tinybase 5.4.0-beta.1 → 5.4.0-beta.2

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

@@ -140,8 +140,8 @@
     );
   const createPayload = (toClientId, ...args) =>
     createRawPayload(toClientId ?? EMPTY_STRING, jsonStringWithUndefined(args));
-  const createRawPayload = (toClientId, remainder) =>
-    toClientId + MESSAGE_SEPARATOR + remainder;
+  const createRawPayload = (clientId, remainder) =>
+    clientId + MESSAGE_SEPARATOR + remainder;
 
   const newStamp = (value, time) => (time ? [value, time] : [value]);
   const getLatestTime = (time1, time2) =>
@@ -719,10 +719,8 @@
           if (clientId !== SERVER_CLIENT_ID) {
             serverClient[3 /* Send */]?.(forwardedPayload);
           }
-          mapForEach(clients, (otherClientId, otherWebSocket) =>
-            otherClientId !== clientId
-              ? otherWebSocket.send(forwardedPayload)
-              : 0,
+          mapForEach(clients, (otherClientId, otherClient) =>
+            otherClientId !== clientId ? otherClient.send(forwardedPayload) : 0,
           );
         } else if (toClientId === SERVER_CLIENT_ID) {
           serverClient[3 /* Send */]?.(forwardedPayload);
@@ -730,7 +728,7 @@
           mapGet(clients, toClientId)?.send(forwardedPayload);
         }
       });
