@orpc/client 0.0.0-next.6d75718 → 0.0.0-next.6f0af5e
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 +9 -12
- package/dist/adapters/fetch/index.d.ts +9 -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 +16 -11
- package/dist/index.d.ts +16 -11
- package/dist/index.mjs +8 -8
- package/dist/plugins/index.d.mts +103 -20
- package/dist/plugins/index.d.ts +103 -20
- package/dist/plugins/index.mjs +207 -42
- package/dist/shared/client.8TjrVhkC.d.ts +91 -0
- package/dist/shared/client.BjJBZryq.d.mts +91 -0
- package/dist/shared/{client.Bt40CWA-.d.ts → client.C9U9n1f3.d.ts} +21 -14
- 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.B1XjLWRe.mjs → client.DpICn1BD.mjs} +48 -27
- package/dist/shared/{client.CKw2tbcl.d.mts → client.FXep-a3a.d.mts} +21 -14
- 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.FXep-a3a.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 | ((isSuccess: boolean) => void);
|
|
46
98
|
}
|
|
47
99
|
declare class ClientRetryPluginInvalidEventIteratorRetryResponse extends Error {
|
|
48
100
|
}
|
|
@@ -58,4 +110,35 @@ 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, ClientRetryPlugin, ClientRetryPluginInvalidEventIteratorRetryResponse, SimpleCsrfProtectionLinkPlugin };
|
|
144
|
+
export type { BatchLinkPluginGroup, BatchLinkPluginOptions, ClientRetryPluginAttemptOptions, ClientRetryPluginContext, ClientRetryPluginOptions, 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.C9U9n1f3.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 | ((isSuccess: boolean) => void);
|
|
46
98
|
}
|
|
47
99
|
declare class ClientRetryPluginInvalidEventIteratorRetryResponse extends Error {
|
|
48
100
|
}
|
|
@@ -58,4 +110,35 @@ 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, ClientRetryPlugin, ClientRetryPluginInvalidEventIteratorRetryResponse, SimpleCsrfProtectionLinkPlugin };
|
|
144
|
+
export type { BatchLinkPluginGroup, BatchLinkPluginOptions, ClientRetryPluginAttemptOptions, ClientRetryPluginContext, ClientRetryPluginOptions, 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,71 +163,57 @@ 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
|
-
let
|
|
178
|
+
let callback;
|
|
30
179
|
let attemptIndex = 0;
|
|
31
|
-
const next = async (
|
|
32
|
-
let
|
|
180
|
+
const next = async (initialError) => {
|
|
181
|
+
let currentError = initialError;
|
|
33
182
|
while (true) {
|
|
34
|
-
const
|
|
35
|
-
if (
|
|
183
|
+
const updatedInterceptorOptions = { ...interceptorOptions, lastEventId };
|
|
184
|
+
if (currentError) {
|
|
36
185
|
if (attemptIndex >= maxAttempts) {
|
|
37
|
-
throw
|
|
186
|
+
throw currentError.error;
|
|
38
187
|
}
|
|
39
188
|
const attemptOptions = {
|
|
189
|
+
...updatedInterceptorOptions,
|
|
40
190
|
attemptIndex,
|
|
41
|
-
error:
|
|
42
|
-
lastEventId,
|
|
191
|
+
error: currentError.error,
|
|
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
|
-
throw
|
|
199
|
+
throw currentError.error;
|
|
54
200
|
}
|
|
55
|
-
|
|
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
|
+
callback = 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
|
-
|
|
74
|
-
options: newClientOptions
|
|
75
|
-
});
|
|
76
|
-
return output2;
|
|
207
|
+
currentError = void 0;
|
|
208
|
+
return await interceptorOptions.next(updatedInterceptorOptions);
|
|
77
209
|
} catch (error) {
|
|
78
|
-
|
|
210
|
+
currentError = { error };
|
|
211
|
+
if (updatedInterceptorOptions.signal?.aborted === true) {
|
|
79
212
|
throw error;
|
|
80
213
|
}
|
|
81
|
-
current = { error };
|
|
82
214
|
} finally {
|
|
83
|
-
|
|
84
|
-
|
|
215
|
+
callback?.(!currentError);
|
|
216
|
+
callback = void 0;
|
|
85
217
|
}
|
|
86
218
|
}
|
|
87
219
|
};
|
|
@@ -123,4 +255,37 @@ class ClientRetryPlugin {
|
|
|
123
255
|
}
|
|
124
256
|
}
|
|
125
257
|
|
|
126
|
-
|
|
258
|
+
class SimpleCsrfProtectionLinkPlugin {
|
|
259
|
+
headerName;
|
|
260
|
+
headerValue;
|
|
261
|
+
exclude;
|
|
262
|
+
constructor(options = {}) {
|
|
263
|
+
this.headerName = options.headerName ?? "x-csrf-token";
|
|
264
|
+
this.headerValue = options.headerValue ?? "orpc";
|
|
265
|
+
this.exclude = options.exclude ?? false;
|
|
266
|
+
}
|
|
267
|
+
order = 8e6;
|
|
268
|
+
init(options) {
|
|
269
|
+
options.clientInterceptors ??= [];
|
|
270
|
+
options.clientInterceptors.push(async (options2) => {
|
|
271
|
+
const excluded = await value(this.exclude, options2);
|
|
272
|
+
if (excluded) {
|
|
273
|
+
return options2.next();
|
|
274
|
+
}
|
|
275
|
+
const headerName = await value(this.headerName, options2);
|
|
276
|
+
const headerValue = await value(this.headerValue, options2);
|
|
277
|
+
return options2.next({
|
|
278
|
+
...options2,
|
|
279
|
+
request: {
|
|
280
|
+
...options2.request,
|
|
281
|
+
headers: {
|
|
282
|
+
...options2.request.headers,
|
|
283
|
+
[headerName]: headerValue
|
|
284
|
+
}
|
|
285
|
+
}
|
|
286
|
+
});
|
|
287
|
+
});
|
|
288
|
+
}
|
|
289
|
+
}
|
|
290
|
+
|
|
291
|
+
export { BatchLinkPlugin, ClientRetryPlugin, ClientRetryPluginInvalidEventIteratorRetryResponse, SimpleCsrfProtectionLinkPlugin };
|
|
@@ -0,0 +1,91 @@
|
|
|
1
|
+
import { a as ClientContext, b as ClientOptions, d as HTTPMethod } from './client.CipPQkhk.js';
|
|
2
|
+
import { e as StandardLinkCodec, b as StandardLinkOptions, d as StandardLink, f as StandardLinkClient } from './client.C9U9n1f3.js';
|
|
3
|
+
import { Segment, Value } from '@orpc/shared';
|
|
4
|
+
import { StandardHeaders, StandardRequest, StandardLazyResponse } from '@orpc/standard-server';
|
|
5
|
+
|
|
6
|
+
declare const STANDARD_RPC_JSON_SERIALIZER_BUILT_IN_TYPES: {
|
|
7
|
+
readonly BIGINT: 0;
|
|
8
|
+
readonly DATE: 1;
|
|
9
|
+
readonly NAN: 2;
|
|
10
|
+
readonly UNDEFINED: 3;
|
|
11
|
+
readonly URL: 4;
|
|
12
|
+
readonly REGEXP: 5;
|
|
13
|
+
readonly SET: 6;
|
|
14
|
+
readonly MAP: 7;
|
|
15
|
+
};
|
|
16
|
+
type StandardRPCJsonSerializedMetaItem = readonly [type: number, ...path: Segment[]];
|
|
17
|
+
type StandardRPCJsonSerialized = [json: unknown, meta: StandardRPCJsonSerializedMetaItem[], maps: Segment[][], blobs: Blob[]];
|
|
18
|
+
interface StandardRPCCustomJsonSerializer {
|
|
19
|
+
type: number;
|
|
20
|
+
condition(data: unknown): boolean;
|
|
21
|
+
serialize(data: any): unknown;
|
|
22
|
+
deserialize(serialized: any): unknown;
|
|
23
|
+
}
|
|
24
|
+
interface StandardRPCJsonSerializerOptions {
|
|
25
|
+
customJsonSerializers?: readonly StandardRPCCustomJsonSerializer[];
|
|
26
|
+
}
|
|
27
|
+
declare class StandardRPCJsonSerializer {
|
|
28
|
+
private readonly customSerializers;
|
|
29
|
+
constructor(options?: StandardRPCJsonSerializerOptions);
|
|
30
|
+
serialize(data: unknown, segments?: Segment[], meta?: StandardRPCJsonSerializedMetaItem[], maps?: Segment[][], blobs?: Blob[]): StandardRPCJsonSerialized;
|
|
31
|
+
deserialize(json: unknown, meta: readonly StandardRPCJsonSerializedMetaItem[]): unknown;
|
|
32
|
+
deserialize(json: unknown, meta: readonly StandardRPCJsonSerializedMetaItem[], maps: readonly Segment[][], getBlob: (index: number) => Blob): unknown;
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
declare class StandardRPCSerializer {
|
|
36
|
+
#private;
|
|
37
|
+
private readonly jsonSerializer;
|
|
38
|
+
constructor(jsonSerializer: StandardRPCJsonSerializer);
|
|
39
|
+
serialize(data: unknown): object;
|
|
40
|
+
deserialize(data: unknown): unknown;
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
interface StandardRPCLinkCodecOptions<T extends ClientContext> {
|
|
44
|
+
/**
|
|
45
|
+
* Base url for all requests.
|
|
46
|
+
*/
|
|
47
|
+
url: Value<string | URL, [options: ClientOptions<T>, path: readonly string[], input: unknown]>;
|
|
48
|
+
/**
|
|
49
|
+
* The maximum length of the URL.
|
|
50
|
+
*
|
|
51
|
+
* @default 2083
|
|
52
|
+
*/
|
|
53
|
+
maxUrlLength?: Value<number, [options: ClientOptions<T>, path: readonly string[], input: unknown]>;
|
|
54
|
+
/**
|
|
55
|
+
* The method used to make the request.
|
|
56
|
+
*
|
|
57
|
+
* @default 'POST'
|
|
58
|
+
*/
|
|
59
|
+
method?: Value<HTTPMethod, [options: ClientOptions<T>, path: readonly string[], input: unknown]>;
|
|
60
|
+
/**
|
|
61
|
+
* The method to use when the payload cannot safely pass to the server with method return from method function.
|
|
62
|
+
* GET is not allowed, it's very dangerous.
|
|
63
|
+
*
|
|
64
|
+
* @default 'POST'
|
|
65
|
+
*/
|
|
66
|
+
fallbackMethod?: Exclude<HTTPMethod, 'GET'>;
|
|
67
|
+
/**
|
|
68
|
+
* Inject headers to the request.
|
|
69
|
+
*/
|
|
70
|
+
headers?: Value<StandardHeaders, [options: ClientOptions<T>, path: readonly string[], input: unknown]>;
|
|
71
|
+
}
|
|
72
|
+
declare class StandardRPCLinkCodec<T extends ClientContext> implements StandardLinkCodec<T> {
|
|
73
|
+
private readonly serializer;
|
|
74
|
+
private readonly baseUrl;
|
|
75
|
+
private readonly maxUrlLength;
|
|
76
|
+
private readonly fallbackMethod;
|
|
77
|
+
private readonly expectedMethod;
|
|
78
|
+
private readonly headers;
|
|
79
|
+
constructor(serializer: StandardRPCSerializer, options: StandardRPCLinkCodecOptions<T>);
|
|
80
|
+
encode(path: readonly string[], input: unknown, options: ClientOptions<T>): Promise<StandardRequest>;
|
|
81
|
+
decode(response: StandardLazyResponse): Promise<unknown>;
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
interface StandardRPCLinkOptions<T extends ClientContext> extends StandardLinkOptions<T>, StandardRPCLinkCodecOptions<T>, StandardRPCJsonSerializerOptions {
|
|
85
|
+
}
|
|
86
|
+
declare class StandardRPCLink<T extends ClientContext> extends StandardLink<T> {
|
|
87
|
+
constructor(linkClient: StandardLinkClient<T>, options: StandardRPCLinkOptions<T>);
|
|
88
|
+
}
|
|
89
|
+
|
|
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 };
|