@evolu/nodejs 1.0.1-preview.9 → 2.0.0

package/dist/Evolu/Relay.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Relay.d.ts","sourceRoot":"","sources":["../../src/Evolu/Relay.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EAIV,qBAAqB,EAIrB,MAAM,EAEN,WAAW,EAGZ,MAAM,eAAe,CAAC;AACvB,OAAO,EAOL,KAAK,EACL,WAAW,EACZ,MAAM,qBAAqB,CAAC;AAM7B,MAAM,WAAW,iBAAkB,SAAQ,WAAW;IACpD,2CAA2C;IAC3C,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;CACxB;AAED;;;;;;GAMG;AACH,eAAO,MAAM,iBAAiB,GAC3B,MAAM,UAAU,MAChB,QAAQ,iBAAiB,KAAG,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,WAAW,CAAC,CAInD,CAAC;AAEf;;;;;GAKG;AACH,eAAO,MAAM,iCAAiC,GAC3C,MAAM,UAAU,GAAG,qBAAqB,MACxC,QAAQ,iBAAiB,KAAG,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,WAAW,CAAC,CAKnD,CAAC"}
+{"version":3,"file":"Relay.d.ts","sourceRoot":"","sources":["../../src/Evolu/Relay.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EAIV,qBAAqB,EAKrB,MAAM,EAEN,WAAW,EAGZ,MAAM,eAAe,CAAC;AACvB,OAAO,EASL,KAAK,EACL,WAAW,EACZ,MAAM,qBAAqB,CAAC;AAO7B,MAAM,WAAW,iBAAkB,SAAQ,WAAW;IACpD,2CAA2C;IAC3C,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;CACxB;AAED;;;;;;GAMG;AACH,eAAO,MAAM,iBAAiB,GAC3B,MAAM,UAAU,MAChB,QAAQ,iBAAiB,KAAG,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,WAAW,CAAC,CAInD,CAAC;AAEf;;;;;GAKG;AACH,eAAO,MAAM,iCAAiC,GAC3C,MAAM,UAAU,GAAG,qBAAqB,MACxC,QAAQ,iBAAiB,KAAG,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,WAAW,CAAC,CAKnD,CAAC"}

package/dist/Evolu/Relay.js

@@ -1,5 +1,6 @@
-import { createManyToManyMap, createRandom, createSqlite, ok, SimpleName, Uint8Array, } from "@evolu/common";
-import { applyProtocolMessageAsRelay, createRelayLogger, createRelaySqliteStorage, defaultProtocolMessageMaxSize, parseOwnerIdFromUrl, } from "@evolu/common/evolu";
+import { createRelation, createRandom, createSqlite, isAsync, ok, SimpleName, Uint8Array, } from "@evolu/common";
+import { applyProtocolMessageAsRelay, createBaseSqliteStorageTables, createRelayLogger, createRelaySqliteStorage, createRelayStorageTables, defaultProtocolMessageMaxSize, parseOwnerIdFromOwnerWebSocketTransportUrl, } from "@evolu/common/evolu";
+import { existsSync } from "fs";
 import { createServer } from "http";
 import { WebSocket, WebSocketServer } from "ws";
 import { createBetterSqliteDriver } from "../BetterSqliteDriver.js";
@@ -26,25 +27,32 @@ export const createNodeJsRelayWithSqliteDriver = (deps) => (config) => createNod
     random: createRandom(),
     timingSafeEqual: createTimingSafeEqual(),
 })(config);
