@orpc/client 0.0.0-next.0f0c680 → 0.0.0-next.10ace4f
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.
- package/README.md +11 -0
- package/dist/adapters/fetch/index.d.mts +9 -12
- package/dist/adapters/fetch/index.d.ts +9 -12
- package/dist/adapters/fetch/index.mjs +5 -9
- package/dist/adapters/standard/index.d.mts +7 -152
- package/dist/adapters/standard/index.d.ts +7 -152
- package/dist/adapters/standard/index.mjs +2 -2
- package/dist/index.d.mts +20 -20
- package/dist/index.d.ts +20 -20
- package/dist/index.mjs +35 -33
- package/dist/plugins/index.d.mts +61 -0
- package/dist/plugins/index.d.ts +61 -0
- package/dist/plugins/index.mjs +126 -0
- package/dist/shared/client.5813Ufvs.d.mts +39 -0
- package/dist/shared/client.Bt94sjrK.d.mts +103 -0
- package/dist/shared/client.C0lT7w02.d.mts +30 -0
- package/dist/shared/client.C0lT7w02.d.ts +30 -0
- package/dist/shared/client.D-jrSuDb.d.ts +103 -0
- package/dist/shared/{client.Cwx-UcH5.mjs → client.D77bw0hs.mjs} +79 -68
- package/dist/shared/client.grRbC25r.d.ts +39 -0
- package/dist/shared/{client.XAn8cDTM.mjs → client.jKEwIsRd.mjs} +6 -97
- package/package.json +9 -4
- package/dist/shared/client.D_CzLDyB.d.mts +0 -42
- package/dist/shared/client.D_CzLDyB.d.ts +0 -42
|
@@ -1,48 +1,25 @@
|
|
|
1
|
-
import { intercept,
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
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
|
-
|
|
12
|
-
|
|
13
|
-
|
|
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
|
-
|
|
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 Event Iterator retry response");
|
|
43
|
-
}
|
|
44
|
-
return maybeIterator;
|
|
45
|
-
}, options2.lastEventId);
|
|
22
|
+
return output;
|
|
46
23
|
});
|
|
47
24
|
}
|
|
48
25
|
async #call(path, input, options) {
|
|
@@ -57,52 +34,74 @@ class StandardLink {
|
|
|
57
34
|
}
|
|
58
35
|
}
|
|
59
36
|
|
|
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
|
+
};
|
|
60
47
|
class StandardRPCJsonSerializer {
|
|
61
|
-
|
|
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
|
+
}
|
|
62
54
|
}
|
|
63
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
|
+
}
|
|
64
63
|
if (data instanceof Blob) {
|
|
65
64
|
maps.push(segments);
|
|
66
65
|
blobs.push(data);
|
|
67
66
|
return [data, meta, maps, blobs];
|
|
68
67
|
}
|
|
69
68
|
if (typeof data === "bigint") {
|
|
70
|
-
meta.push([
|
|
69
|
+
meta.push([STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES.BIGINT, ...segments]);
|
|
71
70
|
return [data.toString(), meta, maps, blobs];
|
|
72
71
|
}
|
|
73
72
|
if (data instanceof Date) {
|
|
74
|
-
meta.push([
|
|
73
|
+
meta.push([STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES.DATE, ...segments]);
|
|
75
74
|
if (Number.isNaN(data.getTime())) {
|
|
76
75
|
return [null, meta, maps, blobs];
|
|
77
76
|
}
|
|
78
77
|
return [data.toISOString(), meta, maps, blobs];
|
|
79
78
|
}
|
|
80
79
|
if (Number.isNaN(data)) {
|
|
81
|
-
meta.push([
|
|
80
|
+
meta.push([STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES.NAN, ...segments]);
|
|
82
81
|
return [null, meta, maps, blobs];
|
|
83
82
|
}
|
|
84
83
|
if (data instanceof URL) {
|
|
85
|
-
meta.push([
|
|
84
|
+
meta.push([STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES.URL, ...segments]);
|
|
86
85
|
return [data.toString(), meta, maps, blobs];
|
|
87
86
|
}
|
|
88
87
|
if (data instanceof RegExp) {
|
|
89
|
-
meta.push([
|
|
88
|
+
meta.push([STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES.REGEXP, ...segments]);
|
|
90
89
|
return [data.toString(), meta, maps, blobs];
|
|
91
90
|
}
|
|
92
91
|
if (data instanceof Set) {
|
|
93
92
|
const result = this.serialize(Array.from(data), segments, meta, maps, blobs);
|
|
94
|
-
meta.push([
|
|
93
|
+
meta.push([STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES.SET, ...segments]);
|
|
95
94
|
return result;
|
|
96
95
|
}
|
|
97
96
|
if (data instanceof Map) {
|
|
98
97
|
const result = this.serialize(Array.from(data.entries()), segments, meta, maps, blobs);
|
|
99
|
-
meta.push([
|
|
98
|
+
meta.push([STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES.MAP, ...segments]);
|
|
100
99
|
return result;
|
|
101
100
|
}
|
|
102
101
|
if (Array.isArray(data)) {
|
|
103
102
|
const json = data.map((v, i) => {
|
|
104
103
|
if (v === void 0) {
|
|
105
|
-
meta.push([
|
|
104
|
+
meta.push([STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES.UNDEFINED, ...segments, i]);
|
|
106
105
|
return v;
|
|
107
106
|
}
|
|
108
107
|
return this.serialize(v, [...segments, i], meta, maps, blobs)[0];
|
|
@@ -112,6 +111,9 @@ class StandardRPCJsonSerializer {
|
|
|
112
111
|
if (isObject(data)) {
|
|
113
112
|
const json = {};
|
|
114
113
|
for (const k in data) {
|
|
114
|
+
if (k === "toJSON" && typeof data[k] === "function") {
|
|
115
|
+
continue;
|
|
116
|
+
}
|
|
115
117
|
json[k] = this.serialize(data[k], [...segments, k], meta, maps, blobs)[0];
|
|
116
118
|
}
|
|
117
119
|
return [json, meta, maps, blobs];
|
|
@@ -131,38 +133,45 @@ class StandardRPCJsonSerializer {
|
|
|
131
133
|
currentRef[preSegment] = getBlob(i);
|
|
132
134
|
});
|
|
133
135
|
}
|
|
134
|
-
for (const
|
|
136
|
+
for (const item of meta) {
|
|
137
|
+
const type = item[0];
|
|
135
138
|
let currentRef = ref;
|
|
136
139
|
let preSegment = "data";
|
|
137
|
-
|
|
140
|
+
for (let i = 1; i < item.length; i++) {
|
|
138
141
|
currentRef = currentRef[preSegment];
|
|
139
|
-
preSegment =
|
|
140
|
-
}
|
|
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
|
+
}
|
|
141
150
|
switch (type) {
|
|
142
|
-
case
|
|
151
|
+
case STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES.BIGINT:
|
|
143
152
|
currentRef[preSegment] = BigInt(currentRef[preSegment]);
|
|
144
153
|
break;
|
|
145
|
-
case
|
|
154
|
+
case STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES.DATE:
|
|
146
155
|
currentRef[preSegment] = new Date(currentRef[preSegment] ?? "Invalid Date");
|
|
147
156
|
break;
|
|
148
|
-
case
|
|
157
|
+
case STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES.NAN:
|
|
149
158
|
currentRef[preSegment] = Number.NaN;
|
|
150
159
|
break;
|
|
151
|
-
case
|
|
160
|
+
case STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES.UNDEFINED:
|
|
152
161
|
currentRef[preSegment] = void 0;
|
|
153
162
|
break;
|
|
154
|
-
case
|
|
163
|
+
case STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES.URL:
|
|
155
164
|
currentRef[preSegment] = new URL(currentRef[preSegment]);
|
|
156
165
|
break;
|
|
157
|
-
case
|
|
166
|
+
case STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES.REGEXP: {
|
|
158
167
|
const [, pattern, flags] = currentRef[preSegment].match(/^\/(.*)\/([a-z]*)$/);
|
|
159
168
|
currentRef[preSegment] = new RegExp(pattern, flags);
|
|
160
169
|
break;
|
|
161
170
|
}
|
|
162
|
-
case
|
|
171
|
+
case STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES.SET:
|
|
163
172
|
currentRef[preSegment] = new Set(currentRef[preSegment]);
|
|
164
173
|
break;
|
|
165
|
-
case
|
|
174
|
+
case STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES.MAP:
|
|
166
175
|
currentRef[preSegment] = new Map(currentRef[preSegment]);
|
|
167
176
|
break;
|
|
168
177
|
}
|
|
@@ -171,6 +180,10 @@ class StandardRPCJsonSerializer {
|
|
|
171
180
|
}
|
|
172
181
|
}
|
|
173
182
|
|
|
183
|
+
function toHttpPath(path) {
|
|
184
|
+
return `/${path.map(encodeURIComponent).join("/")}`;
|
|
185
|
+
}
|
|
186
|
+
|
|
174
187
|
class StandardRPCLinkCodec {
|
|
175
188
|
constructor(serializer, options) {
|
|
176
189
|
this.serializer = serializer;
|
|
@@ -187,14 +200,17 @@ class StandardRPCLinkCodec {
|
|
|
187
200
|
headers;
|
|
188
201
|
async encode(path, input, options) {
|
|
189
202
|
const expectedMethod = await value(this.expectedMethod, options, path, input);
|
|
190
|
-
|
|
203
|
+
let headers = await value(this.headers, options, path, input);
|
|
191
204
|
const baseUrl = await value(this.baseUrl, options, path, input);
|
|
192
|
-
const url = new URL(`${
|
|
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
|
+
}
|
|
193
209
|
const serialized = this.serializer.serialize(input);
|
|
194
|
-
if (expectedMethod === "GET" && !(serialized instanceof FormData) && !
|
|
210
|
+
if (expectedMethod === "GET" && !(serialized instanceof FormData) && !isAsyncIteratorObject(serialized)) {
|
|
195
211
|
const maxUrlLength = await value(this.maxUrlLength, options, path, input);
|
|
196
212
|
const getUrl = new URL(url);
|
|
197
|
-
getUrl.searchParams.append("data", stringifyJSON(serialized)
|
|
213
|
+
getUrl.searchParams.append("data", stringifyJSON(serialized));
|
|
198
214
|
if (getUrl.toString().length <= maxUrlLength) {
|
|
199
215
|
return {
|
|
200
216
|
body: void 0,
|
|
@@ -214,7 +230,7 @@ class StandardRPCLinkCodec {
|
|
|
214
230
|
};
|
|
215
231
|
}
|
|
216
232
|
async decode(response) {
|
|
217
|
-
const isOk = response.status
|
|
233
|
+
const isOk = !isORPCErrorStatus(response.status);
|
|
218
234
|
const deserialized = await (async () => {
|
|
219
235
|
let isBodyOk = false;
|
|
220
236
|
try {
|
|
@@ -236,8 +252,9 @@ class StandardRPCLinkCodec {
|
|
|
236
252
|
if (ORPCError.isValidJSON(deserialized)) {
|
|
237
253
|
throw ORPCError.fromJSON(deserialized);
|
|
238
254
|
}
|
|
239
|
-
throw new
|
|
240
|
-
|
|
255
|
+
throw new ORPCError("MALFORMED_ORPC_ERROR_RESPONSE", {
|
|
256
|
+
status: response.status,
|
|
257
|
+
data: deserialized
|
|
241
258
|
});
|
|
242
259
|
}
|
|
243
260
|
return deserialized;
|
|
@@ -263,9 +280,6 @@ class StandardRPCSerializer {
|
|
|
263
280
|
return this.#serialize(data, true);
|
|
264
281
|
}
|
|
265
282
|
#serialize(data, enableFormData) {
|
|
266
|
-
if (data === void 0 || data instanceof Blob) {
|
|
267
|
-
return data;
|
|
268
|
-
}
|
|
269
283
|
const [json, meta_, maps, blobs] = this.jsonSerializer.serialize(data);
|
|
270
284
|
const meta = meta_.length === 0 ? void 0 : meta_;
|
|
271
285
|
if (!enableFormData || blobs.length === 0) {
|
|
@@ -303,9 +317,6 @@ class StandardRPCSerializer {
|
|
|
303
317
|
return this.#deserialize(data);
|
|
304
318
|
}
|
|
305
319
|
#deserialize(data) {
|
|
306
|
-
if (data === void 0 || data instanceof Blob) {
|
|
307
|
-
return data;
|
|
308
|
-
}
|
|
309
320
|
if (!(data instanceof FormData)) {
|
|
310
321
|
return this.jsonSerializer.deserialize(data.json, data.meta ?? []);
|
|
311
322
|
}
|
|
@@ -319,4 +330,4 @@ class StandardRPCSerializer {
|
|
|
319
330
|
}
|
|
320
331
|
}
|
|
321
332
|
|
|
322
|
-
export { InvalidEventIteratorRetryResponse as I, StandardLink as S,
|
|
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.C0lT7w02.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 };
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { isObject, isTypescriptObject
|
|
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
|
|
95
|
-
throw new Error("[ORPCError]
|
|
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,33 +136,8 @@ function toORPCError(error) {
|
|
|
136
136
|
cause: error
|
|
137
137
|
});
|
|
138
138
|
}
|
|
139
|
-
|
|
140
|
-
|
|
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, options = {}) {
|
|
151
|
-
const notifyImmediately = options.notifyImmediately ?? true;
|
|
152
|
-
const state = iteratorStates.get(iterator);
|
|
153
|
-
if (!state) {
|
|
154
|
-
throw new Error("Iterator is not registered.");
|
|
155
|
-
}
|
|
156
|
-
if (notifyImmediately) {
|
|
157
|
-
callback(state.status);
|
|
158
|
-
}
|
|
159
|
-
state.listeners.push(callback);
|
|
160
|
-
return () => {
|
|
161
|
-
const index = state.listeners.indexOf(callback);
|
|
162
|
-
if (index !== -1) {
|
|
163
|
-
state.listeners.splice(index, 1);
|
|
164
|
-
}
|
|
165
|
-
};
|
|
139
|
+
function isORPCErrorStatus(status) {
|
|
140
|
+
return status < 200 || status >= 400;
|
|
166
141
|
}
|
|
167
142
|
|
|
168
143
|
function mapEventIterator(iterator, maps) {
|
|
@@ -196,71 +171,5 @@ function mapEventIterator(iterator, maps) {
|
|
|
196
171
|
}
|
|
197
172
|
}();
|
|
198
173
|
}
|
|
199
|
-
const MAX_ALLOWED_RETRY_TIMES = 99;
|
|
200
|
-
function createAutoRetryEventIterator(initial, reconnect, initialLastEventId) {
|
|
201
|
-
const state = {
|
|
202
|
-
status: "connected",
|
|
203
|
-
listeners: []
|
|
204
|
-
};
|
|
205
|
-
const iterator = async function* () {
|
|
206
|
-
let current = initial;
|
|
207
|
-
let lastEventId = initialLastEventId;
|
|
208
|
-
let lastRetry;
|
|
209
|
-
let retryTimes = 0;
|
|
210
|
-
try {
|
|
211
|
-
while (true) {
|
|
212
|
-
try {
|
|
213
|
-
updateEventIteratorStatus(state, "connected");
|
|
214
|
-
const { done, value } = await current.next();
|
|
215
|
-
const meta = getEventMeta(value);
|
|
216
|
-
lastEventId = meta?.id ?? lastEventId;
|
|
217
|
-
lastRetry = meta?.retry ?? lastRetry;
|
|
218
|
-
retryTimes = 0;
|
|
219
|
-
if (done) {
|
|
220
|
-
return value;
|
|
221
|
-
}
|
|
222
|
-
yield value;
|
|
223
|
-
} catch (e) {
|
|
224
|
-
updateEventIteratorStatus(state, "reconnecting");
|
|
225
|
-
const meta = getEventMeta(e);
|
|
226
|
-
lastEventId = meta?.id ?? lastEventId;
|
|
227
|
-
lastRetry = meta?.retry ?? lastRetry;
|
|
228
|
-
let currentError = e;
|
|
229
|
-
current = await retry({ times: MAX_ALLOWED_RETRY_TIMES }, async (exit) => {
|
|
230
|
-
retryTimes += 1;
|
|
231
|
-
if (retryTimes > MAX_ALLOWED_RETRY_TIMES) {
|
|
232
|
-
throw exit(new Error(
|
|
233
|
-
`Exceeded maximum retry attempts (${MAX_ALLOWED_RETRY_TIMES}) for event iterator. Possible infinite retry loop detected. Please review the retry logic.`,
|
|
234
|
-
{ cause: currentError }
|
|
235
|
-
));
|
|
236
|
-
}
|
|
237
|
-
const reconnected = await (async () => {
|
|
238
|
-
try {
|
|
239
|
-
return await reconnect({
|
|
240
|
-
lastRetry,
|
|
241
|
-
lastEventId,
|
|
242
|
-
retryTimes,
|
|
243
|
-
error: currentError
|
|
244
|
-
});
|
|
245
|
-
} catch (e2) {
|
|
246
|
-
currentError = e2;
|
|
247
|
-
throw e2;
|
|
248
|
-
}
|
|
249
|
-
})();
|
|
250
|
-
if (!reconnected) {
|
|
251
|
-
throw exit(currentError);
|
|
252
|
-
}
|
|
253
|
-
return reconnected;
|
|
254
|
-
});
|
|
255
|
-
}
|
|
256
|
-
}
|
|
257
|
-
} finally {
|
|
258
|
-
updateEventIteratorStatus(state, "closed");
|
|
259
|
-
await current.return?.();
|
|
260
|
-
}
|
|
261
|
-
}();
|
|
262
|
-
registerEventIteratorState(iterator, state);
|
|
263
|
-
return iterator;
|
|
264
|
-
}
|
|
265
174
|
|
|
266
|
-
export { COMMON_ORPC_ERROR_DEFS as C, ORPCError as O, fallbackORPCErrorMessage as a,
|
|
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.
|
|
4
|
+
"version": "0.0.0-next.10ace4f",
|
|
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,9 +39,9 @@
|
|
|
34
39
|
"dist"
|
|
35
40
|
],
|
|
36
41
|
"dependencies": {
|
|
37
|
-
"@orpc/shared": "0.0.0-next.
|
|
38
|
-
"@orpc/standard-server
|
|
39
|
-
"@orpc/standard-server": "0.0.0-next.
|
|
42
|
+
"@orpc/shared": "0.0.0-next.10ace4f",
|
|
43
|
+
"@orpc/standard-server": "0.0.0-next.10ace4f",
|
|
44
|
+
"@orpc/standard-server-fetch": "0.0.0-next.10ace4f"
|
|
40
45
|
},
|
|
41
46
|
"devDependencies": {
|
|
42
47
|
"zod": "^3.24.2"
|
|
@@ -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 };
|
|
@@ -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 };
|