@orpc/client 0.0.0-next.db1f26d → 0.0.0-next.df024bb

package/dist/shared/client.DcaJQZfy.mjs

@@ -0,0 +1,265 @@
+import { isObject, isTypescriptObject, retry } from '@orpc/shared';
+import { getEventMeta, withEventMeta } from '@orpc/standard-server';
+
+const COMMON_ORPC_ERROR_DEFS = {
+  BAD_REQUEST: {
+    status: 400,
+    message: "Bad Request"
+  },
+  UNAUTHORIZED: {
+    status: 401,
+    message: "Unauthorized"
+  },
+  FORBIDDEN: {
+    status: 403,
+    message: "Forbidden"
+  },
+  NOT_FOUND: {
+    status: 404,
+    message: "Not Found"
+  },
+  METHOD_NOT_SUPPORTED: {
+    status: 405,
+    message: "Method Not Supported"
+  },
+  NOT_ACCEPTABLE: {
+    status: 406,
+    message: "Not Acceptable"
+  },
+  TIMEOUT: {
+    status: 408,
+    message: "Request Timeout"
+  },
+  CONFLICT: {
+    status: 409,
+    message: "Conflict"
+  },
+  PRECONDITION_FAILED: {
+    status: 412,
+    message: "Precondition Failed"
+  },
+  PAYLOAD_TOO_LARGE: {
+    status: 413,
+    message: "Payload Too Large"
+  },
+  UNSUPPORTED_MEDIA_TYPE: {
+    status: 415,
+    message: "Unsupported Media Type"
+  },
+  UNPROCESSABLE_CONTENT: {
+    status: 422,
+    message: "Unprocessable Content"
+  },
+  TOO_MANY_REQUESTS: {
+    status: 429,
+    message: "Too Many Requests"
+  },
+  CLIENT_CLOSED_REQUEST: {
+    status: 499,
+    message: "Client Closed Request"
+  },
+  INTERNAL_SERVER_ERROR: {
+    status: 500,
+    message: "Internal Server Error"
+  },
+  NOT_IMPLEMENTED: {
+    status: 501,
+    message: "Not Implemented"
+  },
+  BAD_GATEWAY: {
+    status: 502,
+    message: "Bad Gateway"
+  },
+  SERVICE_UNAVAILABLE: {
+    status: 503,
+    message: "Service Unavailable"
+  },
+  GATEWAY_TIMEOUT: {
+    status: 504,
+    message: "Gateway Timeout"
+  }
+};
+function fallbackORPCErrorStatus(code, status) {
+  return status ?? COMMON_ORPC_ERROR_DEFS[code]?.status ?? 500;
+}
+function fallbackORPCErrorMessage(code, message) {
+  return message || COMMON_ORPC_ERROR_DEFS[code]?.message || code;
+}
+class ORPCError extends Error {
+  defined;
+  code;
+  status;
+  data;
+  constructor(code, ...[options]) {
+    if (options?.status && (options.status < 400 || options.status >= 600)) {
+      throw new Error("[ORPCError] The error status code must be in the 400-599 range.");
+    }
+    const message = fallbackORPCErrorMessage(code, options?.message);
+    super(message, options);
+    this.code = code;
+    this.status = fallbackORPCErrorStatus(code, options?.status);
+    this.defined = options?.defined ?? false;
+    this.data = options?.data;
+  }
+  toJSON() {
+    return {
+      defined: this.defined,
+      code: this.code,
+      status: this.status,
+      message: this.message,
+      data: this.data
+    };
+  }
+  static fromJSON(json, options) {
+    return new ORPCError(json.code, {
+      ...options,
+      ...json
+    });
+  }
+  static isValidJSON(json) {
+    if (!isObject(json)) {
+      return false;
+    }
+    const validKeys = ["defined", "code", "status", "message", "data"];
+    if (Object.keys(json).some((k) => !validKeys.includes(k))) {
+      return false;
+    }
+    return "defined" in json && typeof json.defined === "boolean" && "code" in json && typeof json.code === "string" && "status" in json && typeof json.status === "number" && "message" in json && typeof json.message === "string";
+  }
+}
+function isDefinedError(error) {
+  return error instanceof ORPCError && error.defined;
+}
+function toORPCError(error) {
+  return error instanceof ORPCError ? error : new ORPCError("INTERNAL_SERVER_ERROR", {
+    message: "Internal server error",
+    cause: error
+  });
+}
+
+const iteratorStates = /* @__PURE__ */ new WeakMap();
+function registerEventIteratorState(iterator, state) {
+  iteratorStates.set(iterator, state);
+}
+function updateEventIteratorStatus(state, status) {
+  if (state.status !== status) {
+    state.status = status;
+    state.listeners.forEach((cb) => cb(status));
+  }
+}
+function onEventIteratorStatusChange(iterator, callback, notifyImmediately = true) {
+  const state = iteratorStates.get(iterator);
+  if (!state) {
+    throw new Error("Iterator is not registered.");
+  }
+  if (notifyImmediately) {
+    callback(state.status);
+  }
+  state.listeners.push(callback);
+  return () => {
+    const index = state.listeners.indexOf(callback);
+    if (index !== -1) {
+      state.listeners.splice(index, 1);
+    }
+  };
+}
+
+function mapEventIterator(iterator, maps) {
+  return async function* () {
+    try {
+      while (true) {
+        const { done, value } = await iterator.next();
+        let mappedValue = await maps.value(value, done);
+        if (mappedValue !== value) {
+          const meta = getEventMeta(value);
+          if (meta && isTypescriptObject(mappedValue)) {
+            mappedValue = withEventMeta(mappedValue, meta);
+          }
+        }
+        if (done) {
+          return mappedValue;
+        }
+        yield mappedValue;
+      }
+    } 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;
+    } finally {
+      await iterator.return?.();
+    }
+  }();
+}
+const MAX_ALLOWED_RETRY_TIMES = 99;
+function createAutoRetryEventIterator(initial, reconnect, initialLastEventId) {
+  const state = {
+    status: "connected",
+    listeners: []
+  };
+  const iterator = async function* () {
+    let current = initial;
+    let lastEventId = initialLastEventId;
+    let lastRetry;
+    let retryTimes = 0;
+    try {
+      while (true) {
+        try {
+          updateEventIteratorStatus(state, "connected");
+          const { done, value } = await current.next();
+          const meta = getEventMeta(value);
+          lastEventId = meta?.id ?? lastEventId;
+          lastRetry = meta?.retry ?? lastRetry;
+          retryTimes = 0;
+          if (done) {
+            return value;
+          }
+          yield value;
+        } catch (e) {
+          updateEventIteratorStatus(state, "reconnecting");
+          const meta = getEventMeta(e);
+          lastEventId = meta?.id ?? lastEventId;
+          lastRetry = meta?.retry ?? lastRetry;
+          let currentError = e;
+          current = await retry({ times: MAX_ALLOWED_RETRY_TIMES }, async (exit) => {
+            retryTimes += 1;
+            if (retryTimes > MAX_ALLOWED_RETRY_TIMES) {
+              throw exit(new Error(
+                `Exceeded maximum retry attempts (${MAX_ALLOWED_RETRY_TIMES}) for event iterator. Possible infinite retry loop detected. Please review the retry logic.`,
+                { cause: currentError }
+              ));
+            }
+            const reconnected = await (async () => {
+              try {
+                return await reconnect({
+                  lastRetry,
+                  lastEventId,
+                  retryTimes,
+                  error: currentError
+                });
+              } catch (e2) {
+                currentError = e2;
+                throw e2;
+              }
+            })();
+            if (!reconnected) {
+              throw exit(currentError);
+            }
+            return reconnected;
+          });
+        }
+      }
+    } finally {
+      updateEventIteratorStatus(state, "closed");
+      await current.return?.();
+    }
+  }();
+  registerEventIteratorState(iterator, state);
+  return iterator;
+}
+
+export { COMMON_ORPC_ERROR_DEFS as C, ORPCError as O, fallbackORPCErrorMessage as a, createAutoRetryEventIterator as c, fallbackORPCErrorStatus as f, isDefinedError as i, mapEventIterator as m, onEventIteratorStatusChange as o, registerEventIteratorState as r, toORPCError as t, updateEventIteratorStatus as u };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/client",
   "type": "module",
