@orpc/client 0.0.0-next.d16a1b6 → 0.0.0-next.d1f8ea3

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.
@@ -1,48 +1,25 @@
1
- import { intercept, isAsyncIteratorObject, value, isObject, stringifyJSON, trim } from '@orpc/shared';
2
- import { c as createAutoRetryEventIterator, m as mapEventIterator, t as toORPCError, O as ORPCError } from './client.DcaJQZfy.mjs';
3
- import { ErrorEvent } from '@orpc/standard-server';
1
+ import { toArray, intercept, isObject, value, isAsyncIteratorObject, stringifyJSON } from '@orpc/shared';
2
+ import { mergeStandardHeaders, ErrorEvent } from '@orpc/standard-server';
3
+ import { b as isORPCErrorStatus, O as ORPCError, m as mapEventIterator, t as toORPCError } from './client.jKEwIsRd.mjs';
4
4
 
5
5
  class InvalidEventIteratorRetryResponse extends Error {
6
6
  }
7
7
  class StandardLink {
8
- constructor(codec, sender, options) {
8
+ constructor(codec, sender, options = {}) {
9
9
  this.codec = codec;
10
10
  this.sender = sender;
11
- this.eventIteratorMaxRetries = options.eventIteratorMaxRetries ?? 5;
12
- this.eventIteratorRetryDelay = options.eventIteratorRetryDelay ?? ((o) => o.lastRetry ?? 1e3 * 2 ** o.retryTimes);
13
- this.eventIteratorShouldRetry = options.eventIteratorShouldRetry ?? true;
14
- this.interceptors = options.interceptors ?? [];
15
- this.clientInterceptors = options.clientInterceptors ?? [];
11
+ for (const plugin of toArray(options.plugins)) {
12
+ plugin.init?.(options);
13
+ }
14
+ this.interceptors = toArray(options.interceptors);
15
+ this.clientInterceptors = toArray(options.clientInterceptors);
16
16
  }
17
- eventIteratorMaxRetries;
18
- eventIteratorRetryDelay;
19
- eventIteratorShouldRetry;
20
17
  interceptors;
21
18
  clientInterceptors;
22
19
  call(path, input, options) {
23
20
  return intercept(this.interceptors, { path, input, options }, async ({ path: path2, input: input2, options: options2 }) => {
24
21
  const output = await this.#call(path2, input2, options2);
25
- if (!isAsyncIteratorObject(output)) {
26
- return output;
27
- }
28
- return createAutoRetryEventIterator(output, async (reconnectOptions) => {
29
- const maxRetries = await value(this.eventIteratorMaxRetries, reconnectOptions, options2, path2, input2);
30
- if (options2.signal?.aborted || reconnectOptions.retryTimes > maxRetries) {
31
- return null;
32
- }
33
- const shouldRetry = await value(this.eventIteratorShouldRetry, reconnectOptions, options2, path2, input2);
34
- if (!shouldRetry) {
35
- return null;
36
- }
37
- const retryDelay = await value(this.eventIteratorRetryDelay, reconnectOptions, options2, path2, input2);
38
- await new Promise((resolve) => setTimeout(resolve, retryDelay));
39
- const updatedOptions = { ...options2, lastEventId: reconnectOptions.lastEventId };
40
- const maybeIterator = await this.#call(path2, input2, updatedOptions);
41
- if (!isAsyncIteratorObject(maybeIterator)) {
42
- throw new InvalidEventIteratorRetryResponse("Invalid EventSource retry response");
43
- }
44
- return maybeIterator;
45
- }, options2.lastEventId);
22
+ return output;
46
23
  });
47
24
  }
48
25
  async #call(path, input, options) {
@@ -57,50 +34,74 @@ class StandardLink {
57
34
  }
58
35
  }
59
36
 
60
- class RPCJsonSerializer {
37
+ const STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES = {
38
+ BIGINT: 0,
39
+ DATE: 1,
40
+ NAN: 2,
41
+ UNDEFINED: 3,
42
+ URL: 4,
43
+ REGEXP: 5,
44
+ SET: 6,
45
+ MAP: 7
46
+ };
47
+ class StandardRPCJsonSerializer {
48
+ customSerializers;
49
+ constructor(options = {}) {
50
+ this.customSerializers = options.customJsonSerializers ?? [];
51
+ if (this.customSerializers.length !== new Set(this.customSerializers.map((custom) => custom.type)).size) {
52
+ throw new Error("Custom serializer type must be unique.");
53
+ }
54
+ }
61
55
  serialize(data, segments = [], meta = [], maps = [], blobs = []) {
56
+ for (const custom of this.customSerializers) {
57
+ if (custom.condition(data)) {
58
+ const result = this.serialize(custom.serialize(data), segments, meta, maps, blobs);
59
+ meta.push([custom.type, ...segments]);
60
+ return result;
61
+ }
62
+ }
62
63
  if (data instanceof Blob) {
63
64
  maps.push(segments);
64
65
  blobs.push(data);
65
66
  return [data, meta, maps, blobs];
66
67
  }
67
68
  if (typeof data === "bigint") {
68
- meta.push([0, segments]);
69
+ meta.push([STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES.BIGINT, ...segments]);
69
70
  return [data.toString(), meta, maps, blobs];
70
71
  }
71
72
  if (data instanceof Date) {
72
- meta.push([1, segments]);
73
+ meta.push([STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES.DATE, ...segments]);
73
74
  if (Number.isNaN(data.getTime())) {
74
75
  return [null, meta, maps, blobs];
75
76
  }
76
77
  return [data.toISOString(), meta, maps, blobs];
77
78
  }
78
79
  if (Number.isNaN(data)) {
79
- meta.push([2, segments]);
80
+ meta.push([STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES.NAN, ...segments]);
80
81
  return [null, meta, maps, blobs];
81
82
  }
82
83
  if (data instanceof URL) {
83
- meta.push([4, segments]);
84
+ meta.push([STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES.URL, ...segments]);
84
85
  return [data.toString(), meta, maps, blobs];
85
86
  }
86
87
  if (data instanceof RegExp) {
87
- meta.push([5, segments]);
88
+ meta.push([STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES.REGEXP, ...segments]);
88
89
  return [data.toString(), meta, maps, blobs];
89
90
  }
90
91
  if (data instanceof Set) {
91
92
  const result = this.serialize(Array.from(data), segments, meta, maps, blobs);
92
- meta.push([6, segments]);
93
+ meta.push([STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES.SET, ...segments]);
93
94
  return result;
94
95
  }
95
96
  if (data instanceof Map) {
96
97
  const result = this.serialize(Array.from(data.entries()), segments, meta, maps, blobs);
97
- meta.push([7, segments]);
98
+ meta.push([STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES.MAP, ...segments]);
98
99
  return result;
99
100
  }
100
101
  if (Array.isArray(data)) {
101
102
  const json = data.map((v, i) => {
102
103
  if (v === void 0) {
103
- meta.push([3, [...segments, i]]);
104
+ meta.push([STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES.UNDEFINED, ...segments, i]);
104
105
  return v;
105
106
  }
106
107
  return this.serialize(v, [...segments, i], meta, maps, blobs)[0];
@@ -110,6 +111,9 @@ class RPCJsonSerializer {
110
111
  if (isObject(data)) {
111
112
  const json = {};
112
113
  for (const k in data) {
114
+ if (k === "toJSON" && typeof data[k] === "function") {
115
+ continue;
116
+ }
113
117
  json[k] = this.serialize(data[k], [...segments, k], meta, maps, blobs)[0];
114
118
  }
115
119
  return [json, meta, maps, blobs];
@@ -129,38 +133,45 @@ class RPCJsonSerializer {
129
133
  currentRef[preSegment] = getBlob(i);
130
134
  });
131
135
  }
132
- for (const [type, segments] of meta) {
136
+ for (const item of meta) {
137
+ const type = item[0];
133
138
  let currentRef = ref;
134
139
  let preSegment = "data";
135
- segments.forEach((segment) => {
140
+ for (let i = 1; i < item.length; i++) {
136
141
  currentRef = currentRef[preSegment];
137
- preSegment = segment;
138
- });
142
+ preSegment = item[i];
143
+ }
144
+ for (const custom of this.customSerializers) {
145
+ if (custom.type === type) {
146
+ currentRef[preSegment] = custom.deserialize(currentRef[preSegment]);
147
+ break;
148
+ }
149
+ }
139
150
  switch (type) {
140
- case 0:
151
+ case STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES.BIGINT:
141
152
  currentRef[preSegment] = BigInt(currentRef[preSegment]);
142
153
  break;
143
- case 1:
154
+ case STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES.DATE:
144
155
  currentRef[preSegment] = new Date(currentRef[preSegment] ?? "Invalid Date");
145
156
  break;
146
- case 2:
157
+ case STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES.NAN:
147
158
  currentRef[preSegment] = Number.NaN;
148
159
  break;
149
- case 3:
160
+ case STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES.UNDEFINED:
150
161
  currentRef[preSegment] = void 0;
151
162
  break;
152
- case 4:
163
+ case STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES.URL:
153
164
  currentRef[preSegment] = new URL(currentRef[preSegment]);
154
165
  break;
155
- case 5: {
166
+ case STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES.REGEXP: {
156
167
  const [, pattern, flags] = currentRef[preSegment].match(/^\/(.*)\/([a-z]*)$/);
157
168
  currentRef[preSegment] = new RegExp(pattern, flags);
158
169
  break;
159
170
  }
160
- case 6:
171
+ case STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES.SET:
161
172
  currentRef[preSegment] = new Set(currentRef[preSegment]);
162
173
  break;
163
- case 7:
174
+ case STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES.MAP:
164
175
  currentRef[preSegment] = new Map(currentRef[preSegment]);
165
176
  break;
166
177
  }
@@ -169,8 +180,89 @@ class RPCJsonSerializer {
169
180
  }
170
181
  }
171
182
 
172
- class RPCSerializer {
173
- constructor(jsonSerializer = new RPCJsonSerializer()) {
183
+ function toHttpPath(path) {
184
+ return `/${path.map(encodeURIComponent).join("/")}`;
185
+ }
186
+
187
+ class StandardRPCLinkCodec {
188
+ constructor(serializer, options) {
189
+ this.serializer = serializer;
190
+ this.baseUrl = options.url;
191
+ this.maxUrlLength = options.maxUrlLength ?? 2083;
192
+ this.fallbackMethod = options.fallbackMethod ?? "POST";
193
+ this.expectedMethod = options.method ?? this.fallbackMethod;
194
+ this.headers = options.headers ?? {};
195
+ }
196
+ baseUrl;
197
+ maxUrlLength;
198
+ fallbackMethod;
199
+ expectedMethod;
200
+ headers;
201
+ async encode(path, input, options) {
202
+ const expectedMethod = await value(this.expectedMethod, options, path, input);
203
+ let headers = await value(this.headers, options, path, input);
204
+ const baseUrl = await value(this.baseUrl, options, path, input);
205
+ const url = new URL(`${baseUrl.toString().replace(/\/$/, "")}${toHttpPath(path)}`);
206
+ if (options.lastEventId !== void 0) {
207
+ headers = mergeStandardHeaders(headers, { "last-event-id": options.lastEventId });
208
+ }
209
+ const serialized = this.serializer.serialize(input);
210
+ if (expectedMethod === "GET" && !(serialized instanceof FormData) && !isAsyncIteratorObject(serialized)) {
211
+ const maxUrlLength = await value(this.maxUrlLength, options, path, input);
212
+ const getUrl = new URL(url);
213
+ getUrl.searchParams.append("data", stringifyJSON(serialized));
214
+ if (getUrl.toString().length <= maxUrlLength) {
215
+ return {
216
+ body: void 0,
217
+ method: expectedMethod,
218
+ headers,
219
+ url: getUrl,
220
+ signal: options.signal
221
+ };
222
+ }
223
+ }
224
+ return {
225
+ url,
226
+ method: expectedMethod === "GET" ? this.fallbackMethod : expectedMethod,
227
+ headers,
228
+ body: serialized,
229
+ signal: options.signal
230
+ };
231
+ }
232
+ async decode(response) {
233
+ const isOk = !isORPCErrorStatus(response.status);
234
+ const deserialized = await (async () => {
235
+ let isBodyOk = false;
236
+ try {
237
+ const body = await response.body();
238
+ isBodyOk = true;
239
+ return this.serializer.deserialize(body);
240
+ } catch (error) {
241
+ if (!isBodyOk) {
242
+ throw new Error("Cannot parse response body, please check the response body and content-type.", {
243
+ cause: error
244
+ });
245
+ }
246
+ throw new Error("Invalid RPC response format.", {
247
+ cause: error
248
+ });
249
+ }
250
+ })();
251
+ if (!isOk) {
252
+ if (ORPCError.isValidJSON(deserialized)) {
253
+ throw ORPCError.fromJSON(deserialized);
254
+ }
255
+ throw new ORPCError("MALFORMED_ORPC_ERROR_RESPONSE", {
256
+ status: response.status,
257
+ data: deserialized
258
+ });
259
+ }
260
+ return deserialized;
261
+ }
262
+ }
263
+
264
+ class StandardRPCSerializer {
265
+ constructor(jsonSerializer) {
174
266
  this.jsonSerializer = jsonSerializer;
175
267
  }
176
268
  serialize(data) {
@@ -188,9 +280,6 @@ class RPCSerializer {
188
280
  return this.#serialize(data, true);
189
281
  }
190
282
  #serialize(data, enableFormData) {
191
- if (data === void 0 || data instanceof Blob) {
192
- return data;
193
- }
194
283
  const [json, meta_, maps, blobs] = this.jsonSerializer.serialize(data);
195
284
  const meta = meta_.length === 0 ? void 0 : meta_;
196
285
  if (!enableFormData || blobs.length === 0) {
@@ -228,9 +317,6 @@ class RPCSerializer {
228
317
  return this.#deserialize(data);
229
318
  }
230
319
  #deserialize(data) {
231
- if (data === void 0 || data instanceof Blob) {
232
- return data;
233
- }
234
320
  if (!(data instanceof FormData)) {
235
321
  return this.jsonSerializer.deserialize(data.json, data.meta ?? []);
236
322
  }
@@ -244,78 +330,4 @@ class RPCSerializer {
244
330
  }
245
331
  }
246
332
 
247
- class StandardRPCLinkCodec {
248
- baseUrl;
249
- maxUrlLength;
250
- fallbackMethod;
251
- expectedMethod;
252
- headers;
253
- rpcSerializer;
254
- constructor(options) {
255
- this.baseUrl = options.url;
256
- this.maxUrlLength = options.maxUrlLength ?? 2083;
257
- this.fallbackMethod = options.fallbackMethod ?? "POST";
258
- this.expectedMethod = options.method ?? this.fallbackMethod;
259
- this.headers = options.headers ?? {};
260
- this.rpcSerializer = options.rpcSerializer ?? new RPCSerializer();
261
- }
262
- async encode(path, input, options) {
263
- const expectedMethod = await value(this.expectedMethod, options, path, input);
264
- const headers = await value(this.headers, options, path, input);
265
- const baseUrl = await value(this.baseUrl, options, path, input);
266
- const url = new URL(`${trim(baseUrl.toString(), "/")}/${path.map(encodeURIComponent).join("/")}`);
267
- const serialized = this.rpcSerializer.serialize(input);
268
- if (expectedMethod === "GET" && !(serialized instanceof FormData) && !(serialized instanceof Blob) && !isAsyncIteratorObject(serialized)) {
269
- const maxUrlLength = await value(this.maxUrlLength, options, path, input);
270
- const getUrl = new URL(url);
271
- getUrl.searchParams.append("data", stringifyJSON(serialized) ?? "");
272
- if (getUrl.toString().length <= maxUrlLength) {
273
- return {
274
- body: void 0,
275
- method: expectedMethod,
276
- headers,
277
- url: getUrl,
278
- signal: options.signal
279
- };
280
- }
281
- }
282
- return {
283
- url,
284
- method: expectedMethod === "GET" ? this.fallbackMethod : expectedMethod,
285
- headers,
286
- body: serialized,
287
- signal: options.signal
288
- };
289
- }
290
- async decode(response) {
291
- const isOk = response.status >= 200 && response.status < 300;
292
- const deserialized = await (async () => {
293
- let isBodyOk = false;
294
- try {
295
- const body = await response.body();
296
- isBodyOk = true;
297
- return this.rpcSerializer.deserialize(body);
298
- } catch (error) {
299
- if (!isBodyOk) {
300
- throw new Error("Cannot parse response body, please check the response body and content-type.", {
301
- cause: error
302
- });
303
- }
304
- throw new Error("Invalid RPC response format.", {
305
- cause: error
306
- });
307
- }
308
- })();
309
- if (!isOk) {
310
- if (ORPCError.isValidJSON(deserialized)) {
311
- throw ORPCError.fromJSON(deserialized);
312
- }
313
- throw new Error("Invalid RPC error response format.", {
314
- cause: deserialized
315
- });
316
- }
317
- return deserialized;
318
- }
319
- }
320
-
321
- export { InvalidEventIteratorRetryResponse as I, RPCJsonSerializer as R, StandardLink as S, StandardRPCLinkCodec as a, RPCSerializer as b };
333
+ export { InvalidEventIteratorRetryResponse as I, StandardLink as S, STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES as a, StandardRPCJsonSerializer as b, StandardRPCLinkCodec as c, StandardRPCSerializer as d, toHttpPath as t };
@@ -0,0 +1,39 @@
1
+ import { Interceptor, ThrowableError } from '@orpc/shared';
2
+ import { StandardRequest, StandardLazyResponse } from '@orpc/standard-server';
3
+ import { a as ClientContext, b as ClientOptions, C as ClientLink } from './client.3Fsj0tpH.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
+ }
12
+
13
+ declare class InvalidEventIteratorRetryResponse extends Error {
14
+ }
15
+ interface StandardLinkPlugin<T extends ClientContext> {
16
+ init?(options: StandardLinkOptions<T>): void;
17
+ }
18
+ interface StandardLinkOptions<T extends ClientContext> {
19
+ interceptors?: Interceptor<{
20
+ path: readonly string[];
21
+ input: unknown;
22
+ options: ClientOptions<T>;
23
+ }, unknown, ThrowableError>[];
24
+ clientInterceptors?: Interceptor<{
25
+ request: StandardRequest;
26
+ }, StandardLazyResponse, ThrowableError>[];
27
+ plugins?: StandardLinkPlugin<T>[];
28
+ }
29
+ declare class StandardLink<T extends ClientContext> implements ClientLink<T> {
30
+ #private;
31
+ readonly codec: StandardLinkCodec<T>;
32
+ readonly sender: StandardLinkClient<T>;
33
+ private readonly interceptors;
34
+ private readonly clientInterceptors;
35
+ constructor(codec: StandardLinkCodec<T>, sender: StandardLinkClient<T>, options?: StandardLinkOptions<T>);
36
+ call(path: readonly string[], input: unknown, options: ClientOptions<T>): Promise<unknown>;
37
+ }
38
+
39
+ export { InvalidEventIteratorRetryResponse as I, type StandardLinkPlugin as S, type StandardLinkOptions as a, StandardLink as b, type StandardLinkCodec as c, type StandardLinkClient as d };
@@ -0,0 +1,39 @@
1
+ import { Interceptor, ThrowableError } from '@orpc/shared';
2
+ import { StandardRequest, StandardLazyResponse } from '@orpc/standard-server';
3
+ import { a as ClientContext, b as ClientOptions, C as ClientLink } from './client.3Fsj0tpH.mjs';
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
+ }
12
+
13
+ declare class InvalidEventIteratorRetryResponse extends Error {
14
+ }
15
+ interface StandardLinkPlugin<T extends ClientContext> {
16
+ init?(options: StandardLinkOptions<T>): void;
17
+ }
18
+ interface StandardLinkOptions<T extends ClientContext> {
19
+ interceptors?: Interceptor<{
20
+ path: readonly string[];
21
+ input: unknown;
22
+ options: ClientOptions<T>;
23
+ }, unknown, ThrowableError>[];
24
+ clientInterceptors?: Interceptor<{
25
+ request: StandardRequest;
26
+ }, StandardLazyResponse, ThrowableError>[];
27
+ plugins?: StandardLinkPlugin<T>[];
28
+ }
29
+ declare class StandardLink<T extends ClientContext> implements ClientLink<T> {
30
+ #private;
31
+ readonly codec: StandardLinkCodec<T>;
32
+ readonly sender: StandardLinkClient<T>;
33
+ private readonly interceptors;
34
+ private readonly clientInterceptors;
35
+ constructor(codec: StandardLinkCodec<T>, sender: StandardLinkClient<T>, options?: StandardLinkOptions<T>);
36
+ call(path: readonly string[], input: unknown, options: ClientOptions<T>): Promise<unknown>;
37
+ }
38
+
39
+ export { InvalidEventIteratorRetryResponse as I, type StandardLinkPlugin as S, type StandardLinkOptions as a, StandardLink as b, type StandardLinkCodec as c, type StandardLinkClient as d };
@@ -1,4 +1,4 @@
1
- import { isObject, isTypescriptObject, retry } from '@orpc/shared';
1
+ import { isObject, isTypescriptObject } from '@orpc/shared';
2
2
  import { getEventMeta, withEventMeta } from '@orpc/standard-server';
3
3
 
4
4
  const COMMON_ORPC_ERROR_DEFS = {
@@ -91,8 +91,8 @@ class ORPCError extends Error {
91
91
  status;
92
92
  data;
93
93
  constructor(code, ...[options]) {
94
- if (options?.status && (options.status < 400 || options.status >= 600)) {
95
- throw new Error("[ORPCError] The error status code must be in the 400-599 range.");
94
+ if (options?.status && !isORPCErrorStatus(options.status)) {
95
+ throw new Error("[ORPCError] Invalid error status code.");
96
96
  }
97
97
  const message = fallbackORPCErrorMessage(code, options?.message);
98
98
  super(message, options);
@@ -136,32 +136,8 @@ function toORPCError(error) {
136
136
  cause: error
137
137
  });
138
138
  }
139
-
140
- const iteratorStates = /* @__PURE__ */ new WeakMap();
141
- function registerEventIteratorState(iterator, state) {
142
- iteratorStates.set(iterator, state);
143
- }
144
- function updateEventIteratorStatus(state, status) {
145
- if (state.status !== status) {
146
- state.status = status;
147
- state.listeners.forEach((cb) => cb(status));
148
- }
149
- }
150
- function onEventIteratorStatusChange(iterator, callback, notifyImmediately = true) {
151
- const state = iteratorStates.get(iterator);
152
- if (!state) {
153
- throw new Error("Iterator is not registered.");
154
- }
155
- if (notifyImmediately) {
156
- callback(state.status);
157
- }
158
- state.listeners.push(callback);
159
- return () => {
160
- const index = state.listeners.indexOf(callback);
161
- if (index !== -1) {
162
- state.listeners.splice(index, 1);
163
- }
164
- };
139
+ function isORPCErrorStatus(status) {
140
+ return status < 200 || status >= 400;
165
141
  }
166
142
 
167
143
  function mapEventIterator(iterator, maps) {
@@ -195,71 +171,5 @@ function mapEventIterator(iterator, maps) {
195
171
  }
196
172
  }();
197
173
  }
198
- const MAX_ALLOWED_RETRY_TIMES = 99;
199
- function createAutoRetryEventIterator(initial, reconnect, initialLastEventId) {
200
- const state = {
201
- status: "connected",
202
- listeners: []
203
- };
204
- const iterator = async function* () {
205
- let current = initial;
206
- let lastEventId = initialLastEventId;
207
- let lastRetry;
208
- let retryTimes = 0;
209
- try {
210
- while (true) {
211
- try {
212
- updateEventIteratorStatus(state, "connected");
213
- const { done, value } = await current.next();
214
- const meta = getEventMeta(value);
215
- lastEventId = meta?.id ?? lastEventId;
216
- lastRetry = meta?.retry ?? lastRetry;
217
- retryTimes = 0;
218
- if (done) {
219
- return value;
220
- }
221
- yield value;
222
- } catch (e) {
223
- updateEventIteratorStatus(state, "reconnecting");
224
- const meta = getEventMeta(e);
225
- lastEventId = meta?.id ?? lastEventId;
226
- lastRetry = meta?.retry ?? lastRetry;
227
- let currentError = e;
228
- current = await retry({ times: MAX_ALLOWED_RETRY_TIMES }, async (exit) => {
229
- retryTimes += 1;
230
- if (retryTimes > MAX_ALLOWED_RETRY_TIMES) {
231
- throw exit(new Error(
232
- `Exceeded maximum retry attempts (${MAX_ALLOWED_RETRY_TIMES}) for event iterator. Possible infinite retry loop detected. Please review the retry logic.`,
233
- { cause: currentError }
234
- ));
235
- }
236
- const reconnected = await (async () => {
237
- try {
238
- return await reconnect({
239
- lastRetry,
240
- lastEventId,
241
- retryTimes,
242
- error: currentError
243
- });
244
- } catch (e2) {
245
- currentError = e2;
246
- throw e2;
247
- }
248
- })();
249
- if (!reconnected) {
250
- throw exit(currentError);
251
- }
252
- return reconnected;
253
- });
254
- }
255
- }
256
- } finally {
257
- updateEventIteratorStatus(state, "closed");
258
- await current.return?.();
259
- }
260
- }();
261
- registerEventIteratorState(iterator, state);
262
- return iterator;
263
- }
264
174
 
265
- export { COMMON_ORPC_ERROR_DEFS as C, ORPCError as O, fallbackORPCErrorMessage as a, createAutoRetryEventIterator as c, fallbackORPCErrorStatus as f, isDefinedError as i, mapEventIterator as m, onEventIteratorStatusChange as o, registerEventIteratorState as r, toORPCError as t, updateEventIteratorStatus as u };
175
+ export { COMMON_ORPC_ERROR_DEFS as C, ORPCError as O, fallbackORPCErrorMessage as a, isORPCErrorStatus as b, fallbackORPCErrorStatus as f, isDefinedError as i, mapEventIterator as m, toORPCError as t };
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@orpc/client",
3
3
  "type": "module",
4
- "version": "0.0.0-next.d16a1b6",
4
+ "version": "0.0.0-next.d1f8ea3",
5
5
  "license": "MIT",
6
6
  "homepage": "https://orpc.unnoq.com",
7
7
  "repository": {
@@ -19,6 +19,11 @@
19
19
  "import": "./dist/index.mjs",
20
20
  "default": "./dist/index.mjs"
21
21
  },
22
+ "./plugins": {
23
+ "types": "./dist/plugins/index.d.mts",
24
+ "import": "./dist/plugins/index.mjs",
25
+ "default": "./dist/plugins/index.mjs"
26
+ },
22
27
  "./standard": {
23
28
  "types": "./dist/adapters/standard/index.d.mts",
24
29
  "import": "./dist/adapters/standard/index.mjs",
@@ -34,12 +39,12 @@
34
39
  "dist"
35
40
  ],
36
41
  "dependencies": {
37
- "@orpc/shared": "0.0.0-next.d16a1b6",
38
- "@orpc/standard-server": "0.0.0-next.d16a1b6",
39
- "@orpc/standard-server-fetch": "0.0.0-next.d16a1b6"
42
+ "@orpc/standard-server": "0.0.0-next.d1f8ea3",
43
+ "@orpc/shared": "0.0.0-next.d1f8ea3",
44
+ "@orpc/standard-server-fetch": "0.0.0-next.d1f8ea3"
40
45
  },
41
46
  "devDependencies": {
42
- "zod": "^3.24.1"
47
+ "zod": "^3.24.2"
43
48
  },
44
49
  "scripts": {
45
50
  "build": "unbuild",
@@ -1,42 +0,0 @@
1
- type ClientContext = Record<string, any>;
2
- type ClientOptions<TClientContext extends ClientContext> = {
3
- signal?: AbortSignal;
4
- lastEventId?: string | undefined;
5
- } & (Record<never, never> extends TClientContext ? {
6
- context?: TClientContext;
7
- } : {
8
- context: TClientContext;
9
- });
10
- type ClientRest<TClientContext extends ClientContext, TInput> = Record<never, never> extends TClientContext ? undefined extends TInput ? [input?: TInput, options?: ClientOptions<TClientContext>] : [input: TInput, options?: ClientOptions<TClientContext>] : [input: TInput, options: ClientOptions<TClientContext>];
11
- type ClientPromiseResult<TOutput, TError extends Error> = Promise<TOutput> & {
12
- __error?: {
13
- type: TError;
14
- };
15
- };
16
- interface Client<TClientContext extends ClientContext, TInput, TOutput, TError extends Error> {
17
- (...rest: ClientRest<TClientContext, TInput>): ClientPromiseResult<TOutput, TError>;
18
- }
19
- type NestedClient<TClientContext extends ClientContext> = Client<TClientContext, any, any, any> | {
20
- [k: string]: NestedClient<TClientContext>;
21
- };
22
- type InferClientContext<T extends NestedClient<any>> = T extends NestedClient<infer U> ? U : never;
23
- type ClientOptionsOut<TClientContext extends ClientContext> = ClientOptions<TClientContext> & {
24
- context: TClientContext;
25
- };
26
- interface ClientLink<TClientContext extends ClientContext> {
27
- call: (path: readonly string[], input: unknown, options: ClientOptionsOut<TClientContext>) => Promise<unknown>;
28
- }
29
-
30
- declare function mapEventIterator<TYield, TReturn, TNext, TMap = TYield | TReturn>(iterator: AsyncIterator<TYield, TReturn, TNext>, maps: {
31
- value: (value: NoInfer<TYield | TReturn>, done: boolean | undefined) => Promise<TMap>;
32
- error: (error: unknown) => Promise<unknown>;
33
- }): AsyncGenerator<TMap, TMap, TNext>;
34
- interface EventIteratorReconnectOptions {
35
- lastRetry: number | undefined;
36
- lastEventId: string | undefined;
37
- retryTimes: number;
38
- error: unknown;
39
- }
40
- declare function createAutoRetryEventIterator<TYield, TReturn>(initial: AsyncIterator<TYield, TReturn, void>, reconnect: (options: EventIteratorReconnectOptions) => Promise<AsyncIterator<TYield, TReturn, void> | null>, initialLastEventId: string | undefined): AsyncGenerator<TYield, TReturn, void>;
41
-
42
- export { type ClientContext as C, type EventIteratorReconnectOptions as E, type InferClientContext as I, type NestedClient as N, type ClientOptionsOut as a, type ClientLink as b, type ClientPromiseResult as c, createAutoRetryEventIterator as d, type ClientOptions as e, type ClientRest as f, type Client as g, mapEventIterator as m };