tinybase 5.0.0-beta.10 → 5.0.0-beta.11

package/lib/debug/synchronizers/synchronizer-ws-server.js

@@ -4,9 +4,18 @@ const UTF8 = 'utf8';
 const isUndefined = (thing) => thing == void 0;
 const ifNotUndefined = (value, then, otherwise) =>
   isUndefined(value) ? otherwise?.() : then(value);
+const isArray = (thing) => Array.isArray(thing);
 const slice = (arrayOrString, start, end) => arrayOrString.slice(start, end);
+const size = (arrayOrString) => arrayOrString.length;
+const test = (regex, subject) => regex.test(subject);
 
+const arrayForEach = (array, cb) => array.forEach(cb);
 const arrayReduce = (array, cb, initial) => array.reduce(cb, initial);
+const arrayPush = (array, ...values) => array.push(...values);
+const arrayShift = (array) => array.shift();
+
+const object = Object;
+const objFreeze = object.freeze;
 
 const collSizeN = (collSizer) => (coll) =>
   arrayReduce(collValues(coll), (total, coll2) => total + collSizer(coll2), 0);
@@ -34,17 +43,139 @@ const mapEnsure = (map, key, getDefaultValue, hadExistingValue) => {
   }
   return mapGet(map, key);
 };
+const visitTree = (node, path, ensureLeaf, pruneLeaf, p = 0) =>
+  ifNotUndefined(
+    (ensureLeaf ? mapEnsure : mapGet)(
+      node,
+      path[p],
+      p > size(path) - 2 ? ensureLeaf : mapNew,
+    ),
+    (nodeOrLeaf) => {
+      if (p > size(path) - 2) {
+        if (pruneLeaf?.(nodeOrLeaf)) {
+          mapSet(node, path[p]);
+        }
+        return nodeOrLeaf;
+      }
+      const leaf = visitTree(nodeOrLeaf, path, ensureLeaf, pruneLeaf, p + 1);
+      if (collIsEmpty(nodeOrLeaf)) {
+        mapSet(node, path[p]);
+      }
+      return leaf;
+    },
+  );
 
 const MESSAGE_SEPARATOR = '\n';
 
