@orpc/client 2.0.0-beta.44 → 2.0.0-beta.45

package/dist/plugins/index.mjs

@@ -2,8 +2,10 @@ import { toArray, value, splitInHalf, promiseWithResolvers, safeEncodeURICompone
 import { parseStandardUrl, flattenStandardHeader, generateContentDisposition, getEventMeta } from '@standard-server/core';
 import { ClientPeer, isServerPeerSendMessage, decodePeerMessage } from '@standard-server/peer';
 import { toFetchHeaders, toStandardBody } from '@standard-server/fetch';
-import { C as COMMON_ERROR_STATUS_MAP } from '../shared/client.CrHurHrq.mjs';
+import { O as ORPCError, R as ResponseError, C as COMMON_ERROR_STATUS_MAP } from '../shared/client.LF04eOvL.mjs';
 
+const BATCH_HEADER = "orpc-batch";
+const DEFAULT_BATCH_MAX_SIZE = 10;
 class BatchLinkPlugin {
   name = "~batch";
   groups;
@@ -11,7 +13,6 @@ class BatchLinkPlugin {
   scope;
   maxSize;
   wait;
-  mode;
   batchUrl;
   maxUrlLength;
   batchHeaders;
@@ -22,9 +23,8 @@ class BatchLinkPlugin {
     this.groups = options.groups;
     this.filter = options.filter ?? (() => true);
     this.scope = options.scope ?? (() => void 0);
-    this.maxSize = options.maxSize ?? 10;
+    this.maxSize = options.maxSize ?? DEFAULT_BATCH_MAX_SIZE;
     this.wait = options.wait ?? 0;
-    this.mode = options.mode ?? "streaming";
     this.batchUrl = options.url ?? ((options2) => {
       const [pathname] = parseStandardUrl(options2[0].request.url);
       return `${pathname}/__batch__`;
@@ -141,7 +141,6 @@ class BatchLinkPlugin {
       }
       const url = await value(this.batchUrl, subOptionsList);
       const headers = await value(this.batchHeaders, subOptionsList);
-      const mode = value(this.mode, subOptionsList);
       let suppressErrorFromCurrentBatch = false;
       const controller = new AbortController();
       const pendingMessages = [];
@@ -185,7 +184,7 @@ class BatchLinkPlugin {
         const request = {
           url,
           method,
-          headers: { ...headers, "orpc-batch": mode },
+          headers: { ...headers, [BATCH_HEADER]: "1" },
           signal: controller.signal
         };
         if (method === "GET") {
@@ -745,6 +744,14 @@ function parseContentEncodings(header) {
   return header.split(",").map((part) => part.trim().toLowerCase());
 }
 
+function isRetryableError(error) {
+  const responseError = error instanceof ORPCError ? error.cause : error;
+  if (!(responseError instanceof ResponseError)) {
+    return true;
+  }
+  const { status } = responseError.response;
+  return status < 400 || status >= 500 || status === COMMON_ERROR_STATUS_MAP.TIMEOUT || status === COMMON_ERROR_STATUS_MAP.TOO_MANY_REQUESTS;
+}
 class RetryLinkPlugin {
   defaultRetry;
   defaultRetryDelay;
@@ -754,7 +761,7 @@ class RetryLinkPlugin {
   constructor(options = {}) {
     this.defaultRetry = options.default?.retry ?? 0;
     this.defaultRetryDelay = options.default?.retryDelay ?? ((o) => o.lastEventRetry ?? 2e3);
-    this.defaultShouldRetry = options.default?.shouldRetry ?? true;
+    this.defaultShouldRetry = options.default?.shouldRetry ?? ((o) => isRetryableError(o.error));
     this.defaultOnRetry = options.default?.onRetry;
   }
   init(options) {
@@ -961,4 +968,4 @@ class TimeoutLinkPlugin {
   }
 }
 
-export { BatchLinkPlugin, RetryLinkPlugin as ClientRetryPlugin, DedupeLinkPlugin, DedupeLinkPlugin as DedupeRequestsPlugin, RequestCompressionLinkPlugin, ResponseCompressionLinkPlugin, RetryAfterLinkPlugin, RetryAfterLinkPlugin as RetryAfterPlugin, RetryLinkPlugin, TimeoutLinkPlugin };
+export { BATCH_HEADER, BatchLinkPlugin, RetryLinkPlugin as ClientRetryPlugin, DEFAULT_BATCH_MAX_SIZE, DedupeLinkPlugin, DedupeLinkPlugin as DedupeRequestsPlugin, RequestCompressionLinkPlugin, ResponseCompressionLinkPlugin, RetryAfterLinkPlugin, RetryAfterLinkPlugin as RetryAfterPlugin, RetryLinkPlugin, TimeoutLinkPlugin, isRetryableError };

package/dist/shared/{client.DZHZRyR6.d.mts → client.BoHJeq15.d.mts}

@@ -10,7 +10,7 @@ interface ClientOptions<T extends ClientContext> {
     context: T;
 }
 type FriendlyClientOptions<T extends ClientContext> = Omit<ClientOptions<T>, 'context'> & (object extends T ? {
-    context?: T;
+    context?: T | undefined;
 } : {
     context: T;
 });
@@ -134,7 +134,7 @@ type ORPCErrorCode = Registry extends {
     ORPCErrorCode: infer T extends string;
 } ? T : (keyof typeof COMMON_ERROR_STATUS_MAP) | (string & {});
 type ORPCErrorOptions<TData> = ErrorOptions & {
-    message?: string;
+    message?: string | undefined;
 } & (undefined extends TData ? {
     data?: TData;
 } : {
@@ -186,18 +186,37 @@ interface ORPCErrorJSON<TCode extends string, TData> extends Pick<ORPCError<TCod
 }
 type AnyORPCError = ORPCError<any, any>;
 type AnyORPCErrorJSON = ORPCErrorJSON<any, any>;
-interface MalformedResponseErrorOptions extends ErrorOptions {
+interface ResponseErrorOptions extends ErrorOptions {
     /**
-     * @default inferred from the response body or status
+     * @default inferred from the response status
      */
-    message?: string;
+    message?: string | undefined;
     response: StandardResponse;
 }
+/**
+ * Error carrying the resolved response a link received. Links set it as the `cause`
+ * of an `ORPCError` decoded from an error response, so details that are not part
+ * of the error itself, such as its status or headers, stay available.
+ *
+ * @see {@link https://orpc.dev/docs/rpc/link#error-responses | RPC Link - Error Responses}
+ * @see {@link https://orpc.dev/docs/openapi/link#error-responses | OpenAPI Link - Error Responses}
+ */
+declare class ResponseError extends Error {
+    readonly name: string;
+    response: StandardResponse;
+    constructor(options: ResponseErrorOptions);
+}
+interface MalformedResponseErrorOptions extends ResponseErrorOptions {
+    /**
+     * @default inferred from the response body or status
+     */
+    message?: string | undefined;
+}
 /**
  * Error thrown by links when a response does not follow the expected oRPC format,
- * for example when a proxy or gateway answers instead of your handler. Carries the
- * resolved response. Unless overridden via `options.message`, the message is
- * inferred from the response body or status.
+ * for example when a proxy or gateway answers instead of your handler. Extends
+ * `ResponseError`, so it carries the resolved response. Unless overridden via
+ * `options.message`, the message is inferred from the response body or status.
  *
  * Unlike `ORPCError`, it reaches a handler's callers as a generic `INTERNAL_SERVER_ERROR`
  * when thrown from the handler, so an upstream's response is not sent to them.
@@ -205,11 +224,10 @@ interface MalformedResponseErrorOptions extends ErrorOptions {
  * @see {@link https://orpc.dev/docs/rpc/link#malformed-responses | RPC Link - Malformed Responses}
  * @see {@link https://orpc.dev/docs/openapi/link#malformed-responses | OpenAPI Link - Malformed Responses}
  */
-declare class MalformedResponseError extends Error {
+declare class MalformedResponseError extends ResponseError {
     readonly name = "MalformedResponseError";
-    response: StandardResponse;
     constructor(options: MalformedResponseErrorOptions);
 }
 
-export { MalformedResponseError as M, ORPCError as h, COMMON_ERROR_STATUS_MAP as j };
-export type { AnyORPCError as A, ClientContext as C, FriendlyClientOptions as F, InferClientContext as I, NestedClient as N, ORPCErrorCode as O, ClientOptions as a, ClientLink as b, AnyNestedClient as c, InferClientError as d, Client as e, ClientRest as f, ORPCErrorJSON as g, AnyORPCErrorJSON as i, InferClientBodyInputs as k, InferClientBodyOutputs as l, InferClientErrors as m, InferClientInputs as n, InferClientOutputs as o, MalformedResponseErrorOptions as p, ORPCErrorOptions as q };
+export { MalformedResponseError as M, ResponseError as R, ORPCError as h, COMMON_ERROR_STATUS_MAP as j };
+export type { AnyORPCError as A, ClientContext as C, FriendlyClientOptions as F, InferClientContext as I, NestedClient as N, ORPCErrorCode as O, ClientOptions as a, ClientLink as b, AnyNestedClient as c, InferClientError as d, Client as e, ClientRest as f, ORPCErrorJSON as g, AnyORPCErrorJSON as i, InferClientBodyInputs as k, InferClientBodyOutputs as l, InferClientErrors as m, InferClientInputs as n, InferClientOutputs as o, MalformedResponseErrorOptions as p, ORPCErrorOptions as q, ResponseErrorOptions as r };

package/dist/shared/{client.DZHZRyR6.d.ts → client.BoHJeq15.d.ts}

@@ -10,7 +10,7 @@ interface ClientOptions<T extends ClientContext> {
     context: T;
 }
 type FriendlyClientOptions<T extends ClientContext> = Omit<ClientOptions<T>, 'context'> & (object extends T ? {
-    context?: T;
+    context?: T | undefined;
 } : {
     context: T;
 });
@@ -134,7 +134,7 @@ type ORPCErrorCode = Registry extends {
     ORPCErrorCode: infer T extends string;
 } ? T : (keyof typeof COMMON_ERROR_STATUS_MAP) | (string & {});
 type ORPCErrorOptions<TData> = ErrorOptions & {
-    message?: string;
+    message?: string | undefined;
 } & (undefined extends TData ? {
     data?: TData;
 } : {
@@ -186,18 +186,37 @@ interface ORPCErrorJSON<TCode extends string, TData> extends Pick<ORPCError<TCod
 }
 type AnyORPCError = ORPCError<any, any>;
 type AnyORPCErrorJSON = ORPCErrorJSON<any, any>;
-interface MalformedResponseErrorOptions extends ErrorOptions {
+interface ResponseErrorOptions extends ErrorOptions {
     /**
-     * @default inferred from the response body or status
+     * @default inferred from the response status
      */
-    message?: string;
+    message?: string | undefined;
     response: StandardResponse;
 }
+/**
+ * Error carrying the resolved response a link received. Links set it as the `cause`
+ * of an `ORPCError` decoded from an error response, so details that are not part
+ * of the error itself, such as its status or headers, stay available.
+ *
+ * @see {@link https://orpc.dev/docs/rpc/link#error-responses | RPC Link - Error Responses}
+ * @see {@link https://orpc.dev/docs/openapi/link#error-responses | OpenAPI Link - Error Responses}
+ */
+declare class ResponseError extends Error {
+    readonly name: string;
+    response: StandardResponse;
+    constructor(options: ResponseErrorOptions);
+}
+interface MalformedResponseErrorOptions extends ResponseErrorOptions {
+    /**
+     * @default inferred from the response body or status
+     */
+    message?: string | undefined;
+}
 /**
  * Error thrown by links when a response does not follow the expected oRPC format,
- * for example when a proxy or gateway answers instead of your handler. Carries the
- * resolved response. Unless overridden via `options.message`, the message is
- * inferred from the response body or status.
+ * for example when a proxy or gateway answers instead of your handler. Extends
+ * `ResponseError`, so it carries the resolved response. Unless overridden via
+ * `options.message`, the message is inferred from the response body or status.
  *
  * Unlike `ORPCError`, it reaches a handler's callers as a generic `INTERNAL_SERVER_ERROR`
  * when thrown from the handler, so an upstream's response is not sent to them.
@@ -205,11 +224,10 @@ interface MalformedResponseErrorOptions extends ErrorOptions {
  * @see {@link https://orpc.dev/docs/rpc/link#malformed-responses | RPC Link - Malformed Responses}
  * @see {@link https://orpc.dev/docs/openapi/link#malformed-responses | OpenAPI Link - Malformed Responses}
  */
-declare class MalformedResponseError extends Error {
+declare class MalformedResponseError extends ResponseError {
     readonly name = "MalformedResponseError";
-    response: StandardResponse;
     constructor(options: MalformedResponseErrorOptions);
 }
 
-export { MalformedResponseError as M, ORPCError as h, COMMON_ERROR_STATUS_MAP as j };
-export type { AnyORPCError as A, ClientContext as C, FriendlyClientOptions as F, InferClientContext as I, NestedClient as N, ORPCErrorCode as O, ClientOptions as a, ClientLink as b, AnyNestedClient as c, InferClientError as d, Client as e, ClientRest as f, ORPCErrorJSON as g, AnyORPCErrorJSON as i, InferClientBodyInputs as k, InferClientBodyOutputs as l, InferClientErrors as m, InferClientInputs as n, InferClientOutputs as o, MalformedResponseErrorOptions as p, ORPCErrorOptions as q };
+export { MalformedResponseError as M, ResponseError as R, ORPCError as h, COMMON_ERROR_STATUS_MAP as j };
+export type { AnyORPCError as A, ClientContext as C, FriendlyClientOptions as F, InferClientContext as I, NestedClient as N, ORPCErrorCode as O, ClientOptions as a, ClientLink as b, AnyNestedClient as c, InferClientError as d, Client as e, ClientRest as f, ORPCErrorJSON as g, AnyORPCErrorJSON as i, InferClientBodyInputs as k, InferClientBodyOutputs as l, InferClientErrors as m, InferClientInputs as n, InferClientOutputs as o, MalformedResponseErrorOptions as p, ORPCErrorOptions as q, ResponseErrorOptions as r };

package/dist/shared/{client.B7P_ugvl.mjs → client.Bpyj1NM2.mjs}

@@ -1,8 +1,8 @@
 import { sortPlugins, runWithSpan, ORPC_NAME, getTracer, isAsyncIteratorObject, override, traceAsyncIterator, traceReadableStream, intercept, value, pathToHttpPath, stringifyJSON } from '@orpc/shared';
 import { mergeStandardHeaders, parseStandardUrl } from '@standard-server/core';
 import { toStandardHeaders } from '@standard-server/fetch';
-import { M as MalformedResponseError } from './client.CrHurHrq.mjs';
-import { R as RPCSerializer, i as isORPCErrorJson, c as createORPCErrorFromJson } from './client.BLfXUpyF.mjs';
+import { M as MalformedResponseError, R as ResponseError } from './client.LF04eOvL.mjs';
+import { R as RPCSerializer, i as isORPCErrorJson, c as createORPCErrorFromJson } from './client._wG5INmC.mjs';
 
 class CompositeStandardLinkPlugin {
   name = "~composite";
@@ -150,7 +150,12 @@ class RPCLinkCodec {
     })();
     if (!isOk) {
       if (isORPCErrorJson(deserialized)) {
-        return { kind: "error", error: createORPCErrorFromJson(deserialized) };
+        return {
+          kind: "error",
+          error: createORPCErrorFromJson(deserialized, {
+            cause: new ResponseError({ response: { status: response.status, headers: response.headers, body } })
+          })
+        };
       }
       throw new MalformedResponseError({ response: { headers: response.headers, status: response.status, body } });
     }

package/dist/shared/{client.BzAY7ZC2.d.mts → client.CkwtFnrc.d.mts}

@@ -1,6 +1,6 @@
 import { Promisable, OrderablePlugin, Interceptor } from '@orpc/shared';
 import { StandardRequest, StandardLazyResponse } from '@standard-server/core';
-import { C as ClientContext, a as ClientOptions, A as AnyORPCError, b as ClientLink } from './client.DZHZRyR6.mjs';
+import { C as ClientContext, a as ClientOptions, A as AnyORPCError, b as ClientLink } from './client.BoHJeq15.mjs';
 
 type StandardLinkCodecDecodedResponse = {
     kind: 'output';
@@ -72,13 +72,13 @@ interface StandardLinkOptions<T extends ClientContext> {
      * Interceptors that execute around the entire call, including transport and codec.
      * Useful for error handling, logging, metrics, ...
      */
-    interceptors?: StandardLinkInterceptor<T>[];
+    interceptors?: StandardLinkInterceptor<T>[] | undefined;
     /**
      * Interceptors that execute around the transport layer, after encoding and before decoding.
      * Useful for modifying the request or response, adding transport-level logging, ...
      */
-    transportInterceptors?: StandardLinkTransportInterceptor<T>[];
-    plugins?: StandardLinkPlugin<T>[];
+    transportInterceptors?: StandardLinkTransportInterceptor<T>[] | undefined;
+    plugins?: StandardLinkPlugin<T>[] | undefined;
 }
 declare class StandardLink<T extends ClientContext> implements ClientLink<T> {
     private readonly codec;

package/dist/shared/{client.CHH2CNMj.d.ts → client.DBDKICdk.d.ts}

@@ -1,6 +1,6 @@
 import { Promisable, OrderablePlugin, Interceptor } from '@orpc/shared';
 import { StandardRequest, StandardLazyResponse } from '@standard-server/core';
-import { C as ClientContext, a as ClientOptions, A as AnyORPCError, b as ClientLink } from './client.DZHZRyR6.js';
+import { C as ClientContext, a as ClientOptions, A as AnyORPCError, b as ClientLink } from './client.BoHJeq15.js';
 
 type StandardLinkCodecDecodedResponse = {
     kind: 'output';
@@ -72,13 +72,13 @@ interface StandardLinkOptions<T extends ClientContext> {
      * Interceptors that execute around the entire call, including transport and codec.
      * Useful for error handling, logging, metrics, ...
      */
-    interceptors?: StandardLinkInterceptor<T>[];
+    interceptors?: StandardLinkInterceptor<T>[] | undefined;
     /**
      * Interceptors that execute around the transport layer, after encoding and before decoding.
      * Useful for modifying the request or response, adding transport-level logging, ...
      */
-    transportInterceptors?: StandardLinkTransportInterceptor<T>[];
-    plugins?: StandardLinkPlugin<T>[];
+    transportInterceptors?: StandardLinkTransportInterceptor<T>[] | undefined;
+    plugins?: StandardLinkPlugin<T>[] | undefined;
 }
 declare class StandardLink<T extends ClientContext> implements ClientLink<T> {
     private readonly codec;

package/dist/shared/{client.BPa_Mmuh.d.mts → client.DqIWeNhQ.d.mts}

@@ -28,7 +28,7 @@ interface RPCJsonSerializerHandler {
      *
      * @default false
      */
-    isTerminal?: boolean;
+    isTerminal?: boolean | undefined;
 }
 interface RPCJsonSerializerOptions {
     /**
@@ -88,13 +88,13 @@ declare class RPCJsonSerializer {
     private readonly handlerEntries;
     private readonly omitUndefinedProperties;
     constructor(options?: RPCJsonSerializerOptions);
-    serialize(data: unknown): RPCJsonSerialization;
+    serializeJson(data: unknown): RPCJsonSerialization;
     /**
      * `segments` is a shared mutable stack (push/pop while walking),
      * so it must be copied before being stored in `meta` or `maps`.
      */
     private serializeValue;
-    deserialize(serialized: RPCJsonSerialization): unknown;
+    deserializeJson(serialized: RPCJsonSerialization): unknown;
 }
 
 interface RPCSerializerSerializeOptions {
@@ -104,7 +104,7 @@ interface RPCSerializerSerializeOptions {
      *
      * @default true
      */
-    useFormDataForBlobFields?: boolean;
+    useFormDataForBlobFields?: boolean | undefined;
 }
 interface RPCSerializerOptions extends RPCJsonSerializerOptions {
     /**
@@ -118,14 +118,13 @@ interface RPCSerializerOptions extends RPCJsonSerializerOptions {
  *
  * @see {@link https://orpc.dev/docs/rpc/serializer | RPC Serializer}
  */
-declare class RPCSerializer {
-    private readonly jsonSerializer;
+declare class RPCSerializer extends RPCJsonSerializer {
     private readonly defaultSerializeOptions;
     constructor(options?: RPCSerializerOptions);
     serialize(data: unknown, options?: RPCSerializerSerializeOptions): StandardBody;
-    private serializeValue;
+    private serializePayload;
     deserialize(data: StandardBody): unknown;
-    private deserializeValue;
+    private deserializePayload;
 }
 
 export { RPCJsonSerializer as b, RPCSerializer as e };

package/dist/shared/{client.BPa_Mmuh.d.ts → client.DqIWeNhQ.d.ts}

@@ -28,7 +28,7 @@ interface RPCJsonSerializerHandler {
      *
      * @default false
      */
-    isTerminal?: boolean;
+    isTerminal?: boolean | undefined;
 }
 interface RPCJsonSerializerOptions {
     /**
@@ -88,13 +88,13 @@ declare class RPCJsonSerializer {
     private readonly handlerEntries;
     private readonly omitUndefinedProperties;
     constructor(options?: RPCJsonSerializerOptions);
-    serialize(data: unknown): RPCJsonSerialization;
+    serializeJson(data: unknown): RPCJsonSerialization;
     /**
      * `segments` is a shared mutable stack (push/pop while walking),
      * so it must be copied before being stored in `meta` or `maps`.
      */
     private serializeValue;
-    deserialize(serialized: RPCJsonSerialization): unknown;
+    deserializeJson(serialized: RPCJsonSerialization): unknown;
 }
 
 interface RPCSerializerSerializeOptions {
@@ -104,7 +104,7 @@ interface RPCSerializerSerializeOptions {
      *
      * @default true
      */
-    useFormDataForBlobFields?: boolean;
+    useFormDataForBlobFields?: boolean | undefined;
 }
 interface RPCSerializerOptions extends RPCJsonSerializerOptions {
     /**
@@ -118,14 +118,13 @@ interface RPCSerializerOptions extends RPCJsonSerializerOptions {
  *
  * @see {@link https://orpc.dev/docs/rpc/serializer | RPC Serializer}
  */
-declare class RPCSerializer {
-    private readonly jsonSerializer;
+declare class RPCSerializer extends RPCJsonSerializer {
     private readonly defaultSerializeOptions;
     constructor(options?: RPCSerializerOptions);
     serialize(data: unknown, options?: RPCSerializerSerializeOptions): StandardBody;
-    private serializeValue;
+    private serializePayload;
     deserialize(data: StandardBody): unknown;
-    private deserializeValue;
+    private deserializePayload;
 }
 
 export { RPCJsonSerializer as b, RPCSerializer as e };

package/dist/shared/{client.CrHurHrq.mjs → client.LF04eOvL.mjs}

@@ -85,14 +85,20 @@ class ORPCError extends Error {
     return false;
   }
 }
-class MalformedResponseError extends Error {
-  name = "MalformedResponseError";
+class ResponseError extends Error {
+  name = "ResponseError";
   response;
   constructor(options) {
-    super(options.message ?? inferMalformedResponseMessage(options.response), options);
+    super(options.message ?? `Received a ${options.response.status} response.`, options);
     this.response = options.response;
   }
 }
+class MalformedResponseError extends ResponseError {
+  name = "MalformedResponseError";
+  constructor(options) {
+    super({ ...options, message: options.message ?? inferMalformedResponseMessage(options.response) });
+  }
+}
 const INFERRED_MESSAGE_MAX_LENGTH = 256;
 function inferMalformedResponseMessage(response) {
   const candidate = isPlainObject(response.body) ? response.body.message : response.body;
@@ -106,4 +112,4 @@ function codeToMessage(code) {
   return code.split("_").map((word) => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase()).join(" ");
 }
 
-export { COMMON_ERROR_STATUS_MAP as C, MalformedResponseError as M, ORPCError as O };
+export { COMMON_ERROR_STATUS_MAP as C, MalformedResponseError as M, ORPCError as O, ResponseError as R };

package/dist/shared/{client.BLfXUpyF.mjs → client._wG5INmC.mjs}

@@ -1,6 +1,6 @@
 import { isPlainObject, wrapAsyncIterator, isTypescriptObject, NullProtoObj, parseBigIntString, DEFAULT_MAX_BIGINT_DIGITS, copyOnWrite, isAsyncIteratorObject, stringifyJSON } from '@orpc/shared';
 import { getEventMeta, withEventMeta, ErrorEvent } from '@standard-server/core';
-import { O as ORPCError } from './client.CrHurHrq.mjs';
+import { O as ORPCError } from './client.LF04eOvL.mjs';
 
 function isDefinedError(error) {
   return error instanceof ORPCError && error.defined;
@@ -230,7 +230,7 @@ class RPCJsonSerializer {
     this.inlineBuiltInHandlers = inlineBuiltInHandlers;
     this.handlerEntries = handlerEntries;
   }
-  serialize(data) {
+  serializeJson(data) {
     let meta = [];
     const maps = [];
     const blobs = [];
@@ -345,7 +345,7 @@ class RPCJsonSerializer {
     }
     return data;
   }
-  deserialize(serialized) {
+  deserializeJson(serialized) {
     const ref = { json: serialized.json };
     if (serialized.blobs?.length) {
       for (let i = 0; i < serialized.maps.length; i++) {
@@ -422,11 +422,10 @@ class RPCJsonSerializer {
   }
 }
 
-class RPCSerializer {
-  jsonSerializer;
+class RPCSerializer extends RPCJsonSerializer {
   defaultSerializeOptions;
   constructor(options = {}) {
-    this.jsonSerializer = new RPCJsonSerializer(options);
+    super(options);
     this.defaultSerializeOptions = options.serialize;
   }
   serialize(data, options = {}) {
@@ -439,19 +438,19 @@ class RPCSerializer {
           if (result.value === void 0) {
             return result;
           }
-          return { done: result.done, value: this.serializeValue(result.value, false) };
+          return { done: result.done, value: this.serializePayload(result.value, false) };
         },
         mapError: (e) => new ErrorEvent(
-          this.serializeValue(toORPCError(e).toJSON(), false),
+          this.serializePayload(toORPCError(e).toJSON(), false),
           { cause: e }
         )
       });
     }
     const useFormDataForBlobs = options.useFormDataForBlobFields ?? this.defaultSerializeOptions?.useFormDataForBlobFields ?? true;
-    return this.serializeValue(data, useFormDataForBlobs);
+    return this.serializePayload(data, useFormDataForBlobs);
   }
-  serializeValue(data, useFormDataForBlobs) {
-    const { json, meta, maps, blobs } = this.jsonSerializer.serialize(data);
+  serializePayload(data, useFormDataForBlobs) {
+    const { json, meta, maps, blobs } = this.serializeJson(data);
     if (!useFormDataForBlobs || !blobs?.length) {
       return { json, meta };
     }
@@ -472,13 +471,13 @@ class RPCSerializer {
           if (result.value === void 0) {
             return result;
           }
-          return { done: result.done, value: this.deserializeValue(result.value) };
+          return { done: result.done, value: this.deserializePayload(result.value) };
         },
         mapError: (e) => {
           if (!(e instanceof ErrorEvent)) {
             return e;
           }
-          const deserialized = this.deserializeValue(e.data);
+          const deserialized = this.deserializePayload(e.data);
           if (isORPCErrorJson(deserialized)) {
             return createORPCErrorFromJson(deserialized, { cause: e });
           }
@@ -486,11 +485,11 @@ class RPCSerializer {
         }
       });
     }
-    return this.deserializeValue(data);
+    return this.deserializePayload(data);
   }
-  deserializeValue(data) {
+  deserializePayload(data) {
     if (!(data instanceof FormData)) {
-      return this.jsonSerializer.deserialize(data);
+      return this.deserializeJson(data);
     }
     const serialized = JSON.parse(data.get("data"));
     const blobs = [];
@@ -499,7 +498,7 @@ class RPCSerializer {
         blobs[Number(key)] = value;
       }
     }
-    return this.jsonSerializer.deserialize({ ...serialized, blobs });
+    return this.deserializeJson({ ...serialized, blobs });
   }
 }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/client",
   "type": "module",
-  "version": "2.0.0-beta.44",
+  "version": "2.0.0-beta.45",
   "description": "Consume oRPC and OpenAPI APIs with end-to-end type safety over HTTP, WebSocket, or message ports",
   "license": "MIT",
   "funding": [
@@ -63,15 +63,15 @@
     "dist"
   ],
   "dependencies": {
-    "@orpc/shared": "2.0.0-beta.44",
-    "@standard-server/core": "~0.10.3",
-    "@standard-server/fetch": "~0.10.3",
-    "@standard-server/peer": "~0.10.3"
+    "@orpc/shared": "2.0.0-beta.45",
+    "@standard-server/core": "~0.11.0",
+    "@standard-server/fetch": "~0.11.0",
+    "@standard-server/peer": "~0.11.0"
   },
   "devDependencies": {
     "@types/ws": "^8.18.2",
     "ws": "^8.22.0",
-    "zod": "^4.6.5"
+    "zod": "^4.6.7"
   },
   "scripts": {
     "type:check": "tsc -b"