@orpc/client 0.51.0 → 0.53.0
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 +1 -0
- package/dist/adapters/fetch/index.d.mts +8 -12
- package/dist/adapters/fetch/index.d.ts +8 -12
- package/dist/adapters/fetch/index.mjs +5 -12
- package/dist/adapters/standard/index.d.mts +8 -103
- package/dist/adapters/standard/index.d.ts +8 -103
- package/dist/adapters/standard/index.mjs +2 -2
- package/dist/index.d.mts +15 -11
- package/dist/index.d.ts +15 -11
- package/dist/index.mjs +8 -8
- package/dist/plugins/index.d.mts +102 -20
- package/dist/plugins/index.d.ts +102 -20
- package/dist/plugins/index.mjs +196 -32
- package/dist/shared/{client.CKw2tbcl.d.mts → client.Bt2hFtM_.d.mts} +19 -13
- package/dist/shared/{client.BacCdg3F.mjs → client.CRWEpqLB.mjs} +22 -19
- package/dist/shared/{client.RZs5Myak.d.mts → client.CipPQkhk.d.mts} +14 -15
- package/dist/shared/{client.RZs5Myak.d.ts → client.CipPQkhk.d.ts} +14 -15
- package/dist/shared/client.DXvQo1nS.d.mts +90 -0
- package/dist/shared/client.Dc8eXpCj.d.ts +90 -0
- package/dist/shared/{client.CAwgYDwB.mjs → client.DpICn1BD.mjs} +47 -26
- package/dist/shared/{client.Bt40CWA-.d.ts → client.FvDtk0Vr.d.ts} +19 -13
- package/package.json +4 -4
package/dist/plugins/index.d.mts
CHANGED
@@ -1,11 +1,73 @@
|
|
1
1
|
import { Value } from '@orpc/shared';
|
2
|
-
import {
|
3
|
-
import {
|
4
|
-
import '
|
2
|
+
import { StandardHeaders, StandardRequest } from '@orpc/standard-server';
|
3
|
+
import { S as StandardLinkClientInterceptorOptions, a as StandardLinkPlugin, b as StandardLinkOptions, c as StandardLinkInterceptorOptions } from '../shared/client.Bt2hFtM_.mjs';
|
4
|
+
import { a as ClientContext } from '../shared/client.CipPQkhk.mjs';
|
5
5
|
|
6
|
-
interface
|
6
|
+
interface BatchLinkPluginGroup<T extends ClientContext> {
|
7
|
+
condition(options: StandardLinkClientInterceptorOptions<T>): boolean;
|
8
|
+
context: T;
|
9
|
+
path?: readonly string[];
|
10
|
+
input?: unknown;
|
11
|
+
}
|
12
|
+
interface BatchLinkPluginOptions<T extends ClientContext> {
|
13
|
+
groups: readonly [BatchLinkPluginGroup<T>, ...BatchLinkPluginGroup<T>[]];
|
14
|
+
/**
|
15
|
+
* The maximum number of requests in the batch.
|
16
|
+
*
|
17
|
+
* @default 10
|
18
|
+
*/
|
19
|
+
maxSize?: Value<number, [readonly [StandardLinkClientInterceptorOptions<T>, ...StandardLinkClientInterceptorOptions<T>[]]]>;
|
20
|
+
/**
|
21
|
+
* Defines the URL to use for the batch request.
|
22
|
+
*
|
23
|
+
* @default the URL of the first request in the batch + '/__batch__'
|
24
|
+
*/
|
25
|
+
url?: Value<string | URL, [readonly [StandardLinkClientInterceptorOptions<T>, ...StandardLinkClientInterceptorOptions<T>[]]]>;
|
26
|
+
/**
|
27
|
+
* The maximum length of the URL.
|
28
|
+
*
|
29
|
+
* @default 2083
|
30
|
+
*/
|
31
|
+
maxUrlLength?: Value<number, [readonly [StandardLinkClientInterceptorOptions<T>, ...StandardLinkClientInterceptorOptions<T>[]]]>;
|
32
|
+
/**
|
33
|
+
* Defines the HTTP headers to use for the batch request.
|
34
|
+
*
|
35
|
+
* @default The same headers of all requests in the batch
|
36
|
+
*/
|
37
|
+
headers?: Value<StandardHeaders, [readonly [StandardLinkClientInterceptorOptions<T>, ...StandardLinkClientInterceptorOptions<T>[]]]>;
|
38
|
+
/**
|
39
|
+
* Map the batch request items before sending them.
|
40
|
+
*
|
41
|
+
* @default Removes headers that are duplicated in the batch headers.
|
42
|
+
*/
|
43
|
+
mapRequestItem?: (options: StandardLinkClientInterceptorOptions<T> & {
|
44
|
+
batchUrl: URL;
|
45
|
+
batchHeaders: StandardHeaders;
|
46
|
+
}) => StandardRequest;
|
47
|
+
/**
|
48
|
+
* Exclude a request from the batch.
|
49
|
+
*
|
50
|
+
* @default () => false
|
51
|
+
*/
|
52
|
+
exclude?: (options: StandardLinkClientInterceptorOptions<T>) => boolean;
|
53
|
+
}
|
54
|
+
declare class BatchLinkPlugin<T extends ClientContext> implements StandardLinkPlugin<T> {
|
55
|
+
#private;
|
56
|
+
private readonly groups;
|
57
|
+
private readonly maxSize;
|
58
|
+
private readonly batchUrl;
|
59
|
+
private readonly maxUrlLength;
|
60
|
+
private readonly batchHeaders;
|
61
|
+
private readonly mapRequestItem;
|
62
|
+
private readonly exclude;
|
63
|
+
private pending;
|
64
|
+
order: number;
|
65
|
+
constructor(options: BatchLinkPluginOptions<T>);
|
66
|
+
init(options: StandardLinkOptions<T>): void;
|
67
|
+
}
|
68
|
+
|
69
|
+
interface ClientRetryPluginAttemptOptions<T extends ClientContext> extends StandardLinkInterceptorOptions<T> {
|
7
70
|
lastEventRetry: number | undefined;
|
8
|
-
lastEventId: string | undefined;
|
9
71
|
attemptIndex: number;
|
10
72
|
error: unknown;
|
11
73
|
}
|
@@ -16,33 +78,23 @@ interface ClientRetryPluginContext {
|
|
16
78
|
*
|
17
79
|
* @default 0
|
18
80
|
*/
|
19
|
-
retry?: number
|
81
|
+
retry?: Value<number, [StandardLinkInterceptorOptions<ClientRetryPluginContext>]>;
|
20
82
|
/**
|
21
83
|
* Delay (in ms) before retrying.
|
22
84
|
*
|
23
85
|
* @default (o) => o.lastEventRetry ?? 2000
|
24
86
|
*/
|
25
|
-
retryDelay?: Value<number, [
|
26
|
-
attemptOptions: ClientRetryPluginAttemptOptions,
|
27
|
-
clientOptions: ClientOptions<ClientRetryPluginContext>,
|
28
|
-
path: readonly string[],
|
29
|
-
input: unknown
|
30
|
-
]>;
|
87
|
+
retryDelay?: Value<number, [ClientRetryPluginAttemptOptions<ClientRetryPluginContext>]>;
|
31
88
|
/**
|
32
89
|
* Determine should retry or not.
|
33
90
|
*
|
34
91
|
* @default true
|
35
92
|
*/
|
36
|
-
shouldRetry?: Value<boolean, [
|
37
|
-
attemptOptions: ClientRetryPluginAttemptOptions,
|
38
|
-
clientOptions: ClientOptions<ClientRetryPluginContext>,
|
39
|
-
path: readonly string[],
|
40
|
-
input: unknown
|
41
|
-
]>;
|
93
|
+
shouldRetry?: Value<boolean, [ClientRetryPluginAttemptOptions<ClientRetryPluginContext>]>;
|
42
94
|
/**
|
43
95
|
* The hook called when retrying, and return the unsubscribe function.
|
44
96
|
*/
|
45
|
-
onRetry?: (options: ClientRetryPluginAttemptOptions
|
97
|
+
onRetry?: (options: ClientRetryPluginAttemptOptions<ClientRetryPluginContext>) => void | (() => void);
|
46
98
|
}
|
47
99
|
declare class ClientRetryPluginInvalidEventIteratorRetryResponse extends Error {
|
48
100
|
}
|
@@ -58,4 +110,34 @@ declare class ClientRetryPlugin<T extends ClientRetryPluginContext> implements S
|
|
58
110
|
init(options: StandardLinkOptions<T>): void;
|
59
111
|
}
|
60
112
|
|
61
|
-
|
113
|
+
interface SimpleCsrfProtectionLinkPluginOptions<T extends ClientContext> {
|
114
|
+
/**
|
115
|
+
* The name of the header to check.
|
116
|
+
*
|
117
|
+
* @default 'x-csrf-token'
|
118
|
+
*/
|
119
|
+
headerName?: Value<string, [options: StandardLinkClientInterceptorOptions<T>]>;
|
120
|
+
/**
|
121
|
+
* The value of the header to check.
|
122
|
+
*
|
123
|
+
* @default 'orpc'
|
124
|
+
*
|
125
|
+
*/
|
126
|
+
headerValue?: Value<string, [options: StandardLinkClientInterceptorOptions<T>]>;
|
127
|
+
/**
|
128
|
+
* Exclude a procedure from the plugin.
|
129
|
+
*
|
130
|
+
* @default false
|
131
|
+
*/
|
132
|
+
exclude?: Value<boolean, [options: StandardLinkClientInterceptorOptions<T>]>;
|
133
|
+
}
|
134
|
+
declare class SimpleCsrfProtectionLinkPlugin<T extends ClientContext> implements StandardLinkPlugin<T> {
|
135
|
+
private readonly headerName;
|
136
|
+
private readonly headerValue;
|
137
|
+
private readonly exclude;
|
138
|
+
constructor(options?: SimpleCsrfProtectionLinkPluginOptions<T>);
|
139
|
+
order: number;
|
140
|
+
init(options: StandardLinkOptions<T>): void;
|
141
|
+
}
|
142
|
+
|
143
|
+
export { BatchLinkPlugin, type BatchLinkPluginGroup, type BatchLinkPluginOptions, ClientRetryPlugin, type ClientRetryPluginAttemptOptions, type ClientRetryPluginContext, ClientRetryPluginInvalidEventIteratorRetryResponse, type ClientRetryPluginOptions, SimpleCsrfProtectionLinkPlugin, type SimpleCsrfProtectionLinkPluginOptions };
|
package/dist/plugins/index.d.ts
CHANGED
@@ -1,11 +1,73 @@
|
|
1
1
|
import { Value } from '@orpc/shared';
|
2
|
-
import {
|
3
|
-
import {
|
4
|
-
import '
|
2
|
+
import { StandardHeaders, StandardRequest } from '@orpc/standard-server';
|
3
|
+
import { S as StandardLinkClientInterceptorOptions, a as StandardLinkPlugin, b as StandardLinkOptions, c as StandardLinkInterceptorOptions } from '../shared/client.FvDtk0Vr.js';
|
4
|
+
import { a as ClientContext } from '../shared/client.CipPQkhk.js';
|
5
5
|
|
6
|
-
interface
|
6
|
+
interface BatchLinkPluginGroup<T extends ClientContext> {
|
7
|
+
condition(options: StandardLinkClientInterceptorOptions<T>): boolean;
|
8
|
+
context: T;
|
9
|
+
path?: readonly string[];
|
10
|
+
input?: unknown;
|
11
|
+
}
|
12
|
+
interface BatchLinkPluginOptions<T extends ClientContext> {
|
13
|
+
groups: readonly [BatchLinkPluginGroup<T>, ...BatchLinkPluginGroup<T>[]];
|
14
|
+
/**
|
15
|
+
* The maximum number of requests in the batch.
|
16
|
+
*
|
17
|
+
* @default 10
|
18
|
+
*/
|
19
|
+
maxSize?: Value<number, [readonly [StandardLinkClientInterceptorOptions<T>, ...StandardLinkClientInterceptorOptions<T>[]]]>;
|
20
|
+
/**
|
21
|
+
* Defines the URL to use for the batch request.
|
22
|
+
*
|
23
|
+
* @default the URL of the first request in the batch + '/__batch__'
|
24
|
+
*/
|
25
|
+
url?: Value<string | URL, [readonly [StandardLinkClientInterceptorOptions<T>, ...StandardLinkClientInterceptorOptions<T>[]]]>;
|
26
|
+
/**
|
27
|
+
* The maximum length of the URL.
|
28
|
+
*
|
29
|
+
* @default 2083
|
30
|
+
*/
|
31
|
+
maxUrlLength?: Value<number, [readonly [StandardLinkClientInterceptorOptions<T>, ...StandardLinkClientInterceptorOptions<T>[]]]>;
|
32
|
+
/**
|
33
|
+
* Defines the HTTP headers to use for the batch request.
|
34
|
+
*
|
35
|
+
* @default The same headers of all requests in the batch
|
36
|
+
*/
|
37
|
+
headers?: Value<StandardHeaders, [readonly [StandardLinkClientInterceptorOptions<T>, ...StandardLinkClientInterceptorOptions<T>[]]]>;
|
38
|
+
/**
|
39
|
+
* Map the batch request items before sending them.
|
40
|
+
*
|
41
|
+
* @default Removes headers that are duplicated in the batch headers.
|
42
|
+
*/
|
43
|
+
mapRequestItem?: (options: StandardLinkClientInterceptorOptions<T> & {
|
44
|
+
batchUrl: URL;
|
45
|
+
batchHeaders: StandardHeaders;
|
46
|
+
}) => StandardRequest;
|
47
|
+
/**
|
48
|
+
* Exclude a request from the batch.
|
49
|
+
*
|
50
|
+
* @default () => false
|
51
|
+
*/
|
52
|
+
exclude?: (options: StandardLinkClientInterceptorOptions<T>) => boolean;
|
53
|
+
}
|
54
|
+
declare class BatchLinkPlugin<T extends ClientContext> implements StandardLinkPlugin<T> {
|
55
|
+
#private;
|
56
|
+
private readonly groups;
|
57
|
+
private readonly maxSize;
|
58
|
+
private readonly batchUrl;
|
59
|
+
private readonly maxUrlLength;
|
60
|
+
private readonly batchHeaders;
|
61
|
+
private readonly mapRequestItem;
|
62
|
+
private readonly exclude;
|
63
|
+
private pending;
|
64
|
+
order: number;
|
65
|
+
constructor(options: BatchLinkPluginOptions<T>);
|
66
|
+
init(options: StandardLinkOptions<T>): void;
|
67
|
+
}
|
68
|
+
|
69
|
+
interface ClientRetryPluginAttemptOptions<T extends ClientContext> extends StandardLinkInterceptorOptions<T> {
|
7
70
|
lastEventRetry: number | undefined;
|
8
|
-
lastEventId: string | undefined;
|
9
71
|
attemptIndex: number;
|
10
72
|
error: unknown;
|
11
73
|
}
|
@@ -16,33 +78,23 @@ interface ClientRetryPluginContext {
|
|
16
78
|
*
|
17
79
|
* @default 0
|
18
80
|
*/
|
19
|
-
retry?: number
|
81
|
+
retry?: Value<number, [StandardLinkInterceptorOptions<ClientRetryPluginContext>]>;
|
20
82
|
/**
|
21
83
|
* Delay (in ms) before retrying.
|
22
84
|
*
|
23
85
|
* @default (o) => o.lastEventRetry ?? 2000
|
24
86
|
*/
|
25
|
-
retryDelay?: Value<number, [
|
26
|
-
attemptOptions: ClientRetryPluginAttemptOptions,
|
27
|
-
clientOptions: ClientOptions<ClientRetryPluginContext>,
|
28
|
-
path: readonly string[],
|
29
|
-
input: unknown
|
30
|
-
]>;
|
87
|
+
retryDelay?: Value<number, [ClientRetryPluginAttemptOptions<ClientRetryPluginContext>]>;
|
31
88
|
/**
|
32
89
|
* Determine should retry or not.
|
33
90
|
*
|
34
91
|
* @default true
|
35
92
|
*/
|
36
|
-
shouldRetry?: Value<boolean, [
|
37
|
-
attemptOptions: ClientRetryPluginAttemptOptions,
|
38
|
-
clientOptions: ClientOptions<ClientRetryPluginContext>,
|
39
|
-
path: readonly string[],
|
40
|
-
input: unknown
|
41
|
-
]>;
|
93
|
+
shouldRetry?: Value<boolean, [ClientRetryPluginAttemptOptions<ClientRetryPluginContext>]>;
|
42
94
|
/**
|
43
95
|
* The hook called when retrying, and return the unsubscribe function.
|
44
96
|
*/
|
45
|
-
onRetry?: (options: ClientRetryPluginAttemptOptions
|
97
|
+
onRetry?: (options: ClientRetryPluginAttemptOptions<ClientRetryPluginContext>) => void | (() => void);
|
46
98
|
}
|
47
99
|
declare class ClientRetryPluginInvalidEventIteratorRetryResponse extends Error {
|
48
100
|
}
|
@@ -58,4 +110,34 @@ declare class ClientRetryPlugin<T extends ClientRetryPluginContext> implements S
|
|
58
110
|
init(options: StandardLinkOptions<T>): void;
|
59
111
|
}
|
60
112
|
|
61
|
-
|
113
|
+
interface SimpleCsrfProtectionLinkPluginOptions<T extends ClientContext> {
|
114
|
+
/**
|
115
|
+
* The name of the header to check.
|
116
|
+
*
|
117
|
+
* @default 'x-csrf-token'
|
118
|
+
*/
|
119
|
+
headerName?: Value<string, [options: StandardLinkClientInterceptorOptions<T>]>;
|
120
|
+
/**
|
121
|
+
* The value of the header to check.
|
122
|
+
*
|
123
|
+
* @default 'orpc'
|
124
|
+
*
|
125
|
+
*/
|
126
|
+
headerValue?: Value<string, [options: StandardLinkClientInterceptorOptions<T>]>;
|
127
|
+
/**
|
128
|
+
* Exclude a procedure from the plugin.
|
129
|
+
*
|
130
|
+
* @default false
|
131
|
+
*/
|
132
|
+
exclude?: Value<boolean, [options: StandardLinkClientInterceptorOptions<T>]>;
|
133
|
+
}
|
134
|
+
declare class SimpleCsrfProtectionLinkPlugin<T extends ClientContext> implements StandardLinkPlugin<T> {
|
135
|
+
private readonly headerName;
|
136
|
+
private readonly headerValue;
|
137
|
+
private readonly exclude;
|
138
|
+
constructor(options?: SimpleCsrfProtectionLinkPluginOptions<T>);
|
139
|
+
order: number;
|
140
|
+
init(options: StandardLinkOptions<T>): void;
|
141
|
+
}
|
142
|
+
|
143
|
+
export { BatchLinkPlugin, type BatchLinkPluginGroup, type BatchLinkPluginOptions, ClientRetryPlugin, type ClientRetryPluginAttemptOptions, type ClientRetryPluginContext, ClientRetryPluginInvalidEventIteratorRetryResponse, type ClientRetryPluginOptions, SimpleCsrfProtectionLinkPlugin, type SimpleCsrfProtectionLinkPluginOptions };
|
package/dist/plugins/index.mjs
CHANGED
@@ -1,6 +1,152 @@
|
|
1
|
-
import { isAsyncIteratorObject, value } from '@orpc/shared';
|
1
|
+
import { isAsyncIteratorObject, value, splitInHalf, toArray } from '@orpc/shared';
|
2
|
+
import { toBatchRequest, parseBatchResponse } from '@orpc/standard-server/batch';
|
2
3
|
import { getEventMeta } from '@orpc/standard-server';
|
3
4
|
|
5
|
+
class BatchLinkPlugin {
|
6
|
+
groups;
|
7
|
+
maxSize;
|
8
|
+
batchUrl;
|
9
|
+
maxUrlLength;
|
10
|
+
batchHeaders;
|
11
|
+
mapRequestItem;
|
12
|
+
exclude;
|
13
|
+
pending;
|
14
|
+
order = 5e6;
|
15
|
+
constructor(options) {
|
16
|
+
this.groups = options.groups;
|
17
|
+
this.pending = /* @__PURE__ */ new Map();
|
18
|
+
this.maxSize = options.maxSize ?? 10;
|
19
|
+
this.maxUrlLength = options.maxUrlLength ?? 2083;
|
20
|
+
this.batchUrl = options.url ?? (([options2]) => `${options2.request.url.origin}${options2.request.url.pathname}/__batch__`);
|
21
|
+
this.batchHeaders = options.headers ?? (([options2, ...rest]) => {
|
22
|
+
const headers = {};
|
23
|
+
for (const [key, value2] of Object.entries(options2.request.headers)) {
|
24
|
+
if (rest.every((item) => item.request.headers[key] === value2)) {
|
25
|
+
headers[key] = value2;
|
26
|
+
}
|
27
|
+
}
|
28
|
+
return headers;
|
29
|
+
});
|
30
|
+
this.mapRequestItem = options.mapRequestItem ?? (({ request, batchHeaders }) => {
|
31
|
+
const headers = {};
|
32
|
+
for (const [key, value2] of Object.entries(request.headers)) {
|
33
|
+
if (batchHeaders[key] !== value2) {
|
34
|
+
headers[key] = value2;
|
35
|
+
}
|
36
|
+
}
|
37
|
+
return {
|
38
|
+
method: request.method,
|
39
|
+
url: request.url,
|
40
|
+
headers,
|
41
|
+
body: request.body,
|
42
|
+
signal: request.signal
|
43
|
+
};
|
44
|
+
});
|
45
|
+
this.exclude = options.exclude ?? (() => false);
|
46
|
+
}
|
47
|
+
init(options) {
|
48
|
+
options.clientInterceptors ??= [];
|
49
|
+
options.clientInterceptors.push((options2) => {
|
50
|
+
if (options2.request.headers["x-orpc-batch"] !== "1") {
|
51
|
+
return options2.next();
|
52
|
+
}
|
53
|
+
return options2.next({
|
54
|
+
...options2,
|
55
|
+
request: {
|
56
|
+
...options2.request,
|
57
|
+
headers: {
|
58
|
+
...options2.request.headers,
|
59
|
+
"x-orpc-batch": void 0
|
60
|
+
}
|
61
|
+
}
|
62
|
+
});
|
63
|
+
});
|
64
|
+
options.clientInterceptors.push((options2) => {
|
65
|
+
if (this.exclude(options2) || options2.request.body instanceof Blob || options2.request.body instanceof FormData || isAsyncIteratorObject(options2.request.body)) {
|
66
|
+
return options2.next();
|
67
|
+
}
|
68
|
+
const group = this.groups.find((group2) => group2.condition(options2));
|
69
|
+
if (!group) {
|
70
|
+
return options2.next();
|
71
|
+
}
|
72
|
+
return new Promise((resolve, reject) => {
|
73
|
+
this.#enqueueRequest(group, options2, resolve, reject);
|
74
|
+
setTimeout(() => this.#processPendingBatches());
|
75
|
+
});
|
76
|
+
});
|
77
|
+
}
|
78
|
+
#enqueueRequest(group, options, resolve, reject) {
|
79
|
+
const items = this.pending.get(group);
|
80
|
+
if (items) {
|
81
|
+
items.push([options, resolve, reject]);
|
82
|
+
} else {
|
83
|
+
this.pending.set(group, [[options, resolve, reject]]);
|
84
|
+
}
|
85
|
+
}
|
86
|
+
async #processPendingBatches() {
|
87
|
+
const pending = this.pending;
|
88
|
+
this.pending = /* @__PURE__ */ new Map();
|
89
|
+
for (const [group, items] of pending) {
|
90
|
+
const getItems = items.filter(([options]) => options.request.method === "GET");
|
91
|
+
const restItems = items.filter(([options]) => options.request.method !== "GET");
|
92
|
+
this.#executeBatch("GET", group, getItems);
|
93
|
+
this.#executeBatch("POST", group, restItems);
|
94
|
+
}
|
95
|
+
}
|
96
|
+
async #executeBatch(method, group, groupItems) {
|
97
|
+
if (!groupItems.length) {
|
98
|
+
return;
|
99
|
+
}
|
100
|
+
const batchItems = groupItems;
|
101
|
+
if (batchItems.length === 1) {
|
102
|
+
batchItems[0][0].next().then(batchItems[0][1]).catch(batchItems[0][2]);
|
103
|
+
return;
|
104
|
+
}
|
105
|
+
try {
|
106
|
+
const options = batchItems.map(([options2]) => options2);
|
107
|
+
const maxSize = await value(this.maxSize, options);
|
108
|
+
if (batchItems.length > maxSize) {
|
109
|
+
const [first, second] = splitInHalf(batchItems);
|
110
|
+
this.#executeBatch(method, group, first);
|
111
|
+
this.#executeBatch(method, group, second);
|
112
|
+
return;
|
113
|
+
}
|
114
|
+
const batchUrl = new URL(await value(this.batchUrl, options));
|
115
|
+
const batchHeaders = await value(this.batchHeaders, options);
|
116
|
+
const mappedItems = batchItems.map(([options2]) => this.mapRequestItem({ ...options2, batchUrl, batchHeaders }));
|
117
|
+
const batchRequest = toBatchRequest({
|
118
|
+
method,
|
119
|
+
url: batchUrl,
|
120
|
+
headers: batchHeaders,
|
121
|
+
requests: mappedItems
|
122
|
+
});
|
123
|
+
const maxUrlLength = await value(this.maxUrlLength, options);
|
124
|
+
if (batchRequest.url.toString().length > maxUrlLength) {
|
125
|
+
const [first, second] = splitInHalf(batchItems);
|
126
|
+
this.#executeBatch(method, group, first);
|
127
|
+
this.#executeBatch(method, group, second);
|
128
|
+
return;
|
129
|
+
}
|
130
|
+
const lazyResponse = await options[0].next({
|
131
|
+
request: { ...batchRequest, headers: { ...batchRequest.headers, "x-orpc-batch": "1" } },
|
132
|
+
signal: batchRequest.signal,
|
133
|
+
context: group.context,
|
134
|
+
input: group.input,
|
135
|
+
path: toArray(group.path)
|
136
|
+
});
|
137
|
+
const parsed = parseBatchResponse({ ...lazyResponse, body: await lazyResponse.body() });
|
138
|
+
for await (const item of parsed) {
|
139
|
+
batchItems[item.index]?.[1]({ ...item, body: () => Promise.resolve(item.body) });
|
140
|
+
}
|
141
|
+
throw new Error("Something went wrong make batch response not contains enough responses. This can be a bug please report it.");
|
142
|
+
} catch (error) {
|
143
|
+
for (const [, , reject] of batchItems) {
|
144
|
+
reject(error);
|
145
|
+
}
|
146
|
+
}
|
147
|
+
}
|
148
|
+
}
|
149
|
+
|
4
150
|
class ClientRetryPluginInvalidEventIteratorRetryResponse extends Error {
|
5
151
|
}
|
6
152
|
class ClientRetryPlugin {
|
@@ -17,65 +163,50 @@ class ClientRetryPlugin {
|
|
17
163
|
init(options) {
|
18
164
|
options.interceptors ??= [];
|
19
165
|
options.interceptors.push(async (interceptorOptions) => {
|
20
|
-
const maxAttempts =
|
21
|
-
|
22
|
-
|
23
|
-
|
166
|
+
const maxAttempts = await value(
|
167
|
+
interceptorOptions.context.retry ?? this.defaultRetry,
|
168
|
+
interceptorOptions
|
169
|
+
);
|
170
|
+
const retryDelay = interceptorOptions.context.retryDelay ?? this.defaultRetryDelay;
|
171
|
+
const shouldRetry = interceptorOptions.context.shouldRetry ?? this.defaultShouldRetry;
|
172
|
+
const onRetry = interceptorOptions.context.onRetry ?? this.defaultOnRetry;
|
24
173
|
if (maxAttempts <= 0) {
|
25
174
|
return interceptorOptions.next();
|
26
175
|
}
|
27
|
-
let lastEventId = interceptorOptions.
|
176
|
+
let lastEventId = interceptorOptions.lastEventId;
|
28
177
|
let lastEventRetry;
|
29
178
|
let unsubscribe;
|
30
179
|
let attemptIndex = 0;
|
31
180
|
const next = async (initial) => {
|
32
181
|
let current = initial;
|
33
182
|
while (true) {
|
34
|
-
const
|
183
|
+
const updatedInterceptorOptions = { ...interceptorOptions, lastEventId };
|
35
184
|
if (current) {
|
36
185
|
if (attemptIndex >= maxAttempts) {
|
37
186
|
throw current.error;
|
38
187
|
}
|
39
188
|
const attemptOptions = {
|
189
|
+
...updatedInterceptorOptions,
|
40
190
|
attemptIndex,
|
41
191
|
error: current.error,
|
42
|
-
lastEventId,
|
43
192
|
lastEventRetry
|
44
193
|
};
|
45
194
|
const shouldRetryBool = await value(
|
46
195
|
shouldRetry,
|
47
|
-
attemptOptions
|
48
|
-
newClientOptions,
|
49
|
-
interceptorOptions.path,
|
50
|
-
interceptorOptions.input
|
196
|
+
attemptOptions
|
51
197
|
);
|
52
198
|
if (!shouldRetryBool) {
|
53
199
|
throw current.error;
|
54
200
|
}
|
55
|
-
unsubscribe = onRetry?.(
|
56
|
-
|
57
|
-
newClientOptions,
|
58
|
-
interceptorOptions.path,
|
59
|
-
interceptorOptions.input
|
60
|
-
);
|
61
|
-
const retryDelayMs = await value(
|
62
|
-
retryDelay,
|
63
|
-
attemptOptions,
|
64
|
-
newClientOptions,
|
65
|
-
interceptorOptions.path,
|
66
|
-
interceptorOptions.input
|
67
|
-
);
|
201
|
+
unsubscribe = onRetry?.(attemptOptions);
|
202
|
+
const retryDelayMs = await value(retryDelay, attemptOptions);
|
68
203
|
await new Promise((resolve) => setTimeout(resolve, retryDelayMs));
|
69
204
|
attemptIndex++;
|
70
205
|
}
|
71
206
|
try {
|
72
|
-
|
73
|
-
...interceptorOptions,
|
74
|
-
options: newClientOptions
|
75
|
-
});
|
76
|
-
return output2;
|
207
|
+
return await interceptorOptions.next(updatedInterceptorOptions);
|
77
208
|
} catch (error) {
|
78
|
-
if (
|
209
|
+
if (updatedInterceptorOptions.signal?.aborted === true) {
|
79
210
|
throw error;
|
80
211
|
}
|
81
212
|
current = { error };
|
@@ -123,4 +254,37 @@ class ClientRetryPlugin {
|
|
123
254
|
}
|
124
255
|
}
|
125
256
|
|
126
|
-
|
257
|
+
class SimpleCsrfProtectionLinkPlugin {
|
258
|
+
headerName;
|
259
|
+
headerValue;
|
260
|
+
exclude;
|
261
|
+
constructor(options = {}) {
|
262
|
+
this.headerName = options.headerName ?? "x-csrf-token";
|
263
|
+
this.headerValue = options.headerValue ?? "orpc";
|
264
|
+
this.exclude = options.exclude ?? false;
|
265
|
+
}
|
266
|
+
order = 8e6;
|
267
|
+
init(options) {
|
268
|
+
options.clientInterceptors ??= [];
|
269
|
+
options.clientInterceptors.push(async (options2) => {
|
270
|
+
const excluded = await value(this.exclude, options2);
|
271
|
+
if (excluded) {
|
272
|
+
return options2.next();
|
273
|
+
}
|
274
|
+
const headerName = await value(this.headerName, options2);
|
275
|
+
const headerValue = await value(this.headerValue, options2);
|
276
|
+
return options2.next({
|
277
|
+
...options2,
|
278
|
+
request: {
|
279
|
+
...options2.request,
|
280
|
+
headers: {
|
281
|
+
...options2.request.headers,
|
282
|
+
[headerName]: headerValue
|
283
|
+
}
|
284
|
+
}
|
285
|
+
});
|
286
|
+
});
|
287
|
+
}
|
288
|
+
}
|
289
|
+
|
290
|
+
export { BatchLinkPlugin, ClientRetryPlugin, ClientRetryPluginInvalidEventIteratorRetryResponse, SimpleCsrfProtectionLinkPlugin };
|
@@ -1,6 +1,6 @@
|
|
1
|
-
import { Interceptor } from '@orpc/shared';
|
1
|
+
import { Interceptor, ThrowableError } from '@orpc/shared';
|
2
2
|
import { StandardRequest, StandardLazyResponse } from '@orpc/standard-server';
|
3
|
-
import { a as ClientContext,
|
3
|
+
import { a as ClientContext, b as ClientOptions, C as ClientLink } from './client.CipPQkhk.mjs';
|
4
4
|
|
5
5
|
interface StandardLinkCodec<T extends ClientContext> {
|
6
6
|
encode(path: readonly string[], input: unknown, options: ClientOptions<T>): Promise<StandardRequest>;
|
@@ -10,20 +10,26 @@ interface StandardLinkClient<T extends ClientContext> {
|
|
10
10
|
call(request: StandardRequest, options: ClientOptions<T>, path: readonly string[], input: unknown): Promise<StandardLazyResponse>;
|
11
11
|
}
|
12
12
|
|
13
|
-
declare class InvalidEventIteratorRetryResponse extends Error {
|
14
|
-
}
|
15
13
|
interface StandardLinkPlugin<T extends ClientContext> {
|
14
|
+
order?: number;
|
16
15
|
init?(options: StandardLinkOptions<T>): void;
|
17
16
|
}
|
17
|
+
declare class CompositeStandardLinkPlugin<T extends ClientContext, TPlugin extends StandardLinkPlugin<T>> implements StandardLinkPlugin<T> {
|
18
|
+
protected readonly plugins: TPlugin[];
|
19
|
+
constructor(plugins?: readonly TPlugin[]);
|
20
|
+
init(options: StandardLinkOptions<T>): void;
|
21
|
+
}
|
22
|
+
|
23
|
+
interface StandardLinkInterceptorOptions<T extends ClientContext> extends ClientOptions<T> {
|
24
|
+
path: readonly string[];
|
25
|
+
input: unknown;
|
26
|
+
}
|
27
|
+
interface StandardLinkClientInterceptorOptions<T extends ClientContext> extends StandardLinkInterceptorOptions<T> {
|
28
|
+
request: StandardRequest;
|
29
|
+
}
|
18
30
|
interface StandardLinkOptions<T extends ClientContext> {
|
19
|
-
interceptors?: Interceptor<
|
20
|
-
|
21
|
-
input: unknown;
|
22
|
-
options: ClientOptions<T>;
|
23
|
-
}, unknown, unknown>[];
|
24
|
-
clientInterceptors?: Interceptor<{
|
25
|
-
request: StandardRequest;
|
26
|
-
}, StandardLazyResponse, unknown>[];
|
31
|
+
interceptors?: Interceptor<StandardLinkInterceptorOptions<T>, unknown, ThrowableError>[];
|
32
|
+
clientInterceptors?: Interceptor<StandardLinkClientInterceptorOptions<T>, StandardLazyResponse, ThrowableError>[];
|
27
33
|
plugins?: StandardLinkPlugin<T>[];
|
28
34
|
}
|
29
35
|
declare class StandardLink<T extends ClientContext> implements ClientLink<T> {
|
@@ -36,4 +42,4 @@ 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, type StandardLinkClientInterceptorOptions as S, type StandardLinkPlugin as a, type StandardLinkOptions as b, type StandardLinkInterceptorOptions as c, StandardLink as d, type StandardLinkCodec as e, type StandardLinkClient as f };
|