@orpc/server 1.1.0 → 1.2.0

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

@@ -0,0 +1,35 @@
+import { MaybeOptionalOptions } from '@orpc/shared';
+import { C as Context, R as Router } from '../../shared/server.DPWk5pjW.mjs';
+import { i as StandardHandler } from '../../shared/server.eWLxY3lq.mjs';
+import { F as FriendlyStandardHandleOptions } from '../../shared/server.QUe9N8P4.mjs';
+import { S as StandardRPCHandlerOptions } from '../../shared/server.BRoxSiSC.mjs';
+import '@orpc/client';
+import '@orpc/contract';
+import '@orpc/standard-server';
+import '@orpc/client/standard';
+
+interface ServerWebSocket {
+    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 | {
+        buffer: ArrayBufferLike;
+    }, ...rest: MaybeOptionalOptions<Omit<FriendlyStandardHandleOptions<T>, 'prefix'>>): Promise<void>;
+    close(ws: ServerWebSocket): void;
+}
+
+/**
+ * RPC Handler for Bun WS adapter
+ *
+ * @see {@link https://orpc.unnoq.com/docs/rpc-handler RPC Handler Docs}
+ * @see {@link https://orpc.unnoq.com/docs/adapters/websocket Websocket Adapter Docs}
+ */
+declare class experimental_RPCHandler<T extends Context> extends experimental_BunWsHandler<T> {
+    constructor(router: Router<any, T>, options?: NoInfer<StandardRPCHandlerOptions<T>>);
+}
+
+export { experimental_BunWsHandler, experimental_RPCHandler };
+export type { ServerWebSocket };

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

@@ -0,0 +1,35 @@
+import { MaybeOptionalOptions } from '@orpc/shared';
+import { C as Context, R as Router } from '../../shared/server.DPWk5pjW.js';
+import { i as StandardHandler } from '../../shared/server.YZzrREz9.js';
+import { F as FriendlyStandardHandleOptions } from '../../shared/server.BjiJH9Vo.js';
+import { S as StandardRPCHandlerOptions } from '../../shared/server.Cy1vfSiG.js';
+import '@orpc/client';
+import '@orpc/contract';
+import '@orpc/standard-server';
+import '@orpc/client/standard';
+
+interface ServerWebSocket {
+    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 | {
+        buffer: ArrayBufferLike;
+    }, ...rest: MaybeOptionalOptions<Omit<FriendlyStandardHandleOptions<T>, 'prefix'>>): Promise<void>;
+    close(ws: ServerWebSocket): void;
+}
+
+/**
+ * RPC Handler for Bun WS adapter
+ *
+ * @see {@link https://orpc.unnoq.com/docs/rpc-handler RPC Handler Docs}
+ * @see {@link https://orpc.unnoq.com/docs/adapters/websocket Websocket Adapter Docs}
+ */
+declare class experimental_RPCHandler<T extends Context> extends experimental_BunWsHandler<T> {
+    constructor(router: Router<any, T>, options?: NoInfer<StandardRPCHandlerOptions<T>>);
+}
+
+export { experimental_BunWsHandler, experimental_RPCHandler };
+export type { ServerWebSocket };

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

@@ -0,0 +1,50 @@
+import { resolveMaybeOptionalOptions } from '@orpc/shared';
+import { ServerPeer } from '@orpc/standard-server-peer';
+import { r as resolveFriendlyStandardHandleOptions } from '../../shared/server.BVwwTHyO.mjs';
+import '@orpc/client';
+import '@orpc/contract';
+import { b as StandardRPCHandler } from '../../shared/server.SxlTJfG2.mjs';
+import '@orpc/client/standard';
+import '../../shared/server.DG7Tamti.mjs';
+
+class experimental_BunWsHandler {
+  constructor(standardHandler) {
+    this.standardHandler = standardHandler;
+  }
+  peers = /* @__PURE__ */ new WeakMap();
+  async message(ws, message, ...rest) {
+    let peer = this.peers.get(ws);
+    if (!peer) {
+      this.peers.set(ws, peer = new ServerPeer(async (raw) => {
+        if (raw instanceof Blob) {
+          const buffer = await raw.arrayBuffer();
+          ws.send(buffer);
+        } else {
+          ws.send(raw);
+        }
+      }));
+    }
+    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);
+    if (server) {
+      server.close();
+      this.peers.delete(ws);
+    }
+  }
+}
+
+class experimental_RPCHandler extends experimental_BunWsHandler {
+  constructor(router, options = {}) {
+    super(new StandardRPCHandler(router, options));
+  }
+}
+
+export { experimental_BunWsHandler, experimental_RPCHandler };

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

