tinybase 5.0.0-beta.10 → 5.0.0-beta.11

package/lib/debug/synchronizers/synchronizer-local.js

@@ -79,24 +79,27 @@ const stampNewObj = (time = EMPTY_STRING) => newStamp(objNew(), time);
 
 const scheduleRunning = mapNew();
 const scheduleActions = mapNew();
-const getStoreFunctions = (supportsMergeableStore, store) =>
-  !supportsMergeableStore || isUndefined(store.getMergeableContent)
+const getStoreFunctions = (supportedStoreType = 1, store) =>
+  supportedStoreType > 1 && 'getMergeableContent' in store
     ? [
-        0,
-        store.getContent,
-        store.getTransactionChanges,
-        ([changedTables, changedValues]) =>
-          !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
-        store.setContent,
-      ]
-    : [
         1,
         store.getMergeableContent,
         store.getTransactionMergeableChanges,
         ([[changedTables], [changedValues]]) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
-      ];
+      ]
+    : supportedStoreType != 2
+      ? [
+          0,
+          store.getContent,
+          store.getTransactionChanges,
+          ([changedTables, changedValues]) =>
+            !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
+          store.setContent,
+        ]
+      : /* istanbul ignore next */
+        0;
 const createCustomPersister = (
   store,
   getPersisted,
@@ -104,7 +107,7 @@ const createCustomPersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
-  supportsMergeableStore,
+  supportedStoreType,
   extra = {},
   scheduleId = [],
 ) => {
@@ -122,7 +125,7 @@ const createCustomPersister = (
     getChanges,
     hasChanges,
     setDefaultContent,
-  ] = getStoreFunctions(supportsMergeableStore, store);
+  ] = getStoreFunctions(supportedStoreType, store);
   const run = async () => {
     /* istanbul ignore else */
     if (!mapGet(scheduleRunning, scheduleId)) {
@@ -140,20 +143,6 @@ const createCustomPersister = (
       mapSet(scheduleRunning, scheduleId, 0);
     }
   };
-  const loadLock = async (actions) => {
-    /* istanbul ignore else */
-    if (loadSave != 2) {
-      loadSave = 1;
-      {
-        loads++;
-      }
-      await persister.schedule(async () => {
-        await actions();
-        loadSave = 0;
-      });
-    }
-    return persister;
-  };
   const setContentOrChanges = (contentOrChanges) => {
     (isMergeableStore && isArray(contentOrChanges?.[0])
       ? contentOrChanges?.[2] === 1
@@ -163,9 +152,14 @@ const createCustomPersister = (
         ? store.applyChanges
         : store.setContent)(contentOrChanges);
   };
-  const persister = {
-    load: async (initialContent) =>
-      await loadLock(async () => {
+  const load = async (initialContent) => {
+    /* istanbul ignore else */
+    if (loadSave != 2) {
+      loadSave = 1;
+      {
+        loads++;
+      }
+      await schedule(async () => {
         try {
           setContentOrChanges(await getPersisted());
         } catch (error) {
@@ -174,76 +168,94 @@ const createCustomPersister = (
             setDefaultContent(initialContent);
           }
         }
-      }),
-    startAutoLoad: async (initialContent) => {
-      await persister.stopAutoLoad().load(initialContent);
-      autoLoadHandle = addPersisterListener(
-        async (getContent2, getChanges2) => {
-          const changes = getChanges2?.();
-          await loadLock(async () => {
-            try {
-              setContentOrChanges(
-                changes ?? getContent2?.() ?? (await getPersisted()),
-              );
-            } catch (error) {
-              onIgnoredError?.(error);
-            }
-          });
-        },
-      );
-      return persister;
-    },
-    stopAutoLoad: () => {
-      if (autoLoadHandle) {
-        delPersisterListener(autoLoadHandle);
-        autoLoadHandle = void 0;
-      }
-      return persister;
-    },
-    isAutoLoading: () => !isUndefined(autoLoadHandle),
-    save: async (getChanges2) => {
-      /* istanbul ignore else */
-      if (loadSave != 1) {
-        loadSave = 2;
-        {
-          saves++;
-        }
-        await persister.schedule(async () => {
-          try {
-            await setPersisted(getContent, getChanges2);
-          } catch (error) {
-            /* istanbul ignore next */
-            onIgnoredError?.(error);
+        loadSave = 0;
+      });
+    }
+    return persister;
+  };
+  const startAutoLoad = async (initialContent) => {
+    await stopAutoLoad().load(initialContent);
+    autoLoadHandle = addPersisterListener(async (content, changes) => {
+      if (changes || content) {
+        /* istanbul ignore else */
+        if (loadSave != 2) {
+          loadSave = 1;
+          {
+            loads++;
           }
+          setContentOrChanges(changes ?? content);
           loadSave = 0;
-        });
+        }
+      } else {
+        await load();
       }
-      return persister;
-    },
-    startAutoSave: async () => {
-      await persister.stopAutoSave().save();
-      autoSaveListenerId = store.addDidFinishTransactionListener(() => {
-        const changes = getChanges();
-        if (hasChanges(changes)) {
-          persister.save(() => changes);
+    });
+    return persister;
+  };
+  const stopAutoLoad = () => {
+    if (autoLoadHandle) {
+      delPersisterListener(autoLoadHandle);
+      autoLoadHandle = void 0;
+    }
+    return persister;
+  };
+  const isAutoLoading = () => !isUndefined(autoLoadHandle);
+  const save = async (changes) => {
+    /* istanbul ignore else */
+    if (loadSave != 1) {
+      loadSave = 2;
+      {
+        saves++;
+      }
+      await schedule(async () => {
+        try {
+          await setPersisted(getContent, changes);
+        } catch (error) {
+          /* istanbul ignore next */
+          onIgnoredError?.(error);
         }
+        loadSave = 0;
       });
-      return persister;
-    },
-    stopAutoSave: () => {
-      ifNotUndefined(autoSaveListenerId, store.delListener);
-      autoSaveListenerId = void 0;
-      return persister;
-    },
-    isAutoSaving: () => !isUndefined(autoSaveListenerId),
-    schedule: async (...actions) => {
-      arrayPush(mapGet(scheduleActions, scheduleId), ...actions);
-      await run();
-      return persister;
-    },
-    getStore: () => store,
-    destroy: () => persister.stopAutoLoad().stopAutoSave(),
-    getStats: () => ({loads, saves}),
+    }
+    return persister;
+  };
+  const startAutoSave = async () => {
+    await stopAutoSave().save();
+    autoSaveListenerId = store.addDidFinishTransactionListener(() => {
+      const changes = getChanges();
+      if (hasChanges(changes)) {
+        save(changes);
+      }
+    });
+    return persister;
+  };
+  const stopAutoSave = () => {
+    ifNotUndefined(autoSaveListenerId, store.delListener);
+    autoSaveListenerId = void 0;
+    return persister;
+  };
+  const isAutoSaving = () => !isUndefined(autoSaveListenerId);
+  const schedule = async (...actions) => {
+    arrayPush(mapGet(scheduleActions, scheduleId), ...actions);
+    await run();
+    return persister;
+  };
+  const getStore = () => store;
+  const destroy = () => stopAutoLoad().stopAutoSave();
+  const getStats = () => ({loads, saves});
+  const persister = {
+    load,
+    startAutoLoad,
+    stopAutoLoad,
+    isAutoLoading,
+    save,
+    startAutoSave,
+    stopAutoSave,
+    isAutoSaving,
+    schedule,
+    getStore,
+    destroy,
+    getStats,
     ...extra,
   };
   return objFreeze(persister);
@@ -359,10 +371,10 @@ const createCustomSynchronizer = (
       );
     } else if (messageType == CONTENT_HASHES && persister.isAutoLoading()) {
       getChangesFromOtherStore(fromClientId, messageBody).then((changes) => {
-        persisterListener?.(void 0, () => changes);
+        persisterListener?.(void 0, changes);
       });
     } else if (messageType == CONTENT_DIFF && persister.isAutoLoading()) {
-      persisterListener?.(void 0, () => messageBody);
+      persisterListener?.(void 0, messageBody);
     } else {
       ifNotUndefined(
         messageType == GET_CONTENT_HASHES && persister.isAutoSaving()
@@ -486,12 +498,12 @@ const createCustomSynchronizer = (
       ? changes
       : void 0;
   };
-  const setPersisted = async (getContent, getChanges) => {
+  const setPersisted = async (_getContent, changes) => {
     {
       sends++;
     }
-    if (getChanges) {
-      send(null, null, CONTENT_DIFF, getChanges());
+    if (changes) {
+      send(null, null, CONTENT_DIFF, changes);
     } else {
       send(null, null, CONTENT_HASHES, store.getMergeableContentHashes());
     }
@@ -513,7 +525,7 @@ const createCustomSynchronizer = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    true,
+    2,
     {startSync, stopSync, destroy, getSynchronizerStats, ...extra},
   );
   return persister;
@@ -551,7 +563,7 @@ const createLocalSynchronizer = (store, onIgnoredError) => {
     send,
     onReceive,
     destroy,
-    0.05,
+    0.01,
     onIgnoredError,
   );
 };

package/lib/debug/synchronizers/synchronizer-ws-client.js

@@ -90,24 +90,27 @@ const stampNewObj = (time = EMPTY_STRING) => newStamp(objNew(), time);
 
 const scheduleRunning = mapNew();
 const scheduleActions = mapNew();
-const getStoreFunctions = (supportsMergeableStore, store) =>
-  !supportsMergeableStore || isUndefined(store.getMergeableContent)
+const getStoreFunctions = (supportedStoreType = 1, store) =>
+  supportedStoreType > 1 && 'getMergeableContent' in store
     ? [
-        0,
-        store.getContent,
-        store.getTransactionChanges,
-        ([changedTables, changedValues]) =>
-          !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
-        store.setContent,
-      ]
-    : [
         1,
         store.getMergeableContent,
         store.getTransactionMergeableChanges,
         ([[changedTables], [changedValues]]) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
-      ];
+      ]
+    : supportedStoreType != 2
+      ? [
+          0,
+          store.getContent,
+          store.getTransactionChanges,
+          ([changedTables, changedValues]) =>
+            !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
+          store.setContent,
+        ]
+      : /* istanbul ignore next */
+        0;
 const createCustomPersister = (
   store,
   getPersisted,
@@ -115,7 +118,7 @@ const createCustomPersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
-  supportsMergeableStore,
+  supportedStoreType,
   extra = {},
   scheduleId = [],
 ) => {
@@ -133,7 +136,7 @@ const createCustomPersister = (
     getChanges,
     hasChanges,
     setDefaultContent,
-  ] = getStoreFunctions(supportsMergeableStore, store);
+  ] = getStoreFunctions(supportedStoreType, store);
   const run = async () => {
     /* istanbul ignore else */
     if (!mapGet(scheduleRunning, scheduleId)) {
@@ -151,20 +154,6 @@ const createCustomPersister = (
       mapSet(scheduleRunning, scheduleId, 0);
     }
   };
-  const loadLock = async (actions) => {
-    /* istanbul ignore else */
-    if (loadSave != 2) {
-      loadSave = 1;
-      {
-        loads++;
-      }
-      await persister.schedule(async () => {
-        await actions();
-        loadSave = 0;
-      });
-    }
-    return persister;
-  };
   const setContentOrChanges = (contentOrChanges) => {
     (isMergeableStore && isArray(contentOrChanges?.[0])
       ? contentOrChanges?.[2] === 1
@@ -174,9 +163,14 @@ const createCustomPersister = (
         ? store.applyChanges
         : store.setContent)(contentOrChanges);
   };
-  const persister = {
-    load: async (initialContent) =>
-      await loadLock(async () => {
+  const load = async (initialContent) => {
+    /* istanbul ignore else */
+    if (loadSave != 2) {
+      loadSave = 1;
+      {
+        loads++;
+      }
+      await schedule(async () => {
         try {
           setContentOrChanges(await getPersisted());
         } catch (error) {
@@ -185,76 +179,94 @@ const createCustomPersister = (
             setDefaultContent(initialContent);
           }
         }
-      }),
-    startAutoLoad: async (initialContent) => {
-      await persister.stopAutoLoad().load(initialContent);
-      autoLoadHandle = addPersisterListener(
-        async (getContent2, getChanges2) => {
-          const changes = getChanges2?.();
-          await loadLock(async () => {
-            try {
-              setContentOrChanges(
-                changes ?? getContent2?.() ?? (await getPersisted()),
-              );
-            } catch (error) {
-              onIgnoredError?.(error);
-            }
-          });
-        },
-      );
-      return persister;
-    },
-    stopAutoLoad: () => {
-      if (autoLoadHandle) {
-        delPersisterListener(autoLoadHandle);
-        autoLoadHandle = void 0;
-      }
-      return persister;
-    },
-    isAutoLoading: () => !isUndefined(autoLoadHandle),
-    save: async (getChanges2) => {
-      /* istanbul ignore else */
-      if (loadSave != 1) {
-        loadSave = 2;
-        {
-          saves++;
-        }
-        await persister.schedule(async () => {
-          try {
-            await setPersisted(getContent, getChanges2);
-          } catch (error) {
-            /* istanbul ignore next */
-            onIgnoredError?.(error);
+        loadSave = 0;
+      });
+    }
+    return persister;
+  };
+  const startAutoLoad = async (initialContent) => {
+    await stopAutoLoad().load(initialContent);
+    autoLoadHandle = addPersisterListener(async (content, changes) => {
+      if (changes || content) {
+        /* istanbul ignore else */
+        if (loadSave != 2) {
+          loadSave = 1;
+          {
+            loads++;
           }
+          setContentOrChanges(changes ?? content);
           loadSave = 0;
-        });
+        }
+      } else {
+        await load();
       }
-      return persister;
-    },
-    startAutoSave: async () => {
-      await persister.stopAutoSave().save();
-      autoSaveListenerId = store.addDidFinishTransactionListener(() => {
-        const changes = getChanges();
-        if (hasChanges(changes)) {
-          persister.save(() => changes);
+    });
+    return persister;
+  };
+  const stopAutoLoad = () => {
+    if (autoLoadHandle) {
+      delPersisterListener(autoLoadHandle);
+      autoLoadHandle = void 0;
+    }
+    return persister;
+  };
+  const isAutoLoading = () => !isUndefined(autoLoadHandle);
+  const save = async (changes) => {
+    /* istanbul ignore else */
+    if (loadSave != 1) {
+      loadSave = 2;
+      {
+        saves++;
+      }
+      await schedule(async () => {
+        try {
+          await setPersisted(getContent, changes);
+        } catch (error) {
+          /* istanbul ignore next */
+          onIgnoredError?.(error);
         }
+        loadSave = 0;
       });
-      return persister;
-    },
-    stopAutoSave: () => {
-      ifNotUndefined(autoSaveListenerId, store.delListener);
-      autoSaveListenerId = void 0;
-      return persister;
-    },
-    isAutoSaving: () => !isUndefined(autoSaveListenerId),
-    schedule: async (...actions) => {
-      arrayPush(mapGet(scheduleActions, scheduleId), ...actions);
-      await run();
-      return persister;
-    },
-    getStore: () => store,
-    destroy: () => persister.stopAutoLoad().stopAutoSave(),
-    getStats: () => ({loads, saves}),
+    }
+    return persister;
+  };
+  const startAutoSave = async () => {
+    await stopAutoSave().save();
+    autoSaveListenerId = store.addDidFinishTransactionListener(() => {
+      const changes = getChanges();
+      if (hasChanges(changes)) {
+        save(changes);
+      }
+    });
+    return persister;
+  };
+  const stopAutoSave = () => {
+    ifNotUndefined(autoSaveListenerId, store.delListener);
+    autoSaveListenerId = void 0;
+    return persister;
+  };
+  const isAutoSaving = () => !isUndefined(autoSaveListenerId);
+  const schedule = async (...actions) => {
+    arrayPush(mapGet(scheduleActions, scheduleId), ...actions);
+    await run();
+    return persister;
+  };
+  const getStore = () => store;
+  const destroy = () => stopAutoLoad().stopAutoSave();
+  const getStats = () => ({loads, saves});
+  const persister = {
+    load,
+    startAutoLoad,
+    stopAutoLoad,
+    isAutoLoading,
+    save,
+    startAutoSave,
+    stopAutoSave,
+    isAutoSaving,
+    schedule,
+    getStore,
+    destroy,
+    getStats,
     ...extra,
   };
   return objFreeze(persister);
@@ -370,10 +382,10 @@ const createCustomSynchronizer = (
       );
     } else if (messageType == CONTENT_HASHES && persister.isAutoLoading()) {
       getChangesFromOtherStore(fromClientId, messageBody).then((changes) => {
-        persisterListener?.(void 0, () => changes);
+        persisterListener?.(void 0, changes);
       });
     } else if (messageType == CONTENT_DIFF && persister.isAutoLoading()) {
-      persisterListener?.(void 0, () => messageBody);
+      persisterListener?.(void 0, messageBody);
     } else {
       ifNotUndefined(
         messageType == GET_CONTENT_HASHES && persister.isAutoSaving()
@@ -497,12 +509,12 @@ const createCustomSynchronizer = (
       ? changes
       : void 0;
   };
-  const setPersisted = async (getContent, getChanges) => {
+  const setPersisted = async (_getContent, changes) => {
     {
       sends++;
     }
-    if (getChanges) {
-      send(null, null, CONTENT_DIFF, getChanges());
+    if (changes) {
+      send(null, null, CONTENT_DIFF, changes);
     } else {
       send(null, null, CONTENT_HASHES, store.getMergeableContentHashes());
     }
@@ -524,7 +536,7 @@ const createCustomSynchronizer = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    true,
+    2,
     {startSync, stopSync, destroy, getSynchronizerStats, ...extra},
   );
   return persister;