@orpc/server 0.0.0-next.69674a7 → 0.0.0-next.6a2fc81

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 (70) hide show
  1. package/README.md +34 -21
  2. package/dist/adapters/aws-lambda/index.d.mts +46 -0
  3. package/dist/adapters/aws-lambda/index.d.ts +46 -0
  4. package/dist/adapters/aws-lambda/index.mjs +42 -0
  5. package/dist/adapters/bun-ws/index.d.mts +36 -0
  6. package/dist/adapters/bun-ws/index.d.ts +36 -0
  7. package/dist/adapters/bun-ws/index.mjs +47 -0
  8. package/dist/adapters/crossws/index.d.mts +33 -0
  9. package/dist/adapters/crossws/index.d.ts +33 -0
  10. package/dist/adapters/crossws/index.mjs +45 -0
  11. package/dist/adapters/fetch/index.d.mts +108 -10
  12. package/dist/adapters/fetch/index.d.ts +108 -10
  13. package/dist/adapters/fetch/index.mjs +179 -8
  14. package/dist/adapters/message-port/index.d.mts +31 -0
  15. package/dist/adapters/message-port/index.d.ts +31 -0
  16. package/dist/adapters/message-port/index.mjs +39 -0
  17. package/dist/adapters/node/index.d.mts +86 -21
  18. package/dist/adapters/node/index.d.ts +86 -21
  19. package/dist/adapters/node/index.mjs +144 -23
  20. package/dist/adapters/standard/index.d.mts +11 -15
  21. package/dist/adapters/standard/index.d.ts +11 -15
  22. package/dist/adapters/standard/index.mjs +5 -3
  23. package/dist/adapters/standard-peer/index.d.mts +18 -0
  24. package/dist/adapters/standard-peer/index.d.ts +18 -0
  25. package/dist/adapters/standard-peer/index.mjs +7 -0
  26. package/dist/adapters/websocket/index.d.mts +56 -0
  27. package/dist/adapters/websocket/index.d.ts +56 -0
  28. package/dist/adapters/websocket/index.mjs +67 -0
  29. package/dist/adapters/ws/index.d.mts +31 -0
  30. package/dist/adapters/ws/index.d.ts +31 -0
  31. package/dist/adapters/ws/index.mjs +37 -0
  32. package/dist/helpers/index.d.mts +149 -0
  33. package/dist/helpers/index.d.ts +149 -0
  34. package/dist/helpers/index.mjs +198 -0
  35. package/dist/hibernation/index.d.mts +44 -0
  36. package/dist/hibernation/index.d.ts +44 -0
  37. package/dist/hibernation/index.mjs +65 -0
  38. package/dist/index.d.mts +633 -99
  39. package/dist/index.d.ts +633 -99
  40. package/dist/index.mjs +185 -36
  41. package/dist/plugins/index.d.mts +157 -16
  42. package/dist/plugins/index.d.ts +157 -16
  43. package/dist/plugins/index.mjs +200 -16
  44. package/dist/shared/{server.CPteJIPP.d.mts → server.B4BGqy3Y.d.mts} +74 -24
  45. package/dist/shared/{server.CPteJIPP.d.ts → server.B4BGqy3Y.d.ts} +74 -24
  46. package/dist/shared/server.Bxx6tqNe.mjs +219 -0
  47. package/dist/shared/server.COL12UTb.d.ts +32 -0
  48. package/dist/shared/server.CVKCo60T.d.mts +12 -0
  49. package/dist/shared/server.Cb6yD7DZ.d.ts +42 -0
  50. package/dist/shared/server.Ck-gOLzq.d.mts +32 -0
  51. package/dist/shared/server.DBCUJijK.d.mts +74 -0
  52. package/dist/shared/server.DNtJ-p60.d.ts +12 -0
  53. package/dist/shared/server.DPIFWpxG.d.ts +74 -0
  54. package/dist/shared/server.DZ5BIITo.mjs +9 -0
  55. package/dist/shared/{server.kPUGzsdw.mjs → server.Ds4HPpvH.mjs} +145 -93
  56. package/dist/shared/server.DzV1hr3z.d.mts +42 -0
  57. package/dist/shared/server.TEVCLCFC.mjs +39 -0
  58. package/dist/shared/server.UVMTOWrk.mjs +26 -0
  59. package/package.json +73 -20
  60. package/dist/adapters/hono/index.d.mts +0 -19
  61. package/dist/adapters/hono/index.d.ts +0 -19
  62. package/dist/adapters/hono/index.mjs +0 -32
  63. package/dist/adapters/next/index.d.mts +0 -26
  64. package/dist/adapters/next/index.d.ts +0 -26
  65. package/dist/adapters/next/index.mjs +0 -29
  66. package/dist/shared/server.CM3tWr3C.d.mts +0 -75
  67. package/dist/shared/server.CXu_v2vM.mjs +0 -28
  68. package/dist/shared/server.DmW25ynm.d.ts +0 -75
  69. package/dist/shared/server.N2ttmv6r.mjs +0 -158
  70. package/dist/shared/server.Q6ZmnTgO.mjs +0 -12