@@ -0,0 +1,30 @@
+import { MaybeOptionalOptions } from '@orpc/shared';
+import { Peer, Message } from 'crossws';
+import { C as Context, R as Router } from '../../shared/server.DPWk5pjW.mjs';
+import { i as StandardHandler } from '../../shared/server.eWLxY3lq.mjs';
+import { F as FriendlyStandardHandleOptions } from '../../shared/server.QUe9N8P4.mjs';
+import { S as StandardRPCHandlerOptions } from '../../shared/server.BRoxSiSC.mjs';
+import '@orpc/client';
+import '@orpc/contract';
+import '@orpc/standard-server';
+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>;
+    close(ws: Pick<Peer, 'send'>): void;
+}
+
+/**
+ * RPC Handler for Crossws adapter
+ *
+ * @see {@link https://orpc.unnoq.com/docs/rpc-handler RPC Handler Docs}
+ * @see {@link https://orpc.unnoq.com/docs/adapters/websocket Websocket Adapter Docs}
+ */
+declare class experimental_RPCHandler<T extends Context> extends experimental_CrosswsHandler<T> {
+    constructor(router: Router<any, T>, options?: NoInfer<StandardRPCHandlerOptions<T>>);
+}
+
+export { experimental_CrosswsHandler, experimental_RPCHandler };

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

@@ -0,0 +1,30 @@
+import { MaybeOptionalOptions } from '@orpc/shared';
+import { Peer, Message } from 'crossws';
+import { C as Context, R as Router } from '../../shared/server.DPWk5pjW.js';
+import { i as StandardHandler } from '../../shared/server.YZzrREz9.js';
+import { F as FriendlyStandardHandleOptions } from '../../shared/server.BjiJH9Vo.js';
+import { S as StandardRPCHandlerOptions } from '../../shared/server.Cy1vfSiG.js';
+import '@orpc/client';
+import '@orpc/contract';
+import '@orpc/standard-server';
+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>;
+    close(ws: Pick<Peer, 'send'>): void;
+}
+
+/**
+ * RPC Handler for Crossws adapter
+ *
+ * @see {@link https://orpc.unnoq.com/docs/rpc-handler RPC Handler Docs}
+ * @see {@link https://orpc.unnoq.com/docs/adapters/websocket Websocket Adapter Docs}
+ */
+declare class experimental_RPCHandler<T extends Context> extends experimental_CrosswsHandler<T> {
+    constructor(router: Router<any, T>, options?: NoInfer<StandardRPCHandlerOptions<T>>);
+}
+
+export { experimental_CrosswsHandler, experimental_RPCHandler };

package/dist/adapters/crossws/index.mjs

@@ -0,0 +1,50 @@
+import { resolveMaybeOptionalOptions } from '@orpc/shared';
+import { ServerPeer } from '@orpc/standard-server-peer';
+import { r as resolveFriendlyStandardHandleOptions } from '../../shared/server.BVwwTHyO.mjs';
+import '@orpc/client';
+import '@orpc/contract';
+import { b as StandardRPCHandler } from '../../shared/server.SxlTJfG2.mjs';
+import '@orpc/client/standard';
+import '../../shared/server.DG7Tamti.mjs';
+
+class experimental_CrosswsHandler {
+  constructor(standardHandler) {
+    this.standardHandler = standardHandler;
+  }
+  peers = /* @__PURE__ */ new WeakMap();
+  async message(ws, message, ...rest) {
+    let peer = this.peers.get(ws);
+    if (!peer) {
+      this.peers.set(ws, peer = new ServerPeer(async (raw) => {
+        if (raw instanceof Blob) {
+          const buffer = await raw.arrayBuffer();
+          ws.send(buffer);
+        } else {
+          ws.send(raw);
+        }
+      }));
+    }
+    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);
+    if (server) {
+      server.close();
+      this.peers.delete(ws);
+    }
+  }
+}
+
+class experimental_RPCHandler extends experimental_CrosswsHandler {
+  constructor(router, options = {}) {
+    super(new StandardRPCHandler(router, options));
+  }
+}
+
+export { experimental_CrosswsHandler, experimental_RPCHandler };

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

@@ -3,7 +3,7 @@ import { Interceptor, ThrowableError, 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.eWLxY3lq.mjs';
 import { F as FriendlyStandardHandleOptions } from '../../shared/server.QUe9N8P4.mjs';
-import { S as StandardRPCHandlerOptions } from '../../shared/server.CzSMXd8y.mjs';
+import { S as StandardRPCHandlerOptions } from '../../shared/server.BRoxSiSC.mjs';
 import '@orpc/client';
 import '@orpc/contract';
 import '@orpc/standard-server';
@@ -56,15 +56,23 @@ declare class BodyLimitPlugin<T extends Context> implements FetchHandlerPlugin<T
     initRuntimeAdapter(options: FetchHandlerOptions<T>): void;
 }
 
+type RPCHandlerOptions<T extends Context> = FetchHandlerOptions<T> & StandardRPCHandlerOptions<T> & {
+    /**
+     * Enables or disables the StrictGetMethodPlugin.
+     *
+     * @default true
+     */
+    strictGetMethodPluginEnabled?: boolean;
+};
 /**
  * RPC Handler for Fetch Server
  *
  * @see {@link https://orpc.unnoq.com/docs/rpc-handler RPC Handler Docs}
- * @see {@link https://orpc.unnoq.com/docs/integrations/fetch-server Fetch Server Integration Docs}
+ * @see {@link https://orpc.unnoq.com/docs/adapters/http HTTP Adapter Docs}
  */
 declare class RPCHandler<T extends Context> extends FetchHandler<T> {
-    constructor(router: Router<any, T>, options?: NoInfer<FetchHandlerOptions<T> & StandardRPCHandlerOptions<T>>);
+    constructor(router: Router<any, T>, options?: NoInfer<RPCHandlerOptions<T>>);
 }
 
 export { BodyLimitPlugin, CompositeFetchHandlerPlugin, FetchHandler, RPCHandler };
