@orpc/server 1.7.10 → 1.8.0

package/README.md

@@ -30,6 +30,7 @@
 - **🔗 End-to-End Type Safety**: Ensure type-safe inputs, outputs, and errors from client to server.
 - **📘 First-Class OpenAPI**: Built-in support that fully adheres to the OpenAPI standard.
 - **📝 Contract-First Development**: Optionally define your API contract before implementation.
+- **🔍 First-Class OpenTelemetry**: Seamlessly integrate with OpenTelemetry for observability.
 - **⚙️ Framework Integrations**: Seamlessly integrate with TanStack Query (React, Vue, Solid, Svelte, Angular), Pinia Colada, and more.
 - **🚀 Server Actions**: Fully compatible with React Server Actions on Next.js, TanStack Start, and other platforms.
 - **🔠 Standard Schema Support**: Works out of the box with Zod, Valibot, ArkType, and other schema validators.
@@ -38,7 +39,6 @@
 - **📡 SSE & Streaming**: Enjoy full type-safe support for SSE and streaming.
 - **🌍 Multi-Runtime Support**: Fast and lightweight on Cloudflare, Deno, Bun, Node.js, and beyond.
 - **🔌 Extendability**: Easily extend functionality with plugins, middleware, and interceptors.
-- **🛡️ Reliability**: Well-tested, TypeScript-based, production-ready, and MIT licensed.
 
 ## Documentation
 
