@igoforth/ws-rpc 1.1.1 → 1.1.3

package/dist/adapters/client.d.ts

@@ -1,10 +1,10 @@
-import { a as InferEventData, h as StringKeys, m as RpcSchema, n as EventDef, p as Provider, t as Driver } from "../schema-BzaFWzeV.js";
-import "../factory-Dapk2aA3.js";
-import "../json-ZQ5sjEbW.js";
+import { g as Provider, o as EventTuple, t as Driver, v as RpcSchema } from "../schema-DuWFD2hs.js";
+import "../factory-CoVA-Yix.js";
+import "../json-CQRE-rQe.js";
 import "../index-Be7jjS77.js";
-import { u as RpcProtocol } from "../protocol-4AgHYQBE.js";
-import { a as IRpcOptions, c as WebSocketOptions, o as IWebSocket } from "../types-NYBscFQZ.js";
-import "../default-DY19RYXA.js";
+import { u as RpcProtocol } from "../protocol-CIjzi9ME.js";
+import { a as IRpcOptions, c as WebSocketOptions, o as IWebSocket } from "../types-DsiLgrDW.js";
+import "../default-dpfi_YqB.js";
 import { t as ReconnectOptions } from "../reconnect-DbcN0R_1.js";
 import { IAdapterHooks, IConnectionAdapter } from "./types.js";
 
@@ -13,7 +13,7 @@ import { IAdapterHooks, IConnectionAdapter } from "./types.js";
 /**
  * Options for creating an RpcClient
  */
