@orpc/server 0.0.0-next.7c931d7 → 0.0.0-next.7ccd703

package/README.md

@@ -30,7 +30,8 @@
 - **🔗 End-to-End Type Safety**: Ensure type-safe inputs, outputs, and errors from client to server.
 - **📘 First-Class OpenAPI**: Built-in support that fully adheres to the OpenAPI standard.
 - **📝 Contract-First Development**: Optionally define your API contract before implementation.
-- **⚙️ Framework Integrations**: Seamlessly integrate with TanStack Query (React, Vue, Solid, Svelte), Pinia Colada, and more.
+- **🔍 First-Class OpenTelemetry**: Seamlessly integrate with OpenTelemetry for observability.
+- **⚙️ Framework Integrations**: Seamlessly integrate with TanStack Query (React, Vue, Solid, Svelte, Angular), Pinia Colada, and more.
 - **🚀 Server Actions**: Fully compatible with React Server Actions on Next.js, TanStack Start, and other platforms.
 - **🔠 Standard Schema Support**: Works out of the box with Zod, Valibot, ArkType, and other schema validators.
 - **🗃️ Native Types**: Supports native types like Date, File, Blob, BigInt, URL, and more.
@@ -38,7 +39,6 @@
 - **📡 SSE & Streaming**: Enjoy full type-safe support for SSE and streaming.
 - **🌍 Multi-Runtime Support**: Fast and lightweight on Cloudflare, Deno, Bun, Node.js, and beyond.
 - **🔌 Extendability**: Easily extend functionality with plugins, middleware, and interceptors.
-- **🛡️ Reliability**: Well-tested, TypeScript-based, production-ready, and MIT licensed.
 
 ## Documentation
 
