@orpc/client 0.0.0-next.c40d0c9 → 0.0.0-next.c462bb4

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 (32) hide show
  1. package/README.md +22 -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 +27 -13
  5. package/dist/adapters/message-port/index.d.mts +80 -0
  6. package/dist/adapters/message-port/index.d.ts +80 -0
  7. package/dist/adapters/message-port/index.mjs +87 -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 +4 -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 +47 -0
  14. package/dist/index.d.mts +104 -29
  15. package/dist/index.d.ts +104 -29
  16. package/dist/index.mjs +58 -11
  17. package/dist/plugins/index.d.mts +209 -25
  18. package/dist/plugins/index.d.ts +209 -25
  19. package/dist/plugins/index.mjs +410 -56
  20. package/dist/shared/{client.DSPm2IGZ.mjs → client.A0J6mgVq.mjs} +90 -29
  21. package/dist/shared/client.BH1AYT_p.d.mts +83 -0
  22. package/dist/shared/client.BH1AYT_p.d.ts +83 -0
  23. package/dist/shared/client.BLtwTQUg.mjs +40 -0
  24. package/dist/shared/{client.D-jrSuDb.d.ts → client.BxV-mzeR.d.ts} +13 -25
  25. package/dist/shared/{client.grRbC25r.d.ts → client.CPgZaUox.d.mts} +21 -15
  26. package/dist/shared/{client.Bt94sjrK.d.mts → client.D8lMmWVC.d.mts} +13 -25
  27. package/dist/shared/client.DL-GilqA.mjs +171 -0
  28. package/dist/shared/{client.5813Ufvs.d.mts → client.De8SW4Kw.d.ts} +21 -15
  29. package/package.json +16 -5
  30. package/dist/shared/client.C0lT7w02.d.mts +0 -30
  31. package/dist/shared/client.C0lT7w02.d.ts +0 -30
  32. package/dist/shared/client.jKEwIsRd.mjs +0 -175
