@orpc/server 0.0.0-next.eae6003 → 0.0.0-next.eaec0b2

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

@@ -1,13 +1,15 @@
-import { C as Context, R as Router } from '../../shared/server.DPWk5pjW.js';
-import { Interceptor, ThrowableError, MaybeOptionalOptions } from '@orpc/shared';
+import { C as Context, R as Router } from '../../shared/server.qKsRrdxW.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.YZzrREz9.js';
-import { F as FriendlyStandardHandleOptions } from '../../shared/server.BjiJH9Vo.js';
-import { S as StandardRPCHandlerOptions } from '../../shared/server.Cy1vfSiG.js';
+import { g as StandardHandlerPlugin, C as CompositeStandardHandlerPlugin, b as StandardHandleOptions, f as StandardHandler } from '../../shared/server.7cEtMB30.js';
+import { F as FriendlyStandardHandleOptions } from '../../shared/server.EfTOZ2Q7.js';
+import compression from '@orpc/interop/compression';
+import { S as StandardRPCHandlerOptions } from '../../shared/server.yoEB3Fx4.js';
 import '@orpc/client';
 import '@orpc/contract';
 import '@orpc/standard-server';
 import '@orpc/client/standard';
+import '../../shared/server.ChyoA9XY.js';
 
 interface NodeHttpHandlerPlugin<T extends Context> extends StandardHandlerPlugin<T> {
     initRuntimeAdapter?(options: NodeHttpHandlerOptions<T>): void;
@@ -27,10 +29,10 @@ interface NodeHttpHandlerInterceptorOptions<T extends Context> extends StandardH
     sendStandardResponseOptions: SendStandardResponseOptions;
 }
 interface NodeHttpHandlerOptions<T extends Context> extends SendStandardResponseOptions {
-    adapterInterceptors?: Interceptor<NodeHttpHandlerInterceptorOptions<T>, NodeHttpHandleResult, ThrowableError>[];
+    adapterInterceptors?: Interceptor<NodeHttpHandlerInterceptorOptions<T>, Promise<NodeHttpHandleResult>>[];
     plugins?: NodeHttpHandlerPlugin<T>[];
 }
