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

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

@@ -1,5 +1,6 @@
 const EMPTY_STRING = '';
 const UTF8 = 'utf8';
+const MESSAGE = 'message';
 const strMatch = (str, regex) => (str == null ? void 0 : str.match(regex));
 
 const isUndefined = (thing) => thing == void 0;
@@ -50,8 +51,8 @@ const ifPayloadValid = (payload, then) => {
     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;
 
 var __async = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
@@ -79,21 +80,20 @@ var __async = (__this, __arguments, generator) => {
 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'], (clientId) =>
         __async(void 0, null, function* () {
           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) => {
               var _a;
               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 {
@@ -101,9 +101,9 @@ const createWsServerSimple = (webSocketServer) => {
                   ? void 0
                   : _a.send(forwardedPayload);
               }
-            });
-          });
-          webSocket.on('close', () => {
+            }),
+          );
+          client.on('close', () => {
             collDel(clients, clientId);
             if (collIsEmpty(clients)) {
               collDel(clientsByPath, pathId);

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

@@ -1,5 +1,6 @@
 const EMPTY_STRING = '';
 const UTF8 = 'utf8';
+const MESSAGE = 'message';
 const strMatch = (str, regex) => (str == null ? void 0 : str.match(regex));
 
 const isUndefined = (thing) => thing == void 0;
@@ -50,8 +51,8 @@ const ifPayloadValid = (payload, then) => {
     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;
 
 var __async = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
@@ -79,21 +80,20 @@ var __async = (__this, __arguments, generator) => {
 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'], (clientId) =>
         __async(void 0, null, function* () {
           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) => {
               var _a;
               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 {
@@ -101,9 +101,9 @@ const createWsServerSimple = (webSocketServer) => {
                   ? void 0
                   : _a.send(forwardedPayload);
               }
-            });
-          });
-          webSocket.on('close', () => {
+            }),
+          );
+          client.on('close', () => {
             collDel(clients, clientId);
             if (collIsEmpty(clients)) {
               collDel(clientsByPath, pathId);

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

@@ -4,6 +4,9 @@ const strSplit = (str, separator = EMPTY_STRING, limit) =>
 
 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;
@@ -106,7 +109,7 @@ const visitTree = (node, path, ensureLeaf, pruneLeaf, p = 0) =>
     },
   );
 
-const newStamp = (value, time) => (time ? [value, time] : [value]);
+const stampNew = (value, time) => (time ? [value, time] : [value]);
 const getLatestTime = (time1, time2) => {
   var _a;
   return (
@@ -119,7 +122,7 @@ const getLatestTime = (time1, time2) => {
       : ''
   );
 };
-const stampNewObj = (time = EMPTY_STRING) => newStamp(objNew(), time);
+const stampNewObj = (time = EMPTY_STRING) => stampNew(objNew(), time);
 
 const setNew = (entryOrEntries) =>
   new Set(
@@ -286,12 +289,16 @@ var __async$1 = (__this, __arguments, generator) => {
 };
 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,
@@ -315,6 +322,7 @@ const createCustomPersister = (
   onIgnoredError,
   persist,
   extra = {},
+  isSynchronizer = 0,
   scheduleId = [],
 ) => {
   let status = 0; /* Idle */
@@ -332,7 +340,7 @@ const createCustomPersister = (
     getChanges,
     hasChanges,
     setDefaultContent,
-  ] = getStoreFunctions(persist, store);
+  ] = getStoreFunctions(persist, store, isSynchronizer);
   const [addListener, callListeners, delListenerImpl] = getListenerFunctions(
     () => persister,
   );
@@ -387,7 +395,7 @@ const createCustomPersister = (
               } else if (initialContent) {
                 setDefaultContent(initialContent);
               } else {
-                errorNew(`Content is not an array ${content}`);
+                errorNew(`Content is not an array: ${content}`);
               }
             } catch (error) {
               onIgnoredError == null ? void 0 : onIgnoredError(error);
@@ -403,7 +411,8 @@ const createCustomPersister = (
     });
   const startAutoLoad = (initialContent) =>
     __async$1(void 0, null, function* () {
-      yield stopAutoLoad().load(initialContent);
+      stopAutoLoad();
+      yield load(initialContent);
       try {
         autoLoadHandle = yield addPersisterListener((content, changes) =>
           __async$1(void 0, null, function* () {
@@ -456,7 +465,8 @@ const createCustomPersister = (
     });
   const startAutoSave = () =>
     __async$1(void 0, null, function* () {
-      yield stopAutoSave().save();
+      stopAutoSave();
+      yield save();
       autoSaveListenerId = store.addDidFinishTransactionListener(() => {
         const changes = getChanges();
         if (hasChanges(changes)) {
@@ -466,8 +476,10 @@ const createCustomPersister = (
       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);
@@ -596,41 +608,39 @@ const createCustomSynchronizer = (
   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 == null ? void 0 : onSend(toClientId, requestId, message, body);
     send(toClientId, requestId, message, body);
   };
-  const request = (_0, _1, ..._2) =>
-    __async(
-      void 0,
-      [_0, _1, ..._2],
-      function* (toClientId, message, body = EMPTY_STRING) {
-        return promiseNew((resolve, reject) => {
-          const requestId = getUniqueId();
-          const timeout = setTimeout(() => {
+  const request = (toClientId, message, body, transactionId) =>
+    __async(void 0, null, function* () {
+      return promiseNew((resolve, reject) => {
+        const requestId = transactionId + '.' + getUniqueId(4);
+        const timeout = startTimeout(() => {
+          collDel(pendingRequests, requestId);
+          reject(
+            `No response from ${toClientId != null ? toClientId : 'anyone'} to ${requestId}, ` +
+              message,
+          );
+        }, requestTimeoutSeconds);
+        mapSet(pendingRequests, requestId, [
+          toClientId,
+          (response, fromClientId) => {
+            clearTimeout(timeout);
             collDel(pendingRequests, requestId);
-            reject(
-              `No response from ${toClientId != null ? toClientId : 'anyone'} to ${requestId}, ` +
-                message,
-            );
-          }, requestTimeoutSeconds * 1e3);
-          mapSet(pendingRequests, requestId, [
-            toClientId,
-            (response, fromClientId) => {
-              clearTimeout(timeout);
-              collDel(pendingRequests, requestId);
-              resolve([response, fromClientId]);
-            },
-          ]);
-          sendImpl(toClientId, requestId, message, body);
-        });
-      },
-    );
+            resolve([response, fromClientId, transactionId]);
+          },
+        ]);
+        sendImpl(toClientId, requestId, message, body);
+      });
+    });
   const mergeTablesStamps = (tablesStamp, [tableStamps2, tablesTime2]) => {
     objForEach(tableStamps2, ([rowStamps2, tableTime2], tableId) => {
       const tableStamp = objEnsure(tablesStamp[0], tableId, stampNewObj);
@@ -639,7 +649,7 @@ const createCustomSynchronizer = (
         objForEach(
           cellStamps2,
           ([cell2, cellTime2], cellId) =>
-            (rowStamp[0][cellId] = newStamp(cell2, cellTime2)),
+            (rowStamp[0][cellId] = stampNew(cell2, cellTime2)),
         );
         rowStamp[1] = getLatestTime(rowStamp[1], rowTime2);
       });
@@ -647,67 +657,86 @@ const createCustomSynchronizer = (
     });
     tablesStamp[1] = getLatestTime(tablesStamp[1], tablesTime2);
   };
-  const getChangesFromOtherStore = (otherClientId = null, otherContentHashes) =>
-    __async(void 0, null, function* () {
-      if (isUndefined(otherContentHashes)) {
-        [otherContentHashes, otherClientId] = yield request(
-          otherClientId,
-          1 /* GetContentHashes */,
-        );
-      }
-      const [otherTablesHash, otherValuesHash] = otherContentHashes;
-      const [tablesHash, valuesHash] = store.getMergeableContentHashes();
-      let tablesChanges = stampNewObj();
-      if (tablesHash != otherTablesHash) {
-        const [newTables, differentTableHashes] = (yield request(
-          otherClientId,
-          4 /* GetTableDiff */,
-          store.getMergeableTableHashes(),
-        ))[0];
-        tablesChanges = newTables;
-        if (!objIsEmpty(differentTableHashes)) {
-          const [newRows, differentRowHashes] = (yield request(
-            otherClientId,
-            5 /* GetRowDiff */,
-            store.getMergeableRowHashes(differentTableHashes),
-          ))[0];
-          mergeTablesStamps(tablesChanges, newRows);
-          if (!objIsEmpty(differentRowHashes)) {
-            const newCells = (yield request(
+  const getChangesFromOtherStore = (..._0) =>
+    __async(
+      void 0,
+      [..._0],
+      function* (
+        otherClientId = null,
+        otherContentHashes,
+        transactionId = getTransactionId(),
+      ) {
+        try {
+          if (isUndefined(otherContentHashes)) {
+            [otherContentHashes, otherClientId, transactionId] = yield 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] = (yield request(
               otherClientId,
-              6 /* GetCellDiff */,
-              store.getMergeableCellHashes(differentRowHashes),
+              4 /* GetTableDiff */,
+              store.getMergeableTableHashes(),
+              transactionId,
             ))[0];
-            mergeTablesStamps(tablesChanges, newCells);
+            tablesChanges = newTables;
+            if (!objIsEmpty(differentTableHashes)) {
+              const [newRows, differentRowHashes] = (yield request(
+                otherClientId,
+                5 /* GetRowDiff */,
+                store.getMergeableRowHashes(differentTableHashes),
+                transactionId,
+              ))[0];
+              mergeTablesStamps(tablesChanges, newRows);
+              if (!objIsEmpty(differentRowHashes)) {
+                const newCells = (yield request(
+                  otherClientId,
+                  6 /* GetCellDiff */,
+                  store.getMergeableCellHashes(differentRowHashes),
+                  transactionId,
+                ))[0];
+                mergeTablesStamps(tablesChanges, newCells);
+              }
+            }
           }
+          return [
+            tablesChanges,
+            valuesHash == otherValuesHash
+              ? stampNewObj()
+              : (yield request(
+                  otherClientId,
+                  7 /* GetValueDiff */,
+                  store.getMergeableValueHashes(),
+                  transactionId,
+                ))[0],
+            1,
+          ];
+        } catch (error) {
+          onIgnoredError == null ? void 0 : onIgnoredError(error);
         }
-      }
-      return [
-        tablesChanges,
-        valuesHash == otherValuesHash
-          ? stampNewObj()
-          : (yield request(
-              otherClientId,
-              7 /* GetValueDiff */,
-              store.getMergeableValueHashes(),
-            ))[0],
-        1,
-      ];
-    });
+      },
+    );
   const getPersisted = () =>
     __async(void 0, null, function* () {
       const changes = yield 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 = (_getContent, changes) =>
     __async(void 0, null, function* () {
       return changes
-        ? sendImpl(null, null, 3 /* ContentDiff */, changes)
+        ? sendImpl(null, getTransactionId(), 3 /* ContentDiff */, changes)
         : sendImpl(
             null,
-            null,
+            getTransactionId(),
             2 /* ContentHashes */,
             store.getMergeableContentHashes(),
           );
@@ -716,11 +745,15 @@ const createCustomSynchronizer = (
   const delPersisterListener = () => (persisterListener = void 0);
   const startSync = (initialContent) =>
     __async(void 0, null, function* () {
+      syncing = 1;
       return yield (yield persister.startAutoLoad(
         initialContent,
       )).startAutoSave();
     });
-  const stopSync = () => persister.stopAutoLoad().stopAutoSave();
+  const stopSync = () => {
+    syncing = 0;
+    return persister.stopAutoLoad().stopAutoSave();
+  };
   const destroy = () => {
     destroyImpl();
     return persister.stopSync();
@@ -736,30 +769,41 @@ const createCustomSynchronizer = (
     2,
     // MergeableStoreOnly
     __spreadValues({startSync, stopSync, destroy, getSynchronizerStats}, extra),
+    1,
   );
-  registerReceive((fromClientId, requestId, message, body) => {
+  registerReceive((fromClientId, transactionOrRequestId, message, body) => {
+    const isAutoLoading = syncing || persister.isAutoLoading();
     receives++;
     onReceive == null
       ? void 0
-      : 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 == null ? void 0 : persisterListener(void 0, changes);
-      });
-    } else if (message == 3 /* ContentDiff */ && persister.isAutoLoading()) {
+    } else if (message == 2 /* ContentHashes */ && isAutoLoading) {
+      getChangesFromOtherStore(
+        fromClientId,
+        body,
+        transactionOrRequestId != null ? transactionOrRequestId : void 0,
+      )
+        .then((changes) => {
+          persisterListener == null
+            ? void 0
+            : persisterListener(void 0, changes);
+        })
+        .catch(onIgnoredError);
+    } else if (message == 3 /* ContentDiff */ && isAutoLoading) {
       persisterListener == null ? void 0 : 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)
@@ -771,7 +815,12 @@ const createCustomSynchronizer = (
                   ? store.getMergeableValueDiff(body)
                   : void 0,
         (response) => {
-          sendImpl(fromClientId, requestId, 0 /* Response */, response);
+          sendImpl(
+            fromClientId,
+            transactionOrRequestId,
+            0 /* Response */,
+            response,
+          );
         },
       );
     }

package/es6/ui-react-dom/index.js

@@ -1,25 +1,25 @@
 import {
   useRowIds,
+  useStoreOrStoreById,
+  useSetCellCallback,
+  useCell,
+  CellView,
   useTableCellIds,
   useRowCount,
   useSortedRowIds,
   useValueIds,
+  useSetValueCallback,
+  useValue,
   ValueView,
   useIndexesOrIndexesById,
   useSliceRowIds,
   useRelationshipsOrRelationshipsById,
+  useRemoteRowId,
   useResultRowIds,
+  ResultCellView,
   useResultTableCellIds,
   useResultRowCount,
   useResultSortedRowIds,
-  useCell,
-  useSetCellCallback,
-  useStoreOrStoreById,
-  useValue,
-  useSetValueCallback,
-  CellView,
-  ResultCellView,
-  useRemoteRowId,
 } from '../ui-react/index.js';
 import React from 'react';
 

package/es6/ui-react-dom/with-schemas/index.js

@@ -1,25 +1,25 @@
 import {
   useRowIds,
+  useStoreOrStoreById,
+  useSetCellCallback,
+  useCell,
+  CellView,
   useTableCellIds,
   useRowCount,
   useSortedRowIds,
   useValueIds,
+  useSetValueCallback,
+  useValue,
   ValueView,
   useIndexesOrIndexesById,
   useSliceRowIds,
   useRelationshipsOrRelationshipsById,
+  useRemoteRowId,
   useResultRowIds,
+  ResultCellView,
   useResultTableCellIds,
   useResultRowCount,
   useResultSortedRowIds,
-  useCell,
-  useSetCellCallback,
-  useStoreOrStoreById,
-  useValue,
-  useSetValueCallback,
-  CellView,
-  ResultCellView,
-  useRemoteRowId,
 } from '../../ui-react/with-schemas/index.js';
 import React from 'react';