@firtoz/websocket-do 10.0.0 → 13.0.0

package/dist/chunk-XFB6C3NZ.js

@@ -0,0 +1,134 @@
+import { __privateAdd, __privateMethod } from './chunk-NOUFNU2O.js';
+import { DurableObject } from 'cloudflare:workers';
+import { Hono } from 'hono';
+
+var _BaseWebSocketDO_instances, handleClose_fn;
+var BaseWebSocketDO = class extends DurableObject {
+  constructor(ctx, env, options) {
+    super(ctx, env);
+    this.options = options;
+    __privateAdd(this, _BaseWebSocketDO_instances);
+    this.sessions = /* @__PURE__ */ new Map();
+    this.ctx.blockConcurrencyWhile(async () => {
+      const websockets = this.ctx.getWebSockets();
+      await Promise.all(
+        websockets.map(async (websocket) => {
+          try {
+            const session = await options.createSession(void 0, websocket);
+            session.resume();
+            this.sessions.set(websocket, session);
+          } catch (error) {
+            console.error(`Error during session setup: ${error}`);
+            await this.webSocketError(websocket, error);
+          }
+        })
+      );
+    });
+  }
+  getBaseApp() {
+    return new Hono().get(
+      "/websocket",
+      async (ctx) => {
+        const { req } = ctx;
+        if (req.header("Upgrade") !== "websocket") {
+          console.error("Expected websocket");
+          return ctx.text("Expected websocket", 400);
+        }
+        const [client, server] = Object.values(new WebSocketPair());
+        try {
+          await this.handleSession(ctx, server);
+          return new Response(null, { status: 101, webSocket: client });
+        } catch (error) {
+          console.error(error);
+          client.accept();
+          client.send(
+            JSON.stringify({
+              error: "Uncaught exception during session setup."
+            })
+          );
+          client.close(1011, "Uncaught exception during session setup.");
+          return new Response(null, { status: 101, webSocket: client });
+        }
+      }
+    );
+  }
+  async handleSession(ctx, ws) {
+    this.ctx.acceptWebSocket(ws);
+    try {
+      const session = await this.options.createSession(ctx, ws);
+      session.startFresh(ctx);
+      this.sessions.set(ws, session);
+    } catch (error) {
+      console.error(`Error during session setup: ${error}`);
+      await this.webSocketError(ws, error);
+    }
+  }
+  async webSocketMessage(ws, message) {
+    const session = this.sessions.get(ws);
+    if (!session) return;
+    try {
+      if (message instanceof ArrayBuffer) {
+        await session.handleBufferMessage(message);
+        return;
+      }
+      const rawMessageSession = session;
+      if (rawMessageSession.handleRawMessage) {
+        await rawMessageSession.handleRawMessage(message);
+        return;
+      }
+      const parsed = JSON.parse(message);
+      await session.handleMessage(parsed);
+    } catch (error) {
+      console.error(`Error during session message: ${error}`);
+    }
+  }
+  async webSocketClose(ws, _code, _reason, _wasClean) {
+    const session = this.sessions.get(ws);
+    if (!session) return;
+    try {
+      await __privateMethod(this, _BaseWebSocketDO_instances, handleClose_fn).call(this, session);
+    } catch (error) {
+      console.error(`Error during session close: ${error}`);
+    } finally {
+      if (ws.readyState === WebSocket.OPEN || ws.readyState === WebSocket.CLOSING) {
+        ws.close(1e3, "Normal closure");
+      }
+    }
+  }
+  async webSocketError(ws, error) {
+    const session = this.sessions.get(ws);
+    if (!session) {
+      if (ws.readyState === WebSocket.OPEN || ws.readyState === WebSocket.CLOSING) {
+        ws.close(1011, "Error during session setup.");
+      }
+      return;
+    }
+    console.error(`Error for session: ${error}`);
+    try {
+      await __privateMethod(this, _BaseWebSocketDO_instances, handleClose_fn).call(this, session);
+    } catch (error2) {
+      console.error(`Error during session close: ${error2}`);
+    } finally {
+      if (ws.readyState === WebSocket.OPEN || ws.readyState === WebSocket.CLOSING) {
+        ws.close(1011, "Error during session.");
+      }
+    }
+  }
+  fetch(request) {
+    return this.app.fetch(request, this.env);
+  }
+};
+_BaseWebSocketDO_instances = new WeakSet();
+handleClose_fn = async function(session) {
+  try {
+    await session.handleClose();
+  } catch (error) {
+    console.error(`Error during session close: ${error}`);
+  } finally {
+    this.sessions.delete(session.websocket);
+  }
+};
+
+export { BaseWebSocketDO };
+//# sourceMappingURL=chunk-XFB6C3NZ.js.map
+//# sourceMappingURL=chunk-XFB6C3NZ.js.map

