tinybase 6.1.0-beta.3 → 6.1.0-beta.5

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

@@ -20,10 +20,19 @@ const isArray = (thing) => Array.isArray(thing);
 const slice = (arrayOrString, start, end) => arrayOrString.slice(start, end);
 const size = (arrayOrString) => arrayOrString.length;
 const test = (regex, subject) => regex.test(subject);
+const noop = () => {};
 const promiseNew = (resolver) => new promise(resolver);
 const errorNew = (message) => {
   throw new Error(message);
 };
+const tryCatch = async (action, then1, then2) => {
+  try {
+    return await action();
+  } catch (error) {
+    /* istanbul ignore next */
+    then1?.(error);
+  }
+};
 
 const arrayForEach = (array, cb) => array.forEach(cb);
 const arrayMap = (array, cb) => array.map(cb);
@@ -313,9 +322,7 @@ const createCustomPersister = (
       while (
         !isUndefined((action = arrayShift(mapGet(scheduleActions, scheduleId))))
       ) {
-        try {
-          await action();
-        } catch (error) {}
+        await tryCatch(action, onIgnoredError);
       }
       mapSet(scheduleRunning, scheduleId, 0);
     }
@@ -335,20 +342,23 @@ const createCustomPersister = (
       setStatus(1 /* Loading */);
       loads++;
       await schedule(async () => {
-        try {
-          const content = await getPersisted();
-          if (isArray(content)) {
-            setContentOrChanges(content);
-          } else if (initialContent) {
-            setDefaultContent(initialContent);
-          } else {
-            errorNew(`Content is not an array: ${content}`);
-          }
-        } catch (error) {
-          if (initialContent) {
-            setDefaultContent(initialContent);
-          }
-        }
+        await tryCatch(
+          async () => {
+            const content = await getPersisted();
+            if (isArray(content)) {
+              setContentOrChanges(content);
+            } else if (initialContent) {
+              setDefaultContent(initialContent);
+            } else {
+              errorNew(`Content is not an array: ${content}`);
+            }
+          },
+          () => {
+            if (initialContent) {
+              setDefaultContent(initialContent);
+            }
+          },
+        );
         setStatus(0 /* Idle */);
       });
     }