-interface RpcClientOptions<TLocalSchema extends RpcSchema, TRemoteSchema extends RpcSchema> extends IAdapterHooks<TRemoteSchema>, IRpcOptions<TLocalSchema, TRemoteSchema> {
+interface RpcClientOptions<TLocalSchema extends RpcSchema, TRemoteSchema extends RpcSchema> extends IAdapterHooks<TRemoteSchema["events"]>, IRpcOptions<TLocalSchema, TRemoteSchema> {
   /** WebSocket URL to connect to */
   url: string;
   /** Implementation of local methods */
@@ -44,7 +44,7 @@ declare class RpcClient<TLocalSchema extends RpcSchema, TRemoteSchema extends Rp
   readonly timeout: number;
   readonly protocol?: RpcProtocol;
   readonly provider: Provider<TLocalSchema["methods"]>;
-  readonly hooks: IAdapterHooks<TRemoteSchema>;
+  readonly hooks: IAdapterHooks<TRemoteSchema["events"]>;
   private readonly reconnectOptions;
   private readonly createWebSocket;
   private ws;
@@ -72,10 +72,9 @@ declare class RpcClient<TLocalSchema extends RpcSchema, TRemoteSchema extends Rp
   /**
    * Emit an event to the server (fire-and-forget)
    *
-   * @param event - Event name from local schema
-   * @param data - Event data matching the schema
+   * @param args - Event name and data as tuple
    */
-  emit<K extends StringKeys<TLocalSchema["events"]>>(event: K, data: TLocalSchema["events"] extends Record<string, EventDef> ? InferEventData<TLocalSchema["events"][K]> : never): void;
+  emit(...args: EventTuple<TLocalSchema["events"]>): void;
   /**
    * Connect to the WebSocket server
    *

package/dist/adapters/client.js

@@ -5,7 +5,7 @@ import "../protocol-_mpoOPp6.js";
 import "../errors-5BfreE63.js";
 import { t as WebSocketReadyState } from "../types-D_psiH09.js";
 import { n as defaultReconnectOptions, t as calculateReconnectDelay } from "../reconnect-CGAA_1Gf.js";
-import { t as RpcPeer } from "../default-B6CVJfTD.js";
+import { t as RpcPeer } from "../default-DUF9qUU_.js";
 import "./types.js";
 
 //#region src/adapters/client.ts
@@ -81,15 +81,14 @@ var RpcClient = class {
 	/**
 	* Emit an event to the server (fire-and-forget)
 	*
-	* @param event - Event name from local schema
-	* @param data - Event data matching the schema
+	* @param args - Event name and data as tuple
 	*/
-	emit(event, data) {
+	emit(...args) {
 		if (!this.peer) {
-			console.warn(`Cannot emit event '${String(event)}': not connected`);
+			console.warn(`Cannot emit event '${args[0]}': not connected`);
 			return;
 		}
-		this.peer.emit(event, data);
+		this.peer.emit(...args);
 	}
 	/**
 	* Connect to the WebSocket server

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

@@ -1,10 +1,10 @@
-import { a as InferEventData, h as StringKeys, m as RpcSchema, n as EventDef, p as Provider } from "../schema-BzaFWzeV.js";
-import "../factory-Dapk2aA3.js";
-import "../json-ZQ5sjEbW.js";
+import { g as Provider, o as EventTuple, v as RpcSchema } from "../schema-DuWFD2hs.js";
+import "../factory-CoVA-Yix.js";
+import "../json-CQRE-rQe.js";
 import "../index-Be7jjS77.js";
-import "../protocol-4AgHYQBE.js";
-import { a as IRpcOptions } from "../types-NYBscFQZ.js";
-import { t as RpcPeer } from "../default-DY19RYXA.js";
+import "../protocol-CIjzi9ME.js";
+import { a as IRpcOptions } from "../types-DsiLgrDW.js";
+import { t as RpcPeer } from "../default-dpfi_YqB.js";
 import { IMultiAdapterHooks, IMultiConnectionAdapter } from "./types.js";
 import { Constructor } from "type-fest";
 import { Actor } from "@cloudflare/actors";
@@ -28,7 +28,7 @@ interface IRpcActorHooks<TLocalSchema extends RpcSchema, TRemoteSchema extends R
   /** Called when a peer disconnects. Override to handle disconnection events. */
   onRpcDisconnect(peer: RpcPeer<TLocalSchema, TRemoteSchema>): void;
   /** Called when an event is received from a peer. Override to handle events. */
-  onRpcEvent<K extends StringKeys<TRemoteSchema["events"]>>(peer: RpcPeer<TLocalSchema, TRemoteSchema>, event: K, data: TRemoteSchema["events"] extends Record<string, EventDef> ? InferEventData<TRemoteSchema["events"][K]> : never): void;
+  onRpcEvent(peer: RpcPeer<TLocalSchema, TRemoteSchema>, ...args: EventTuple<TRemoteSchema["events"]>): void;
   /** Called when a peer encounters an error. Override to handle errors. */
   onRpcError(peer: RpcPeer<TLocalSchema, TRemoteSchema> | null, error: Error): void;
   /** Called when a peer is recreated after hibernation. Override to handle recovery. */

package/dist/adapters/cloudflare-do.js

@@ -4,9 +4,9 @@ import "../codecs-BmYG2d_U.js";
 import "../protocol-_mpoOPp6.js";
 import "../errors-5BfreE63.js";
 import { t as SqlPendingCallStorage } from "../sql-CCjc6Bid.js";
-import "../default-B6CVJfTD.js";
-import { n as createDurableRpcPeerFactory } from "../durable-DENcbnTp.js";
-import { t as MultiPeerBase } from "../multi-peer-DFUqFBsx.js";
+import "../default-DUF9qUU_.js";
+import { n as createDurableRpcPeerFactory } from "../durable-8omxPmIp.js";
+import { t as MultiPeerBase } from "../multi-peer-ClznNCc6.js";
 
 //#region src/adapters/cloudflare-do.ts
 /**
@@ -35,8 +35,8 @@ var DOMultiPeer = class extends MultiPeerBase {
 			remoteSchema: this.remoteSchema,
 			provider,
 			...this.protocol !== void 0 && { protocol: this.protocol },
-			onEvent: (event, data) => {
-				this.hooks.onEvent?.(peer, event, data);
+			onEvent: (...args) => {
+				this.hooks.onEvent?.(peer, ...args);
 			},
 			timeout: this.timeout
 		});
@@ -148,7 +148,7 @@ function withRpc(Base, options) {
 				hooks: {
 					onConnect: (peer) => this.onRpcConnect(peer),
 					onDisconnect: (peer) => this.onRpcDisconnect(peer),
-					onEvent: (peer, event, data) => this.onRpcEvent(peer, event, data),
+					onEvent: (peer, ...args) => this.onRpcEvent(peer, ...args),
 					onError: (peer, error) => this.onRpcError(peer, error),
 					onPeerRecreated: (peer, ws) => this.onRpcPeerRecreated(peer, ws)
 				}
@@ -159,7 +159,7 @@ function withRpc(Base, options) {
 		/** Called when a peer disconnects. Override to handle disconnection events. */
 		onRpcDisconnect(_peer) {}
 		/** Called when an event is received from a peer. Override to handle events. */
-		onRpcEvent(_peer, _event, _data) {}
+		onRpcEvent(_peer, ...[_event, _data]) {}
 		/** Called when a peer encounters an error. Override to handle errors. */
 		onRpcError(_peer, _error) {}
 		/** Called when a peer is recreated after hibernation. Override to handle recovery. */
@@ -177,8 +177,8 @@ function withRpc(Base, options) {
 		* @param data - Event data matching the schema
 		* @param ids - Optional array of peer IDs to emit to (broadcasts to all if omitted)
 		*/
-		emit(event, data, ids) {
-			this._rpc.emit(event, data, ids);
+		emit(...args) {
+			this._rpc.emit(...args);
 		}
 		/**
 		* Get the number of connected peers

package/dist/adapters/index.d.ts

@@ -1,13 +1,13 @@
-import "../schema-BzaFWzeV.js";
-import "../factory-Dapk2aA3.js";
-import "../json-ZQ5sjEbW.js";
+import "../schema-DuWFD2hs.js";
+import "../factory-CoVA-Yix.js";
+import "../json-CQRE-rQe.js";
 import "../index-Be7jjS77.js";
-import "../protocol-4AgHYQBE.js";
-import "../types-NYBscFQZ.js";
-import "../default-DY19RYXA.js";
+import "../protocol-CIjzi9ME.js";
+import "../types-DsiLgrDW.js";
+import "../default-dpfi_YqB.js";
 import { n as calculateReconnectDelay, r as defaultReconnectOptions, t as ReconnectOptions } from "../reconnect-DbcN0R_1.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-Dp8DSL5I.js";
+import { n as RpcServerOptions, r as MultiPeerBase, t as RpcServer } from "../server-C53TIGtY.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

@@ -5,11 +5,11 @@ import "../protocol-_mpoOPp6.js";
 import "../errors-5BfreE63.js";
 import "../sql-CCjc6Bid.js";
 import { n as defaultReconnectOptions, t as calculateReconnectDelay } from "../reconnect-CGAA_1Gf.js";
-import "../default-B6CVJfTD.js";
-import "../durable-DENcbnTp.js";
+import "../default-DUF9qUU_.js";
+import "../durable-8omxPmIp.js";
 import "./types.js";
 import { RpcClient } from "./client.js";
-import { t as MultiPeerBase } from "../multi-peer-DFUqFBsx.js";
+import { t as MultiPeerBase } from "../multi-peer-ClznNCc6.js";
 import { withRpc } from "./cloudflare-do.js";
 import { RpcServer } from "./server.js";
 

package/dist/adapters/server.d.ts

@@ -1,10 +1,10 @@
-import "../schema-BzaFWzeV.js";
-import "../factory-Dapk2aA3.js";
-import "../json-ZQ5sjEbW.js";
+import "../schema-DuWFD2hs.js";
+import "../factory-CoVA-Yix.js";
+import "../json-CQRE-rQe.js";
 import "../index-Be7jjS77.js";
-import "../protocol-4AgHYQBE.js";
-import "../types-NYBscFQZ.js";
-import "../default-DY19RYXA.js";
+import "../protocol-CIjzi9ME.js";
+import "../types-DsiLgrDW.js";
+import "../default-dpfi_YqB.js";
 import "./types.js";
-import { n as RpcServerOptions, t as RpcServer } from "../server-Dp8DSL5I.js";
+import { n as RpcServerOptions, t as RpcServer } from "../server-C53TIGtY.js";
 export { RpcServer, RpcServerOptions };

package/dist/adapters/server.js

@@ -4,8 +4,8 @@ import "../codecs-BmYG2d_U.js";
 import "../protocol-_mpoOPp6.js";
 import "../errors-5BfreE63.js";
 import { t as WebSocketReadyState } from "../types-D_psiH09.js";
-import { t as RpcPeer } from "../default-B6CVJfTD.js";
-import { t as MultiPeerBase } from "../multi-peer-DFUqFBsx.js";
+import { t as RpcPeer } from "../default-DUF9qUU_.js";
+import { t as MultiPeerBase } from "../multi-peer-ClznNCc6.js";
 
 //#region src/adapters/server.ts
 /**
@@ -80,8 +80,8 @@ var RpcServer = class extends MultiPeerBase {
 			provider: this.provider,
 			...this.protocol !== void 0 && { protocol: this.protocol },
 			timeout: this.timeout,
-			onEvent: (event, data) => {
-				this.hooks.onEvent?.(peer, event, data);
+			onEvent: (...args) => {
+				this.hooks.onEvent?.(peer, ...args);
 			}
 		});
 		this.addPeer(ws, peer);

package/dist/adapters/types.d.ts

@@ -1,10 +1,10 @@
-import { f as MethodDef, h as StringKeys, i as EventHandler, l as InferOutput, m as RpcSchema, s as InferInput, t as Driver } from "../schema-BzaFWzeV.js";
-import "../factory-Dapk2aA3.js";
-import "../json-ZQ5sjEbW.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-DuWFD2hs.js";
+import "../factory-CoVA-Yix.js";
+import "../json-CQRE-rQe.js";
 import "../index-Be7jjS77.js";
-import "../protocol-4AgHYQBE.js";
-import { a as IRpcOptions, n as IMethodController, t as IEventController } from "../types-NYBscFQZ.js";
-import { t as RpcPeer } from "../default-DY19RYXA.js";
+import "../protocol-CIjzi9ME.js";
+import { a as IRpcOptions, n as IMethodController, t as IEventController } from "../types-DsiLgrDW.js";
+import { t as RpcPeer } from "../default-dpfi_YqB.js";
 import { n as calculateReconnectDelay, r as defaultReconnectOptions, t as ReconnectOptions } from "../reconnect-DbcN0R_1.js";
 
 //#region src/adapters/types.d.ts
@@ -78,7 +78,7 @@ type MultiDriver<TRemoteSchema extends RpcSchema> = TRemoteSchema["methods"] ext
 /**
  * Event emitter type for client callbacks
  */
-interface IAdapterHooks<TRemoteSchema extends RpcSchema> {
+interface IAdapterHooks<TRemoteEvents extends Record<string, EventDef> | undefined> {
   /** Called when WebSocket connection opens */
   onConnect?(): void;
   /** Called when WebSocket connection closes */
@@ -88,7 +88,7 @@ interface IAdapterHooks<TRemoteSchema extends RpcSchema> {
   /** Called when reconnection fails after max attempts */
   onReconnectFailed?(): void;
   /** Called when receiving an event from the server */
-  onEvent?: EventHandler<TRemoteSchema["events"]>;
+  onEvent?: EventHandler<TRemoteEvents>;
 }
 interface IMultiAdapterHooks<TLocalSchema extends RpcSchema, TRemoteSchema extends RpcSchema> {
   /** Called when a peer connects */
@@ -101,10 +101,10 @@ interface IMultiAdapterHooks<TLocalSchema extends RpcSchema, TRemoteSchema exten
   onError?(peer: RpcPeer<TLocalSchema, TRemoteSchema> | null, error: Error): void;
   onClose?(): void;
 }
-interface IConnectionAdapter<TLocalSchema extends RpcSchema, TRemoteSchema extends RpcSchema> extends IRpcOptions<TLocalSchema, TRemoteSchema>, IMethodController<TLocalSchema>, IEventController<TLocalSchema, TRemoteSchema> {
+interface IConnectionAdapter<TLocalSchema extends RpcSchema, TRemoteSchema extends RpcSchema> extends IRpcOptions<TLocalSchema, TRemoteSchema>, IMethodController<TLocalSchema["methods"]>, IEventController<TLocalSchema["events"], TRemoteSchema["events"]> {
   /** Driver for calling remote methods on connected peer */
   readonly driver: Driver<TRemoteSchema["methods"]>;
-  readonly hooks: IAdapterHooks<TRemoteSchema>;
+  readonly hooks: IAdapterHooks<TRemoteSchema["events"]>;
 }
 /**
  * Interface for adapters that manage multiple connections
@@ -112,7 +112,7 @@ interface IConnectionAdapter<TLocalSchema extends RpcSchema, TRemoteSchema exten
  * Extends IRpcConnection - `emit()` broadcasts to all connected peers.
  * Implemented by RpcServer and Cloudflare DO adapter.
  */
-interface IMultiConnectionAdapter<TLocalSchema extends RpcSchema, TRemoteSchema extends RpcSchema> extends IRpcOptions<TLocalSchema, TRemoteSchema>, IMethodController<TLocalSchema>, IEventController<TLocalSchema, TRemoteSchema, [ids?: string[]]> {
+interface IMultiConnectionAdapter<TLocalSchema extends RpcSchema, TRemoteSchema extends RpcSchema> extends IRpcOptions<TLocalSchema, TRemoteSchema>, IMethodController<TLocalSchema["methods"]>, IEventController<TLocalSchema["events"], TRemoteSchema["events"], [ids?: string[]]> {
   /** Driver for calling remote methods on connected peers */
   readonly driver: MultiDriver<TRemoteSchema>;
   readonly hooks: IMultiAdapterHooks<TLocalSchema, TRemoteSchema>;

package/dist/codecs/cbor.d.ts

@@ -1,5 +1,5 @@
-import "../schema-BzaFWzeV.js";
-import { n as CodecFactory } from "../factory-Dapk2aA3.js";
+import "../schema-DuWFD2hs.js";
+import { n as CodecFactory } from "../factory-CoVA-Yix.js";
 import * as z from "zod";
 
 //#region src/codecs/cbor.d.ts

package/dist/codecs/factory.d.ts

@@ -1,3 +1,3 @@
-import "../schema-BzaFWzeV.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-Dapk2aA3.js";
+import "../schema-DuWFD2hs.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-CoVA-Yix.js";
 export { BinaryCodec, CodecFactory, CodecOptions, StringCodec, WireCodec, WireData, createBinaryCodecFactory, createStringCodecFactory, isBinaryCodec, isStringCodec };

package/dist/codecs/index.d.ts

@@ -1,5 +1,5 @@
-import "../schema-BzaFWzeV.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-Dapk2aA3.js";
-import { n as createJsonCodec, t as JsonCodec } from "../json-ZQ5sjEbW.js";
+import "../schema-DuWFD2hs.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-CoVA-Yix.js";
+import { n as createJsonCodec, t as JsonCodec } from "../json-CQRE-rQe.js";
 import "../index-Be7jjS77.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-BzaFWzeV.js";
-import "../factory-Dapk2aA3.js";
-import { n as createJsonCodec, t as JsonCodec } from "../json-ZQ5sjEbW.js";
+import "../schema-DuWFD2hs.js";
+import "../factory-CoVA-Yix.js";
+import { n as createJsonCodec, t as JsonCodec } from "../json-CQRE-rQe.js";
 export { JsonCodec, createJsonCodec };

package/dist/codecs/msgpack.d.ts

@@ -1,5 +1,5 @@
-import "../schema-BzaFWzeV.js";
-import { n as CodecFactory } from "../factory-Dapk2aA3.js";
+import "../schema-DuWFD2hs.js";
+import { n as CodecFactory } from "../factory-CoVA-Yix.js";
 import * as z from "zod";
 
 //#region src/codecs/msgpack.d.ts

package/dist/{default-B6CVJfTD.js → default-DUF9qUU_.js}

@@ -82,7 +82,7 @@ var RpcPeer = class {
 	/**
 	* Emit an event to the remote peer (fire-and-forget)
 	*/
-	emit(event, data) {
+	emit(...[event, data]) {
 		if (this.closed || this.ws.readyState !== 1) {
 			console.warn(`Cannot emit event '${String(event)}': connection closed`);
 			return;

package/dist/{default-DY19RYXA.d.ts → default-dpfi_YqB.d.ts}

@@ -1,6 +1,6 @@
-import { a as InferEventData, h as StringKeys, i as EventHandler, m as RpcSchema, n as EventDef, p as Provider, t as Driver } from "./schema-BzaFWzeV.js";
-import { g as WireInput, u as RpcProtocol } from "./protocol-4AgHYQBE.js";
-import { a as IRpcOptions, r as IMinWebSocket } from "./types-NYBscFQZ.js";
+import { a as EventHandler, g as Provider, o as EventTuple, t as Driver, v as RpcSchema } from "./schema-DuWFD2hs.js";
+import { g as WireInput, u as RpcProtocol } from "./protocol-CIjzi9ME.js";
+import { a as IRpcOptions, r as IMinWebSocket } from "./types-DsiLgrDW.js";
 
 //#region src/peers/default.d.ts
 
@@ -55,7 +55,7 @@ declare class RpcPeer<TLocalSchema extends RpcSchema, TRemoteSchema extends RpcS
   /**
    * Emit an event to the remote peer (fire-and-forget)
    */
-  emit<K extends StringKeys<TLocalSchema["events"]>>(event: K, data: TLocalSchema["events"] extends Record<string, EventDef> ? InferEventData<TLocalSchema["events"][K]> : never): void;
+  emit(...[event, data]: EventTuple<TLocalSchema["events"]>): void;
   /**
    * Handle an incoming WebSocket message
    *

package/dist/{durable-DENcbnTp.js → durable-8omxPmIp.js}

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

package/dist/{factory-Dapk2aA3.d.ts → factory-CoVA-Yix.d.ts}

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

package/dist/index.d.ts

@@ -1,14 +1,14 @@
-import { _ as method, a as InferEventData, c as InferMethods, f as MethodDef, g as event, i as EventHandler, l as InferOutput, m as RpcSchema, n as EventDef, o as InferEvents, p as Provider, s as InferInput, t as Driver } from "./schema-BzaFWzeV.js";
-import "./factory-Dapk2aA3.js";
-import "./json-ZQ5sjEbW.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-DuWFD2hs.js";
+import "./factory-CoVA-Yix.js";
+import "./json-CQRE-rQe.js";
 import "./index-Be7jjS77.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-4AgHYQBE.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-NYBscFQZ.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-CIjzi9ME.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-DsiLgrDW.js";
 import { n as calculateReconnectDelay, r as defaultReconnectOptions, t as ReconnectOptions } from "./reconnect-DbcN0R_1.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-CoVQ0KnO.js";
-import { t as MemoryPendingCallStorage } from "./memory-DSlJL2of.js";
-import { t as SqlPendingCallStorage } from "./sql-bFsho2vn.js";
+import { a as PendingCallStorage, i as PendingCall, o as StorageMode, r as MaybePromise, s as SyncPendingCallStorage, t as AsyncPendingCallStorage } from "./interface-Cj6qYfKi.js";
+import { t as MemoryPendingCallStorage } from "./memory-BFwexqyK.js";
+import { t as SqlPendingCallStorage } from "./sql-D2z59CPk.js";
 import "./storage/index.js";
 import "./utils/index.js";
-export { type AsyncPendingCallStorage, type Driver, type EventDef, type EventHandler, 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 };
+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/{interface-CoVQ0KnO.d.ts → interface-Cj6qYfKi.d.ts}

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

package/dist/{json-ZQ5sjEbW.d.ts → json-CQRE-rQe.d.ts}

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

package/dist/{memory-DSlJL2of.d.ts → memory-BFwexqyK.d.ts}

@@ -1,5 +1,5 @@
-import { i as StringCodec } from "./factory-Dapk2aA3.js";
-import { i as PendingCall, s as SyncPendingCallStorage } from "./interface-CoVQ0KnO.js";
+import { i as StringCodec } from "./factory-CoVA-Yix.js";
+import { i as PendingCall, s as SyncPendingCallStorage } from "./interface-Cj6qYfKi.js";
 
 //#region src/storage/memory.d.ts
 

package/dist/{multi-peer-DFUqFBsx.js → multi-peer-ClznNCc6.js}

@@ -1,4 +1,4 @@
-import { t as RpcPeer } from "./default-B6CVJfTD.js";
+import { t as RpcPeer } from "./default-DUF9qUU_.js";
 
 //#region src/adapters/multi-peer.ts
 /**
@@ -53,9 +53,9 @@ var MultiPeerBase = class {
 			remoteSchema: this.remoteSchema,
 			provider: this.provider,
 			...this.protocol !== void 0 && { protocol: this.protocol },
-			onEvent: this.hooks.onEvent ? (event, data) => {
+			onEvent: this.hooks.onEvent ? (...args) => {
 				const peer = this.findPeerByWs(ws);
-				if (peer) this.hooks.onEvent(peer, event, data);
+				if (peer) this.hooks.onEvent?.(peer, ...args);
 			} : void 0,
 			timeout: this.timeout
 		});
@@ -154,13 +154,13 @@ var MultiPeerBase = class {
 	/**
 	* Emit an event to connected peers
 	*
-	* @param event - Event name from local schema
-	* @param data - Event data matching the schema
-	* @param ids - Optional array of peer IDs to emit to (broadcasts to all if omitted)
+	* @param args - Event tuple followed by optional peer IDs
 	*/
-	emit(event, data, ids) {
+	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);
-		for (const peer of validPeers) peer.emit(event, data);
+		for (const peer of validPeers) peer.emit(...eventArgs);
 	}
 	/**
 	* Close a specific peer by ID

package/dist/peers/default.d.ts

@@ -1,8 +1,8 @@
-import "../schema-BzaFWzeV.js";
-import "../factory-Dapk2aA3.js";
-import "../json-ZQ5sjEbW.js";
+import "../schema-DuWFD2hs.js";
+import "../factory-CoVA-Yix.js";
+import "../json-CQRE-rQe.js";
 import "../index-Be7jjS77.js";
-import "../protocol-4AgHYQBE.js";
-import "../types-NYBscFQZ.js";
-import { n as RpcPeerOptions, t as RpcPeer } from "../default-DY19RYXA.js";
+import "../protocol-CIjzi9ME.js";
+import "../types-DsiLgrDW.js";
+import { n as RpcPeerOptions, t as RpcPeer } from "../default-dpfi_YqB.js";
 export { RpcPeer, RpcPeerOptions };

package/dist/peers/default.js

@@ -3,6 +3,6 @@ import "../json-Bshec-bZ.js";
 import "../codecs-BmYG2d_U.js";
 import "../protocol-_mpoOPp6.js";
 import "../errors-5BfreE63.js";
-import { t as RpcPeer } from "../default-B6CVJfTD.js";
+import { t as RpcPeer } from "../default-DUF9qUU_.js";
 
 export { RpcPeer };

package/dist/peers/durable.d.ts

@@ -1,11 +1,11 @@
-import { m as RpcSchema } from "../schema-BzaFWzeV.js";
-import "../factory-Dapk2aA3.js";
-import "../json-ZQ5sjEbW.js";
+import { v as RpcSchema } from "../schema-DuWFD2hs.js";
+import "../factory-CoVA-Yix.js";
+import "../json-CQRE-rQe.js";
 import "../index-Be7jjS77.js";
-import { g as WireInput } from "../protocol-4AgHYQBE.js";
-import "../types-NYBscFQZ.js";
-import { n as RpcPeerOptions, t as RpcPeer } from "../default-DY19RYXA.js";
-import { i as PendingCall, s as SyncPendingCallStorage } from "../interface-CoVQ0KnO.js";
+import { g as WireInput } from "../protocol-CIjzi9ME.js";
+import "../types-DsiLgrDW.js";
+import { n as RpcPeerOptions, t as RpcPeer } from "../default-dpfi_YqB.js";
+import { i as PendingCall, s as SyncPendingCallStorage } from "../interface-Cj6qYfKi.js";
 
 //#region src/peers/durable.d.ts
 

package/dist/peers/durable.js

@@ -3,7 +3,7 @@ import "../json-Bshec-bZ.js";
 import "../codecs-BmYG2d_U.js";
 import "../protocol-_mpoOPp6.js";
 import "../errors-5BfreE63.js";
-import "../default-B6CVJfTD.js";
-import { n as createDurableRpcPeerFactory, t as DurableRpcPeer } from "../durable-DENcbnTp.js";
+import "../default-DUF9qUU_.js";
+import { n as createDurableRpcPeerFactory, t as DurableRpcPeer } from "../durable-8omxPmIp.js";
 
 export { DurableRpcPeer, createDurableRpcPeerFactory };

package/dist/peers/index.d.ts

@@ -1,10 +1,10 @@
-import "../schema-BzaFWzeV.js";
-import "../factory-Dapk2aA3.js";
-import "../json-ZQ5sjEbW.js";
+import "../schema-DuWFD2hs.js";
+import "../factory-CoVA-Yix.js";
+import "../json-CQRE-rQe.js";
 import "../index-Be7jjS77.js";
-import "../protocol-4AgHYQBE.js";
-import "../types-NYBscFQZ.js";
-import { n as RpcPeerOptions, t as RpcPeer } from "../default-DY19RYXA.js";
-import "../interface-CoVQ0KnO.js";
+import "../protocol-CIjzi9ME.js";
+import "../types-DsiLgrDW.js";
+import { n as RpcPeerOptions, t as RpcPeer } from "../default-dpfi_YqB.js";
+import "../interface-Cj6qYfKi.js";
 import { CallContext, DurableRpcPeer, DurableRpcPeerOptions } from "./durable.js";
 export { type CallContext, DurableRpcPeer, type DurableRpcPeerOptions, RpcPeer, type RpcPeerOptions };

package/dist/peers/index.js

@@ -3,7 +3,7 @@ import "../json-Bshec-bZ.js";
 import "../codecs-BmYG2d_U.js";
 import "../protocol-_mpoOPp6.js";
 import "../errors-5BfreE63.js";
-import { t as RpcPeer } from "../default-B6CVJfTD.js";
-import { t as DurableRpcPeer } from "../durable-DENcbnTp.js";
+import { t as RpcPeer } from "../default-DUF9qUU_.js";
+import { t as DurableRpcPeer } from "../durable-8omxPmIp.js";
 
 export { DurableRpcPeer, RpcPeer };

package/dist/{protocol-4AgHYQBE.d.ts → protocol-CIjzi9ME.d.ts}

@@ -1,4 +1,4 @@
-import { a as WireCodec } from "./factory-Dapk2aA3.js";
+import { a as WireCodec } from "./factory-CoVA-Yix.js";
 import * as z from "zod";
 
 //#region src/protocol.d.ts

package/dist/protocol.d.ts

@@ -1,6 +1,6 @@
-import "./schema-BzaFWzeV.js";
-import "./factory-Dapk2aA3.js";
-import "./json-ZQ5sjEbW.js";
+import "./schema-DuWFD2hs.js";
+import "./factory-CoVA-Yix.js";
+import "./json-CQRE-rQe.js";
 import "./index-Be7jjS77.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-4AgHYQBE.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-CIjzi9ME.js";
 export { JsonProtocol, RpcError, RpcErrorCodes, RpcErrorSchema, RpcEvent, RpcEventSchema, RpcMessage, RpcMessageCodec, RpcMessageSchema, RpcProtocol, RpcRequest, RpcRequestSchema, RpcResponse, RpcResponseSchema, RpcWireCodec, WireInput, createProtocol };

package/dist/{schema-BzaFWzeV.d.ts → schema-DuWFD2hs.d.ts}

@@ -14,6 +14,7 @@ interface MethodDef<TInput extends z.ZodType = z.ZodType, TOutput extends z.ZodT
   input: TInput;
   output: TOutput;
 }
+type Method = (input: unknown) => unknown | Promise<unknown>;
 /**
  * Event definition with data schema
  */
@@ -21,6 +22,7 @@ interface EventDef<TData extends z.ZodType = z.ZodType> {
   _type: "event";
   data: TData;
 }
+type Event = unknown;
 /**
  * Define an RPC method with input/output schemas
  *
@@ -62,6 +64,10 @@ interface RpcSchema {
   methods?: Record<string, MethodDef>;
   events?: Record<string, EventDef>;
 }
+interface RpcCollection {
+  methods?: Record<string, Method>;
+  events?: Record<string, Event>;
+}
 /**
  * Infer the input type from a method definition
  *
@@ -83,11 +89,11 @@ type InferEventData<T extends EventDef> = z.infer<T["data"]>;
 /**
  * Infer method signatures from a schema's methods
  */
-type InferMethods<T extends Record<string, MethodDef>> = { [K in StringKeys<T>]: (input: z.input<T[K]["input"]>) => z.output<T[K]["output"]> | Promise<z.output<T[K]["output"]>> };
+type InferMethods<T extends RpcSchema["methods"]> = T extends Record<string, MethodDef> ? { [K in StringKeys<T>]: (input: z.input<T[K]["input"]>) => z.output<T[K]["output"]> | Promise<z.output<T[K]["output"]>> } : Record<string, Method>;
 /**
  * Infer event emitter signatures from a schema's events
  */
-type InferEvents<T extends Record<string, EventDef>> = { [K in StringKeys<T>]: InferEventData<T[K]> };
+type InferEvents<T extends RpcSchema["events"]> = T extends Record<string, EventDef> ? { [K in StringKeys<T>]: z.infer<T[K]["data"]> } : Record<string, Event>;
 /**
  * Provider type - implements the local methods defined in a schema
  */
@@ -97,12 +103,22 @@ type Provider<T extends RpcSchema["methods"]> = T extends Record<string, MethodD
  */
 type Driver<T extends RpcSchema["methods"]> = T extends Record<string, MethodDef> ? InferMethods<T> : {};
 /**
- * Event handler type - handles incoming events
+ * Discriminated event tuple union - enables proper narrowing in switch statements.
  */
-type EventHandler<T extends RpcSchema["events"], ExtraArgs extends any[] = []> = <K$1 extends StringKeys<T>>(...args: [...ExtraArgs, event: K$1, data: T extends Record<string, EventDef> ? InferEventData<T[K$1]> : never]) => void;
+type EventTuple<T extends RpcSchema["events"]> = T extends Record<string, EventDef> ? { [K in keyof T]: [event: K, data: z.infer<T[K]["data"]>] }[keyof T] : [event: string, data: unknown];
 /**
- * Event emitter type - emits outgoing events
+ * Event handler type - handles incoming events.
+ * Uses discriminated tuple union for proper type narrowing in switch statements.
  */
-type EventEmitter<T extends RpcSchema["events"], ExtraArgs extends any[] = []> = <K$1 extends StringKeys<T>>(...args: [event: K$1, data: T extends Record<string, EventDef> ? InferEventData<T[K$1]> : never, ...ExtraArgs]) => void;
+interface EventHandler<T extends RpcSchema["events"], ExtraArgs extends any[] = []> {
+  (...args: [...ExtraArgs, ...EventTuple<T>]): void;
+}
+/**
+ * Event emitter type - emits outgoing events.
+ * Uses discriminated tuple union for proper type narrowing.
+ */
+interface EventEmitter<T extends RpcSchema["events"], ExtraArgs extends any[] = []> {
+  (...args: [...EventTuple<T>, ...ExtraArgs]): void;
+}
 //#endregion
-export { method as _, InferEventData as a, InferMethods as c, LiteralStringUnion as d, MethodDef as f, event as g, StringKeys as h, EventHandler as i, InferOutput as l, RpcSchema as m, EventDef as n, InferEvents as o, Provider as p, EventEmitter as r, InferInput as s, Driver as t, LiteralString as u };
+export { RpcCollection as _, EventHandler as a, event as b, InferEvents as c, InferOutput as d, LiteralString as f, Provider as g, MethodDef as h, EventEmitter as i, InferInput as l, Method as m, Event as n, EventTuple as o, LiteralStringUnion as p, EventDef as r, InferEventData as s, Driver as t, InferMethods as u, RpcSchema as v, method as x, StringKeys as y };

package/dist/schema.d.ts

@@ -1,2 +1,2 @@
-import { _ as method, a as InferEventData, c as InferMethods, d as LiteralStringUnion, f as MethodDef, g as event, h as StringKeys, i as EventHandler, l as InferOutput, m as RpcSchema, n as EventDef, o as InferEvents, p as Provider, r as EventEmitter, s as InferInput, t as Driver, u as LiteralString } from "./schema-BzaFWzeV.js";
-export { Driver, EventDef, EventEmitter, EventHandler, InferEventData, InferEvents, InferInput, InferMethods, InferOutput, LiteralString, LiteralStringUnion, MethodDef, Provider, RpcSchema, StringKeys, event, method };
+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-DuWFD2hs.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-Dp8DSL5I.d.ts → server-C53TIGtY.d.ts}

@@ -1,7 +1,7 @@
-import { a as InferEventData, h as StringKeys, m as RpcSchema, n as EventDef, p as Provider } from "./schema-BzaFWzeV.js";
-import { u as RpcProtocol } from "./protocol-4AgHYQBE.js";
-import { a as IRpcOptions, o as IWebSocket, r as IMinWebSocket, s as IWebSocketServer, u as WebSocketServerOptions } from "./types-NYBscFQZ.js";
-import { t as RpcPeer } from "./default-DY19RYXA.js";
+import { g as Provider, o as EventTuple, v as RpcSchema } from "./schema-DuWFD2hs.js";
+import { u as RpcProtocol } from "./protocol-CIjzi9ME.js";
+import { a as IRpcOptions, o as IWebSocket, r as IMinWebSocket, s as IWebSocketServer, u as WebSocketServerOptions } from "./types-DsiLgrDW.js";
+import { t as RpcPeer } from "./default-dpfi_YqB.js";
 import { IMultiAdapterHooks, IMultiConnectionAdapter, MultiDriver } from "./adapters/types.js";
 
 //#region src/adapters/multi-peer.d.ts
@@ -111,11 +111,9 @@ declare abstract class MultiPeerBase<TLocalSchema extends RpcSchema, TRemoteSche
   /**
    * Emit an event to connected peers
    *
-   * @param event - Event name from local schema
-   * @param data - Event data matching the schema
-   * @param ids - Optional array of peer IDs to emit to (broadcasts to all if omitted)
+   * @param args - Event tuple followed by optional peer IDs
    */
-  emit<K extends StringKeys<TLocalSchema["events"]>>(event: K, data: TLocalSchema["events"] extends Record<string, EventDef> ? InferEventData<TLocalSchema["events"][K]> : never, ids?: string[]): void;
+  emit(...args: [...EventTuple<TLocalSchema["events"]>, ids?: string[] | undefined]): void;
   /**
    * Close a specific peer by ID
    *

package/dist/{sql-bFsho2vn.d.ts → sql-D2z59CPk.d.ts}

@@ -1,5 +1,5 @@
-import { i as StringCodec } from "./factory-Dapk2aA3.js";
-import { i as PendingCall, s as SyncPendingCallStorage } from "./interface-CoVQ0KnO.js";
+import { i as StringCodec } from "./factory-CoVA-Yix.js";
+import { i as PendingCall, s as SyncPendingCallStorage } from "./interface-Cj6qYfKi.js";
 
 //#region src/storage/sql.d.ts
 

package/dist/storage/index.d.ts

@@ -1,8 +1,8 @@
-import "../schema-BzaFWzeV.js";
-import "../factory-Dapk2aA3.js";
-import "../json-ZQ5sjEbW.js";
+import "../schema-DuWFD2hs.js";
+import "../factory-CoVA-Yix.js";
+import "../json-CQRE-rQe.js";
 import "../index-Be7jjS77.js";
-import { a as PendingCallStorage, i as PendingCall, o as StorageMode, r as MaybePromise, s as SyncPendingCallStorage, t as AsyncPendingCallStorage } from "../interface-CoVQ0KnO.js";
-import { n as MemoryPendingCallStorageOptions, t as MemoryPendingCallStorage } from "../memory-DSlJL2of.js";
-import { n as SqlPendingCallStorageOptions, t as SqlPendingCallStorage } from "../sql-bFsho2vn.js";
+import { a as PendingCallStorage, i as PendingCall, o as StorageMode, r as MaybePromise, s as SyncPendingCallStorage, t as AsyncPendingCallStorage } from "../interface-Cj6qYfKi.js";
+import { n as MemoryPendingCallStorageOptions, t as MemoryPendingCallStorage } from "../memory-BFwexqyK.js";
+import { n as SqlPendingCallStorageOptions, t as SqlPendingCallStorage } from "../sql-D2z59CPk.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-BzaFWzeV.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-CoVQ0KnO.js";
+import "../schema-DuWFD2hs.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-Cj6qYfKi.js";
 export { AsyncPendingCallStorage, IContinuationHandler, MaybePromise, PendingCall, PendingCallStorage, StorageMode, SyncPendingCallStorage };

package/dist/storage/memory.d.ts

@@ -1,7 +1,7 @@
-import "../schema-BzaFWzeV.js";
-import "../factory-Dapk2aA3.js";
-import "../json-ZQ5sjEbW.js";
+import "../schema-DuWFD2hs.js";
+import "../factory-CoVA-Yix.js";
+import "../json-CQRE-rQe.js";
 import "../index-Be7jjS77.js";
-import "../interface-CoVQ0KnO.js";
-import { n as MemoryPendingCallStorageOptions, t as MemoryPendingCallStorage } from "../memory-DSlJL2of.js";
+import "../interface-Cj6qYfKi.js";
+import { n as MemoryPendingCallStorageOptions, t as MemoryPendingCallStorage } from "../memory-BFwexqyK.js";
 export { MemoryPendingCallStorage, MemoryPendingCallStorageOptions };

package/dist/storage/sql.d.ts

@@ -1,7 +1,7 @@
-import "../schema-BzaFWzeV.js";
-import "../factory-Dapk2aA3.js";
-import "../json-ZQ5sjEbW.js";
+import "../schema-DuWFD2hs.js";
+import "../factory-CoVA-Yix.js";
+import "../json-CQRE-rQe.js";
 import "../index-Be7jjS77.js";
-import "../interface-CoVQ0KnO.js";
-import { i as SqlStorageCursor, n as SqlPendingCallStorageOptions, r as SqlStorage, t as SqlPendingCallStorage } from "../sql-bFsho2vn.js";
+import "../interface-Cj6qYfKi.js";
+import { i as SqlStorageCursor, n as SqlPendingCallStorageOptions, r as SqlStorage, t as SqlPendingCallStorage } from "../sql-D2z59CPk.js";
 export { SqlPendingCallStorage, SqlPendingCallStorageOptions, SqlStorage, SqlStorageCursor };

package/dist/{types-NYBscFQZ.d.ts → types-DsiLgrDW.d.ts}

@@ -1,5 +1,5 @@
-import { i as EventHandler, m as RpcSchema, p as Provider, r as EventEmitter } from "./schema-BzaFWzeV.js";
-import { g as WireInput, u as RpcProtocol } from "./protocol-4AgHYQBE.js";
+import { a as EventHandler, g as Provider, h as MethodDef, i as EventEmitter, r as EventDef, v as RpcSchema } from "./schema-DuWFD2hs.js";
+import { g as WireInput, u as RpcProtocol } from "./protocol-CIjzi9ME.js";
 
 //#region src/types.d.ts
 
@@ -83,9 +83,9 @@ interface IRpcOptions<TLocalSchema extends RpcSchema, TRemoteSchema extends RpcS
  *
  * @typeParam TLocalSchema - Schema defining local methods
  */
-interface IMethodController<TLocalSchema extends RpcSchema> {
+interface IMethodController<TLocalMethods extends Record<string, MethodDef> | undefined> {
   /** Implementation of local methods */
-  readonly provider: Provider<TLocalSchema["methods"]>;
+  readonly provider: Provider<TLocalMethods>;
 }
 /**
  * Interface for types that can emit and receive events
@@ -95,18 +95,18 @@ interface IMethodController<TLocalSchema extends RpcSchema> {
  * @typeParam EmitArgs - Additional arguments for emit (e.g., peer IDs)
  * @typeParam EventArgs - Additional arguments for event handler
  */
-interface IEventController<TLocalSchema extends RpcSchema, TRemoteSchema extends RpcSchema, EmitArgs extends any[] = [], EventArgs extends any[] = []> {
+interface IEventController<TLocalEvents extends Record<string, EventDef> | undefined, TRemoteEvents extends Record<string, EventDef> | undefined, EmitArgs extends any[] = [], EventArgs extends any[] = []> {
   /** Emit an event to the connected peer */
-  emit: EventEmitter<TLocalSchema["events"], EmitArgs>;
+  emit: EventEmitter<TLocalEvents, EmitArgs>;
   /** Called when receiving an event from the connected peer */
-  onEvent?: EventHandler<TRemoteSchema["events"], EventArgs>;
+  onEvent?: EventHandler<TRemoteEvents, EventArgs>;
 }
 /**
  * Base interface for RPC connections (1-1)
  *
  * Implemented by RpcPeer.
  */
-interface IRpcConnection<TLocalSchema extends RpcSchema, TRemoteSchema extends RpcSchema> extends IRpcOptions<TLocalSchema, TRemoteSchema>, IMethodController<TLocalSchema>, IEventController<TLocalSchema, TRemoteSchema> {
+interface IRpcConnection<TLocalSchema extends RpcSchema, TRemoteSchema extends RpcSchema> extends IRpcOptions<TLocalSchema, TRemoteSchema>, IMethodController<TLocalSchema["methods"]>, IEventController<TLocalSchema["events"], TRemoteSchema["events"]> {
   /** Timeout for RPC calls in ms */
   readonly timeout: number;
   /** Handle an incoming WebSocket message */

package/dist/types.d.ts

@@ -1,7 +1,7 @@
-import "./schema-BzaFWzeV.js";
-import "./factory-Dapk2aA3.js";
-import "./json-ZQ5sjEbW.js";
+import "./schema-DuWFD2hs.js";
+import "./factory-CoVA-Yix.js";
+import "./json-CQRE-rQe.js";
 import "./index-Be7jjS77.js";
-import "./protocol-4AgHYQBE.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-NYBscFQZ.js";
+import "./protocol-CIjzi9ME.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-DsiLgrDW.js";
 export { IEventController, IMethodController, IMinWebSocket, IRpcConnection, IRpcOptions, IWebSocket, IWebSocketServer, WebSocketOptions, WebSocketReadyState, WebSocketServerOptions };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@igoforth/ws-rpc",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "description": "Bidirectional RPC over WebSocket with Zod schema validation, TypeScript inference, and Cloudflare Durable Object support",
   "type": "module",
   "license": "MIT",