@tanstack/start-server-core 1.120.7 → 1.121.0-alpha.11

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 (60) hide show
  1. package/README.md +6 -27
  2. package/dist/cjs/createRequestHandler.cjs +1 -3
  3. package/dist/cjs/createRequestHandler.cjs.map +1 -1
  4. package/dist/cjs/createStartHandler.cjs +268 -31
  5. package/dist/cjs/createStartHandler.cjs.map +1 -1
  6. package/dist/cjs/createStartHandler.d.cts +8 -6
  7. package/dist/cjs/h3.cjs +30 -73
  8. package/dist/cjs/h3.cjs.map +1 -1
  9. package/dist/cjs/h3.d.cts +11 -7
  10. package/dist/cjs/handlerCallback.cjs.map +1 -1
  11. package/dist/cjs/handlerCallback.d.cts +3 -4
  12. package/dist/cjs/index.cjs +17 -14
  13. package/dist/cjs/index.cjs.map +1 -1
  14. package/dist/cjs/index.d.cts +6 -1
  15. package/dist/cjs/router-manifest.cjs +44 -0
  16. package/dist/cjs/router-manifest.cjs.map +1 -0
  17. package/dist/cjs/router-manifest.d.cts +17 -0
  18. package/dist/cjs/server-functions-handler.cjs +145 -0
  19. package/dist/cjs/server-functions-handler.cjs.map +1 -0
  20. package/dist/cjs/server-functions-handler.d.cts +3 -0
  21. package/dist/cjs/serverRoute.cjs +100 -0
  22. package/dist/cjs/serverRoute.cjs.map +1 -0
  23. package/dist/cjs/serverRoute.d.cts +115 -0
  24. package/dist/cjs/ssr-server.cjs +3 -2
  25. package/dist/cjs/ssr-server.cjs.map +1 -1
  26. package/dist/esm/createRequestHandler.js +1 -3
  27. package/dist/esm/createRequestHandler.js.map +1 -1
  28. package/dist/esm/createStartHandler.d.ts +8 -6
  29. package/dist/esm/createStartHandler.js +248 -33
  30. package/dist/esm/createStartHandler.js.map +1 -1
  31. package/dist/esm/h3.d.ts +11 -7
  32. package/dist/esm/h3.js +26 -63
  33. package/dist/esm/h3.js.map +1 -1
  34. package/dist/esm/handlerCallback.d.ts +3 -4
  35. package/dist/esm/handlerCallback.js.map +1 -1
  36. package/dist/esm/index.d.ts +6 -1
  37. package/dist/esm/index.js +14 -5
  38. package/dist/esm/index.js.map +1 -1
  39. package/dist/esm/router-manifest.d.ts +17 -0
  40. package/dist/esm/router-manifest.js +44 -0
  41. package/dist/esm/router-manifest.js.map +1 -0
  42. package/dist/esm/server-functions-handler.d.ts +3 -0
  43. package/dist/esm/server-functions-handler.js +145 -0
  44. package/dist/esm/server-functions-handler.js.map +1 -0
  45. package/dist/esm/serverRoute.d.ts +115 -0
  46. package/dist/esm/serverRoute.js +100 -0
  47. package/dist/esm/serverRoute.js.map +1 -0
  48. package/dist/esm/ssr-server.js +3 -2
  49. package/dist/esm/ssr-server.js.map +1 -1
  50. package/package.json +8 -6
  51. package/src/createRequestHandler.ts +1 -3
  52. package/src/createStartHandler.ts +373 -47
  53. package/src/h3.ts +71 -78
  54. package/src/handlerCallback.ts +5 -12
  55. package/src/index.tsx +11 -1
  56. package/src/router-manifest.ts +79 -0
  57. package/src/server-functions-handler.ts +260 -0
  58. package/src/serverRoute.ts +661 -0
  59. package/src/ssr-server.ts +2 -0
  60. package/src/tanstack-start.d.ts +5 -0
@@ -1,56 +1,271 @@
1
1
  import { createMemoryHistory } from "@tanstack/history";
2
- import { mergeHeaders } from "@tanstack/start-client-core";
3
- import { eventHandler, toWebRequest, getResponseHeaders } from "h3";
2
+ import { mergeHeaders, json, flattenMiddlewares } from "@tanstack/start-client-core";
3
+ import { joinPaths, trimPath, isRedirect, isResolvedRedirect, processRouteTree, getMatchedRoutes, rootRouteId } from "@tanstack/router-core";
4
+ import { getResponseHeaders, requestHandler } from "./h3.js";
4
5
  import { attachRouterServerSsrUtils, dehydrateRouter } from "./ssr-server.js";