-const createNodeJsRelayWithDeps = (deps) => async ({ port = 443, name = SimpleName.orThrow("evolu-relay"), enableLogging = false, authenticateOwner, }) => {
+const createNodeJsRelayWithDeps = (deps) => async ({ port = 443, name = SimpleName.orThrow("evolu-relay"), enableLogging = false, isOwnerAllowed, isOwnerWithinQuota, }) => {
     const log = createRelayLogger(deps);
     log.started(enableLogging, port);
-    const sqliteResult = await createSqlite(deps)(name);
-    if (!sqliteResult.ok)
-        return sqliteResult;
-    const sqlite = sqliteResult.value;
-    const storageResult = createRelaySqliteStorage({ ...deps, sqlite })({
+    const dbFileExists = existsSync(`${name}.db`);
+    const sqlite = await createSqlite(deps)(name);
+    if (!sqlite.ok)
+        return sqlite;
+    const depsWithSqlite = { ...deps, sqlite: sqlite.value };
+    if (!dbFileExists) {
+        const baseTables = createBaseSqliteStorageTables(depsWithSqlite);
+        if (!baseTables.ok)
+            return baseTables;
+        const relayTables = createRelayStorageTables(depsWithSqlite);
+        if (!relayTables.ok)
+            return relayTables;
+    }
+    const storage = createRelaySqliteStorage(depsWithSqlite)({
         onStorageError: log.storageError,
+        isOwnerWithinQuota,
     });
-    if (!storageResult.ok)
-        return storageResult;
-    const storage = storageResult.value;
     const server = createServer();
     const wss = new WebSocketServer({
         maxPayload: defaultProtocolMessageMaxSize,
         noServer: true,
     });
-    const ownerSocketsMap = createManyToManyMap();
+    const ownerSocketRelation = createRelation();
     server.on("upgrade", (request, socket, head) => {
         socket.on("error", log.upgradeSocketError);
         const completeUpgrade = () => {
@@ -53,32 +61,28 @@ const createNodeJsRelayWithDeps = (deps) => async ({ port = 443, name = SimpleNa
                 wss.emit("connection", ws, request);
             });
         };
-        if (!authenticateOwner) {
+        if (!isOwnerAllowed) {
             completeUpgrade();
             return;
         }
-        const ownerId = parseOwnerIdFromUrl(request.url);
+        const ownerId = parseOwnerIdFromOwnerWebSocketTransportUrl(request.url ?? "");
         if (!ownerId) {
             log.invalidOrMissingOwnerIdInUrl(request.url);
             socket.write("HTTP/1.1 400 Bad Request\r\n\r\n");
             socket.destroy();
             return;
         }
-        authenticateOwner(ownerId)
-            .then((isAuthenticated) => {
-            if (!isAuthenticated) {
+        void (async () => {
+            const result = isOwnerAllowed(ownerId);
+            const isAllowed = isAsync(result) ? await result : result;
+            if (!isAllowed) {
                 log.unauthorizedOwner(ownerId);
                 socket.write("HTTP/1.1 401 Unauthorized\r\n\r\n");
                 socket.destroy();
                 return;
             }
             completeUpgrade();
-        })
-            .catch((error) => {
-            log.authenticateOwnerError(error);
-            socket.write("HTTP/1.1 500 Internal Server Error\r\n\r\n");
-            socket.destroy();
-        });
+        })();
     });
     wss.on("connection", (ws) => {
         log.connectionEstablished(wss.clients.size);
@@ -87,15 +91,15 @@ const createNodeJsRelayWithDeps = (deps) => async ({ port = 443, name = SimpleNa
         });
         const options = {
             subscribe: (ownerId) => {
-                ownerSocketsMap.add(ownerId, ws);
-                log.relayOptionSubscribe(ownerId, () => ownerSocketsMap.getValues(ownerId)?.size ?? 0);
+                ownerSocketRelation.add(ownerId, ws);
+                log.relayOptionSubscribe(ownerId, () => ownerSocketRelation.getB(ownerId)?.size ?? 0);
             },
             unsubscribe: (ownerId) => {
-                ownerSocketsMap.remove(ownerId, ws);
-                log.relayOptionUnsubscribe(ownerId, () => ownerSocketsMap.getValues(ownerId)?.size ?? 0);
+                ownerSocketRelation.remove(ownerId, ws);
+                log.relayOptionUnsubscribe(ownerId, () => ownerSocketRelation.getB(ownerId)?.size ?? 0);
             },
             broadcast: (ownerId, message) => {
-                const sockets = ownerSocketsMap.getValues(ownerId);
+                const sockets = ownerSocketRelation.getB(ownerId);
                 if (!sockets)
                     return;
                 let broadcastCount = 0;
@@ -124,7 +128,7 @@ const createNodeJsRelayWithDeps = (deps) => async ({ port = 443, name = SimpleNa
                 .catch(log.applyProtocolMessageAsRelayUnknownError);
         });
         ws.on("close", () => {
-            ownerSocketsMap.deleteValue(ws);
+            ownerSocketRelation.deleteB(ws);
             log.connectionClosed(wss.clients.size);
         });
     });
@@ -149,7 +153,7 @@ const createNodeJsRelayWithDeps = (deps) => async ({ port = 443, name = SimpleNa
             if (isDisposed)
                 return;
             isDisposed = true;
-            sqlite[Symbol.dispose]();
+            sqlite.value[Symbol.dispose]();
             dispose();
         },
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@evolu/nodejs",
-  "version": "1.0.1-preview.9",
+  "version": "2.0.0",
   "description": "Evolu for Node.js",
   "author": "Daniel Steigerwald <daniel@steigerwald.cz>",
   "license": "MIT",
@@ -30,11 +30,11 @@
     "shx": "^0.4.0",
     "typescript": "^5.9.2",
     "vitest": "^4.0.4",
-    "@evolu/common": "6.0.1-preview.21",
+    "@evolu/common": "7.0.0",
     "@evolu/tsconfig": "0.0.2"
   },
   "peerDependencies": {
-    "@evolu/common": "^6.0.1-preview.21"
+    "@evolu/common": "^7.0.0"
   },
   "engines": {
     "node": ">=22.0.0"

package/src/Evolu/Relay.ts

@@ -1,9 +1,10 @@
 import {
   ConsoleDep,
-  createManyToManyMap,
+  createRelation,
   createRandom,
   createSqlite,
   CreateSqliteDriverDep,
+  isAsync,
   ok,
   OwnerId,
   RandomDep,
@@ -16,13 +17,16 @@ import {
 import {
   applyProtocolMessageAsRelay,
   ApplyProtocolMessageAsRelayOptions,
+  createBaseSqliteStorageTables,
   createRelayLogger,
   createRelaySqliteStorage,
+  createRelayStorageTables,
   defaultProtocolMessageMaxSize,
-  parseOwnerIdFromUrl,
+  parseOwnerIdFromOwnerWebSocketTransportUrl,
   Relay,
   RelayConfig,
 } from "@evolu/common/evolu";
+import { existsSync } from "fs";
 import { createServer } from "http";
 import { WebSocket, WebSocketServer } from "ws";
 import { createBetterSqliteDriver } from "../BetterSqliteDriver.js";
@@ -69,29 +73,39 @@ const createNodeJsRelayWithDeps =
     port = 443,
     name = SimpleName.orThrow("evolu-relay"),
     enableLogging = false,
-    authenticateOwner,
+    isOwnerAllowed,
+    isOwnerWithinQuota,
   }: NodeJsRelayConfig): Promise<Result<Relay, SqliteError>> => {
     const log = createRelayLogger(deps);
     log.started(enableLogging, port);
 
-    const sqliteResult = await createSqlite(deps)(name);
-    if (!sqliteResult.ok) return sqliteResult;
-    const sqlite = sqliteResult.value;
+    const dbFileExists = existsSync(`${name}.db`);
 
-    const storageResult = createRelaySqliteStorage({ ...deps, sqlite })({
+    const sqlite = await createSqlite(deps)(name);
+    if (!sqlite.ok) return sqlite;
+
+    const depsWithSqlite = { ...deps, sqlite: sqlite.value };
+
+    if (!dbFileExists) {
+      const baseTables = createBaseSqliteStorageTables(depsWithSqlite);
+      if (!baseTables.ok) return baseTables;
+
+      const relayTables = createRelayStorageTables(depsWithSqlite);
+      if (!relayTables.ok) return relayTables;
+    }
+
+    const storage = createRelaySqliteStorage(depsWithSqlite)({
       onStorageError: log.storageError,
+      isOwnerWithinQuota,
     });
 
-    if (!storageResult.ok) return storageResult;
-    const storage = storageResult.value;
-
     const server = createServer();
     const wss = new WebSocketServer({
       maxPayload: defaultProtocolMessageMaxSize,
       noServer: true,
     });
 
-    const ownerSocketsMap = createManyToManyMap<OwnerId, WebSocket>();
+    const ownerSocketRelation = createRelation<OwnerId, WebSocket>();
 
     server.on("upgrade", (request, socket, head) => {
       socket.on("error", log.upgradeSocketError);
@@ -103,12 +117,15 @@ const createNodeJsRelayWithDeps =
         });
       };
 
-      if (!authenticateOwner) {
+      if (!isOwnerAllowed) {
         completeUpgrade();
         return;
       }
 
-      const ownerId = parseOwnerIdFromUrl(request.url);
+      const ownerId = parseOwnerIdFromOwnerWebSocketTransportUrl(
+        request.url ?? "",
+      );
+
       if (!ownerId) {
         log.invalidOrMissingOwnerIdInUrl(request.url);
         socket.write("HTTP/1.1 400 Bad Request\r\n\r\n");
@@ -116,21 +133,17 @@ const createNodeJsRelayWithDeps =
         return;
       }
 
-      authenticateOwner(ownerId)
-        .then((isAuthenticated) => {
-          if (!isAuthenticated) {
-            log.unauthorizedOwner(ownerId);
-            socket.write("HTTP/1.1 401 Unauthorized\r\n\r\n");
-            socket.destroy();
-            return;
-          }
-          completeUpgrade();
-        })
-        .catch((error: unknown) => {
-          log.authenticateOwnerError(error);
-          socket.write("HTTP/1.1 500 Internal Server Error\r\n\r\n");
+      void (async () => {
+        const result = isOwnerAllowed(ownerId);
+        const isAllowed = isAsync(result) ? await result : result;
+        if (!isAllowed) {
+          log.unauthorizedOwner(ownerId);
+          socket.write("HTTP/1.1 401 Unauthorized\r\n\r\n");
           socket.destroy();
-        });
+          return;
+        }
+        completeUpgrade();
+      })();
     });
 
     wss.on("connection", (ws) => {
@@ -142,23 +155,23 @@ const createNodeJsRelayWithDeps =
 
       const options: ApplyProtocolMessageAsRelayOptions = {
         subscribe: (ownerId) => {
-          ownerSocketsMap.add(ownerId, ws);
+          ownerSocketRelation.add(ownerId, ws);
           log.relayOptionSubscribe(
             ownerId,
-            () => ownerSocketsMap.getValues(ownerId)?.size ?? 0,
+            () => ownerSocketRelation.getB(ownerId)?.size ?? 0,
           );
         },
 
         unsubscribe: (ownerId) => {
-          ownerSocketsMap.remove(ownerId, ws);
+          ownerSocketRelation.remove(ownerId, ws);
           log.relayOptionUnsubscribe(
             ownerId,
-            () => ownerSocketsMap.getValues(ownerId)?.size ?? 0,
+            () => ownerSocketRelation.getB(ownerId)?.size ?? 0,
           );
         },
 
         broadcast: (ownerId, message) => {
-          const sockets = ownerSocketsMap.getValues(ownerId);
+          const sockets = ownerSocketRelation.getB(ownerId);
           if (!sockets) return;
 
           let broadcastCount = 0;
@@ -190,7 +203,7 @@ const createNodeJsRelayWithDeps =
       });
 
       ws.on("close", () => {
-        ownerSocketsMap.deleteValue(ws);
+        ownerSocketRelation.deleteB(ws);
         log.connectionClosed(wss.clients.size);
       });
     });
@@ -221,7 +234,7 @@ const createNodeJsRelayWithDeps =
       [Symbol.dispose]: () => {
         if (isDisposed) return;
         isDisposed = true;
-        sqlite[Symbol.dispose]();
+        sqlite.value[Symbol.dispose]();
         dispose();
       },
     };