package/dist/chunk-XFB6C3NZ.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/BaseWebSocketDO.ts"],"names":["error"],"mappings":"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","file":"chunk-XFB6C3NZ.js","sourcesContent":["import { DurableObject } from \"cloudflare:workers\";\nimport type { DOWithHonoApp } from \"@firtoz/hono-fetcher/honoDoFetcher\";\nimport { type Context, Hono } from \"hono\";\nimport type {\n\tBaseSession,\n\tSessionClientMessage,\n\tSessionEnv,\n} from \"./BaseSession\";\n\nexport type BaseWebSocketDOOptions<\n\t// biome-ignore lint/suspicious/noExplicitAny: We are using any on purpose to allow any type of session.\n\tTSession extends BaseSession<any, any, any, any>,\n\tTEnv extends SessionEnv<TSession>,\n> = {\n\tcreateSession: (\n\t\tctx: Context<{ Bindings: TEnv }> | undefined,\n\t\twebsocket: WebSocket,\n\t) => TSession | Promise<TSession>;\n};\n\nexport abstract class BaseWebSocketDO<\n\t\t// biome-ignore lint/suspicious/noExplicitAny: We are using any on purpose to allow any type of session.\n\t\tTSession extends BaseSession<any, any, any, any> = BaseSession<\n\t\t\t// biome-ignore lint/suspicious/noExplicitAny: We are using any on purpose to allow any type of session.\n\t\t\tany,\n\t\t\t// biome-ignore lint/suspicious/noExplicitAny: We are using any on purpose to allow any type of session.\n\t\t\tany,\n\t\t\t// biome-ignore lint/suspicious/noExplicitAny: We are using any on purpose to allow any type of session.\n\t\t\tany,\n\t\t\t// biome-ignore lint/suspicious/noExplicitAny: We are using any on purpose to allow any type of session.\n\t\t\tany\n\t\t>,\n\t\tTEnv extends SessionEnv<TSession> = SessionEnv<TSession>,\n\t>\n\textends DurableObject<TEnv>\n\timplements DOWithHonoApp\n{\n\tprotected readonly sessions = new Map<WebSocket, TSession>();\n\tabstract readonly app: Hono<{ Bindings: TEnv }>;\n\n\tconstructor(\n\t\tctx: DurableObjectState,\n\t\tenv: TEnv,\n\t\tprivate readonly options: BaseWebSocketDOOptions<TSession, TEnv>,\n\t) {\n\t\tsuper(ctx, env);\n\n\t\tthis.ctx.blockConcurrencyWhile(async () => {\n\t\t\tconst websockets = this.ctx.getWebSockets();\n\t\t\tawait Promise.all(\n\t\t\t\twebsockets.map(async (websocket) => {\n\t\t\t\t\ttry {\n\t\t\t\t\t\t// For resumed sessions, we don't have a Hono context\n\t\t\t\t\t\t// Pass undefined and let implementers handle it\n\t\t\t\t\t\tconst session = await options.createSession(undefined, websocket);\n\t\t\t\t\t\tsession.resume();\n\t\t\t\t\t\tthis.sessions.set(websocket, session);\n\t\t\t\t\t} catch (error) {\n\t\t\t\t\t\tconsole.error(`Error during session setup: ${error}`);\n\t\t\t\t\t\tawait this.webSocketError(websocket, error);\n\t\t\t\t\t}\n\t\t\t\t}),\n\t\t\t);\n\t\t});\n\t}\n\n\tprotected getBaseApp() {\n\t\treturn new Hono<{ Bindings: TEnv }>().get(\n\t\t\t\"/websocket\",\n\t\t\tasync (ctx): Promise<Response> => {\n\t\t\t\tconst { req } = ctx;\n\t\t\t\tif (req.header(\"Upgrade\") !== \"websocket\") {\n\t\t\t\t\tconsole.error(\"Expected websocket\");\n\t\t\t\t\treturn ctx.text(\"Expected websocket\", 400);\n\t\t\t\t}\n\n\t\t\t\tconst [client, server] = Object.values(new WebSocketPair()) as [\n\t\t\t\t\tWebSocket,\n\t\t\t\t\tWebSocket,\n\t\t\t\t];\n\n\t\t\t\ttry {\n\t\t\t\t\tawait this.handleSession(ctx, server);\n\t\t\t\t\treturn new Response(null, { status: 101, webSocket: client });\n\t\t\t\t} catch (error) {\n\t\t\t\t\tconsole.error(error);\n\t\t\t\t\tclient.accept();\n\t\t\t\t\tclient.send(\n\t\t\t\t\t\tJSON.stringify({\n\t\t\t\t\t\t\terror: \"Uncaught exception during session setup.\",\n\t\t\t\t\t\t}),\n\t\t\t\t\t);\n\t\t\t\t\tclient.close(1011, \"Uncaught exception during session setup.\");\n\t\t\t\t\treturn new Response(null, { status: 101, webSocket: client });\n\t\t\t\t}\n\t\t\t},\n\t\t);\n\t}\n\n\tasync handleSession(\n\t\tctx: Context<{ Bindings: TEnv }>,\n\t\tws: WebSocket,\n\t): Promise<void> {\n\t\tthis.ctx.acceptWebSocket(ws);\n\t\ttry {\n\t\t\tconst session = await this.options.createSession(ctx, ws);\n\t\t\tsession.startFresh(ctx);\n\t\t\tthis.sessions.set(ws, session);\n\t\t} catch (error) {\n\t\t\tconsole.error(`Error during session setup: ${error}`);\n\t\t\tawait this.webSocketError(ws, error);\n\t\t}\n\t}\n\n\toverride async webSocketMessage(\n\t\tws: WebSocket,\n\t\tmessage: string | ArrayBuffer,\n\t): Promise<void> {\n\t\tconst session = this.sessions.get(ws);\n\t\tif (!session) return;\n\n\t\ttry {\n\t\t\tif (message instanceof ArrayBuffer) {\n\t\t\t\tawait session.handleBufferMessage(message);\n\t\t\t\treturn;\n\t\t\t}\n\n\t\t\tconst rawMessageSession = session as BaseSession<\n\t\t\t\tunknown,\n\t\t\t\tunknown,\n\t\t\t\tunknown,\n\t\t\t\tTEnv\n\t\t\t> & {\n\t\t\t\thandleRawMessage?: (rawMessage: string) => Promise<void>;\n\t\t\t};\n\t\t\tif (rawMessageSession.handleRawMessage) {\n\t\t\t\tawait rawMessageSession.handleRawMessage(message);\n\t\t\t\treturn;\n\t\t\t}\n\n\t\t\tconst parsed = JSON.parse(message) as SessionClientMessage<TSession>;\n\t\t\tawait session.handleMessage(parsed);\n\t\t} catch (error) {\n\t\t\tconsole.error(`Error during session message: ${error}`);\n\t\t\t// Let the implementer decide how to handle errors in their session implementation\n\t\t\t// The session can optionally implement error handling that closes the connection if needed\n\t\t}\n\t}\n\n\toverride async webSocketClose(\n\t\tws: WebSocket,\n\t\t_code: number,\n\t\t_reason: string,\n\t\t_wasClean: boolean,\n\t) {\n\t\tconst session = this.sessions.get(ws);\n\t\tif (!session) return;\n\n\t\ttry {\n\t\t\tawait this.#handleClose(session);\n\t\t} catch (error) {\n\t\t\tconsole.error(`Error during session close: ${error}`);\n\t\t} finally {\n\t\t\t// Call close() for both OPEN and CLOSING states\n\t\t\t// For CLOSING, this can help ensure the WebSocket fully transitions to CLOSED\n\t\t\tif (\n\t\t\t\tws.readyState === WebSocket.OPEN ||\n\t\t\t\tws.readyState === WebSocket.CLOSING\n\t\t\t) {\n\t\t\t\tws.close(1000, \"Normal closure\");\n\t\t\t}\n\t\t}\n\t}\n\n\toverride async webSocketError(ws: WebSocket, error: unknown) {\n\t\tconst session = this.sessions.get(ws);\n\t\tif (!session) {\n\t\t\t// Call close() for both OPEN and CLOSING states\n\t\t\tif (\n\t\t\t\tws.readyState === WebSocket.OPEN ||\n\t\t\t\tws.readyState === WebSocket.CLOSING\n\t\t\t) {\n\t\t\t\tws.close(1011, \"Error during session setup.\");\n\t\t\t}\n\t\t\treturn;\n\t\t}\n\n\t\tconsole.error(`Error for session: ${error}`);\n\t\ttry {\n\t\t\tawait this.#handleClose(session);\n\t\t} catch (error) {\n\t\t\tconsole.error(`Error during session close: ${error}`);\n\t\t} finally {\n\t\t\t// Call close() for both OPEN and CLOSING states\n\t\t\tif (\n\t\t\t\tws.readyState === WebSocket.OPEN ||\n\t\t\t\tws.readyState === WebSocket.CLOSING\n\t\t\t) {\n\t\t\t\tws.close(1011, \"Error during session.\");\n\t\t\t}\n\t\t}\n\t}\n\n\tasync #handleClose(session: TSession) {\n\t\ttry {\n\t\t\tawait session.handleClose();\n\t\t} catch (error) {\n\t\t\tconsole.error(`Error during session close: ${error}`);\n\t\t} finally {\n\t\t\tthis.sessions.delete(session.websocket);\n\t\t}\n\t}\n\n\toverride fetch(request: Request): Response | Promise<Response> {\n\t\treturn this.app.fetch(request, this.env);\n\t}\n}\n"]}

