@orpc/server 0.0.0-next.14dd190 → 0.0.0-next.150aa84

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.
Files changed (58) hide show
  1. package/README.md +4 -2
  2. package/dist/adapters/aws-lambda/index.d.mts +5 -5
  3. package/dist/adapters/aws-lambda/index.d.ts +5 -5
  4. package/dist/adapters/aws-lambda/index.mjs +3 -2
  5. package/dist/adapters/bun-ws/index.d.mts +5 -5
  6. package/dist/adapters/bun-ws/index.d.ts +5 -5
  7. package/dist/adapters/bun-ws/index.mjs +10 -10
  8. package/dist/adapters/crossws/index.d.mts +5 -5
  9. package/dist/adapters/crossws/index.d.ts +5 -5
  10. package/dist/adapters/crossws/index.mjs +5 -7
  11. package/dist/adapters/fetch/index.d.mts +54 -9
  12. package/dist/adapters/fetch/index.d.ts +54 -9
  13. package/dist/adapters/fetch/index.mjs +73 -3
  14. package/dist/adapters/message-port/index.d.mts +5 -5
  15. package/dist/adapters/message-port/index.d.ts +5 -5
  16. package/dist/adapters/message-port/index.mjs +5 -7
  17. package/dist/adapters/node/index.d.mts +30 -9
  18. package/dist/adapters/node/index.d.ts +30 -9
  19. package/dist/adapters/node/index.mjs +69 -12
  20. package/dist/adapters/standard/index.d.mts +6 -6
  21. package/dist/adapters/standard/index.d.ts +6 -6
  22. package/dist/adapters/standard/index.mjs +2 -2
  23. package/dist/adapters/standard-peer/index.d.mts +9 -5
  24. package/dist/adapters/standard-peer/index.d.ts +9 -5
  25. package/dist/adapters/standard-peer/index.mjs +1 -1
  26. package/dist/adapters/websocket/index.d.mts +5 -5
  27. package/dist/adapters/websocket/index.d.ts +5 -5
  28. package/dist/adapters/websocket/index.mjs +5 -7
  29. package/dist/adapters/ws/index.d.mts +5 -5
  30. package/dist/adapters/ws/index.d.ts +5 -5
  31. package/dist/adapters/ws/index.mjs +5 -7
  32. package/dist/helpers/index.d.mts +134 -0
  33. package/dist/helpers/index.d.ts +134 -0
  34. package/dist/helpers/index.mjs +188 -0
  35. package/dist/hibernation/index.d.mts +11 -11
  36. package/dist/hibernation/index.d.ts +11 -11
  37. package/dist/hibernation/index.mjs +8 -8
  38. package/dist/index.d.mts +5 -5
  39. package/dist/index.d.ts +5 -5
  40. package/dist/index.mjs +4 -4
  41. package/dist/plugins/index.d.mts +17 -4
  42. package/dist/plugins/index.d.ts +17 -4
  43. package/dist/plugins/index.mjs +83 -57
  44. package/dist/shared/{server.NeumLVdS.mjs → server.7jWaIryJ.mjs} +95 -49
  45. package/dist/shared/{server.CNZgPgce.d.ts → server.B7b2w3_i.d.ts} +2 -2
  46. package/dist/shared/{server.Cu-7se50.d.mts → server.BEFBl-Cb.d.mts} +2 -2
  47. package/dist/shared/{server.CIL9uKTN.mjs → server.BHZCyRuJ.mjs} +64 -39
  48. package/dist/shared/{server.CC8z0B3U.d.mts → server.BU4WI18A.d.mts} +3 -3
  49. package/dist/shared/{server.DVBSOxWU.d.ts → server.Bmh5xd4n.d.ts} +1 -1
  50. package/dist/shared/{server.wMv480px.d.mts → server.CYNGeoCm.d.mts} +3 -1
  51. package/dist/shared/{server.wMv480px.d.ts → server.CYNGeoCm.d.ts} +3 -1
  52. package/dist/shared/{server.DOwaI1le.d.ts → server.D0H-iaY3.d.ts} +3 -3
  53. package/dist/shared/{server.Cwq7K86l.d.mts → server.DhJj-1X9.d.mts} +1 -1
  54. package/dist/shared/server.UVMTOWrk.mjs +26 -0
  55. package/dist/shared/{server.DHgXKx3q.d.mts → server.gqRxT-yN.d.mts} +1 -1
  56. package/dist/shared/{server.a_VzWVCm.d.ts → server.jMTkVNIb.d.ts} +1 -1
  57. package/package.json +18 -11
  58. package/dist/shared/server.C6Q5sqYw.mjs +0 -20
