From daa1e3ddf585f5fe237c100504130a3eae204252 Mon Sep 17 00:00:00 2001
From: bobzel <zzzman@gmail.com>
Date: Fri, 26 Feb 2021 15:12:28 -0500
Subject: fixed serialization error handling to not kill Dash - bad list items
 prevented tabs from being created.  cleaned up document fields a little more
 - switched layers to _layerTags, got rid of a couple unused fields.

---
 src/server/database.ts  | 4 ++--
 src/server/websocket.ts | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'src/server')

diff --git a/src/server/database.ts b/src/server/database.ts
index 41bf8b3da..8e0f99a1f 100644
--- a/src/server/database.ts
+++ b/src/server/database.ts
@@ -163,7 +163,7 @@ export namespace Database {
         }
 
         public async insert(value: any, collectionName = DocumentsCollection) {
-            if (this.db) {
+            if (this.db && value) {
                 if ("id" in value) {
                     value._id = value.id;
                     delete value.id;
@@ -185,7 +185,7 @@ export namespace Database {
                 newProm = prom ? prom.then(run) : run();
                 this.currentWrites[id] = newProm;
                 return newProm;
-            } else {
+            } else if (value) {
                 this.onConnect.push(() => this.insert(value, collectionName));
             }
         }
diff --git a/src/server/websocket.ts b/src/server/websocket.ts
index 7e3c4da82..4ae97913f 100644
--- a/src/server/websocket.ts
+++ b/src/server/websocket.ts
@@ -277,7 +277,11 @@ export namespace WebSocket {
     function addToListField(socket: Socket, diff: Diff, curListItems?: Transferable): void {
         diff.diff.$set = diff.diff.$addToSet; delete diff.diff.$addToSet;// convert add to set to a query of the current fields, and then a set of the composition of the new fields with the old ones
         const updatefield = Array.from(Object.keys(diff.diff.$set))[0];
-        const newListItems = diff.diff.$set[updatefield].fields;
+        const newListItems = diff.diff.$set[updatefield]?.fields;
+        if (!newListItems) {
+            console.log("Error: addToListField - no new list items");
+            return;
+        }
         const curList = (curListItems as any)?.fields?.[updatefield.replace("fields.", "")]?.fields.filter((item: any) => item !== undefined) || [];
         diff.diff.$set[updatefield].fields = [...curList, ...newListItems.filter((newItem: any) => newItem === null || !curList.some((curItem: any) => curItem.fieldId ? curItem.fieldId === newItem.fieldId : curItem.heading ? curItem.heading === newItem.heading : curItem === newItem))];
         const sendBack = diff.diff.length !== diff.diff.$set[updatefield].fields.length;
-- 
cgit v1.2.3-70-g09d2


From e4615d12bfe74523b00185cf616a226cf94e303c Mon Sep 17 00:00:00 2001
From: bobzel <zzzman@gmail.com>
Date: Fri, 26 Feb 2021 16:50:45 -0500
Subject: reverting back some parts of the fix to serialization

---
 src/client/util/SerializationHelper.ts | 6 +++---
 src/server/database.ts                 | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/server')

diff --git a/src/client/util/SerializationHelper.ts b/src/client/util/SerializationHelper.ts
index 4c3b3f096..d109cb497 100644
--- a/src/client/util/SerializationHelper.ts
+++ b/src/client/util/SerializationHelper.ts
@@ -22,12 +22,12 @@ export namespace SerializationHelper {
             return obj;
         }
 
+        serializing++;
         if (!(obj.constructor.name in reverseMap)) {
-            // throw Error(
             console.log("Error: " + `type '${obj.constructor.name}' not registered. Make sure you register it using a @Deserializable decorator`, obj);
+            throw Error("Error: " + `type '${obj.constructor.name}' not registered. Make sure you register it using a @Deserializable decorator`);
             return undefined;
         }
-        serializing++;
 
         const json = serialize(obj);
         json.__type = reverseMap[obj.constructor.name];
@@ -54,8 +54,8 @@ export namespace SerializationHelper {
         }
 
         if (!(obj.__type in serializationTypes)) {
-            // throw Error(
             console.log(`type '${obj.__type}' not registered. Make sure you register it using a @Deserializable decorator`);
+            throw Error(`type '${obj.__type}' not registered. Make sure you register it using a @Deserializable decorator`);
             return undefined;
         }
 
diff --git a/src/server/database.ts b/src/server/database.ts
index 8e0f99a1f..2a55c14de 100644
--- a/src/server/database.ts
+++ b/src/server/database.ts
@@ -163,7 +163,7 @@ export namespace Database {
         }
 
         public async insert(value: any, collectionName = DocumentsCollection) {
-            if (this.db && value) {
+            if (this.db && value !== null) {
                 if ("id" in value) {
                     value._id = value.id;
                     delete value.id;
@@ -185,7 +185,7 @@ export namespace Database {
                 newProm = prom ? prom.then(run) : run();
                 this.currentWrites[id] = newProm;
                 return newProm;
-            } else if (value) {
+            } else if (value !== null) {
                 this.onConnect.push(() => this.insert(value, collectionName));
             }
         }
-- 
cgit v1.2.3-70-g09d2