package/dist/index.d.ts

@@ -0,0 +1,14 @@
+export { BaseSession, BaseSessionHandlers, SessionClientMessage, SessionEnv, SessionServerMessage } from './BaseSession.js';
+export { BaseWebSocketDO, BaseWebSocketDOOptions } from './BaseWebSocketDO.js';
+export { WebsocketWrapper } from './WebsocketWrapper.js';
+export { StandardSchemaSession, StandardSchemaSessionHandlers, StandardSchemaSessionOptions } from './StandardSchemaSession.js';
+export { StandardSchemaWebSocketClient, StandardSchemaWebSocketClientOptions } from './StandardSchemaWebSocketClient.js';
+export { StandardSchemaSessionOptionsOrFactory, StandardSchemaWebSocketDO, StandardSchemaWebSocketDOOptions } from './StandardSchemaWebSocketDO.js';
+export { parseStandardSchema } from './parseStandardSchema.js';
+export { standardSchemaMsgpack } from './standardSchemaMsgpack.js';
+import 'hono';
+import 'hono/hono-base';
+import 'hono/utils/http-status';
+import 'cloudflare:workers';
+import '@firtoz/hono-fetcher/honoDoFetcher';
+import '@standard-schema/spec';

package/dist/index.js

@@ -0,0 +1,11 @@
+export { StandardSchemaSession } from './chunk-53MFRNQS.js';
+export { standardSchemaMsgpack } from './chunk-QMGIRIHJ.js';
+export { BaseSession } from './chunk-3C77OSOD.js';
+export { StandardSchemaWebSocketClient } from './chunk-3LWVEY3R.js';
+export { StandardSchemaWebSocketDO } from './chunk-ULGH6X42.js';
+export { BaseWebSocketDO } from './chunk-XFB6C3NZ.js';
+export { WebsocketWrapper } from './chunk-KCPOB32E.js';
+export { parseStandardSchema } from './chunk-CAX4POIL.js';
+import './chunk-NOUFNU2O.js';
+//# sourceMappingURL=index.js.map
+//# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":[],"names":[],"mappings":"","file":"index.js"}

