tinybase 5.0.4 → 5.1.0-beta.1

package/cjs/es6/synchronizers/synchronizer-ws-client/index.cjs

@@ -22,6 +22,7 @@ const errorNew = (message) => {
 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();
 
@@ -60,6 +61,23 @@ const jsonParseWithUndefined = (str) =>
   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 != null ? toClientId : EMPTY_STRING,
+    jsonStringWithUndefined(args),
+  );
+const createRawPayload = (toClientId, remainder) =>
+  toClientId + MESSAGE_SEPARATOR + remainder;
 
 const collHas = (coll, keyOrValue) => {
   var _a;
@@ -85,6 +103,20 @@ const mapEnsure = (map, key, getDefaultValue, hadExistingValue) => {
   return mapGet(map, key);
 };
 
+new GLOBAL.TextEncoder();
+
+const newStamp = (value, time) => (time ? [value, time] : [value]);
+const getLatestTime = (time1, time2) => {
+  var _a;
+  return (_a =
+    (time1 != null ? time1 : '') > (time2 != null ? time2 : '')
+      ? time1
+      : time2) != null
+    ? _a
+    : '';
+};
+const stampNewObj = (time = EMPTY_STRING) => newStamp(objNew(), time);
+
 var __defProp$1 = Object.defineProperty;
 var __getOwnPropSymbols$1 = Object.getOwnPropertySymbols;
 var __hasOwnProp$1 = Object.prototype.hasOwnProperty;
@@ -130,15 +162,10 @@ var __async$2 = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
-const Persists = {
-  StoreOnly: 1,
-  MergeableStoreOnly: 2,
-  StoreOrMergeableStore: 3,
-};
 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,
@@ -147,7 +174,7 @@ const getStoreFunctions = (persist = Persists.StoreOnly, store) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
       ]