@@ -1,8 +1,8 @@
1
1
  import { Value, Promisable } from '@orpc/shared';
2
2
  import { StandardRequest, StandardHeaders } from '@orpc/standard-server';
3
3
  import { BatchResponseBodyItem } from '@orpc/standard-server/batch';
4
- import { d as StandardHandlerInterceptorOptions, g as StandardHandlerPlugin, e as StandardHandlerOptions } from '../shared/server.DHgXKx3q.mjs';
5
- import { C as Context, d as ProcedureClientInterceptorOptions } from '../shared/server.wMv480px.mjs';
4
+ import { d as StandardHandlerInterceptorOptions, g as StandardHandlerPlugin, e as StandardHandlerOptions } from '../shared/server.gqRxT-yN.mjs';
5
+ import { C as Context, d as ProcedureClientInterceptorOptions } from '../shared/server.CYNGeoCm.mjs';
6
6
  import { Meta, ORPCError as ORPCError$1 } from '@orpc/contract';
7
7
  import { ORPCError } from '@orpc/client';
8
8
 
@@ -69,6 +69,19 @@ declare class CORSPlugin<T extends Context> implements StandardHandlerPlugin<T>
69
69
  init(options: StandardHandlerOptions<T>): void;
70
70
  }
71
71
 
72
+ interface RequestHeadersPluginContext {
73
+ reqHeaders?: Headers;
74
+ }
75
+ /**
76
+ * The Request Headers Plugin injects a `reqHeaders` instance into the context,
77
+ * allowing access to request headers in oRPC.
78
+ *
79
+ * @see {@link https://orpc.unnoq.com/docs/plugins/request-headers Request Headers Plugin Docs}
80
+ */
81
+ declare class RequestHeadersPlugin<T extends RequestHeadersPluginContext> implements StandardHandlerPlugin<T> {
82
+ init(options: StandardHandlerOptions<T>): void;
83
+ }
84
+
72
85
  interface ResponseHeadersPluginContext {
73
86
  resHeaders?: Headers;
74
87
  }
@@ -152,5 +165,5 @@ declare class StrictGetMethodPlugin<T extends Context> implements StandardHandle
152
165
  init(options: StandardHandlerOptions<T>): void;
153
166
  }
154
167
 
155
- export { BatchHandlerPlugin, CORSPlugin, ResponseHeadersPlugin, SimpleCsrfProtectionHandlerPlugin, StrictGetMethodPlugin };
156
- export type { BatchHandlerOptions, CORSOptions, ResponseHeadersPluginContext, SimpleCsrfProtectionHandlerPluginOptions, StrictGetMethodPluginOptions };
168
+ export { BatchHandlerPlugin, CORSPlugin, RequestHeadersPlugin, ResponseHeadersPlugin, SimpleCsrfProtectionHandlerPlugin, StrictGetMethodPlugin };
169
+ export type { BatchHandlerOptions, CORSOptions, RequestHeadersPluginContext, ResponseHeadersPluginContext, SimpleCsrfProtectionHandlerPluginOptions, StrictGetMethodPluginOptions };
@@ -1,8 +1,8 @@
1
1
  import { Value, Promisable } from '@orpc/shared';
2
2
  import { StandardRequest, StandardHeaders } from '@orpc/standard-server';
3
3
  import { BatchResponseBodyItem } from '@orpc/standard-server/batch';
4
- import { d as StandardHandlerInterceptorOptions, g as StandardHandlerPlugin, e as StandardHandlerOptions } from '../shared/server.DVBSOxWU.js';
5
- import { C as Context, d as ProcedureClientInterceptorOptions } from '../shared/server.wMv480px.js';
4
+ import { d as StandardHandlerInterceptorOptions, g as StandardHandlerPlugin, e as StandardHandlerOptions } from '../shared/server.Bmh5xd4n.js';
5
+ import { C as Context, d as ProcedureClientInterceptorOptions } from '../shared/server.CYNGeoCm.js';
6
6
  import { Meta, ORPCError as ORPCError$1 } from '@orpc/contract';