package/dist/parseStandardSchema.d.ts

@@ -0,0 +1,9 @@
+import { StandardSchemaV1 } from '@standard-schema/spec';
+
+/**
+ * Validates {@link value} with a Standard Schema v1 schema and returns the output,
+ * or throws an {@link Error} whose message aggregates issue messages.
+ */
+declare function parseStandardSchema<T>(schema: StandardSchemaV1<unknown, T>, value: unknown): Promise<T>;
+
+export { parseStandardSchema };

package/dist/parseStandardSchema.js

@@ -0,0 +1,4 @@
+export { parseStandardSchema } from './chunk-CAX4POIL.js';
+import './chunk-NOUFNU2O.js';
+//# sourceMappingURL=parseStandardSchema.js.map
+//# sourceMappingURL=parseStandardSchema.js.map

package/dist/parseStandardSchema.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":[],"names":[],"mappings":"","file":"parseStandardSchema.js"}

package/dist/standardSchemaMsgpack.d.ts

@@ -0,0 +1,8 @@
+import { StandardSchemaV1 } from '@standard-schema/spec';
+
+declare const standardSchemaMsgpack: <T>(schema: StandardSchemaV1<unknown, T>) => {
+    encode(value: T): Promise<Uint8Array>;
+    decode(bytes: Uint8Array): Promise<T>;
+};
+
+export { standardSchemaMsgpack };

package/dist/standardSchemaMsgpack.js

@@ -0,0 +1,5 @@
+export { standardSchemaMsgpack } from './chunk-QMGIRIHJ.js';
+import './chunk-CAX4POIL.js';
+import './chunk-NOUFNU2O.js';
+//# sourceMappingURL=standardSchemaMsgpack.js.map
+//# sourceMappingURL=standardSchemaMsgpack.js.map

package/dist/standardSchemaMsgpack.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":[],"names":[],"mappings":"","file":"standardSchemaMsgpack.js"}

package/dist/standardSchemaRpc.d.ts

