@orpc/server 0.0.0-next.ac518b6 → 0.0.0-next.add5acf

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

@@ -1,9 +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.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 { 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 '@orpc/client';
 import '@orpc/contract';
 import '@orpc/standard-server';

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

@@ -1,9 +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.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 { 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 '@orpc/client';
 import '@orpc/contract';
 import '@orpc/standard-server';

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.CB8Snncu.mjs';
+import { b as StandardRPCHandler } from '../../shared/server.CHvOkcM3.mjs';
 import '@orpc/client/standard';
-import '../../shared/server.DLJzqnSX.mjs';
+import '../../shared/server.DG7Tamti.mjs';
 
 class AwsLambdaHandler {
   constructor(standardHandler, options = {}) {

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

@@ -1,23 +1,23 @@
 import { MaybeOptionalOptions } from '@orpc/shared';
-import { C as Context, R as Router } from '../../shared/server.6ohwBdwx.mjs';
-import { a as StandardHandler } from '../../shared/server.BtQsqpPB.mjs';
-import { experimental_HandleStandardServerPeerMessageOptions } from '../standard-peer/index.mjs';
-import { S as StandardRPCHandlerOptions } from '../../shared/server.CKafa5G2.mjs';
+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 '@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 | Uint8Array): number;
+    send(message: string | ArrayBufferLike): number;
 }
 declare class experimental_BunWsHandler<T extends Context> {
     private readonly standardHandler;
     private readonly peers;
     constructor(standardHandler: StandardHandler<T>);
-    message(ws: ServerWebSocket, message: string | ArrayBufferView, ...rest: MaybeOptionalOptions<experimental_HandleStandardServerPeerMessageOptions<T>>): Promise<void>;
+    message(ws: ServerWebSocket, message: string | {
+        buffer: ArrayBufferLike;
+    }, ...rest: MaybeOptionalOptions<Omit<FriendlyStandardHandleOptions<T>, 'prefix'>>): Promise<void>;
     close(ws: ServerWebSocket): void;
 }
 

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

@@ -1,23 +1,23 @@
 import { MaybeOptionalOptions } from '@orpc/shared';
-import { C as Context, R as Router } from '../../shared/server.6ohwBdwx.js';
-import { a as StandardHandler } from '../../shared/server.BE3B4vij.js';
-import { experimental_HandleStandardServerPeerMessageOptions } from '../standard-peer/index.js';
-import { S as StandardRPCHandlerOptions } from '../../shared/server.B6GspgNq.js';
+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 '@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 | Uint8Array): number;
+    send(message: string | ArrayBufferLike): number;
 }
 declare class experimental_BunWsHandler<T extends Context> {
     private readonly standardHandler;
     private readonly peers;
     constructor(standardHandler: StandardHandler<T>);
-    message(ws: ServerWebSocket, message: string | ArrayBufferView, ...rest: MaybeOptionalOptions<experimental_HandleStandardServerPeerMessageOptions<T>>): Promise<void>;
+    message(ws: ServerWebSocket, message: string | {
+        buffer: ArrayBufferLike;
+    }, ...rest: MaybeOptionalOptions<Omit<FriendlyStandardHandleOptions<T>, 'prefix'>>): Promise<void>;
     close(ws: ServerWebSocket): void;
 }
 

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

@@ -1,13 +1,12 @@
 import { resolveMaybeOptionalOptions } from '@orpc/shared';
 import { ServerPeer } from '@orpc/standard-server-peer';
-import { e as experimental_handleStandardServerPeerMessage } from '../../shared/server.DxNFsvpM.mjs';
+import { r as resolveFriendlyStandardHandleOptions } from '../../shared/server.DZ5BIITo.mjs';
 import '@orpc/client';
 import '@orpc/standard-server';
 import '@orpc/contract';
-import { b as StandardRPCHandler } from '../../shared/server.CB8Snncu.mjs';
+import { b as StandardRPCHandler } from '../../shared/server.CHvOkcM3.mjs';
 import '@orpc/client/standard';
-import '../../shared/server.DZ5BIITo.mjs';
-import '../../shared/server.DLJzqnSX.mjs';
+import '../../shared/server.DG7Tamti.mjs';
 
 class experimental_BunWsHandler {
   constructor(standardHandler) {
@@ -21,13 +20,13 @@ class experimental_BunWsHandler {
         ws.send(message2);
       }));
     }
-    const encodedMessage = typeof message === "string" ? message : new Uint8Array(message.buffer, message.byteOffset, message.byteLength);
-    await experimental_handleStandardServerPeerMessage(
-      this.standardHandler,
-      peer,
-      encodedMessage,
-      resolveMaybeOptionalOptions(rest)
-    );
+    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" });
   }
   close(ws) {
     const server = this.peers.get(ws);

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

@@ -1,21 +1,19 @@
 import { MaybeOptionalOptions } from '@orpc/shared';
 import { Peer, Message } from 'crossws';
-import { C as Context, R as Router } from '../../shared/server.6ohwBdwx.mjs';
-import { a as StandardHandler } from '../../shared/server.BtQsqpPB.mjs';
-import { experimental_HandleStandardServerPeerMessageOptions } from '../standard-peer/index.mjs';
-import { S as StandardRPCHandlerOptions } from '../../shared/server.CKafa5G2.mjs';
+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 '@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<experimental_HandleStandardServerPeerMessageOptions<T>>): Promise<void>;
+    message(ws: Pick<Peer, 'send'>, message: Pick<Message, 'rawData' | 'uint8Array'>, ...rest: MaybeOptionalOptions<Omit<FriendlyStandardHandleOptions<T>, 'prefix'>>): Promise<void>;
     close(ws: Pick<Peer, 'send'>): void;
 }
 

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

