@orpc/server 1.2.0 → 1.4.0

package/README.md

@@ -49,6 +49,7 @@ You can find the full documentation [here](https://orpc.unnoq.com).
 - [@orpc/contract](https://www.npmjs.com/package/@orpc/contract): Build your API contract.
 - [@orpc/server](https://www.npmjs.com/package/@orpc/server): Build your API or implement API contract.
 - [@orpc/client](https://www.npmjs.com/package/@orpc/client): Consume your API on the client with type-safety.
+- [@orpc/nest](https://www.npmjs.com/package/@orpc/nest): Deeply integrate oRPC with NestJS.
 - [@orpc/react](https://www.npmjs.com/package/@orpc/react): Utilities for integrating oRPC with React and React Server Actions.
 - [@orpc/react-query](https://www.npmjs.com/package/@orpc/react-query): Integration with [React Query](https://tanstack.com/query/latest/docs/framework/react/overview).
 - [@orpc/vue-query](https://www.npmjs.com/package/@orpc/vue-query): Integration with [Vue Query](https://tanstack.com/query/latest/docs/framework/vue/overview).

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

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

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

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

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

@@ -0,0 +1,41 @@
+import { resolveMaybeOptionalOptions } from '@orpc/shared';
+import { toStandardLazyRequest, sendStandardResponse } from '@orpc/standard-server-aws-lambda';
+import { r as resolveFriendlyStandardHandleOptions } from '../../shared/server.BVwwTHyO.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.CHvOkcM3.mjs';
+import '@orpc/client/standard';
+import '../../shared/server.DG7Tamti.mjs';
+
+class AwsLambdaHandler {
+  constructor(standardHandler, options = {}) {
+    this.standardHandler = standardHandler;
+    this.sendStandardResponseOptions = options;
+  }
+  sendStandardResponseOptions;
+  async handle(event, responseStream, ...rest) {
+    const standardRequest = toStandardLazyRequest(event, responseStream);
+    const options = resolveFriendlyStandardHandleOptions(resolveMaybeOptionalOptions(rest));
+    const result = await this.standardHandler.handle(standardRequest, options);
+    if (!result.matched) {
+      return { matched: false };
+    }
+    await sendStandardResponse(responseStream, result.response, this.sendStandardResponseOptions);
+    return { matched: true };
+  }
+}
+
+class experimental_RPCHandler extends AwsLambdaHandler {
+  constructor(router, options = {}) {
+    if (options.strictGetMethodPluginEnabled ?? true) {
+      options.plugins ??= [];
+      options.plugins.push(new StrictGetMethodPlugin());
+    }
+    super(new StandardRPCHandler(router, options), options);
+  }
+}
+
+export { AwsLambdaHandler, experimental_RPCHandler };

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

@@ -1,8 +1,8 @@
 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 { 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/bun-ws/index.d.ts

@@ -1,8 +1,8 @@
 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 { 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/bun-ws/index.mjs

@@ -2,8 +2,9 @@ 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/standard-server';
 import '@orpc/contract';
-import { b as StandardRPCHandler } from '../../shared/server.SxlTJfG2.mjs';
+import { b as StandardRPCHandler } from '../../shared/server.CHvOkcM3.mjs';
 import '@orpc/client/standard';
 import '../../shared/server.DG7Tamti.mjs';
 

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

@@ -1,9 +1,9 @@
 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 { 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/crossws/index.d.ts

@@ -1,9 +1,9 @@
 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 { 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/crossws/index.mjs

@@ -2,8 +2,9 @@ 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/standard-server';
 import '@orpc/contract';
-import { b as StandardRPCHandler } from '../../shared/server.SxlTJfG2.mjs';
+import { b as StandardRPCHandler } from '../../shared/server.CHvOkcM3.mjs';
 import '@orpc/client/standard';
 import '../../shared/server.DG7Tamti.mjs';
 

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

@@ -1,9 +1,9 @@
-import { C as Context, R as Router } from '../../shared/server.DPWk5pjW.mjs';
-import { Interceptor, ThrowableError, MaybeOptionalOptions } from '@orpc/shared';
+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 { 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.BRoxSiSC.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';
@@ -28,7 +28,7 @@ interface FetchHandlerInterceptorOptions<T extends Context> extends StandardHand
     toFetchResponseOptions: ToFetchResponseOptions;
 }
 interface FetchHandlerOptions<T extends Context> extends ToFetchResponseOptions {
-    adapterInterceptors?: Interceptor<FetchHandlerInterceptorOptions<T>, FetchHandleResult, ThrowableError>[];
+    adapterInterceptors?: Interceptor<FetchHandlerInterceptorOptions<T>, Promise<FetchHandleResult>>[];
     plugins?: FetchHandlerPlugin<T>[];
 }
 declare class FetchHandler<T extends Context> {

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

@@ -1,9 +1,9 @@
-import { C as Context, R as Router } from '../../shared/server.DPWk5pjW.js';
-import { Interceptor, ThrowableError, MaybeOptionalOptions } from '@orpc/shared';
+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 { 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.Cy1vfSiG.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';
@@ -28,7 +28,7 @@ interface FetchHandlerInterceptorOptions<T extends Context> extends StandardHand
     toFetchResponseOptions: ToFetchResponseOptions;
 }
 interface FetchHandlerOptions<T extends Context> extends ToFetchResponseOptions {
-    adapterInterceptors?: Interceptor<FetchHandlerInterceptorOptions<T>, FetchHandleResult, ThrowableError>[];
+    adapterInterceptors?: Interceptor<FetchHandlerInterceptorOptions<T>, Promise<FetchHandleResult>>[];
     plugins?: FetchHandlerPlugin<T>[];
 }
 declare class FetchHandler<T extends Context> {

package/dist/adapters/fetch/index.mjs

@@ -2,11 +2,11 @@ import { ORPCError } from '@orpc/client';
 import { toArray, intercept, resolveMaybeOptionalOptions } from '@orpc/shared';
 import { toStandardLazyRequest, toFetchResponse } from '@orpc/standard-server-fetch';
 import { r as resolveFriendlyStandardHandleOptions } from '../../shared/server.BVwwTHyO.mjs';
+import '@orpc/standard-server';
 import '@orpc/contract';
-import { C as CompositeStandardHandlerPlugin, b as StandardRPCHandler } from '../../shared/server.SxlTJfG2.mjs';
+import { C as CompositeStandardHandlerPlugin, b as StandardRPCHandler } from '../../shared/server.CHvOkcM3.mjs';
 import '@orpc/client/standard';
 import '@orpc/standard-server/batch';
-import '@orpc/standard-server';
 import { S as StrictGetMethodPlugin } from '../../shared/server.BW-nUGgA.mjs';
 import '../../shared/server.DG7Tamti.mjs';
 

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

@@ -0,0 +1,28 @@
+import { SupportedMessagePort } from '@orpc/client/message-port';
+import { MaybeOptionalOptions } from '@orpc/shared';
+import { C as Context, R as Router } from '../../shared/server.DD2C4ujN.mjs';
+import { i as StandardHandler } from '../../shared/server.Dq8xr7PQ.mjs';
+import { F as FriendlyStandardHandleOptions } from '../../shared/server.BliFSTnG.mjs';
+import { S as StandardRPCHandlerOptions } from '../../shared/server.Bd52nNaH.mjs';
+import '@orpc/client';
+import '@orpc/contract';
+import '@orpc/standard-server';
+import '@orpc/client/standard';
+
+declare class experimental_MessagePortHandler<T extends Context> {
+    private readonly standardHandler;
+    constructor(standardHandler: StandardHandler<T>);
+    upgrade(port: SupportedMessagePort, ...rest: MaybeOptionalOptions<Omit<FriendlyStandardHandleOptions<T>, 'prefix'>>): void;
+}
+
+/**
+ * RPC Handler for common message port implementations.
+ *
+ * @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> {
+    constructor(router: Router<any, T>, options?: NoInfer<StandardRPCHandlerOptions<T>>);
+}
+
+export { experimental_MessagePortHandler, experimental_RPCHandler };

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

@@ -0,0 +1,28 @@
+import { SupportedMessagePort } from '@orpc/client/message-port';
+import { MaybeOptionalOptions } from '@orpc/shared';
+import { C as Context, R as Router } from '../../shared/server.DD2C4ujN.js';
+import { i as StandardHandler } from '../../shared/server.-ACo36I0.js';
+import { F as FriendlyStandardHandleOptions } from '../../shared/server.IG2MjhrD.js';
+import { S as StandardRPCHandlerOptions } from '../../shared/server.BPAWobQg.js';
+import '@orpc/client';
+import '@orpc/contract';
+import '@orpc/standard-server';
+import '@orpc/client/standard';
+
+declare class experimental_MessagePortHandler<T extends Context> {
+    private readonly standardHandler;
+    constructor(standardHandler: StandardHandler<T>);
+    upgrade(port: SupportedMessagePort, ...rest: MaybeOptionalOptions<Omit<FriendlyStandardHandleOptions<T>, 'prefix'>>): void;
+}
+
+/**
+ * RPC Handler for common message port implementations.
+ *
+ * @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> {
+    constructor(router: Router<any, T>, options?: NoInfer<StandardRPCHandlerOptions<T>>);
+}
+
+export { experimental_MessagePortHandler, experimental_RPCHandler };

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

@@ -0,0 +1,41 @@
+import { onMessagePortMessage, onMessagePortClose } from '@orpc/client/message-port';
+import { resolveMaybeOptionalOptions } from '@orpc/shared';
+import { ServerPeer } from '@orpc/standard-server-peer';
+import { r as resolveFriendlyStandardHandleOptions } from '../../shared/server.BVwwTHyO.mjs';
+import '@orpc/client';
+import '@orpc/standard-server';
+import '@orpc/contract';
+import { b as StandardRPCHandler } from '../../shared/server.CHvOkcM3.mjs';
+import '@orpc/client/standard';
+import '../../shared/server.DG7Tamti.mjs';
+
+class experimental_MessagePortHandler {
+  constructor(standardHandler) {
+    this.standardHandler = standardHandler;
+  }
+  upgrade(port, ...rest) {
+    const peer = new ServerPeer(async (message) => {
+      port.postMessage(message instanceof Blob ? await message.arrayBuffer() : 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" });
+    });
+    onMessagePortClose(port, () => {
+      peer.close();
+    });
+  }
+}
+
+class experimental_RPCHandler extends experimental_MessagePortHandler {
+  constructor(router, options = {}) {
+    super(new StandardRPCHandler(router, options));
+  }
+}
+
+export { experimental_MessagePortHandler, experimental_RPCHandler };

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

@@ -1,9 +1,9 @@
-import { C as Context, R as Router } from '../../shared/server.DPWk5pjW.mjs';
-import { Interceptor, ThrowableError, MaybeOptionalOptions } from '@orpc/shared';
+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 { 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.BRoxSiSC.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';
@@ -27,7 +27,7 @@ interface NodeHttpHandlerInterceptorOptions<T extends Context> extends StandardH
     sendStandardResponseOptions: SendStandardResponseOptions;
 }
 interface NodeHttpHandlerOptions<T extends Context> extends SendStandardResponseOptions {
-    adapterInterceptors?: Interceptor<NodeHttpHandlerInterceptorOptions<T>, NodeHttpHandleResult, ThrowableError>[];
+    adapterInterceptors?: Interceptor<NodeHttpHandlerInterceptorOptions<T>, Promise<NodeHttpHandleResult>>[];
     plugins?: NodeHttpHandlerPlugin<T>[];
 }
 declare class NodeHttpHandler<T extends Context> implements NodeHttpHandler<T> {

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

@@ -1,9 +1,9 @@
-import { C as Context, R as Router } from '../../shared/server.DPWk5pjW.js';
-import { Interceptor, ThrowableError, MaybeOptionalOptions } from '@orpc/shared';
+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 { 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.Cy1vfSiG.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';
@@ -27,7 +27,7 @@ interface NodeHttpHandlerInterceptorOptions<T extends Context> extends StandardH
     sendStandardResponseOptions: SendStandardResponseOptions;
 }
 interface NodeHttpHandlerOptions<T extends Context> extends SendStandardResponseOptions {
-    adapterInterceptors?: Interceptor<NodeHttpHandlerInterceptorOptions<T>, NodeHttpHandleResult, ThrowableError>[];
+    adapterInterceptors?: Interceptor<NodeHttpHandlerInterceptorOptions<T>, Promise<NodeHttpHandleResult>>[];
     plugins?: NodeHttpHandlerPlugin<T>[];
 }
 declare class NodeHttpHandler<T extends Context> implements NodeHttpHandler<T> {

package/dist/adapters/node/index.mjs

@@ -2,11 +2,11 @@ import { ORPCError } from '@orpc/client';
 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/standard-server';
 import '@orpc/contract';
-import { C as CompositeStandardHandlerPlugin, b as StandardRPCHandler } from '../../shared/server.SxlTJfG2.mjs';
+import { C as CompositeStandardHandlerPlugin, b as StandardRPCHandler } from '../../shared/server.CHvOkcM3.mjs';
 import '@orpc/client/standard';
 import '@orpc/standard-server/batch';
-import '@orpc/standard-server';
 import { S as StrictGetMethodPlugin } from '../../shared/server.BW-nUGgA.mjs';
 import '../../shared/server.DG7Tamti.mjs';
 

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

@@ -1,10 +1,10 @@
-import { c as StandardCodec, d as StandardParams, e as StandardMatcher, f as StandardMatchResult } from '../../shared/server.eWLxY3lq.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.eWLxY3lq.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 { h as AnyProcedure, f as AnyRouter } from '../../shared/server.DPWk5pjW.mjs';
-export { a as StandardRPCHandler, S as StandardRPCHandlerOptions } from '../../shared/server.BRoxSiSC.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,10 +1,10 @@
-import { c as StandardCodec, d as StandardParams, e as StandardMatcher, f as StandardMatchResult } from '../../shared/server.YZzrREz9.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.YZzrREz9.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 { h as AnyProcedure, f as AnyRouter } from '../../shared/server.DPWk5pjW.js';
-export { a as StandardRPCHandler, S as StandardRPCHandlerOptions } from '../../shared/server.Cy1vfSiG.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,6 +1,7 @@
-export { C as CompositeStandardHandlerPlugin, S as StandardHandler, a as StandardRPCCodec, b as StandardRPCHandler, c as StandardRPCMatcher } from '../../shared/server.SxlTJfG2.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.DG7Tamti.mjs';
 import '@orpc/contract';

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

@@ -1,8 +1,8 @@
 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 { 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/websocket/index.d.ts

@@ -1,8 +1,8 @@
 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 { 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/websocket/index.mjs

@@ -2,8 +2,9 @@ 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/standard-server';
 import '@orpc/contract';
-import { b as StandardRPCHandler } from '../../shared/server.SxlTJfG2.mjs';
+import { b as StandardRPCHandler } from '../../shared/server.CHvOkcM3.mjs';
 import '@orpc/client/standard';
 import '../../shared/server.DG7Tamti.mjs';
 

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

@@ -1,9 +1,9 @@
 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 { 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/ws/index.d.ts

@@ -1,9 +1,9 @@
 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 { 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/ws/index.mjs

@@ -2,8 +2,9 @@ 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/standard-server';
 import '@orpc/contract';
-import { b as StandardRPCHandler } from '../../shared/server.SxlTJfG2.mjs';
+import { b as StandardRPCHandler } from '../../shared/server.CHvOkcM3.mjs';
 import '@orpc/client/standard';
 import '../../shared/server.DG7Tamti.mjs';
 

package/dist/index.d.mts

@@ -4,8 +4,8 @@ import { AnySchema, ErrorMap, InferSchemaInput, InferSchemaOutput, ErrorFromErro
 export { ContractProcedure, ContractProcedureDef, ContractRouter, ErrorMap, ErrorMapItem, InferSchemaInput, InferSchemaOutput, InputStructure, MergedErrorMap, Meta, OutputStructure, Route, Schema, ValidationError, eventIterator, type } from '@orpc/contract';
 import { ThrowableError, IntersectPick, MaybeOptionalOptions } from '@orpc/shared';
 export { IntersectPick, Registry, ThrowableError, onError, onFinish, onStart, onSuccess } from '@orpc/shared';
-import { C as Context, P as Procedure, M as Middleware, O as ORPCErrorConstructorMap, a as MergedInitialContext, b as MergedCurrentContext, c as MapInputMiddleware, d as CreateProcedureClientOptions, e as ProcedureClient, A as AnyMiddleware, L as Lazyable, f as AnyRouter, g as Lazy, h as AnyProcedure, i as ProcedureHandler, R as Router, I as InferRouterInitialContext } from './shared/server.DPWk5pjW.mjs';
-export { J as InferRouterCurrentContexts, H as InferRouterInitialContexts, K as InferRouterInputs, N as InferRouterOutputs, n as LAZY_SYMBOL, o as LazyMeta, w as MiddlewareNextFn, t as MiddlewareNextFnOptions, y as MiddlewareOptions, x as MiddlewareOutputFn, s as MiddlewareResult, k as ORPCErrorConstructorMapItem, j as ORPCErrorConstructorMapItemOptions, F as ProcedureClientInterceptorOptions, D as ProcedureDef, B as ProcedureHandlerOptions, l as createORPCErrorConstructorMap, G as createProcedureClient, r as getLazyMeta, q as isLazy, E as isProcedure, p as lazy, m as mergeCurrentContext, z as middlewareOutputFn, u as unlazy, v as validateORPCError } from './shared/server.DPWk5pjW.mjs';
+import { C as Context, P as Procedure, M as Middleware, O as ORPCErrorConstructorMap, a as MergedInitialContext, b as MergedCurrentContext, c as MapInputMiddleware, d as CreateProcedureClientOptions, e as ProcedureClient, A as AnyMiddleware, L as Lazyable, f as AnyRouter, g as Lazy, h as AnyProcedure, i as ProcedureHandler, R as Router, I as InferRouterInitialContext } from './shared/server.DD2C4ujN.mjs';
+export { J as InferRouterCurrentContexts, H as InferRouterInitialContexts, K as InferRouterInputs, N as InferRouterOutputs, n as LAZY_SYMBOL, o as LazyMeta, w as MiddlewareNextFn, t as MiddlewareNextFnOptions, y as MiddlewareOptions, x as MiddlewareOutputFn, s as MiddlewareResult, k as ORPCErrorConstructorMapItem, j as ORPCErrorConstructorMapItemOptions, F as ProcedureClientInterceptorOptions, D as ProcedureDef, B as ProcedureHandlerOptions, l as createORPCErrorConstructorMap, G as createProcedureClient, r as getLazyMeta, q as isLazy, E as isProcedure, p as lazy, m as mergeCurrentContext, z as middlewareOutputFn, u as unlazy, v as validateORPCError } from './shared/server.DD2C4ujN.mjs';
 export { getEventMeta, withEventMeta } from '@orpc/standard-server';
 
 type ActionableError<T> = T extends ORPCError<infer U, infer V> ? ORPCErrorJSON<U, V> & {

package/dist/index.d.ts

@@ -4,8 +4,8 @@ import { AnySchema, ErrorMap, InferSchemaInput, InferSchemaOutput, ErrorFromErro
 export { ContractProcedure, ContractProcedureDef, ContractRouter, ErrorMap, ErrorMapItem, InferSchemaInput, InferSchemaOutput, InputStructure, MergedErrorMap, Meta, OutputStructure, Route, Schema, ValidationError, eventIterator, type } from '@orpc/contract';
 import { ThrowableError, IntersectPick, MaybeOptionalOptions } from '@orpc/shared';
 export { IntersectPick, Registry, ThrowableError, onError, onFinish, onStart, onSuccess } from '@orpc/shared';
-import { C as Context, P as Procedure, M as Middleware, O as ORPCErrorConstructorMap, a as MergedInitialContext, b as MergedCurrentContext, c as MapInputMiddleware, d as CreateProcedureClientOptions, e as ProcedureClient, A as AnyMiddleware, L as Lazyable, f as AnyRouter, g as Lazy, h as AnyProcedure, i as ProcedureHandler, R as Router, I as InferRouterInitialContext } from './shared/server.DPWk5pjW.js';
-export { J as InferRouterCurrentContexts, H as InferRouterInitialContexts, K as InferRouterInputs, N as InferRouterOutputs, n as LAZY_SYMBOL, o as LazyMeta, w as MiddlewareNextFn, t as MiddlewareNextFnOptions, y as MiddlewareOptions, x as MiddlewareOutputFn, s as MiddlewareResult, k as ORPCErrorConstructorMapItem, j as ORPCErrorConstructorMapItemOptions, F as ProcedureClientInterceptorOptions, D as ProcedureDef, B as ProcedureHandlerOptions, l as createORPCErrorConstructorMap, G as createProcedureClient, r as getLazyMeta, q as isLazy, E as isProcedure, p as lazy, m as mergeCurrentContext, z as middlewareOutputFn, u as unlazy, v as validateORPCError } from './shared/server.DPWk5pjW.js';
+import { C as Context, P as Procedure, M as Middleware, O as ORPCErrorConstructorMap, a as MergedInitialContext, b as MergedCurrentContext, c as MapInputMiddleware, d as CreateProcedureClientOptions, e as ProcedureClient, A as AnyMiddleware, L as Lazyable, f as AnyRouter, g as Lazy, h as AnyProcedure, i as ProcedureHandler, R as Router, I as InferRouterInitialContext } from './shared/server.DD2C4ujN.js';
+export { J as InferRouterCurrentContexts, H as InferRouterInitialContexts, K as InferRouterInputs, N as InferRouterOutputs, n as LAZY_SYMBOL, o as LazyMeta, w as MiddlewareNextFn, t as MiddlewareNextFnOptions, y as MiddlewareOptions, x as MiddlewareOutputFn, s as MiddlewareResult, k as ORPCErrorConstructorMapItem, j as ORPCErrorConstructorMapItemOptions, F as ProcedureClientInterceptorOptions, D as ProcedureDef, B as ProcedureHandlerOptions, l as createORPCErrorConstructorMap, G as createProcedureClient, r as getLazyMeta, q as isLazy, E as isProcedure, p as lazy, m as mergeCurrentContext, z as middlewareOutputFn, u as unlazy, v as validateORPCError } from './shared/server.DD2C4ujN.js';
 export { getEventMeta, withEventMeta } from '@orpc/standard-server';
 
 type ActionableError<T> = T extends ORPCError<infer U, infer V> ? ORPCErrorJSON<U, V> & {

package/dist/index.mjs

@@ -4,6 +4,7 @@ import { P as Procedure, b as addMiddleware, c as createProcedureClient, e as en
 export { L as LAZY_SYMBOL, p as call, r as createAccessibleLazyRouter, a as createContractedProcedure, h as createORPCErrorConstructorMap, q as getHiddenRouterContract, j as getLazyMeta, n as isStartWithMiddlewares, m as mergeCurrentContext, o as mergeMiddlewares, k as middlewareOutputFn, w as resolveContractProcedures, t as traverseContractProcedures, u as unlazy, x as unlazyRouter, v as validateORPCError } from './shared/server.DG7Tamti.mjs';
 import { toORPCError } from '@orpc/client';
 export { ORPCError, isDefinedError, safe } from '@orpc/client';
+import { resolveMaybeOptionalOptions } from '@orpc/shared';
 export { onError, onFinish, onStart, onSuccess } from '@orpc/shared';
 export { getEventMeta, withEventMeta } from '@orpc/standard-server';
 
@@ -449,10 +450,10 @@ function implement(contract, config = {}) {
 
 function createRouterClient(router, ...rest) {
   if (isProcedure(router)) {
-    const caller = createProcedureClient(router, ...rest);
+    const caller = createProcedureClient(router, resolveMaybeOptionalOptions(rest));
     return caller;
   }
-  const procedureCaller = isLazy(router) ? createProcedureClient(createAssertedLazyProcedure(router), ...rest) : {};
+  const procedureCaller = isLazy(router) ? createProcedureClient(createAssertedLazyProcedure(router), resolveMaybeOptionalOptions(rest)) : {};
   const recursive = new Proxy(procedureCaller, {
     get(target, key) {
       if (typeof key !== "string") {

package/dist/plugins/index.d.mts

@@ -1,8 +1,8 @@
-import { Value } from '@orpc/shared';
+import { Value, Promisable } from '@orpc/shared';
 import { StandardRequest, StandardHeaders } from '@orpc/standard-server';
 import { BatchResponseBodyItem } from '@orpc/standard-server/batch';
-import { S as StandardHandlerInterceptorOptions, a as StandardHandlerPlugin, b as StandardHandlerOptions } from '../shared/server.eWLxY3lq.mjs';
-import { C as Context, F as ProcedureClientInterceptorOptions } from '../shared/server.DPWk5pjW.mjs';
+import { S as StandardHandlerInterceptorOptions, a as StandardHandlerPlugin, b as StandardHandlerOptions } from '../shared/server.Dq8xr7PQ.mjs';
+import { C as Context, F as ProcedureClientInterceptorOptions } from '../shared/server.DD2C4ujN.mjs';
 import { Meta, ORPCError as ORPCError$1 } from '@orpc/contract';
 import { ORPCError } from '@orpc/client';
 
@@ -12,7 +12,7 @@ interface BatchHandlerOptions<T extends Context> {
      *
      * @default 10
      */
-    maxSize?: Value<number, [StandardHandlerInterceptorOptions<T>]>;
+    maxSize?: Value<Promisable<number>, [StandardHandlerInterceptorOptions<T>]>;
     /**
      * Map the request before processing it.
      *
@@ -24,19 +24,19 @@ interface BatchHandlerOptions<T extends Context> {
      *
      * @default 207
      */
-    successStatus?: Value<number, [responses: Promise<BatchResponseBodyItem>[], batchOptions: StandardHandlerInterceptorOptions<T>]>;
+    successStatus?: Value<Promisable<number>, [responses: Promise<BatchResponseBodyItem>[], batchOptions: StandardHandlerInterceptorOptions<T>]>;
     /**
      * success batch response headers.
      *
      * @default {}
      */
-    headers?: Value<StandardHeaders, [responses: Promise<BatchResponseBodyItem>[], batchOptions: StandardHandlerInterceptorOptions<T>]>;
+    headers?: Value<Promisable<StandardHeaders>, [responses: Promise<BatchResponseBodyItem>[], batchOptions: StandardHandlerInterceptorOptions<T>]>;
 }
 /**
- * The Batch Request/Response Plugin allows you to combine multiple requests and responses into a single batch,
+ * The Batch Requests Plugin allows you to combine multiple requests and responses into a single batch,
  * reducing the overhead of sending each one separately.
  *
- * @see {@link https://orpc.unnoq.com/docs/plugins/batch-request-response Batch Request/Response Plugin Docs}
+ * @see {@link https://orpc.unnoq.com/docs/plugins/batch-requests Batch Requests Plugin Docs}
  */
 declare class BatchHandlerPlugin<T extends Context> implements StandardHandlerPlugin<T> {
     private readonly maxSize;
@@ -49,8 +49,8 @@ declare class BatchHandlerPlugin<T extends Context> implements StandardHandlerPl
 }
 
 interface CORSOptions<T extends Context> {
-    origin?: Value<string | readonly string[] | null | undefined, [origin: string, options: StandardHandlerInterceptorOptions<T>]>;
-    timingOrigin?: Value<string | readonly string[] | null | undefined, [origin: string, options: StandardHandlerInterceptorOptions<T>]>;
+    origin?: Value<Promisable<string | readonly string[] | null | undefined>, [origin: string, options: StandardHandlerInterceptorOptions<T>]>;
+    timingOrigin?: Value<Promisable<string | readonly string[] | null | undefined>, [origin: string, options: StandardHandlerInterceptorOptions<T>]>;
     allowMethods?: readonly string[];
     allowHeaders?: readonly string[];
     maxAge?: number;
@@ -88,21 +88,21 @@ interface SimpleCsrfProtectionHandlerPluginOptions<T extends Context> {
      *
      * @default 'x-csrf-token'
      */
-    headerName?: Value<string, [options: StandardHandlerInterceptorOptions<T>]>;
+    headerName?: Value<Promisable<string>, [options: StandardHandlerInterceptorOptions<T>]>;
     /**
      * The value of the header to check.
      *
      * @default 'orpc'
      *
      */
-    headerValue?: Value<string, [options: StandardHandlerInterceptorOptions<T>]>;
+    headerValue?: Value<Promisable<string>, [options: StandardHandlerInterceptorOptions<T>]>;
     /**
      * Exclude a procedure from the plugin.
      *
      * @default false
      *
      */
-    exclude?: Value<boolean, [options: ProcedureClientInterceptorOptions<T, Record<never, never>, Meta>]>;
+    exclude?: Value<Promisable<boolean>, [options: ProcedureClientInterceptorOptions<T, Record<never, never>, Meta>]>;
     /**
      * The error thrown when the CSRF token is invalid.
      *

package/dist/plugins/index.d.ts

@@ -1,8 +1,8 @@
-import { Value } from '@orpc/shared';
+import { Value, Promisable } from '@orpc/shared';
 import { StandardRequest, StandardHeaders } from '@orpc/standard-server';
 import { BatchResponseBodyItem } from '@orpc/standard-server/batch';
-import { S as StandardHandlerInterceptorOptions, a as StandardHandlerPlugin, b as StandardHandlerOptions } from '../shared/server.YZzrREz9.js';
-import { C as Context, F as ProcedureClientInterceptorOptions } from '../shared/server.DPWk5pjW.js';
+import { S as StandardHandlerInterceptorOptions, a as StandardHandlerPlugin, b as StandardHandlerOptions } from '../shared/server.-ACo36I0.js';
+import { C as Context, F as ProcedureClientInterceptorOptions } from '../shared/server.DD2C4ujN.js';
 import { Meta, ORPCError as ORPCError$1 } from '@orpc/contract';
 import { ORPCError } from '@orpc/client';
 
@@ -12,7 +12,7 @@ interface BatchHandlerOptions<T extends Context> {
      *
      * @default 10
      */
-    maxSize?: Value<number, [StandardHandlerInterceptorOptions<T>]>;
+    maxSize?: Value<Promisable<number>, [StandardHandlerInterceptorOptions<T>]>;
     /**
      * Map the request before processing it.
      *
@@ -24,19 +24,19 @@ interface BatchHandlerOptions<T extends Context> {
      *
      * @default 207
      */
-    successStatus?: Value<number, [responses: Promise<BatchResponseBodyItem>[], batchOptions: StandardHandlerInterceptorOptions<T>]>;
+    successStatus?: Value<Promisable<number>, [responses: Promise<BatchResponseBodyItem>[], batchOptions: StandardHandlerInterceptorOptions<T>]>;
     /**
      * success batch response headers.
      *
      * @default {}
      */
-    headers?: Value<StandardHeaders, [responses: Promise<BatchResponseBodyItem>[], batchOptions: StandardHandlerInterceptorOptions<T>]>;
+    headers?: Value<Promisable<StandardHeaders>, [responses: Promise<BatchResponseBodyItem>[], batchOptions: StandardHandlerInterceptorOptions<T>]>;
 }
 /**
- * The Batch Request/Response Plugin allows you to combine multiple requests and responses into a single batch,
+ * The Batch Requests Plugin allows you to combine multiple requests and responses into a single batch,
  * reducing the overhead of sending each one separately.
  *
- * @see {@link https://orpc.unnoq.com/docs/plugins/batch-request-response Batch Request/Response Plugin Docs}
+ * @see {@link https://orpc.unnoq.com/docs/plugins/batch-requests Batch Requests Plugin Docs}
  */
 declare class BatchHandlerPlugin<T extends Context> implements StandardHandlerPlugin<T> {
     private readonly maxSize;
@@ -49,8 +49,8 @@ declare class BatchHandlerPlugin<T extends Context> implements StandardHandlerPl
 }
 
 interface CORSOptions<T extends Context> {
-    origin?: Value<string | readonly string[] | null | undefined, [origin: string, options: StandardHandlerInterceptorOptions<T>]>;
-    timingOrigin?: Value<string | readonly string[] | null | undefined, [origin: string, options: StandardHandlerInterceptorOptions<T>]>;
+    origin?: Value<Promisable<string | readonly string[] | null | undefined>, [origin: string, options: StandardHandlerInterceptorOptions<T>]>;
+    timingOrigin?: Value<Promisable<string | readonly string[] | null | undefined>, [origin: string, options: StandardHandlerInterceptorOptions<T>]>;
     allowMethods?: readonly string[];
     allowHeaders?: readonly string[];
     maxAge?: number;
@@ -88,21 +88,21 @@ interface SimpleCsrfProtectionHandlerPluginOptions<T extends Context> {
      *
      * @default 'x-csrf-token'
      */
-    headerName?: Value<string, [options: StandardHandlerInterceptorOptions<T>]>;
+    headerName?: Value<Promisable<string>, [options: StandardHandlerInterceptorOptions<T>]>;
     /**
      * The value of the header to check.
      *
      * @default 'orpc'
      *
      */
-    headerValue?: Value<string, [options: StandardHandlerInterceptorOptions<T>]>;
+    headerValue?: Value<Promisable<string>, [options: StandardHandlerInterceptorOptions<T>]>;
     /**
      * Exclude a procedure from the plugin.
      *
      * @default false
      *
      */
-    exclude?: Value<boolean, [options: ProcedureClientInterceptorOptions<T, Record<never, never>, Meta>]>;
+    exclude?: Value<Promisable<boolean>, [options: ProcedureClientInterceptorOptions<T, Record<never, never>, Meta>]>;
     /**
      * The error thrown when the CSRF token is invalid.
      *

package/dist/plugins/index.mjs

@@ -1,6 +1,6 @@
 import { value, isAsyncIteratorObject } from '@orpc/shared';
-import { parseBatchRequest, toBatchResponse } from '@orpc/standard-server/batch';
 import { flattenHeader } from '@orpc/standard-server';
+import { parseBatchRequest, toBatchResponse } from '@orpc/standard-server/batch';
 import { ORPCError } from '@orpc/client';
 export { S as StrictGetMethodPlugin } from '../shared/server.BW-nUGgA.mjs';
 import '@orpc/contract';
@@ -26,7 +26,8 @@ class BatchHandlerPlugin {
   init(options) {
     options.rootInterceptors ??= [];
     options.rootInterceptors.unshift(async (options2) => {
-      if (options2.request.headers["x-orpc-batch"] !== "1") {
+      const xHeader = flattenHeader(options2.request.headers["x-orpc-batch"]);
+      if (xHeader === void 0) {
         return options2.next();
       }
       let isParsing = false;
@@ -69,9 +70,10 @@ class BatchHandlerPlugin {
         await Promise.race(responses);
         const status = await value(this.successStatus, responses, options2);
         const headers = await value(this.headers, responses, options2);
-        const response = toBatchResponse({
+        const response = await toBatchResponse({
           status,
           headers,
+          mode: xHeader === "buffered" ? "buffered" : "streaming",
           body: async function* () {
             const promises = [...responses];
             while (true) {

package/dist/shared/{server.YZzrREz9.d.ts → server.-ACo36I0.d.ts}

@@ -1,8 +1,8 @@
 import { HTTPPath, ORPCError } from '@orpc/client';
-import { Meta, InferSchemaOutput, AnySchema, ErrorFromErrorMap } from '@orpc/contract';
-import { Interceptor, ThrowableError } from '@orpc/shared';
+import { Meta } from '@orpc/contract';
+import { Interceptor } from '@orpc/shared';
 import { StandardResponse, StandardLazyRequest } from '@orpc/standard-server';
-import { C as Context, R as Router, f as AnyRouter, h as AnyProcedure, F as ProcedureClientInterceptorOptions } from './server.DPWk5pjW.js';
+import { C as Context, R as Router, f as AnyRouter, h as AnyProcedure, F as ProcedureClientInterceptorOptions } from './server.DD2C4ujN.js';
 
 interface StandardHandlerPlugin<T extends Context> {
     order?: number;
@@ -49,16 +49,16 @@ interface StandardHandlerOptions<TContext extends Context> {
     /**
      * Interceptors at the request level, helpful when you want catch errors
      */
-    interceptors?: Interceptor<StandardHandlerInterceptorOptions<TContext>, StandardHandleResult, ThrowableError>[];
+    interceptors?: Interceptor<StandardHandlerInterceptorOptions<TContext>, Promise<StandardHandleResult>>[];
     /**
      * Interceptors at the root level, helpful when you want override the request/response
      */
-    rootInterceptors?: Interceptor<StandardHandlerInterceptorOptions<TContext>, StandardHandleResult, ThrowableError>[];
+    rootInterceptors?: Interceptor<StandardHandlerInterceptorOptions<TContext>, Promise<StandardHandleResult>>[];
     /**
      *
      * Interceptors for procedure client.
      */
-    clientInterceptors?: Interceptor<ProcedureClientInterceptorOptions<TContext, Record<never, never>, Meta>, InferSchemaOutput<AnySchema>, ErrorFromErrorMap<Record<never, never>>>[];
+    clientInterceptors?: Interceptor<ProcedureClientInterceptorOptions<TContext, Record<never, never>, Meta>, Promise<unknown>>[];
 }
 declare class StandardHandler<T extends Context> {
     private readonly matcher;

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

@@ -1,6 +1,6 @@
 import { StandardRPCJsonSerializerOptions } from '@orpc/client/standard';
-import { C as Context, R as Router } from './server.DPWk5pjW.js';
-import { b as StandardHandlerOptions, i as StandardHandler } from './server.YZzrREz9.js';
+import { C as Context, R as Router } from './server.DD2C4ujN.js';
+import { b as StandardHandlerOptions, i as StandardHandler } from './server.-ACo36I0.js';
 
 interface StandardRPCHandlerOptions<T extends Context> extends StandardHandlerOptions<T>, StandardRPCJsonSerializerOptions {
 }

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

@@ -1,6 +1,6 @@
 import { StandardRPCJsonSerializerOptions } from '@orpc/client/standard';
-import { C as Context, R as Router } from './server.DPWk5pjW.mjs';
-import { b as StandardHandlerOptions, i as StandardHandler } from './server.eWLxY3lq.mjs';
+import { C as Context, R as Router } from './server.DD2C4ujN.mjs';
+import { b as StandardHandlerOptions, i as StandardHandler } from './server.Dq8xr7PQ.mjs';
 
 interface StandardRPCHandlerOptions<T extends Context> extends StandardHandlerOptions<T>, StandardRPCJsonSerializerOptions {
 }

package/dist/shared/{server.QUe9N8P4.d.mts → server.BliFSTnG.d.mts}

@@ -1,5 +1,5 @@
-import { C as Context } from './server.DPWk5pjW.mjs';
-import { g as StandardHandleOptions } from './server.eWLxY3lq.mjs';
+import { C as Context } from './server.DD2C4ujN.mjs';
+import { g as StandardHandleOptions } from './server.Dq8xr7PQ.mjs';
 
 type FriendlyStandardHandleOptions<T extends Context> = Omit<StandardHandleOptions<T>, 'context'> & (Record<never, never> extends T ? {
     context?: T;

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

@@ -1,6 +1,7 @@
 import { toHttpPath, StandardRPCJsonSerializer, StandardRPCSerializer } from '@orpc/client/standard';
 import { ORPCError, toORPCError } from '@orpc/client';
-import { toArray, intercept, parseEmptyableJSON } from '@orpc/shared';
+import { toArray, intercept, parseEmptyableJSON, NullProtoObj } from '@orpc/shared';
+import { flattenHeader } from '@orpc/standard-server';
 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 {
@@ -59,8 +60,10 @@ class StandardHandler {
               isDecoding = true;
               const input = await this.codec.decode(request2, match.params, match.procedure);
               isDecoding = false;
-              const lastEventId = Array.isArray(request2.headers["last-event-id"]) ? request2.headers["last-event-id"].at(-1) : request2.headers["last-event-id"];
-              const output = await client(input, { signal: request2.signal, lastEventId });
+              const output = await client(input, {
+                signal: request2.signal,
+                lastEventId: flattenHeader(request2.headers["last-event-id"])
+              });
               const response = this.codec.encode(output, match.procedure);
               return {
                 matched: true,
@@ -109,7 +112,7 @@ class StandardRPCCodec {
 }
 
 class StandardRPCMatcher {
-  tree = {};
+  tree = new NullProtoObj();
   pendingRouters = [];
   init(router, path = []) {
     const laziedOptions = traverseContractProcedures({ router, path }, ({ path: path2, contract }) => {

package/dist/shared/{server.DPWk5pjW.d.ts → server.DD2C4ujN.d.mts}

@@ -1,6 +1,6 @@
 import { ORPCErrorCode, ORPCErrorOptions, ORPCError, HTTPPath, ClientContext, Client } from '@orpc/client';
 import { ErrorMap, ErrorMapItem, InferSchemaInput, AnySchema, Meta, ContractProcedureDef, InferSchemaOutput, ErrorFromErrorMap, AnyContractRouter, ContractProcedure } from '@orpc/contract';
-import { MaybeOptionalOptions, Promisable, Interceptor, Value } from '@orpc/shared';
+import { MaybeOptionalOptions, Promisable, Interceptor, PromiseWithError, Value } from '@orpc/shared';
 
 type Context = Record<PropertyKey, any>;
 type MergedInitialContext<TInitial extends Context, TAdditional extends Context, TCurrent extends Context> = TInitial & Omit<TAdditional, keyof TCurrent>;
@@ -127,11 +127,11 @@ type CreateProcedureClientOptions<TInitialContext extends Context, TOutputSchema
      * This is helpful for logging and analytics.
      */
     path?: readonly string[];
-    interceptors?: Interceptor<ProcedureClientInterceptorOptions<TInitialContext, TErrorMap, TMeta>, InferSchemaOutput<TOutputSchema>, ErrorFromErrorMap<TErrorMap>>[];
+    interceptors?: Interceptor<ProcedureClientInterceptorOptions<TInitialContext, TErrorMap, TMeta>, PromiseWithError<InferSchemaOutput<TOutputSchema>, ErrorFromErrorMap<TErrorMap>>>[];
 } & (Record<never, never> extends TInitialContext ? {
-    context?: Value<TInitialContext, [clientContext: TClientContext]>;
+    context?: Value<Promisable<TInitialContext>, [clientContext: TClientContext]>;
 } : {
-    context: Value<TInitialContext, [clientContext: TClientContext]>;
+    context: Value<Promisable<TInitialContext>, [clientContext: TClientContext]>;
 });
 /**
  * Create Server-side client from a procedure.

package/dist/shared/{server.DPWk5pjW.d.mts → server.DD2C4ujN.d.ts}

@@ -1,6 +1,6 @@
 import { ORPCErrorCode, ORPCErrorOptions, ORPCError, HTTPPath, ClientContext, Client } from '@orpc/client';
 import { ErrorMap, ErrorMapItem, InferSchemaInput, AnySchema, Meta, ContractProcedureDef, InferSchemaOutput, ErrorFromErrorMap, AnyContractRouter, ContractProcedure } from '@orpc/contract';
-import { MaybeOptionalOptions, Promisable, Interceptor, Value } from '@orpc/shared';
+import { MaybeOptionalOptions, Promisable, Interceptor, PromiseWithError, Value } from '@orpc/shared';
 
 type Context = Record<PropertyKey, any>;
 type MergedInitialContext<TInitial extends Context, TAdditional extends Context, TCurrent extends Context> = TInitial & Omit<TAdditional, keyof TCurrent>;
@@ -127,11 +127,11 @@ type CreateProcedureClientOptions<TInitialContext extends Context, TOutputSchema
      * This is helpful for logging and analytics.
      */
     path?: readonly string[];
-    interceptors?: Interceptor<ProcedureClientInterceptorOptions<TInitialContext, TErrorMap, TMeta>, InferSchemaOutput<TOutputSchema>, ErrorFromErrorMap<TErrorMap>>[];
+    interceptors?: Interceptor<ProcedureClientInterceptorOptions<TInitialContext, TErrorMap, TMeta>, PromiseWithError<InferSchemaOutput<TOutputSchema>, ErrorFromErrorMap<TErrorMap>>>[];
 } & (Record<never, never> extends TInitialContext ? {
-    context?: Value<TInitialContext, [clientContext: TClientContext]>;
+    context?: Value<Promisable<TInitialContext>, [clientContext: TClientContext]>;
 } : {
-    context: Value<TInitialContext, [clientContext: TClientContext]>;
+    context: Value<Promisable<TInitialContext>, [clientContext: TClientContext]>;
 });
 /**
  * Create Server-side client from a procedure.

package/dist/shared/{server.eWLxY3lq.d.mts → server.Dq8xr7PQ.d.mts}

@@ -1,8 +1,8 @@
 import { HTTPPath, ORPCError } from '@orpc/client';
-import { Meta, InferSchemaOutput, AnySchema, ErrorFromErrorMap } from '@orpc/contract';
-import { Interceptor, ThrowableError } from '@orpc/shared';
+import { Meta } from '@orpc/contract';
+import { Interceptor } from '@orpc/shared';
 import { StandardResponse, StandardLazyRequest } from '@orpc/standard-server';
-import { C as Context, R as Router, f as AnyRouter, h as AnyProcedure, F as ProcedureClientInterceptorOptions } from './server.DPWk5pjW.mjs';
+import { C as Context, R as Router, f as AnyRouter, h as AnyProcedure, F as ProcedureClientInterceptorOptions } from './server.DD2C4ujN.mjs';
 
 interface StandardHandlerPlugin<T extends Context> {
     order?: number;
@@ -49,16 +49,16 @@ interface StandardHandlerOptions<TContext extends Context> {
     /**
      * Interceptors at the request level, helpful when you want catch errors
      */
-    interceptors?: Interceptor<StandardHandlerInterceptorOptions<TContext>, StandardHandleResult, ThrowableError>[];
+    interceptors?: Interceptor<StandardHandlerInterceptorOptions<TContext>, Promise<StandardHandleResult>>[];
     /**
      * Interceptors at the root level, helpful when you want override the request/response
      */
-    rootInterceptors?: Interceptor<StandardHandlerInterceptorOptions<TContext>, StandardHandleResult, ThrowableError>[];
+    rootInterceptors?: Interceptor<StandardHandlerInterceptorOptions<TContext>, Promise<StandardHandleResult>>[];
     /**
      *
      * Interceptors for procedure client.
      */
-    clientInterceptors?: Interceptor<ProcedureClientInterceptorOptions<TContext, Record<never, never>, Meta>, InferSchemaOutput<AnySchema>, ErrorFromErrorMap<Record<never, never>>>[];
+    clientInterceptors?: Interceptor<ProcedureClientInterceptorOptions<TContext, Record<never, never>, Meta>, Promise<unknown>>[];
 }
 declare class StandardHandler<T extends Context> {
     private readonly matcher;

package/dist/shared/{server.BjiJH9Vo.d.ts → server.IG2MjhrD.d.ts}

@@ -1,5 +1,5 @@
-import { C as Context } from './server.DPWk5pjW.js';
-import { g as StandardHandleOptions } from './server.YZzrREz9.js';
+import { C as Context } from './server.DD2C4ujN.js';
+import { g as StandardHandleOptions } from './server.-ACo36I0.js';
 
 type FriendlyStandardHandleOptions<T extends Context> = Omit<StandardHandleOptions<T>, 'context'> & (Record<never, never> extends T ? {
     context?: T;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/server",
   "type": "module",
-  "version": "1.2.0",
+  "version": "1.4.0",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -39,6 +39,11 @@
       "import": "./dist/adapters/node/index.mjs",
       "default": "./dist/adapters/node/index.mjs"
     },
+    "./aws-lambda": {
+      "types": "./dist/adapters/aws-lambda/index.d.mts",
+      "import": "./dist/adapters/aws-lambda/index.mjs",
+      "default": "./dist/adapters/aws-lambda/index.mjs"
+    },
     "./websocket": {
       "types": "./dist/adapters/websocket/index.d.mts",
       "import": "./dist/adapters/websocket/index.mjs",
@@ -58,6 +63,11 @@
       "types": "./dist/adapters/bun-ws/index.d.mts",
       "import": "./dist/adapters/bun-ws/index.mjs",
       "default": "./dist/adapters/bun-ws/index.mjs"
+    },
+    "./message-port": {
+      "types": "./dist/adapters/message-port/index.d.mts",
+      "import": "./dist/adapters/message-port/index.mjs",
+      "default": "./dist/adapters/message-port/index.mjs"
     }
   },
   "files": [
@@ -76,17 +86,18 @@
     }
   },
   "dependencies": {
-    "@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"
+    "@orpc/client": "1.4.0",
+    "@orpc/shared": "1.4.0",
+    "@orpc/contract": "1.4.0",
+    "@orpc/standard-server": "1.4.0",
+    "@orpc/standard-server-aws-lambda": "1.4.0",
+    "@orpc/standard-server-node": "1.4.0",
+    "@orpc/standard-server-fetch": "1.4.0",
+    "@orpc/standard-server-peer": "1.4.0"
   },
   "devDependencies": {
     "@types/ws": "^8.18.1",
-    "crossws": "^0.3.4",
+    "crossws": "^0.4.1",
     "next": "^15.3.0",
     "supertest": "^7.1.0",
     "ws": "^8.18.1"