7
7
  import { ORPCError } from '@orpc/client';
8
8
 
@@ -69,6 +69,19 @@ declare class CORSPlugin<T extends Context> implements StandardHandlerPlugin<T>
69
69
  init(options: StandardHandlerOptions<T>): void;
70
70
  }
71
71
 
72
+ interface RequestHeadersPluginContext {
73
+ reqHeaders?: Headers;
74
+ }
75
+ /**
76
+ * The Request Headers Plugin injects a `reqHeaders` instance into the context,
77
+ * allowing access to request headers in oRPC.
78
+ *
79
+ * @see {@link https://orpc.unnoq.com/docs/plugins/request-headers Request Headers Plugin Docs}
80
+ */
81
+ declare class RequestHeadersPlugin<T extends RequestHeadersPluginContext> implements StandardHandlerPlugin<T> {
82
+ init(options: StandardHandlerOptions<T>): void;
83
+ }
84
+
72
85
  interface ResponseHeadersPluginContext {
73
86
  resHeaders?: Headers;
74
87
  }
@@ -152,5 +165,5 @@ declare class StrictGetMethodPlugin<T extends Context> implements StandardHandle
152
165
  init(options: StandardHandlerOptions<T>): void;
153
166
  }
154
167
 
155
- export { BatchHandlerPlugin, CORSPlugin, ResponseHeadersPlugin, SimpleCsrfProtectionHandlerPlugin, StrictGetMethodPlugin };
156
- export type { BatchHandlerOptions, CORSOptions, ResponseHeadersPluginContext, SimpleCsrfProtectionHandlerPluginOptions, StrictGetMethodPluginOptions };
168
+ export { BatchHandlerPlugin, CORSPlugin, RequestHeadersPlugin, ResponseHeadersPlugin, SimpleCsrfProtectionHandlerPlugin, StrictGetMethodPlugin };
169
+ export type { BatchHandlerOptions, CORSOptions, RequestHeadersPluginContext, ResponseHeadersPluginContext, SimpleCsrfProtectionHandlerPluginOptions, StrictGetMethodPluginOptions };
@@ -1,6 +1,7 @@
1
- import { value, isAsyncIteratorObject, clone } from '@orpc/shared';
1
+ import { runWithSpan, value, setSpanError, isAsyncIteratorObject, clone } from '@orpc/shared';
2
2
  import { flattenHeader } from '@orpc/standard-server';
3
3
  import { parseBatchRequest, toBatchResponse } from '@orpc/standard-server/batch';
4
+ import { toFetchHeaders } from '@orpc/standard-server-fetch';
4
5
  import { ORPCError } from '@orpc/client';
5
6
  export { S as StrictGetMethodPlugin } from '../shared/server.BW-nUGgA.mjs';
6
7
  import '@orpc/contract';
@@ -32,65 +33,74 @@ class BatchHandlerPlugin {
32
33
  }
33
34
  let isParsing = false;
