@orpc/client 0.0.0-next.bec9f4e → 0.0.0-next.bf3438f

package/dist/shared/{client.0FH21c3Z.mjs → client.BX0_8bnM.mjs}

@@ -1,4 +1,4 @@
-import { isObject, isTypescriptObject } from '@orpc/shared';
+import { isObject, AsyncIteratorClass, isTypescriptObject } from '@orpc/shared';
 import { getEventMeta, withEventMeta } from '@orpc/standard-server';
 
 const COMMON_ORPC_ERROR_DEFS = {
@@ -91,8 +91,8 @@ class ORPCError extends Error {
   status;
   data;
   constructor(code, ...[options]) {
-    if (options?.status && (options.status >= 200 && options.status < 300)) {
-      throw new Error("[ORPCError] The error status code must not be in the 200-299 range.");
+    if (options?.status && !isORPCErrorStatus(options.status)) {
+      throw new Error("[ORPCError] Invalid error status code.");
     }
     const message = fallbackORPCErrorMessage(code, options?.message);
     super(message, options);
@@ -110,22 +110,6 @@ class ORPCError extends Error {
       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;
@@ -136,24 +120,38 @@ function toORPCError(error) {
     cause: error
   });
 }
+function isORPCErrorStatus(status) {
+  return status < 200 || status >= 400;
+}
+function isORPCErrorJson(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" && isORPCErrorStatus(json.status) && "message" in json && typeof json.message === "string";
+}
+function createORPCErrorFromJson(json, options = {}) {
+  return new ORPCError(json.code, {
+    ...options,
+    ...json
+  });
+}
 
 function mapEventIterator(iterator, maps) {
-  return async function* () {
+  return new AsyncIteratorClass(async () => {
     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);
-          }
+      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;
       }
+      return { done, value: mappedValue };
     } catch (error) {
       let mappedError = await maps.error(error);
       if (mappedError !== error) {
@@ -163,10 +161,12 @@ function mapEventIterator(iterator, maps) {
         }
       }
       throw mappedError;
-    } finally {
+    }
+  }, async (reason) => {
+    if (reason !== "next") {
       await iterator.return?.();
     }
-  }();
+  });
 }
 
-export { COMMON_ORPC_ERROR_DEFS as C, ORPCError as O, fallbackORPCErrorMessage as a, fallbackORPCErrorStatus as f, isDefinedError as i, mapEventIterator as m, toORPCError as t };
+export { COMMON_ORPC_ERROR_DEFS as C, ORPCError as O, fallbackORPCErrorMessage as a, isORPCErrorStatus as b, isORPCErrorJson as c, createORPCErrorFromJson as d, fallbackORPCErrorStatus as f, isDefinedError as i, mapEventIterator as m, toORPCError as t };

package/dist/shared/{client.BC0T26HA.d.mts → client.BdD8cpjs.d.mts}

