@orpc/client 0.0.0-next.31590a1 → 0.0.0-next.32cb70c

package/dist/fetch.js

@@ -1,12 +1,10 @@
 // src/adapters/fetch/orpc-link.ts
 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";
+import { ORPCPayloadCodec } from "@orpc/server/fetch";
+import { ORPC_HANDLER_HEADER, ORPC_HANDLER_VALUE, trim } from "@orpc/shared";
 var RPCLink = class {
   fetch;
-  rpcSerializer;
+  payloadCodec;
   maxURLLength;
   fallbackMethod;
   getMethod;
@@ -14,7 +12,7 @@ var RPCLink = class {
   url;
   constructor(options) {
     this.fetch = options.fetch ?? globalThis.fetch.bind(globalThis);
-    this.rpcSerializer = options.rpcSerializer ?? new RPCSerializer();
+    this.payloadCodec = options.payloadCodec ?? new ORPCPayloadCodec();
     this.maxURLLength = options.maxURLLength ?? 2083;
     this.fallbackMethod = options.fallbackMethod ?? "POST";
     this.url = options.url;
@@ -28,73 +26,59 @@ var RPCLink = class {
   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", cd(encoded.body instanceof File ? encoded.body.name : "blob"));
-    }
     const response = await this.fetch(encoded.url, {
       method: encoded.method,
       headers: encoded.headers,
       body: encoded.body,
       signal: options.signal
     }, clientContext);
-    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
-        });
+    const decoded = await this.payloadCodec.decode(response);
+    if (!response.ok) {
+      if (ORPCError.isValidJSON(decoded)) {
+        throw ORPCError.fromJSON(decoded);
       }
-    })();
-    if (response.ok) {
-      return deserialized;
+      throw new ORPCError("INTERNAL_SERVER_ERROR", {
+        status: response.status,
+        message: "Internal server error",
+        cause: decoded
+      });
     }
-    throw ORPCError.fromJSON(deserialized);
+    return decoded;
   }
   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 methods = /* @__PURE__ */ new Set([expectMethod, this.fallbackMethod]);
+    const baseHeaders = await this.getHeaders(path, input, clientContext);
+    const baseUrl = new URL(`${trim(this.url, "/")}/${path.map(encodeURIComponent).join("/")}`);
+    baseHeaders.append(ORPC_HANDLER_HEADER, ORPC_HANDLER_VALUE);
+    for (const method of methods) {
+      const url = new URL(baseUrl);
+      const headers = new Headers(baseHeaders);
+      const encoded = this.payloadCodec.encode(input, method, this.fallbackMethod);
+      if (encoded.query) {
+        for (const [key, value] of encoded.query.entries()) {
+          url.searchParams.append(key, value);
+        }
       }
-    }
-    const method = expectMethod === "GET" ? this.fallbackMethod : expectMethod;
-    if (isPlainObject(serialized)) {
-      if (!headers.has("content-type")) {
-        headers.set("content-type", "application/json");
+      if (url.toString().length > this.maxURLLength) {
+        continue;
+      }
+      if (encoded.headers) {
+        for (const [key, value] of encoded.headers.entries()) {
+          headers.append(key, value);
+        }
       }
       return {
-        body: JSON.stringify(serialized),
-        method,
+        url,
         headers,
-        url
+        method: encoded.method,
+        body: encoded.body
       };
     }
-    return {
-      body: serialized,
-      method,
-      headers,
-      url
-    };
+    throw new ORPCError("BAD_REQUEST", {
+      message: "Cannot encode the request, please check the url length or payload."
+    });
   }
 };
 export {

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

@@ -2,7 +2,7 @@ import type { ClientOptions, HTTPMethod } from '@orpc/contract';
 import type { Promisable } from '@orpc/shared';
 import type { ClientLink } from '../../types';
 import type { FetchWithContext } from './types';
-import { RPCSerializer } from '@orpc/server/standard';
+import { type PublicORPCPayloadCodec } from '@orpc/server/fetch';
 export interface RPCLinkOptions<TClientContext> {
     /**
      * Base url for all requests.
@@ -22,18 +22,18 @@ export interface RPCLinkOptions<TClientContext> {
     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.
+     * Do not use GET as fallback method, it's very dangerous.
      *
      * @default 'POST'
      */
-    fallbackMethod?: Exclude<HTTPMethod, 'GET'>;
+    fallbackMethod?: HTTPMethod;
     headers?(path: readonly string[], input: unknown, context: TClientContext): Promisable<Headers | Record<string, string>>;
     fetch?: FetchWithContext<TClientContext>;
-    rpcSerializer?: RPCSerializer;
+    payloadCodec?: PublicORPCPayloadCodec;
 }
 export declare class RPCLink<TClientContext> implements ClientLink<TClientContext> {
     private readonly fetch;
-    private readonly rpcSerializer;
+    private readonly payloadCodec;
     private readonly maxURLLength;
     private readonly fallbackMethod;
     private readonly getMethod;

package/dist/src/client.d.ts

@@ -1,4 +1,4 @@
-import type { AnyContractRouter, ContractRouterClient } from '@orpc/contract';
+import type { ContractRouter, 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 AnyRouter | AnyContractRouter, TClientContext = unknown>(link: ClientLink<TClientContext>, options?: createORPCClientOptions): TRouter extends AnyRouter ? RouterClient<TRouter, TClientContext> : TRouter extends AnyContractRouter ? ContractRouterClient<TRouter, TClientContext> : never;
+export declare function createORPCClient<TRouter extends AnyRouter | ContractRouter<any>, TClientContext = unknown>(link: ClientLink<TClientContext>, options?: createORPCClientOptions): TRouter extends ContractRouter<any> ? ContractRouterClient<TRouter, TClientContext> : TRouter extends AnyRouter ? RouterClient<TRouter, TClientContext> : never;
 //# sourceMappingURL=client.d.ts.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/client",
   "type": "module",
-  "version": "0.0.0-next.31590a1",
+  "version": "0.0.0-next.32cb70c",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -34,14 +34,13 @@
     "dist"
   ],
   "dependencies": {
-    "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"
+    "@orpc/contract": "0.0.0-next.32cb70c",
+    "@orpc/server": "0.0.0-next.32cb70c",
+    "@orpc/shared": "0.0.0-next.32cb70c"
   },
   "devDependencies": {
     "zod": "^3.24.1",
-    "@orpc/openapi": "0.0.0-next.31590a1"
+    "@orpc/openapi": "0.0.0-next.32cb70c"
   },
   "scripts": {
     "build": "tsup --clean --sourcemap --entry.index=src/index.ts --entry.fetch=src/adapters/fetch/index.ts --format=esm --onSuccess='tsc -b --noCheck'",