tinybase 5.4.0-beta.1 → 5.4.0-beta.3

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

@@ -11,6 +11,7 @@
 
   const EMPTY_STRING = '';
   const UTF8 = 'utf8';
+  const MESSAGE = 'message';
   const strMatch = (str, regex) => str?.match(regex);
 
   const isUndefined = (thing) => thing == void 0;
@@ -48,35 +49,34 @@
       then(slice(payload, 0, splitAt), slice(payload, splitAt + 1));
     }
   };
-  const createRawPayload = (toClientId, remainder) =>
-    toClientId + MESSAGE_SEPARATOR + remainder;
+  const createRawPayload = (clientId, remainder) =>
+    clientId + MESSAGE_SEPARATOR + remainder;
 
   const PATH_REGEX = /\/([^?]*)/;
   const createWsServerSimple = (webSocketServer) => {
     const clientsByPath = mapNew();
-    webSocketServer.on('connection', (webSocket, request) =>
+    webSocketServer.on('connection', (client, request) =>
       ifNotUndefined(strMatch(request.url, PATH_REGEX), ([, pathId]) =>
         ifNotUndefined(
           request.headers['sec-websocket-key'],
           async (clientId) => {
             const clients = mapEnsure(clientsByPath, pathId, mapNew);
-            mapSet(clients, clientId, webSocket);
-            webSocket.on('message', (data) => {
-              const payload = data.toString(UTF8);
-              ifPayloadValid(payload, (toClientId, remainder) => {
+            mapSet(clients, clientId, client);
+            client.on(MESSAGE, (data) =>
+              ifPayloadValid(data.toString(UTF8), (toClientId, remainder) => {
                 const forwardedPayload = createRawPayload(clientId, remainder);
                 if (toClientId === EMPTY_STRING) {
-                  mapForEach(clients, (otherClientId, otherWebSocket) =>
+                  mapForEach(clients, (otherClientId, otherClient) =>
                     otherClientId !== clientId
-                      ? otherWebSocket.send(forwardedPayload)
+                      ? otherClient.send(forwardedPayload)
                       : 0,
                   );
                 } else {
                   mapGet(clients, toClientId)?.send(forwardedPayload);
                 }
-              });
-            });
-            webSocket.on('close', () => {
+              }),
+            );
+            client.on('close', () => {
               collDel(clients, clientId);
               if (collIsEmpty(clients)) {
                 collDel(clientsByPath, pathId);

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

@@ -11,6 +11,7 @@
 
   const EMPTY_STRING = '';
   const UTF8 = 'utf8';
+  const MESSAGE = 'message';
   const strMatch = (str, regex) => str?.match(regex);
 
   const isUndefined = (thing) => thing == void 0;
@@ -48,35 +49,34 @@
       then(slice(payload, 0, splitAt), slice(payload, splitAt + 1));
     }
   };
-  const createRawPayload = (toClientId, remainder) =>
-    toClientId + MESSAGE_SEPARATOR + remainder;
+  const createRawPayload = (clientId, remainder) =>
+    clientId + MESSAGE_SEPARATOR + remainder;
 
   const PATH_REGEX = /\/([^?]*)/;
   const createWsServerSimple = (webSocketServer) => {
     const clientsByPath = mapNew();
-    webSocketServer.on('connection', (webSocket, request) =>
+    webSocketServer.on('connection', (client, request) =>
       ifNotUndefined(strMatch(request.url, PATH_REGEX), ([, pathId]) =>
         ifNotUndefined(
           request.headers['sec-websocket-key'],
           async (clientId) => {
             const clients = mapEnsure(clientsByPath, pathId, mapNew);
-            mapSet(clients, clientId, webSocket);
-            webSocket.on('message', (data) => {
-              const payload = data.toString(UTF8);
-              ifPayloadValid(payload, (toClientId, remainder) => {
+            mapSet(clients, clientId, client);
+            client.on(MESSAGE, (data) =>
+              ifPayloadValid(data.toString(UTF8), (toClientId, remainder) => {
                 const forwardedPayload = createRawPayload(clientId, remainder);
                 if (toClientId === EMPTY_STRING) {
-                  mapForEach(clients, (otherClientId, otherWebSocket) =>
+                  mapForEach(clients, (otherClientId, otherClient) =>
                     otherClientId !== clientId
-                      ? otherWebSocket.send(forwardedPayload)
+                      ? otherClient.send(forwardedPayload)
                       : 0,
                   );
                 } else {
                   mapGet(clients, toClientId)?.send(forwardedPayload);
                 }
-              });
-            });
-            webSocket.on('close', () => {
+              }),
+            );
+            client.on('close', () => {
               collDel(clients, clientId);
               if (collIsEmpty(clients)) {
                 collDel(clientsByPath, pathId);

package/umd/synchronizers/with-schemas/index.js

@@ -15,6 +15,9 @@
 
   const promise = Promise;
   const GLOBAL = globalThis;
+  const THOUSAND = 1e3;
+  const startTimeout = (callback, sec = 0) =>
+    setTimeout(callback, sec * THOUSAND);
   const math = Math;
   const mathFloor = math.floor;
   const isUndefined = (thing) => thing == void 0;
@@ -104,11 +107,11 @@
       },
     );
 
-  const newStamp = (value, time) => (time ? [value, time] : [value]);
+  const stampNew = (value, time) => (time ? [value, time] : [value]);
   const getLatestTime = (time1, time2) =>
     /* istanbul ignore next */
     ((time1 ?? '') > (time2 ?? '') ? time1 : time2) ?? '';
-  const stampNewObj = (time = EMPTY_STRING) => newStamp(objNew(), time);
+  const stampNewObj = (time = EMPTY_STRING) => stampNew(objNew(), time);
 
   const setNew = (entryOrEntries) =>
     new Set(
@@ -208,12 +211,16 @@
 
   const scheduleRunning = mapNew();
   const scheduleActions = mapNew();
-  const getStoreFunctions = (persist = 1 /* StoreOnly */, store) =>
+  const getStoreFunctions = (
+    persist = 1 /* StoreOnly */,
+    store,
+    isSynchronizer,
+  ) =>
     persist != 1 /* StoreOnly */ && store.isMergeable()
       ? [
           1,
           store.getMergeableContent,
-          store.getTransactionMergeableChanges,
+          () => store.getTransactionMergeableChanges(!isSynchronizer),
           ([[changedTables], [changedValues]]) =>
             !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
           store.setDefaultContent,
@@ -237,6 +244,7 @@
     onIgnoredError,
     persist,
     extra = {},
+    isSynchronizer = 0,
     scheduleId = [],
   ) => {
     let status = 0; /* Idle */
@@ -254,7 +262,7 @@
       getChanges,
       hasChanges,
       setDefaultContent,
-    ] = getStoreFunctions(persist, store);
+    ] = getStoreFunctions(persist, store, isSynchronizer);
     const [addListener, callListeners, delListenerImpl] = getListenerFunctions(
       () => persister,
     );
@@ -305,7 +313,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);
@@ -319,7 +327,8 @@
       return persister;
     };
     const startAutoLoad = async (initialContent) => {
-      await stopAutoLoad().load(initialContent);
+      stopAutoLoad();
+      await load(initialContent);
       try {
         autoLoadHandle = await addPersisterListener(
           async (content, changes) => {
@@ -368,7 +377,8 @@
       return persister;
     };
     const startAutoSave = async () => {
-      await stopAutoSave().save();
+      stopAutoSave();
+      await save();
       autoSaveListenerId = store.addDidFinishTransactionListener(() => {
         const changes = getChanges();
         if (hasChanges(changes)) {
@@ -378,8 +388,10 @@
       return persister;
     };
     const stopAutoSave = () => {
-      ifNotUndefined(autoSaveListenerId, store.delListener);
-      autoSaveListenerId = void 0;
+      if (autoSaveListenerId) {
+        store.delListener(autoSaveListenerId);
+        autoSaveListenerId = void 0;
+      }
       return persister;
     };
     const isAutoSaving = () => !isUndefined(autoSaveListenerId);
@@ -460,31 +472,33 @@
     onIgnoredError,
     extra = {},
   ) => {
+    let syncing = 0;
     let persisterListener;
     let sends = 0;
     let receives = 0;
     const pendingRequests = mapNew();
+    const getTransactionId = () => getUniqueId(11);
     const sendImpl = (toClientId, requestId, message, body) => {
       sends++;
       onSend?.(toClientId, requestId, message, body);
       send(toClientId, requestId, message, body);
     };
-    const request = async (toClientId, message, body = EMPTY_STRING) =>
+    const request = async (toClientId, message, body, transactionId) =>
       promiseNew((resolve, reject) => {
-        const requestId = getUniqueId();
-        const timeout = setTimeout(() => {
+        const requestId = transactionId + '.' + getUniqueId(4);
+        const timeout = startTimeout(() => {
           collDel(pendingRequests, requestId);
           reject(
             `No response from ${toClientId ?? 'anyone'} to ${requestId}, ` +
               message,
           );
-        }, requestTimeoutSeconds * 1e3);
+        }, requestTimeoutSeconds);
         mapSet(pendingRequests, requestId, [
           toClientId,
           (response, fromClientId) => {
             clearTimeout(timeout);
             collDel(pendingRequests, requestId);
-            resolve([response, fromClientId]);
+            resolve([response, fromClientId, transactionId]);
           },
         ]);
         sendImpl(toClientId, requestId, message, body);
@@ -497,7 +511,7 @@
           objForEach(
             cellStamps2,
             ([cell2, cellTime2], cellId) =>
-              (rowStamp[0][cellId] = newStamp(cell2, cellTime2)),
+              (rowStamp[0][cellId] = stampNew(cell2, cellTime2)),
           );
           rowStamp[1] = getLatestTime(rowStamp[1], rowTime2);
         });
@@ -508,80 +522,99 @@
     const getChangesFromOtherStore = async (
       otherClientId = null,
       otherContentHashes,
+      transactionId = getTransactionId(),
     ) => {
-      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(
-            otherClientId,
-            4 /* GetTableDiff */,
-            store.getMergeableTableHashes(),
-          )
-        )[0];
-        tablesChanges = newTables;
-        if (!objIsEmpty(differentTableHashes)) {
-          const [newRows, differentRowHashes] = (
+      try {
+        if (isUndefined(otherContentHashes)) {
+          [otherContentHashes, otherClientId, transactionId] = await request(
+            null,
+            1 /* GetContentHashes */,
+            EMPTY_STRING,
+            transactionId,
+          );
+        }
+        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(),
+              transactionId,
             )
           )[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),
+                transactionId,
               )
             )[0];
-            mergeTablesStamps(tablesChanges, newCells);
+            mergeTablesStamps(tablesChanges, newRows);
+            if (!objIsEmpty(differentRowHashes)) {
+              const newCells = (
+                await request(
+                  otherClientId,
+                  6 /* GetCellDiff */,
+                  store.getMergeableCellHashes(differentRowHashes),
+                  transactionId,
+                )
+              )[0];
+              mergeTablesStamps(tablesChanges, newCells);
+            }
           }
         }
+        return [
+          tablesChanges,
+          valuesHash == otherValuesHash
+            ? stampNewObj()
+            : (
+                await request(
+                  otherClientId,
+                  7 /* GetValueDiff */,
+                  store.getMergeableValueHashes(),
+                  transactionId,
+                )
+              )[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;
     };
     const setPersisted = async (_getContent, changes) =>
       changes
-        ? sendImpl(null, null, 3 /* ContentDiff */, changes)
+        ? sendImpl(null, getTransactionId(), 3 /* ContentDiff */, changes)
         : sendImpl(
             null,
-            null,
+            getTransactionId(),
             2 /* ContentHashes */,
             store.getMergeableContentHashes(),
           );
     const addPersisterListener = (listener) => (persisterListener = listener);
     const delPersisterListener = () => (persisterListener = void 0);
-    const startSync = async (initialContent) =>
-      await (await persister.startAutoLoad(initialContent)).startAutoSave();
-    const stopSync = () => persister.stopAutoLoad().stopAutoSave();
+    const startSync = async (initialContent) => {
+      syncing = 1;
+      return await (
+        await persister.startAutoLoad(initialContent)
+      ).startAutoSave();
+    };
+    const stopSync = () => {
+      syncing = 0;
+      return persister.stopAutoLoad().stopAutoSave();
+    };
     const destroy = () => {
       destroyImpl();
       return persister.stopSync();
@@ -597,31 +630,37 @@
       2,
       // MergeableStoreOnly
       {startSync, stopSync, destroy, getSynchronizerStats, ...extra},
+      1,
     );
-    registerReceive((fromClientId, requestId, message, body) => {
+    registerReceive((fromClientId, transactionOrRequestId, message, body) => {
+      const isAutoLoading = syncing || persister.isAutoLoading();
       receives++;
-      onReceive?.(fromClientId, requestId, message, body);
+      onReceive?.(fromClientId, transactionOrRequestId, message, body);
       if (message == 0 /* Response */) {
         ifNotUndefined(
-          mapGet(pendingRequests, requestId),
+          mapGet(pendingRequests, transactionOrRequestId),
           ([toClientId, handleResponse]) =>
             isUndefined(toClientId) || toClientId == fromClientId
               ? handleResponse(body, fromClientId)
               : /* istanbul ignore next */
                 0,
         );
-      } else if (
-        message == 2 /* ContentHashes */ &&
-        persister.isAutoLoading()
-      ) {
-        getChangesFromOtherStore(fromClientId, body).then((changes) => {
-          persisterListener?.(void 0, changes);
-        });
-      } else if (message == 3 /* ContentDiff */ && persister.isAutoLoading()) {
+      } else if (message == 2 /* ContentHashes */ && isAutoLoading) {
+        getChangesFromOtherStore(
+          fromClientId,
+          body,
+          transactionOrRequestId ?? void 0,
+        )
+          .then((changes) => {
+            persisterListener?.(void 0, changes);
+          })
+          .catch(onIgnoredError);
+      } else if (message == 3 /* ContentDiff */ && isAutoLoading) {
         persisterListener?.(void 0, body);
       } else {
         ifNotUndefined(
-          message == 1 /* GetContentHashes */ && persister.isAutoSaving()
+          message == 1 /* GetContentHashes */ &&
+            (syncing || persister.isAutoSaving())
             ? store.getMergeableContentHashes()
             : message == 4 /* GetTableDiff */
               ? store.getMergeableTableDiff(body)
@@ -633,7 +672,12 @@
                     ? store.getMergeableValueDiff(body)
                     : void 0,
           (response) => {
-            sendImpl(fromClientId, requestId, 0 /* Response */, response);
+            sendImpl(
+              fromClientId,
+              transactionOrRequestId,
+              0 /* Response */,
+              response,
+            );
           },
         );
       }

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

@@ -1734,12 +1734,16 @@
 
   const scheduleRunning = mapNew();
   const scheduleActions = mapNew();
-  const getStoreFunctions = (persist = 1 /* StoreOnly */, store) =>
+  const getStoreFunctions = (
+    persist = 1 /* StoreOnly */,
+    store,
+    isSynchronizer,
+  ) =>
     persist != 1 /* StoreOnly */ && store.isMergeable()
       ? [
           1,
           store.getMergeableContent,
-          store.getTransactionMergeableChanges,
+          () => store.getTransactionMergeableChanges(!isSynchronizer),
           ([[changedTables], [changedValues]]) =>
             !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
           store.setDefaultContent,
@@ -1763,6 +1767,7 @@
     onIgnoredError,
     persist,
     extra = {},
+    isSynchronizer = 0,
     scheduleId = [],
   ) => {
     let status = 0; /* Idle */
@@ -1780,7 +1785,7 @@
       getChanges,
       hasChanges,
       setDefaultContent,
-    ] = getStoreFunctions(persist, store);
+    ] = getStoreFunctions(persist, store, isSynchronizer);
     const [addListener, callListeners, delListenerImpl] = getListenerFunctions(
       () => persister,
     );
@@ -1828,7 +1833,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) {
@@ -1841,7 +1846,8 @@
       return persister;
     };
     const startAutoLoad = async (initialContent) => {
-      await stopAutoLoad().load(initialContent);
+      stopAutoLoad();
+      await load(initialContent);
       try {
         autoLoadHandle = await addPersisterListener(
           async (content, changes) => {
@@ -1884,7 +1890,8 @@
       return persister;
     };
     const startAutoSave = async () => {
-      await stopAutoSave().save();
+      stopAutoSave();
+      await save();
       autoSaveListenerId = store.addDidFinishTransactionListener(() => {
         const changes = getChanges();
         if (hasChanges(changes)) {
@@ -1894,8 +1901,10 @@
       return persister;
     };
     const stopAutoSave = () => {
-      ifNotUndefined(autoSaveListenerId, store.delListener);
-      autoSaveListenerId = void 0;
+      if (autoSaveListenerId) {
+        store.delListener(autoSaveListenerId);
+        autoSaveListenerId = void 0;
+      }
       return persister;
     };
     const isAutoSaving = () => !isUndefined(autoSaveListenerId);
@@ -2301,11 +2310,11 @@
     };
     const getNewRowId = (tableId, reuse) => {
       const [getId] = mapGet(tablePoolFunctions, tableId);
-      const rowId = getId(reuse);
-      if (!collHas(mapGet(tablesMap, tableId), rowId)) {
-        return rowId;
-      }
-      return getNewRowId(tableId, reuse);
+      let rowId;
+      do {
+        rowId = getId(reuse);
+      } while (collHas(mapGet(tablesMap, tableId), rowId));
+      return rowId;
     };
     const getOrCreateTable = (tableId) =>
       mapGet(tablesMap, tableId) ?? setValidTable(tableId, {});

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

@@ -1734,12 +1734,16 @@
 
   const scheduleRunning = mapNew();
   const scheduleActions = mapNew();
-  const getStoreFunctions = (persist = 1 /* StoreOnly */, store) =>
+  const getStoreFunctions = (
+    persist = 1 /* StoreOnly */,
+    store,
+    isSynchronizer,
+  ) =>
     persist != 1 /* StoreOnly */ && store.isMergeable()
       ? [
           1,
           store.getMergeableContent,
-          store.getTransactionMergeableChanges,
+          () => store.getTransactionMergeableChanges(!isSynchronizer),
           ([[changedTables], [changedValues]]) =>
             !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
           store.setDefaultContent,
@@ -1763,6 +1767,7 @@
     onIgnoredError,
     persist,
     extra = {},
+    isSynchronizer = 0,
     scheduleId = [],
   ) => {
     let status = 0; /* Idle */
@@ -1780,7 +1785,7 @@
       getChanges,
       hasChanges,
       setDefaultContent,
-    ] = getStoreFunctions(persist, store);
+    ] = getStoreFunctions(persist, store, isSynchronizer);
     const [addListener, callListeners, delListenerImpl] = getListenerFunctions(
       () => persister,
     );
@@ -1828,7 +1833,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) {
@@ -1841,7 +1846,8 @@
       return persister;
     };
     const startAutoLoad = async (initialContent) => {
-      await stopAutoLoad().load(initialContent);
+      stopAutoLoad();
+      await load(initialContent);
       try {
         autoLoadHandle = await addPersisterListener(
           async (content, changes) => {
@@ -1884,7 +1890,8 @@
       return persister;
     };
     const startAutoSave = async () => {
-      await stopAutoSave().save();
+      stopAutoSave();
+      await save();
       autoSaveListenerId = store.addDidFinishTransactionListener(() => {
         const changes = getChanges();
         if (hasChanges(changes)) {
@@ -1894,8 +1901,10 @@
       return persister;
     };
     const stopAutoSave = () => {
-      ifNotUndefined(autoSaveListenerId, store.delListener);
-      autoSaveListenerId = void 0;
+      if (autoSaveListenerId) {
+        store.delListener(autoSaveListenerId);
+        autoSaveListenerId = void 0;
+      }
       return persister;
     };
     const isAutoSaving = () => !isUndefined(autoSaveListenerId);
@@ -2301,11 +2310,11 @@
     };
     const getNewRowId = (tableId, reuse) => {
       const [getId] = mapGet(tablePoolFunctions, tableId);
-      const rowId = getId(reuse);
-      if (!collHas(mapGet(tablesMap, tableId), rowId)) {
-        return rowId;
-      }
-      return getNewRowId(tableId, reuse);
+      let rowId;
+      do {
+        rowId = getId(reuse);
+      } while (collHas(mapGet(tablesMap, tableId), rowId));
+      return rowId;
     };
     const getOrCreateTable = (tableId) =>
       mapGet(tablesMap, tableId) ?? setValidTable(tableId, {});