@evolu/nodejs 1.0.1-preview.10 → 1.0.1-preview.12

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,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"}
+{"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,4 +1,4 @@
-import { createManyToManyMap, createRandom, createSqlite, ok, SimpleName, Uint8Array, } from "@evolu/common";
+import { createManyToManyMap, 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";
@@ -27,7 +27,7 @@ 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 dbFileExists = existsSync(`${name}.db`);
@@ -45,6 +45,7 @@ const createNodeJsRelayWithDeps = (deps) => async ({ port = 443, name = SimpleNa
     }
     const storage = createRelaySqliteStorage(depsWithSqlite)({
         onStorageError: log.storageError,
+        isOwnerWithinQuota,
     });
     const server = createServer();
     const wss = new WebSocketServer({
@@ -60,7 +61,7 @@ const createNodeJsRelayWithDeps = (deps) => async ({ port = 443, name = SimpleNa
                 wss.emit("connection", ws, request);
             });
         };
-        if (!authenticateOwner) {
+        if (!isOwnerAllowed) {
             completeUpgrade();
             return;
         }
@@ -71,21 +72,17 @@ const createNodeJsRelayWithDeps = (deps) => async ({ port = 443, name = SimpleNa
             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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@evolu/nodejs",
-  "version": "1.0.1-preview.10",
+  "version": "1.0.1-preview.12",
   "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.26",
+    "@evolu/common": "6.0.1-preview.30",
     "@evolu/tsconfig": "0.0.2"
   },
   "peerDependencies": {
-    "@evolu/common": "^6.0.1-preview.26"
+    "@evolu/common": "^6.0.1-preview.30"
   },
   "engines": {
     "node": ">=22.0.0"

package/src/Evolu/Relay.ts

@@ -4,6 +4,7 @@ import {
   createRandom,
   createSqlite,
   CreateSqliteDriverDep,
+  isAsync,
   ok,
   OwnerId,
   RandomDep,
@@ -72,7 +73,8 @@ 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);
@@ -94,6 +96,7 @@ const createNodeJsRelayWithDeps =
 
     const storage = createRelaySqliteStorage(depsWithSqlite)({
       onStorageError: log.storageError,
+      isOwnerWithinQuota,
     });
 
     const server = createServer();
@@ -114,7 +117,7 @@ const createNodeJsRelayWithDeps =
         });
       };
 
-      if (!authenticateOwner) {
+      if (!isOwnerAllowed) {
         completeUpgrade();
         return;
       }
@@ -122,6 +125,7 @@ const createNodeJsRelayWithDeps =
       const ownerId = parseOwnerIdFromOwnerWebSocketTransportUrl(
         request.url ?? "",
       );
+
       if (!ownerId) {
         log.invalidOrMissingOwnerIdInUrl(request.url);
         socket.write("HTTP/1.1 400 Bad Request\r\n\r\n");
@@ -129,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) => {