@orpc/server 1.6.8 → 1.7.1

package/README.md

@@ -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,8 +1,9 @@
 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, S as StandardRPCHandlerOptions } from '../../shared/server.D2T2AlNJ.mjs';
+import { C as Context, R as Router } from '../../shared/server.6ohwBdwx.mjs';
+import { a as StandardHandler } from '../../shared/server.BtQsqpPB.mjs';
+import { F as FriendlyStandardHandleOptions } from '../../shared/server.B3dVpAsJ.mjs';
+import { S as StandardRPCHandlerOptions } from '../../shared/server.CKafa5G2.mjs';
 import '@orpc/client';
 import '@orpc/contract';
 import '@orpc/standard-server';
@@ -36,9 +37,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,8 +1,9 @@
 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, S as StandardRPCHandlerOptions } from '../../shared/server.CLcOiNNH.js';
+import { C as Context, R as Router } from '../../shared/server.6ohwBdwx.js';
+import { a as StandardHandler } from '../../shared/server.BE3B4vij.js';
+import { F as FriendlyStandardHandleOptions } from '../../shared/server.CeW2jMCj.js';
+import { S as StandardRPCHandlerOptions } from '../../shared/server.B6GspgNq.js';
 import '@orpc/client';
 import '@orpc/contract';
 import '@orpc/standard-server';
@@ -36,9 +37,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

@@ -1,11 +1,12 @@
 import { resolveMaybeOptionalOptions } from '@orpc/shared';
 import { toStandardLazyRequest, sendStandardResponse } from '@orpc/standard-server-aws-lambda';
-import { r as resolveFriendlyStandardHandleOptions, b as StandardRPCHandler } from '../../shared/server.CQ4gr8z6.mjs';
+import { r as resolveFriendlyStandardHandleOptions } from '../../shared/server.DZ5BIITo.mjs';
 import '@orpc/standard-server';
 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.CB8Snncu.mjs';
 import '@orpc/client/standard';
 import '../../shared/server.DLJzqnSX.mjs';
 
@@ -27,7 +28,7 @@ class AwsLambdaHandler {
   }
 }
 
-class experimental_RPCHandler extends AwsLambdaHandler {
+class RPCHandler extends AwsLambdaHandler {
   constructor(router, options = {}) {
     if (options.strictGetMethodPluginEnabled ?? true) {
       options.plugins ??= [];
@@ -37,4 +38,4 @@ class experimental_RPCHandler extends AwsLambdaHandler {
   }
 }
 
-export { AwsLambdaHandler, experimental_RPCHandler };
+export { AwsLambdaHandler, RPCHandler };

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

@@ -1,22 +1,23 @@
 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, S as StandardRPCHandlerOptions } from '../../shared/server.D2T2AlNJ.mjs';
+import { C as Context, R as Router } from '../../shared/server.6ohwBdwx.mjs';
+import { a as StandardHandler } from '../../shared/server.BtQsqpPB.mjs';
+import { HandleStandardServerPeerMessageOptions } from '../standard-peer/index.mjs';
+import { S as StandardRPCHandlerOptions } from '../../shared/server.CKafa5G2.mjs';
 import '@orpc/client';
 import '@orpc/contract';
 import '@orpc/standard-server';
+import '@orpc/standard-server-peer';
+import '../../shared/server.B3dVpAsJ.mjs';
 import '@orpc/client/standard';
 
 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;
 }
 
@@ -26,9 +27,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,22 +1,23 @@
 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, S as StandardRPCHandlerOptions } from '../../shared/server.CLcOiNNH.js';
+import { C as Context, R as Router } from '../../shared/server.6ohwBdwx.js';
+import { a as StandardHandler } from '../../shared/server.BE3B4vij.js';
+import { HandleStandardServerPeerMessageOptions } from '../standard-peer/index.js';
+import { S as StandardRPCHandlerOptions } from '../../shared/server.B6GspgNq.js';
 import '@orpc/client';
 import '@orpc/contract';
 import '@orpc/standard-server';
+import '@orpc/standard-server-peer';
+import '../../shared/server.CeW2jMCj.js';
 import '@orpc/client/standard';
 
 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;
 }
 
