tinybase 5.3.7 → 5.3.9

package/es6/synchronizers/synchronizer-local/with-schemas/index.js

@@ -389,7 +389,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 == null ? void 0 : onIgnoredError(error);
@@ -641,55 +641,60 @@ const createCustomSynchronizer = (
   };
   const getChangesFromOtherStore = (otherClientId = null, otherContentHashes) =>
     __async(void 0, null, function* () {
-      if (isUndefined(otherContentHashes)) {
-        [otherContentHashes, otherClientId] = yield request(
-          otherClientId,
-          1 /* GetContentHashes */,
-        );
-      }
-      const [otherTablesHash, otherValuesHash] = otherContentHashes;
-      const [tablesHash, valuesHash] = store.getMergeableContentHashes();
-      let tablesChanges = stampNewObj();
-      if (tablesHash != otherTablesHash) {
-        const [newTables, differentTableHashes] = (yield request(
-          otherClientId,
-          4 /* GetTableDiff */,
-          store.getMergeableTableHashes(),
-        ))[0];
-        tablesChanges = newTables;
-        if (!objIsEmpty(differentTableHashes)) {
-          const [newRows, differentRowHashes] = (yield request(
+      try {
+        if (isUndefined(otherContentHashes)) {
+          [otherContentHashes, otherClientId] = yield request(
+            otherClientId,
+            1 /* GetContentHashes */,
+          );
+        }
+        const [otherTablesHash, otherValuesHash] = otherContentHashes;
+        const [tablesHash, valuesHash] = store.getMergeableContentHashes();
+        let tablesChanges = stampNewObj();
+        if (tablesHash != otherTablesHash) {
+          const [newTables, differentTableHashes] = (yield request(
             otherClientId,
-            5 /* GetRowDiff */,
-            store.getMergeableRowHashes(differentTableHashes),
+            4 /* GetTableDiff */,
+            store.getMergeableTableHashes(),
           ))[0];
-          mergeTablesStamps(tablesChanges, newRows);
-          if (!objIsEmpty(differentRowHashes)) {
-            const newCells = (yield request(
+          tablesChanges = newTables;
+          if (!objIsEmpty(differentTableHashes)) {
+            const [newRows, differentRowHashes] = (yield request(
               otherClientId,
-              6 /* GetCellDiff */,
-              store.getMergeableCellHashes(differentRowHashes),
+              5 /* GetRowDiff */,
+              store.getMergeableRowHashes(differentTableHashes),
             ))[0];
-            mergeTablesStamps(tablesChanges, newCells);
+            mergeTablesStamps(tablesChanges, newRows);
+            if (!objIsEmpty(differentRowHashes)) {
+              const newCells = (yield request(
+                otherClientId,
+                6 /* GetCellDiff */,
+                store.getMergeableCellHashes(differentRowHashes),
+              ))[0];
+              mergeTablesStamps(tablesChanges, newCells);
+            }
           }
         }
+        return [
+          tablesChanges,
+          valuesHash == otherValuesHash
+            ? stampNewObj()
+            : (yield request(
+                otherClientId,
+                7 /* GetValueDiff */,
+                store.getMergeableValueHashes(),
+              ))[0],
+          1,
+        ];
+      } catch (error) {
+        onIgnoredError == null ? void 0 : onIgnoredError(error);
       }
-      return [
-        tablesChanges,
-        valuesHash == otherValuesHash
-          ? stampNewObj()
-          : (yield request(
-              otherClientId,
-              7 /* GetValueDiff */,
-              store.getMergeableValueHashes(),
-            ))[0],
-        1,
-      ];
     });
   const getPersisted = () =>
     __async(void 0, null, function* () {
       const changes = yield getChangesFromOtherStore();
-      return !objIsEmpty(changes[0][0]) || !objIsEmpty(changes[1][0])
+      return changes &&
+        (!objIsEmpty(changes[0][0]) || !objIsEmpty(changes[1][0]))
         ? changes
         : void 0;
     });
@@ -744,9 +749,13 @@ const createCustomSynchronizer = (
               0,
       );
     } else if (message == 2 /* ContentHashes */ && persister.isAutoLoading()) {
-      getChangesFromOtherStore(fromClientId, body).then((changes) => {
-        persisterListener == null ? void 0 : persisterListener(void 0, changes);
-      });
+      getChangesFromOtherStore(fromClientId, body)
+        .then((changes) => {
+          persisterListener == null
+            ? void 0
+            : persisterListener(void 0, changes);
+        })
+        .catch(onIgnoredError);
     } else if (message == 3 /* ContentDiff */ && persister.isAutoLoading()) {
       persisterListener == null ? void 0 : persisterListener(void 0, body);
     } else {

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

@@ -416,7 +416,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 == null ? void 0 : onIgnoredError(error);
@@ -668,55 +668,60 @@ const createCustomSynchronizer = (
   };
   const getChangesFromOtherStore = (otherClientId = null, otherContentHashes) =>
     __async$1(void 0, null, function* () {
-      if (isUndefined(otherContentHashes)) {
-        [otherContentHashes, otherClientId] = yield request(
-          otherClientId,
-          1 /* GetContentHashes */,
-        );
-      }
-      const [otherTablesHash, otherValuesHash] = otherContentHashes;
-      const [tablesHash, valuesHash] = store.getMergeableContentHashes();
-      let tablesChanges = stampNewObj();
-      if (tablesHash != otherTablesHash) {
-        const [newTables, differentTableHashes] = (yield request(
-          otherClientId,
-          4 /* GetTableDiff */,
-          store.getMergeableTableHashes(),
-        ))[0];
-        tablesChanges = newTables;
-        if (!objIsEmpty(differentTableHashes)) {
-          const [newRows, differentRowHashes] = (yield request(
+      try {
+        if (isUndefined(otherContentHashes)) {
+          [otherContentHashes, otherClientId] = yield request(
+            otherClientId,
+            1 /* GetContentHashes */,
+          );
+        }
+        const [otherTablesHash, otherValuesHash] = otherContentHashes;
+        const [tablesHash, valuesHash] = store.getMergeableContentHashes();
+        let tablesChanges = stampNewObj();
+        if (tablesHash != otherTablesHash) {
+          const [newTables, differentTableHashes] = (yield request(
             otherClientId,
-            5 /* GetRowDiff */,
-            store.getMergeableRowHashes(differentTableHashes),
+            4 /* GetTableDiff */,
+            store.getMergeableTableHashes(),
           ))[0];
-          mergeTablesStamps(tablesChanges, newRows);
-          if (!objIsEmpty(differentRowHashes)) {
-            const newCells = (yield request(
+          tablesChanges = newTables;
+          if (!objIsEmpty(differentTableHashes)) {
+            const [newRows, differentRowHashes] = (yield request(
               otherClientId,
-              6 /* GetCellDiff */,
-              store.getMergeableCellHashes(differentRowHashes),
+              5 /* GetRowDiff */,
+              store.getMergeableRowHashes(differentTableHashes),
             ))[0];
-            mergeTablesStamps(tablesChanges, newCells);
+            mergeTablesStamps(tablesChanges, newRows);
+            if (!objIsEmpty(differentRowHashes)) {
+              const newCells = (yield request(
+                otherClientId,
+                6 /* GetCellDiff */,
+                store.getMergeableCellHashes(differentRowHashes),
+              ))[0];
+              mergeTablesStamps(tablesChanges, newCells);
+            }
           }
         }
+        return [
+          tablesChanges,
+          valuesHash == otherValuesHash
+            ? stampNewObj()
+            : (yield request(
+                otherClientId,
+                7 /* GetValueDiff */,
+                store.getMergeableValueHashes(),
+              ))[0],
+          1,
+        ];
+      } catch (error) {
+        onIgnoredError == null ? void 0 : onIgnoredError(error);
       }
-      return [
-        tablesChanges,
-        valuesHash == otherValuesHash
-          ? stampNewObj()
-          : (yield request(
-              otherClientId,
-              7 /* GetValueDiff */,
-              store.getMergeableValueHashes(),
-            ))[0],
-        1,
-      ];
     });
   const getPersisted = () =>
     __async$1(void 0, null, function* () {
       const changes = yield getChangesFromOtherStore();
-      return !objIsEmpty(changes[0][0]) || !objIsEmpty(changes[1][0])
+      return changes &&
+        (!objIsEmpty(changes[0][0]) || !objIsEmpty(changes[1][0]))
         ? changes
         : void 0;
     });
@@ -771,9 +776,13 @@ const createCustomSynchronizer = (
               0,
       );
     } else if (message == 2 /* ContentHashes */ && persister.isAutoLoading()) {
-      getChangesFromOtherStore(fromClientId, body).then((changes) => {
-        persisterListener == null ? void 0 : persisterListener(void 0, changes);
-      });
+      getChangesFromOtherStore(fromClientId, body)
+        .then((changes) => {
+          persisterListener == null
+            ? void 0
+            : persisterListener(void 0, changes);
+        })
+        .catch(onIgnoredError);
     } else if (message == 3 /* ContentDiff */ && persister.isAutoLoading()) {
       persisterListener == null ? void 0 : persisterListener(void 0, body);
     } else {

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

@@ -416,7 +416,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 == null ? void 0 : onIgnoredError(error);
@@ -668,55 +668,60 @@ const createCustomSynchronizer = (
   };
   const getChangesFromOtherStore = (otherClientId = null, otherContentHashes) =>
     __async$1(void 0, null, function* () {
-      if (isUndefined(otherContentHashes)) {
-        [otherContentHashes, otherClientId] = yield request(
-          otherClientId,
-          1 /* GetContentHashes */,
-        );
-      }
-      const [otherTablesHash, otherValuesHash] = otherContentHashes;
-      const [tablesHash, valuesHash] = store.getMergeableContentHashes();
-      let tablesChanges = stampNewObj();
-      if (tablesHash != otherTablesHash) {
-        const [newTables, differentTableHashes] = (yield request(
-          otherClientId,
-          4 /* GetTableDiff */,
-          store.getMergeableTableHashes(),
-        ))[0];
-        tablesChanges = newTables;
-        if (!objIsEmpty(differentTableHashes)) {
-          const [newRows, differentRowHashes] = (yield request(
+      try {
+        if (isUndefined(otherContentHashes)) {
+          [otherContentHashes, otherClientId] = yield request(
+            otherClientId,
+            1 /* GetContentHashes */,
+          );
+        }
+        const [otherTablesHash, otherValuesHash] = otherContentHashes;
+        const [tablesHash, valuesHash] = store.getMergeableContentHashes();
+        let tablesChanges = stampNewObj();
+        if (tablesHash != otherTablesHash) {
+          const [newTables, differentTableHashes] = (yield request(
             otherClientId,
-            5 /* GetRowDiff */,
-            store.getMergeableRowHashes(differentTableHashes),
+            4 /* GetTableDiff */,
+            store.getMergeableTableHashes(),
           ))[0];
-          mergeTablesStamps(tablesChanges, newRows);
-          if (!objIsEmpty(differentRowHashes)) {
-            const newCells = (yield request(
+          tablesChanges = newTables;
+          if (!objIsEmpty(differentTableHashes)) {
+            const [newRows, differentRowHashes] = (yield request(
               otherClientId,
-              6 /* GetCellDiff */,
-              store.getMergeableCellHashes(differentRowHashes),
+              5 /* GetRowDiff */,
+              store.getMergeableRowHashes(differentTableHashes),
             ))[0];
-            mergeTablesStamps(tablesChanges, newCells);
+            mergeTablesStamps(tablesChanges, newRows);
+            if (!objIsEmpty(differentRowHashes)) {
+              const newCells = (yield request(
+                otherClientId,
+                6 /* GetCellDiff */,
+                store.getMergeableCellHashes(differentRowHashes),
+              ))[0];
+              mergeTablesStamps(tablesChanges, newCells);
+            }
           }
         }
+        return [
+          tablesChanges,
+          valuesHash == otherValuesHash
+            ? stampNewObj()
+            : (yield request(
+                otherClientId,
+                7 /* GetValueDiff */,
+                store.getMergeableValueHashes(),
+              ))[0],
+          1,
+        ];
+      } catch (error) {
+        onIgnoredError == null ? void 0 : onIgnoredError(error);
       }
-      return [
-        tablesChanges,
-        valuesHash == otherValuesHash
-          ? stampNewObj()
-          : (yield request(
-              otherClientId,
-              7 /* GetValueDiff */,
-              store.getMergeableValueHashes(),
-            ))[0],
-        1,
-      ];
     });
   const getPersisted = () =>
     __async$1(void 0, null, function* () {
       const changes = yield getChangesFromOtherStore();
-      return !objIsEmpty(changes[0][0]) || !objIsEmpty(changes[1][0])
+      return changes &&
+        (!objIsEmpty(changes[0][0]) || !objIsEmpty(changes[1][0]))
         ? changes
         : void 0;
     });
@@ -771,9 +776,13 @@ const createCustomSynchronizer = (
               0,
       );
     } else if (message == 2 /* ContentHashes */ && persister.isAutoLoading()) {
-      getChangesFromOtherStore(fromClientId, body).then((changes) => {
-        persisterListener == null ? void 0 : persisterListener(void 0, changes);
-      });
+      getChangesFromOtherStore(fromClientId, body)
+        .then((changes) => {
+          persisterListener == null
+            ? void 0
+            : persisterListener(void 0, changes);
+        })
+        .catch(onIgnoredError);
     } else if (message == 3 /* ContentDiff */ && persister.isAutoLoading()) {
       persisterListener == null ? void 0 : persisterListener(void 0, body);
     } else {

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

@@ -398,7 +398,10 @@ const createCustomPersister = (
         ) {
           try {
             yield action();
-          } catch (error) {}
+          } catch (error) {
+            /* istanbul ignore next */
+            onIgnoredError == null ? void 0 : onIgnoredError(error);
+          }
         }
         mapSet(scheduleRunning, scheduleId, 0);
       }
@@ -428,9 +431,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 == null ? void 0 : onIgnoredError(error);
               if (initialContent) {
                 setDefaultContent(initialContent);
               }
@@ -460,7 +464,10 @@ const createCustomPersister = (
             }
           }),
         );
-      } catch (error) {}
+      } catch (error) {
+        /* istanbul ignore next */
+        onIgnoredError == null ? void 0 : onIgnoredError(error);
+      }
       return persister;
     });
   const stopAutoLoad = () => {
@@ -481,7 +488,10 @@ const createCustomPersister = (
           __async$2(void 0, null, function* () {
             try {
               yield setPersisted(getContent, changes);
-            } catch (error) {}
+            } catch (error) {
+              /* istanbul ignore next */
+              onIgnoredError == null ? void 0 : onIgnoredError(error);
+            }
             setStatus(0 /* Idle */);
           }),
         );
@@ -672,55 +682,60 @@ const createCustomSynchronizer = (
   };
   const getChangesFromOtherStore = (otherClientId = null, otherContentHashes) =>
     __async$1(void 0, null, function* () {
-      if (isUndefined(otherContentHashes)) {
-        [otherContentHashes, otherClientId] = yield request(
-          otherClientId,
-          1 /* GetContentHashes */,
-        );
-      }
-      const [otherTablesHash, otherValuesHash] = otherContentHashes;
-      const [tablesHash, valuesHash] = store.getMergeableContentHashes();
-      let tablesChanges = stampNewObj();
-      if (tablesHash != otherTablesHash) {
-        const [newTables, differentTableHashes] = (yield request(
-          otherClientId,
-          4 /* GetTableDiff */,
-          store.getMergeableTableHashes(),
-        ))[0];
-        tablesChanges = newTables;
-        if (!objIsEmpty(differentTableHashes)) {
-          const [newRows, differentRowHashes] = (yield request(
+      try {
+        if (isUndefined(otherContentHashes)) {
+          [otherContentHashes, otherClientId] = yield request(
+            otherClientId,
+            1 /* GetContentHashes */,
+          );
+        }
+        const [otherTablesHash, otherValuesHash] = otherContentHashes;
+        const [tablesHash, valuesHash] = store.getMergeableContentHashes();
+        let tablesChanges = stampNewObj();
+        if (tablesHash != otherTablesHash) {
+          const [newTables, differentTableHashes] = (yield request(
             otherClientId,
-            5 /* GetRowDiff */,
-            store.getMergeableRowHashes(differentTableHashes),
+            4 /* GetTableDiff */,
+            store.getMergeableTableHashes(),
           ))[0];
-          mergeTablesStamps(tablesChanges, newRows);
-          if (!objIsEmpty(differentRowHashes)) {
-            const newCells = (yield request(
+          tablesChanges = newTables;
+          if (!objIsEmpty(differentTableHashes)) {
+            const [newRows, differentRowHashes] = (yield request(
               otherClientId,
-              6 /* GetCellDiff */,
-              store.getMergeableCellHashes(differentRowHashes),
+              5 /* GetRowDiff */,
+              store.getMergeableRowHashes(differentTableHashes),
             ))[0];
-            mergeTablesStamps(tablesChanges, newCells);
+            mergeTablesStamps(tablesChanges, newRows);
+            if (!objIsEmpty(differentRowHashes)) {
+              const newCells = (yield request(
+                otherClientId,
+                6 /* GetCellDiff */,
+                store.getMergeableCellHashes(differentRowHashes),
+              ))[0];
+              mergeTablesStamps(tablesChanges, newCells);
+            }
           }
         }
+        return [
+          tablesChanges,
+          valuesHash == otherValuesHash
+            ? stampNewObj()
+            : (yield request(
+                otherClientId,
+                7 /* GetValueDiff */,
+                store.getMergeableValueHashes(),
+              ))[0],
+          1,
+        ];
+      } catch (error) {
+        onIgnoredError == null ? void 0 : onIgnoredError(error);
       }
-      return [
-        tablesChanges,
-        valuesHash == otherValuesHash
-          ? stampNewObj()
-          : (yield request(
-              otherClientId,
-              7 /* GetValueDiff */,
-              store.getMergeableValueHashes(),
-            ))[0],
-        1,
-      ];
     });
   const getPersisted = () =>
     __async$1(void 0, null, function* () {
       const changes = yield getChangesFromOtherStore();
-      return !objIsEmpty(changes[0][0]) || !objIsEmpty(changes[1][0])
+      return changes &&
+        (!objIsEmpty(changes[0][0]) || !objIsEmpty(changes[1][0]))
         ? changes
         : void 0;
     });
@@ -771,9 +786,13 @@ const createCustomSynchronizer = (
               0,
       );
     } else if (message == 2 /* ContentHashes */ && persister.isAutoLoading()) {
-      getChangesFromOtherStore(fromClientId, body).then((changes) => {
-        persisterListener == null ? void 0 : persisterListener(void 0, changes);
-      });
+      getChangesFromOtherStore(fromClientId, body)
+        .then((changes) => {
+          persisterListener == null
+            ? void 0
+            : persisterListener(void 0, changes);
+        })
+        .catch(onIgnoredError);
     } else if (message == 3 /* ContentDiff */ && persister.isAutoLoading()) {
       persisterListener == null ? void 0 : persisterListener(void 0, body);
     } else {
@@ -823,7 +842,11 @@ var __async = (__this, __arguments, generator) => {
 };
 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();
@@ -858,6 +881,9 @@ const createWsServer = (webSocketServer, createPersisterForPath) => {
                 receivePayload(payload, receive)),
             () => {},
             1,
+            void 0,
+            void 0,
+            onIgnoredError,
           );
           serverClient[4 /* Buffer */] = [];
           serverClient[5 /* Then */] = isArray(persisterMaybeThen)
@@ -949,10 +975,16 @@ 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));