@tanstack/start-server-core 1.120.4-alpha.11 → 1.120.4-alpha.13

package/dist/cjs/createStartHandler.cjs

@@ -126,6 +126,20 @@ function createStartHandler({
         }
       })();
       if (routerCore.isRedirect(response)) {
+        if (routerCore.isResolvedRedirect(response)) {
+          if (request.headers.get("x-tsr-redirect") === "manual") {
+            return startClientCore.json(
+              {
+                ...response.options,
+                isSerializedRedirect: true
+              },
+              {
+                headers: response.headers
+              }
+            );
+          }
+          return response;
+        }
         if (response.options.to && typeof response.options.to === "string" && !response.options.to.startsWith("/")) {
           throw new Error(
             `Server side redirects must use absolute paths via the 'href' or 'to' options. Received: ${JSON.stringify(response.options)}`
@@ -148,20 +162,13 @@ function createStartHandler({
               isSerializedRedirect: true
             },
             {
-              headers: redirect.headers
+              headers: response.headers
             }
           );
         }
         return redirect;
       }
-      const body = response.status === 204 ? null : await response.clone().blob();
-      const headers = new Headers(response.headers);
-      headers.append("Access-Control-Expose-Headers", routerCore.tsrRedirectHeaderKey);
-      return new Response(body, {
-        status: response.status,
-        statusText: response.statusText,
-        headers
-      });
+      return response;
     });
   };
 }
@@ -254,7 +261,10 @@ function handleCtxResult(result) {
   return result;
 }
 function isSpecialResponse(err) {
-  return err instanceof Response || routerCore.isRedirect(err);
+  return isResponse(err) || routerCore.isRedirect(err);
+}
+function isResponse(response) {
+  return response instanceof Response;
 }
 exports.createStartHandler = createStartHandler;
 exports.getStartResponseHeaders = getStartResponseHeaders;

package/dist/cjs/createStartHandler.cjs.map

@@ -1 +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  joinPaths,\n  processRouteTree,\n  rootRouteId,\n  trimPath,\n  tsrRedirectHeaderKey,\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    return requestHandler(async ({ request }) => {\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              // @ts-expect-error\n              return (await import('tanstack:server-routes')) as {\n                routeTree: AnyServerRoute\n              }\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 (\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: redirect.headers,\n            },\n          )\n        }\n\n        return redirect\n      }\n\n      // Add Access-Control-Expose-Headers\n      // With HTTPs the response/header objects are immutable, therefore we must clone them\n      const body =\n        response.status === 204 ? null : await response.clone().blob()\n      const headers = new Headers(response.headers)\n      headers.append('Access-Control-Expose-Headers', tsrRedirectHeaderKey)\n\n      return new Response(body, {\n        status: response.status,\n        statusText: response.statusText,\n        headers,\n      })\n    })\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, ...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 err instanceof Response || isRedirect(err)\n}\n"],"names":["mergeHeaders","getResponseHeaders","requestHandler","history","createMemoryHistory","attachRouterServerSsrUtils","getStartManifest","joinPaths","trimPath","handleServerAction","response","json","dehydrateRouter","isRedirect","tsrRedirectHeaderKey","processRouteTree","getMatchedRoutes","rootRouteId","method","flattenMiddlewares","ctx"],"mappings":"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"}
+{"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    return requestHandler(async ({ request }) => {\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              // @ts-expect-error\n              return (await import('tanstack:server-routes')) as {\n                routeTree: AnyServerRoute\n              }\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}\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, ...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","requestHandler","history","createMemoryHistory","attachRouterServerSsrUtils","getStartManifest","joinPaths","trimPath","handleServerAction","response","json","dehydrateRouter","isRedirect","isResolvedRedirect","processRouteTree","getMatchedRoutes","rootRouteId","method","flattenMiddlewares","ctx"],"mappings":"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"}

package/dist/esm/createStartHandler.js

@@ -1,6 +1,6 @@
 import { createMemoryHistory } from "@tanstack/history";
 import { mergeHeaders, json, flattenMiddlewares } from "@tanstack/start-client-core";
-import { joinPaths, trimPath, isRedirect, tsrRedirectHeaderKey, processRouteTree, getMatchedRoutes, rootRouteId } from "@tanstack/router-core";
+import { joinPaths, trimPath, isRedirect, isResolvedRedirect, processRouteTree, getMatchedRoutes, rootRouteId } from "@tanstack/router-core";
 import { getResponseHeaders, requestHandler } from "./h3.js";
 import { attachRouterServerSsrUtils, dehydrateRouter } from "./ssr-server.js";
 import { getStartManifest } from "./router-manifest.js";
@@ -102,6 +102,20 @@ function createStartHandler({
         }
       })();
       if (isRedirect(response)) {
+        if (isResolvedRedirect(response)) {
+          if (request.headers.get("x-tsr-redirect") === "manual") {
+            return json(
+              {
+                ...response.options,
+                isSerializedRedirect: true
+              },
+              {
+                headers: response.headers
+              }
+            );
+          }
+          return response;
+        }
         if (response.options.to && typeof response.options.to === "string" && !response.options.to.startsWith("/")) {
           throw new Error(
             `Server side redirects must use absolute paths via the 'href' or 'to' options. Received: ${JSON.stringify(response.options)}`
@@ -124,20 +138,13 @@ function createStartHandler({
               isSerializedRedirect: true
             },
             {
-              headers: redirect.headers
+              headers: response.headers
             }
           );
         }
         return redirect;
       }
-      const body = response.status === 204 ? null : await response.clone().blob();
-      const headers = new Headers(response.headers);
-      headers.append("Access-Control-Expose-Headers", tsrRedirectHeaderKey);
-      return new Response(body, {
-        status: response.status,
-        statusText: response.statusText,
-        headers
-      });
+      return response;
     });
   };
 }
