@orpc/client 0.0.0-next.6b26cdc → 0.0.0-next.6bc474e

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 (31) hide show
  1. package/README.md +144 -34
  2. package/dist/adapters/fetch/index.d.mts +30 -10
  3. package/dist/adapters/fetch/index.d.ts +30 -10
  4. package/dist/adapters/fetch/index.mjs +25 -8
  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 +96 -21
  15. package/dist/index.d.ts +96 -21
  16. package/dist/index.mjs +55 -8
  17. package/dist/plugins/index.d.mts +123 -17
  18. package/dist/plugins/index.d.ts +123 -17
  19. package/dist/plugins/index.mjs +233 -38
  20. package/dist/shared/{client.FvDtk0Vr.d.ts → client.2jUAqzYU.d.ts} +14 -14
  21. package/dist/shared/{client.CRWEpqLB.mjs → client.4qgEyLNQ.mjs} +37 -41
  22. package/dist/shared/{client.Dc8eXpCj.d.ts → client.B3pNRBih.d.ts} +10 -9
  23. package/dist/shared/{client.DXvQo1nS.d.mts → client.BFAVy68H.d.mts} +10 -9
  24. package/dist/shared/client.BLtwTQUg.mjs +40 -0
  25. package/dist/shared/{client.DpICn1BD.mjs → client.CEWGvV28.mjs} +69 -20
  26. package/dist/shared/{client.Bt2hFtM_.d.mts → client.CpCa3si8.d.mts} +14 -14
  27. package/dist/shared/client.i2uoJbEp.d.mts +83 -0
  28. package/dist/shared/client.i2uoJbEp.d.ts +83 -0
  29. package/package.json +18 -8
  30. package/dist/shared/client.CipPQkhk.d.mts +0 -29
  31. package/dist/shared/client.CipPQkhk.d.ts +0 -29
@@ -1,6 +1,7 @@
1
- import { isAsyncIteratorObject, value, splitInHalf, toArray } from '@orpc/shared';
2
- import { toBatchRequest, parseBatchResponse } from '@orpc/standard-server/batch';
3
- 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.4qgEyLNQ.mjs';
4
5
 
