@orpc/client 0.0.0-next.2ba0691 → 0.0.0-next.31590a1

package/dist/fetch.js

@@ -1,52 +1,103 @@
 // src/adapters/fetch/orpc-link.ts
-import { ORPCPayloadCodec } from "@orpc/server/fetch";
-import { ORPC_HANDLER_HEADER, ORPC_HANDLER_VALUE, trim } from "@orpc/shared";
-import { ORPCError } from "@orpc/shared/error";
-var ORPCLink = class {
+import { ORPCError } from "@orpc/contract";
+import { fetchReToStandardBody } from "@orpc/server/fetch";
+import { RPCSerializer } from "@orpc/server/standard";
+import { isPlainObject, trim } from "@orpc/shared";
+import cd from "content-disposition";
+var RPCLink = class {
+  fetch;
+  rpcSerializer;
+  maxURLLength;
+  fallbackMethod;
+  getMethod;
+  getHeaders;
+  url;
   constructor(options) {
-    this.options = options;
     this.fetch = options.fetch ?? globalThis.fetch.bind(globalThis);
-    this.payloadCodec = options.payloadCodec ?? new ORPCPayloadCodec();
+    this.rpcSerializer = options.rpcSerializer ?? new RPCSerializer();
+    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));
+    };
   }
-  fetch;
-  payloadCodec;
   async call(path, input, options) {
     const clientContext = options.context;
-    const url = new URL(`${trim(this.options.url, "/")}/${path.map(encodeURIComponent).join("/")}`);
-    const method = await this.options.method?.(path, input, clientContext) ?? "POST";
-    const encoded = this.payloadCodec.encode(input, method);
-    if (encoded.query) {
-      for (const [key, value] of encoded.query.entries()) {
-        url.searchParams.append(key, value);
-      }
-    }
-    const headers = new Headers(encoded.headers);
-    headers.append(ORPC_HANDLER_HEADER, ORPC_HANDLER_VALUE);
-    let customHeaders = await this.options.headers?.(path, input, clientContext);
-    customHeaders = customHeaders instanceof Headers ? customHeaders : new Headers(customHeaders);
-    for (const [key, value] of customHeaders.entries()) {
-      headers.append(key, value);
+    const encoded = await this.encode(path, input, options);
+    if (encoded.body instanceof Blob && !encoded.headers.has("content-disposition")) {
+      encoded.headers.set("content-disposition", cd(encoded.body instanceof File ? encoded.body.name : "blob"));
     }
-    const response = await this.fetch(url, {
-      method,
-      headers,
+    const response = await this.fetch(encoded.url, {
+      method: encoded.method,
+      headers: encoded.headers,
       body: encoded.body,
       signal: options.signal
     }, clientContext);
-    const decoded = await this.payloadCodec.decode(response);
-    if (!response.ok) {
-      const error = ORPCError.fromJSON(decoded) ?? new ORPCError({
-        status: response.status,
-        code: "INTERNAL_SERVER_ERROR",
-        message: "Internal server error",
-        cause: decoded
-      });
-      throw error;
+    const body = await fetchReToStandardBody(response);
+    const deserialized = (() => {
+      try {
+        return this.rpcSerializer.deserialize(body);
+      } catch (error) {
+        if (response.ok) {
+          throw new ORPCError("INTERNAL_SERVER_ERROR", {
+            message: "Invalid RPC response",
+            cause: error
+          });
+        }
+        throw new ORPCError(response.status.toString(), {
+          message: response.statusText
+        });
+      }
+    })();
+    if (response.ok) {
+      return deserialized;
     }
-    return decoded;
+    throw ORPCError.fromJSON(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);
+    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" && isPlainObject(serialized)) {
+      const tryURL = new URL(url);
+      tryURL.searchParams.append("data", JSON.stringify(serialized));
+      if (tryURL.toString().length <= this.maxURLLength) {
+        return {
+          body: void 0,
+          method: expectMethod,
+          headers,
+          url: tryURL
+        };
+      }
+    }
+    const method = expectMethod === "GET" ? this.fallbackMethod : expectMethod;
+    if (isPlainObject(serialized)) {
+      if (!headers.has("content-type")) {
+        headers.set("content-type", "application/json");
+      }
+      return {
+        body: JSON.stringify(serialized),
+        method,
+        headers,
+        url
+      };
+    }
+    return {
+      body: serialized,
+      method,
+      headers,
+      url
+    };
   }
 };
 export {
-  ORPCLink
+  RPCLink
 };
 //# sourceMappingURL=fetch.js.map

package/dist/index.js

@@ -31,9 +31,12 @@ var DynamicLink = class {
 };
 
 // src/index.ts
-export * from "@orpc/shared/error";
+import { isDefinedError, ORPCError, safe } from "@orpc/contract";
 export {
   DynamicLink,
-  createORPCClient
+  ORPCError,
+  createORPCClient,
+  isDefinedError,
+  safe
 };
 //# sourceMappingURL=index.js.map

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

@@ -1,21 +1,46 @@
-import type { HTTPMethod } from '@orpc/contract';
-import type { ProcedureClientOptions } from '@orpc/server';
+import type { ClientOptions, HTTPMethod } from '@orpc/contract';
 import type { Promisable } from '@orpc/shared';
 import type { ClientLink } from '../../types';
 import type { FetchWithContext } from './types';
-import { type PublicORPCPayloadCodec } from '@orpc/server/fetch';
-export interface ORPCLinkOptions<TClientContext> {
+import { RPCSerializer } from '@orpc/server/standard';
+export interface RPCLinkOptions<TClientContext> {
+    /**
+     * Base url for all requests.
+     */
     url: string;
-    method?: (path: readonly string[], input: unknown, context: TClientContext) => Promisable<HTTPMethod | undefined>;
-    headers?: (path: readonly string[], input: unknown, context: TClientContext) => Promisable<Headers | Record<string, string>>;
+    /**
+     * The maximum length of the URL.
+     *
+     * @default 2083
+     */
+    maxURLLength?: number;
+    /**
+     * The method used to make the request.
+     *
+     * @default 'POST'
+     */
+    method?(path: readonly string[], input: unknown, context: TClientContext): Promisable<HTTPMethod | undefined>;
+    /**
+     * 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'>;
+    headers?(path: readonly string[], input: unknown, context: TClientContext): Promisable<Headers | Record<string, string>>;
     fetch?: FetchWithContext<TClientContext>;
-    payloadCodec?: PublicORPCPayloadCodec;
+    rpcSerializer?: RPCSerializer;
 }
-export declare class ORPCLink<TClientContext> implements ClientLink<TClientContext> {
-    private readonly options;
+export declare class RPCLink<TClientContext> implements ClientLink<TClientContext> {
     private readonly fetch;
-    private readonly payloadCodec;
-    constructor(options: ORPCLinkOptions<TClientContext>);
-    call(path: readonly string[], input: unknown, options: ProcedureClientOptions<TClientContext>): Promise<unknown>;
+    private readonly rpcSerializer;
+    private readonly maxURLLength;
+    private readonly fallbackMethod;
+    private readonly getMethod;
+    private readonly getHeaders;
+    private readonly url;
+    constructor(options: RPCLinkOptions<TClientContext>);
+    call(path: readonly string[], input: unknown, options: ClientOptions<TClientContext>): Promise<unknown>;
+    private encode;
 }
 //# sourceMappingURL=orpc-link.d.ts.map

package/dist/src/client.d.ts

@@ -1,5 +1,5 @@
-import type { ContractRouter } from '@orpc/contract';
-import type { ANY_ROUTER, RouterClient } from '@orpc/server';
+import type { AnyContractRouter, ContractRouterClient } from '@orpc/contract';
+import type { AnyRouter, RouterClient } from '@orpc/server';
 import type { ClientLink } from './types';
 export interface createORPCClientOptions {
     /**
@@ -7,5 +7,5 @@ export interface createORPCClientOptions {
      */
     path?: string[];
 }
-export declare function createORPCClient<TRouter extends ANY_ROUTER | ContractRouter, TClientContext = unknown>(link: ClientLink<TClientContext>, options?: createORPCClientOptions): RouterClient<TRouter, TClientContext>;
+export declare function createORPCClient<TRouter extends AnyRouter | AnyContractRouter, TClientContext = unknown>(link: ClientLink<TClientContext>, options?: createORPCClientOptions): TRouter extends AnyRouter ? RouterClient<TRouter, TClientContext> : TRouter extends AnyContractRouter ? ContractRouterClient<TRouter, TClientContext> : never;
 //# sourceMappingURL=client.d.ts.map

package/dist/src/dynamic-link.d.ts

@@ -1,4 +1,4 @@
-import type { ProcedureClientOptions } from '@orpc/server';
+import type { ClientOptions } from '@orpc/contract';
 import type { Promisable } from '@orpc/shared';
 import type { ClientLink } from './types';
 /**
@@ -8,6 +8,6 @@ import type { ClientLink } from './types';
 export declare class DynamicLink<TClientContext> implements ClientLink<TClientContext> {
     private readonly linkResolver;
     constructor(linkResolver: (path: readonly string[], input: unknown, context: TClientContext) => Promisable<ClientLink<TClientContext>>);
-    call(path: readonly string[], input: unknown, options: ProcedureClientOptions<TClientContext>): Promise<unknown>;
+    call(path: readonly string[], input: unknown, options: ClientOptions<TClientContext>): Promise<unknown>;
 }
 //# sourceMappingURL=dynamic-link.d.ts.map

package/dist/src/index.d.ts

@@ -2,5 +2,5 @@
 export * from './client';
 export * from './dynamic-link';
 export * from './types';
-export * from '@orpc/shared/error';
+export { isDefinedError, ORPCError, safe } from '@orpc/contract';
 //# sourceMappingURL=index.d.ts.map

package/dist/src/types.d.ts

@@ -1,5 +1,5 @@
-import type { ProcedureClientOptions } from '@orpc/server';
+import type { ClientOptions } from '@orpc/contract';
 export interface ClientLink<TClientContext> {
-    call: (path: readonly string[], input: unknown, options: ProcedureClientOptions<TClientContext>) => Promise<unknown>;
+    call(path: readonly string[], input: unknown, options: ClientOptions<TClientContext>): Promise<unknown>;
 }
 //# sourceMappingURL=types.d.ts.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/client",
   "type": "module",
-  "version": "0.0.0-next.2ba0691",
+  "version": "0.0.0-next.31590a1",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -33,16 +33,15 @@
     "!**/*.tsbuildinfo",
     "dist"
   ],
-  "peerDependencies": {
-    "@orpc/contract": "0.0.0-next.2ba0691"
-  },
   "dependencies": {
-    "@orpc/server": "0.0.0-next.2ba0691",
-    "@orpc/shared": "0.0.0-next.2ba0691"
+    "content-disposition": "^0.5.4",
+    "@orpc/server": "0.0.0-next.31590a1",
+    "@orpc/contract": "0.0.0-next.31590a1",
+    "@orpc/shared": "0.0.0-next.31590a1"
   },
   "devDependencies": {
     "zod": "^3.24.1",
-    "@orpc/openapi": "0.0.0-next.2ba0691"
+    "@orpc/openapi": "0.0.0-next.31590a1"
   },
   "scripts": {
     "build": "tsup --clean --sourcemap --entry.index=src/index.ts --entry.fetch=src/adapters/fetch/index.ts --format=esm --onSuccess='tsc -b --noCheck'",