@@ -49,14 +49,13 @@ You can find the full documentation [here](https://orpc.unnoq.com).
 - [@orpc/contract](https://www.npmjs.com/package/@orpc/contract): Build your API contract.
 - [@orpc/server](https://www.npmjs.com/package/@orpc/server): Build your API or implement API contract.
 - [@orpc/client](https://www.npmjs.com/package/@orpc/client): Consume your API on the client with type-safety.
-- [@orpc/nest](https://www.npmjs.com/package/@orpc/nest): Deeply integrate oRPC with NestJS.
+- [@orpc/openapi](https://www.npmjs.com/package/@orpc/openapi): Generate OpenAPI specs and handle OpenAPI requests.
+- [@orpc/otel](https://www.npmjs.com/package/@orpc/otel): [OpenTelemetry](https://opentelemetry.io/) integration for observability.
+- [@orpc/nest](https://www.npmjs.com/package/@orpc/nest): Deeply integrate oRPC with [NestJS](https://nestjs.com/).
 - [@orpc/react](https://www.npmjs.com/package/@orpc/react): Utilities for integrating oRPC with React and React Server Actions.
-- [@orpc/react-query](https://www.npmjs.com/package/@orpc/react-query): Integration with [React Query](https://tanstack.com/query/latest/docs/framework/react/overview).
-- [@orpc/vue-query](https://www.npmjs.com/package/@orpc/vue-query): Integration with [Vue Query](https://tanstack.com/query/latest/docs/framework/vue/overview).
-- [@orpc/solid-query](https://www.npmjs.com/package/@orpc/solid-query): Integration with [Solid Query](https://tanstack.com/query/latest/docs/framework/solid/overview).
-- [@orpc/svelte-query](https://www.npmjs.com/package/@orpc/svelte-query): Integration with [Svelte Query](https://tanstack.com/query/latest/docs/framework/svelte/overview).
+- [@orpc/tanstack-query](https://www.npmjs.com/package/@orpc/tanstack-query): [TanStack Query](https://tanstack.com/query/latest) integration.
 - [@orpc/vue-colada](https://www.npmjs.com/package/@orpc/vue-colada): Integration with [Pinia Colada](https://pinia-colada.esm.dev/).
-- [@orpc/openapi](https://www.npmjs.com/package/@orpc/openapi): Generate OpenAPI specs and handle OpenAPI requests.
+- [@orpc/hey-api](https://www.npmjs.com/package/@orpc/hey-api): [Hey API](https://heyapi.dev/) integration.
 - [@orpc/zod](https://www.npmjs.com/package/@orpc/zod): More schemas that [Zod](https://zod.dev/) doesn't support yet.
 - [@orpc/valibot](https://www.npmjs.com/package/@orpc/valibot): OpenAPI spec generation from [Valibot](https://valibot.dev/).
 - [@orpc/arktype](https://www.npmjs.com/package/@orpc/arktype): OpenAPI spec generation from [ArkType](https://arktype.io/).
@@ -68,7 +67,7 @@ Build your API or implement API contract. Read the [documentation](https://orpc.
 ```ts
 import type { IncomingHttpHeaders } from 'node:http'
 import { ORPCError, os } from '@orpc/server'
-import { z } from 'zod'
+import * as z from 'zod'
 
 const PlanetSchema = z.object({
   id: z.number().int().min(1),

package/dist/adapters/aws-lambda/index.d.mts

@@ -0,0 +1,46 @@
+import { MaybeOptionalOptions } from '@orpc/shared';
+import { SendStandardResponseOptions, APIGatewayProxyEventV2, ResponseStream } from '@orpc/standard-server-aws-lambda';
+import { C as Context, R as Router } 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 { 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 AwsLambdaHandlerOptions extends SendStandardResponseOptions {
+}
+type AwsLambdaHandleResult = {
+    matched: true;
+} | {
+    matched: false;
+};
+declare class AwsLambdaHandler<T extends Context> {
+    private readonly standardHandler;
+    private readonly sendStandardResponseOptions;
+    constructor(standardHandler: StandardHandler<T>, options?: AwsLambdaHandlerOptions);
+    handle(event: APIGatewayProxyEventV2, responseStream: ResponseStream, ...rest: MaybeOptionalOptions<FriendlyStandardHandleOptions<T>>): Promise<AwsLambdaHandleResult>;
+}
+
+type RPCHandlerOptions<T extends Context> = AwsLambdaHandlerOptions & StandardRPCHandlerOptions<T> & {
+    /**
+     * Enables or disables the StrictGetMethodPlugin.
+     *
+     * @default true
+     */
+    strictGetMethodPluginEnabled?: boolean;
+};
+/**
+ * RPC Handler for AWS Lambda.
+ *
+ * @see {@link https://orpc.unnoq.com/docs/rpc-handler RPC Handler Docs}
+ * @see {@link https://orpc.unnoq.com/docs/adapters/http HTTP Adapter Docs}
+ */
+declare class RPCHandler<T extends Context> extends AwsLambdaHandler<T> {
+    constructor(router: Router<any, T>, options?: NoInfer<RPCHandlerOptions<T>>);
+}
+
+export { AwsLambdaHandler, RPCHandler };
+export type { AwsLambdaHandleResult, AwsLambdaHandlerOptions, RPCHandlerOptions };

package/dist/adapters/aws-lambda/index.d.ts

@@ -0,0 +1,46 @@
+import { MaybeOptionalOptions } from '@orpc/shared';
+import { SendStandardResponseOptions, APIGatewayProxyEventV2, ResponseStream } from '@orpc/standard-server-aws-lambda';
+import { C as Context, R as Router } 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 { 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 AwsLambdaHandlerOptions extends SendStandardResponseOptions {
+}
+type AwsLambdaHandleResult = {
+    matched: true;
+} | {
+    matched: false;
+};
+declare class AwsLambdaHandler<T extends Context> {
+    private readonly standardHandler;
+    private readonly sendStandardResponseOptions;
+    constructor(standardHandler: StandardHandler<T>, options?: AwsLambdaHandlerOptions);
+    handle(event: APIGatewayProxyEventV2, responseStream: ResponseStream, ...rest: MaybeOptionalOptions<FriendlyStandardHandleOptions<T>>): Promise<AwsLambdaHandleResult>;
+}
+
+type RPCHandlerOptions<T extends Context> = AwsLambdaHandlerOptions & StandardRPCHandlerOptions<T> & {
+    /**
+     * Enables or disables the StrictGetMethodPlugin.
+     *
+     * @default true
+     */
+    strictGetMethodPluginEnabled?: boolean;
+};
+/**
+ * RPC Handler for AWS Lambda.
+ *
+ * @see {@link https://orpc.unnoq.com/docs/rpc-handler RPC Handler Docs}
+ * @see {@link https://orpc.unnoq.com/docs/adapters/http HTTP Adapter Docs}
+ */
+declare class RPCHandler<T extends Context> extends AwsLambdaHandler<T> {
+    constructor(router: Router<any, T>, options?: NoInfer<RPCHandlerOptions<T>>);
+}
+
+export { AwsLambdaHandler, RPCHandler };
+export type { AwsLambdaHandleResult, AwsLambdaHandlerOptions, RPCHandlerOptions };

package/dist/adapters/aws-lambda/index.mjs

@@ -0,0 +1,42 @@
+import { resolveMaybeOptionalOptions } from '@orpc/shared';
+import { toStandardLazyRequest, sendStandardResponse } from '@orpc/standard-server-aws-lambda';
+import { r as resolveFriendlyStandardHandleOptions } from '../../shared/server.DZ5BIITo.mjs';
+import '@orpc/standard-server';
+import '@orpc/standard-server/batch';
+import '@orpc/standard-server-fetch';
+import '@orpc/client';
+import { S as StrictGetMethodPlugin } from '../../shared/server.BW-nUGgA.mjs';
+import '@orpc/contract';
+import { b as StandardRPCHandler } from '../../shared/server.CYRYFTxo.mjs';
+import '@orpc/client/standard';
+import '../../shared/server.B_fj3X5m.mjs';
+
+class AwsLambdaHandler {
+  constructor(standardHandler, options = {}) {
+    this.standardHandler = standardHandler;
+    this.sendStandardResponseOptions = options;
+  }
+  sendStandardResponseOptions;
+  async handle(event, responseStream, ...rest) {
+    const standardRequest = toStandardLazyRequest(event, responseStream);
+    const options = resolveFriendlyStandardHandleOptions(resolveMaybeOptionalOptions(rest));
+    const result = await this.standardHandler.handle(standardRequest, options);
+    if (!result.matched) {
+      return { matched: false };
+    }
+    await sendStandardResponse(responseStream, result.response, this.sendStandardResponseOptions);
+    return { matched: true };
+  }
+}
+
+class RPCHandler extends AwsLambdaHandler {
+  constructor(router, options = {}) {
+    if (options.strictGetMethodPluginEnabled ?? true) {
+      options.plugins ??= [];
+      options.plugins.push(new StrictGetMethodPlugin());
+    }
+    super(new StandardRPCHandler(router, options), options);
+  }
+}
+
+export { AwsLambdaHandler, RPCHandler };

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

@@ -1,23 +1,24 @@
 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';
 
 interface ServerWebSocket {
-    send(message: string | ArrayBufferLike): number;
+    send(message: string | ArrayBufferLike | Uint8Array): number;
 }
-declare class experimental_BunWsHandler<T extends Context> {
+declare class BunWsHandler<T extends Context> {
     private readonly standardHandler;
     private readonly peers;
     constructor(standardHandler: StandardHandler<T>);
-    message(ws: ServerWebSocket, message: string | {
-        buffer: ArrayBufferLike;
-    }, ...rest: MaybeOptionalOptions<Omit<FriendlyStandardHandleOptions<T>, 'prefix'>>): Promise<void>;
+    message(ws: ServerWebSocket, message: string | ArrayBufferView, ...rest: MaybeOptionalOptions<HandleStandardServerPeerMessageOptions<T>>): Promise<void>;
     close(ws: ServerWebSocket): void;
 }
 
@@ -27,9 +28,9 @@ declare class experimental_BunWsHandler<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_BunWsHandler<T> {
+declare class RPCHandler<T extends Context> extends BunWsHandler<T> {
     constructor(router: Router<any, T>, options?: NoInfer<StandardRPCHandlerOptions<T>>);
 }
 
-export { experimental_BunWsHandler, experimental_RPCHandler };
+export { BunWsHandler, RPCHandler };
 export type { ServerWebSocket };

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

@@ -1,23 +1,24 @@
 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';
 
 interface ServerWebSocket {
-    send(message: string | ArrayBufferLike): number;
+    send(message: string | ArrayBufferLike | Uint8Array): number;
 }
-declare class experimental_BunWsHandler<T extends Context> {
+declare class BunWsHandler<T extends Context> {
     private readonly standardHandler;
     private readonly peers;
     constructor(standardHandler: StandardHandler<T>);
-    message(ws: ServerWebSocket, message: string | {
-        buffer: ArrayBufferLike;
-    }, ...rest: MaybeOptionalOptions<Omit<FriendlyStandardHandleOptions<T>, 'prefix'>>): Promise<void>;
+    message(ws: ServerWebSocket, message: string | ArrayBufferView, ...rest: MaybeOptionalOptions<HandleStandardServerPeerMessageOptions<T>>): Promise<void>;
     close(ws: ServerWebSocket): void;
 }
 
@@ -27,9 +28,9 @@ declare class experimental_BunWsHandler<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_BunWsHandler<T> {
+declare class RPCHandler<T extends Context> extends BunWsHandler<T> {
     constructor(router: Router<any, T>, options?: NoInfer<StandardRPCHandlerOptions<T>>);
 }
 
-export { experimental_BunWsHandler, experimental_RPCHandler };
+export { BunWsHandler, RPCHandler };
 export type { ServerWebSocket };

package/dist/adapters/bun-ws/index.mjs

@@ -1,14 +1,15 @@
 import { 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.CYRYFTxo.mjs';
 import '@orpc/client/standard';
-import '../../shared/server.DG7Tamti.mjs';
+import '../../shared/server.DZ5BIITo.mjs';
+import '../../shared/server.B_fj3X5m.mjs';
 
-class experimental_BunWsHandler {
+class BunWsHandler {
   constructor(standardHandler) {
     this.standardHandler = standardHandler;
   }
@@ -16,22 +17,17 @@ class experimental_BunWsHandler {
   async message(ws, message, ...rest) {
     let peer = this.peers.get(ws);
     if (!peer) {
-      this.peers.set(ws, peer = new ServerPeer(async (raw) => {
-        if (raw instanceof Blob) {
-          const buffer = await raw.arrayBuffer();
-          ws.send(buffer);
-        } else {
-          ws.send(raw);
+      this.peers.set(ws, peer = new ServerPeer(
+        (message2) => {
+          ws.send(message2);
         }
-      }));
+      ));
     }
-    const [id, request] = await peer.message(typeof message === "string" ? message : message.buffer);
-    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 encodedMessage = typeof message === "string" ? message : new Uint8Array(message.buffer, message.byteOffset, message.byteLength);
+    await peer.message(
+      encodedMessage,
+      createServerPeerHandleRequestFn(this.standardHandler, resolveMaybeOptionalOptions(rest))
+    );
   }
   close(ws) {
     const server = this.peers.get(ws);
@@ -42,10 +38,10 @@ class experimental_BunWsHandler {
   }
 }
 
-class experimental_RPCHandler extends experimental_BunWsHandler {
+class RPCHandler extends BunWsHandler {
   constructor(router, options = {}) {
     super(new StandardRPCHandler(router, options));
   }
 }
 
-export { experimental_BunWsHandler, experimental_RPCHandler };
+export { BunWsHandler, RPCHandler };

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

@@ -1,19 +1,22 @@
 import { MaybeOptionalOptions } from '@orpc/shared';
 import { Peer, Message } from 'crossws';
-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_CrosswsHandler<T extends Context> {
     private readonly standardHandler;
     private readonly peers;
     constructor(standardHandler: StandardHandler<T>);
-    message(ws: Pick<Peer, 'send'>, message: Pick<Message, 'rawData' | 'uint8Array'>, ...rest: MaybeOptionalOptions<Omit<FriendlyStandardHandleOptions<T>, 'prefix'>>): Promise<void>;
+    message(ws: Pick<Peer, 'send'>, message: Pick<Message, 'rawData' | 'uint8Array'>, ...rest: MaybeOptionalOptions<HandleStandardServerPeerMessageOptions<T>>): Promise<void>;
     close(ws: Pick<Peer, 'send'>): void;
 }
 

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

@@ -1,19 +1,22 @@
 import { MaybeOptionalOptions } from '@orpc/shared';
 import { Peer, Message } from 'crossws';
-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_CrosswsHandler<T extends Context> {
     private readonly standardHandler;
     private readonly peers;
     constructor(standardHandler: StandardHandler<T>);
-    message(ws: Pick<Peer, 'send'>, message: Pick<Message, 'rawData' | 'uint8Array'>, ...rest: MaybeOptionalOptions<Omit<FriendlyStandardHandleOptions<T>, 'prefix'>>): Promise<void>;
+    message(ws: Pick<Peer, 'send'>, message: Pick<Message, 'rawData' | 'uint8Array'>, ...rest: MaybeOptionalOptions<HandleStandardServerPeerMessageOptions<T>>): Promise<void>;
     close(ws: Pick<Peer, 'send'>): void;
 }
 

package/dist/adapters/crossws/index.mjs

@@ -1,12 +1,13 @@
 import { 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.CYRYFTxo.mjs';
 import '@orpc/client/standard';
-import '../../shared/server.DG7Tamti.mjs';
+import '../../shared/server.DZ5BIITo.mjs';
+import '../../shared/server.B_fj3X5m.mjs';
 
 class experimental_CrosswsHandler {
   constructor(standardHandler) {
@@ -16,22 +17,15 @@ class experimental_CrosswsHandler {
   async message(ws, message, ...rest) {
     let peer = this.peers.get(ws);
     if (!peer) {
-      this.peers.set(ws, peer = new ServerPeer(async (raw) => {
-        if (raw instanceof Blob) {
-          const buffer = await raw.arrayBuffer();
-          ws.send(buffer);
-        } else {
-          ws.send(raw);
-        }
+      this.peers.set(ws, peer = new ServerPeer((message2) => {
+        ws.send(message2);
       }));
     }
-    const [id, request] = await peer.message(typeof message.rawData === "string" ? message.rawData : message.uint8Array());
-    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 encodedMessage = typeof message.rawData === "string" ? message.rawData : message.uint8Array();
+    await peer.message(
+      encodedMessage,
+      createServerPeerHandleRequestFn(this.standardHandler, resolveMaybeOptionalOptions(rest))
+    );
   }
   close(ws) {
     const server = this.peers.get(ws);

package/dist/adapters/fetch/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 { ToFetchResponseOptions } from '@orpc/standard-server-fetch';
-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 FetchHandlerPlugin<T extends Context> extends StandardHandlerPlugin<T> {
     initRuntimeAdapter?(options: FetchHandlerOptions<T>): void;

package/dist/adapters/fetch/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 { ToFetchResponseOptions } from '@orpc/standard-server-fetch';
-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 FetchHandlerPlugin<T extends Context> extends StandardHandlerPlugin<T> {
     initRuntimeAdapter?(options: FetchHandlerOptions<T>): void;

package/dist/adapters/fetch/index.mjs

@@ -1,14 +1,14 @@
 import { ORPCError } from '@orpc/client';
 import { toArray, intercept, resolveMaybeOptionalOptions } from '@orpc/shared';
 import { toStandardLazyRequest, toFetchResponse } from '@orpc/standard-server-fetch';
-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.CYRYFTxo.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 '../../shared/server.B_fj3X5m.mjs';
 
 class BodyLimitPlugin {
   maxBodySize;

package/dist/adapters/message-port/index.d.mts

@@ -1,18 +1,21 @@
 import { SupportedMessagePort } from '@orpc/client/message-port';
 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_MessagePortHandler<T extends Context> {
+declare class MessagePortHandler<T extends Context> {
     private readonly standardHandler;
     constructor(standardHandler: StandardHandler<T>);
-    upgrade(port: SupportedMessagePort, ...rest: MaybeOptionalOptions<Omit<FriendlyStandardHandleOptions<T>, 'prefix'>>): void;
+    upgrade(port: SupportedMessagePort, ...rest: MaybeOptionalOptions<HandleStandardServerPeerMessageOptions<T>>): void;
 }
 
 /**
@@ -21,8 +24,8 @@ declare class experimental_MessagePortHandler<T extends Context> {
  * @see {@link https://orpc.unnoq.com/docs/rpc-handler RPC Handler Docs}
  * @see {@link https://orpc.unnoq.com/docs/adapters/message-port Message Port Adapter Docs}
  */
-declare class experimental_RPCHandler<T extends Context> extends experimental_MessagePortHandler<T> {
+declare class RPCHandler<T extends Context> extends MessagePortHandler<T> {
     constructor(router: Router<any, T>, options?: NoInfer<StandardRPCHandlerOptions<T>>);
 }
 
-export { experimental_MessagePortHandler, experimental_RPCHandler };
+export { MessagePortHandler, RPCHandler };

package/dist/adapters/message-port/index.d.ts

@@ -1,18 +1,21 @@
 import { SupportedMessagePort } from '@orpc/client/message-port';
 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_MessagePortHandler<T extends Context> {
+declare class MessagePortHandler<T extends Context> {
     private readonly standardHandler;
     constructor(standardHandler: StandardHandler<T>);
-    upgrade(port: SupportedMessagePort, ...rest: MaybeOptionalOptions<Omit<FriendlyStandardHandleOptions<T>, 'prefix'>>): void;
+    upgrade(port: SupportedMessagePort, ...rest: MaybeOptionalOptions<HandleStandardServerPeerMessageOptions<T>>): void;
 }
 
 /**
@@ -21,8 +24,8 @@ declare class experimental_MessagePortHandler<T extends Context> {
  * @see {@link https://orpc.unnoq.com/docs/rpc-handler RPC Handler Docs}
  * @see {@link https://orpc.unnoq.com/docs/adapters/message-port Message Port Adapter Docs}
  */
-declare class experimental_RPCHandler<T extends Context> extends experimental_MessagePortHandler<T> {
+declare class RPCHandler<T extends Context> extends MessagePortHandler<T> {
     constructor(router: Router<any, T>, options?: NoInfer<StandardRPCHandlerOptions<T>>);
 }
 
-export { experimental_MessagePortHandler, experimental_RPCHandler };
+export { MessagePortHandler, RPCHandler };