tinybase 5.3.6 → 5.3.8

package/synchronizers/synchronizer-ws-client/index.js

@@ -316,7 +316,7 @@ const createCustomPersister = (
           } else if (initialContent) {
             setDefaultContent(initialContent);
           } else {
-            errorNew(`Content is not an array ${content}`);
+            errorNew(`Content is not an array: ${content}`);
           }
         } catch (error) {
           onIgnoredError?.(error);
@@ -508,62 +508,66 @@ const createCustomSynchronizer = (
     otherClientId = null,
     otherContentHashes,
   ) => {
-    if (isUndefined(otherContentHashes)) {
-      [otherContentHashes, otherClientId] = await request(
-        otherClientId,
-        1 /* GetContentHashes */,
-      );
-    }
-    const [otherTablesHash, otherValuesHash] = otherContentHashes;
-    const [tablesHash, valuesHash] = store.getMergeableContentHashes();
-    let tablesChanges = stampNewObj();
-    if (tablesHash != otherTablesHash) {
-      const [newTables, differentTableHashes] = (
-        await request(
+    try {
+      if (isUndefined(otherContentHashes)) {
+        [otherContentHashes, otherClientId] = await request(
           otherClientId,
-          4 /* GetTableDiff */,
-          store.getMergeableTableHashes(),
-        )
-      )[0];
-      tablesChanges = newTables;
-      if (!objIsEmpty(differentTableHashes)) {
-        const [newRows, differentRowHashes] = (
+          1 /* GetContentHashes */,
+        );
+      }
+      const [otherTablesHash, otherValuesHash] = otherContentHashes;
+      const [tablesHash, valuesHash] = store.getMergeableContentHashes();
+      let tablesChanges = stampNewObj();
+      if (tablesHash != otherTablesHash) {
+        const [newTables, differentTableHashes] = (
           await request(
             otherClientId,
-            5 /* GetRowDiff */,
-            store.getMergeableRowHashes(differentTableHashes),
+            4 /* GetTableDiff */,
+            store.getMergeableTableHashes(),
           )
         )[0];
-        mergeTablesStamps(tablesChanges, newRows);
-        if (!objIsEmpty(differentRowHashes)) {
-          const newCells = (
+        tablesChanges = newTables;
+        if (!objIsEmpty(differentTableHashes)) {
+          const [newRows, differentRowHashes] = (
             await request(
               otherClientId,
-              6 /* GetCellDiff */,
-              store.getMergeableCellHashes(differentRowHashes),
+              5 /* GetRowDiff */,
+              store.getMergeableRowHashes(differentTableHashes),
             )
           )[0];
-          mergeTablesStamps(tablesChanges, newCells);
+          mergeTablesStamps(tablesChanges, newRows);
+          if (!objIsEmpty(differentRowHashes)) {
+            const newCells = (
+              await request(
+                otherClientId,
+                6 /* GetCellDiff */,
+                store.getMergeableCellHashes(differentRowHashes),
+              )
+            )[0];
+            mergeTablesStamps(tablesChanges, newCells);
+          }
         }
       }
+      return [
+        tablesChanges,
+        valuesHash == otherValuesHash
+          ? stampNewObj()
+          : (
+              await request(
+                otherClientId,
+                7 /* GetValueDiff */,
+                store.getMergeableValueHashes(),
+              )
+            )[0],
+        1,
+      ];
+    } catch (error) {
+      onIgnoredError?.(error);
     }
-    return [
-      tablesChanges,
-      valuesHash == otherValuesHash
-        ? stampNewObj()
-        : (
-            await request(
-              otherClientId,
-              7 /* GetValueDiff */,
-              store.getMergeableValueHashes(),
-            )
-          )[0],
-      1,
-    ];
   };
   const getPersisted = async () => {
     const changes = await getChangesFromOtherStore();
-    return !objIsEmpty(changes[0][0]) || !objIsEmpty(changes[1][0])
+    return changes && (!objIsEmpty(changes[0][0]) || !objIsEmpty(changes[1][0]))
       ? changes
       : void 0;
   };
@@ -610,9 +614,11 @@ const createCustomSynchronizer = (
               0,
       );
     } else if (message == 2 /* ContentHashes */ && persister.isAutoLoading()) {
-      getChangesFromOtherStore(fromClientId, body).then((changes) => {
-        persisterListener?.(void 0, changes);
-      });
+      getChangesFromOtherStore(fromClientId, body)
+        .then((changes) => {
+          persisterListener?.(void 0, changes);
+        })
+        .catch(onIgnoredError);
     } else if (message == 3 /* ContentDiff */ && persister.isAutoLoading()) {
       persisterListener?.(void 0, body);
     } else {

package/synchronizers/synchronizer-ws-client/with-schemas/index.js

@@ -316,7 +316,7 @@ const createCustomPersister = (
           } else if (initialContent) {
             setDefaultContent(initialContent);
           } else {
-            errorNew(`Content is not an array ${content}`);
+            errorNew(`Content is not an array: ${content}`);
           }
         } catch (error) {
           onIgnoredError?.(error);
@@ -508,62 +508,66 @@ const createCustomSynchronizer = (
     otherClientId = null,
     otherContentHashes,
   ) => {
-    if (isUndefined(otherContentHashes)) {
-      [otherContentHashes, otherClientId] = await request(
-        otherClientId,
-        1 /* GetContentHashes */,
-      );
-    }
-    const [otherTablesHash, otherValuesHash] = otherContentHashes;
-    const [tablesHash, valuesHash] = store.getMergeableContentHashes();
-    let tablesChanges = stampNewObj();
-    if (tablesHash != otherTablesHash) {
-      const [newTables, differentTableHashes] = (
-        await request(
+    try {
+      if (isUndefined(otherContentHashes)) {
+        [otherContentHashes, otherClientId] = await request(
           otherClientId,
-          4 /* GetTableDiff */,
-          store.getMergeableTableHashes(),
-        )
-      )[0];
-      tablesChanges = newTables;
-      if (!objIsEmpty(differentTableHashes)) {
-        const [newRows, differentRowHashes] = (
+          1 /* GetContentHashes */,
+        );
+      }
+      const [otherTablesHash, otherValuesHash] = otherContentHashes;
+      const [tablesHash, valuesHash] = store.getMergeableContentHashes();
+      let tablesChanges = stampNewObj();
+      if (tablesHash != otherTablesHash) {
+        const [newTables, differentTableHashes] = (
           await request(
             otherClientId,
-            5 /* GetRowDiff */,
-            store.getMergeableRowHashes(differentTableHashes),
+            4 /* GetTableDiff */,
+            store.getMergeableTableHashes(),
           )
         )[0];
-        mergeTablesStamps(tablesChanges, newRows);
-        if (!objIsEmpty(differentRowHashes)) {
-          const newCells = (
+        tablesChanges = newTables;
+        if (!objIsEmpty(differentTableHashes)) {
+          const [newRows, differentRowHashes] = (
             await request(
               otherClientId,
-              6 /* GetCellDiff */,
-              store.getMergeableCellHashes(differentRowHashes),
+              5 /* GetRowDiff */,
+              store.getMergeableRowHashes(differentTableHashes),
             )
           )[0];
-          mergeTablesStamps(tablesChanges, newCells);
+          mergeTablesStamps(tablesChanges, newRows);
+          if (!objIsEmpty(differentRowHashes)) {
+            const newCells = (
+              await request(
+                otherClientId,
+                6 /* GetCellDiff */,
+                store.getMergeableCellHashes(differentRowHashes),
+              )
+            )[0];
+            mergeTablesStamps(tablesChanges, newCells);
+          }
         }
       }
+      return [
+        tablesChanges,
+        valuesHash == otherValuesHash
+          ? stampNewObj()
+          : (
+              await request(
+                otherClientId,
+                7 /* GetValueDiff */,
+                store.getMergeableValueHashes(),
+              )
+            )[0],
+        1,
+      ];
+    } catch (error) {
+      onIgnoredError?.(error);
     }
-    return [
-      tablesChanges,
-      valuesHash == otherValuesHash
-        ? stampNewObj()
-        : (
-            await request(
-              otherClientId,
-              7 /* GetValueDiff */,
-              store.getMergeableValueHashes(),
-            )
-          )[0],
-      1,
-    ];
   };
   const getPersisted = async () => {
     const changes = await getChangesFromOtherStore();
-    return !objIsEmpty(changes[0][0]) || !objIsEmpty(changes[1][0])
+    return changes && (!objIsEmpty(changes[0][0]) || !objIsEmpty(changes[1][0]))
       ? changes
       : void 0;
   };
@@ -610,9 +614,11 @@ const createCustomSynchronizer = (
               0,
       );
     } else if (message == 2 /* ContentHashes */ && persister.isAutoLoading()) {
-      getChangesFromOtherStore(fromClientId, body).then((changes) => {
-        persisterListener?.(void 0, changes);
-      });
+      getChangesFromOtherStore(fromClientId, body)
+        .then((changes) => {
+          persisterListener?.(void 0, changes);
+        })
+        .catch(onIgnoredError);
     } else if (message == 3 /* ContentDiff */ && persister.isAutoLoading()) {
       persisterListener?.(void 0, body);
     } else {

package/synchronizers/synchronizer-ws-server/index.js

@@ -295,7 +295,10 @@ const createCustomPersister = (
       ) {
         try {
           await action();
-        } catch (error) {}
+        } catch (error) {
+          /* istanbul ignore next */
+          onIgnoredError?.(error);
+        }
       }
       mapSet(scheduleRunning, scheduleId, 0);
     }
@@ -322,9 +325,10 @@ const createCustomPersister = (
           } else if (initialContent) {
             setDefaultContent(initialContent);
           } else {
-            errorNew(`Content is not an array ${content}`);
+            errorNew(`Content is not an array: ${content}`);
           }
         } catch (error) {
+          onIgnoredError?.(error);
           if (initialContent) {
             setDefaultContent(initialContent);
           }
@@ -350,7 +354,10 @@ const createCustomPersister = (
           await load();
         }
       });
-    } catch (error) {}
+    } catch (error) {
+      /* istanbul ignore next */
+      onIgnoredError?.(error);
+    }
     return persister;
   };
   const stopAutoLoad = () => {
@@ -369,7 +376,10 @@ const createCustomPersister = (
       await schedule(async () => {
         try {
           await setPersisted(getContent, changes);
-        } catch (error) {}
+        } catch (error) {
+          /* istanbul ignore next */
+          onIgnoredError?.(error);
+        }
         setStatus(0 /* Idle */);
       });
     }
@@ -506,62 +516,66 @@ const createCustomSynchronizer = (
     otherClientId = null,
     otherContentHashes,
   ) => {
-    if (isUndefined(otherContentHashes)) {
-      [otherContentHashes, otherClientId] = await request(
-        otherClientId,
-        1 /* GetContentHashes */,
-      );
-    }
-    const [otherTablesHash, otherValuesHash] = otherContentHashes;
-    const [tablesHash, valuesHash] = store.getMergeableContentHashes();
-    let tablesChanges = stampNewObj();
-    if (tablesHash != otherTablesHash) {
-      const [newTables, differentTableHashes] = (
-        await request(
+    try {
+      if (isUndefined(otherContentHashes)) {
+        [otherContentHashes, otherClientId] = await request(
           otherClientId,
-          4 /* GetTableDiff */,
-          store.getMergeableTableHashes(),
-        )
-      )[0];
-      tablesChanges = newTables;
-      if (!objIsEmpty(differentTableHashes)) {
-        const [newRows, differentRowHashes] = (
+          1 /* GetContentHashes */,
+        );
+      }
+      const [otherTablesHash, otherValuesHash] = otherContentHashes;
+      const [tablesHash, valuesHash] = store.getMergeableContentHashes();
+      let tablesChanges = stampNewObj();
+      if (tablesHash != otherTablesHash) {
+        const [newTables, differentTableHashes] = (
           await request(
             otherClientId,
-            5 /* GetRowDiff */,
-            store.getMergeableRowHashes(differentTableHashes),
+            4 /* GetTableDiff */,
+            store.getMergeableTableHashes(),
           )
         )[0];
-        mergeTablesStamps(tablesChanges, newRows);
-        if (!objIsEmpty(differentRowHashes)) {
-          const newCells = (
+        tablesChanges = newTables;
+        if (!objIsEmpty(differentTableHashes)) {
+          const [newRows, differentRowHashes] = (
             await request(
               otherClientId,
-              6 /* GetCellDiff */,
-              store.getMergeableCellHashes(differentRowHashes),
+              5 /* GetRowDiff */,
+              store.getMergeableRowHashes(differentTableHashes),
             )
           )[0];
-          mergeTablesStamps(tablesChanges, newCells);
+          mergeTablesStamps(tablesChanges, newRows);
+          if (!objIsEmpty(differentRowHashes)) {
+            const newCells = (
+              await request(
+                otherClientId,
+                6 /* GetCellDiff */,
+                store.getMergeableCellHashes(differentRowHashes),
+              )
+            )[0];
+            mergeTablesStamps(tablesChanges, newCells);
+          }
         }
       }
+      return [
+        tablesChanges,
+        valuesHash == otherValuesHash
+          ? stampNewObj()
+          : (
+              await request(
+                otherClientId,
+                7 /* GetValueDiff */,
+                store.getMergeableValueHashes(),
+              )
+            )[0],
+        1,
+      ];
+    } catch (error) {
+      onIgnoredError?.(error);
     }
-    return [
-      tablesChanges,
-      valuesHash == otherValuesHash
-        ? stampNewObj()
-        : (
-            await request(
-              otherClientId,
-              7 /* GetValueDiff */,
-              store.getMergeableValueHashes(),
-            )
-          )[0],
-      1,
-    ];
   };
   const getPersisted = async () => {
     const changes = await getChangesFromOtherStore();
-    return !objIsEmpty(changes[0][0]) || !objIsEmpty(changes[1][0])
+    return changes && (!objIsEmpty(changes[0][0]) || !objIsEmpty(changes[1][0]))
       ? changes
       : void 0;
   };
@@ -606,9 +620,11 @@ const createCustomSynchronizer = (
               0,
       );
     } else if (message == 2 /* ContentHashes */ && persister.isAutoLoading()) {
-      getChangesFromOtherStore(fromClientId, body).then((changes) => {
-        persisterListener?.(void 0, changes);
-      });
+      getChangesFromOtherStore(fromClientId, body)
+        .then((changes) => {
+          persisterListener?.(void 0, changes);
+        })
+        .catch(onIgnoredError);
     } else if (message == 3 /* ContentDiff */ && persister.isAutoLoading()) {
       persisterListener?.(void 0, body);
     } else {
@@ -635,7 +651,11 @@ const createCustomSynchronizer = (
 
 const PATH_REGEX = /\/([^?]*)/;
 const SERVER_CLIENT_ID = 'S';
-const createWsServer = (webSocketServer, createPersisterForPath) => {
+const createWsServer = (
+  webSocketServer,
+  createPersisterForPath,
+  onIgnoredError,
+) => {
   const pathIdListeners = mapNew();
   const clientIdListeners = mapNew();
   const clientsByPath = mapNew();
@@ -665,6 +685,9 @@ const createWsServer = (webSocketServer, createPersisterForPath) => {
               receivePayload(payload, receive)),
           () => {},
           1,
+          void 0,
+          void 0,
+          onIgnoredError,
         );
         serverClient[4 /* Buffer */] = [];
         serverClient[5 /* Then */] = isArray(persisterMaybeThen)
@@ -745,9 +768,15 @@ const createWsServer = (webSocketServer, createPersisterForPath) => {
             callListeners(pathIdListeners, void 0, pathId, -1);
           }
         });
+        if (onIgnoredError) {
+          webSocket.on('error', onIgnoredError);
+        }
       }),
     ),
   );
+  if (onIgnoredError) {
+    webSocketServer.on('error', onIgnoredError);
+  }
   const getWebSocketServer = () => webSocketServer;
   const getPathIds = () => mapKeys(clientsByPath);
   const getClientIds = (path) => mapKeys(mapGet(clientsByPath, path));

package/synchronizers/synchronizer-ws-server/with-schemas/index.js

@@ -295,7 +295,10 @@ const createCustomPersister = (
       ) {
         try {
           await action();
-        } catch (error) {}
+        } catch (error) {
+          /* istanbul ignore next */
+          onIgnoredError?.(error);
+        }
       }
       mapSet(scheduleRunning, scheduleId, 0);
     }
@@ -322,9 +325,10 @@ const createCustomPersister = (
           } else if (initialContent) {
             setDefaultContent(initialContent);
           } else {
-            errorNew(`Content is not an array ${content}`);
+            errorNew(`Content is not an array: ${content}`);
           }
         } catch (error) {
+          onIgnoredError?.(error);
           if (initialContent) {
             setDefaultContent(initialContent);
           }
@@ -350,7 +354,10 @@ const createCustomPersister = (
           await load();
         }
       });
-    } catch (error) {}
+    } catch (error) {
+      /* istanbul ignore next */
+      onIgnoredError?.(error);
+    }
     return persister;
   };
   const stopAutoLoad = () => {
@@ -369,7 +376,10 @@ const createCustomPersister = (
       await schedule(async () => {
         try {
           await setPersisted(getContent, changes);
-        } catch (error) {}
+        } catch (error) {
+          /* istanbul ignore next */
+          onIgnoredError?.(error);
+        }
         setStatus(0 /* Idle */);
       });
     }