@@ -0,0 +1,30 @@
+import { StandardSchemaWebSocketClientOptions, StandardSchemaWebSocketClient } from './StandardSchemaWebSocketClient.js';
+import '@standard-schema/spec';
+
+type StandardSchemaWebSocketRpcSessionConstructorOptions<TClientMsg, TServerMsg, TPending extends {
+    reject: (error: Error) => void;
+}> = Omit<StandardSchemaWebSocketClientOptions<TClientMsg, TServerMsg>, "onMessage"> & {
+    onMessage: (message: TServerMsg, session: StandardSchemaWebSocketRpcSession<TClientMsg, TServerMsg, TPending>) => void;
+};
+/**
+ * WebSocket client session with a pending map for request/response RPC and a
+ * monotonic id helper. Wire formats stay in your Standard Schema schemas; you dispatch
+ * {@link TServerMsg} in `onMessage` (typically with `switch` + `exhaustiveGuard`)
+ * and resolve/reject entries in {@link pending}.
+ */
+declare class StandardSchemaWebSocketRpcSession<TClientMsg, TServerMsg, TPending extends {
+    reject: (error: Error) => void;
+}> {
+    readonly pending: Map<string, TPending>;
+    readonly client: StandardSchemaWebSocketClient<TClientMsg, TServerMsg>;
+    private idSeq;
+    constructor(options: StandardSchemaWebSocketRpcSessionConstructorOptions<TClientMsg, TServerMsg, TPending>);
+    nextId(prefix: string): string;
+    rejectAllPending(reason: Error): void;
+    close(code?: number, reason?: string): void;
+}
+declare function createStandardSchemaWebSocketRpcSession<TClientMsg, TServerMsg, TPending extends {
+    reject: (error: Error) => void;
+}>(options: StandardSchemaWebSocketRpcSessionConstructorOptions<TClientMsg, TServerMsg, TPending>): StandardSchemaWebSocketRpcSession<TClientMsg, TServerMsg, TPending>;
+
+export { StandardSchemaWebSocketRpcSession, type StandardSchemaWebSocketRpcSessionConstructorOptions, createStandardSchemaWebSocketRpcSession };

package/dist/standardSchemaRpc.js

@@ -0,0 +1,6 @@
+export { StandardSchemaWebSocketRpcSession, createStandardSchemaWebSocketRpcSession } from './chunk-WJIQBI6I.js';
+import './chunk-3LWVEY3R.js';
+import './chunk-CAX4POIL.js';
+import './chunk-NOUFNU2O.js';
+//# sourceMappingURL=standardSchemaRpc.js.map
+//# sourceMappingURL=standardSchemaRpc.js.map

package/dist/standardSchemaRpc.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":[],"names":[],"mappings":"","file":"standardSchemaRpc.js"}

package/dist/standardSchemaRpcReact.d.ts

@@ -0,0 +1,27 @@
+import { DependencyList, RefObject } from 'react';
+import { StandardSchemaWebSocketRpcSessionConstructorOptions, StandardSchemaWebSocketRpcSession } from './standardSchemaRpc.js';
+import './StandardSchemaWebSocketClient.js';
+import '@standard-schema/spec';
+
+/** Options for {@link useStandardSchemaWebSocketRpc} (same as constructor options for {@link StandardSchemaWebSocketRpcSession}). */
+type UseStandardSchemaWebSocketRpcOptions<TClientMsg, TServerMsg, TPending extends {
+    reject: (error: Error) => void;
+}> = StandardSchemaWebSocketRpcSessionConstructorOptions<TClientMsg, TServerMsg, TPending>;
+/**
+ * Connects a {@link StandardSchemaWebSocketRpcSession} in an effect: rejects all pending
+ * RPCs and closes the socket on cleanup or when `deps` change.
+ *
+ * Callback refs keep the latest `onMessage` / `onOpen` / `onClose` without
+ * listing them in `deps`, so inline handlers do not reconnect every render.
+ *
+ * Pass `deps` as the second argument; keep it aligned with values used to
+ * build `url` / `webSocket`.
+ */
+declare function useStandardSchemaWebSocketRpc<TClientMsg, TServerMsg, TPending extends {
+    reject: (error: Error) => void;
+}>(options: UseStandardSchemaWebSocketRpcOptions<TClientMsg, TServerMsg, TPending>, deps: DependencyList): {
+    ready: boolean;
+    sessionRef: RefObject<StandardSchemaWebSocketRpcSession<TClientMsg, TServerMsg, TPending> | null>;
+};
+
+export { type UseStandardSchemaWebSocketRpcOptions, useStandardSchemaWebSocketRpc };

package/dist/standardSchemaRpcReact.js