@@ -1,21 +1,19 @@
 import { MaybeOptionalOptions } from '@orpc/shared';
 import { Peer, Message } from 'crossws';
-import { C as Context, R as Router } from '../../shared/server.6ohwBdwx.js';
-import { a as StandardHandler } from '../../shared/server.BE3B4vij.js';
-import { experimental_HandleStandardServerPeerMessageOptions } from '../standard-peer/index.js';
-import { S as StandardRPCHandlerOptions } from '../../shared/server.B6GspgNq.js';
+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 '@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<experimental_HandleStandardServerPeerMessageOptions<T>>): Promise<void>;
+    message(ws: Pick<Peer, 'send'>, message: Pick<Message, 'rawData' | 'uint8Array'>, ...rest: MaybeOptionalOptions<Omit<FriendlyStandardHandleOptions<T>, 'prefix'>>): Promise<void>;
     close(ws: Pick<Peer, 'send'>): void;
 }
 

package/dist/adapters/crossws/index.mjs

@@ -1,13 +1,12 @@
 import { resolveMaybeOptionalOptions } from '@orpc/shared';
 import { ServerPeer } from '@orpc/standard-server-peer';
-import { e as experimental_handleStandardServerPeerMessage } from '../../shared/server.DxNFsvpM.mjs';
+import { r as resolveFriendlyStandardHandleOptions } from '../../shared/server.DZ5BIITo.mjs';
 import '@orpc/client';
 import '@orpc/standard-server';
 import '@orpc/contract';
-import { b as StandardRPCHandler } from '../../shared/server.CB8Snncu.mjs';
+import { b as StandardRPCHandler } from '../../shared/server.CHvOkcM3.mjs';
 import '@orpc/client/standard';
-import '../../shared/server.DZ5BIITo.mjs';
-import '../../shared/server.DLJzqnSX.mjs';
+import '../../shared/server.DG7Tamti.mjs';
 
 class experimental_CrosswsHandler {
   constructor(standardHandler) {
@@ -21,13 +20,13 @@ class experimental_CrosswsHandler {
         ws.send(message2);
       }));
     }
