@orpc/client 0.0.0-next.ee46dab → 0.0.0-next.ee89076

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (28) hide show
  1. package/README.md +19 -22
  2. package/dist/adapters/fetch/index.d.mts +31 -11
  3. package/dist/adapters/fetch/index.d.ts +31 -11
  4. package/dist/adapters/fetch/index.mjs +26 -13
  5. package/dist/adapters/message-port/index.d.mts +59 -0
  6. package/dist/adapters/message-port/index.d.ts +59 -0
  7. package/dist/adapters/message-port/index.mjs +72 -0
  8. package/dist/adapters/standard/index.d.mts +6 -5
  9. package/dist/adapters/standard/index.d.ts +6 -5
  10. package/dist/adapters/standard/index.mjs +3 -2
  11. package/dist/adapters/websocket/index.d.mts +29 -0
  12. package/dist/adapters/websocket/index.d.ts +29 -0
  13. package/dist/adapters/websocket/index.mjs +46 -0
  14. package/dist/index.d.mts +53 -23
  15. package/dist/index.d.ts +53 -23
  16. package/dist/index.mjs +25 -8
  17. package/dist/plugins/index.d.mts +162 -25
  18. package/dist/plugins/index.d.ts +162 -25
  19. package/dist/plugins/index.mjs +331 -56
  20. package/dist/shared/{client.5813Ufvs.d.mts → client.BG98rYdO.d.ts} +21 -15
  21. package/dist/shared/{client.C0lT7w02.d.mts → client.BOYsZIRq.d.mts} +8 -9
  22. package/dist/shared/{client.C0lT7w02.d.ts → client.BOYsZIRq.d.ts} +8 -9
  23. package/dist/shared/{client.DSPm2IGZ.mjs → client.Bp1jlnBk.mjs} +89 -29
  24. package/dist/shared/{client.grRbC25r.d.ts → client.Bwgm6dgk.d.mts} +21 -15
  25. package/dist/shared/{client.D-jrSuDb.d.ts → client.CVVVqf1Y.d.ts} +13 -25
  26. package/dist/shared/{client.Bt94sjrK.d.mts → client._Y_enhib.d.mts} +13 -25
  27. package/dist/shared/{client.jKEwIsRd.mjs → client.txdq_i5V.mjs} +54 -49
  28. package/package.json +16 -5
@@ -1,11 +1,119 @@
1
- import { Value } from '@orpc/shared';
2
- import { S as StandardLinkPlugin, a as StandardLinkOptions } from '../shared/client.grRbC25r.js';
3
- import { b as ClientOptions } from '../shared/client.C0lT7w02.js';
4
- import '@orpc/standard-server';
1
+ import { Value, Promisable } from '@orpc/shared';
2
+ import { StandardHeaders, StandardRequest } from '@orpc/standard-server';
3
+ import { BatchResponseMode } from '@orpc/standard-server/batch';
4
+ import { S as StandardLinkClientInterceptorOptions, a as StandardLinkPlugin, b as StandardLinkOptions, c as StandardLinkInterceptorOptions } from '../shared/client.BG98rYdO.js';
5
+ import { b as ClientContext } from '../shared/client.BOYsZIRq.js';
5
6
 
