@orpc/server 0.0.0-next.65596ea → 0.0.0-next.66774c1

package/dist/adapters/node/index.d.mts

@@ -1,13 +1,14 @@
-import { C as Context, R as Router } from '../../shared/server.DD2C4ujN.mjs';
+import { C as Context, R as Router } from '../../shared/server.CYNGeoCm.mjs';
 import { Interceptor, MaybeOptionalOptions } from '@orpc/shared';
 import { SendStandardResponseOptions, NodeHttpRequest, NodeHttpResponse } from '@orpc/standard-server-node';
-import { a as StandardHandlerPlugin, C as CompositeStandardHandlerPlugin, g as StandardHandleOptions, i as StandardHandler } from '../../shared/server.Dq8xr7PQ.mjs';
-import { F as FriendlyStandardHandleOptions } from '../../shared/server.BliFSTnG.mjs';
-import { S as StandardRPCHandlerOptions } from '../../shared/server.Bd52nNaH.mjs';
+import { g as StandardHandlerPlugin, C as CompositeStandardHandlerPlugin, b as StandardHandleOptions, f as StandardHandler } from '../../shared/server.gqRxT-yN.mjs';
+import { F as FriendlyStandardHandleOptions } from '../../shared/server.BEFBl-Cb.mjs';
+import { S as StandardRPCHandlerOptions } from '../../shared/server.BU4WI18A.mjs';
 import '@orpc/client';
 import '@orpc/contract';
 import '@orpc/standard-server';
 import '@orpc/client/standard';
