@igoforth/ws-rpc 1.1.4 → 1.1.6

package/README.md

@@ -312,31 +312,6 @@ Real WebSocket RPC round-trip benchmarks (GitHub Actions runner, Node.js 22):
 > Benchmarks run automatically via GitHub Actions. Results may vary based on runner load.
 > Run locally with `pnpm bench` for your environment.
 
-## Multi-Peer Driver Results
-
-When calling methods via `server.driver` or `this.driver` in a Durable Object, results are returned as an array:
-
-```typescript
-// Call all connected peers
-const results = await server.driver.getData({});
-
-// Each result contains the peer ID and success/error
-for (const { id, result } of results) {
-  if (result.success) {
-    console.log(`Peer ${id} returned:`, result.value);
-  } else {
-    console.error(`Peer ${id} failed:`, result.error.message);
-  }
-}
-
-// Call specific peers
-const singleResult = await server.driver.getData({}, { ids: "peer-123" });
-const multiResult = await server.driver.getData({}, {
-  ids: ["peer-1", "peer-2"],
-  timeout: 5000,
-});
-```
-
 ## License
 
 MIT

package/dist/adapters/client.d.ts

@@ -1,10 +1,10 @@
-import { g as Provider, o as EventTuple, t as Driver, v as RpcSchema } from "../schema-DVufxLYY.js";
-import "../factory-uZbj772l.js";
-import "../json-BBnW1n_D.js";
+import { g as Provider, o as EventTuple, t as Driver, v as RpcSchema } from "../schema-BPSDt2br.js";
+import "../factory-BEd16-Ao.js";
+import "../json-CDnAdySL.js";
 import "../index-DAwMsCZ3.js";
-import { u as RpcProtocol } from "../protocol-B6z2_jyb.js";
-import { a as IRpcOptions, c as WebSocketOptions, o as IWebSocket } from "../types-DTHyD7n1.js";
-import "../default-s4vvfkK4.js";
+import { u as RpcProtocol } from "../protocol-AvNp0_PF.js";
+import { a as IRpcOptions, o as IWebSocket, u as WebSocketOptions } from "../types-BO4jYJPi.js";
+import "../default-DYoo8pOJ.js";
 import { t as ReconnectOptions } from "../reconnect-CYt5_8Xy.js";
 import { IAdapterHooks, IConnectionAdapter } from "./types.js";
 
@@ -81,7 +81,7 @@ declare class RpcClient<TLocalSchema extends RpcSchema, TRemoteSchema extends Rp
    * @returns Promise that resolves when connected
    * @throws Error if connection fails
    */
-  connect(): Promise<void>;
+  connect(): void | Promise<void>;
   /**
    * Disconnect from the server
    *

package/dist/adapters/client.js

@@ -1,11 +1,11 @@
 import "../factory-3ziwTuZe.js";
 import "../json-Bshec-bZ.js";
 import "../codecs-BmYG2d_U.js";
-import "../protocol-C5QIKXey.js";
-import "../errors-C5IC-13X.js";
+import { u as isWireInput } from "../protocol-BMv48vpU.js";
+import "../errors-UHUwf6sp.js";
 import { t as WebSocketReadyState } from "../types-D_psiH09.js";
 import { n as defaultReconnectOptions, t as calculateReconnectDelay } from "../reconnect-Cdr_3mjN.js";
-import { t as RpcPeer } from "../default-DwjN80sT.js";
+import { t as RpcPeer } from "../default-BXFwXL8g.js";
 import "./types.js";
 
 //#region src/adapters/client.ts
@@ -96,7 +96,7 @@ var RpcClient = class {
 	* @returns Promise that resolves when connected
 	* @throws Error if connection fails
 	*/
