@orpc/client 1.7.11 → 1.8.1

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/fetch/index.d.mts

@@ -1,8 +1,8 @@
 import { StandardRequest, StandardLazyResponse } from '@orpc/standard-server';
 import { ToFetchRequestOptions } from '@orpc/standard-server-fetch';
 import { b as ClientContext, c as ClientOptions } from '../../shared/client.BOYsZIRq.mjs';
-import { f as StandardLinkClient } from '../../shared/client.C4VxIexA.mjs';
-import { f as StandardRPCLinkOptions, g as StandardRPCLink } from '../../shared/client.aTp4sII-.mjs';
+import { f as StandardLinkClient } from '../../shared/client.Bwgm6dgk.mjs';
+import { f as StandardRPCLinkOptions, g as StandardRPCLink } from '../../shared/client.Ycwr4Tuo.mjs';
 import '@orpc/shared';
 
 interface LinkFetchClientOptions<T extends ClientContext> extends ToFetchRequestOptions {

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

@@ -1,8 +1,8 @@
 import { StandardRequest, StandardLazyResponse } from '@orpc/standard-server';
 import { ToFetchRequestOptions } from '@orpc/standard-server-fetch';
 import { b as ClientContext, c as ClientOptions } from '../../shared/client.BOYsZIRq.js';
-import { f as StandardLinkClient } from '../../shared/client.CXXEPIbK.js';
-import { f as StandardRPCLinkOptions, g as StandardRPCLink } from '../../shared/client.WCinBImJ.js';
+import { f as StandardLinkClient } from '../../shared/client.BG98rYdO.js';
+import { f as StandardRPCLinkOptions, g as StandardRPCLink } from '../../shared/client.C176log5.js';
 import '@orpc/shared';
 
 interface LinkFetchClientOptions<T extends ClientContext> extends ToFetchRequestOptions {

package/dist/adapters/fetch/index.mjs

@@ -1,8 +1,8 @@
 import { toFetchRequest, toStandardLazyResponse } from '@orpc/standard-server-fetch';
 import '@orpc/shared';
-import { c as StandardRPCLink } from '../../shared/client.BvXDSBF5.mjs';
+import { c as StandardRPCLink } from '../../shared/client.DKmRtVO2.mjs';
 import '@orpc/standard-server';
-import '../../shared/client.BngOL3Ai.mjs';
+import '../../shared/client.txdq_i5V.mjs';
 
 class LinkFetchClient {
   fetch;
@@ -14,7 +14,7 @@ class LinkFetchClient {
   async call(request, options, path, input) {
     const fetchRequest = toFetchRequest(request, this.toFetchRequestOptions);
     const fetchResponse = await this.fetch(fetchRequest, { redirect: "manual" }, options, path, input);
-    const lazyResponse = toStandardLazyResponse(fetchResponse);
+    const lazyResponse = toStandardLazyResponse(fetchResponse, { signal: fetchRequest.signal });
     return lazyResponse;
   }
 }

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

@@ -1,7 +1,7 @@
 import { StandardRequest, StandardLazyResponse } from '@orpc/standard-server';
 import { b as ClientContext, c as ClientOptions } from '../../shared/client.BOYsZIRq.mjs';
-import { f as StandardLinkClient } from '../../shared/client.C4VxIexA.mjs';
-import { f as StandardRPCLinkOptions, g as StandardRPCLink } from '../../shared/client.aTp4sII-.mjs';
+import { f as StandardLinkClient } from '../../shared/client.Bwgm6dgk.mjs';
+import { f as StandardRPCLinkOptions, g as StandardRPCLink } from '../../shared/client.Ycwr4Tuo.mjs';
 import '@orpc/shared';
 
 /**

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

@@ -1,7 +1,7 @@
 import { StandardRequest, StandardLazyResponse } from '@orpc/standard-server';
 import { b as ClientContext, c as ClientOptions } from '../../shared/client.BOYsZIRq.js';
-import { f as StandardLinkClient } from '../../shared/client.CXXEPIbK.js';
-import { f as StandardRPCLinkOptions, g as StandardRPCLink } from '../../shared/client.WCinBImJ.js';
+import { f as StandardLinkClient } from '../../shared/client.BG98rYdO.js';
+import { f as StandardRPCLinkOptions, g as StandardRPCLink } from '../../shared/client.C176log5.js';
 import '@orpc/shared';
 
 /**

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

@@ -1,8 +1,8 @@
 import { ClientPeer } from '@orpc/standard-server-peer';
 import '@orpc/shared';
-import { c as StandardRPCLink } from '../../shared/client.BvXDSBF5.mjs';
+import { c as StandardRPCLink } from '../../shared/client.DKmRtVO2.mjs';
 import '@orpc/standard-server';
-import '../../shared/client.BngOL3Ai.mjs';
+import '../../shared/client.txdq_i5V.mjs';
 
 function postMessagePortMessage(port, data) {
   port.postMessage(data);

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

@@ -1,5 +1,5 @@
-export { C as CompositeStandardLinkPlugin, d as StandardLink, f as StandardLinkClient, S as StandardLinkClientInterceptorOptions, e as StandardLinkCodec, c as StandardLinkInterceptorOptions, b as StandardLinkOptions, a as StandardLinkPlugin } from '../../shared/client.C4VxIexA.mjs';
-export { S as STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES, c as StandardRPCCustomJsonSerializer, b as StandardRPCJsonSerialized, a as StandardRPCJsonSerializedMetaItem, e as StandardRPCJsonSerializer, d as StandardRPCJsonSerializerOptions, g as StandardRPCLink, i as StandardRPCLinkCodec, h as StandardRPCLinkCodecOptions, f as StandardRPCLinkOptions, j as StandardRPCSerializer } from '../../shared/client.aTp4sII-.mjs';
+export { C as CompositeStandardLinkPlugin, d as StandardLink, f as StandardLinkClient, S as StandardLinkClientInterceptorOptions, e as StandardLinkCodec, c as StandardLinkInterceptorOptions, b as StandardLinkOptions, a as StandardLinkPlugin } from '../../shared/client.Bwgm6dgk.mjs';
+export { S as STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES, c as StandardRPCCustomJsonSerializer, b as StandardRPCJsonSerialized, a as StandardRPCJsonSerializedMetaItem, e as StandardRPCJsonSerializer, d as StandardRPCJsonSerializerOptions, g as StandardRPCLink, i as StandardRPCLinkCodec, h as StandardRPCLinkCodecOptions, f as StandardRPCLinkOptions, j as StandardRPCSerializer } from '../../shared/client.Ycwr4Tuo.mjs';
 import { H as HTTPPath } from '../../shared/client.BOYsZIRq.mjs';
 import '@orpc/shared';
 import '@orpc/standard-server';

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

@@ -1,5 +1,5 @@
-export { C as CompositeStandardLinkPlugin, d as StandardLink, f as StandardLinkClient, S as StandardLinkClientInterceptorOptions, e as StandardLinkCodec, c as StandardLinkInterceptorOptions, b as StandardLinkOptions, a as StandardLinkPlugin } from '../../shared/client.CXXEPIbK.js';
-export { S as STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES, c as StandardRPCCustomJsonSerializer, b as StandardRPCJsonSerialized, a as StandardRPCJsonSerializedMetaItem, e as StandardRPCJsonSerializer, d as StandardRPCJsonSerializerOptions, g as StandardRPCLink, i as StandardRPCLinkCodec, h as StandardRPCLinkCodecOptions, f as StandardRPCLinkOptions, j as StandardRPCSerializer } from '../../shared/client.WCinBImJ.js';
+export { C as CompositeStandardLinkPlugin, d as StandardLink, f as StandardLinkClient, S as StandardLinkClientInterceptorOptions, e as StandardLinkCodec, c as StandardLinkInterceptorOptions, b as StandardLinkOptions, a as StandardLinkPlugin } from '../../shared/client.BG98rYdO.js';
+export { S as STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES, c as StandardRPCCustomJsonSerializer, b as StandardRPCJsonSerialized, a as StandardRPCJsonSerializedMetaItem, e as StandardRPCJsonSerializer, d as StandardRPCJsonSerializerOptions, g as StandardRPCLink, i as StandardRPCLinkCodec, h as StandardRPCLinkCodecOptions, f as StandardRPCLinkOptions, j as StandardRPCSerializer } from '../../shared/client.C176log5.js';
 import { H as HTTPPath } from '../../shared/client.BOYsZIRq.js';
 import '@orpc/shared';
 import '@orpc/standard-server';

package/dist/adapters/standard/index.mjs

@@ -1,4 +1,4 @@
-export { C as CompositeStandardLinkPlugin, a as STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES, S as StandardLink, b as StandardRPCJsonSerializer, c as StandardRPCLink, d as StandardRPCLinkCodec, e as StandardRPCSerializer, g as getMalformedResponseErrorCode, t as toHttpPath } from '../../shared/client.BvXDSBF5.mjs';
+export { C as CompositeStandardLinkPlugin, a as STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES, S as StandardLink, b as StandardRPCJsonSerializer, c as StandardRPCLink, d as StandardRPCLinkCodec, e as StandardRPCSerializer, g as getMalformedResponseErrorCode, t as toHttpPath } from '../../shared/client.DKmRtVO2.mjs';
 import '@orpc/shared';
 import '@orpc/standard-server';
-import '../../shared/client.BngOL3Ai.mjs';
+import '../../shared/client.txdq_i5V.mjs';

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

@@ -1,7 +1,7 @@
 import { StandardRequest, StandardLazyResponse } from '@orpc/standard-server';
 import { b as ClientContext, c as ClientOptions } from '../../shared/client.BOYsZIRq.mjs';
-import { f as StandardLinkClient } from '../../shared/client.C4VxIexA.mjs';
-import { f as StandardRPCLinkOptions, g as StandardRPCLink } from '../../shared/client.aTp4sII-.mjs';
+import { f as StandardLinkClient } from '../../shared/client.Bwgm6dgk.mjs';
+import { f as StandardRPCLinkOptions, g as StandardRPCLink } from '../../shared/client.Ycwr4Tuo.mjs';
 import '@orpc/shared';
 
 interface LinkWebsocketClientOptions {

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

@@ -1,7 +1,7 @@
 import { StandardRequest, StandardLazyResponse } from '@orpc/standard-server';
 import { b as ClientContext, c as ClientOptions } from '../../shared/client.BOYsZIRq.js';
-import { f as StandardLinkClient } from '../../shared/client.CXXEPIbK.js';
-import { f as StandardRPCLinkOptions, g as StandardRPCLink } from '../../shared/client.WCinBImJ.js';
+import { f as StandardLinkClient } from '../../shared/client.BG98rYdO.js';
+import { f as StandardRPCLinkOptions, g as StandardRPCLink } from '../../shared/client.C176log5.js';
 import '@orpc/shared';
 
 interface LinkWebsocketClientOptions {

package/dist/adapters/websocket/index.mjs

@@ -1,14 +1,15 @@
 import { readAsBuffer } from '@orpc/shared';
 import { ClientPeer } from '@orpc/standard-server-peer';
-import { c as StandardRPCLink } from '../../shared/client.BvXDSBF5.mjs';
+import { c as StandardRPCLink } from '../../shared/client.DKmRtVO2.mjs';
 import '@orpc/standard-server';
-import '../../shared/client.BngOL3Ai.mjs';
+import '../../shared/client.txdq_i5V.mjs';
 
+const WEBSOCKET_CONNECTING = 0;
 class LinkWebsocketClient {
   peer;
   constructor(options) {
     const untilOpen = new Promise((resolve) => {
-      if (options.websocket.readyState === 0) {
+      if (options.websocket.readyState === WEBSOCKET_CONNECTING) {
         options.websocket.addEventListener("open", () => {
           resolve();
         }, { once: true });

package/dist/index.mjs

@@ -1,5 +1,5 @@
-import { i as isDefinedError } from './shared/client.BngOL3Ai.mjs';
-export { C as COMMON_ORPC_ERROR_DEFS, O as ORPCError, d as createORPCErrorFromJson, a as fallbackORPCErrorMessage, f as fallbackORPCErrorStatus, c as isORPCErrorJson, b as isORPCErrorStatus, m as mapEventIterator, t as toORPCError } from './shared/client.BngOL3Ai.mjs';
+import { i as isDefinedError } from './shared/client.txdq_i5V.mjs';
+export { C as COMMON_ORPC_ERROR_DEFS, O as ORPCError, d as createORPCErrorFromJson, a as fallbackORPCErrorMessage, f as fallbackORPCErrorStatus, c as isORPCErrorJson, b as isORPCErrorStatus, m as mapEventIterator, t as toORPCError } from './shared/client.txdq_i5V.mjs';
 import { isTypescriptObject } from '@orpc/shared';
 export { AsyncIteratorClass, EventPublisher, asyncIteratorToStream as eventIteratorToStream, onError, onFinish, onStart, onSuccess, streamToAsyncIteratorClass as streamToEventIterator } from '@orpc/shared';
 export { ErrorEvent } from '@orpc/standard-server';

package/dist/plugins/index.d.mts

@@ -1,7 +1,7 @@
 import { Value, Promisable } from '@orpc/shared';
 import { StandardHeaders, StandardRequest } from '@orpc/standard-server';
 import { BatchResponseMode } from '@orpc/standard-server/batch';
-import { S as StandardLinkClientInterceptorOptions, a as StandardLinkPlugin, b as StandardLinkOptions, c as StandardLinkInterceptorOptions } from '../shared/client.C4VxIexA.mjs';
+import { S as StandardLinkClientInterceptorOptions, a as StandardLinkPlugin, b as StandardLinkOptions, c as StandardLinkInterceptorOptions } from '../shared/client.Bwgm6dgk.mjs';
 import { b as ClientContext } from '../shared/client.BOYsZIRq.mjs';
 
 interface BatchLinkPluginGroup<T extends ClientContext> {

package/dist/plugins/index.d.ts

@@ -1,7 +1,7 @@
 import { Value, Promisable } from '@orpc/shared';
 import { StandardHeaders, StandardRequest } from '@orpc/standard-server';
 import { BatchResponseMode } from '@orpc/standard-server/batch';
-import { S as StandardLinkClientInterceptorOptions, a as StandardLinkPlugin, b as StandardLinkOptions, c as StandardLinkInterceptorOptions } from '../shared/client.CXXEPIbK.js';
+import { S as StandardLinkClientInterceptorOptions, a as StandardLinkPlugin, b as StandardLinkOptions, c as StandardLinkInterceptorOptions } from '../shared/client.BG98rYdO.js';
 import { b as ClientContext } from '../shared/client.BOYsZIRq.js';
 
 interface BatchLinkPluginGroup<T extends ClientContext> {

package/dist/plugins/index.mjs

@@ -64,7 +64,7 @@ class BatchLinkPlugin {
       });
     });
     options.clientInterceptors.push((options2) => {
-      if (this.exclude(options2) || options2.request.body instanceof Blob || options2.request.body instanceof FormData || isAsyncIteratorObject(options2.request.body)) {
+      if (this.exclude(options2) || options2.request.body instanceof Blob || options2.request.body instanceof FormData || isAsyncIteratorObject(options2.request.body) || options2.request.signal?.aborted) {
         return options2.next();
       }
       const group = this.groups.find((group2) => group2.condition(options2));
@@ -130,16 +130,27 @@ class BatchLinkPlugin {
         return;
       }
       const mode = value(this.mode, options);
-      const lazyResponse = await options[0].next({
-        request: { ...batchRequest, headers: { ...batchRequest.headers, "x-orpc-batch": mode } },
-        signal: batchRequest.signal,
-        context: group.context,
-        input: group.input,
-        path: toArray(group.path)
-      });
-      const parsed = parseBatchResponse({ ...lazyResponse, body: await lazyResponse.body() });
-      for await (const item of parsed) {
-        batchItems[item.index]?.[1]({ ...item, body: () => Promise.resolve(item.body) });
+      try {
+        const lazyResponse = await options[0].next({
+          request: { ...batchRequest, headers: { ...batchRequest.headers, "x-orpc-batch": mode } },
+          signal: batchRequest.signal,
+          context: group.context,
+          input: group.input,
+          path: toArray(group.path)
+        });
+        const parsed = parseBatchResponse({ ...lazyResponse, body: await lazyResponse.body() });
+        for await (const item of parsed) {
+          batchItems[item.index]?.[1]({ ...item, body: () => Promise.resolve(item.body) });
+        }
+      } catch (err) {
+        if (batchRequest.signal?.aborted && batchRequest.signal.reason === err) {
+          for (const [{ signal }, , reject] of batchItems) {
+            if (signal?.aborted) {
+              reject(signal.reason);
+            }
+          }
+        }
+        throw err;
       }
       throw new Error("Something went wrong make batch response not contains enough responses. This can be a bug please report it.");
     } catch (error) {

package/dist/shared/{client.CXXEPIbK.d.ts → client.BG98rYdO.d.ts}

@@ -33,7 +33,6 @@ interface StandardLinkOptions<T extends ClientContext> {
     plugins?: StandardLinkPlugin<T>[];
 }
 declare class StandardLink<T extends ClientContext> implements ClientLink<T> {
-    #private;
     readonly codec: StandardLinkCodec<T>;
     readonly sender: StandardLinkClient<T>;
     private readonly interceptors;

package/dist/shared/{client.C4VxIexA.d.mts → client.Bwgm6dgk.d.mts}

@@ -33,7 +33,6 @@ interface StandardLinkOptions<T extends ClientContext> {
     plugins?: StandardLinkPlugin<T>[];
 }
 declare class StandardLink<T extends ClientContext> implements ClientLink<T> {
-    #private;
     readonly codec: StandardLinkCodec<T>;
     readonly sender: StandardLinkClient<T>;
     private readonly interceptors;

package/dist/shared/{client.WCinBImJ.d.ts → client.C176log5.d.ts}

@@ -1,5 +1,5 @@
 import { b as ClientContext, c as ClientOptions, f as HTTPMethod } from './client.BOYsZIRq.js';
-import { e as StandardLinkCodec, b as StandardLinkOptions, d as StandardLink, f as StandardLinkClient } from './client.CXXEPIbK.js';
+import { e as StandardLinkCodec, b as StandardLinkOptions, d as StandardLink, f as StandardLinkClient } from './client.BG98rYdO.js';
 import { Segment, Value, Promisable } from '@orpc/shared';
 import { StandardHeaders, StandardRequest, StandardLazyResponse } from '@orpc/standard-server';
 

package/dist/shared/{client.BvXDSBF5.mjs → client.DKmRtVO2.mjs}

@@ -1,6 +1,6 @@
-import { toArray, intercept, isObject, value, isAsyncIteratorObject, stringifyJSON } from '@orpc/shared';
+import { toArray, runWithSpan, ORPC_NAME, isAsyncIteratorObject, asyncIteratorWithSpan, intercept, getGlobalOtelConfig, isObject, value, stringifyJSON } from '@orpc/shared';
 import { mergeStandardHeaders, ErrorEvent } from '@orpc/standard-server';
-import { C as COMMON_ORPC_ERROR_DEFS, b as isORPCErrorStatus, c as isORPCErrorJson, d as createORPCErrorFromJson, O as ORPCError, m as mapEventIterator, t as toORPCError } from './client.BngOL3Ai.mjs';
+import { C as COMMON_ORPC_ERROR_DEFS, b as isORPCErrorStatus, c as isORPCErrorJson, d as createORPCErrorFromJson, O as ORPCError, m as mapEventIterator, t as toORPCError } from './client.txdq_i5V.mjs';
 
 class CompositeStandardLinkPlugin {
   plugins;
@@ -26,20 +26,52 @@ class StandardLink {
   interceptors;
   clientInterceptors;
   call(path, input, options) {
-    return intercept(this.interceptors, { ...options, path, input }, async ({ path: path2, input: input2, ...options2 }) => {
-      const output = await this.#call(path2, input2, options2);
-      return output;
-    });
-  }
-  async #call(path, input, options) {
-    const request = await this.codec.encode(path, input, options);
-    const response = await intercept(
-      this.clientInterceptors,
-      { ...options, input, path, request },
-      ({ input: input2, path: path2, request: request2, ...options2 }) => this.sender.call(request2, options2, path2, input2)
+    return runWithSpan(
+      { name: `${ORPC_NAME}.${path.join("/")}`, signal: options.signal },
+      (span) => {
+        span?.setAttribute("rpc.system", ORPC_NAME);
+        span?.setAttribute("rpc.method", path.join("."));
+        if (isAsyncIteratorObject(input)) {
+          input = asyncIteratorWithSpan(
+            { name: "consume_event_iterator_input", signal: options.signal },
+            input
+          );
+        }
+        return intercept(this.interceptors, { ...options, path, input }, async ({ path: path2, input: input2, ...options2 }) => {
+          const otelConfig = getGlobalOtelConfig();
+          let otelContext;
+          const currentSpan = otelConfig?.trace.getActiveSpan() ?? span;
+          if (currentSpan && otelConfig) {
+            otelContext = otelConfig?.trace.setSpan(otelConfig.context.active(), currentSpan);
+          }
+          const request = await runWithSpan(
+            { name: "encode_request", context: otelContext },
+            () => this.codec.encode(path2, input2, options2)
+          );
+          const response = await intercept(
+            this.clientInterceptors,
+            { ...options2, input: input2, path: path2, request },
+            ({ input: input3, path: path3, request: request2, ...options3 }) => {
+              return runWithSpan(
+                { name: "send_request", signal: options3.signal, context: otelContext },
+                () => this.sender.call(request2, options3, path3, input3)
+              );
+            }
+          );
+          const output = await runWithSpan(
+            { name: "decode_response", context: otelContext },
+            () => this.codec.decode(response, options2, path2, input2)
+          );
+          if (isAsyncIteratorObject(output)) {
+            return asyncIteratorWithSpan(
+              { name: "consume_event_iterator_output", signal: options2.signal },
+              output
+            );
+          }
+          return output;
+        });
+      }
     );
-    const output = await this.codec.decode(response, options, path, input);
-    return output;
   }
 }
 
@@ -330,6 +362,9 @@ class StandardRPCSerializer {
     return this.#deserialize(data);
   }
   #deserialize(data) {
+    if (data === void 0) {
+      return void 0;
+    }
     if (!(data instanceof FormData)) {
       return this.jsonSerializer.deserialize(data.json, data.meta ?? []);
     }

package/dist/shared/{client.aTp4sII-.d.mts → client.Ycwr4Tuo.d.mts}

@@ -1,5 +1,5 @@
 import { b as ClientContext, c as ClientOptions, f as HTTPMethod } from './client.BOYsZIRq.mjs';
-import { e as StandardLinkCodec, b as StandardLinkOptions, d as StandardLink, f as StandardLinkClient } from './client.C4VxIexA.mjs';
+import { e as StandardLinkCodec, b as StandardLinkOptions, d as StandardLink, f as StandardLinkClient } from './client.Bwgm6dgk.mjs';
 import { Segment, Value, Promisable } from '@orpc/shared';
 import { StandardHeaders, StandardRequest, StandardLazyResponse } from '@orpc/standard-server';
 

package/dist/shared/{client.BngOL3Ai.mjs → client.txdq_i5V.mjs}

@@ -142,19 +142,22 @@ function createORPCErrorFromJson(json, options = {}) {
 }
 
 function mapEventIterator(iterator, maps) {
+  const mapError = async (error) => {
+    let mappedError = await maps.error(error);
+    if (mappedError !== error) {
+      const meta = getEventMeta(error);
+      if (meta && isTypescriptObject(mappedError)) {
+        mappedError = withEventMeta(mappedError, meta);
+      }
+    }
+    return mappedError;
+  };
   return new AsyncIteratorClass(async () => {
     const { done, value } = await (async () => {
       try {
         return await iterator.next();
       } catch (error) {
-        let mappedError = await maps.error(error);
-        if (mappedError !== error) {
-          const meta = getEventMeta(error);
-          if (meta && isTypescriptObject(mappedError)) {
-            mappedError = withEventMeta(mappedError, meta);
-          }
-        }
-        throw mappedError;
+        throw await mapError(error);
       }
     })();
     let mappedValue = await maps.value(value, done);
@@ -166,7 +169,11 @@ function mapEventIterator(iterator, maps) {
     }
     return { done, value: mappedValue };
   }, async () => {
-    await iterator.return?.();
+    try {
+      await iterator.return?.();
+    } catch (error) {
+      throw await mapError(error);
+    }
   });
 }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/client",
   "type": "module",
-  "version": "1.7.11",
+  "version": "1.8.1",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -49,13 +49,13 @@
     "dist"
   ],
   "dependencies": {
-    "@orpc/shared": "1.7.11",
-    "@orpc/standard-server": "1.7.11",
-    "@orpc/standard-server-fetch": "1.7.11",
-    "@orpc/standard-server-peer": "1.7.11"
+    "@orpc/shared": "1.8.1",
+    "@orpc/standard-server": "1.8.1",
+    "@orpc/standard-server-fetch": "1.8.1",
+    "@orpc/standard-server-peer": "1.8.1"
   },
   "devDependencies": {
-    "zod": "^4.0.14"
+    "zod": "^4.0.17"
   },
   "scripts": {
     "build": "unbuild",