@orpc/client 0.0.0-next.b5b7502 → 0.0.0-next.b683b88
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 +12 -5
- package/dist/adapters/fetch/index.d.ts +12 -5
- package/dist/adapters/fetch/index.mjs +4 -7
- 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 +28 -14
- package/dist/index.d.ts +28 -14
- package/dist/index.mjs +7 -7
- package/dist/plugins/index.d.mts +162 -25
- package/dist/plugins/index.d.ts +162 -25
- package/dist/plugins/index.mjs +304 -46
- package/dist/shared/{client.C0lT7w02.d.mts → client.4TS_0JaO.d.mts} +7 -8
- package/dist/shared/{client.C0lT7w02.d.ts → client.4TS_0JaO.d.ts} +7 -8
- package/dist/shared/{client.D-jrSuDb.d.ts → client.7UM0t5o-.d.ts} +13 -25
- package/dist/shared/{client.grRbC25r.d.ts → client.BMoG_EdN.d.mts} +21 -14
- package/dist/shared/{client.jKEwIsRd.mjs → client.BX0_8bnM.mjs} +30 -33
- package/dist/shared/{client.Bt94sjrK.d.mts → client.BdD8cpjs.d.mts} +13 -25
- package/dist/shared/{client.5813Ufvs.d.mts → client.C0KbSWlC.d.ts} +21 -14
- package/dist/shared/{client.DhAxdT4W.mjs → client.CQCGVpTM.mjs} +34 -15
- 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
|
}
|
@@ -18,75 +262,56 @@ class ClientRetryPlugin {
|
|
18
262
|
options.interceptors ??= [];
|
19
263
|
options.interceptors.push(async (interceptorOptions) => {
|
20
264
|
const maxAttempts = await value(
|
21
|
-
interceptorOptions.
|
22
|
-
interceptorOptions
|
23
|
-
interceptorOptions.path,
|
24
|
-
interceptorOptions.input
|
265
|
+
interceptorOptions.context.retry ?? this.defaultRetry,
|
266
|
+
interceptorOptions
|
25
267
|
);
|
26
|
-
const retryDelay = interceptorOptions.
|
27
|
-
const shouldRetry = interceptorOptions.
|
28
|
-
const onRetry = interceptorOptions.
|
268
|
+
const retryDelay = interceptorOptions.context.retryDelay ?? this.defaultRetryDelay;
|
269
|
+
const shouldRetry = interceptorOptions.context.shouldRetry ?? this.defaultShouldRetry;
|
270
|
+
const onRetry = interceptorOptions.context.onRetry ?? this.defaultOnRetry;
|
29
271
|
if (maxAttempts <= 0) {
|
30
272
|
return interceptorOptions.next();
|
31
273
|
}
|
32
|
-
let lastEventId = interceptorOptions.
|
274
|
+
let lastEventId = interceptorOptions.lastEventId;
|
33
275
|
let lastEventRetry;
|
34
|
-
let
|
276
|
+
let callback;
|
35
277
|
let attemptIndex = 0;
|
36
|
-
const next = async (
|
37
|
-
let
|
278
|
+
const next = async (initialError) => {
|
279
|
+
let currentError = initialError;
|
38
280
|
while (true) {
|
39
|
-
const
|
40
|
-
if (
|
281
|
+
const updatedInterceptorOptions = { ...interceptorOptions, lastEventId };
|
282
|
+
if (currentError) {
|
41
283
|
if (attemptIndex >= maxAttempts) {
|
42
|
-
throw
|
284
|
+
throw currentError.error;
|
43
285
|
}
|
44
286
|
const attemptOptions = {
|
287
|
+
...updatedInterceptorOptions,
|
45
288
|
attemptIndex,
|
46
|
-
error:
|
47
|
-
lastEventId,
|
289
|
+
error: currentError.error,
|
48
290
|
lastEventRetry
|
49
291
|
};
|
50
292
|
const shouldRetryBool = await value(
|
51
293
|
shouldRetry,
|
52
|
-
attemptOptions
|
53
|
-
newClientOptions,
|
54
|
-
interceptorOptions.path,
|
55
|
-
interceptorOptions.input
|
294
|
+
attemptOptions
|
56
295
|
);
|
57
296
|
if (!shouldRetryBool) {
|
58
|
-
throw
|
297
|
+
throw currentError.error;
|
59
298
|
}
|
60
|
-
|
61
|
-
|
62
|
-
newClientOptions,
|
63
|
-
interceptorOptions.path,
|
64
|
-
interceptorOptions.input
|
65
|
-
);
|
66
|
-
const retryDelayMs = await value(
|
67
|
-
retryDelay,
|
68
|
-
attemptOptions,
|
69
|
-
newClientOptions,
|
70
|
-
interceptorOptions.path,
|
71
|
-
interceptorOptions.input
|
72
|
-
);
|
299
|
+
callback = onRetry?.(attemptOptions);
|
300
|
+
const retryDelayMs = await value(retryDelay, attemptOptions);
|
73
301
|
await new Promise((resolve) => setTimeout(resolve, retryDelayMs));
|
74
302
|
attemptIndex++;
|
75
303
|
}
|
76
304
|
try {
|
77
|
-
|
78
|
-
|
79
|
-
options: newClientOptions
|
80
|
-
});
|
81
|
-
return output2;
|
305
|
+
currentError = void 0;
|
306
|
+
return await interceptorOptions.next(updatedInterceptorOptions);
|
82
307
|
} catch (error) {
|
83
|
-
|
308
|
+
currentError = { error };
|
309
|
+
if (updatedInterceptorOptions.signal?.aborted === true) {
|
84
310
|
throw error;
|
85
311
|
}
|
86
|
-
current = { error };
|
87
312
|
} finally {
|
88
|
-
|
89
|
-
|
313
|
+
callback?.(!currentError);
|
314
|
+
callback = void 0;
|
90
315
|
}
|
91
316
|
}
|
92
317
|
};
|
@@ -128,4 +353,37 @@ class ClientRetryPlugin {
|
|
128
353
|
}
|
129
354
|
}
|
130
355
|
|
131
|
-
|
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,15 +1,17 @@
|
|
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;
|
8
8
|
lastEventId?: string | undefined;
|
9
|
-
|
10
|
-
|
9
|
+
context: T;
|
10
|
+
}
|
11
|
+
type FriendlyClientOptions<T extends ClientContext> = Omit<ClientOptions<T>, 'context'> & (Record<never, never> extends T ? {
|
12
|
+
context?: T;
|
11
13
|
} : {
|
12
|
-
context:
|
14
|
+
context: T;
|
13
15
|
});
|
14
16
|
type ClientRest<TClientContext extends ClientContext, TInput> = Record<never, never> extends TClientContext ? undefined extends TInput ? [input?: TInput, options?: FriendlyClientOptions<TClientContext>] : [input: TInput, options?: FriendlyClientOptions<TClientContext>] : [input: TInput, options: FriendlyClientOptions<TClientContext>];
|
15
17
|
type ClientPromiseResult<TOutput, TError> = PromiseWithError<TOutput, TError>;
|
@@ -20,9 +22,6 @@ type NestedClient<TClientContext extends ClientContext> = Client<TClientContext,
|
|
20
22
|
[k: string]: NestedClient<TClientContext>;
|
21
23
|
};
|
22
24
|
type InferClientContext<T extends NestedClient<any>> = T extends NestedClient<infer U> ? U : never;
|
23
|
-
type ClientOptions<TClientContext extends ClientContext> = FriendlyClientOptions<TClientContext> & {
|
24
|
-
context: TClientContext;
|
25
|
-
};
|
26
25
|
interface ClientLink<TClientContext extends ClientContext> {
|
27
26
|
call: (path: readonly string[], input: unknown, options: ClientOptions<TClientContext>) => Promise<unknown>;
|
28
27
|
}
|
@@ -1,15 +1,17 @@
|
|
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;
|
8
8
|
lastEventId?: string | undefined;
|
9
|
-
|
10
|
-
|
9
|
+
context: T;
|
10
|
+
}
|
11
|
+
type FriendlyClientOptions<T extends ClientContext> = Omit<ClientOptions<T>, 'context'> & (Record<never, never> extends T ? {
|
12
|
+
context?: T;
|
11
13
|
} : {
|
12
|
-
context:
|
14
|
+
context: T;
|
13
15
|
});
|
14
16
|
type ClientRest<TClientContext extends ClientContext, TInput> = Record<never, never> extends TClientContext ? undefined extends TInput ? [input?: TInput, options?: FriendlyClientOptions<TClientContext>] : [input: TInput, options?: FriendlyClientOptions<TClientContext>] : [input: TInput, options: FriendlyClientOptions<TClientContext>];
|
15
17
|
type ClientPromiseResult<TOutput, TError> = PromiseWithError<TOutput, TError>;
|
@@ -20,9 +22,6 @@ type NestedClient<TClientContext extends ClientContext> = Client<TClientContext,
|
|
20
22
|
[k: string]: NestedClient<TClientContext>;
|
21
23
|
};
|
22
24
|
type InferClientContext<T extends NestedClient<any>> = T extends NestedClient<infer U> ? U : never;
|
23
|
-
type ClientOptions<TClientContext extends ClientContext> = FriendlyClientOptions<TClientContext> & {
|
24
|
-
context: TClientContext;
|
25
|
-
};
|
26
25
|
interface ClientLink<TClientContext extends ClientContext> {
|
27
26
|
call: (path: readonly string[], input: unknown, options: ClientOptions<TClientContext>) => Promise<unknown>;
|
28
27
|
}
|
@@ -1,6 +1,6 @@
|
|
1
|
-
import { a as ClientContext, b as ClientOptions, d as HTTPMethod } from './client.
|
2
|
-
import {
|
3
|
-
import { Segment, Value } from '@orpc/shared';
|
1
|
+
import { a as ClientContext, b as ClientOptions, d as HTTPMethod } from './client.4TS_0JaO.js';
|
2
|
+
import { e as StandardLinkCodec, b as StandardLinkOptions, d as StandardLink, f as StandardLinkClient } from './client.C0KbSWlC.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,46 +44,30 @@ interface StandardRPCLinkCodecOptions<T extends ClientContext> {
|
|
44
44
|
/**
|
45
45
|
* Base url for all requests.
|
46
46
|
*/
|
47
|
-
url: Value<string | URL,
|
48
|
-
options: ClientOptions<T>,
|
49
|
-
path: readonly string[],
|
50
|
-
input: unknown
|
51
|
-
]>;
|
47
|
+
url: Value<Promisable<string | URL>, [options: ClientOptions<T>, path: readonly string[], input: unknown]>;
|
52
48
|
/**
|
53
49
|
* The maximum length of the URL.
|
54
50
|
*
|
55
51
|
* @default 2083
|
56
52
|
*/
|
57
|
-
maxUrlLength?: Value<number,
|
58
|
-
options: ClientOptions<T>,
|
59
|
-
path: readonly string[],
|
60
|
-
input: unknown
|
61
|
-
]>;
|
53
|
+
maxUrlLength?: Value<Promisable<number>, [options: ClientOptions<T>, path: readonly string[], input: unknown]>;
|
62
54
|
/**
|
63
55
|
* The method used to make the request.
|
64
56
|
*
|
65
57
|
* @default 'POST'
|
66
58
|
*/
|
67
|
-
method?: Value<HTTPMethod, [
|
68
|
-
options: ClientOptions<T>,
|
69
|
-
path: readonly string[],
|
70
|
-
input: unknown
|
71
|
-
]>;
|
59
|
+
method?: Value<Promisable<Exclude<HTTPMethod, 'HEAD'>>, [options: ClientOptions<T>, path: readonly string[], input: unknown]>;
|
72
60
|
/**
|
73
61
|
* The method to use when the payload cannot safely pass to the server with method return from method function.
|
74
62
|
* GET is not allowed, it's very dangerous.
|
75
63
|
*
|
76
64
|
* @default 'POST'
|
77
65
|
*/
|
78
|
-
fallbackMethod?: Exclude<HTTPMethod, 'GET'>;
|
66
|
+
fallbackMethod?: Exclude<HTTPMethod, 'HEAD' | 'GET'>;
|
79
67
|
/**
|
80
68
|
* Inject headers to the request.
|
81
69
|
*/
|
82
|
-
headers?: Value<StandardHeaders,
|
83
|
-
options: ClientOptions<T>,
|
84
|
-
path: readonly string[],
|
85
|
-
input: unknown
|
86
|
-
]>;
|
70
|
+
headers?: Value<Promisable<StandardHeaders>, [options: ClientOptions<T>, path: readonly string[], input: unknown]>;
|
87
71
|
}
|
88
72
|
declare class StandardRPCLinkCodec<T extends ClientContext> implements StandardLinkCodec<T> {
|
89
73
|
private readonly serializer;
|
@@ -99,5 +83,9 @@ declare class StandardRPCLinkCodec<T extends ClientContext> implements StandardL
|
|
99
83
|
|
100
84
|
interface StandardRPCLinkOptions<T extends ClientContext> extends StandardLinkOptions<T>, StandardRPCLinkCodecOptions<T>, StandardRPCJsonSerializerOptions {
|
101
85
|
}
|
86
|
+
declare class StandardRPCLink<T extends ClientContext> extends StandardLink<T> {
|
87
|
+
constructor(linkClient: StandardLinkClient<T>, options: StandardRPCLinkOptions<T>);
|
88
|
+
}
|
102
89
|
|
103
|
-
export { STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES as S,
|
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,16 @@
|
|
1
|
-
import { Interceptor
|
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.
|
3
|
+
import { a as ClientContext, b as ClientOptions, C as ClientLink } from './client.4TS_0JaO.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,20 +20,16 @@ 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
|
-
|
23
|
+
interface StandardLinkInterceptorOptions<T extends ClientContext> extends ClientOptions<T> {
|
24
|
+
path: readonly string[];
|
25
|
+
input: unknown;
|
14
26
|
}
|
15
|
-
interface
|
16
|
-
|
27
|
+
interface StandardLinkClientInterceptorOptions<T extends ClientContext> extends StandardLinkInterceptorOptions<T> {
|
28
|
+
request: StandardRequest;
|
17
29
|
}
|
18
30
|
interface StandardLinkOptions<T extends ClientContext> {
|
19
|
-
interceptors?: Interceptor<
|
20
|
-
|
21
|
-
input: unknown;
|
22
|
-
options: ClientOptions<T>;
|
23
|
-
}, unknown, ThrowableError>[];
|
24
|
-
clientInterceptors?: Interceptor<{
|
25
|
-
request: StandardRequest;
|
26
|
-
}, StandardLazyResponse, ThrowableError>[];
|
31
|
+
interceptors?: Interceptor<StandardLinkInterceptorOptions<T>, Promise<unknown>>[];
|
32
|
+
clientInterceptors?: Interceptor<StandardLinkClientInterceptorOptions<T>, Promise<StandardLazyResponse>>[];
|
27
33
|
plugins?: StandardLinkPlugin<T>[];
|
28
34
|
}
|
29
35
|
declare class StandardLink<T extends ClientContext> implements ClientLink<T> {
|
@@ -36,4 +42,5 @@ declare class StandardLink<T extends ClientContext> implements ClientLink<T> {
|
|
36
42
|
call(path: readonly string[], input: unknown, options: ClientOptions<T>): Promise<unknown>;
|
37
43
|
}
|
38
44
|
|
39
|
-
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 };
|
@@ -1,4 +1,4 @@
|
|
1
|
-
import { isObject, isTypescriptObject } from '@orpc/shared';
|
1
|
+
import { isObject, AsyncIteratorClass, isTypescriptObject } from '@orpc/shared';
|
2
2
|
import { getEventMeta, withEventMeta } from '@orpc/standard-server';
|
3
3
|
|
4
4
|
const COMMON_ORPC_ERROR_DEFS = {
|
@@ -110,22 +110,6 @@ class ORPCError extends Error {
|
|
110
110
|
data: this.data
|
111
111
|
};
|
112
112
|
}
|
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
113
|
}
|
130
114
|
function isDefinedError(error) {
|
131
115
|
return error instanceof ORPCError && error.defined;
|
@@ -139,24 +123,35 @@ function toORPCError(error) {
|
|
139
123
|
function isORPCErrorStatus(status) {
|
140
124
|
return status < 200 || status >= 400;
|
141
125
|
}
|
126
|
+
function isORPCErrorJson(json) {
|
127
|
+
if (!isObject(json)) {
|
128
|
+
return false;
|
129
|
+
}
|
130
|
+
const validKeys = ["defined", "code", "status", "message", "data"];
|
131
|
+
if (Object.keys(json).some((k) => !validKeys.includes(k))) {
|
132
|
+
return false;
|
133
|
+
}
|
134
|
+
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";
|
135
|
+
}
|
136
|
+
function createORPCErrorFromJson(json, options = {}) {
|
137
|
+
return new ORPCError(json.code, {
|
138
|
+
...options,
|
139
|
+
...json
|
140
|
+
});
|
141
|
+
}
|
142
142
|
|
143
143
|
function mapEventIterator(iterator, maps) {
|
144
|
-
return async
|
144
|
+
return new AsyncIteratorClass(async () => {
|
145
145
|
try {
|
146
|
-
|
147
|
-
|
148
|
-
|
149
|
-
|
150
|
-
|
151
|
-
|
152
|
-
mappedValue = withEventMeta(mappedValue, meta);
|
153
|
-
}
|
146
|
+
const { done, value } = await iterator.next();
|
147
|
+
let mappedValue = await maps.value(value, done);
|
148
|
+
if (mappedValue !== value) {
|
149
|
+
const meta = getEventMeta(value);
|
150
|
+
if (meta && isTypescriptObject(mappedValue)) {
|
151
|
+
mappedValue = withEventMeta(mappedValue, meta);
|
154
152
|
}
|
155
|
-
if (done) {
|
156
|
-
return mappedValue;
|
157
|
-
}
|
158
|
-
yield mappedValue;
|
159
153
|
}
|
154
|
+
return { done, value: mappedValue };
|
160
155
|
} catch (error) {
|
161
156
|
let mappedError = await maps.error(error);
|
162
157
|
if (mappedError !== error) {
|
@@ -166,10 +161,12 @@ function mapEventIterator(iterator, maps) {
|
|
166
161
|
}
|
167
162
|
}
|
168
163
|
throw mappedError;
|
169
|
-
}
|
164
|
+
}
|
165
|
+
}, async (reason) => {
|
166
|
+
if (reason !== "next") {
|
170
167
|
await iterator.return?.();
|
171
168
|
}
|
172
|
-
}
|
169
|
+
});
|
173
170
|
}
|
174
171
|
|
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 };
|
172
|
+
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 };
|