6
+ import { getStartManifest } from "./router-manifest.js";
7
+ import { handleServerAction } from "./server-functions-handler.js";
8
+ function getStartResponseHeaders(opts) {
9
+ let headers = mergeHeaders(
10
+ getResponseHeaders(),
11
+ {
12
+ "Content-Type": "text/html; charset=UTF-8"
13
+ },
14
+ ...opts.router.state.matches.map((match) => {
15
+ return match.headers;
16
+ })
17
+ );
18
+ const { redirect } = opts.router.state;
19
+ if (redirect) {
20
+ headers = mergeHeaders(headers, redirect.headers);
21
+ }
22
+ return headers;
23
+ }
5
24
  function createStartHandler({
6
- createRouter,
7
- getRouterManifest
25
+ createRouter
8
26
  }) {
9
27
  return (cb) => {
10
- return eventHandler(async (event) => {
11
- const request = toWebRequest(event);
28
+ const originalFetch = globalThis.fetch;
29
+ const startRequestResolver = async ({ request }) => {
30
+ globalThis.fetch = async function(input, init) {
31
+ function resolve(url2, requestOptions) {
32
+ const fetchRequest = new Request(url2, requestOptions);
33
+ return startRequestResolver({ request: fetchRequest });
34
+ }
35
+ function getOrigin() {
36
+ return request.headers.get("Origin") || request.headers.get("Referer") || "http://localhost";
37
+ }
38
+ if (typeof input === "string" && input.startsWith("/")) {
39
+ const url2 = new URL(input, getOrigin());
40
+ return resolve(url2, init);
41
+ } else if (typeof input === "object" && "url" in input && typeof input.url === "string" && input.url.startsWith("/")) {
42
+ const url2 = new URL(input.url, getOrigin());
43
+ return resolve(url2, init);
44
+ }
45
+ return originalFetch(input, init);
46
+ };
12
47
  const url = new URL(request.url);
13
48
  const href = url.href.replace(url.origin, "");
14
49
  const history = createMemoryHistory({
15
50
  initialEntries: [href]
16
51
  });
17
52
  const router = createRouter();
18
- attachRouterServerSsrUtils(router, await (getRouterManifest == null ? void 0 : getRouterManifest()));
53
+ attachRouterServerSsrUtils(router, getStartManifest());
19
54
  router.update({
20
55
  history
21
56
  });
22
- await router.load();
23
- dehydrateRouter(router);
24
- const responseHeaders = getStartResponseHeaders({ event, router });
25
- const response = await cb({
26
- request,
27
- router,
28
- responseHeaders
29
- });
57
+ const response = await (async () => {
58
+ try {
59
+ if (!process.env.TSS_SERVER_FN_BASE) {
60
+ throw new Error(
61
+ "tanstack/start-server-core: TSS_SERVER_FN_BASE must be defined in your environment for createStartHandler()"
62
+ );
63
+ }
64
+ const serverFnBase = joinPaths([
65
+ "/",
66
+ trimPath(process.env.TSS_SERVER_FN_BASE),
67
+ "/"
68
+ ]);
69
+ if (href.startsWith(serverFnBase)) {
70
+ return await handleServerAction({ request });
71
+ }
72
+ const serverRouteTreeModule = await (async () => {
73
+ try {
74
+ return await import(
75
+ // @ts-expect-error
76
+ "tanstack-start-server-routes-manifest:v"
77
+ );
78
+ } catch (e) {
79
+ console.log(e);
80
+ return void 0;
81
+ }
82
+ })();
83
+ if (serverRouteTreeModule) {
84
+ const [_matchedRoutes, response3] = await handleServerRoutes({
85
+ routeTree: serverRouteTreeModule.routeTree,
86
+ request
87
+ });
88
+ if (response3) return response3;
89
+ }
90
+ const requestAcceptHeader = request.headers.get("Accept") || "*/*";
91
+ const splitRequestAcceptHeader = requestAcceptHeader.split(",");
92
+ const supportedMimeTypes = ["*/*", "text/html"];
93
+ const isRouterAcceptSupported = supportedMimeTypes.some(
94
+ (mimeType) => splitRequestAcceptHeader.some(
95
+ (acceptedMimeType) => acceptedMimeType.trim().startsWith(mimeType)
96
+ )
97
+ );
98
+ if (!isRouterAcceptSupported) {
99
+ return json(
100
+ {
101
+ error: "Only HTML requests are supported here"
102
+ },
103
+ {
104
+ status: 500
105
+ }
106
+ );
107
+ }
108
+ await router.load();
109
+ if (router.state.redirect) return router.state.redirect;
110
+ dehydrateRouter(router);
111
+ const responseHeaders = getStartResponseHeaders({ router });
112
+ const response2 = await cb({
113
+ request,
114
+ router,
115
+ responseHeaders
116
+ });
117
+ return response2;
118
+ } catch (err) {
119
+ if (err instanceof Response) {
120
+ return err;
121
+ }
122
+ throw err;
123
+ }
124
+ })();
125
+ if (isRedirect(response)) {
126
+ if (isResolvedRedirect(response)) {
127
+ if (request.headers.get("x-tsr-redirect") === "manual") {
128
+ return json(
129
+ {
130
+ ...response.options,
131
+ isSerializedRedirect: true
132
+ },
133
+ {
134
+ headers: response.headers
135
+ }
136
+ );
137
+ }
138
+ return response;
139
+ }
140
+ if (response.options.to && typeof response.options.to === "string" && !response.options.to.startsWith("/")) {
141
+ throw new Error(
142
+ `Server side redirects must use absolute paths via the 'href' or 'to' options. Received: ${JSON.stringify(response.options)}`
143
+ );
144
+ }
145
+ if (["params", "search", "hash"].some(
146
+ (d) => typeof response.options[d] === "function"
147
+ )) {
148
+ throw new Error(
149
+ `Server side redirects must use static search, params, and hash values and do not support functional values. Received functional values for: ${Object.keys(
150
+ response.options
151
+ ).filter((d) => typeof response.options[d] === "function").map((d) => `"${d}"`).join(", ")}`
152
+ );
153
+ }
154
+ const redirect = router.resolveRedirect(response);
155
+ if (request.headers.get("x-tsr-redirect") === "manual") {
156
+ return json(
157
+ {
158
+ ...response.options,
159
+ isSerializedRedirect: true
160
+ },
161
+ {
162
+ headers: response.headers
163
+ }
164
+ );
165
+ }
166
+ return redirect;
167
+ }
30
168
  return response;
31
- });
169
+ };
170
+ return requestHandler(startRequestResolver);
32
171
  };
33
172
  }
