@johannc-dev/zyrk 0.2.0 → 0.2.2

package/dist/stream.js

@@ -6,19 +6,33 @@ export { ExecutionEvent, Gap } from "./contracts.js";
 const decoder = (schema, what) => decodeWith(schema, undefined, (message) => new DecodeError({ what, message }));
 const decodeEvent = decoder(ExecutionEvent, "execution event");
 const decodeGap = decoder(Gap, "stream gap");
+const refusedKey = 4401;
+const defaultKeyRefusalWindowMs = 360_000;
+const reconnectDelay = (closes) => Math.min(5_000, 500 * 2 ** closes) * (0.5 + Math.random() / 2);
 function connect(options, handlers) {
     let cursor = options.afterSeq;
+    const window = options.keyRefusalWindowMs ?? defaultKeyRefusalWindowMs;
     const endpoint = new URL("/v1/stream", options.url);
     endpoint.protocol =
         endpoint.protocol === "https:" || endpoint.protocol === "wss:"
             ? "wss:"
             : "ws:";
     const socket = new Socket(endpoint.toString(), {
-        params: { api_key: options.apiKey },
+        params: { api_key: options.apiKey, on_refusal: "close" },
         transport: WebSocket,
     });
     const channel = socket.channel("functions", () => cursor === undefined ? {} : { after_seq: cursor });
-    channel.on("execution", (raw) => {
+    let account;
+    let checked = false;
+    let held = [];
+    const gated = (handle) => (raw) => {
+        if (closed)
+            return;
+        if (!checked)
+            return void held.push(() => handle(raw));
+        handle(raw);
+    };
+    channel.on("execution", gated((raw) => {
         const result = decodeEvent(raw);
         if (Result.isFailure(result))
             return handlers.fail(result.failure);
@@ -27,26 +41,110 @@ function connect(options, handlers) {
             return;
         cursor = event.seq;
         handlers.message({ _tag: "Execution", event });
-    });
-    channel.on("gap", (raw) => {
+    }));
+    channel.on("gap", gated((raw) => {
         const result = decodeGap(raw);
         if (Result.isFailure(result))
             return handlers.fail(result.failure);
         cursor = result.success.resumeAfter;
         handlers.message({ _tag: "Gap", gap: result.success });
+    }));
+    let closed = false;
+    let timer;
+    const stop = () => {
+        closed = true;
+        held = [];
+        clearTimeout(timer);
+        channel.leave();
+        socket.disconnect();
+    };
+    const fail = (message, cause, reason) => {
+        if (closed)
+            return;
+        stop();
+        handlers.fail(new NetworkError({
+            url: endpoint.toString(),
+            message,
+            cause,
+            ...(reason === undefined ? {} : { reason }),
+        }));
+    };
+    channel.on("status", gated((raw) => {
+        const status = raw;
+        if (status?.available === false && status.reason === "functions_disabled")
+            fail("Functions access was removed from this account: the server closed the stream", raw, "functions_disabled");
+    }));
+    channel.onClose((cause) => fail(`The server closed the stream: subscribe again with afterSeq ${cursor ?? "(unset)"}`, cause, "channel_closed"));
+    let closes = 0;
+    let pending = false;
+    const reconnect = () => {
+        if (pending)
+            return;
+        pending = true;
+        socket.disconnect();
+        timer = setTimeout(() => {
+            pending = false;
+            socket.connect();
+        }, reconnectDelay(closes++));
+    };
+    let refusedSince;
+    const refused = (reason, message, cause) => {
+        const now = Date.now();
+        refusedSince ??= now;
+        if (now - refusedSince >= window)
+            return fail(message, cause, reason);
+        reconnect();
+    };
+    socket.onClose((event) => {
+        if (closed || pending)
+            return;
+        if (event?.code === refusedKey)
+            return refused("invalid_key", `The API key is no longer valid (revoked, unknown, or its account is not active): the server refused it for ${Math.round(window / 1000)} s`, event);
+        if (event?.code === 1000)
+            reconnect();
+    });
+    const transient = (error) => queueMicrotask(() => {
+        if (!closed && refusedSince === undefined)
+            handlers.transient(error);
+    });
+    socket.onError(transient);
+    channel.onError((error) => {
+        checked = false;
+        transient(error);
     });
-    socket.onError((error) => handlers.transient(error));
-    channel.onError((error) => handlers.transient(error));
     socket.connect();
-    channel.join().receive("error", (reason) => handlers.fail(new NetworkError({
-        url: endpoint.toString(),
-        message: `Stream join refused: ${JSON.stringify(reason)}`,
-        cause: reason,
-    })));
+    channel
+        .join()
+        .receive("ok", (reply) => {
+        if (closed)
+            return;
+        const named = reply?.account;
+        if (typeof named === "string") {
+            account ??= named;
+            if (named !== account)
+                return fail("The API key now belongs to another account: the stream of the previous account ended (its events are not followed on the new one)", reply, "account_changed");
+        }
+        checked = true;
+        closes = 0;
+        refusedSince = undefined;
+        const waiting = held;
+        held = [];
+        for (const handle of waiting)
+            if (!closed)
+                handle();
+    })
+        .receive("error", (reason) => {
+        if (closed)
+            return;
+        const code = reason?.reason;
+        const message = `Stream join refused: ${JSON.stringify(reason)}`;
+        if (code === "unauthorized")
+            return refused(code, message, reason);
+        fail(message, reason, typeof code === "string" ? code : undefined);
+    });
     return {
         close() {
-            channel.leave();
-            socket.disconnect();
+            stop();
         },
         get cursor() {
             return cursor;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@johannc-dev/zyrk",
-  "version": "0.2.0",
-  "description": "SDK and CLI for Zyrk hosted functions (funrun v2)",
+  "version": "0.2.2",
+  "description": "SDK and CLI for Zyrk hosted functions",
   "license": "UNLICENSED",
   "publishConfig": {
     "access": "public",
@@ -39,7 +39,7 @@
   "scripts": {
     "build": "node scripts/build.mjs",
     "typecheck": "tsc --noEmit && tsc --noEmit -p tsconfig.test.json",
-    "test": "npm run build && npm run typecheck && node --test test/*.test.ts",
+    "test": "npm run build && npm run typecheck && node --test --test-timeout=60000 --test-force-exit test/*.test.ts",
     "format": "prettier --write src types scripts test examples package.json tsconfig.json tsconfig.test.json README.md",
     "format:check": "prettier --check src types scripts test examples package.json tsconfig.json tsconfig.test.json README.md",
     "prepack": "npm run build"