+const setNew = (entryOrEntries) =>
+  new Set(
+    isArray(entryOrEntries) || isUndefined(entryOrEntries)
+      ? entryOrEntries
+      : [entryOrEntries],
+  );
+const setAdd = (set, value) => set?.add(value);
+
+const INTEGER = /^\d+$/;
+const getPoolFunctions = () => {
+  const pool = [];
+  let nextId = 0;
+  return [
+    (reuse) => (reuse ? arrayShift(pool) : null) ?? EMPTY_STRING + nextId++,
+    (id) => {
+      if (test(INTEGER, id) && size(pool) < 1e3) {
+        arrayPush(pool, id);
+      }
+    },
+  ];
+};
+
+const getWildcardedLeaves = (deepIdSet, path = [EMPTY_STRING]) => {
+  const leaves = [];
+  const deep = (node, p) =>
+    p == size(path)
+      ? arrayPush(leaves, node)
+      : path[p] === null
+        ? collForEach(node, (node2) => deep(node2, p + 1))
+        : arrayForEach([path[p], null], (id) => deep(mapGet(node, id), p + 1));
+  deep(deepIdSet, 0);
+  return leaves;
+};
+const getListenerFunctions = (getThing) => {
+  let thing;
+  const [getId, releaseId] = getPoolFunctions();
+  const allListeners = mapNew();
+  const addListener = (
+    listener,
+    idSetNode,
+    path,
+    pathGetters = [],
+    extraArgsGetter = () => [],
+  ) => {
+    thing ??= getThing();
+    const id = getId(1);
+    mapSet(allListeners, id, [
+      listener,
+      idSetNode,
+      path,
+      pathGetters,
+      extraArgsGetter,
+    ]);
+    setAdd(visitTree(idSetNode, path ?? [EMPTY_STRING], setNew), id);
+    return id;
+  };
+  const callListeners = (idSetNode, ids, ...extraArgs) =>
+    arrayForEach(getWildcardedLeaves(idSetNode, ids), (set) =>
+      collForEach(set, (id) =>
+        mapGet(allListeners, id)[0](thing, ...(ids ?? []), ...extraArgs),
+      ),
+    );
+  const delListener = (id) =>
+    ifNotUndefined(mapGet(allListeners, id), ([, idSetNode, idOrNulls]) => {
+      visitTree(idSetNode, idOrNulls ?? [EMPTY_STRING], void 0, (idSet) => {
+        collDel(idSet, id);
+        return collIsEmpty(idSet) ? 1 : 0;
+      });
+      mapSet(allListeners, id);
+      releaseId(id);
+      return idOrNulls;
+    });
+  const callListener = (id) =>
+    ifNotUndefined(
+      mapGet(allListeners, id),
+      ([listener, , path = [], pathGetters, extraArgsGetter]) => {
+        const callWithIds = (...ids) => {
+          const index = size(ids);
+          index == size(path)
+            ? listener(thing, ...ids, ...extraArgsGetter(ids))
+            : isUndefined(path[index])
+              ? arrayForEach(pathGetters[index]?.(...ids) ?? [], (id2) =>
+                  callWithIds(...ids, id2),
+                )
+              : callWithIds(...ids, path[index]);
+        };
+        callWithIds();
+      },
+    );
+  return [addListener, callListeners, delListener, callListener];
+};
+
 const PATH_REGEX = /\/([^?]*)/;
 const createWsServer = (webSocketServer) => {
+  const pathIdListeners = mapNew();
+  const clientIdListeners = mapNew();
   const clientsByPath = mapNew();
+  const [addListener, callListeners, delListenerImpl] = getListenerFunctions(
+    () => wsServer,
+  );
   webSocketServer.on('connection', (webSocket, request) =>
-    ifNotUndefined(request.url?.match(PATH_REGEX), ([path]) =>
+    ifNotUndefined(request.url?.match(PATH_REGEX), ([, pathId]) =>
       ifNotUndefined(request.headers['sec-websocket-key'], (clientId) => {
-        const clients = mapEnsure(clientsByPath, path, mapNew);
+        const clients = mapEnsure(clientsByPath, pathId, mapNew);
         mapSet(clients, clientId, webSocket);
+        if (clients.size == 1) {
+          callListeners(pathIdListeners, void 0, () => ({[pathId]: 1}));
+        }
+        callListeners(clientIdListeners, [pathId], () => ({[clientId]: 1}));
         webSocket.on('message', (data) => {
           const payload = data.toString(UTF8);
           const splitAt = payload.indexOf(MESSAGE_SEPARATOR);
@@ -66,16 +197,26 @@ const createWsServer = (webSocketServer) => {
         });
         webSocket.on('close', () => {
           collDel(clients, clientId);
+          callListeners(clientIdListeners, [pathId], () => ({[clientId]: -1}));
           if (collIsEmpty(clients)) {
-            collDel(clientsByPath, path);
+            collDel(clientsByPath, pathId);
+            callListeners(pathIdListeners, void 0, () => ({[pathId]: -1}));
           }
         });
       }),
     ),
   );
   const getWebSocketServer = () => webSocketServer;
-  const getPaths = () => mapKeys(clientsByPath);
+  const getPathIds = () => mapKeys(clientsByPath);
   const getClientIds = (path) => mapKeys(mapGet(clientsByPath, path));
+  const addPathIdsListener = (listener) =>
+    addListener(listener, pathIdListeners);
+  const addClientIdsListener = (pathId, listener) =>
+    addListener(listener, clientIdListeners, [pathId]);
+  const delListener = (listenerId) => {
+    delListenerImpl(listenerId);
+    return wsServer;
+  };
   const getStats = () => ({
     paths: collSize(clientsByPath),
     clients: collSize2(clientsByPath),
@@ -84,13 +225,17 @@ const createWsServer = (webSocketServer) => {
     webSocketServer.close();
     collClear(clientsByPath);
   };
-  return {
+  const wsServer = {
     getWebSocketServer,
-    getPaths,
+    getPathIds,
     getClientIds,
+    addPathIdsListener,
+    addClientIdsListener,
+    delListener,
     getStats,
     destroy,
   };
+  return objFreeze(wsServer);
 };
 
 export {createWsServer};

package/lib/debug/synchronizers.js

@@ -76,24 +76,27 @@ const stampNewObj = (time = EMPTY_STRING) => newStamp(objNew(), time);
 
 const scheduleRunning = mapNew();
 const scheduleActions = mapNew();
-const getStoreFunctions = (supportsMergeableStore, store) =>
-  !supportsMergeableStore || isUndefined(store.getMergeableContent)
+const getStoreFunctions = (supportedStoreType = 1, store) =>
+  supportedStoreType > 1 && 'getMergeableContent' in store
     ? [
-        0,
-        store.getContent,
-        store.getTransactionChanges,
-        ([changedTables, changedValues]) =>
-          !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
-        store.setContent,
-      ]
-    : [
         1,
         store.getMergeableContent,
         store.getTransactionMergeableChanges,
         ([[changedTables], [changedValues]]) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
-      ];
+      ]
+    : supportedStoreType != 2
+      ? [
+          0,
+          store.getContent,
+          store.getTransactionChanges,
+          ([changedTables, changedValues]) =>
+            !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
+          store.setContent,
+        ]
+      : /* istanbul ignore next */
+        0;
 const createCustomPersister = (
   store,
   getPersisted,
@@ -101,7 +104,7 @@ const createCustomPersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
-  supportsMergeableStore,
+  supportedStoreType,
   extra = {},
   scheduleId = [],
 ) => {
@@ -119,7 +122,7 @@ const createCustomPersister = (
     getChanges,
     hasChanges,
     setDefaultContent,
-  ] = getStoreFunctions(supportsMergeableStore, store);
+  ] = getStoreFunctions(supportedStoreType, store);
   const run = async () => {
     /* istanbul ignore else */
     if (!mapGet(scheduleRunning, scheduleId)) {
@@ -137,20 +140,6 @@ const createCustomPersister = (
       mapSet(scheduleRunning, scheduleId, 0);
     }
   };
-  const loadLock = async (actions) => {
-    /* istanbul ignore else */
-    if (loadSave != 2) {
-      loadSave = 1;
-      {
-        loads++;
-      }
-      await persister.schedule(async () => {
-        await actions();
-        loadSave = 0;
-      });
-    }
-    return persister;
-  };
   const setContentOrChanges = (contentOrChanges) => {
     (isMergeableStore && isArray(contentOrChanges?.[0])
       ? contentOrChanges?.[2] === 1
@@ -160,9 +149,14 @@ const createCustomPersister = (
         ? store.applyChanges
         : store.setContent)(contentOrChanges);
   };
-  const persister = {
-    load: async (initialContent) =>
-      await loadLock(async () => {
+  const load = async (initialContent) => {
+    /* istanbul ignore else */
+    if (loadSave != 2) {
+      loadSave = 1;
+      {
+        loads++;
+      }
+      await schedule(async () => {
         try {
           setContentOrChanges(await getPersisted());
         } catch (error) {
@@ -171,76 +165,94 @@ const createCustomPersister = (
             setDefaultContent(initialContent);
           }
         }
-      }),
-    startAutoLoad: async (initialContent) => {
-      await persister.stopAutoLoad().load(initialContent);
-      autoLoadHandle = addPersisterListener(
-        async (getContent2, getChanges2) => {
-          const changes = getChanges2?.();
-          await loadLock(async () => {
-            try {
-              setContentOrChanges(
-                changes ?? getContent2?.() ?? (await getPersisted()),
-              );
-            } catch (error) {
-              onIgnoredError?.(error);
-            }
-          });
-        },
-      );
-      return persister;
-    },
-    stopAutoLoad: () => {
-      if (autoLoadHandle) {
-        delPersisterListener(autoLoadHandle);
-        autoLoadHandle = void 0;
-      }
-      return persister;
-    },
-    isAutoLoading: () => !isUndefined(autoLoadHandle),
-    save: async (getChanges2) => {
-      /* istanbul ignore else */
-      if (loadSave != 1) {
-        loadSave = 2;
-        {
-          saves++;
-        }
-        await persister.schedule(async () => {
-          try {
-            await setPersisted(getContent, getChanges2);
-          } catch (error) {
-            /* istanbul ignore next */
-            onIgnoredError?.(error);
+        loadSave = 0;
+      });
+    }
+    return persister;
+  };
+  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;
-        });
+        }
+      } else {
+        await load();
       }
-      return persister;
-    },
-    startAutoSave: async () => {
-      await persister.stopAutoSave().save();
-      autoSaveListenerId = store.addDidFinishTransactionListener(() => {
-        const changes = getChanges();
-        if (hasChanges(changes)) {
-          persister.save(() => changes);
+    });
+    return persister;
+  };
+  const stopAutoLoad = () => {
+    if (autoLoadHandle) {
+      delPersisterListener(autoLoadHandle);
+      autoLoadHandle = void 0;
+    }
+    return persister;
+  };
+  const isAutoLoading = () => !isUndefined(autoLoadHandle);
+  const save = async (changes) => {
+    /* istanbul ignore else */
+    if (loadSave != 1) {
+      loadSave = 2;
+      {
+        saves++;
+      }
+      await schedule(async () => {
+        try {
+          await setPersisted(getContent, changes);
+        } catch (error) {
+          /* istanbul ignore next */
+          onIgnoredError?.(error);
         }
+        loadSave = 0;
       });
-      return persister;
-    },
-    stopAutoSave: () => {
-      ifNotUndefined(autoSaveListenerId, store.delListener);
-      autoSaveListenerId = void 0;
-      return persister;
-    },
-    isAutoSaving: () => !isUndefined(autoSaveListenerId),
-    schedule: async (...actions) => {
-      arrayPush(mapGet(scheduleActions, scheduleId), ...actions);
-      await run();
-      return persister;
-    },
-    getStore: () => store,
-    destroy: () => persister.stopAutoLoad().stopAutoSave(),
-    getStats: () => ({loads, saves}),
+    }
+    return persister;
+  };
+  const startAutoSave = async () => {
+    await stopAutoSave().save();
+    autoSaveListenerId = store.addDidFinishTransactionListener(() => {
+      const changes = getChanges();
+      if (hasChanges(changes)) {
+        save(changes);
+      }
+    });
+    return persister;
+  };
+  const stopAutoSave = () => {
+    ifNotUndefined(autoSaveListenerId, store.delListener);
+    autoSaveListenerId = void 0;
+    return persister;
+  };
+  const isAutoSaving = () => !isUndefined(autoSaveListenerId);
+  const schedule = async (...actions) => {
+    arrayPush(mapGet(scheduleActions, scheduleId), ...actions);
+    await run();
+    return persister;
+  };
+  const getStore = () => store;
+  const destroy = () => stopAutoLoad().stopAutoSave();
+  const getStats = () => ({loads, saves});
+  const persister = {
+    load,
+    startAutoLoad,
+    stopAutoLoad,
+    isAutoLoading,
+    save,
+    startAutoSave,
+    stopAutoSave,
+    isAutoSaving,
+    schedule,
+    getStore,
+    destroy,
+    getStats,
     ...extra,
   };
   return objFreeze(persister);
@@ -356,10 +368,10 @@ const createCustomSynchronizer = (
       );
     } else if (messageType == CONTENT_HASHES && persister.isAutoLoading()) {
       getChangesFromOtherStore(fromClientId, messageBody).then((changes) => {
-        persisterListener?.(void 0, () => changes);
+        persisterListener?.(void 0, changes);
       });
     } else if (messageType == CONTENT_DIFF && persister.isAutoLoading()) {
-      persisterListener?.(void 0, () => messageBody);
+      persisterListener?.(void 0, messageBody);
     } else {
       ifNotUndefined(
         messageType == GET_CONTENT_HASHES && persister.isAutoSaving()
@@ -483,12 +495,12 @@ const createCustomSynchronizer = (
       ? changes
       : void 0;
   };
-  const setPersisted = async (getContent, getChanges) => {
+  const setPersisted = async (_getContent, changes) => {
     {
       sends++;
     }
-    if (getChanges) {
-      send(null, null, CONTENT_DIFF, getChanges());
+    if (changes) {
+      send(null, null, CONTENT_DIFF, changes);
     } else {
       send(null, null, CONTENT_HASHES, store.getMergeableContentHashes());
     }
@@ -510,7 +522,7 @@ const createCustomSynchronizer = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    true,
+    2,
     {startSync, stopSync, destroy, getSynchronizerStats, ...extra},
   );
   return persister;