@orpc/client 0.0.0-next.0787cc6 → 0.0.0-next.0c0619f

package/dist/fetch.js

@@ -1,43 +1,75 @@
-// src/adapters/fetch/orpc-link.ts
-import { ORPCError } from "@orpc/contract";
-import { fetchReToStandardBody } from "@orpc/server/fetch";
-import { RPCSerializer } from "@orpc/server/standard";
-import { isObject, trim } from "@orpc/shared";
-import { contentDisposition } from "@tinyhttp/content-disposition";
+import {
+  RPCSerializer
+} from "./chunk-OX3K2AN4.js";
+import {
+  ORPCError,
+  createAutoRetryEventIterator
+} from "./chunk-2UPNYYFF.js";
+
+// src/adapters/fetch/rpc-link.ts
+import { isAsyncIteratorObject } from "@orpc/server-standard";
+import { toFetchBody, toStandardBody } from "@orpc/server-standard-fetch";
+import { trim, value } from "@orpc/shared";
+var InvalidEventSourceRetryResponse = class extends Error {
+};
 var RPCLink = class {
   fetch;
   rpcSerializer;
-  maxURLLength;
+  maxUrlLength;
   fallbackMethod;
-  getMethod;
-  getHeaders;
+  method;
+  headers;
   url;
+  eventSourceMaxNumberOfRetries;
+  eventSourceRetryDelay;
+  eventSourceRetry;
   constructor(options) {
     this.fetch = options.fetch ?? globalThis.fetch.bind(globalThis);
     this.rpcSerializer = options.rpcSerializer ?? new RPCSerializer();
-    this.maxURLLength = options.maxURLLength ?? 2083;
+    this.maxUrlLength = options.maxUrlLength ?? 2083;
     this.fallbackMethod = options.fallbackMethod ?? "POST";
     this.url = options.url;
-    this.getMethod = async (path, input, context) => {
-      return await options.method?.(path, input, context) ?? this.fallbackMethod;
-    };
-    this.getHeaders = async (path, input, context) => {
-      return new Headers(await options.headers?.(path, input, context));
-    };
+    this.eventSourceMaxNumberOfRetries = options.eventSourceMaxNumberOfRetries ?? 5;
+    this.method = options.method ?? this.fallbackMethod;
+    this.headers = options.headers ?? {};
+    this.eventSourceRetry = options.eventSourceRetry ?? true;
+    this.eventSourceRetryDelay = options.eventSourceRetryDelay ?? (({ retryTimes, lastRetry }) => lastRetry ?? 1e3 * 2 ** retryTimes);
   }
   async call(path, input, options) {
-    const clientContext = options.context;
-    const encoded = await this.encode(path, input, options);
-    if (encoded.body instanceof Blob && !encoded.headers.has("content-disposition")) {
-      encoded.headers.set("content-disposition", contentDisposition(encoded.body instanceof File ? encoded.body.name : "blob"));
+    const output = await this.performCall(path, input, options);
+    if (!isAsyncIteratorObject(output)) {
+      return output;
+    }
+    return createAutoRetryEventIterator(output, async (reconnectOptions) => {
+      if (options.signal?.aborted || reconnectOptions.retryTimes > this.eventSourceMaxNumberOfRetries) {
+        return null;
+      }
+      if (!await value(this.eventSourceRetry, reconnectOptions, options, path, input)) {
+        return null;
+      }
+      const delay = await value(this.eventSourceRetryDelay, reconnectOptions, options, path, input);
+      await new Promise((resolve) => setTimeout(resolve, delay));
+      const updatedOptions = { ...options, lastEventId: reconnectOptions.lastEventId };
+      const maybeIterator = await this.performCall(path, input, updatedOptions);
+      if (!isAsyncIteratorObject(maybeIterator)) {
+        throw new InvalidEventSourceRetryResponse("Invalid EventSource retry response");
+      }
+      return maybeIterator;
+    }, void 0);
+  }
+  async performCall(path, input, options) {
+    const encoded = await this.encodeRequest(path, input, options);
+    const fetchBody = toFetchBody(encoded.body, encoded.headers);
+    if (options.lastEventId !== void 0) {
+      encoded.headers.set("last-event-id", options.lastEventId);
     }
     const response = await this.fetch(encoded.url, {
       method: encoded.method,
       headers: encoded.headers,
-      body: encoded.body,
+      body: fetchBody,
       signal: options.signal
-    }, clientContext);
-    const body = await fetchReToStandardBody(response);
+    }, options, path, input);
+    const body = await toStandardBody(response);
     const deserialized = (() => {
       try {
         return this.rpcSerializer.deserialize(body);
@@ -53,59 +85,44 @@ var RPCLink = class {
         });
       }
     })();