@@ -0,0 +1,54 @@
+import { createStandardSchemaWebSocketRpcSession } from './chunk-WJIQBI6I.js';
+import './chunk-3LWVEY3R.js';
+import './chunk-CAX4POIL.js';
+import './chunk-NOUFNU2O.js';
+import { useRef, useState, useEffect } from 'react';
+
+function useStandardSchemaWebSocketRpc(options, deps) {
+  const { onMessage, onOpen, onClose, ...clientOptions } = options;
+  const onMessageRef = useRef(onMessage);
+  onMessageRef.current = onMessage;
+  const onOpenRef = useRef(onOpen);
+  onOpenRef.current = onOpen;
+  const onCloseRef = useRef(onClose);
+  onCloseRef.current = onClose;
+  const [ready, setReady] = useState(false);
+  const sessionRef = useRef(null);
+  useEffect(() => {
+    let cancelled = false;
+    setReady(false);
+    const session = createStandardSchemaWebSocketRpcSession({
+      ...clientOptions,
+      onMessage: (msg, s) => {
+        onMessageRef.current(msg, s);
+      },
+      onOpen: (event) => {
+        if (!cancelled) {
+          setReady(true);
+        }
+        onOpenRef.current?.(event);
+      },
+      onClose: (event) => {
+        if (!cancelled) {
+          setReady(false);
+        }
+        onCloseRef.current?.(event);
+      }
+    });
+    sessionRef.current = session;
+    if (session.client.socket.readyState === WebSocket.OPEN) {
+      setReady(true);
+    }
+    return () => {
+      cancelled = true;
+      sessionRef.current = null;
+      session.rejectAllPending(new Error("WebSocket closed"));
+      session.close();
+    };
+  }, deps);
+  return { ready, sessionRef };
+}
+
+export { useStandardSchemaWebSocketRpc };
+//# sourceMappingURL=standardSchemaRpcReact.js.map
+//# sourceMappingURL=standardSchemaRpcReact.js.map