-  "version": "0.0.0-next.db1f26d",
+  "version": "0.0.0-next.df024bb",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -15,33 +15,34 @@
   ],
   "exports": {
     ".": {
-      "types": "./dist/src/index.d.ts",
-      "import": "./dist/index.js",
-      "default": "./dist/index.js"
+      "types": "./dist/index.d.mts",
+      "import": "./dist/index.mjs",
+      "default": "./dist/index.mjs"
     },
-    "./🔒/*": {
-      "types": "./dist/src/*.d.ts"
+    "./standard": {
+      "types": "./dist/adapters/standard/index.d.mts",
+      "import": "./dist/adapters/standard/index.mjs",
+      "default": "./dist/adapters/standard/index.mjs"
+    },
+    "./fetch": {
+      "types": "./dist/adapters/fetch/index.d.mts",
+      "import": "./dist/adapters/fetch/index.mjs",
+      "default": "./dist/adapters/fetch/index.mjs"
     }
   },
   "files": [
-    "!**/*.map",
-    "!**/*.tsbuildinfo",
     "dist"
   ],
-  "peerDependencies": {
-    "@orpc/contract": "0.0.0-next.db1f26d",
-    "@orpc/server": "0.0.0-next.db1f26d"
-  },
   "dependencies": {
-    "@orpc/shared": "0.0.0-next.db1f26d",
-    "@orpc/transformer": "0.0.0-next.db1f26d"
+    "@orpc/shared": "0.0.0-next.df024bb",
+    "@orpc/standard-server": "0.0.0-next.df024bb",
+    "@orpc/standard-server-fetch": "0.0.0-next.df024bb"
   },
   "devDependencies": {
-    "zod": "^3.23.8",
-    "@orpc/openapi": "0.0.0-next.db1f26d"
+    "zod": "^3.24.1"
   },
   "scripts": {
-    "build": "tsup --clean --sourcemap --entry.index=src/index.ts --format=esm --onSuccess='tsc -b --noCheck'",
+    "build": "unbuild",
     "build:watch": "pnpm run build --watch",
     "type:check": "tsc -b"
   }

package/dist/index.js

@@ -1,83 +0,0 @@
-// src/procedure.ts
-import {
-  ORPC_HEADER,
-  ORPC_HEADER_VALUE
-} from "@orpc/contract";
-import { trim } from "@orpc/shared";
-import { ORPCError } from "@orpc/shared/error";
-import { ORPCDeserializer, ORPCSerializer } from "@orpc/transformer";
-function createProcedureClient(options) {
-  const serializer = new ORPCSerializer();
-  const deserializer = new ORPCDeserializer();
-  const client = async (input) => {
-    const fetch_ = options.fetch ?? fetch;
-    const url = `${trim(options.baseURL, "/")}/${options.path.map(encodeURIComponent).join("/")}`;
-    let headers = await options.headers?.(input);
-    headers = headers instanceof Headers ? headers : new Headers(headers);
-    const { body, headers: headers_ } = serializer.serialize(input);
-    for (const [key, value] of headers_.entries()) {
-      headers.set(key, value);
-    }
-    headers.set(ORPC_HEADER, ORPC_HEADER_VALUE);
-    const response = await fetch_(url, {
-      method: "POST",
-      headers,
-      body
-    });
-    const json = await (async () => {
-      try {
-        return await deserializer.deserialize(response);
-      } catch (e) {
-        throw new ORPCError({
-          code: "INTERNAL_SERVER_ERROR",
-          message: "Cannot parse response.",
-          cause: e
-        });
-      }
-    })();
-    if (!response.ok) {
-      throw ORPCError.fromJSON(json) ?? new ORPCError({
-        status: response.status,
-        code: "INTERNAL_SERVER_ERROR",
-        message: "Internal server error"
-      });
-    }
-    return json;
-  };
-  return client;
-}
-
-// src/router.ts
-function createRouterClient(options) {
-  const path = options?.path ?? [];
-  const client = new Proxy(
-    createProcedureClient({
-      baseURL: options.baseURL,
-      fetch: options.fetch,
-      headers: options.headers,
-      path
-    }),
-    {
-      get(target, key) {
-        if (typeof key !== "string") {
-          return Reflect.get(target, key);
-        }
-        return createRouterClient({
-          ...options,
-          path: [...path, key]
-        });
-      }
-    }
-  );
-  return client;
-}
-
-// src/index.ts
-export * from "@orpc/shared/error";
-var createORPCClient = createRouterClient;
-export {
-  createORPCClient,
-  createProcedureClient,
-  createRouterClient
-};
-//# sourceMappingURL=index.js.map

package/dist/src/index.d.ts

@@ -1,7 +0,0 @@
-/** unnoq */
-import { createRouterClient } from './router';
-export * from './procedure';
-export * from './router';
-export * from '@orpc/shared/error';
-export declare const createORPCClient: typeof createRouterClient;
-//# sourceMappingURL=index.d.ts.map

package/dist/src/procedure.d.ts

@@ -1,27 +0,0 @@
-import type { Promisable } from '@orpc/shared';
-import { type Schema, type SchemaInput, type SchemaOutput } from '@orpc/contract';
-export interface ProcedureClient<TInputSchema extends Schema, TOutputSchema extends Schema, TFuncOutput extends SchemaOutput<TOutputSchema>> {
-    (input: SchemaInput<TInputSchema>): Promise<SchemaOutput<TOutputSchema, TFuncOutput>>;
-}
-export interface CreateProcedureClientOptions {
-    /**
-     * The base url of the server.
-     */
-    baseURL: string;
-    /**
-     * The fetch function used to make the request.
-     * @default global fetch
-     */
-    fetch?: typeof fetch;
-    /**
-     * The headers used to make the request.
-     * Invoked before the request is made.
-     */
-    headers?: (input: unknown) => Promisable<Headers | Record<string, string>>;
-    /**
-     * The path of the procedure on server.
-     */
-    path: string[];
-}
-export declare function createProcedureClient<TInputSchema extends Schema, TOutputSchema extends Schema, TFuncOutput extends SchemaOutput<TOutputSchema>>(options: CreateProcedureClientOptions): ProcedureClient<TInputSchema, TOutputSchema, TFuncOutput>;
-//# sourceMappingURL=procedure.d.ts.map

package/dist/src/router.d.ts

@@ -1,34 +0,0 @@
-import type { ContractProcedure, ContractRouter, SchemaOutput } from '@orpc/contract';
-import type { Lazy, Procedure, Router } from '@orpc/server';
-import type { Promisable } from '@orpc/shared';
-import { type ProcedureClient } from './procedure';
-export type RouterClientWithContractRouter<TRouter extends ContractRouter> = {
-    [K in keyof TRouter]: TRouter[K] extends ContractProcedure<infer UInputSchema, infer UOutputSchema> ? ProcedureClient<UInputSchema, UOutputSchema, SchemaOutput<UOutputSchema>> : TRouter[K] extends ContractRouter ? RouterClientWithContractRouter<TRouter[K]> : never;
-};
-export type RouterClientWithRouter<TRouter extends Router<any>> = {
-    [K in keyof TRouter]: TRouter[K] extends Procedure<any, any, infer UInputSchema, infer UOutputSchema, infer UFuncOutput> | Lazy<Procedure<any, any, infer UInputSchema, infer UOutputSchema, infer UFuncOutput>> ? ProcedureClient<UInputSchema, UOutputSchema, UFuncOutput> : TRouter[K] extends Router<any> ? RouterClientWithRouter<TRouter[K]> : never;
-};
-export interface CreateRouterClientOptions {
-    /**
-     * The base url of the server.
-     */
-    baseURL: string;
-    /**
-     * The fetch function used to make the request.
-     * @default global fetch
-     */
-    fetch?: typeof fetch;
-    /**
-     * The headers used to make the request.
-     * Invoked before the request is made.
-     */
-    headers?: (input: unknown) => Promisable<Headers | Record<string, string>>;
-    /**
-     * This used for internal purpose only.
-     *
-     * @internal
-     */
-    path?: string[];
-}
-export declare function createRouterClient<TRouter extends Router<any> | ContractRouter>(options: CreateRouterClientOptions): TRouter extends Router<any> ? RouterClientWithRouter<TRouter> : TRouter extends ContractRouter ? RouterClientWithContractRouter<TRouter> : never;
-//# sourceMappingURL=router.d.ts.map