@@ -1,5 +1,261 @@
1
- import { value, isAsyncIteratorObject } from '@orpc/shared';
2
- import { getEventMeta } from '@orpc/standard-server';
1
+ import { isAsyncIteratorObject, defer, value, splitInHalf, toArray, stringifyJSON, overlayProxy, AsyncIteratorClass } from '@orpc/shared';
2
+ import { toBatchRequest, parseBatchResponse, toBatchAbortSignal } from '@orpc/standard-server/batch';
3
+ import { replicateStandardLazyResponse, getEventMeta, flattenHeader } from '@orpc/standard-server';
4
+ import { C as COMMON_ORPC_ERROR_DEFS } from '../shared/client.DL-GilqA.mjs';
5
+
6
+ class BatchLinkPlugin {
7
+ groups;
8
+ maxSize;
9
+ batchUrl;
10
+ maxUrlLength;
11
+ batchHeaders;
12
+ mapRequestItem;
13
+ exclude;
14
+ mode;
15
+ pending;
16
+ order = 5e6;
17
+ constructor(options) {
18
+ this.groups = options.groups;
19
+ this.pending = /* @__PURE__ */ new Map();
20
+ this.maxSize = options.maxSize ?? 10;
21
+ this.maxUrlLength = options.maxUrlLength ?? 2083;
22
+ this.mode = options.mode ?? "streaming";
23
+ this.batchUrl = options.url ?? (([options2]) => `${options2.request.url.origin}${options2.request.url.pathname}/__batch__`);
24
+ this.batchHeaders = options.headers ?? (([options2, ...rest]) => {
25
+ const headers = {};
26
+ for (const [key, value2] of Object.entries(options2.request.headers)) {
27
+ if (rest.every((item) => item.request.headers[key] === value2)) {
28
+ headers[key] = value2;
29
+ }
30
+ }
31
+ return headers;
32
+ });
33
+ this.mapRequestItem = options.mapRequestItem ?? (({ request, batchHeaders }) => {
34
+ const headers = {};
35
+ for (const [key, value2] of Object.entries(request.headers)) {
36
+ if (batchHeaders[key] !== value2) {
37
+ headers[key] = value2;
38
+ }
39
+ }
40
+ return {
41
+ method: request.method,
42
+ url: request.url,
43
+ headers,
44
+ body: request.body,
45
+ signal: request.signal
46
+ };
47
+ });
48
+ this.exclude = options.exclude ?? (() => false);
49
+ }
50
+ init(options) {
51
+ options.clientInterceptors ??= [];
52
+ options.clientInterceptors.push((options2) => {
53
+ if (options2.request.headers["x-orpc-batch"] !== "1") {
54
+ return options2.next();
55
+ }
56
+ return options2.next({
57
+ ...options2,
58
+ request: {
59
+ ...options2.request,
60
+ headers: {
61
+ ...options2.request.headers,
62
+ "x-orpc-batch": void 0
63
+ }
64
+ }
65
+ });
66
+ });
67
+ options.clientInterceptors.push((options2) => {
68
+ if (this.exclude(options2) || options2.request.body instanceof Blob || options2.request.body instanceof FormData || isAsyncIteratorObject(options2.request.body) || options2.request.signal?.aborted) {
69
+ return options2.next();
70
+ }
71
+ const group = this.groups.find((group2) => group2.condition(options2));
72
+ if (!group) {
73
+ return options2.next();
74
+ }
75
+ return new Promise((resolve, reject) => {
76
+ this.#enqueueRequest(group, options2, resolve, reject);
77
+ defer(() => this.#processPendingBatches());
78
+ });
79
+ });
80
+ }
81
+ #enqueueRequest(group, options, resolve, reject) {
82
+ const items = this.pending.get(group);
83
+ if (items) {
84
+ items.push([options, resolve, reject]);
85
+ } else {
86
+ this.pending.set(group, [[options, resolve, reject]]);
87
+ }
88
+ }
89
+ async #processPendingBatches() {
90
+ const pending = this.pending;
91
+ this.pending = /* @__PURE__ */ new Map();
92
+ for (const [group, items] of pending) {
93
+ const getItems = items.filter(([options]) => options.request.method === "GET");
94
+ const restItems = items.filter(([options]) => options.request.method !== "GET");
95
+ this.#executeBatch("GET", group, getItems);
96
+ this.#executeBatch("POST", group, restItems);
97
+ }
98
+ }
99
+ async #executeBatch(method, group, groupItems) {
100
+ if (!groupItems.length) {
101
+ return;
102
+ }
103
+ const batchItems = groupItems;
104
+ if (batchItems.length === 1) {
105
+ batchItems[0][0].next().then(batchItems[0][1]).catch(batchItems[0][2]);
106
+ return;
107
+ }
108
+ try {
109
+ const options = batchItems.map(([options2]) => options2);
110
+ const maxSize = await value(this.maxSize, options);
111
+ if (batchItems.length > maxSize) {
112
+ const [first, second] = splitInHalf(batchItems);
113
+ this.#executeBatch(method, group, first);
114
+ this.#executeBatch(method, group, second);
115
+ return;
116
+ }
117
+ const batchUrl = new URL(await value(this.batchUrl, options));
118
+ const batchHeaders = await value(this.batchHeaders, options);
119
+ const mappedItems = batchItems.map(([options2]) => this.mapRequestItem({ ...options2, batchUrl, batchHeaders }));
120
+ const batchRequest = toBatchRequest({
121
+ method,
122
+ url: batchUrl,
123
+ headers: batchHeaders,
124
+ requests: mappedItems
125
+ });
126
+ const maxUrlLength = await value(this.maxUrlLength, options);
127
+ if (batchRequest.url.toString().length > maxUrlLength) {
128
+ const [first, second] = splitInHalf(batchItems);
129
+ this.#executeBatch(method, group, first);
130
+ this.#executeBatch(method, group, second);
131
+ return;
132
+ }
133
+ const mode = value(this.mode, options);
134
+ try {
135
+ const lazyResponse = await options[0].next({
136
+ request: { ...batchRequest, headers: { ...batchRequest.headers, "x-orpc-batch": mode } },
137
+ signal: batchRequest.signal,
138
+ context: group.context,
139
+ input: group.input,
140
+ path: toArray(group.path)
141
+ });
142
+ const parsed = parseBatchResponse({ ...lazyResponse, body: await lazyResponse.body() });
143
+ for await (const item of parsed) {
144
+ batchItems[item.index]?.[1]({ ...item, body: () => Promise.resolve(item.body) });
145
+ }
146
+ } catch (err) {
147
+ if (batchRequest.signal?.aborted && batchRequest.signal.reason === err) {
148
+ for (const [{ signal }, , reject] of batchItems) {
149
+ if (signal?.aborted) {
150
+ reject(signal.reason);
151
+ }
152
+ }
153
+ }
154
+ throw err;
155
+ }
156
+ throw new Error("Something went wrong make batch response not contains enough responses. This can be a bug please report it.");
157
+ } catch (error) {
158
+ for (const [, , reject] of batchItems) {
159
+ reject(error);
160
+ }
161
+ }
162
+ }
163
+ }
164
+
165
+ class DedupeRequestsPlugin {
166
+ #groups;
167
+ #filter;
168
+ order = 4e6;
169
+ // make sure execute before batch plugin
170
+ #queue = /* @__PURE__ */ new Map();
171
+ constructor(options) {
172
+ this.#groups = options.groups;
173
+ this.#filter = options.filter ?? (({ request }) => request.method === "GET");
174
+ }
175
+ init(options) {
176
+ options.clientInterceptors ??= [];
177
+ options.clientInterceptors.push((options2) => {
178
+ if (options2.request.body instanceof Blob || options2.request.body instanceof FormData || options2.request.body instanceof URLSearchParams || isAsyncIteratorObject(options2.request.body) || !this.#filter(options2)) {
179
+ return options2.next();
180
+ }
181
+ const group = this.#groups.find((group2) => group2.condition(options2));
182
+ if (!group) {
183
+ return options2.next();
184
+ }
185
+ return new Promise((resolve, reject) => {
186
+ this.#enqueue(group, options2, resolve, reject);
187
+ defer(() => this.#dequeue());
188
+ });
189
+ });
190
+ }
191
+ #enqueue(group, options, resolve, reject) {
192
+ let queue = this.#queue.get(group);
193
+ if (!queue) {
194
+ this.#queue.set(group, queue = []);
195
+ }
196
+ const matched = queue.find((item) => {
197
+ const requestString1 = stringifyJSON({
198
+ body: item.options.request.body,
199
+ headers: item.options.request.headers,
200
+ method: item.options.request.method,
201
+ url: item.options.request.url
202
+ });
203
+ const requestString2 = stringifyJSON({
204
+ body: options.request.body,
205
+ headers: options.request.headers,
206
+ method: options.request.method,
207
+ url: options.request.url
208
+ });
209
+ return requestString1 === requestString2;
210
+ });
211
+ if (matched) {
212
+ matched.signals.push(options.request.signal);
213
+ matched.resolves.push(resolve);
214
+ matched.rejects.push(reject);
215
+ } else {
216
+ queue.push({
217
+ options,
218
+ signals: [options.request.signal],
219
+ resolves: [resolve],
220
+ rejects: [reject]
221
+ });
222
+ }
223
+ }
224
+ async #dequeue() {
225
+ const promises = [];
226
+ for (const [group, items] of this.#queue) {
227
+ for (const { options, signals, resolves, rejects } of items) {
228
+ promises.push(
229
+ this.#execute(group, options, signals, resolves, rejects)
230
+ );
231
+ }
232
+ }
233
+ this.#queue.clear();
234
+ await Promise.all(promises);
235
+ }
236
+ async #execute(group, options, signals, resolves, rejects) {
237
+ try {
238
+ const dedupedRequest = {
239
+ ...options.request,
240
+ signal: toBatchAbortSignal(signals)
241
+ };
242
+ const response = await options.next({
243
+ ...options,
244
+ request: dedupedRequest,
245
+ signal: dedupedRequest.signal,
246
+ context: group.context
247
+ });
248
+ const replicatedResponses = replicateStandardLazyResponse(response, resolves.length);
249
+ for (const resolve of resolves) {
250
+ resolve(replicatedResponses.shift());
251
+ }
252
+ } catch (error) {
253
+ for (const reject of rejects) {
254
+ reject(error);
255
+ }
256
+ }
257
+ }
258
+ }
3
259
 