package/dist/standardSchemaRpcReact.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/standardSchemaRpcReact.ts"],"names":[],"mappings":";;;;;;AA6BO,SAAS,6BAAA,CAKf,SAKA,IAAA,EAQC;AACD,EAAA,MAAM,EAAE,SAAA,EAAW,MAAA,EAAQ,OAAA,EAAS,GAAG,eAAc,GAAI,OAAA;AAEzD,EAAA,MAAM,YAAA,GAAe,OAAO,SAAS,CAAA;AACrC,EAAA,YAAA,CAAa,OAAA,GAAU,SAAA;AACvB,EAAA,MAAM,SAAA,GAAY,OAAO,MAAM,CAAA;AAC/B,EAAA,SAAA,CAAU,OAAA,GAAU,MAAA;AACpB,EAAA,MAAM,UAAA,GAAa,OAAO,OAAO,CAAA;AACjC,EAAA,UAAA,CAAW,OAAA,GAAU,OAAA;AAErB,EAAA,MAAM,CAAC,KAAA,EAAO,QAAQ,CAAA,GAAI,SAAS,KAAK,CAAA;AACxC,EAAA,MAAM,UAAA,GAAa,OAIT,IAAI,CAAA;AAEd,EAAA,SAAA,CAAU,MAAM;AACf,IAAA,IAAI,SAAA,GAAY,KAAA;AAChB,IAAA,QAAA,CAAS,KAAK,CAAA;AAEd,IAAA,MAAM,UAAU,uCAAA,CAId;AAAA,MACD,GAAG,aAAA;AAAA,MACH,SAAA,EAAW,CAAC,GAAA,EAAK,CAAA,KAAM;AACtB,QAAA,YAAA,CAAa,OAAA,CAAQ,KAAK,CAAC,CAAA;AAAA,MAC5B,CAAA;AAAA,MACA,MAAA,EAAQ,CAAC,KAAA,KAAU;AAClB,QAAA,IAAI,CAAC,SAAA,EAAW;AACf,UAAA,QAAA,CAAS,IAAI,CAAA;AAAA,QACd;AACA,QAAA,SAAA,CAAU,UAAU,KAAK,CAAA;AAAA,MAC1B,CAAA;AAAA,MACA,OAAA,EAAS,CAAC,KAAA,KAAU;AACnB,QAAA,IAAI,CAAC,SAAA,EAAW;AACf,UAAA,QAAA,CAAS,KAAK,CAAA;AAAA,QACf;AACA,QAAA,UAAA,CAAW,UAAU,KAAK,CAAA;AAAA,MAC3B;AAAA,KACA,CAAA;AAED,IAAA,UAAA,CAAW,OAAA,GAAU,OAAA;AACrB,IAAA,IAAI,OAAA,CAAQ,MAAA,CAAO,MAAA,CAAO,UAAA,KAAe,UAAU,IAAA,EAAM;AACxD,MAAA,QAAA,CAAS,IAAI,CAAA;AAAA,IACd;AAEA,IAAA,OAAO,MAAM;AACZ,MAAA,SAAA,GAAY,IAAA;AACZ,MAAA,UAAA,CAAW,OAAA,GAAU,IAAA;AACrB,MAAA,OAAA,CAAQ,gBAAA,CAAiB,IAAI,KAAA,CAAM,kBAAkB,CAAC,CAAA;AACtD,MAAA,OAAA,CAAQ,KAAA,EAAM;AAAA,IACf,CAAA;AAAA,EAED,GAAG,IAAI,CAAA;AAEP,EAAA,OAAO,EAAE,OAAO,UAAA,EAAW;AAC5B","file":"standardSchemaRpcReact.js","sourcesContent":["import type { DependencyList, RefObject } from \"react\";\nimport { useEffect, useRef, useState } from \"react\";\nimport {\n\ttype StandardSchemaWebSocketRpcSession,\n\ttype StandardSchemaWebSocketRpcSessionConstructorOptions,\n\tcreateStandardSchemaWebSocketRpcSession,\n} from \"./standardSchemaRpc\";\n\n/** Options for {@link useStandardSchemaWebSocketRpc} (same as constructor options for {@link StandardSchemaWebSocketRpcSession}). */\nexport type UseStandardSchemaWebSocketRpcOptions<\n\tTClientMsg,\n\tTServerMsg,\n\tTPending extends { reject: (error: Error) => void },\n> = StandardSchemaWebSocketRpcSessionConstructorOptions<\n\tTClientMsg,\n\tTServerMsg,\n\tTPending\n>;\n\n/**\n * Connects a {@link StandardSchemaWebSocketRpcSession} in an effect: rejects all pending\n * RPCs and closes the socket on cleanup or when `deps` change.\n *\n * Callback refs keep the latest `onMessage` / `onOpen` / `onClose` without\n * listing them in `deps`, so inline handlers do not reconnect every render.\n *\n * Pass `deps` as the second argument; keep it aligned with values used to\n * build `url` / `webSocket`.\n */\nexport function useStandardSchemaWebSocketRpc<\n\tTClientMsg,\n\tTServerMsg,\n\tTPending extends { reject: (error: Error) => void },\n>(\n\toptions: UseStandardSchemaWebSocketRpcOptions<\n\t\tTClientMsg,\n\t\tTServerMsg,\n\t\tTPending\n\t>,\n\tdeps: DependencyList,\n): {\n\tready: boolean;\n\tsessionRef: RefObject<StandardSchemaWebSocketRpcSession<\n\t\tTClientMsg,\n\t\tTServerMsg,\n\t\tTPending\n\t> | null>;\n} {\n\tconst { onMessage, onOpen, onClose, ...clientOptions } = options;\n\n\tconst onMessageRef = useRef(onMessage);\n\tonMessageRef.current = onMessage;\n\tconst onOpenRef = useRef(onOpen);\n\tonOpenRef.current = onOpen;\n\tconst onCloseRef = useRef(onClose);\n\tonCloseRef.current = onClose;\n\n\tconst [ready, setReady] = useState(false);\n\tconst sessionRef = useRef<StandardSchemaWebSocketRpcSession<\n\t\tTClientMsg,\n\t\tTServerMsg,\n\t\tTPending\n\t> | null>(null);\n\n\tuseEffect(() => {\n\t\tlet cancelled = false;\n\t\tsetReady(false);\n\n\t\tconst session = createStandardSchemaWebSocketRpcSession<\n\t\t\tTClientMsg,\n\t\t\tTServerMsg,\n\t\t\tTPending\n\t\t>({\n\t\t\t...clientOptions,\n\t\t\tonMessage: (msg, s) => {\n\t\t\t\tonMessageRef.current(msg, s);\n\t\t\t},\n\t\t\tonOpen: (event) => {\n\t\t\t\tif (!cancelled) {\n\t\t\t\t\tsetReady(true);\n\t\t\t\t}\n\t\t\t\tonOpenRef.current?.(event);\n\t\t\t},\n\t\t\tonClose: (event) => {\n\t\t\t\tif (!cancelled) {\n\t\t\t\t\tsetReady(false);\n\t\t\t\t}\n\t\t\t\tonCloseRef.current?.(event);\n\t\t\t},\n\t\t});\n\n\t\tsessionRef.current = session;\n\t\tif (session.client.socket.readyState === WebSocket.OPEN) {\n\t\t\tsetReady(true);\n\t\t}\n\n\t\treturn () => {\n\t\t\tcancelled = true;\n\t\t\tsessionRef.current = null;\n\t\t\tsession.rejectAllPending(new Error(\"WebSocket closed\"));\n\t\t\tsession.close();\n\t\t};\n\t\t// biome-ignore lint/correctness/useExhaustiveDependencies: deps is the explicit contract\n\t}, deps);\n\n\treturn { ready, sessionRef };\n}\n"]}

package/package.json