34
35
  try {
35
- isParsing = true;
36
- const parsed = parseBatchRequest({ ...options2.request, body: await options2.request.body() });
37
- isParsing = false;
38
- const maxSize = await value(this.maxSize, options2);
39
- if (parsed.length > maxSize) {
40
- return {
41
- matched: true,
42
- response: {
43
- status: 413,
44
- headers: {},
45
- body: "Batch request size exceeds the maximum allowed size"
46
- }
47
- };
48
- }
49
- const responses = parsed.map(
50
- (request, index) => {
51
- const mapped = this.mapRequestItem(request, options2);
52
- return options2.next({ ...options2, request: { ...mapped, body: () => Promise.resolve(mapped.body) } }).then(({ response: response2, matched }) => {
53
- if (matched) {
54
- if (response2.body instanceof Blob || response2.body instanceof FormData || isAsyncIteratorObject(response2.body)) {
55
- return {
56
- index,
57
- status: 500,
58
- headers: {},
59
- body: "Batch responses do not support file/blob, or event-iterator. Please call this procedure separately outside of the batch request."
60
- };
61
- }
62
- 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
63
53
  }
64
- return { index, status: 404, headers: {}, body: "No procedure matched" };
65
- }).catch(() => {
66
- return { index, status: 500, headers: {}, body: "Internal server error" };
67
- });
54
+ };
68
55
  }
69
- );
70
- await Promise.race(responses);
71
- const status = await value(this.successStatus, responses, options2);
72
- const headers = await value(this.headers, responses, options2);
73
- const response = await toBatchResponse({
74
- status,
75
- headers,
76
- mode: xHeader === "buffered" ? "buffered" : "streaming",
77
- body: async function* () {
78
- const promises = [...responses];
79
- while (true) {
80
- const handling = promises.filter((p) => p !== void 0);
81
- if (handling.length === 0) {
82
- return;
83
- }
84
- const result = await Promise.race(handling);
85
- promises[result.index] = void 0;
86
- yield result;
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
+ });
87
77
  }
88
- }()
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
+ };
89
103
  });