@@ -26,9 +27,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,13 +1,15 @@
 import { resolveMaybeOptionalOptions } from '@orpc/shared';
 import { ServerPeer } from '@orpc/standard-server-peer';
-import { r as resolveFriendlyStandardHandleOptions, b as StandardRPCHandler } from '../../shared/server.CQ4gr8z6.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.CB8Snncu.mjs';
 import '@orpc/client/standard';
+import '../../shared/server.DZ5BIITo.mjs';
 import '../../shared/server.DLJzqnSX.mjs';
 
-class experimental_BunWsHandler {
+class BunWsHandler {
   constructor(standardHandler) {
     this.standardHandler = standardHandler;
   }
@@ -19,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);
@@ -36,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,18 +1,21 @@
 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, S as StandardRPCHandlerOptions } from '../../shared/server.D2T2AlNJ.mjs';
+import { C as Context, R as Router } from '../../shared/server.6ohwBdwx.mjs';
+import { a as StandardHandler } from '../../shared/server.BtQsqpPB.mjs';
+import { HandleStandardServerPeerMessageOptions } from '../standard-peer/index.mjs';
+import { S as StandardRPCHandlerOptions } from '../../shared/server.CKafa5G2.mjs';
 import '@orpc/client';
 import '@orpc/contract';
 import '@orpc/standard-server';
+import '@orpc/standard-server-peer';
+import '../../shared/server.B3dVpAsJ.mjs';
 import '@orpc/client/standard';
 
 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,18 +1,21 @@
 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, S as StandardRPCHandlerOptions } from '../../shared/server.CLcOiNNH.js';
+import { C as Context, R as Router } from '../../shared/server.6ohwBdwx.js';
+import { a as StandardHandler } from '../../shared/server.BE3B4vij.js';
+import { HandleStandardServerPeerMessageOptions } from '../standard-peer/index.js';
+import { S as StandardRPCHandlerOptions } from '../../shared/server.B6GspgNq.js';
 import '@orpc/client';
 import '@orpc/contract';
 import '@orpc/standard-server';
+import '@orpc/standard-server-peer';
+import '../../shared/server.CeW2jMCj.js';
 import '@orpc/client/standard';
 
 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,10 +1,12 @@
 import { resolveMaybeOptionalOptions } from '@orpc/shared';
 import { ServerPeer } from '@orpc/standard-server-peer';
-import { r as resolveFriendlyStandardHandleOptions, b as StandardRPCHandler } from '../../shared/server.CQ4gr8z6.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.CB8Snncu.mjs';
 import '@orpc/client/standard';
+import '../../shared/server.DZ5BIITo.mjs';
 import '../../shared/server.DLJzqnSX.mjs';
 
 class experimental_CrosswsHandler {
@@ -19,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,8 +1,9 @@
-import { C as Context, R as Router } from '../../shared/server.DD2C4ujN.mjs';
+import { C as Context, R as Router } from '../../shared/server.6ohwBdwx.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, S as StandardRPCHandlerOptions } from '../../shared/server.D2T2AlNJ.mjs';
+import { c as StandardHandlerPlugin, C as CompositeStandardHandlerPlugin, b as StandardHandleOptions, a as StandardHandler } from '../../shared/server.BtQsqpPB.mjs';
+import { F as FriendlyStandardHandleOptions } from '../../shared/server.B3dVpAsJ.mjs';
+import { S as StandardRPCHandlerOptions } from '../../shared/server.CKafa5G2.mjs';
 import '@orpc/client';
 import '@orpc/contract';
 import '@orpc/standard-server';

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

@@ -1,8 +1,9 @@
-import { C as Context, R as Router } from '../../shared/server.DD2C4ujN.js';
+import { C as Context, R as Router } from '../../shared/server.6ohwBdwx.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, S as StandardRPCHandlerOptions } from '../../shared/server.CLcOiNNH.js';
+import { c as StandardHandlerPlugin, C as CompositeStandardHandlerPlugin, b as StandardHandleOptions, a as StandardHandler } from '../../shared/server.BE3B4vij.js';
+import { F as FriendlyStandardHandleOptions } from '../../shared/server.CeW2jMCj.js';
+import { S as StandardRPCHandlerOptions } from '../../shared/server.B6GspgNq.js';
 import '@orpc/client';
 import '@orpc/contract';
 import '@orpc/standard-server';

package/dist/adapters/fetch/index.mjs

@@ -1,9 +1,10 @@
 import { ORPCError } from '@orpc/client';
 import { toArray, intercept, resolveMaybeOptionalOptions } from '@orpc/shared';
 import { toStandardLazyRequest, toFetchResponse } from '@orpc/standard-server-fetch';
-import { C as CompositeStandardHandlerPlugin, r as resolveFriendlyStandardHandleOptions, b as StandardRPCHandler } from '../../shared/server.CQ4gr8z6.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.CB8Snncu.mjs';
 import '@orpc/client/standard';
 import '@orpc/standard-server/batch';
 import { S as StrictGetMethodPlugin } from '../../shared/server.BW-nUGgA.mjs';

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

@@ -1,17 +1,20 @@
 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, S as StandardRPCHandlerOptions } from '../../shared/server.D2T2AlNJ.mjs';
