@orpc/server 0.0.0-next.96f9dd3 → 0.0.0-next.9701ec8
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 +19 -23
- package/dist/adapters/aws-lambda/index.d.mts +46 -0
- package/dist/adapters/aws-lambda/index.d.ts +46 -0
- package/dist/adapters/aws-lambda/index.mjs +42 -0
- package/dist/adapters/bun-ws/index.d.mts +36 -0
- package/dist/adapters/bun-ws/index.d.ts +36 -0
- package/dist/adapters/bun-ws/index.mjs +47 -0
- package/dist/adapters/crossws/index.d.mts +33 -0
- package/dist/adapters/crossws/index.d.ts +33 -0
- package/dist/adapters/crossws/index.mjs +45 -0
- package/dist/adapters/fetch/index.d.mts +81 -11
- package/dist/adapters/fetch/index.d.ts +81 -11
- package/dist/adapters/fetch/index.mjs +178 -8
- package/dist/adapters/message-port/index.d.mts +31 -0
- package/dist/adapters/message-port/index.d.ts +31 -0
- package/dist/adapters/message-port/index.mjs +39 -0
- package/dist/adapters/node/index.d.mts +57 -11
- package/dist/adapters/node/index.d.ts +57 -11
- package/dist/adapters/node/index.mjs +89 -22
- package/dist/adapters/standard/index.d.mts +8 -13
- package/dist/adapters/standard/index.d.ts +8 -13
- package/dist/adapters/standard/index.mjs +5 -3
- package/dist/adapters/standard-peer/index.d.mts +18 -0
- package/dist/adapters/standard-peer/index.d.ts +18 -0
- package/dist/adapters/standard-peer/index.mjs +7 -0
- package/dist/adapters/websocket/index.d.mts +54 -0
- package/dist/adapters/websocket/index.d.ts +54 -0
- package/dist/adapters/websocket/index.mjs +67 -0
- package/dist/adapters/ws/index.d.mts +31 -0
- package/dist/adapters/ws/index.d.ts +31 -0
- package/dist/adapters/ws/index.mjs +37 -0
- package/dist/helpers/index.d.mts +134 -0
- package/dist/helpers/index.d.ts +134 -0
- package/dist/helpers/index.mjs +188 -0
- package/dist/hibernation/index.d.mts +44 -0
- package/dist/hibernation/index.d.ts +44 -0
- package/dist/hibernation/index.mjs +65 -0
- package/dist/index.d.mts +563 -51
- package/dist/index.d.ts +563 -51
- package/dist/index.mjs +138 -12
- package/dist/plugins/index.d.mts +114 -11
- package/dist/plugins/index.d.ts +114 -11
- package/dist/plugins/index.mjs +147 -58
- package/dist/shared/server.B7b2w3_i.d.ts +12 -0
- package/dist/shared/server.BEFBl-Cb.d.mts +12 -0
- package/dist/shared/server.BU4WI18A.d.mts +32 -0
- package/dist/shared/server.BW-nUGgA.mjs +36 -0
- package/dist/shared/{server.C37gDhSZ.mjs → server.B_fj3X5m.mjs} +95 -51
- package/dist/shared/{server.BlxK0o8R.d.mts → server.Bmh5xd4n.d.ts} +18 -10
- package/dist/shared/{server.DLt5njUb.d.mts → server.CYNGeoCm.d.mts} +60 -9
- package/dist/shared/{server.DLt5njUb.d.ts → server.CYNGeoCm.d.ts} +60 -9
- package/dist/shared/server.CYRYFTxo.mjs +219 -0
- package/dist/shared/server.D0H-iaY3.d.ts +32 -0
- package/dist/shared/{server.BVwwTHyO.mjs → server.DZ5BIITo.mjs} +1 -1
- package/dist/shared/server.DhJj-1X9.d.mts +42 -0
- package/dist/shared/server.UVMTOWrk.mjs +26 -0
- package/dist/shared/{server.DuTpqr2w.d.ts → server.gqRxT-yN.d.mts} +18 -10
- package/dist/shared/server.jMTkVNIb.d.ts +42 -0
- package/package.json +71 -20
- package/dist/adapters/hono/index.d.mts +0 -22
- package/dist/adapters/hono/index.d.ts +0 -22
- package/dist/adapters/hono/index.mjs +0 -32
- package/dist/adapters/next/index.d.mts +0 -29
- package/dist/adapters/next/index.d.ts +0 -29
- package/dist/adapters/next/index.mjs +0 -29
- package/dist/shared/server.BFt8M4Cr.d.ts +0 -8
- package/dist/shared/server.Bc6jnvPE.d.ts +0 -10
- package/dist/shared/server.CCPFkKqC.mjs +0 -98
- package/dist/shared/server.CCgy73tk.d.mts +0 -10
- package/dist/shared/server.DJrRF9vD.mjs +0 -162
- package/dist/shared/server.JgWzFqlo.d.mts +0 -8
package/dist/plugins/index.mjs
CHANGED
@@ -1,11 +1,17 @@
|
|
1
|
-
import { value } from '@orpc/shared';
|
1
|
+
import { runWithSpan, value, setSpanError, isAsyncIteratorObject, clone } from '@orpc/shared';
|
2
|
+
import { flattenHeader } from '@orpc/standard-server';
|
2
3
|
import { parseBatchRequest, toBatchResponse } from '@orpc/standard-server/batch';
|
4
|
+
import { toFetchHeaders } from '@orpc/standard-server-fetch';
|
5
|
+
import { ORPCError } from '@orpc/client';
|
6
|
+
export { S as StrictGetMethodPlugin } from '../shared/server.BW-nUGgA.mjs';
|
7
|
+
import '@orpc/contract';
|
3
8
|
|
4
9
|
class BatchHandlerPlugin {
|
5
10
|
maxSize;
|
6
11
|
mapRequestItem;
|
7
12
|
successStatus;
|
8
13
|
headers;
|
14
|
+
order = 5e6;
|
9
15
|
constructor(options = {}) {
|
10
16
|
this.maxSize = options.maxSize ?? 10;
|
11
17
|
this.mapRequestItem = options.mapRequestItem ?? ((request, { request: batchRequest }) => ({
|
@@ -21,61 +27,80 @@ class BatchHandlerPlugin {
|
|
21
27
|
init(options) {
|
22
28
|
options.rootInterceptors ??= [];
|
23
29
|
options.rootInterceptors.unshift(async (options2) => {
|
24
|
-
|
30
|
+
const xHeader = flattenHeader(options2.request.headers["x-orpc-batch"]);
|
31
|
+
if (xHeader === void 0) {
|
25
32
|
return options2.next();
|
26
33
|
}
|
27
34
|
let isParsing = false;
|
28
35
|
try {
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
return options2.next({ ...options2, request: { ...mapped, body: () => Promise.resolve(mapped.body) } }).then(({ response: response2, matched }) => {
|
47
|
-
if (matched) {
|
48
|
-
return { ...response2, index };
|
36
|
+
return await runWithSpan({ name: "handle_batch_request" }, async (span) => {
|
37
|
+
const mode = xHeader === "buffered" ? "buffered" : "streaming";
|
38
|
+
isParsing = true;
|
39
|
+
const parsed = parseBatchRequest({ ...options2.request, body: await options2.request.body() });
|
40
|
+
isParsing = false;
|
41
|
+
span?.setAttribute("batch.mode", mode);
|
42
|
+
span?.setAttribute("batch.size", parsed.length);
|
43
|
+
const maxSize = await value(this.maxSize, options2);
|
44
|
+
if (parsed.length > maxSize) {
|
45
|
+
const message = "Batch request size exceeds the maximum allowed size";
|
46
|
+
setSpanError(span, message);
|
47
|
+
return {
|
48
|
+
matched: true,
|
49
|
+
response: {
|
50
|
+
status: 413,
|
51
|
+
headers: {},
|
52
|
+
body: message
|
49
53
|
}
|
50
|
-
|
51
|
-
}).catch(() => {
|
52
|
-
return { index, status: 500, headers: {}, body: "Internal server error" };
|
53
|
-
});
|
54
|
+
};
|
54
55
|
}
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
|
56
|
+
const responses = parsed.map(
|
57
|
+
(request, index) => {
|
58
|
+
const mapped = this.mapRequestItem(request, options2);
|
59
|
+
return options2.next({ ...options2, request: { ...mapped, body: () => Promise.resolve(mapped.body) } }).then(({ response: response2, matched }) => {
|
60
|
+
span?.addEvent(`response.${index}.${matched ? "success" : "not_matched"}`);
|
61
|
+
if (matched) {
|
62
|
+
if (response2.body instanceof Blob || response2.body instanceof FormData || isAsyncIteratorObject(response2.body)) {
|
63
|
+
return {
|
64
|
+
index,
|
65
|
+
status: 500,
|
66
|
+
headers: {},
|
67
|
+
body: "Batch responses do not support file/blob, or event-iterator. Please call this procedure separately outside of the batch request."
|
68
|
+
};
|
69
|
+
}
|
70
|
+
return { ...response2, index };
|
71
|
+
}
|
72
|
+
return { index, status: 404, headers: {}, body: "No procedure matched" };
|
73
|
+
}).catch((err) => {
|
74
|
+
Promise.reject(err);
|
75
|
+
return { index, status: 500, headers: {}, body: "Internal server error" };
|
76
|
+
});
|
72
77
|
}
|
73
|
-
|
78
|
+
);
|
79
|
+
await Promise.race(responses);
|
80
|
+
const status = await value(this.successStatus, responses, options2);
|
81
|
+
const headers = await value(this.headers, responses, options2);
|
82
|
+
const response = await toBatchResponse({
|
83
|
+
status,
|
84
|
+
headers,
|
85
|
+
mode,
|
86
|
+
body: async function* () {
|
87
|
+
const promises = [...responses];
|
88
|
+
while (true) {
|
89
|
+
const handling = promises.filter((p) => p !== void 0);
|
90
|
+
if (handling.length === 0) {
|
91
|
+
return;
|
92
|
+
}
|
93
|
+
const result = await Promise.race(handling);
|
94
|
+
promises[result.index] = void 0;
|
95
|
+
yield result;
|
96
|
+
}
|
97
|
+
}()
|
98
|
+
});
|
99
|
+
return {
|
100
|
+
matched: true,
|
101
|
+
response
|
102
|
+
};
|
74
103
|
});
|
75
|
-
return {
|
76
|
-
matched: true,
|
77
|
-
response
|
78
|
-
};
|
79
104
|
} catch (cause) {
|
80
105
|
if (isParsing) {
|
81
106
|
return {
|
@@ -91,6 +116,7 @@ class BatchHandlerPlugin {
|
|
91
116
|
|
92
117
|
class CORSPlugin {
|
93
118
|
options;
|
119
|
+
order = 9e6;
|
94
120
|
constructor(options = {}) {
|
95
121
|
const defaults = {
|
96
122
|
origin: (origin) => origin,
|
@@ -110,13 +136,11 @@ class CORSPlugin {
|
|
110
136
|
resHeaders["access-control-max-age"] = this.options.maxAge.toString();
|
111
137
|
}
|
112
138
|
if (this.options.allowMethods?.length) {
|
113
|
-
resHeaders["access-control-allow-methods"] = this.options.allowMethods
|
139
|
+
resHeaders["access-control-allow-methods"] = flattenHeader(this.options.allowMethods);
|
114
140
|
}
|
115
141
|
const allowHeaders = this.options.allowHeaders ?? interceptorOptions.request.headers["access-control-request-headers"];
|
116
|
-
if (
|
117
|
-
resHeaders["access-control-allow-headers"] = allowHeaders
|
118
|
-
} else if (typeof allowHeaders === "string") {
|
119
|
-
resHeaders["access-control-allow-headers"] = allowHeaders;
|
142
|
+
if (typeof allowHeaders === "string" || allowHeaders?.length) {
|
143
|
+
resHeaders["access-control-allow-headers"] = flattenHeader(allowHeaders);
|
120
144
|
}
|
121
145
|
return {
|
122
146
|
matched: true,
|
@@ -134,7 +158,7 @@ class CORSPlugin {
|
|
134
158
|
if (!result.matched) {
|
135
159
|
return result;
|
136
160
|
}
|
137
|
-
const origin =
|
161
|
+
const origin = flattenHeader(interceptorOptions.request.headers.origin) ?? "";
|
138
162
|
const allowedOrigin = await value(this.options.origin, origin, interceptorOptions);
|
139
163
|
const allowedOriginArr = Array.isArray(allowedOrigin) ? allowedOrigin : [allowedOrigin];
|
140
164
|
if (allowedOriginArr.includes("*")) {
|
@@ -156,13 +180,29 @@ class CORSPlugin {
|
|
156
180
|
result.response.headers["access-control-allow-credentials"] = "true";
|
157
181
|
}
|
158
182
|
if (this.options.exposeHeaders?.length) {
|
159
|
-
result.response.headers["access-control-expose-headers"] = this.options.exposeHeaders
|
183
|
+
result.response.headers["access-control-expose-headers"] = flattenHeader(this.options.exposeHeaders);
|
160
184
|
}
|
161
185
|
return result;
|
162
186
|
});
|
163
187
|
}
|
164
188
|
}
|
165
189
|
|
190
|
+
class RequestHeadersPlugin {
|
191
|
+
init(options) {
|
192
|
+
options.rootInterceptors ??= [];
|
193
|
+
options.rootInterceptors.push((interceptorOptions) => {
|
194
|
+
const reqHeaders = interceptorOptions.context.reqHeaders ?? toFetchHeaders(interceptorOptions.request.headers);
|
195
|
+
return interceptorOptions.next({
|
196
|
+
...interceptorOptions,
|
197
|
+
context: {
|
198
|
+
...interceptorOptions.context,
|
199
|
+
reqHeaders
|
200
|
+
}
|
201
|
+
});
|
202
|
+
});
|
203
|
+
}
|
204
|
+
}
|
205
|
+
|
166
206
|
class ResponseHeadersPlugin {
|
167
207
|
init(options) {
|
168
208
|
options.rootInterceptors ??= [];
|
@@ -178,7 +218,7 @@ class ResponseHeadersPlugin {
|
|
178
218
|
if (!result.matched) {
|
179
219
|
return result;
|
180
220
|
}
|
181
|
-
const responseHeaders = result.response.headers;
|
221
|
+
const responseHeaders = clone(result.response.headers);
|
182
222
|
for (const [key, value] of resHeaders) {
|
183
223
|
if (Array.isArray(responseHeaders[key])) {
|
184
224
|
responseHeaders[key].push(value);
|
@@ -188,9 +228,58 @@ class ResponseHeadersPlugin {
|
|
188
228
|
responseHeaders[key] = value;
|
189
229
|
}
|
190
230
|
}
|
191
|
-
return
|
231
|
+
return {
|
232
|
+
...result,
|
233
|
+
response: {
|
234
|
+
...result.response,
|
235
|
+
headers: responseHeaders
|
236
|
+
}
|
237
|
+
};
|
238
|
+
});
|
239
|
+
}
|
240
|
+
}
|
241
|
+
|
242
|
+
const SIMPLE_CSRF_PROTECTION_CONTEXT_SYMBOL = Symbol("SIMPLE_CSRF_PROTECTION_CONTEXT");
|
243
|
+
class SimpleCsrfProtectionHandlerPlugin {
|
244
|
+
headerName;
|
245
|
+
headerValue;
|
246
|
+
exclude;
|
247
|
+
error;
|
248
|
+
constructor(options = {}) {
|
249
|
+
this.headerName = options.headerName ?? "x-csrf-token";
|
250
|
+
this.headerValue = options.headerValue ?? "orpc";
|
251
|
+
this.exclude = options.exclude ?? false;
|
252
|
+
this.error = options.error ?? new ORPCError("CSRF_TOKEN_MISMATCH", {
|
253
|
+
status: 403,
|
254
|
+
message: "Invalid CSRF token"
|
255
|
+
});
|
256
|
+
}
|
257
|
+
order = 8e6;
|
258
|
+
init(options) {
|
259
|
+
options.rootInterceptors ??= [];
|
260
|
+
options.clientInterceptors ??= [];
|
261
|
+
options.rootInterceptors.unshift(async (options2) => {
|
262
|
+
const headerName = await value(this.headerName, options2);
|
263
|
+
const headerValue = await value(this.headerValue, options2);
|
264
|
+
return options2.next({
|
265
|
+
...options2,
|
266
|
+
context: {
|
267
|
+
...options2.context,
|
268
|
+
[SIMPLE_CSRF_PROTECTION_CONTEXT_SYMBOL]: options2.request.headers[headerName] === headerValue
|
269
|
+
}
|
270
|
+
});
|
271
|
+
});
|
272
|
+
options.clientInterceptors.unshift(async (options2) => {
|
273
|
+
if (typeof options2.context[SIMPLE_CSRF_PROTECTION_CONTEXT_SYMBOL] !== "boolean") {
|
274
|
+
throw new TypeError("[SimpleCsrfProtectionHandlerPlugin] CSRF protection context has been corrupted or modified by another plugin or interceptor");
|
275
|
+
}
|
276
|
+
const excluded = await value(this.exclude, options2);
|
277
|
+
if (!excluded && !options2.context[SIMPLE_CSRF_PROTECTION_CONTEXT_SYMBOL]) {
|
278
|
+
throw this.error;
|
279
|
+
}
|
280
|
+
return options2.next();
|
192
281
|
});
|
193
282
|
}
|
194
283
|
}
|
195
284
|
|
196
|
-
export { BatchHandlerPlugin, CORSPlugin, ResponseHeadersPlugin };
|
285
|
+
export { BatchHandlerPlugin, CORSPlugin, RequestHeadersPlugin, ResponseHeadersPlugin, SimpleCsrfProtectionHandlerPlugin };
|
@@ -0,0 +1,12 @@
|
|
1
|
+
import { C as Context } from './server.CYNGeoCm.js';
|
2
|
+
import { b as StandardHandleOptions } from './server.Bmh5xd4n.js';
|
3
|
+
|
4
|
+
type FriendlyStandardHandleOptions<T extends Context> = Omit<StandardHandleOptions<T>, 'context'> & (Record<never, never> extends T ? {
|
5
|
+
context?: T;
|
6
|
+
} : {
|
7
|
+
context: T;
|
8
|
+
});
|
9
|
+
declare function resolveFriendlyStandardHandleOptions<T extends Context>(options: FriendlyStandardHandleOptions<T>): StandardHandleOptions<T>;
|
10
|
+
|
11
|
+
export { resolveFriendlyStandardHandleOptions as r };
|
12
|
+
export type { FriendlyStandardHandleOptions as F };
|
@@ -0,0 +1,12 @@
|
|
1
|
+
import { C as Context } from './server.CYNGeoCm.mjs';
|
2
|
+
import { b as StandardHandleOptions } from './server.gqRxT-yN.mjs';
|
3
|
+
|
4
|
+
type FriendlyStandardHandleOptions<T extends Context> = Omit<StandardHandleOptions<T>, 'context'> & (Record<never, never> extends T ? {
|
5
|
+
context?: T;
|
6
|
+
} : {
|
7
|
+
context: T;
|
8
|
+
});
|
9
|
+
declare function resolveFriendlyStandardHandleOptions<T extends Context>(options: FriendlyStandardHandleOptions<T>): StandardHandleOptions<T>;
|
10
|
+
|
11
|
+
export { resolveFriendlyStandardHandleOptions as r };
|
12
|
+
export type { FriendlyStandardHandleOptions as F };
|
@@ -0,0 +1,32 @@
|
|
1
|
+
import { StandardRPCJsonSerializerOptions } from '@orpc/client/standard';
|
2
|
+
import { b as AnyRouter, C as Context, R as Router } from './server.CYNGeoCm.mjs';
|
3
|
+
import { i as StandardMatcher, h as StandardMatchResult, e as StandardHandlerOptions, f as StandardHandler } from './server.gqRxT-yN.mjs';
|
4
|
+
import { HTTPPath } from '@orpc/client';
|
5
|
+
import { Value } from '@orpc/shared';
|
6
|
+
import { T as TraverseContractProcedureCallbackOptions } from './server.DhJj-1X9.mjs';
|
7
|
+
|
8
|
+
interface StandardRPCMatcherOptions {
|
9
|
+
/**
|
10
|
+
* Filter procedures. Return `false` to exclude a procedure from matching.
|
11
|
+
*
|
12
|
+
* @default true
|
13
|
+
*/
|
14
|
+
filter?: Value<boolean, [options: TraverseContractProcedureCallbackOptions]>;
|
15
|
+
}
|
16
|
+
declare class StandardRPCMatcher implements StandardMatcher {
|
17
|
+
private readonly filter;
|
18
|
+
private readonly tree;
|
19
|
+
private pendingRouters;
|
20
|
+
constructor(options?: StandardRPCMatcherOptions);
|
21
|
+
init(router: AnyRouter, path?: readonly string[]): void;
|
22
|
+
match(_method: string, pathname: HTTPPath): Promise<StandardMatchResult>;
|
23
|
+
}
|
24
|
+
|
25
|
+
interface StandardRPCHandlerOptions<T extends Context> extends StandardHandlerOptions<T>, StandardRPCJsonSerializerOptions, StandardRPCMatcherOptions {
|
26
|
+
}
|
27
|
+
declare class StandardRPCHandler<T extends Context> extends StandardHandler<T> {
|
28
|
+
constructor(router: Router<any, T>, options?: StandardRPCHandlerOptions<T>);
|
29
|
+
}
|
30
|
+
|
31
|
+
export { StandardRPCHandler as a, StandardRPCMatcher as c };
|
32
|
+
export type { StandardRPCHandlerOptions as S, StandardRPCMatcherOptions as b };
|
@@ -0,0 +1,36 @@
|
|
1
|
+
import { ORPCError, fallbackContractConfig } from '@orpc/contract';
|
2
|
+
|
3
|
+
const STRICT_GET_METHOD_PLUGIN_IS_GET_METHOD_CONTEXT_SYMBOL = Symbol("STRICT_GET_METHOD_PLUGIN_IS_GET_METHOD_CONTEXT");
|
4
|
+
class StrictGetMethodPlugin {
|
5
|
+
error;
|
6
|
+
order = 7e6;
|
7
|
+
constructor(options = {}) {
|
8
|
+
this.error = options.error ?? new ORPCError("METHOD_NOT_SUPPORTED");
|
9
|
+
}
|
10
|
+
init(options) {
|
11
|
+
options.rootInterceptors ??= [];
|
12
|
+
options.clientInterceptors ??= [];
|
13
|
+
options.rootInterceptors.unshift((options2) => {
|
14
|
+
const isGetMethod = options2.request.method === "GET";
|
15
|
+
return options2.next({
|
16
|
+
...options2,
|
17
|
+
context: {
|
18
|
+
...options2.context,
|
19
|
+
[STRICT_GET_METHOD_PLUGIN_IS_GET_METHOD_CONTEXT_SYMBOL]: isGetMethod
|
20
|
+
}
|
21
|
+
});
|
22
|
+
});
|
23
|
+
options.clientInterceptors.unshift((options2) => {
|
24
|
+
if (typeof options2.context[STRICT_GET_METHOD_PLUGIN_IS_GET_METHOD_CONTEXT_SYMBOL] !== "boolean") {
|
25
|
+
throw new TypeError("[StrictGetMethodPlugin] strict GET method context has been corrupted or modified by another plugin or interceptor");
|
26
|
+
}
|
27
|
+
const procedureMethod = fallbackContractConfig("defaultMethod", options2.procedure["~orpc"].route.method);
|
28
|
+
if (options2.context[STRICT_GET_METHOD_PLUGIN_IS_GET_METHOD_CONTEXT_SYMBOL] && procedureMethod !== "GET") {
|
29
|
+
throw this.error;
|
30
|
+
}
|
31
|
+
return options2.next();
|
32
|
+
});
|
33
|
+
}
|
34
|
+
}
|
35
|
+
|
36
|
+
export { StrictGetMethodPlugin as S };
|
@@ -1,6 +1,7 @@
|
|
1
1
|
import { isContractProcedure, ValidationError, mergePrefix, mergeErrorMap, enhanceRoute } from '@orpc/contract';
|
2
|
+
import { resolveMaybeOptionalOptions, toArray, value, runWithSpan, intercept, isAsyncIteratorObject, asyncIteratorWithSpan } from '@orpc/shared';
|
2
3
|
import { fallbackORPCErrorStatus, ORPCError } from '@orpc/client';
|
3
|
-
import {
|
4
|
+
import { HibernationEventIterator } from '@orpc/standard-server';
|
4
5
|
|
5
6
|
const LAZY_SYMBOL = Symbol("ORPC_LAZY_SYMBOL");
|
6
7
|
function lazy(loader, meta = {}) {
|
@@ -46,6 +47,9 @@ function addMiddleware(middlewares, addition) {
|
|
46
47
|
}
|
47
48
|
|
48
49
|
class Procedure {
|
50
|
+
/**
|
51
|
+
* This property holds the defined options.
|
52
|
+
*/
|
49
53
|
"~orpc";
|
50
54
|
constructor(def) {
|
51
55
|
this["~orpc"] = def;
|
@@ -68,14 +72,15 @@ function createORPCErrorConstructorMap(errors) {
|
|
68
72
|
if (typeof code !== "string") {
|
69
73
|
return Reflect.get(target, code);
|
70
74
|
}
|
71
|
-
const item = (...
|
75
|
+
const item = (...rest) => {
|
76
|
+
const options = resolveMaybeOptionalOptions(rest);
|
72
77
|
const config = errors[code];
|
73
78
|
return new ORPCError(code, {
|
74
79
|
defined: Boolean(config),
|
75
80
|
status: config?.status,
|
76
|
-
message: options
|
77
|
-
data: options
|
78
|
-
cause: options
|
81
|
+
message: options.message ?? config?.message,
|
82
|
+
data: options.data,
|
83
|
+
cause: options.cause
|
79
84
|
});
|
80
85
|
};
|
81
86
|
return item;
|
@@ -103,28 +108,45 @@ function middlewareOutputFn(output) {
|
|
103
108
|
return { output, context: {} };
|
104
109
|
}
|
105
110
|
|
106
|
-
function createProcedureClient(lazyableProcedure, ...
|
111
|
+
function createProcedureClient(lazyableProcedure, ...rest) {
|
112
|
+
const options = resolveMaybeOptionalOptions(rest);
|
107
113
|
return async (...[input, callerOptions]) => {
|
108
|
-
const path = options
|
114
|
+
const path = toArray(options.path);
|
109
115
|
const { default: procedure } = await unlazy(lazyableProcedure);
|
110
116
|
const clientContext = callerOptions?.context ?? {};
|
111
|
-
const context = await value(options
|
117
|
+
const context = await value(options.context ?? {}, clientContext);
|
112
118
|
const errors = createORPCErrorConstructorMap(procedure["~orpc"].errorMap);
|
113
119
|
try {
|
114
|
-
|
115
|
-
|
116
|
-
{
|
117
|
-
|
118
|
-
|
119
|
-
|
120
|
-
|
121
|
-
|
122
|
-
|
123
|
-
|
124
|
-
|
125
|
-
|
126
|
-
|
120
|
+
const output = await runWithSpan(
|
121
|
+
{ name: "call_procedure", signal: callerOptions?.signal },
|
122
|
+
(span) => {
|
123
|
+
span?.setAttribute("procedure.path", [...path]);
|
124
|
+
return intercept(
|
125
|
+
toArray(options.interceptors),
|
126
|
+
{
|
127
|
+
context,
|
128
|
+
input,
|
129
|
+
// input only optional when it undefinable so we can safely cast it
|
130
|
+
errors,
|
131
|
+
path,
|
132
|
+
procedure,
|
133
|
+
signal: callerOptions?.signal,
|
134
|
+
lastEventId: callerOptions?.lastEventId
|
135
|
+
},
|
136
|
+
(interceptorOptions) => executeProcedureInternal(interceptorOptions.procedure, interceptorOptions)
|
137
|
+
);
|
138
|
+
}
|
127
139
|
);
|
140
|
+
if (isAsyncIteratorObject(output)) {
|
141
|
+
if (output instanceof HibernationEventIterator) {
|
142
|
+
return output;
|
143
|
+
}
|
144
|
+
return asyncIteratorWithSpan(
|
145
|
+
{ name: "consume_event_iterator_output", signal: callerOptions?.signal },
|
146
|
+
output
|
147
|
+
);
|
148
|
+
}
|
149
|
+
return output;
|
128
150
|
} catch (e) {
|
129
151
|
if (!(e instanceof ORPCError)) {
|
130
152
|
throw e;
|
@@ -139,31 +161,41 @@ async function validateInput(procedure, input) {
|
|
139
161
|
if (!schema) {
|
140
162
|
return input;
|
141
163
|
}
|
142
|
-
|
143
|
-
|
144
|
-
|
145
|
-
|
146
|
-
|
147
|
-
|
148
|
-
|
149
|
-
|
150
|
-
|
151
|
-
|
152
|
-
|
164
|
+
return runWithSpan(
|
165
|
+
{ name: "validate_input" },
|
166
|
+
async () => {
|
167
|
+
const result = await schema["~standard"].validate(input);
|
168
|
+
if (result.issues) {
|
169
|
+
throw new ORPCError("BAD_REQUEST", {
|
170
|
+
message: "Input validation failed",
|
171
|
+
data: {
|
172
|
+
issues: result.issues
|
173
|
+
},
|
174
|
+
cause: new ValidationError({ message: "Input validation failed", issues: result.issues })
|
175
|
+
});
|
176
|
+
}
|
177
|
+
return result.value;
|
178
|
+
}
|
179
|
+
);
|
153
180
|
}
|
154
181
|
async function validateOutput(procedure, output) {
|
155
182
|
const schema = procedure["~orpc"].outputSchema;
|
156
183
|
if (!schema) {
|
157
184
|
return output;
|
158
185
|
}
|
159
|
-
|
160
|
-
|
161
|
-
|
162
|
-
|
163
|
-
|
164
|
-
|
165
|
-
|
166
|
-
|
186
|
+
return runWithSpan(
|
187
|
+
{ name: "validate_output" },
|
188
|
+
async () => {
|
189
|
+
const result = await schema["~standard"].validate(output);
|
190
|
+
if (result.issues) {
|
191
|
+
throw new ORPCError("INTERNAL_SERVER_ERROR", {
|
192
|
+
message: "Output validation failed",
|
193
|
+
cause: new ValidationError({ message: "Output validation failed", issues: result.issues })
|
194
|
+
});
|
195
|
+
}
|
196
|
+
return result.value;
|
197
|
+
}
|
198
|
+
);
|
167
199
|
}
|
168
200
|
async function executeProcedureInternal(procedure, options) {
|
169
201
|
const middlewares = procedure["~orpc"].middlewares;
|
@@ -175,17 +207,28 @@ async function executeProcedureInternal(procedure, options) {
|
|
175
207
|
currentInput = await validateInput(procedure, currentInput);
|
176
208
|
}
|
177
209
|
const mid = middlewares[index];
|
178
|
-
const output = mid ?
|
179
|
-
|
180
|
-
|
181
|
-
|
182
|
-
|
183
|
-
|
184
|
-
|
185
|
-
context
|
186
|
-
|
210
|
+
const output = mid ? await runWithSpan(
|
211
|
+
{ name: `middleware.${mid.name}`, signal: options.signal },
|
212
|
+
async (span) => {
|
213
|
+
span?.setAttribute("middleware.index", index);
|
214
|
+
span?.setAttribute("middleware.name", mid.name);
|
215
|
+
const result = await mid({
|
216
|
+
...options,
|
217
|
+
context,
|
218
|
+
next: async (...[nextOptions]) => {
|
219
|
+
const nextContext = nextOptions?.context ?? {};
|
220
|
+
return {
|
221
|
+
output: await next(index + 1, mergeCurrentContext(context, nextContext), currentInput),
|
222
|
+
context: nextContext
|
223
|
+
};
|
224
|
+
}
|
225
|
+
}, currentInput, middlewareOutputFn);
|
226
|
+
return result.output;
|
187
227
|
}
|
188
|
-
|
228
|
+
) : await runWithSpan(
|
229
|
+
{ name: "handler", signal: options.signal },
|
230
|
+
() => procedure["~orpc"].handler({ ...options, context, input: currentInput })
|
231
|
+
);
|
189
232
|
if (index === outputValidationIndex) {
|
190
233
|
return await validateOutput(procedure, output);
|
191
234
|
}
|
@@ -358,7 +401,8 @@ function createContractedProcedure(procedure, contract) {
|
|
358
401
|
});
|
359
402
|
}
|
360
403
|
function call(procedure, input, ...rest) {
|
361
|
-
|
404
|
+
const options = resolveMaybeOptionalOptions(rest);
|
405
|
+
return createProcedureClient(procedure, options)(input, options);
|
362
406
|
}
|
363
407
|
|
364
408
|
export { LAZY_SYMBOL as L, Procedure as P, createContractedProcedure as a, addMiddleware as b, createProcedureClient as c, isLazy as d, enhanceRouter as e, createAssertedLazyProcedure as f, getRouter as g, createORPCErrorConstructorMap as h, isProcedure as i, getLazyMeta as j, middlewareOutputFn as k, lazy as l, mergeCurrentContext as m, isStartWithMiddlewares as n, mergeMiddlewares as o, call as p, getHiddenRouterContract as q, createAccessibleLazyRouter as r, setHiddenRouterContract as s, traverseContractProcedures as t, unlazy as u, validateORPCError as v, resolveContractProcedures as w, unlazyRouter as x };
|
@@ -1,8 +1,18 @@
|
|
1
1
|
import { HTTPPath, ORPCError } from '@orpc/client';
|
2
|
-
import { Meta
|
3
|
-
import { Interceptor
|
2
|
+
import { Meta } from '@orpc/contract';
|
3
|
+
import { Interceptor } from '@orpc/shared';
|
4
4
|
import { StandardResponse, StandardLazyRequest } from '@orpc/standard-server';
|
5
|
-
import {
|
5
|
+
import { C as Context, R as Router, b as AnyRouter, A as AnyProcedure, d as ProcedureClientInterceptorOptions } from './server.CYNGeoCm.js';
|
6
|
+
|
7
|
+
interface StandardHandlerPlugin<T extends Context> {
|
8
|
+
order?: number;
|
9
|
+
init?(options: StandardHandlerOptions<T>, router: Router<any, T>): void;
|
10
|
+
}
|
11
|
+
declare class CompositeStandardHandlerPlugin<T extends Context, TPlugin extends StandardHandlerPlugin<T>> implements StandardHandlerPlugin<T> {
|
12
|
+
protected readonly plugins: TPlugin[];
|
13
|
+
constructor(plugins?: readonly TPlugin[]);
|
14
|
+
init(options: StandardHandlerOptions<T>, router: Router<any, T>): void;
|
15
|
+
}
|
6
16
|
|
7
17
|
type StandardParams = Record<string, string>;
|
8
18
|
type StandardMatchResult = {
|
@@ -31,9 +41,6 @@ type StandardHandleResult = {
|
|
31
41
|
matched: false;
|
32
42
|
response: undefined;
|
33
43
|
};
|
34
|
-
interface StandardHandlerPlugin<TContext extends Context> {
|
35
|
-
init?(options: StandardHandlerOptions<TContext>): void;
|
36
|
-
}
|
37
44
|
interface StandardHandlerInterceptorOptions<T extends Context> extends StandardHandleOptions<T> {
|
38
45
|
request: StandardLazyRequest;
|
39
46
|
}
|
@@ -42,16 +49,16 @@ interface StandardHandlerOptions<TContext extends Context> {
|
|
42
49
|
/**
|
43
50
|
* Interceptors at the request level, helpful when you want catch errors
|
44
51
|
*/
|
45
|
-
interceptors?: Interceptor<StandardHandlerInterceptorOptions<TContext>, StandardHandleResult
|
52
|
+
interceptors?: Interceptor<StandardHandlerInterceptorOptions<TContext>, Promise<StandardHandleResult>>[];
|
46
53
|
/**
|
47
54
|
* Interceptors at the root level, helpful when you want override the request/response
|
48
55
|
*/
|
49
|
-
rootInterceptors?: Interceptor<StandardHandlerInterceptorOptions<TContext>, StandardHandleResult
|
56
|
+
rootInterceptors?: Interceptor<StandardHandlerInterceptorOptions<TContext>, Promise<StandardHandleResult>>[];
|
50
57
|
/**
|
51
58
|
*
|
52
59
|
* Interceptors for procedure client.
|
53
60
|
*/
|
54
|
-
clientInterceptors?: Interceptor<ProcedureClientInterceptorOptions<TContext, Record<never, never>, Meta>,
|
61
|
+
clientInterceptors?: Interceptor<ProcedureClientInterceptorOptions<TContext, Record<never, never>, Meta>, Promise<unknown>>[];
|
55
62
|
}
|
56
63
|
declare class StandardHandler<T extends Context> {
|
57
64
|
private readonly matcher;
|
@@ -63,4 +70,5 @@ declare class StandardHandler<T extends Context> {
|
|
63
70
|
handle(request: StandardLazyRequest, options: StandardHandleOptions<T>): Promise<StandardHandleResult>;
|
64
71
|
}
|
65
72
|
|
66
|
-
export {
|
73
|
+
export { CompositeStandardHandlerPlugin as C, StandardHandler as f };
|
74
|
+
export type { StandardCodec as S, StandardParams as a, StandardHandleOptions as b, StandardHandleResult as c, StandardHandlerInterceptorOptions as d, StandardHandlerOptions as e, StandardHandlerPlugin as g, StandardMatchResult as h, StandardMatcher as i };
|