-export type { BodyLimitPluginOptions, FetchHandleResult, FetchHandlerInterceptorOptions, FetchHandlerOptions, FetchHandlerPlugin };
+export type { BodyLimitPluginOptions, FetchHandleResult, FetchHandlerInterceptorOptions, FetchHandlerOptions, FetchHandlerPlugin, RPCHandlerOptions };

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

@@ -3,7 +3,7 @@ import { Interceptor, ThrowableError, 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.YZzrREz9.js';
 import { F as FriendlyStandardHandleOptions } from '../../shared/server.BjiJH9Vo.js';
-import { S as StandardRPCHandlerOptions } from '../../shared/server.DEgjJVit.js';
+import { S as StandardRPCHandlerOptions } from '../../shared/server.Cy1vfSiG.js';
 import '@orpc/client';
 import '@orpc/contract';
 import '@orpc/standard-server';
@@ -56,15 +56,23 @@ declare class BodyLimitPlugin<T extends Context> implements FetchHandlerPlugin<T
     initRuntimeAdapter(options: FetchHandlerOptions<T>): void;
 }
 
+type RPCHandlerOptions<T extends Context> = FetchHandlerOptions<T> & StandardRPCHandlerOptions<T> & {
+    /**
+     * Enables or disables the StrictGetMethodPlugin.
+     *
+     * @default true
+     */
+    strictGetMethodPluginEnabled?: boolean;
+};
 /**
  * RPC Handler for Fetch Server
  *
  * @see {@link https://orpc.unnoq.com/docs/rpc-handler RPC Handler Docs}
- * @see {@link https://orpc.unnoq.com/docs/integrations/fetch-server Fetch Server Integration Docs}
+ * @see {@link https://orpc.unnoq.com/docs/adapters/http HTTP Adapter Docs}
  */
 declare class RPCHandler<T extends Context> extends FetchHandler<T> {
-    constructor(router: Router<any, T>, options?: NoInfer<FetchHandlerOptions<T> & StandardRPCHandlerOptions<T>>);
+    constructor(router: Router<any, T>, options?: NoInfer<RPCHandlerOptions<T>>);
 }
 
 export { BodyLimitPlugin, CompositeFetchHandlerPlugin, FetchHandler, RPCHandler };
-export type { BodyLimitPluginOptions, FetchHandleResult, FetchHandlerInterceptorOptions, FetchHandlerOptions, FetchHandlerPlugin };
+export type { BodyLimitPluginOptions, FetchHandleResult, FetchHandlerInterceptorOptions, FetchHandlerOptions, FetchHandlerPlugin, RPCHandlerOptions };

package/dist/adapters/fetch/index.mjs

@@ -3,10 +3,11 @@ import { toArray, intercept, resolveMaybeOptionalOptions } from '@orpc/shared';
 import { toStandardLazyRequest, toFetchResponse } from '@orpc/standard-server-fetch';
 import { r as resolveFriendlyStandardHandleOptions } from '../../shared/server.BVwwTHyO.mjs';
 import '@orpc/contract';
-import { C as CompositeStandardHandlerPlugin, b as StandardRPCHandler } from '../../shared/server.BM1HMJGg.mjs';
+import { C as CompositeStandardHandlerPlugin, b as StandardRPCHandler } from '../../shared/server.SxlTJfG2.mjs';
 import '@orpc/client/standard';
 import '@orpc/standard-server/batch';
