tinybase 5.3.6 → 5.3.8

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

@@ -433,7 +433,7 @@
                 } 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);
@@ -688,55 +688,60 @@
       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;
       });
@@ -797,11 +802,13 @@
         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/umd/es6/synchronizers/synchronizer-ws-client/with-schemas/index.js

@@ -433,7 +433,7 @@
                 } 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);
@@ -688,55 +688,60 @@
       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;
       });
@@ -797,11 +802,13 @@
         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/umd/es6/synchronizers/synchronizer-ws-server/index.js

@@ -421,7 +421,10 @@
           ) {
             try {
               yield action();
-            } catch (error) {}
+            } catch (error) {
+              /* istanbul ignore next */
+              onIgnoredError == null ? void 0 : onIgnoredError(error);
+            }
           }
           mapSet(scheduleRunning, scheduleId, 0);
         }
@@ -451,9 +454,10 @@
                 } 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);
                 }
@@ -483,7 +487,10 @@
               }
             }),
           );
-        } catch (error) {}
+        } catch (error) {
+          /* istanbul ignore next */
+          onIgnoredError == null ? void 0 : onIgnoredError(error);
+        }
         return persister;
       });
     const stopAutoLoad = () => {
@@ -504,7 +511,10 @@
             __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 */);
             }),
           );
@@ -698,55 +708,60 @@
       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;
       });
@@ -803,11 +818,13 @@
         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 {
@@ -857,7 +874,11 @@
   };
   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();
@@ -892,6 +913,9 @@
                   receivePayload(payload, receive)),
               () => {},
               1,
+              void 0,
+              void 0,
+              onIgnoredError,
             );
             serverClient[4 /* Buffer */] = [];
             serverClient[5 /* Then */] = isArray(persisterMaybeThen)
@@ -983,10 +1007,16 @@
                 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/umd/es6/synchronizers/synchronizer-ws-server/with-schemas/index.js

@@ -421,7 +421,10 @@
           ) {
             try {
               yield action();
-            } catch (error) {}
+            } catch (error) {
+              /* istanbul ignore next */
+              onIgnoredError == null ? void 0 : onIgnoredError(error);
+            }
           }
           mapSet(scheduleRunning, scheduleId, 0);
         }
@@ -451,9 +454,10 @@
                 } 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);
                 }
@@ -483,7 +487,10 @@
               }
             }),
           );
-        } catch (error) {}
+        } catch (error) {
+          /* istanbul ignore next */
+          onIgnoredError == null ? void 0 : onIgnoredError(error);
+        }
         return persister;
       });
     const stopAutoLoad = () => {
@@ -504,7 +511,10 @@
             __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 */);
             }),
           );
@@ -698,55 +708,60 @@
       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;
       });
@@ -803,11 +818,13 @@
         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 {
@@ -857,7 +874,11 @@
   };
   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();
@@ -892,6 +913,9 @@
                   receivePayload(payload, receive)),
               () => {},
               1,
+              void 0,
+              void 0,
+              onIgnoredError,
             );
             serverClient[4 /* Buffer */] = [];
             serverClient[5 /* Then */] = isArray(persisterMaybeThen)
@@ -983,10 +1007,16 @@
                 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));