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

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

@@ -21,10 +21,20 @@ 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 promiseAll = async (promises) => promise.all(promises);
 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);
@@ -78,6 +88,8 @@ const mapKeys = (map) => [...(map?.keys() ?? [])];
 const mapGet = (map, key) => map?.get(key);
 const mapForEach = (map, cb) =>
   collForEach(map, (value, key) => cb(key, value));
+const mapMap = (coll, cb) =>
+  arrayMap([...(coll?.entries() ?? [])], ([key, value]) => cb(value, key));
 const mapSet = (map, key, value) =>
   isUndefined(value) ? (collDel(map, key), map) : map?.set(key, value);
 const mapEnsure = (map, key, getDefaultValue, hadExistingValue) => {
@@ -320,12 +332,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);
     }
@@ -345,21 +352,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 */);
       });
     }
@@ -368,29 +377,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;
@@ -402,12 +415,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 */);
       });
     }
@@ -424,7 +432,7 @@ const createCustomPersister = (
     });
     return persister;
   };
-  const stopAutoSave = () => {
+  const stopAutoSave = async () => {
     if (autoSaveListenerId) {
       store.delListener(autoSaveListenerId);
       autoSaveListenerId = void 0;
@@ -445,9 +453,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 = {
@@ -475,7 +484,7 @@ const createCustomSynchronizer = (
   store,
   send,
   registerReceive,
-  destroyImpl,
+  extraDestroy,
   requestTimeoutSeconds,
   onSend,
   onReceive,
@@ -528,12 +537,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,
@@ -592,10 +601,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]))
@@ -619,12 +625,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(
@@ -725,7 +734,7 @@ const createWsServer = (
           (receive) =>
             (serverClient[3 /* Send */] = (payload) =>
               receivePayload(payload, receive)),
-          () => {},
+          noop,
           1,
           void 0,
           void 0,
@@ -747,9 +756,9 @@ const createWsServer = (
     serverClient[5 /* Then */](serverClient[1 /* Persister */].getStore());
     serverClient[0 /* State */] = 0 /* Ready */;
   };
-  const stopServerClient = (serverClient) => {
-    serverClient[1 /* Persister */]?.destroy();
-    serverClient[2 /* Synchronizer */]?.destroy();
+  const stopServerClient = async (serverClient) => {
+    await serverClient[1 /* Persister */]?.destroy();
+    await serverClient[2 /* Synchronizer */]?.destroy();
   };
   const getMessageHandler = (clientId, clients, serverClient) => (payload) =>
     ifPayloadValid(payload, (toClientId, remainder) => {
@@ -798,11 +807,11 @@ const createWsServer = (
           arrayForEach(serverClient[4 /* Buffer */], messageHandler);
           serverClient[4 /* Buffer */] = [];
         }
-        client.on('close', () => {
+        client.on('close', async () => {
           collDel(clients, clientId);
           callListeners(clientIdListeners, [pathId], clientId, -1);
           if (collIsEmpty(clients)) {
-            stopServerClient(serverClient);
+            await stopServerClient(serverClient);
             collDel(serverClientsByPath, pathId);
             collDel(clientsByPath, pathId);
             callListeners(pathIdListeners, void 0, pathId, -1);
@@ -832,9 +841,9 @@ const createWsServer = (
     paths: collSize(clientsByPath),
     clients: collSize2(clientsByPath),
   });
-  const destroy = () => {
+  const destroy = async () => {
     collClear(clientsByPath);
-    collForEach(serverClientsByPath, stopServerClient);
+    await promiseAll(mapMap(serverClientsByPath, stopServerClient));
     webSocketServer.close();
   };
   const wsServer = {

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

@@ -21,10 +21,20 @@ 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 promiseAll = async (promises) => promise.all(promises);
 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);
@@ -78,6 +88,8 @@ const mapKeys = (map) => [...(map?.keys() ?? [])];
 const mapGet = (map, key) => map?.get(key);
 const mapForEach = (map, cb) =>
   collForEach(map, (value, key) => cb(key, value));
+const mapMap = (coll, cb) =>
+  arrayMap([...(coll?.entries() ?? [])], ([key, value]) => cb(value, key));
 const mapSet = (map, key, value) =>
   isUndefined(value) ? (collDel(map, key), map) : map?.set(key, value);
 const mapEnsure = (map, key, getDefaultValue, hadExistingValue) => {
@@ -320,12 +332,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);
     }
@@ -345,21 +352,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 */);
       });
     }
@@ -368,29 +377,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;
@@ -402,12 +415,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 */);
       });
     }
@@ -424,7 +432,7 @@ const createCustomPersister = (
     });
     return persister;
   };
-  const stopAutoSave = () => {
+  const stopAutoSave = async () => {
     if (autoSaveListenerId) {
       store.delListener(autoSaveListenerId);
       autoSaveListenerId = void 0;
@@ -445,9 +453,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 = {
@@ -475,7 +484,7 @@ const createCustomSynchronizer = (
   store,
   send,
   registerReceive,
-  destroyImpl,
+  extraDestroy,
   requestTimeoutSeconds,
   onSend,
   onReceive,
@@ -528,12 +537,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,
@@ -592,10 +601,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]))
@@ -619,12 +625,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(
@@ -725,7 +734,7 @@ const createWsServer = (
           (receive) =>
             (serverClient[3 /* Send */] = (payload) =>
               receivePayload(payload, receive)),
-          () => {},
+          noop,
           1,
           void 0,
           void 0,
@@ -747,9 +756,9 @@ const createWsServer = (
     serverClient[5 /* Then */](serverClient[1 /* Persister */].getStore());
     serverClient[0 /* State */] = 0 /* Ready */;
   };
-  const stopServerClient = (serverClient) => {
-    serverClient[1 /* Persister */]?.destroy();
-    serverClient[2 /* Synchronizer */]?.destroy();
+  const stopServerClient = async (serverClient) => {
+    await serverClient[1 /* Persister */]?.destroy();
+    await serverClient[2 /* Synchronizer */]?.destroy();
   };
   const getMessageHandler = (clientId, clients, serverClient) => (payload) =>
     ifPayloadValid(payload, (toClientId, remainder) => {
@@ -798,11 +807,11 @@ const createWsServer = (
           arrayForEach(serverClient[4 /* Buffer */], messageHandler);
           serverClient[4 /* Buffer */] = [];
         }
-        client.on('close', () => {
+        client.on('close', async () => {
           collDel(clients, clientId);
           callListeners(clientIdListeners, [pathId], clientId, -1);
           if (collIsEmpty(clients)) {
-            stopServerClient(serverClient);
+            await stopServerClient(serverClient);
             collDel(serverClientsByPath, pathId);
             collDel(clientsByPath, pathId);
             callListeners(pathIdListeners, void 0, pathId, -1);
@@ -832,9 +841,9 @@ const createWsServer = (
     paths: collSize(clientsByPath),
     clients: collSize2(clientsByPath),
   });
-  const destroy = () => {
+  const destroy = async () => {
     collClear(clientsByPath);
-    collForEach(serverClientsByPath, stopServerClient);
+    await promiseAll(mapMap(serverClientsByPath, stopServerClient));
     webSocketServer.close();
   };
   const wsServer = {