@orpc/client 1.8.2 → 1.8.3

package/dist/adapters/fetch/index.d.mts

@@ -1,23 +1,36 @@
+import { Interceptor } from '@orpc/shared';
 import { StandardRequest, StandardLazyResponse } from '@orpc/standard-server';
 import { ToFetchRequestOptions } from '@orpc/standard-server-fetch';
 import { b as ClientContext, c as ClientOptions } from '../../shared/client.BOYsZIRq.mjs';
-import { f as StandardLinkClient } from '../../shared/client.Bwgm6dgk.mjs';
+import { a as StandardLinkPlugin, f as StandardLinkClient } from '../../shared/client.Bwgm6dgk.mjs';
 import { f as StandardRPCLinkOptions, g as StandardRPCLink } from '../../shared/client.Ycwr4Tuo.mjs';
-import '@orpc/shared';
 
-interface LinkFetchClientOptions<T extends ClientContext> extends ToFetchRequestOptions {
-    fetch?: (request: Request, init: {
+interface LinkFetchPlugin<T extends ClientContext> extends StandardLinkPlugin<T> {
+    initRuntimeAdapter?(options: LinkFetchClientOptions<T>): void;
+}
+
+interface LinkFetchInterceptorOptions<T extends ClientContext> extends ClientOptions<T> {
+    request: Request;
+    init: {
         redirect?: Request['redirect'];
-    }, options: ClientOptions<T>, path: readonly string[], input: unknown) => Promise<Response>;
+    };
+    path: readonly string[];
+    input: unknown;
+}
+interface LinkFetchClientOptions<T extends ClientContext> extends ToFetchRequestOptions {
+    fetch?: (request: Request, init: LinkFetchInterceptorOptions<T>['init'], options: ClientOptions<T>, path: readonly string[], input: unknown) => Promise<Response>;
+    adapterInterceptors?: Interceptor<LinkFetchInterceptorOptions<T>, Promise<Response>>[];
+    plugins?: LinkFetchPlugin<T>[];
 }
 declare class LinkFetchClient<T extends ClientContext> implements StandardLinkClient<T> {
     private readonly fetch;
     private readonly toFetchRequestOptions;
+    private readonly adapterInterceptors;
     constructor(options: LinkFetchClientOptions<T>);
-    call(request: StandardRequest, options: ClientOptions<T>, path: readonly string[], input: unknown): Promise<StandardLazyResponse>;
+    call(standardRequest: StandardRequest, options: ClientOptions<T>, path: readonly string[], input: unknown): Promise<StandardLazyResponse>;
 }
 
-interface RPCLinkOptions<T extends ClientContext> extends StandardRPCLinkOptions<T>, LinkFetchClientOptions<T> {
+interface RPCLinkOptions<T extends ClientContext> extends LinkFetchClientOptions<T>, Omit<StandardRPCLinkOptions<T>, 'plugins'> {
 }
 /**
  * The RPC Link communicates with the server using the RPC protocol.
@@ -30,4 +43,4 @@ declare class RPCLink<T extends ClientContext> extends StandardRPCLink<T> {
 }
 
 export { LinkFetchClient, RPCLink };
-export type { LinkFetchClientOptions, RPCLinkOptions };
+export type { LinkFetchClientOptions, LinkFetchInterceptorOptions, RPCLinkOptions };

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

@@ -1,23 +1,36 @@
+import { Interceptor } from '@orpc/shared';
 import { StandardRequest, StandardLazyResponse } from '@orpc/standard-server';
 import { ToFetchRequestOptions } from '@orpc/standard-server-fetch';
 import { b as ClientContext, c as ClientOptions } from '../../shared/client.BOYsZIRq.js';
-import { f as StandardLinkClient } from '../../shared/client.BG98rYdO.js';
+import { a as StandardLinkPlugin, f as StandardLinkClient } from '../../shared/client.BG98rYdO.js';
 import { f as StandardRPCLinkOptions, g as StandardRPCLink } from '../../shared/client.C176log5.js';
-import '@orpc/shared';
 
-interface LinkFetchClientOptions<T extends ClientContext> extends ToFetchRequestOptions {
-    fetch?: (request: Request, init: {
+interface LinkFetchPlugin<T extends ClientContext> extends StandardLinkPlugin<T> {
+    initRuntimeAdapter?(options: LinkFetchClientOptions<T>): void;
+}
+
+interface LinkFetchInterceptorOptions<T extends ClientContext> extends ClientOptions<T> {
+    request: Request;
+    init: {
         redirect?: Request['redirect'];
-    }, options: ClientOptions<T>, path: readonly string[], input: unknown) => Promise<Response>;
+    };
+    path: readonly string[];
+    input: unknown;
+}
+interface LinkFetchClientOptions<T extends ClientContext> extends ToFetchRequestOptions {
+    fetch?: (request: Request, init: LinkFetchInterceptorOptions<T>['init'], options: ClientOptions<T>, path: readonly string[], input: unknown) => Promise<Response>;
+    adapterInterceptors?: Interceptor<LinkFetchInterceptorOptions<T>, Promise<Response>>[];
+    plugins?: LinkFetchPlugin<T>[];
 }
 declare class LinkFetchClient<T extends ClientContext> implements StandardLinkClient<T> {
     private readonly fetch;
     private readonly toFetchRequestOptions;
+    private readonly adapterInterceptors;
     constructor(options: LinkFetchClientOptions<T>);
-    call(request: StandardRequest, options: ClientOptions<T>, path: readonly string[], input: unknown): Promise<StandardLazyResponse>;
+    call(standardRequest: StandardRequest, options: ClientOptions<T>, path: readonly string[], input: unknown): Promise<StandardLazyResponse>;
 }
 
-interface RPCLinkOptions<T extends ClientContext> extends StandardRPCLinkOptions<T>, LinkFetchClientOptions<T> {
+interface RPCLinkOptions<T extends ClientContext> extends LinkFetchClientOptions<T>, Omit<StandardRPCLinkOptions<T>, 'plugins'> {
 }
 /**
  * The RPC Link communicates with the server using the RPC protocol.
@@ -30,4 +43,4 @@ declare class RPCLink<T extends ClientContext> extends StandardRPCLink<T> {
 }
 
 export { LinkFetchClient, RPCLink };
-export type { LinkFetchClientOptions, RPCLinkOptions };
+export type { LinkFetchClientOptions, LinkFetchInterceptorOptions, RPCLinkOptions };

package/dist/adapters/fetch/index.mjs

@@ -1,20 +1,36 @@
+import { toArray, intercept } from '@orpc/shared';
 import { toFetchRequest, toStandardLazyResponse } from '@orpc/standard-server-fetch';
-import '@orpc/shared';
-import { c as StandardRPCLink } from '../../shared/client.DKmRtVO2.mjs';
+import { C as CompositeStandardLinkPlugin, c as StandardRPCLink } from '../../shared/client.DKmRtVO2.mjs';
 import '@orpc/standard-server';
 import '../../shared/client.txdq_i5V.mjs';
 
+class CompositeLinkFetchPlugin extends CompositeStandardLinkPlugin {
+  initRuntimeAdapter(options) {
+    for (const plugin of this.plugins) {
+      plugin.initRuntimeAdapter?.(options);
+    }
+  }
+}
+
 class LinkFetchClient {
   fetch;
   toFetchRequestOptions;
+  adapterInterceptors;
   constructor(options) {
-    this.fetch = options?.fetch ?? globalThis.fetch.bind(globalThis);
+    const plugin = new CompositeLinkFetchPlugin(options.plugins);
+    plugin.initRuntimeAdapter(options);
+    this.fetch = options.fetch ?? globalThis.fetch.bind(globalThis);
     this.toFetchRequestOptions = options;
+    this.adapterInterceptors = toArray(options.adapterInterceptors);
   }
-  async call(request, options, path, input) {
-    const fetchRequest = toFetchRequest(request, this.toFetchRequestOptions);
-    const fetchResponse = await this.fetch(fetchRequest, { redirect: "manual" }, options, path, input);
-    const lazyResponse = toStandardLazyResponse(fetchResponse, { signal: fetchRequest.signal });
+  async call(standardRequest, options, path, input) {
+    const request = toFetchRequest(standardRequest, this.toFetchRequestOptions);
+    const fetchResponse = await intercept(
+      this.adapterInterceptors,
+      { ...options, request, path, input, init: { redirect: "manual" } },
+      ({ request: request2, path: path2, input: input2, init, ...options2 }) => this.fetch(request2, init, options2, path2, input2)
+    );
+    const lazyResponse = toStandardLazyResponse(fetchResponse, { signal: request.signal });
     return lazyResponse;
   }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/client",
   "type": "module",
-  "version": "1.8.2",
+  "version": "1.8.3",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -49,10 +49,10 @@
     "dist"
   ],
   "dependencies": {
-    "@orpc/shared": "1.8.2",
-    "@orpc/standard-server-fetch": "1.8.2",
-    "@orpc/standard-server": "1.8.2",
-    "@orpc/standard-server-peer": "1.8.2"
+    "@orpc/standard-server": "1.8.3",
+    "@orpc/shared": "1.8.3",
+    "@orpc/standard-server-fetch": "1.8.3",
+    "@orpc/standard-server-peer": "1.8.3"
   },
   "devDependencies": {
     "zod": "^4.0.17"