@@ -50,6 +50,7 @@ You can find the full documentation [here](https://orpc.unnoq.com).
 - [@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/openapi](https://www.npmjs.com/package/@orpc/openapi): Generate OpenAPI specs and handle OpenAPI requests.
+- [@orpc/otel](https://www.npmjs.com/package/@orpc/otel): [OpenTelemetry](https://opentelemetry.io/) integration for observability.
 - [@orpc/nest](https://www.npmjs.com/package/@orpc/nest): Deeply integrate oRPC with [NestJS](https://nestjs.com/).
 - [@orpc/react](https://www.npmjs.com/package/@orpc/react): Utilities for integrating oRPC with React and React Server Actions.
 - [@orpc/tanstack-query](https://www.npmjs.com/package/@orpc/tanstack-query): [TanStack Query](https://tanstack.com/query/latest) integration.

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

@@ -7,9 +7,9 @@ import '@orpc/standard-server-fetch';
 import '@orpc/client';
 import { S as StrictGetMethodPlugin } from '../../shared/server.BW-nUGgA.mjs';
 import '@orpc/contract';
-import { b as StandardRPCHandler } from '../../shared/server.CIL9uKTN.mjs';
+import { b as StandardRPCHandler } from '../../shared/server.CYRYFTxo.mjs';
 import '@orpc/client/standard';
-import '../../shared/server.NeumLVdS.mjs';
+import '../../shared/server.B_fj3X5m.mjs';
 
 class AwsLambdaHandler {
   constructor(standardHandler, options = {}) {

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

@@ -1,13 +1,13 @@
 import { resolveMaybeOptionalOptions } from '@orpc/shared';
 import { ServerPeer } from '@orpc/standard-server-peer';
-import { h as handleStandardServerPeerMessage } from '../../shared/server.C6Q5sqYw.mjs';
+import { c as createServerPeerHandleRequestFn } from '../../shared/server.UVMTOWrk.mjs';
 import '@orpc/client';
 import '@orpc/standard-server';
 import '@orpc/contract';
-import { b as StandardRPCHandler } from '../../shared/server.CIL9uKTN.mjs';
+import { b as StandardRPCHandler } from '../../shared/server.CYRYFTxo.mjs';
 import '@orpc/client/standard';
 import '../../shared/server.DZ5BIITo.mjs';
-import '../../shared/server.NeumLVdS.mjs';
+import '../../shared/server.B_fj3X5m.mjs';
 
 class BunWsHandler {
   constructor(standardHandler) {
@@ -17,16 +17,16 @@ class BunWsHandler {
   async message(ws, message, ...rest) {
     let peer = this.peers.get(ws);
     if (!peer) {
-      this.peers.set(ws, peer = new ServerPeer((message2) => {
-        ws.send(message2);
-      }));
+      this.peers.set(ws, peer = new ServerPeer(
+        (message2) => {
+          ws.send(message2);
+        }
+      ));
     }
     const encodedMessage = typeof message === "string" ? message : new Uint8Array(message.buffer, message.byteOffset, message.byteLength);
-    await handleStandardServerPeerMessage(
-      this.standardHandler,
-      peer,
+    await peer.message(
       encodedMessage,
-      resolveMaybeOptionalOptions(rest)
+      createServerPeerHandleRequestFn(this.standardHandler, resolveMaybeOptionalOptions(rest))
     );
   }
   close(ws) {

package/dist/adapters/crossws/index.mjs

@@ -1,13 +1,13 @@
 import { resolveMaybeOptionalOptions } from '@orpc/shared';
 import { ServerPeer } from '@orpc/standard-server-peer';
-import { h as handleStandardServerPeerMessage } from '../../shared/server.C6Q5sqYw.mjs';
+import { c as createServerPeerHandleRequestFn } from '../../shared/server.UVMTOWrk.mjs';
 import '@orpc/client';
 import '@orpc/standard-server';
 import '@orpc/contract';
-import { b as StandardRPCHandler } from '../../shared/server.CIL9uKTN.mjs';
+import { b as StandardRPCHandler } from '../../shared/server.CYRYFTxo.mjs';
 import '@orpc/client/standard';
 import '../../shared/server.DZ5BIITo.mjs';
-import '../../shared/server.NeumLVdS.mjs';
+import '../../shared/server.B_fj3X5m.mjs';
 
 class experimental_CrosswsHandler {
   constructor(standardHandler) {
@@ -22,11 +22,9 @@ class experimental_CrosswsHandler {
       }));
     }
     const encodedMessage = typeof message.rawData === "string" ? message.rawData : message.uint8Array();
-    await handleStandardServerPeerMessage(
-      this.standardHandler,
-      peer,
+    await peer.message(
       encodedMessage,
-      resolveMaybeOptionalOptions(rest)
+      createServerPeerHandleRequestFn(this.standardHandler, resolveMaybeOptionalOptions(rest))
     );
   }
   close(ws) {

package/dist/adapters/fetch/index.mjs

@@ -4,11 +4,11 @@ import { toStandardLazyRequest, toFetchResponse } from '@orpc/standard-server-fe
 import { r as resolveFriendlyStandardHandleOptions } from '../../shared/server.DZ5BIITo.mjs';
 import '@orpc/standard-server';
 import '@orpc/contract';
-import { C as CompositeStandardHandlerPlugin, b as StandardRPCHandler } from '../../shared/server.CIL9uKTN.mjs';
+import { C as CompositeStandardHandlerPlugin, b as StandardRPCHandler } from '../../shared/server.CYRYFTxo.mjs';
 import '@orpc/client/standard';
 import '@orpc/standard-server/batch';
 import { S as StrictGetMethodPlugin } from '../../shared/server.BW-nUGgA.mjs';
-import '../../shared/server.NeumLVdS.mjs';
+import '../../shared/server.B_fj3X5m.mjs';
 
 class BodyLimitPlugin {
   maxBodySize;

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

@@ -1,14 +1,14 @@
 import { postMessagePortMessage, onMessagePortMessage, onMessagePortClose } from '@orpc/client/message-port';
 import { resolveMaybeOptionalOptions } from '@orpc/shared';
 import { ServerPeer } from '@orpc/standard-server-peer';
-import { h as handleStandardServerPeerMessage } from '../../shared/server.C6Q5sqYw.mjs';
+import { c as createServerPeerHandleRequestFn } from '../../shared/server.UVMTOWrk.mjs';
 import '@orpc/client';
 import '@orpc/standard-server';
 import '@orpc/contract';
-import { b as StandardRPCHandler } from '../../shared/server.CIL9uKTN.mjs';
+import { b as StandardRPCHandler } from '../../shared/server.CYRYFTxo.mjs';
 import '@orpc/client/standard';
 import '../../shared/server.DZ5BIITo.mjs';
-import '../../shared/server.NeumLVdS.mjs';
+import '../../shared/server.B_fj3X5m.mjs';
 
 class MessagePortHandler {
   constructor(standardHandler) {
@@ -19,11 +19,9 @@ class MessagePortHandler {
       return postMessagePortMessage(port, message);
     });
     onMessagePortMessage(port, async (message) => {
-      await handleStandardServerPeerMessage(
-        this.standardHandler,
-        peer,
+      await peer.message(
         message,
-        resolveMaybeOptionalOptions(rest)
+        createServerPeerHandleRequestFn(this.standardHandler, resolveMaybeOptionalOptions(rest))
       );
     });
     onMessagePortClose(port, () => {

package/dist/adapters/node/index.mjs

@@ -4,12 +4,12 @@ import { toStandardLazyRequest, sendStandardResponse } from '@orpc/standard-serv
 import { r as resolveFriendlyStandardHandleOptions } from '../../shared/server.DZ5BIITo.mjs';
 import '@orpc/standard-server';
 import '@orpc/contract';
-import { C as CompositeStandardHandlerPlugin, b as StandardRPCHandler } from '../../shared/server.CIL9uKTN.mjs';
+import { C as CompositeStandardHandlerPlugin, b as StandardRPCHandler } from '../../shared/server.CYRYFTxo.mjs';
 import '@orpc/client/standard';
 import '@orpc/standard-server/batch';
 import '@orpc/standard-server-fetch';
 import { S as StrictGetMethodPlugin } from '../../shared/server.BW-nUGgA.mjs';
-import '../../shared/server.NeumLVdS.mjs';
+import '../../shared/server.B_fj3X5m.mjs';
 
 class BodyLimitPlugin {
   maxBodySize;

package/dist/adapters/standard/index.mjs

@@ -1,8 +1,8 @@
-export { C as CompositeStandardHandlerPlugin, S as StandardHandler, a as StandardRPCCodec, b as StandardRPCHandler, c as StandardRPCMatcher } from '../../shared/server.CIL9uKTN.mjs';
+export { C as CompositeStandardHandlerPlugin, S as StandardHandler, a as StandardRPCCodec, b as StandardRPCHandler, c as StandardRPCMatcher } from '../../shared/server.CYRYFTxo.mjs';
 export { r as resolveFriendlyStandardHandleOptions } from '../../shared/server.DZ5BIITo.mjs';
 import '@orpc/client/standard';
 import '@orpc/client';
 import '@orpc/shared';
 import '@orpc/standard-server';
-import '../../shared/server.NeumLVdS.mjs';
+import '../../shared/server.B_fj3X5m.mjs';
 import '@orpc/contract';

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

@@ -1,4 +1,4 @@
-import { ServerPeer, EncodedMessage } from '@orpc/standard-server-peer';
+import { ServerPeer, EncodedMessage, ServerPeerHandleRequestFn } from '@orpc/standard-server-peer';
 import { C as Context } from '../../shared/server.CYNGeoCm.mjs';
 import { f as StandardHandler } from '../../shared/server.gqRxT-yN.mjs';
 import { F as FriendlyStandardHandleOptions } from '../../shared/server.BEFBl-Cb.mjs';
@@ -8,7 +8,11 @@ import '@orpc/shared';
 import '@orpc/standard-server';
 
 type HandleStandardServerPeerMessageOptions<T extends Context> = Omit<FriendlyStandardHandleOptions<T>, 'prefix'>;
+/**
+ * @deprecated Use `createServerPeerRequestHandleFn` instead.
+ */
 declare function handleStandardServerPeerMessage<T extends Context>(handler: StandardHandler<T>, peer: ServerPeer, message: EncodedMessage, options: HandleStandardServerPeerMessageOptions<T>): Promise<void>;
+declare function createServerPeerHandleRequestFn<T extends Context>(handler: StandardHandler<T>, options: HandleStandardServerPeerMessageOptions<T>): ServerPeerHandleRequestFn;
 
-export { handleStandardServerPeerMessage };
+export { createServerPeerHandleRequestFn, handleStandardServerPeerMessage };
 export type { HandleStandardServerPeerMessageOptions };

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

@@ -1,4 +1,4 @@
-import { ServerPeer, EncodedMessage } from '@orpc/standard-server-peer';
+import { ServerPeer, EncodedMessage, ServerPeerHandleRequestFn } from '@orpc/standard-server-peer';
 import { C as Context } from '../../shared/server.CYNGeoCm.js';
 import { f as StandardHandler } from '../../shared/server.Bmh5xd4n.js';
 import { F as FriendlyStandardHandleOptions } from '../../shared/server.B7b2w3_i.js';
@@ -8,7 +8,11 @@ import '@orpc/shared';
 import '@orpc/standard-server';
 
 type HandleStandardServerPeerMessageOptions<T extends Context> = Omit<FriendlyStandardHandleOptions<T>, 'prefix'>;
+/**
+ * @deprecated Use `createServerPeerRequestHandleFn` instead.
+ */
 declare function handleStandardServerPeerMessage<T extends Context>(handler: StandardHandler<T>, peer: ServerPeer, message: EncodedMessage, options: HandleStandardServerPeerMessageOptions<T>): Promise<void>;
+declare function createServerPeerHandleRequestFn<T extends Context>(handler: StandardHandler<T>, options: HandleStandardServerPeerMessageOptions<T>): ServerPeerHandleRequestFn;
 
-export { handleStandardServerPeerMessage };
+export { createServerPeerHandleRequestFn, handleStandardServerPeerMessage };
 export type { HandleStandardServerPeerMessageOptions };

package/dist/adapters/standard-peer/index.mjs

@@ -1,4 +1,4 @@
-export { h as handleStandardServerPeerMessage } from '../../shared/server.C6Q5sqYw.mjs';
+export { c as createServerPeerHandleRequestFn, h as handleStandardServerPeerMessage } from '../../shared/server.UVMTOWrk.mjs';
 import '@orpc/client';
 import '@orpc/shared';
 import '@orpc/standard-server';

package/dist/adapters/websocket/index.mjs

@@ -1,13 +1,13 @@
 import { readAsBuffer, resolveMaybeOptionalOptions } from '@orpc/shared';
 import { ServerPeer } from '@orpc/standard-server-peer';
-import { h as handleStandardServerPeerMessage } from '../../shared/server.C6Q5sqYw.mjs';
+import { c as createServerPeerHandleRequestFn } from '../../shared/server.UVMTOWrk.mjs';
 import '@orpc/client';
 import '@orpc/standard-server';
 import '@orpc/contract';
-import { b as StandardRPCHandler } from '../../shared/server.CIL9uKTN.mjs';
+import { b as StandardRPCHandler } from '../../shared/server.CYRYFTxo.mjs';
 import '@orpc/client/standard';
 import '../../shared/server.DZ5BIITo.mjs';
-import '../../shared/server.NeumLVdS.mjs';
+import '../../shared/server.B_fj3X5m.mjs';
 
 class WebsocketHandler {
   #peers = /* @__PURE__ */ new WeakMap();
@@ -40,11 +40,9 @@ class WebsocketHandler {
       this.#peers.set(ws, peer = new ServerPeer(ws.send.bind(ws)));
     }
     const message = data instanceof Blob ? await readAsBuffer(data) : data;
-    await handleStandardServerPeerMessage(
-      this.#handler,
-      peer,
+    await peer.message(
       message,
-      resolveMaybeOptionalOptions(rest)
+      createServerPeerHandleRequestFn(this.#handler, resolveMaybeOptionalOptions(rest))
     );
   }
   /**

package/dist/adapters/ws/index.mjs

@@ -1,13 +1,13 @@
 import { readAsBuffer, resolveMaybeOptionalOptions } from '@orpc/shared';
 import { ServerPeer } from '@orpc/standard-server-peer';
-import { h as handleStandardServerPeerMessage } from '../../shared/server.C6Q5sqYw.mjs';
+import { c as createServerPeerHandleRequestFn } from '../../shared/server.UVMTOWrk.mjs';
 import '@orpc/client';
 import '@orpc/standard-server';
 import '@orpc/contract';
-import { b as StandardRPCHandler } from '../../shared/server.CIL9uKTN.mjs';
+import { b as StandardRPCHandler } from '../../shared/server.CYRYFTxo.mjs';
 import '@orpc/client/standard';
 import '../../shared/server.DZ5BIITo.mjs';
-import '../../shared/server.NeumLVdS.mjs';
+import '../../shared/server.B_fj3X5m.mjs';
 
 class WsHandler {
   constructor(standardHandler) {
@@ -17,11 +17,9 @@ class WsHandler {
     const peer = new ServerPeer(ws.send.bind(ws));
     ws.addEventListener("message", async (event) => {
       const message = Array.isArray(event.data) ? await readAsBuffer(new Blob(event.data)) : event.data;
-      await handleStandardServerPeerMessage(
-        this.standardHandler,
-        peer,
+      await peer.message(
         message,
-        resolveMaybeOptionalOptions(rest)
+        createServerPeerHandleRequestFn(this.standardHandler, resolveMaybeOptionalOptions(rest))
       );
     });
     ws.addEventListener("close", () => {

package/dist/hibernation/index.d.mts

@@ -1,13 +1,13 @@
 import { StandardRPCJsonSerializerOptions } from '@orpc/client/standard';
 import { g as StandardHandlerPlugin, e as StandardHandlerOptions } from '../shared/server.gqRxT-yN.mjs';
-import { experimental_HibernationEventIterator } from '@orpc/standard-server';
-export { experimental_HibernationEventIterator, experimental_HibernationEventIteratorCallback } from '@orpc/standard-server';
+import { HibernationEventIterator } from '@orpc/standard-server';
+export { HibernationEventIterator, HibernationEventIteratorCallback } from '@orpc/standard-server';
 import { C as Context, R as Router } from '../shared/server.CYNGeoCm.mjs';
 import '@orpc/client';
 import '@orpc/contract';
 import '@orpc/shared';
 
-interface experimental_EncodeHibernationRPCEventOptions extends StandardRPCJsonSerializerOptions {
+interface EncodeHibernationRPCEventOptions extends StandardRPCJsonSerializerOptions {
     /**
      * The type of event, each type corresponds a different operation
      *
@@ -24,21 +24,21 @@ interface experimental_EncodeHibernationRPCEventOptions extends StandardRPCJsonS
  *
  * @see {@link https://orpc.unnoq.com/docs/plugins/hibernation Hibernation Plugin}
  */
-declare function experimental_encodeHibernationRPCEvent(id: string, payload: unknown, options?: experimental_EncodeHibernationRPCEventOptions): string;
+declare function encodeHibernationRPCEvent(id: string, payload: unknown, options?: EncodeHibernationRPCEventOptions): string;
 
-interface experimental_HibernationPluginContext {
-    iterator?: experimental_HibernationEventIterator<any>;
+interface HibernationPluginContext {
+    iterator?: HibernationEventIterator<any>;
 }
 /**
  * Enable Hibernation APIs
  *
  * @see {@link https://orpc.unnoq.com/docs/plugins/hibernation Hibernation Plugin}
  */
-declare class experimental_HibernationPlugin<T extends Context> implements StandardHandlerPlugin<T> {
+declare class HibernationPlugin<T extends Context> implements StandardHandlerPlugin<T> {
     readonly CONTEXT_SYMBOL: symbol;
     order: number;
     init(options: StandardHandlerOptions<T>, _router: Router<any, T>): void;
 }
 
-export { experimental_HibernationPlugin, experimental_encodeHibernationRPCEvent };
-export type { experimental_EncodeHibernationRPCEventOptions, experimental_HibernationPluginContext };
+export { HibernationPlugin, encodeHibernationRPCEvent };
+export type { EncodeHibernationRPCEventOptions, HibernationPluginContext };

package/dist/hibernation/index.d.ts

@@ -1,13 +1,13 @@
 import { StandardRPCJsonSerializerOptions } from '@orpc/client/standard';
 import { g as StandardHandlerPlugin, e as StandardHandlerOptions } from '../shared/server.Bmh5xd4n.js';
-import { experimental_HibernationEventIterator } from '@orpc/standard-server';
-export { experimental_HibernationEventIterator, experimental_HibernationEventIteratorCallback } from '@orpc/standard-server';
+import { HibernationEventIterator } from '@orpc/standard-server';
+export { HibernationEventIterator, HibernationEventIteratorCallback } from '@orpc/standard-server';
 import { C as Context, R as Router } from '../shared/server.CYNGeoCm.js';
 import '@orpc/client';
 import '@orpc/contract';
 import '@orpc/shared';
 
-interface experimental_EncodeHibernationRPCEventOptions extends StandardRPCJsonSerializerOptions {
+interface EncodeHibernationRPCEventOptions extends StandardRPCJsonSerializerOptions {
     /**
      * The type of event, each type corresponds a different operation
      *
@@ -24,21 +24,21 @@ interface experimental_EncodeHibernationRPCEventOptions extends StandardRPCJsonS
  *
  * @see {@link https://orpc.unnoq.com/docs/plugins/hibernation Hibernation Plugin}
  */
-declare function experimental_encodeHibernationRPCEvent(id: string, payload: unknown, options?: experimental_EncodeHibernationRPCEventOptions): string;
+declare function encodeHibernationRPCEvent(id: string, payload: unknown, options?: EncodeHibernationRPCEventOptions): string;
 
-interface experimental_HibernationPluginContext {
-    iterator?: experimental_HibernationEventIterator<any>;
+interface HibernationPluginContext {
+    iterator?: HibernationEventIterator<any>;
 }
 /**
  * Enable Hibernation APIs
  *
  * @see {@link https://orpc.unnoq.com/docs/plugins/hibernation Hibernation Plugin}
  */
-declare class experimental_HibernationPlugin<T extends Context> implements StandardHandlerPlugin<T> {
+declare class HibernationPlugin<T extends Context> implements StandardHandlerPlugin<T> {
     readonly CONTEXT_SYMBOL: symbol;
     order: number;
     init(options: StandardHandlerOptions<T>, _router: Router<any, T>): void;
 }
 
-export { experimental_HibernationPlugin, experimental_encodeHibernationRPCEvent };
-export type { experimental_EncodeHibernationRPCEventOptions, experimental_HibernationPluginContext };
+export { HibernationPlugin, encodeHibernationRPCEvent };
+export type { EncodeHibernationRPCEventOptions, HibernationPluginContext };

package/dist/hibernation/index.mjs

@@ -1,11 +1,11 @@
 import { toORPCError } from '@orpc/client';
 import { StandardRPCJsonSerializer } from '@orpc/client/standard';
 import { stringifyJSON } from '@orpc/shared';
-import { getEventMeta, experimental_HibernationEventIterator } from '@orpc/standard-server';
-export { experimental_HibernationEventIterator } from '@orpc/standard-server';
+import { getEventMeta, HibernationEventIterator } from '@orpc/standard-server';
+export { HibernationEventIterator } from '@orpc/standard-server';
 import { MessageType } from '@orpc/standard-server-peer';
 
-function experimental_encodeHibernationRPCEvent(id, payload, options = {}) {
+function encodeHibernationRPCEvent(id, payload, options = {}) {
   const { event = "message", ...rest } = options;
   const serializer = new StandardRPCJsonSerializer(rest);
   const data = event === "error" ? toORPCError(payload).toJSON() : payload;
@@ -21,7 +21,7 @@ function experimental_encodeHibernationRPCEvent(id, payload, options = {}) {
   });
 }
 
-class experimental_HibernationPlugin {
+class HibernationPlugin {
   CONTEXT_SYMBOL = Symbol("ORPC_HIBERNATION_CONTEXT");
   order = 2e6;
   // make sure execute after the batch plugin
@@ -33,8 +33,8 @@ class experimental_HibernationPlugin {
       const result = await options2.next({
         ...options2,
         context: {
-          [this.CONTEXT_SYMBOL]: hibernationContext,
-          ...options2.context
+          ...options2.context,
+          [this.CONTEXT_SYMBOL]: hibernationContext
         }
       });
       if (!result.matched || !hibernationContext.iterator) {
@@ -54,7 +54,7 @@ class experimental_HibernationPlugin {
         throw new TypeError("[HibernationPlugin] Hibernation context has been corrupted or modified by another plugin or interceptor");
       }
       const output = await options2.next();
-      if (output instanceof experimental_HibernationEventIterator) {
+      if (output instanceof HibernationEventIterator) {
         hibernationContext.iterator = output;
       }
       return output;
@@ -62,4 +62,4 @@ class experimental_HibernationPlugin {
   }
 }
 
-export { experimental_HibernationPlugin, experimental_encodeHibernationRPCEvent };
+export { HibernationPlugin, encodeHibernationRPCEvent };

package/dist/index.mjs

@@ -1,7 +1,7 @@
 import { mergeErrorMap, mergeMeta, mergeRoute, mergePrefix, mergeTags, isContractProcedure, getContractRouter, fallbackContractConfig } from '@orpc/contract';
 export { ValidationError, eventIterator, type } from '@orpc/contract';
-import { P as Procedure, b as addMiddleware, c as createProcedureClient, e as enhanceRouter, l as lazy, s as setHiddenRouterContract, u as unlazy, g as getRouter, i as isProcedure, d as isLazy, f as createAssertedLazyProcedure } from './shared/server.NeumLVdS.mjs';
-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, x as unlazyRouter, v as validateORPCError } from './shared/server.NeumLVdS.mjs';
+import { P as Procedure, b as addMiddleware, c as createProcedureClient, e as enhanceRouter, l as lazy, s as setHiddenRouterContract, u as unlazy, g as getRouter, i as isProcedure, d as isLazy, f as createAssertedLazyProcedure } from './shared/server.B_fj3X5m.mjs';
+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, x as unlazyRouter, v as validateORPCError } from './shared/server.B_fj3X5m.mjs';
 import { toORPCError } from '@orpc/client';
 export { ORPCError, isDefinedError, safe } from '@orpc/client';
 import { resolveMaybeOptionalOptions } from '@orpc/shared';

package/dist/plugins/index.mjs

@@ -1,4 +1,4 @@
-import { value, isAsyncIteratorObject, clone } from '@orpc/shared';
+import { runWithSpan, value, setSpanError, isAsyncIteratorObject, clone } from '@orpc/shared';
 import { flattenHeader } from '@orpc/standard-server';
 import { parseBatchRequest, toBatchResponse } from '@orpc/standard-server/batch';
 import { toFetchHeaders } from '@orpc/standard-server-fetch';
@@ -33,65 +33,74 @@ class BatchHandlerPlugin {
       }
       let isParsing = false;
       try {
-        isParsing = true;
-        const parsed = parseBatchRequest({ ...options2.request, body: await options2.request.body() });
-        isParsing = false;
-        const maxSize = await value(this.maxSize, options2);
-        if (parsed.length > maxSize) {
-          return {
-            matched: true,
-            response: {
-              status: 413,
-              headers: {},
-              body: "Batch request size exceeds the maximum allowed size"
-            }
-          };
-        }
-        const responses = parsed.map(
-          (request, index) => {
-            const mapped = this.mapRequestItem(request, options2);
-            return options2.next({ ...options2, request: { ...mapped, body: () => Promise.resolve(mapped.body) } }).then(({ response: response2, matched }) => {
-              if (matched) {
-                if (response2.body instanceof Blob || response2.body instanceof FormData || isAsyncIteratorObject(response2.body)) {
-                  return {
-                    index,
-                    status: 500,
-                    headers: {},
-                    body: "Batch responses do not support file/blob, or event-iterator. Please call this procedure separately outside of the batch request."
-                  };
-                }
-                return { ...response2, index };
+        return await runWithSpan({ name: "handle_batch_request" }, async (span) => {
+          const mode = xHeader === "buffered" ? "buffered" : "streaming";
+          isParsing = true;
+          const parsed = parseBatchRequest({ ...options2.request, body: await options2.request.body() });
+          isParsing = false;
+          span?.setAttribute("batch.mode", mode);
+          span?.setAttribute("batch.size", parsed.length);
+          const maxSize = await value(this.maxSize, options2);
+          if (parsed.length > maxSize) {
+            const message = "Batch request size exceeds the maximum allowed size";
+            setSpanError(span, message);
+            return {
+              matched: true,
+              response: {
+                status: 413,
+                headers: {},
+                body: message
               }
-              return { index, status: 404, headers: {}, body: "No procedure matched" };
-            }).catch(() => {
-              return { index, status: 500, headers: {}, body: "Internal server error" };
-            });
+            };
           }
-        );
-        await Promise.race(responses);
-        const status = await value(this.successStatus, responses, options2);
-        const headers = await value(this.headers, responses, options2);
-        const response = await toBatchResponse({
-          status,
-          headers,
-          mode: xHeader === "buffered" ? "buffered" : "streaming",
-          body: async function* () {
-            const promises = [...responses];
-            while (true) {
-              const handling = promises.filter((p) => p !== void 0);
-              if (handling.length === 0) {
-                return;
-              }
-              const result = await Promise.race(handling);
-              promises[result.index] = void 0;
-              yield result;
+          const responses = parsed.map(
+            (request, index) => {
+              const mapped = this.mapRequestItem(request, options2);
+              return options2.next({ ...options2, request: { ...mapped, body: () => Promise.resolve(mapped.body) } }).then(({ response: response2, matched }) => {
+                span?.addEvent(`response.${index}.${matched ? "success" : "not_matched"}`);
+                if (matched) {
+                  if (response2.body instanceof Blob || response2.body instanceof FormData || isAsyncIteratorObject(response2.body)) {
+                    return {
+                      index,
+                      status: 500,
+                      headers: {},
+                      body: "Batch responses do not support file/blob, or event-iterator. Please call this procedure separately outside of the batch request."
+                    };
+                  }
+                  return { ...response2, index };
+                }
+                return { index, status: 404, headers: {}, body: "No procedure matched" };
+              }).catch((err) => {
+                Promise.reject(err);
+                return { index, status: 500, headers: {}, body: "Internal server error" };
+              });
             }
-          }()
+          );
+          await Promise.race(responses);
+          const status = await value(this.successStatus, responses, options2);
+          const headers = await value(this.headers, responses, options2);
+          const response = await toBatchResponse({
+            status,
+            headers,
+            mode,
+            body: async function* () {
+              const promises = [...responses];
+              while (true) {
+                const handling = promises.filter((p) => p !== void 0);
+                if (handling.length === 0) {
+                  return;
+                }
+                const result = await Promise.race(handling);
+                promises[result.index] = void 0;
+                yield result;
+              }
+            }()
+          });
+          return {
+            matched: true,
+            response
+          };
         });
-        return {
-          matched: true,
-          response
-        };
       } catch (cause) {
         if (isParsing) {
           return {

package/dist/shared/{server.NeumLVdS.mjs → server.B_fj3X5m.mjs}

@@ -1,6 +1,7 @@
 import { isContractProcedure, ValidationError, mergePrefix, mergeErrorMap, enhanceRoute } from '@orpc/contract';
-import { resolveMaybeOptionalOptions, toArray, value, intercept } from '@orpc/shared';
+import { resolveMaybeOptionalOptions, toArray, value, runWithSpan, intercept, isAsyncIteratorObject, asyncIteratorWithSpan } from '@orpc/shared';
 import { fallbackORPCErrorStatus, ORPCError } from '@orpc/client';
+import { HibernationEventIterator } from '@orpc/standard-server';
 
 const LAZY_SYMBOL = Symbol("ORPC_LAZY_SYMBOL");
 function lazy(loader, meta = {}) {
@@ -116,20 +117,36 @@ function createProcedureClient(lazyableProcedure, ...rest) {
     const context = await value(options.context ?? {}, clientContext);
     const errors = createORPCErrorConstructorMap(procedure["~orpc"].errorMap);
     try {
-      return await intercept(
-        toArray(options.interceptors),
-        {
-          context,
-          input,
-          // input only optional when it undefinable so we can safely cast it
-          errors,
-          path,
-          procedure,
-          signal: callerOptions?.signal,
-          lastEventId: callerOptions?.lastEventId
-        },
-        (interceptorOptions) => executeProcedureInternal(interceptorOptions.procedure, interceptorOptions)
+      const output = await runWithSpan(
+        { name: "call_procedure", signal: callerOptions?.signal },
+        (span) => {
+          span?.setAttribute("procedure.path", [...path]);
+          return intercept(
+            toArray(options.interceptors),
+            {
+              context,
+              input,
+              // input only optional when it undefinable so we can safely cast it
+              errors,
+              path,
+              procedure,
+              signal: callerOptions?.signal,
+              lastEventId: callerOptions?.lastEventId
+            },
+            (interceptorOptions) => executeProcedureInternal(interceptorOptions.procedure, interceptorOptions)
+          );
+        }
       );
+      if (isAsyncIteratorObject(output)) {
+        if (output instanceof HibernationEventIterator) {
+          return output;
+        }
+        return asyncIteratorWithSpan(
+          { name: "consume_event_iterator_output", signal: callerOptions?.signal },
+          output
+        );
+      }
+      return output;
     } catch (e) {
       if (!(e instanceof ORPCError)) {
         throw e;
@@ -144,31 +161,41 @@ async function validateInput(procedure, input) {
   if (!schema) {
     return input;
   }
-  const result = await schema["~standard"].validate(input);
-  if (result.issues) {
-    throw new ORPCError("BAD_REQUEST", {
-      message: "Input validation failed",
-      data: {
-        issues: result.issues
-      },
-      cause: new ValidationError({ message: "Input validation failed", issues: result.issues })
-    });
-  }
-  return result.value;
+  return runWithSpan(
+    { name: "validate_input" },
+    async () => {
+      const result = await schema["~standard"].validate(input);
+      if (result.issues) {
+        throw new ORPCError("BAD_REQUEST", {
+          message: "Input validation failed",
+          data: {
+            issues: result.issues
+          },
+          cause: new ValidationError({ message: "Input validation failed", issues: result.issues })
+        });
+      }
+      return result.value;
+    }
+  );
 }
 async function validateOutput(procedure, output) {
   const schema = procedure["~orpc"].outputSchema;
   if (!schema) {
     return output;
   }
-  const result = await schema["~standard"].validate(output);
-  if (result.issues) {
-    throw new ORPCError("INTERNAL_SERVER_ERROR", {
-      message: "Output validation failed",
-      cause: new ValidationError({ message: "Output validation failed", issues: result.issues })
-    });
-  }
-  return result.value;
+  return runWithSpan(
+    { name: "validate_output" },
+    async () => {
+      const result = await schema["~standard"].validate(output);
+      if (result.issues) {
+        throw new ORPCError("INTERNAL_SERVER_ERROR", {
+          message: "Output validation failed",
+          cause: new ValidationError({ message: "Output validation failed", issues: result.issues })
+        });
+      }
+      return result.value;
+    }
+  );
 }
 async function executeProcedureInternal(procedure, options) {
   const middlewares = procedure["~orpc"].middlewares;
@@ -180,17 +207,28 @@ async function executeProcedureInternal(procedure, options) {
       currentInput = await validateInput(procedure, currentInput);
     }
     const mid = middlewares[index];
-    const output = mid ? (await mid({
-      ...options,
-      context,
-      next: async (...[nextOptions]) => {
-        const nextContext = nextOptions?.context ?? {};
-        return {
-          output: await next(index + 1, mergeCurrentContext(context, nextContext), currentInput),
-          context: nextContext
-        };
+    const output = mid ? await runWithSpan(
+      { name: `middleware.${mid.name}`, signal: options.signal },
+      async (span) => {
+        span?.setAttribute("middleware.index", index);
+        span?.setAttribute("middleware.name", mid.name);
+        const result = await mid({
+          ...options,
+          context,
+          next: async (...[nextOptions]) => {
+            const nextContext = nextOptions?.context ?? {};
+            return {
+              output: await next(index + 1, mergeCurrentContext(context, nextContext), currentInput),
+              context: nextContext
+            };
+          }
+        }, currentInput, middlewareOutputFn);
+        return result.output;
       }
-    }, currentInput, middlewareOutputFn)).output : await procedure["~orpc"].handler({ ...options, context, input: currentInput });
+    ) : await runWithSpan(
+      { name: "handler", signal: options.signal },
+      () => procedure["~orpc"].handler({ ...options, context, input: currentInput })
+    );
     if (index === outputValidationIndex) {
       return await validateOutput(procedure, output);
     }

package/dist/shared/{server.CIL9uKTN.mjs → server.CYRYFTxo.mjs}

@@ -1,8 +1,8 @@
 import { toHttpPath, StandardRPCJsonSerializer, StandardRPCSerializer } from '@orpc/client/standard';
 import { ORPCError, toORPCError } from '@orpc/client';
-import { toArray, intercept, parseEmptyableJSON, NullProtoObj, value } from '@orpc/shared';
+import { toArray, intercept, runWithSpan, ORPC_NAME, isAsyncIteratorObject, asyncIteratorWithSpan, setSpanError, parseEmptyableJSON, NullProtoObj, value } 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.NeumLVdS.mjs';
+import { c as createProcedureClient, t as traverseContractProcedures, i as isProcedure, u as unlazy, g as getRouter, a as createContractedProcedure } from './server.B_fj3X5m.mjs';
 
 class CompositeStandardHandlerPlugin {
   plugins;
@@ -39,49 +39,74 @@ class StandardHandler {
       this.rootInterceptors,
       { ...options, request, prefix },
       async (interceptorOptions) => {
-        let isDecoding = false;
-        try {
-          return await intercept(
-            this.interceptors,
-            interceptorOptions,
-            async ({ request: request2, context, prefix: prefix2 }) => {
-              const method = request2.method;
-              const url = request2.url;
-              const pathname = prefix2 ? url.pathname.replace(prefix2, "") : url.pathname;
-              const match = await this.matcher.match(method, `/${pathname.replace(/^\/|\/$/g, "")}`);
-              if (!match) {
-                return { matched: false, response: void 0 };
+        return runWithSpan(
+          { name: `${request.method} ${request.url.pathname}` },
+          async (span) => {
+            let step;
+            try {
+              return await intercept(
+                this.interceptors,
+                interceptorOptions,
+                async ({ request: request2, context, prefix: prefix2 }) => {
+                  const method = request2.method;
+                  const url = request2.url;
+                  const pathname = prefix2 ? url.pathname.replace(prefix2, "") : url.pathname;
+                  const match = await runWithSpan(
+                    { name: "find_procedure" },
+                    () => this.matcher.match(method, `/${pathname.replace(/^\/|\/$/g, "")}`)
+                  );
+                  if (!match) {
+                    return { matched: false, response: void 0 };
+                  }
+                  span?.updateName(`${ORPC_NAME}.${match.path.join("/")}`);
+                  span?.setAttribute("rpc.system", ORPC_NAME);
+                  span?.setAttribute("rpc.method", match.path.join("."));
+                  step = "decode_input";
+                  let input = await runWithSpan(
+                    { name: "decode_input" },
+                    () => this.codec.decode(request2, match.params, match.procedure)
+                  );
+                  step = void 0;
+                  if (isAsyncIteratorObject(input)) {
+                    input = asyncIteratorWithSpan(
+                      { name: "consume_event_iterator_input", signal: request2.signal },
+                      input
+                    );
+                  }
+                  const client = createProcedureClient(match.procedure, {
+                    context,
+                    path: match.path,
+                    interceptors: this.clientInterceptors
+                  });
+                  step = "call_procedure";
+                  const output = await client(input, {
+                    signal: request2.signal,
+                    lastEventId: flattenHeader(request2.headers["last-event-id"])
+                  });
+                  step = void 0;
+                  const response = this.codec.encode(output, match.procedure);
+                  return {
+                    matched: true,
+                    response
+                  };
+                }
+              );
+            } catch (e) {
+              if (step !== "call_procedure") {
+                setSpanError(span, e);
               }
-              const client = createProcedureClient(match.procedure, {
-                context,
-                path: match.path,
-                interceptors: this.clientInterceptors
-              });
-              isDecoding = true;
-              const input = await this.codec.decode(request2, match.params, match.procedure);
-              isDecoding = false;
-              const output = await client(input, {
-                signal: request2.signal,
-                lastEventId: flattenHeader(request2.headers["last-event-id"])
-              });
-              const response = this.codec.encode(output, match.procedure);
+              const error = step === "decode_input" && !(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);
+              const response = this.codec.encodeError(error);
               return {
                 matched: true,
                 response
               };
             }
-          );
-        } catch (e) {
-          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);
-          const response = this.codec.encodeError(error);
-          return {
-            matched: true,
-            response
-          };
-        }
+          }
+        );
       }
     );
   }

package/dist/shared/server.UVMTOWrk.mjs

@@ -0,0 +1,26 @@
+import '@orpc/client';
+import '@orpc/shared';
+import '@orpc/standard-server';
+import '@orpc/contract';
+import '@orpc/client/standard';
+import { r as resolveFriendlyStandardHandleOptions } from './server.DZ5BIITo.mjs';
+
+async function handleStandardServerPeerMessage(handler, peer, message, options) {
+  const [id, request] = await peer.message(message);
+  if (!request) {
+    return;
+  }
+  const handle = createServerPeerHandleRequestFn(handler, options);
+  await peer.response(id, await handle(request));
+}
+function createServerPeerHandleRequestFn(handler, options) {
+  return async (request) => {
+    const { response } = await handler.handle(
+      { ...request, body: () => Promise.resolve(request.body) },
+      resolveFriendlyStandardHandleOptions(options)
+    );
+    return response ?? { status: 404, headers: {}, body: "No procedure matched" };
+  };
+}
+
+export { createServerPeerHandleRequestFn as c, handleStandardServerPeerMessage as h };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/server",
   "type": "module",
-  "version": "1.7.10",
+  "version": "1.8.0",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -102,14 +102,14 @@
   },
   "dependencies": {
     "cookie": "^1.0.2",
-    "@orpc/client": "1.7.10",
-    "@orpc/contract": "1.7.10",
-    "@orpc/shared": "1.7.10",
-    "@orpc/standard-server-fetch": "1.7.10",
-    "@orpc/standard-server-node": "1.7.10",
-    "@orpc/standard-server": "1.7.10",
-    "@orpc/standard-server-peer": "1.7.10",
-    "@orpc/standard-server-aws-lambda": "1.7.10"
+    "@orpc/client": "1.8.0",
+    "@orpc/shared": "1.8.0",
+    "@orpc/standard-server": "1.8.0",
+    "@orpc/contract": "1.8.0",
+    "@orpc/standard-server-aws-lambda": "1.8.0",
+    "@orpc/standard-server-fetch": "1.8.0",
+    "@orpc/standard-server-node": "1.8.0",
+    "@orpc/standard-server-peer": "1.8.0"
   },
   "devDependencies": {
     "@types/ws": "^8.18.1",

package/dist/shared/server.C6Q5sqYw.mjs

@@ -1,20 +0,0 @@
-import '@orpc/client';
-import '@orpc/shared';
-import '@orpc/standard-server';
-import '@orpc/contract';
-import '@orpc/client/standard';
-import { r as resolveFriendlyStandardHandleOptions } from './server.DZ5BIITo.mjs';
-
-async function handleStandardServerPeerMessage(handler, peer, message, options) {
-  const [id, request] = await peer.message(message);
-  if (!request) {
-    return;
-  }
-  const { response } = await handler.handle(
-    { ...request, body: () => Promise.resolve(request.body) },
-    resolveFriendlyStandardHandleOptions(options)
-  );
-  await peer.response(id, response ?? { status: 404, headers: {}, body: "No procedure matched" });
-}
-
-export { handleStandardServerPeerMessage as h };