+import '../../shared/server.DhJj-1X9.mjs';
 
 interface NodeHttpHandlerPlugin<T extends Context> extends StandardHandlerPlugin<T> {
     initRuntimeAdapter?(options: NodeHttpHandlerOptions<T>): void;

package/dist/adapters/node/index.d.ts

@@ -1,13 +1,14 @@
-import { C as Context, R as Router } from '../../shared/server.DD2C4ujN.js';
+import { C as Context, R as Router } from '../../shared/server.CYNGeoCm.js';
 import { Interceptor, MaybeOptionalOptions } from '@orpc/shared';
 import { SendStandardResponseOptions, NodeHttpRequest, NodeHttpResponse } from '@orpc/standard-server-node';
-import { a as StandardHandlerPlugin, C as CompositeStandardHandlerPlugin, g as StandardHandleOptions, i as StandardHandler } from '../../shared/server.-ACo36I0.js';
-import { F as FriendlyStandardHandleOptions } from '../../shared/server.IG2MjhrD.js';
-import { S as StandardRPCHandlerOptions } from '../../shared/server.BPAWobQg.js';
+import { g as StandardHandlerPlugin, C as CompositeStandardHandlerPlugin, b as StandardHandleOptions, f as StandardHandler } from '../../shared/server.Bmh5xd4n.js';
+import { F as FriendlyStandardHandleOptions } from '../../shared/server.B7b2w3_i.js';
+import { S as StandardRPCHandlerOptions } from '../../shared/server.D0H-iaY3.js';
 import '@orpc/client';
 import '@orpc/contract';
 import '@orpc/standard-server';
 import '@orpc/client/standard';
+import '../../shared/server.jMTkVNIb.js';
 
 interface NodeHttpHandlerPlugin<T extends Context> extends StandardHandlerPlugin<T> {
     initRuntimeAdapter?(options: NodeHttpHandlerOptions<T>): void;

package/dist/adapters/node/index.mjs

@@ -1,14 +1,15 @@
 import { ORPCError } from '@orpc/client';
 import { toArray, intercept, resolveMaybeOptionalOptions } from '@orpc/shared';
 import { toStandardLazyRequest, sendStandardResponse } from '@orpc/standard-server-node';
-import { r as resolveFriendlyStandardHandleOptions } from '../../shared/server.BVwwTHyO.mjs';
+import { r as resolveFriendlyStandardHandleOptions } from '../../shared/server.DZ5BIITo.mjs';
 import '@orpc/standard-server';
 import '@orpc/contract';
-import { C as CompositeStandardHandlerPlugin, b as StandardRPCHandler } from '../../shared/server.CHvOkcM3.mjs';
+import { C as CompositeStandardHandlerPlugin, b as StandardRPCHandler } from '../../shared/server.CYRYFTxo.mjs';
 import '@orpc/client/standard';
 import '@orpc/standard-server/batch';
+import '@orpc/standard-server-fetch';
 import { S as StrictGetMethodPlugin } from '../../shared/server.BW-nUGgA.mjs';
-import '../../shared/server.DG7Tamti.mjs';
+import '../../shared/server.B_fj3X5m.mjs';
 
 class BodyLimitPlugin {
   maxBodySize;

package/dist/adapters/standard/index.d.mts

@@ -1,12 +1,14 @@
-import { c as StandardCodec, d as StandardParams, e as StandardMatcher, f as StandardMatchResult } from '../../shared/server.Dq8xr7PQ.mjs';
-export { C as CompositeStandardHandlerPlugin, g as StandardHandleOptions, h as StandardHandleResult, i as StandardHandler, S as StandardHandlerInterceptorOptions, b as StandardHandlerOptions, a as StandardHandlerPlugin } from '../../shared/server.Dq8xr7PQ.mjs';
-import { ORPCError, HTTPPath } from '@orpc/client';
+import { S as StandardCodec, a as StandardParams } from '../../shared/server.gqRxT-yN.mjs';
+export { C as CompositeStandardHandlerPlugin, b as StandardHandleOptions, c as StandardHandleResult, f as StandardHandler, d as StandardHandlerInterceptorOptions, e as StandardHandlerOptions, g as StandardHandlerPlugin, h as StandardMatchResult, i as StandardMatcher } from '../../shared/server.gqRxT-yN.mjs';
+import { ORPCError } from '@orpc/client';
 import { StandardRPCSerializer } from '@orpc/client/standard';
 import { StandardLazyRequest, StandardResponse } from '@orpc/standard-server';
-import { h as AnyProcedure, f as AnyRouter } from '../../shared/server.DD2C4ujN.mjs';
-export { a as StandardRPCHandler, S as StandardRPCHandlerOptions } from '../../shared/server.Bd52nNaH.mjs';
+import { A as AnyProcedure } from '../../shared/server.CYNGeoCm.mjs';
+export { a as StandardRPCHandler, S as StandardRPCHandlerOptions, c as StandardRPCMatcher, b as StandardRPCMatcherOptions } from '../../shared/server.BU4WI18A.mjs';
+export { F as FriendlyStandardHandleOptions, r as resolveFriendlyStandardHandleOptions } from '../../shared/server.BEFBl-Cb.mjs';
 import '@orpc/contract';
 import '@orpc/shared';
+import '../../shared/server.DhJj-1X9.mjs';
 
 declare class StandardRPCCodec implements StandardCodec {
     private readonly serializer;
@@ -16,11 +18,4 @@ declare class StandardRPCCodec implements StandardCodec {
     encodeError(error: ORPCError<any, any>): StandardResponse;
 }
 
-declare class StandardRPCMatcher implements StandardMatcher {
-    private readonly tree;
-    private pendingRouters;
-    init(router: AnyRouter, path?: readonly string[]): void;
-    match(_method: string, pathname: HTTPPath): Promise<StandardMatchResult>;
-}
-
-export { StandardCodec, StandardMatchResult, StandardMatcher, StandardParams, StandardRPCCodec, StandardRPCMatcher };
+export { StandardCodec, StandardParams, StandardRPCCodec };

package/dist/adapters/standard/index.d.ts

@@ -1,12 +1,14 @@
-import { c as StandardCodec, d as StandardParams, e as StandardMatcher, f as StandardMatchResult } from '../../shared/server.-ACo36I0.js';
-export { C as CompositeStandardHandlerPlugin, g as StandardHandleOptions, h as StandardHandleResult, i as StandardHandler, S as StandardHandlerInterceptorOptions, b as StandardHandlerOptions, a as StandardHandlerPlugin } from '../../shared/server.-ACo36I0.js';
-import { ORPCError, HTTPPath } from '@orpc/client';
+import { S as StandardCodec, a as StandardParams } from '../../shared/server.Bmh5xd4n.js';
+export { C as CompositeStandardHandlerPlugin, b as StandardHandleOptions, c as StandardHandleResult, f as StandardHandler, d as StandardHandlerInterceptorOptions, e as StandardHandlerOptions, g as StandardHandlerPlugin, h as StandardMatchResult, i as StandardMatcher } from '../../shared/server.Bmh5xd4n.js';
+import { ORPCError } from '@orpc/client';
 import { StandardRPCSerializer } from '@orpc/client/standard';
 import { StandardLazyRequest, StandardResponse } from '@orpc/standard-server';
-import { h as AnyProcedure, f as AnyRouter } from '../../shared/server.DD2C4ujN.js';
-export { a as StandardRPCHandler, S as StandardRPCHandlerOptions } from '../../shared/server.BPAWobQg.js';
+import { A as AnyProcedure } from '../../shared/server.CYNGeoCm.js';
+export { a as StandardRPCHandler, S as StandardRPCHandlerOptions, c as StandardRPCMatcher, b as StandardRPCMatcherOptions } from '../../shared/server.D0H-iaY3.js';
+export { F as FriendlyStandardHandleOptions, r as resolveFriendlyStandardHandleOptions } from '../../shared/server.B7b2w3_i.js';
 import '@orpc/contract';
 import '@orpc/shared';
+import '../../shared/server.jMTkVNIb.js';
 
 declare class StandardRPCCodec implements StandardCodec {
     private readonly serializer;
@@ -16,11 +18,4 @@ declare class StandardRPCCodec implements StandardCodec {
     encodeError(error: ORPCError<any, any>): StandardResponse;
 }
 
-declare class StandardRPCMatcher implements StandardMatcher {
-    private readonly tree;
-    private pendingRouters;
-    init(router: AnyRouter, path?: readonly string[]): void;
-    match(_method: string, pathname: HTTPPath): Promise<StandardMatchResult>;
-}
-
-export { StandardCodec, StandardMatchResult, StandardMatcher, StandardParams, StandardRPCCodec, StandardRPCMatcher };
+export { StandardCodec, StandardParams, StandardRPCCodec };

package/dist/adapters/standard/index.mjs

@@ -1,7 +1,8 @@
-export { C as CompositeStandardHandlerPlugin, S as StandardHandler, a as StandardRPCCodec, b as StandardRPCHandler, c as StandardRPCMatcher } from '../../shared/server.CHvOkcM3.mjs';
+export { C as CompositeStandardHandlerPlugin, S as StandardHandler, a as StandardRPCCodec, b as StandardRPCHandler, c as StandardRPCMatcher } from '../../shared/server.CYRYFTxo.mjs';
+export { r as resolveFriendlyStandardHandleOptions } from '../../shared/server.DZ5BIITo.mjs';
 import '@orpc/client/standard';
 import '@orpc/client';
 import '@orpc/shared';
 import '@orpc/standard-server';
-import '../../shared/server.DG7Tamti.mjs';
+import '../../shared/server.B_fj3X5m.mjs';
 import '@orpc/contract';

package/dist/adapters/standard-peer/index.d.mts

@@ -0,0 +1,18 @@
+import { ServerPeer, EncodedMessage, ServerPeerHandleRequestFn } from '@orpc/standard-server-peer';
+import { C as Context } from '../../shared/server.CYNGeoCm.mjs';
+import { f as StandardHandler } from '../../shared/server.gqRxT-yN.mjs';
+import { F as FriendlyStandardHandleOptions } from '../../shared/server.BEFBl-Cb.mjs';
+import '@orpc/client';
+import '@orpc/contract';
+import '@orpc/shared';
+import '@orpc/standard-server';
+
+type HandleStandardServerPeerMessageOptions<T extends Context> = Omit<FriendlyStandardHandleOptions<T>, 'prefix'>;
+/**
+ * @deprecated Use `createServerPeerRequestHandleFn` instead.
+ */
+declare function handleStandardServerPeerMessage<T extends Context>(handler: StandardHandler<T>, peer: ServerPeer, message: EncodedMessage, options: HandleStandardServerPeerMessageOptions<T>): Promise<void>;
+declare function createServerPeerHandleRequestFn<T extends Context>(handler: StandardHandler<T>, options: HandleStandardServerPeerMessageOptions<T>): ServerPeerHandleRequestFn;
+
+export { createServerPeerHandleRequestFn, handleStandardServerPeerMessage };
+export type { HandleStandardServerPeerMessageOptions };

package/dist/adapters/standard-peer/index.d.ts

@@ -0,0 +1,18 @@
+import { ServerPeer, EncodedMessage, ServerPeerHandleRequestFn } from '@orpc/standard-server-peer';
+import { C as Context } from '../../shared/server.CYNGeoCm.js';
+import { f as StandardHandler } from '../../shared/server.Bmh5xd4n.js';
+import { F as FriendlyStandardHandleOptions } from '../../shared/server.B7b2w3_i.js';
+import '@orpc/client';
+import '@orpc/contract';
+import '@orpc/shared';
+import '@orpc/standard-server';
+
+type HandleStandardServerPeerMessageOptions<T extends Context> = Omit<FriendlyStandardHandleOptions<T>, 'prefix'>;
+/**
+ * @deprecated Use `createServerPeerRequestHandleFn` instead.
+ */
+declare function handleStandardServerPeerMessage<T extends Context>(handler: StandardHandler<T>, peer: ServerPeer, message: EncodedMessage, options: HandleStandardServerPeerMessageOptions<T>): Promise<void>;
+declare function createServerPeerHandleRequestFn<T extends Context>(handler: StandardHandler<T>, options: HandleStandardServerPeerMessageOptions<T>): ServerPeerHandleRequestFn;
+
+export { createServerPeerHandleRequestFn, handleStandardServerPeerMessage };
+export type { HandleStandardServerPeerMessageOptions };

package/dist/adapters/standard-peer/index.mjs

@@ -0,0 +1,7 @@
+export { c as createServerPeerHandleRequestFn, h as handleStandardServerPeerMessage } from '../../shared/server.UVMTOWrk.mjs';
+import '@orpc/client';
+import '@orpc/shared';
+import '@orpc/standard-server';
+import '@orpc/contract';
+import '@orpc/client/standard';
+import '../../shared/server.DZ5BIITo.mjs';

package/dist/adapters/websocket/index.d.mts

@@ -1,17 +1,43 @@
 import { MaybeOptionalOptions } from '@orpc/shared';
-import { C as Context, R as Router } from '../../shared/server.DD2C4ujN.mjs';
-import { i as StandardHandler } from '../../shared/server.Dq8xr7PQ.mjs';
-import { F as FriendlyStandardHandleOptions } from '../../shared/server.BliFSTnG.mjs';
-import { S as StandardRPCHandlerOptions } from '../../shared/server.Bd52nNaH.mjs';
+import { C as Context, R as Router } from '../../shared/server.CYNGeoCm.mjs';
+import { f as StandardHandler } from '../../shared/server.gqRxT-yN.mjs';
+import { HandleStandardServerPeerMessageOptions } from '../standard-peer/index.mjs';
+import { S as StandardRPCHandlerOptions } from '../../shared/server.BU4WI18A.mjs';
 import '@orpc/client';
 import '@orpc/contract';
 import '@orpc/standard-server';
+import '@orpc/standard-server-peer';
+import '../../shared/server.BEFBl-Cb.mjs';
 import '@orpc/client/standard';
+import '../../shared/server.DhJj-1X9.mjs';
 
-declare class experimental_WebsocketHandler<T extends Context> {
-    private readonly standardHandler;
+type MinimalWebsocket = Pick<WebSocket, 'addEventListener' | 'send'>;
+declare class WebsocketHandler<T extends Context> {
+    #private;
     constructor(standardHandler: StandardHandler<T>);
-    upgrade(ws: Pick<WebSocket, 'addEventListener' | 'send'>, ...rest: MaybeOptionalOptions<Omit<FriendlyStandardHandleOptions<T>, 'prefix'>>): void;
+    /**
+     * Upgrades a WebSocket to enable handling
+     *
+     * This attaches the necessary 'message' and 'close' listeners to the WebSocket
+     *
+     * @warning Do not use this method if you're using `.message()` or `.close()`
+     */
+    upgrade(ws: MinimalWebsocket, ...rest: MaybeOptionalOptions<HandleStandardServerPeerMessageOptions<T>>): void;
+    /**
+     * Handles a single message received from a WebSocket.
+     *
+     * @warning Avoid calling this directly if `.upgrade()` is used.
+     *
+     * @param ws The WebSocket instance
+     * @param data The message payload, usually place in `event.data`
+     */
+    message(ws: MinimalWebsocket, data: string | ArrayBuffer | Blob, ...rest: MaybeOptionalOptions<HandleStandardServerPeerMessageOptions<T>>): Promise<void>;
+    /**
+     * Closes the WebSocket peer and cleans up.
+     *
+     * @warning Avoid calling this directly if `.upgrade()` is used.
+     */
+    close(ws: MinimalWebsocket): void;
 }
 
 /**
@@ -20,8 +46,9 @@ declare class experimental_WebsocketHandler<T extends Context> {
  * @see {@link https://orpc.unnoq.com/docs/rpc-handler RPC Handler Docs}
  * @see {@link https://orpc.unnoq.com/docs/adapters/websocket Websocket Adapter Docs}
  */
-declare class experimental_RPCHandler<T extends Context> extends experimental_WebsocketHandler<T> {
+declare class RPCHandler<T extends Context> extends WebsocketHandler<T> {
     constructor(router: Router<any, T>, options?: NoInfer<StandardRPCHandlerOptions<T>>);
 }
 
-export { experimental_RPCHandler, experimental_WebsocketHandler };
+export { RPCHandler, WebsocketHandler };
+export type { MinimalWebsocket };

package/dist/adapters/websocket/index.d.ts

@@ -1,17 +1,43 @@
 import { MaybeOptionalOptions } from '@orpc/shared';
-import { C as Context, R as Router } from '../../shared/server.DD2C4ujN.js';
-import { i as StandardHandler } from '../../shared/server.-ACo36I0.js';
-import { F as FriendlyStandardHandleOptions } from '../../shared/server.IG2MjhrD.js';
-import { S as StandardRPCHandlerOptions } from '../../shared/server.BPAWobQg.js';
+import { C as Context, R as Router } from '../../shared/server.CYNGeoCm.js';
+import { f as StandardHandler } from '../../shared/server.Bmh5xd4n.js';
+import { HandleStandardServerPeerMessageOptions } from '../standard-peer/index.js';
+import { S as StandardRPCHandlerOptions } from '../../shared/server.D0H-iaY3.js';
 import '@orpc/client';
 import '@orpc/contract';
 import '@orpc/standard-server';
+import '@orpc/standard-server-peer';
+import '../../shared/server.B7b2w3_i.js';
 import '@orpc/client/standard';
+import '../../shared/server.jMTkVNIb.js';
 
-declare class experimental_WebsocketHandler<T extends Context> {
-    private readonly standardHandler;
+type MinimalWebsocket = Pick<WebSocket, 'addEventListener' | 'send'>;
+declare class WebsocketHandler<T extends Context> {
+    #private;
     constructor(standardHandler: StandardHandler<T>);
-    upgrade(ws: Pick<WebSocket, 'addEventListener' | 'send'>, ...rest: MaybeOptionalOptions<Omit<FriendlyStandardHandleOptions<T>, 'prefix'>>): void;
+    /**
+     * Upgrades a WebSocket to enable handling
+     *
+     * This attaches the necessary 'message' and 'close' listeners to the WebSocket
+     *
+     * @warning Do not use this method if you're using `.message()` or `.close()`
+     */
+    upgrade(ws: MinimalWebsocket, ...rest: MaybeOptionalOptions<HandleStandardServerPeerMessageOptions<T>>): void;
+    /**
+     * Handles a single message received from a WebSocket.
+     *
+     * @warning Avoid calling this directly if `.upgrade()` is used.
+     *
+     * @param ws The WebSocket instance
+     * @param data The message payload, usually place in `event.data`
+     */
+    message(ws: MinimalWebsocket, data: string | ArrayBuffer | Blob, ...rest: MaybeOptionalOptions<HandleStandardServerPeerMessageOptions<T>>): Promise<void>;
+    /**
+     * Closes the WebSocket peer and cleans up.
+     *
+     * @warning Avoid calling this directly if `.upgrade()` is used.
+     */
+    close(ws: MinimalWebsocket): void;
 }
 
 /**
@@ -20,8 +46,9 @@ declare class experimental_WebsocketHandler<T extends Context> {
  * @see {@link https://orpc.unnoq.com/docs/rpc-handler RPC Handler Docs}
  * @see {@link https://orpc.unnoq.com/docs/adapters/websocket Websocket Adapter Docs}
  */
-declare class experimental_RPCHandler<T extends Context> extends experimental_WebsocketHandler<T> {
+declare class RPCHandler<T extends Context> extends WebsocketHandler<T> {
     constructor(router: Router<any, T>, options?: NoInfer<StandardRPCHandlerOptions<T>>);
 }
 
-export { experimental_RPCHandler, experimental_WebsocketHandler };
+export { RPCHandler, WebsocketHandler };
+export type { MinimalWebsocket };

package/dist/adapters/websocket/index.mjs

@@ -1,38 +1,67 @@
-import { resolveMaybeOptionalOptions } from '@orpc/shared';
+import { readAsBuffer, resolveMaybeOptionalOptions } from '@orpc/shared';
 import { ServerPeer } from '@orpc/standard-server-peer';
-import { r as resolveFriendlyStandardHandleOptions } from '../../shared/server.BVwwTHyO.mjs';
+import { c as createServerPeerHandleRequestFn } from '../../shared/server.UVMTOWrk.mjs';
 import '@orpc/client';
 import '@orpc/standard-server';
 import '@orpc/contract';
-import { b as StandardRPCHandler } from '../../shared/server.CHvOkcM3.mjs';
+import { b as StandardRPCHandler } from '../../shared/server.CYRYFTxo.mjs';
 import '@orpc/client/standard';
-import '../../shared/server.DG7Tamti.mjs';
+import '../../shared/server.DZ5BIITo.mjs';
+import '../../shared/server.B_fj3X5m.mjs';
 
-class experimental_WebsocketHandler {
+class WebsocketHandler {
+  #peers = /* @__PURE__ */ new WeakMap();
+  #handler;
   constructor(standardHandler) {
-    this.standardHandler = standardHandler;
+    this.#handler = standardHandler;
   }
+  /**
+   * Upgrades a WebSocket to enable handling
+   *
+   * This attaches the necessary 'message' and 'close' listeners to the WebSocket
+   *
+   * @warning Do not use this method if you're using `.message()` or `.close()`
+   */
   upgrade(ws, ...rest) {
-    const peer = new ServerPeer(ws.send.bind(ws));
-    ws.addEventListener("message", async (event) => {
-      const [id, request] = await peer.message(event.data);
-      if (!request) {
-        return;
-      }
-      const options = resolveFriendlyStandardHandleOptions(resolveMaybeOptionalOptions(rest));
-      const { response } = await this.standardHandler.handle({ ...request, body: () => Promise.resolve(request.body) }, options);
-      await peer.response(id, response ?? { status: 404, headers: {}, body: "No procedure matched" });
-    });
-    ws.addEventListener("close", () => {
+    ws.addEventListener("message", (event) => this.message(ws, event.data, ...rest));
+    ws.addEventListener("close", () => this.close(ws));
+  }
+  /**
+   * Handles a single message received from a WebSocket.
+   *
+   * @warning Avoid calling this directly if `.upgrade()` is used.
+   *
+   * @param ws The WebSocket instance
+   * @param data The message payload, usually place in `event.data`
+   */
+  async message(ws, data, ...rest) {
+    let peer = this.#peers.get(ws);
+    if (!peer) {
+      this.#peers.set(ws, peer = new ServerPeer(ws.send.bind(ws)));
+    }
+    const message = data instanceof Blob ? await readAsBuffer(data) : data;
+    await peer.message(
+      message,
+      createServerPeerHandleRequestFn(this.#handler, resolveMaybeOptionalOptions(rest))
+    );
+  }
+  /**
+   * Closes the WebSocket peer and cleans up.
+   *
+   * @warning Avoid calling this directly if `.upgrade()` is used.
+   */
+  close(ws) {
+    const peer = this.#peers.get(ws);
+    if (peer) {
       peer.close();
-    });
+    }
   }
 }
 
-class experimental_RPCHandler extends experimental_WebsocketHandler {
+class RPCHandler extends WebsocketHandler {
   constructor(router, options = {}) {
     super(new StandardRPCHandler(router, options));
   }
 }
 
-export { experimental_RPCHandler, experimental_WebsocketHandler };
+export { RPCHandler, WebsocketHandler };

package/dist/adapters/ws/index.d.mts

@@ -1,18 +1,21 @@
 import { MaybeOptionalOptions } from '@orpc/shared';
 import { WebSocket } from 'ws';
-import { C as Context, R as Router } from '../../shared/server.DD2C4ujN.mjs';
-import { i as StandardHandler } from '../../shared/server.Dq8xr7PQ.mjs';
-import { F as FriendlyStandardHandleOptions } from '../../shared/server.BliFSTnG.mjs';
-import { S as StandardRPCHandlerOptions } from '../../shared/server.Bd52nNaH.mjs';
+import { C as Context, R as Router } from '../../shared/server.CYNGeoCm.mjs';
+import { f as StandardHandler } from '../../shared/server.gqRxT-yN.mjs';
+import { HandleStandardServerPeerMessageOptions } from '../standard-peer/index.mjs';
+import { S as StandardRPCHandlerOptions } from '../../shared/server.BU4WI18A.mjs';
 import '@orpc/client';
 import '@orpc/contract';
 import '@orpc/standard-server';
+import '@orpc/standard-server-peer';
+import '../../shared/server.BEFBl-Cb.mjs';
 import '@orpc/client/standard';
+import '../../shared/server.DhJj-1X9.mjs';
 
-declare class experimental_WsHandler<T extends Context> {
+declare class WsHandler<T extends Context> {
     private readonly standardHandler;
     constructor(standardHandler: StandardHandler<T>);
-    upgrade(ws: Pick<WebSocket, 'addEventListener' | 'send'>, ...rest: MaybeOptionalOptions<Omit<FriendlyStandardHandleOptions<T>, 'prefix'>>): Promise<void>;
+    upgrade(ws: Pick<WebSocket, 'addEventListener' | 'send'>, ...rest: MaybeOptionalOptions<HandleStandardServerPeerMessageOptions<T>>): Promise<void>;
 }
 
 /**
@@ -21,8 +24,8 @@ declare class experimental_WsHandler<T extends Context> {
  * @see {@link https://orpc.unnoq.com/docs/rpc-handler RPC Handler Docs}
  * @see {@link https://orpc.unnoq.com/docs/adapters/websocket Websocket Adapter Docs}
  */
-declare class experimental_RPCHandler<T extends Context> extends experimental_WsHandler<T> {
+declare class RPCHandler<T extends Context> extends WsHandler<T> {
     constructor(router: Router<any, T>, options?: NoInfer<StandardRPCHandlerOptions<T>>);
 }
 
-export { experimental_RPCHandler, experimental_WsHandler };
+export { RPCHandler, WsHandler };

package/dist/adapters/ws/index.d.ts

@@ -1,18 +1,21 @@
 import { MaybeOptionalOptions } from '@orpc/shared';
 import { WebSocket } from 'ws';
-import { C as Context, R as Router } from '../../shared/server.DD2C4ujN.js';
-import { i as StandardHandler } from '../../shared/server.-ACo36I0.js';
-import { F as FriendlyStandardHandleOptions } from '../../shared/server.IG2MjhrD.js';
-import { S as StandardRPCHandlerOptions } from '../../shared/server.BPAWobQg.js';
+import { C as Context, R as Router } from '../../shared/server.CYNGeoCm.js';
+import { f as StandardHandler } from '../../shared/server.Bmh5xd4n.js';
+import { HandleStandardServerPeerMessageOptions } from '../standard-peer/index.js';
+import { S as StandardRPCHandlerOptions } from '../../shared/server.D0H-iaY3.js';
 import '@orpc/client';
 import '@orpc/contract';
 import '@orpc/standard-server';
+import '@orpc/standard-server-peer';
+import '../../shared/server.B7b2w3_i.js';
 import '@orpc/client/standard';
+import '../../shared/server.jMTkVNIb.js';
 
-declare class experimental_WsHandler<T extends Context> {
+declare class WsHandler<T extends Context> {
     private readonly standardHandler;
     constructor(standardHandler: StandardHandler<T>);
-    upgrade(ws: Pick<WebSocket, 'addEventListener' | 'send'>, ...rest: MaybeOptionalOptions<Omit<FriendlyStandardHandleOptions<T>, 'prefix'>>): Promise<void>;
+    upgrade(ws: Pick<WebSocket, 'addEventListener' | 'send'>, ...rest: MaybeOptionalOptions<HandleStandardServerPeerMessageOptions<T>>): Promise<void>;
 }
 
 /**
@@ -21,8 +24,8 @@ declare class experimental_WsHandler<T extends Context> {
  * @see {@link https://orpc.unnoq.com/docs/rpc-handler RPC Handler Docs}
  * @see {@link https://orpc.unnoq.com/docs/adapters/websocket Websocket Adapter Docs}
  */
-declare class experimental_RPCHandler<T extends Context> extends experimental_WsHandler<T> {
+declare class RPCHandler<T extends Context> extends WsHandler<T> {
     constructor(router: Router<any, T>, options?: NoInfer<StandardRPCHandlerOptions<T>>);
 }
 
-export { experimental_RPCHandler, experimental_WsHandler };
+export { RPCHandler, WsHandler };

package/dist/adapters/ws/index.mjs

@@ -1,27 +1,26 @@
-import { resolveMaybeOptionalOptions } from '@orpc/shared';
+import { readAsBuffer, resolveMaybeOptionalOptions } from '@orpc/shared';
 import { ServerPeer } from '@orpc/standard-server-peer';
-import { r as resolveFriendlyStandardHandleOptions } from '../../shared/server.BVwwTHyO.mjs';
+import { c as createServerPeerHandleRequestFn } from '../../shared/server.UVMTOWrk.mjs';
 import '@orpc/client';
 import '@orpc/standard-server';
 import '@orpc/contract';
-import { b as StandardRPCHandler } from '../../shared/server.CHvOkcM3.mjs';
+import { b as StandardRPCHandler } from '../../shared/server.CYRYFTxo.mjs';
 import '@orpc/client/standard';
-import '../../shared/server.DG7Tamti.mjs';
+import '../../shared/server.DZ5BIITo.mjs';
+import '../../shared/server.B_fj3X5m.mjs';
 
-class experimental_WsHandler {
+class WsHandler {
   constructor(standardHandler) {
     this.standardHandler = standardHandler;
   }
   async upgrade(ws, ...rest) {
     const peer = new ServerPeer(ws.send.bind(ws));
     ws.addEventListener("message", async (event) => {
-      const [id, request] = await peer.message(new Blob(Array.isArray(event.data) ? event.data : [event.data]));
-      if (!request) {
-        return;
-      }
-      const options = resolveFriendlyStandardHandleOptions(resolveMaybeOptionalOptions(rest));
-      const { response } = await this.standardHandler.handle({ ...request, body: () => Promise.resolve(request.body) }, options);
-      await peer.response(id, response ?? { status: 404, headers: {}, body: "No procedure matched" });
+      const message = Array.isArray(event.data) ? await readAsBuffer(new Blob(event.data)) : event.data;
+      await peer.message(
+        message,
+        createServerPeerHandleRequestFn(this.standardHandler, resolveMaybeOptionalOptions(rest))
+      );
     });
     ws.addEventListener("close", () => {
       peer.close();
@@ -29,10 +28,10 @@ class experimental_WsHandler {
   }
 }
 
-class experimental_RPCHandler extends experimental_WsHandler {
+class RPCHandler extends WsHandler {
   constructor(router, options = {}) {
     super(new StandardRPCHandler(router, options));
   }
 }
 
-export { experimental_RPCHandler, experimental_WsHandler };
+export { RPCHandler, WsHandler };