@@ -1,28 +1,40 @@
 {
 	"name": "@firtoz/websocket-do",
-	"version": "10.0.0",
+	"version": "13.0.0",
 	"description": "Type-safe WebSocket session management for Cloudflare Durable Objects with Hono integration",
-	"main": "./src/index.ts",
-	"module": "./src/index.ts",
-	"types": "./src/index.ts",
+	"type": "module",
+	"main": "./dist/index.js",
+	"module": "./dist/index.js",
+	"types": "./dist/index.d.ts",
 	"exports": {
 		".": {
-			"types": "./src/index.ts",
-			"import": "./src/index.ts",
-			"require": "./src/index.ts"
+			"types": "./dist/index.d.ts",
+			"import": "./dist/index.js"
 		},
-		"./zod-client": {
-			"types": "./src/ZodWebSocketClient.ts",
-			"import": "./src/ZodWebSocketClient.ts",
-			"require": "./src/ZodWebSocketClient.ts"
+		"./schema-client": {
+			"types": "./dist/StandardSchemaWebSocketClient.d.ts",
+			"import": "./dist/StandardSchemaWebSocketClient.js"
+		},
+		"./rpc": {
+			"types": "./dist/standardSchemaRpc.d.ts",
+			"import": "./dist/standardSchemaRpc.js"
+		},
+		"./rpc-react": {
+			"types": "./dist/standardSchemaRpcReact.d.ts",
+			"import": "./dist/standardSchemaRpcReact.js"
 		}
 	},
 	"files": [
+		"dist/**/*.js",
+		"dist/**/*.js.map",
+		"dist/**/*.d.ts",
 		"src/**/*.ts",
 		"!src/**/*.test.ts",
 		"README.md"
 	],
 	"scripts": {
+		"build": "tsup",
+		"prepack": "bun run build",
 		"typecheck": "tsgo --noEmit -p ./tsconfig.json",
 		"lint": "biome check --write src",
 		"lint:ci": "biome ci src",
@@ -51,13 +63,18 @@
 	},
 	"peerDependencies": {
 		"@cloudflare/workers-types": "^4.20260329.1",
-		"@firtoz/hono-fetcher": "^2.6.0",
-		"hono": "^4.12.9"
+		"@firtoz/hono-fetcher": "^2.7.0",
+		"hono": "^4.12.9",
+		"react": ">=18.0.0"
 	},
-	"optionalDependencies": {
-		"msgpackr": "^1.11.9",
-		"react": "^19.2.4",
-		"zod": "^4.3.6"
+	"peerDependenciesMeta": {
+		"react": {
+			"optional": true
+		}
+	},
+	"dependencies": {
+		"@standard-schema/spec": "^1.1.0",
+		"msgpackr": "^1.11.9"
 	},
 	"engines": {
 		"node": ">=18.0.0"
@@ -68,6 +85,7 @@
 	"devDependencies": {
 		"@types/react": "^19.2.14",
 		"bun-types": "^1.3.11",
-		"typescript": "^6.0.2"
+		"typescript": "^6.0.2",
+		"zod": "^4.3.6"
 	}
 }

package/src/BaseSession.ts

@@ -53,14 +53,21 @@ export type SessionEnv<
 
 export type BaseSessionHandlers<
 	TData,
-	_TServerMessage,
+	TServerMessage,
 	TClientMessage,
 	TEnv extends object = Cloudflare.Env,
 > = {
-	createData: (ctx: Context<{ Bindings: TEnv }>) => TData;
+	/**
+	 * Per-connection state. If omitted, `startFresh` initializes `data` as `{}`
+	 * (use empty `TData`, e.g. `Record<string, never>`).
+	 */
+	createData?: (ctx: Context<{ Bindings: TEnv }>) => TData;
 	handleMessage: (message: TClientMessage) => Promise<void>;
 	handleBufferMessage: (message: ArrayBuffer) => Promise<void>;
-	handleClose: () => Promise<void>;
+	/** Called when this connection closes; `session` is this {@link BaseSession} instance. */
+	handleClose: (
+		session: BaseSession<TData, TServerMessage, TClientMessage, TEnv>,
+	) => Promise<void>;
 };
 
 export class BaseSession<
@@ -100,7 +107,10 @@ export class BaseSession<
 	}
 
 	public startFresh(ctx: Context<{ Bindings: TEnv }>) {
-		this.data = this.handlers.createData(ctx);
+		this.data =
+			this.handlers.createData !== undefined
+				? this.handlers.createData(ctx)
+				: ({} as TData);
 		this.wrapper.serializeAttachment(this.data);
 	}
 
@@ -137,6 +147,6 @@ export class BaseSession<
 	}
 
 	async handleClose(): Promise<void> {
-		return this.handlers.handleClose();
+		return this.handlers.handleClose(this);
 	}
 }