4
260
  class ClientRetryPluginInvalidEventIteratorRetryResponse extends Error {
5
261
  }
@@ -8,6 +264,7 @@ class ClientRetryPlugin {
8
264
  defaultRetryDelay;
9
265
  defaultShouldRetry;
10
266
  defaultOnRetry;
267
+ order = 18e5;
11
268
  constructor(options = {}) {
12
269
  this.defaultRetry = options.default?.retry ?? 0;
13
270
  this.defaultRetryDelay = options.default?.retryDelay ?? ((o) => o.lastEventRetry ?? 2e3);
@@ -18,75 +275,56 @@ class ClientRetryPlugin {
18
275
  options.interceptors ??= [];
19
276
  options.interceptors.push(async (interceptorOptions) => {
20
277
  const maxAttempts = await value(
21
- interceptorOptions.options.context.retry ?? this.defaultRetry,
22
- interceptorOptions.options,
23
- interceptorOptions.path,
24
- interceptorOptions.input
278
+ interceptorOptions.context.retry ?? this.defaultRetry,
279
+ interceptorOptions
25
280
  );
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;
281
+ const retryDelay = interceptorOptions.context.retryDelay ?? this.defaultRetryDelay;
282
+ const shouldRetry = interceptorOptions.context.shouldRetry ?? this.defaultShouldRetry;
283
+ const onRetry = interceptorOptions.context.onRetry ?? this.defaultOnRetry;
29
284
  if (maxAttempts <= 0) {
30
285
  return interceptorOptions.next();
31
286
  }
32
- let lastEventId = interceptorOptions.options.lastEventId;
287
+ let lastEventId = interceptorOptions.lastEventId;
33
288
  let lastEventRetry;
34
- let unsubscribe;
289
+ let callback;
35
290
  let attemptIndex = 0;
36
- const next = async (initial) => {
37
- let current = initial;
291
+ const next = async (initialError) => {
292
+ let currentError = initialError;
38
293
  while (true) {
39
- const newClientOptions = { ...interceptorOptions.options, lastEventId };
40
- if (current) {
294
+ const updatedInterceptorOptions = { ...interceptorOptions, lastEventId };
295
+ if (currentError) {
41
296
  if (attemptIndex >= maxAttempts) {
42
- throw current.error;
297
+ throw currentError.error;
43
298
  }
44
299
  const attemptOptions = {
300
+ ...updatedInterceptorOptions,
45
301
  attemptIndex,
46
- error: current.error,
47
- lastEventId,
302
+ error: currentError.error,
48
303
  lastEventRetry
49
304
  };
50
305
  const shouldRetryBool = await value(
51
306
  shouldRetry,
52
- attemptOptions,
53
- newClientOptions,
54
- interceptorOptions.path,
55
- interceptorOptions.input
307
+ attemptOptions
56
308
  );
57
309
  if (!shouldRetryBool) {
58
- throw current.error;
310
+ throw currentError.error;
59
311
  }
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
- );
312
+ callback = onRetry?.(attemptOptions);
313
+ const retryDelayMs = await value(retryDelay, attemptOptions);
73
314
  await new Promise((resolve) => setTimeout(resolve, retryDelayMs));
74
315
  attemptIndex++;
75
316
  }
76
317
  try {
77
- const output2 = await interceptorOptions.next({
78
- ...interceptorOptions,
79
- options: newClientOptions
80
- });
81
- return output2;
318
+ currentError = void 0;
319
+ return await interceptorOptions.next(updatedInterceptorOptions);
82
320
  } catch (error) {
83
- if (newClientOptions.signal?.aborted === true) {
321
+ currentError = { error };
322
+ if (updatedInterceptorOptions.signal?.aborted) {
84
323
  throw error;
85
324
  }
86
- current = { error };
87
325
  } finally {
88
- unsubscribe?.();
89
- unsubscribe = void 0;
326
+ callback?.(!currentError);
327
+ callback = void 0;
90
328
  }
91
329
  }
92
330
  };
@@ -94,19 +332,17 @@ class ClientRetryPlugin {
94
332
  if (!isAsyncIteratorObject(output)) {
95
333
  return output;
96
334
  }
97
- return async function* () {
98
- let current = output;
99
- try {
335
+ let current = output;
336
+ let isIteratorAborted = false;
337
+ return overlayProxy(() => current, new AsyncIteratorClass(
338
+ async () => {
100
339
  while (true) {
101
340
  try {
102
341
  const item = await current.next();
103
342
  const meta = getEventMeta(item.value);
104
343
  lastEventId = meta?.id ?? lastEventId;
105
344
  lastEventRetry = meta?.retry ?? lastEventRetry;
106
- if (item.done) {
107
- return item.value;
108
- }
109
- yield item.value;
345
+ return item;
110
346
  } catch (error) {
111
347
  const meta = getEventMeta(error);
112
348
  lastEventId = meta?.id ?? lastEventId;
@@ -118,14 +354,132 @@ class ClientRetryPlugin {
118
354
  );
119
355
  }
120
356
  current = maybeEventIterator;
357
+ if (isIteratorAborted) {
358
+ await current.return?.();
359
+ throw error;
360
+ }
121
361
  }
122
362
  }
123
- } finally {
124
- await current.return?.();
363
+ },
364
+ async (reason) => {
365
+ isIteratorAborted = true;
366
+ if (reason !== "next") {
367
+ await current.return?.();
368
+ }
369
+ }
370
+ ));
371
+ });
372
+ }
373
+ }
374
+
375
+ class RetryAfterPlugin {
376
+ condition;
377
+ maxAttempts;
378
+ timeout;
379
+ order = 19e5;
380
+ constructor(options = {}) {
381
+ this.condition = options.condition ?? ((response) => response.status === COMMON_ORPC_ERROR_DEFS.TOO_MANY_REQUESTS.status || response.status === COMMON_ORPC_ERROR_DEFS.SERVICE_UNAVAILABLE.status);
382
+ this.maxAttempts = options.maxAttempts ?? 3;
383
+ this.timeout = options.timeout ?? 5 * 60 * 1e3;
384
+ }
385
+ init(options) {
386
+ options.clientInterceptors ??= [];
387
+ options.clientInterceptors.push(async (interceptorOptions) => {
388
+ const startTime = Date.now();
389
+ let attemptCount = 0;
390
+ while (true) {
391
+ attemptCount++;
392
+ const response = await interceptorOptions.next();
393
+ if (!value(this.condition, response, interceptorOptions)) {
394
+ return response;
395
+ }
396
+ const retryAfterHeader = flattenHeader(response.headers["retry-after"]);
397
+ const retryAfterMs = this.parseRetryAfterHeader(retryAfterHeader);
398
+ if (retryAfterMs === void 0) {
399
+ return response;
400
+ }
401
+ if (attemptCount >= value(this.maxAttempts, response, interceptorOptions)) {
402
+ return response;
403
+ }
404
+ const timeoutMs = value(this.timeout, response, interceptorOptions);
405
+ const elapsedTime = Date.now() - startTime;
406
+ if (elapsedTime + retryAfterMs > timeoutMs) {
407
+ return response;
408
+ }
409
+ await this.delayExecution(retryAfterMs, interceptorOptions.signal);
410
+ if (interceptorOptions.signal?.aborted) {
411
+ return response;
412
+ }
413
+ }
414
+ });
415
+ }
416
+ parseRetryAfterHeader(value2) {
417
+ value2 = value2?.trim();
418
+ if (!value2) {
419
+ return void 0;
420
+ }
421
+ const seconds = Number(value2);
422
+ if (Number.isFinite(seconds)) {
423
+ return Math.max(0, seconds * 1e3);
424
+ }
425
+ const retryDate = Date.parse(value2);
426
+ if (!Number.isNaN(retryDate)) {
427
+ return Math.max(0, retryDate - Date.now());
428
+ }
429
+ return void 0;
430
+ }
431
+ delayExecution(ms, signal) {
432
+ return new Promise((resolve) => {
433
+ if (signal?.aborted) {
434
+ resolve();
435
+ return;
436
+ }
437
+ let timeout;
438
+ const onAbort = () => {
439
+ clearTimeout(timeout);
440
+ timeout = void 0;
441
+ resolve();
442
+ };
443
+ signal?.addEventListener("abort", onAbort, { once: true });
444
+ timeout = setTimeout(() => {
445
+ signal?.removeEventListener("abort", onAbort);
446
+ resolve();
447
+ }, ms);
448
+ });
449
+ }
450
+ }
451
+
452
+ class SimpleCsrfProtectionLinkPlugin {
453
+ headerName;
454
+ headerValue;
455
+ exclude;
456
+ constructor(options = {}) {
457
+ this.headerName = options.headerName ?? "x-csrf-token";
458
+ this.headerValue = options.headerValue ?? "orpc";
459
+ this.exclude = options.exclude ?? false;
460
+ }
461
+ order = 8e6;
462
+ init(options) {
463
+ options.clientInterceptors ??= [];
464
+ options.clientInterceptors.push(async (options2) => {
465
+ const excluded = await value(this.exclude, options2);
466
+ if (excluded) {
467
+ return options2.next();
468
+ }
469
+ const headerName = await value(this.headerName, options2);
470
+ const headerValue = await value(this.headerValue, options2);
471
+ return options2.next({
472
+ ...options2,
473
+ request: {
474
+ ...options2.request,
475
+ headers: {
476
+ ...options2.request.headers,
477
+ [headerName]: headerValue
478
+ }
125
479
  }
126
- }();
480
+ });
127
481
  });
128
482
  }
129
483
  }
130
484
 
131
- export { ClientRetryPlugin, ClientRetryPluginInvalidEventIteratorRetryResponse };
485
+ export { BatchLinkPlugin, ClientRetryPlugin, ClientRetryPluginInvalidEventIteratorRetryResponse, DedupeRequestsPlugin, RetryAfterPlugin, SimpleCsrfProtectionLinkPlugin };