tinybase 5.3.7 → 5.3.8

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

@@ -314,7 +314,10 @@
         ) {
           try {
             await action();
-          } catch (error) {}
+          } catch (error) {
+            /* istanbul ignore next */
+            onIgnoredError?.(error);
+          }
         }
         mapSet(scheduleRunning, scheduleId, 0);
       }
@@ -341,9 +344,10 @@
             } 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);
             }
@@ -371,7 +375,10 @@
             }
           },
         );
-      } catch (error) {}
+      } catch (error) {
+        /* istanbul ignore next */
+        onIgnoredError?.(error);
+      }
       return persister;
     };
     const stopAutoLoad = () => {
@@ -390,7 +397,10 @@
         await schedule(async () => {
           try {
             await setPersisted(getContent, changes);
-          } catch (error) {}
+          } catch (error) {
+            /* istanbul ignore next */
+            onIgnoredError?.(error);
+          }
           setStatus(0 /* Idle */);
         });
       }
@@ -527,62 +537,67 @@
       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;
     };
@@ -630,9 +645,11 @@
         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 {
@@ -659,7 +676,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();
@@ -691,6 +712,9 @@
                 receivePayload(payload, receive)),
             () => {},
             1,
+            void 0,
+            void 0,
+            onIgnoredError,
           );
           serverClient[4 /* Buffer */] = [];
           serverClient[5 /* Then */] = isArray(persisterMaybeThen)
@@ -773,10 +797,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/synchronizers/with-schemas/index.js

@@ -305,7 +305,7 @@
             } else if (initialContent) {
               setDefaultContent(initialContent);
             } else {
-              errorNew(`Content is not an array ${content}`);
+              errorNew(`Content is not an array: ${content}`);
             }
           } catch (error) {
             onIgnoredError?.(error);
@@ -509,62 +509,67 @@
       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;
     };
@@ -614,9 +619,11 @@
         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/umd/ui-react-inspector/index.js

@@ -1828,7 +1828,7 @@
             } else if (initialContent) {
               setDefaultContent(initialContent);
             } else {
-              errorNew(`Content is not an array ${content}`);
+              errorNew(`Content is not an array: ${content}`);
             }
           } catch (error) {
             if (initialContent) {

package/umd/ui-react-inspector/with-schemas/index.js

@@ -1828,7 +1828,7 @@
             } else if (initialContent) {
               setDefaultContent(initialContent);
             } else {
-              errorNew(`Content is not an array ${content}`);
+              errorNew(`Content is not an array: ${content}`);
             }
           } catch (error) {
             if (initialContent) {