-    : persist != Persists.MergeableStoreOnly
+    : persist != 2 /* MergeableStoreOnly */
       ? [
           0,
           store.getContent,
@@ -238,21 +265,26 @@ const createCustomPersister = (
   const startAutoLoad = (initialContent) =>
     __async$2(void 0, null, function* () {
       yield stopAutoLoad().load(initialContent);
-      autoLoadHandle = addPersisterListener((content, changes) =>
-        __async$2(void 0, null, function* () {
-          if (changes || content) {
-            /* istanbul ignore else */
-            if (loadSave != 2) {
-              loadSave = 1;
-              loads++;
-              setContentOrChanges(changes != null ? changes : content);
-              loadSave = 0;
+      try {
+        autoLoadHandle = addPersisterListener((content, changes) =>
+          __async$2(void 0, null, function* () {
+            if (changes || content) {
+              /* istanbul ignore else */
+              if (loadSave != 2) {
+                loadSave = 1;
+                loads++;
+                setContentOrChanges(changes != null ? changes : content);
+                loadSave = 0;
+              }
+            } else {
+              yield load();
             }
-          } else {
-            yield load();
-          }
-        }),
-      );
+          }),
+        );
+      } catch (error) {
+        /* istanbul ignore next */
+        onIgnoredError == null ? void 0 : onIgnoredError(error);
+      }
       return persister;
     });
   const stopAutoLoad = () => {
@@ -307,7 +339,10 @@ const createCustomPersister = (
       return persister;
     });
   const getStore = () => store;
-  const destroy = () => stopAutoLoad().stopAutoSave();
+  const destroy = () => {
+    arrayClear(mapGet(scheduleActions, scheduleId));
+    return stopAutoLoad().stopAutoSave();
+  };
   const getStats = () => ({loads, saves});
   const persister = __spreadValues$1(
     {
@@ -329,20 +364,6 @@ const createCustomPersister = (
   return objFreeze(persister);
 };
 
-new GLOBAL.TextEncoder();
-
-const newStamp = (value, time) => (time ? [value, time] : [value]);
-const getLatestTime = (time1, time2) => {
-  var _a;
-  return (_a =
-    (time1 != null ? time1 : '') > (time2 != null ? time2 : '')
-      ? time1
-      : time2) != null
-    ? _a
-    : '';
-};
-const stampNewObj = (time = EMPTY_STRING) => newStamp(objNew(), time);
-
 const MASK6 = 63;
 const ENCODE =
   '-0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz'.split(
@@ -407,22 +428,14 @@ var __async$1 = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
-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 = {},
 ) => {
@@ -430,43 +443,11 @@ const createCustomSynchronizer = (
   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 == null ? void 0 : persisterListener(void 0, changes);
-      });
-    } else if (message == Message.ContentDiff && persister.isAutoLoading()) {
-      persisterListener == null ? void 0 : 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 == null ? void 0 : onSend(toClientId, requestId, message, body);
+    send(toClientId, requestId, message, body);
+  };
   const request = (_0, _1, ..._2) =>
     __async$1(
       void 0,
@@ -477,7 +458,8 @@ const createCustomSynchronizer = (
           const timeout = setTimeout(() => {
             collDel(pendingRequests, requestId);
             reject(
-              `No response from ${toClientId != null ? toClientId : 'anyone'} to '${message}'`,
+              `No response from ${toClientId != null ? toClientId : 'anyone'} to ${requestId}, ` +
+                message,
             );
           }, requestTimeoutSeconds * 1e3);
           mapSet(pendingRequests, requestId, [
@@ -488,8 +470,7 @@ const createCustomSynchronizer = (
               resolve([response, fromClientId]);
             },
           ]);
-          sends++;
-          send(toClientId, requestId, message, body);
+          sendImpl(toClientId, requestId, message, body);
         });
       },
     );
@@ -514,7 +495,7 @@ const createCustomSynchronizer = (
       if (isUndefined(otherContentHashes)) {
         [otherContentHashes, otherClientId] = yield request(
           otherClientId,
-          Message.GetContentHashes,
+          1 /* GetContentHashes */,
         );
       }
       const [otherTablesHash, otherValuesHash] = otherContentHashes;
@@ -523,21 +504,21 @@ const createCustomSynchronizer = (
       if (tablesHash != otherTablesHash) {
         const [newTables, differentTableHashes] = (yield request(
           otherClientId,
-          Message.GetTableDiff,
+          4 /* GetTableDiff */,
           store.getMergeableTableHashes(),
         ))[0];
         tablesChanges = newTables;
         if (!objIsEmpty(differentTableHashes)) {
           const [newRows, differentRowHashes] = (yield request(
             otherClientId,
-            Message.GetRowDiff,
+            5 /* GetRowDiff */,
             store.getMergeableRowHashes(differentTableHashes),
           ))[0];
           mergeTablesStamps(tablesChanges, newRows);
           if (!objIsEmpty(differentRowHashes)) {
             const newCells = (yield request(
               otherClientId,
-              Message.GetCellDiff,
+              6 /* GetCellDiff */,
               store.getMergeableCellHashes(differentRowHashes),
             ))[0];
             mergeTablesStamps(tablesChanges, newCells);
@@ -550,7 +531,7 @@ const createCustomSynchronizer = (
           ? stampNewObj()
           : (yield request(
               otherClientId,
-              Message.GetValueDiff,
+              7 /* GetValueDiff */,
               store.getMergeableValueHashes(),
             ))[0],
         1,
@@ -565,17 +546,14 @@ const createCustomSynchronizer = (
     });
   const setPersisted = (_getContent, changes) =>
     __async$1(void 0, null, function* () {
-      sends++;
-      if (changes) {
-        send(null, null, Message.ContentDiff, changes);
-      } else {
-        send(
-          null,
-          null,
-          Message.ContentHashes,
-          store.getMergeableContentHashes(),
-        );
-      }
+      return changes
+        ? sendImpl(null, null, 3 /* ContentDiff */, changes)
+        : sendImpl(
+            null,
+            null,
+            2 /* ContentHashes */,
+            store.getMergeableContentHashes(),
+          );
     });
   const addPersisterListener = (listener) => (persisterListener = listener);
   const delPersisterListener = () => (persisterListener = void 0);
@@ -598,9 +576,49 @@ const createCustomSynchronizer = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    Persists.MergeableStoreOnly,
+    2,
+    // MergeableStoreOnly
     __spreadValues({startSync, stopSync, destroy, getSynchronizerStats}, extra),
   );
+  registerReceive((fromClientId, requestId, message, body) => {
+    receives++;
+    onReceive == null
+      ? void 0
+      : 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 == null ? void 0 : persisterListener(void 0, changes);
+      });
+    } else if (message == 3 /* ContentDiff */ && persister.isAutoLoading()) {
+      persisterListener == null ? void 0 : 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;
 };
 
@@ -631,28 +649,19 @@ const createWsSynchronizer = (
   store,
   webSocket,
   requestTimeoutSeconds = 1,
+  onSend,
+  onReceive,
   onIgnoredError,
 ) =>
   __async(void 0, null, function* () {
     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 != null ? 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();
     };
@@ -662,6 +671,8 @@ const createWsSynchronizer = (
       registerReceive,
       destroy,
       requestTimeoutSeconds,
+      onSend,
+      onReceive,
       onIgnoredError,
       {getWebSocket: () => webSocket},
     );