tinybase 5.0.0-beta.26 → 5.0.0-beta.28

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

@@ -135,8 +135,8 @@ const Persists = {
 };
 const scheduleRunning = mapNew();
 const scheduleActions = mapNew();
-const getStoreFunctions = (persistable = Persists.StoreOnly, store) =>
-  persistable != Persists.StoreOnly && store.isMergeable()
+const getStoreFunctions = (persist = Persists.StoreOnly, store) =>
+  persist != Persists.StoreOnly && store.isMergeable()
     ? [
         1,
         store.getMergeableContent,
@@ -145,7 +145,7 @@ const getStoreFunctions = (persistable = Persists.StoreOnly, store) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
       ]
-    : persistable != Persists.MergeableStoreOnly
+    : persist != Persists.MergeableStoreOnly
       ? [
           0,
           store.getContent,
@@ -162,7 +162,7 @@ const createCustomPersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
-  persistable,
+  persist,
   extra = {},
   scheduleId = [],
 ) => {
@@ -180,7 +180,7 @@ const createCustomPersister = (
     getChanges,
     hasChanges,
     setDefaultContent,
-  ] = getStoreFunctions(persistable, store);
+  ] = getStoreFunctions(persist, store);
   const run = () =>
     __async$2(void 0, null, function* () {
       /* istanbul ignore else */
@@ -405,18 +405,20 @@ var __async$1 = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
-const RESPONSE = 0;
-const GET_CONTENT_HASHES = 1;
-const CONTENT_HASHES = 2;
-const CONTENT_DIFF = 3;
-const GET_TABLE_DIFF = 4;
-const GET_ROW_DIFF = 5;
-const GET_CELL_DIFF = 6;
-const GET_VALUE_DIFF = 7;
+const Message = {
+  Response: 0,
+  GetContentHashes: 1,
+  ContentHashes: 2,
+  ContentDiff: 3,
+  GetTableDiff: 4,
+  GetRowDiff: 5,
+  GetCellDiff: 6,
+  GetValueDiff: 7,
+};
 const createCustomSynchronizer = (
   store,
   send,
-  onReceive,
+  registerReceive,
   destroyImpl,
   requestTimeoutSeconds,
   onIgnoredError,
@@ -426,41 +428,39 @@ const createCustomSynchronizer = (
   let sends = 0;
   let receives = 0;
   const pendingRequests = mapNew();
-  onReceive((fromClientId, requestId, messageType, messageBody) => {
+  registerReceive((fromClientId, requestId, message, body) => {
     receives++;
-    if (messageType == RESPONSE) {
+    if (message == Message.Response) {
       ifNotUndefined(
         mapGet(pendingRequests, requestId),
         ([toClientId, handleResponse]) =>
           isUndefined(toClientId) || toClientId == fromClientId
-            ? handleResponse(messageBody, fromClientId)
+            ? handleResponse(body, fromClientId)
             : /* istanbul ignore next */
               0,
       );
-    } else if (messageType == CONTENT_HASHES && persister.isAutoLoading()) {
-      getChangesFromOtherStore(fromClientId, messageBody).then((changes) => {
+    } else if (message == Message.ContentHashes && persister.isAutoLoading()) {
+      getChangesFromOtherStore(fromClientId, body).then((changes) => {
         persisterListener == null ? void 0 : persisterListener(void 0, changes);
       });
-    } else if (messageType == CONTENT_DIFF && persister.isAutoLoading()) {
-      persisterListener == null
-        ? void 0
-        : persisterListener(void 0, messageBody);
+    } else if (message == Message.ContentDiff && persister.isAutoLoading()) {
+      persisterListener == null ? void 0 : persisterListener(void 0, body);
     } else {
       ifNotUndefined(
-        messageType == GET_CONTENT_HASHES && persister.isAutoSaving()
+        message == Message.GetContentHashes && persister.isAutoSaving()
           ? store.getMergeableContentHashes()
-          : messageType == GET_TABLE_DIFF
-            ? store.getMergeableTableDiff(messageBody)
-            : messageType == GET_ROW_DIFF
-              ? store.getMergeableRowDiff(messageBody)
-              : messageType == GET_CELL_DIFF
-                ? store.getMergeableCellDiff(messageBody)
-                : messageType == GET_VALUE_DIFF
-                  ? store.getMergeableValueDiff(messageBody)
+          : 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, RESPONSE, response);
+          send(fromClientId, requestId, Message.Response, response);
         },
       );
     }
@@ -469,13 +469,13 @@ const createCustomSynchronizer = (
     __async$1(
       void 0,
       [_0, _1, ..._2],
-      function* (toClientId, messageType, messageBody = EMPTY_STRING) {
+      function* (toClientId, message, body = EMPTY_STRING) {
         return promiseNew((resolve, reject) => {
           const requestId = getUniqueId();
           const timeout = setTimeout(() => {
             collDel(pendingRequests, requestId);
             reject(
-              `No response from ${toClientId != null ? toClientId : 'anyone'} to '${messageType}'`,
+              `No response from ${toClientId != null ? toClientId : 'anyone'} to '${message}'`,
             );
           }, requestTimeoutSeconds * 1e3);
           mapSet(pendingRequests, requestId, [
@@ -487,7 +487,7 @@ const createCustomSynchronizer = (
             },
           ]);
           sends++;
-          send(toClientId, requestId, messageType, messageBody);
+          send(toClientId, requestId, message, body);
         });
       },
     );
@@ -512,7 +512,7 @@ const createCustomSynchronizer = (
       if (isUndefined(otherContentHashes)) {
         [otherContentHashes, otherClientId] = yield request(
           otherClientId,
-          GET_CONTENT_HASHES,
+          Message.GetContentHashes,
         );
       }
       const [otherTablesHash, otherValuesHash] = otherContentHashes;
@@ -521,21 +521,21 @@ const createCustomSynchronizer = (
       if (tablesHash != otherTablesHash) {
         const [newTables, differentTableHashes] = (yield request(
           otherClientId,
-          GET_TABLE_DIFF,
+          Message.GetTableDiff,
           store.getMergeableTableHashes(),
         ))[0];
         tablesChanges = newTables;
         if (!objIsEmpty(differentTableHashes)) {
           const [newRows, differentRowHashes] = (yield request(
             otherClientId,
-            GET_ROW_DIFF,
+            Message.GetRowDiff,
             store.getMergeableRowHashes(differentTableHashes),
           ))[0];
           mergeTablesStamps(tablesChanges, newRows);
           if (!objIsEmpty(differentRowHashes)) {
             const newCells = (yield request(
               otherClientId,
-              GET_CELL_DIFF,
+              Message.GetCellDiff,
               store.getMergeableCellHashes(differentRowHashes),
             ))[0];
             mergeTablesStamps(tablesChanges, newCells);
@@ -548,7 +548,7 @@ const createCustomSynchronizer = (
           ? stampNewObj()
           : (yield request(
               otherClientId,
-              GET_VALUE_DIFF,
+              Message.GetValueDiff,
               store.getMergeableValueHashes(),
             ))[0],
         1,
@@ -565,9 +565,14 @@ const createCustomSynchronizer = (
     __async$1(void 0, null, function* () {
       sends++;
       if (changes) {
-        send(null, null, CONTENT_DIFF, changes);
+        send(null, null, Message.ContentDiff, changes);
       } else {
-        send(null, null, CONTENT_HASHES, store.getMergeableContentHashes());
+        send(
+          null,
+          null,
+          Message.ContentHashes,
+          store.getMergeableContentHashes(),
+        );
       }
     });
   const addPersisterListener = (listener) => (persisterListener = listener);
@@ -627,43 +632,37 @@ const createWsSynchronizer = (
   onIgnoredError,
 ) =>
   __async(void 0, null, function* () {
-    let currentReceive;
     const addEventListener = (event, handler) =>
       webSocket.addEventListener(event, handler);
-    const onReceive = (receive) => {
-      currentReceive = receive;
-    };
-    const send = (toClientId, ...args) => {
+    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),
       );
-    };
     const destroy = () => {
       webSocket.close();
     };
     const synchronizer = createCustomSynchronizer(
       store,
       send,
-      onReceive,
+      registerReceive,
       destroy,
       requestTimeoutSeconds,
       onIgnoredError,
       {getWebSocket: () => webSocket},
     );
-    addEventListener('message', ({data}) => {
-      if (!isUndefined(currentReceive)) {
-        const payload = data.toString(UTF8);
-        const splitAt = payload.indexOf(MESSAGE_SEPARATOR);
-        if (splitAt !== -1) {
-          currentReceive(
-            slice(data, 0, splitAt),
-            ...jsonParseWithUndefined(slice(data, splitAt + 1)),
-          );
-        }
-      }
-    });
     return promiseNew((resolve, reject) => {
       if (webSocket.readyState != webSocket.OPEN) {
         addEventListener('error', reject);

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

@@ -135,8 +135,8 @@ const Persists = {
 };
 const scheduleRunning = mapNew();
 const scheduleActions = mapNew();
-const getStoreFunctions = (persistable = Persists.StoreOnly, store) =>
-  persistable != Persists.StoreOnly && store.isMergeable()
+const getStoreFunctions = (persist = Persists.StoreOnly, store) =>
+  persist != Persists.StoreOnly && store.isMergeable()
     ? [
         1,
         store.getMergeableContent,
@@ -145,7 +145,7 @@ const getStoreFunctions = (persistable = Persists.StoreOnly, store) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
       ]
-    : persistable != Persists.MergeableStoreOnly
+    : persist != Persists.MergeableStoreOnly
       ? [
           0,
           store.getContent,
@@ -162,7 +162,7 @@ const createCustomPersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
-  persistable,
+  persist,
   extra = {},
   scheduleId = [],
 ) => {
@@ -180,7 +180,7 @@ const createCustomPersister = (
     getChanges,
     hasChanges,
     setDefaultContent,
-  ] = getStoreFunctions(persistable, store);
+  ] = getStoreFunctions(persist, store);
   const run = () =>
     __async$2(void 0, null, function* () {
       /* istanbul ignore else */
@@ -405,18 +405,20 @@ var __async$1 = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
-const RESPONSE = 0;
-const GET_CONTENT_HASHES = 1;
-const CONTENT_HASHES = 2;
-const CONTENT_DIFF = 3;
-const GET_TABLE_DIFF = 4;
-const GET_ROW_DIFF = 5;
-const GET_CELL_DIFF = 6;
-const GET_VALUE_DIFF = 7;
+const Message = {
+  Response: 0,
+  GetContentHashes: 1,
+  ContentHashes: 2,
+  ContentDiff: 3,
+  GetTableDiff: 4,
+  GetRowDiff: 5,
+  GetCellDiff: 6,
+  GetValueDiff: 7,
+};
 const createCustomSynchronizer = (
   store,
   send,
-  onReceive,
+  registerReceive,
   destroyImpl,
   requestTimeoutSeconds,
   onIgnoredError,
@@ -426,41 +428,39 @@ const createCustomSynchronizer = (
   let sends = 0;
   let receives = 0;
   const pendingRequests = mapNew();
-  onReceive((fromClientId, requestId, messageType, messageBody) => {
+  registerReceive((fromClientId, requestId, message, body) => {
     receives++;
-    if (messageType == RESPONSE) {
+    if (message == Message.Response) {
       ifNotUndefined(
         mapGet(pendingRequests, requestId),
         ([toClientId, handleResponse]) =>
           isUndefined(toClientId) || toClientId == fromClientId
-            ? handleResponse(messageBody, fromClientId)
+            ? handleResponse(body, fromClientId)
             : /* istanbul ignore next */
               0,
       );
-    } else if (messageType == CONTENT_HASHES && persister.isAutoLoading()) {
-      getChangesFromOtherStore(fromClientId, messageBody).then((changes) => {
+    } else if (message == Message.ContentHashes && persister.isAutoLoading()) {
+      getChangesFromOtherStore(fromClientId, body).then((changes) => {
         persisterListener == null ? void 0 : persisterListener(void 0, changes);
       });
-    } else if (messageType == CONTENT_DIFF && persister.isAutoLoading()) {
-      persisterListener == null
-        ? void 0
-        : persisterListener(void 0, messageBody);
+    } else if (message == Message.ContentDiff && persister.isAutoLoading()) {
+      persisterListener == null ? void 0 : persisterListener(void 0, body);
     } else {
       ifNotUndefined(
-        messageType == GET_CONTENT_HASHES && persister.isAutoSaving()
+        message == Message.GetContentHashes && persister.isAutoSaving()
           ? store.getMergeableContentHashes()
-          : messageType == GET_TABLE_DIFF
-            ? store.getMergeableTableDiff(messageBody)
-            : messageType == GET_ROW_DIFF
-              ? store.getMergeableRowDiff(messageBody)
-              : messageType == GET_CELL_DIFF
-                ? store.getMergeableCellDiff(messageBody)
-                : messageType == GET_VALUE_DIFF
-                  ? store.getMergeableValueDiff(messageBody)
+          : 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, RESPONSE, response);
+          send(fromClientId, requestId, Message.Response, response);
         },
       );
     }
@@ -469,13 +469,13 @@ const createCustomSynchronizer = (
     __async$1(
       void 0,
       [_0, _1, ..._2],
-      function* (toClientId, messageType, messageBody = EMPTY_STRING) {
+      function* (toClientId, message, body = EMPTY_STRING) {
         return promiseNew((resolve, reject) => {
           const requestId = getUniqueId();
           const timeout = setTimeout(() => {
             collDel(pendingRequests, requestId);
             reject(
-              `No response from ${toClientId != null ? toClientId : 'anyone'} to '${messageType}'`,
+              `No response from ${toClientId != null ? toClientId : 'anyone'} to '${message}'`,
             );
           }, requestTimeoutSeconds * 1e3);
           mapSet(pendingRequests, requestId, [
@@ -487,7 +487,7 @@ const createCustomSynchronizer = (
             },
           ]);
           sends++;
-          send(toClientId, requestId, messageType, messageBody);
+          send(toClientId, requestId, message, body);
         });
       },
     );
@@ -512,7 +512,7 @@ const createCustomSynchronizer = (
       if (isUndefined(otherContentHashes)) {
         [otherContentHashes, otherClientId] = yield request(
           otherClientId,
-          GET_CONTENT_HASHES,
+          Message.GetContentHashes,
         );
       }
       const [otherTablesHash, otherValuesHash] = otherContentHashes;
@@ -521,21 +521,21 @@ const createCustomSynchronizer = (
       if (tablesHash != otherTablesHash) {
         const [newTables, differentTableHashes] = (yield request(
           otherClientId,
-          GET_TABLE_DIFF,
+          Message.GetTableDiff,
           store.getMergeableTableHashes(),
         ))[0];
         tablesChanges = newTables;
         if (!objIsEmpty(differentTableHashes)) {
           const [newRows, differentRowHashes] = (yield request(
             otherClientId,
-            GET_ROW_DIFF,
+            Message.GetRowDiff,
             store.getMergeableRowHashes(differentTableHashes),
           ))[0];
           mergeTablesStamps(tablesChanges, newRows);
           if (!objIsEmpty(differentRowHashes)) {
             const newCells = (yield request(
               otherClientId,
-              GET_CELL_DIFF,
+              Message.GetCellDiff,
               store.getMergeableCellHashes(differentRowHashes),
             ))[0];
             mergeTablesStamps(tablesChanges, newCells);
@@ -548,7 +548,7 @@ const createCustomSynchronizer = (
           ? stampNewObj()
           : (yield request(
               otherClientId,
-              GET_VALUE_DIFF,
+              Message.GetValueDiff,
               store.getMergeableValueHashes(),
             ))[0],
         1,
@@ -565,9 +565,14 @@ const createCustomSynchronizer = (
     __async$1(void 0, null, function* () {
       sends++;
       if (changes) {
-        send(null, null, CONTENT_DIFF, changes);
+        send(null, null, Message.ContentDiff, changes);
       } else {
-        send(null, null, CONTENT_HASHES, store.getMergeableContentHashes());
+        send(
+          null,
+          null,
+          Message.ContentHashes,
+          store.getMergeableContentHashes(),
+        );
       }
     });
   const addPersisterListener = (listener) => (persisterListener = listener);
@@ -627,43 +632,37 @@ const createWsSynchronizer = (
   onIgnoredError,
 ) =>
   __async(void 0, null, function* () {
-    let currentReceive;
     const addEventListener = (event, handler) =>
       webSocket.addEventListener(event, handler);
-    const onReceive = (receive) => {
-      currentReceive = receive;
-    };
-    const send = (toClientId, ...args) => {
+    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),
       );
-    };
     const destroy = () => {
       webSocket.close();
     };
     const synchronizer = createCustomSynchronizer(
       store,
       send,
-      onReceive,
+      registerReceive,
       destroy,
       requestTimeoutSeconds,
       onIgnoredError,
       {getWebSocket: () => webSocket},
     );
-    addEventListener('message', ({data}) => {
-      if (!isUndefined(currentReceive)) {
-        const payload = data.toString(UTF8);
-        const splitAt = payload.indexOf(MESSAGE_SEPARATOR);
-        if (splitAt !== -1) {
-          currentReceive(
-            slice(data, 0, splitAt),
-            ...jsonParseWithUndefined(slice(data, splitAt + 1)),
-          );
-        }
-      }
-    });
     return promiseNew((resolve, reject) => {
       if (webSocket.readyState != webSocket.OPEN) {
         addEventListener('error', reject);