@orpc/server 0.0.0-next.e6490f2 → 0.0.0-next.e788265

package/README.md

@@ -30,7 +30,7 @@
 - **🔗 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.
+- **⚙️ 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.
@@ -66,7 +66,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

@@ -1,13 +1,14 @@
 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.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.CRejaM08.mjs';
+import { f as StandardHandler } from '../../shared/server.De2J-WNx.mjs';
+import { F as FriendlyStandardHandleOptions } from '../../shared/server.VjZAmjFs.mjs';
+import { S as StandardRPCHandlerOptions } from '../../shared/server.C-F_fMXW.mjs';
 import '@orpc/client';
 import '@orpc/contract';
 import '@orpc/standard-server';
 import '@orpc/client/standard';
+import '../../shared/server.DrG30u7a.mjs';
 
 interface AwsLambdaHandlerOptions extends SendStandardResponseOptions {
 }
@@ -37,9 +38,9 @@ type RPCHandlerOptions<T extends Context> = AwsLambdaHandlerOptions & StandardRP
  * @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 experimental_RPCHandler<T extends Context> extends AwsLambdaHandler<T> {
+declare class RPCHandler<T extends Context> extends AwsLambdaHandler<T> {
     constructor(router: Router<any, T>, options?: NoInfer<RPCHandlerOptions<T>>);
 }
 
-export { AwsLambdaHandler, experimental_RPCHandler };
+export { AwsLambdaHandler, RPCHandler };
 export type { AwsLambdaHandleResult, AwsLambdaHandlerOptions, RPCHandlerOptions };

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

@@ -1,13 +1,14 @@
 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.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.CRejaM08.js';
+import { f as StandardHandler } from '../../shared/server.BX8Iro5z.js';
+import { F as FriendlyStandardHandleOptions } from '../../shared/server.mGrd7l1v.js';
+import { S as StandardRPCHandlerOptions } from '../../shared/server.CPC5w4d2.js';
 import '@orpc/client';
 import '@orpc/contract';
 import '@orpc/standard-server';
 import '@orpc/client/standard';
+import '../../shared/server.Bi2_bIHo.js';
 
 interface AwsLambdaHandlerOptions extends SendStandardResponseOptions {
 }
@@ -37,9 +38,9 @@ type RPCHandlerOptions<T extends Context> = AwsLambdaHandlerOptions & StandardRP
  * @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 experimental_RPCHandler<T extends Context> extends AwsLambdaHandler<T> {
+declare class RPCHandler<T extends Context> extends AwsLambdaHandler<T> {
     constructor(router: Router<any, T>, options?: NoInfer<RPCHandlerOptions<T>>);
 }
 
-export { AwsLambdaHandler, experimental_RPCHandler };
+export { AwsLambdaHandler, RPCHandler };
 export type { AwsLambdaHandleResult, AwsLambdaHandlerOptions, RPCHandlerOptions };

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

@@ -6,9 +6,9 @@ import '@orpc/standard-server/batch';
 import '@orpc/client';
 import { S as StrictGetMethodPlugin } from '../../shared/server.BW-nUGgA.mjs';
 import '@orpc/contract';
-import { b as StandardRPCHandler } from '../../shared/server.CHvOkcM3.mjs';
+import { b as StandardRPCHandler } from '../../shared/server.Aqc4pYFD.mjs';
 import '@orpc/client/standard';
-import '../../shared/server.DG7Tamti.mjs';
+import '../../shared/server.DLJzqnSX.mjs';
 
 class AwsLambdaHandler {
   constructor(standardHandler, options = {}) {
@@ -28,7 +28,7 @@ class AwsLambdaHandler {
   }
 }
 
-class experimental_RPCHandler extends AwsLambdaHandler {
+class RPCHandler extends AwsLambdaHandler {
   constructor(router, options = {}) {
     if (options.strictGetMethodPluginEnabled ?? true) {
       options.plugins ??= [];
@@ -38,4 +38,4 @@ class experimental_RPCHandler extends AwsLambdaHandler {
   }
 }
 
-export { AwsLambdaHandler, experimental_RPCHandler };
+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.CRejaM08.mjs';
+import { f as StandardHandler } from '../../shared/server.De2J-WNx.mjs';
+import { HandleStandardServerPeerMessageOptions } from '../standard-peer/index.mjs';
+import { S as StandardRPCHandlerOptions } from '../../shared/server.C-F_fMXW.mjs';
 import '@orpc/client';
 import '@orpc/contract';
 import '@orpc/standard-server';
+import '@orpc/standard-server-peer';
+import '../../shared/server.VjZAmjFs.mjs';
 import '@orpc/client/standard';
+import '../../shared/server.DrG30u7a.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.CRejaM08.js';
+import { f as StandardHandler } from '../../shared/server.BX8Iro5z.js';
+import { HandleStandardServerPeerMessageOptions } from '../standard-peer/index.js';
+import { S as StandardRPCHandlerOptions } from '../../shared/server.CPC5w4d2.js';
 import '@orpc/client';
 import '@orpc/contract';
 import '@orpc/standard-server';
+import '@orpc/standard-server-peer';
+import '../../shared/server.mGrd7l1v.js';
 import '@orpc/client/standard';
+import '../../shared/server.Bi2_bIHo.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.DZ5BIITo.mjs';
+import { h as handleStandardServerPeerMessage } from '../../shared/server.C6Q5sqYw.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.Aqc4pYFD.mjs';
 import '@orpc/client/standard';
-import '../../shared/server.DG7Tamti.mjs';
+import '../../shared/server.DZ5BIITo.mjs';
+import '../../shared/server.DLJzqnSX.mjs';
 
-class experimental_BunWsHandler {
+class BunWsHandler {
   constructor(standardHandler) {
     this.standardHandler = standardHandler;
   }
@@ -20,13 +21,13 @@ class experimental_BunWsHandler {
         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 handleStandardServerPeerMessage(
+      this.standardHandler,
+      peer,
+      encodedMessage,
+      resolveMaybeOptionalOptions(rest)
+    );
   }
   close(ws) {
     const server = this.peers.get(ws);
@@ -37,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.CRejaM08.mjs';
+import { f as StandardHandler } from '../../shared/server.De2J-WNx.mjs';
+import { HandleStandardServerPeerMessageOptions } from '../standard-peer/index.mjs';
+import { S as StandardRPCHandlerOptions } from '../../shared/server.C-F_fMXW.mjs';
 import '@orpc/client';
 import '@orpc/contract';
 import '@orpc/standard-server';
+import '@orpc/standard-server-peer';
+import '../../shared/server.VjZAmjFs.mjs';
 import '@orpc/client/standard';
+import '../../shared/server.DrG30u7a.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.CRejaM08.js';
+import { f as StandardHandler } from '../../shared/server.BX8Iro5z.js';
+import { HandleStandardServerPeerMessageOptions } from '../standard-peer/index.js';
+import { S as StandardRPCHandlerOptions } from '../../shared/server.CPC5w4d2.js';
 import '@orpc/client';
 import '@orpc/contract';
 import '@orpc/standard-server';
+import '@orpc/standard-server-peer';
+import '../../shared/server.mGrd7l1v.js';
 import '@orpc/client/standard';
+import '../../shared/server.Bi2_bIHo.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.DZ5BIITo.mjs';
+import { h as handleStandardServerPeerMessage } from '../../shared/server.C6Q5sqYw.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.Aqc4pYFD.mjs';
 import '@orpc/client/standard';
-import '../../shared/server.DG7Tamti.mjs';
+import '../../shared/server.DZ5BIITo.mjs';
+import '../../shared/server.DLJzqnSX.mjs';
 
 class experimental_CrosswsHandler {
   constructor(standardHandler) {
@@ -20,13 +21,13 @@ class experimental_CrosswsHandler {
         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 handleStandardServerPeerMessage(
+      this.standardHandler,
+      peer,
+      encodedMessage,
+      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.CRejaM08.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.De2J-WNx.mjs';
+import { F as FriendlyStandardHandleOptions } from '../../shared/server.VjZAmjFs.mjs';
+import { S as StandardRPCHandlerOptions } from '../../shared/server.C-F_fMXW.mjs';
 import '@orpc/client';
 import '@orpc/contract';
 import '@orpc/standard-server';
 import '@orpc/client/standard';
+import '../../shared/server.DrG30u7a.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.CRejaM08.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.BX8Iro5z.js';
+import { F as FriendlyStandardHandleOptions } from '../../shared/server.mGrd7l1v.js';
+import { S as StandardRPCHandlerOptions } from '../../shared/server.CPC5w4d2.js';
 import '@orpc/client';
 import '@orpc/contract';
 import '@orpc/standard-server';
 import '@orpc/client/standard';
+import '../../shared/server.Bi2_bIHo.js';
 
 interface FetchHandlerPlugin<T extends Context> extends StandardHandlerPlugin<T> {
     initRuntimeAdapter?(options: FetchHandlerOptions<T>): void;

package/dist/adapters/fetch/index.mjs

@@ -4,11 +4,11 @@ import { toStandardLazyRequest, toFetchResponse } from '@orpc/standard-server-fe
 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.Aqc4pYFD.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.DLJzqnSX.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.CRejaM08.mjs';
+import { f as StandardHandler } from '../../shared/server.De2J-WNx.mjs';
+import { HandleStandardServerPeerMessageOptions } from '../standard-peer/index.mjs';
+import { S as StandardRPCHandlerOptions } from '../../shared/server.C-F_fMXW.mjs';
 import '@orpc/client';
 import '@orpc/contract';
 import '@orpc/standard-server';
+import '@orpc/standard-server-peer';
+import '../../shared/server.VjZAmjFs.mjs';
 import '@orpc/client/standard';
+import '../../shared/server.DrG30u7a.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.CRejaM08.js';
+import { f as StandardHandler } from '../../shared/server.BX8Iro5z.js';
+import { HandleStandardServerPeerMessageOptions } from '../standard-peer/index.js';
+import { S as StandardRPCHandlerOptions } from '../../shared/server.CPC5w4d2.js';
 import '@orpc/client';
 import '@orpc/contract';
 import '@orpc/standard-server';
+import '@orpc/standard-server-peer';
+import '../../shared/server.mGrd7l1v.js';
 import '@orpc/client/standard';
+import '../../shared/server.Bi2_bIHo.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 };

package/dist/adapters/message-port/index.mjs

@@ -1,15 +1,16 @@
 import { postMessagePortMessage, onMessagePortMessage, onMessagePortClose } from '@orpc/client/message-port';
 import { resolveMaybeOptionalOptions } from '@orpc/shared';
 import { ServerPeer } from '@orpc/standard-server-peer';
-import { r as resolveFriendlyStandardHandleOptions } from '../../shared/server.DZ5BIITo.mjs';
+import { h as handleStandardServerPeerMessage } from '../../shared/server.C6Q5sqYw.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.Aqc4pYFD.mjs';
 import '@orpc/client/standard';
-import '../../shared/server.DG7Tamti.mjs';
+import '../../shared/server.DZ5BIITo.mjs';
+import '../../shared/server.DLJzqnSX.mjs';
 
-class experimental_MessagePortHandler {
+class MessagePortHandler {
   constructor(standardHandler) {
     this.standardHandler = standardHandler;
   }
@@ -18,13 +19,12 @@ class experimental_MessagePortHandler {
       return postMessagePortMessage(port, message);
     });
     onMessagePortMessage(port, async (message) => {
-      const [id, request] = await peer.message(message);
-      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" });
+      await handleStandardServerPeerMessage(
+        this.standardHandler,
+        peer,
+        message,
+        resolveMaybeOptionalOptions(rest)
+      );
     });
     onMessagePortClose(port, () => {
       peer.close();
@@ -32,10 +32,10 @@ class experimental_MessagePortHandler {
   }
 }
 
-class experimental_RPCHandler extends experimental_MessagePortHandler {
+class RPCHandler extends MessagePortHandler {
   constructor(router, options = {}) {
     super(new StandardRPCHandler(router, options));
   }
 }
 
-export { experimental_MessagePortHandler, experimental_RPCHandler };
+export { MessagePortHandler, RPCHandler };

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.CRejaM08.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.De2J-WNx.mjs';
+import { F as FriendlyStandardHandleOptions } from '../../shared/server.VjZAmjFs.mjs';
+import { S as StandardRPCHandlerOptions } from '../../shared/server.C-F_fMXW.mjs';
 import '@orpc/client';
 import '@orpc/contract';
 import '@orpc/standard-server';
 import '@orpc/client/standard';
+import '../../shared/server.DrG30u7a.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.CRejaM08.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.BX8Iro5z.js';
+import { F as FriendlyStandardHandleOptions } from '../../shared/server.mGrd7l1v.js';
+import { S as StandardRPCHandlerOptions } from '../../shared/server.CPC5w4d2.js';
 import '@orpc/client';
 import '@orpc/contract';
 import '@orpc/standard-server';
 import '@orpc/client/standard';
+import '../../shared/server.Bi2_bIHo.js';
 
 interface NodeHttpHandlerPlugin<T extends Context> extends StandardHandlerPlugin<T> {
     initRuntimeAdapter?(options: NodeHttpHandlerOptions<T>): void;

package/dist/adapters/node/index.mjs

@@ -4,11 +4,11 @@ import { toStandardLazyRequest, sendStandardResponse } from '@orpc/standard-serv
 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.Aqc4pYFD.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.DLJzqnSX.mjs';
 
 class BodyLimitPlugin {
   maxBodySize;