@@ -230,7 +237,10 @@ function handleCtxResult(result) {
   return result;
 }
 function isSpecialResponse(err) {
-  return err instanceof Response || isRedirect(err);
+  return isResponse(err) || isRedirect(err);
+}
+function isResponse(response) {
+  return response instanceof Response;
 }
 export {
   createStartHandler,

package/dist/esm/createStartHandler.js.map

@@ -1 +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  joinPaths,\n  processRouteTree,\n  rootRouteId,\n  trimPath,\n  tsrRedirectHeaderKey,\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    return requestHandler(async ({ request }) => {\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              // @ts-expect-error\n              return (await import('tanstack:server-routes')) as {\n                routeTree: AnyServerRoute\n              }\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 (\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: redirect.headers,\n            },\n          )\n        }\n\n        return redirect\n      }\n\n      // Add Access-Control-Expose-Headers\n      // With HTTPs the response/header objects are immutable, therefore we must clone them\n      const body =\n        response.status === 204 ? null : await response.clone().blob()\n      const headers = new Headers(response.headers)\n      headers.append('Access-Control-Expose-Headers', tsrRedirectHeaderKey)\n\n      return new Response(body, {\n        status: response.status,\n        statusText: response.statusText,\n        headers,\n      })\n    })\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, ...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 err instanceof Response || isRedirect(err)\n}\n"],"names":["response","method","ctx"],"mappings":"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"}
+{"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    return requestHandler(async ({ request }) => {\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              // @ts-expect-error\n              return (await import('tanstack:server-routes')) as {\n                routeTree: AnyServerRoute\n              }\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}\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, ...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":["response","method","ctx"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/start-server-core",
-  "version": "1.120.4-alpha.11",
+  "version": "1.120.4-alpha.13",
   "description": "Modern and scalable routing for React applications",
   "author": "Tanner Linsley",
   "license": "MIT",
@@ -54,9 +54,9 @@
     "tiny-warning": "^1.0.3",
     "unctx": "^2.4.1",
     "undici": "^7.8.0",
-    "@tanstack/history": "^1.120.4-alpha.1",
-    "@tanstack/router-core": "^1.120.4-alpha.10",
-    "@tanstack/start-client-core": "^1.120.4-alpha.10"
+    "@tanstack/router-core": "^1.120.4-alpha.13",
+    "@tanstack/start-client-core": "^1.120.4-alpha.13",
+    "@tanstack/history": "^1.120.4-alpha.1"
   },
   "devDependencies": {
     "@types/jsesc": "^3.0.3",

package/src/createStartHandler.ts

@@ -7,11 +7,11 @@ import {
 import {
   getMatchedRoutes,
   isRedirect,
+  isResolvedRedirect,
   joinPaths,
   processRouteTree,
   rootRouteId,
   trimPath,
-  tsrRedirectHeaderKey,
 } from '@tanstack/router-core'
 import { getResponseHeaders, requestHandler } from './h3'
 import { attachRouterServerSsrUtils, dehydrateRouter } from './ssr-server'
@@ -165,6 +165,20 @@ export function createStartHandler<TRouter extends AnyRouter>({
       })()
 
       if (isRedirect(response)) {
+        if (isResolvedRedirect(response)) {
+          if (request.headers.get('x-tsr-redirect') === 'manual') {
+            return json(
+              {
+                ...response.options,
+                isSerializedRedirect: true,
+              },
+              {
+                headers: response.headers,
+              },
+            )
+          }
+          return response
+        }
         if (
           response.options.to &&
           typeof response.options.to === 'string' &&
@@ -199,7 +213,7 @@ export function createStartHandler<TRouter extends AnyRouter>({
               isSerializedRedirect: true,
             },
             {
-              headers: redirect.headers,
+              headers: response.headers,
             },
           )
         }
@@ -207,18 +221,7 @@ export function createStartHandler<TRouter extends AnyRouter>({
         return redirect
       }
 
-      // Add Access-Control-Expose-Headers
-      // With HTTPs the response/header objects are immutable, therefore we must clone them
-      const body =
-        response.status === 204 ? null : await response.clone().blob()
-      const headers = new Headers(response.headers)
-      headers.append('Access-Control-Expose-Headers', tsrRedirectHeaderKey)
-
-      return new Response(body, {
-        status: response.status,
-        statusText: response.statusText,
-        headers,
-      })
+      return response
     })
   }
 }
@@ -355,5 +358,9 @@ function handleCtxResult(result: TODO) {
 }
 
 function isSpecialResponse(err: TODO) {
-  return err instanceof Response || isRedirect(err)
+  return isResponse(err) || isRedirect(err)
+}
+
+function isResponse(response: Response): response is Response {
+  return response instanceof Response
 }