-    if (response.ok) {
-      return deserialized;
+    if (!response.ok) {
+      if (ORPCError.isValidJSON(deserialized)) {
+        throw ORPCError.fromJSON(deserialized);
+      }
+      throw new ORPCError("INTERNAL_SERVER_ERROR", {
+        message: "Invalid RPC error response",
+        cause: deserialized
+      });
     }
-    throw ORPCError.fromJSON(deserialized);
+    return deserialized;
   }
-  async encode(path, input, options) {
-    const clientContext = options.context;
-    const expectMethod = await this.getMethod(path, input, clientContext);
-    const headers = await this.getHeaders(path, input, clientContext);
+  async encodeRequest(path, input, options) {
+    const expectedMethod = await value(this.method, options, path, input);
+    const headers = new Headers(await value(this.headers, options, path, input));
     const url = new URL(`${trim(this.url, "/")}/${path.map(encodeURIComponent).join("/")}`);
-    headers.append("x-orpc-handler", "rpc");
     const serialized = this.rpcSerializer.serialize(input);
-    if (expectMethod === "GET" && isObject(serialized)) {
-      const tryURL = new URL(url);
-      tryURL.searchParams.append("data", JSON.stringify(serialized));
-      if (tryURL.toString().length <= this.maxURLLength) {
+    if (expectedMethod === "GET" && !(serialized instanceof FormData) && !(serialized instanceof Blob) && !isAsyncIteratorObject(serialized)) {
+      const getUrl = new URL(url);
+      getUrl.searchParams.append("data", JSON.stringify(serialized) ?? "");
+      if (getUrl.toString().length <= this.maxUrlLength) {
         return {
           body: void 0,
-          method: expectMethod,
+          method: expectedMethod,
           headers,
-          url: tryURL
+          url: getUrl
         };
       }
     }
-    const method = expectMethod === "GET" ? this.fallbackMethod : expectMethod;
-    if (input === void 0) {
-      return {
-        body: void 0,
-        method,
-        headers,
-        url
-      };
-    }
-    if (isObject(serialized)) {
-      if (!headers.has("content-type")) {
-        headers.set("content-type", "application/json");
-      }
-      return {
-        body: JSON.stringify(serialized),
-        method,
-        headers,
-        url
-      };
-    }
     return {
-      body: serialized,
-      method,
+      url,
+      method: expectedMethod === "GET" ? this.fallbackMethod : expectedMethod,
       headers,
-      url
+      body: serialized
     };
   }
 };
 export {
+  InvalidEventSourceRetryResponse,
   RPCLink
 };
 //# sourceMappingURL=fetch.js.map

package/dist/index.js

@@ -1,8 +1,27 @@
+import {
+  COMMON_ORPC_ERROR_DEFS,
+  ORPCError,
+  createAutoRetryEventIterator,
+  fallbackORPCErrorMessage,
+  fallbackORPCErrorStatus,
+  isDefinedError,
+  mapEventIterator,
+  onEventIteratorStatusChange,
+  registerEventIteratorState,
+  toORPCError,
+  updateEventIteratorStatus
+} from "./chunk-2UPNYYFF.js";
+
 // src/client.ts
 function createORPCClient(link, options) {
   const path = options?.path ?? [];
   const procedureClient = async (...[input, options2]) => {
-    return await link.call(path, input, options2 ?? {});
+    const optionsOut = {
+      ...options2,
+      context: options2?.context ?? {}
+      // options.context can be undefined when all field is optional
+    };
+    return await link.call(path, input, optionsOut);
   };
   const recursive = new Proxy(procedureClient, {
     get(target, key) {
@@ -24,19 +43,39 @@ var DynamicLink = class {
     this.linkResolver = linkResolver;
   }
   async call(path, input, options) {
-    const resolvedLink = await this.linkResolver(path, input, options.context);
+    const resolvedLink = await this.linkResolver(options, path, input);
     const output = await resolvedLink.call(path, input, options);
     return output;
   }
 };
 
-// src/index.ts
-import { isDefinedError, ORPCError, safe } from "@orpc/contract";
+// src/utils.ts
+async function safe(promise) {
+  try {
+    const output = await promise;
+    return [output, void 0, false];
+  } catch (e) {
+    const error = e;
+    if (isDefinedError(error)) {
+      return [void 0, error, true];
+    }
+    return [void 0, error, false];
+  }
+}
 export {
+  COMMON_ORPC_ERROR_DEFS,
   DynamicLink,
   ORPCError,
+  createAutoRetryEventIterator,
   createORPCClient,
+  fallbackORPCErrorMessage,
+  fallbackORPCErrorStatus,
   isDefinedError,
-  safe
+  mapEventIterator,
+  onEventIteratorStatusChange,
+  registerEventIteratorState,
+  safe,
+  toORPCError,
+  updateEventIteratorStatus
 };
 //# sourceMappingURL=index.js.map

package/dist/openapi.js

@@ -0,0 +1,329 @@
+import {
+  ORPCError,
+  __export,
+  mapEventIterator,
+  toORPCError
+} from "./chunk-2UPNYYFF.js";
+
+// src/openapi/bracket-notation.ts
+var bracket_notation_exports = {};
+__export(bracket_notation_exports, {
+  deserialize: () => deserialize,
+  escapeSegment: () => escapeSegment,
+  parsePath: () => parsePath,
+  serialize: () => serialize,
+  stringifyPath: () => stringifyPath
+});
+import { isObject } from "@orpc/shared";
+function serialize(payload, parentKey = "") {
+  if (!Array.isArray(payload) && !isObject(payload))
+    return [["", payload]];
+  const result = [];
+  function helper(value, path) {
+    if (Array.isArray(value)) {
+      value.forEach((item, index) => {
+        helper(item, [...path, String(index)]);
+      });
+    } else if (isObject(value)) {
+      for (const [key, val] of Object.entries(value)) {
+        helper(val, [...path, key]);
+      }
+    } else {
+      result.push([stringifyPath(path), value]);
+    }
+  }
+  helper(payload, parentKey ? [parentKey] : []);
+  return result;
+}
+function deserialize(entities) {
+  if (entities.length === 0) {
+    return void 0;
+  }
+  const isRootArray = entities.every(([path]) => path === "");
+  const result = isRootArray ? [] : {};
+  const arrayPushPaths = /* @__PURE__ */ new Set();
+  for (const [path, _] of entities) {
+    const segments = parsePath(path);
+    const base = segments.slice(0, -1).join(".");
+    const last = segments[segments.length - 1];
+    if (last === "") {
+      arrayPushPaths.add(base);
+    } else {
+      arrayPushPaths.delete(base);
+    }
+  }
+  function setValue(obj, segments, value, fullPath) {
+    const [first, ...rest_] = segments;
+    if (Array.isArray(obj) && first === "") {
+      ;
+      obj.push(value);
+      return;
+    }
+    const objAsRecord = obj;
+    if (rest_.length === 0) {
+      objAsRecord[first] = value;
+      return;
+    }
+    const rest = rest_;
+    if (rest[0] === "") {
+      const pathToCheck = segments.slice(0, -1).join(".");
+      if (rest.length === 1 && arrayPushPaths.has(pathToCheck)) {
+        if (!(first in objAsRecord)) {
+          objAsRecord[first] = [];
+        }
+        if (Array.isArray(objAsRecord[first])) {
+          ;
+          objAsRecord[first].push(value);
+          return;
+        }
+      }
+      if (!(first in objAsRecord)) {
+        objAsRecord[first] = {};
+      }
+      const target = objAsRecord[first];
+      target[""] = value;
+      return;
+    }
+    if (!(first in objAsRecord)) {
+      objAsRecord[first] = {};
+    }
+    setValue(
+      objAsRecord[first],
+      rest,
+      value,
+      fullPath
+    );
+  }
+  for (const [path, value] of entities) {
+    const segments = parsePath(path);
+    setValue(result, segments, value, path);
+  }
+  return result;
+}
+function escapeSegment(segment) {
+  return segment.replace(/[\\[\]]/g, (match) => {
+    switch (match) {
+      case "\\":
+        return "\\\\";
+      case "[":
+        return "\\[";
+      case "]":
+        return "\\]";
+      default:
+        return match;
+    }
+  });
+}
+function stringifyPath(path) {
+  const [first, ...rest] = path;
+  const firstSegment = escapeSegment(first);
+  const base = first === "" ? "" : firstSegment;
+  return rest.reduce(
+    (result, segment) => `${result}[${escapeSegment(segment)}]`,
+    base
+  );
+}
+function parsePath(path) {
+  if (path === "")
+    return [""];
+  const result = [];
+  let currentSegment = "";
+  let inBracket = false;
+  let bracketContent = "";
+  let backslashCount = 0;
+  for (let i = 0; i < path.length; i++) {
+    const char = path[i];
+    if (char === "\\") {
+      backslashCount++;
+      continue;
+    }
+    if (backslashCount > 0) {
+      const literalBackslashes = "\\".repeat(Math.floor(backslashCount / 2));
+      if (char === "[" || char === "]") {
+        if (backslashCount % 2 === 1) {
+          if (inBracket) {
+            bracketContent += literalBackslashes + char;
+          } else {
+            currentSegment += literalBackslashes + char;
+          }
+        } else {
+          if (inBracket) {
+            bracketContent += literalBackslashes;
+          } else {
+            currentSegment += literalBackslashes;
+          }
+          if (char === "[" && !inBracket) {
+            if (currentSegment !== "" || result.length === 0) {
+              result.push(currentSegment);
+            }
+            inBracket = true;
+            bracketContent = "";
+            currentSegment = "";
+          } else if (char === "]" && inBracket) {
+            result.push(bracketContent);
+            inBracket = false;
+            bracketContent = "";
+          } else {
+            if (inBracket) {
+              bracketContent += char;
+            } else {
+              currentSegment += char;
+            }
+          }
+        }
+      } else {
+        const allBackslashes = "\\".repeat(backslashCount);
+        if (inBracket) {
+          bracketContent += allBackslashes + char;
+        } else {
+          currentSegment += allBackslashes + char;
+        }
+      }
+      backslashCount = 0;
+      continue;
+    }
+    if (char === "[" && !inBracket) {
+      if (currentSegment !== "" || result.length === 0) {
+        result.push(currentSegment);
+      }
+      inBracket = true;
+      bracketContent = "";
+      currentSegment = "";
+      continue;
+    }
+    if (char === "]" && inBracket) {
+      result.push(bracketContent);
+      inBracket = false;
+      bracketContent = "";
+      continue;
+    }
+    if (inBracket) {
+      bracketContent += char;
+    } else {
+      currentSegment += char;
+    }
+  }
+  if (backslashCount > 0) {
+    const remainingBackslashes = "\\".repeat(backslashCount);
+    if (inBracket) {
+      bracketContent += remainingBackslashes;
+    } else {
+      currentSegment += remainingBackslashes;
+    }
+  }
+  if (inBracket) {
+    if (currentSegment !== "" || result.length === 0) {
+      result.push(currentSegment);
+    }
+    result.push(`[${bracketContent}`);
+  } else if (currentSegment !== "" || result.length === 0) {
+    result.push(currentSegment);
+  }
+  return result;
+}
+
+// src/openapi/json-serializer.ts
+import { isObject as isObject2 } from "@orpc/shared";
+var OpenAPIJsonSerializer = class {
+  serialize(payload) {
+    if (payload instanceof Set)
+      return this.serialize([...payload]);
+    if (payload instanceof Map)
+      return this.serialize([...payload.entries()]);
+    if (Array.isArray(payload)) {
+      return payload.map((v) => v === void 0 ? "undefined" : this.serialize(v));
+    }
+    if (Number.isNaN(payload))
+      return "NaN";
+    if (typeof payload === "bigint")
+      return payload.toString();
+    if (payload instanceof Date && Number.isNaN(payload.getTime())) {
+      return "Invalid Date";
+    }
+    if (payload instanceof RegExp)
+      return payload.toString();
+    if (payload instanceof URL)
+      return payload.toString();
+    if (!isObject2(payload))
+      return payload;
+    return Object.keys(payload).reduce(
+      (carry, key) => {
+        const val = payload[key];
+        carry[key] = this.serialize(val);
+        return carry;
+      },
+      {}
+    );
+  }
+};
+
+// src/openapi/serializer.ts
+import { ErrorEvent, isAsyncIteratorObject } from "@orpc/server-standard";
+import { findDeepMatches } from "@orpc/shared";
+var OpenAPISerializer = class {
+  jsonSerializer;
+  constructor(options) {
+    this.jsonSerializer = options?.jsonSerializer ?? new OpenAPIJsonSerializer();
+  }
+  serialize(data) {
+    if (data instanceof Blob || data === void 0) {
+      return data;
+    }
+    if (isAsyncIteratorObject(data)) {
+      return mapEventIterator(data, {
+        value: async (value) => this.jsonSerializer.serialize(value),
+        error: async (e) => {
+          if (e instanceof ErrorEvent) {
+            return new ErrorEvent({
+              data: this.jsonSerializer.serialize(e.data),
+              cause: e
+            });
+          }
+          return new ErrorEvent({
+            data: this.jsonSerializer.serialize(toORPCError(e).toJSON()),
+            cause: e
+          });
+        }
+      });
+    }
+    const serializedJSON = this.jsonSerializer.serialize(data);
+    const { values: blobs } = findDeepMatches((v) => v instanceof Blob, serializedJSON);
+    if (blobs.length === 0) {
+      return serializedJSON;
+    }
+    const form = new FormData();
+    for (const [path, value] of serialize(serializedJSON)) {
+      if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") {
+        form.append(path, value.toString());
+      } else if (value instanceof Date) {
+        form.append(path, value.toISOString());
+      } else if (value instanceof Blob) {
+        form.append(path, value);
+      }
+    }
+    return form;
+  }
+  deserialize(serialized) {
+    if (serialized instanceof URLSearchParams || serialized instanceof FormData) {
+      return deserialize([...serialized.entries()]);
+    }
+    if (isAsyncIteratorObject(serialized)) {
+      return mapEventIterator(serialized, {
+        value: async (value) => value,
+        error: async (e) => {
+          if (e instanceof ErrorEvent && ORPCError.isValidJSON(e.data)) {
+            return ORPCError.fromJSON(e.data, { cause: e });
+          }
+          return e;
+        }
+      });
+    }
+    return serialized;
+  }
+};
+export {
+  bracket_notation_exports as BracketNotation,
+  OpenAPIJsonSerializer,
+  OpenAPISerializer
+};
+//# sourceMappingURL=openapi.js.map

package/dist/rpc.js

@@ -0,0 +1,10 @@
+import {
+  RPCJsonSerializer,
+  RPCSerializer
+} from "./chunk-OX3K2AN4.js";
+import "./chunk-2UPNYYFF.js";
+export {
+  RPCJsonSerializer,
+  RPCSerializer
+};
+//# sourceMappingURL=rpc.js.map

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

@@ -1,3 +1,3 @@
-export * from './orpc-link';
+export * from './rpc-link';
 export * from './types';
 //# sourceMappingURL=index.d.ts.map

package/dist/src/adapters/fetch/rpc-link.d.ts

@@ -0,0 +1,98 @@
+import type { Value } from '@orpc/shared';
+import type { ClientContext, ClientLink, ClientOptionsOut } from '../../types';
+import type { FetchWithContext } from './types';
+import { type EventIteratorReconnectOptions } from '../../event-iterator';
+import { RPCSerializer } from '../../rpc';
+type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH';
+export declare class InvalidEventSourceRetryResponse extends Error {
+}
+export interface RPCLinkOptions<TClientContext extends ClientContext> {
+    /**
+     * Base url for all requests.
+     */
+    url: string;
+    /**
+     * The maximum length of the URL.
+     *
+     * @default 2083
+     */
+    maxUrlLength?: number;
+    /**
+     * The method used to make the request.
+     *
+     * @default 'POST'
+     */
+    method?: Value<HTTPMethod, [
+        options: ClientOptionsOut<TClientContext>,
+        path: readonly string[],
+        input: unknown
+    ]>;
+    /**
+     * The method to use when the payload cannot safely pass to the server with method return from method function.
+     * GET is not allowed, it's very dangerous.
+     *
+     * @default 'POST'
+     */
+    fallbackMethod?: Exclude<HTTPMethod, 'GET'>;
+    /**
+     * Inject headers to the request.
+     */
+    headers?: Value<[string, string][] | Record<string, string> | Headers, [
+        options: ClientOptionsOut<TClientContext>,
+        path: readonly string[],
+        input: unknown
+    ]>;
+    /**
+     * Custom fetch implementation.
+     *
+     * @default globalThis.fetch.bind(globalThis)
+     */
+    fetch?: FetchWithContext<TClientContext>;
+    rpcSerializer?: RPCSerializer;
+    /**
+     * Maximum number of retry attempts for EventSource errors before throwing.
+     *
+     * @default 5
+     */
+    eventSourceMaxNumberOfRetries?: number;
+    /**
+     * Delay (in ms) before retrying an EventSource call.
+     *
+     * @default ({retryTimes, lastRetry}) => lastRetry ?? (1000 * 2 ** retryTimes)
+     */
+    eventSourceRetryDelay?: Value<number, [
+        reconnectOptions: EventIteratorReconnectOptions,
+        options: ClientOptionsOut<TClientContext>,
+        path: readonly string[],
+        input: unknown
+    ]>;
+    /**
+     * Function to determine if an error is retryable.
+     *
+     * @default true
+     */
+    eventSourceRetry?: Value<boolean, [
+        reconnectOptions: EventIteratorReconnectOptions,
+        options: ClientOptionsOut<TClientContext>,
+        path: readonly string[],
+        input: unknown
+    ]>;
+}
+export declare class RPCLink<TClientContext extends ClientContext> implements ClientLink<TClientContext> {
+    private readonly fetch;
+    private readonly rpcSerializer;
+    private readonly maxUrlLength;
+    private readonly fallbackMethod;
+    private readonly method;
+    private readonly headers;
+    private readonly url;
+    private readonly eventSourceMaxNumberOfRetries;
+    private readonly eventSourceRetryDelay;
+    private readonly eventSourceRetry;
+    constructor(options: RPCLinkOptions<TClientContext>);
+    call(path: readonly string[], input: unknown, options: ClientOptionsOut<TClientContext>): Promise<unknown>;
+    private performCall;
+    private encodeRequest;
+}
+export {};
+//# sourceMappingURL=rpc-link.d.ts.map