tinybase 5.1.0-beta.0 → 5.1.0-beta.1

package/umd/synchronizers/synchronizer-ws-client/index.js

@@ -31,6 +31,7 @@
   const arrayForEach = (array, cb) => array.forEach(cb);
   const arrayMap = (array, cb) => array.map(cb);
   const arrayReduce = (array, cb, initial) => array.reduce(cb, initial);
+  const arrayClear = (array, to) => array.splice(0, to);
   const arrayPush = (array, ...values) => array.push(...values);
   const arrayShift = (array) => array.shift();
 
@@ -71,6 +72,20 @@
     JSON.parse(str, (_key, value) => (value === UNDEFINED ? void 0 : value));
 
   const MESSAGE_SEPARATOR = '\n';
+  const ifPayloadValid = (payload, then) => {
+    const splitAt = payload.indexOf(MESSAGE_SEPARATOR);
+    splitAt !== -1
+      ? then(slice(payload, 0, splitAt), slice(payload, splitAt + 1))
+      : 0;
+  };
+  const receivePayload = (payload, receive) =>
+    ifPayloadValid(payload, (fromClientId, remainder) =>
+      receive(fromClientId, ...jsonParseWithUndefined(remainder)),
+    );
+  const createPayload = (toClientId, ...args) =>
+    createRawPayload(toClientId ?? EMPTY_STRING, jsonStringWithUndefined(args));
+  const createRawPayload = (toClientId, remainder) =>
+    toClientId + MESSAGE_SEPARATOR + remainder;
 
   const collHas = (coll, keyOrValue) => coll?.has(keyOrValue) ?? false;
   const collDel = (coll, keyOrValue) => coll?.delete(keyOrValue);
@@ -86,15 +101,17 @@
     return mapGet(map, key);
   };
 
-  const Persists = {
-    StoreOnly: 1,
-    MergeableStoreOnly: 2,
-    StoreOrMergeableStore: 3,
-  };
+  new GLOBAL.TextEncoder();
+
+  const newStamp = (value, time) => (time ? [value, time] : [value]);
+  const getLatestTime = (time1, time2) =>
+    ((time1 ?? '') > (time2 ?? '') ? time1 : time2) ?? '';
+  const stampNewObj = (time = EMPTY_STRING) => newStamp(objNew(), time);
+
   const scheduleRunning = mapNew();
   const scheduleActions = mapNew();
-  const getStoreFunctions = (persist = Persists.StoreOnly, store) =>
-    persist != Persists.StoreOnly && store.isMergeable()
+  const getStoreFunctions = (persist = 1 /* StoreOnly */, store) =>
+    persist != 1 /* StoreOnly */ && store.isMergeable()
       ? [
           1,
           store.getMergeableContent,
@@ -103,7 +120,7 @@
             !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
           store.setDefaultContent,
         ]
-      : persist != Persists.MergeableStoreOnly
+      : persist != 2 /* MergeableStoreOnly */
         ? [
             0,
             store.getContent,
@@ -188,19 +205,24 @@
     };
     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;
+      try {
+        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();
           }
-        } else {
-          await load();
-        }
-      });
+        });
+      } catch (error) {
+        /* istanbul ignore next */
+        onIgnoredError?.(error);
+      }
       return persister;
     };
     const stopAutoLoad = () => {
@@ -250,7 +272,10 @@
       return persister;
     };
     const getStore = () => store;
-    const destroy = () => stopAutoLoad().stopAutoSave();
+    const destroy = () => {
+      arrayClear(mapGet(scheduleActions, scheduleId));
+      return stopAutoLoad().stopAutoSave();
+    };
     const getStats = () => ({loads, saves});
     const persister = {
       load,
@@ -270,13 +295,6 @@
     return objFreeze(persister);
   };
 
-  new GLOBAL.TextEncoder();
-
-  const newStamp = (value, time) => (time ? [value, time] : [value]);
-  const getLatestTime = (time1, time2) =>
-    ((time1 ?? '') > (time2 ?? '') ? time1 : time2) ?? '';
-  const stampNewObj = (time = EMPTY_STRING) => newStamp(objNew(), time);
-
   const MASK6 = 63;
   const ENCODE =
     '-0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz'.split(
@@ -296,22 +314,14 @@
       '',
     );
 