-declare class NodeHttpHandler<T extends Context> implements NodeHttpHandler<T> {
+declare class NodeHttpHandler<T extends Context> {
     private readonly standardHandler;
     private readonly sendStandardResponseOptions;
     private readonly adapterInterceptors;
@@ -47,7 +49,7 @@ interface BodyLimitPluginOptions {
 /**
  * The Body Limit Plugin restricts the size of the request body for the Node.js HTTP Server.
  *
- * @see {@link https://orpc.unnoq.com/docs/plugins/body-limit Body Limit Plugin Docs}
+ * @see {@link https://orpc.dev/docs/plugins/body-limit Body Limit Plugin Docs}
  */
 declare class BodyLimitPlugin<T extends Context> implements NodeHttpHandlerPlugin<T> {
     private readonly maxBodySize;
@@ -55,23 +57,43 @@ declare class BodyLimitPlugin<T extends Context> implements NodeHttpHandlerPlugi
     initRuntimeAdapter(options: NodeHttpHandlerOptions<T>): void;
 }
 
-type RPCHandlerOptions<T extends Context> = NodeHttpHandlerOptions<T> & StandardRPCHandlerOptions<T> & {
+interface CompressionPluginOptions extends compression.CompressionOptions {
+    /**
+     * Override the default content-type filter used to determine which responses should be compressed.
+     *
+     * @warning [Event Iterator](https://orpc.dev/docs/event-iterator) responses are never compressed, regardless of this filter's return value.
+     * @default only responses with compressible content types are compressed.
+     */
+    filter?: (req: NodeHttpRequest, res: NodeHttpResponse) => boolean;
+}
+/**
+ * The Compression Plugin adds response compression to the Node.js HTTP Server.
+ *
+ * @see {@link https://orpc.dev/docs/plugins/compression Compression Plugin Docs}
+ */
+declare class CompressionPlugin<T extends Context> implements NodeHttpHandlerPlugin<T> {
+    private readonly compressionHandler;
+    constructor(options?: CompressionPluginOptions);
+    initRuntimeAdapter(options: NodeHttpHandlerOptions<T>): void;
+}
+
+interface RPCHandlerOptions<T extends Context> extends NodeHttpHandlerOptions<T>, Omit<StandardRPCHandlerOptions<T>, 'plugins'> {
     /**
      * Enables or disables the StrictGetMethodPlugin.
      *
      * @default true
      */
     strictGetMethodPluginEnabled?: boolean;
-};
+}
 /**
  * RPC Handler for Node.js HTTP Server
  *
- * @see {@link https://orpc.unnoq.com/docs/rpc-handler RPC Handler Docs}
- * @see {@link https://orpc.unnoq.com/docs/adapters/http HTTP Adapter Docs}
+ * @see {@link https://orpc.dev/docs/rpc-handler RPC Handler Docs}
+ * @see {@link https://orpc.dev/docs/adapters/http HTTP Adapter Docs}
  */
 declare class RPCHandler<T extends Context> extends NodeHttpHandler<T> {
     constructor(router: Router<any, T>, options?: NoInfer<RPCHandlerOptions<T>>);
 }
 
-export { BodyLimitPlugin, CompositeNodeHttpHandlerPlugin, NodeHttpHandler, RPCHandler };
-export type { BodyLimitPluginOptions, NodeHttpHandleResult, NodeHttpHandlerInterceptorOptions, NodeHttpHandlerOptions, NodeHttpHandlerPlugin, RPCHandlerOptions };
+export { BodyLimitPlugin, CompositeNodeHttpHandlerPlugin, CompressionPlugin, NodeHttpHandler, RPCHandler };
+export type { BodyLimitPluginOptions, CompressionPluginOptions, NodeHttpHandleResult, NodeHttpHandlerInterceptorOptions, NodeHttpHandlerOptions, NodeHttpHandlerPlugin, RPCHandlerOptions };

package/dist/adapters/node/index.mjs

@@ -1,14 +1,16 @@
 import { ORPCError } from '@orpc/client';
-import { toArray, intercept, resolveMaybeOptionalOptions } from '@orpc/shared';
+import { once, toArray, intercept, resolveMaybeOptionalOptions } from '@orpc/shared';
+import compression from '@orpc/interop/compression';
 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.4FnxLwwr.mjs';
+import { C as CompositeStandardHandlerPlugin, b as StandardRPCHandler } from '../../shared/server.Bxx6tqNe.mjs';
 import '@orpc/client/standard';
 import '@orpc/standard-server/batch';
-import { S as StrictGetMethodPlugin } from '../../shared/server.BW-nUGgA.mjs';
-import '../../shared/server.DG7Tamti.mjs';
+import '@orpc/standard-server-fetch';
+import { S as StrictGetMethodPlugin } from '../../shared/server.TEVCLCFC.mjs';
+import '../../shared/server.Ds4HPpvH.mjs';
 
 class BodyLimitPlugin {
   maxBodySize;
@@ -18,14 +20,12 @@ class BodyLimitPlugin {
   initRuntimeAdapter(options) {
     options.adapterInterceptors ??= [];
     options.adapterInterceptors.push(async (options2) => {
-      let isHeaderChecked = false;
-      const checkHeader = () => {
-        if (!isHeaderChecked && Number(options2.request.headers["content-length"]) > this.maxBodySize) {
+      const checkHeader = once(() => {
+        if (Number(options2.request.headers["content-length"]) > this.maxBodySize) {
           throw new ORPCError("PAYLOAD_TOO_LARGE");
         }
-        isHeaderChecked = true;
-      };
-      const originalEmit = options2.request.emit.bind(options2.request);
+      });
+      const originalEmit = options2.request.emit;
       let currentBodySize = 0;
       options2.request.emit = (event, ...args) => {
         if (event === "data") {
@@ -35,9 +35,66 @@ class BodyLimitPlugin {
             throw new ORPCError("PAYLOAD_TOO_LARGE");
           }
         }
-        return originalEmit(event, ...args);
+        return originalEmit.call(options2.request, event, ...args);
       };
-      return options2.next();
+      try {
+        return await options2.next(options2);
+      } finally {
+        options2.request.emit = originalEmit;
+      }
+    });
+  }
+}
+
+class CompressionPlugin {
+  compressionHandler;
+  constructor(options = {}) {
+    this.compressionHandler = compression({
+      ...options,
+      filter: (req, res) => {
+        const hasContentDisposition = res.hasHeader("content-disposition");
+        const contentType = res.getHeader("content-type")?.toString();
+        if (!hasContentDisposition && contentType?.startsWith("text/event-stream")) {
+          return false;
+        }
+        return options.filter ? options.filter(req, res) : compression.filter(req, res);
+      }
+    });
+  }
+  initRuntimeAdapter(options) {
+    options.adapterInterceptors ??= [];
+    options.adapterInterceptors.unshift(async (options2) => {
+      let resolve;
+      let reject;
+      const promise = new Promise((res, rej) => {
+        resolve = res;
+        reject = rej;
+      });
+      const originalWrite = options2.response.write;
+      const originalEnd = options2.response.end;
+      const originalOn = options2.response.on;
+      this.compressionHandler(
+        options2.request,
+        options2.response,
+        async (err) => {
+          if (err) {
+            reject(err);
+          } else {
+            try {
+              resolve(await options2.next());
+            } catch (error) {
+              reject(error);
+            }
+          }
+        }
+      );
+      try {
+        return await promise;
+      } finally {
+        options2.response.write = originalWrite;
+        options2.response.end = originalEnd;
+        options2.response.on = originalOn;
+      }
     });
   }
 }
@@ -92,4 +149,4 @@ class RPCHandler extends NodeHttpHandler {
   }
 }
 
-export { BodyLimitPlugin, CompositeNodeHttpHandlerPlugin, NodeHttpHandler, RPCHandler };
+export { BodyLimitPlugin, CompositeNodeHttpHandlerPlugin, CompressionPlugin, NodeHttpHandler, RPCHandler };

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.eWLxY3lq.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.eWLxY3lq.mjs';
-import { ORPCError, HTTPPath } from '@orpc/client';
+import { S as StandardCodec, a as StandardParams } from '../../shared/server.BqadksTP.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.BqadksTP.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.DPWk5pjW.mjs';
-export { a as StandardRPCHandler, S as StandardRPCHandlerOptions } from '../../shared/server.BRoxSiSC.mjs';
+import { A as AnyProcedure } from '../../shared/server.qKsRrdxW.mjs';
+export { a as StandardRPCHandler, S as StandardRPCHandlerOptions, c as StandardRPCMatcher, b as StandardRPCMatcherOptions } from '../../shared/server.ChUyt5-i.mjs';
+export { F as FriendlyStandardHandleOptions, r as resolveFriendlyStandardHandleOptions } from '../../shared/server.B8gYOD5g.mjs';
 import '@orpc/contract';
 import '@orpc/shared';
+import '../../shared/server.C8_sRzQB.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.YZzrREz9.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.YZzrREz9.js';
-import { ORPCError, HTTPPath } from '@orpc/client';
+import { S as StandardCodec, a as StandardParams } from '../../shared/server.7cEtMB30.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.7cEtMB30.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.DPWk5pjW.js';
-export { a as StandardRPCHandler, S as StandardRPCHandlerOptions } from '../../shared/server.Cy1vfSiG.js';
+import { A as AnyProcedure } from '../../shared/server.qKsRrdxW.js';
+export { a as StandardRPCHandler, S as StandardRPCHandlerOptions, c as StandardRPCMatcher, b as StandardRPCMatcherOptions } from '../../shared/server.yoEB3Fx4.js';
+export { F as FriendlyStandardHandleOptions, r as resolveFriendlyStandardHandleOptions } from '../../shared/server.EfTOZ2Q7.js';
 import '@orpc/contract';
 import '@orpc/shared';
+import '../../shared/server.ChyoA9XY.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.4FnxLwwr.mjs';
+export { C as CompositeStandardHandlerPlugin, S as StandardHandler, a as StandardRPCCodec, b as StandardRPCHandler, c as StandardRPCMatcher } from '../../shared/server.Bxx6tqNe.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.Ds4HPpvH.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.qKsRrdxW.mjs';
+import { f as StandardHandler } from '../../shared/server.BqadksTP.mjs';
+import { F as FriendlyStandardHandleOptions } from '../../shared/server.B8gYOD5g.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.qKsRrdxW.js';
+import { f as StandardHandler } from '../../shared/server.7cEtMB30.js';
+import { F as FriendlyStandardHandleOptions } from '../../shared/server.EfTOZ2Q7.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,27 +1,56 @@
 import { MaybeOptionalOptions } from '@orpc/shared';
-import { C as Context, R as Router } from '../../shared/server.DPWk5pjW.mjs';
-import { i as StandardHandler } from '../../shared/server.eWLxY3lq.mjs';
-import { F as FriendlyStandardHandleOptions } from '../../shared/server.QUe9N8P4.mjs';
-import { S as StandardRPCHandlerOptions } from '../../shared/server.BRoxSiSC.mjs';
+import { C as Context, R as Router } from '../../shared/server.qKsRrdxW.mjs';
+import { f as StandardHandler } from '../../shared/server.BqadksTP.mjs';
+import { HandleStandardServerPeerMessageOptions } from '../standard-peer/index.mjs';
+import { S as StandardRPCHandlerOptions } from '../../shared/server.ChUyt5-i.mjs';
 import '@orpc/client';
 import '@orpc/contract';
 import '@orpc/standard-server';
+import '@orpc/standard-server-peer';
+import '../../shared/server.B8gYOD5g.mjs';
 import '@orpc/client/standard';
+import '../../shared/server.C8_sRzQB.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;
 }
 
+interface RPCHandlerOptions<T extends Context> extends StandardRPCHandlerOptions<T> {
+}
 /**
  * RPC Handler for Websocket adapter
  *
- * @see {@link https://orpc.unnoq.com/docs/rpc-handler RPC Handler Docs}
- * @see {@link https://orpc.unnoq.com/docs/adapters/websocket Websocket Adapter Docs}
+ * @see {@link https://orpc.dev/docs/rpc-handler RPC Handler Docs}
+ * @see {@link https://orpc.dev/docs/adapters/websocket Websocket Adapter Docs}
  */
-declare class experimental_RPCHandler<T extends Context> extends experimental_WebsocketHandler<T> {
-    constructor(router: Router<any, T>, options?: NoInfer<StandardRPCHandlerOptions<T>>);
+declare class RPCHandler<T extends Context> extends WebsocketHandler<T> {
+    constructor(router: Router<any, T>, options?: NoInfer<RPCHandlerOptions<T>>);
 }
 
-export { experimental_RPCHandler, experimental_WebsocketHandler };
+export { RPCHandler, WebsocketHandler };
+export type { MinimalWebsocket, RPCHandlerOptions };

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

@@ -1,27 +1,56 @@
 import { MaybeOptionalOptions } from '@orpc/shared';
-import { C as Context, R as Router } from '../../shared/server.DPWk5pjW.js';
-import { i as StandardHandler } from '../../shared/server.YZzrREz9.js';
-import { F as FriendlyStandardHandleOptions } from '../../shared/server.BjiJH9Vo.js';
-import { S as StandardRPCHandlerOptions } from '../../shared/server.Cy1vfSiG.js';
+import { C as Context, R as Router } from '../../shared/server.qKsRrdxW.js';
+import { f as StandardHandler } from '../../shared/server.7cEtMB30.js';
+import { HandleStandardServerPeerMessageOptions } from '../standard-peer/index.js';
+import { S as StandardRPCHandlerOptions } from '../../shared/server.yoEB3Fx4.js';
 import '@orpc/client';
 import '@orpc/contract';
 import '@orpc/standard-server';
+import '@orpc/standard-server-peer';
+import '../../shared/server.EfTOZ2Q7.js';
 import '@orpc/client/standard';
+import '../../shared/server.ChyoA9XY.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;
 }
 
+interface RPCHandlerOptions<T extends Context> extends StandardRPCHandlerOptions<T> {
+}
 /**
  * RPC Handler for Websocket adapter
  *
- * @see {@link https://orpc.unnoq.com/docs/rpc-handler RPC Handler Docs}
- * @see {@link https://orpc.unnoq.com/docs/adapters/websocket Websocket Adapter Docs}
+ * @see {@link https://orpc.dev/docs/rpc-handler RPC Handler Docs}
+ * @see {@link https://orpc.dev/docs/adapters/websocket Websocket Adapter Docs}
  */
-declare class experimental_RPCHandler<T extends Context> extends experimental_WebsocketHandler<T> {
-    constructor(router: Router<any, T>, options?: NoInfer<StandardRPCHandlerOptions<T>>);
+declare class RPCHandler<T extends Context> extends WebsocketHandler<T> {
+    constructor(router: Router<any, T>, options?: NoInfer<RPCHandlerOptions<T>>);
 }
 
-export { experimental_RPCHandler, experimental_WebsocketHandler };
+export { RPCHandler, WebsocketHandler };
+export type { MinimalWebsocket, RPCHandlerOptions };

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.4FnxLwwr.mjs';
+import { b as StandardRPCHandler } from '../../shared/server.Bxx6tqNe.mjs';
 import '@orpc/client/standard';
-import '../../shared/server.DG7Tamti.mjs';
+import '../../shared/server.DZ5BIITo.mjs';
+import '../../shared/server.Ds4HPpvH.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,28 +1,31 @@
 import { MaybeOptionalOptions } from '@orpc/shared';
 import { WebSocket } from 'ws';
-import { C as Context, R as Router } from '../../shared/server.DPWk5pjW.mjs';
-import { i as StandardHandler } from '../../shared/server.eWLxY3lq.mjs';
-import { F as FriendlyStandardHandleOptions } from '../../shared/server.QUe9N8P4.mjs';
-import { S as StandardRPCHandlerOptions } from '../../shared/server.BRoxSiSC.mjs';
+import { C as Context, R as Router } from '../../shared/server.qKsRrdxW.mjs';
+import { f as StandardHandler } from '../../shared/server.BqadksTP.mjs';
+import { HandleStandardServerPeerMessageOptions } from '../standard-peer/index.mjs';
+import { S as StandardRPCHandlerOptions } from '../../shared/server.ChUyt5-i.mjs';
 import '@orpc/client';
 import '@orpc/contract';
 import '@orpc/standard-server';
+import '@orpc/standard-server-peer';
+import '../../shared/server.B8gYOD5g.mjs';
 import '@orpc/client/standard';
+import '../../shared/server.C8_sRzQB.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>;
 }
 
 /**
  * RPC Handler for ws (node ws) adapter
  *
- * @see {@link https://orpc.unnoq.com/docs/rpc-handler RPC Handler Docs}
- * @see {@link https://orpc.unnoq.com/docs/adapters/websocket Websocket Adapter Docs}
+ * @see {@link https://orpc.dev/docs/rpc-handler RPC Handler Docs}
+ * @see {@link https://orpc.dev/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 };