+import { C as Context, R as Router } from '../../shared/server.6ohwBdwx.mjs';
+import { a as StandardHandler } from '../../shared/server.BtQsqpPB.mjs';
+import { HandleStandardServerPeerMessageOptions } from '../standard-peer/index.mjs';
+import { S as StandardRPCHandlerOptions } from '../../shared/server.CKafa5G2.mjs';
 import '@orpc/client';
 import '@orpc/contract';
 import '@orpc/standard-server';
+import '@orpc/standard-server-peer';
+import '../../shared/server.B3dVpAsJ.mjs';
 import '@orpc/client/standard';
 
-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;
 }
 
 /**
@@ -20,8 +23,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,17 +1,20 @@
 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, S as StandardRPCHandlerOptions } from '../../shared/server.CLcOiNNH.js';
+import { C as Context, R as Router } from '../../shared/server.6ohwBdwx.js';
+import { a as StandardHandler } from '../../shared/server.BE3B4vij.js';
+import { HandleStandardServerPeerMessageOptions } from '../standard-peer/index.js';
+import { S as StandardRPCHandlerOptions } from '../../shared/server.B6GspgNq.js';
 import '@orpc/client';
 import '@orpc/contract';
 import '@orpc/standard-server';
+import '@orpc/standard-server-peer';
+import '../../shared/server.CeW2jMCj.js';
 import '@orpc/client/standard';
 
-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;
 }
 
 /**
@@ -20,8 +23,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,14 +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, b as StandardRPCHandler } from '../../shared/server.CQ4gr8z6.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.CB8Snncu.mjs';
 import '@orpc/client/standard';
+import '../../shared/server.DZ5BIITo.mjs';
 import '../../shared/server.DLJzqnSX.mjs';
 
-class experimental_MessagePortHandler {
+class MessagePortHandler {
   constructor(standardHandler) {
     this.standardHandler = standardHandler;
   }
@@ -17,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();
@@ -31,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,8 +1,9 @@
-import { C as Context, R as Router } from '../../shared/server.DD2C4ujN.mjs';
+import { C as Context, R as Router } from '../../shared/server.6ohwBdwx.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, S as StandardRPCHandlerOptions } from '../../shared/server.D2T2AlNJ.mjs';
+import { c as StandardHandlerPlugin, C as CompositeStandardHandlerPlugin, b as StandardHandleOptions, a as StandardHandler } from '../../shared/server.BtQsqpPB.mjs';
+import { F as FriendlyStandardHandleOptions } from '../../shared/server.B3dVpAsJ.mjs';
+import { S as StandardRPCHandlerOptions } from '../../shared/server.CKafa5G2.mjs';
 import '@orpc/client';
 import '@orpc/contract';
 import '@orpc/standard-server';

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

@@ -1,8 +1,9 @@
-import { C as Context, R as Router } from '../../shared/server.DD2C4ujN.js';
+import { C as Context, R as Router } from '../../shared/server.6ohwBdwx.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, S as StandardRPCHandlerOptions } from '../../shared/server.CLcOiNNH.js';
+import { c as StandardHandlerPlugin, C as CompositeStandardHandlerPlugin, b as StandardHandleOptions, a as StandardHandler } from '../../shared/server.BE3B4vij.js';
+import { F as FriendlyStandardHandleOptions } from '../../shared/server.CeW2jMCj.js';
+import { S as StandardRPCHandlerOptions } from '../../shared/server.B6GspgNq.js';
 import '@orpc/client';
 import '@orpc/contract';
 import '@orpc/standard-server';

package/dist/adapters/node/index.mjs

@@ -1,9 +1,10 @@
 import { ORPCError } from '@orpc/client';
 import { toArray, intercept, resolveMaybeOptionalOptions } from '@orpc/shared';
 import { toStandardLazyRequest, sendStandardResponse } from '@orpc/standard-server-node';
-import { C as CompositeStandardHandlerPlugin, r as resolveFriendlyStandardHandleOptions, b as StandardRPCHandler } from '../../shared/server.CQ4gr8z6.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.CB8Snncu.mjs';
 import '@orpc/client/standard';
 import '@orpc/standard-server/batch';
 import { S as StrictGetMethodPlugin } from '../../shared/server.BW-nUGgA.mjs';

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

@@ -1,10 +1,11 @@
-import { c as StandardCodec, d as StandardParams, e as StandardMatcher, f as StandardMatchResult } from '../../shared/server.Dq8xr7PQ.mjs';
-export { C as CompositeStandardHandlerPlugin, g as StandardHandleOptions, h as StandardHandleResult, i as StandardHandler, S as StandardHandlerInterceptorOptions, b as StandardHandlerOptions, a as StandardHandlerPlugin } from '../../shared/server.Dq8xr7PQ.mjs';
+import { d as StandardCodec, e as StandardParams, f as StandardMatcher, g as StandardMatchResult } from '../../shared/server.BtQsqpPB.mjs';
+export { C as CompositeStandardHandlerPlugin, b as StandardHandleOptions, h as StandardHandleResult, a as StandardHandler, i as StandardHandlerInterceptorOptions, S as StandardHandlerOptions, c as StandardHandlerPlugin } from '../../shared/server.BtQsqpPB.mjs';
 import { ORPCError, HTTPPath } from '@orpc/client';
 import { StandardRPCSerializer } from '@orpc/client/standard';
 import { StandardLazyRequest, StandardResponse } from '@orpc/standard-server';
-import { h as AnyProcedure, f as AnyRouter } from '../../shared/server.DD2C4ujN.mjs';
-export { F as FriendlyStandardHandleOptions, a as StandardRPCHandler, S as StandardRPCHandlerOptions, r as resolveFriendlyStandardHandleOptions } from '../../shared/server.D2T2AlNJ.mjs';
+import { A as AnyProcedure, a as AnyRouter } from '../../shared/server.6ohwBdwx.mjs';
+export { a as StandardRPCHandler, S as StandardRPCHandlerOptions } from '../../shared/server.CKafa5G2.mjs';
+export { F as FriendlyStandardHandleOptions, r as resolveFriendlyStandardHandleOptions } from '../../shared/server.B3dVpAsJ.mjs';
 import '@orpc/contract';
 import '@orpc/shared';
 

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

@@ -1,10 +1,11 @@
-import { c as StandardCodec, d as StandardParams, e as StandardMatcher, f as StandardMatchResult } from '../../shared/server.-ACo36I0.js';
-export { C as CompositeStandardHandlerPlugin, g as StandardHandleOptions, h as StandardHandleResult, i as StandardHandler, S as StandardHandlerInterceptorOptions, b as StandardHandlerOptions, a as StandardHandlerPlugin } from '../../shared/server.-ACo36I0.js';
+import { d as StandardCodec, e as StandardParams, f as StandardMatcher, g as StandardMatchResult } from '../../shared/server.BE3B4vij.js';
+export { C as CompositeStandardHandlerPlugin, b as StandardHandleOptions, h as StandardHandleResult, a as StandardHandler, i as StandardHandlerInterceptorOptions, S as StandardHandlerOptions, c as StandardHandlerPlugin } from '../../shared/server.BE3B4vij.js';
 import { ORPCError, HTTPPath } from '@orpc/client';
 import { StandardRPCSerializer } from '@orpc/client/standard';
 import { StandardLazyRequest, StandardResponse } from '@orpc/standard-server';
-import { h as AnyProcedure, f as AnyRouter } from '../../shared/server.DD2C4ujN.js';
-export { F as FriendlyStandardHandleOptions, a as StandardRPCHandler, S as StandardRPCHandlerOptions, r as resolveFriendlyStandardHandleOptions } from '../../shared/server.CLcOiNNH.js';
+import { A as AnyProcedure, a as AnyRouter } from '../../shared/server.6ohwBdwx.js';
+export { a as StandardRPCHandler, S as StandardRPCHandlerOptions } from '../../shared/server.B6GspgNq.js';
+export { F as FriendlyStandardHandleOptions, r as resolveFriendlyStandardHandleOptions } from '../../shared/server.CeW2jMCj.js';
 import '@orpc/contract';
 import '@orpc/shared';
 

package/dist/adapters/standard/index.mjs

@@ -1,4 +1,5 @@
-export { C as CompositeStandardHandlerPlugin, S as StandardHandler, a as StandardRPCCodec, b as StandardRPCHandler, c as StandardRPCMatcher, r as resolveFriendlyStandardHandleOptions } from '../../shared/server.CQ4gr8z6.mjs';
+export { C as CompositeStandardHandlerPlugin, S as StandardHandler, a as StandardRPCCodec, b as StandardRPCHandler, c as StandardRPCMatcher } from '../../shared/server.CB8Snncu.mjs';
+export { r as resolveFriendlyStandardHandleOptions } from '../../shared/server.DZ5BIITo.mjs';
 import '@orpc/client/standard';
 import '@orpc/client';
 import '@orpc/shared';

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

@@ -0,0 +1,14 @@
+import { ServerPeer, EncodedMessage } from '@orpc/standard-server-peer';
+import { C as Context } from '../../shared/server.6ohwBdwx.mjs';
+import { a as StandardHandler } from '../../shared/server.BtQsqpPB.mjs';
+import { F as FriendlyStandardHandleOptions } from '../../shared/server.B3dVpAsJ.mjs';
+import '@orpc/client';
+import '@orpc/contract';
+import '@orpc/shared';
+import '@orpc/standard-server';
+
+type HandleStandardServerPeerMessageOptions<T extends Context> = Omit<FriendlyStandardHandleOptions<T>, 'prefix'>;
+declare function handleStandardServerPeerMessage<T extends Context>(handler: StandardHandler<T>, peer: ServerPeer, message: EncodedMessage, options: HandleStandardServerPeerMessageOptions<T>): Promise<void>;
+
+export { handleStandardServerPeerMessage };
+export type { HandleStandardServerPeerMessageOptions };

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

@@ -0,0 +1,14 @@
+import { ServerPeer, EncodedMessage } from '@orpc/standard-server-peer';
+import { C as Context } from '../../shared/server.6ohwBdwx.js';
+import { a as StandardHandler } from '../../shared/server.BE3B4vij.js';
+import { F as FriendlyStandardHandleOptions } from '../../shared/server.CeW2jMCj.js';
+import '@orpc/client';
+import '@orpc/contract';
+import '@orpc/shared';
+import '@orpc/standard-server';
+
+type HandleStandardServerPeerMessageOptions<T extends Context> = Omit<FriendlyStandardHandleOptions<T>, 'prefix'>;
+declare function handleStandardServerPeerMessage<T extends Context>(handler: StandardHandler<T>, peer: ServerPeer, message: EncodedMessage, options: HandleStandardServerPeerMessageOptions<T>): Promise<void>;
+
+export { handleStandardServerPeerMessage };
+export type { HandleStandardServerPeerMessageOptions };