6
- interface ClientRetryPluginAttemptOptions {
7
+ interface BatchLinkPluginGroup<T extends ClientContext> {
8
+ condition(options: StandardLinkClientInterceptorOptions<T>): boolean;
9
+ context: T;
10
+ path?: readonly string[];
11
+ input?: unknown;
12
+ }
13
+ interface BatchLinkPluginOptions<T extends ClientContext> {
14
+ groups: readonly [BatchLinkPluginGroup<T>, ...BatchLinkPluginGroup<T>[]];
15
+ /**
16
+ * The maximum number of requests in the batch.
17
+ *
18
+ * @default 10
19
+ */
20
+ maxSize?: Value<Promisable<number>, [readonly [StandardLinkClientInterceptorOptions<T>, ...StandardLinkClientInterceptorOptions<T>[]]]>;
21
+ /**
22
+ * The batch response mode.
23
+ *
24
+ * @default 'streaming'
25
+ */
26
+ mode?: Value<BatchResponseMode, [readonly [StandardLinkClientInterceptorOptions<T>, ...StandardLinkClientInterceptorOptions<T>[]]]>;
27
+ /**
28
+ * Defines the URL to use for the batch request.
29
+ *
30
+ * @default the URL of the first request in the batch + '/__batch__'
31
+ */
32
+ url?: Value<Promisable<string | URL>, [readonly [StandardLinkClientInterceptorOptions<T>, ...StandardLinkClientInterceptorOptions<T>[]]]>;
33
+ /**
34
+ * The maximum length of the URL.
35
+ *
36
+ * @default 2083
37
+ */
38
+ maxUrlLength?: Value<Promisable<number>, [readonly [StandardLinkClientInterceptorOptions<T>, ...StandardLinkClientInterceptorOptions<T>[]]]>;
39
+ /**
40
+ * Defines the HTTP headers to use for the batch request.
41
+ *
42
+ * @default The same headers of all requests in the batch
43
+ */
44
+ headers?: Value<Promisable<StandardHeaders>, [readonly [StandardLinkClientInterceptorOptions<T>, ...StandardLinkClientInterceptorOptions<T>[]]]>;
45
+ /**
46
+ * Map the batch request items before sending them.
47
+ *
48
+ * @default Removes headers that are duplicated in the batch headers.
49
+ */
50
+ mapRequestItem?: (options: StandardLinkClientInterceptorOptions<T> & {
51
+ batchUrl: URL;
52
+ batchHeaders: StandardHeaders;
53
+ }) => StandardRequest;
54
+ /**
55
+ * Exclude a request from the batch.
56
+ *
57
+ * @default () => false
58
+ */
59
+ exclude?: (options: StandardLinkClientInterceptorOptions<T>) => boolean;
60
+ }
61
+ /**
62
+ * The Batch Requests Plugin allows you to combine multiple requests and responses into a single batch,
63
+ * reducing the overhead of sending each one separately.
64
+ *
65
+ * @see {@link https://orpc.unnoq.com/docs/plugins/batch-requests Batch Requests Plugin Docs}
66
+ */
67
+ declare class BatchLinkPlugin<T extends ClientContext> implements StandardLinkPlugin<T> {
68
+ #private;
69
+ private readonly groups;
70
+ private readonly maxSize;
71
+ private readonly batchUrl;
72
+ private readonly maxUrlLength;
73
+ private readonly batchHeaders;
74
+ private readonly mapRequestItem;
75
+ private readonly exclude;
76
+ private readonly mode;
77
+ private pending;
78
+ order: number;
79
+ constructor(options: NoInfer<BatchLinkPluginOptions<T>>);
80
+ init(options: StandardLinkOptions<T>): void;
81
+ }
82
+
83
+ interface DedupeRequestsPluginGroup<T extends ClientContext> {
84
+ condition(options: StandardLinkClientInterceptorOptions<T>): boolean;
85
+ /**
86
+ * The context used for the rest of the request lifecycle.
87
+ */
88
+ context: T;
89
+ }
90
+ interface DedupeRequestsPluginOptions<T extends ClientContext> {
91
+ /**
92
+ * To enable deduplication, a request must match at least one defined group.
93
+ * Requests that fall into the same group are considered for deduplication together.
94
+ */
95
+ groups: readonly [DedupeRequestsPluginGroup<T>, ...DedupeRequestsPluginGroup<T>[]];
96
+ /**
97
+ * Filters requests to dedupe
98
+ *
99
+ * @default (({ request }) => request.method === 'GET')
100
+ */
101
+ filter?: (options: StandardLinkClientInterceptorOptions<T>) => boolean;
102
+ }
103
+ /**
104
+ * Prevents duplicate requests by deduplicating similar ones to reduce server load.
105
+ *
106
+ * @see {@link https://orpc.unnoq.com/docs/plugins/dedupe-requests Dedupe Requests Plugin}
107
+ */
108
+ declare class DedupeRequestsPlugin<T extends ClientContext> implements StandardLinkPlugin<T> {
109
+ #private;
110
+ order: number;
111
+ constructor(options: NoInfer<DedupeRequestsPluginOptions<T>>);
112
+ init(options: StandardLinkOptions<T>): void;
113
+ }
114
+
115
+ interface ClientRetryPluginAttemptOptions<T extends ClientContext> extends StandardLinkInterceptorOptions<T> {
7
116
  lastEventRetry: number | undefined;
8
- lastEventId: string | undefined;
9
117
  attemptIndex: number;
10
118
  error: unknown;
11
119
  }
@@ -16,43 +124,34 @@ interface ClientRetryPluginContext {
16
124
  *
17
125
  * @default 0
18
126
  */
19
- retry?: Value<number, [
20
- clientOptions: ClientOptions<ClientRetryPluginContext>,
21
- path: readonly string[],
22
- input: unknown
23
- ]>;
127
+ retry?: Value<Promisable<number>, [StandardLinkInterceptorOptions<ClientRetryPluginContext>]>;
24
128
  /**
25
129
  * Delay (in ms) before retrying.
26
130
  *
27
131
  * @default (o) => o.lastEventRetry ?? 2000
28
132
  */
29
- retryDelay?: Value<number, [
30
- attemptOptions: ClientRetryPluginAttemptOptions,
31
- clientOptions: ClientOptions<ClientRetryPluginContext>,
32
- path: readonly string[],
33
- input: unknown
34
- ]>;
133
+ retryDelay?: Value<Promisable<number>, [ClientRetryPluginAttemptOptions<ClientRetryPluginContext>]>;
35
134
  /**
36
135
  * Determine should retry or not.
37
136
  *
38
137
  * @default true
39
138
  */
40
- shouldRetry?: Value<boolean, [
41
- attemptOptions: ClientRetryPluginAttemptOptions,
42
- clientOptions: ClientOptions<ClientRetryPluginContext>,
43
- path: readonly string[],
44
- input: unknown
45
- ]>;
139
+ shouldRetry?: Value<Promisable<boolean>, [ClientRetryPluginAttemptOptions<ClientRetryPluginContext>]>;
46
140
  /**
47
141
  * The hook called when retrying, and return the unsubscribe function.
48
142
  */
49
- onRetry?: (options: ClientRetryPluginAttemptOptions, clientOptions: ClientOptions<ClientRetryPluginContext>, path: readonly string[], input: unknown) => void | (() => void);
143
+ onRetry?: (options: ClientRetryPluginAttemptOptions<ClientRetryPluginContext>) => void | ((isSuccess: boolean) => void);
50
144
  }
51
145
  declare class ClientRetryPluginInvalidEventIteratorRetryResponse extends Error {
52
146
  }
53
147
  interface ClientRetryPluginOptions {
54
148
  default?: ClientRetryPluginContext;
55
149
  }
150
+ /**
151
+ * The Client Retry Plugin enables retrying client calls when errors occur.
152
+ *
153
+ * @see {@link https://orpc.unnoq.com/docs/plugins/client-retry Client Retry Plugin Docs}
154
+ */
56
155
  declare class ClientRetryPlugin<T extends ClientRetryPluginContext> implements StandardLinkPlugin<T> {
57
156
  private readonly defaultRetry;
58
157
  private readonly defaultRetryDelay;
@@ -62,4 +161,42 @@ declare class ClientRetryPlugin<T extends ClientRetryPluginContext> implements S
62
161
  init(options: StandardLinkOptions<T>): void;
63
162
  }
64
163
 
65
- export { ClientRetryPlugin, type ClientRetryPluginAttemptOptions, type ClientRetryPluginContext, ClientRetryPluginInvalidEventIteratorRetryResponse, type ClientRetryPluginOptions };
164
+ interface SimpleCsrfProtectionLinkPluginOptions<T extends ClientContext> {
165
+ /**
166
+ * The name of the header to check.
167
+ *
168
+ * @default 'x-csrf-token'
169
+ */
170
+ headerName?: Value<Promisable<string>, [options: StandardLinkClientInterceptorOptions<T>]>;
171
+ /**
172
+ * The value of the header to check.
173
+ *
174
+ * @default 'orpc'
175
+ *
176
+ */
177
+ headerValue?: Value<Promisable<string>, [options: StandardLinkClientInterceptorOptions<T>]>;
178
+ /**
179
+ * Exclude a procedure from the plugin.
180
+ *
181
+ * @default false
182
+ */
183
+ exclude?: Value<Promisable<boolean>, [options: StandardLinkClientInterceptorOptions<T>]>;
184
+ }
185
+ /**
186
+ * This plugin adds basic Cross-Site Request Forgery (CSRF) protection to your oRPC application.
187
+ * It helps ensure that requests to your procedures originate from JavaScript code,
188
+ * not from other sources like standard HTML forms or direct browser navigation.
189
+ *
190
+ * @see {@link https://orpc.unnoq.com/docs/plugins/simple-csrf-protection Simple CSRF Protection Plugin Docs}
191
+ */
192
+ declare class SimpleCsrfProtectionLinkPlugin<T extends ClientContext> implements StandardLinkPlugin<T> {
193
+ private readonly headerName;
194
+ private readonly headerValue;
195
+ private readonly exclude;
196
+ constructor(options?: SimpleCsrfProtectionLinkPluginOptions<T>);
197
+ order: number;
198
+ init(options: StandardLinkOptions<T>): void;
199
+ }
200
+
201
+ export { BatchLinkPlugin, ClientRetryPlugin, ClientRetryPluginInvalidEventIteratorRetryResponse, DedupeRequestsPlugin, SimpleCsrfProtectionLinkPlugin };
202
+ export type { BatchLinkPluginGroup, BatchLinkPluginOptions, ClientRetryPluginAttemptOptions, ClientRetryPluginContext, ClientRetryPluginOptions, DedupeRequestsPluginGroup, DedupeRequestsPluginOptions, SimpleCsrfProtectionLinkPluginOptions };
@@ -1,5 +1,260 @@
1
- import { value, isAsyncIteratorObject } from '@orpc/shared';
2
- import { getEventMeta } from '@orpc/standard-server';
1
+ import { isAsyncIteratorObject, defer, value, splitInHalf, toArray, stringifyJSON, AsyncIteratorClass } from '@orpc/shared';
2
+ import { toBatchRequest, parseBatchResponse, toBatchAbortSignal } from '@orpc/standard-server/batch';
3
+ import { replicateStandardLazyResponse, getEventMeta } from '@orpc/standard-server';
4
+
5
+ class BatchLinkPlugin {
6
+ groups;
7
+ maxSize;
8
+ batchUrl;
9
+ maxUrlLength;
10
+ batchHeaders;
11
+ mapRequestItem;
12
+ exclude;
13
+ mode;
14
+ pending;
15
+ order = 5e6;
16
+ constructor(options) {
17
+ this.groups = options.groups;
18
+ this.pending = /* @__PURE__ */ new Map();
19
+ this.maxSize = options.maxSize ?? 10;
20
+ this.maxUrlLength = options.maxUrlLength ?? 2083;
21
+ this.mode = options.mode ?? "streaming";
22
+ this.batchUrl = options.url ?? (([options2]) => `${options2.request.url.origin}${options2.request.url.pathname}/__batch__`);
23
+ this.batchHeaders = options.headers ?? (([options2, ...rest]) => {
24
+ const headers = {};
25
+ for (const [key, value2] of Object.entries(options2.request.headers)) {
26
+ if (rest.every((item) => item.request.headers[key] === value2)) {
27
+ headers[key] = value2;
28
+ }
29
+ }
30
+ return headers;
31
+ });
32
+ this.mapRequestItem = options.mapRequestItem ?? (({ request, batchHeaders }) => {
33
+ const headers = {};
34
+ for (const [key, value2] of Object.entries(request.headers)) {
35
+ if (batchHeaders[key] !== value2) {
36
+ headers[key] = value2;
37
+ }
38
+ }
39
+ return {
40
+ method: request.method,
41
+ url: request.url,
42
+ headers,
43
+ body: request.body,
44
+ signal: request.signal
45
+ };
46
+ });
47
+ this.exclude = options.exclude ?? (() => false);
48
+ }
49
+ init(options) {
50
+ options.clientInterceptors ??= [];
51
+ options.clientInterceptors.push((options2) => {
52
+ if (options2.request.headers["x-orpc-batch"] !== "1") {
53
+ return options2.next();
54
+ }
55
+ return options2.next({
56
+ ...options2,
57
+ request: {
58
+ ...options2.request,
59
+ headers: {
60
+ ...options2.request.headers,
61
+ "x-orpc-batch": void 0
62
+ }
63
+ }
64
+ });
65
+ });
66
+ options.clientInterceptors.push((options2) => {
67
+ if (this.exclude(options2) || options2.request.body instanceof Blob || options2.request.body instanceof FormData || isAsyncIteratorObject(options2.request.body) || options2.request.signal?.aborted) {
68
+ return options2.next();
69
+ }
70
+ const group = this.groups.find((group2) => group2.condition(options2));
71
+ if (!group) {
72
+ return options2.next();
73
+ }
74
+ return new Promise((resolve, reject) => {
75
+ this.#enqueueRequest(group, options2, resolve, reject);
76
+ defer(() => this.#processPendingBatches());
77
+ });
78
+ });
79
+ }
80
+ #enqueueRequest(group, options, resolve, reject) {
81
+ const items = this.pending.get(group);
82
+ if (items) {
83
+ items.push([options, resolve, reject]);
84
+ } else {
85
+ this.pending.set(group, [[options, resolve, reject]]);
86
+ }
87
+ }
88
+ async #processPendingBatches() {
89
+ const pending = this.pending;
90
+ this.pending = /* @__PURE__ */ new Map();
91
+ for (const [group, items] of pending) {
92
+ const getItems = items.filter(([options]) => options.request.method === "GET");
93
+ const restItems = items.filter(([options]) => options.request.method !== "GET");
94
+ this.#executeBatch("GET", group, getItems);
95
+ this.#executeBatch("POST", group, restItems);
96
+ }
97
+ }
98
+ async #executeBatch(method, group, groupItems) {
99
+ if (!groupItems.length) {
100
+ return;
101
+ }
102
+ const batchItems = groupItems;
103
+ if (batchItems.length === 1) {
104
+ batchItems[0][0].next().then(batchItems[0][1]).catch(batchItems[0][2]);
105
+ return;
106
+ }
107
+ try {
108
+ const options = batchItems.map(([options2]) => options2);
109
+ const maxSize = await value(this.maxSize, options);
110
+ if (batchItems.length > maxSize) {
111
+ const [first, second] = splitInHalf(batchItems);
112
+ this.#executeBatch(method, group, first);
113
+ this.#executeBatch(method, group, second);
114
+ return;
115
+ }
116
+ const batchUrl = new URL(await value(this.batchUrl, options));
117
+ const batchHeaders = await value(this.batchHeaders, options);
118
+ const mappedItems = batchItems.map(([options2]) => this.mapRequestItem({ ...options2, batchUrl, batchHeaders }));
119
+ const batchRequest = toBatchRequest({
120
+ method,
121
+ url: batchUrl,
122
+ headers: batchHeaders,
123
+ requests: mappedItems
124
+ });
125
+ const maxUrlLength = await value(this.maxUrlLength, options);
126
+ if (batchRequest.url.toString().length > maxUrlLength) {
127
+ const [first, second] = splitInHalf(batchItems);
128
+ this.#executeBatch(method, group, first);
129
+ this.#executeBatch(method, group, second);
130
+ return;
131
+ }
132
+ const mode = value(this.mode, options);
133
+ try {
134
+ const lazyResponse = await options[0].next({
135
+ request: { ...batchRequest, headers: { ...batchRequest.headers, "x-orpc-batch": mode } },
136
+ signal: batchRequest.signal,
137
+ context: group.context,
138
+ input: group.input,
139
+ path: toArray(group.path)
140
+ });
141
+ const parsed = parseBatchResponse({ ...lazyResponse, body: await lazyResponse.body() });
142
+ for await (const item of parsed) {
143
+ batchItems[item.index]?.[1]({ ...item, body: () => Promise.resolve(item.body) });
144
+ }
145
+ } catch (err) {
146
+ if (batchRequest.signal?.aborted && batchRequest.signal.reason === err) {
147
+ for (const [{ signal }, , reject] of batchItems) {
148
+ if (signal?.aborted) {
149
+ reject(signal.reason);
150
+ }
151
+ }
152
+ }
153
+ throw err;
154
+ }
155
+ throw new Error("Something went wrong make batch response not contains enough responses. This can be a bug please report it.");
156
+ } catch (error) {
157
+ for (const [, , reject] of batchItems) {
158
+ reject(error);
159
+ }
160
+ }
161
+ }
162
+ }
163
+
164
+ class DedupeRequestsPlugin {
165
+ #groups;
166
+ #filter;
167
+ order = 4e6;
168
+ // make sure execute before batch plugin
169
+ #queue = /* @__PURE__ */ new Map();
170
+ constructor(options) {
171
+ this.#groups = options.groups;
172
+ this.#filter = options.filter ?? (({ request }) => request.method === "GET");
173
+ }
174
+ init(options) {
175
+ options.clientInterceptors ??= [];
176
+ options.clientInterceptors.push((options2) => {
177
+ if (options2.request.body instanceof Blob || options2.request.body instanceof FormData || options2.request.body instanceof URLSearchParams || isAsyncIteratorObject(options2.request.body) || !this.#filter(options2)) {
178
+ return options2.next();
179
+ }
180
+ const group = this.#groups.find((group2) => group2.condition(options2));
181
+ if (!group) {
182
+ return options2.next();
183
+ }
184
+ return new Promise((resolve, reject) => {
185
+ this.#enqueue(group, options2, resolve, reject);
186
+ defer(() => this.#dequeue());
187
+ });
188
+ });
189
+ }
190
+ #enqueue(group, options, resolve, reject) {
191
+ let queue = this.#queue.get(group);
192
+ if (!queue) {
193
+ this.#queue.set(group, queue = []);
194
+ }
195
+ const matched = queue.find((item) => {
196
+ const requestString1 = stringifyJSON({
197
+ body: item.options.request.body,
198
+ headers: item.options.request.headers,
199
+ method: item.options.request.method,
200
+ url: item.options.request.url
201
+ });
202
+ const requestString2 = stringifyJSON({
203
+ body: options.request.body,
204
+ headers: options.request.headers,
205
+ method: options.request.method,
206
+ url: options.request.url
207
+ });
208
+ return requestString1 === requestString2;
209
+ });
210
+ if (matched) {
211
+ matched.signals.push(options.request.signal);
212
+ matched.resolves.push(resolve);
213
+ matched.rejects.push(reject);
214
+ } else {
215
+ queue.push({
216
+ options,
217
+ signals: [options.request.signal],
218
+ resolves: [resolve],
219
+ rejects: [reject]
220
+ });
221
+ }
222
+ }
223
+ async #dequeue() {
224
+ const promises = [];
225
+ for (const [group, items] of this.#queue) {
226
+ for (const { options, signals, resolves, rejects } of items) {
227
+ promises.push(
228
+ this.#execute(group, options, signals, resolves, rejects)
229
+ );
230
+ }
231
+ }
232
+ this.#queue.clear();
233
+ await Promise.all(promises);
234
+ }
235
+ async #execute(group, options, signals, resolves, rejects) {
236
+ try {
237
+ const dedupedRequest = {
238
+ ...options.request,
239
+ signal: toBatchAbortSignal(signals)
240
+ };
241
+ const response = await options.next({
242
+ ...options,
243
+ request: dedupedRequest,
244
+ signal: dedupedRequest.signal,
245
+ context: group.context
246
+ });
247
+ const replicatedResponses = replicateStandardLazyResponse(response, resolves.length);
248
+ for (const resolve of resolves) {
249
+ resolve(replicatedResponses.shift());
250
+ }
251
+ } catch (error) {
252
+ for (const reject of rejects) {
253
+ reject(error);
254
+ }
255
+ }
256
+ }
257
+ }
3
258
 