-    const encodedMessage = typeof message.rawData === "string" ? message.rawData : message.uint8Array();
-    await experimental_handleStandardServerPeerMessage(
-      this.standardHandler,
-      peer,
-      encodedMessage,
-      resolveMaybeOptionalOptions(rest)
-    );
+    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" });
   }
   close(ws) {
     const server = this.peers.get(ws);

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

@@ -1,9 +1,9 @@
-import { C as Context, R as Router } from '../../shared/server.6ohwBdwx.mjs';
+import { C as Context, R as Router } from '../../shared/server.DD2C4ujN.mjs';
 import { Interceptor, MaybeOptionalOptions } from '@orpc/shared';
 import { ToFetchResponseOptions } from '@orpc/standard-server-fetch';
-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 { 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 '@orpc/client';
 import '@orpc/contract';
 import '@orpc/standard-server';

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

@@ -1,9 +1,9 @@
-import { C as Context, R as Router } from '../../shared/server.6ohwBdwx.js';
+import { C as Context, R as Router } from '../../shared/server.DD2C4ujN.js';
 import { Interceptor, MaybeOptionalOptions } from '@orpc/shared';
 import { ToFetchResponseOptions } from '@orpc/standard-server-fetch';
-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 { 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 '@orpc/client';
 import '@orpc/contract';
 import '@orpc/standard-server';

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.CB8Snncu.mjs';
+import { C as CompositeStandardHandlerPlugin, b as StandardRPCHandler } from '../../shared/server.CHvOkcM3.mjs';
 import '@orpc/client/standard';
 import '@orpc/standard-server/batch';
 import { S as StrictGetMethodPlugin } from '../../shared/server.BW-nUGgA.mjs';
-import '../../shared/server.DLJzqnSX.mjs';
+import '../../shared/server.DG7Tamti.mjs';
 
 class BodyLimitPlugin {
   maxBodySize;

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

@@ -1,20 +1,18 @@
 import { SupportedMessagePort } from '@orpc/client/message-port';
 import { MaybeOptionalOptions } from '@orpc/shared';
-import { C as Context, R as Router } from '../../shared/server.6ohwBdwx.mjs';
-import { a as StandardHandler } from '../../shared/server.BtQsqpPB.mjs';
-import { experimental_HandleStandardServerPeerMessageOptions } from '../standard-peer/index.mjs';
-import { S as StandardRPCHandlerOptions } from '../../shared/server.CKafa5G2.mjs';
+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 '@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> {
     private readonly standardHandler;
     constructor(standardHandler: StandardHandler<T>);
-    upgrade(port: SupportedMessagePort, ...rest: MaybeOptionalOptions<experimental_HandleStandardServerPeerMessageOptions<T>>): void;
+    upgrade(port: SupportedMessagePort, ...rest: MaybeOptionalOptions<Omit<FriendlyStandardHandleOptions<T>, 'prefix'>>): void;
 }
 
 /**

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

@@ -1,20 +1,18 @@
 import { SupportedMessagePort } from '@orpc/client/message-port';
 import { MaybeOptionalOptions } from '@orpc/shared';
-import { C as Context, R as Router } from '../../shared/server.6ohwBdwx.js';
-import { a as StandardHandler } from '../../shared/server.BE3B4vij.js';
-import { experimental_HandleStandardServerPeerMessageOptions } from '../standard-peer/index.js';
-import { S as StandardRPCHandlerOptions } from '../../shared/server.B6GspgNq.js';
+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 '@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> {
     private readonly standardHandler;
     constructor(standardHandler: StandardHandler<T>);
-    upgrade(port: SupportedMessagePort, ...rest: MaybeOptionalOptions<experimental_HandleStandardServerPeerMessageOptions<T>>): void;
+    upgrade(port: SupportedMessagePort, ...rest: MaybeOptionalOptions<Omit<FriendlyStandardHandleOptions<T>, 'prefix'>>): void;
 }
 
 /**

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

@@ -1,14 +1,13 @@
 import { postMessagePortMessage, onMessagePortMessage, onMessagePortClose } from '@orpc/client/message-port';
 import { resolveMaybeOptionalOptions } from '@orpc/shared';
 import { ServerPeer } from '@orpc/standard-server-peer';
-import { e as experimental_handleStandardServerPeerMessage } from '../../shared/server.DxNFsvpM.mjs';
+import { r as resolveFriendlyStandardHandleOptions } from '../../shared/server.DZ5BIITo.mjs';
 import '@orpc/client';
 import '@orpc/standard-server';
 import '@orpc/contract';
-import { b as StandardRPCHandler } from '../../shared/server.CB8Snncu.mjs';
+import { b as StandardRPCHandler } from '../../shared/server.CHvOkcM3.mjs';
 import '@orpc/client/standard';
-import '../../shared/server.DZ5BIITo.mjs';
-import '../../shared/server.DLJzqnSX.mjs';
+import '../../shared/server.DG7Tamti.mjs';
 
 class experimental_MessagePortHandler {
   constructor(standardHandler) {
@@ -19,12 +18,13 @@ class experimental_MessagePortHandler {
       return postMessagePortMessage(port, message);
     });
     onMessagePortMessage(port, async (message) => {
-      await experimental_handleStandardServerPeerMessage(
-        this.standardHandler,
-        peer,
-        message,
-        resolveMaybeOptionalOptions(rest)
-      );
+      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" });
     });
     onMessagePortClose(port, () => {
       peer.close();

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

@@ -1,9 +1,9 @@
-import { C as Context, R as Router } from '../../shared/server.6ohwBdwx.mjs';
+import { C as Context, R as Router } from '../../shared/server.DD2C4ujN.mjs';
 import { Interceptor, MaybeOptionalOptions } from '@orpc/shared';
 import { SendStandardResponseOptions, NodeHttpRequest, NodeHttpResponse } from '@orpc/standard-server-node';
-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 { 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 '@orpc/client';
 import '@orpc/contract';
 import '@orpc/standard-server';

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

@@ -1,9 +1,9 @@
-import { C as Context, R as Router } from '../../shared/server.6ohwBdwx.js';
+import { C as Context, R as Router } from '../../shared/server.DD2C4ujN.js';
 import { Interceptor, MaybeOptionalOptions } from '@orpc/shared';
 import { SendStandardResponseOptions, NodeHttpRequest, NodeHttpResponse } from '@orpc/standard-server-node';
-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 { 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 '@orpc/client';
 import '@orpc/contract';
 import '@orpc/standard-server';

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.CB8Snncu.mjs';
+import { C as CompositeStandardHandlerPlugin, b as StandardRPCHandler } from '../../shared/server.CHvOkcM3.mjs';
 import '@orpc/client/standard';
 import '@orpc/standard-server/batch';
 import { S as StrictGetMethodPlugin } from '../../shared/server.BW-nUGgA.mjs';
-import '../../shared/server.DLJzqnSX.mjs';
+import '../../shared/server.DG7Tamti.mjs';
 
 class BodyLimitPlugin {
   maxBodySize;

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

@@ -1,11 +1,10 @@
-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 { c as StandardCodec, d as StandardParams, e as StandardMatcher, f as StandardMatchResult } from '../../shared/server.Dq8xr7PQ.mjs';
+export { C as CompositeStandardHandlerPlugin, g as StandardHandleOptions, h as StandardHandleResult, i as StandardHandler, S as StandardHandlerInterceptorOptions, b as StandardHandlerOptions, a as StandardHandlerPlugin } from '../../shared/server.Dq8xr7PQ.mjs';
 import { ORPCError, HTTPPath } from '@orpc/client';
 import { StandardRPCSerializer } from '@orpc/client/standard';
 import { StandardLazyRequest, StandardResponse } from '@orpc/standard-server';
-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 { h as AnyProcedure, f as AnyRouter } from '../../shared/server.DD2C4ujN.mjs';
+export { a as StandardRPCHandler, S as StandardRPCHandlerOptions } from '../../shared/server.Bd52nNaH.mjs';
 import '@orpc/contract';
 import '@orpc/shared';
 

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

@@ -1,11 +1,10 @@
-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 { c as StandardCodec, d as StandardParams, e as StandardMatcher, f as StandardMatchResult } from '../../shared/server.-ACo36I0.js';
+export { C as CompositeStandardHandlerPlugin, g as StandardHandleOptions, h as StandardHandleResult, i as StandardHandler, S as StandardHandlerInterceptorOptions, b as StandardHandlerOptions, a as StandardHandlerPlugin } from '../../shared/server.-ACo36I0.js';
 import { ORPCError, HTTPPath } from '@orpc/client';
 import { StandardRPCSerializer } from '@orpc/client/standard';
 import { StandardLazyRequest, StandardResponse } from '@orpc/standard-server';
-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 { h as AnyProcedure, f as AnyRouter } from '../../shared/server.DD2C4ujN.js';
+export { a as StandardRPCHandler, S as StandardRPCHandlerOptions } from '../../shared/server.BPAWobQg.js';
 import '@orpc/contract';
 import '@orpc/shared';
 

package/dist/adapters/standard/index.mjs

@@ -1,8 +1,7 @@
-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';
+export { C as CompositeStandardHandlerPlugin, S as StandardHandler, a as StandardRPCCodec, b as StandardRPCHandler, c as StandardRPCMatcher } from '../../shared/server.CHvOkcM3.mjs';
 import '@orpc/client/standard';
 import '@orpc/client';
 import '@orpc/shared';
 import '@orpc/standard-server';
-import '../../shared/server.DLJzqnSX.mjs';
+import '../../shared/server.DG7Tamti.mjs';
 import '@orpc/contract';

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

@@ -1,13 +1,11 @@
 import { MaybeOptionalOptions } from '@orpc/shared';
-import { C as Context, R as Router } from '../../shared/server.6ohwBdwx.mjs';
-import { a as StandardHandler } from '../../shared/server.BtQsqpPB.mjs';
-import { experimental_HandleStandardServerPeerMessageOptions } from '../standard-peer/index.mjs';
-import { S as StandardRPCHandlerOptions } from '../../shared/server.CKafa5G2.mjs';
+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 '@orpc/client';
 import '@orpc/contract';
 import '@orpc/standard-server';
-import '@orpc/standard-server-peer';
-import '../../shared/server.B3dVpAsJ.mjs';
 import '@orpc/client/standard';
 
 type experimental_MinimalWebsocket = Pick<WebSocket, 'addEventListener' | 'send'>;
@@ -21,7 +19,7 @@ declare class experimental_WebsocketHandler<T extends Context> {
      *
      * @warning Do not use this method if you're using `.message()` or `.close()`
      */
-    upgrade(ws: experimental_MinimalWebsocket, ...rest: MaybeOptionalOptions<experimental_HandleStandardServerPeerMessageOptions<T>>): void;
+    upgrade(ws: experimental_MinimalWebsocket, ...rest: MaybeOptionalOptions<Omit<FriendlyStandardHandleOptions<T>, 'prefix'>>): void;
     /**
      * Handles a single message received from a WebSocket.
      *
@@ -30,7 +28,7 @@ declare class experimental_WebsocketHandler<T extends Context> {
      * @param ws The WebSocket instance
      * @param data The message payload, usually place in `event.data`
      */
-    message(ws: experimental_MinimalWebsocket, data: string | ArrayBuffer | Blob, ...rest: MaybeOptionalOptions<experimental_HandleStandardServerPeerMessageOptions<T>>): Promise<void>;
+    message(ws: experimental_MinimalWebsocket, data: string | ArrayBuffer | Blob, ...rest: MaybeOptionalOptions<Omit<FriendlyStandardHandleOptions<T>, 'prefix'>>): Promise<void>;
     /**
      * Closes the WebSocket peer and cleans up.
      *

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

@@ -1,13 +1,11 @@
 import { MaybeOptionalOptions } from '@orpc/shared';
-import { C as Context, R as Router } from '../../shared/server.6ohwBdwx.js';
-import { a as StandardHandler } from '../../shared/server.BE3B4vij.js';
-import { experimental_HandleStandardServerPeerMessageOptions } from '../standard-peer/index.js';
-import { S as StandardRPCHandlerOptions } from '../../shared/server.B6GspgNq.js';
+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 '@orpc/client';
 import '@orpc/contract';
 import '@orpc/standard-server';
-import '@orpc/standard-server-peer';
-import '../../shared/server.CeW2jMCj.js';
 import '@orpc/client/standard';
 
 type experimental_MinimalWebsocket = Pick<WebSocket, 'addEventListener' | 'send'>;
@@ -21,7 +19,7 @@ declare class experimental_WebsocketHandler<T extends Context> {
      *
      * @warning Do not use this method if you're using `.message()` or `.close()`
      */
-    upgrade(ws: experimental_MinimalWebsocket, ...rest: MaybeOptionalOptions<experimental_HandleStandardServerPeerMessageOptions<T>>): void;
+    upgrade(ws: experimental_MinimalWebsocket, ...rest: MaybeOptionalOptions<Omit<FriendlyStandardHandleOptions<T>, 'prefix'>>): void;
     /**
      * Handles a single message received from a WebSocket.
      *
@@ -30,7 +28,7 @@ declare class experimental_WebsocketHandler<T extends Context> {
      * @param ws The WebSocket instance
      * @param data The message payload, usually place in `event.data`
      */
-    message(ws: experimental_MinimalWebsocket, data: string | ArrayBuffer | Blob, ...rest: MaybeOptionalOptions<experimental_HandleStandardServerPeerMessageOptions<T>>): Promise<void>;
+    message(ws: experimental_MinimalWebsocket, data: string | ArrayBuffer | Blob, ...rest: MaybeOptionalOptions<Omit<FriendlyStandardHandleOptions<T>, 'prefix'>>): Promise<void>;
     /**
      * Closes the WebSocket peer and cleans up.
      *

package/dist/adapters/websocket/index.mjs

@@ -1,13 +1,12 @@
-import { readAsBuffer, resolveMaybeOptionalOptions } from '@orpc/shared';
+import { resolveMaybeOptionalOptions } from '@orpc/shared';
 import { ServerPeer } from '@orpc/standard-server-peer';
-import { e as experimental_handleStandardServerPeerMessage } from '../../shared/server.DxNFsvpM.mjs';
+import { r as resolveFriendlyStandardHandleOptions } from '../../shared/server.DZ5BIITo.mjs';
 import '@orpc/client';
 import '@orpc/standard-server';
 import '@orpc/contract';
-import { b as StandardRPCHandler } from '../../shared/server.CB8Snncu.mjs';
+import { b as StandardRPCHandler } from '../../shared/server.CHvOkcM3.mjs';
 import '@orpc/client/standard';
-import '../../shared/server.DZ5BIITo.mjs';
-import '../../shared/server.DLJzqnSX.mjs';
+import '../../shared/server.DG7Tamti.mjs';
 
 class experimental_WebsocketHandler {
   #peers = /* @__PURE__ */ new WeakMap();
@@ -39,13 +38,14 @@ class experimental_WebsocketHandler {
     if (!peer) {
       this.#peers.set(ws, peer = new ServerPeer(ws.send.bind(ws)));
     }
-    const message = data instanceof Blob ? await readAsBuffer(data) : data;
-    await experimental_handleStandardServerPeerMessage(
-      this.#handler,
-      peer,
-      message,
-      resolveMaybeOptionalOptions(rest)
-    );
+    const message = data instanceof Blob ? await data.arrayBuffer() : data;
+    const [id, request] = await peer.message(message);
+    if (!request) {
+      return;
+    }
+    const options = resolveFriendlyStandardHandleOptions(resolveMaybeOptionalOptions(rest));
+    const { response } = await this.#handler.handle({ ...request, body: () => Promise.resolve(request.body) }, options);
+    await peer.response(id, response ?? { status: 404, headers: {}, body: "No procedure matched" });
   }
   /**
    * Closes the WebSocket peer and cleans up.