-	async connect() {
+	connect() {
 		if (this._state === "connected" || this._state === "connecting") return;
 		this.intentionalClose = false;
 		this._state = "connecting";
@@ -116,14 +116,13 @@ var RpcClient = class {
 			const onError = (event) => {
 				cleanup();
 				this._state = "disconnected";
-				reject(/* @__PURE__ */ new Error(`WebSocket connection failed: ${event}`));
+				reject(/* @__PURE__ */ new Error(`WebSocket connection failed: ${JSON.stringify(event)}`));
 			};
 			const onClose = (event) => {
 				cleanup();
+				const typed = event;
 				this._state = "disconnected";
-				const code = typeof event === "object" && event != null && "code" in event ? event.code : "Unknown code";
-				const reason = typeof event === "object" && event != null && "reason" in event ? event.reason : "Unknown reason";
-				reject(/* @__PURE__ */ new Error(`WebSocket closed: ${code} ${reason}`));
+				reject(/* @__PURE__ */ new Error(`WebSocket closed: ${typed.code} ${typed.reason}`));
 			};
 			const cleanup = () => {
 				this.ws?.removeEventListener?.("open", onOpen);
@@ -169,12 +168,11 @@ var RpcClient = class {
 			timeout: this.timeout
 		});
 		this.ws.onmessage = (event) => {
-			if (typeof event === "object" && event != null && "data" in event) this.peer?.handleMessage(event.data);
+			if (isWireInput(event.data)) this.peer?.handleMessage(event.data);
 			else throw new Error(`Received invalid event type in RpcClient.ws.onmessage ${JSON.stringify(event)}`);
 		};
 		this.ws.onclose = (event) => {
-			if (typeof event === "object" && event != null && "code" in event && "reason" in event && typeof event.code === "number" && typeof event.reason === "string") this.handleClose(event.code, event.reason);
-			else throw new Error(`Received invalid event type in RpcClient.ws.onclose ${JSON.stringify(event)}`);
+			this.handleClose(event.code, event.reason);
 		};
 		this.ws.onerror = (event) => {
 			console.error("WebSocket error:", event);

package/dist/adapters/cloudflare-do.d.ts

@@ -1,16 +1,33 @@
-import { g as Provider, o as EventTuple, v as RpcSchema } from "../schema-DVufxLYY.js";
-import "../factory-uZbj772l.js";
-import "../json-BBnW1n_D.js";
+import { g as Provider, o as EventTuple, v as RpcSchema } from "../schema-BPSDt2br.js";
+import "../factory-BEd16-Ao.js";
+import "../json-CDnAdySL.js";
 import "../index-DAwMsCZ3.js";
-import "../protocol-B6z2_jyb.js";
-import { a as IRpcOptions } from "../types-DTHyD7n1.js";
-import { t as RpcPeer } from "../default-s4vvfkK4.js";
+import "../protocol-AvNp0_PF.js";
+import { a as IRpcOptions } from "../types-BO4jYJPi.js";
+import { t as RpcPeer } from "../default-DYoo8pOJ.js";
 import { IMultiAdapterHooks, IMultiConnectionAdapter } from "./types.js";
 import { Constructor } from "type-fest";
-import { Actor } from "@cloudflare/actors";
+import { DurableObjectStorage } from "@cloudflare/workers-types";
 
 //#region src/adapters/cloudflare-do.d.ts
 
+/**
+ * Minimal interface for Actor-like classes compatible with withRpc.
+ *
+ * This decouples ws-rpc from any specific Actor implementation (e.g. @cloudflare/actors,
+ * @polymarket/actors, or custom implementations). Any class that implements this interface
+ * can be used as a base for the withRpc mixin.
+ *
+ * Note: WebSocket lifecycle methods (onWebSocketConnect, etc.) are not included here
+ * because they are `protected` in Actor classes. The mixin can still override them
+ * from the base class without requiring them in this interface.
+ */
+interface ActorLike {
+  /** Storage with access to raw DurableObjectStorage for SQL-backed pending calls */
+  storage?: {
+    raw: DurableObjectStorage | undefined;
+  };
+}
 /**
  * Extended hooks for Durable Object adapter
  */
@@ -40,7 +57,7 @@ interface IRpcActorHooks<TLocalSchema extends RpcSchema, TRemoteSchema extends R
  * Subclasses must implement methods from TLocalSchema on `this`.
  * Runtime enforces this when methods are called via RPC.
  */
-type RpcActorConstructor<TBase extends Constructor<Actor<unknown>>, TLocalSchema extends RpcSchema, TRemoteSchema extends RpcSchema> = {
+type RpcActorConstructor<TBase extends Constructor<ActorLike>, TLocalSchema extends RpcSchema, TRemoteSchema extends RpcSchema> = {
   new (...args: ConstructorParameters<TBase>): InstanceType<TBase> & IMultiConnectionAdapter<TLocalSchema, TRemoteSchema> & IRpcActorHooks<TLocalSchema, TRemoteSchema>;
 } & Omit<TBase, "new">;
 /**
@@ -86,8 +103,8 @@ type RpcActorConstructor<TBase extends Constructor<Actor<unknown>>, TLocalSchema
  * }
  * ```
  */
-declare function withRpc<TLocalSchema extends RpcSchema, TRemoteSchema extends RpcSchema, TEnv, TBase extends Constructor<Actor<TEnv>> & {
+declare function withRpc<TLocalSchema extends RpcSchema, TRemoteSchema extends RpcSchema, TBase extends Constructor<ActorLike> & {
   prototype: Provider<TLocalSchema["methods"]>;
 }>(Base: TBase, options: IRpcOptions<TLocalSchema, TRemoteSchema>): RpcActorConstructor<TBase, TLocalSchema, TRemoteSchema>;
 //#endregion
-export { IDOHooks, IRpcActorHooks, RpcActorConstructor, withRpc };
+export { ActorLike, IDOHooks, IRpcActorHooks, RpcActorConstructor, withRpc };

package/dist/adapters/cloudflare-do.js

@@ -1,12 +1,13 @@
 import "../factory-3ziwTuZe.js";
 import "../json-Bshec-bZ.js";
 import "../codecs-BmYG2d_U.js";
-import "../protocol-C5QIKXey.js";
-import "../errors-C5IC-13X.js";
+import "../protocol-BMv48vpU.js";
+import "../errors-UHUwf6sp.js";
+import { t as MemoryPendingCallStorage } from "../memory-Bqb3KEVr.js";
 import { t as SqlPendingCallStorage } from "../sql-CCjc6Bid.js";
-import "../default-DwjN80sT.js";
-import { n as createDurableRpcPeerFactory } from "../durable-BIdilnMO.js";
-import { t as MultiPeerBase } from "../multi-peer-T1uQHC-l.js";
+import "../default-BXFwXL8g.js";
+import { n as createDurableRpcPeerFactory } from "../durable-DUd5YAN_.js";
+import { t as MultiPeerBase } from "../multi-peer-DuZtphz_.js";
 
 //#region src/adapters/cloudflare-do.ts
 /**
@@ -132,14 +133,19 @@ function withRpc(Base, options) {
 		*
 		* Handles peer management, message routing, and durable storage.
 		* Uses SQL storage from the Durable Object for hibernation-safe calls.
-		*
-		* @throws Error if DurableObjectStorage is not available
+		* Falls back to in-memory storage if DurableObjectStorage is not available.
 		*/
 		get _rpc() {
-			if (!this.storage.raw) throw new Error("DurableObjectStorage not present in actor `raw`");
-			return this.__rpc ??= new DOMultiPeer({
+			if (this.__rpc) return this.__rpc;
+			let storage;
+			if (this.storage?.raw) storage = new SqlPendingCallStorage(this.storage.raw.sql);
+			else {
+				console.warn(`[ws-rpc] DurableObjectStorage not available (storage=${typeof this.storage}, this=${this?.constructor?.name ?? typeof this}). Falling back to in-memory storage. Pending calls will not survive hibernation.`);
+				storage = new MemoryPendingCallStorage();
+			}
+			return this.__rpc = new DOMultiPeer({
 				actor: this,
-				storage: new SqlPendingCallStorage(this.storage.raw.sql),
+				storage,
 				localSchema: options.localSchema,
 				remoteSchema: options.remoteSchema,
 				provider: this,

package/dist/adapters/index.d.ts

@@ -1,13 +1,13 @@
-import "../schema-DVufxLYY.js";
-import "../factory-uZbj772l.js";
-import "../json-BBnW1n_D.js";
+import "../schema-BPSDt2br.js";
+import "../factory-BEd16-Ao.js";
+import "../json-CDnAdySL.js";
 import "../index-DAwMsCZ3.js";
-import "../protocol-B6z2_jyb.js";
-import "../types-DTHyD7n1.js";
-import "../default-s4vvfkK4.js";
+import "../protocol-AvNp0_PF.js";
+import "../types-BO4jYJPi.js";
+import "../default-DYoo8pOJ.js";
 import { n as calculateReconnectDelay, r as defaultReconnectOptions, t as ReconnectOptions } from "../reconnect-CYt5_8Xy.js";
 import { IAdapterHooks, IConnectionAdapter, IMultiAdapterHooks, IMultiConnectionAdapter, MultiCallOptions, MultiCallResult, MultiDriver } from "./types.js";
 import { ConnectionState, RpcClient, RpcClientOptions } from "./client.js";
 import { IDOHooks, IRpcActorHooks, RpcActorConstructor, withRpc } from "./cloudflare-do.js";
-import { n as RpcServerOptions, r as MultiPeerBase, t as RpcServer } from "../server-Cp7xKF5w.js";
+import { n as RpcServerOptions, r as MultiPeerBase, t as RpcServer } from "../server-B2DZ33eC.js";
 export { type ConnectionState, IAdapterHooks, IConnectionAdapter, type IDOHooks, IMultiAdapterHooks, IMultiConnectionAdapter, type IRpcActorHooks, MultiCallOptions, MultiCallResult, MultiDriver, MultiPeerBase, ReconnectOptions, type RpcActorConstructor, RpcClient, type RpcClientOptions, RpcServer, type RpcServerOptions, calculateReconnectDelay, defaultReconnectOptions, withRpc };

package/dist/adapters/index.js

@@ -1,15 +1,16 @@
 import "../factory-3ziwTuZe.js";
 import "../json-Bshec-bZ.js";
 import "../codecs-BmYG2d_U.js";
-import "../protocol-C5QIKXey.js";
-import "../errors-C5IC-13X.js";
+import "../protocol-BMv48vpU.js";
+import "../errors-UHUwf6sp.js";
+import "../memory-Bqb3KEVr.js";
 import "../sql-CCjc6Bid.js";
 import { n as defaultReconnectOptions, t as calculateReconnectDelay } from "../reconnect-Cdr_3mjN.js";
-import "../default-DwjN80sT.js";
-import "../durable-BIdilnMO.js";
+import "../default-BXFwXL8g.js";
+import "../durable-DUd5YAN_.js";
 import "./types.js";
 import { RpcClient } from "./client.js";
-import { t as MultiPeerBase } from "../multi-peer-T1uQHC-l.js";
+import { t as MultiPeerBase } from "../multi-peer-DuZtphz_.js";
 import { withRpc } from "./cloudflare-do.js";
 import { RpcServer } from "./server.js";
 

package/dist/adapters/server.d.ts

@@ -1,10 +1,10 @@
-import "../schema-DVufxLYY.js";
-import "../factory-uZbj772l.js";
-import "../json-BBnW1n_D.js";
+import "../schema-BPSDt2br.js";
+import "../factory-BEd16-Ao.js";
+import "../json-CDnAdySL.js";
 import "../index-DAwMsCZ3.js";
-import "../protocol-B6z2_jyb.js";
-import "../types-DTHyD7n1.js";
-import "../default-s4vvfkK4.js";
+import "../protocol-AvNp0_PF.js";
+import "../types-BO4jYJPi.js";
+import "../default-DYoo8pOJ.js";
 import "./types.js";
-import { n as RpcServerOptions, t as RpcServer } from "../server-Cp7xKF5w.js";
+import { n as RpcServerOptions, t as RpcServer } from "../server-B2DZ33eC.js";
 export { RpcServer, RpcServerOptions };

package/dist/adapters/server.js

@@ -1,11 +1,11 @@
 import "../factory-3ziwTuZe.js";
 import "../json-Bshec-bZ.js";
 import "../codecs-BmYG2d_U.js";
-import "../protocol-C5QIKXey.js";
-import "../errors-C5IC-13X.js";
+import { u as isWireInput } from "../protocol-BMv48vpU.js";
+import "../errors-UHUwf6sp.js";
 import { t as WebSocketReadyState } from "../types-D_psiH09.js";
-import { t as RpcPeer } from "../default-DwjN80sT.js";
-import { t as MultiPeerBase } from "../multi-peer-T1uQHC-l.js";
+import "../default-BXFwXL8g.js";
+import { t as MultiPeerBase } from "../multi-peer-DuZtphz_.js";
 
 //#region src/adapters/server.ts
 /**
@@ -73,20 +73,11 @@ var RpcServer = class extends MultiPeerBase {
 		this.wss.on("close", () => this.hooks.onClose?.());
 	}
 	handleConnection(ws) {
-		const peer = new RpcPeer({
-			ws,
-			localSchema: this.localSchema,
-			remoteSchema: this.remoteSchema,
-			provider: this.provider,
-			...this.protocol !== void 0 && { protocol: this.protocol },
-			timeout: this.timeout,
-			onEvent: (...args) => {
-				this.hooks.onEvent?.(peer, ...args);
-			}
-		});
+		const peer = this.createPeer(ws);
 		this.addPeer(ws, peer);
 		ws.onmessage = (event) => {
-			if (typeof event === "object" && event != null && "data" in event && (typeof event.data === "string" || event.data instanceof ArrayBuffer)) peer.handleMessage(event.data);
+			if (isWireInput(event.data)) peer.handleMessage(event.data);
+			else throw new Error(`Received invalid event type in RpcServer.ws.onmessage ${JSON.stringify(event)}`);
 		};
 		ws.onclose = () => {
 			this.removePeer(ws);

package/dist/adapters/types.d.ts

@@ -1,10 +1,10 @@
-import { a as EventHandler, d as InferOutput, h as MethodDef, l as InferInput, r as EventDef, t as Driver, v as RpcSchema, y as StringKeys } from "../schema-DVufxLYY.js";
-import "../factory-uZbj772l.js";
-import "../json-BBnW1n_D.js";
+import { a as EventHandler, d as InferOutput, h as MethodDef, l as InferInput, r as EventDef, t as Driver, v as RpcSchema, y as StringKeys } from "../schema-BPSDt2br.js";
+import "../factory-BEd16-Ao.js";
+import "../json-CDnAdySL.js";
 import "../index-DAwMsCZ3.js";
-import "../protocol-B6z2_jyb.js";
-import { a as IRpcOptions, n as IMethodController, t as IEventController } from "../types-DTHyD7n1.js";
-import { t as RpcPeer } from "../default-s4vvfkK4.js";
+import "../protocol-AvNp0_PF.js";
+import { a as IRpcOptions, n as IMethodController, t as IEventController } from "../types-BO4jYJPi.js";
+import { t as RpcPeer } from "../default-DYoo8pOJ.js";
 import { n as calculateReconnectDelay, r as defaultReconnectOptions, t as ReconnectOptions } from "../reconnect-CYt5_8Xy.js";
 
 //#region src/adapters/types.d.ts

package/dist/codecs/cbor.d.ts

@@ -1,5 +1,5 @@
-import "../schema-DVufxLYY.js";
-import { n as CodecFactory } from "../factory-uZbj772l.js";
+import "../schema-BPSDt2br.js";
+import { n as CodecFactory } from "../factory-BEd16-Ao.js";
 import * as z from "zod";
 
 //#region src/codecs/cbor.d.ts

package/dist/codecs/factory.d.ts

@@ -1,3 +1,3 @@
-import "../schema-DVufxLYY.js";
-import { a as WireCodec, c as createStringCodecFactory, i as StringCodec, l as isBinaryCodec, n as CodecFactory, o as WireData, r as CodecOptions, s as createBinaryCodecFactory, t as BinaryCodec, u as isStringCodec } from "../factory-uZbj772l.js";
+import "../schema-BPSDt2br.js";
+import { a as WireCodec, c as createStringCodecFactory, i as StringCodec, l as isBinaryCodec, n as CodecFactory, o as WireData, r as CodecOptions, s as createBinaryCodecFactory, t as BinaryCodec, u as isStringCodec } from "../factory-BEd16-Ao.js";
 export { BinaryCodec, CodecFactory, CodecOptions, StringCodec, WireCodec, WireData, createBinaryCodecFactory, createStringCodecFactory, isBinaryCodec, isStringCodec };

package/dist/codecs/index.d.ts

@@ -1,5 +1,5 @@
-import "../schema-DVufxLYY.js";
-import { a as WireCodec, c as createStringCodecFactory, i as StringCodec, l as isBinaryCodec, n as CodecFactory, o as WireData, r as CodecOptions, s as createBinaryCodecFactory, t as BinaryCodec, u as isStringCodec } from "../factory-uZbj772l.js";
-import { n as createJsonCodec, t as JsonCodec } from "../json-BBnW1n_D.js";
+import "../schema-BPSDt2br.js";
+import { a as WireCodec, c as createStringCodecFactory, i as StringCodec, l as isBinaryCodec, n as CodecFactory, o as WireData, r as CodecOptions, s as createBinaryCodecFactory, t as BinaryCodec, u as isStringCodec } from "../factory-BEd16-Ao.js";
+import { n as createJsonCodec, t as JsonCodec } from "../json-CDnAdySL.js";
 import "../index-DAwMsCZ3.js";
 export { BinaryCodec, CodecFactory, CodecOptions, JsonCodec, StringCodec, WireCodec, WireData, createBinaryCodecFactory, createJsonCodec, createStringCodecFactory, isBinaryCodec, isStringCodec };

package/dist/codecs/json.d.ts

@@ -1,4 +1,4 @@
-import "../schema-DVufxLYY.js";
-import "../factory-uZbj772l.js";
-import { n as createJsonCodec, t as JsonCodec } from "../json-BBnW1n_D.js";
+import "../schema-BPSDt2br.js";
+import "../factory-BEd16-Ao.js";
+import { n as createJsonCodec, t as JsonCodec } from "../json-CDnAdySL.js";
 export { JsonCodec, createJsonCodec };

package/dist/codecs/msgpack.d.ts

@@ -1,5 +1,5 @@
-import "../schema-DVufxLYY.js";
-import { n as CodecFactory } from "../factory-uZbj772l.js";
+import "../schema-BPSDt2br.js";
+import { n as CodecFactory } from "../factory-BEd16-Ao.js";
 import * as z from "zod";
 
 //#region src/codecs/msgpack.d.ts

package/dist/{default-DwjN80sT.js → default-BXFwXL8g.js}

@@ -1,5 +1,5 @@
-import { n as RpcErrorCodes, t as JsonProtocol } from "./protocol-C5QIKXey.js";
-import { a as RpcTimeoutError, i as RpcRemoteError, o as RpcValidationError, r as RpcMethodNotFoundError, t as RpcConnectionClosed } from "./errors-C5IC-13X.js";
+import { n as RpcErrorCodes, t as JsonProtocol } from "./protocol-BMv48vpU.js";
+import { a as RpcTimeoutError, i as RpcRemoteError, o as RpcValidationError, r as RpcMethodNotFoundError, t as RpcConnectionClosed } from "./errors-UHUwf6sp.js";
 import { v7 } from "uuid";
 
 //#region src/peers/default.ts

package/dist/{default-s4vvfkK4.d.ts → default-DYoo8pOJ.d.ts}

@@ -1,6 +1,6 @@
-import { a as EventHandler, g as Provider, o as EventTuple, t as Driver, v as RpcSchema } from "./schema-DVufxLYY.js";
-import { g as WireInput, u as RpcProtocol } from "./protocol-B6z2_jyb.js";
-import { a as IRpcOptions, r as IMinWebSocket } from "./types-DTHyD7n1.js";
+import { a as EventHandler, g as Provider, o as EventTuple, t as Driver, v as RpcSchema } from "./schema-BPSDt2br.js";
+import { g as WireInput, u as RpcProtocol } from "./protocol-AvNp0_PF.js";
+import { a as IRpcOptions, r as IMinWebSocket } from "./types-BO4jYJPi.js";
 
 //#region src/peers/default.d.ts
 

package/dist/{durable-BIdilnMO.js → durable-DUd5YAN_.js}

@@ -1,4 +1,4 @@
-import { t as RpcPeer } from "./default-DwjN80sT.js";
+import { t as RpcPeer } from "./default-BXFwXL8g.js";
 
 //#region src/peers/durable.ts
 /**

package/dist/{errors-C5IC-13X.js → errors-UHUwf6sp.js}

@@ -1,4 +1,4 @@
-import { n as RpcErrorCodes } from "./protocol-C5QIKXey.js";
+import { n as RpcErrorCodes } from "./protocol-BMv48vpU.js";
 
 //#region src/errors.ts
 /**

package/dist/errors.js

@@ -1,7 +1,7 @@
 import "./factory-3ziwTuZe.js";
 import "./json-Bshec-bZ.js";
 import "./codecs-BmYG2d_U.js";
-import "./protocol-C5QIKXey.js";
-import { a as RpcTimeoutError, i as RpcRemoteError, n as RpcError, o as RpcValidationError, r as RpcMethodNotFoundError, t as RpcConnectionClosed } from "./errors-C5IC-13X.js";
+import "./protocol-BMv48vpU.js";
+import { a as RpcTimeoutError, i as RpcRemoteError, n as RpcError, o as RpcValidationError, r as RpcMethodNotFoundError, t as RpcConnectionClosed } from "./errors-UHUwf6sp.js";
 
 export { RpcConnectionClosed, RpcError, RpcMethodNotFoundError, RpcRemoteError, RpcTimeoutError, RpcValidationError };

package/dist/{factory-uZbj772l.d.ts → factory-BEd16-Ao.d.ts}

@@ -1,4 +1,4 @@
-import { p as LiteralStringUnion } from "./schema-DVufxLYY.js";
+import { p as LiteralStringUnion } from "./schema-BPSDt2br.js";
 import * as z from "zod";
 
 //#region src/codecs/factory.d.ts

package/dist/index.d.ts

@@ -1,13 +1,13 @@
-import { a as EventHandler, b as event, c as InferEvents, d as InferOutput, g as Provider, h as MethodDef, l as InferInput, o as EventTuple, r as EventDef, s as InferEventData, t as Driver, u as InferMethods, v as RpcSchema, x as method } from "./schema-DVufxLYY.js";
-import "./factory-uZbj772l.js";
-import "./json-BBnW1n_D.js";
+import { a as EventHandler, b as event, c as InferEvents, d as InferOutput, g as Provider, h as MethodDef, l as InferInput, o as EventTuple, r as EventDef, s as InferEventData, t as Driver, u as InferMethods, v as RpcSchema, x as method } from "./schema-BPSDt2br.js";
+import "./factory-BEd16-Ao.js";
+import "./json-CDnAdySL.js";
 import "./index-DAwMsCZ3.js";
-import { _ as createProtocol, a as RpcEvent, c as RpcMessageCodec, d as RpcRequest, f as RpcRequestSchema, h as RpcWireCodec, i as RpcErrorSchema, l as RpcMessageSchema, m as RpcResponseSchema, n as RpcError$1, o as RpcEventSchema, p as RpcResponse, r as RpcErrorCodes, s as RpcMessage, t as JsonProtocol, u as RpcProtocol } from "./protocol-B6z2_jyb.js";
-import { a as IRpcOptions, c as WebSocketOptions, i as IRpcConnection, l as WebSocketReadyState, n as IMethodController, o as IWebSocket, r as IMinWebSocket, s as IWebSocketServer, t as IEventController, u as WebSocketServerOptions } from "./types-DTHyD7n1.js";
+import { _ as createProtocol, a as RpcEvent, c as RpcMessageCodec, d as RpcRequest, f as RpcRequestSchema, h as RpcWireCodec, i as RpcErrorSchema, l as RpcMessageSchema, m as RpcResponseSchema, n as RpcError$1, o as RpcEventSchema, p as RpcResponse, r as RpcErrorCodes, s as RpcMessage, t as JsonProtocol, u as RpcProtocol } from "./protocol-AvNp0_PF.js";
+import { a as IRpcOptions, d as WebSocketReadyState, f as WebSocketServerOptions, i as IRpcConnection, l as IWebSocketServer, n as IMethodController, o as IWebSocket, r as IMinWebSocket, t as IEventController, u as WebSocketOptions } from "./types-BO4jYJPi.js";
 import { n as calculateReconnectDelay, r as defaultReconnectOptions, t as ReconnectOptions } from "./reconnect-CYt5_8Xy.js";
 import { RpcConnectionClosed, RpcError, RpcMethodNotFoundError, RpcRemoteError, RpcTimeoutError, RpcValidationError } from "./errors.js";
-import { a as PendingCallStorage, i as PendingCall, o as StorageMode, r as MaybePromise, s as SyncPendingCallStorage, t as AsyncPendingCallStorage } from "./interface-Dwr9zDR6.js";
-import { t as MemoryPendingCallStorage } from "./memory-CPEAGd76.js";
-import { t as SqlPendingCallStorage } from "./sql-DYEHo09F.js";
+import { a as PendingCallStorage, i as PendingCall, o as StorageMode, r as MaybePromise, s as SyncPendingCallStorage, t as AsyncPendingCallStorage } from "./interface-DYLQZys5.js";
+import { t as MemoryPendingCallStorage } from "./memory-DWpvxAue.js";
+import { t as SqlPendingCallStorage } from "./sql-J3OVXInb.js";
 import "./storage/index.js";
 export { type AsyncPendingCallStorage, type Driver, type EventDef, type EventHandler, type EventTuple, type IEventController, type IMethodController, type IMinWebSocket, type IRpcConnection, type IRpcOptions, type IWebSocket, type IWebSocketServer, type InferEventData, type InferEvents, type InferInput, type InferMethods, type InferOutput, JsonProtocol, type MaybePromise, MemoryPendingCallStorage, type MethodDef, type PendingCall, type PendingCallStorage, type Provider, type ReconnectOptions, RpcConnectionClosed, RpcError, RpcErrorCodes, type RpcError$1 as RpcErrorMessage, RpcErrorSchema, type RpcEvent, RpcEventSchema, type RpcMessage, RpcMessageCodec, RpcMessageSchema, RpcMethodNotFoundError, type RpcProtocol, RpcRemoteError, type RpcRequest, RpcRequestSchema, type RpcResponse, RpcResponseSchema, type RpcSchema, RpcTimeoutError, RpcValidationError, type RpcWireCodec, SqlPendingCallStorage, type StorageMode, type SyncPendingCallStorage, type WebSocketOptions, WebSocketReadyState, type WebSocketServerOptions, calculateReconnectDelay, createProtocol, defaultReconnectOptions, event, method };

package/dist/index.js

@@ -1,8 +1,8 @@
 import "./factory-3ziwTuZe.js";
 import "./json-Bshec-bZ.js";
 import "./codecs-BmYG2d_U.js";
-import { a as RpcMessageCodec, c as RpcResponseSchema, i as RpcEventSchema, l as createProtocol, n as RpcErrorCodes, o as RpcMessageSchema, r as RpcErrorSchema, s as RpcRequestSchema, t as JsonProtocol } from "./protocol-C5QIKXey.js";
-import { a as RpcTimeoutError, i as RpcRemoteError, n as RpcError, o as RpcValidationError, r as RpcMethodNotFoundError, t as RpcConnectionClosed } from "./errors-C5IC-13X.js";
+import { a as RpcMessageCodec, c as RpcResponseSchema, i as RpcEventSchema, l as createProtocol, n as RpcErrorCodes, o as RpcMessageSchema, r as RpcErrorSchema, s as RpcRequestSchema, t as JsonProtocol } from "./protocol-BMv48vpU.js";
+import { a as RpcTimeoutError, i as RpcRemoteError, n as RpcError, o as RpcValidationError, r as RpcMethodNotFoundError, t as RpcConnectionClosed } from "./errors-UHUwf6sp.js";
 import { event, method } from "./schema.js";
 import { t as MemoryPendingCallStorage } from "./memory-Bqb3KEVr.js";
 import { t as SqlPendingCallStorage } from "./sql-CCjc6Bid.js";

package/dist/{interface-Dwr9zDR6.d.ts → interface-DYLQZys5.d.ts}

@@ -1,4 +1,4 @@
-import { v as RpcSchema } from "./schema-DVufxLYY.js";
+import { v as RpcSchema } from "./schema-BPSDt2br.js";
 
 //#region src/storage/interface.d.ts
 

package/dist/{json-BBnW1n_D.d.ts → json-CDnAdySL.d.ts}

@@ -1,4 +1,4 @@
-import { n as CodecFactory } from "./factory-uZbj772l.js";
+import { n as CodecFactory } from "./factory-BEd16-Ao.js";
 import * as z from "zod";
 
 //#region src/codecs/json.d.ts

package/dist/{memory-CPEAGd76.d.ts → memory-DWpvxAue.d.ts}

@@ -1,5 +1,5 @@
-import { i as StringCodec } from "./factory-uZbj772l.js";
-import { i as PendingCall, s as SyncPendingCallStorage } from "./interface-Dwr9zDR6.js";
+import { i as StringCodec } from "./factory-BEd16-Ao.js";
+import { i as PendingCall, s as SyncPendingCallStorage } from "./interface-DYLQZys5.js";
 
 //#region src/storage/memory.d.ts
 

package/dist/{multi-peer-T1uQHC-l.js → multi-peer-DuZtphz_.js}

@@ -1,5 +1,5 @@
 import { t as isPromise } from "./promise-CjrOX-DI.js";
-import { t as RpcPeer } from "./default-DwjN80sT.js";
+import { t as RpcPeer } from "./default-BXFwXL8g.js";
 
 //#region src/adapters/multi-peer.ts
 /**
@@ -48,25 +48,18 @@ var MultiPeerBase = class {
 	* Subclasses can override to customize peer creation.
 	*/
 	createPeer(ws) {
-		return new RpcPeer({
+		const peer = new RpcPeer({
 			ws,
 			localSchema: this.localSchema,
 			remoteSchema: this.remoteSchema,
 			provider: this.provider,
+			timeout: this.timeout,
 			...this.protocol !== void 0 && { protocol: this.protocol },
-			onEvent: this.hooks.onEvent ? (...args) => {
-				const peer = this.findPeerByWs(ws);
-				if (peer) this.hooks.onEvent?.(peer, ...args);
-			} : void 0,
-			timeout: this.timeout
+			onEvent: (...args) => {
+				this.hooks.onEvent?.(peer, ...args);
+			}
 		});
-	}
-	/**
-	* Find peer by WebSocket (internal helper for event routing)
-	*/
-	findPeerByWs(ws) {
-		for (const peer of this.peers.values()) if (peer.getWebSocket() === ws) return peer;
-		return null;
+		return peer;
 	}
 	/**
 	* Add a peer (called by subclass when connection established)
@@ -98,7 +91,7 @@ var MultiPeerBase = class {
 	* Get peer by ID
 	*/
 	getPeer(id) {
-		for (const peer of this.peers.values()) if (peer.id === id) return peer;
+		for (const peer of this.getPeers()) if (peer.id === id) return peer;
 		return null;
 	}
 	/**
@@ -133,7 +126,7 @@ var MultiPeerBase = class {
 	*/
 	getConnectionCount() {
 		let count = 0;
-		for (const peer of this.peers.values()) if (peer.isOpen) count++;
+		for (const peer of this.getPeers()) if (peer.isOpen) count++;
 		return count;
 	}
 	/**
@@ -141,7 +134,7 @@ var MultiPeerBase = class {
 	*/
 	getConnectionIds() {
 		const ids = [];
-		for (const peer of this.peers.values()) if (peer.isOpen) ids.push(peer.id);
+		for (const peer of this.getPeers()) if (peer.isOpen) ids.push(peer.id);
 		return ids;
 	}
 	/**
@@ -160,7 +153,7 @@ var MultiPeerBase = class {
 	emit(...args) {
 		const ids = args[2];
 		const eventArgs = args.slice(0, 2);
-		const validPeers = ids ? this.peers.values().filter((p) => ids.includes(p.id) && p.isOpen) : this.peers.values().filter((p) => p.isOpen);
+		const validPeers = ids ? Array.from(this.getPeers()).filter((p) => ids.includes(p.id) && p.isOpen) : Array.from(this.getPeers()).filter((p) => p.isOpen);
 		for (const peer of validPeers) peer.emit(...eventArgs);
 	}
 	/**
@@ -183,7 +176,7 @@ var MultiPeerBase = class {
 	* Close all peers
 	*/
 	closeAll() {
-		for (const peer of this.peers.values()) {
+		for (const peer of this.getPeers()) {
 			peer.close();
 			this.hooks.onDisconnect?.(peer);
 		}
@@ -213,7 +206,7 @@ var MultiPeerBase = class {
 		const [input, options] = args.length === 2 ? args : [void 0, args[0]];
 		const { ids, timeout = this.timeout } = options ?? {};
 		let targetPeers;
-		if (ids === void 0) targetPeers = Array.from(this.peers.values()).filter((p) => p.isOpen);
+		if (ids === void 0) targetPeers = Array.from(this.getPeers()).filter((p) => p.isOpen);
 		else if (typeof ids === "string") {
 			const peer = this.getPeer(ids);
 			targetPeers = peer?.isOpen ? [peer] : [];

package/dist/peers/default.d.ts

@@ -1,8 +1,8 @@
-import "../schema-DVufxLYY.js";
-import "../factory-uZbj772l.js";
-import "../json-BBnW1n_D.js";
+import "../schema-BPSDt2br.js";
+import "../factory-BEd16-Ao.js";
+import "../json-CDnAdySL.js";
 import "../index-DAwMsCZ3.js";
-import "../protocol-B6z2_jyb.js";
-import "../types-DTHyD7n1.js";
-import { n as RpcPeerOptions, t as RpcPeer } from "../default-s4vvfkK4.js";
+import "../protocol-AvNp0_PF.js";
+import "../types-BO4jYJPi.js";
+import { n as RpcPeerOptions, t as RpcPeer } from "../default-DYoo8pOJ.js";
 export { RpcPeer, RpcPeerOptions };

package/dist/peers/default.js

@@ -1,8 +1,8 @@
 import "../factory-3ziwTuZe.js";
 import "../json-Bshec-bZ.js";
 import "../codecs-BmYG2d_U.js";
-import "../protocol-C5QIKXey.js";
-import "../errors-C5IC-13X.js";
-import { t as RpcPeer } from "../default-DwjN80sT.js";
+import "../protocol-BMv48vpU.js";
+import "../errors-UHUwf6sp.js";
+import { t as RpcPeer } from "../default-BXFwXL8g.js";
 
 export { RpcPeer };

package/dist/peers/durable.d.ts

@@ -1,11 +1,11 @@
-import { v as RpcSchema } from "../schema-DVufxLYY.js";
-import "../factory-uZbj772l.js";
-import "../json-BBnW1n_D.js";
+import { v as RpcSchema } from "../schema-BPSDt2br.js";
+import "../factory-BEd16-Ao.js";
+import "../json-CDnAdySL.js";
 import "../index-DAwMsCZ3.js";
-import { g as WireInput } from "../protocol-B6z2_jyb.js";
-import "../types-DTHyD7n1.js";
-import { n as RpcPeerOptions, t as RpcPeer } from "../default-s4vvfkK4.js";
-import { i as PendingCall, s as SyncPendingCallStorage } from "../interface-Dwr9zDR6.js";
+import { g as WireInput } from "../protocol-AvNp0_PF.js";
+import "../types-BO4jYJPi.js";
+import { n as RpcPeerOptions, t as RpcPeer } from "../default-DYoo8pOJ.js";
+import { i as PendingCall, s as SyncPendingCallStorage } from "../interface-DYLQZys5.js";
 
 //#region src/peers/durable.d.ts
 

package/dist/peers/durable.js

@@ -1,9 +1,9 @@
 import "../factory-3ziwTuZe.js";
 import "../json-Bshec-bZ.js";
 import "../codecs-BmYG2d_U.js";
-import "../protocol-C5QIKXey.js";
-import "../errors-C5IC-13X.js";
-import "../default-DwjN80sT.js";
-import { n as createDurableRpcPeerFactory, t as DurableRpcPeer } from "../durable-BIdilnMO.js";
+import "../protocol-BMv48vpU.js";
+import "../errors-UHUwf6sp.js";
+import "../default-BXFwXL8g.js";
+import { n as createDurableRpcPeerFactory, t as DurableRpcPeer } from "../durable-DUd5YAN_.js";
 
 export { DurableRpcPeer, createDurableRpcPeerFactory };

package/dist/peers/index.d.ts

@@ -1,10 +1,10 @@
-import "../schema-DVufxLYY.js";
-import "../factory-uZbj772l.js";
-import "../json-BBnW1n_D.js";
+import "../schema-BPSDt2br.js";
+import "../factory-BEd16-Ao.js";
+import "../json-CDnAdySL.js";
 import "../index-DAwMsCZ3.js";
-import "../protocol-B6z2_jyb.js";
-import "../types-DTHyD7n1.js";
-import { n as RpcPeerOptions, t as RpcPeer } from "../default-s4vvfkK4.js";
-import "../interface-Dwr9zDR6.js";
+import "../protocol-AvNp0_PF.js";
+import "../types-BO4jYJPi.js";
+import { n as RpcPeerOptions, t as RpcPeer } from "../default-DYoo8pOJ.js";
+import "../interface-DYLQZys5.js";
 import { CallContext, DurableRpcPeer, DurableRpcPeerOptions } from "./durable.js";
 export { type CallContext, DurableRpcPeer, type DurableRpcPeerOptions, RpcPeer, type RpcPeerOptions };

package/dist/peers/index.js

@@ -1,9 +1,9 @@
 import "../factory-3ziwTuZe.js";
 import "../json-Bshec-bZ.js";
 import "../codecs-BmYG2d_U.js";
-import "../protocol-C5QIKXey.js";
-import "../errors-C5IC-13X.js";
-import { t as RpcPeer } from "../default-DwjN80sT.js";
-import { t as DurableRpcPeer } from "../durable-BIdilnMO.js";
+import "../protocol-BMv48vpU.js";
+import "../errors-UHUwf6sp.js";
+import { t as RpcPeer } from "../default-BXFwXL8g.js";
+import { t as DurableRpcPeer } from "../durable-DUd5YAN_.js";
 
 export { DurableRpcPeer, RpcPeer };

package/dist/{protocol-B6z2_jyb.d.ts → protocol-AvNp0_PF.d.ts}

@@ -1,4 +1,4 @@
-import { a as WireCodec } from "./factory-uZbj772l.js";
+import { a as WireCodec } from "./factory-BEd16-Ao.js";
 import * as z from "zod";
 
 //#region src/protocol.d.ts
@@ -130,6 +130,7 @@ type WireDataOf<T extends RpcWireCodec> = T extends z.ZodCodec<infer A> ? A exte
  * for seamless integration with the ws package.
  */
 type WireInput = string | ArrayBuffer | Uint8Array | Uint8Array[];
+declare function isWireInput(value: unknown): value is WireInput;
 /**
  * Protocol interface returned by createProtocol
  */
@@ -208,4 +209,4 @@ declare const JsonProtocol: RpcProtocol<z.ZodCodec<z.ZodString, z.ZodUnion<reado
   data: z.ZodUnknown;
 }, z.core.$strip>]>>>;
 //#endregion
-export { createProtocol as _, RpcEvent as a, RpcMessageCodec as c, RpcRequest as d, RpcRequestSchema as f, WireInput as g, RpcWireCodec as h, RpcErrorSchema as i, RpcMessageSchema as l, RpcResponseSchema as m, RpcError as n, RpcEventSchema as o, RpcResponse as p, RpcErrorCodes as r, RpcMessage as s, JsonProtocol as t, RpcProtocol as u };
+export { createProtocol as _, RpcEvent as a, RpcMessageCodec as c, RpcRequest as d, RpcRequestSchema as f, WireInput as g, RpcWireCodec as h, RpcErrorSchema as i, RpcMessageSchema as l, RpcResponseSchema as m, RpcError as n, RpcEventSchema as o, RpcResponse as p, RpcErrorCodes as r, RpcMessage as s, JsonProtocol as t, RpcProtocol as u, isWireInput as v };

package/dist/{protocol-C5QIKXey.js → protocol-BMv48vpU.js}

@@ -81,6 +81,9 @@ const RpcErrorCodes = {
 * ```
 */
 const RpcMessageCodec = createJsonCodec(RpcMessageSchema);
+function isWireInput(value) {
+	return typeof value === "string" || value instanceof ArrayBuffer || value instanceof Uint8Array || Array.isArray(value) && value.every((v) => v instanceof Uint8Array);
+}
 /**
 * Create a protocol instance with bound encode/decode functions
 *
@@ -189,4 +192,4 @@ function createProtocol(codec = RpcMessageCodec) {
 const JsonProtocol = createProtocol(RpcMessageCodec);
 
 //#endregion
-export { RpcMessageCodec as a, RpcResponseSchema as c, RpcEventSchema as i, createProtocol as l, RpcErrorCodes as n, RpcMessageSchema as o, RpcErrorSchema as r, RpcRequestSchema as s, JsonProtocol as t };
+export { RpcMessageCodec as a, RpcResponseSchema as c, RpcEventSchema as i, createProtocol as l, RpcErrorCodes as n, RpcMessageSchema as o, RpcErrorSchema as r, RpcRequestSchema as s, JsonProtocol as t, isWireInput as u };

package/dist/protocol.d.ts

@@ -1,6 +1,6 @@
-import "./schema-DVufxLYY.js";
-import "./factory-uZbj772l.js";
-import "./json-BBnW1n_D.js";
+import "./schema-BPSDt2br.js";
+import "./factory-BEd16-Ao.js";
+import "./json-CDnAdySL.js";
 import "./index-DAwMsCZ3.js";
-import { _ as createProtocol, a as RpcEvent, c as RpcMessageCodec, d as RpcRequest, f as RpcRequestSchema, g as WireInput, h as RpcWireCodec, i as RpcErrorSchema, l as RpcMessageSchema, m as RpcResponseSchema, n as RpcError, o as RpcEventSchema, p as RpcResponse, r as RpcErrorCodes, s as RpcMessage, t as JsonProtocol, u as RpcProtocol } from "./protocol-B6z2_jyb.js";
-export { JsonProtocol, RpcError, RpcErrorCodes, RpcErrorSchema, RpcEvent, RpcEventSchema, RpcMessage, RpcMessageCodec, RpcMessageSchema, RpcProtocol, RpcRequest, RpcRequestSchema, RpcResponse, RpcResponseSchema, RpcWireCodec, WireInput, createProtocol };
+import { _ as createProtocol, a as RpcEvent, c as RpcMessageCodec, d as RpcRequest, f as RpcRequestSchema, g as WireInput, h as RpcWireCodec, i as RpcErrorSchema, l as RpcMessageSchema, m as RpcResponseSchema, n as RpcError, o as RpcEventSchema, p as RpcResponse, r as RpcErrorCodes, s as RpcMessage, t as JsonProtocol, u as RpcProtocol, v as isWireInput } from "./protocol-AvNp0_PF.js";
+export { JsonProtocol, RpcError, RpcErrorCodes, RpcErrorSchema, RpcEvent, RpcEventSchema, RpcMessage, RpcMessageCodec, RpcMessageSchema, RpcProtocol, RpcRequest, RpcRequestSchema, RpcResponse, RpcResponseSchema, RpcWireCodec, WireInput, createProtocol, isWireInput };

package/dist/protocol.js

@@ -1,6 +1,6 @@
 import "./factory-3ziwTuZe.js";
 import "./json-Bshec-bZ.js";
 import "./codecs-BmYG2d_U.js";
-import { a as RpcMessageCodec, c as RpcResponseSchema, i as RpcEventSchema, l as createProtocol, n as RpcErrorCodes, o as RpcMessageSchema, r as RpcErrorSchema, s as RpcRequestSchema, t as JsonProtocol } from "./protocol-C5QIKXey.js";
+import { a as RpcMessageCodec, c as RpcResponseSchema, i as RpcEventSchema, l as createProtocol, n as RpcErrorCodes, o as RpcMessageSchema, r as RpcErrorSchema, s as RpcRequestSchema, t as JsonProtocol, u as isWireInput } from "./protocol-BMv48vpU.js";
 
-export { JsonProtocol, RpcErrorCodes, RpcErrorSchema, RpcEventSchema, RpcMessageCodec, RpcMessageSchema, RpcRequestSchema, RpcResponseSchema, createProtocol };
+export { JsonProtocol, RpcErrorCodes, RpcErrorSchema, RpcEventSchema, RpcMessageCodec, RpcMessageSchema, RpcRequestSchema, RpcResponseSchema, createProtocol, isWireInput };

package/dist/{schema-DVufxLYY.d.ts → schema-BPSDt2br.d.ts}

@@ -1,5 +1,5 @@
 import * as z from "zod";
-import { LiteralUnion } from "type-fest";
+import { LiteralUnion, NonEmptyObject } from "type-fest";
 
 //#region src/schema.d.ts
 
@@ -123,7 +123,7 @@ type Driver<T extends RpcSchema["methods"]> = T extends Record<string, MethodDef
 /**
  * Discriminated event tuple union - enables proper narrowing in switch statements.
  */
-type EventTuple<T extends RpcSchema["events"]> = T extends Record<string, EventDef> ? { [K in keyof T]: [event: K, data: InferEventData<T[K]>] }[keyof T] : [event: string, data: unknown];
+type EventTuple<T extends RpcSchema["events"]> = T extends NonEmptyObject<Record<string, EventDef>> ? { [K in keyof T]: [event: K, data: InferEventData<T[K]>] }[keyof T] : [event: string, data: unknown];
 /**
  * Event handler type - handles incoming events.
  * Uses discriminated tuple union for proper type narrowing in switch statements.

package/dist/schema.d.ts

@@ -1,2 +1,2 @@
-import { _ as RpcCollection, a as EventHandler, b as event, c as InferEvents, d as InferOutput, f as LiteralString, g as Provider, h as MethodDef, i as EventEmitter, l as InferInput, m as Method, n as Event, o as EventTuple, p as LiteralStringUnion, r as EventDef, s as InferEventData, t as Driver, u as InferMethods, v as RpcSchema, x as method, y as StringKeys } from "./schema-DVufxLYY.js";
+import { _ as RpcCollection, a as EventHandler, b as event, c as InferEvents, d as InferOutput, f as LiteralString, g as Provider, h as MethodDef, i as EventEmitter, l as InferInput, m as Method, n as Event, o as EventTuple, p as LiteralStringUnion, r as EventDef, s as InferEventData, t as Driver, u as InferMethods, v as RpcSchema, x as method, y as StringKeys } from "./schema-BPSDt2br.js";
 export { Driver, Event, EventDef, EventEmitter, EventHandler, EventTuple, InferEventData, InferEvents, InferInput, InferMethods, InferOutput, LiteralString, LiteralStringUnion, Method, MethodDef, Provider, RpcCollection, RpcSchema, StringKeys, event, method };

package/dist/{server-Cp7xKF5w.d.ts → server-B2DZ33eC.d.ts}

@@ -1,7 +1,7 @@
-import { g as Provider, o as EventTuple, v as RpcSchema } from "./schema-DVufxLYY.js";
-import { u as RpcProtocol } from "./protocol-B6z2_jyb.js";
-import { a as IRpcOptions, o as IWebSocket, r as IMinWebSocket, s as IWebSocketServer, u as WebSocketServerOptions } from "./types-DTHyD7n1.js";
-import { t as RpcPeer } from "./default-s4vvfkK4.js";
+import { g as Provider, o as EventTuple, v as RpcSchema } from "./schema-BPSDt2br.js";
+import { u as RpcProtocol } from "./protocol-AvNp0_PF.js";
+import { a as IRpcOptions, f as WebSocketServerOptions, l as IWebSocketServer, o as IWebSocket, r as IMinWebSocket } from "./types-BO4jYJPi.js";
+import { t as RpcPeer } from "./default-DYoo8pOJ.js";
 import { IMultiAdapterHooks, IMultiConnectionAdapter, MultiDriver } from "./adapters/types.js";
 
 //#region src/adapters/multi-peer.d.ts
@@ -56,10 +56,6 @@ declare abstract class MultiPeerBase<TLocalSchema extends RpcSchema, TRemoteSche
    * Subclasses can override to customize peer creation.
    */
   protected createPeer(ws: IMinWebSocket): RpcPeer<TLocalSchema, TRemoteSchema>;
-  /**
-   * Find peer by WebSocket (internal helper for event routing)
-   */
-  private findPeerByWs;
   /**
    * Add a peer (called by subclass when connection established)
    */
@@ -86,7 +82,7 @@ declare abstract class MultiPeerBase<TLocalSchema extends RpcSchema, TRemoteSche
   /**
    * Get all peers
    */
-  getPeers(): IterableIterator<RpcPeer<TLocalSchema, TRemoteSchema>>;
+  getPeers(): MapIterator<RpcPeer<TLocalSchema, TRemoteSchema>>;
   /**
    * Get all open peer entries (internal)
    */

package/dist/{sql-DYEHo09F.d.ts → sql-J3OVXInb.d.ts}

@@ -1,5 +1,5 @@
-import { i as StringCodec } from "./factory-uZbj772l.js";
-import { i as PendingCall, s as SyncPendingCallStorage } from "./interface-Dwr9zDR6.js";
+import { i as StringCodec } from "./factory-BEd16-Ao.js";
+import { i as PendingCall, s as SyncPendingCallStorage } from "./interface-DYLQZys5.js";
 
 //#region src/storage/sql.d.ts
 

package/dist/storage/index.d.ts

@@ -1,8 +1,8 @@
-import "../schema-DVufxLYY.js";
-import "../factory-uZbj772l.js";
-import "../json-BBnW1n_D.js";
+import "../schema-BPSDt2br.js";
+import "../factory-BEd16-Ao.js";
+import "../json-CDnAdySL.js";
 import "../index-DAwMsCZ3.js";
-import { a as PendingCallStorage, i as PendingCall, o as StorageMode, r as MaybePromise, s as SyncPendingCallStorage, t as AsyncPendingCallStorage } from "../interface-Dwr9zDR6.js";
-import { n as MemoryPendingCallStorageOptions, t as MemoryPendingCallStorage } from "../memory-CPEAGd76.js";
-import { n as SqlPendingCallStorageOptions, t as SqlPendingCallStorage } from "../sql-DYEHo09F.js";
+import { a as PendingCallStorage, i as PendingCall, o as StorageMode, r as MaybePromise, s as SyncPendingCallStorage, t as AsyncPendingCallStorage } from "../interface-DYLQZys5.js";
+import { n as MemoryPendingCallStorageOptions, t as MemoryPendingCallStorage } from "../memory-DWpvxAue.js";
+import { n as SqlPendingCallStorageOptions, t as SqlPendingCallStorage } from "../sql-J3OVXInb.js";
 export { type AsyncPendingCallStorage, type MaybePromise, MemoryPendingCallStorage, type MemoryPendingCallStorageOptions, type PendingCall, type PendingCallStorage, SqlPendingCallStorage, type SqlPendingCallStorageOptions, type StorageMode, type SyncPendingCallStorage };

package/dist/storage/interface.d.ts

@@ -1,3 +1,3 @@
-import "../schema-DVufxLYY.js";
-import { a as PendingCallStorage, i as PendingCall, n as IContinuationHandler, o as StorageMode, r as MaybePromise, s as SyncPendingCallStorage, t as AsyncPendingCallStorage } from "../interface-Dwr9zDR6.js";
+import "../schema-BPSDt2br.js";
+import { a as PendingCallStorage, i as PendingCall, n as IContinuationHandler, o as StorageMode, r as MaybePromise, s as SyncPendingCallStorage, t as AsyncPendingCallStorage } from "../interface-DYLQZys5.js";
 export { AsyncPendingCallStorage, IContinuationHandler, MaybePromise, PendingCall, PendingCallStorage, StorageMode, SyncPendingCallStorage };

package/dist/storage/memory.d.ts

@@ -1,7 +1,7 @@
-import "../schema-DVufxLYY.js";
-import "../factory-uZbj772l.js";
-import "../json-BBnW1n_D.js";
+import "../schema-BPSDt2br.js";
+import "../factory-BEd16-Ao.js";
+import "../json-CDnAdySL.js";
 import "../index-DAwMsCZ3.js";
-import "../interface-Dwr9zDR6.js";
-import { n as MemoryPendingCallStorageOptions, t as MemoryPendingCallStorage } from "../memory-CPEAGd76.js";
+import "../interface-DYLQZys5.js";
+import { n as MemoryPendingCallStorageOptions, t as MemoryPendingCallStorage } from "../memory-DWpvxAue.js";
 export { MemoryPendingCallStorage, MemoryPendingCallStorageOptions };

package/dist/storage/sql.d.ts

@@ -1,7 +1,7 @@
-import "../schema-DVufxLYY.js";
-import "../factory-uZbj772l.js";
-import "../json-BBnW1n_D.js";
+import "../schema-BPSDt2br.js";
+import "../factory-BEd16-Ao.js";
+import "../json-CDnAdySL.js";
 import "../index-DAwMsCZ3.js";
-import "../interface-Dwr9zDR6.js";
-import { i as SqlStorageCursor, n as SqlPendingCallStorageOptions, r as SqlStorage, t as SqlPendingCallStorage } from "../sql-DYEHo09F.js";
+import "../interface-DYLQZys5.js";
+import { i as SqlStorageCursor, n as SqlPendingCallStorageOptions, r as SqlStorage, t as SqlPendingCallStorage } from "../sql-J3OVXInb.js";
 export { SqlPendingCallStorage, SqlPendingCallStorageOptions, SqlStorage, SqlStorageCursor };

package/dist/{types-DTHyD7n1.d.ts → types-BO4jYJPi.d.ts}

@@ -1,5 +1,5 @@
-import { a as EventHandler, g as Provider, h as MethodDef, i as EventEmitter, r as EventDef, v as RpcSchema } from "./schema-DVufxLYY.js";
-import { g as WireInput, u as RpcProtocol } from "./protocol-B6z2_jyb.js";
+import { a as EventHandler, g as Provider, h as MethodDef, i as EventEmitter, r as EventDef, v as RpcSchema } from "./schema-BPSDt2br.js";
+import { g as WireInput, u as RpcProtocol } from "./protocol-AvNp0_PF.js";
 
 //#region src/types.d.ts
 
@@ -24,6 +24,15 @@ interface IMinWebSocket {
   close(code?: number, reason?: string): void;
   readonly readyState: number;
 }
+interface IWebSocketMessage {
+  [x: string]: unknown;
+  data: unknown;
+}
+interface IWebSocketClose {
+  code: number;
+  reason: string;
+  wasClean: boolean;
+}
 /**
  * Extended WebSocket interface with events
  */
@@ -32,8 +41,8 @@ interface IWebSocket extends IMinWebSocket {
   addEventListener?(type: "open" | "close" | "message" | "error", listener: (event: unknown) => void): void;
   removeEventListener?(type: "open" | "close" | "message" | "error", listener: (event: unknown) => void): void;
   onopen?: ((event: unknown) => void) | null;
-  onclose?: ((event: unknown) => void) | null;
-  onmessage?: ((event: unknown) => void) | null;
+  onclose?: ((event: IWebSocketClose) => void) | null;
+  onmessage?: ((event: IWebSocketMessage) => void) | null;
   onerror?: ((event: unknown) => void) | null;
 }
 /**
@@ -113,4 +122,4 @@ interface IRpcConnection<TLocalSchema extends RpcSchema, TRemoteSchema extends R
   handleMessage(data: WireInput): void;
 }
 //#endregion
-export { IRpcOptions as a, WebSocketOptions as c, IRpcConnection as i, WebSocketReadyState as l, IMethodController as n, IWebSocket as o, IMinWebSocket as r, IWebSocketServer as s, IEventController as t, WebSocketServerOptions as u };
+export { IRpcOptions as a, IWebSocketMessage as c, WebSocketReadyState as d, WebSocketServerOptions as f, IRpcConnection as i, IWebSocketServer as l, IMethodController as n, IWebSocket as o, IMinWebSocket as r, IWebSocketClose as s, IEventController as t, WebSocketOptions as u };

package/dist/types.d.ts

@@ -1,7 +1,7 @@
-import "./schema-DVufxLYY.js";
-import "./factory-uZbj772l.js";
-import "./json-BBnW1n_D.js";
+import "./schema-BPSDt2br.js";
+import "./factory-BEd16-Ao.js";
+import "./json-CDnAdySL.js";
 import "./index-DAwMsCZ3.js";
-import "./protocol-B6z2_jyb.js";
-import { a as IRpcOptions, c as WebSocketOptions, i as IRpcConnection, l as WebSocketReadyState, n as IMethodController, o as IWebSocket, r as IMinWebSocket, s as IWebSocketServer, t as IEventController, u as WebSocketServerOptions } from "./types-DTHyD7n1.js";
-export { IEventController, IMethodController, IMinWebSocket, IRpcConnection, IRpcOptions, IWebSocket, IWebSocketServer, WebSocketOptions, WebSocketReadyState, WebSocketServerOptions };
+import "./protocol-AvNp0_PF.js";
+import { a as IRpcOptions, c as IWebSocketMessage, d as WebSocketReadyState, f as WebSocketServerOptions, i as IRpcConnection, l as IWebSocketServer, n as IMethodController, o as IWebSocket, r as IMinWebSocket, s as IWebSocketClose, t as IEventController, u as WebSocketOptions } from "./types-BO4jYJPi.js";
+export { IEventController, IMethodController, IMinWebSocket, IRpcConnection, IRpcOptions, IWebSocket, IWebSocketClose, IWebSocketMessage, IWebSocketServer, WebSocketOptions, WebSocketReadyState, WebSocketServerOptions };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@igoforth/ws-rpc",
-  "version": "1.1.4",
+  "version": "1.1.6",
   "description": "Bidirectional RPC over WebSocket with Zod schema validation, TypeScript inference, and Cloudflare Durable Object support",
   "type": "module",
   "license": "MIT",
@@ -132,10 +132,12 @@
     "@biomejs/biome": "^2.3.10",
     "@cloudflare/actors": "^0.0.1-beta.6",
     "@cloudflare/vitest-pool-workers": "^0.11.1",
+    "@cloudflare/workers-types": "^4.20251223.0",
     "@msgpack/msgpack": "^3.1.2",
     "@types/node": "^22.10.2",
     "@types/ws": "^8.18.1",
     "@vitest/coverage-istanbul": "^3.2.4",
+    "@vitest/coverage-v8": "^3.2.4",
     "cbor-x": "^1.6.0",
     "tsdown": "^0.18.1",
     "typescript": "^5.9.3",
@@ -145,9 +147,10 @@
   },
   "scripts": {
     "build": "tsdown",
-    "test": "vitest run",
+    "test": "vitest run --silent && NODE_OPTIONS='--no-deprecation' vitest run --config vitest.config.workers.ts",
     "test:watch": "vitest",
-    "bench": "vitest bench --config vitest.config.bench.ts",
+    "test:workers": "NODE_OPTIONS='--no-deprecation' vitest run --config vitest.config.workers.ts",
+    "bench": "vitest bench",
     "typecheck": "tsc --noEmit",
     "typecheck:test": "tsc --noEmit -p tsconfig.test.json",
     "typegen": "wrangler types",