@@ -1,6 +1,6 @@
-import { a as ClientContext, b as ClientOptions, d as HTTPMethod } from './client.87WXDX8t.mjs';
-import { c as StandardLinkCodec, a as StandardLinkOptions } from './client.D9lmRwGB.mjs';
-import { Segment, Value } from '@orpc/shared';
+import { a as ClientContext, b as ClientOptions, d as HTTPMethod } from './client.4TS_0JaO.mjs';
+import { e as StandardLinkCodec, b as StandardLinkOptions, d as StandardLink, f as StandardLinkClient } from './client.BMoG_EdN.mjs';
+import { Segment, Value, Promisable } from '@orpc/shared';
 import { StandardHeaders, StandardRequest, StandardLazyResponse } from '@orpc/standard-server';
 
 declare const STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES: {
@@ -44,46 +44,30 @@ interface StandardRPCLinkCodecOptions<T extends ClientContext> {
     /**
      * Base url for all requests.
      */
-    url: Value<string | URL, [
-        options: ClientOptions<T>,
-        path: readonly string[],
-        input: unknown
-    ]>;
+    url: Value<Promisable<string | URL>, [options: ClientOptions<T>, path: readonly string[], input: unknown]>;
     /**
      * The maximum length of the URL.
      *
      * @default 2083
      */
-    maxUrlLength?: Value<number, [
-        options: ClientOptions<T>,
-        path: readonly string[],
-        input: unknown
-    ]>;
+    maxUrlLength?: Value<Promisable<number>, [options: ClientOptions<T>, path: readonly string[], input: unknown]>;
     /**
      * The method used to make the request.
      *
      * @default 'POST'
      */
-    method?: Value<HTTPMethod, [
-        options: ClientOptions<T>,
-        path: readonly string[],
-        input: unknown
-    ]>;
+    method?: Value<Promisable<Exclude<HTTPMethod, 'HEAD'>>, [options: ClientOptions<T>, 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'>;
+    fallbackMethod?: Exclude<HTTPMethod, 'HEAD' | 'GET'>;
     /**
      * Inject headers to the request.
      */
-    headers?: Value<StandardHeaders, [
-        options: ClientOptions<T>,
-        path: readonly string[],
-        input: unknown
-    ]>;
+    headers?: Value<Promisable<StandardHeaders>, [options: ClientOptions<T>, path: readonly string[], input: unknown]>;
 }
 declare class StandardRPCLinkCodec<T extends ClientContext> implements StandardLinkCodec<T> {
     private readonly serializer;
@@ -99,5 +83,9 @@ declare class StandardRPCLinkCodec<T extends ClientContext> implements StandardL
 
 interface StandardRPCLinkOptions<T extends ClientContext> extends StandardLinkOptions<T>, StandardRPCLinkCodecOptions<T>, StandardRPCJsonSerializerOptions {
 }
+declare class StandardRPCLink<T extends ClientContext> extends StandardLink<T> {
+    constructor(linkClient: StandardLinkClient<T>, options: StandardRPCLinkOptions<T>);
+}
 
-export { STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES as S, type StandardRPCJsonSerializedMetaItem as a, type StandardRPCJsonSerialized as b, type StandardRPCCustomJsonSerializer as c, type StandardRPCJsonSerializerOptions as d, StandardRPCJsonSerializer as e, type StandardRPCLinkOptions as f, type StandardRPCLinkCodecOptions as g, StandardRPCLinkCodec as h, StandardRPCSerializer as i };
+export { STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES as S, StandardRPCJsonSerializer as e, StandardRPCLink as g, StandardRPCLinkCodec as i, StandardRPCSerializer as j };
+export type { StandardRPCJsonSerializedMetaItem as a, StandardRPCJsonSerialized as b, StandardRPCCustomJsonSerializer as c, StandardRPCJsonSerializerOptions as d, StandardRPCLinkOptions as f, StandardRPCLinkCodecOptions as h };

package/dist/shared/{client.D9lmRwGB.d.mts → client.C0KbSWlC.d.ts}

@@ -1,6 +1,16 @@
 import { Interceptor } from '@orpc/shared';
 import { StandardRequest, StandardLazyResponse } from '@orpc/standard-server';
-import { a as ClientContext, b as ClientOptions, C as ClientLink } from './client.87WXDX8t.mjs';
+import { a as ClientContext, b as ClientOptions, C as ClientLink } from './client.4TS_0JaO.js';
+
+interface StandardLinkPlugin<T extends ClientContext> {
+    order?: number;
+    init?(options: StandardLinkOptions<T>): void;
+}
+declare class CompositeStandardLinkPlugin<T extends ClientContext, TPlugin extends StandardLinkPlugin<T>> implements StandardLinkPlugin<T> {
+    protected readonly plugins: TPlugin[];
+    constructor(plugins?: readonly TPlugin[]);
+    init(options: StandardLinkOptions<T>): void;
+}
 
 interface StandardLinkCodec<T extends ClientContext> {
     encode(path: readonly string[], input: unknown, options: ClientOptions<T>): Promise<StandardRequest>;
@@ -10,20 +20,16 @@ interface StandardLinkClient<T extends ClientContext> {
     call(request: StandardRequest, options: ClientOptions<T>, path: readonly string[], input: unknown): Promise<StandardLazyResponse>;
 }
 
-declare class InvalidEventIteratorRetryResponse extends Error {
+interface StandardLinkInterceptorOptions<T extends ClientContext> extends ClientOptions<T> {
+    path: readonly string[];
+    input: unknown;
 }
-interface StandardLinkPlugin<T extends ClientContext> {
-    init?(options: StandardLinkOptions<T>): void;
+interface StandardLinkClientInterceptorOptions<T extends ClientContext> extends StandardLinkInterceptorOptions<T> {
+    request: StandardRequest;
 }
 interface StandardLinkOptions<T extends ClientContext> {
-    interceptors?: Interceptor<{
-        path: readonly string[];
-        input: unknown;
-        options: ClientOptions<T>;
-    }, unknown, unknown>[];
-    clientInterceptors?: Interceptor<{
-        request: StandardRequest;
-    }, StandardLazyResponse, unknown>[];
+    interceptors?: Interceptor<StandardLinkInterceptorOptions<T>, Promise<unknown>>[];
+    clientInterceptors?: Interceptor<StandardLinkClientInterceptorOptions<T>, Promise<StandardLazyResponse>>[];
     plugins?: StandardLinkPlugin<T>[];
 }
 declare class StandardLink<T extends ClientContext> implements ClientLink<T> {
@@ -36,4 +42,5 @@ declare class StandardLink<T extends ClientContext> implements ClientLink<T> {
     call(path: readonly string[], input: unknown, options: ClientOptions<T>): Promise<unknown>;
 }
 
-export { InvalidEventIteratorRetryResponse as I, type StandardLinkPlugin as S, type StandardLinkOptions as a, StandardLink as b, type StandardLinkCodec as c, type StandardLinkClient as d };
+export { CompositeStandardLinkPlugin as C, StandardLink as d };
+export type { StandardLinkClientInterceptorOptions as S, StandardLinkPlugin as a, StandardLinkOptions as b, StandardLinkInterceptorOptions as c, StandardLinkCodec as e, StandardLinkClient as f };

package/dist/shared/{client._CYwsI7p.mjs → client.CQCGVpTM.mjs}

@@ -1,23 +1,32 @@
 import { toArray, intercept, isObject, value, isAsyncIteratorObject, stringifyJSON } from '@orpc/shared';
 import { mergeStandardHeaders, ErrorEvent } from '@orpc/standard-server';
-import { O as ORPCError, m as mapEventIterator, t as toORPCError } from './client.0FH21c3Z.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.BX0_8bnM.mjs';
 
-class InvalidEventIteratorRetryResponse extends Error {
+class CompositeStandardLinkPlugin {
+  plugins;
+  constructor(plugins = []) {
+    this.plugins = [...plugins].sort((a, b) => (a.order ?? 0) - (b.order ?? 0));
+  }
+  init(options) {
+    for (const plugin of this.plugins) {
+      plugin.init?.(options);
+    }
+  }
 }
+
 class StandardLink {
   constructor(codec, sender, options = {}) {
     this.codec = codec;
     this.sender = sender;
-    for (const plugin of toArray(options.plugins)) {
-      plugin.init?.(options);
-    }
+    const plugin = new CompositeStandardLinkPlugin(options.plugins);
+    plugin.init(options);
     this.interceptors = toArray(options.interceptors);
     this.clientInterceptors = toArray(options.clientInterceptors);
   }
   interceptors;
   clientInterceptors;
   call(path, input, options) {
-    return intercept(this.interceptors, { path, input, options }, async ({ path: path2, input: input2, options: options2 }) => {
+    return intercept(this.interceptors, { ...options, path, input }, async ({ path: path2, input: input2, ...options2 }) => {
       const output = await this.#call(path2, input2, options2);
       return output;
     });
@@ -26,8 +35,8 @@ class StandardLink {
     const request = await this.codec.encode(path, input, options);
     const response = await intercept(
       this.clientInterceptors,
-      { request },
-      ({ request: request2 }) => this.sender.call(request2, options, path, input)
+      { ...options, input, path, request },
+      ({ input: input2, path: path2, request: request2, ...options2 }) => this.sender.call(request2, options2, path2, input2)
     );
     const output = await this.codec.decode(response, options, path, input);
     return output;
@@ -183,6 +192,9 @@ class StandardRPCJsonSerializer {
 function toHttpPath(path) {
   return `/${path.map(encodeURIComponent).join("/")}`;
 }
+function getMalformedResponseErrorCode(status) {
+  return Object.entries(COMMON_ORPC_ERROR_DEFS).find(([, def]) => def.status === status)?.[0] ?? "MALFORMED_ORPC_ERROR_RESPONSE";
+}
 
 class StandardRPCLinkCodec {
   constructor(serializer, options) {
@@ -202,7 +214,8 @@ class StandardRPCLinkCodec {
     const expectedMethod = await value(this.expectedMethod, options, path, input);
     let headers = await value(this.headers, options, path, input);
     const baseUrl = await value(this.baseUrl, options, path, input);
-    const url = new URL(`${baseUrl.toString().replace(/\/$/, "")}${toHttpPath(path)}`);
+    const url = new URL(baseUrl);
+    url.pathname = `${url.pathname.replace(/\/$/, "")}${toHttpPath(path)}`;
     if (options.lastEventId !== void 0) {
       headers = mergeStandardHeaders(headers, { "last-event-id": options.lastEventId });
     }
@@ -230,7 +243,7 @@ class StandardRPCLinkCodec {
     };
   }
   async decode(response) {
-    const isOk = response.status >= 200 && response.status < 300;
+    const isOk = !isORPCErrorStatus(response.status);
     const deserialized = await (async () => {
       let isBodyOk = false;
       try {
@@ -249,12 +262,12 @@ class StandardRPCLinkCodec {
       }
     })();
     if (!isOk) {
-      if (ORPCError.isValidJSON(deserialized)) {
-        throw ORPCError.fromJSON(deserialized);
+      if (isORPCErrorJson(deserialized)) {
+        throw createORPCErrorFromJson(deserialized);
       }
-      throw new ORPCError("MALFORMED_ORPC_ERROR_RESPONSE", {
+      throw new ORPCError(getMalformedResponseErrorCode(response.status), {
         status: response.status,
-        data: deserialized
+        data: { ...response, body: deserialized }
       });
     }
     return deserialized;
@@ -304,8 +317,8 @@ class StandardRPCSerializer {
             return e;
           }
           const deserialized = this.#deserialize(e.data);
-          if (ORPCError.isValidJSON(deserialized)) {
-            return ORPCError.fromJSON(deserialized, { cause: e });
+          if (isORPCErrorJson(deserialized)) {
+            return createORPCErrorFromJson(deserialized, { cause: e });
           }
           return new ErrorEvent({
             data: deserialized,
@@ -330,4 +343,13 @@ class StandardRPCSerializer {
   }
 }
 
-export { InvalidEventIteratorRetryResponse as I, StandardLink as S, STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES as a, StandardRPCJsonSerializer as b, StandardRPCLinkCodec as c, StandardRPCSerializer as d, toHttpPath as t };
+class StandardRPCLink extends StandardLink {
+  constructor(linkClient, options) {
+    const jsonSerializer = new StandardRPCJsonSerializer(options);
+    const serializer = new StandardRPCSerializer(jsonSerializer);
+    const linkCodec = new StandardRPCLinkCodec(serializer, options);
+    super(linkCodec, linkClient, options);
+  }
+}
+
+export { CompositeStandardLinkPlugin as C, StandardLink as S, STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES as a, StandardRPCJsonSerializer as b, StandardRPCLink as c, StandardRPCLinkCodec as d, StandardRPCSerializer as e, getMalformedResponseErrorCode as g, toHttpPath as t };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/client",
   "type": "module",
-  "version": "0.0.0-next.bec9f4e",
+  "version": "0.0.0-next.bf3438f",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -33,18 +33,29 @@
       "types": "./dist/adapters/fetch/index.d.mts",
       "import": "./dist/adapters/fetch/index.mjs",
       "default": "./dist/adapters/fetch/index.mjs"
+    },
+    "./websocket": {
+      "types": "./dist/adapters/websocket/index.d.mts",
+      "import": "./dist/adapters/websocket/index.mjs",
+      "default": "./dist/adapters/websocket/index.mjs"
+    },
+    "./message-port": {
+      "types": "./dist/adapters/message-port/index.d.mts",
+      "import": "./dist/adapters/message-port/index.mjs",
+      "default": "./dist/adapters/message-port/index.mjs"
     }
   },
   "files": [
     "dist"
   ],
   "dependencies": {
-    "@orpc/shared": "0.0.0-next.bec9f4e",
-    "@orpc/standard-server": "0.0.0-next.bec9f4e",
-    "@orpc/standard-server-fetch": "0.0.0-next.bec9f4e"
+    "@orpc/shared": "0.0.0-next.bf3438f",
+    "@orpc/standard-server-fetch": "0.0.0-next.bf3438f",
+    "@orpc/standard-server": "0.0.0-next.bf3438f",
+    "@orpc/standard-server-peer": "0.0.0-next.bf3438f"
   },
   "devDependencies": {
-    "zod": "^3.24.2"
+    "zod": "^3.25.67"
   },
   "scripts": {
     "build": "unbuild",