90
- return {
91
- matched: true,
92
- response
93
- };
94
104
  } catch (cause) {
95
105
  if (isParsing) {
96
106
  return {
@@ -177,6 +187,22 @@ class CORSPlugin {
177
187
  }
178
188
  }
179
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
+
180
206
  class ResponseHeadersPlugin {
181
207
  init(options) {
182
208
  options.rootInterceptors ??= [];
@@ -256,4 +282,4 @@ class SimpleCsrfProtectionHandlerPlugin {
256
282
  }
257
283
  }
258
284
 
259
- export { BatchHandlerPlugin, CORSPlugin, ResponseHeadersPlugin, SimpleCsrfProtectionHandlerPlugin };
285
+ export { BatchHandlerPlugin, CORSPlugin, RequestHeadersPlugin, ResponseHeadersPlugin, SimpleCsrfProtectionHandlerPlugin };
@@ -1,6 +1,7 @@
1
1
  import { isContractProcedure, ValidationError, mergePrefix, mergeErrorMap, enhanceRoute } from '@orpc/contract';
2
- import { resolveMaybeOptionalOptions, toArray, value, intercept } from '@orpc/shared';
3
- import { fallbackORPCErrorStatus, ORPCError } from '@orpc/client';
2
+ import { resolveMaybeOptionalOptions, toArray, value, runWithSpan, intercept, isAsyncIteratorObject, asyncIteratorWithSpan } from '@orpc/shared';
3
+ import { ORPCError, fallbackORPCErrorStatus, mapEventIterator } from '@orpc/client';
4
+ import { HibernationEventIterator } from '@orpc/standard-server';
4
5
 
5
6
  const LAZY_SYMBOL = Symbol("ORPC_LAZY_SYMBOL");
6
7
  function lazy(loader, meta = {}) {
@@ -115,27 +116,51 @@ function createProcedureClient(lazyableProcedure, ...rest) {
115
116
  const clientContext = callerOptions?.context ?? {};
116
117
  const context = await value(options.context ?? {}, clientContext);
117
118
  const errors = createORPCErrorConstructorMap(procedure["~orpc"].errorMap);
119
+ const validateError = async (e) => {
120
+ if (e instanceof ORPCError) {
121
+ return await validateORPCError(procedure["~orpc"].errorMap, e);
122
+ }
123
+ return e;
124
+ };
118
125
  try {
119
- return await intercept(
120
- toArray(options.interceptors),
121
- {
122
- context,
123
- input,
124
- // input only optional when it undefinable so we can safely cast it
125
- errors,
126
- path,
127
- procedure,
128
- signal: callerOptions?.signal,
129
- lastEventId: callerOptions?.lastEventId
130
- },
131
- (interceptorOptions) => executeProcedureInternal(interceptorOptions.procedure, interceptorOptions)
126
+ const output = await runWithSpan(
127
+ { name: "call_procedure", signal: callerOptions?.signal },
128
+ (span) => {
129
+ span?.setAttribute("procedure.path", [...path]);
130
+ return intercept(
131
+ toArray(options.interceptors),
132
+ {
133
+ context,
134
+ input,
135
+ // input only optional when it undefinable so we can safely cast it
136
+ errors,
137
+ path,
138
+ procedure,
139
+ signal: callerOptions?.signal,
140
+ lastEventId: callerOptions?.lastEventId
141
+ },
142
+ (interceptorOptions) => executeProcedureInternal(interceptorOptions.procedure, interceptorOptions)
143
+ );
144
+ }
132
145
  );
133
- } catch (e) {
134
- if (!(e instanceof ORPCError)) {
135
- throw e;
146
+ if (isAsyncIteratorObject(output)) {
147
+ if (output instanceof HibernationEventIterator) {
148
+ return output;
149
+ }
150
+ return mapEventIterator(
151
+ asyncIteratorWithSpan(
152
+ { name: "consume_event_iterator_output", signal: callerOptions?.signal },
153
+ output
154
+ ),
155
+ {
156
+ value: (v) => v,
157
+ error: (e) => validateError(e)
158
+ }
159
+ );
136
160
  }
137
- const validated = await validateORPCError(procedure["~orpc"].errorMap, e);
138
- throw validated;
161
+ return output;
162
+ } catch (e) {
163
+ throw await validateError(e);
139
164
  }
140
165
  };
141
166
  }
@@ -144,31 +169,41 @@ async function validateInput(procedure, input) {
144
169
  if (!schema) {
145
170
  return input;
146
171
  }
147
- const result = await schema["~standard"].validate(input);
148
- if (result.issues) {
149
- throw new ORPCError("BAD_REQUEST", {
150
- message: "Input validation failed",
151
- data: {
152
- issues: result.issues
153
- },
154
- cause: new ValidationError({ message: "Input validation failed", issues: result.issues })
155
- });
156
- }
157
- return result.value;
172
+ return runWithSpan(
173
+ { name: "validate_input" },
174
+ async () => {
175
+ const result = await schema["~standard"].validate(input);
176
+ if (result.issues) {
177
+ throw new ORPCError("BAD_REQUEST", {
178
+ message: "Input validation failed",
179
+ data: {
180
+ issues: result.issues
181
+ },
182
+ cause: new ValidationError({ message: "Input validation failed", issues: result.issues })
183
+ });
184
+ }
185
+ return result.value;
186
+ }
187
+ );
158
188
  }
159
189
  async function validateOutput(procedure, output) {
160
190
  const schema = procedure["~orpc"].outputSchema;
161
191
  if (!schema) {
162
192
  return output;
163
193
  }
164
- const result = await schema["~standard"].validate(output);
165
- if (result.issues) {
166
- throw new ORPCError("INTERNAL_SERVER_ERROR", {
167
- message: "Output validation failed",
168
- cause: new ValidationError({ message: "Output validation failed", issues: result.issues })
169
- });
170
- }
171
- return result.value;
194
+ return runWithSpan(
195
+ { name: "validate_output" },
196
+ async () => {
197
+ const result = await schema["~standard"].validate(output);
198
+ if (result.issues) {
199
+ throw new ORPCError("INTERNAL_SERVER_ERROR", {
200
+ message: "Output validation failed",
201
+ cause: new ValidationError({ message: "Output validation failed", issues: result.issues })
202
+ });
203
+ }
204
+ return result.value;
205
+ }
206
+ );
172
207
  }
173
208
  async function executeProcedureInternal(procedure, options) {
174
209
  const middlewares = procedure["~orpc"].middlewares;
@@ -180,17 +215,28 @@ async function executeProcedureInternal(procedure, options) {
180
215
  currentInput = await validateInput(procedure, currentInput);
181
216
  }
182
217
  const mid = middlewares[index];
183
- const output = mid ? (await mid({
184
- ...options,
185
- context,
186
- next: async (...[nextOptions]) => {
187
- const nextContext = nextOptions?.context ?? {};
188
- return {
189
- output: await next(index + 1, mergeCurrentContext(context, nextContext), currentInput),
190
- context: nextContext
191
- };
218
+ const output = mid ? await runWithSpan(
219
+ { name: `middleware.${mid.name}`, signal: options.signal },
220
+ async (span) => {
221
+ span?.setAttribute("middleware.index", index);
222
+ span?.setAttribute("middleware.name", mid.name);
223
+ const result = await mid({
224
+ ...options,
225
+ context,
226
+ next: async (...[nextOptions]) => {
227
+ const nextContext = nextOptions?.context ?? {};
228
+ return {
229
+ output: await next(index + 1, mergeCurrentContext(context, nextContext), currentInput),
230
+ context: nextContext
231
+ };
232
+ }
233
+ }, currentInput, middlewareOutputFn);
234
+ return result.output;
192
235
  }
193
- }, currentInput, middlewareOutputFn)).output : await procedure["~orpc"].handler({ ...options, context, input: currentInput });
236
+ ) : await runWithSpan(
237
+ { name: "handler", signal: options.signal },
238
+ () => procedure["~orpc"].handler({ ...options, context, input: currentInput })
239
+ );
194
240
  if (index === outputValidationIndex) {
195
241
  return await validateOutput(procedure, output);
196
242
  }
@@ -1,5 +1,5 @@
1
- import { C as Context } from './server.wMv480px.js';
2
- import { b as StandardHandleOptions } from './server.DVBSOxWU.js';
1
+ import { C as Context } from './server.CYNGeoCm.js';
2
+ import { b as StandardHandleOptions } from './server.Bmh5xd4n.js';
3
3
 
4
4
  type FriendlyStandardHandleOptions<T extends Context> = Omit<StandardHandleOptions<T>, 'context'> & (Record<never, never> extends T ? {
5
5
  context?: T;
@@ -1,5 +1,5 @@
1
- import { C as Context } from './server.wMv480px.mjs';
2
- import { b as StandardHandleOptions } from './server.DHgXKx3q.mjs';
1
+ import { C as Context } from './server.CYNGeoCm.mjs';
2
+ import { b as StandardHandleOptions } from './server.gqRxT-yN.mjs';
3
3
 
4
4
  type FriendlyStandardHandleOptions<T extends Context> = Omit<StandardHandleOptions<T>, 'context'> & (Record<never, never> extends T ? {
5
5
  context?: T;
@@ -1,8 +1,8 @@
1
1
  import { toHttpPath, StandardRPCJsonSerializer, StandardRPCSerializer } from '@orpc/client/standard';
2
2
  import { ORPCError, toORPCError } from '@orpc/client';
3
- import { toArray, intercept, parseEmptyableJSON, NullProtoObj, value } from '@orpc/shared';
3
+ import { toArray, intercept, runWithSpan, ORPC_NAME, isAsyncIteratorObject, asyncIteratorWithSpan, setSpanError, parseEmptyableJSON, NullProtoObj, value } from '@orpc/shared';
4
4
  import { flattenHeader } from '@orpc/standard-server';
5
- import { c as createProcedureClient, t as traverseContractProcedures, i as isProcedure, u as unlazy, g as getRouter, a as createContractedProcedure } from './server.NeumLVdS.mjs';
5
+ import { c as createProcedureClient, t as traverseContractProcedures, i as isProcedure, u as unlazy, g as getRouter, a as createContractedProcedure } from './server.7jWaIryJ.mjs';
6
6
 
7
7
  class CompositeStandardHandlerPlugin {
8
8
  plugins;
@@ -39,49 +39,74 @@ class StandardHandler {
39
39
  this.rootInterceptors,
40
40
  { ...options, request, prefix },
41
41
  async (interceptorOptions) => {
42
- let isDecoding = false;
43
- try {
44
- return await intercept(
45
- this.interceptors,
46
- interceptorOptions,
47
- async ({ request: request2, context, prefix: prefix2 }) => {
48
- const method = request2.method;
49
- const url = request2.url;
50
- const pathname = prefix2 ? url.pathname.replace(prefix2, "") : url.pathname;
51
- const match = await this.matcher.match(method, `/${pathname.replace(/^\/|\/$/g, "")}`);
52
- if (!match) {
53
- return { matched: false, response: void 0 };
42
+ return runWithSpan(
43
+ { name: `${request.method} ${request.url.pathname}` },
44
+ async (span) => {
45
+ let step;
46
+ try {
47
+ return await intercept(
48
+ this.interceptors,
49
+ interceptorOptions,
50
+ async ({ request: request2, context, prefix: prefix2 }) => {
51
+ const method = request2.method;
52
+ const url = request2.url;
53
+ const pathname = prefix2 ? url.pathname.replace(prefix2, "") : url.pathname;
54
+ const match = await runWithSpan(
55
+ { name: "find_procedure" },
56
+ () => this.matcher.match(method, `/${pathname.replace(/^\/|\/$/g, "")}`)
57
+ );
58
+ if (!match) {
59
+ return { matched: false, response: void 0 };
60
+ }
61
+ span?.updateName(`${ORPC_NAME}.${match.path.join("/")}`);
62
+ span?.setAttribute("rpc.system", ORPC_NAME);
63
+ span?.setAttribute("rpc.method", match.path.join("."));
64
+ step = "decode_input";
65
+ let input = await runWithSpan(
66
+ { name: "decode_input" },
67
+ () => this.codec.decode(request2, match.params, match.procedure)
68
+ );
69
+ step = void 0;
70
+ if (isAsyncIteratorObject(input)) {
71
+ input = asyncIteratorWithSpan(
72
+ { name: "consume_event_iterator_input", signal: request2.signal },
73
+ input
74
+ );
75
+ }
76
+ const client = createProcedureClient(match.procedure, {
77
+ context,
78
+ path: match.path,
79
+ interceptors: this.clientInterceptors
80
+ });
81
+ step = "call_procedure";
82
+ const output = await client(input, {
83
+ signal: request2.signal,
84
+ lastEventId: flattenHeader(request2.headers["last-event-id"])
85
+ });
86
+ step = void 0;
87
+ const response = this.codec.encode(output, match.procedure);
88
+ return {
89
+ matched: true,
90
+ response
91
+ };
92
+ }
93
+ );
94
+ } catch (e) {
95
+ if (step !== "call_procedure") {
96
+ setSpanError(span, e);
54
97
  }
55
- const client = createProcedureClient(match.procedure, {
56
- context,
57
- path: match.path,
58
- interceptors: this.clientInterceptors
59
- });
60
- isDecoding = true;
61
- const input = await this.codec.decode(request2, match.params, match.procedure);
62
- isDecoding = false;
63
- const output = await client(input, {
64
- signal: request2.signal,
65
- lastEventId: flattenHeader(request2.headers["last-event-id"])
66
- });
67
- const response = this.codec.encode(output, match.procedure);
98
+ const error = step === "decode_input" && !(e instanceof ORPCError) ? new ORPCError("BAD_REQUEST", {
99
+ message: `Malformed request. Ensure the request body is properly formatted and the 'Content-Type' header is set correctly.`,
100
+ cause: e
101
+ }) : toORPCError(e);
102
+ const response = this.codec.encodeError(error);
68
103
  return {
69
104
  matched: true,
70
105
  response
71
106
  };
72
107
  }
73
- );
74
- } catch (e) {
75
- const error = isDecoding && !(e instanceof ORPCError) ? new ORPCError("BAD_REQUEST", {
76
- message: `Malformed request. Ensure the request body is properly formatted and the 'Content-Type' header is set correctly.`,
77
- cause: e
78
- }) : toORPCError(e);
79
- const response = this.codec.encodeError(error);
80
- return {
81
- matched: true,
82
- response
83
- };
84
- }
108
+ }
109
+ );
85
110
  }
86
111
  );
87
112
  }
@@ -1,9 +1,9 @@
1
1
  import { StandardRPCJsonSerializerOptions } from '@orpc/client/standard';
2
- import { b as AnyRouter, C as Context, R as Router } from './server.wMv480px.mjs';
3
- import { i as StandardMatcher, h as StandardMatchResult, e as StandardHandlerOptions, f as StandardHandler } from './server.DHgXKx3q.mjs';
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
4
  import { HTTPPath } from '@orpc/client';
5
5
  import { Value } from '@orpc/shared';
6
- import { T as TraverseContractProcedureCallbackOptions } from './server.Cwq7K86l.mjs';
6
+ import { T as TraverseContractProcedureCallbackOptions } from './server.DhJj-1X9.mjs';
7
7
 
8
8
  interface StandardRPCMatcherOptions {
9
9
  /**
@@ -2,7 +2,7 @@ import { HTTPPath, ORPCError } from '@orpc/client';
2
2
  import { Meta } from '@orpc/contract';
3
3
  import { Interceptor } from '@orpc/shared';
4
4
  import { StandardResponse, StandardLazyRequest } from '@orpc/standard-server';
5
- import { C as Context, R as Router, b as AnyRouter, A as AnyProcedure, d as ProcedureClientInterceptorOptions } from './server.wMv480px.js';
5
+ import { C as Context, R as Router, b as AnyRouter, A as AnyProcedure, d as ProcedureClientInterceptorOptions } from './server.CYNGeoCm.js';
6
6
 
7
7
  interface StandardHandlerPlugin<T extends Context> {
8
8
  order?: number;
@@ -29,7 +29,9 @@ interface Lazy<T> {
29
29
  }
30
30
  type Lazyable<T> = T | Lazy<T>;
31
31
  /**
32
- * Create a lazy thing.
32
+ * Creates a lazy-loaded item.
33
+ *
34
+ * @warning The `prefix` in `meta` only holds metadata and does not apply the prefix to the lazy router, use `os.prefix(...).lazy(...)` instead.
33
35
  */
34
36
  declare function lazy<T>(loader: () => Promise<{
35
37
  default: T;
@@ -29,7 +29,9 @@ interface Lazy<T> {
29
29
  }
30
30
  type Lazyable<T> = T | Lazy<T>;
31
31
  /**
32
- * Create a lazy thing.
32
+ * Creates a lazy-loaded item.
33
+ *
34
+ * @warning The `prefix` in `meta` only holds metadata and does not apply the prefix to the lazy router, use `os.prefix(...).lazy(...)` instead.
33
35
  */
34
36
  declare function lazy<T>(loader: () => Promise<{
35
37
  default: T;
@@ -1,9 +1,9 @@
1
1
  import { StandardRPCJsonSerializerOptions } from '@orpc/client/standard';
2
- import { b as AnyRouter, C as Context, R as Router } from './server.wMv480px.js';
3
- import { i as StandardMatcher, h as StandardMatchResult, e as StandardHandlerOptions, f as StandardHandler } from './server.DVBSOxWU.js';
2
+ import { b as AnyRouter, C as Context, R as Router } from './server.CYNGeoCm.js';
3
+ import { i as StandardMatcher, h as StandardMatchResult, e as StandardHandlerOptions, f as StandardHandler } from './server.Bmh5xd4n.js';
4
4
  import { HTTPPath } from '@orpc/client';
5
5
  import { Value } from '@orpc/shared';
6
- import { T as TraverseContractProcedureCallbackOptions } from './server.a_VzWVCm.js';
6
+ import { T as TraverseContractProcedureCallbackOptions } from './server.jMTkVNIb.js';
7
7
 
8
8
  interface StandardRPCMatcherOptions {
9
9
  /**
@@ -1,5 +1,5 @@
1
1
  import { ErrorMap, EnhanceRouteOptions, MergedErrorMap, AnyContractRouter, AnyContractProcedure } from '@orpc/contract';
2
- import { a as AnyMiddleware, L as Lazyable, b as AnyRouter, C as Context, c as Lazy, A as AnyProcedure, P as Procedure, M as MergedInitialContext } from './server.wMv480px.mjs';
2
+ import { a as AnyMiddleware, L as Lazyable, b as AnyRouter, C as Context, c as Lazy, A as AnyProcedure, P as Procedure, M as MergedInitialContext } from './server.CYNGeoCm.mjs';
3
3
 
4
4
  declare function getRouter<T extends Lazyable<AnyRouter | undefined>>(router: T, path: readonly string[]): T extends Lazy<any> ? Lazy<AnyRouter | undefined> : Lazyable<AnyRouter | undefined>;
5
5
  type AccessibleLazyRouter<T extends Lazyable<AnyRouter | undefined>> = T extends Lazy<infer U extends AnyRouter | undefined | Lazy<AnyRouter | undefined>> ? AccessibleLazyRouter<U> : T extends AnyProcedure | undefined ? Lazy<T> : Lazy<T> & {