-  const Message = {
-    Response: 0,
-    GetContentHashes: 1,
-    ContentHashes: 2,
-    ContentDiff: 3,
-    GetTableDiff: 4,
-    GetRowDiff: 5,
-    GetCellDiff: 6,
-    GetValueDiff: 7,
-  };
   const createCustomSynchronizer = (
     store,
     send,
     registerReceive,
     destroyImpl,
     requestTimeoutSeconds,
+    onSend,
+    onReceive,
     onIgnoredError,
     extra = {},
   ) => {
@@ -319,52 +329,20 @@
     let sends = 0;
     let receives = 0;
     const pendingRequests = mapNew();
-    registerReceive((fromClientId, requestId, message, body) => {
-      receives++;
-      if (message == Message.Response) {
-        ifNotUndefined(
-          mapGet(pendingRequests, requestId),
-          ([toClientId, handleResponse]) =>
-            isUndefined(toClientId) || toClientId == fromClientId
-              ? handleResponse(body, fromClientId)
-              : /* istanbul ignore next */
-                0,
-        );
-      } else if (
-        message == Message.ContentHashes &&
-        persister.isAutoLoading()
-      ) {
-        getChangesFromOtherStore(fromClientId, body).then((changes) => {
-          persisterListener?.(void 0, changes);
-        });
-      } else if (message == Message.ContentDiff && persister.isAutoLoading()) {
-        persisterListener?.(void 0, body);
-      } else {
-        ifNotUndefined(
-          message == Message.GetContentHashes && persister.isAutoSaving()
-            ? store.getMergeableContentHashes()
-            : message == Message.GetTableDiff
-              ? store.getMergeableTableDiff(body)
-              : message == Message.GetRowDiff
-                ? store.getMergeableRowDiff(body)
-                : message == Message.GetCellDiff
-                  ? store.getMergeableCellDiff(body)
-                  : message == Message.GetValueDiff
-                    ? store.getMergeableValueDiff(body)
-                    : void 0,
-          (response) => {
-            sends++;
-            send(fromClientId, requestId, Message.Response, response);
-          },
-        );
-      }
-    });
+    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) =>
       promiseNew((resolve, reject) => {
         const requestId = getUniqueId();
         const timeout = setTimeout(() => {
           collDel(pendingRequests, requestId);
-          reject(`No response from ${toClientId ?? 'anyone'} to '${message}'`);
+          reject(
+            `No response from ${toClientId ?? 'anyone'} to ${requestId}, ` +
+              message,
+          );
         }, requestTimeoutSeconds * 1e3);
         mapSet(pendingRequests, requestId, [
           toClientId,
@@ -374,8 +352,7 @@
             resolve([response, fromClientId]);
           },
         ]);
-        sends++;
-        send(toClientId, requestId, message, body);
+        sendImpl(toClientId, requestId, message, body);
       });
     const mergeTablesStamps = (tablesStamp, [tableStamps2, tablesTime2]) => {
       objForEach(tableStamps2, ([rowStamps2, tableTime2], tableId) => {
@@ -400,7 +377,7 @@
       if (isUndefined(otherContentHashes)) {
         [otherContentHashes, otherClientId] = await request(
           otherClientId,
-          Message.GetContentHashes,
+          1 /* GetContentHashes */,
         );
       }
       const [otherTablesHash, otherValuesHash] = otherContentHashes;
@@ -410,7 +387,7 @@
         const [newTables, differentTableHashes] = (
           await request(
             otherClientId,
-            Message.GetTableDiff,
+            4 /* GetTableDiff */,
             store.getMergeableTableHashes(),
           )
         )[0];
@@ -419,7 +396,7 @@
           const [newRows, differentRowHashes] = (
             await request(
               otherClientId,
-              Message.GetRowDiff,
+              5 /* GetRowDiff */,
               store.getMergeableRowHashes(differentTableHashes),
             )
           )[0];
@@ -428,7 +405,7 @@
             const newCells = (
               await request(
                 otherClientId,
-                Message.GetCellDiff,
+                6 /* GetCellDiff */,
                 store.getMergeableCellHashes(differentRowHashes),
               )
             )[0];
@@ -443,7 +420,7 @@
           : (
               await request(
                 otherClientId,
-                Message.GetValueDiff,
+                7 /* GetValueDiff */,
                 store.getMergeableValueHashes(),
               )
             )[0],
@@ -456,19 +433,15 @@
         ? changes
         : void 0;
     };
-    const setPersisted = async (_getContent, changes) => {
-      sends++;
-      if (changes) {
-        send(null, null, Message.ContentDiff, changes);
-      } else {
-        send(
-          null,
-          null,
-          Message.ContentHashes,
-          store.getMergeableContentHashes(),
-        );
-      }
-    };
+    const setPersisted = async (_getContent, changes) =>
+      changes
+        ? sendImpl(null, null, 3 /* ContentDiff */, changes)
+        : sendImpl(
+            null,
+            null,
+            2 /* ContentHashes */,
+            store.getMergeableContentHashes(),
+          );
     const addPersisterListener = (listener) => (persisterListener = listener);
     const delPersisterListener = () => (persisterListener = void 0);
     const startSync = async (initialContent) =>
@@ -486,9 +459,50 @@
       addPersisterListener,
       delPersisterListener,
       onIgnoredError,
-      Persists.MergeableStoreOnly,
+      2,
+      // MergeableStoreOnly
       {startSync, stopSync, destroy, getSynchronizerStats, ...extra},
     );
+    registerReceive((fromClientId, requestId, message, body) => {
+      receives++;
+      onReceive?.(fromClientId, requestId, message, body);
+      if (message == 0 /* Response */) {
+        ifNotUndefined(
+          mapGet(pendingRequests, requestId),
+          ([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()) {
+        persisterListener?.(void 0, body);
+      } else {
+        ifNotUndefined(
+          message == 1 /* GetContentHashes */ && persister.isAutoSaving()
+            ? store.getMergeableContentHashes()
+            : message == 4 /* GetTableDiff */
+              ? store.getMergeableTableDiff(body)
+              : message == 5 /* GetRowDiff */
+                ? store.getMergeableRowDiff(body)
+                : message == 6 /* GetCellDiff */
+                  ? store.getMergeableCellDiff(body)
+                  : message == 7 /* GetValueDiff */
+                    ? store.getMergeableValueDiff(body)
+                    : void 0,
+          (response) => {
+            sendImpl(fromClientId, requestId, 0 /* Response */, response);
+          },
+        );
+      }
+    });
     return persister;
   };
 
@@ -496,27 +510,18 @@
     store,
     webSocket,
     requestTimeoutSeconds = 1,
+    onSend,
+    onReceive,
     onIgnoredError,
   ) => {
     const addEventListener = (event, handler) =>
       webSocket.addEventListener(event, handler);
     const registerReceive = (receive) =>
-      addEventListener('message', ({data}) => {
-        const payload = data.toString(UTF8);
-        const splitAt = payload.indexOf(MESSAGE_SEPARATOR);
-        if (splitAt !== -1) {
-          receive(
-            slice(data, 0, splitAt),
-            ...jsonParseWithUndefined(slice(data, splitAt + 1)),
-          );
-        }
-      });
-    const send = (toClientId, ...args) =>
-      webSocket.send(
-        (toClientId ?? EMPTY_STRING) +
-          MESSAGE_SEPARATOR +
-          jsonStringWithUndefined(args),
+      addEventListener('message', ({data}) =>
+        receivePayload(data.toString(UTF8), receive),
       );
+    const send = (toClientId, ...args) =>
+      webSocket.send(createPayload(toClientId, ...args));
     const destroy = () => {
       webSocket.close();
     };
@@ -526,6 +531,8 @@
       registerReceive,
       destroy,
       requestTimeoutSeconds,
+      onSend,
+      onReceive,
       onIgnoredError,
       {getWebSocket: () => webSocket},
     );