@temporary-name/server 1.9.3-alpha.6ef4729e23affbe6454d37025d1dfc4d998b0649 → 1.9.3-alpha.72daecd600ae901064d3c4f8ab780582c1335ffe
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/dist/adapters/aws-lambda/index.d.mts +11 -7
- package/dist/adapters/aws-lambda/index.d.ts +11 -7
- package/dist/adapters/aws-lambda/index.mjs +11 -4
- package/dist/adapters/fetch/index.d.mts +15 -87
- package/dist/adapters/fetch/index.d.ts +15 -87
- package/dist/adapters/fetch/index.mjs +22 -161
- package/dist/adapters/node/index.d.mts +15 -64
- package/dist/adapters/node/index.d.ts +15 -64
- package/dist/adapters/node/index.mjs +20 -126
- package/dist/handler/index.d.mts +28 -0
- package/dist/handler/index.d.ts +28 -0
- package/dist/handler/index.mjs +8 -0
- package/dist/helpers/index.mjs +3 -29
- package/dist/index.d.mts +373 -546
- package/dist/index.d.ts +373 -546
- package/dist/index.mjs +547 -470
- package/dist/openapi/index.d.mts +185 -0
- package/dist/openapi/index.d.ts +185 -0
- package/dist/openapi/index.mjs +782 -0
- package/dist/shared/server.BwcJq6aP.d.mts +808 -0
- package/dist/shared/server.BwcJq6aP.d.ts +808 -0
- package/dist/shared/server.C1RJffw4.mjs +30 -0
- package/dist/shared/server.CjPiuQYH.d.mts +51 -0
- package/dist/shared/server.CjPiuQYH.d.ts +51 -0
- package/dist/shared/server.D1LXM1bf.mjs +523 -0
- package/dist/shared/server.DEC2sW8B.mjs +496 -0
- package/dist/shared/server.Deg5phAY.d.ts +39 -0
- package/dist/shared/server.H11763QX.mjs +315 -0
- package/dist/shared/server.gSXsB9Bn.mjs +156 -0
- package/dist/shared/server.hAH-LVh_.d.mts +39 -0
- package/package.json +20 -31
- package/dist/adapters/standard/index.d.mts +0 -16
- package/dist/adapters/standard/index.d.ts +0 -16
- package/dist/adapters/standard/index.mjs +0 -101
- package/dist/plugins/index.d.mts +0 -160
- package/dist/plugins/index.d.ts +0 -160
- package/dist/plugins/index.mjs +0 -288
- package/dist/shared/server.BEQrAa3A.mjs +0 -207
- package/dist/shared/server.Bo94xDTv.d.mts +0 -73
- package/dist/shared/server.Btxrgkj5.d.ts +0 -73
- package/dist/shared/server.C1YnHvvf.d.mts +0 -192
- package/dist/shared/server.C1YnHvvf.d.ts +0 -192
- package/dist/shared/server.D6K9uoPI.mjs +0 -35
- package/dist/shared/server.DZ5BIITo.mjs +0 -9
- package/dist/shared/server.X0YaZxSJ.mjs +0 -13
|
@@ -0,0 +1,315 @@
|
|
|
1
|
+
import { isObject, NullProtoObj, fallbackContractConfig, stringifyJSON, isAsyncIteratorObject, tryDecodeURIComponent, toHttpPath, runWithSpan, ORPC_NAME, asyncIteratorWithSpan, setSpanError } from '@temporary-name/shared';
|
|
2
|
+
import { e as encodeError, i as isAPIErrorStatus, s as standardizeHTTPPath, A as APIError, B as BadRequestError, t as toAPIError$1 } from './server.DEC2sW8B.mjs';
|
|
3
|
+
import { c as createProcedureClient } from './server.gSXsB9Bn.mjs';
|
|
4
|
+
import { toAPIError, traverseContractProcedures, getLazyMeta, unlazy } from '@temporary-name/server';
|
|
5
|
+
import { mapEventIterator, ErrorEvent } from '@temporary-name/standard-server';
|
|
6
|
+
import { createRouter, addRoute, findRoute } from 'rou3';
|
|
7
|
+
|
|
8
|
+
function bracketNotationDeserialize(serialized, { maxArrayIndex = 9999 } = {}) {
|
|
9
|
+
if (serialized.length === 0) {
|
|
10
|
+
return {};
|
|
11
|
+
}
|
|
12
|
+
const arrayPushStyles = /* @__PURE__ */ new WeakSet();
|
|
13
|
+
const ref = { value: [] };
|
|
14
|
+
for (const [path, value] of serialized) {
|
|
15
|
+
const segments = parsePath(path);
|
|
16
|
+
let currentRef = ref;
|
|
17
|
+
let nextSegment = "value";
|
|
18
|
+
segments.forEach((segment, i) => {
|
|
19
|
+
if (!Array.isArray(currentRef[nextSegment]) && !isObject(currentRef[nextSegment])) {
|
|
20
|
+
currentRef[nextSegment] = [];
|
|
21
|
+
}
|
|
22
|
+
if (i !== segments.length - 1) {
|
|
23
|
+
if (Array.isArray(currentRef[nextSegment]) && !isValidArrayIndex(segment, maxArrayIndex)) {
|
|
24
|
+
if (arrayPushStyles.has(currentRef[nextSegment])) {
|
|
25
|
+
arrayPushStyles.delete(currentRef[nextSegment]);
|
|
26
|
+
currentRef[nextSegment] = pushStyleArrayToObject(currentRef[nextSegment]);
|
|
27
|
+
} else {
|
|
28
|
+
currentRef[nextSegment] = arrayToObject(currentRef[nextSegment]);
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
} else {
|
|
32
|
+
if (Array.isArray(currentRef[nextSegment])) {
|
|
33
|
+
if (segment === "") {
|
|
34
|
+
if (currentRef[nextSegment].length && !arrayPushStyles.has(currentRef[nextSegment])) {
|
|
35
|
+
currentRef[nextSegment] = arrayToObject(currentRef[nextSegment]);
|
|
36
|
+
}
|
|
37
|
+
} else {
|
|
38
|
+
if (arrayPushStyles.has(currentRef[nextSegment])) {
|
|
39
|
+
arrayPushStyles.delete(currentRef[nextSegment]);
|
|
40
|
+
currentRef[nextSegment] = pushStyleArrayToObject(currentRef[nextSegment]);
|
|
41
|
+
} else if (!isValidArrayIndex(segment, maxArrayIndex)) {
|
|
42
|
+
currentRef[nextSegment] = arrayToObject(currentRef[nextSegment]);
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
currentRef = currentRef[nextSegment];
|
|
48
|
+
nextSegment = segment;
|
|
49
|
+
});
|
|
50
|
+
if (Array.isArray(currentRef) && nextSegment === "") {
|
|
51
|
+
arrayPushStyles.add(currentRef);
|
|
52
|
+
currentRef.push(value);
|
|
53
|
+
} else if (nextSegment in currentRef) {
|
|
54
|
+
if (Array.isArray(currentRef[nextSegment])) {
|
|
55
|
+
currentRef[nextSegment].push(value);
|
|
56
|
+
} else {
|
|
57
|
+
currentRef[nextSegment] = [currentRef[nextSegment], value];
|
|
58
|
+
}
|
|
59
|
+
} else {
|
|
60
|
+
currentRef[nextSegment] = value;
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
return ref.value;
|
|
64
|
+
}
|
|
65
|
+
function parsePath(path) {
|
|
66
|
+
const segments = [];
|
|
67
|
+
let inBrackets = false;
|
|
68
|
+
let currentSegment = "";
|
|
69
|
+
let backslashCount = 0;
|
|
70
|
+
for (let i = 0; i < path.length; i++) {
|
|
71
|
+
const char = path[i];
|
|
72
|
+
const nextChar = path[i + 1];
|
|
73
|
+
if (inBrackets && char === "]" && (nextChar === void 0 || nextChar === "[") && backslashCount % 2 === 0) {
|
|
74
|
+
if (nextChar === void 0) {
|
|
75
|
+
inBrackets = false;
|
|
76
|
+
}
|
|
77
|
+
segments.push(currentSegment);
|
|
78
|
+
currentSegment = "";
|
|
79
|
+
i++;
|
|
80
|
+
} else if (segments.length === 0 && char === "[" && backslashCount % 2 === 0) {
|
|
81
|
+
inBrackets = true;
|
|
82
|
+
segments.push(currentSegment);
|
|
83
|
+
currentSegment = "";
|
|
84
|
+
} else if (char === "\\") {
|
|
85
|
+
backslashCount++;
|
|
86
|
+
} else {
|
|
87
|
+
currentSegment += "\\".repeat(backslashCount / 2) + char;
|
|
88
|
+
backslashCount = 0;
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
return inBrackets || segments.length === 0 ? [path] : segments;
|
|
92
|
+
}
|
|
93
|
+
function isValidArrayIndex(value, maxIndex) {
|
|
94
|
+
return /^0$|^[1-9]\d*$/.test(value) && Number(value) <= maxIndex;
|
|
95
|
+
}
|
|
96
|
+
function arrayToObject(array) {
|
|
97
|
+
const obj = new NullProtoObj();
|
|
98
|
+
array.forEach((item, i) => {
|
|
99
|
+
obj[i] = item;
|
|
100
|
+
});
|
|
101
|
+
return obj;
|
|
102
|
+
}
|
|
103
|
+
function pushStyleArrayToObject(array) {
|
|
104
|
+
const obj = new NullProtoObj();
|
|
105
|
+
obj[""] = array.length === 1 ? array[0] : array;
|
|
106
|
+
return obj;
|
|
107
|
+
}
|
|
108
|
+
|
|
109
|
+
async function decode(request, pathParams) {
|
|
110
|
+
return {
|
|
111
|
+
path: pathParams ?? {},
|
|
112
|
+
query: bracketNotationDeserialize(Array.from(request.url.searchParams.entries())),
|
|
113
|
+
headers: request.headers,
|
|
114
|
+
body: await request.body() ?? {}
|
|
115
|
+
};
|
|
116
|
+
}
|
|
117
|
+
function asyncSafeSerialize(data) {
|
|
118
|
+
if (isAsyncIteratorObject(data)) {
|
|
119
|
+
return mapEventIterator(data, {
|
|
120
|
+
value: async (value) => value,
|
|
121
|
+
error: async (e) => {
|
|
122
|
+
return new ErrorEvent({
|
|
123
|
+
data: encodeError(toAPIError(e))["body"],
|
|
124
|
+
cause: e
|
|
125
|
+
});
|
|
126
|
+
}
|
|
127
|
+
});
|
|
128
|
+
}
|
|
129
|
+
return data;
|
|
130
|
+
}
|
|
131
|
+
function encode(output, procedure) {
|
|
132
|
+
const successStatus = fallbackContractConfig(
|
|
133
|
+
"defaultSuccessStatus",
|
|
134
|
+
procedure["~orpc"].route.successStatus
|
|
135
|
+
);
|
|
136
|
+
const outputStructure = fallbackContractConfig(
|
|
137
|
+
"defaultOutputStructure",
|
|
138
|
+
procedure["~orpc"].route.outputStructure
|
|
139
|
+
);
|
|
140
|
+
if (outputStructure === "compact") {
|
|
141
|
+
return {
|
|
142
|
+
status: successStatus,
|
|
143
|
+
headers: new Headers(),
|
|
144
|
+
body: asyncSafeSerialize(output)
|
|
145
|
+
};
|
|
146
|
+
}
|
|
147
|
+
if (!isDetailedOutput(output)) {
|
|
148
|
+
throw new Error(`
|
|
149
|
+
Invalid "detailed" output structure:
|
|
150
|
+
\u2022 Expected an object with optional properties:
|
|
151
|
+
- status (number 200-399)
|
|
152
|
+
- headers (Record<string, string | string[]>)
|
|
153
|
+
- body (any)
|
|
154
|
+
\u2022 No extra keys allowed.
|
|
155
|
+
|
|
156
|
+
Actual value:
|
|
157
|
+
${stringifyJSON(output)}
|
|
158
|
+
`);
|
|
159
|
+
}
|
|
160
|
+
return {
|
|
161
|
+
status: output.status ?? successStatus,
|
|
162
|
+
headers: output.headers ?? new Headers(),
|
|
163
|
+
body: asyncSafeSerialize(output.body)
|
|
164
|
+
};
|
|
165
|
+
}
|
|
166
|
+
function isDetailedOutput(output) {
|
|
167
|
+
if (!isObject(output)) {
|
|
168
|
+
return false;
|
|
169
|
+
}
|
|
170
|
+
if (output.headers && !isObject(output.headers)) {
|
|
171
|
+
return false;
|
|
172
|
+
}
|
|
173
|
+
if (output.status !== void 0 && (typeof output.status !== "number" || !Number.isInteger(output.status) || isAPIErrorStatus(output.status))) {
|
|
174
|
+
return false;
|
|
175
|
+
}
|
|
176
|
+
return true;
|
|
177
|
+
}
|
|
178
|
+
|
|
179
|
+
function resolveFriendlyStandardHandleOptions(options) {
|
|
180
|
+
return {
|
|
181
|
+
...options,
|
|
182
|
+
context: options.context ?? {}
|
|
183
|
+
// Context only optional if all fields are optional
|
|
184
|
+
};
|
|
185
|
+
}
|
|
186
|
+
function toRou3Pattern(path) {
|
|
187
|
+
return standardizeHTTPPath(path).replace(/\/\{\+([^}]+)\}/g, "/**:$1").replace(/\/\{([^}]+)\}/g, "/:$1");
|
|
188
|
+
}
|
|
189
|
+
function decodeParams(params) {
|
|
190
|
+
return Object.fromEntries(
|
|
191
|
+
Object.entries(params).map(([key, value]) => [key, tryDecodeURIComponent(value)])
|
|
192
|
+
);
|
|
193
|
+
}
|
|
194
|
+
|
|
195
|
+
class StandardOpenAPIMatcher {
|
|
196
|
+
tree = createRouter();
|
|
197
|
+
pendingRouters = [];
|
|
198
|
+
init(router, path = []) {
|
|
199
|
+
const laziedOptions = traverseContractProcedures({ router, path }, (traverseOptions) => {
|
|
200
|
+
const { path: path2, contract } = traverseOptions;
|
|
201
|
+
const method = fallbackContractConfig("defaultMethod", contract["~orpc"].route.method);
|
|
202
|
+
const httpPath = toRou3Pattern(contract["~orpc"].route.path ?? toHttpPath(path2));
|
|
203
|
+
addRoute(this.tree, method, httpPath, {
|
|
204
|
+
path: path2,
|
|
205
|
+
// cast is safe because router is typed as Router (not ContractRouter)
|
|
206
|
+
procedure: contract,
|
|
207
|
+
router
|
|
208
|
+
});
|
|
209
|
+
});
|
|
210
|
+
this.pendingRouters.push(
|
|
211
|
+
...laziedOptions.map((option) => ({
|
|
212
|
+
...option,
|
|
213
|
+
httpPathPrefix: toHttpPath(option.path),
|
|
214
|
+
laziedPrefix: getLazyMeta(option.router).prefix
|
|
215
|
+
}))
|
|
216
|
+
);
|
|
217
|
+
}
|
|
218
|
+
async match(method, pathname) {
|
|
219
|
+
if (this.pendingRouters.length) {
|
|
220
|
+
const newPendingRouters = [];
|
|
221
|
+
for (const pendingRouter of this.pendingRouters) {
|
|
222
|
+
if (!pendingRouter.laziedPrefix || pathname.startsWith(pendingRouter.laziedPrefix) || pathname.startsWith(pendingRouter.httpPathPrefix)) {
|
|
223
|
+
const { default: router } = await unlazy(pendingRouter.router);
|
|
224
|
+
this.init(router, pendingRouter.path);
|
|
225
|
+
} else {
|
|
226
|
+
newPendingRouters.push(pendingRouter);
|
|
227
|
+
}
|
|
228
|
+
}
|
|
229
|
+
this.pendingRouters = newPendingRouters;
|
|
230
|
+
}
|
|
231
|
+
const match = findRoute(this.tree, method, pathname);
|
|
232
|
+
if (!match) {
|
|
233
|
+
return void 0;
|
|
234
|
+
}
|
|
235
|
+
return {
|
|
236
|
+
path: match.data.path,
|
|
237
|
+
procedure: match.data.procedure,
|
|
238
|
+
params: match.params ? decodeParams(match.params) : void 0
|
|
239
|
+
};
|
|
240
|
+
}
|
|
241
|
+
}
|
|
242
|
+
|
|
243
|
+
class StandardHandler {
|
|
244
|
+
matcher;
|
|
245
|
+
constructor(router) {
|
|
246
|
+
this.matcher = new StandardOpenAPIMatcher();
|
|
247
|
+
this.matcher.init(router);
|
|
248
|
+
}
|
|
249
|
+
async handle(request, options) {
|
|
250
|
+
const prefix = options.prefix?.replace(/\/$/, "") || void 0;
|
|
251
|
+
if (prefix && !request.url.pathname.startsWith(`${prefix}/`) && request.url.pathname !== prefix) {
|
|
252
|
+
return { matched: false, response: void 0 };
|
|
253
|
+
}
|
|
254
|
+
return runWithSpan({ name: `${request.method} ${request.url.pathname}` }, async (span) => {
|
|
255
|
+
let step;
|
|
256
|
+
try {
|
|
257
|
+
const context = options.context;
|
|
258
|
+
const method = request.method;
|
|
259
|
+
const url = request.url;
|
|
260
|
+
const pathname = prefix ? url.pathname.replace(prefix, "") : url.pathname;
|
|
261
|
+
const match = await runWithSpan(
|
|
262
|
+
{ name: "find_procedure" },
|
|
263
|
+
() => this.matcher.match(method, `/${pathname.replace(/^\/|\/$/g, "")}`)
|
|
264
|
+
);
|
|
265
|
+
if (!match) {
|
|
266
|
+
return { matched: false, response: void 0 };
|
|
267
|
+
}
|
|
268
|
+
span?.updateName(`${ORPC_NAME}.${match.path.join("/")}`);
|
|
269
|
+
span?.setAttribute("rpc.system", ORPC_NAME);
|
|
270
|
+
span?.setAttribute("rpc.method", match.path.join("."));
|
|
271
|
+
step = "decode_input";
|
|
272
|
+
const input = await runWithSpan({ name: "decode_input" }, () => decode(request, match.params));
|
|
273
|
+
step = void 0;
|
|
274
|
+
if (isAsyncIteratorObject(input.body)) {
|
|
275
|
+
input.body = asyncIteratorWithSpan(
|
|
276
|
+
{ name: "consume_event_iterator_input", signal: request.signal },
|
|
277
|
+
input.body
|
|
278
|
+
);
|
|
279
|
+
}
|
|
280
|
+
const client = createProcedureClient(match.procedure, {
|
|
281
|
+
context,
|
|
282
|
+
path: match.path
|
|
283
|
+
});
|
|
284
|
+
step = "call_procedure";
|
|
285
|
+
const output = await client(input, {
|
|
286
|
+
request,
|
|
287
|
+
signal: request.signal,
|
|
288
|
+
lastEventId: request.headers.get("last-event-id") ?? void 0
|
|
289
|
+
});
|
|
290
|
+
step = void 0;
|
|
291
|
+
const response = encode(output, match.procedure);
|
|
292
|
+
return {
|
|
293
|
+
matched: true,
|
|
294
|
+
response
|
|
295
|
+
};
|
|
296
|
+
} catch (e) {
|
|
297
|
+
if (step !== "call_procedure") {
|
|
298
|
+
setSpanError(span, e);
|
|
299
|
+
}
|
|
300
|
+
const error = step === "decode_input" && !(e instanceof APIError) ? new BadRequestError({
|
|
301
|
+
code: "malformed_request",
|
|
302
|
+
message: `Malformed request. Ensure the request body is properly formatted and the 'Content-Type' header is set correctly.`,
|
|
303
|
+
cause: e
|
|
304
|
+
}) : toAPIError$1(e);
|
|
305
|
+
const response = encodeError(error);
|
|
306
|
+
return {
|
|
307
|
+
matched: true,
|
|
308
|
+
response
|
|
309
|
+
};
|
|
310
|
+
}
|
|
311
|
+
});
|
|
312
|
+
}
|
|
313
|
+
}
|
|
314
|
+
|
|
315
|
+
export { StandardHandler as S, StandardOpenAPIMatcher as a, decodeParams as b, decode as d, encode as e, resolveFriendlyStandardHandleOptions as r, toRou3Pattern as t };
|
|
@@ -0,0 +1,156 @@
|
|
|
1
|
+
import { resolveMaybeOptionalOptions, toArray, value, runWithSpan, isAsyncIteratorObject, overlayProxy, asyncIteratorWithSpan } from '@temporary-name/shared';
|
|
2
|
+
import { HibernationEventIterator, mapEventIterator } from '@temporary-name/standard-server';
|
|
3
|
+
import { safeDecodeAsync, safeEncodeAsync } from '@temporary-name/zod';
|
|
4
|
+
import { u as unlazy, B as BadRequestError, V as ValidationError, I as InternalServerError } from './server.DEC2sW8B.mjs';
|
|
5
|
+
|
|
6
|
+
function mergeCurrentContext(context, other) {
|
|
7
|
+
return { ...context, ...other };
|
|
8
|
+
}
|
|
9
|
+
|
|
10
|
+
function middlewareOutputFn(output) {
|
|
11
|
+
return { output, context: {} };
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
function createProcedureClient(lazyableProcedure, ...rest) {
|
|
15
|
+
const options = resolveMaybeOptionalOptions(rest);
|
|
16
|
+
return async (...[input, callerOptions]) => {
|
|
17
|
+
const path = toArray(options.path);
|
|
18
|
+
const { default: procedure } = await unlazy(lazyableProcedure);
|
|
19
|
+
const clientContext = callerOptions?.context ?? {};
|
|
20
|
+
const context = await value(options.context ?? {}, clientContext);
|
|
21
|
+
const output = await runWithSpan({ name: "call_procedure", signal: callerOptions?.signal }, (span) => {
|
|
22
|
+
span?.setAttribute("procedure.path", [...path]);
|
|
23
|
+
return executeProcedureInternal(procedure, input, {
|
|
24
|
+
context,
|
|
25
|
+
path,
|
|
26
|
+
procedure,
|
|
27
|
+
request: callerOptions?.request,
|
|
28
|
+
signal: callerOptions?.signal,
|
|
29
|
+
lastEventId: callerOptions?.lastEventId
|
|
30
|
+
});
|
|
31
|
+
});
|
|
32
|
+
if (isAsyncIteratorObject(output)) {
|
|
33
|
+
if (output instanceof HibernationEventIterator) {
|
|
34
|
+
return output;
|
|
35
|
+
}
|
|
36
|
+
return overlayProxy(
|
|
37
|
+
output,
|
|
38
|
+
mapEventIterator(
|
|
39
|
+
asyncIteratorWithSpan(
|
|
40
|
+
{ name: "consume_event_iterator_output", signal: callerOptions?.signal },
|
|
41
|
+
output
|
|
42
|
+
),
|
|
43
|
+
{
|
|
44
|
+
value: (v) => v,
|
|
45
|
+
error: async (e) => e
|
|
46
|
+
}
|
|
47
|
+
)
|
|
48
|
+
);
|
|
49
|
+
}
|
|
50
|
+
return output;
|
|
51
|
+
};
|
|
52
|
+
}
|
|
53
|
+
async function validateInput(procedure, input) {
|
|
54
|
+
const schemas = procedure["~orpc"].schemas;
|
|
55
|
+
return runWithSpan({ name: "validate_input" }, async () => {
|
|
56
|
+
const resultBody = await safeDecodeAsync(schemas.bodySchema, input.body, { parseType: "body" });
|
|
57
|
+
const resultPath = await safeDecodeAsync(schemas.pathSchema, input.path, { parseType: "path" });
|
|
58
|
+
const resultQuery = await safeDecodeAsync(schemas.querySchema, input.query, { parseType: "query" });
|
|
59
|
+
const issues = [];
|
|
60
|
+
if (!resultBody.success) {
|
|
61
|
+
issues.push(...resultBody.error.issues.map((i) => ({ ...i, path: ["body", ...i.path] })));
|
|
62
|
+
}
|
|
63
|
+
if (!resultPath.success) {
|
|
64
|
+
issues.push(...resultPath.error.issues.map((i) => ({ ...i, path: ["path", ...i.path] })));
|
|
65
|
+
}
|
|
66
|
+
if (!resultQuery.success) {
|
|
67
|
+
issues.push(...resultQuery.error.issues.map((i) => ({ ...i, path: ["query", ...i.path] })));
|
|
68
|
+
}
|
|
69
|
+
if (issues.length > 0) {
|
|
70
|
+
throw new BadRequestError({
|
|
71
|
+
code: "input_validation_failed",
|
|
72
|
+
message: "Input validation failed",
|
|
73
|
+
cause: new ValidationError({
|
|
74
|
+
issues,
|
|
75
|
+
data: input
|
|
76
|
+
})
|
|
77
|
+
});
|
|
78
|
+
}
|
|
79
|
+
const results = {
|
|
80
|
+
body: resultBody.data,
|
|
81
|
+
path: resultPath.data,
|
|
82
|
+
query: resultQuery.data
|
|
83
|
+
};
|
|
84
|
+
return results;
|
|
85
|
+
});
|
|
86
|
+
}
|
|
87
|
+
async function validateOutput(procedure, output) {
|
|
88
|
+
const schema = procedure["~orpc"].schemas.outputSchema;
|
|
89
|
+
if (!schema) {
|
|
90
|
+
return output;
|
|
91
|
+
}
|
|
92
|
+
return runWithSpan({ name: "validate_output" }, async () => {
|
|
93
|
+
const result = await safeEncodeAsync(schema, output, { parseType: "output" });
|
|
94
|
+
if (!result.success) {
|
|
95
|
+
throw new InternalServerError({
|
|
96
|
+
message: "Output validation failed",
|
|
97
|
+
cause: new ValidationError({
|
|
98
|
+
issues: result.error.issues,
|
|
99
|
+
data: output
|
|
100
|
+
})
|
|
101
|
+
});
|
|
102
|
+
}
|
|
103
|
+
return result.data;
|
|
104
|
+
});
|
|
105
|
+
}
|
|
106
|
+
async function executeProcedureInternal(procedure, input, options) {
|
|
107
|
+
const middlewares = procedure["~orpc"].middlewares;
|
|
108
|
+
const inputValidationIndex = Math.min(
|
|
109
|
+
Math.max(0, procedure["~orpc"].inputValidationIndex),
|
|
110
|
+
middlewares.length
|
|
111
|
+
);
|
|
112
|
+
const outputValidationIndex = Math.min(
|
|
113
|
+
Math.max(0, procedure["~orpc"].outputValidationIndex),
|
|
114
|
+
middlewares.length
|
|
115
|
+
);
|
|
116
|
+
const next = async (index, context, input2) => {
|
|
117
|
+
let currentInput = input2;
|
|
118
|
+
if (index === inputValidationIndex) {
|
|
119
|
+
currentInput = await validateInput(procedure, currentInput);
|
|
120
|
+
}
|
|
121
|
+
const mid = middlewares[index];
|
|
122
|
+
const output = mid ? await runWithSpan({ name: `middleware.${mid.name}`, signal: options.signal }, async (span) => {
|
|
123
|
+
span?.setAttribute("middleware.index", index);
|
|
124
|
+
span?.setAttribute("middleware.name", mid.name);
|
|
125
|
+
const result = await mid(
|
|
126
|
+
{
|
|
127
|
+
...options,
|
|
128
|
+
context,
|
|
129
|
+
next: async (nextOptions) => {
|
|
130
|
+
const nextContext = nextOptions?.context ?? {};
|
|
131
|
+
return {
|
|
132
|
+
output: await next(index + 1, mergeCurrentContext(context, nextContext), currentInput),
|
|
133
|
+
// NB: Pretty sure this isn't used (or meant to be used) at runtime, it's just there
|
|
134
|
+
// to get type inference in the builder (via the caller returning the output of next() in
|
|
135
|
+
// the middleware function)
|
|
136
|
+
context: nextContext
|
|
137
|
+
};
|
|
138
|
+
}
|
|
139
|
+
},
|
|
140
|
+
currentInput,
|
|
141
|
+
middlewareOutputFn
|
|
142
|
+
);
|
|
143
|
+
return result.output;
|
|
144
|
+
}) : await runWithSpan(
|
|
145
|
+
{ name: "handler", signal: options.signal },
|
|
146
|
+
() => procedure["~orpc"].handler(currentInput, { ...options, context })
|
|
147
|
+
);
|
|
148
|
+
if (index === outputValidationIndex) {
|
|
149
|
+
return await validateOutput(procedure, output);
|
|
150
|
+
}
|
|
151
|
+
return output;
|
|
152
|
+
};
|
|
153
|
+
return next(0, options.context, input);
|
|
154
|
+
}
|
|
155
|
+
|
|
156
|
+
export { middlewareOutputFn as a, createProcedureClient as c, mergeCurrentContext as m };
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
import { HTTPPath, StandardResponse, StandardLazyRequest } from '@temporary-name/shared';
|
|
2
|
+
import { C as Context, m as Router } from './server.BwcJq6aP.mjs';
|
|
3
|
+
|
|
4
|
+
interface StandardHandleOptions<T extends Context> {
|
|
5
|
+
prefix?: HTTPPath;
|
|
6
|
+
context: T;
|
|
7
|
+
}
|
|
8
|
+
type StandardHandleResult = {
|
|
9
|
+
matched: true;
|
|
10
|
+
response: StandardResponse;
|
|
11
|
+
} | {
|
|
12
|
+
matched: false;
|
|
13
|
+
response: undefined;
|
|
14
|
+
};
|
|
15
|
+
declare class StandardHandler<T extends Context> {
|
|
16
|
+
private readonly matcher;
|
|
17
|
+
constructor(router: Router<T>);
|
|
18
|
+
handle(request: StandardLazyRequest, options: StandardHandleOptions<T>): Promise<StandardHandleResult>;
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
type FriendlyStandardHandleOptions<T extends Context> = Omit<StandardHandleOptions<T>, 'context'> & (object extends T ? {
|
|
22
|
+
context?: T;
|
|
23
|
+
} : {
|
|
24
|
+
context: T;
|
|
25
|
+
});
|
|
26
|
+
declare function resolveFriendlyStandardHandleOptions<T extends Context>(options: FriendlyStandardHandleOptions<T>): StandardHandleOptions<T>;
|
|
27
|
+
/**
|
|
28
|
+
* {@link https://github.com/unjs/rou3}
|
|
29
|
+
*
|
|
30
|
+
* @internal
|
|
31
|
+
*/
|
|
32
|
+
declare function toRou3Pattern(path: HTTPPath): string;
|
|
33
|
+
/**
|
|
34
|
+
* @internal
|
|
35
|
+
*/
|
|
36
|
+
declare function decodeParams(params: Record<string, string>): Record<string, string>;
|
|
37
|
+
|
|
38
|
+
export { StandardHandler as b, decodeParams as d, resolveFriendlyStandardHandleOptions as r, toRou3Pattern as t };
|
|
39
|
+
export type { FriendlyStandardHandleOptions as F, StandardHandleOptions as S, StandardHandleResult as a };
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@temporary-name/server",
|
|
3
3
|
"type": "module",
|
|
4
|
-
"version": "1.9.3-alpha.
|
|
4
|
+
"version": "1.9.3-alpha.72daecd600ae901064d3c4f8ab780582c1335ffe",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"homepage": "https://www.stainless.com/",
|
|
7
7
|
"repository": {
|
|
@@ -23,15 +23,10 @@
|
|
|
23
23
|
"import": "./dist/helpers/index.mjs",
|
|
24
24
|
"default": "./dist/helpers/index.mjs"
|
|
25
25
|
},
|
|
26
|
-
"./plugins": {
|
|
27
|
-
"types": "./dist/plugins/index.d.mts",
|
|
28
|
-
"import": "./dist/plugins/index.mjs",
|
|
29
|
-
"default": "./dist/plugins/index.mjs"
|
|
30
|
-
},
|
|
31
26
|
"./standard": {
|
|
32
|
-
"types": "./dist/
|
|
33
|
-
"import": "./dist/
|
|
34
|
-
"default": "./dist/
|
|
27
|
+
"types": "./dist/handler/index.d.mts",
|
|
28
|
+
"import": "./dist/handler/index.mjs",
|
|
29
|
+
"default": "./dist/handler/index.mjs"
|
|
35
30
|
},
|
|
36
31
|
"./fetch": {
|
|
37
32
|
"types": "./dist/adapters/fetch/index.d.mts",
|
|
@@ -47,43 +42,37 @@
|
|
|
47
42
|
"types": "./dist/adapters/aws-lambda/index.d.mts",
|
|
48
43
|
"import": "./dist/adapters/aws-lambda/index.mjs",
|
|
49
44
|
"default": "./dist/adapters/aws-lambda/index.mjs"
|
|
45
|
+
},
|
|
46
|
+
"./openapi": {
|
|
47
|
+
"types": "./dist/openapi/index.d.mts",
|
|
48
|
+
"import": "./dist/openapi/index.mjs",
|
|
49
|
+
"default": "./dist/openapi/index.mjs"
|
|
50
50
|
}
|
|
51
51
|
},
|
|
52
52
|
"files": [
|
|
53
53
|
"dist"
|
|
54
54
|
],
|
|
55
|
-
"peerDependencies": {
|
|
56
|
-
"drizzle-orm": "^0.44.5",
|
|
57
|
-
"drizzle-zod": "^0.8.3"
|
|
58
|
-
},
|
|
59
|
-
"peerDependenciesMeta": {
|
|
60
|
-
"drizzle-orm": {
|
|
61
|
-
"optional": true
|
|
62
|
-
},
|
|
63
|
-
"drizzle-zod": {
|
|
64
|
-
"optional": true
|
|
65
|
-
}
|
|
66
|
-
},
|
|
67
55
|
"dependencies": {
|
|
68
56
|
"cookie": "^1.0.2",
|
|
69
|
-
"
|
|
57
|
+
"rou3": "^0.7.7",
|
|
70
58
|
"zod": "^4.1.12",
|
|
71
|
-
"@temporary-name/
|
|
72
|
-
"@temporary-name/
|
|
73
|
-
"@temporary-name/
|
|
74
|
-
"@temporary-name/
|
|
75
|
-
"@temporary-name/standard-server
|
|
76
|
-
"@temporary-name/
|
|
77
|
-
"@temporary-name/
|
|
78
|
-
"@temporary-name/standard-server-node": "1.9.3-alpha.6ef4729e23affbe6454d37025d1dfc4d998b0649"
|
|
59
|
+
"@temporary-name/interop": "1.9.3-alpha.72daecd600ae901064d3c4f8ab780582c1335ffe",
|
|
60
|
+
"@temporary-name/standard-server-fetch": "1.9.3-alpha.72daecd600ae901064d3c4f8ab780582c1335ffe",
|
|
61
|
+
"@temporary-name/standard-server-aws-lambda": "1.9.3-alpha.72daecd600ae901064d3c4f8ab780582c1335ffe",
|
|
62
|
+
"@temporary-name/zod": "1.9.3-alpha.72daecd600ae901064d3c4f8ab780582c1335ffe",
|
|
63
|
+
"@temporary-name/standard-server": "1.9.3-alpha.72daecd600ae901064d3c4f8ab780582c1335ffe",
|
|
64
|
+
"@temporary-name/shared": "1.9.3-alpha.72daecd600ae901064d3c4f8ab780582c1335ffe",
|
|
65
|
+
"@temporary-name/standard-server-node": "1.9.3-alpha.72daecd600ae901064d3c4f8ab780582c1335ffe"
|
|
79
66
|
},
|
|
80
67
|
"devDependencies": {
|
|
68
|
+
"@types/supertest": "^6.0.3",
|
|
81
69
|
"@types/ws": "^8.18.1",
|
|
82
70
|
"supertest": "^7.1.4"
|
|
83
71
|
},
|
|
84
72
|
"scripts": {
|
|
85
73
|
"build": "unbuild",
|
|
86
74
|
"build:watch": "pnpm run build --watch",
|
|
87
|
-
"
|
|
75
|
+
"clean": "tsc -b --clean",
|
|
76
|
+
"lint:tsc": "tsc -b"
|
|
88
77
|
}
|
|
89
78
|
}
|
|
@@ -1,16 +0,0 @@
|
|
|
1
|
-
import { b as StandardHandleOptions } from '../../shared/server.Bo94xDTv.mjs';
|
|
2
|
-
export { C as CompositeStandardHandlerPlugin, i as StandardCodec, e as StandardHandleResult, S as StandardHandler, c as StandardHandlerInterceptorOptions, d as StandardHandlerOptions, a as StandardHandlerPlugin, g as StandardMatchResult, h as StandardMatcher, f as StandardParams } from '../../shared/server.Bo94xDTv.mjs';
|
|
3
|
-
import { C as Context } from '../../shared/server.C1YnHvvf.mjs';
|
|
4
|
-
import '@temporary-name/contract';
|
|
5
|
-
import '@temporary-name/shared';
|
|
6
|
-
import '@temporary-name/standard-server';
|
|
7
|
-
|
|
8
|
-
type FriendlyStandardHandleOptions<T extends Context> = Omit<StandardHandleOptions<T>, 'context'> & (Record<never, never> extends T ? {
|
|
9
|
-
context?: T;
|
|
10
|
-
} : {
|
|
11
|
-
context: T;
|
|
12
|
-
});
|
|
13
|
-
declare function resolveFriendlyStandardHandleOptions<T extends Context>(options: FriendlyStandardHandleOptions<T>): StandardHandleOptions<T>;
|
|
14
|
-
|
|
15
|
-
export { StandardHandleOptions, resolveFriendlyStandardHandleOptions };
|
|
16
|
-
export type { FriendlyStandardHandleOptions };
|
|
@@ -1,16 +0,0 @@
|
|
|
1
|
-
import { b as StandardHandleOptions } from '../../shared/server.Btxrgkj5.js';
|
|
2
|
-
export { C as CompositeStandardHandlerPlugin, i as StandardCodec, e as StandardHandleResult, S as StandardHandler, c as StandardHandlerInterceptorOptions, d as StandardHandlerOptions, a as StandardHandlerPlugin, g as StandardMatchResult, h as StandardMatcher, f as StandardParams } from '../../shared/server.Btxrgkj5.js';
|
|
3
|
-
import { C as Context } from '../../shared/server.C1YnHvvf.js';
|
|
4
|
-
import '@temporary-name/contract';
|
|
5
|
-
import '@temporary-name/shared';
|
|
6
|
-
import '@temporary-name/standard-server';
|
|
7
|
-
|
|
8
|
-
type FriendlyStandardHandleOptions<T extends Context> = Omit<StandardHandleOptions<T>, 'context'> & (Record<never, never> extends T ? {
|
|
9
|
-
context?: T;
|
|
10
|
-
} : {
|
|
11
|
-
context: T;
|
|
12
|
-
});
|
|
13
|
-
declare function resolveFriendlyStandardHandleOptions<T extends Context>(options: FriendlyStandardHandleOptions<T>): StandardHandleOptions<T>;
|
|
14
|
-
|
|
15
|
-
export { StandardHandleOptions, resolveFriendlyStandardHandleOptions };
|
|
16
|
-
export type { FriendlyStandardHandleOptions };
|