@orpc/client 0.0.0-next.25532a8 → 0.0.0-next.25bd3b5
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 +17 -22
- package/dist/adapters/fetch/index.d.mts +13 -6
- package/dist/adapters/fetch/index.d.ts +13 -6
- package/dist/adapters/fetch/index.mjs +5 -8
- package/dist/adapters/message-port/index.d.mts +59 -0
- package/dist/adapters/message-port/index.d.ts +59 -0
- package/dist/adapters/message-port/index.mjs +71 -0
- package/dist/adapters/standard/index.d.mts +3 -3
- package/dist/adapters/standard/index.d.ts +3 -3
- package/dist/adapters/standard/index.mjs +2 -2
- package/dist/adapters/websocket/index.d.mts +29 -0
- package/dist/adapters/websocket/index.d.ts +29 -0
- package/dist/adapters/websocket/index.mjs +44 -0
- package/dist/index.d.mts +53 -23
- package/dist/index.d.ts +53 -23
- package/dist/index.mjs +24 -7
- package/dist/plugins/index.d.mts +161 -9
- package/dist/plugins/index.d.ts +161 -9
- package/dist/plugins/index.mjs +292 -14
- package/dist/shared/{client.CipPQkhk.d.ts → client.BOYsZIRq.d.mts} +2 -2
- package/dist/shared/{client.CipPQkhk.d.mts → client.BOYsZIRq.d.ts} +2 -2
- package/dist/shared/{client.jKEwIsRd.mjs → client.BngOL3Ai.mjs} +46 -48
- package/dist/shared/{client.BQuFq0Vi.mjs → client.BvXDSBF5.mjs} +33 -16
- package/dist/shared/{client.qdWq4aGG.d.ts → client.C4VxIexA.d.mts} +16 -10
- package/dist/shared/{client.C486S9aU.d.mts → client.CXXEPIbK.d.ts} +16 -10
- package/dist/shared/{client.DKA6DQSn.d.ts → client.WCinBImJ.d.ts} +13 -9
- package/dist/shared/{client.Bx07L657.d.mts → client.aTp4sII-.d.mts} +13 -9
- package/package.json +16 -5
package/dist/plugins/index.mjs
CHANGED
|
@@ -1,5 +1,249 @@
|
|
|
1
|
-
import { value,
|
|
2
|
-
import {
|
|
1
|
+
import { isAsyncIteratorObject, defer, value, splitInHalf, toArray, stringifyJSON } from '@orpc/shared';
|
|
2
|
+
import { toBatchRequest, parseBatchResponse, toBatchAbortSignal } from '@orpc/standard-server/batch';
|
|
3
|
+
import { replicateStandardLazyResponse, getEventMeta } from '@orpc/standard-server';
|
|
4
|
+
|
|
5
|
+
class BatchLinkPlugin {
|
|
6
|
+
groups;
|
|
7
|
+
maxSize;
|
|
8
|
+
batchUrl;
|
|
9
|
+
maxUrlLength;
|
|
10
|
+
batchHeaders;
|
|
11
|
+
mapRequestItem;
|
|
12
|
+
exclude;
|
|
13
|
+
mode;
|
|
14
|
+
pending;
|
|
15
|
+
order = 5e6;
|
|
16
|
+
constructor(options) {
|
|
17
|
+
this.groups = options.groups;
|
|
18
|
+
this.pending = /* @__PURE__ */ new Map();
|
|
19
|
+
this.maxSize = options.maxSize ?? 10;
|
|
20
|
+
this.maxUrlLength = options.maxUrlLength ?? 2083;
|
|
21
|
+
this.mode = options.mode ?? "streaming";
|
|
22
|
+
this.batchUrl = options.url ?? (([options2]) => `${options2.request.url.origin}${options2.request.url.pathname}/__batch__`);
|
|
23
|
+
this.batchHeaders = options.headers ?? (([options2, ...rest]) => {
|
|
24
|
+
const headers = {};
|
|
25
|
+
for (const [key, value2] of Object.entries(options2.request.headers)) {
|
|
26
|
+
if (rest.every((item) => item.request.headers[key] === value2)) {
|
|
27
|
+
headers[key] = value2;
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
return headers;
|
|
31
|
+
});
|
|
32
|
+
this.mapRequestItem = options.mapRequestItem ?? (({ request, batchHeaders }) => {
|
|
33
|
+
const headers = {};
|
|
34
|
+
for (const [key, value2] of Object.entries(request.headers)) {
|
|
35
|
+
if (batchHeaders[key] !== value2) {
|
|
36
|
+
headers[key] = value2;
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
return {
|
|
40
|
+
method: request.method,
|
|
41
|
+
url: request.url,
|
|
42
|
+
headers,
|
|
43
|
+
body: request.body,
|
|
44
|
+
signal: request.signal
|
|
45
|
+
};
|
|
46
|
+
});
|
|
47
|
+
this.exclude = options.exclude ?? (() => false);
|
|
48
|
+
}
|
|
49
|
+
init(options) {
|
|
50
|
+
options.clientInterceptors ??= [];
|
|
51
|
+
options.clientInterceptors.push((options2) => {
|
|
52
|
+
if (options2.request.headers["x-orpc-batch"] !== "1") {
|
|
53
|
+
return options2.next();
|
|
54
|
+
}
|
|
55
|
+
return options2.next({
|
|
56
|
+
...options2,
|
|
57
|
+
request: {
|
|
58
|
+
...options2.request,
|
|
59
|
+
headers: {
|
|
60
|
+
...options2.request.headers,
|
|
61
|
+
"x-orpc-batch": void 0
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
});
|
|
65
|
+
});
|
|
66
|
+
options.clientInterceptors.push((options2) => {
|
|
67
|
+
if (this.exclude(options2) || options2.request.body instanceof Blob || options2.request.body instanceof FormData || isAsyncIteratorObject(options2.request.body)) {
|
|
68
|
+
return options2.next();
|
|
69
|
+
}
|
|
70
|
+
const group = this.groups.find((group2) => group2.condition(options2));
|
|
71
|
+
if (!group) {
|
|
72
|
+
return options2.next();
|
|
73
|
+
}
|
|
74
|
+
return new Promise((resolve, reject) => {
|
|
75
|
+
this.#enqueueRequest(group, options2, resolve, reject);
|
|
76
|
+
defer(() => this.#processPendingBatches());
|
|
77
|
+
});
|
|
78
|
+
});
|
|
79
|
+
}
|
|
80
|
+
#enqueueRequest(group, options, resolve, reject) {
|
|
81
|
+
const items = this.pending.get(group);
|
|
82
|
+
if (items) {
|
|
83
|
+
items.push([options, resolve, reject]);
|
|
84
|
+
} else {
|
|
85
|
+
this.pending.set(group, [[options, resolve, reject]]);
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
async #processPendingBatches() {
|
|
89
|
+
const pending = this.pending;
|
|
90
|
+
this.pending = /* @__PURE__ */ new Map();
|
|
91
|
+
for (const [group, items] of pending) {
|
|
92
|
+
const getItems = items.filter(([options]) => options.request.method === "GET");
|
|
93
|
+
const restItems = items.filter(([options]) => options.request.method !== "GET");
|
|
94
|
+
this.#executeBatch("GET", group, getItems);
|
|
95
|
+
this.#executeBatch("POST", group, restItems);
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
async #executeBatch(method, group, groupItems) {
|
|
99
|
+
if (!groupItems.length) {
|
|
100
|
+
return;
|
|
101
|
+
}
|
|
102
|
+
const batchItems = groupItems;
|
|
103
|
+
if (batchItems.length === 1) {
|
|
104
|
+
batchItems[0][0].next().then(batchItems[0][1]).catch(batchItems[0][2]);
|
|
105
|
+
return;
|
|
106
|
+
}
|
|
107
|
+
try {
|
|
108
|
+
const options = batchItems.map(([options2]) => options2);
|
|
109
|
+
const maxSize = await value(this.maxSize, options);
|
|
110
|
+
if (batchItems.length > maxSize) {
|
|
111
|
+
const [first, second] = splitInHalf(batchItems);
|
|
112
|
+
this.#executeBatch(method, group, first);
|
|
113
|
+
this.#executeBatch(method, group, second);
|
|
114
|
+
return;
|
|
115
|
+
}
|
|
116
|
+
const batchUrl = new URL(await value(this.batchUrl, options));
|
|
117
|
+
const batchHeaders = await value(this.batchHeaders, options);
|
|
118
|
+
const mappedItems = batchItems.map(([options2]) => this.mapRequestItem({ ...options2, batchUrl, batchHeaders }));
|
|
119
|
+
const batchRequest = toBatchRequest({
|
|
120
|
+
method,
|
|
121
|
+
url: batchUrl,
|
|
122
|
+
headers: batchHeaders,
|
|
123
|
+
requests: mappedItems
|
|
124
|
+
});
|
|
125
|
+
const maxUrlLength = await value(this.maxUrlLength, options);
|
|
126
|
+
if (batchRequest.url.toString().length > maxUrlLength) {
|
|
127
|
+
const [first, second] = splitInHalf(batchItems);
|
|
128
|
+
this.#executeBatch(method, group, first);
|
|
129
|
+
this.#executeBatch(method, group, second);
|
|
130
|
+
return;
|
|
131
|
+
}
|
|
132
|
+
const mode = value(this.mode, options);
|
|
133
|
+
const lazyResponse = await options[0].next({
|
|
134
|
+
request: { ...batchRequest, headers: { ...batchRequest.headers, "x-orpc-batch": mode } },
|
|
135
|
+
signal: batchRequest.signal,
|
|
136
|
+
context: group.context,
|
|
137
|
+
input: group.input,
|
|
138
|
+
path: toArray(group.path)
|
|
139
|
+
});
|
|
140
|
+
const parsed = parseBatchResponse({ ...lazyResponse, body: await lazyResponse.body() });
|
|
141
|
+
for await (const item of parsed) {
|
|
142
|
+
batchItems[item.index]?.[1]({ ...item, body: () => Promise.resolve(item.body) });
|
|
143
|
+
}
|
|
144
|
+
throw new Error("Something went wrong make batch response not contains enough responses. This can be a bug please report it.");
|
|
145
|
+
} catch (error) {
|
|
146
|
+
for (const [, , reject] of batchItems) {
|
|
147
|
+
reject(error);
|
|
148
|
+
}
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
}
|
|
152
|
+
|
|
153
|
+
class DedupeRequestsPlugin {
|
|
154
|
+
#groups;
|
|
155
|
+
#filter;
|
|
156
|
+
order = 4e6;
|
|
157
|
+
// make sure execute before batch plugin
|
|
158
|
+
#queue = /* @__PURE__ */ new Map();
|
|
159
|
+
constructor(options) {
|
|
160
|
+
this.#groups = options.groups;
|
|
161
|
+
this.#filter = options.filter ?? (({ request }) => request.method === "GET");
|
|
162
|
+
}
|
|
163
|
+
init(options) {
|
|
164
|
+
options.clientInterceptors ??= [];
|
|
165
|
+
options.clientInterceptors.push((options2) => {
|
|
166
|
+
if (options2.request.body instanceof Blob || options2.request.body instanceof FormData || options2.request.body instanceof URLSearchParams || isAsyncIteratorObject(options2.request.body) || !this.#filter(options2)) {
|
|
167
|
+
return options2.next();
|
|
168
|
+
}
|
|
169
|
+
const group = this.#groups.find((group2) => group2.condition(options2));
|
|
170
|
+
if (!group) {
|
|
171
|
+
return options2.next();
|
|
172
|
+
}
|
|
173
|
+
return new Promise((resolve, reject) => {
|
|
174
|
+
this.#enqueue(group, options2, resolve, reject);
|
|
175
|
+
defer(() => this.#dequeue());
|
|
176
|
+
});
|
|
177
|
+
});
|
|
178
|
+
}
|
|
179
|
+
#enqueue(group, options, resolve, reject) {
|
|
180
|
+
let queue = this.#queue.get(group);
|
|
181
|
+
if (!queue) {
|
|
182
|
+
this.#queue.set(group, queue = []);
|
|
183
|
+
}
|
|
184
|
+
const matched = queue.find((item) => {
|
|
185
|
+
const requestString1 = stringifyJSON({
|
|
186
|
+
body: item.options.request.body,
|
|
187
|
+
headers: item.options.request.headers,
|
|
188
|
+
method: item.options.request.method,
|
|
189
|
+
url: item.options.request.url
|
|
190
|
+
});
|
|
191
|
+
const requestString2 = stringifyJSON({
|
|
192
|
+
body: options.request.body,
|
|
193
|
+
headers: options.request.headers,
|
|
194
|
+
method: options.request.method,
|
|
195
|
+
url: options.request.url
|
|
196
|
+
});
|
|
197
|
+
return requestString1 === requestString2;
|
|
198
|
+
});
|
|
199
|
+
if (matched) {
|
|
200
|
+
matched.signals.push(options.request.signal);
|
|
201
|
+
matched.resolves.push(resolve);
|
|
202
|
+
matched.rejects.push(reject);
|
|
203
|
+
} else {
|
|
204
|
+
queue.push({
|
|
205
|
+
options,
|
|
206
|
+
signals: [options.request.signal],
|
|
207
|
+
resolves: [resolve],
|
|
208
|
+
rejects: [reject]
|
|
209
|
+
});
|
|
210
|
+
}
|
|
211
|
+
}
|
|
212
|
+
async #dequeue() {
|
|
213
|
+
const promises = [];
|
|
214
|
+
for (const [group, items] of this.#queue) {
|
|
215
|
+
for (const { options, signals, resolves, rejects } of items) {
|
|
216
|
+
promises.push(
|
|
217
|
+
this.#execute(group, options, signals, resolves, rejects)
|
|
218
|
+
);
|
|
219
|
+
}
|
|
220
|
+
}
|
|
221
|
+
this.#queue.clear();
|
|
222
|
+
await Promise.all(promises);
|
|
223
|
+
}
|
|
224
|
+
async #execute(group, options, signals, resolves, rejects) {
|
|
225
|
+
try {
|
|
226
|
+
const dedupedRequest = {
|
|
227
|
+
...options.request,
|
|
228
|
+
signal: toBatchAbortSignal(signals)
|
|
229
|
+
};
|
|
230
|
+
const response = await options.next({
|
|
231
|
+
...options,
|
|
232
|
+
request: dedupedRequest,
|
|
233
|
+
signal: dedupedRequest.signal,
|
|
234
|
+
context: group.context
|
|
235
|
+
});
|
|
236
|
+
const replicatedResponses = replicateStandardLazyResponse(response, resolves.length);
|
|
237
|
+
for (const resolve of resolves) {
|
|
238
|
+
resolve(replicatedResponses.shift());
|
|
239
|
+
}
|
|
240
|
+
} catch (error) {
|
|
241
|
+
for (const reject of rejects) {
|
|
242
|
+
reject(error);
|
|
243
|
+
}
|
|
244
|
+
}
|
|
245
|
+
}
|
|
246
|
+
}
|
|
3
247
|
|
|
4
248
|
class ClientRetryPluginInvalidEventIteratorRetryResponse extends Error {
|
|
5
249
|
}
|
|
@@ -29,20 +273,20 @@ class ClientRetryPlugin {
|
|
|
29
273
|
}
|
|
30
274
|
let lastEventId = interceptorOptions.lastEventId;
|
|
31
275
|
let lastEventRetry;
|
|
32
|
-
let
|
|
276
|
+
let callback;
|
|
33
277
|
let attemptIndex = 0;
|
|
34
|
-
const next = async (
|
|
35
|
-
let
|
|
278
|
+
const next = async (initialError) => {
|
|
279
|
+
let currentError = initialError;
|
|
36
280
|
while (true) {
|
|
37
281
|
const updatedInterceptorOptions = { ...interceptorOptions, lastEventId };
|
|
38
|
-
if (
|
|
282
|
+
if (currentError) {
|
|
39
283
|
if (attemptIndex >= maxAttempts) {
|
|
40
|
-
throw
|
|
284
|
+
throw currentError.error;
|
|
41
285
|
}
|
|
42
286
|
const attemptOptions = {
|
|
43
287
|
...updatedInterceptorOptions,
|
|
44
288
|
attemptIndex,
|
|
45
|
-
error:
|
|
289
|
+
error: currentError.error,
|
|
46
290
|
lastEventRetry
|
|
47
291
|
};
|
|
48
292
|
const shouldRetryBool = await value(
|
|
@@ -50,23 +294,24 @@ class ClientRetryPlugin {
|
|
|
50
294
|
attemptOptions
|
|
51
295
|
);
|
|
52
296
|
if (!shouldRetryBool) {
|
|
53
|
-
throw
|
|
297
|
+
throw currentError.error;
|
|
54
298
|
}
|
|
55
|
-
|
|
299
|
+
callback = onRetry?.(attemptOptions);
|
|
56
300
|
const retryDelayMs = await value(retryDelay, attemptOptions);
|
|
57
301
|
await new Promise((resolve) => setTimeout(resolve, retryDelayMs));
|
|
58
302
|
attemptIndex++;
|
|
59
303
|
}
|
|
60
304
|
try {
|
|
305
|
+
currentError = void 0;
|
|
61
306
|
return await interceptorOptions.next(updatedInterceptorOptions);
|
|
62
307
|
} catch (error) {
|
|
308
|
+
currentError = { error };
|
|
63
309
|
if (updatedInterceptorOptions.signal?.aborted === true) {
|
|
64
310
|
throw error;
|
|
65
311
|
}
|
|
66
|
-
current = { error };
|
|
67
312
|
} finally {
|
|
68
|
-
|
|
69
|
-
|
|
313
|
+
callback?.(!currentError);
|
|
314
|
+
callback = void 0;
|
|
70
315
|
}
|
|
71
316
|
}
|
|
72
317
|
};
|
|
@@ -108,4 +353,37 @@ class ClientRetryPlugin {
|
|
|
108
353
|
}
|
|
109
354
|
}
|
|
110
355
|
|
|
111
|
-
|
|
356
|
+
class SimpleCsrfProtectionLinkPlugin {
|
|
357
|
+
headerName;
|
|
358
|
+
headerValue;
|
|
359
|
+
exclude;
|
|
360
|
+
constructor(options = {}) {
|
|
361
|
+
this.headerName = options.headerName ?? "x-csrf-token";
|
|
362
|
+
this.headerValue = options.headerValue ?? "orpc";
|
|
363
|
+
this.exclude = options.exclude ?? false;
|
|
364
|
+
}
|
|
365
|
+
order = 8e6;
|
|
366
|
+
init(options) {
|
|
367
|
+
options.clientInterceptors ??= [];
|
|
368
|
+
options.clientInterceptors.push(async (options2) => {
|
|
369
|
+
const excluded = await value(this.exclude, options2);
|
|
370
|
+
if (excluded) {
|
|
371
|
+
return options2.next();
|
|
372
|
+
}
|
|
373
|
+
const headerName = await value(this.headerName, options2);
|
|
374
|
+
const headerValue = await value(this.headerValue, options2);
|
|
375
|
+
return options2.next({
|
|
376
|
+
...options2,
|
|
377
|
+
request: {
|
|
378
|
+
...options2.request,
|
|
379
|
+
headers: {
|
|
380
|
+
...options2.request.headers,
|
|
381
|
+
[headerName]: headerValue
|
|
382
|
+
}
|
|
383
|
+
}
|
|
384
|
+
});
|
|
385
|
+
});
|
|
386
|
+
}
|
|
387
|
+
}
|
|
388
|
+
|
|
389
|
+
export { BatchLinkPlugin, ClientRetryPlugin, ClientRetryPluginInvalidEventIteratorRetryResponse, DedupeRequestsPlugin, SimpleCsrfProtectionLinkPlugin };
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { PromiseWithError } from '@orpc/shared';
|
|
2
2
|
|
|
3
3
|
type HTTPPath = `/${string}`;
|
|
4
|
-
type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH';
|
|
4
|
+
type HTTPMethod = 'HEAD' | 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH';
|
|
5
5
|
type ClientContext = Record<PropertyKey, any>;
|
|
6
6
|
interface ClientOptions<T extends ClientContext> {
|
|
7
7
|
signal?: AbortSignal;
|
|
@@ -26,4 +26,4 @@ interface ClientLink<TClientContext extends ClientContext> {
|
|
|
26
26
|
call: (path: readonly string[], input: unknown, options: ClientOptions<TClientContext>) => Promise<unknown>;
|
|
27
27
|
}
|
|
28
28
|
|
|
29
|
-
export type { ClientLink as C, FriendlyClientOptions as F, HTTPPath as H, InferClientContext as I, NestedClient as N,
|
|
29
|
+
export type { ClientLink as C, FriendlyClientOptions as F, HTTPPath as H, InferClientContext as I, NestedClient as N, ClientPromiseResult as a, ClientContext as b, ClientOptions as c, Client as d, ClientRest as e, HTTPMethod as f };
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { PromiseWithError } from '@orpc/shared';
|
|
2
2
|
|
|
3
3
|
type HTTPPath = `/${string}`;
|
|
4
|
-
type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH';
|
|
4
|
+
type HTTPMethod = 'HEAD' | 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH';
|
|
5
5
|
type ClientContext = Record<PropertyKey, any>;
|
|
6
6
|
interface ClientOptions<T extends ClientContext> {
|
|
7
7
|
signal?: AbortSignal;
|
|
@@ -26,4 +26,4 @@ interface ClientLink<TClientContext extends ClientContext> {
|
|
|
26
26
|
call: (path: readonly string[], input: unknown, options: ClientOptions<TClientContext>) => Promise<unknown>;
|
|
27
27
|
}
|
|
28
28
|
|
|
29
|
-
export type { ClientLink as C, FriendlyClientOptions as F, HTTPPath as H, InferClientContext as I, NestedClient as N,
|
|
29
|
+
export type { ClientLink as C, FriendlyClientOptions as F, HTTPPath as H, InferClientContext as I, NestedClient as N, ClientPromiseResult as a, ClientContext as b, ClientOptions as c, Client as d, ClientRest as e, HTTPMethod as f };
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { isObject, isTypescriptObject } from '@orpc/shared';
|
|
1
|
+
import { resolveMaybeOptionalOptions, isObject, AsyncIteratorClass, isTypescriptObject } from '@orpc/shared';
|
|
2
2
|
import { getEventMeta, withEventMeta } from '@orpc/standard-server';
|
|
3
3
|
|
|
4
4
|
const COMMON_ORPC_ERROR_DEFS = {
|
|
@@ -90,16 +90,17 @@ class ORPCError extends Error {
|
|
|
90
90
|
code;
|
|
91
91
|
status;
|
|
92
92
|
data;
|
|
93
|
-
constructor(code, ...
|
|
94
|
-
|
|
93
|
+
constructor(code, ...rest) {
|
|
94
|
+
const options = resolveMaybeOptionalOptions(rest);
|
|
95
|
+
if (options.status !== void 0 && !isORPCErrorStatus(options.status)) {
|
|
95
96
|
throw new Error("[ORPCError] Invalid error status code.");
|
|
96
97
|
}
|
|
97
|
-
const message = fallbackORPCErrorMessage(code, options
|
|
98
|
+
const message = fallbackORPCErrorMessage(code, options.message);
|
|
98
99
|
super(message, options);
|
|
99
100
|
this.code = code;
|
|
100
|
-
this.status = fallbackORPCErrorStatus(code, options
|
|
101
|
-
this.defined = options
|
|
102
|
-
this.data = options
|
|
101
|
+
this.status = fallbackORPCErrorStatus(code, options.status);
|
|
102
|
+
this.defined = options.defined ?? false;
|
|
103
|
+
this.data = options.data;
|
|
103
104
|
}
|
|
104
105
|
toJSON() {
|
|
105
106
|
return {
|
|
@@ -110,22 +111,6 @@ class ORPCError extends Error {
|
|
|
110
111
|
data: this.data
|
|
111
112
|
};
|
|
112
113
|
}
|
|
113
|
-
static fromJSON(json, options) {
|
|
114
|
-
return new ORPCError(json.code, {
|
|
115
|
-
...options,
|
|
116
|
-
...json
|
|
117
|
-
});
|
|
118
|
-
}
|
|
119
|
-
static isValidJSON(json) {
|
|
120
|
-
if (!isObject(json)) {
|
|
121
|
-
return false;
|
|
122
|
-
}
|
|
123
|
-
const validKeys = ["defined", "code", "status", "message", "data"];
|
|
124
|
-
if (Object.keys(json).some((k) => !validKeys.includes(k))) {
|
|
125
|
-
return false;
|
|
126
|
-
}
|
|
127
|
-
return "defined" in json && typeof json.defined === "boolean" && "code" in json && typeof json.code === "string" && "status" in json && typeof json.status === "number" && "message" in json && typeof json.message === "string";
|
|
128
|
-
}
|
|
129
114
|
}
|
|
130
115
|
function isDefinedError(error) {
|
|
131
116
|
return error instanceof ORPCError && error.defined;
|
|
@@ -139,37 +124,50 @@ function toORPCError(error) {
|
|
|
139
124
|
function isORPCErrorStatus(status) {
|
|
140
125
|
return status < 200 || status >= 400;
|
|
141
126
|
}
|
|
127
|
+
function isORPCErrorJson(json) {
|
|
128
|
+
if (!isObject(json)) {
|
|
129
|
+
return false;
|
|
130
|
+
}
|
|
131
|
+
const validKeys = ["defined", "code", "status", "message", "data"];
|
|
132
|
+
if (Object.keys(json).some((k) => !validKeys.includes(k))) {
|
|
133
|
+
return false;
|
|
134
|
+
}
|
|
135
|
+
return "defined" in json && typeof json.defined === "boolean" && "code" in json && typeof json.code === "string" && "status" in json && typeof json.status === "number" && isORPCErrorStatus(json.status) && "message" in json && typeof json.message === "string";
|
|
136
|
+
}
|
|
137
|
+
function createORPCErrorFromJson(json, options = {}) {
|
|
138
|
+
return new ORPCError(json.code, {
|
|
139
|
+
...options,
|
|
140
|
+
...json
|
|
141
|
+
});
|
|
142
|
+
}
|
|
142
143
|
|
|
143
144
|
function mapEventIterator(iterator, maps) {
|
|
144
|
-
return async
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
145
|
+
return new AsyncIteratorClass(async () => {
|
|
146
|
+
const { done, value } = await (async () => {
|
|
147
|
+
try {
|
|
148
|
+
return await iterator.next();
|
|
149
|
+
} catch (error) {
|
|
150
|
+
let mappedError = await maps.error(error);
|
|
151
|
+
if (mappedError !== error) {
|
|
152
|
+
const meta = getEventMeta(error);
|
|
153
|
+
if (meta && isTypescriptObject(mappedError)) {
|
|
154
|
+
mappedError = withEventMeta(mappedError, meta);
|
|
153
155
|
}
|
|
154
156
|
}
|
|
155
|
-
|
|
156
|
-
return mappedValue;
|
|
157
|
-
}
|
|
158
|
-
yield mappedValue;
|
|
157
|
+
throw mappedError;
|
|
159
158
|
}
|
|
160
|
-
}
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
}
|
|
159
|
+
})();
|
|
160
|
+
let mappedValue = await maps.value(value, done);
|
|
161
|
+
if (mappedValue !== value) {
|
|
162
|
+
const meta = getEventMeta(value);
|
|
163
|
+
if (meta && isTypescriptObject(mappedValue)) {
|
|
164
|
+
mappedValue = withEventMeta(mappedValue, meta);
|
|
167
165
|
}
|
|
168
|
-
throw mappedError;
|
|
169
|
-
} finally {
|
|
170
|
-
await iterator.return?.();
|
|
171
166
|
}
|
|
172
|
-
|
|
167
|
+
return { done, value: mappedValue };
|
|
168
|
+
}, async () => {
|
|
169
|
+
await iterator.return?.();
|
|
170
|
+
});
|
|
173
171
|
}
|
|
174
172
|
|
|
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 };
|
|
173
|
+
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 };
|
|
@@ -1,16 +1,25 @@
|
|
|
1
1
|
import { toArray, intercept, isObject, value, isAsyncIteratorObject, stringifyJSON } from '@orpc/shared';
|
|
2
2
|
import { mergeStandardHeaders, ErrorEvent } from '@orpc/standard-server';
|
|
3
|
-
import { C as COMMON_ORPC_ERROR_DEFS, b as isORPCErrorStatus, O as ORPCError, m as mapEventIterator, t as toORPCError } from './client.
|
|
3
|
+
import { C as COMMON_ORPC_ERROR_DEFS, b as isORPCErrorStatus, c as isORPCErrorJson, d as createORPCErrorFromJson, O as ORPCError, m as mapEventIterator, t as toORPCError } from './client.BngOL3Ai.mjs';
|
|
4
4
|
|
|
5
|
-
class
|
|
5
|
+
class CompositeStandardLinkPlugin {
|
|
6
|
+
plugins;
|
|
7
|
+
constructor(plugins = []) {
|
|
8
|
+
this.plugins = [...plugins].sort((a, b) => (a.order ?? 0) - (b.order ?? 0));
|
|
9
|
+
}
|
|
10
|
+
init(options) {
|
|
11
|
+
for (const plugin of this.plugins) {
|
|
12
|
+
plugin.init?.(options);
|
|
13
|
+
}
|
|
14
|
+
}
|
|
6
15
|
}
|
|
16
|
+
|
|
7
17
|
class StandardLink {
|
|
8
18
|
constructor(codec, sender, options = {}) {
|
|
9
19
|
this.codec = codec;
|
|
10
20
|
this.sender = sender;
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
}
|
|
21
|
+
const plugin = new CompositeStandardLinkPlugin(options.plugins);
|
|
22
|
+
plugin.init(options);
|
|
14
23
|
this.interceptors = toArray(options.interceptors);
|
|
15
24
|
this.clientInterceptors = toArray(options.clientInterceptors);
|
|
16
25
|
}
|
|
@@ -202,10 +211,9 @@ class StandardRPCLinkCodec {
|
|
|
202
211
|
expectedMethod;
|
|
203
212
|
headers;
|
|
204
213
|
async encode(path, input, options) {
|
|
205
|
-
const
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
const baseUrl = await value(this.baseUrl, generalOptions);
|
|
214
|
+
const expectedMethod = await value(this.expectedMethod, options, path, input);
|
|
215
|
+
let headers = await value(this.headers, options, path, input);
|
|
216
|
+
const baseUrl = await value(this.baseUrl, options, path, input);
|
|
209
217
|
const url = new URL(baseUrl);
|
|
210
218
|
url.pathname = `${url.pathname.replace(/\/$/, "")}${toHttpPath(path)}`;
|
|
211
219
|
if (options.lastEventId !== void 0) {
|
|
@@ -213,7 +221,7 @@ class StandardRPCLinkCodec {
|
|
|
213
221
|
}
|
|
214
222
|
const serialized = this.serializer.serialize(input);
|
|
215
223
|
if (expectedMethod === "GET" && !(serialized instanceof FormData) && !isAsyncIteratorObject(serialized)) {
|
|
216
|
-
const maxUrlLength = await value(this.maxUrlLength,
|
|
224
|
+
const maxUrlLength = await value(this.maxUrlLength, options, path, input);
|
|
217
225
|
const getUrl = new URL(url);
|
|
218
226
|
getUrl.searchParams.append("data", stringifyJSON(serialized));
|
|
219
227
|
if (getUrl.toString().length <= maxUrlLength) {
|
|
@@ -254,12 +262,12 @@ class StandardRPCLinkCodec {
|
|
|
254
262
|
}
|
|
255
263
|
})();
|
|
256
264
|
if (!isOk) {
|
|
257
|
-
if (
|
|
258
|
-
throw
|
|
265
|
+
if (isORPCErrorJson(deserialized)) {
|
|
266
|
+
throw createORPCErrorFromJson(deserialized);
|
|
259
267
|
}
|
|
260
268
|
throw new ORPCError(getMalformedResponseErrorCode(response.status), {
|
|
261
269
|
status: response.status,
|
|
262
|
-
data: deserialized
|
|
270
|
+
data: { ...response, body: deserialized }
|
|
263
271
|
});
|
|
264
272
|
}
|
|
265
273
|
return deserialized;
|
|
@@ -309,8 +317,8 @@ class StandardRPCSerializer {
|
|
|
309
317
|
return e;
|
|
310
318
|
}
|
|
311
319
|
const deserialized = this.#deserialize(e.data);
|
|
312
|
-
if (
|
|
313
|
-
return
|
|
320
|
+
if (isORPCErrorJson(deserialized)) {
|
|
321
|
+
return createORPCErrorFromJson(deserialized, { cause: e });
|
|
314
322
|
}
|
|
315
323
|
return new ErrorEvent({
|
|
316
324
|
data: deserialized,
|
|
@@ -335,4 +343,13 @@ class StandardRPCSerializer {
|
|
|
335
343
|
}
|
|
336
344
|
}
|
|
337
345
|
|
|
338
|
-
|
|
346
|
+
class StandardRPCLink extends StandardLink {
|
|
347
|
+
constructor(linkClient, options) {
|
|
348
|
+
const jsonSerializer = new StandardRPCJsonSerializer(options);
|
|
349
|
+
const serializer = new StandardRPCSerializer(jsonSerializer);
|
|
350
|
+
const linkCodec = new StandardRPCLinkCodec(serializer, options);
|
|
351
|
+
super(linkCodec, linkClient, options);
|
|
352
|
+
}
|
|
353
|
+
}
|
|
354
|
+
|
|
355
|
+
export { CompositeStandardLinkPlugin as C, StandardLink as S, STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES as a, StandardRPCJsonSerializer as b, StandardRPCLink as c, StandardRPCLinkCodec as d, StandardRPCSerializer as e, getMalformedResponseErrorCode as g, toHttpPath as t };
|
|
@@ -1,6 +1,16 @@
|
|
|
1
|
-
import { Interceptor
|
|
1
|
+
import { Interceptor } from '@orpc/shared';
|
|
2
2
|
import { StandardRequest, StandardLazyResponse } from '@orpc/standard-server';
|
|
3
|
-
import {
|
|
3
|
+
import { b as ClientContext, c as ClientOptions, C as ClientLink } from './client.BOYsZIRq.mjs';
|
|
4
|
+
|
|
5
|
+
interface StandardLinkPlugin<T extends ClientContext> {
|
|
6
|
+
order?: number;
|
|
7
|
+
init?(options: StandardLinkOptions<T>): void;
|
|
8
|
+
}
|
|
9
|
+
declare class CompositeStandardLinkPlugin<T extends ClientContext, TPlugin extends StandardLinkPlugin<T>> implements StandardLinkPlugin<T> {
|
|
10
|
+
protected readonly plugins: TPlugin[];
|
|
11
|
+
constructor(plugins?: readonly TPlugin[]);
|
|
12
|
+
init(options: StandardLinkOptions<T>): void;
|
|
13
|
+
}
|
|
4
14
|
|
|
5
15
|
interface StandardLinkCodec<T extends ClientContext> {
|
|
6
16
|
encode(path: readonly string[], input: unknown, options: ClientOptions<T>): Promise<StandardRequest>;
|
|
@@ -10,11 +20,6 @@ interface StandardLinkClient<T extends ClientContext> {
|
|
|
10
20
|
call(request: StandardRequest, options: ClientOptions<T>, path: readonly string[], input: unknown): Promise<StandardLazyResponse>;
|
|
11
21
|
}
|
|
12
22
|
|
|
13
|
-
declare class InvalidEventIteratorRetryResponse extends Error {
|
|
14
|
-
}
|
|
15
|
-
interface StandardLinkPlugin<T extends ClientContext> {
|
|
16
|
-
init?(options: StandardLinkOptions<T>): void;
|
|
17
|
-
}
|
|
18
23
|
interface StandardLinkInterceptorOptions<T extends ClientContext> extends ClientOptions<T> {
|
|
19
24
|
path: readonly string[];
|
|
20
25
|
input: unknown;
|
|
@@ -23,8 +28,8 @@ interface StandardLinkClientInterceptorOptions<T extends ClientContext> extends
|
|
|
23
28
|
request: StandardRequest;
|
|
24
29
|
}
|
|
25
30
|
interface StandardLinkOptions<T extends ClientContext> {
|
|
26
|
-
interceptors?: Interceptor<StandardLinkInterceptorOptions<T>, unknown
|
|
27
|
-
clientInterceptors?: Interceptor<StandardLinkClientInterceptorOptions<T>, StandardLazyResponse
|
|
31
|
+
interceptors?: Interceptor<StandardLinkInterceptorOptions<T>, Promise<unknown>>[];
|
|
32
|
+
clientInterceptors?: Interceptor<StandardLinkClientInterceptorOptions<T>, Promise<StandardLazyResponse>>[];
|
|
28
33
|
plugins?: StandardLinkPlugin<T>[];
|
|
29
34
|
}
|
|
30
35
|
declare class StandardLink<T extends ClientContext> implements ClientLink<T> {
|
|
@@ -37,4 +42,5 @@ declare class StandardLink<T extends ClientContext> implements ClientLink<T> {
|
|
|
37
42
|
call(path: readonly string[], input: unknown, options: ClientOptions<T>): Promise<unknown>;
|
|
38
43
|
}
|
|
39
44
|
|
|
40
|
-
export {
|
|
45
|
+
export { CompositeStandardLinkPlugin as C, StandardLink as d };
|
|
46
|
+
export type { StandardLinkClientInterceptorOptions as S, StandardLinkPlugin as a, StandardLinkOptions as b, StandardLinkInterceptorOptions as c, StandardLinkCodec as e, StandardLinkClient as f };
|