34
- function getStartResponseHeaders(opts) {
35
- let headers = mergeHeaders(
36
- getResponseHeaders(opts.event),
37
- opts.event.___ssrRpcResponseHeaders,
38
- {
39
- "Content-Type": "text/html; charset=UTF-8"
40
- },
41
- ...opts.router.state.matches.map((match) => {
42
- return match.headers;
43
- })
44
- );
45
- const { redirect } = opts.router.state;
46
- if (redirect) {
47
- headers = mergeHeaders(headers, redirect.headers, {
48
- Location: redirect.href
173
+ async function handleServerRoutes({
174
+ routeTree,
175
+ request
176
+ }) {
177
+ const { flatRoutes, routesById, routesByPath } = processRouteTree({
178
+ routeTree,
179
+ initRoute: (route, i) => {
180
+ route.init({
181
+ originalIndex: i
182
+ });
183
+ }
184
+ });
185
+ const url = new URL(request.url);
186
+ const pathname = url.pathname;
187
+ const history = createMemoryHistory({
188
+ initialEntries: [pathname]
189
+ });
190
+ const { matchedRoutes, foundRoute, routeParams } = getMatchedRoutes({
191
+ pathname: history.location.pathname,
192
+ basepath: "/",
193
+ caseSensitive: true,
194
+ routesByPath,
195
+ routesById,
196
+ flatRoutes
197
+ });
198
+ let response;
199
+ if (foundRoute && foundRoute.id !== rootRouteId) {
200
+ const method = Object.keys(foundRoute.options.methods).find(
201
+ (method2) => method2.toLowerCase() === request.method.toLowerCase()
202
+ );
203
+ if (method) {
204
+ const handler = foundRoute.options.methods[method];
205
+ if (handler) {
206
+ const middlewares = flattenMiddlewares(
207
+ matchedRoutes.flatMap((r) => r.options.middleware).filter(Boolean)
208
+ ).map((d) => d.options.server);
209
+ middlewares.push(handlerToMiddleware(handler));
210
+ const ctx = await executeMiddleware(middlewares, {
211
+ request,
212
+ context: {},
213
+ params: routeParams,
214
+ pathname: history.location.pathname
215
+ });
216
+ response = ctx.response;
217
+ }
218
+ }
219
+ }
220
+ return [matchedRoutes, response];
221
+ }
222
+ function handlerToMiddleware(handler) {
223
+ return async ({ next: _next, ...rest }) => ({
224
+ response: await handler(rest)
225
+ });
226
+ }
227
+ function executeMiddleware(middlewares, ctx) {
228
+ let index = -1;
229
+ const next = async (ctx2) => {
230
+ index++;
231
+ const middleware = middlewares[index];
232
+ if (!middleware) return ctx2;
233
+ const result = await middleware({
234
+ ...ctx2,
235
+ // Allow the middleware to call the next middleware in the chain
236
+ next: async (nextCtx) => {
237
+ const nextResult = await next({ ...ctx2, ...nextCtx });
238
+ return Object.assign(ctx2, handleCtxResult(nextResult));
239
+ }
240
+ // Allow the middleware result to extend the return context
241
+ }).catch((err) => {
242
+ if (isSpecialResponse(err)) {
243
+ return {
244
+ response: err
245
+ };
246
+ }
247
+ throw err;
49
248
  });
249
+ return Object.assign(ctx2, handleCtxResult(result));
250
+ };
251
+ return handleCtxResult(next(ctx));
252
+ }
253
+ function handleCtxResult(result) {
254
+ if (isSpecialResponse(result)) {
255
+ return {
256
+ response: result
257
+ };
50
258
  }
51
- return headers;
259
+ return result;
260
+ }
261
+ function isSpecialResponse(err) {
262
+ return isResponse(err) || isRedirect(err);
263
+ }
264
+ function isResponse(response) {
265
+ return response instanceof Response;
52
266
  }
53
267
  export {
54
- createStartHandler
268
+ createStartHandler,
269
+ getStartResponseHeaders
55
270
  };
56
271
  //# sourceMappingURL=createStartHandler.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"createStartHandler.js","sources":["../../src/createStartHandler.ts"],"sourcesContent":["import { createMemoryHistory } from '@tanstack/history'\nimport { mergeHeaders } from '@tanstack/start-client-core'\nimport { eventHandler, getResponseHeaders, toWebRequest } from 'h3'\nimport { attachRouterServerSsrUtils, dehydrateRouter } from './ssr-server'\nimport type { HandlerCallback } from './handlerCallback'\nimport type { EventHandlerResponse, H3Event } from 'h3'\nimport type { AnyRouter, Manifest } from '@tanstack/router-core'\n\nexport type CustomizeStartHandler<\n TRouter extends AnyRouter,\n TResponse extends EventHandlerResponse = EventHandlerResponse,\n> = (cb: HandlerCallback<TRouter, TResponse>) => ReturnType<typeof eventHandler>\n\nexport function createStartHandler<\n TRouter extends AnyRouter,\n TResponse extends EventHandlerResponse = EventHandlerResponse,\n>({\n createRouter,\n getRouterManifest,\n}: {\n createRouter: () => TRouter\n getRouterManifest?: () => Manifest | Promise<Manifest>\n}): CustomizeStartHandler<TRouter, TResponse> {\n return (cb) => {\n return eventHandler(async (event) => {\n const request = toWebRequest(event)\n\n const url = new URL(request.url)\n const href = url.href.replace(url.origin, '')\n\n // Create a history for the router\n const history = createMemoryHistory({\n initialEntries: [href],\n })\n\n const router = createRouter()\n\n attachRouterServerSsrUtils(router, await getRouterManifest?.())\n\n // Update the router with the history and context\n router.update({\n history,\n })\n\n await router.load()\n\n dehydrateRouter(router)\n\n const responseHeaders = getStartResponseHeaders({ event, router })\n const response = await cb({\n request,\n router,\n responseHeaders,\n })\n\n return response\n })\n }\n}\n\nfunction getStartResponseHeaders(opts: { event: H3Event; router: AnyRouter }) {\n let headers = mergeHeaders(\n getResponseHeaders(opts.event),\n (opts.event as any).___ssrRpcResponseHeaders,\n {\n 'Content-Type': 'text/html; charset=UTF-8',\n },\n ...opts.router.state.matches.map((match) => {\n return match.headers\n }),\n )\n\n // Handle Redirects\n const { redirect } = opts.router.state\n\n if (redirect) {\n headers = mergeHeaders(headers, redirect.headers, {\n Location: redirect.href,\n })\n }\n return headers\n}\n"],"names":[],"mappings":";;;;AAaO,SAAS,mBAGd;AAAA,EACA;AAAA,EACA;AACF,GAG8C;AAC5C,SAAO,CAAC,OAAO;AACN,WAAA,aAAa,OAAO,UAAU;AAC7B,YAAA,UAAU,aAAa,KAAK;AAElC,YAAM,MAAM,IAAI,IAAI,QAAQ,GAAG;AAC/B,YAAM,OAAO,IAAI,KAAK,QAAQ,IAAI,QAAQ,EAAE;AAG5C,YAAM,UAAU,oBAAoB;AAAA,QAClC,gBAAgB,CAAC,IAAI;AAAA,MAAA,CACtB;AAED,YAAM,SAAS,aAAa;AAED,iCAAA,QAAQ,OAAM,yDAAqB;AAG9D,aAAO,OAAO;AAAA,QACZ;AAAA,MAAA,CACD;AAED,YAAM,OAAO,KAAK;AAElB,sBAAgB,MAAM;AAEtB,YAAM,kBAAkB,wBAAwB,EAAE,OAAO,QAAQ;AAC3D,YAAA,WAAW,MAAM,GAAG;AAAA,QACxB;AAAA,QACA;AAAA,QACA;AAAA,MAAA,CACD;AAEM,aAAA;AAAA,IAAA,CACR;AAAA,EACH;AACF;AAEA,SAAS,wBAAwB,MAA6C;AAC5E,MAAI,UAAU;AAAA,IACZ,mBAAmB,KAAK,KAAK;AAAA,IAC5B,KAAK,MAAc;AAAA,IACpB;AAAA,MACE,gBAAgB;AAAA,IAClB;AAAA,IACA,GAAG,KAAK,OAAO,MAAM,QAAQ,IAAI,CAAC,UAAU;AAC1C,aAAO,MAAM;AAAA,IACd,CAAA;AAAA,EACH;AAGA,QAAM,EAAE,SAAA,IAAa,KAAK,OAAO;AAEjC,MAAI,UAAU;AACF,cAAA,aAAa,SAAS,SAAS,SAAS;AAAA,MAChD,UAAU,SAAS;AAAA,IAAA,CACpB;AAAA,EAAA;AAEI,SAAA;AACT;"}
1
+ {"version":3,"file":"createStartHandler.js","sources":["../../src/createStartHandler.ts"],"sourcesContent":["import { createMemoryHistory } from '@tanstack/history'\nimport {\n flattenMiddlewares,\n json,\n mergeHeaders,\n} from '@tanstack/start-client-core'\nimport {\n getMatchedRoutes,\n isRedirect,\n isResolvedRedirect,\n joinPaths,\n processRouteTree,\n rootRouteId,\n trimPath,\n} from '@tanstack/router-core'\nimport { getResponseHeaders, requestHandler } from './h3'\nimport { attachRouterServerSsrUtils, dehydrateRouter } from './ssr-server'\nimport { getStartManifest } from './router-manifest'\nimport { handleServerAction } from './server-functions-handler'\nimport type { AnyServerRoute, AnyServerRouteWithTypes } from './serverRoute'\nimport type { RequestHandler } from './h3'\nimport type { AnyRouter } from '@tanstack/router-core'\nimport type { HandlerCallback } from './handlerCallback'\n\ntype TODO = any\n\nexport type CustomizeStartHandler<TRouter extends AnyRouter> = (\n cb: HandlerCallback<TRouter>,\n) => RequestHandler\n\nexport function getStartResponseHeaders(opts: { router: AnyRouter }) {\n let headers = mergeHeaders(\n getResponseHeaders(),\n {\n 'Content-Type': 'text/html; charset=UTF-8',\n },\n ...opts.router.state.matches.map((match) => {\n return match.headers\n }),\n )\n // Handle Redirects\n const { redirect } = opts.router.state\n\n if (redirect) {\n headers = mergeHeaders(headers, redirect.headers)\n }\n return headers\n}\n\nexport function createStartHandler<TRouter extends AnyRouter>({\n createRouter,\n}: {\n createRouter: () => TRouter\n}): CustomizeStartHandler<TRouter> {\n return (cb) => {\n const originalFetch = globalThis.fetch\n\n const startRequestResolver: RequestHandler = async ({ request }) => {\n // Patching fetch function to use our request resolver\n // if the input starts with `/` which is a common pattern for\n // client-side routing.\n // When we encounter similar requests, we can assume that the\n // user wants to use the same origin as the current request.\n globalThis.fetch = async function (input, init) {\n function resolve(url: URL, requestOptions: RequestInit | undefined) {\n const fetchRequest = new Request(url, requestOptions)\n return startRequestResolver({ request: fetchRequest })\n }\n\n function getOrigin() {\n return (\n request.headers.get('Origin') ||\n request.headers.get('Referer') ||\n 'http://localhost'\n )\n }\n\n if (typeof input === 'string' && input.startsWith('/')) {\n // e.g: fetch('/api/data')\n const url = new URL(input, getOrigin())\n return resolve(url, init)\n } else if (\n typeof input === 'object' &&\n 'url' in input &&\n typeof input.url === 'string' &&\n input.url.startsWith('/')\n ) {\n // e.g: fetch(new Request('/api/data'))\n const url = new URL(input.url, getOrigin())\n return resolve(url, init)\n }\n\n // If not, it should just use the original fetch\n return originalFetch(input, init)\n }\n\n const url = new URL(request.url)\n const href = url.href.replace(url.origin, '')\n\n // Create a history for the client-side router\n const history = createMemoryHistory({\n initialEntries: [href],\n })\n\n // Create the client-side router\n const router = createRouter()\n\n // Attach the server-side SSR utils to the client-side router\n attachRouterServerSsrUtils(router, getStartManifest())\n\n // Update the client-side router with the history and context\n router.update({\n history,\n })\n\n const response = await (async () => {\n try {\n if (!process.env.TSS_SERVER_FN_BASE) {\n throw new Error(\n 'tanstack/start-server-core: TSS_SERVER_FN_BASE must be defined in your environment for createStartHandler()',\n )\n }\n\n // First, let's attempt to handle server functions\n // Add trailing slash to sanitise user defined TSS_SERVER_FN_BASE\n const serverFnBase = joinPaths([\n '/',\n trimPath(process.env.TSS_SERVER_FN_BASE),\n '/',\n ])\n if (href.startsWith(serverFnBase)) {\n return await handleServerAction({ request })\n }\n\n // Then move on to attempting to load server routes\n const serverRouteTreeModule = await (async () => {\n try {\n return (await import(\n // @ts-expect-error\n 'tanstack-start-server-routes-manifest:v'\n )) as { routeTree: AnyServerRoute }\n } catch (e) {\n console.log(e)\n return undefined\n }\n })()\n\n // If we have a server route tree, then we try matching to see if we have a\n // server route that matches the request.\n if (serverRouteTreeModule) {\n const [_matchedRoutes, response] = await handleServerRoutes({\n routeTree: serverRouteTreeModule.routeTree,\n request,\n })\n\n if (response) return response\n }\n\n const requestAcceptHeader = request.headers.get('Accept') || '*/*'\n const splitRequestAcceptHeader = requestAcceptHeader.split(',')\n\n const supportedMimeTypes = ['*/*', 'text/html']\n const isRouterAcceptSupported = supportedMimeTypes.some((mimeType) =>\n splitRequestAcceptHeader.some((acceptedMimeType) =>\n acceptedMimeType.trim().startsWith(mimeType),\n ),\n )\n\n if (!isRouterAcceptSupported) {\n return json(\n {\n error: 'Only HTML requests are supported here',\n },\n {\n status: 500,\n },\n )\n }\n\n // If no Server Routes were found, so fallback to normal SSR matching using\n // the router\n\n await router.load()\n\n // If there was a redirect, skip rendering the page at all\n if (router.state.redirect) return router.state.redirect\n\n dehydrateRouter(router)\n\n const responseHeaders = getStartResponseHeaders({ router })\n const response = await cb({\n request,\n router,\n responseHeaders,\n })\n\n return response\n } catch (err) {\n if (err instanceof Response) {\n return err\n }\n\n throw err\n }\n })()\n\n if (isRedirect(response)) {\n if (isResolvedRedirect(response)) {\n if (request.headers.get('x-tsr-redirect') === 'manual') {\n return json(\n {\n ...response.options,\n isSerializedRedirect: true,\n },\n {\n headers: response.headers,\n },\n )\n }\n return response\n }\n if (\n response.options.to &&\n typeof response.options.to === 'string' &&\n !response.options.to.startsWith('/')\n ) {\n throw new Error(\n `Server side redirects must use absolute paths via the 'href' or 'to' options. Received: ${JSON.stringify(response.options)}`,\n )\n }\n\n if (\n ['params', 'search', 'hash'].some(\n (d) => typeof (response.options as any)[d] === 'function',\n )\n ) {\n throw new Error(\n `Server side redirects must use static search, params, and hash values and do not support functional values. Received functional values for: ${Object.keys(\n response.options,\n )\n .filter((d) => typeof (response.options as any)[d] === 'function')\n .map((d) => `\"${d}\"`)\n .join(', ')}`,\n )\n }\n\n const redirect = router.resolveRedirect(response)\n\n if (request.headers.get('x-tsr-redirect') === 'manual') {\n return json(\n {\n ...response.options,\n isSerializedRedirect: true,\n },\n {\n headers: response.headers,\n },\n )\n }\n\n return redirect\n }\n\n return response\n }\n\n return requestHandler(startRequestResolver)\n }\n}\n\nasync function handleServerRoutes({\n routeTree,\n request,\n}: {\n routeTree: AnyServerRouteWithTypes\n request: Request\n}) {\n const { flatRoutes, routesById, routesByPath } = processRouteTree({\n routeTree,\n initRoute: (route, i) => {\n route.init({\n originalIndex: i,\n })\n },\n })\n\n const url = new URL(request.url)\n const pathname = url.pathname\n\n const history = createMemoryHistory({\n initialEntries: [pathname],\n })\n\n const { matchedRoutes, foundRoute, routeParams } =\n getMatchedRoutes<AnyServerRouteWithTypes>({\n pathname: history.location.pathname,\n basepath: '/',\n caseSensitive: true,\n routesByPath,\n routesById,\n flatRoutes,\n })\n\n let response: Response | undefined\n\n if (foundRoute && foundRoute.id !== rootRouteId) {\n // We've found a server route that matches the request, so we can call it.\n // TODO: Get the input type-signature correct\n // TODO: Perform the middlewares?\n // TODO: Error handling? What happens when its `throw redirect()` vs `throw new Error()`?\n\n const method = Object.keys(foundRoute.options.methods).find(\n (method) => method.toLowerCase() === request.method.toLowerCase(),\n )\n\n if (method) {\n const handler = foundRoute.options.methods[method]\n\n if (handler) {\n const middlewares = flattenMiddlewares(\n matchedRoutes.flatMap((r) => r.options.middleware).filter(Boolean),\n ).map((d) => d.options.server)\n\n middlewares.push(handlerToMiddleware(handler) as TODO)\n\n // TODO: This is starting to feel too much like a server function\n // Do generalize the existing middleware execution? Or do we need to\n // build a new middleware execution system for server routes?\n const ctx = await executeMiddleware(middlewares, {\n request,\n context: {},\n params: routeParams,\n pathname: history.location.pathname,\n })\n\n response = ctx.response\n }\n }\n }\n\n // We return the matched routes too so if\n // the app router happens to match the same path,\n // it can use any request middleware from server routes\n return [matchedRoutes, response] as const\n}\n\nfunction handlerToMiddleware(\n handler: AnyServerRouteWithTypes['options']['methods'][string],\n) {\n return async ({ next: _next, ...rest }: TODO) => ({\n response: await handler(rest),\n })\n}\n\nfunction executeMiddleware(middlewares: TODO, ctx: TODO) {\n let index = -1\n\n const next = async (ctx: TODO) => {\n index++\n const middleware = middlewares[index]\n if (!middleware) return ctx\n\n const result = await middleware({\n ...ctx,\n // Allow the middleware to call the next middleware in the chain\n next: async (nextCtx: TODO) => {\n // Allow the caller to extend the context for the next middleware\n const nextResult = await next({ ...ctx, ...nextCtx })\n\n // Merge the result into the context\\\n return Object.assign(ctx, handleCtxResult(nextResult))\n },\n // Allow the middleware result to extend the return context\n }).catch((err: TODO) => {\n if (isSpecialResponse(err)) {\n return {\n response: err,\n }\n }\n\n throw err\n })\n\n // Merge the middleware result into the context, just in case it\n // returns a partial context\n return Object.assign(ctx, handleCtxResult(result))\n }\n\n return handleCtxResult(next(ctx))\n}\n\nfunction handleCtxResult(result: TODO) {\n if (isSpecialResponse(result)) {\n return {\n response: result,\n }\n }\n\n return result\n}\n\nfunction isSpecialResponse(err: TODO) {\n return isResponse(err) || isRedirect(err)\n}\n\nfunction isResponse(response: Response): response is Response {\n return response instanceof Response\n}\n"],"names":["url","response","method","ctx"],"mappings":"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"}
package/dist/esm/h3.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { H3Event, appendCorsHeaders as _appendCorsHeaders, appendCorsPreflightHeaders as _appendCorsPreflightHeaders, appendHeader as _appendHeader, appendResponseHeader as _appendResponseHeader, appendResponseHeaders as _appendResponseHeaders, assertMethod as _assertMethod, clearResponseHeaders as _clearResponseHeaders, clearSession as _clearSession, defaultContentType as _defaultContentType, deleteCookie as _deleteCookie, fetchWithEvent as _fetchWithEvent, getCookie as _getCookie, getProxyRequestHeaders as _getProxyRequestHeaders, getQuery as _getQuery, getRequestFingerprint as _getRequestFingerprint, getRequestHeader as _getRequestHeader, getRequestHeaders as _getRequestHeaders, getRequestHost as _getRequestHost, getRequestIP as _getRequestIP, getRequestProtocol as _getRequestProtocol, getRequestURL as _getRequestURL, getRequestWebStream as _getRequestWebStream, getResponseHeader as _getResponseHeader, getResponseHeaders as _getResponseHeaders, getResponseStatus as _getResponseStatus, getResponseStatusText as _getResponseStatusText, getRouterParam as _getRouterParam, getRouterParams as _getRouterParams, getSession as _getSession, getValidatedQuery as _getValidatedQuery, getValidatedRouterParams as _getValidatedRouterParams, handleCacheHeaders as _handleCacheHeaders, handleCors as _handleCors, isMethod as _isMethod, isPreflightRequest as _isPreflightRequest, parseCookies as _parseCookies, proxyRequest as _proxyRequest, readBody as _readBody, readFormData as _readFormData, readMultipartFormData as _readMultipartFormData, readRawBody as _readRawBody, readValidatedBody as _readValidatedBody, removeResponseHeader as _removeResponseHeader, sealSession as _sealSession, send as _send, sendError as _sendError, sendNoContent as _sendNoContent, sendProxy as _sendProxy, sendRedirect as _sendRedirect, sendStream as _sendStream, sendWebResponse as _sendWebResponse, setCookie as _setCookie, setHeader as _setHeader, setResponseHeader as _setResponseHeader, setResponseHeaders as _setResponseHeaders, setResponseStatus as _setResponseStatus, unsealSession as _unsealSession, updateSession as _updateSession, useSession as _useSession, writeEarlyHints as _writeEarlyHints, Encoding, HTTPHeaderName, InferEventInput, _RequestMiddleware, _ResponseMiddleware } from 'h3';
1
+ import { H3Event, appendCorsHeaders as _appendCorsHeaders, appendCorsPreflightHeaders as _appendCorsPreflightHeaders, appendHeader as _appendHeader, appendResponseHeader as _appendResponseHeader, appendResponseHeaders as _appendResponseHeaders, assertMethod as _assertMethod, clearResponseHeaders as _clearResponseHeaders, clearSession as _clearSession, defaultContentType as _defaultContentType, deleteCookie as _deleteCookie, fetchWithEvent as _fetchWithEvent, getCookie as _getCookie, getProxyRequestHeaders as _getProxyRequestHeaders, getQuery as _getQuery, getRequestFingerprint as _getRequestFingerprint, getRequestHeader as _getRequestHeader, getRequestHeaders as _getRequestHeaders, getRequestHost as _getRequestHost, getRequestIP as _getRequestIP, getRequestProtocol as _getRequestProtocol, getRequestURL as _getRequestURL, getRequestWebStream as _getRequestWebStream, getResponseHeader as _getResponseHeader, getResponseHeaders as _getResponseHeaders, getResponseStatus as _getResponseStatus, getResponseStatusText as _getResponseStatusText, getRouterParam as _getRouterParam, getRouterParams as _getRouterParams, getSession as _getSession, getValidatedQuery as _getValidatedQuery, getValidatedRouterParams as _getValidatedRouterParams, handleCacheHeaders as _handleCacheHeaders, handleCors as _handleCors, isMethod as _isMethod, isPreflightRequest as _isPreflightRequest, parseCookies as _parseCookies, proxyRequest as _proxyRequest, readBody as _readBody, readFormData as _readFormData, readMultipartFormData as _readMultipartFormData, readRawBody as _readRawBody, readValidatedBody as _readValidatedBody, removeResponseHeader as _removeResponseHeader, sealSession as _sealSession, send as _send, sendError as _sendError, sendNoContent as _sendNoContent, sendProxy as _sendProxy, sendRedirect as _sendRedirect, sendStream as _sendStream, sendWebResponse as _sendWebResponse, setCookie as _setCookie, setHeader as _setHeader, setResponseHeader as _setResponseHeader, setResponseHeaders as _setResponseHeaders, setResponseStatus as _setResponseStatus, toWebRequest as _toWebRequest, unsealSession as _unsealSession, updateSession as _updateSession, useSession as _useSession, writeEarlyHints as _writeEarlyHints, Encoding, EventHandler, HTTPHeaderName, InferEventInput, _RequestMiddleware, _ResponseMiddleware } from 'h3';
2
2
  declare function _setContext(event: H3Event, key: string, value: any): void;
3
3
  declare function _getContext(event: H3Event, key: string): any;
4
4
  export declare function defineMiddleware(options: {
@@ -8,8 +8,11 @@ export declare function defineMiddleware(options: {
8
8
  onRequest?: _RequestMiddleware | Array<_RequestMiddleware>;
9
9
  onBeforeResponse?: _ResponseMiddleware | Array<_ResponseMiddleware>;
10
10
  };
11
- export declare function toWebRequest(event: H3Event): Request | undefined;
12
- export { H3Error, H3Event, MIMES, callNodeListener, createApp, createAppEventHandler, createEvent, createRouter, defineEventHandler, defineLazyEventHandler, defineNodeListener, defineNodeMiddleware, defineRequestMiddleware, defineResponseMiddleware, dynamicEventHandler, defineWebSocket, eventHandler, splitCookiesString, fromNodeMiddleware, fromPlainHandler, fromWebHandler, isError, isEventHandler, isWebResponse, lazyEventHandler, promisifyNodeListener, serveStatic, toEventHandler, toNodeListener, toPlainHandler, toWebHandler, isCorsOriginAllowed, isStream, createError, sanitizeStatusCode, sanitizeStatusMessage, useBase, type AddRouteShortcuts, type App, type AppOptions, type AppUse, type CacheConditions, type CreateRouterOptions, type Duplex, type DynamicEventHandler, type Encoding, type EventHandler, type EventHandlerObject, type EventHandlerRequest, type EventHandlerResponse, type H3CorsOptions, type H3EventContext, type HTTPHeaderName, type HTTPMethod, type InferEventInput, type InputLayer, type InputStack, type Layer, type LazyEventHandler, type Matcher, type MultiPartData, type NodeEventContext, type NodeListener, type NodeMiddleware, type NodePromisifiedHandler, type PlainHandler, type PlainRequest, type PlainResponse, type ProxyOptions, type RequestFingerprintOptions, type RequestHeaders, type RouteNode, type Router, type RouterMethod, type RouterUse, type ServeStaticOptions, type Session, type SessionConfig, type SessionData, type Stack, type StaticAssetMeta, type ValidateFunction, type ValidateResult, type WebEventContext, type WebHandler, type _RequestMiddleware, type _ResponseMiddleware, } from 'h3';
11
+ export { H3Error, H3Event, MIMES, callNodeListener, createApp, createAppEventHandler, createEvent, createRouter, defineLazyEventHandler, defineNodeListener, defineNodeMiddleware, defineRequestMiddleware, defineResponseMiddleware, dynamicEventHandler, defineWebSocket, splitCookiesString, fromNodeMiddleware, fromPlainHandler, fromWebHandler, isError, isEventHandler, isWebResponse, lazyEventHandler, promisifyNodeListener, serveStatic, toEventHandler, toNodeListener, toPlainHandler, toWebHandler, toWebRequest, isCorsOriginAllowed, isStream, createError, sanitizeStatusCode, sanitizeStatusMessage, useBase, type AddRouteShortcuts, type App, type AppOptions, type AppUse, type CacheConditions, type CreateRouterOptions, type Duplex, type DynamicEventHandler, type Encoding, type EventHandler, type EventHandlerObject, type EventHandlerRequest, type EventHandlerResponse, type H3CorsOptions, type H3EventContext, type HTTPHeaderName, type HTTPMethod, type InferEventInput, type InputLayer, type InputStack, type Layer, type LazyEventHandler, type Matcher, type MultiPartData, type NodeEventContext, type NodeListener, type NodeMiddleware, type NodePromisifiedHandler, type PlainHandler, type PlainRequest, type PlainResponse, type ProxyOptions, type RequestFingerprintOptions, type RequestHeaders, type RouteNode, type Router, type RouterMethod, type RouterUse, type ServeStaticOptions, type Session, type SessionConfig, type SessionData, type Stack, type StaticAssetMeta, type ValidateFunction, type ValidateResult, type WebEventContext, type WebHandler, type _RequestMiddleware, type _ResponseMiddleware, } from 'h3';
12
+ export declare function defineEventHandler(handler: EventHandler): EventHandler<import('h3').EventHandlerRequest, Promise<any>>;
13
+ export declare function eventHandler(handler: EventHandler): EventHandler<import('h3').EventHandlerRequest, Promise<any>>;
14
+ export declare function runWithEvent<T>(event: H3Event, fn: () => T | Promise<T>): Promise<T>;
15
+ export declare function getEvent(): H3Event<import('h3').EventHandlerRequest>;
13
16
  export declare const HTTPEventSymbol: unique symbol;
14
17
  export declare function isEvent(obj: any): obj is H3Event | {
15
18
  [HTTPEventSymbol]: H3Event;
@@ -99,7 +102,8 @@ export declare const removeResponseHeader: WrapFunction<typeof _removeResponseHe
99
102
  export declare const getContext: WrapFunction<typeof _getContext>;
100
103
  export declare const setContext: WrapFunction<typeof _setContext>;
101
104
  export declare const clearResponseHeaders: WrapFunction<typeof _clearResponseHeaders>;
102
- export declare const getWebRequest: WrapFunction<typeof toWebRequest>;
103
- export { createApp as createServer } from 'h3';
104
- export declare function getEvent(): H3Event<import('h3').EventHandlerRequest>;
105
- export declare function handleHTTPEvent(event: H3Event): Promise<any>;
105
+ export declare const getWebRequest: WrapFunction<typeof _toWebRequest>;
106
+ export type RequestHandler = (ctx: {
107
+ request: Request;
108
+ }) => Promise<Response> | Response;
109
+ export declare function requestHandler(handler: RequestHandler): RequestHandler;
package/dist/esm/h3.js CHANGED
@@ -1,7 +1,7 @@
1
1
  import { AsyncLocalStorage } from "node:async_hooks";
2
- import { H3Event, readBody as readBody$1, getQuery as getQuery$1, isMethod as isMethod$1, isPreflightRequest as isPreflightRequest$1, getValidatedQuery as getValidatedQuery$1, getRouterParams as getRouterParams$1, getRouterParam as getRouterParam$1, getValidatedRouterParams as getValidatedRouterParams$1, assertMethod as assertMethod$1, getRequestHeaders as getRequestHeaders$1, getRequestHeader as getRequestHeader$1, getRequestURL as getRequestURL$1, getRequestHost as getRequestHost$1, getRequestProtocol as getRequestProtocol$1, getRequestIP as getRequestIP$1, send as send$1, sendNoContent as sendNoContent$1, setResponseStatus as setResponseStatus$1, getResponseStatus as getResponseStatus$1, getResponseStatusText as getResponseStatusText$1, getResponseHeaders as getResponseHeaders$1, getResponseHeader as getResponseHeader$1, setResponseHeaders as setResponseHeaders$1, setResponseHeader as setResponseHeader$1, appendResponseHeaders as appendResponseHeaders$1, appendResponseHeader as appendResponseHeader$1, defaultContentType as defaultContentType$1, sendRedirect as sendRedirect$1, sendStream as sendStream$1, writeEarlyHints as writeEarlyHints$1, sendError as sendError$1, sendProxy as sendProxy$1, proxyRequest as proxyRequest$1, fetchWithEvent as fetchWithEvent$1, getProxyRequestHeaders as getProxyRequestHeaders$1, parseCookies as parseCookies$1, getCookie as getCookie$1, setCookie as setCookie$1, deleteCookie as deleteCookie$1, useSession as useSession$1, getSession as getSession$1, updateSession as updateSession$1, sealSession as sealSession$1, unsealSession as unsealSession$1, clearSession as clearSession$1, handleCacheHeaders as handleCacheHeaders$1, handleCors as handleCors$1, appendCorsHeaders as appendCorsHeaders$1, appendCorsPreflightHeaders as appendCorsPreflightHeaders$1, sendWebResponse as sendWebResponse$1, appendHeader as appendHeader$1, appendHeaders as appendHeaders$1, setHeader as setHeader$1, setHeaders as setHeaders$1, getHeader as getHeader$1, getHeaders as getHeaders$1, getRequestFingerprint as getRequestFingerprint$1, getRequestWebStream as getRequestWebStream$1, readFormData as readFormData$1, readMultipartFormData as readMultipartFormData$1, readValidatedBody as readValidatedBody$1, removeResponseHeader as removeResponseHeader$1, clearResponseHeaders as clearResponseHeaders$1, readRawBody as readRawBody$1 } from "h3";
3
- import { H3Error, H3Event as H3Event2, MIMES, callNodeListener, createApp, createAppEventHandler, createError, createEvent, createRouter, createApp as createApp2, defineEventHandler, defineLazyEventHandler, defineNodeListener, defineNodeMiddleware, defineRequestMiddleware, defineResponseMiddleware, defineWebSocket, dynamicEventHandler, eventHandler, fromNodeMiddleware, fromPlainHandler, fromWebHandler, isCorsOriginAllowed, isError, isEventHandler, isStream, isWebResponse, lazyEventHandler, promisifyNodeListener, sanitizeStatusCode, sanitizeStatusMessage, serveStatic, splitCookiesString, toEventHandler, toNodeListener, toPlainHandler, toWebHandler, useBase } from "h3";
4
- import { getContext as getContext$1 } from "unctx";
2
+ import { defineEventHandler as defineEventHandler$1, eventHandler as eventHandler$1, H3Event, readBody as readBody$1, getQuery as getQuery$1, isMethod as isMethod$1, isPreflightRequest as isPreflightRequest$1, getValidatedQuery as getValidatedQuery$1, getRouterParams as getRouterParams$1, getRouterParam as getRouterParam$1, getValidatedRouterParams as getValidatedRouterParams$1, assertMethod as assertMethod$1, getRequestHeaders as getRequestHeaders$1, getRequestHeader as getRequestHeader$1, getRequestURL as getRequestURL$1, getRequestHost as getRequestHost$1, getRequestProtocol as getRequestProtocol$1, getRequestIP as getRequestIP$1, send as send$1, sendNoContent as sendNoContent$1, setResponseStatus as setResponseStatus$1, getResponseStatus as getResponseStatus$1, getResponseStatusText as getResponseStatusText$1, getResponseHeaders as getResponseHeaders$1, getResponseHeader as getResponseHeader$1, setResponseHeaders as setResponseHeaders$1, setResponseHeader as setResponseHeader$1, appendResponseHeaders as appendResponseHeaders$1, appendResponseHeader as appendResponseHeader$1, defaultContentType as defaultContentType$1, sendRedirect as sendRedirect$1, sendStream as sendStream$1, writeEarlyHints as writeEarlyHints$1, sendError as sendError$1, sendProxy as sendProxy$1, proxyRequest as proxyRequest$1, fetchWithEvent as fetchWithEvent$1, getProxyRequestHeaders as getProxyRequestHeaders$1, parseCookies as parseCookies$1, getCookie as getCookie$1, setCookie as setCookie$1, deleteCookie as deleteCookie$1, useSession as useSession$1, getSession as getSession$1, updateSession as updateSession$1, sealSession as sealSession$1, unsealSession as unsealSession$1, clearSession as clearSession$1, handleCacheHeaders as handleCacheHeaders$1, handleCors as handleCors$1, appendCorsHeaders as appendCorsHeaders$1, appendCorsPreflightHeaders as appendCorsPreflightHeaders$1, sendWebResponse as sendWebResponse$1, appendHeader as appendHeader$1, appendHeaders as appendHeaders$1, setHeader as setHeader$1, setHeaders as setHeaders$1, getHeader as getHeader$1, getHeaders as getHeaders$1, getRequestFingerprint as getRequestFingerprint$1, getRequestWebStream as getRequestWebStream$1, readFormData as readFormData$1, readMultipartFormData as readMultipartFormData$1, readValidatedBody as readValidatedBody$1, removeResponseHeader as removeResponseHeader$1, clearResponseHeaders as clearResponseHeaders$1, toWebRequest, readRawBody as readRawBody$1 } from "h3";
3
+ import { H3Error, H3Event as H3Event2, MIMES, callNodeListener, createApp, createAppEventHandler, createError, createEvent, createRouter, defineLazyEventHandler, defineNodeListener, defineNodeMiddleware, defineRequestMiddleware, defineResponseMiddleware, defineWebSocket, dynamicEventHandler, fromNodeMiddleware, fromPlainHandler, fromWebHandler, isCorsOriginAllowed, isError, isEventHandler, isStream, isWebResponse, lazyEventHandler, promisifyNodeListener, sanitizeStatusCode, sanitizeStatusMessage, serveStatic, splitCookiesString, toEventHandler, toNodeListener, toPlainHandler, toWebHandler, toWebRequest as toWebRequest2, useBase } from "h3";
4
+ const eventStorage = new AsyncLocalStorage();
5
5
  function _setContext(event, key, value) {
6
6
  event.context[key] = value;
7
7
  }
@@ -11,41 +11,27 @@ function _getContext(event, key) {
11
11
  function defineMiddleware(options) {
12
12
  return options;
13
13
  }
14
- function toWebRequestH3(event) {
15
- let readableStream;
16
- const url = getRequestURL(event);
17
- const base = {
18
- // @ts-ignore Undici option
19
- duplex: "half",
20
- method: event.method,
21
- headers: event.headers
22
- };
23
- if (event.node.req.body instanceof ArrayBuffer) {
24
- return new Request(url, {
25
- ...base,
26
- body: event.node.req.body
27
- });
28
- }
29
- return new Request(url, {
30
- ...base,
31
- get body() {
32
- if (readableStream) {
33
- return readableStream;
34
- }
35
- readableStream = getRequestWebStream(event);
36
- return readableStream;
37
- }
14
+ function defineEventHandler(handler) {
15
+ return defineEventHandler$1((event) => {
16
+ return runWithEvent(event, () => handler(event));
38
17
  });
39
18
  }
40
- function toWebRequest(event) {
41
- event.web ?? (event.web = {
42
- request: toWebRequestH3(event),
43
- url: getRequestURL(event)
19
+ function eventHandler(handler) {
20
+ return eventHandler$1((event) => {
21
+ return runWithEvent(event, () => handler(event));
44
22
  });
45
- return event.web.request;
46
23
  }
47
- function getHTTPEvent() {
48
- return getEvent();
24
+ async function runWithEvent(event, fn) {
25
+ return eventStorage.run(event, fn);
26
+ }
27
+ function getEvent() {
28
+ const event = eventStorage.getStore();
29
+ if (!event) {
30
+ throw new Error(
31
+ `No HTTPEvent found in AsyncLocalStorage. Make sure you are using the function within the server runtime.`
32
+ );
33
+ }
34
+ return event;
49
35
  }
50
36
  const HTTPEventSymbol = Symbol("$HTTPEvent");
51
37
  function isEvent(obj) {
@@ -53,15 +39,9 @@ function isEvent(obj) {
53
39
  }
54
40
  function createWrapperFunction(h3Function) {
55
41
  return function(...args) {
56
- var _a;
57
42
  const event = args[0];
58
43
  if (!isEvent(event)) {
59
- if (!((_a = globalThis.app.config.server.experimental) == null ? void 0 : _a.asyncContext)) {
60
- throw new Error(
61
- "AsyncLocalStorage was not enabled. Use the `server.experimental.asyncContext: true` option in your app configuration to enable it. Or, pass the instance of HTTPEvent that you have as the first argument to the function."
62
- );
63
- }
64
- args.unshift(getHTTPEvent());
44
+ args.unshift(getEvent());
65
45
  } else {
66
46
  args[0] = event instanceof H3Event || event.__is_event__ ? event : event[HTTPEventSymbol];
67
47
  }
@@ -149,25 +129,8 @@ const getContext = createWrapperFunction(_getContext);
149
129
  const setContext = createWrapperFunction(_setContext);
150
130
  const clearResponseHeaders = createWrapperFunction(clearResponseHeaders$1);
151
131
  const getWebRequest = createWrapperFunction(toWebRequest);
152
- function getNitroAsyncContext() {
153
- var _a;
154
- const nitroAsyncContext = getContext$1("nitro-app", {
155
- asyncContext: ((_a = globalThis.app.config.server.experimental) == null ? void 0 : _a.asyncContext) ? true : false,
156
- AsyncLocalStorage
157
- });
158
- return nitroAsyncContext;
159
- }
160
- function getEvent() {
161
- const event = getNitroAsyncContext().use().event;
162
- if (!event) {
163
- throw new Error(
164
- `No HTTPEvent found in AsyncLocalStorage. Make sure you are using the function within the server runtime.`
165
- );
166
- }
167
- return event;
168
- }
169
- async function handleHTTPEvent(event) {
170
- return await globalThis.$handle(event);
132
+ function requestHandler(handler) {
133
+ return handler;
171
134
  }
172
135
  export {
173
136
  H3Error,
@@ -189,7 +152,6 @@ export {
189
152
  createError,
190
153
  createEvent,
191
154
  createRouter,
192
- createApp2 as createServer,
193
155
  defaultContentType,
194
156
  defineEventHandler,
195
157
  defineLazyEventHandler,
@@ -233,7 +195,6 @@ export {
233
195
  getWebRequest,
234
196
  handleCacheHeaders,
235
197
  handleCors,
236
- handleHTTPEvent,
237
198
  isCorsOriginAllowed,
238
199
  isError,
239
200
  isEvent,
@@ -252,6 +213,8 @@ export {
252
213
  readRawBody,
253
214
  readValidatedBody,
254
215
  removeResponseHeader,
216
+ requestHandler,
217
+ runWithEvent,
255
218
  sanitizeStatusCode,
256
219
  sanitizeStatusMessage,
257
220
  sealSession,
@@ -275,7 +238,7 @@ export {
275
238
  toNodeListener,
276
239
  toPlainHandler,
277
240
  toWebHandler,
278
- toWebRequest,
241
+ toWebRequest2 as toWebRequest,
279
242
  unsealSession,
280
243
  updateSession,
281
244
  useBase,