-    webSocketServer.on('connection', (webSocket, request) =>
+    webSocketServer.on('connection', (client, request) =>
       ifNotUndefined(strMatch(request.url, PATH_REGEX), ([, pathId]) =>
         ifNotUndefined(
           request.headers['sec-websocket-key'],
@@ -748,9 +746,9 @@
               callListeners(pathIdListeners, void 0, pathId, 1);
               await configureServerClient(serverClient, pathId, clients);
             }
-            mapSet(clients, clientId, webSocket);
+            mapSet(clients, clientId, client);
             callListeners(clientIdListeners, [pathId], clientId, 1);
-            webSocket.on('message', (data) => {
+            client.on('message', (data) => {
               const payload = data.toString(UTF8);
               if (serverClient[0 /* State */] == 0 /* Ready */) {
                 messageHandler(payload);
@@ -763,7 +761,7 @@
               arrayForEach(serverClient[4 /* Buffer */], messageHandler);
               serverClient[4 /* Buffer */] = [];
             }
-            webSocket.on('close', () => {
+            client.on('close', () => {
               collDel(clients, clientId);
               callListeners(clientIdListeners, [pathId], clientId, -1);
               if (collIsEmpty(clients)) {
@@ -779,7 +777,7 @@
     );
     const getWebSocketServer = () => webSocketServer;
     const getPathIds = () => mapKeys(clientsByPath);
-    const getClientIds = (path) => mapKeys(mapGet(clientsByPath, path));
+    const getClientIds = (pathId) => mapKeys(mapGet(clientsByPath, pathId));
     const addPathIdsListener = (listener) =>
       addListener(listener, pathIdListeners);
     const addClientIdsListener = (pathId, listener) =>

package/umd/synchronizers/synchronizer-ws-server/with-schemas/index.js

@@ -140,8 +140,8 @@
     );
   const createPayload = (toClientId, ...args) =>
     createRawPayload(toClientId ?? EMPTY_STRING, jsonStringWithUndefined(args));
-  const createRawPayload = (toClientId, remainder) =>
-    toClientId + MESSAGE_SEPARATOR + remainder;
+  const createRawPayload = (clientId, remainder) =>
+    clientId + MESSAGE_SEPARATOR + remainder;
 
   const newStamp = (value, time) => (time ? [value, time] : [value]);
   const getLatestTime = (time1, time2) =>
@@ -719,10 +719,8 @@
           if (clientId !== SERVER_CLIENT_ID) {
             serverClient[3 /* Send */]?.(forwardedPayload);
           }
-          mapForEach(clients, (otherClientId, otherWebSocket) =>
-            otherClientId !== clientId
-              ? otherWebSocket.send(forwardedPayload)
-              : 0,
+          mapForEach(clients, (otherClientId, otherClient) =>
+            otherClientId !== clientId ? otherClient.send(forwardedPayload) : 0,
           );
         } else if (toClientId === SERVER_CLIENT_ID) {
           serverClient[3 /* Send */]?.(forwardedPayload);
@@ -730,7 +728,7 @@
           mapGet(clients, toClientId)?.send(forwardedPayload);
         }
       });
-    webSocketServer.on('connection', (webSocket, request) =>
+    webSocketServer.on('connection', (client, request) =>
       ifNotUndefined(strMatch(request.url, PATH_REGEX), ([, pathId]) =>
         ifNotUndefined(
           request.headers['sec-websocket-key'],
@@ -748,9 +746,9 @@
               callListeners(pathIdListeners, void 0, pathId, 1);
               await configureServerClient(serverClient, pathId, clients);
             }
-            mapSet(clients, clientId, webSocket);
+            mapSet(clients, clientId, client);
             callListeners(clientIdListeners, [pathId], clientId, 1);
-            webSocket.on('message', (data) => {
+            client.on('message', (data) => {
               const payload = data.toString(UTF8);
               if (serverClient[0 /* State */] == 0 /* Ready */) {
                 messageHandler(payload);
@@ -763,7 +761,7 @@
               arrayForEach(serverClient[4 /* Buffer */], messageHandler);
               serverClient[4 /* Buffer */] = [];
             }
-            webSocket.on('close', () => {
+            client.on('close', () => {
               collDel(clients, clientId);
               callListeners(clientIdListeners, [pathId], clientId, -1);
               if (collIsEmpty(clients)) {
@@ -779,7 +777,7 @@
     );
     const getWebSocketServer = () => webSocketServer;
     const getPathIds = () => mapKeys(clientsByPath);
-    const getClientIds = (path) => mapKeys(mapGet(clientsByPath, path));
+    const getClientIds = (pathId) => mapKeys(mapGet(clientsByPath, pathId));
     const addPathIdsListener = (listener) =>
       addListener(listener, pathIdListeners);
     const addClientIdsListener = (pathId, listener) =>

package/umd/synchronizers/synchronizer-ws-server-durable-object/index.js

@@ -0,0 +1,113 @@
+(function (global, factory) {
+  typeof exports === 'object' && typeof module !== 'undefined'
+    ? factory(exports, require('cloudflare:workers'))
+    : typeof define === 'function' && define.amd
+      ? define(['exports', 'cloudflare:workers'], factory)
+      : ((global =
+          typeof globalThis !== 'undefined' ? globalThis : global || self),
+        factory(
+          (global.TinyBaseSynchronizerWsServerDurableObject = {}),
+          global.cloudflare_workers,
+        ));
+})(this, function (exports, cloudflare_workers) {
+  'use strict';
+
+  const EMPTY_STRING = '';
+  const strMatch = (str, regex) => str?.match(regex);
+
+  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 size = (arrayOrString) => arrayOrString.length;
+
+  const arrayForEach = (array, cb) => array.forEach(cb);
+  const arrayMap = (array, cb) => array.map(cb);
+  const arrayIsEmpty = (array) => size(array) == 0;
+
+  const object = Object;
+  const objValues = (obj) => object.values(obj);
+
+  const MESSAGE_SEPARATOR = '\n';
+  const ifPayloadValid = (payload, then) => {
+    const splitAt = payload.indexOf(MESSAGE_SEPARATOR);
+    if (splitAt !== -1) {
+      then(slice(payload, 0, splitAt), slice(payload, splitAt + 1));
+    }
+  };
+  const createRawPayload = (clientId, remainder) =>
+    clientId + MESSAGE_SEPARATOR + remainder;
+
+  const PATH_REGEX = /\/([^?]*)/;
+  const getPathId = (request) =>
+    strMatch(new URL(request.url).pathname, PATH_REGEX)?.[1] ?? EMPTY_STRING;
+  const getClientId = (request) =>
+    request.headers.get('upgrade')?.toLowerCase() == 'websocket'
+      ? request.headers.get('sec-websocket-key')
+      : null;
+  const createResponse = (status, webSocket = null, body = null) =>
+    new Response(body, {status, webSocket});
+  const createUpgradeRequiredResponse = () =>
+    createResponse(426, null, 'Upgrade required');
+  class WsServerDurableObject extends cloudflare_workers.DurableObject {
+    constructor(ctx, env) {
+      super(ctx, env);
+    }
+    fetch(request) {
+      const pathId = getPathId(request);
+      return ifNotUndefined(
+        getClientId(request),
+        (clientId) => {
+          const [webSocket, client] = objValues(new WebSocketPair());
+          client.serializeAttachment({pathId});
+          if (arrayIsEmpty(this.ctx.getWebSockets())) {
+            this.onPathId(pathId, 1);
+          }
+          this.ctx.acceptWebSocket(client, [clientId]);
+          this.onClientId(pathId, clientId, 1);
+          return createResponse(101, webSocket);
+        },
+        createUpgradeRequiredResponse,
+      );
+    }
+    webSocketMessage(client, message) {
+      ifNotUndefined(this.ctx.getTags(client)[0], (clientId) =>
+        ifPayloadValid(message.toString(), (toClientId, remainder) => {
+          const forwardedPayload = createRawPayload(clientId, remainder);
+          if (toClientId === EMPTY_STRING) {
+            arrayForEach(this.ctx.getWebSockets(), (otherClient) =>
+              otherClient !== client ? otherClient.send(forwardedPayload) : 0,
+            );
+          } else {
+            this.ctx.getWebSockets(toClientId)[0]?.send(forwardedPayload);
+          }
+        }),
+      );
+    }
+    webSocketClose(client) {
+      const {pathId} = client.deserializeAttachment();
+      this.onClientId(pathId, this.ctx.getTags(client)[0], -1);
+      if (size(this.ctx.getWebSockets()) == 1) {
+        this.onPathId(pathId, -1);
+      }
+    }
+    // --
+    getClientIds(_pathId) {
+      return arrayMap(
+        this.ctx.getWebSockets(),
+        (client) => this.ctx.getTags(client)[0],
+      );
+    }
+    onPathId(_pathId, _addedOrRemoved) {}
+    onClientId(_pathId, _clientId, _addedOrRemoved) {}
+  }
+  const getWsServerDurableObjectFetch = (namespace) => (request, env) =>
+    getClientId(request)
+      ? env[namespace]
+          .get(env[namespace].idFromName(getPathId(request)))
+          .fetch(request)
+      : createUpgradeRequiredResponse();
+
+  exports.WsServerDurableObject = WsServerDurableObject;
+  exports.getWsServerDurableObjectFetch = getWsServerDurableObjectFetch;
+});

package/umd/synchronizers/synchronizer-ws-server-durable-object/with-schemas/index.js

@@ -0,0 +1,113 @@
+(function (global, factory) {
+  typeof exports === 'object' && typeof module !== 'undefined'
+    ? factory(exports, require('cloudflare:workers'))
+    : typeof define === 'function' && define.amd
+      ? define(['exports', 'cloudflare:workers'], factory)
+      : ((global =
+          typeof globalThis !== 'undefined' ? globalThis : global || self),
+        factory(
+          (global.TinyBaseSynchronizerWsServerDurableObject = {}),
+          global.cloudflare_workers,
+        ));
+})(this, function (exports, cloudflare_workers) {
+  'use strict';
+
+  const EMPTY_STRING = '';
+  const strMatch = (str, regex) => str?.match(regex);
+
+  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 size = (arrayOrString) => arrayOrString.length;
+
+  const arrayForEach = (array, cb) => array.forEach(cb);
+  const arrayMap = (array, cb) => array.map(cb);
+  const arrayIsEmpty = (array) => size(array) == 0;
+
+  const object = Object;
+  const objValues = (obj) => object.values(obj);
+
+  const MESSAGE_SEPARATOR = '\n';
+  const ifPayloadValid = (payload, then) => {
+    const splitAt = payload.indexOf(MESSAGE_SEPARATOR);
+    if (splitAt !== -1) {
+      then(slice(payload, 0, splitAt), slice(payload, splitAt + 1));
+    }
+  };
+  const createRawPayload = (clientId, remainder) =>
+    clientId + MESSAGE_SEPARATOR + remainder;
+
+  const PATH_REGEX = /\/([^?]*)/;
+  const getPathId = (request) =>
+    strMatch(new URL(request.url).pathname, PATH_REGEX)?.[1] ?? EMPTY_STRING;
+  const getClientId = (request) =>
+    request.headers.get('upgrade')?.toLowerCase() == 'websocket'
+      ? request.headers.get('sec-websocket-key')
+      : null;
+  const createResponse = (status, webSocket = null, body = null) =>
+    new Response(body, {status, webSocket});
+  const createUpgradeRequiredResponse = () =>
+    createResponse(426, null, 'Upgrade required');
+  class WsServerDurableObject extends cloudflare_workers.DurableObject {
+    constructor(ctx, env) {
+      super(ctx, env);
+    }
+    fetch(request) {
+      const pathId = getPathId(request);
+      return ifNotUndefined(
+        getClientId(request),
+        (clientId) => {
+          const [webSocket, client] = objValues(new WebSocketPair());
+          client.serializeAttachment({pathId});
+          if (arrayIsEmpty(this.ctx.getWebSockets())) {
+            this.onPathId(pathId, 1);
+          }
+          this.ctx.acceptWebSocket(client, [clientId]);
+          this.onClientId(pathId, clientId, 1);
+          return createResponse(101, webSocket);
+        },
+        createUpgradeRequiredResponse,
+      );
+    }
+    webSocketMessage(client, message) {
+      ifNotUndefined(this.ctx.getTags(client)[0], (clientId) =>
+        ifPayloadValid(message.toString(), (toClientId, remainder) => {
+          const forwardedPayload = createRawPayload(clientId, remainder);
+          if (toClientId === EMPTY_STRING) {
+            arrayForEach(this.ctx.getWebSockets(), (otherClient) =>
+              otherClient !== client ? otherClient.send(forwardedPayload) : 0,
+            );
+          } else {
+            this.ctx.getWebSockets(toClientId)[0]?.send(forwardedPayload);
+          }
+        }),
+      );
+    }
+    webSocketClose(client) {
+      const {pathId} = client.deserializeAttachment();
+      this.onClientId(pathId, this.ctx.getTags(client)[0], -1);
+      if (size(this.ctx.getWebSockets()) == 1) {
+        this.onPathId(pathId, -1);
+      }
+    }
+    // --
+    getClientIds(_pathId) {
+      return arrayMap(
+        this.ctx.getWebSockets(),
+        (client) => this.ctx.getTags(client)[0],
+      );
+    }
+    onPathId(_pathId, _addedOrRemoved) {}
+    onClientId(_pathId, _clientId, _addedOrRemoved) {}
+  }
+  const getWsServerDurableObjectFetch = (namespace) => (request, env) =>
+    getClientId(request)
+      ? env[namespace]
+          .get(env[namespace].idFromName(getPathId(request)))
+          .fetch(request)
+      : createUpgradeRequiredResponse();
+
+  exports.WsServerDurableObject = WsServerDurableObject;
+  exports.getWsServerDurableObjectFetch = getWsServerDurableObjectFetch;
+});

package/umd/synchronizers/synchronizer-ws-server-simple/index.js

@@ -48,35 +48,34 @@
       then(slice(payload, 0, splitAt), slice(payload, splitAt + 1));
     }
   };
-  const createRawPayload = (toClientId, remainder) =>
-    toClientId + MESSAGE_SEPARATOR + remainder;
+  const createRawPayload = (clientId, remainder) =>
+    clientId + MESSAGE_SEPARATOR + remainder;
 
   const PATH_REGEX = /\/([^?]*)/;
   const createWsServerSimple = (webSocketServer) => {
     const clientsByPath = mapNew();
-    webSocketServer.on('connection', (webSocket, request) =>
+    webSocketServer.on('connection', (client, request) =>
       ifNotUndefined(strMatch(request.url, PATH_REGEX), ([, pathId]) =>
         ifNotUndefined(
           request.headers['sec-websocket-key'],
           async (clientId) => {
             const clients = mapEnsure(clientsByPath, pathId, mapNew);
-            mapSet(clients, clientId, webSocket);
-            webSocket.on('message', (data) => {
-              const payload = data.toString(UTF8);
-              ifPayloadValid(payload, (toClientId, remainder) => {
+            mapSet(clients, clientId, client);
+            client.on('message', (data) =>
+              ifPayloadValid(data.toString(UTF8), (toClientId, remainder) => {
                 const forwardedPayload = createRawPayload(clientId, remainder);
                 if (toClientId === EMPTY_STRING) {
-                  mapForEach(clients, (otherClientId, otherWebSocket) =>
+                  mapForEach(clients, (otherClientId, otherClient) =>
                     otherClientId !== clientId
-                      ? otherWebSocket.send(forwardedPayload)
+                      ? otherClient.send(forwardedPayload)
                       : 0,
                   );
                 } else {
                   mapGet(clients, toClientId)?.send(forwardedPayload);
                 }
-              });
-            });
-            webSocket.on('close', () => {
+              }),
+            );
+            client.on('close', () => {
               collDel(clients, clientId);
               if (collIsEmpty(clients)) {
                 collDel(clientsByPath, pathId);

package/umd/synchronizers/synchronizer-ws-server-simple/with-schemas/index.js

@@ -48,35 +48,34 @@
       then(slice(payload, 0, splitAt), slice(payload, splitAt + 1));
     }
   };
-  const createRawPayload = (toClientId, remainder) =>
-    toClientId + MESSAGE_SEPARATOR + remainder;
+  const createRawPayload = (clientId, remainder) =>
+    clientId + MESSAGE_SEPARATOR + remainder;
 
   const PATH_REGEX = /\/([^?]*)/;
   const createWsServerSimple = (webSocketServer) => {
     const clientsByPath = mapNew();
-    webSocketServer.on('connection', (webSocket, request) =>
+    webSocketServer.on('connection', (client, request) =>
       ifNotUndefined(strMatch(request.url, PATH_REGEX), ([, pathId]) =>
         ifNotUndefined(
           request.headers['sec-websocket-key'],
           async (clientId) => {
             const clients = mapEnsure(clientsByPath, pathId, mapNew);
-            mapSet(clients, clientId, webSocket);
-            webSocket.on('message', (data) => {
-              const payload = data.toString(UTF8);
-              ifPayloadValid(payload, (toClientId, remainder) => {
+            mapSet(clients, clientId, client);
+            client.on('message', (data) =>
+              ifPayloadValid(data.toString(UTF8), (toClientId, remainder) => {
                 const forwardedPayload = createRawPayload(clientId, remainder);
                 if (toClientId === EMPTY_STRING) {
-                  mapForEach(clients, (otherClientId, otherWebSocket) =>
+                  mapForEach(clients, (otherClientId, otherClient) =>
                     otherClientId !== clientId
-                      ? otherWebSocket.send(forwardedPayload)
+                      ? otherClient.send(forwardedPayload)
                       : 0,
                   );
                 } else {
                   mapGet(clients, toClientId)?.send(forwardedPayload);
                 }
-              });
-            });
-            webSocket.on('close', () => {
+              }),
+            );
+            client.on('close', () => {
               collDel(clients, clientId);
               if (collIsEmpty(clients)) {
                 collDel(clientsByPath, pathId);

package/umd/ui-react-inspector/index.js

@@ -2301,11 +2301,11 @@
     };
     const getNewRowId = (tableId, reuse) => {
       const [getId] = mapGet(tablePoolFunctions, tableId);
-      const rowId = getId(reuse);
-      if (!collHas(mapGet(tablesMap, tableId), rowId)) {
-        return rowId;
-      }
-      return getNewRowId(tableId, reuse);
+      let rowId;
+      do {
+        rowId = getId(reuse);
+      } while (collHas(mapGet(tablesMap, tableId), rowId));
+      return rowId;
     };
     const getOrCreateTable = (tableId) =>
       mapGet(tablesMap, tableId) ?? setValidTable(tableId, {});

package/umd/ui-react-inspector/with-schemas/index.js

@@ -2301,11 +2301,11 @@
     };
     const getNewRowId = (tableId, reuse) => {
       const [getId] = mapGet(tablePoolFunctions, tableId);
-      const rowId = getId(reuse);
-      if (!collHas(mapGet(tablesMap, tableId), rowId)) {
-        return rowId;
-      }
-      return getNewRowId(tableId, reuse);
+      let rowId;
+      do {
+        rowId = getId(reuse);
+      } while (collHas(mapGet(tablesMap, tableId), rowId));
+      return rowId;
     };
     const getOrCreateTable = (tableId) =>
       mapGet(tablesMap, tableId) ?? setValidTable(tableId, {});

package/umd/with-schemas/index.js

@@ -2207,11 +2207,11 @@
     };
     const getNewRowId = (tableId, reuse) => {
       const [getId] = mapGet(tablePoolFunctions, tableId);
-      const rowId = getId(reuse);
-      if (!collHas(mapGet(tablesMap, tableId), rowId)) {
-        return rowId;
-      }
-      return getNewRowId(tableId, reuse);
+      let rowId;
+      do {
+        rowId = getId(reuse);
+      } while (collHas(mapGet(tablesMap, tableId), rowId));
+      return rowId;
     };
     const getOrCreateTable = (tableId) =>
       mapGet(tablesMap, tableId) ?? setValidTable(tableId, {});

package/with-schemas/index.js

@@ -2155,11 +2155,11 @@ const createStore = () => {
   };
   const getNewRowId = (tableId, reuse) => {
     const [getId] = mapGet(tablePoolFunctions, tableId);
-    const rowId = getId(reuse);
-    if (!collHas(mapGet(tablesMap, tableId), rowId)) {
-      return rowId;
-    }
-    return getNewRowId(tableId, reuse);
+    let rowId;
+    do {
+      rowId = getId(reuse);
+    } while (collHas(mapGet(tablesMap, tableId), rowId));
+    return rowId;
   };
   const getOrCreateTable = (tableId) =>
     mapGet(tablesMap, tableId) ?? setValidTable(tableId, {});