@@ -506,62 +516,66 @@ const createCustomSynchronizer = (
     otherClientId = null,
     otherContentHashes,
   ) => {
-    if (isUndefined(otherContentHashes)) {
-      [otherContentHashes, otherClientId] = await request(
-        otherClientId,
-        1 /* GetContentHashes */,
-      );
-    }
-    const [otherTablesHash, otherValuesHash] = otherContentHashes;
-    const [tablesHash, valuesHash] = store.getMergeableContentHashes();
-    let tablesChanges = stampNewObj();
-    if (tablesHash != otherTablesHash) {
-      const [newTables, differentTableHashes] = (
-        await request(
+    try {
+      if (isUndefined(otherContentHashes)) {
+        [otherContentHashes, otherClientId] = await request(
           otherClientId,
-          4 /* GetTableDiff */,
-          store.getMergeableTableHashes(),
-        )
-      )[0];
-      tablesChanges = newTables;
-      if (!objIsEmpty(differentTableHashes)) {
-        const [newRows, differentRowHashes] = (
+          1 /* GetContentHashes */,
+        );
+      }
+      const [otherTablesHash, otherValuesHash] = otherContentHashes;
+      const [tablesHash, valuesHash] = store.getMergeableContentHashes();
+      let tablesChanges = stampNewObj();
+      if (tablesHash != otherTablesHash) {
+        const [newTables, differentTableHashes] = (
           await request(
             otherClientId,
-            5 /* GetRowDiff */,
-            store.getMergeableRowHashes(differentTableHashes),
+            4 /* GetTableDiff */,
+            store.getMergeableTableHashes(),
           )
         )[0];
-        mergeTablesStamps(tablesChanges, newRows);
-        if (!objIsEmpty(differentRowHashes)) {
-          const newCells = (
+        tablesChanges = newTables;
+        if (!objIsEmpty(differentTableHashes)) {
+          const [newRows, differentRowHashes] = (
             await request(
               otherClientId,
-              6 /* GetCellDiff */,
-              store.getMergeableCellHashes(differentRowHashes),
+              5 /* GetRowDiff */,
+              store.getMergeableRowHashes(differentTableHashes),
             )
           )[0];
-          mergeTablesStamps(tablesChanges, newCells);
+          mergeTablesStamps(tablesChanges, newRows);
+          if (!objIsEmpty(differentRowHashes)) {
+            const newCells = (
+              await request(
+                otherClientId,
+                6 /* GetCellDiff */,
+                store.getMergeableCellHashes(differentRowHashes),
+              )
+            )[0];
+            mergeTablesStamps(tablesChanges, newCells);
+          }
         }
       }
+      return [
+        tablesChanges,
+        valuesHash == otherValuesHash
+          ? stampNewObj()
+          : (
+              await request(
+                otherClientId,
+                7 /* GetValueDiff */,
+                store.getMergeableValueHashes(),
+              )
+            )[0],
+        1,
+      ];
+    } catch (error) {
+      onIgnoredError?.(error);
     }
-    return [
-      tablesChanges,
-      valuesHash == otherValuesHash
-        ? stampNewObj()
-        : (
-            await request(
-              otherClientId,
-              7 /* GetValueDiff */,
-              store.getMergeableValueHashes(),
-            )
-          )[0],
-      1,
-    ];
   };
   const getPersisted = async () => {
     const changes = await getChangesFromOtherStore();
-    return !objIsEmpty(changes[0][0]) || !objIsEmpty(changes[1][0])
+    return changes && (!objIsEmpty(changes[0][0]) || !objIsEmpty(changes[1][0]))
       ? changes
       : void 0;
   };
@@ -606,9 +620,11 @@ const createCustomSynchronizer = (
               0,
       );
     } else if (message == 2 /* ContentHashes */ && persister.isAutoLoading()) {
-      getChangesFromOtherStore(fromClientId, body).then((changes) => {
-        persisterListener?.(void 0, changes);
-      });
+      getChangesFromOtherStore(fromClientId, body)
+        .then((changes) => {
+          persisterListener?.(void 0, changes);
+        })
+        .catch(onIgnoredError);
     } else if (message == 3 /* ContentDiff */ && persister.isAutoLoading()) {
       persisterListener?.(void 0, body);
     } else {
@@ -635,7 +651,11 @@ const createCustomSynchronizer = (
 
 const PATH_REGEX = /\/([^?]*)/;
 const SERVER_CLIENT_ID = 'S';
-const createWsServer = (webSocketServer, createPersisterForPath) => {
+const createWsServer = (
+  webSocketServer,
+  createPersisterForPath,
+  onIgnoredError,
+) => {
   const pathIdListeners = mapNew();
   const clientIdListeners = mapNew();
   const clientsByPath = mapNew();
@@ -665,6 +685,9 @@ const createWsServer = (webSocketServer, createPersisterForPath) => {
               receivePayload(payload, receive)),
           () => {},
           1,
+          void 0,
+          void 0,
+          onIgnoredError,
         );
         serverClient[4 /* Buffer */] = [];
         serverClient[5 /* Then */] = isArray(persisterMaybeThen)
@@ -745,9 +768,15 @@ const createWsServer = (webSocketServer, createPersisterForPath) => {
             callListeners(pathIdListeners, void 0, pathId, -1);
           }
         });
+        if (onIgnoredError) {
+          webSocket.on('error', onIgnoredError);
+        }
       }),
     ),
   );
+  if (onIgnoredError) {
+    webSocketServer.on('error', onIgnoredError);
+  }
   const getWebSocketServer = () => webSocketServer;
   const getPathIds = () => mapKeys(clientsByPath);
   const getClientIds = (path) => mapKeys(mapGet(clientsByPath, path));