@@ -357,26 +367,33 @@ const createCustomPersister = (
   const startAutoLoad = async (initialContent) => {
     stopAutoLoad();
     await load(initialContent);
-    try {
-      autoLoadHandle = await addPersisterListener(async (content, changes) => {
-        if (changes || content) {
-          /* istanbul ignore else */
-          if (status != 2 /* Saving */) {
-            setStatus(1 /* Loading */);
-            loads++;
-            setContentOrChanges(changes ?? content);
-            setStatus(0 /* Idle */);
-          }
-        } else {
-          await load();
-        }
-      });
-    } catch (error) {}
+    await tryCatch(
+      async () =>
+        (autoLoadHandle = await addPersisterListener(
+          async (content, changes) => {
+            if (changes || content) {
+              /* istanbul ignore else */
+              if (status != 2 /* Saving */) {
+                setStatus(1 /* Loading */);
+                loads++;
+                setContentOrChanges(changes ?? content);
+                setStatus(0 /* Idle */);
+              }
+            } else {
+              await load();
+            }
+          },
+        )),
+      onIgnoredError,
+    );
     return persister;
   };
-  const stopAutoLoad = () => {
+  const stopAutoLoad = async () => {
     if (autoLoadHandle) {
-      delPersisterListener(autoLoadHandle);
+      await tryCatch(
+        () => delPersisterListener(autoLoadHandle),
+        onIgnoredError,
+      );
       autoLoadHandle = void 0;
     }
     return persister;
@@ -388,9 +405,7 @@ const createCustomPersister = (
       setStatus(2 /* Saving */);
       saves++;
       await schedule(async () => {
-        try {
-          await setPersisted(getContent, changes);
-        } catch (error) {}
+        await tryCatch(() => setPersisted(getContent, changes), onIgnoredError);
         setStatus(0 /* Idle */);
       });
     }
@@ -407,7 +422,7 @@ const createCustomPersister = (
     });
     return persister;
   };
-  const stopAutoSave = () => {
+  const stopAutoSave = async () => {
     if (autoSaveListenerId) {
       store.delListener(autoSaveListenerId);
       autoSaveListenerId = void 0;
@@ -428,9 +443,10 @@ const createCustomPersister = (
     return persister;
   };
   const getStore = () => store;
-  const destroy = () => {
+  const destroy = async () => {
     arrayClear(mapGet(scheduleActions, scheduleId));
-    return stopAutoLoad().stopAutoSave();
+    await persister.stopAutoLoad();
+    return await persister.stopAutoSave();
   };
   const getStats = () => ({loads, saves});
   const persister = {
@@ -458,7 +474,7 @@ const createCustomSynchronizer = (
   store,
   send,
   registerReceive,
-  destroyImpl,
+  extraDestroy,
   requestTimeoutSeconds,
   onSend,
   onReceive,
@@ -511,12 +527,12 @@ const createCustomSynchronizer = (
     });
     tablesStamp[1] = getLatestTime(tablesStamp[1], tablesTime2);
   };
-  const getChangesFromOtherStore = async (
+  const getChangesFromOtherStore = (
     otherClientId = null,
     otherContentHashes,
     transactionId = getTransactionId(),
-  ) => {
-    try {
+  ) =>
+    tryCatch(async () => {
       if (isUndefined(otherContentHashes)) {
         [otherContentHashes, otherClientId, transactionId] = await request(
           null,
@@ -575,8 +591,7 @@ const createCustomSynchronizer = (
             )[0],
         1,
       ];
-    } catch (error) {}
-  };
+    }, onIgnoredError);
   const getPersisted = async () => {
     const changes = await getChangesFromOtherStore();
     return changes && (!objIsEmpty(changes[0][0]) || !objIsEmpty(changes[1][0]))
@@ -600,12 +615,15 @@ const createCustomSynchronizer = (
       await persister.startAutoLoad(initialContent)
     ).startAutoSave();
   };
-  const stopSync = () => {
+  const stopSync = async () => {
     syncing = 0;
-    return persister.stopAutoLoad().stopAutoSave();
+    await persister.stopAutoLoad();
+    await persister.stopAutoSave();
+    return persister;
   };
-  const destroy = () => {
-    return persister.stopSync();
+  const destroy = async () => {
+    await persister.stopSync();
+    return persister;
   };
   const getSynchronizerStats = () => ({sends, receives});
   const persister = createCustomPersister(
@@ -704,7 +722,7 @@ class WsServerDurableObject extends DurableObject {
               (receive) =>
                 (this.#serverClientSend = (payload) =>
                   receivePayload(payload, receive)),
-              () => {},
+              noop,
               1,
             );
             await persister.load();

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

@@ -20,10 +20,19 @@ const isArray = (thing) => Array.isArray(thing);
 const slice = (arrayOrString, start, end) => arrayOrString.slice(start, end);
 const size = (arrayOrString) => arrayOrString.length;
 const test = (regex, subject) => regex.test(subject);
+const noop = () => {};
 const promiseNew = (resolver) => new promise(resolver);
 const errorNew = (message) => {
   throw new Error(message);
 };
+const tryCatch = async (action, then1, then2) => {
+  try {
+    return await action();
+  } catch (error) {
+    /* istanbul ignore next */
+    then1?.(error);
+  }
+};
 
 const arrayForEach = (array, cb) => array.forEach(cb);
 const arrayMap = (array, cb) => array.map(cb);
@@ -313,9 +322,7 @@ const createCustomPersister = (
       while (
         !isUndefined((action = arrayShift(mapGet(scheduleActions, scheduleId))))
       ) {
-        try {
-          await action();
-        } catch (error) {}
+        await tryCatch(action, onIgnoredError);
       }
       mapSet(scheduleRunning, scheduleId, 0);
     }
@@ -335,20 +342,23 @@ const createCustomPersister = (
       setStatus(1 /* Loading */);
       loads++;
       await schedule(async () => {
-        try {
-          const content = await getPersisted();
-          if (isArray(content)) {
-            setContentOrChanges(content);
-          } else if (initialContent) {
-            setDefaultContent(initialContent);
-          } else {
-            errorNew(`Content is not an array: ${content}`);
-          }
-        } catch (error) {
-          if (initialContent) {
-            setDefaultContent(initialContent);
-          }
-        }
+        await tryCatch(
+          async () => {
+            const content = await getPersisted();
+            if (isArray(content)) {
+              setContentOrChanges(content);
+            } else if (initialContent) {
+              setDefaultContent(initialContent);
+            } else {
+              errorNew(`Content is not an array: ${content}`);
+            }
+          },
+          () => {
+            if (initialContent) {
+              setDefaultContent(initialContent);
+            }
+          },
+        );
         setStatus(0 /* Idle */);
       });
     }
@@ -357,26 +367,33 @@ const createCustomPersister = (
   const startAutoLoad = async (initialContent) => {
     stopAutoLoad();
     await load(initialContent);
-    try {
-      autoLoadHandle = await addPersisterListener(async (content, changes) => {
-        if (changes || content) {
-          /* istanbul ignore else */
-          if (status != 2 /* Saving */) {
-            setStatus(1 /* Loading */);
-            loads++;
-            setContentOrChanges(changes ?? content);
-            setStatus(0 /* Idle */);
-          }
-        } else {
-          await load();
-        }
-      });
-    } catch (error) {}
+    await tryCatch(
+      async () =>
+        (autoLoadHandle = await addPersisterListener(
+          async (content, changes) => {
+            if (changes || content) {
+              /* istanbul ignore else */
+              if (status != 2 /* Saving */) {
+                setStatus(1 /* Loading */);
+                loads++;
+                setContentOrChanges(changes ?? content);
+                setStatus(0 /* Idle */);
+              }
+            } else {
+              await load();
+            }
+          },
+        )),
+      onIgnoredError,
+    );
     return persister;
   };
-  const stopAutoLoad = () => {
+  const stopAutoLoad = async () => {
     if (autoLoadHandle) {
-      delPersisterListener(autoLoadHandle);
+      await tryCatch(
+        () => delPersisterListener(autoLoadHandle),
+        onIgnoredError,
+      );
       autoLoadHandle = void 0;
     }
     return persister;
@@ -388,9 +405,7 @@ const createCustomPersister = (
       setStatus(2 /* Saving */);
       saves++;
       await schedule(async () => {
-        try {
-          await setPersisted(getContent, changes);
-        } catch (error) {}
+        await tryCatch(() => setPersisted(getContent, changes), onIgnoredError);
         setStatus(0 /* Idle */);
       });
     }
@@ -407,7 +422,7 @@ const createCustomPersister = (
     });
     return persister;
   };
-  const stopAutoSave = () => {
+  const stopAutoSave = async () => {
     if (autoSaveListenerId) {
       store.delListener(autoSaveListenerId);
       autoSaveListenerId = void 0;
@@ -428,9 +443,10 @@ const createCustomPersister = (
     return persister;
   };
   const getStore = () => store;
-  const destroy = () => {
+  const destroy = async () => {
     arrayClear(mapGet(scheduleActions, scheduleId));
-    return stopAutoLoad().stopAutoSave();
+    await persister.stopAutoLoad();
+    return await persister.stopAutoSave();
   };
   const getStats = () => ({loads, saves});
   const persister = {
@@ -458,7 +474,7 @@ const createCustomSynchronizer = (
   store,
   send,
   registerReceive,
-  destroyImpl,
+  extraDestroy,
   requestTimeoutSeconds,
   onSend,
   onReceive,
@@ -511,12 +527,12 @@ const createCustomSynchronizer = (
     });
     tablesStamp[1] = getLatestTime(tablesStamp[1], tablesTime2);
   };
-  const getChangesFromOtherStore = async (
+  const getChangesFromOtherStore = (
     otherClientId = null,
     otherContentHashes,
     transactionId = getTransactionId(),
-  ) => {
-    try {
+  ) =>
+    tryCatch(async () => {
       if (isUndefined(otherContentHashes)) {
         [otherContentHashes, otherClientId, transactionId] = await request(
           null,
@@ -575,8 +591,7 @@ const createCustomSynchronizer = (
             )[0],
         1,
       ];
-    } catch (error) {}
-  };
+    }, onIgnoredError);
   const getPersisted = async () => {
     const changes = await getChangesFromOtherStore();
     return changes && (!objIsEmpty(changes[0][0]) || !objIsEmpty(changes[1][0]))
@@ -600,12 +615,15 @@ const createCustomSynchronizer = (
       await persister.startAutoLoad(initialContent)
     ).startAutoSave();
   };
-  const stopSync = () => {
+  const stopSync = async () => {
     syncing = 0;
-    return persister.stopAutoLoad().stopAutoSave();
+    await persister.stopAutoLoad();
+    await persister.stopAutoSave();
+    return persister;
   };
-  const destroy = () => {
-    return persister.stopSync();
+  const destroy = async () => {
+    await persister.stopSync();
+    return persister;
   };
   const getSynchronizerStats = () => ({sends, receives});
   const persister = createCustomPersister(
@@ -704,7 +722,7 @@ class WsServerDurableObject extends DurableObject {
               (receive) =>
                 (this.#serverClientSend = (payload) =>
                   receivePayload(payload, receive)),
-              () => {},
+              noop,
               1,
             );
             await persister.load();

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

@@ -73,7 +73,7 @@ const createWsServerSimple = (webSocketServer) => {
     ),
   );
   const getWebSocketServer = () => webSocketServer;
-  const destroy = () => {
+  const destroy = async () => {
     collClear(clientsByPath);
     webSocketServer.close();
   };

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

@@ -73,7 +73,7 @@ const createWsServerSimple = (webSocketServer) => {
     ),
   );
   const getWebSocketServer = () => webSocketServer;
-  const destroy = () => {
+  const destroy = async () => {
     collClear(clientsByPath);
     webSocketServer.close();
   };

package/synchronizers/with-schemas/index.js

@@ -19,6 +19,14 @@ const promiseNew = (resolver) => new promise(resolver);
 const errorNew = (message) => {
   throw new Error(message);
 };
+const tryCatch = async (action, then1, then2) => {
+  try {
+    return await action();
+  } catch (error) {
+    /* istanbul ignore next */
+    then1?.(error);
+  }
+};
 
 const arrayForEach = (array, cb) => array.forEach(cb);
 const arrayMap = (array, cb) => array.map(cb);
@@ -283,12 +291,7 @@ const createCustomPersister = (
       while (
         !isUndefined((action = arrayShift(mapGet(scheduleActions, scheduleId))))
       ) {
-        try {
-          await action();
-        } catch (error) {
-          /* istanbul ignore next */
-          onIgnoredError?.(error);
-        }
+        await tryCatch(action, onIgnoredError);
       }
       mapSet(scheduleRunning, scheduleId, 0);
     }
@@ -308,21 +311,23 @@ const createCustomPersister = (
       setStatus(1 /* Loading */);
       loads++;
       await schedule(async () => {
-        try {
-          const content = await getPersisted();
-          if (isArray(content)) {
-            setContentOrChanges(content);
-          } else if (initialContent) {
-            setDefaultContent(initialContent);
-          } else {
-            errorNew(`Content is not an array: ${content}`);
-          }
-        } catch (error) {
-          onIgnoredError?.(error);
-          if (initialContent) {
-            setDefaultContent(initialContent);
-          }
-        }
+        await tryCatch(
+          async () => {
+            const content = await getPersisted();
+            if (isArray(content)) {
+              setContentOrChanges(content);
+            } else if (initialContent) {
+              setDefaultContent(initialContent);
+            } else {
+              errorNew(`Content is not an array: ${content}`);
+            }
+          },
+          () => {
+            if (initialContent) {
+              setDefaultContent(initialContent);
+            }
+          },
+        );
         setStatus(0 /* Idle */);
       });
     }
@@ -331,29 +336,33 @@ const createCustomPersister = (
   const startAutoLoad = async (initialContent) => {
     stopAutoLoad();
     await load(initialContent);
-    try {
-      autoLoadHandle = await addPersisterListener(async (content, changes) => {
-        if (changes || content) {
-          /* istanbul ignore else */
-          if (status != 2 /* Saving */) {
-            setStatus(1 /* Loading */);
-            loads++;
-            setContentOrChanges(changes ?? content);
-            setStatus(0 /* Idle */);
-          }
-        } else {
-          await load();
-        }
-      });
-    } catch (error) {
-      /* istanbul ignore next */
-      onIgnoredError?.(error);
-    }
+    await tryCatch(
+      async () =>
+        (autoLoadHandle = await addPersisterListener(
+          async (content, changes) => {
+            if (changes || content) {
+              /* istanbul ignore else */
+              if (status != 2 /* Saving */) {
+                setStatus(1 /* Loading */);
+                loads++;
+                setContentOrChanges(changes ?? content);
+                setStatus(0 /* Idle */);
+              }
+            } else {
+              await load();
+            }
+          },
+        )),
+      onIgnoredError,
+    );
     return persister;
   };
-  const stopAutoLoad = () => {
+  const stopAutoLoad = async () => {
     if (autoLoadHandle) {
-      delPersisterListener(autoLoadHandle);
+      await tryCatch(
+        () => delPersisterListener(autoLoadHandle),
+        onIgnoredError,
+      );
       autoLoadHandle = void 0;
     }
     return persister;
@@ -365,12 +374,7 @@ const createCustomPersister = (
       setStatus(2 /* Saving */);
       saves++;
       await schedule(async () => {
-        try {
-          await setPersisted(getContent, changes);
-        } catch (error) {
-          /* istanbul ignore next */
-          onIgnoredError?.(error);
-        }
+        await tryCatch(() => setPersisted(getContent, changes), onIgnoredError);
         setStatus(0 /* Idle */);
       });
     }
@@ -387,7 +391,7 @@ const createCustomPersister = (
     });
     return persister;
   };
-  const stopAutoSave = () => {
+  const stopAutoSave = async () => {
     if (autoSaveListenerId) {
       store.delListener(autoSaveListenerId);
       autoSaveListenerId = void 0;
@@ -408,9 +412,10 @@ const createCustomPersister = (
     return persister;
   };
   const getStore = () => store;
-  const destroy = () => {
+  const destroy = async () => {
     arrayClear(mapGet(scheduleActions, scheduleId));
-    return stopAutoLoad().stopAutoSave();
+    await persister.stopAutoLoad();
+    return await persister.stopAutoSave();
   };
   const getStats = () => ({loads, saves});
   const persister = {
@@ -448,7 +453,7 @@ const createCustomSynchronizer = (
   store,
   send,
   registerReceive,
-  destroyImpl,
+  extraDestroy,
   requestTimeoutSeconds,
   onSend,
   onReceive,
@@ -502,12 +507,12 @@ const createCustomSynchronizer = (
     });
     tablesStamp[1] = getLatestTime(tablesStamp[1], tablesTime2);
   };
-  const getChangesFromOtherStore = async (
+  const getChangesFromOtherStore = (
     otherClientId = null,
     otherContentHashes,
     transactionId = getTransactionId(),
-  ) => {
-    try {
+  ) =>
+    tryCatch(async () => {
       if (isUndefined(otherContentHashes)) {
         [otherContentHashes, otherClientId, transactionId] = await request(
           null,
@@ -566,10 +571,7 @@ const createCustomSynchronizer = (
             )[0],
         1,
       ];
-    } catch (error) {
-      onIgnoredError?.(error);
-    }
-  };
+    }, onIgnoredError);
   const getPersisted = async () => {
     const changes = await getChangesFromOtherStore();
     return changes && (!objIsEmpty(changes[0][0]) || !objIsEmpty(changes[1][0]))
@@ -593,13 +595,16 @@ const createCustomSynchronizer = (
       await persister.startAutoLoad(initialContent)
     ).startAutoSave();
   };
-  const stopSync = () => {
+  const stopSync = async () => {
     syncing = 0;
-    return persister.stopAutoLoad().stopAutoSave();
+    await persister.stopAutoLoad();
+    await persister.stopAutoSave();
+    return persister;
   };
-  const destroy = () => {
-    destroyImpl();
-    return persister.stopSync();
+  const destroy = async () => {
+    await persister.stopSync();
+    extraDestroy();
+    return persister;
   };
   const getSynchronizerStats = () => ({sends, receives});
   const persister = createCustomPersister(