-import '../../shared/server.BW-nUGgA.mjs';
+import '@orpc/standard-server';
+import { S as StrictGetMethodPlugin } from '../../shared/server.BW-nUGgA.mjs';
 import '../../shared/server.DG7Tamti.mjs';
 
 class BodyLimitPlugin {
@@ -98,6 +99,10 @@ class FetchHandler {
 
 class RPCHandler extends FetchHandler {
   constructor(router, options = {}) {
+    if (options.strictGetMethodPluginEnabled ?? true) {
+      options.plugins ??= [];
+      options.plugins.push(new StrictGetMethodPlugin());
+    }
     super(new StandardRPCHandler(router, options), options);
   }
 }

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

@@ -3,7 +3,7 @@ import { Interceptor, ThrowableError, 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.eWLxY3lq.mjs';
 import { F as FriendlyStandardHandleOptions } from '../../shared/server.QUe9N8P4.mjs';
-import { S as StandardRPCHandlerOptions } from '../../shared/server.CzSMXd8y.mjs';
+import { S as StandardRPCHandlerOptions } from '../../shared/server.BRoxSiSC.mjs';
 import '@orpc/client';
 import '@orpc/contract';
 import '@orpc/standard-server';
@@ -55,15 +55,23 @@ declare class BodyLimitPlugin<T extends Context> implements NodeHttpHandlerPlugi
     initRuntimeAdapter(options: NodeHttpHandlerOptions<T>): void;
 }
 
+type RPCHandlerOptions<T extends Context> = NodeHttpHandlerOptions<T> & StandardRPCHandlerOptions<T> & {
+    /**
+     * Enables or disables the StrictGetMethodPlugin.
+     *
+     * @default true
+     */
+    strictGetMethodPluginEnabled?: boolean;
+};
 /**
  * RPC Handler for Node.js HTTP Server
  *
  * @see {@link https://orpc.unnoq.com/docs/rpc-handler RPC Handler Docs}
- * @see {@link https://orpc.unnoq.com/docs/integrations/node Node Integration Docs}
+ * @see {@link https://orpc.unnoq.com/docs/adapters/http HTTP Adapter Docs}
  */
 declare class RPCHandler<T extends Context> extends NodeHttpHandler<T> {
-    constructor(router: Router<any, T>, options?: NoInfer<StandardRPCHandlerOptions<T> & NodeHttpHandlerOptions<T>>);
+    constructor(router: Router<any, T>, options?: NoInfer<RPCHandlerOptions<T>>);
 }
 
 export { BodyLimitPlugin, CompositeNodeHttpHandlerPlugin, NodeHttpHandler, RPCHandler };
-export type { BodyLimitPluginOptions, NodeHttpHandleResult, NodeHttpHandlerInterceptorOptions, NodeHttpHandlerOptions, NodeHttpHandlerPlugin };
+export type { BodyLimitPluginOptions, NodeHttpHandleResult, NodeHttpHandlerInterceptorOptions, NodeHttpHandlerOptions, NodeHttpHandlerPlugin, RPCHandlerOptions };

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

@@ -3,7 +3,7 @@ import { Interceptor, ThrowableError, MaybeOptionalOptions } from '@orpc/shared'
 import { SendStandardResponseOptions, NodeHttpRequest, NodeHttpResponse } from '@orpc/standard-server-node';
 import { a as StandardHandlerPlugin, C as CompositeStandardHandlerPlugin, g as StandardHandleOptions, i as StandardHandler } from '../../shared/server.YZzrREz9.js';
 import { F as FriendlyStandardHandleOptions } from '../../shared/server.BjiJH9Vo.js';
-import { S as StandardRPCHandlerOptions } from '../../shared/server.DEgjJVit.js';
+import { S as StandardRPCHandlerOptions } from '../../shared/server.Cy1vfSiG.js';
 import '@orpc/client';
 import '@orpc/contract';
 import '@orpc/standard-server';
@@ -55,15 +55,23 @@ declare class BodyLimitPlugin<T extends Context> implements NodeHttpHandlerPlugi
     initRuntimeAdapter(options: NodeHttpHandlerOptions<T>): void;
 }
 
+type RPCHandlerOptions<T extends Context> = NodeHttpHandlerOptions<T> & StandardRPCHandlerOptions<T> & {
+    /**
+     * Enables or disables the StrictGetMethodPlugin.
+     *
+     * @default true
+     */
+    strictGetMethodPluginEnabled?: boolean;
+};
 /**
  * RPC Handler for Node.js HTTP Server
  *
  * @see {@link https://orpc.unnoq.com/docs/rpc-handler RPC Handler Docs}
- * @see {@link https://orpc.unnoq.com/docs/integrations/node Node Integration Docs}
+ * @see {@link https://orpc.unnoq.com/docs/adapters/http HTTP Adapter Docs}
  */
 declare class RPCHandler<T extends Context> extends NodeHttpHandler<T> {
-    constructor(router: Router<any, T>, options?: NoInfer<StandardRPCHandlerOptions<T> & NodeHttpHandlerOptions<T>>);
+    constructor(router: Router<any, T>, options?: NoInfer<RPCHandlerOptions<T>>);
 }
 
 export { BodyLimitPlugin, CompositeNodeHttpHandlerPlugin, NodeHttpHandler, RPCHandler };
-export type { BodyLimitPluginOptions, NodeHttpHandleResult, NodeHttpHandlerInterceptorOptions, NodeHttpHandlerOptions, NodeHttpHandlerPlugin };
+export type { BodyLimitPluginOptions, NodeHttpHandleResult, NodeHttpHandlerInterceptorOptions, NodeHttpHandlerOptions, NodeHttpHandlerPlugin, RPCHandlerOptions };

package/dist/adapters/node/index.mjs

@@ -3,10 +3,11 @@ import { toArray, intercept, resolveMaybeOptionalOptions } from '@orpc/shared';
 import { toStandardLazyRequest, sendStandardResponse } from '@orpc/standard-server-node';
 import { r as resolveFriendlyStandardHandleOptions } from '../../shared/server.BVwwTHyO.mjs';
 import '@orpc/contract';
-import { C as CompositeStandardHandlerPlugin, b as StandardRPCHandler } from '../../shared/server.BM1HMJGg.mjs';
+import { C as CompositeStandardHandlerPlugin, b as StandardRPCHandler } from '../../shared/server.SxlTJfG2.mjs';
 import '@orpc/client/standard';
 import '@orpc/standard-server/batch';
-import '../../shared/server.BW-nUGgA.mjs';
+import '@orpc/standard-server';
+import { S as StrictGetMethodPlugin } from '../../shared/server.BW-nUGgA.mjs';
 import '../../shared/server.DG7Tamti.mjs';
 
 class BodyLimitPlugin {
@@ -83,6 +84,10 @@ class NodeHttpHandler {
 
 class RPCHandler extends NodeHttpHandler {
   constructor(router, options = {}) {
+    if (options.strictGetMethodPluginEnabled ?? true) {
+      options.plugins ??= [];
+      options.plugins.push(new StrictGetMethodPlugin());
+    }
     super(new StandardRPCHandler(router, options), options);
   }
 }

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

@@ -4,7 +4,7 @@ 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.DPWk5pjW.mjs';
-export { a as StandardRPCHandler, S as StandardRPCHandlerOptions } from '../../shared/server.CzSMXd8y.mjs';
+export { a as StandardRPCHandler, S as StandardRPCHandlerOptions } from '../../shared/server.BRoxSiSC.mjs';
 import '@orpc/contract';
 import '@orpc/shared';
 

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

@@ -4,7 +4,7 @@ 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.DPWk5pjW.js';
-export { a as StandardRPCHandler, S as StandardRPCHandlerOptions } from '../../shared/server.DEgjJVit.js';
+export { a as StandardRPCHandler, S as StandardRPCHandlerOptions } from '../../shared/server.Cy1vfSiG.js';
 import '@orpc/contract';
 import '@orpc/shared';
 

package/dist/adapters/standard/index.mjs

@@ -1,8 +1,6 @@
-export { C as CompositeStandardHandlerPlugin, S as StandardHandler, a as StandardRPCCodec, b as StandardRPCHandler, c as StandardRPCMatcher } from '../../shared/server.BM1HMJGg.mjs';
+export { C as CompositeStandardHandlerPlugin, S as StandardHandler, a as StandardRPCCodec, b as StandardRPCHandler, c as StandardRPCMatcher } from '../../shared/server.SxlTJfG2.mjs';
 import '@orpc/client/standard';
-import '@orpc/shared';
-import '@orpc/standard-server/batch';
 import '@orpc/client';
-import '../../shared/server.BW-nUGgA.mjs';
-import '@orpc/contract';
+import '@orpc/shared';
 import '../../shared/server.DG7Tamti.mjs';
+import '@orpc/contract';

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

@@ -0,0 +1,27 @@
+import { MaybeOptionalOptions } from '@orpc/shared';
+import { C as Context, R as Router } from '../../shared/server.DPWk5pjW.mjs';
+import { i as StandardHandler } from '../../shared/server.eWLxY3lq.mjs';
+import { F as FriendlyStandardHandleOptions } from '../../shared/server.QUe9N8P4.mjs';
+import { S as StandardRPCHandlerOptions } from '../../shared/server.BRoxSiSC.mjs';
+import '@orpc/client';
+import '@orpc/contract';
+import '@orpc/standard-server';
+import '@orpc/client/standard';
+
+declare class experimental_WebsocketHandler<T extends Context> {
+    private readonly standardHandler;
+    constructor(standardHandler: StandardHandler<T>);
+    upgrade(ws: Pick<WebSocket, 'addEventListener' | 'send'>, ...rest: MaybeOptionalOptions<Omit<FriendlyStandardHandleOptions<T>, 'prefix'>>): void;
+}
+
+/**
+ * RPC Handler for Websocket adapter
+ *
+ * @see {@link https://orpc.unnoq.com/docs/rpc-handler RPC Handler Docs}
+ * @see {@link https://orpc.unnoq.com/docs/adapters/websocket Websocket Adapter Docs}
+ */
+declare class experimental_RPCHandler<T extends Context> extends experimental_WebsocketHandler<T> {
+    constructor(router: Router<any, T>, options?: NoInfer<StandardRPCHandlerOptions<T>>);
+}
+
+export { experimental_RPCHandler, experimental_WebsocketHandler };

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

@@ -0,0 +1,27 @@
+import { MaybeOptionalOptions } from '@orpc/shared';
+import { C as Context, R as Router } from '../../shared/server.DPWk5pjW.js';
+import { i as StandardHandler } from '../../shared/server.YZzrREz9.js';
+import { F as FriendlyStandardHandleOptions } from '../../shared/server.BjiJH9Vo.js';
+import { S as StandardRPCHandlerOptions } from '../../shared/server.Cy1vfSiG.js';
+import '@orpc/client';
+import '@orpc/contract';
+import '@orpc/standard-server';
+import '@orpc/client/standard';
+
+declare class experimental_WebsocketHandler<T extends Context> {
+    private readonly standardHandler;
+    constructor(standardHandler: StandardHandler<T>);
+    upgrade(ws: Pick<WebSocket, 'addEventListener' | 'send'>, ...rest: MaybeOptionalOptions<Omit<FriendlyStandardHandleOptions<T>, 'prefix'>>): void;
+}
+
+/**
+ * RPC Handler for Websocket adapter
+ *
+ * @see {@link https://orpc.unnoq.com/docs/rpc-handler RPC Handler Docs}
+ * @see {@link https://orpc.unnoq.com/docs/adapters/websocket Websocket Adapter Docs}
+ */
+declare class experimental_RPCHandler<T extends Context> extends experimental_WebsocketHandler<T> {
+    constructor(router: Router<any, T>, options?: NoInfer<StandardRPCHandlerOptions<T>>);
+}
+
+export { experimental_RPCHandler, experimental_WebsocketHandler };

package/dist/adapters/websocket/index.mjs

@@ -0,0 +1,37 @@
+import { resolveMaybeOptionalOptions } from '@orpc/shared';
+import { ServerPeer } from '@orpc/standard-server-peer';
+import { r as resolveFriendlyStandardHandleOptions } from '../../shared/server.BVwwTHyO.mjs';
+import '@orpc/client';
+import '@orpc/contract';
+import { b as StandardRPCHandler } from '../../shared/server.SxlTJfG2.mjs';
+import '@orpc/client/standard';
+import '../../shared/server.DG7Tamti.mjs';
+
+class experimental_WebsocketHandler {
+  constructor(standardHandler) {
+    this.standardHandler = standardHandler;
+  }
+  upgrade(ws, ...rest) {
+    const peer = new ServerPeer(ws.send.bind(ws));
+    ws.addEventListener("message", async (event) => {
+      const [id, request] = await peer.message(event.data);
+      if (!request) {
+        return;
+      }
+      const options = resolveFriendlyStandardHandleOptions(resolveMaybeOptionalOptions(rest));
+      const { response } = await this.standardHandler.handle({ ...request, body: () => Promise.resolve(request.body) }, options);
+      await peer.response(id, response ?? { status: 404, headers: {}, body: "No procedure matched" });
+    });
+    ws.addEventListener("close", () => {
+      peer.close();
+    });
+  }
+}
+
+class experimental_RPCHandler extends experimental_WebsocketHandler {
+  constructor(router, options = {}) {
+    super(new StandardRPCHandler(router, options));
+  }
+}
+
+export { experimental_RPCHandler, experimental_WebsocketHandler };

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

@@ -0,0 +1,28 @@
+import { MaybeOptionalOptions } from '@orpc/shared';
+import { WebSocket } from 'ws';
+import { C as Context, R as Router } from '../../shared/server.DPWk5pjW.mjs';
+import { i as StandardHandler } from '../../shared/server.eWLxY3lq.mjs';
+import { F as FriendlyStandardHandleOptions } from '../../shared/server.QUe9N8P4.mjs';
+import { S as StandardRPCHandlerOptions } from '../../shared/server.BRoxSiSC.mjs';
+import '@orpc/client';
+import '@orpc/contract';
+import '@orpc/standard-server';
+import '@orpc/client/standard';
+
+declare class experimental_WsHandler<T extends Context> {
+    private readonly standardHandler;
+    constructor(standardHandler: StandardHandler<T>);
+    upgrade(ws: Pick<WebSocket, 'addEventListener' | 'send'>, ...rest: MaybeOptionalOptions<Omit<FriendlyStandardHandleOptions<T>, 'prefix'>>): Promise<void>;
+}
+
+/**
+ * RPC Handler for ws (node ws) adapter
+ *
+ * @see {@link https://orpc.unnoq.com/docs/rpc-handler RPC Handler Docs}
+ * @see {@link https://orpc.unnoq.com/docs/adapters/websocket Websocket Adapter Docs}
+ */
+declare class experimental_RPCHandler<T extends Context> extends experimental_WsHandler<T> {
+    constructor(router: Router<any, T>, options?: NoInfer<StandardRPCHandlerOptions<T>>);
+}
+
+export { experimental_RPCHandler, experimental_WsHandler };

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

@@ -0,0 +1,28 @@
+import { MaybeOptionalOptions } from '@orpc/shared';
+import { WebSocket } from 'ws';
+import { C as Context, R as Router } from '../../shared/server.DPWk5pjW.js';
+import { i as StandardHandler } from '../../shared/server.YZzrREz9.js';
+import { F as FriendlyStandardHandleOptions } from '../../shared/server.BjiJH9Vo.js';
+import { S as StandardRPCHandlerOptions } from '../../shared/server.Cy1vfSiG.js';
+import '@orpc/client';
+import '@orpc/contract';
+import '@orpc/standard-server';
+import '@orpc/client/standard';
+
+declare class experimental_WsHandler<T extends Context> {
+    private readonly standardHandler;
+    constructor(standardHandler: StandardHandler<T>);
+    upgrade(ws: Pick<WebSocket, 'addEventListener' | 'send'>, ...rest: MaybeOptionalOptions<Omit<FriendlyStandardHandleOptions<T>, 'prefix'>>): Promise<void>;
+}
+
+/**
+ * RPC Handler for ws (node ws) adapter
+ *
+ * @see {@link https://orpc.unnoq.com/docs/rpc-handler RPC Handler Docs}
+ * @see {@link https://orpc.unnoq.com/docs/adapters/websocket Websocket Adapter Docs}
+ */
+declare class experimental_RPCHandler<T extends Context> extends experimental_WsHandler<T> {
+    constructor(router: Router<any, T>, options?: NoInfer<StandardRPCHandlerOptions<T>>);
+}
+
+export { experimental_RPCHandler, experimental_WsHandler };

package/dist/adapters/ws/index.mjs

@@ -0,0 +1,37 @@
+import { resolveMaybeOptionalOptions } from '@orpc/shared';
+import { ServerPeer } from '@orpc/standard-server-peer';
+import { r as resolveFriendlyStandardHandleOptions } from '../../shared/server.BVwwTHyO.mjs';
+import '@orpc/client';
+import '@orpc/contract';
+import { b as StandardRPCHandler } from '../../shared/server.SxlTJfG2.mjs';
+import '@orpc/client/standard';
+import '../../shared/server.DG7Tamti.mjs';
+
+class experimental_WsHandler {
+  constructor(standardHandler) {
+    this.standardHandler = standardHandler;
+  }
+  async upgrade(ws, ...rest) {
+    const peer = new ServerPeer(ws.send.bind(ws));
+    ws.addEventListener("message", async (event) => {
+      const [id, request] = await peer.message(new Blob(Array.isArray(event.data) ? event.data : [event.data]));
+      if (!request) {
+        return;
+      }
+      const options = resolveFriendlyStandardHandleOptions(resolveMaybeOptionalOptions(rest));
+      const { response } = await this.standardHandler.handle({ ...request, body: () => Promise.resolve(request.body) }, options);
+      await peer.response(id, response ?? { status: 404, headers: {}, body: "No procedure matched" });
+    });
+    ws.addEventListener("close", () => {
+      peer.close();
+    });
+  }
+}
+
+class experimental_RPCHandler extends experimental_WsHandler {
+  constructor(router, options = {}) {
+    super(new StandardRPCHandler(router, options));
+  }
+}
+
+export { experimental_RPCHandler, experimental_WsHandler };

package/dist/index.mjs

@@ -50,6 +50,9 @@ function createActionableClient(client) {
     try {
       return [null, await client(input)];
     } catch (error) {
+      if (error instanceof Error && "digest" in error && typeof error.digest === "string" && error.digest.startsWith("NEXT_")) {
+        throw error;
+      }
       return [toORPCError(error).toJSON(), void 0];
     }
   };

package/dist/plugins/index.mjs

@@ -1,5 +1,6 @@
 import { value, isAsyncIteratorObject } from '@orpc/shared';
 import { parseBatchRequest, toBatchResponse } from '@orpc/standard-server/batch';
+import { flattenHeader } from '@orpc/standard-server';
 import { ORPCError } from '@orpc/client';
 export { S as StrictGetMethodPlugin } from '../shared/server.BW-nUGgA.mjs';
 import '@orpc/contract';
@@ -123,13 +124,11 @@ class CORSPlugin {
           resHeaders["access-control-max-age"] = this.options.maxAge.toString();
         }
         if (this.options.allowMethods?.length) {
-          resHeaders["access-control-allow-methods"] = this.options.allowMethods.join(",");
+          resHeaders["access-control-allow-methods"] = flattenHeader(this.options.allowMethods);
         }
         const allowHeaders = this.options.allowHeaders ?? interceptorOptions.request.headers["access-control-request-headers"];
-        if (Array.isArray(allowHeaders) && allowHeaders.length) {
-          resHeaders["access-control-allow-headers"] = allowHeaders.join(",");
-        } else if (typeof allowHeaders === "string") {
-          resHeaders["access-control-allow-headers"] = allowHeaders;
+        if (typeof allowHeaders === "string" || allowHeaders?.length) {
+          resHeaders["access-control-allow-headers"] = flattenHeader(allowHeaders);
         }
         return {
           matched: true,
@@ -147,7 +146,7 @@ class CORSPlugin {
       if (!result.matched) {
         return result;
       }
-      const origin = Array.isArray(interceptorOptions.request.headers.origin) ? interceptorOptions.request.headers.origin.join(",") : interceptorOptions.request.headers.origin || "";
+      const origin = flattenHeader(interceptorOptions.request.headers.origin) ?? "";
       const allowedOrigin = await value(this.options.origin, origin, interceptorOptions);
       const allowedOriginArr = Array.isArray(allowedOrigin) ? allowedOrigin : [allowedOrigin];
       if (allowedOriginArr.includes("*")) {
@@ -169,7 +168,7 @@ class CORSPlugin {
         result.response.headers["access-control-allow-credentials"] = "true";
       }
       if (this.options.exposeHeaders?.length) {
-        result.response.headers["access-control-expose-headers"] = this.options.exposeHeaders.join(",");
+        result.response.headers["access-control-expose-headers"] = flattenHeader(this.options.exposeHeaders);
       }
       return result;
     });

package/dist/shared/{server.CzSMXd8y.d.mts → server.BRoxSiSC.d.mts}

@@ -3,15 +3,9 @@ import { C as Context, R as Router } from './server.DPWk5pjW.mjs';
 import { b as StandardHandlerOptions, i as StandardHandler } from './server.eWLxY3lq.mjs';
 
 interface StandardRPCHandlerOptions<T extends Context> extends StandardHandlerOptions<T>, StandardRPCJsonSerializerOptions {
-    /**
-     * Enables or disables the StrictGetMethodPlugin.
-     *
-     * @default true
-     */
-    strictGetMethodPluginEnabled?: boolean;
 }
 declare class StandardRPCHandler<T extends Context> extends StandardHandler<T> {
-    constructor(router: Router<any, T>, options: StandardRPCHandlerOptions<T>);
+    constructor(router: Router<any, T>, options?: StandardRPCHandlerOptions<T>);
 }
 
 export { StandardRPCHandler as a };

package/dist/shared/{server.DEgjJVit.d.ts → server.Cy1vfSiG.d.ts}

@@ -3,15 +3,9 @@ import { C as Context, R as Router } from './server.DPWk5pjW.js';
 import { b as StandardHandlerOptions, i as StandardHandler } from './server.YZzrREz9.js';
 
 interface StandardRPCHandlerOptions<T extends Context> extends StandardHandlerOptions<T>, StandardRPCJsonSerializerOptions {
-    /**
-     * Enables or disables the StrictGetMethodPlugin.
-     *
-     * @default true
-     */
-    strictGetMethodPluginEnabled?: boolean;
 }
 declare class StandardRPCHandler<T extends Context> extends StandardHandler<T> {
-    constructor(router: Router<any, T>, options: StandardRPCHandlerOptions<T>);
+    constructor(router: Router<any, T>, options?: StandardRPCHandlerOptions<T>);
 }
 
 export { StandardRPCHandler as a };

package/dist/shared/{server.BM1HMJGg.mjs → server.SxlTJfG2.mjs}

@@ -1,8 +1,6 @@
 import { toHttpPath, StandardRPCJsonSerializer, StandardRPCSerializer } from '@orpc/client/standard';
-import { toArray, intercept, parseEmptyableJSON } from '@orpc/shared';
-import '@orpc/standard-server/batch';
 import { ORPCError, toORPCError } from '@orpc/client';
-import { S as StrictGetMethodPlugin } from './server.BW-nUGgA.mjs';
+import { toArray, intercept, parseEmptyableJSON } from '@orpc/shared';
 import { c as createProcedureClient, t as traverseContractProcedures, i as isProcedure, u as unlazy, g as getRouter, a as createContractedProcedure } from './server.DG7Tamti.mjs';
 
 class CompositeStandardHandlerPlugin {
@@ -173,12 +171,7 @@ class StandardRPCMatcher {
 }
 
 class StandardRPCHandler extends StandardHandler {
-  constructor(router, options) {
-    options.plugins ??= [];
-    const strictGetMethodPluginEnabled = options.strictGetMethodPluginEnabled ?? true;
-    if (strictGetMethodPluginEnabled) {
-      options.plugins.push(new StrictGetMethodPlugin());
-    }
+  constructor(router, options = {}) {
     const jsonSerializer = new StandardRPCJsonSerializer(options);
     const serializer = new StandardRPCSerializer(jsonSerializer);
     const matcher = new StandardRPCMatcher();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/server",
   "type": "module",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -38,21 +38,58 @@
       "types": "./dist/adapters/node/index.d.mts",
       "import": "./dist/adapters/node/index.mjs",
       "default": "./dist/adapters/node/index.mjs"
+    },
+    "./websocket": {
+      "types": "./dist/adapters/websocket/index.d.mts",
+      "import": "./dist/adapters/websocket/index.mjs",
+      "default": "./dist/adapters/websocket/index.mjs"
+    },
+    "./crossws": {
+      "types": "./dist/adapters/crossws/index.d.mts",
+      "import": "./dist/adapters/crossws/index.mjs",
+      "default": "./dist/adapters/crossws/index.mjs"
+    },
+    "./ws": {
+      "types": "./dist/adapters/ws/index.d.mts",
+      "import": "./dist/adapters/ws/index.mjs",
+      "default": "./dist/adapters/ws/index.mjs"
+    },
+    "./bun-ws": {
+      "types": "./dist/adapters/bun-ws/index.d.mts",
+      "import": "./dist/adapters/bun-ws/index.mjs",
+      "default": "./dist/adapters/bun-ws/index.mjs"
     }
   },
   "files": [
     "dist"
   ],
+  "peerDependencies": {
+    "crossws": ">=0.3.4",
+    "ws": ">=8.18.1"
+  },
+  "peerDependenciesMeta": {
+    "crossws": {
+      "optional": true
+    },
+    "ws": {
+      "optional": true
+    }
+  },
   "dependencies": {
-    "@orpc/client": "1.1.0",
-    "@orpc/standard-server-fetch": "1.1.0",
-    "@orpc/standard-server": "1.1.0",
-    "@orpc/standard-server-node": "1.1.0",
-    "@orpc/contract": "1.1.0",
-    "@orpc/shared": "1.1.0"
+    "@orpc/client": "1.2.0",
+    "@orpc/shared": "1.2.0",
+    "@orpc/contract": "1.2.0",
+    "@orpc/standard-server-fetch": "1.2.0",
+    "@orpc/standard-server": "1.2.0",
+    "@orpc/standard-server-node": "1.2.0",
+    "@orpc/standard-server-peer": "1.2.0"
   },
   "devDependencies": {
-    "supertest": "^7.1.0"
+    "@types/ws": "^8.18.1",
+    "crossws": "^0.3.4",
+    "next": "^15.3.0",
+    "supertest": "^7.1.0",
+    "ws": "^8.18.1"
   },
   "scripts": {
     "build": "unbuild",