@orpc/server 0.0.0-next.c788572 → 0.0.0-next.c854c60

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.DY7OKEoj.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.D5fBlF9j.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,4 +1,5 @@
 import { value, isAsyncIteratorObject } from '@orpc/shared';
+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';
@@ -25,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;
@@ -68,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) {
@@ -123,13 +126,11 @@ class CORSPlugin {
           resHeaders["access-control-max-age"] = this.options.maxAge.toString();
         }
         if (this.options.allowMethods?.length) {
-          resHeaders["access-control-allow-methods"] = this.options.allowMethods.join(",");
+          resHeaders["access-control-allow-methods"] = flattenHeader(this.options.allowMethods);
         }
         const allowHeaders = this.options.allowHeaders ?? interceptorOptions.request.headers["access-control-request-headers"];
-        if (Array.isArray(allowHeaders) && allowHeaders.length) {
-          resHeaders["access-control-allow-headers"] = allowHeaders.join(",");
-        } else if (typeof allowHeaders === "string") {
-          resHeaders["access-control-allow-headers"] = allowHeaders;
+        if (typeof allowHeaders === "string" || allowHeaders?.length) {
+          resHeaders["access-control-allow-headers"] = flattenHeader(allowHeaders);
         }
         return {
           matched: true,
@@ -147,7 +148,7 @@ class CORSPlugin {
       if (!result.matched) {
         return result;
       }
-      const origin = Array.isArray(interceptorOptions.request.headers.origin) ? interceptorOptions.request.headers.origin.join(",") : interceptorOptions.request.headers.origin || "";
+      const origin = flattenHeader(interceptorOptions.request.headers.origin) ?? "";
       const allowedOrigin = await value(this.options.origin, origin, interceptorOptions);
       const allowedOriginArr = Array.isArray(allowedOrigin) ? allowedOrigin : [allowedOrigin];
       if (allowedOriginArr.includes("*")) {
@@ -169,7 +170,7 @@ class CORSPlugin {
         result.response.headers["access-control-allow-credentials"] = "true";
       }
       if (this.options.exposeHeaders?.length) {
-        result.response.headers["access-control-expose-headers"] = this.options.exposeHeaders.join(",");
+        result.response.headers["access-control-expose-headers"] = flattenHeader(this.options.exposeHeaders);
       }
       return result;
     });

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

@@ -1,17 +1,17 @@
 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, f as AnyRouter, h as AnyProcedure, F as ProcedureClientInterceptorOptions, R as Router } 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<TContext extends Context> {
+interface StandardHandlerPlugin<T extends Context> {
     order?: number;
-    init?(options: StandardHandlerOptions<TContext>): void;
+    init?(options: StandardHandlerOptions<T>, router: Router<any, T>): void;
 }
 declare class CompositeStandardHandlerPlugin<T extends Context, TPlugin extends StandardHandlerPlugin<T>> implements StandardHandlerPlugin<T> {
     protected readonly plugins: TPlugin[];
     constructor(plugins?: readonly TPlugin[]);
-    init(options: StandardHandlerOptions<T>): void;
+    init(options: StandardHandlerOptions<T>, router: Router<any, T>): void;
 }
 
 type StandardParams = Record<string, string>;
@@ -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.CuD15qZB.d.ts → server.BPAWobQg.d.ts}

@@ -1,17 +1,11 @@
 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.D5fBlF9j.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 {
-    /**
-     * Enables or disables the StrictGetMethodPlugin.
-     *
-     * @default true
-     */
-    strictGetMethodPluginEnabled?: boolean;
 }
 declare class StandardRPCHandler<T extends Context> extends StandardHandler<T> {
-    constructor(router: Router<any, T>, options: StandardRPCHandlerOptions<T>);
+    constructor(router: Router<any, T>, options?: StandardRPCHandlerOptions<T>);
 }
 
 export { StandardRPCHandler as a };

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

@@ -1,17 +1,11 @@
 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.DY7OKEoj.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 {
-    /**
-     * Enables or disables the StrictGetMethodPlugin.
-     *
-     * @default true
-     */
-    strictGetMethodPluginEnabled?: boolean;
 }
 declare class StandardRPCHandler<T extends Context> extends StandardHandler<T> {
-    constructor(router: Router<any, T>, options: StandardRPCHandlerOptions<T>);
+    constructor(router: Router<any, T>, options?: StandardRPCHandlerOptions<T>);
 }
 
 export { StandardRPCHandler as a };

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

@@ -1,5 +1,5 @@
-import { C as Context } from './server.DPWk5pjW.mjs';
-import { g as StandardHandleOptions } from './server.DY7OKEoj.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.qf03T-Xn.mjs → server.CHvOkcM3.mjs}

@@ -1,8 +1,7 @@
 import { toHttpPath, StandardRPCJsonSerializer, StandardRPCSerializer } from '@orpc/client/standard';
-import { toArray, intercept, parseEmptyableJSON } from '@orpc/shared';
-import '@orpc/standard-server/batch';
 import { ORPCError, toORPCError } from '@orpc/client';
-import { S as StrictGetMethodPlugin } from './server.BW-nUGgA.mjs';
+import { toArray, intercept, parseEmptyableJSON, 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 {
@@ -10,9 +9,9 @@ class CompositeStandardHandlerPlugin {
   constructor(plugins = []) {
     this.plugins = [...plugins].sort((a, b) => (a.order ?? 0) - (b.order ?? 0));
   }
-  init(options) {
+  init(options, router) {
     for (const plugin of this.plugins) {
-      plugin.init?.(options);
+      plugin.init?.(options, router);
     }
   }
 }
@@ -22,7 +21,7 @@ class StandardHandler {
     this.matcher = matcher;
     this.codec = codec;
     const plugins = new CompositeStandardHandlerPlugin(options.plugins);
-    plugins.init(options);
+    plugins.init(options, router);
     this.interceptors = toArray(options.interceptors);
     this.clientInterceptors = toArray(options.clientInterceptors);
     this.rootInterceptors = toArray(options.rootInterceptors);
@@ -61,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,
@@ -111,7 +112,7 @@ class StandardRPCCodec {
 }
 
 class StandardRPCMatcher {
-  tree = {};
+  tree = new NullProtoObj();
   pendingRouters = [];
   init(router, path = []) {
     const laziedOptions = traverseContractProcedures({ router, path }, ({ path: path2, contract }) => {
@@ -173,12 +174,7 @@ class StandardRPCMatcher {
 }
 
 class StandardRPCHandler extends StandardHandler {
-  constructor(router, options) {
-    options.plugins ??= [];
-    const strictGetMethodPluginEnabled = options.strictGetMethodPluginEnabled ?? true;
-    if (strictGetMethodPluginEnabled) {
-      options.plugins.push(new StrictGetMethodPlugin());
-    }
+  constructor(router, options = {}) {
     const jsonSerializer = new StandardRPCJsonSerializer(options);
     const serializer = new StandardRPCSerializer(jsonSerializer);
     const matcher = new StandardRPCMatcher();

package/dist/shared/{server.DPWk5pjW.d.mts → 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.ts → 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.BVwwTHyO.mjs → server.DZ5BIITo.mjs}

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

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

@@ -1,17 +1,17 @@
 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, f as AnyRouter, h as AnyProcedure, F as ProcedureClientInterceptorOptions, R as Router } 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<TContext extends Context> {
+interface StandardHandlerPlugin<T extends Context> {
     order?: number;
-    init?(options: StandardHandlerOptions<TContext>): void;
+    init?(options: StandardHandlerOptions<T>, router: Router<any, T>): void;
 }
 declare class CompositeStandardHandlerPlugin<T extends Context, TPlugin extends StandardHandlerPlugin<T>> implements StandardHandlerPlugin<T> {
     protected readonly plugins: TPlugin[];
     constructor(plugins?: readonly TPlugin[]);
-    init(options: StandardHandlerOptions<T>): void;
+    init(options: StandardHandlerOptions<T>, router: Router<any, T>): void;
 }
 
 type StandardParams = Record<string, string>;
@@ -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.CjlA3NKP.d.ts → server.IG2MjhrD.d.ts}

@@ -1,5 +1,5 @@
-import { C as Context } from './server.DPWk5pjW.js';
-import { g as StandardHandleOptions } from './server.D5fBlF9j.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": "0.0.0-next.c788572",
+  "version": "0.0.0-next.c854c60",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -38,21 +38,69 @@
       "types": "./dist/adapters/node/index.d.mts",
       "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",
+      "default": "./dist/adapters/websocket/index.mjs"
+    },
+    "./crossws": {
+      "types": "./dist/adapters/crossws/index.d.mts",
+      "import": "./dist/adapters/crossws/index.mjs",
+      "default": "./dist/adapters/crossws/index.mjs"
+    },
+    "./ws": {
+      "types": "./dist/adapters/ws/index.d.mts",
+      "import": "./dist/adapters/ws/index.mjs",
+      "default": "./dist/adapters/ws/index.mjs"
+    },
+    "./bun-ws": {
+      "types": "./dist/adapters/bun-ws/index.d.mts",
+      "import": "./dist/adapters/bun-ws/index.mjs",
+      "default": "./dist/adapters/bun-ws/index.mjs"
+    },
+    "./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": [
     "dist"
   ],
+  "peerDependencies": {
+    "crossws": ">=0.3.4",
+    "ws": ">=8.18.1"
+  },
+  "peerDependenciesMeta": {
+    "crossws": {
+      "optional": true
+    },
+    "ws": {
+      "optional": true
+    }
+  },
   "dependencies": {
-    "@orpc/client": "0.0.0-next.c788572",
-    "@orpc/contract": "0.0.0-next.c788572",
-    "@orpc/shared": "0.0.0-next.c788572",
-    "@orpc/standard-server": "0.0.0-next.c788572",
-    "@orpc/standard-server-fetch": "0.0.0-next.c788572",
-    "@orpc/standard-server-node": "0.0.0-next.c788572"
+    "@orpc/client": "0.0.0-next.c854c60",
+    "@orpc/contract": "0.0.0-next.c854c60",
+    "@orpc/standard-server": "0.0.0-next.c854c60",
+    "@orpc/standard-server-aws-lambda": "0.0.0-next.c854c60",
+    "@orpc/shared": "0.0.0-next.c854c60",
+    "@orpc/standard-server-fetch": "0.0.0-next.c854c60",
+    "@orpc/standard-server-node": "0.0.0-next.c854c60",
+    "@orpc/standard-server-peer": "0.0.0-next.c854c60"
   },
   "devDependencies": {
-    "supertest": "^7.1.0"
+    "@types/ws": "^8.18.1",
+    "crossws": "^0.4.1",
+    "next": "^15.3.0",
+    "supertest": "^7.1.0",
+    "ws": "^8.18.1"
   },
   "scripts": {
     "build": "unbuild",