5
6
  class BatchLinkPlugin {
6
7
  groups;
@@ -10,6 +11,7 @@ class BatchLinkPlugin {
10
11
  batchHeaders;
11
12
  mapRequestItem;
12
13
  exclude;
14
+ mode;
13
15
  pending;
14
16
  order = 5e6;
15
17
  constructor(options) {
@@ -17,6 +19,7 @@ class BatchLinkPlugin {
17
19
  this.pending = /* @__PURE__ */ new Map();
18
20
  this.maxSize = options.maxSize ?? 10;
19
21
  this.maxUrlLength = options.maxUrlLength ?? 2083;
22
+ this.mode = options.mode ?? "streaming";
20
23
  this.batchUrl = options.url ?? (([options2]) => `${options2.request.url.origin}${options2.request.url.pathname}/__batch__`);
21
24
  this.batchHeaders = options.headers ?? (([options2, ...rest]) => {
22
25
  const headers = {};
@@ -62,7 +65,7 @@ class BatchLinkPlugin {
62
65
  });
63
66
  });
64
67
  options.clientInterceptors.push((options2) => {
65
- if (this.exclude(options2) || options2.request.body instanceof Blob || options2.request.body instanceof FormData || isAsyncIteratorObject(options2.request.body)) {
68
+ if (this.exclude(options2) || options2.request.body instanceof Blob || options2.request.body instanceof FormData || isAsyncIteratorObject(options2.request.body) || options2.request.signal?.aborted) {
66
69
  return options2.next();
67
70
  }
68
71
  const group = this.groups.find((group2) => group2.condition(options2));
@@ -71,7 +74,7 @@ class BatchLinkPlugin {
71
74
  }
72
75
  return new Promise((resolve, reject) => {
73
76
  this.#enqueueRequest(group, options2, resolve, reject);
74
- setTimeout(() => this.#processPendingBatches());
77
+ defer(() => this.#processPendingBatches());
75
78
  });
76
79
  });
77
80
  }
@@ -127,16 +130,28 @@ class BatchLinkPlugin {
127
130
  this.#executeBatch(method, group, second);
128
131
  return;
129
132
  }
130
- const lazyResponse = await options[0].next({
131
- request: { ...batchRequest, headers: { ...batchRequest.headers, "x-orpc-batch": "1" } },
132
- signal: batchRequest.signal,
133
- context: group.context,
134
- input: group.input,
135
- path: toArray(group.path)
136
- });
137
- const parsed = parseBatchResponse({ ...lazyResponse, body: await lazyResponse.body() });
138
- for await (const item of parsed) {
139
- batchItems[item.index]?.[1]({ ...item, body: () => Promise.resolve(item.body) });
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;
140
155
  }
141
156
  throw new Error("Something went wrong make batch response not contains enough responses. This can be a bug please report it.");
142
157
  } catch (error) {
@@ -147,6 +162,101 @@ class BatchLinkPlugin {
147
162
  }
148
163
  }
149
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
+ }
259
+
150
260
  class ClientRetryPluginInvalidEventIteratorRetryResponse extends Error {
151
261
  }
152
262
  class ClientRetryPlugin {
@@ -154,6 +264,7 @@ class ClientRetryPlugin {
154
264
  defaultRetryDelay;
155
265
  defaultShouldRetry;
156
266
  defaultOnRetry;
267
+ order = 18e5;
157
268
  constructor(options = {}) {
158
269
  this.defaultRetry = options.default?.retry ?? 0;
159
270
  this.defaultRetryDelay = options.default?.retryDelay ?? ((o) => o.lastEventRetry ?? 2e3);
@@ -175,20 +286,20 @@ class ClientRetryPlugin {
175
286
  }
176
287
  let lastEventId = interceptorOptions.lastEventId;
177
288
  let lastEventRetry;
178
- let unsubscribe;
289
+ let callback;
179
290
  let attemptIndex = 0;
180
- const next = async (initial) => {
181
- let current = initial;
291
+ const next = async (initialError) => {
292
+ let currentError = initialError;
182
293
  while (true) {
183
294
  const updatedInterceptorOptions = { ...interceptorOptions, lastEventId };
184
- if (current) {
295
+ if (currentError) {
185
296
  if (attemptIndex >= maxAttempts) {
186
- throw current.error;
297
+ throw currentError.error;
187
298
  }
188
299
  const attemptOptions = {
189
300
  ...updatedInterceptorOptions,
190
301
  attemptIndex,
191
- error: current.error,
302
+ error: currentError.error,
192
303
  lastEventRetry
193
304
  };
194
305
  const shouldRetryBool = await value(
@@ -196,23 +307,24 @@ class ClientRetryPlugin {
196
307
  attemptOptions
197
308
  );
198
309
  if (!shouldRetryBool) {
199
- throw current.error;
310
+ throw currentError.error;
200
311
  }
201
- unsubscribe = onRetry?.(attemptOptions);
312
+ callback = onRetry?.(attemptOptions);
202
313
  const retryDelayMs = await value(retryDelay, attemptOptions);
203
314
  await new Promise((resolve) => setTimeout(resolve, retryDelayMs));
204
315
  attemptIndex++;
205
316
  }
206
317
  try {
318
+ currentError = void 0;
207
319
  return await interceptorOptions.next(updatedInterceptorOptions);
208
320
  } catch (error) {
209
- if (updatedInterceptorOptions.signal?.aborted === true) {
321
+ currentError = { error };
322
+ if (updatedInterceptorOptions.signal?.aborted) {
210
323
  throw error;
211
324
  }
212
- current = { error };
213
325
  } finally {
214
- unsubscribe?.();
215
- unsubscribe = void 0;
326
+ callback?.(!currentError);
327
+ callback = void 0;
216
328
  }
217
329
  }
218
330
  };
@@ -220,19 +332,17 @@ class ClientRetryPlugin {
220
332
  if (!isAsyncIteratorObject(output)) {
221
333
  return output;
222
334
  }
223
- return async function* () {
224
- let current = output;
225
- try {
335
+ let current = output;
336
+ let isIteratorAborted = false;
337
+ return overlayProxy(() => current, new AsyncIteratorClass(
338
+ async () => {
226
339
  while (true) {
227
340
  try {
228
341
  const item = await current.next();
229
342
  const meta = getEventMeta(item.value);
230
343
  lastEventId = meta?.id ?? lastEventId;
231
344
  lastEventRetry = meta?.retry ?? lastEventRetry;
232
- if (item.done) {
233
- return item.value;
234
- }
235
- yield item.value;
345
+ return item;
236
346
  } catch (error) {
237
347
  const meta = getEventMeta(error);
238
348
  lastEventId = meta?.id ?? lastEventId;
@@ -244,12 +354,97 @@ class ClientRetryPlugin {
244
354
  );
245
355
  }
246
356
  current = maybeEventIterator;
357
+ if (isIteratorAborted) {
358
+ await current.return?.();
359
+ throw error;
360
+ }
247
361
  }
248
362
  }
249
- } finally {
250
- await current.return?.();
363
+ },
364
+ async (reason) => {
365
+ isIteratorAborted = true;
366
+ if (reason !== "next") {
367
+ await current.return?.();
368
+ }
251
369
  }
252
- }();
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);
253
448
  });
254
449
  }
255
450
  }
@@ -287,4 +482,4 @@ class SimpleCsrfProtectionLinkPlugin {
287
482
  }
288
483
  }
289
484
 
290
- export { BatchLinkPlugin, ClientRetryPlugin, ClientRetryPluginInvalidEventIteratorRetryResponse, SimpleCsrfProtectionLinkPlugin };
485
+ export { BatchLinkPlugin, ClientRetryPlugin, ClientRetryPluginInvalidEventIteratorRetryResponse, DedupeRequestsPlugin, RetryAfterPlugin, SimpleCsrfProtectionLinkPlugin };
@@ -1,14 +1,6 @@
1
- import { Interceptor, ThrowableError } from '@orpc/shared';
1
+ import { Interceptor } from '@orpc/shared';
2
2
  import { StandardRequest, StandardLazyResponse } from '@orpc/standard-server';
3
- import { a as ClientContext, b as ClientOptions, C as ClientLink } from './client.CipPQkhk.js';
4
-
5
- interface StandardLinkCodec<T extends ClientContext> {
6
- encode(path: readonly string[], input: unknown, options: ClientOptions<T>): Promise<StandardRequest>;
7
- decode(response: StandardLazyResponse, options: ClientOptions<T>, path: readonly string[], input: unknown): Promise<unknown>;
8
- }
9
- interface StandardLinkClient<T extends ClientContext> {
10
- call(request: StandardRequest, options: ClientOptions<T>, path: readonly string[], input: unknown): Promise<StandardLazyResponse>;
11
- }
3
+ import { b as ClientContext, c as ClientOptions, C as ClientLink } from './client.i2uoJbEp.js';
12
4
 
13
5
  interface StandardLinkPlugin<T extends ClientContext> {
14
6
  order?: number;
@@ -20,6 +12,14 @@ declare class CompositeStandardLinkPlugin<T extends ClientContext, TPlugin exten
20
12
  init(options: StandardLinkOptions<T>): void;
21
13
  }
22
14
 
15
+ interface StandardLinkCodec<T extends ClientContext> {
16
+ encode(path: readonly string[], input: unknown, options: ClientOptions<T>): Promise<StandardRequest>;
17
+ decode(response: StandardLazyResponse, options: ClientOptions<T>, path: readonly string[], input: unknown): Promise<unknown>;
18
+ }
19
+ interface StandardLinkClient<T extends ClientContext> {
20
+ call(request: StandardRequest, options: ClientOptions<T>, path: readonly string[], input: unknown): Promise<StandardLazyResponse>;
21
+ }
22
+
23
23
  interface StandardLinkInterceptorOptions<T extends ClientContext> extends ClientOptions<T> {
24
24
  path: readonly string[];
25
25
  input: unknown;
@@ -28,12 +28,11 @@ interface StandardLinkClientInterceptorOptions<T extends ClientContext> extends
28
28
  request: StandardRequest;
29
29
  }
30
30
  interface StandardLinkOptions<T extends ClientContext> {
31
- interceptors?: Interceptor<StandardLinkInterceptorOptions<T>, unknown, ThrowableError>[];
32
- clientInterceptors?: Interceptor<StandardLinkClientInterceptorOptions<T>, StandardLazyResponse, ThrowableError>[];
31
+ interceptors?: Interceptor<StandardLinkInterceptorOptions<T>, Promise<unknown>>[];
32
+ clientInterceptors?: Interceptor<StandardLinkClientInterceptorOptions<T>, Promise<StandardLazyResponse>>[];
33
33
  plugins?: StandardLinkPlugin<T>[];
34
34
  }
35
35
  declare class StandardLink<T extends ClientContext> implements ClientLink<T> {
36
- #private;
37
36
  readonly codec: StandardLinkCodec<T>;
38
37
  readonly sender: StandardLinkClient<T>;
39
38
  private readonly interceptors;
@@ -42,4 +41,5 @@ declare class StandardLink<T extends ClientContext> implements ClientLink<T> {
42
41
  call(path: readonly string[], input: unknown, options: ClientOptions<T>): Promise<unknown>;
43
42
  }
44
43
 
45
- export { CompositeStandardLinkPlugin as C, type StandardLinkClientInterceptorOptions as S, type StandardLinkPlugin as a, type StandardLinkOptions as b, type StandardLinkInterceptorOptions as c, StandardLink as d, type StandardLinkCodec as e, type StandardLinkClient as f };
44
+ export { CompositeStandardLinkPlugin as C, StandardLink as d };
45
+ export type { StandardLinkClientInterceptorOptions as S, StandardLinkPlugin as a, StandardLinkOptions as b, StandardLinkInterceptorOptions as c, StandardLinkCodec as e, StandardLinkClient as f };
@@ -1,5 +1,7 @@
1
- import { isObject, isTypescriptObject } from '@orpc/shared';
2
- import { getEventMeta, withEventMeta } from '@orpc/standard-server';
1
+ import { resolveMaybeOptionalOptions, getConstructor, isObject } from '@orpc/shared';
2
+
3
+ const ORPC_CLIENT_PACKAGE_NAME = "@orpc/client";
4
+ const ORPC_CLIENT_PACKAGE_VERSION = "0.0.0-next.6bc474e";
3
5
 
4
6
  const COMMON_ORPC_ERROR_DEFS = {
5
7
  BAD_REQUEST: {
@@ -85,21 +87,25 @@ function fallbackORPCErrorStatus(code, status) {
85
87
  function fallbackORPCErrorMessage(code, message) {
86
88
  return message || COMMON_ORPC_ERROR_DEFS[code]?.message || code;
87
89
  }
90
+ const GLOBAL_ORPC_ERROR_CONSTRUCTORS_SYMBOL = Symbol.for(`__${ORPC_CLIENT_PACKAGE_NAME}@${ORPC_CLIENT_PACKAGE_VERSION}/error/ORPC_ERROR_CONSTRUCTORS__`);
91
+ void (globalThis[GLOBAL_ORPC_ERROR_CONSTRUCTORS_SYMBOL] ??= /* @__PURE__ */ new WeakSet());
92
+ const globalORPCErrorConstructors = globalThis[GLOBAL_ORPC_ERROR_CONSTRUCTORS_SYMBOL];
88
93
  class ORPCError extends Error {
89
94
  defined;
90
95
  code;
91
96
  status;
92
97
  data;
93
- constructor(code, ...[options]) {
94
- if (options?.status && !isORPCErrorStatus(options.status)) {
98
+ constructor(code, ...rest) {
99
+ const options = resolveMaybeOptionalOptions(rest);
100
+ if (options.status !== void 0 && !isORPCErrorStatus(options.status)) {
95
101
  throw new Error("[ORPCError] Invalid error status code.");
96
102
  }
97
- const message = fallbackORPCErrorMessage(code, options?.message);
103
+ const message = fallbackORPCErrorMessage(code, options.message);
98
104
  super(message, options);
99
105
  this.code = code;
100
- this.status = fallbackORPCErrorStatus(code, options?.status);
101
- this.defined = options?.defined ?? false;
102
- this.data = options?.data;
106
+ this.status = fallbackORPCErrorStatus(code, options.status);
107
+ this.defined = options.defined ?? false;
108
+ this.data = options.data;
103
109
  }
104
110
  toJSON() {
105
111
  return {
@@ -110,7 +116,29 @@ class ORPCError extends Error {
110
116
  data: this.data
111
117
  };
112
118
  }
119
+ /**
120
+ * Workaround for Next.js where different contexts use separate
121
+ * dependency graphs, causing multiple ORPCError constructors existing and breaking
122
+ * `instanceof` checks across contexts.
123
+ *
124
+ * This is particularly problematic with "Optimized SSR", where orpc-client
125
+ * executes in one context but is invoked from another. When an error is thrown
126
+ * in the execution context, `instanceof ORPCError` checks fail in the
127
+ * invocation context due to separate class constructors.
128
+ *
129
+ * @todo Remove this and related code if Next.js resolves the multiple dependency graph issue.
130
+ */
131
+ static [Symbol.hasInstance](instance) {
132
+ if (globalORPCErrorConstructors.has(this)) {
133
+ const constructor = getConstructor(instance);
134
+ if (constructor && globalORPCErrorConstructors.has(constructor)) {
135
+ return true;
136
+ }
137
+ }
138
+ return super[Symbol.hasInstance](instance);
139
+ }
113
140
  }
141
+ globalORPCErrorConstructors.add(ORPCError);
114
142
  function isDefinedError(error) {
115
143
  return error instanceof ORPCError && error.defined;
116
144
  }
@@ -140,36 +168,4 @@ function createORPCErrorFromJson(json, options = {}) {
140
168
  });
141
169
  }
142
170
 
143
- function mapEventIterator(iterator, maps) {
144
- return async function* () {
145
- try {
146
- while (true) {
147
- const { done, value } = await iterator.next();
148
- let mappedValue = await maps.value(value, done);
149
- if (mappedValue !== value) {
150
- const meta = getEventMeta(value);
151
- if (meta && isTypescriptObject(mappedValue)) {
152
- mappedValue = withEventMeta(mappedValue, meta);
153
- }
154
- }
155
- if (done) {
156
- return mappedValue;
157
- }
158
- yield mappedValue;
159
- }
160
- } catch (error) {
161
- let mappedError = await maps.error(error);
162
- if (mappedError !== error) {
163
- const meta = getEventMeta(error);
164
- if (meta && isTypescriptObject(mappedError)) {
165
- mappedError = withEventMeta(mappedError, meta);
166
- }
167
- }
168
- throw mappedError;
169
- } finally {
170
- await iterator.return?.();
171
- }
172
- }();
173
- }
174
-
175
- export { COMMON_ORPC_ERROR_DEFS as C, ORPCError as O, fallbackORPCErrorMessage as a, isORPCErrorStatus as b, isORPCErrorJson as c, createORPCErrorFromJson as d, fallbackORPCErrorStatus as f, isDefinedError as i, mapEventIterator as m, toORPCError as t };
171
+ export { COMMON_ORPC_ERROR_DEFS as C, ORPC_CLIENT_PACKAGE_NAME as O, ORPC_CLIENT_PACKAGE_VERSION as a, fallbackORPCErrorMessage as b, ORPCError as c, isORPCErrorStatus as d, isORPCErrorJson as e, fallbackORPCErrorStatus as f, createORPCErrorFromJson as g, isDefinedError as i, toORPCError as t };
@@ -1,6 +1,6 @@
1
- import { a as ClientContext, b as ClientOptions, d as HTTPMethod } from './client.CipPQkhk.js';
2
- import { e as StandardLinkCodec, b as StandardLinkOptions, d as StandardLink, f as StandardLinkClient } from './client.FvDtk0Vr.js';
3
- import { Segment, Value } from '@orpc/shared';
1
+ import { b as ClientContext, c as ClientOptions, f as HTTPMethod } from './client.i2uoJbEp.js';
2
+ import { e as StandardLinkCodec, b as StandardLinkOptions, d as StandardLink, f as StandardLinkClient } from './client.2jUAqzYU.js';
3
+ import { Segment, Value, Promisable } from '@orpc/shared';
4
4
  import { StandardHeaders, StandardRequest, StandardLazyResponse } from '@orpc/standard-server';
5
5
 
6
6
  declare const STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES: {
@@ -44,30 +44,30 @@ interface StandardRPCLinkCodecOptions<T extends ClientContext> {
44
44
  /**
45
45
  * Base url for all requests.
46
46
  */
47
- url: Value<string | URL, [options: ClientOptions<T>, path: readonly string[], input: unknown]>;
47
+ url: Value<Promisable<string | URL>, [options: ClientOptions<T>, path: readonly string[], input: unknown]>;
48
48
  /**
49
49
  * The maximum length of the URL.
50
50
  *
51
51
  * @default 2083
52
52
  */
53
- maxUrlLength?: Value<number, [options: ClientOptions<T>, path: readonly string[], input: unknown]>;
53
+ maxUrlLength?: Value<Promisable<number>, [options: ClientOptions<T>, path: readonly string[], input: unknown]>;
54
54
  /**
55
55
  * The method used to make the request.
56
56
  *
57
57
  * @default 'POST'
58
58
  */
59
- method?: Value<HTTPMethod, [options: ClientOptions<T>, path: readonly string[], input: unknown]>;
59
+ method?: Value<Promisable<Exclude<HTTPMethod, 'HEAD'>>, [options: ClientOptions<T>, path: readonly string[], input: unknown]>;
60
60
  /**
61
61
  * The method to use when the payload cannot safely pass to the server with method return from method function.
62
62
  * GET is not allowed, it's very dangerous.
63
63
  *
64
64
  * @default 'POST'
65
65
  */
66
- fallbackMethod?: Exclude<HTTPMethod, 'GET'>;
66
+ fallbackMethod?: Exclude<HTTPMethod, 'HEAD' | 'GET'>;
67
67
  /**
68
68
  * Inject headers to the request.
69
69
  */
70
- headers?: Value<StandardHeaders, [options: ClientOptions<T>, path: readonly string[], input: unknown]>;
70
+ headers?: Value<Promisable<StandardHeaders | Headers>, [options: ClientOptions<T>, path: readonly string[], input: unknown]>;
71
71
  }
72
72
  declare class StandardRPCLinkCodec<T extends ClientContext> implements StandardLinkCodec<T> {
73
73
  private readonly serializer;
@@ -87,4 +87,5 @@ declare class StandardRPCLink<T extends ClientContext> extends StandardLink<T> {
87
87
  constructor(linkClient: StandardLinkClient<T>, options: StandardRPCLinkOptions<T>);
88
88
  }
89
89
 
90
- export { STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES as S, type StandardRPCJsonSerializedMetaItem as a, type StandardRPCJsonSerialized as b, type StandardRPCCustomJsonSerializer as c, type StandardRPCJsonSerializerOptions as d, StandardRPCJsonSerializer as e, type StandardRPCLinkOptions as f, StandardRPCLink as g, type StandardRPCLinkCodecOptions as h, StandardRPCLinkCodec as i, StandardRPCSerializer as j };
90
+ export { STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES as S, StandardRPCJsonSerializer as e, StandardRPCLink as g, StandardRPCLinkCodec as i, StandardRPCSerializer as j };
91
+ export type { StandardRPCJsonSerializedMetaItem as a, StandardRPCJsonSerialized as b, StandardRPCCustomJsonSerializer as c, StandardRPCJsonSerializerOptions as d, StandardRPCLinkOptions as f, StandardRPCLinkCodecOptions as h };
@@ -1,6 +1,6 @@
1
- import { a as ClientContext, b as ClientOptions, d as HTTPMethod } from './client.CipPQkhk.mjs';
2
- import { e as StandardLinkCodec, b as StandardLinkOptions, d as StandardLink, f as StandardLinkClient } from './client.Bt2hFtM_.mjs';
3
- import { Segment, Value } from '@orpc/shared';
1
+ import { b as ClientContext, c as ClientOptions, f as HTTPMethod } from './client.i2uoJbEp.mjs';
2
+ import { e as StandardLinkCodec, b as StandardLinkOptions, d as StandardLink, f as StandardLinkClient } from './client.CpCa3si8.mjs';
3
+ import { Segment, Value, Promisable } from '@orpc/shared';
4
4
  import { StandardHeaders, StandardRequest, StandardLazyResponse } from '@orpc/standard-server';
5
5
 
6
6
  declare const STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES: {
@@ -44,30 +44,30 @@ interface StandardRPCLinkCodecOptions<T extends ClientContext> {
44
44
  /**
45
45
  * Base url for all requests.
46
46
  */
47
- url: Value<string | URL, [options: ClientOptions<T>, path: readonly string[], input: unknown]>;
47
+ url: Value<Promisable<string | URL>, [options: ClientOptions<T>, path: readonly string[], input: unknown]>;
48
48
  /**
49
49
  * The maximum length of the URL.
50
50
  *
51
51
  * @default 2083
52
52
  */
53
- maxUrlLength?: Value<number, [options: ClientOptions<T>, path: readonly string[], input: unknown]>;
53
+ maxUrlLength?: Value<Promisable<number>, [options: ClientOptions<T>, path: readonly string[], input: unknown]>;
54
54
  /**
55
55
  * The method used to make the request.
56
56
  *
57
57
  * @default 'POST'
58
58
  */
59
- method?: Value<HTTPMethod, [options: ClientOptions<T>, path: readonly string[], input: unknown]>;
59
+ method?: Value<Promisable<Exclude<HTTPMethod, 'HEAD'>>, [options: ClientOptions<T>, path: readonly string[], input: unknown]>;
60
60
  /**
61
61
  * The method to use when the payload cannot safely pass to the server with method return from method function.
62
62
  * GET is not allowed, it's very dangerous.
63
63
  *
64
64
  * @default 'POST'
65
65
  */
66
- fallbackMethod?: Exclude<HTTPMethod, 'GET'>;
66
+ fallbackMethod?: Exclude<HTTPMethod, 'HEAD' | 'GET'>;
67
67
  /**
68
68
  * Inject headers to the request.
69
69
  */
70
- headers?: Value<StandardHeaders, [options: ClientOptions<T>, path: readonly string[], input: unknown]>;
70
+ headers?: Value<Promisable<StandardHeaders | Headers>, [options: ClientOptions<T>, path: readonly string[], input: unknown]>;
71
71
  }
72
72
  declare class StandardRPCLinkCodec<T extends ClientContext> implements StandardLinkCodec<T> {
73
73
  private readonly serializer;
@@ -87,4 +87,5 @@ declare class StandardRPCLink<T extends ClientContext> extends StandardLink<T> {
87
87
  constructor(linkClient: StandardLinkClient<T>, options: StandardRPCLinkOptions<T>);
88
88
  }
89
89
 
90
- export { STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES as S, type StandardRPCJsonSerializedMetaItem as a, type StandardRPCJsonSerialized as b, type StandardRPCCustomJsonSerializer as c, type StandardRPCJsonSerializerOptions as d, StandardRPCJsonSerializer as e, type StandardRPCLinkOptions as f, StandardRPCLink as g, type StandardRPCLinkCodecOptions as h, StandardRPCLinkCodec as i, StandardRPCSerializer as j };
90
+ export { STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES as S, StandardRPCJsonSerializer as e, StandardRPCLink as g, StandardRPCLinkCodec as i, StandardRPCSerializer as j };
91
+ export type { StandardRPCJsonSerializedMetaItem as a, StandardRPCJsonSerialized as b, StandardRPCCustomJsonSerializer as c, StandardRPCJsonSerializerOptions as d, StandardRPCLinkOptions as f, StandardRPCLinkCodecOptions as h };