@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
package/README.md CHANGED
@@ -1,33 +1,12 @@
1
- > 🤫 we're cooking up something special!
2
-
3
1
  <img src="https://static.scarf.sh/a.png?x-pxid=d988eb79-b0fc-4a2b-8514-6a1ab932d188" />
4
2
 
5
- # TanStack Start
6
-
7
- ![TanStack Router Header](https://github.com/tanstack/router/raw/main/media/header.png)
3
+ # TanStack Start - Server Core
8
4
 
9
- 🤖 Type-safe router w/ built-in caching & URL state management for React!
5
+ This package is not meant to be used directly. It is a dependency of the TanStack Start framework-specific packages:
10
6
 
11
- <a href="https://twitter.com/intent/tweet?button_hashtag=TanStack" target="\_parent">
12
- <img alt="#TanStack" src="https://img.shields.io/twitter/url?color=%2308a0e9&label=%23TanStack&style=social&url=https%3A%2F%2Ftwitter.com%2Fintent%2Ftweet%3Fbutton_hashtag%3DTanStack">
13
- </a><a href="https://discord.com/invite/WrRKjPJ" target="\_parent">
14
- <img alt="" src="https://img.shields.io/badge/Discord-TanStack-%235865F2" />
15
- </a><a href="https://npmjs.com/package/@tanstack/react-router" target="\_parent">
16
- <img alt="" src="https://img.shields.io/npm/dm/@tanstack/router.svg" />
17
- </a><a href="https://bundlephobia.com/result?p=@tanstack/react-router" target="\_parent">
18
- <img alt="" src="https://badgen.net/bundlephobia/minzip/@tanstack/react-router" />
19
- </a><a href="#badge">
20
- <img alt="semantic-release" src="https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg">
21
- </a><a href="https://github.com/tanstack/router/discussions">
22
- <img alt="Join the discussion on Github" src="https://img.shields.io/badge/Github%20Discussions%20%26%20Support-Chat%20now!-blue" />
23
- </a><a href="https://bestofjs.org/projects/router"><img alt="Best of JS" src="https://img.shields.io/endpoint?url=https://bestofjs-serverless.now.sh/api/project-badge?fullName=tanstack%2Frouter%26since=daily" /></a><a href="https://github.com/tanstack/router" target="\_parent">
24
- <img alt="" src="https://img.shields.io/github/stars/tanstack/router.svg?style=social&label=Star" />
25
- </a><a href="https://twitter.com/tan_stack" target="\_parent">
26
- <img alt="" src="https://img.shields.io/twitter/follow/tan_stack.svg?style=social&label=Follow @TanStack" />
27
- </a><a href="https://twitter.com/tannerlinsley" target="\_parent">
28
- <img alt="" src="https://img.shields.io/twitter/follow/tannerlinsley.svg?style=social&label=Follow @TannerLinsley" />
29
- </a>
7
+ - [`@tanstack/react-start`](https://www.npmjs.com/package/@tanstack/react-start)
8
+ - [`@tanstack/solid-start`](https://www.npmjs.com/package/@tanstack/solid-start).
30
9
 
31
- Enjoy this library? Try the entire [TanStack](https://tanstack.com)! [React Query](https://github.com/tannerlinsley/react-query), [React Table](https://github.com/tanstack/react-table), [React Charts](https://github.com/tannerlinsley/react-charts), [React Virtual](https://github.com/tannerlinsley/react-virtual)
10
+ It provides the core functionality for TanStack Start, which is a fullstack-framework made for SSR, Streaming, Server Functions, API Routes, bundling and more powered by [TanStack Router](https://tanstack.com/router).
32
11
 
33
- ## Visit [tanstack.com/router](https://tanstack.com/router) for docs, guides, API and more!
12
+ Head over to [tanstack.com/start](https://tanstack.com/start) for more information about getting started.
@@ -42,9 +42,7 @@ function getRequestHeaders(opts) {
42
42
  );
43
43
  const { redirect } = opts.router.state;
44
44
  if (redirect) {
45
- headers = startClientCore.mergeHeaders(headers, redirect.headers, {
46
- Location: redirect.href
47
- });
45
+ headers = startClientCore.mergeHeaders(headers, redirect.headers);
48
46
  }
49
47
  return headers;
50
48
  }
@@ -1 +1 @@
1
- {"version":3,"file":"createRequestHandler.cjs","sources":["../../src/createRequestHandler.ts"],"sourcesContent":["import { createMemoryHistory } from '@tanstack/history'\nimport { mergeHeaders } from '@tanstack/start-client-core'\nimport { attachRouterServerSsrUtils, dehydrateRouter } from './ssr-server'\nimport type { HandlerCallback } from './handlerCallback'\nimport type { AnyRouter, Manifest } from '@tanstack/router-core'\n\nexport type RequestHandler<TRouter extends AnyRouter> = (\n cb: HandlerCallback<TRouter>,\n) => Promise<Response>\n\nexport function createRequestHandler<TRouter extends AnyRouter>({\n createRouter,\n request,\n getRouterManifest,\n}: {\n createRouter: () => TRouter\n request: Request\n getRouterManifest?: () => Manifest | Promise<Manifest>\n}): RequestHandler<TRouter> {\n return async (cb) => {\n const router = createRouter()\n\n attachRouterServerSsrUtils(router, await getRouterManifest?.())\n\n const url = new URL(request.url, 'http://localhost')\n\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 // 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 = getRequestHeaders({\n router,\n })\n\n return cb({\n request,\n router,\n responseHeaders,\n } as any)\n }\n}\n\nfunction getRequestHeaders(opts: { router: AnyRouter }): Headers {\n let headers = mergeHeaders(\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\n return headers\n}\n"],"names":["attachRouterServerSsrUtils","history","createMemoryHistory","dehydrateRouter","mergeHeaders"],"mappings":";;;;;AAUO,SAAS,qBAAgD;AAAA,EAC9D;AAAA,EACA;AAAA,EACA;AACF,GAI4B;AAC1B,SAAO,OAAO,OAAO;AACnB,UAAM,SAAS,aAAa;AAEDA,yCAAA,QAAQ,OAAM,yDAAqB;AAE9D,UAAM,MAAM,IAAI,IAAI,QAAQ,KAAK,kBAAkB;AAEnD,UAAM,OAAO,IAAI,KAAK,QAAQ,IAAI,QAAQ,EAAE;AAG5C,UAAMC,YAAUC,QAAAA,oBAAoB;AAAA,MAClC,gBAAgB,CAAC,IAAI;AAAA,IAAA,CACtB;AAGD,WAAO,OAAO;AAAA,MACZD,SAAAA;AAAAA,IAAA,CACD;AAED,UAAM,OAAO,KAAK;AAElBE,cAAAA,gBAAgB,MAAM;AAEtB,UAAM,kBAAkB,kBAAkB;AAAA,MACxC;AAAA,IAAA,CACD;AAED,WAAO,GAAG;AAAA,MACR;AAAA,MACA;AAAA,MACA;AAAA,IAAA,CACM;AAAA,EACV;AACF;AAEA,SAAS,kBAAkB,MAAsC;AAC/D,MAAI,UAAUC,gBAAA;AAAA,IACZ;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,cAAAA,gBAAA,aAAa,SAAS,SAAS,SAAS;AAAA,MAChD,UAAU,SAAS;AAAA,IAAA,CACpB;AAAA,EAAA;AAGI,SAAA;AACT;;"}
1
+ {"version":3,"file":"createRequestHandler.cjs","sources":["../../src/createRequestHandler.ts"],"sourcesContent":["import { createMemoryHistory } from '@tanstack/history'\nimport { mergeHeaders } from '@tanstack/start-client-core'\nimport { attachRouterServerSsrUtils, dehydrateRouter } from './ssr-server'\nimport type { HandlerCallback } from './handlerCallback'\nimport type { AnyRouter, Manifest } from '@tanstack/router-core'\n\nexport type RequestHandler<TRouter extends AnyRouter> = (\n cb: HandlerCallback<TRouter>,\n) => Promise<Response>\n\nexport function createRequestHandler<TRouter extends AnyRouter>({\n createRouter,\n request,\n getRouterManifest,\n}: {\n createRouter: () => TRouter\n request: Request\n getRouterManifest?: () => Manifest | Promise<Manifest>\n}): RequestHandler<TRouter> {\n return async (cb) => {\n const router = createRouter()\n\n attachRouterServerSsrUtils(router, await getRouterManifest?.())\n\n const url = new URL(request.url, 'http://localhost')\n\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 // 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 = getRequestHeaders({\n router,\n })\n\n return cb({\n request,\n router,\n responseHeaders,\n } as any)\n }\n}\n\nfunction getRequestHeaders(opts: { router: AnyRouter }): Headers {\n let headers = mergeHeaders(\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 }\n\n return headers\n}\n"],"names":["attachRouterServerSsrUtils","history","createMemoryHistory","dehydrateRouter","mergeHeaders"],"mappings":";;;;;AAUO,SAAS,qBAAgD;AAAA,EAC9D;AAAA,EACA;AAAA,EACA;AACF,GAI4B;AAC1B,SAAO,OAAO,OAAO;AACnB,UAAM,SAAS,aAAa;AAEDA,yCAAA,QAAQ,OAAM,yDAAqB;AAE9D,UAAM,MAAM,IAAI,IAAI,QAAQ,KAAK,kBAAkB;AAEnD,UAAM,OAAO,IAAI,KAAK,QAAQ,IAAI,QAAQ,EAAE;AAG5C,UAAMC,YAAUC,QAAAA,oBAAoB;AAAA,MAClC,gBAAgB,CAAC,IAAI;AAAA,IAAA,CACtB;AAGD,WAAO,OAAO;AAAA,MACZD,SAAAA;AAAAA,IAAA,CACD;AAED,UAAM,OAAO,KAAK;AAElBE,cAAAA,gBAAgB,MAAM;AAEtB,UAAM,kBAAkB,kBAAkB;AAAA,MACxC;AAAA,IAAA,CACD;AAED,WAAO,GAAG;AAAA,MACR;AAAA,MACA;AAAA,MACA;AAAA,IAAA,CACM;AAAA,EACV;AACF;AAEA,SAAS,kBAAkB,MAAsC;AAC/D,MAAI,UAAUC,gBAAA;AAAA,IACZ;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,cAAAA,gBAAA,aAAa,SAAS,SAAS,OAAO;AAAA,EAAA;AAG3C,SAAA;AACT;;"}
@@ -1,56 +1,293 @@
1
1
  "use strict";
2
+ var __create = Object.create;
3
+ var __defProp = Object.defineProperty;
4
+ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
5
+ var __getOwnPropNames = Object.getOwnPropertyNames;
6
+ var __getProtoOf = Object.getPrototypeOf;
7
+ var __hasOwnProp = Object.prototype.hasOwnProperty;
8
+ var __copyProps = (to, from, except, desc) => {
9
+ if (from && typeof from === "object" || typeof from === "function") {
10
+ for (let key of __getOwnPropNames(from))
11
+ if (!__hasOwnProp.call(to, key) && key !== except)
12
+ __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
13
+ }
14
+ return to;
15
+ };
16
+ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
17
+ // If the importer is in node compatibility mode or this is not an ESM
18
+ // file that has been converted to a CommonJS file using a Babel-
19
+ // compatible transform (i.e. "__esModule" has not been set), then set
20
+ // "default" to the CommonJS "module.exports" for node compatibility.
21
+ isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
22
+ mod
23
+ ));
2
24
  Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
3
25
  const history = require("@tanstack/history");
4
26
  const startClientCore = require("@tanstack/start-client-core");
5
- const h3 = require("h3");
27
+ const routerCore = require("@tanstack/router-core");
28
+ const h3 = require("./h3.cjs");
6
29
  const ssrServer = require("./ssr-server.cjs");
30
+ const routerManifest = require("./router-manifest.cjs");
31
+ const serverFunctionsHandler = require("./server-functions-handler.cjs");
32
+ function getStartResponseHeaders(opts) {
33
+ let headers = startClientCore.mergeHeaders(
34
+ h3.getResponseHeaders(),
35
+ {
36
+ "Content-Type": "text/html; charset=UTF-8"
37
+ },
38
+ ...opts.router.state.matches.map((match) => {
39
+ return match.headers;
40
+ })
41
+ );
42
+ const { redirect } = opts.router.state;
43
+ if (redirect) {
44
+ headers = startClientCore.mergeHeaders(headers, redirect.headers);
45
+ }
46
+ return headers;
47
+ }
7
48
  function createStartHandler({
8
- createRouter,
9
- getRouterManifest
49
+ createRouter
10
50
  }) {
11
51
  return (cb) => {
12
- return h3.eventHandler(async (event) => {
13
- const request = h3.toWebRequest(event);
52
+ const originalFetch = globalThis.fetch;
53
+ const startRequestResolver = async ({ request }) => {
54
+ globalThis.fetch = async function(input, init) {
55
+ function resolve(url2, requestOptions) {
56
+ const fetchRequest = new Request(url2, requestOptions);
57
+ return startRequestResolver({ request: fetchRequest });
58
+ }
59
+ function getOrigin() {
60
+ return request.headers.get("Origin") || request.headers.get("Referer") || "http://localhost";
61
+ }
62
+ if (typeof input === "string" && input.startsWith("/")) {
63
+ const url2 = new URL(input, getOrigin());
64
+ return resolve(url2, init);
65
+ } else if (typeof input === "object" && "url" in input && typeof input.url === "string" && input.url.startsWith("/")) {
66
+ const url2 = new URL(input.url, getOrigin());
67
+ return resolve(url2, init);
68
+ }
69
+ return originalFetch(input, init);
70
+ };
14
71
  const url = new URL(request.url);
15
72
  const href = url.href.replace(url.origin, "");
16
73
  const history$1 = history.createMemoryHistory({
17
74
  initialEntries: [href]
18
75
  });
19
76
  const router = createRouter();
20
- ssrServer.attachRouterServerSsrUtils(router, await (getRouterManifest == null ? void 0 : getRouterManifest()));
77
+ ssrServer.attachRouterServerSsrUtils(router, routerManifest.getStartManifest());
21
78
  router.update({
22
79
  history: history$1
23
80
  });
24
- await router.load();
25
- ssrServer.dehydrateRouter(router);
26
- const responseHeaders = getStartResponseHeaders({ event, router });
27
- const response = await cb({
28
- request,
29
- router,
30
- responseHeaders
31
- });
81
+ const response = await (async () => {
82
+ try {
83
+ if (!process.env.TSS_SERVER_FN_BASE) {
84
+ throw new Error(
85
+ "tanstack/start-server-core: TSS_SERVER_FN_BASE must be defined in your environment for createStartHandler()"
86
+ );
87
+ }
88
+ const serverFnBase = routerCore.joinPaths([
89
+ "/",
90
+ routerCore.trimPath(process.env.TSS_SERVER_FN_BASE),
91
+ "/"
92
+ ]);
93
+ if (href.startsWith(serverFnBase)) {
94
+ return await serverFunctionsHandler.handleServerAction({ request });
95
+ }
96
+ const serverRouteTreeModule = await (async () => {
97
+ try {
98
+ return await import(
99
+ // @ts-expect-error
100
+ "tanstack-start-server-routes-manifest:v"
101
+ );
102
+ } catch (e) {
103
+ console.log(e);
104
+ return void 0;
105
+ }
106
+ })();
107
+ if (serverRouteTreeModule) {
108
+ const [_matchedRoutes, response3] = await handleServerRoutes({
109
+ routeTree: serverRouteTreeModule.routeTree,
110
+ request
111
+ });
112
+ if (response3) return response3;
113
+ }
114
+ const requestAcceptHeader = request.headers.get("Accept") || "*/*";
115
+ const splitRequestAcceptHeader = requestAcceptHeader.split(",");
116
+ const supportedMimeTypes = ["*/*", "text/html"];
117
+ const isRouterAcceptSupported = supportedMimeTypes.some(
118
+ (mimeType) => splitRequestAcceptHeader.some(
119
+ (acceptedMimeType) => acceptedMimeType.trim().startsWith(mimeType)
120
+ )
121
+ );
122
+ if (!isRouterAcceptSupported) {
123
+ return startClientCore.json(
124
+ {
125
+ error: "Only HTML requests are supported here"
126
+ },
127
+ {
128
+ status: 500
129
+ }
130
+ );
131
+ }
132
+ await router.load();
133
+ if (router.state.redirect) return router.state.redirect;
134
+ ssrServer.dehydrateRouter(router);
135
+ const responseHeaders = getStartResponseHeaders({ router });
136
+ const response2 = await cb({
137
+ request,
138
+ router,
139
+ responseHeaders
140
+ });
141
+ return response2;
142
+ } catch (err) {
143
+ if (err instanceof Response) {
144
+ return err;
145
+ }
146
+ throw err;
147
+ }
148
+ })();
149
+ if (routerCore.isRedirect(response)) {
150
+ if (routerCore.isResolvedRedirect(response)) {
151
+ if (request.headers.get("x-tsr-redirect") === "manual") {
152
+ return startClientCore.json(
153
+ {
154
+ ...response.options,
155
+ isSerializedRedirect: true
156
+ },
157
+ {
158
+ headers: response.headers
159
+ }
160
+ );
161
+ }
162
+ return response;
163
+ }
164
+ if (response.options.to && typeof response.options.to === "string" && !response.options.to.startsWith("/")) {
165
+ throw new Error(
166
+ `Server side redirects must use absolute paths via the 'href' or 'to' options. Received: ${JSON.stringify(response.options)}`
167
+ );
168
+ }
169
+ if (["params", "search", "hash"].some(
170
+ (d) => typeof response.options[d] === "function"
171
+ )) {
172
+ throw new Error(
173
+ `Server side redirects must use static search, params, and hash values and do not support functional values. Received functional values for: ${Object.keys(
174
+ response.options
175
+ ).filter((d) => typeof response.options[d] === "function").map((d) => `"${d}"`).join(", ")}`
176
+ );
177
+ }
178
+ const redirect = router.resolveRedirect(response);
179
+ if (request.headers.get("x-tsr-redirect") === "manual") {
180
+ return startClientCore.json(
181
+ {
182
+ ...response.options,
183
+ isSerializedRedirect: true
184
+ },
185
+ {
186
+ headers: response.headers
187
+ }
188
+ );
189
+ }
190
+ return redirect;
191
+ }
32
192
  return response;
33
- });
193
+ };
194
+ return h3.requestHandler(startRequestResolver);
34
195
  };
35
196
  }
36
- function getStartResponseHeaders(opts) {
37
- let headers = startClientCore.mergeHeaders(
38
- h3.getResponseHeaders(opts.event),
39
- opts.event.___ssrRpcResponseHeaders,
40
- {
41
- "Content-Type": "text/html; charset=UTF-8"
42
- },
43
- ...opts.router.state.matches.map((match) => {
44
- return match.headers;
45
- })
46
- );
47
- const { redirect } = opts.router.state;
48
- if (redirect) {
49
- headers = startClientCore.mergeHeaders(headers, redirect.headers, {
50
- Location: redirect.href
197
+ async function handleServerRoutes({
198
+ routeTree,
199
+ request
200
+ }) {
201
+ const { flatRoutes, routesById, routesByPath } = routerCore.processRouteTree({
202
+ routeTree,
203
+ initRoute: (route, i) => {
204
+ route.init({
205
+ originalIndex: i
206
+ });
207
+ }
208
+ });
209
+ const url = new URL(request.url);
210
+ const pathname = url.pathname;
211
+ const history$1 = history.createMemoryHistory({
212
+ initialEntries: [pathname]
213
+ });
214
+ const { matchedRoutes, foundRoute, routeParams } = routerCore.getMatchedRoutes({
215
+ pathname: history$1.location.pathname,
216
+ basepath: "/",
217
+ caseSensitive: true,
218
+ routesByPath,
219
+ routesById,
220
+ flatRoutes
221
+ });
222
+ let response;
223
+ if (foundRoute && foundRoute.id !== routerCore.rootRouteId) {
224
+ const method = Object.keys(foundRoute.options.methods).find(
225
+ (method2) => method2.toLowerCase() === request.method.toLowerCase()
226
+ );
227
+ if (method) {
228
+ const handler = foundRoute.options.methods[method];
229
+ if (handler) {
230
+ const middlewares = startClientCore.flattenMiddlewares(
231
+ matchedRoutes.flatMap((r) => r.options.middleware).filter(Boolean)
232
+ ).map((d) => d.options.server);
233
+ middlewares.push(handlerToMiddleware(handler));
234
+ const ctx = await executeMiddleware(middlewares, {
235
+ request,
236
+ context: {},
237
+ params: routeParams,
238
+ pathname: history$1.location.pathname
239
+ });
240
+ response = ctx.response;
241
+ }
242
+ }
243
+ }
244
+ return [matchedRoutes, response];
245
+ }
246
+ function handlerToMiddleware(handler) {
247
+ return async ({ next: _next, ...rest }) => ({
248
+ response: await handler(rest)
249
+ });
250
+ }
251
+ function executeMiddleware(middlewares, ctx) {
252
+ let index = -1;
253
+ const next = async (ctx2) => {
254
+ index++;
255
+ const middleware = middlewares[index];
256
+ if (!middleware) return ctx2;
257
+ const result = await middleware({
258
+ ...ctx2,
259
+ // Allow the middleware to call the next middleware in the chain
260
+ next: async (nextCtx) => {
261
+ const nextResult = await next({ ...ctx2, ...nextCtx });
262
+ return Object.assign(ctx2, handleCtxResult(nextResult));
263
+ }
264
+ // Allow the middleware result to extend the return context
265
+ }).catch((err) => {
266
+ if (isSpecialResponse(err)) {
267
+ return {
268
+ response: err
269
+ };
270
+ }
271
+ throw err;
51
272
  });
273
+ return Object.assign(ctx2, handleCtxResult(result));
274
+ };
275
+ return handleCtxResult(next(ctx));
276
+ }
277
+ function handleCtxResult(result) {
278
+ if (isSpecialResponse(result)) {
279
+ return {
280
+ response: result
281
+ };
52
282
  }
53
- return headers;
283
+ return result;
284
+ }
285
+ function isSpecialResponse(err) {
286
+ return isResponse(err) || routerCore.isRedirect(err);
287
+ }
288
+ function isResponse(response) {
289
+ return response instanceof Response;
54
290
  }
55
291
  exports.createStartHandler = createStartHandler;
292
+ exports.getStartResponseHeaders = getStartResponseHeaders;
56
293
  //# sourceMappingURL=createStartHandler.cjs.map
@@ -1 +1 @@
1
- {"version":3,"file":"createStartHandler.cjs","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":["eventHandler","toWebRequest","history","createMemoryHistory","attachRouterServerSsrUtils","dehydrateRouter","mergeHeaders","getResponseHeaders"],"mappings":";;;;;;AAaO,SAAS,mBAGd;AAAA,EACA;AAAA,EACA;AACF,GAG8C;AAC5C,SAAO,CAAC,OAAO;AACN,WAAAA,GAAAA,aAAa,OAAO,UAAU;AAC7B,YAAA,UAAUC,gBAAa,KAAK;AAElC,YAAM,MAAM,IAAI,IAAI,QAAQ,GAAG;AAC/B,YAAM,OAAO,IAAI,KAAK,QAAQ,IAAI,QAAQ,EAAE;AAG5C,YAAMC,YAAUC,QAAAA,oBAAoB;AAAA,QAClC,gBAAgB,CAAC,IAAI;AAAA,MAAA,CACtB;AAED,YAAM,SAAS,aAAa;AAEDC,2CAAA,QAAQ,OAAM,yDAAqB;AAG9D,aAAO,OAAO;AAAA,QACZF,SAAAA;AAAAA,MAAA,CACD;AAED,YAAM,OAAO,KAAK;AAElBG,gBAAAA,gBAAgB,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,UAAUC,gBAAA;AAAA,IACZC,GAAA,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,cAAAD,gBAAA,aAAa,SAAS,SAAS,SAAS;AAAA,MAChD,UAAU,SAAS;AAAA,IAAA,CACpB;AAAA,EAAA;AAEI,SAAA;AACT;;"}
1
+ {"version":3,"file":"createStartHandler.cjs","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":["mergeHeaders","getResponseHeaders","url","history","createMemoryHistory","attachRouterServerSsrUtils","getStartManifest","joinPaths","trimPath","handleServerAction","response","json","dehydrateRouter","isRedirect","isResolvedRedirect","requestHandler","processRouteTree","getMatchedRoutes","rootRouteId","method","flattenMiddlewares","ctx"],"mappings":"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"}
@@ -1,8 +1,10 @@
1
- import { eventHandler, EventHandlerResponse } from 'h3';
1
+ import { RequestHandler } from './h3.cjs';
2
+ import { AnyRouter } from '@tanstack/router-core';
2
3
  import { HandlerCallback } from './handlerCallback.cjs';
3
- import { AnyRouter, Manifest } from '@tanstack/router-core';
4
- export type CustomizeStartHandler<TRouter extends AnyRouter, TResponse extends EventHandlerResponse = EventHandlerResponse> = (cb: HandlerCallback<TRouter, TResponse>) => ReturnType<typeof eventHandler>;
5
- export declare function createStartHandler<TRouter extends AnyRouter, TResponse extends EventHandlerResponse = EventHandlerResponse>({ createRouter, getRouterManifest, }: {
4
+ export type CustomizeStartHandler<TRouter extends AnyRouter> = (cb: HandlerCallback<TRouter>) => RequestHandler;
5
+ export declare function getStartResponseHeaders(opts: {
6
+ router: AnyRouter;
7
+ }): Headers;
8
+ export declare function createStartHandler<TRouter extends AnyRouter>({ createRouter, }: {
6
9
  createRouter: () => TRouter;
7
- getRouterManifest?: () => Manifest | Promise<Manifest>;
8
- }): CustomizeStartHandler<TRouter, TResponse>;
10
+ }): CustomizeStartHandler<TRouter>;
package/dist/cjs/h3.cjs CHANGED
@@ -2,7 +2,7 @@
2
2
  Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
3
3
  const node_async_hooks = require("node:async_hooks");
4
4
  const h3 = require("h3");
5
- const unctx = require("unctx");
5
+ const eventStorage = new node_async_hooks.AsyncLocalStorage();
6
6
  function _setContext(event, key, value) {
7
7
  event.context[key] = value;
8
8
  }
@@ -12,41 +12,27 @@ function _getContext(event, key) {
12
12
  function defineMiddleware(options) {
13
13
  return options;
14
14
  }
15
- function toWebRequestH3(event) {
16
- let readableStream;
17
- const url = getRequestURL(event);
18
- const base = {
19
- // @ts-ignore Undici option
20
- duplex: "half",
21
- method: event.method,
22
- headers: event.headers
23
- };
24
- if (event.node.req.body instanceof ArrayBuffer) {
25
- return new Request(url, {
26
- ...base,
27
- body: event.node.req.body
28
- });
29
- }
30
- return new Request(url, {
31
- ...base,
32
- get body() {
33
- if (readableStream) {
34
- return readableStream;
35
- }
36
- readableStream = getRequestWebStream(event);
37
- return readableStream;
38
- }
15
+ function defineEventHandler(handler) {
16
+ return h3.defineEventHandler((event) => {
17
+ return runWithEvent(event, () => handler(event));
39
18
  });
40
19
  }
41
- function toWebRequest(event) {
42
- event.web ?? (event.web = {
43
- request: toWebRequestH3(event),
44
- url: getRequestURL(event)
20
+ function eventHandler(handler) {
21
+ return h3.eventHandler((event) => {
22
+ return runWithEvent(event, () => handler(event));
45
23
  });
46
- return event.web.request;
47
24
  }
48
- function getHTTPEvent() {
49
- return getEvent();
25
+ async function runWithEvent(event, fn) {
26
+ return eventStorage.run(event, fn);
27
+ }
28
+ function getEvent() {
29
+ const event = eventStorage.getStore();
30
+ if (!event) {
31
+ throw new Error(
32
+ `No HTTPEvent found in AsyncLocalStorage. Make sure you are using the function within the server runtime.`
33
+ );
34
+ }
35
+ return event;
50
36
  }
51
37
  const HTTPEventSymbol = Symbol("$HTTPEvent");
52
38
  function isEvent(obj) {
@@ -54,15 +40,9 @@ function isEvent(obj) {
54
40
  }
55
41
  function createWrapperFunction(h3Function) {
56
42
  return function(...args) {
57
- var _a;
58
43
  const event = args[0];
59
44
  if (!isEvent(event)) {
60
- if (!((_a = globalThis.app.config.server.experimental) == null ? void 0 : _a.asyncContext)) {
61
- throw new Error(
62
- "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."
63
- );
64
- }
65
- args.unshift(getHTTPEvent());
45
+ args.unshift(getEvent());
66
46
  } else {
67
47
  args[0] = event instanceof h3.H3Event || event.__is_event__ ? event : event[HTTPEventSymbol];
68
48
  }
@@ -149,26 +129,9 @@ const removeResponseHeader = createWrapperFunction(h3.removeResponseHeader);
149
129
  const getContext = createWrapperFunction(_getContext);
150
130
  const setContext = createWrapperFunction(_setContext);
151
131
  const clearResponseHeaders = createWrapperFunction(h3.clearResponseHeaders);
152
- const getWebRequest = createWrapperFunction(toWebRequest);
153
- function getNitroAsyncContext() {
154
- var _a;
155
- const nitroAsyncContext = unctx.getContext("nitro-app", {
156
- asyncContext: ((_a = globalThis.app.config.server.experimental) == null ? void 0 : _a.asyncContext) ? true : false,
157
- AsyncLocalStorage: node_async_hooks.AsyncLocalStorage
158
- });
159
- return nitroAsyncContext;
160
- }
161
- function getEvent() {
162
- const event = getNitroAsyncContext().use().event;
163
- if (!event) {
164
- throw new Error(
165
- `No HTTPEvent found in AsyncLocalStorage. Make sure you are using the function within the server runtime.`
166
- );
167
- }
168
- return event;
169
- }
170
- async function handleHTTPEvent(event) {
171
- return await globalThis.$handle(event);
132
+ const getWebRequest = createWrapperFunction(h3.toWebRequest);
133
+ function requestHandler(handler) {
134
+ return handler;
172
135
  }
173
136
  Object.defineProperty(exports, "H3Error", {
174
137
  enumerable: true,
@@ -206,14 +169,6 @@ Object.defineProperty(exports, "createRouter", {
206
169
  enumerable: true,
207
170
  get: () => h3.createRouter
208
171
  });
209
- Object.defineProperty(exports, "createServer", {
210
- enumerable: true,
211
- get: () => h3.createApp
212
- });
213
- Object.defineProperty(exports, "defineEventHandler", {
214
- enumerable: true,
215
- get: () => h3.defineEventHandler
216
- });
217
172
  Object.defineProperty(exports, "defineLazyEventHandler", {
218
173
  enumerable: true,
219
174
  get: () => h3.defineLazyEventHandler
@@ -242,10 +197,6 @@ Object.defineProperty(exports, "dynamicEventHandler", {
242
197
  enumerable: true,
243
198
  get: () => h3.dynamicEventHandler
244
199
  });
245
- Object.defineProperty(exports, "eventHandler", {
246
- enumerable: true,
247
- get: () => h3.eventHandler
248
- });
249
200
  Object.defineProperty(exports, "fromNodeMiddleware", {
250
201
  enumerable: true,
251
202
  get: () => h3.fromNodeMiddleware
@@ -318,6 +269,10 @@ Object.defineProperty(exports, "toWebHandler", {
318
269
  enumerable: true,
319
270
  get: () => h3.toWebHandler
320
271
  });
272
+ Object.defineProperty(exports, "toWebRequest", {
273
+ enumerable: true,
274
+ get: () => h3.toWebRequest
275
+ });
321
276
  Object.defineProperty(exports, "useBase", {
322
277
  enumerable: true,
323
278
  get: () => h3.useBase
@@ -333,8 +288,10 @@ exports.assertMethod = assertMethod;
333
288
  exports.clearResponseHeaders = clearResponseHeaders;
334
289
  exports.clearSession = clearSession;
335
290
  exports.defaultContentType = defaultContentType;
291
+ exports.defineEventHandler = defineEventHandler;
336
292
  exports.defineMiddleware = defineMiddleware;
337
293
  exports.deleteCookie = deleteCookie;
294
+ exports.eventHandler = eventHandler;
338
295
  exports.fetchWithEvent = fetchWithEvent;
339
296
  exports.getContext = getContext;
340
297
  exports.getCookie = getCookie;
@@ -363,7 +320,6 @@ exports.getValidatedRouterParams = getValidatedRouterParams;
363
320
  exports.getWebRequest = getWebRequest;
364
321
  exports.handleCacheHeaders = handleCacheHeaders;
365
322
  exports.handleCors = handleCors;
366
- exports.handleHTTPEvent = handleHTTPEvent;
367
323
  exports.isEvent = isEvent;
368
324
  exports.isMethod = isMethod;
369
325
  exports.isPreflightRequest = isPreflightRequest;
@@ -375,6 +331,8 @@ exports.readMultipartFormData = readMultipartFormData;
375
331
  exports.readRawBody = readRawBody;
376
332
  exports.readValidatedBody = readValidatedBody;
377
333
  exports.removeResponseHeader = removeResponseHeader;
334
+ exports.requestHandler = requestHandler;
335
+ exports.runWithEvent = runWithEvent;
378
336
  exports.sealSession = sealSession;
379
337
  exports.send = send;
380
338
  exports.sendError = sendError;
@@ -390,7 +348,6 @@ exports.setHeaders = setHeaders;
390
348
  exports.setResponseHeader = setResponseHeader;
391
349
  exports.setResponseHeaders = setResponseHeaders;
392
350
  exports.setResponseStatus = setResponseStatus;
393
- exports.toWebRequest = toWebRequest;
394
351
  exports.unsealSession = unsealSession;
395
352
  exports.updateSession = updateSession;
396
353
  exports.useSession = useSession;