@orpc/client 2.0.0-beta.2 → 2.0.0-beta.20

package/dist/plugins/index.mjs

@@ -1,6 +1,7 @@
-import { toArray, value, splitInHalf, stringifyJSON, isAsyncIteratorObject, defer, loadBytes, allAbortSignal, replicateAsyncIterator, replicateReadableStream, override, AsyncIteratorClass, sleep } from '@orpc/shared';
-import { parseStandardUrl, getEventMeta, flattenStandardHeader } from '@standardserver/core';
+import { toArray, value, splitInHalf, stringifyJSON, isAsyncIteratorObject, defer, loadBytes, allAbortSignal, replicateAsyncIterator, replicateReadableStream, isCompressibleContentType, override, AsyncIteratorClass, sleep, AbortError, anyAbortSignal } from '@orpc/shared';
+import { parseStandardUrl, flattenStandardHeader, generateContentDisposition, getEventMeta } from '@standardserver/core';
 import { ClientPeer, isServerPeerSendMessage, decodePeerMessage } from '@standardserver/peer';
+import { toFetchHeaders, toStandardBody } from '@standardserver/fetch';
 import { C as COMMON_ERROR_STATUS_MAP } from '../shared/client.Dnfj8jnT.mjs';
 
 class BatchLinkPluginError extends TypeError {
@@ -226,6 +227,10 @@ async function decodeLengthPrefixedStream(stream, peer) {
       while (buffer.length >= 4) {
         const view = new DataView(buffer.buffer, buffer.byteOffset, 4);
         const length = view.getUint32(0, false);
+        if (length === 0) {
+          buffer = buffer.subarray(4);
+          continue;
+        }
         if (buffer.length < 4 + length) {
           break;
         }
@@ -387,8 +392,229 @@ function shouldDedupe(items) {
   return items.length >= 2;
 }
 
-class RetryLinkPluginInvalidEventIteratorRetryResponse extends Error {
+const AVG_BYTES_PER_CHAR = 1.2;
+class RequestCompressionLinkPlugin {
+  name = "~request-compression";
+  /**
+   * Compression should be done after batching, to compress the final request
+   */
+  after = ["~batch"];
+  encoding;
+  threshold;
+  constructor(options = {}) {
+    this.encoding = options.encoding ?? "gzip";
+    this.threshold = options.threshold ?? 1024;
+  }
+  init(options) {
+    const transportInterceptor = async ({ next, ...interceptorOptions }) => {
+      const request = interceptorOptions.request;
+      const contentEncoding = flattenStandardHeader(request.headers["content-encoding"])?.trim()?.toLowerCase();
+      if (contentEncoding !== void 0) {
+        return next();
+      }
+      if (request.body instanceof ReadableStream) {
+        const contentLength = Number(flattenStandardHeader(request.headers["content-length"]));
+        if ((!Number.isFinite(contentLength) || contentLength >= this.threshold) && isCompressibleContentType(flattenStandardHeader(request.headers["content-type"]))) {
+          const compressedStream = request.body.pipeThrough(new CompressionStream(this.encoding));
+          return next({
+            ...interceptorOptions,
+            request: {
+              ...interceptorOptions.request,
+              body: compressedStream,
+              headers: {
+                ...request.headers,
+                "standard-server": "octet-stream",
+                "content-length": [],
+                "content-encoding": this.encoding
+              }
+            }
+          });
+        }
+      } else if (request.body instanceof Blob) {
+        if ((!Number.isFinite(request.body.size) || request.body.size >= this.threshold) && isCompressibleContentType(request.body.type)) {
+          const compressedStream = request.body.stream().pipeThrough(new CompressionStream(this.encoding));
+          const contentDisposition = request.headers["content-disposition"] ?? generateContentDisposition(
+            request.body instanceof File ? request.body.name : "blob"
+          );
+          return next({
+            ...interceptorOptions,
+            request: {
+              ...interceptorOptions.request,
+              body: compressedStream,
+              headers: {
+                ...request.headers,
+                "standard-server": "file",
+                "content-type": request.body.type,
+                "content-length": [],
+                "content-disposition": contentDisposition,
+                "content-encoding": this.encoding
+              }
+            }
+          });
+        }
+      } else if (request.body instanceof FormData) {
+        const PART_OVERHEAD = 64;
+        let contentLength = 0;
+        for (const [key, value] of request.body) {
+          contentLength += PART_OVERHEAD + key.length;
+          if (value instanceof Blob) {
+            if (!Number.isFinite(value.size)) {
+              if (!isCompressibleContentType(value.type)) {
+                contentLength = -Infinity;
+                break;
+              }
+              contentLength = Infinity;
+            } else {
+              contentLength += isCompressibleContentType(value.type) ? value.size : -value.size;
+            }
+          } else {
+            contentLength += value.length * AVG_BYTES_PER_CHAR;
+          }
+        }
+        if (contentLength >= this.threshold) {
+          const res = new Response(request.body);
+          const compressedStream = res.body.pipeThrough(new CompressionStream(this.encoding));
+          return next({
+            ...interceptorOptions,
+            request: {
+              ...interceptorOptions.request,
+              body: compressedStream,
+              headers: {
+                ...request.headers,
+                "standard-server": [],
+                "content-type": res.headers.get("content-type"),
+                "content-length": [],
+                "content-encoding": this.encoding
+              }
+            }
+          });
+        }
+      } else if (request.body instanceof URLSearchParams) {
+        const string = request.body.toString();
+        if (string.length * AVG_BYTES_PER_CHAR >= this.threshold) {
+          const compressedStream = new Blob([string]).stream().pipeThrough(new CompressionStream(this.encoding));
+          return next({
+            ...interceptorOptions,
+            request: {
+              ...interceptorOptions.request,
+              body: compressedStream,
+              headers: {
+                ...request.headers,
+                "standard-server": [],
+                "content-type": "application/x-www-form-urlencoded",
+                "content-length": [],
+                "content-encoding": this.encoding
+              }
+            }
+          });
+        }
+      } else if (request.body !== void 0 && !isAsyncIteratorObject(request.body)) {
+        const string = stringifyJSON(request.body);
+        if (string.length * AVG_BYTES_PER_CHAR >= this.threshold) {
+          const compressedStream = new Blob([string]).stream().pipeThrough(new CompressionStream(this.encoding));
+          return next({
+            ...interceptorOptions,
+            request: {
+              ...interceptorOptions.request,
+              body: compressedStream,
+              headers: {
+                ...request.headers,
+                "standard-server": [],
+                "content-type": "application/json",
+                "content-length": [],
+                "content-encoding": this.encoding
+              }
+            }
+          });
+        }
+      }
+      return next();
+    };
+    return {
+      ...options,
+      transportInterceptors: [
+        ...toArray(options.transportInterceptors),
+        transportInterceptor
+      ]
+    };
+  }
+}
+
+class ResponseCompressionLinkPlugin {
+  name = "~response-compression";
+  /**
+   * Decompression should wrap the final batch response instead of sub-responses.
+   */
+  after = ["~batch"];
+  encodings;
+  constructor(options = {}) {
+    this.encodings = options.encodings ?? ["gzip", "deflate"];
+  }
+  init(options) {
+    const acceptEncodingHeader = this.encodings.join(", ");
+    const transportInterceptor = async ({ next, ...interceptorOptions }) => {
+      const response = await next({
+        ...interceptorOptions,
+        request: {
+          ...interceptorOptions.request,
+          headers: {
+            ...interceptorOptions.request.headers,
+            "accept-encoding": acceptEncodingHeader
+          }
+        }
+      });
+      const encodings = parseContentEncodings(
+        flattenStandardHeader(response.headers["content-encoding"])
+      );
+      if (encodings.length === 0 || !encodings.every(isSupportedEncoding)) {
+        return response;
+      }
+      const decompressedHeaders = {
+        ...response.headers,
+        "content-length": void 0,
+        "content-encoding": void 0
+      };
+      return {
+        ...response,
+        headers: decompressedHeaders,
+        async resolveBody(hint) {
+          const stream = await response.resolveBody("octet-stream");
+          if (!(stream instanceof ReadableStream)) {
+            return stream;
+          }
+          let decompressedStream = stream;
+          for (let i = encodings.length - 1; i >= 0; i--) {
+            decompressedStream = decompressedStream.pipeThrough(
+              new DecompressionStream(encodings[i])
+            );
+          }
+          const fetchResponse = new Response(decompressedStream, {
+            headers: toFetchHeaders(decompressedHeaders)
+          });
+          return toStandardBody(fetchResponse, { hint });
+        }
+      };
+    };
+    return {
+      ...options,
+      transportInterceptors: [
+        ...toArray(options.transportInterceptors),
+        transportInterceptor
+      ]
+    };
+  }
 }
+const SUPPORTED_ENCODINGS = ["gzip", "deflate", "deflate-raw"];
+function isSupportedEncoding(encoding) {
+  return SUPPORTED_ENCODINGS.includes(encoding);
+}
+function parseContentEncodings(header) {
+  if (header === void 0) {
+    return [];
+  }
+  return header.split(",").map((part) => part.trim().toLowerCase());
+}
+
 class RetryLinkPlugin {
   defaultRetry;
   defaultRetryDelay;
@@ -484,13 +710,13 @@ class RetryLinkPlugin {
               const meta = getEventMeta(error);
               lastEventId = meta?.id ?? lastEventId;
               lastEventRetry = meta?.retry ?? lastEventRetry;
-              const maybeEventIterator = await callNext({ error });
-              if (!isAsyncIteratorObject(maybeEventIterator)) {
-                throw new RetryLinkPluginInvalidEventIteratorRetryResponse(
-                  "RetryLinkPlugin: Expected an Event Iterator, got a non-Event Iterator"
+              const asyncIteratorObject = await callNext({ error });
+              if (!isAsyncIteratorObject(asyncIteratorObject)) {
+                throw new TypeError(
+                  "RetryLinkPlugin: Expected an AsyncIteratorObject, got a different type."
                 );
               }
-              current = maybeEventIterator;
+              current = asyncIteratorObject;
               if (isIteratorAborted) {
                 await current.return?.();
                 throw error;
@@ -571,4 +797,35 @@ function parseRetryAfterHeader(value2) {
   return void 0;
 }
 
-export { BatchLinkPlugin, BatchLinkPluginError, DedupeLinkPlugin, RetryAfterLinkPlugin, RetryLinkPlugin, RetryLinkPluginInvalidEventIteratorRetryResponse };
+class TimeoutLinkPlugin {
+  timeout;
+  name = "~timeout";
+  /**
+   * Should abort if the total retry time exceeds the configured timeout
+   */
+  after = ["~retry"];
+  constructor(options) {
+    this.timeout = options.timeout;
+  }
+  init(options) {
+    const interceptor = async (interceptorOptions) => {
+      const timeoutMs = value(this.timeout, interceptorOptions);
+      if (timeoutMs === null || timeoutMs === void 0) {
+        return interceptorOptions.next();
+      }
+      const controller = new AbortController();
+      const timeoutId = setTimeout(() => {
+        controller.abort(new AbortError(`Request timed out after ${timeoutMs}ms`));
+      }, timeoutMs);
+      const signal = anyAbortSignal([interceptorOptions.signal, controller.signal]);
+      try {
+        return await interceptorOptions.next({ ...interceptorOptions, signal });
+      } finally {
+        clearTimeout(timeoutId);
+      }
+    };
+    return { ...options, interceptors: [interceptor, ...toArray(options.interceptors)] };
+  }
+}
+
+export { BatchLinkPlugin, BatchLinkPluginError, DedupeLinkPlugin, RequestCompressionLinkPlugin, ResponseCompressionLinkPlugin, RetryAfterLinkPlugin, RetryLinkPlugin, TimeoutLinkPlugin };

package/dist/shared/{client.Cby_-GGh.d.mts → client.8f4DNmdE.d.mts}

@@ -1,6 +1,6 @@
 import { Promisable, OrderablePlugin, Interceptor } from '@orpc/shared';
 import { StandardRequest, StandardLazyResponse } from '@standardserver/core';
-import { C as ClientContext, a as ClientOptions, A as AnyORPCError, b as ClientLink } from './client.8ug8I-zu.mjs';
+import { C as ClientContext, a as ClientOptions, A as AnyORPCError, b as ClientLink } from './client.BBZBQID8.mjs';
 
 type StandardLinkCodecDecodedResponse = {
     kind: 'output';

package/dist/shared/{client.8ug8I-zu.d.mts → client.BBZBQID8.d.mts}

@@ -163,5 +163,5 @@ interface ORPCErrorJSON<TCode extends string, TData> extends Pick<ORPCError<TCod
 type AnyORPCError = ORPCError<any, any>;
 type AnyORPCErrorJSON = ORPCErrorJSON<any, any>;
 
-export { ORPCError as c, 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, ORPCErrorJSON as d, AnyNestedClient as e, InferClientError as f, Client as g, ClientRest as h, AnyORPCErrorJSON as i, InferClientBodyInputs as k, InferClientBodyOutputs as l, InferClientErrors as m, InferClientInputs as n, InferClientOutputs as o, ORPCErrorOptions as p };
+export { ORPCError as g, 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 h, AnyORPCErrorJSON as i, InferClientBodyInputs as k, InferClientBodyOutputs as l, InferClientErrors as m, InferClientInputs as n, InferClientOutputs as o, ORPCErrorOptions as p };

package/dist/shared/{client.8ug8I-zu.d.ts → client.BBZBQID8.d.ts}

@@ -163,5 +163,5 @@ interface ORPCErrorJSON<TCode extends string, TData> extends Pick<ORPCError<TCod
 type AnyORPCError = ORPCError<any, any>;
 type AnyORPCErrorJSON = ORPCErrorJSON<any, any>;
 
-export { ORPCError as c, 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, ORPCErrorJSON as d, AnyNestedClient as e, InferClientError as f, Client as g, ClientRest as h, AnyORPCErrorJSON as i, InferClientBodyInputs as k, InferClientBodyOutputs as l, InferClientErrors as m, InferClientInputs as n, InferClientOutputs as o, ORPCErrorOptions as p };
+export { ORPCError as g, 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 h, AnyORPCErrorJSON as i, InferClientBodyInputs as k, InferClientBodyOutputs as l, InferClientErrors as m, InferClientInputs as n, InferClientOutputs as o, ORPCErrorOptions as p };

package/dist/shared/{client.CPF3hX6O.d.ts → client.BMKYqpdy.d.ts}

@@ -1,6 +1,6 @@
 import { Promisable, OrderablePlugin, Interceptor } from '@orpc/shared';
 import { StandardRequest, StandardLazyResponse } from '@standardserver/core';
-import { C as ClientContext, a as ClientOptions, A as AnyORPCError, b as ClientLink } from './client.8ug8I-zu.js';
+import { C as ClientContext, a as ClientOptions, A as AnyORPCError, b as ClientLink } from './client.BBZBQID8.js';
 
 type StandardLinkCodecDecodedResponse = {
     kind: 'output';

package/dist/shared/{client.DXhchJ84.mjs → client.BRJnOJ0R.mjs}

@@ -2,7 +2,7 @@ import { sortPlugins, runWithSpan, ORPC_NAME, isAsyncIteratorObject, override, t
 import { mergeStandardHeaders, parseStandardUrl } from '@standardserver/core';
 import { toStandardHeaders } from '@standardserver/fetch';
 import { O as ORPCError } from './client.Dnfj8jnT.mjs';
-import { R as RPCSerializer, i as isORPCErrorJson, c as createORPCErrorFromJson } from './client.DMXKFDyV.mjs';
+import { R as RPCSerializer, i as isORPCErrorJson, c as createORPCErrorFromJson } from './client.DqYwRDUO.mjs';
 
 class CompositeStandardLinkPlugin {
   name = "~composite";
@@ -38,7 +38,7 @@ class StandardLink {
       span?.setAttribute("rpc.system", ORPC_NAME);
       span?.setAttribute("rpc.method", path.join("."));
       if (isAsyncIteratorObject(input)) {
-        input = override(input, traceAsyncIterator("consume_event_iterator_input", input));
+        input = override(input, traceAsyncIterator("consume_async_iterator_object_input", input));
       }
       return intercept(this.interceptors, { ...options, path, input }, async ({ path: path2, input: input2, ...options2 }) => {
         const otel = getOpenTelemetryConfig();
@@ -80,7 +80,7 @@ class StandardLink {
         }
         const output = decodedResult.output;
         if (isAsyncIteratorObject(output)) {
-          return override(output, traceAsyncIterator("consume_event_iterator_output", output));
+          return override(output, traceAsyncIterator("consume_async_iterator_object_output", output));
         }
         return output;
       });
@@ -139,7 +139,7 @@ class RPCLinkCodec {
     };
   }
   async decodeResponse(response) {
-    const isOk = response.status >= 200 && response.status < 400;
+    const isOk = response.status < 400;
     const body = await response.resolveBody();
     const deserialized = await (async () => {
       try {

package/dist/shared/{client.DMXKFDyV.mjs → client.DqYwRDUO.mjs}

@@ -40,7 +40,7 @@ function cloneORPCError(error) {
   return cloned;
 }
 
-function wrapEventIteratorPreservingMeta(iterator, { mapResult, mapError, ...rest }) {
+function wrapAsyncIteratorPreservingEventMeta(iterator, { mapResult, mapError, ...rest }) {
   return wrapAsyncIterator(iterator, {
     ...rest,
     mapResult: mapResult && (async (result) => {
@@ -271,7 +271,7 @@ class RPCSerializer {
       return data;
     }
     if (isAsyncIteratorObject(data)) {
-      return wrapEventIteratorPreservingMeta(data, {
+      return wrapAsyncIteratorPreservingEventMeta(data, {
         mapResult: (result) => {
           if (result.value === void 0) {
             return result;
@@ -304,7 +304,7 @@ class RPCSerializer {
       return data;
     }
     if (isAsyncIteratorObject(data)) {
-      return wrapEventIteratorPreservingMeta(data, {
+      return wrapAsyncIteratorPreservingEventMeta(data, {
         mapResult: (result) => {
           if (result.value === void 0) {
             return result;
@@ -331,7 +331,7 @@ class RPCSerializer {
     }
     const serialized = JSON.parse(data.get("data"));
     const blobs = [];
-    for (const [key, value] of data.entries()) {
+    for (const [key, value] of data) {
       if (value instanceof Blob) {
         blobs[Number(key)] = value;
       }
@@ -340,4 +340,4 @@ class RPCSerializer {
   }
 }
 
-export { RPCSerializer as R, isInferableError as a, RPCJsonSerializer as b, createORPCErrorFromJson as c, cloneORPCError as d, isORPCErrorJson as i, toORPCError as t, wrapEventIteratorPreservingMeta as w };
+export { RPCSerializer as R, isInferableError as a, RPCJsonSerializer as b, createORPCErrorFromJson as c, cloneORPCError as d, isORPCErrorJson as i, toORPCError as t, wrapAsyncIteratorPreservingEventMeta as w };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/client",
   "type": "module",
-  "version": "2.0.0-beta.2",
+  "version": "2.0.0-beta.20",
   "license": "MIT",
   "homepage": "https://orpc.dev",
   "repository": {
@@ -50,10 +50,10 @@
     "dist"
   ],
   "dependencies": {
-    "@standardserver/core": "^0.0.25",
-    "@standardserver/fetch": "^0.0.25",
-    "@standardserver/peer": "^0.0.25",
-    "@orpc/shared": "2.0.0-beta.2"
+    "@standardserver/core": "^0.5.0",
+    "@standardserver/fetch": "^0.5.0",
+    "@standardserver/peer": "^0.5.0",
+    "@orpc/shared": "2.0.0-beta.20"
   },
   "devDependencies": {
     "zod": "^4.4.3"