@@ -0,0 +1,74 @@
1
+ import { HTTPPath, ORPCError } from '@orpc/client';
2
+ import { Meta } from '@orpc/contract';
3
+ import { Interceptor } from '@orpc/shared';
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.B4BGqy3Y.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
+ }
16
+
17
+ type StandardParams = Record<string, string>;
18
+ type StandardMatchResult = {
19
+ path: readonly string[];
20
+ procedure: AnyProcedure;
21
+ params?: StandardParams;
22
+ } | undefined;
23
+ interface StandardMatcher {
24
+ init(router: AnyRouter): void;
25
+ match(method: string, pathname: HTTPPath): Promise<StandardMatchResult>;
26
+ }
27
+ interface StandardCodec {
28
+ encode(output: unknown, procedure: AnyProcedure): StandardResponse;
29
+ encodeError(error: ORPCError<any, any>): StandardResponse;
30
+ decode(request: StandardLazyRequest, params: StandardParams | undefined, procedure: AnyProcedure): Promise<unknown>;
31
+ }
32
+
33
+ interface StandardHandleOptions<T extends Context> {
34
+ prefix?: HTTPPath;
35
+ context: T;
36
+ }
37
+ type StandardHandleResult = {
38
+ matched: true;
39
+ response: StandardResponse;
40
+ } | {
41
+ matched: false;
42
+ response: undefined;
43
+ };
44
+ interface StandardHandlerInterceptorOptions<T extends Context> extends StandardHandleOptions<T> {
45
+ request: StandardLazyRequest;
46
+ }
47
+ interface StandardHandlerOptions<TContext extends Context> {
48
+ plugins?: StandardHandlerPlugin<TContext>[];
49
+ /**
50
+ * Interceptors at the request level, helpful when you want catch errors
51
+ */
52
+ interceptors?: Interceptor<StandardHandlerInterceptorOptions<TContext>, Promise<StandardHandleResult>>[];
53
+ /**
54
+ * Interceptors at the root level, helpful when you want override the request/response
55
+ */
56
+ rootInterceptors?: Interceptor<StandardHandlerInterceptorOptions<TContext>, Promise<StandardHandleResult>>[];
57
+ /**
58
+ *
59
+ * Interceptors for procedure client.
60
+ */
61
+ clientInterceptors?: Interceptor<ProcedureClientInterceptorOptions<TContext, Record<never, never>, Meta>, Promise<unknown>>[];
62
+ }
63
+ declare class StandardHandler<T extends Context> {
64
+ private readonly matcher;
65
+ private readonly codec;
66
+ private readonly interceptors;
67
+ private readonly clientInterceptors;
68
+ private readonly rootInterceptors;
69
+ constructor(router: Router<any, T>, matcher: StandardMatcher, codec: StandardCodec, options: NoInfer<StandardHandlerOptions<T>>);
70
+ handle(request: StandardLazyRequest, options: StandardHandleOptions<T>): Promise<StandardHandleResult>;
71
+ }
72
+
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 };
@@ -0,0 +1,9 @@
1
+ function resolveFriendlyStandardHandleOptions(options) {
2
+ return {
3
+ ...options,
4
+ context: options.context ?? {}
5
+ // Context only optional if all fields are optional
6
+ };
7
+ }
8
+
9
+ export { resolveFriendlyStandardHandleOptions as r };
@@ -1,6 +1,7 @@
1
- import { isContractProcedure, ValidationError, mergePrefix, mergeErrorMap, enhanceRoute } from '@orpc/contract';
2
- import { fallbackORPCErrorStatus, ORPCError } from '@orpc/client';
3
- import { value, intercept, toError } from '@orpc/shared';
1
+ import { isContractProcedure, validateORPCError, ValidationError, mergePrefix, mergeErrorMap, enhanceRoute } from '@orpc/contract';
2
+ import { resolveMaybeOptionalOptions, toArray, value, runWithSpan, intercept, isAsyncIteratorObject, overlayProxy, asyncIteratorWithSpan } from '@orpc/shared';
3
+ import { ORPCError, 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 = {}) {
@@ -21,25 +22,34 @@ function unlazy(lazied) {
21
22
  return isLazy(lazied) ? lazied[LAZY_SYMBOL].loader() : Promise.resolve({ default: lazied });
22
23
  }
23
24
 
24
- function dedupeMiddlewares(compare, middlewares) {
25
- let min = 0;
25
+ function isStartWithMiddlewares(middlewares, compare) {
26
+ if (compare.length > middlewares.length) {
27
+ return false;
28
+ }
26
29
  for (let i = 0; i < middlewares.length; i++) {
27
- const index = compare.indexOf(middlewares[i], min);
28
- if (index === -1) {
29
- return middlewares.slice(i);
30
+ if (compare[i] === void 0) {
31
+ return true;
32
+ }
33
+ if (middlewares[i] !== compare[i]) {
34
+ return false;
30
35
  }
31
- min = index + 1;
32
36
  }
33
- return [];
37
+ return true;
34
38
  }
35
- function mergeMiddlewares(first, second) {
36
- return [...first, ...dedupeMiddlewares(first, second)];
39
+ function mergeMiddlewares(first, second, options) {
40
+ if (options.dedupeLeading && isStartWithMiddlewares(second, first)) {
41
+ return second;
42
+ }
43
+ return [...first, ...second];
37
44
  }
38
45
  function addMiddleware(middlewares, addition) {
39
46
  return [...middlewares, addition];
40
47
  }
41
48
 
42
49
  class Procedure {
50
+ /**
51
+ * This property holds the defined options.
52
+ */
43
53
  "~orpc";
44
54
  constructor(def) {
45
55
  this["~orpc"] = def;
@@ -52,20 +62,25 @@ function isProcedure(item) {
52
62
  return isContractProcedure(item) && "middlewares" in item["~orpc"] && "inputValidationIndex" in item["~orpc"] && "outputValidationIndex" in item["~orpc"] && "handler" in item["~orpc"];
53
63
  }
54
64
 
65
+ function mergeCurrentContext(context, other) {
66
+ return { ...context, ...other };
67
+ }
68
+
55
69
  function createORPCErrorConstructorMap(errors) {
56
70
  const proxy = new Proxy(errors, {
57
71
  get(target, code) {
58
72
  if (typeof code !== "string") {
59
73
  return Reflect.get(target, code);
60
74
  }
61
- const item = (...[options]) => {
75
+ const item = (...rest) => {
76
+ const options = resolveMaybeOptionalOptions(rest);
62
77
  const config = errors[code];
63
78
  return new ORPCError(code, {
64
79
  defined: Boolean(config),
65
80
  status: config?.status,
66
- message: options?.message ?? config?.message,
67
- data: options?.data,
68
- cause: options?.cause
81
+ message: options.message ?? config?.message,
82
+ data: options.data,
83
+ cause: options.cause
69
84
  });
70
85
  };
71
86
  return item;
@@ -73,54 +88,64 @@ function createORPCErrorConstructorMap(errors) {
73
88
  });
74
89
  return proxy;
75
90
  }
76
- async function validateORPCError(map, error) {
77
- const { code, status, message, data, cause, defined } = error;
78
- const config = map?.[error.code];
79
- if (!config || fallbackORPCErrorStatus(error.code, config.status) !== error.status) {
80
- return defined ? new ORPCError(code, { defined: false, status, message, data, cause }) : error;
81
- }
82
- if (!config.data) {
83
- return defined ? error : new ORPCError(code, { defined: true, status, message, data, cause });
84
- }
85
- const validated = await config.data["~standard"].validate(error.data);
86
- if (validated.issues) {
87
- return defined ? new ORPCError(code, { defined: false, status, message, data, cause }) : error;
88
- }
89
- return new ORPCError(code, { defined: true, status, message, data: validated.value, cause });
90
- }
91
91
 
92
92
  function middlewareOutputFn(output) {
93
93
  return { output, context: {} };
94
94
  }
95
95
 
96
- function createProcedureClient(lazyableProcedure, ...[options]) {
96
+ function createProcedureClient(lazyableProcedure, ...rest) {
97
+ const options = resolveMaybeOptionalOptions(rest);
97
98
  return async (...[input, callerOptions]) => {
98
- const path = options?.path ?? [];
99
+ const path = toArray(options.path);
99
100
  const { default: procedure } = await unlazy(lazyableProcedure);
100
101
  const clientContext = callerOptions?.context ?? {};
101
- const context = await value(options?.context ?? {}, clientContext);
102
+ const context = await value(options.context ?? {}, clientContext);
102
103
  const errors = createORPCErrorConstructorMap(procedure["~orpc"].errorMap);
104
+ const validateError = async (e) => {
105
+ if (e instanceof ORPCError) {
106
+ return await validateORPCError(procedure["~orpc"].errorMap, e);
107
+ }
108
+ return e;
109
+ };
103
110
  try {
104
- return await intercept(
105
- options?.interceptors ?? [],
106
- {
107
- context,
108
- input,
109
- // input only optional when it undefinable so we can safely cast it
110
- errors,
111
- path,
112
- procedure,
113
- signal: callerOptions?.signal,
114
- lastEventId: callerOptions?.lastEventId
115
- },
116
- (interceptorOptions) => executeProcedureInternal(interceptorOptions.procedure, interceptorOptions)
111
+ const output = await runWithSpan(
112
+ { name: "call_procedure", signal: callerOptions?.signal },
113
+ (span) => {
114
+ span?.setAttribute("procedure.path", [...path]);
115
+ return intercept(
116
+ toArray(options.interceptors),
117
+ {
118
+ context,
119
+ input,
120
+ // input only optional when it undefinable so we can safely cast it
121
+ errors,
122
+ path,
123
+ procedure,
124
+ signal: callerOptions?.signal,
125
+ lastEventId: callerOptions?.lastEventId
126
+ },
127
+ (interceptorOptions) => executeProcedureInternal(interceptorOptions.procedure, interceptorOptions)
128
+ );
129
+ }
117
130
  );
118
- } catch (e) {
119
- if (!(e instanceof ORPCError)) {
120
- throw toError(e);
131
+ if (isAsyncIteratorObject(output)) {
132
+ if (output instanceof HibernationEventIterator) {
133
+ return output;
134
+ }
135
+ return overlayProxy(output, mapEventIterator(
136
+ asyncIteratorWithSpan(
137
+ { name: "consume_event_iterator_output", signal: callerOptions?.signal },
138
+ output
139
+ ),
140
+ {
141
+ value: (v) => v,
142
+ error: (e) => validateError(e)
143
+ }
144
+ ));
121
145
  }
122
- const validated = await validateORPCError(procedure["~orpc"].errorMap, e);
123
- throw validated;
146
+ return output;
147
+ } catch (e) {
148
+ throw await validateError(e);
124
149
  }
125
150
  };
126
151
  }
@@ -129,58 +154,88 @@ async function validateInput(procedure, input) {
129
154
  if (!schema) {
130
155
  return input;
131
156
  }
132
- const result = await schema["~standard"].validate(input);
133
- if (result.issues) {
134
- throw new ORPCError("BAD_REQUEST", {
135
- message: "Input validation failed",
136
- data: {
137
- issues: result.issues
138
- },
139
- cause: new ValidationError({ message: "Input validation failed", issues: result.issues })
140
- });
141
- }
142
- return result.value;
157
+ return runWithSpan(
158
+ { name: "validate_input" },
159
+ async () => {
160
+ const result = await schema["~standard"].validate(input);
161
+ if (result.issues) {
162
+ throw new ORPCError("BAD_REQUEST", {
163
+ message: "Input validation failed",
164
+ data: {
165
+ issues: result.issues
166
+ },
167
+ cause: new ValidationError({
168
+ message: "Input validation failed",
169
+ issues: result.issues,
170
+ data: input
171
+ })
172
+ });
173
+ }
174
+ return result.value;
175
+ }
176
+ );
143
177
  }
144
178
  async function validateOutput(procedure, output) {
145
179
  const schema = procedure["~orpc"].outputSchema;
146
180
  if (!schema) {
147
181
  return output;
148
182
  }
149
- const result = await schema["~standard"].validate(output);
150
- if (result.issues) {
151
- throw new ORPCError("INTERNAL_SERVER_ERROR", {
152
- message: "Output validation failed",
153
- cause: new ValidationError({ message: "Output validation failed", issues: result.issues })
154
- });
155
- }
156
- return result.value;
183
+ return runWithSpan(
184
+ { name: "validate_output" },
185
+ async () => {
186
+ const result = await schema["~standard"].validate(output);
187
+ if (result.issues) {
188
+ throw new ORPCError("INTERNAL_SERVER_ERROR", {
189
+ message: "Output validation failed",
190
+ cause: new ValidationError({
191
+ message: "Output validation failed",
192
+ issues: result.issues,
193
+ data: output
194
+ })
195
+ });
196
+ }
197
+ return result.value;
198
+ }
199
+ );
157
200
  }
158
201
  async function executeProcedureInternal(procedure, options) {
159
202
  const middlewares = procedure["~orpc"].middlewares;
160
203
  const inputValidationIndex = Math.min(Math.max(0, procedure["~orpc"].inputValidationIndex), middlewares.length);
161
204
  const outputValidationIndex = Math.min(Math.max(0, procedure["~orpc"].outputValidationIndex), middlewares.length);
162
- let currentIndex = 0;
163
- let currentContext = options.context;
164
- let currentInput = options.input;
165
- const next = async (...[nextOptions]) => {
166
- const index = currentIndex;
167
- currentIndex += 1;
168
- currentContext = { ...currentContext, ...nextOptions?.context };
205
+ const next = async (index, context, input) => {
206
+ let currentInput = input;
169
207
  if (index === inputValidationIndex) {
170
208
  currentInput = await validateInput(procedure, currentInput);
171
209
  }
172
210
  const mid = middlewares[index];
173
- const result = mid ? await mid({ ...options, context: currentContext, next }, currentInput, middlewareOutputFn) : { output: await procedure["~orpc"].handler({ ...options, context: currentContext, input: currentInput }), context: currentContext };
211
+ const output = mid ? await runWithSpan(
212
+ { name: `middleware.${mid.name}`, signal: options.signal },
213
+ async (span) => {
214
+ span?.setAttribute("middleware.index", index);
215
+ span?.setAttribute("middleware.name", mid.name);
216
+ const result = await mid({
217
+ ...options,
218
+ context,
219
+ next: async (...[nextOptions]) => {
220
+ const nextContext = nextOptions?.context ?? {};
221
+ return {
222
+ output: await next(index + 1, mergeCurrentContext(context, nextContext), currentInput),
223
+ context: nextContext
224
+ };
225
+ }
226
+ }, currentInput, middlewareOutputFn);
227
+ return result.output;
228
+ }
229
+ ) : await runWithSpan(
230
+ { name: "handler", signal: options.signal },
231
+ () => procedure["~orpc"].handler({ ...options, context, input: currentInput })
232
+ );
174
233
  if (index === outputValidationIndex) {
175
- const validatedOutput = await validateOutput(procedure, result.output);
176
- return {
177
- ...result,
178
- output: validatedOutput
179
- };
234
+ return await validateOutput(procedure, output);
180
235
  }
181
- return result;
236
+ return output;
182
237
  };
183
- return (await next({})).output;
238
+ return next(0, options.context, options.input);
184
239
  }
185
240
 
186
241
  const HIDDEN_ROUTER_CONTRACT_SYMBOL = Symbol("ORPC_HIDDEN_ROUTER_CONTRACT");
@@ -250,7 +305,7 @@ function enhanceRouter(router, options) {
250
305
  return accessible;
251
306
  }
252
307
  if (isProcedure(router)) {
253
- const newMiddlewares = mergeMiddlewares(options.middlewares, router["~orpc"].middlewares);
308
+ const newMiddlewares = mergeMiddlewares(options.middlewares, router["~orpc"].middlewares, { dedupeLeading: options.dedupeLeadingMiddlewares });
254
309
  const newMiddlewareAdded = newMiddlewares.length - router["~orpc"].middlewares.length;
255
310
  const enhanced2 = new Procedure({
256
311
  ...router["~orpc"],
@@ -347,11 +402,8 @@ function createContractedProcedure(procedure, contract) {
347
402
  });
348
403
  }
349
404
  function call(procedure, input, ...rest) {
350
- return createProcedureClient(procedure, ...rest)(input);
351
- }
352
-
353
- function toHttpPath(path) {
354
- return `/${path.map(encodeURIComponent).join("/")}`;
405
+ const options = resolveMaybeOptionalOptions(rest);
406
+ return createProcedureClient(procedure, options)(input, options);
355
407
  }
356
408
 
357
- export { LAZY_SYMBOL as L, Procedure as P, toHttpPath as a, createContractedProcedure as b, createProcedureClient as c, addMiddleware as d, enhanceRouter as e, isLazy as f, getRouter as g, createAssertedLazyProcedure as h, isProcedure as i, getLazyMeta as j, call as k, lazy as l, middlewareOutputFn as m, getHiddenRouterContract as n, createAccessibleLazyRouter as o, unlazyRouter as p, resolveContractProcedures as r, setHiddenRouterContract as s, traverseContractProcedures as t, unlazy as u };
409
+ 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, resolveContractProcedures as v, unlazyRouter as w };
@@ -0,0 +1,42 @@
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.B4BGqy3Y.mjs';
3
+
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
+ 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> & {
6
+ [K in keyof T]: T[K] extends Lazyable<AnyRouter> ? AccessibleLazyRouter<T[K]> : never;
7
+ };
8
+ declare function createAccessibleLazyRouter<T extends Lazy<AnyRouter | undefined>>(lazied: T): AccessibleLazyRouter<T>;
9
+ type EnhancedRouter<T extends Lazyable<AnyRouter>, TInitialContext extends Context, TCurrentContext extends Context, TErrorMap extends ErrorMap> = T extends Lazy<infer U extends AnyRouter> ? AccessibleLazyRouter<EnhancedRouter<U, TInitialContext, TCurrentContext, TErrorMap>> : T extends Procedure<infer UInitialContext, infer UCurrentContext, infer UInputSchema, infer UOutputSchema, infer UErrorMap, infer UMeta> ? Procedure<MergedInitialContext<TInitialContext, UInitialContext, TCurrentContext>, UCurrentContext, UInputSchema, UOutputSchema, MergedErrorMap<TErrorMap, UErrorMap>, UMeta> : {
10
+ [K in keyof T]: T[K] extends Lazyable<AnyRouter> ? EnhancedRouter<T[K], TInitialContext, TCurrentContext, TErrorMap> : never;
11
+ };
12
+ interface EnhanceRouterOptions<TErrorMap extends ErrorMap> extends EnhanceRouteOptions {
13
+ middlewares: readonly AnyMiddleware[];
14
+ errorMap: TErrorMap;
15
+ dedupeLeadingMiddlewares: boolean;
16
+ }
17
+ declare function enhanceRouter<T extends Lazyable<AnyRouter>, TInitialContext extends Context, TCurrentContext extends Context, TErrorMap extends ErrorMap>(router: T, options: EnhanceRouterOptions<TErrorMap>): EnhancedRouter<T, TInitialContext, TCurrentContext, TErrorMap>;
18
+ interface TraverseContractProceduresOptions {
19
+ router: AnyContractRouter | AnyRouter;
20
+ path: readonly string[];
21
+ }
22
+ interface TraverseContractProcedureCallbackOptions {
23
+ contract: AnyContractProcedure | AnyProcedure;
24
+ path: readonly string[];
25
+ }
26
+ /**
27
+ * @deprecated Use `TraverseContractProcedureCallbackOptions` instead.
28
+ */
29
+ type ContractProcedureCallbackOptions = TraverseContractProcedureCallbackOptions;
30
+ interface LazyTraverseContractProceduresOptions {
31
+ router: Lazy<AnyRouter>;
32
+ path: readonly string[];
33
+ }
34
+ declare function traverseContractProcedures(options: TraverseContractProceduresOptions, callback: (options: TraverseContractProcedureCallbackOptions) => void, lazyOptions?: LazyTraverseContractProceduresOptions[]): LazyTraverseContractProceduresOptions[];
35
+ declare function resolveContractProcedures(options: TraverseContractProceduresOptions, callback: (options: TraverseContractProcedureCallbackOptions) => void): Promise<void>;
36
+ type UnlaziedRouter<T extends AnyRouter> = T extends AnyProcedure ? T : {
37
+ [K in keyof T]: T[K] extends Lazyable<infer U extends AnyRouter> ? UnlaziedRouter<U> : never;
38
+ };
39
+ declare function unlazyRouter<T extends AnyRouter>(router: T): Promise<UnlaziedRouter<T>>;
40
+
41
+ export { createAccessibleLazyRouter as c, enhanceRouter as e, getRouter as g, resolveContractProcedures as r, traverseContractProcedures as t, unlazyRouter as u };
42
+ export type { AccessibleLazyRouter as A, ContractProcedureCallbackOptions as C, EnhanceRouterOptions as E, LazyTraverseContractProceduresOptions as L, TraverseContractProcedureCallbackOptions as T, UnlaziedRouter as U, EnhancedRouter as a, TraverseContractProceduresOptions as b };
@@ -0,0 +1,39 @@
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
+ /**
7
+ * make sure execute before batch plugin to get real method
8
+ */
9
+ order = 7e6;
10
+ constructor(options = {}) {
11
+ this.error = options.error ?? new ORPCError("METHOD_NOT_SUPPORTED");
12
+ }
13
+ init(options) {
14
+ options.rootInterceptors ??= [];
15
+ options.clientInterceptors ??= [];
16
+ options.rootInterceptors.unshift((options2) => {
17
+ const isGetMethod = options2.request.method === "GET";
18
+ return options2.next({
19
+ ...options2,
20
+ context: {
21
+ ...options2.context,
22
+ [STRICT_GET_METHOD_PLUGIN_IS_GET_METHOD_CONTEXT_SYMBOL]: isGetMethod
23
+ }
24
+ });
25
+ });
26
+ options.clientInterceptors.unshift((options2) => {
27
+ if (typeof options2.context[STRICT_GET_METHOD_PLUGIN_IS_GET_METHOD_CONTEXT_SYMBOL] !== "boolean") {
28
+ throw new TypeError("[StrictGetMethodPlugin] strict GET method context has been corrupted or modified by another plugin or interceptor");
29
+ }
30
+ const procedureMethod = fallbackContractConfig("defaultMethod", options2.procedure["~orpc"].route.method);
31
+ if (options2.context[STRICT_GET_METHOD_PLUGIN_IS_GET_METHOD_CONTEXT_SYMBOL] && procedureMethod !== "GET") {
32
+ throw this.error;
33
+ }
34
+ return options2.next();
35
+ });
36
+ }
37
+ }
38
+
39
+ export { StrictGetMethodPlugin as S };
@@ -0,0 +1,26 @@
1
+ import '@orpc/client';
2
+ import '@orpc/shared';
3
+ import '@orpc/standard-server';
4
+ import '@orpc/contract';
5
+ import '@orpc/client/standard';
6
+ import { r as resolveFriendlyStandardHandleOptions } from './server.DZ5BIITo.mjs';
7
+
8
+ async function handleStandardServerPeerMessage(handler, peer, message, options) {
9
+ const [id, request] = await peer.message(message);
10
+ if (!request) {
11
+ return;
12
+ }
13
+ const handle = createServerPeerHandleRequestFn(handler, options);
14
+ await peer.response(id, await handle(request));
15
+ }
16
+ function createServerPeerHandleRequestFn(handler, options) {
17
+ return async (request) => {
18
+ const { response } = await handler.handle(
19
+ { ...request, body: () => Promise.resolve(request.body) },
20
+ resolveFriendlyStandardHandleOptions(options)
21
+ );
22
+ return response ?? { status: 404, headers: {}, body: "No procedure matched" };
23
+ };
24
+ }
25
+
26
+ export { createServerPeerHandleRequestFn as c, handleStandardServerPeerMessage as h };
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@orpc/server",
3
3
  "type": "module",
4
- "version": "0.0.0-next.69674a7",
4
+ "version": "0.0.0-next.6a2fc81",
5
5
  "license": "MIT",
6
6
  "homepage": "https://orpc.unnoq.com",
7
7
  "repository": {
@@ -19,54 +19,107 @@
19
19
  "import": "./dist/index.mjs",
20
20
  "default": "./dist/index.mjs"
21
21
  },
22
+ "./helpers": {
23
+ "types": "./dist/helpers/index.d.mts",
24
+ "import": "./dist/helpers/index.mjs",
25
+ "default": "./dist/helpers/index.mjs"
26
+ },
22
27
  "./plugins": {
23
28
  "types": "./dist/plugins/index.d.mts",
24
29
  "import": "./dist/plugins/index.mjs",
25
30
  "default": "./dist/plugins/index.mjs"
26
31
  },
32
+ "./hibernation": {
33
+ "types": "./dist/hibernation/index.d.mts",
34
+ "import": "./dist/hibernation/index.mjs",
35
+ "default": "./dist/hibernation/index.mjs"
36
+ },
27
37
  "./standard": {
28
38
  "types": "./dist/adapters/standard/index.d.mts",
29
39
  "import": "./dist/adapters/standard/index.mjs",
30
40
  "default": "./dist/adapters/standard/index.mjs"
31
41
  },
42
+ "./standard-peer": {
43
+ "types": "./dist/adapters/standard-peer/index.d.mts",
44
+ "import": "./dist/adapters/standard-peer/index.mjs",
45
+ "default": "./dist/adapters/standard-peer/index.mjs"
46
+ },
32
47
  "./fetch": {
33
48
  "types": "./dist/adapters/fetch/index.d.mts",
34
49
  "import": "./dist/adapters/fetch/index.mjs",
35
50
  "default": "./dist/adapters/fetch/index.mjs"
36
51
  },
37
- "./hono": {
38
- "types": "./dist/adapters/hono/index.d.mts",
39
- "import": "./dist/adapters/hono/index.mjs",
40
- "default": "./dist/adapters/hono/index.mjs"
41
- },
42
- "./next": {
43
- "types": "./dist/adapters/next/index.d.mts",
44
- "import": "./dist/adapters/next/index.mjs",
45
- "default": "./dist/adapters/next/index.mjs"
46
- },
47
52
  "./node": {
48
53
  "types": "./dist/adapters/node/index.d.mts",
49
54
  "import": "./dist/adapters/node/index.mjs",
50
55
  "default": "./dist/adapters/node/index.mjs"
56
+ },
57
+ "./aws-lambda": {
58
+ "types": "./dist/adapters/aws-lambda/index.d.mts",
59
+ "import": "./dist/adapters/aws-lambda/index.mjs",
60
+ "default": "./dist/adapters/aws-lambda/index.mjs"
61
+ },
62
+ "./websocket": {
63
+ "types": "./dist/adapters/websocket/index.d.mts",
64
+ "import": "./dist/adapters/websocket/index.mjs",
65
+ "default": "./dist/adapters/websocket/index.mjs"
66
+ },
67
+ "./crossws": {
68
+ "types": "./dist/adapters/crossws/index.d.mts",
69
+ "import": "./dist/adapters/crossws/index.mjs",
70
+ "default": "./dist/adapters/crossws/index.mjs"
71
+ },
72
+ "./ws": {
73
+ "types": "./dist/adapters/ws/index.d.mts",
74
+ "import": "./dist/adapters/ws/index.mjs",
75
+ "default": "./dist/adapters/ws/index.mjs"
76
+ },
77
+ "./bun-ws": {
78
+ "types": "./dist/adapters/bun-ws/index.d.mts",
79
+ "import": "./dist/adapters/bun-ws/index.mjs",
80
+ "default": "./dist/adapters/bun-ws/index.mjs"
81
+ },
82
+ "./message-port": {
83
+ "types": "./dist/adapters/message-port/index.d.mts",
84
+ "import": "./dist/adapters/message-port/index.mjs",
85
+ "default": "./dist/adapters/message-port/index.mjs"
51
86
  }
52
87
  },
53
88
  "files": [
54
89
  "dist"
55
90
  ],
56
91
  "peerDependencies": {
57
- "hono": ">=4.6.0",
58
- "next": ">=14.0.0"
92
+ "crossws": ">=0.3.4",
93
+ "ws": ">=8.18.1"
94
+ },
95
+ "peerDependenciesMeta": {
96
+ "crossws": {
97
+ "optional": true
98
+ },
99
+ "ws": {
100
+ "optional": true
101
+ }
59
102
  },
60
103
  "dependencies": {
61
- "@orpc/standard-server": "0.0.0-next.69674a7",
62
- "@orpc/standard-server-fetch": "0.0.0-next.69674a7",
63
- "@orpc/standard-server-node": "0.0.0-next.69674a7",
64
- "@orpc/client": "0.0.0-next.69674a7",
65
- "@orpc/shared": "0.0.0-next.69674a7",
66
- "@orpc/contract": "0.0.0-next.69674a7"
104
+ "cookie": "^1.0.2",
105
+ "@orpc/client": "0.0.0-next.6a2fc81",
106
+ "@orpc/interop": "0.0.0-next.6a2fc81",
107
+ "@orpc/standard-server": "0.0.0-next.6a2fc81",
108
+ "@orpc/standard-server-aws-lambda": "0.0.0-next.6a2fc81",
109
+ "@orpc/shared": "0.0.0-next.6a2fc81",
110
+ "@orpc/contract": "0.0.0-next.6a2fc81",
111
+ "@orpc/standard-server-fetch": "0.0.0-next.6a2fc81",
112
+ "@orpc/standard-server-peer": "0.0.0-next.6a2fc81",
113
+ "@orpc/standard-server-node": "0.0.0-next.6a2fc81"
67
114
  },
68
115
  "devDependencies": {
69
- "light-my-request": "^6.5.1"
116
+ "@tanstack/router-core": "^1.133.15",
117
+ "@types/ws": "^8.18.1",
118
+ "crossws": "^0.4.1",
119
+ "next": "^15.5.6",
120
+ "supertest": "^7.1.4",
121
+ "ws": "^8.18.3",
122
+ "zod": "^4.1.11"
70
123
  },
71
124
  "scripts": {
72
125
  "build": "unbuild",