4
259
  class ClientRetryPluginInvalidEventIteratorRetryResponse extends Error {
5
260
  }
@@ -18,75 +273,56 @@ class ClientRetryPlugin {
18
273
  options.interceptors ??= [];
19
274
  options.interceptors.push(async (interceptorOptions) => {
20
275
  const maxAttempts = await value(
21
- interceptorOptions.options.context.retry ?? this.defaultRetry,
22
- interceptorOptions.options,
23
- interceptorOptions.path,
24
- interceptorOptions.input
276
+ interceptorOptions.context.retry ?? this.defaultRetry,
277
+ interceptorOptions
25
278
  );
26
- const retryDelay = interceptorOptions.options.context.retryDelay ?? this.defaultRetryDelay;
27
- const shouldRetry = interceptorOptions.options.context.shouldRetry ?? this.defaultShouldRetry;
28
- const onRetry = interceptorOptions.options.context.onRetry ?? this.defaultOnRetry;
279
+ const retryDelay = interceptorOptions.context.retryDelay ?? this.defaultRetryDelay;
280
+ const shouldRetry = interceptorOptions.context.shouldRetry ?? this.defaultShouldRetry;
281
+ const onRetry = interceptorOptions.context.onRetry ?? this.defaultOnRetry;
29
282
  if (maxAttempts <= 0) {
30
283
  return interceptorOptions.next();
31
284
  }
32
- let lastEventId = interceptorOptions.options.lastEventId;
285
+ let lastEventId = interceptorOptions.lastEventId;
33
286
  let lastEventRetry;
34
- let unsubscribe;
287
+ let callback;
35
288
  let attemptIndex = 0;
36
- const next = async (initial) => {
37
- let current = initial;
289
+ const next = async (initialError) => {
290
+ let currentError = initialError;
38
291
  while (true) {
39
- const newClientOptions = { ...interceptorOptions.options, lastEventId };
40
- if (current) {
292
+ const updatedInterceptorOptions = { ...interceptorOptions, lastEventId };
293
+ if (currentError) {
41
294
  if (attemptIndex >= maxAttempts) {
42
- throw current.error;
295
+ throw currentError.error;
43
296
  }
44
297
  const attemptOptions = {
298
+ ...updatedInterceptorOptions,
45
299
  attemptIndex,
46
- error: current.error,
47
- lastEventId,
300
+ error: currentError.error,
48
301
  lastEventRetry
49
302
  };
50
303
  const shouldRetryBool = await value(
51
304
  shouldRetry,
52
- attemptOptions,
53
- newClientOptions,
54
- interceptorOptions.path,
55
- interceptorOptions.input
305
+ attemptOptions
56
306
  );
57
307
  if (!shouldRetryBool) {
58
- throw current.error;
308
+ throw currentError.error;
59
309
  }
60
- unsubscribe = onRetry?.(
61
- attemptOptions,
62
- newClientOptions,
63
- interceptorOptions.path,
64
- interceptorOptions.input
65
- );
66
- const retryDelayMs = await value(
67
- retryDelay,
68
- attemptOptions,
69
- newClientOptions,
70
- interceptorOptions.path,
71
- interceptorOptions.input
72
- );
310
+ callback = onRetry?.(attemptOptions);
311
+ const retryDelayMs = await value(retryDelay, attemptOptions);
73
312
  await new Promise((resolve) => setTimeout(resolve, retryDelayMs));
74
313
  attemptIndex++;
75
314
  }
76
315
  try {
77
- const output2 = await interceptorOptions.next({
78
- ...interceptorOptions,
79
- options: newClientOptions
80
- });
81
- return output2;
316
+ currentError = void 0;
317
+ return await interceptorOptions.next(updatedInterceptorOptions);
82
318
  } catch (error) {
83
- if (newClientOptions.signal?.aborted === true) {
319
+ currentError = { error };
320
+ if (updatedInterceptorOptions.signal?.aborted) {
84
321
  throw error;
85
322
  }
86
- current = { error };
87
323
  } finally {
88
- unsubscribe?.();
89
- unsubscribe = void 0;
324
+ callback?.(!currentError);
325
+ callback = void 0;
90
326
  }
91
327
  }
92
328
  };
@@ -94,19 +330,17 @@ class ClientRetryPlugin {
94
330
  if (!isAsyncIteratorObject(output)) {
95
331
  return output;
96
332
  }
97
- return async function* () {
98
- let current = output;
99
- try {
333
+ let current = output;
334
+ let isIteratorAborted = false;
335
+ return new AsyncIteratorClass(
336
+ async () => {
100
337
  while (true) {
101
338
  try {
102
339
  const item = await current.next();
103
340
  const meta = getEventMeta(item.value);
104
341
  lastEventId = meta?.id ?? lastEventId;
105
342
  lastEventRetry = meta?.retry ?? lastEventRetry;
106
- if (item.done) {
107
- return item.value;
108
- }
109
- yield item.value;
343
+ return item;
110
344
  } catch (error) {
111
345
  const meta = getEventMeta(error);
112
346
  lastEventId = meta?.id ?? lastEventId;
@@ -118,14 +352,55 @@ class ClientRetryPlugin {
118
352
  );
119
353
  }
120
354
  current = maybeEventIterator;
355
+ if (isIteratorAborted) {
356
+ await current.return?.();
357
+ throw error;
358
+ }
121
359
  }
122
360
  }
123
- } finally {
124
- await current.return?.();
361
+ },
362
+ async (reason) => {
363
+ isIteratorAborted = true;
364
+ if (reason !== "next") {
365
+ await current.return?.();
366
+ }
367
+ }
368
+ );
369
+ });
370
+ }
371
+ }
372
+
373
+ class SimpleCsrfProtectionLinkPlugin {
374
+ headerName;
375
+ headerValue;
376
+ exclude;
377
+ constructor(options = {}) {
378
+ this.headerName = options.headerName ?? "x-csrf-token";
379
+ this.headerValue = options.headerValue ?? "orpc";
380
+ this.exclude = options.exclude ?? false;
381
+ }
382
+ order = 8e6;
383
+ init(options) {
384
+ options.clientInterceptors ??= [];
385
+ options.clientInterceptors.push(async (options2) => {
386
+ const excluded = await value(this.exclude, options2);
387
+ if (excluded) {
388
+ return options2.next();
389
+ }
390
+ const headerName = await value(this.headerName, options2);
391
+ const headerValue = await value(this.headerValue, options2);
392
+ return options2.next({
393
+ ...options2,
394
+ request: {
395
+ ...options2.request,
396
+ headers: {
397
+ ...options2.request.headers,
398
+ [headerName]: headerValue
399
+ }
125
400
  }
126
- }();
401
+ });
127
402
  });
128
403
  }
129
404
  }
130
405
 
131
- export { ClientRetryPlugin, ClientRetryPluginInvalidEventIteratorRetryResponse };
406
+ export { BatchLinkPlugin, ClientRetryPlugin, ClientRetryPluginInvalidEventIteratorRetryResponse, DedupeRequestsPlugin, SimpleCsrfProtectionLinkPlugin };