@orpc/server 1.0.0-beta.3 → 1.0.0-beta.4

package/README.md

@@ -117,6 +117,14 @@ export const createPlanet = os
 export const router = { planet: { list: listPlanet, find: findPlanet, create: createPlanet } }
 ```
 
+## Sponsors
+
+<p align="center">
+  <a href="https://cdn.jsdelivr.net/gh/unnoq/unnoq/sponsors.svg">
+    <img src='https://cdn.jsdelivr.net/gh/unnoq/unnoq/sponsors.svg'/>
+  </a>
+</p>
+
 ## License
 
 Distributed under the MIT License. See [LICENSE](https://github.com/unnoq/orpc/blob/main/LICENSE) for more information.

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

@@ -1,8 +1,9 @@
-import { MaybeOptionalOptions } from '@orpc/shared';
-import { ToFetchResponseOptions } from '@orpc/standard-server-fetch';
 import { C as Context, R as Router } from '../../shared/server.MZvbGc3n.mjs';
-import { S as StandardHandleOptions } from '../../shared/server.P4_D9lKb.mjs';
-import { S as StandardRPCHandlerOptions } from '../../shared/server.BqBN5WhH.mjs';
+import { c as StandardHandlerPlugin, S as StandardHandleOptions, i as StandardHandler } from '../../shared/server.DJqfB27m.mjs';
+import { Interceptor, MaybeOptionalOptions } from '@orpc/shared';
+import { F as FriendlyStandardHandleOptions } from '../../shared/server.C-CCcROC.mjs';
+import { ToFetchResponseOptions } from '@orpc/standard-server-fetch';
+import { S as StandardRPCHandlerOptions } from '../../shared/server.CIbpOMZX.mjs';
 import '@orpc/client';
 import '@orpc/contract';
 import '@orpc/standard-server';
@@ -15,14 +16,39 @@ type FetchHandleResult = {
     matched: false;
     response: undefined;
 };
-interface FetchHandler<T extends Context> {
-    handle(request: Request, ...rest: MaybeOptionalOptions<StandardHandleOptions<T> & ToFetchResponseOptions>): Promise<FetchHandleResult>;
+interface FetchHandlerPlugin<T extends Context> extends StandardHandlerPlugin<T> {
+    initRuntimeAdapter?(options: FetchHandlerOptions<T>): void;
 }
-
-declare class RPCHandler<T extends Context> implements FetchHandler<T> {
+interface FetchHandlerInterceptorOptions<T extends Context> extends StandardHandleOptions<T> {
+    request: Request;
+    toFetchResponseOptions: ToFetchResponseOptions;
+}
+interface FetchHandlerOptions<T extends Context> extends ToFetchResponseOptions {
+    adapterInterceptors?: Interceptor<FetchHandlerInterceptorOptions<T>, FetchHandleResult, unknown>[];
+    plugins?: FetchHandlerPlugin<T>[];
+}
+declare class FetchHandler<T extends Context> {
     private readonly standardHandler;
-    constructor(router: Router<any, T>, options?: NoInfer<StandardRPCHandlerOptions<T>>);
-    handle(request: Request, ...[options,]: MaybeOptionalOptions<StandardHandleOptions<T> & ToFetchResponseOptions>): Promise<FetchHandleResult>;
+    private readonly toFetchResponseOptions;
+    private readonly adapterInterceptors;
+    constructor(standardHandler: StandardHandler<T>, options?: NoInfer<FetchHandlerOptions<T>>);
+    handle(request: Request, ...rest: MaybeOptionalOptions<FriendlyStandardHandleOptions<T>>): Promise<FetchHandleResult>;
+}
+
+interface BodyLimitPluginOptions {
+    /**
+     * The maximum size of the body in bytes.
+     */
+    maxBodySize: number;
+}
+declare class BodyLimitPlugin<T extends Context> implements FetchHandlerPlugin<T> {
+    private readonly maxBodySize;
+    constructor(options: BodyLimitPluginOptions);
+    initRuntimeAdapter(options: FetchHandlerOptions<T>): void;
+}
+
+declare class RPCHandler<T extends Context> extends FetchHandler<T> {
+    constructor(router: Router<any, T>, options?: NoInfer<FetchHandlerOptions<T> & StandardRPCHandlerOptions<T>>);
 }
 
-export { type FetchHandleResult, type FetchHandler, RPCHandler };
+export { BodyLimitPlugin, type BodyLimitPluginOptions, type FetchHandleResult, FetchHandler, type FetchHandlerInterceptorOptions, type FetchHandlerOptions, type FetchHandlerPlugin, RPCHandler };

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

@@ -1,8 +1,9 @@
-import { MaybeOptionalOptions } from '@orpc/shared';
-import { ToFetchResponseOptions } from '@orpc/standard-server-fetch';
 import { C as Context, R as Router } from '../../shared/server.MZvbGc3n.js';
-import { S as StandardHandleOptions } from '../../shared/server.CPqNKiJp.js';
-import { S as StandardRPCHandlerOptions } from '../../shared/server.Dm3ZuTuI.js';
+import { c as StandardHandlerPlugin, S as StandardHandleOptions, i as StandardHandler } from '../../shared/server.23VRZIfj.js';
+import { Interceptor, MaybeOptionalOptions } from '@orpc/shared';
+import { F as FriendlyStandardHandleOptions } from '../../shared/server.BG5ftPWa.js';
+import { ToFetchResponseOptions } from '@orpc/standard-server-fetch';
+import { S as StandardRPCHandlerOptions } from '../../shared/server.DCcCuA52.js';
 import '@orpc/client';
 import '@orpc/contract';
 import '@orpc/standard-server';
@@ -15,14 +16,39 @@ type FetchHandleResult = {
     matched: false;
     response: undefined;
 };
-interface FetchHandler<T extends Context> {
-    handle(request: Request, ...rest: MaybeOptionalOptions<StandardHandleOptions<T> & ToFetchResponseOptions>): Promise<FetchHandleResult>;
+interface FetchHandlerPlugin<T extends Context> extends StandardHandlerPlugin<T> {
+    initRuntimeAdapter?(options: FetchHandlerOptions<T>): void;
 }
-
-declare class RPCHandler<T extends Context> implements FetchHandler<T> {
+interface FetchHandlerInterceptorOptions<T extends Context> extends StandardHandleOptions<T> {
+    request: Request;
+    toFetchResponseOptions: ToFetchResponseOptions;
+}
+interface FetchHandlerOptions<T extends Context> extends ToFetchResponseOptions {
+    adapterInterceptors?: Interceptor<FetchHandlerInterceptorOptions<T>, FetchHandleResult, unknown>[];
+    plugins?: FetchHandlerPlugin<T>[];
+}
+declare class FetchHandler<T extends Context> {
     private readonly standardHandler;
-    constructor(router: Router<any, T>, options?: NoInfer<StandardRPCHandlerOptions<T>>);
-    handle(request: Request, ...[options,]: MaybeOptionalOptions<StandardHandleOptions<T> & ToFetchResponseOptions>): Promise<FetchHandleResult>;
+    private readonly toFetchResponseOptions;
+    private readonly adapterInterceptors;
+    constructor(standardHandler: StandardHandler<T>, options?: NoInfer<FetchHandlerOptions<T>>);
+    handle(request: Request, ...rest: MaybeOptionalOptions<FriendlyStandardHandleOptions<T>>): Promise<FetchHandleResult>;
+}
+
+interface BodyLimitPluginOptions {
+    /**
+     * The maximum size of the body in bytes.
+     */
+    maxBodySize: number;
+}
+declare class BodyLimitPlugin<T extends Context> implements FetchHandlerPlugin<T> {
+    private readonly maxBodySize;
+    constructor(options: BodyLimitPluginOptions);
+    initRuntimeAdapter(options: FetchHandlerOptions<T>): void;
+}
+
+declare class RPCHandler<T extends Context> extends FetchHandler<T> {
+    constructor(router: Router<any, T>, options?: NoInfer<FetchHandlerOptions<T> & StandardRPCHandlerOptions<T>>);
 }
 
-export { type FetchHandleResult, type FetchHandler, RPCHandler };
+export { BodyLimitPlugin, type BodyLimitPluginOptions, type FetchHandleResult, FetchHandler, type FetchHandlerInterceptorOptions, type FetchHandlerOptions, type FetchHandlerPlugin, RPCHandler };

package/dist/adapters/fetch/index.mjs

@@ -1,9 +1,9 @@
-export { R as RPCHandler } from '../../shared/server.Del5OmaY.mjs';
-import '@orpc/client/standard';
-import '@orpc/standard-server-fetch';
-import '../../shared/server.BY9sDlwl.mjs';
+export { B as BodyLimitPlugin, F as FetchHandler, R as RPCHandler } from '../../shared/server.B4eSvRkD.mjs';
 import '@orpc/client';
+import '@orpc/client/standard';
+import '../../shared/server.DnR6v9pj.mjs';
 import '@orpc/shared';
-import '../../shared/server.Dba3Iiyp.mjs';
 import '../../shared/server.BtxZnWJ9.mjs';
 import '@orpc/contract';
+import '@orpc/standard-server-fetch';
+import '../../shared/server.BVwwTHyO.mjs';

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

@@ -1,11 +1,12 @@
 import { FetchHandler } from '../fetch/index.mjs';
-export { FetchHandleResult, RPCHandler } from '../fetch/index.mjs';
+export { BodyLimitPlugin, BodyLimitPluginOptions, FetchHandleResult, FetchHandlerInterceptorOptions, FetchHandlerOptions, FetchHandlerPlugin, RPCHandler } from '../fetch/index.mjs';
 import { Value, MaybeOptionalOptions } from '@orpc/shared';
 import { Context as Context$1, MiddlewareHandler } from 'hono';
 import { C as Context } from '../../shared/server.MZvbGc3n.mjs';
-import { S as StandardHandleOptions } from '../../shared/server.P4_D9lKb.mjs';
+import { S as StandardHandleOptions } from '../../shared/server.DJqfB27m.mjs';
+import '../../shared/server.C-CCcROC.mjs';
 import '@orpc/standard-server-fetch';
-import '../../shared/server.BqBN5WhH.mjs';
+import '../../shared/server.CIbpOMZX.mjs';
 import '@orpc/client/standard';
 import '@orpc/client';
 import '@orpc/contract';

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

@@ -1,11 +1,12 @@
 import { FetchHandler } from '../fetch/index.js';
-export { FetchHandleResult, RPCHandler } from '../fetch/index.js';
+export { BodyLimitPlugin, BodyLimitPluginOptions, FetchHandleResult, FetchHandlerInterceptorOptions, FetchHandlerOptions, FetchHandlerPlugin, RPCHandler } from '../fetch/index.js';
 import { Value, MaybeOptionalOptions } from '@orpc/shared';
 import { Context as Context$1, MiddlewareHandler } from 'hono';
 import { C as Context } from '../../shared/server.MZvbGc3n.js';
-import { S as StandardHandleOptions } from '../../shared/server.CPqNKiJp.js';
+import { S as StandardHandleOptions } from '../../shared/server.23VRZIfj.js';
+import '../../shared/server.BG5ftPWa.js';
 import '@orpc/standard-server-fetch';
-import '../../shared/server.Dm3ZuTuI.js';
+import '../../shared/server.DCcCuA52.js';
 import '@orpc/client/standard';
 import '@orpc/client';
 import '@orpc/contract';

package/dist/adapters/hono/index.mjs

@@ -1,12 +1,12 @@
-export { R as RPCHandler } from '../../shared/server.Del5OmaY.mjs';
+export { B as BodyLimitPlugin, F as FetchHandler, R as RPCHandler } from '../../shared/server.B4eSvRkD.mjs';
 import { value } from '@orpc/shared';
-import '@orpc/client/standard';
-import '@orpc/standard-server-fetch';
-import '../../shared/server.BY9sDlwl.mjs';
 import '@orpc/client';
-import '../../shared/server.Dba3Iiyp.mjs';
+import '@orpc/client/standard';
+import '../../shared/server.DnR6v9pj.mjs';
 import '../../shared/server.BtxZnWJ9.mjs';
 import '@orpc/contract';
+import '@orpc/standard-server-fetch';
+import '../../shared/server.BVwwTHyO.mjs';
 
 function createMiddleware(handler, ...[options]) {
   return async (c, next) => {

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

@@ -1,11 +1,12 @@
 import { FetchHandler } from '../fetch/index.mjs';
-export { FetchHandleResult, RPCHandler } from '../fetch/index.mjs';
+export { BodyLimitPlugin, BodyLimitPluginOptions, FetchHandleResult, FetchHandlerInterceptorOptions, FetchHandlerOptions, FetchHandlerPlugin, RPCHandler } from '../fetch/index.mjs';
 import { Value, MaybeOptionalOptions } from '@orpc/shared';
 import { NextRequest } from 'next/server';
 import { C as Context } from '../../shared/server.MZvbGc3n.mjs';
-import { S as StandardHandleOptions } from '../../shared/server.P4_D9lKb.mjs';
+import { S as StandardHandleOptions } from '../../shared/server.DJqfB27m.mjs';
+import '../../shared/server.C-CCcROC.mjs';
 import '@orpc/standard-server-fetch';
-import '../../shared/server.BqBN5WhH.mjs';
+import '../../shared/server.CIbpOMZX.mjs';
 import '@orpc/client/standard';
 import '@orpc/client';
 import '@orpc/contract';

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

@@ -1,11 +1,12 @@
 import { FetchHandler } from '../fetch/index.js';
-export { FetchHandleResult, RPCHandler } from '../fetch/index.js';
+export { BodyLimitPlugin, BodyLimitPluginOptions, FetchHandleResult, FetchHandlerInterceptorOptions, FetchHandlerOptions, FetchHandlerPlugin, RPCHandler } from '../fetch/index.js';
 import { Value, MaybeOptionalOptions } from '@orpc/shared';
 import { NextRequest } from 'next/server';
 import { C as Context } from '../../shared/server.MZvbGc3n.js';
-import { S as StandardHandleOptions } from '../../shared/server.CPqNKiJp.js';
+import { S as StandardHandleOptions } from '../../shared/server.23VRZIfj.js';
+import '../../shared/server.BG5ftPWa.js';
 import '@orpc/standard-server-fetch';
-import '../../shared/server.Dm3ZuTuI.js';
+import '../../shared/server.DCcCuA52.js';
 import '@orpc/client/standard';
 import '@orpc/client';
 import '@orpc/contract';

package/dist/adapters/next/index.mjs

@@ -1,12 +1,12 @@
-export { R as RPCHandler } from '../../shared/server.Del5OmaY.mjs';
+export { B as BodyLimitPlugin, F as FetchHandler, R as RPCHandler } from '../../shared/server.B4eSvRkD.mjs';
 import { value } from '@orpc/shared';
-import '@orpc/client/standard';
-import '@orpc/standard-server-fetch';
-import '../../shared/server.BY9sDlwl.mjs';
 import '@orpc/client';
-import '../../shared/server.Dba3Iiyp.mjs';
+import '@orpc/client/standard';
+import '../../shared/server.DnR6v9pj.mjs';
 import '../../shared/server.BtxZnWJ9.mjs';
 import '@orpc/contract';
+import '@orpc/standard-server-fetch';
+import '../../shared/server.BVwwTHyO.mjs';
 
 function serve(handler, ...[options]) {
   const main = async (req) => {

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

@@ -1,36 +1,53 @@
-import { MaybeOptionalOptions } from '@orpc/shared';
-import { SendStandardResponseOptions } from '@orpc/standard-server-node';
 import { C as Context, R as Router } from '../../shared/server.MZvbGc3n.mjs';
-import { S as StandardHandleOptions } from '../../shared/server.P4_D9lKb.mjs';
-import { S as StandardRPCHandlerOptions } from '../../shared/server.BqBN5WhH.mjs';
-import { IncomingMessage, ServerResponse } from 'node:http';
-import { Http2ServerRequest, Http2ServerResponse } from 'node:http2';
+import { SendStandardResponseOptions, NodeHttpRequest, NodeHttpResponse } from '@orpc/standard-server-node';
+import { c as StandardHandlerPlugin, S as StandardHandleOptions, i as StandardHandler } from '../../shared/server.DJqfB27m.mjs';
+import { Interceptor, MaybeOptionalOptions } from '@orpc/shared';
+import { F as FriendlyStandardHandleOptions } from '../../shared/server.C-CCcROC.mjs';
+import { S as StandardRPCHandlerOptions } from '../../shared/server.CIbpOMZX.mjs';
 import '@orpc/client';
 import '@orpc/contract';
 import '@orpc/standard-server';
 import '@orpc/client/standard';
 
-type NodeHttpRequest = (IncomingMessage | Http2ServerRequest) & {
-    /**
-     * Replace `req.url` with `req.originalUrl` when `req.originalUrl` is available.
-     * This is useful for `express.js` middleware.
-     */
-    originalUrl?: string;
-};
-type NodeHttpResponse = ServerResponse | Http2ServerResponse;
 type NodeHttpHandleResult = {
     matched: true;
 } | {
     matched: false;
 };
-interface NodeHttpHandler<T extends Context> {
-    handle(req: NodeHttpRequest, res: NodeHttpResponse, ...rest: MaybeOptionalOptions<StandardHandleOptions<T> & SendStandardResponseOptions>): Promise<NodeHttpHandleResult>;
+interface NodeHttpHandlerPlugin<T extends Context> extends StandardHandlerPlugin<T> {
+    initRuntimeAdapter?(options: NodeHttpHandlerOptions<T>): void;
 }
-
-declare class RPCHandler<T extends Context> implements NodeHttpHandler<T> {
+interface NodeHttpHandlerInterceptorOptions<T extends Context> extends StandardHandleOptions<T> {
+    request: NodeHttpRequest;
+    response: NodeHttpResponse;
+    sendStandardResponseOptions: SendStandardResponseOptions;
+}
+interface NodeHttpHandlerOptions<T extends Context> extends SendStandardResponseOptions {
+    adapterInterceptors?: Interceptor<NodeHttpHandlerInterceptorOptions<T>, NodeHttpHandleResult, unknown>[];
+    plugins?: NodeHttpHandlerPlugin<T>[];
+}
+declare class NodeHttpHandler<T extends Context> implements NodeHttpHandler<T> {
     private readonly standardHandler;
-    constructor(router: Router<any, T>, options?: NoInfer<StandardRPCHandlerOptions<T>>);
-    handle(req: NodeHttpRequest, res: NodeHttpResponse, ...[options,]: MaybeOptionalOptions<StandardHandleOptions<T> & SendStandardResponseOptions>): Promise<NodeHttpHandleResult>;
+    private readonly sendStandardResponseOptions;
+    private readonly adapterInterceptors;
+    constructor(standardHandler: StandardHandler<T>, options?: NoInfer<NodeHttpHandlerOptions<T>>);
+    handle(request: NodeHttpRequest, response: NodeHttpResponse, ...rest: MaybeOptionalOptions<FriendlyStandardHandleOptions<T>>): Promise<NodeHttpHandleResult>;
+}
+
+interface BodyLimitPluginOptions {
+    /**
+     * The maximum size of the body in bytes.
+     */
+    maxBodySize: number;
+}
+declare class BodyLimitPlugin<T extends Context> implements NodeHttpHandlerPlugin<T> {
+    private readonly maxBodySize;
+    constructor(options: BodyLimitPluginOptions);
+    initRuntimeAdapter(options: NodeHttpHandlerOptions<T>): void;
+}
+
+declare class RPCHandler<T extends Context> extends NodeHttpHandler<T> {
+    constructor(router: Router<any, T>, options?: NoInfer<StandardRPCHandlerOptions<T> & NodeHttpHandlerOptions<T>>);
 }
 
-export { type NodeHttpHandleResult, type NodeHttpHandler, type NodeHttpRequest, type NodeHttpResponse, RPCHandler };
+export { BodyLimitPlugin, type BodyLimitPluginOptions, type NodeHttpHandleResult, NodeHttpHandler, type NodeHttpHandlerInterceptorOptions, type NodeHttpHandlerOptions, type NodeHttpHandlerPlugin, RPCHandler };

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

@@ -1,36 +1,53 @@
-import { MaybeOptionalOptions } from '@orpc/shared';
-import { SendStandardResponseOptions } from '@orpc/standard-server-node';
 import { C as Context, R as Router } from '../../shared/server.MZvbGc3n.js';
-import { S as StandardHandleOptions } from '../../shared/server.CPqNKiJp.js';
-import { S as StandardRPCHandlerOptions } from '../../shared/server.Dm3ZuTuI.js';
-import { IncomingMessage, ServerResponse } from 'node:http';
-import { Http2ServerRequest, Http2ServerResponse } from 'node:http2';
+import { SendStandardResponseOptions, NodeHttpRequest, NodeHttpResponse } from '@orpc/standard-server-node';
+import { c as StandardHandlerPlugin, S as StandardHandleOptions, i as StandardHandler } from '../../shared/server.23VRZIfj.js';
+import { Interceptor, MaybeOptionalOptions } from '@orpc/shared';
+import { F as FriendlyStandardHandleOptions } from '../../shared/server.BG5ftPWa.js';
+import { S as StandardRPCHandlerOptions } from '../../shared/server.DCcCuA52.js';
 import '@orpc/client';
 import '@orpc/contract';
 import '@orpc/standard-server';
 import '@orpc/client/standard';
 
-type NodeHttpRequest = (IncomingMessage | Http2ServerRequest) & {
-    /**
-     * Replace `req.url` with `req.originalUrl` when `req.originalUrl` is available.
-     * This is useful for `express.js` middleware.
-     */
-    originalUrl?: string;
-};
-type NodeHttpResponse = ServerResponse | Http2ServerResponse;
 type NodeHttpHandleResult = {
     matched: true;
 } | {
     matched: false;
 };
-interface NodeHttpHandler<T extends Context> {
-    handle(req: NodeHttpRequest, res: NodeHttpResponse, ...rest: MaybeOptionalOptions<StandardHandleOptions<T> & SendStandardResponseOptions>): Promise<NodeHttpHandleResult>;
+interface NodeHttpHandlerPlugin<T extends Context> extends StandardHandlerPlugin<T> {
+    initRuntimeAdapter?(options: NodeHttpHandlerOptions<T>): void;
 }
-
-declare class RPCHandler<T extends Context> implements NodeHttpHandler<T> {
+interface NodeHttpHandlerInterceptorOptions<T extends Context> extends StandardHandleOptions<T> {
+    request: NodeHttpRequest;
+    response: NodeHttpResponse;
+    sendStandardResponseOptions: SendStandardResponseOptions;
+}
+interface NodeHttpHandlerOptions<T extends Context> extends SendStandardResponseOptions {
+    adapterInterceptors?: Interceptor<NodeHttpHandlerInterceptorOptions<T>, NodeHttpHandleResult, unknown>[];
+    plugins?: NodeHttpHandlerPlugin<T>[];
+}
+declare class NodeHttpHandler<T extends Context> implements NodeHttpHandler<T> {
     private readonly standardHandler;
-    constructor(router: Router<any, T>, options?: NoInfer<StandardRPCHandlerOptions<T>>);
-    handle(req: NodeHttpRequest, res: NodeHttpResponse, ...[options,]: MaybeOptionalOptions<StandardHandleOptions<T> & SendStandardResponseOptions>): Promise<NodeHttpHandleResult>;
+    private readonly sendStandardResponseOptions;
+    private readonly adapterInterceptors;
+    constructor(standardHandler: StandardHandler<T>, options?: NoInfer<NodeHttpHandlerOptions<T>>);
+    handle(request: NodeHttpRequest, response: NodeHttpResponse, ...rest: MaybeOptionalOptions<FriendlyStandardHandleOptions<T>>): Promise<NodeHttpHandleResult>;
+}
+
+interface BodyLimitPluginOptions {
+    /**
+     * The maximum size of the body in bytes.
+     */
+    maxBodySize: number;
+}
+declare class BodyLimitPlugin<T extends Context> implements NodeHttpHandlerPlugin<T> {
+    private readonly maxBodySize;
+    constructor(options: BodyLimitPluginOptions);
+    initRuntimeAdapter(options: NodeHttpHandlerOptions<T>): void;
+}
+
+declare class RPCHandler<T extends Context> extends NodeHttpHandler<T> {
+    constructor(router: Router<any, T>, options?: NoInfer<StandardRPCHandlerOptions<T> & NodeHttpHandlerOptions<T>>);
 }
 
-export { type NodeHttpHandleResult, type NodeHttpHandler, type NodeHttpRequest, type NodeHttpResponse, RPCHandler };
+export { BodyLimitPlugin, type BodyLimitPluginOptions, type NodeHttpHandleResult, NodeHttpHandler, type NodeHttpHandlerInterceptorOptions, type NodeHttpHandlerOptions, type NodeHttpHandlerPlugin, RPCHandler };

package/dist/adapters/node/index.mjs

@@ -1,32 +1,85 @@
-import { StandardRPCJsonSerializer, StandardRPCSerializer } from '@orpc/client/standard';
+import { ORPCError } from '@orpc/client';
+import { toArray, intercept, resolveMaybeOptionalOptions } from '@orpc/shared';
 import { toStandardLazyRequest, sendStandardResponse } from '@orpc/standard-server-node';
-import { S as StandardHandler, b as StandardRPCMatcher, a as StandardRPCCodec } from '../../shared/server.BY9sDlwl.mjs';
-import '@orpc/client';
-import '@orpc/shared';
-import '../../shared/server.Dba3Iiyp.mjs';
+import { r as resolveFriendlyStandardHandleOptions } from '../../shared/server.BVwwTHyO.mjs';
+import { StandardRPCJsonSerializer, StandardRPCSerializer } from '@orpc/client/standard';
+import { S as StandardHandler, b as StandardRPCMatcher, a as StandardRPCCodec } from '../../shared/server.DnR6v9pj.mjs';
 import '../../shared/server.BtxZnWJ9.mjs';
 import '@orpc/contract';
 
-class RPCHandler {
-  standardHandler;
+class BodyLimitPlugin {
+  maxBodySize;
+  constructor(options) {
+    this.maxBodySize = options.maxBodySize;
+  }
+  initRuntimeAdapter(options) {
+    options.adapterInterceptors ??= [];
+    options.adapterInterceptors.push(async (options2) => {
+      let isHeaderChecked = false;
+      const checkHeader = () => {
+        if (!isHeaderChecked && Number(options2.request.headers["content-length"]) > this.maxBodySize) {
+          throw new ORPCError("PAYLOAD_TOO_LARGE");
+        }
+        isHeaderChecked = true;
+      };
+      const originalEmit = options2.request.emit.bind(options2.request);
+      let currentBodySize = 0;
+      options2.request.emit = (event, ...args) => {
+        if (event === "data") {
+          checkHeader();
+          currentBodySize += args[0].length;
+          if (currentBodySize > this.maxBodySize) {
+            throw new ORPCError("PAYLOAD_TOO_LARGE");
+          }
+        }
+        return originalEmit(event, ...args);
+      };
+      return options2.next();
+    });
+  }
+}
+
+class NodeHttpHandler {
+  constructor(standardHandler, options = {}) {
+    this.standardHandler = standardHandler;
+    for (const plugin of toArray(options.plugins)) {
+      plugin.initRuntimeAdapter?.(options);
+    }
+    this.adapterInterceptors = toArray(options.adapterInterceptors);
+    this.sendStandardResponseOptions = options;
+  }
+  sendStandardResponseOptions;
+  adapterInterceptors;
+  async handle(request, response, ...rest) {
+    return intercept(
+      this.adapterInterceptors,
+      {
+        ...resolveFriendlyStandardHandleOptions(resolveMaybeOptionalOptions(rest)),
+        request,
+        response,
+        sendStandardResponseOptions: this.sendStandardResponseOptions
+      },
+      async ({ request: request2, response: response2, sendStandardResponseOptions, ...options }) => {
+        const standardRequest = toStandardLazyRequest(request2, response2);
+        const result = await this.standardHandler.handle(standardRequest, options);
+        if (!result.matched) {
+          return { matched: false };
+        }
+        await sendStandardResponse(response2, result.response, sendStandardResponseOptions);
+        return { matched: true };
+      }
+    );
+  }
+}
+
+class RPCHandler extends NodeHttpHandler {
   constructor(router, options = {}) {
     const jsonSerializer = new StandardRPCJsonSerializer(options);
     const serializer = new StandardRPCSerializer(jsonSerializer);
     const matcher = new StandardRPCMatcher();
     const codec = new StandardRPCCodec(serializer);
-    this.standardHandler = new StandardHandler(router, matcher, codec, options);
-  }
-  async handle(req, res, ...[
-    options = {}
-  ]) {
-    const standardRequest = toStandardLazyRequest(req, res);
-    const result = await this.standardHandler.handle(standardRequest, options);
-    if (!result.matched) {
-      return { matched: false };
-    }
-    await sendStandardResponse(res, result.response, options);
-    return { matched: true };
+    super(new StandardHandler(router, matcher, codec, options), options);
   }
 }
 
-export { RPCHandler };
+export { BodyLimitPlugin, NodeHttpHandler, RPCHandler };

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.P4_D9lKb.mjs';
-export { S as StandardHandleOptions, g as StandardHandleResult, h as StandardHandler, b as StandardHandlerInterceptorOptions, a as StandardHandlerOptions } from '../../shared/server.P4_D9lKb.mjs';
+import { d as StandardCodec, e as StandardParams, f as StandardMatcher, g as StandardMatchResult } from '../../shared/server.DJqfB27m.mjs';
+export { S as StandardHandleOptions, h as StandardHandleResult, i as StandardHandler, b as StandardHandlerInterceptorOptions, a as StandardHandlerOptions, c as StandardHandlerPlugin } from '../../shared/server.DJqfB27m.mjs';
 import { ORPCError } from '@orpc/client';
 import { StandardRPCSerializer } from '@orpc/client/standard';
 import { StandardLazyRequest, StandardResponse } from '@orpc/standard-server';
 import { A as AnyProcedure, a as AnyRouter } from '../../shared/server.MZvbGc3n.mjs';
-export { S as StandardRPCHandlerOptions } from '../../shared/server.BqBN5WhH.mjs';
+export { S as StandardRPCHandlerOptions } from '../../shared/server.CIbpOMZX.mjs';
 import { HTTPPath } from '@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.CPqNKiJp.js';
-export { S as StandardHandleOptions, g as StandardHandleResult, h as StandardHandler, b as StandardHandlerInterceptorOptions, a as StandardHandlerOptions } from '../../shared/server.CPqNKiJp.js';
+import { d as StandardCodec, e as StandardParams, f as StandardMatcher, g as StandardMatchResult } from '../../shared/server.23VRZIfj.js';
+export { S as StandardHandleOptions, h as StandardHandleResult, i as StandardHandler, b as StandardHandlerInterceptorOptions, a as StandardHandlerOptions, c as StandardHandlerPlugin } from '../../shared/server.23VRZIfj.js';
 import { ORPCError } from '@orpc/client';
 import { StandardRPCSerializer } from '@orpc/client/standard';
 import { StandardLazyRequest, StandardResponse } from '@orpc/standard-server';
 import { A as AnyProcedure, a as AnyRouter } from '../../shared/server.MZvbGc3n.js';
-export { S as StandardRPCHandlerOptions } from '../../shared/server.Dm3ZuTuI.js';
+export { S as StandardRPCHandlerOptions } from '../../shared/server.DCcCuA52.js';
 import { HTTPPath } from '@orpc/contract';
 import '@orpc/shared';
 

package/dist/adapters/standard/index.mjs

@@ -1,6 +1,5 @@
-export { S as StandardHandler, a as StandardRPCCodec, b as StandardRPCMatcher } from '../../shared/server.BY9sDlwl.mjs';
+export { S as StandardHandler, a as StandardRPCCodec, b as StandardRPCMatcher } from '../../shared/server.DnR6v9pj.mjs';
 import '@orpc/client';
 import '@orpc/shared';
-import '../../shared/server.Dba3Iiyp.mjs';
 import '../../shared/server.BtxZnWJ9.mjs';
 import '@orpc/contract';

package/dist/plugins/index.d.mts

@@ -1,31 +1,30 @@
-import { b as StandardHandlerInterceptorOptions, H as HandlerPlugin, a as StandardHandlerOptions } from '../shared/server.P4_D9lKb.mjs';
-export { C as CompositeHandlerPlugin } from '../shared/server.P4_D9lKb.mjs';
+import { b as StandardHandlerInterceptorOptions, c as StandardHandlerPlugin, a as StandardHandlerOptions } from '../shared/server.DJqfB27m.mjs';
 import { Value } from '@orpc/shared';
 import { C as Context } from '../shared/server.MZvbGc3n.mjs';
 import '@orpc/contract';
 import '@orpc/standard-server';
 import '@orpc/client';
 
-interface CORSOptions<TContext extends Context> {
-    origin?: Value<string | readonly string[] | null | undefined, [origin: string, options: StandardHandlerInterceptorOptions<TContext>]>;
-    timingOrigin?: Value<string | readonly string[] | null | undefined, [origin: string, options: StandardHandlerInterceptorOptions<TContext>]>;
+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>]>;
     allowMethods?: readonly string[];
     allowHeaders?: readonly string[];
     maxAge?: number;
     credentials?: boolean;
     exposeHeaders?: readonly string[];
 }
-declare class CORSPlugin<TContext extends Context> implements HandlerPlugin<TContext> {
+declare class CORSPlugin<T extends Context> implements StandardHandlerPlugin<T> {
     private readonly options;
-    constructor(options?: CORSOptions<TContext>);
-    init(options: StandardHandlerOptions<TContext>): void;
+    constructor(options?: CORSOptions<T>);
+    init(options: StandardHandlerOptions<T>): void;
 }
 
 interface ResponseHeadersPluginContext {
     resHeaders?: Headers;
 }
-declare class ResponseHeadersPlugin<TContext extends ResponseHeadersPluginContext & Context> implements HandlerPlugin<TContext> {
-    init(options: StandardHandlerOptions<TContext>): void;
+declare class ResponseHeadersPlugin<T extends ResponseHeadersPluginContext> implements StandardHandlerPlugin<T> {
+    init(options: StandardHandlerOptions<T>): void;
 }
 
-export { type CORSOptions, CORSPlugin, HandlerPlugin, ResponseHeadersPlugin, type ResponseHeadersPluginContext };
+export { type CORSOptions, CORSPlugin, ResponseHeadersPlugin, type ResponseHeadersPluginContext };

package/dist/plugins/index.d.ts

@@ -1,31 +1,30 @@
-import { b as StandardHandlerInterceptorOptions, H as HandlerPlugin, a as StandardHandlerOptions } from '../shared/server.CPqNKiJp.js';
-export { C as CompositeHandlerPlugin } from '../shared/server.CPqNKiJp.js';
+import { b as StandardHandlerInterceptorOptions, c as StandardHandlerPlugin, a as StandardHandlerOptions } from '../shared/server.23VRZIfj.js';
 import { Value } from '@orpc/shared';
 import { C as Context } from '../shared/server.MZvbGc3n.js';
 import '@orpc/contract';
 import '@orpc/standard-server';
 import '@orpc/client';
 
-interface CORSOptions<TContext extends Context> {
-    origin?: Value<string | readonly string[] | null | undefined, [origin: string, options: StandardHandlerInterceptorOptions<TContext>]>;
-    timingOrigin?: Value<string | readonly string[] | null | undefined, [origin: string, options: StandardHandlerInterceptorOptions<TContext>]>;
+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>]>;
     allowMethods?: readonly string[];
     allowHeaders?: readonly string[];
     maxAge?: number;
     credentials?: boolean;
     exposeHeaders?: readonly string[];
 }
-declare class CORSPlugin<TContext extends Context> implements HandlerPlugin<TContext> {
+declare class CORSPlugin<T extends Context> implements StandardHandlerPlugin<T> {
     private readonly options;
-    constructor(options?: CORSOptions<TContext>);
-    init(options: StandardHandlerOptions<TContext>): void;
+    constructor(options?: CORSOptions<T>);
+    init(options: StandardHandlerOptions<T>): void;
 }
 
 interface ResponseHeadersPluginContext {
     resHeaders?: Headers;
 }
-declare class ResponseHeadersPlugin<TContext extends ResponseHeadersPluginContext & Context> implements HandlerPlugin<TContext> {
-    init(options: StandardHandlerOptions<TContext>): void;
+declare class ResponseHeadersPlugin<T extends ResponseHeadersPluginContext> implements StandardHandlerPlugin<T> {
+    init(options: StandardHandlerOptions<T>): void;
 }
 
-export { type CORSOptions, CORSPlugin, HandlerPlugin, ResponseHeadersPlugin, type ResponseHeadersPluginContext };
+export { type CORSOptions, CORSPlugin, ResponseHeadersPlugin, type ResponseHeadersPluginContext };

package/dist/plugins/index.mjs

@@ -1,4 +1,3 @@
-export { C as CompositeHandlerPlugin } from '../shared/server.Dba3Iiyp.mjs';
 import { value } from '@orpc/shared';
 
 class CORSPlugin {
@@ -79,14 +78,19 @@ class ResponseHeadersPlugin {
   init(options) {
     options.rootInterceptors ??= [];
     options.rootInterceptors.push(async (interceptorOptions) => {
-      const headers = new Headers();
-      interceptorOptions.context.resHeaders = headers;
-      const result = await interceptorOptions.next();
+      const resHeaders = interceptorOptions.context.resHeaders ?? new Headers();
+      const result = await interceptorOptions.next({
+        ...interceptorOptions,
+        context: {
+          ...interceptorOptions.context,
+          resHeaders
+        }
+      });
       if (!result.matched) {
         return result;
       }
       const responseHeaders = result.response.headers;
-      for (const [key, value] of headers) {
+      for (const [key, value] of resHeaders) {
         if (Array.isArray(responseHeaders[key])) {
           responseHeaders[key].push(value);
         } else if (responseHeaders[key] !== void 0) {

package/dist/shared/{server.CPqNKiJp.d.ts → server.23VRZIfj.d.ts}

@@ -1,5 +1,5 @@
 import { HTTPPath, AnySchema, Meta, InferSchemaOutput, ErrorFromErrorMap } from '@orpc/contract';
-import { Interceptor, MaybeOptionalOptions } from '@orpc/shared';
+import { Interceptor } from '@orpc/shared';
 import { StandardResponse, StandardLazyRequest } from '@orpc/standard-server';
 import { a as AnyRouter, A as AnyProcedure, C as Context, P as ProcedureClientInterceptorOptions, R as Router } from './server.MZvbGc3n.js';
 import { ORPCError } from '@orpc/client';
@@ -20,13 +20,10 @@ interface StandardCodec {
     decode(request: StandardLazyRequest, params: StandardParams | undefined, procedure: AnyProcedure): Promise<unknown>;
 }
 
-type StandardHandleOptions<T extends Context> = {
+interface StandardHandleOptions<T extends Context> {
     prefix?: HTTPPath;
-} & (Record<never, never> extends T ? {
-    context?: T;
-} : {
     context: T;
-});
+}
 type StandardHandleResult = {
     matched: true;
     response: StandardResponse;
@@ -34,12 +31,14 @@ type StandardHandleResult = {
     matched: false;
     response: undefined;
 };
-type StandardHandlerInterceptorOptions<T extends Context> = StandardHandleOptions<T> & {
-    context: T;
+interface StandardHandlerPlugin<TContext extends Context> {
+    init?(options: StandardHandlerOptions<TContext>): void;
+}
+interface StandardHandlerInterceptorOptions<T extends Context> extends StandardHandleOptions<T> {
     request: StandardLazyRequest;
-};
+}
 interface StandardHandlerOptions<TContext extends Context> {
-    plugins?: HandlerPlugin<TContext>[];
+    plugins?: StandardHandlerPlugin<TContext>[];
     /**
      * Interceptors at the request level, helpful when you want catch errors
      */
@@ -57,19 +56,11 @@ interface StandardHandlerOptions<TContext extends Context> {
 declare class StandardHandler<T extends Context> {
     private readonly matcher;
     private readonly codec;
-    private readonly options;
-    private readonly plugin;
+    private readonly interceptors;
+    private readonly clientInterceptors;
+    private readonly rootInterceptors;
     constructor(router: Router<any, T>, matcher: StandardMatcher, codec: StandardCodec, options: NoInfer<StandardHandlerOptions<T>>);
-    handle(request: StandardLazyRequest, ...[options]: MaybeOptionalOptions<StandardHandleOptions<T>>): Promise<StandardHandleResult>;
-}
-
-interface HandlerPlugin<TContext extends Context> {
-    init?(options: StandardHandlerOptions<TContext>): void;
-}
-declare class CompositeHandlerPlugin<TContext extends Context> implements HandlerPlugin<TContext> {
-    private readonly plugins;
-    constructor(plugins?: HandlerPlugin<TContext>[]);
-    init(options: StandardHandlerOptions<TContext>): void;
+    handle(request: StandardLazyRequest, options: StandardHandleOptions<T>): Promise<StandardHandleResult>;
 }
 
-export { CompositeHandlerPlugin as C, type HandlerPlugin as H, type StandardHandleOptions as S, type StandardHandlerOptions as a, type StandardHandlerInterceptorOptions as b, type StandardCodec as c, type StandardParams as d, type StandardMatcher as e, type StandardMatchResult as f, type StandardHandleResult as g, StandardHandler as h };
+export { type StandardHandleOptions as S, type StandardHandlerOptions as a, type StandardHandlerInterceptorOptions as b, type StandardHandlerPlugin as c, type StandardCodec as d, type StandardParams as e, type StandardMatcher as f, type StandardMatchResult as g, type StandardHandleResult as h, StandardHandler as i };

package/dist/shared/server.B4eSvRkD.mjs

@@ -0,0 +1,98 @@
+import { ORPCError } from '@orpc/client';
+import { StandardRPCJsonSerializer, StandardRPCSerializer } from '@orpc/client/standard';
+import { S as StandardHandler, b as StandardRPCMatcher, a as StandardRPCCodec } from './server.DnR6v9pj.mjs';
+import { toArray, intercept, resolveMaybeOptionalOptions } from '@orpc/shared';
+import { toStandardLazyRequest, toFetchResponse } from '@orpc/standard-server-fetch';
+import { r as resolveFriendlyStandardHandleOptions } from './server.BVwwTHyO.mjs';
+
+class BodyLimitPlugin {
+  maxBodySize;
+  constructor(options) {
+    this.maxBodySize = options.maxBodySize;
+  }
+  initRuntimeAdapter(options) {
+    options.adapterInterceptors ??= [];
+    options.adapterInterceptors.push(async (options2) => {
+      if (!options2.request.body) {
+        return options2.next();
+      }
+      let currentBodySize = 0;
+      const rawReader = options2.request.body.getReader();
+      const reader = new ReadableStream({
+        start: async (controller) => {
+          try {
+            if (Number(options2.request.headers.get("content-length")) > this.maxBodySize) {
+              controller.error(new ORPCError("PAYLOAD_TOO_LARGE"));
+              return;
+            }
+            while (true) {
+              const { done, value } = await rawReader.read();
+              if (done) {
+                break;
+              }
+              currentBodySize += value.length;
+              if (currentBodySize > this.maxBodySize) {
+                controller.error(new ORPCError("PAYLOAD_TOO_LARGE"));
+                break;
+              }
+              controller.enqueue(value);
+            }
+          } finally {
+            controller.close();
+          }
+        }
+      });
+      const requestInit = { body: reader, duplex: "half" };
+      return options2.next({
+        ...options2,
+        request: new Request(options2.request, requestInit)
+      });
+    });
+  }
+}
+
+class FetchHandler {
+  constructor(standardHandler, options = {}) {
+    this.standardHandler = standardHandler;
+    for (const plugin of toArray(options.plugins)) {
+      plugin.initRuntimeAdapter?.(options);
+    }
+    this.adapterInterceptors = toArray(options.adapterInterceptors);
+    this.toFetchResponseOptions = options;
+  }
+  toFetchResponseOptions;
+  adapterInterceptors;
+  async handle(request, ...rest) {
+    return intercept(
+      this.adapterInterceptors,
+      {
+        ...resolveFriendlyStandardHandleOptions(resolveMaybeOptionalOptions(rest)),
+        request,
+        toFetchResponseOptions: this.toFetchResponseOptions
+      },
+      async ({ request: request2, toFetchResponseOptions, ...options }) => {
+        const standardRequest = toStandardLazyRequest(request2);
+        const result = await this.standardHandler.handle(standardRequest, options);
+        if (!result.matched) {
+          return result;
+        }
+        return {
+          matched: true,
+          response: toFetchResponse(result.response, toFetchResponseOptions)
+        };
+      }
+    );
+  }
+}
+
+class RPCHandler extends FetchHandler {
+  constructor(router, options = {}) {
+    const jsonSerializer = new StandardRPCJsonSerializer(options);
+    const serializer = new StandardRPCSerializer(jsonSerializer);
+    const matcher = new StandardRPCMatcher();
+    const codec = new StandardRPCCodec(serializer);
+    super(new StandardHandler(router, matcher, codec, options), options);
+  }
+}
+
+export { BodyLimitPlugin as B, FetchHandler as F, RPCHandler as R };

package/dist/shared/server.BG5ftPWa.d.ts

@@ -0,0 +1,10 @@
+import { C as Context } from './server.MZvbGc3n.js';
+import { S as StandardHandleOptions } from './server.23VRZIfj.js';
+
+type FriendlyStandardHandleOptions<T extends Context> = Omit<StandardHandleOptions<T>, 'context'> & (Record<never, never> extends T ? {
+    context?: T;
+} : {
+    context: T;
+});
+
+export type { FriendlyStandardHandleOptions as F };

package/dist/shared/server.BVwwTHyO.mjs

@@ -0,0 +1,9 @@
+function resolveFriendlyStandardHandleOptions(options) {
+  return {
+    ...options,
+    context: options?.context ?? {}
+    // Context only optional if all fields are optional
+  };
+}
+
+export { resolveFriendlyStandardHandleOptions as r };

package/dist/shared/server.C-CCcROC.d.mts

@@ -0,0 +1,10 @@
+import { C as Context } from './server.MZvbGc3n.mjs';
+import { S as StandardHandleOptions } from './server.DJqfB27m.mjs';
+
+type FriendlyStandardHandleOptions<T extends Context> = Omit<StandardHandleOptions<T>, 'context'> & (Record<never, never> extends T ? {
+    context?: T;
+} : {
+    context: T;
+});
+
+export type { FriendlyStandardHandleOptions as F };

package/dist/shared/{server.BqBN5WhH.d.mts → server.CIbpOMZX.d.mts}

@@ -1,6 +1,6 @@
 import { StandardRPCJsonSerializerOptions } from '@orpc/client/standard';
 import { C as Context } from './server.MZvbGc3n.mjs';
-import { a as StandardHandlerOptions } from './server.P4_D9lKb.mjs';
+import { a as StandardHandlerOptions } from './server.DJqfB27m.mjs';
 
 interface StandardRPCHandlerOptions<T extends Context> extends StandardHandlerOptions<T>, StandardRPCJsonSerializerOptions {
 }

package/dist/shared/{server.Dm3ZuTuI.d.ts → server.DCcCuA52.d.ts}

@@ -1,6 +1,6 @@
 import { StandardRPCJsonSerializerOptions } from '@orpc/client/standard';
 import { C as Context } from './server.MZvbGc3n.js';
-import { a as StandardHandlerOptions } from './server.CPqNKiJp.js';
+import { a as StandardHandlerOptions } from './server.23VRZIfj.js';
 
 interface StandardRPCHandlerOptions<T extends Context> extends StandardHandlerOptions<T>, StandardRPCJsonSerializerOptions {
 }

package/dist/shared/{server.P4_D9lKb.d.mts → server.DJqfB27m.d.mts}

@@ -1,5 +1,5 @@
 import { HTTPPath, AnySchema, Meta, InferSchemaOutput, ErrorFromErrorMap } from '@orpc/contract';
-import { Interceptor, MaybeOptionalOptions } from '@orpc/shared';
+import { Interceptor } from '@orpc/shared';
 import { StandardResponse, StandardLazyRequest } from '@orpc/standard-server';
 import { a as AnyRouter, A as AnyProcedure, C as Context, P as ProcedureClientInterceptorOptions, R as Router } from './server.MZvbGc3n.mjs';
 import { ORPCError } from '@orpc/client';
@@ -20,13 +20,10 @@ interface StandardCodec {
     decode(request: StandardLazyRequest, params: StandardParams | undefined, procedure: AnyProcedure): Promise<unknown>;
 }
 
-type StandardHandleOptions<T extends Context> = {
+interface StandardHandleOptions<T extends Context> {
     prefix?: HTTPPath;
-} & (Record<never, never> extends T ? {
-    context?: T;
-} : {
     context: T;
-});
+}
 type StandardHandleResult = {
     matched: true;
     response: StandardResponse;
@@ -34,12 +31,14 @@ type StandardHandleResult = {
     matched: false;
     response: undefined;
 };
-type StandardHandlerInterceptorOptions<T extends Context> = StandardHandleOptions<T> & {
-    context: T;
+interface StandardHandlerPlugin<TContext extends Context> {
+    init?(options: StandardHandlerOptions<TContext>): void;
+}
+interface StandardHandlerInterceptorOptions<T extends Context> extends StandardHandleOptions<T> {
     request: StandardLazyRequest;
-};
+}
 interface StandardHandlerOptions<TContext extends Context> {
-    plugins?: HandlerPlugin<TContext>[];
+    plugins?: StandardHandlerPlugin<TContext>[];
     /**
      * Interceptors at the request level, helpful when you want catch errors
      */
@@ -57,19 +56,11 @@ interface StandardHandlerOptions<TContext extends Context> {
 declare class StandardHandler<T extends Context> {
     private readonly matcher;
     private readonly codec;
-    private readonly options;
-    private readonly plugin;
+    private readonly interceptors;
+    private readonly clientInterceptors;
+    private readonly rootInterceptors;
     constructor(router: Router<any, T>, matcher: StandardMatcher, codec: StandardCodec, options: NoInfer<StandardHandlerOptions<T>>);
-    handle(request: StandardLazyRequest, ...[options]: MaybeOptionalOptions<StandardHandleOptions<T>>): Promise<StandardHandleResult>;
-}
-
-interface HandlerPlugin<TContext extends Context> {
-    init?(options: StandardHandlerOptions<TContext>): void;
-}
-declare class CompositeHandlerPlugin<TContext extends Context> implements HandlerPlugin<TContext> {
-    private readonly plugins;
-    constructor(plugins?: HandlerPlugin<TContext>[]);
-    init(options: StandardHandlerOptions<TContext>): void;
+    handle(request: StandardLazyRequest, options: StandardHandleOptions<T>): Promise<StandardHandleResult>;
 }
 
-export { CompositeHandlerPlugin as C, type HandlerPlugin as H, type StandardHandleOptions as S, type StandardHandlerOptions as a, type StandardHandlerInterceptorOptions as b, type StandardCodec as c, type StandardParams as d, type StandardMatcher as e, type StandardMatchResult as f, type StandardHandleResult as g, StandardHandler as h };
+export { type StandardHandleOptions as S, type StandardHandlerOptions as a, type StandardHandlerInterceptorOptions as b, type StandardHandlerPlugin as c, type StandardCodec as d, type StandardParams as e, type StandardMatcher as f, type StandardMatchResult as g, type StandardHandleResult as h, StandardHandler as i };

package/dist/shared/{server.BY9sDlwl.mjs → server.DnR6v9pj.mjs}

@@ -1,51 +1,53 @@
 import { ORPCError, toORPCError } from '@orpc/client';
-import { intercept, trim, parseEmptyableJSON } from '@orpc/shared';
-import { C as CompositeHandlerPlugin } from './server.Dba3Iiyp.mjs';
+import { toArray, intercept, parseEmptyableJSON } from '@orpc/shared';
 import { c as createProcedureClient, t as traverseContractProcedures, a as toHttpPath, i as isProcedure, u as unlazy, g as getRouter, b as createContractedProcedure } from './server.BtxZnWJ9.mjs';
 
 class StandardHandler {
   constructor(router, matcher, codec, options) {
     this.matcher = matcher;
     this.codec = codec;
-    this.options = options;
-    this.plugin = new CompositeHandlerPlugin(options.plugins);
-    this.plugin.init(this.options);
+    for (const plugin of toArray(options.plugins)) {
+      plugin.init?.(options);
+    }
+    this.interceptors = toArray(options.interceptors);
+    this.clientInterceptors = toArray(options.clientInterceptors);
+    this.rootInterceptors = toArray(options.rootInterceptors);
     this.matcher.init(router);
   }
-  plugin;
-  handle(request, ...[options]) {
+  interceptors;
+  clientInterceptors;
+  rootInterceptors;
+  handle(request, options) {
     return intercept(
-      this.options.rootInterceptors ?? [],
-      {
-        request,
-        ...options,
-        context: options?.context ?? {}
-        // context is optional only when all fields are optional so we can safely force it to have a context
-      },
+      this.rootInterceptors,
+      { ...options, request },
       async (interceptorOptions) => {
         let isDecoding = false;
         try {
           return await intercept(
-            this.options.interceptors ?? [],
+            this.interceptors,
             interceptorOptions,
-            async (interceptorOptions2) => {
-              const method = interceptorOptions2.request.method;
-              const url = interceptorOptions2.request.url;
-              const pathname = `/${trim(url.pathname.replace(interceptorOptions2.prefix ?? "", ""), "/")}`;
-              const match = await this.matcher.match(method, pathname);
+            async ({ request: request2, context, prefix }) => {
+              const method = request2.method;
+              const url = request2.url;
+              if (prefix && !url.pathname.startsWith(prefix)) {
+                return { matched: false, response: void 0 };
+              }
+              const pathname = prefix ? url.pathname.replace(prefix, "") : url.pathname;
+              const match = await this.matcher.match(method, `/${pathname.replace(/^\/|\/$/g, "")}`);
               if (!match) {
                 return { matched: false, response: void 0 };
               }
               const client = createProcedureClient(match.procedure, {
-                context: interceptorOptions2.context,
+                context,
                 path: match.path,
-                interceptors: this.options.clientInterceptors
+                interceptors: this.clientInterceptors
               });
               isDecoding = true;
-              const input = await this.codec.decode(request, match.params, match.procedure);
+              const input = await this.codec.decode(request2, match.params, match.procedure);
               isDecoding = false;
-              const lastEventId = Array.isArray(request.headers["last-event-id"]) ? request.headers["last-event-id"].at(-1) : request.headers["last-event-id"];
-              const output = await client(input, { signal: request.signal, lastEventId });
+              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 response = this.codec.encode(output, match.procedure);
               return {
                 matched: true,
@@ -54,7 +56,7 @@ class StandardHandler {
             }
           );
         } catch (e) {
-          const error = isDecoding ? new ORPCError("BAD_REQUEST", {
+          const error = isDecoding && !(e instanceof ORPCError) ? new ORPCError("BAD_REQUEST", {
             message: `Malformed request. Ensure the request body is properly formatted and the 'Content-Type' header is set correctly.`,
             cause: e
           }) : toORPCError(e);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/server",
   "type": "module",
-  "version": "1.0.0-beta.3",
+  "version": "1.0.0-beta.4",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -58,15 +58,15 @@
     "next": ">=14.0.0"
   },
   "dependencies": {
-    "@orpc/client": "1.0.0-beta.3",
-    "@orpc/contract": "1.0.0-beta.3",
-    "@orpc/shared": "1.0.0-beta.3",
-    "@orpc/standard-server": "1.0.0-beta.3",
-    "@orpc/standard-server-fetch": "1.0.0-beta.3",
-    "@orpc/standard-server-node": "1.0.0-beta.3"
+    "@orpc/client": "1.0.0-beta.4",
+    "@orpc/shared": "1.0.0-beta.4",
+    "@orpc/standard-server": "1.0.0-beta.4",
+    "@orpc/standard-server-fetch": "1.0.0-beta.4",
+    "@orpc/standard-server-node": "1.0.0-beta.4",
+    "@orpc/contract": "1.0.0-beta.4"
   },
   "devDependencies": {
-    "light-my-request": "^6.5.1"
+    "supertest": "^7.0.0"
   },
   "scripts": {
     "build": "unbuild",

package/dist/shared/server.Dba3Iiyp.mjs

@@ -1,12 +0,0 @@
-class CompositeHandlerPlugin {
-  constructor(plugins = []) {
-    this.plugins = plugins;
-  }
-  init(options) {
-    for (const plugin of this.plugins) {
-      plugin.init?.(options);
-    }
-  }
-}
-
-export { CompositeHandlerPlugin as C };

package/dist/shared/server.Del5OmaY.mjs

@@ -1,29 +0,0 @@
-import { StandardRPCJsonSerializer, StandardRPCSerializer } from '@orpc/client/standard';
-import { toStandardLazyRequest, toFetchResponse } from '@orpc/standard-server-fetch';
-import { S as StandardHandler, b as StandardRPCMatcher, a as StandardRPCCodec } from './server.BY9sDlwl.mjs';
-
-class RPCHandler {
-  standardHandler;
-  constructor(router, options = {}) {
-    const jsonSerializer = new StandardRPCJsonSerializer(options);
-    const serializer = new StandardRPCSerializer(jsonSerializer);
-    const matcher = new StandardRPCMatcher();
-    const codec = new StandardRPCCodec(serializer);
-    this.standardHandler = new StandardHandler(router, matcher, codec, options);
-  }
-  async handle(request, ...[
-    options = {}
-  ]) {
-    const standardRequest = toStandardLazyRequest(request);
-    const result = await this.standardHandler.handle(standardRequest, options);
-    if (!result.matched) {
-      return result;
-    }
-    return {
-      matched: true,
-      response: toFetchResponse(result.response, options)
-    };
-  }
-}
-
-export { RPCHandler as R };