tinybase 5.0.0-beta.7 → 5.0.0-beta.9

package/lib/debug/persisters/persister-yjs.js

@@ -76,6 +76,7 @@ const getStoreFunctions = (supportsMergeableStore, store) =>
         store.getTransactionChanges,
         ([changedTables, changedValues]) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
+        store.setContent,
       ]
     : [
         1,
@@ -83,6 +84,7 @@ const getStoreFunctions = (supportsMergeableStore, store) =>
         store.getTransactionMergeableChanges,
         ([, [[, changedTables], [, changedValues]]]) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
+        store.setDefaultContent,
       ];
 const createCustomPersister = (
   store,
@@ -103,8 +105,13 @@ const createCustomPersister = (
   let autoSaveListenerId;
   mapEnsure(scheduleRunning, scheduleId, () => 0);
   mapEnsure(scheduleActions, scheduleId, () => []);
-  const [isMergeableStore, getContent, getChanges, hasChanges] =
-    getStoreFunctions(supportsMergeableStore, store);
+  const [
+    isMergeableStore,
+    getContent,
+    getChanges,
+    hasChanges,
+    setDefaultContent,
+  ] = getStoreFunctions(supportsMergeableStore, store);
   const run = async () => {
     /* istanbul ignore else */
     if (!mapGet(scheduleRunning, scheduleId)) {
@@ -146,17 +153,19 @@ const createCustomPersister = (
         : store.setContent)(contentOrChanges);
   };
   const persister = {
-    load: async (initialTables, initialValues) =>
+    load: async (initialContent) =>
       await loadLock(async () => {
         try {
           setContentOrChanges(await getPersisted());
         } catch (error) {
           onIgnoredError?.(error);
-          store.setContent([initialTables, initialValues]);
+          if (initialContent) {
+            setDefaultContent(initialContent);
+          }
         }
       }),
-    startAutoLoad: async (initialTables = {}, initialValues = {}) => {
-      await persister.stopAutoLoad().load(initialTables, initialValues);
+    startAutoLoad: async (initialContent) => {
+      await persister.stopAutoLoad().load(initialContent);
       autoLoadHandle = addPersisterListener(
         async (getContent2, getChanges2) => {
           const changes = getChanges2?.();

package/lib/debug/persisters.js

@@ -54,6 +54,7 @@ const getStoreFunctions = (supportsMergeableStore, store) =>
         store.getTransactionChanges,
         ([changedTables, changedValues]) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
+        store.setContent,
       ]
     : [
         1,
@@ -61,6 +62,7 @@ const getStoreFunctions = (supportsMergeableStore, store) =>
         store.getTransactionMergeableChanges,
         ([, [[, changedTables], [, changedValues]]]) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
+        store.setDefaultContent,
       ];
 const createCustomPersister = (
   store,
@@ -81,8 +83,13 @@ const createCustomPersister = (
   let autoSaveListenerId;
   mapEnsure(scheduleRunning, scheduleId, () => 0);
   mapEnsure(scheduleActions, scheduleId, () => []);
-  const [isMergeableStore, getContent, getChanges, hasChanges] =
-    getStoreFunctions(supportsMergeableStore, store);
+  const [
+    isMergeableStore,
+    getContent,
+    getChanges,
+    hasChanges,
+    setDefaultContent,
+  ] = getStoreFunctions(supportsMergeableStore, store);
   const run = async () => {
     /* istanbul ignore else */
     if (!mapGet(scheduleRunning, scheduleId)) {
@@ -124,17 +131,19 @@ const createCustomPersister = (
         : store.setContent)(contentOrChanges);
   };
   const persister = {
-    load: async (initialTables, initialValues) =>
+    load: async (initialContent) =>
       await loadLock(async () => {
         try {
           setContentOrChanges(await getPersisted());
         } catch (error) {
           onIgnoredError?.(error);
-          store.setContent([initialTables, initialValues]);
+          if (initialContent) {
+            setDefaultContent(initialContent);
+          }
         }
       }),
-    startAutoLoad: async (initialTables = {}, initialValues = {}) => {
-      await persister.stopAutoLoad().load(initialTables, initialValues);
+    startAutoLoad: async (initialContent) => {
+      await persister.stopAutoLoad().load(initialContent);
       autoLoadHandle = addPersisterListener(
         async (getContent2, getChanges2) => {
           const changes = getChanges2?.();

package/lib/debug/synchronizers/synchronizer-local.js

@@ -62,6 +62,7 @@ const getStoreFunctions = (supportsMergeableStore, store) =>
         store.getTransactionChanges,
         ([changedTables, changedValues]) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
+        store.setContent,
       ]
     : [
         1,
@@ -69,6 +70,7 @@ const getStoreFunctions = (supportsMergeableStore, store) =>
         store.getTransactionMergeableChanges,
         ([, [[, changedTables], [, changedValues]]]) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
+        store.setDefaultContent,
       ];
 const createCustomPersister = (
   store,
@@ -89,8 +91,13 @@ const createCustomPersister = (
   let autoSaveListenerId;
   mapEnsure(scheduleRunning, scheduleId, () => 0);
   mapEnsure(scheduleActions, scheduleId, () => []);
-  const [isMergeableStore, getContent, getChanges, hasChanges] =
-    getStoreFunctions(supportsMergeableStore, store);
+  const [
+    isMergeableStore,
+    getContent,
+    getChanges,
+    hasChanges,
+    setDefaultContent,
+  ] = getStoreFunctions(supportsMergeableStore, store);
   const run = async () => {
     /* istanbul ignore else */
     if (!mapGet(scheduleRunning, scheduleId)) {
@@ -132,17 +139,19 @@ const createCustomPersister = (
         : store.setContent)(contentOrChanges);
   };
   const persister = {
-    load: async (initialTables, initialValues) =>
+    load: async (initialContent) =>
       await loadLock(async () => {
         try {
           setContentOrChanges(await getPersisted());
         } catch (error) {
           onIgnoredError?.(error);
-          store.setContent([initialTables, initialValues]);
+          if (initialContent) {
+            setDefaultContent(initialContent);
+          }
         }
       }),
-    startAutoLoad: async (initialTables = {}, initialValues = {}) => {
-      await persister.stopAutoLoad().load(initialTables, initialValues);
+    startAutoLoad: async (initialContent) => {
+      await persister.stopAutoLoad().load(initialContent);
       autoLoadHandle = addPersisterListener(
         async (getContent2, getChanges2) => {
           const changes = getChanges2?.();
@@ -310,9 +319,10 @@ const createCustomSynchronizer = (
   store,
   send,
   onReceive,
-  destroy,
-  requestTimeoutSeconds = 1,
+  destroyImpl,
+  requestTimeoutSeconds,
   onIgnoredError,
+  extra = {},
 ) => {
   let persisterListener;
   let sends = 0;
@@ -444,6 +454,14 @@ const createCustomSynchronizer = (
   };
   const addPersisterListener = (listener) => (persisterListener = listener);
   const delPersisterListener = () => (persisterListener = void 0);
+  const startSync = async (initialContent) =>
+    await (await persister.startAutoLoad(initialContent)).startAutoSave();
+  const stopSync = () => persister.stopAutoLoad().stopAutoSave();
+  const destroy = () => {
+    destroyImpl();
+    return persister.stopSync();
+  };
+  const getSynchronizerStats = () => ({sends, receives});
   const persister = createCustomPersister(
     store,
     getPersisted,
@@ -452,16 +470,7 @@ const createCustomSynchronizer = (
     delPersisterListener,
     onIgnoredError,
     true,
-    {
-      startSync: async () =>
-        await (await persister.startAutoLoad()).startAutoSave(),
-      stopSync: () => persister.stopAutoLoad().stopAutoSave(),
-      destroy: () => {
-        destroy();
-        return persister.stopSync();
-      },
-      getSynchronizerStats: () => ({sends, receives}),
-    },
+    {startSync, stopSync, destroy, getSynchronizerStats, ...extra},
   );
   return persister;
 };

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

@@ -70,6 +70,7 @@ const getStoreFunctions = (supportsMergeableStore, store) =>
         store.getTransactionChanges,
         ([changedTables, changedValues]) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
+        store.setContent,
       ]
     : [
         1,
@@ -77,6 +78,7 @@ const getStoreFunctions = (supportsMergeableStore, store) =>
         store.getTransactionMergeableChanges,
         ([, [[, changedTables], [, changedValues]]]) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
+        store.setDefaultContent,
       ];
 const createCustomPersister = (
   store,
@@ -97,8 +99,13 @@ const createCustomPersister = (
   let autoSaveListenerId;
   mapEnsure(scheduleRunning, scheduleId, () => 0);
   mapEnsure(scheduleActions, scheduleId, () => []);
-  const [isMergeableStore, getContent, getChanges, hasChanges] =
-    getStoreFunctions(supportsMergeableStore, store);
+  const [
+    isMergeableStore,
+    getContent,
+    getChanges,
+    hasChanges,
+    setDefaultContent,
+  ] = getStoreFunctions(supportsMergeableStore, store);
   const run = async () => {
     /* istanbul ignore else */
     if (!mapGet(scheduleRunning, scheduleId)) {
@@ -140,17 +147,19 @@ const createCustomPersister = (
         : store.setContent)(contentOrChanges);
   };
   const persister = {
-    load: async (initialTables, initialValues) =>
+    load: async (initialContent) =>
       await loadLock(async () => {
         try {
           setContentOrChanges(await getPersisted());
         } catch (error) {
           onIgnoredError?.(error);
-          store.setContent([initialTables, initialValues]);
+          if (initialContent) {
+            setDefaultContent(initialContent);
+          }
         }
       }),
-    startAutoLoad: async (initialTables = {}, initialValues = {}) => {
-      await persister.stopAutoLoad().load(initialTables, initialValues);
+    startAutoLoad: async (initialContent) => {
+      await persister.stopAutoLoad().load(initialContent);
       autoLoadHandle = addPersisterListener(
         async (getContent2, getChanges2) => {
           const changes = getChanges2?.();
@@ -318,9 +327,10 @@ const createCustomSynchronizer = (
   store,
   send,
   onReceive,
-  destroy,
-  requestTimeoutSeconds = 1,
+  destroyImpl,
+  requestTimeoutSeconds,
   onIgnoredError,
+  extra = {},
 ) => {
   let persisterListener;
   let sends = 0;
@@ -452,6 +462,14 @@ const createCustomSynchronizer = (
   };
   const addPersisterListener = (listener) => (persisterListener = listener);
   const delPersisterListener = () => (persisterListener = void 0);
+  const startSync = async (initialContent) =>
+    await (await persister.startAutoLoad(initialContent)).startAutoSave();
+  const stopSync = () => persister.stopAutoLoad().stopAutoSave();
+  const destroy = () => {
+    destroyImpl();
+    return persister.stopSync();
+  };
+  const getSynchronizerStats = () => ({sends, receives});
   const persister = createCustomPersister(
     store,
     getPersisted,
@@ -460,16 +478,7 @@ const createCustomSynchronizer = (
     delPersisterListener,
     onIgnoredError,
     true,
-    {
-      startSync: async () =>
-        await (await persister.startAutoLoad()).startAutoSave(),
-      stopSync: () => persister.stopAutoLoad().stopAutoSave(),
-      destroy: () => {
-        destroy();
-        return persister.stopSync();
-      },
-      getSynchronizerStats: () => ({sends, receives}),
-    },
+    {startSync, stopSync, destroy, getSynchronizerStats, ...extra},
   );
   return persister;
 };
@@ -477,22 +486,12 @@ const createCustomSynchronizer = (
 const createWsSynchronizer = async (
   store,
   webSocket,
-  requestTimeoutSeconds,
+  requestTimeoutSeconds = 1,
   onIgnoredError,
 ) => {
   let currentReceive;
-  webSocket.on('message', (data) => {
-    if (!isUndefined(currentReceive)) {
-      const payload = data.toString(UTF8);
-      const splitAt = payload.indexOf(MESSAGE_SEPARATOR);
-      if (splitAt !== -1) {
-        currentReceive(
-          slice(payload, 0, splitAt),
-          ...jsonParse(slice(payload, splitAt + 1)),
-        );
-      }
-    }
-  });
+  const addEventListener = (event, handler) =>
+    webSocket.addEventListener(event, handler);
   const onReceive = (receive) => {
     currentReceive = receive;
   };
@@ -511,11 +510,24 @@ const createWsSynchronizer = async (
     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),
+          ...jsonParse(slice(data, splitAt + 1)),
+        );
+      }
+    }
+  });
   return promiseNew((resolve, reject) => {
     if (webSocket.readyState != webSocket.OPEN) {
-      webSocket.on('error', reject);
-      webSocket.on('open', () => resolve(synchronizer));
+      addEventListener('error', reject);
+      addEventListener('open', () => resolve(synchronizer));
     } else {
       resolve(synchronizer);
     }

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

@@ -2,54 +2,93 @@ const EMPTY_STRING = '';
 const UTF8 = 'utf8';
 
 const isUndefined = (thing) => thing == void 0;
+const ifNotUndefined = (value, then, otherwise) =>
+  isUndefined(value) ? otherwise?.() : then(value);
 const slice = (arrayOrString, start, end) => arrayOrString.slice(start, end);
 
+const arrayReduce = (array, cb, initial) => array.reduce(cb, initial);
+
+const collSizeN = (collSizer) => (coll) =>
+  arrayReduce(collValues(coll), (total, coll2) => total + collSizer(coll2), 0);
+const collSize = (coll) => coll?.size ?? 0;
+const collSize2 = collSizeN(collSize);
+const collHas = (coll, keyOrValue) => coll?.has(keyOrValue) ?? false;
+const collIsEmpty = (coll) => isUndefined(coll) || collSize(coll) == 0;
+const collValues = (coll) => [...(coll?.values() ?? [])];
 const collClear = (coll) => coll.clear();
 const collForEach = (coll, cb) => coll?.forEach(cb);
 const collDel = (coll, keyOrValue) => coll?.delete(keyOrValue);
 
 const mapNew = (entries) => new Map(entries);
+const mapKeys = (map) => [...(map?.keys() ?? [])];
 const mapGet = (map, key) => map?.get(key);
 const mapForEach = (map, cb) =>
   collForEach(map, (value, key) => cb(key, value));
 const mapSet = (map, key, value) =>
   isUndefined(value) ? (collDel(map, key), map) : map?.set(key, value);
+const mapEnsure = (map, key, getDefaultValue, hadExistingValue) => {
+  if (!collHas(map, key)) {
+    mapSet(map, key, getDefaultValue());
+  } else {
+    hadExistingValue?.(mapGet(map, key));
+  }
+  return mapGet(map, key);
+};
 
 const MESSAGE_SEPARATOR = '\n';
 
+const PATH_REGEX = /\/([^?]*)/;
 const createWsServer = (webSocketServer) => {
-  const clients = mapNew();
-  webSocketServer.on('connection', (webSocket, request) => {
-    const clientId = request.headers['sec-websocket-key'];
-    mapSet(clients, clientId, webSocket);
-    webSocket.on('message', (data) => {
-      const payload = data.toString(UTF8);
-      const splitAt = payload.indexOf(MESSAGE_SEPARATOR);
-      if (splitAt !== -1) {
-        const toClientId = slice(payload, 0, splitAt);
-        const message = slice(payload, splitAt + 1);
-        toClientId === EMPTY_STRING
-          ? mapForEach(clients, (otherClientId, otherWebSocket) =>
-              otherClientId != clientId
-                ? otherWebSocket.send(clientId + MESSAGE_SEPARATOR + message)
-                : 0,
-            )
-          : mapGet(clients, toClientId)?.send(
-              clientId + MESSAGE_SEPARATOR + message,
-            );
-      }
-    });
-    webSocket.on('close', () => {
-      collDel(clients, clientId);
-    });
-  });
+  const clientsByPath = mapNew();
+  webSocketServer.on('connection', (webSocket, request) =>
+    ifNotUndefined(request.url?.match(PATH_REGEX), ([path]) =>
+      ifNotUndefined(request.headers['sec-websocket-key'], (clientId) => {
+        const clients = mapEnsure(clientsByPath, path, mapNew);
+        mapSet(clients, clientId, webSocket);
+        webSocket.on('message', (data) => {
+          const payload = data.toString(UTF8);
+          const splitAt = payload.indexOf(MESSAGE_SEPARATOR);
+          if (splitAt !== -1) {
+            const toClientId = slice(payload, 0, splitAt);
+            const message = slice(payload, splitAt + 1);
+            toClientId === EMPTY_STRING
+              ? mapForEach(clients, (otherClientId, otherWebSocket) =>
+                  otherClientId != clientId
+                    ? otherWebSocket.send(
+                        clientId + MESSAGE_SEPARATOR + message,
+                      )
+                    : 0,
+                )
+              : mapGet(clients, toClientId)?.send(
+                  clientId + MESSAGE_SEPARATOR + message,
+                );
+          }
+        });
+        webSocket.on('close', () => {
+          collDel(clients, clientId);
+          if (collIsEmpty(clients)) {
+            collDel(clientsByPath, path);
+          }
+        });
+      }),
+    ),
+  );
   const getWebSocketServer = () => webSocketServer;
+  const getPaths = () => mapKeys(clientsByPath);
+  const getClientIds = (path) => mapKeys(mapGet(clientsByPath, path));
+  const getStats = () => ({
+    paths: collSize(clientsByPath),
+    clients: collSize2(clientsByPath),
+  });
   const destroy = () => {
     webSocketServer.close();
-    collClear(clients);
+    collClear(clientsByPath);
   };
   return {
     getWebSocketServer,
+    getPaths,
+    getClientIds,
+    getStats,
     destroy,
   };
 };

package/lib/debug/synchronizers.js

@@ -59,6 +59,7 @@ const getStoreFunctions = (supportsMergeableStore, store) =>
         store.getTransactionChanges,
         ([changedTables, changedValues]) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
+        store.setContent,
       ]
     : [
         1,
@@ -66,6 +67,7 @@ const getStoreFunctions = (supportsMergeableStore, store) =>
         store.getTransactionMergeableChanges,
         ([, [[, changedTables], [, changedValues]]]) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
+        store.setDefaultContent,
       ];
 const createCustomPersister = (
   store,
@@ -86,8 +88,13 @@ const createCustomPersister = (
   let autoSaveListenerId;
   mapEnsure(scheduleRunning, scheduleId, () => 0);
   mapEnsure(scheduleActions, scheduleId, () => []);
-  const [isMergeableStore, getContent, getChanges, hasChanges] =
-    getStoreFunctions(supportsMergeableStore, store);
+  const [
+    isMergeableStore,
+    getContent,
+    getChanges,
+    hasChanges,
+    setDefaultContent,
+  ] = getStoreFunctions(supportsMergeableStore, store);
   const run = async () => {
     /* istanbul ignore else */
     if (!mapGet(scheduleRunning, scheduleId)) {
@@ -129,17 +136,19 @@ const createCustomPersister = (
         : store.setContent)(contentOrChanges);
   };
   const persister = {
-    load: async (initialTables, initialValues) =>
+    load: async (initialContent) =>
       await loadLock(async () => {
         try {
           setContentOrChanges(await getPersisted());
         } catch (error) {
           onIgnoredError?.(error);
-          store.setContent([initialTables, initialValues]);
+          if (initialContent) {
+            setDefaultContent(initialContent);
+          }
         }
       }),
-    startAutoLoad: async (initialTables = {}, initialValues = {}) => {
-      await persister.stopAutoLoad().load(initialTables, initialValues);
+    startAutoLoad: async (initialContent) => {
+      await persister.stopAutoLoad().load(initialContent);
       autoLoadHandle = addPersisterListener(
         async (getContent2, getChanges2) => {
           const changes = getChanges2?.();
@@ -307,9 +316,10 @@ const createCustomSynchronizer = (
   store,
   send,
   onReceive,
-  destroy,
-  requestTimeoutSeconds = 1,
+  destroyImpl,
+  requestTimeoutSeconds,
   onIgnoredError,
+  extra = {},
 ) => {
   let persisterListener;
   let sends = 0;
@@ -441,6 +451,14 @@ const createCustomSynchronizer = (
   };
   const addPersisterListener = (listener) => (persisterListener = listener);
   const delPersisterListener = () => (persisterListener = void 0);
+  const startSync = async (initialContent) =>
+    await (await persister.startAutoLoad(initialContent)).startAutoSave();
+  const stopSync = () => persister.stopAutoLoad().stopAutoSave();
+  const destroy = () => {
+    destroyImpl();
+    return persister.stopSync();
+  };
+  const getSynchronizerStats = () => ({sends, receives});
   const persister = createCustomPersister(
     store,
     getPersisted,
@@ -449,16 +467,7 @@ const createCustomSynchronizer = (
     delPersisterListener,
     onIgnoredError,
     true,
-    {
-      startSync: async () =>
-        await (await persister.startAutoLoad()).startAutoSave(),
-      stopSync: () => persister.stopAutoLoad().stopAutoSave(),
-      destroy: () => {
-        destroy();
-        return persister.stopSync();
-      },
-      getSynchronizerStats: () => ({sends, receives}),
-    },
+    {startSync, stopSync, destroy, getSynchronizerStats, ...extra},
   );
   return persister;
 };