@tanstack/start-server-core 1.143.8 → 1.143.12

package/dist/esm/createStartHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"createStartHandler.js","sources":["../../src/createStartHandler.ts"],"sourcesContent":["import { createMemoryHistory } from '@tanstack/history'\nimport { flattenMiddlewares, mergeHeaders } from '@tanstack/start-client-core'\nimport {\n  executeRewriteInput,\n  isRedirect,\n  isResolvedRedirect,\n} from '@tanstack/router-core'\nimport {\n  attachRouterServerSsrUtils,\n  getOrigin,\n} from '@tanstack/router-core/ssr/server'\nimport { runWithStartContext } from '@tanstack/start-storage-context'\nimport { requestHandler } from './request-response'\nimport { getStartManifest } from './router-manifest'\nimport { handleServerAction } from './server-functions-handler'\n\nimport { HEADERS } from './constants'\nimport { ServerFunctionSerializationAdapter } from './serializer/ServerFunctionSerializationAdapter'\nimport type {\n  AnyStartInstanceOptions,\n  RouteMethod,\n  RouteMethodHandlerFn,\n  RouterEntry,\n  StartEntry,\n} from '@tanstack/start-client-core'\nimport type { RequestHandler } from './request-handler'\nimport type {\n  AnyRoute,\n  AnyRouter,\n  Awaitable,\n  Manifest,\n  Register,\n} from '@tanstack/router-core'\nimport type { HandlerCallback } from '@tanstack/router-core/ssr/server'\n\ntype TODO = any\n\nfunction getStartResponseHeaders(opts: { router: AnyRouter }) {\n  const 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  return headers\n}\n\nexport function createStartHandler<TRegister = Register>(\n  cb: HandlerCallback<AnyRouter>,\n): RequestHandler<TRegister> {\n  const ROUTER_BASEPATH = process.env.TSS_ROUTER_BASEPATH || '/'\n  let startRoutesManifest: Manifest | null = null\n  let startEntry: StartEntry | null = null\n  let routerEntry: RouterEntry | null = null\n  const getEntries = async (): Promise<{\n    startEntry: StartEntry\n    routerEntry: RouterEntry\n  }> => {\n    if (routerEntry === null) {\n      // @ts-ignore when building, we currently don't respect tsconfig.ts' `include` so we are not picking up the .d.ts from start-client-core\n      routerEntry = await import('#tanstack-router-entry')\n    }\n    if (startEntry === null) {\n      // @ts-ignore when building, we currently don't respect tsconfig.ts' `include` so we are not picking up the .d.ts from start-client-core\n      startEntry = await import('#tanstack-start-entry')\n    }\n    return {\n      startEntry: startEntry as unknown as StartEntry,\n      routerEntry: routerEntry as unknown as RouterEntry,\n    }\n  }\n\n  const startRequestResolver: RequestHandler<Register> = async (\n    request,\n    requestOpts,\n  ) => {\n    let router: AnyRouter | null = null as AnyRouter | null\n    // Track whether the callback will handle cleanup\n    let cbWillCleanup = false as boolean\n    try {\n      const origin = getOrigin(request)\n\n      const url = new URL(request.url)\n      const href = url.href.replace(url.origin, '')\n\n      const startOptions: AnyStartInstanceOptions =\n        (await (await getEntries()).startEntry.startInstance?.getOptions()) ||\n        ({} as AnyStartInstanceOptions)\n\n      const serializationAdapters = [\n        ...(startOptions.serializationAdapters || []),\n        ServerFunctionSerializationAdapter,\n      ]\n\n      const requestStartOptions = {\n        ...startOptions,\n        serializationAdapters,\n      }\n\n      const getRouter = async () => {\n        if (router) return router\n        router = await (await getEntries()).routerEntry.getRouter()\n\n        // Update the client-side router with the history\n        const isPrerendering = process.env.TSS_PRERENDERING === 'true'\n        // env var is set during dev is SPA mode is enabled\n        let isShell = process.env.TSS_SHELL === 'true'\n        if (isPrerendering && !isShell) {\n          // only read the shell header if we are prerendering\n          // to avoid runtime behavior changes by injecting this header\n          // the header is set by the prerender plugin\n          isShell = request.headers.get(HEADERS.TSS_SHELL) === 'true'\n        }\n\n        // Create a history for the client-side router\n        const history = createMemoryHistory({\n          initialEntries: [href],\n        })\n\n        router.update({\n          history,\n          isShell,\n          isPrerendering,\n          origin: router.options.origin ?? origin,\n          ...{\n            defaultSsr: requestStartOptions.defaultSsr,\n            serializationAdapters: [\n              ...requestStartOptions.serializationAdapters,\n              ...(router.options.serializationAdapters || []),\n            ],\n          },\n          basepath: ROUTER_BASEPATH,\n        })\n        return router\n      }\n\n      const requestHandlerMiddleware = handlerToMiddleware(\n        async ({ context }) => {\n          const response = await runWithStartContext(\n            {\n              getRouter,\n              startOptions: requestStartOptions,\n              contextAfterGlobalMiddlewares: context,\n              request,\n            },\n            async () => {\n              try {\n                // First, let's attempt to handle server functions\n                if (href.startsWith(process.env.TSS_SERVER_FN_BASE)) {\n                  return await handleServerAction({\n                    request,\n                    context: requestOpts?.context,\n                  })\n                }\n\n                const executeRouter = async ({\n                  serverContext,\n                }: {\n                  serverContext: any\n                }) => {\n                  const requestAcceptHeader =\n                    request.headers.get('Accept') || '*/*'\n                  const splitRequestAcceptHeader =\n                    requestAcceptHeader.split(',')\n\n                  const supportedMimeTypes = ['*/*', 'text/html']\n                  const isRouterAcceptSupported = supportedMimeTypes.some(\n                    (mimeType) =>\n                      splitRequestAcceptHeader.some((acceptedMimeType) =>\n                        acceptedMimeType.trim().startsWith(mimeType),\n                      ),\n                  )\n\n                  if (!isRouterAcceptSupported) {\n                    return Response.json(\n                      {\n                        error: 'Only HTML requests are supported here',\n                      },\n                      {\n                        status: 500,\n                      },\n                    )\n                  }\n\n                  // if the startRoutesManifest is not loaded yet, load it once\n                  if (startRoutesManifest === null) {\n                    startRoutesManifest = await getStartManifest()\n                  }\n                  const router = await getRouter()\n                  attachRouterServerSsrUtils({\n                    router,\n                    manifest: startRoutesManifest,\n                  })\n\n                  router.update({ additionalContext: { serverContext } })\n                  await router.load()\n\n                  // If there was a redirect, skip rendering the page at all\n                  if (router.state.redirect) {\n                    return router.state.redirect\n                  }\n\n                  await router.serverSsr!.dehydrate()\n\n                  const responseHeaders = getStartResponseHeaders({ router })\n                  // Mark that the callback will handle cleanup\n                  cbWillCleanup = true\n                  const response = await cb({\n                    request,\n                    router,\n                    responseHeaders,\n                  })\n\n                  return response\n                }\n\n                const response = await handleServerRoutes({\n                  getRouter,\n                  request,\n                  executeRouter,\n                  context,\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          return response\n        },\n      )\n\n      const flattenedMiddlewares = startOptions.requestMiddleware\n        ? flattenMiddlewares(startOptions.requestMiddleware)\n        : []\n      const middlewares = flattenedMiddlewares.map((d) => d.options.server)\n      const ctx = await executeMiddleware(\n        [...middlewares, requestHandlerMiddleware],\n        {\n          request,\n\n          context: requestOpts?.context || {},\n        },\n      )\n\n      const response: Response = ctx.response\n\n      if (isRedirect(response)) {\n        if (isResolvedRedirect(response)) {\n          if (request.headers.get('x-tsr-redirect') === 'manual') {\n            return Response.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. The redirect() method's \"to\" property accepts an internal path only. Use the \"href\" property to provide an external URL. 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 router = await getRouter()\n        const redirect = router.resolveRedirect(response)\n\n        if (request.headers.get('x-tsr-redirect') === 'manual') {\n          return Response.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    } finally {\n      if (router && !cbWillCleanup) {\n        // Clean up router SSR state if it was set up but won't be cleaned up by the callback\n        // (e.g., in redirect cases or early returns before the callback is invoked).\n        // When the callback runs, it handles cleanup (either via transformStreamWithRouter\n        // for streaming, or directly in renderRouterToString for non-streaming).\n        router.serverSsr?.cleanup()\n      }\n      router = null\n    }\n  }\n\n  return requestHandler(startRequestResolver)\n}\n\nasync function handleServerRoutes({\n  getRouter,\n  request,\n  executeRouter,\n  context,\n}: {\n  getRouter: () => Awaitable<AnyRouter>\n  request: Request\n  executeRouter: ({\n    serverContext,\n  }: {\n    serverContext: any\n  }) => Promise<Response>\n  context: any\n}) {\n  const router = await getRouter()\n  let url = new URL(request.url)\n  url = executeRewriteInput(router.rewrite, url)\n  const pathname = url.pathname\n  // this will perform a fuzzy match, however for server routes we need an exact match\n  // if the route is not an exact match, executeRouter will handle rendering the app router\n  // the match will be cached internally, so no extra work is done during the app router render\n  const { matchedRoutes, foundRoute, routeParams } =\n    router.getMatchedRoutes(pathname)\n\n  const isExactMatch = foundRoute && routeParams['**'] === undefined\n\n  // TODO: Error handling? What happens when its `throw redirect()` vs `throw new Error()`?\n\n  const middlewares = flattenMiddlewares(\n    matchedRoutes.flatMap((r) => r.options.server?.middleware).filter(Boolean),\n  ).map((d) => d.options.server)\n\n  const server = foundRoute?.options.server\n  if (server && isExactMatch) {\n    if (server.handlers) {\n      const handlers =\n        typeof server.handlers === 'function'\n          ? server.handlers({\n              createHandlers: (d: any) => d,\n            })\n          : server.handlers\n\n      const requestMethod = request.method.toUpperCase() as RouteMethod\n\n      // Attempt to find the method in the handlers\n      const handler = handlers[requestMethod] ?? handlers['ANY']\n\n      // If a method is found, execute the handler\n      if (handler) {\n        const mayDefer = !!foundRoute.options.component\n        if (typeof handler === 'function') {\n          middlewares.push(handlerToMiddleware(handler, mayDefer))\n        } else {\n          const { middleware } = handler\n          if (middleware && middleware.length) {\n            middlewares.push(\n              ...flattenMiddlewares(middleware).map((d) => d.options.server),\n            )\n          }\n          if (handler.handler) {\n            middlewares.push(handlerToMiddleware(handler.handler, mayDefer))\n          }\n        }\n      }\n    }\n  }\n\n  // eventually, execute the router\n  middlewares.push(\n    handlerToMiddleware((ctx) => executeRouter({ serverContext: ctx.context })),\n  )\n\n  const ctx = await executeMiddleware(middlewares, {\n    request,\n    context,\n    params: routeParams,\n    pathname,\n  })\n\n  const response: Response = ctx.response\n\n  return response\n}\n\nfunction throwRouteHandlerError() {\n  if (process.env.NODE_ENV === 'development') {\n    throw new Error(\n      `It looks like you forgot to return a response from your server route handler. If you want to defer to the app router, make sure to have a component set in this route.`,\n    )\n  }\n  throw new Error('Internal Server Error')\n}\n\nfunction throwIfMayNotDefer() {\n  if (process.env.NODE_ENV === 'development') {\n    throw new Error(\n      `You cannot defer to the app router if there is no component defined on this route.`,\n    )\n  }\n  throw new Error('Internal Server Error')\n}\nfunction handlerToMiddleware(\n  handler: RouteMethodHandlerFn<any, AnyRoute, any, any, any, any, any>,\n  mayDefer: boolean = false,\n) {\n  if (mayDefer) {\n    return handler as TODO\n  }\n  return async ({ next: _next, ...rest }: TODO) => {\n    const response = await handler({ ...rest, next: throwIfMayNotDefer })\n    if (!response) {\n      throwRouteHandlerError()\n    }\n    return response\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    let result\n    try {\n      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({\n            ...ctx,\n            ...nextCtx,\n            context: {\n              ...ctx.context,\n              ...(nextCtx?.context || {}),\n            },\n          })\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      })\n    } catch (err: TODO) {\n      if (isSpecialResponse(err)) {\n        result = {\n          response: err,\n        }\n      } else {\n        throw err\n      }\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","router","ctx"],"mappings":"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"}
+{"version":3,"file":"createStartHandler.js","sources":["../../src/createStartHandler.ts"],"sourcesContent":["import { createMemoryHistory } from '@tanstack/history'\nimport {\n  createNullProtoObject,\n  flattenMiddlewares,\n  mergeHeaders,\n  safeObjectMerge,\n} from '@tanstack/start-client-core'\nimport {\n  executeRewriteInput,\n  isRedirect,\n  isResolvedRedirect,\n} from '@tanstack/router-core'\nimport {\n  attachRouterServerSsrUtils,\n  getOrigin,\n} from '@tanstack/router-core/ssr/server'\nimport { runWithStartContext } from '@tanstack/start-storage-context'\nimport { requestHandler } from './request-response'\nimport { getStartManifest } from './router-manifest'\nimport { handleServerAction } from './server-functions-handler'\n\nimport { HEADERS } from './constants'\nimport { ServerFunctionSerializationAdapter } from './serializer/ServerFunctionSerializationAdapter'\nimport type {\n  AnyFunctionMiddleware,\n  AnyRequestMiddleware,\n  AnyStartInstanceOptions,\n  RouteMethod,\n  RouteMethodHandlerFn,\n  RouterEntry,\n  StartEntry,\n} from '@tanstack/start-client-core'\nimport type { RequestHandler } from './request-handler'\nimport type {\n  AnyRoute,\n  AnyRouter,\n  Manifest,\n  Register,\n} from '@tanstack/router-core'\nimport type { HandlerCallback } from '@tanstack/router-core/ssr/server'\n\ntype TODO = any\n\ntype AnyMiddlewareServerFn =\n  | AnyRequestMiddleware['options']['server']\n  | AnyFunctionMiddleware['options']['server']\n\nfunction getStartResponseHeaders(opts: { router: AnyRouter }) {\n  const 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  return headers\n}\n\n// Cached entries - loaded once per process\nlet cachedStartEntry: StartEntry | null = null\nlet cachedRouterEntry: RouterEntry | null = null\nlet cachedManifest: Manifest | null = null\n\nasync function getEntries(): Promise<{\n  startEntry: StartEntry\n  routerEntry: RouterEntry\n}> {\n  if (cachedRouterEntry === null) {\n    // @ts-ignore when building, we currently don't respect tsconfig.ts' `include` so we are not picking up the .d.ts from start-client-core\n    cachedRouterEntry = await import('#tanstack-router-entry')\n  }\n  if (cachedStartEntry === null) {\n    // @ts-ignore when building, we currently don't respect tsconfig.ts' `include` so we are not picking up the .d.ts from start-client-core\n    cachedStartEntry = await import('#tanstack-start-entry')\n  }\n  return {\n    startEntry: cachedStartEntry as unknown as StartEntry,\n    routerEntry: cachedRouterEntry as unknown as RouterEntry,\n  }\n}\n\nasync function getManifest(): Promise<Manifest> {\n  if (cachedManifest === null) {\n    cachedManifest = await getStartManifest()\n  }\n  return cachedManifest\n}\n\n// Pre-computed constants\nconst ROUTER_BASEPATH = process.env.TSS_ROUTER_BASEPATH || '/'\nconst SERVER_FN_BASE = process.env.TSS_SERVER_FN_BASE\nconst IS_PRERENDERING = process.env.TSS_PRERENDERING === 'true'\nconst IS_SHELL_ENV = process.env.TSS_SHELL === 'true'\nconst IS_DEV = process.env.NODE_ENV === 'development'\n\n// Reusable error messages\nconst ERR_NO_RESPONSE = IS_DEV\n  ? `It looks like you forgot to return a response from your server route handler. If you want to defer to the app router, make sure to have a component set in this route.`\n  : 'Internal Server Error'\n\nconst ERR_NO_DEFER = IS_DEV\n  ? `You cannot defer to the app router if there is no component defined on this route.`\n  : 'Internal Server Error'\n\nfunction throwRouteHandlerError(): never {\n  throw new Error(ERR_NO_RESPONSE)\n}\n\nfunction throwIfMayNotDefer(): never {\n  throw new Error(ERR_NO_DEFER)\n}\n\n/**\n * Check if a value is a special response (Response or Redirect)\n */\nfunction isSpecialResponse(value: unknown): value is Response {\n  return value instanceof Response || isRedirect(value)\n}\n\n/**\n * Normalize middleware result to context shape\n */\nfunction handleCtxResult(result: TODO) {\n  if (isSpecialResponse(result)) {\n    return { response: result }\n  }\n  return result\n}\n\n/**\n * Execute a middleware chain\n */\nfunction executeMiddleware(middlewares: Array<TODO>, ctx: TODO): Promise<TODO> {\n  let index = -1\n\n  const next = async (nextCtx?: TODO): Promise<TODO> => {\n    // Merge context if provided using safeObjectMerge for prototype pollution prevention\n    if (nextCtx) {\n      if (nextCtx.context) {\n        ctx.context = safeObjectMerge(ctx.context, nextCtx.context)\n      }\n      // Copy own properties except context (Object.keys returns only own enumerable properties)\n      for (const key of Object.keys(nextCtx)) {\n        if (key !== 'context') {\n          ctx[key] = nextCtx[key]\n        }\n      }\n    }\n\n    index++\n    const middleware = middlewares[index]\n    if (!middleware) return ctx\n\n    let result: TODO\n    try {\n      result = await middleware({ ...ctx, next })\n    } catch (err) {\n      if (isSpecialResponse(err)) {\n        ctx.response = err\n        return ctx\n      }\n      throw err\n    }\n\n    const normalized = handleCtxResult(result)\n    if (normalized) {\n      if (normalized.response !== undefined) {\n        ctx.response = normalized.response\n      }\n      if (normalized.context) {\n        ctx.context = safeObjectMerge(ctx.context, normalized.context)\n      }\n    }\n\n    return ctx\n  }\n\n  return next()\n}\n\n/**\n * Wrap a route handler as middleware\n */\nfunction handlerToMiddleware(\n  handler: RouteMethodHandlerFn<any, AnyRoute, any, any, any, any, any>,\n  mayDefer: boolean = false,\n): TODO {\n  if (mayDefer) {\n    return handler\n  }\n  return async (ctx: TODO) => {\n    const response = await handler({ ...ctx, next: throwIfMayNotDefer })\n    if (!response) {\n      throwRouteHandlerError()\n    }\n    return response\n  }\n}\n\nexport function createStartHandler<TRegister = Register>(\n  cb: HandlerCallback<AnyRouter>,\n): RequestHandler<TRegister> {\n  const startRequestResolver: RequestHandler<Register> = async (\n    request,\n    requestOpts,\n  ) => {\n    let router: AnyRouter | null = null as AnyRouter | null\n    let cbWillCleanup = false as boolean\n\n    try {\n      const url = new URL(request.url)\n      const href = url.href.replace(url.origin, '')\n      const origin = getOrigin(request)\n\n      const entries = await getEntries()\n      const startOptions: AnyStartInstanceOptions =\n        (await entries.startEntry.startInstance?.getOptions()) ||\n        ({} as AnyStartInstanceOptions)\n\n      const serializationAdapters = [\n        ...(startOptions.serializationAdapters || []),\n        ServerFunctionSerializationAdapter,\n      ]\n\n      const requestStartOptions = {\n        ...startOptions,\n        serializationAdapters,\n      }\n\n      // Flatten request middlewares once\n      const flattenedRequestMiddlewares = startOptions.requestMiddleware\n        ? flattenMiddlewares(startOptions.requestMiddleware)\n        : []\n\n      // Create set for deduplication\n      const executedRequestMiddlewares = new Set<TODO>(\n        flattenedRequestMiddlewares,\n      )\n\n      // Memoized router getter\n      const getRouter = async (): Promise<AnyRouter> => {\n        if (router) return router\n\n        router = await entries.routerEntry.getRouter()\n\n        let isShell = IS_SHELL_ENV\n        if (IS_PRERENDERING && !isShell) {\n          isShell = request.headers.get(HEADERS.TSS_SHELL) === 'true'\n        }\n\n        const history = createMemoryHistory({\n          initialEntries: [href],\n        })\n\n        router.update({\n          history,\n          isShell,\n          isPrerendering: IS_PRERENDERING,\n          origin: router.options.origin ?? origin,\n          ...{\n            defaultSsr: requestStartOptions.defaultSsr,\n            serializationAdapters: [\n              ...requestStartOptions.serializationAdapters,\n              ...(router.options.serializationAdapters || []),\n            ],\n          },\n          basepath: ROUTER_BASEPATH,\n        })\n\n        return router\n      }\n\n      // Check for server function requests first (early exit)\n      if (SERVER_FN_BASE && url.pathname.startsWith(SERVER_FN_BASE)) {\n        const serverFnId = url.pathname\n          .slice(SERVER_FN_BASE.length)\n          .split('/')[0]\n\n        if (!serverFnId) {\n          throw new Error('Invalid server action param for serverFnId')\n        }\n\n        const serverFnHandler = async ({ context }: TODO) => {\n          return runWithStartContext(\n            {\n              getRouter,\n              startOptions: requestStartOptions,\n              contextAfterGlobalMiddlewares: context,\n              request,\n              executedRequestMiddlewares,\n            },\n            () =>\n              handleServerAction({\n                request,\n                context: requestOpts?.context,\n                serverFnId,\n              }),\n          )\n        }\n\n        const middlewares = flattenedRequestMiddlewares.map(\n          (d) => d.options.server,\n        )\n        const ctx = await executeMiddleware([...middlewares, serverFnHandler], {\n          request,\n          context: createNullProtoObject(requestOpts?.context),\n        })\n\n        return handleRedirectResponse(ctx.response, request, getRouter)\n      }\n\n      // Router execution function\n      const executeRouter = async (serverContext: TODO): Promise<Response> => {\n        const acceptHeader = request.headers.get('Accept') || '*/*'\n        const acceptParts = acceptHeader.split(',')\n        const supportedMimeTypes = ['*/*', 'text/html']\n\n        const isSupported = supportedMimeTypes.some((mimeType) =>\n          acceptParts.some((part) => part.trim().startsWith(mimeType)),\n        )\n\n        if (!isSupported) {\n          return Response.json(\n            { error: 'Only HTML requests are supported here' },\n            { status: 500 },\n          )\n        }\n\n        const manifest = await getManifest()\n        const routerInstance = await getRouter()\n\n        attachRouterServerSsrUtils({\n          router: routerInstance,\n          manifest,\n        })\n\n        routerInstance.update({ additionalContext: { serverContext } })\n        await routerInstance.load()\n\n        if (routerInstance.state.redirect) {\n          return routerInstance.state.redirect\n        }\n\n        await routerInstance.serverSsr!.dehydrate()\n\n        const responseHeaders = getStartResponseHeaders({\n          router: routerInstance,\n        })\n        cbWillCleanup = true\n\n        return cb({\n          request,\n          router: routerInstance,\n          responseHeaders,\n        })\n      }\n\n      // Main request handler\n      const requestHandlerMiddleware = async ({ context }: TODO) => {\n        return runWithStartContext(\n          {\n            getRouter,\n            startOptions: requestStartOptions,\n            contextAfterGlobalMiddlewares: context,\n            request,\n            executedRequestMiddlewares,\n          },\n          async () => {\n            try {\n              return await handleServerRoutes({\n                getRouter,\n                request,\n                url,\n                executeRouter,\n                context,\n                executedRequestMiddlewares,\n              })\n            } catch (err) {\n              if (err instanceof Response) {\n                return err\n              }\n              throw err\n            }\n          },\n        )\n      }\n\n      const middlewares = flattenedRequestMiddlewares.map(\n        (d) => d.options.server,\n      )\n      const ctx = await executeMiddleware(\n        [...middlewares, requestHandlerMiddleware],\n        { request, context: createNullProtoObject(requestOpts?.context) },\n      )\n\n      return handleRedirectResponse(ctx.response, request, getRouter)\n    } finally {\n      if (router && !cbWillCleanup) {\n        // Clean up router SSR state if it was set up but won't be cleaned up by the callback\n        // (e.g., in redirect cases or early returns before the callback is invoked).\n        // When the callback runs, it handles cleanup (either via transformStreamWithRouter\n        // for streaming, or directly in renderRouterToString for non-streaming).\n        router.serverSsr?.cleanup()\n      }\n      router = null\n    }\n  }\n\n  return requestHandler(startRequestResolver)\n}\n\nasync function handleRedirectResponse(\n  response: Response,\n  request: Request,\n  getRouter: () => Promise<AnyRouter>,\n): Promise<Response> {\n  if (!isRedirect(response)) {\n    return response\n  }\n\n  if (isResolvedRedirect(response)) {\n    if (request.headers.get('x-tsr-serverFn') === 'true') {\n      return Response.json(\n        { ...response.options, isSerializedRedirect: true },\n        { headers: response.headers },\n      )\n    }\n    return response\n  }\n\n  const opts = response.options\n  if (opts.to && typeof opts.to === 'string' && !opts.to.startsWith('/')) {\n    throw new Error(\n      `Server side redirects must use absolute paths via the 'href' or 'to' options. The redirect() method's \"to\" property accepts an internal path only. Use the \"href\" property to provide an external URL. Received: ${JSON.stringify(opts)}`,\n    )\n  }\n\n  if (\n    ['params', 'search', 'hash'].some(\n      (d) => typeof (opts as TODO)[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        opts,\n      )\n        .filter((d) => typeof (opts as TODO)[d] === 'function')\n        .map((d) => `\"${d}\"`)\n        .join(', ')}`,\n    )\n  }\n\n  const router = await getRouter()\n  const redirect = router.resolveRedirect(response)\n\n  if (request.headers.get('x-tsr-serverFn') === 'true') {\n    return Response.json(\n      { ...response.options, isSerializedRedirect: true },\n      { headers: response.headers },\n    )\n  }\n\n  return redirect\n}\n\nasync function handleServerRoutes({\n  getRouter,\n  request,\n  url,\n  executeRouter,\n  context,\n  executedRequestMiddlewares,\n}: {\n  getRouter: () => Promise<AnyRouter>\n  request: Request\n  url: URL\n  executeRouter: (serverContext: any) => Promise<Response>\n  context: any\n  executedRequestMiddlewares: Set<AnyRequestMiddleware>\n}): Promise<Response> {\n  const router = await getRouter()\n  const rewrittenUrl = executeRewriteInput(router.rewrite, url)\n  const pathname = rewrittenUrl.pathname\n  // this will perform a fuzzy match, however for server routes we need an exact match\n  // if the route is not an exact match, executeRouter will handle rendering the app router\n  // the match will be cached internally, so no extra work is done during the app router render\n  const { matchedRoutes, foundRoute, routeParams } =\n    router.getMatchedRoutes(pathname)\n\n  const isExactMatch = foundRoute && routeParams['**'] === undefined\n\n  // Collect and dedupe route middlewares\n  const routeMiddlewares: Array<AnyMiddlewareServerFn> = []\n\n  // Collect middleware from matched routes, filtering out those already executed\n  // in the request phase\n  for (const route of matchedRoutes) {\n    const serverMiddleware = route.options.server?.middleware as\n      | Array<AnyRequestMiddleware>\n      | undefined\n    if (serverMiddleware) {\n      const flattened = flattenMiddlewares(serverMiddleware)\n      for (const m of flattened) {\n        if (!executedRequestMiddlewares.has(m)) {\n          routeMiddlewares.push(m.options.server)\n        }\n      }\n    }\n  }\n\n  // Add handler middleware if exact match\n  const server = foundRoute?.options.server\n  if (server?.handlers && isExactMatch) {\n    const handlers =\n      typeof server.handlers === 'function'\n        ? server.handlers({ createHandlers: (d: any) => d })\n        : server.handlers\n\n    const requestMethod = request.method.toUpperCase() as RouteMethod\n    const handler = handlers[requestMethod] ?? handlers['ANY']\n\n    if (handler) {\n      const mayDefer = !!foundRoute.options.component\n\n      if (typeof handler === 'function') {\n        routeMiddlewares.push(handlerToMiddleware(handler, mayDefer))\n      } else {\n        if (handler.middleware?.length) {\n          const handlerMiddlewares = flattenMiddlewares(handler.middleware)\n          for (const m of handlerMiddlewares) {\n            routeMiddlewares.push(m.options.server)\n          }\n        }\n        if (handler.handler) {\n          routeMiddlewares.push(handlerToMiddleware(handler.handler, mayDefer))\n        }\n      }\n    }\n  }\n\n  // Final middleware: execute router\n  routeMiddlewares.push((ctx: TODO) => executeRouter(ctx.context))\n\n  const ctx = await executeMiddleware(routeMiddlewares, {\n    request,\n    context,\n    params: routeParams,\n    pathname,\n  })\n\n  return ctx.response\n}\n"],"names":["middlewares","ctx"],"mappings":"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"}

package/dist/esm/server-functions-handler.d.ts

@@ -1,4 +1,5 @@
-export declare const handleServerAction: ({ request, context, }: {
+export declare const handleServerAction: ({ request, context, serverFnId, }: {
     request: Request;
     context: any;
+    serverFnId: string;
 }) => Promise<any>;

package/dist/esm/server-functions-handler.js

@@ -1,49 +1,118 @@
-import { isNotFound } from "@tanstack/router-core";
+import { isNotFound, isRedirect } from "@tanstack/router-core";
 import invariant from "tiny-invariant";
-import { getDefaultSerovalPlugins, TSS_FORMDATA_CONTEXT, X_TSS_RAW_RESPONSE, X_TSS_SERIALIZED } from "@tanstack/start-client-core";
-import { fromJSON, toCrossJSONStream, toCrossJSONAsync } from "seroval";
+import { getDefaultSerovalPlugins, X_TSS_SERIALIZED, TSS_FORMDATA_CONTEXT, safeObjectMerge, X_TSS_RAW_RESPONSE } from "@tanstack/start-client-core";
+import { toCrossJSONStream, fromJSON, toCrossJSONAsync } from "seroval";
 import { getResponse } from "./request-response.js";
 import { getServerFnById } from "#tanstack-start-server-fn-resolver";
-let regex = void 0;
+let serovalPlugins = void 0;
+const FORM_DATA_CONTENT_TYPES = [
+  "multipart/form-data",
+  "application/x-www-form-urlencoded"
+];
+const MAX_PAYLOAD_SIZE = 1e6;
 const handleServerAction = async ({
   request,
-  context
+  context,
+  serverFnId
 }) => {
   const controller = new AbortController();
   const signal = controller.signal;
   const abort = () => controller.abort();
   request.signal.addEventListener("abort", abort);
-  if (regex === void 0) {
-    regex = new RegExp(`${process.env.TSS_SERVER_FN_BASE}([^/?#]+)`);
-  }
   const method = request.method;
-  const url = new URL(request.url, "http://localhost:3000");
-  const match = url.pathname.match(regex);
-  const serverFnId = match ? match[1] : null;
-  const search = Object.fromEntries(url.searchParams.entries());
-  const isCreateServerFn = "createServerFn" in search;
-  if (typeof serverFnId !== "string") {
-    throw new Error("Invalid server action param for serverFnId: " + serverFnId);
-  }
+  const methodLower = method.toLowerCase();
+  const url = new URL(request.url);
   const action = await getServerFnById(serverFnId, { fromClient: true });
-  const formDataContentTypes = [
-    "multipart/form-data",
-    "application/x-www-form-urlencoded"
-  ];
+  const isServerFn = request.headers.get("x-tsr-serverFn") === "true";
+  if (!serovalPlugins) {
+    serovalPlugins = getDefaultSerovalPlugins();
+  }
   const contentType = request.headers.get("Content-Type");
-  const serovalPlugins = getDefaultSerovalPlugins();
   function parsePayload(payload) {
     const parsedPayload = fromJSON(payload, { plugins: serovalPlugins });
     return parsedPayload;
   }
   const response = await (async () => {
     try {
-      let result = await (async () => {
-        if (formDataContentTypes.some(
+      let serializeResult = function(res2) {
+        let nonStreamingBody = void 0;
+        const alsResponse = getResponse();
+        if (res2 !== void 0) {
+          let done = false;
+          const callbacks = {
+            onParse: (value) => {
+              nonStreamingBody = value;
+            },
+            onDone: () => {
+              done = true;
+            },
+            onError: (error) => {
+              throw error;
+            }
+          };
+          toCrossJSONStream(res2, {
+            refs: /* @__PURE__ */ new Map(),
+            plugins: serovalPlugins,
+            onParse(value) {
+              callbacks.onParse(value);
+            },
+            onDone() {
+              callbacks.onDone();
+            },
+            onError: (error) => {
+              callbacks.onError(error);
+            }
+          });
+          if (done) {
+            return new Response(
+              nonStreamingBody ? JSON.stringify(nonStreamingBody) : void 0,
+              {
+                status: alsResponse.status,
+                statusText: alsResponse.statusText,
+                headers: {
+                  "Content-Type": "application/json",
+                  [X_TSS_SERIALIZED]: "true"
+                }
+              }
+            );
+          }
+          const encoder = new TextEncoder();
+          const stream = new ReadableStream({
+            start(controller2) {
+              callbacks.onParse = (value) => controller2.enqueue(encoder.encode(JSON.stringify(value) + "\n"));
+              callbacks.onDone = () => {
+                try {
+                  controller2.close();
+                } catch (error) {
+                  controller2.error(error);
+                }
+              };
+              callbacks.onError = (error) => controller2.error(error);
+              if (nonStreamingBody !== void 0) {
+                callbacks.onParse(nonStreamingBody);
+              }
+            }
+          });
+          return new Response(stream, {
+            status: alsResponse.status,
+            statusText: alsResponse.statusText,
+            headers: {
+              "Content-Type": "application/x-ndjson",
+              [X_TSS_SERIALIZED]: "true"
+            }
+          });
+        }
+        return new Response(void 0, {
+          status: alsResponse.status,
+          statusText: alsResponse.statusText
+        });
+      };
+      let res = await (async () => {
+        if (FORM_DATA_CONTENT_TYPES.some(
           (type) => contentType && contentType.includes(type)
         )) {
           invariant(
-            method.toLowerCase() !== "get",
+            methodLower !== "get",
             "GET requests with FormData payloads are not supported"
           );
           const formData = await request.formData();
@@ -60,121 +129,54 @@ const handleServerAction = async ({
                 plugins: serovalPlugins
               });
               if (typeof deserializedContext === "object" && deserializedContext) {
-                params.context = { ...context, ...deserializedContext };
+                params.context = safeObjectMerge(
+                  context,
+                  deserializedContext
+                );
+              }
+            } catch (e) {
+              if (process.env.NODE_ENV === "development") {
+                console.warn("Failed to parse FormData context:", e);
               }
-            } catch {
             }
           }
           return await action(params, signal);
         }
-        if (method.toLowerCase() === "get") {
-          invariant(
-            isCreateServerFn,
-            "expected GET request to originate from createServerFn"
-          );
-          let payload = search.payload;
-          payload = payload ? parsePayload(JSON.parse(payload)) : {};
-          payload.context = { ...context, ...payload.context };
-          return await action(payload, signal);
+        if (methodLower === "get") {
+          const payloadParam = url.searchParams.get("payload");
+          if (payloadParam && payloadParam.length > MAX_PAYLOAD_SIZE) {
+            throw new Error("Payload too large");
+          }
+          const payload2 = payloadParam ? parsePayload(JSON.parse(payloadParam)) : {};
+          payload2.context = safeObjectMerge(context, payload2.context);
+          return await action(payload2, signal);
         }
-        if (method.toLowerCase() !== "post") {
+        if (methodLower !== "post") {
           throw new Error("expected POST method");
         }
         let jsonPayload;
         if (contentType?.includes("application/json")) {
           jsonPayload = await request.json();
         }
-        if (isCreateServerFn) {
-          const payload = jsonPayload ? parsePayload(jsonPayload) : {};
-          payload.context = { ...payload.context, ...context };
-          return await action(payload, signal);
-        }
-        return await action(...jsonPayload);
+        const payload = jsonPayload ? parsePayload(jsonPayload) : {};
+        payload.context = safeObjectMerge(payload.context, context);
+        return await action(payload, signal);
       })();
-      if (result.result instanceof Response) {
-        result.result.headers.set(X_TSS_RAW_RESPONSE, "true");
-        return result.result;
-      }
-      if (!isCreateServerFn) {
-        result = result.result;
-        if (result instanceof Response) {
-          return result;
-        }
+      const unwrapped = res.result || res.error;
+      if (isNotFound(res)) {
+        res = isNotFoundResponse(res);
       }
-      if (isNotFound(result)) {
-        return isNotFoundResponse(result);
+      if (!isServerFn) {
+        return unwrapped;
       }
-      const response2 = getResponse();
-      let nonStreamingBody = void 0;
-      if (result !== void 0) {
-        let done = false;
-        const callbacks = {
-          onParse: (value) => {
-            nonStreamingBody = value;
-          },
-          onDone: () => {
-            done = true;
-          },
-          onError: (error) => {
-            throw error;
-          }
-        };
-        toCrossJSONStream(result, {
-          refs: /* @__PURE__ */ new Map(),
-          plugins: serovalPlugins,
-          onParse(value) {
-            callbacks.onParse(value);
-          },
-          onDone() {
-            callbacks.onDone();
-          },
-          onError: (error) => {
-            callbacks.onError(error);
-          }
-        });
-        if (done) {
-          return new Response(
-            nonStreamingBody ? JSON.stringify(nonStreamingBody) : void 0,
-            {
-              status: response2.status,
-              statusText: response2.statusText,
-              headers: {
-                "Content-Type": "application/json",
-                [X_TSS_SERIALIZED]: "true"
-              }
-            }
-          );
+      if (unwrapped instanceof Response) {
+        if (isRedirect(unwrapped)) {
+          return unwrapped;
         }
-        const encoder = new TextEncoder();
-        const stream = new ReadableStream({
-          start(controller2) {
-            callbacks.onParse = (value) => controller2.enqueue(encoder.encode(JSON.stringify(value) + "\n"));
-            callbacks.onDone = () => {
-              try {
-                controller2.close();
-              } catch (error) {
-                controller2.error(error);
-              }
-            };
-            callbacks.onError = (error) => controller2.error(error);
-            if (nonStreamingBody !== void 0) {
-              callbacks.onParse(nonStreamingBody);
-            }
-          }
-        });
-        return new Response(stream, {
-          status: response2.status,
-          statusText: response2.statusText,
-          headers: {
-            "Content-Type": "application/x-ndjson",
-            [X_TSS_SERIALIZED]: "true"
-          }
-        });
+        unwrapped.headers.set(X_TSS_RAW_RESPONSE, "true");
+        return unwrapped;
       }
-      return new Response(void 0, {
-        status: response2.status,
-        statusText: response2.statusText
-      });
+      return serializeResult(res);
     } catch (error) {
       if (error instanceof Response) {
         return error;

package/dist/esm/server-functions-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"server-functions-handler.js","sources":["../../src/server-functions-handler.ts"],"sourcesContent":["import { isNotFound } from '@tanstack/router-core'\nimport invariant from 'tiny-invariant'\nimport {\n  TSS_FORMDATA_CONTEXT,\n  X_TSS_RAW_RESPONSE,\n  X_TSS_SERIALIZED,\n  getDefaultSerovalPlugins,\n} from '@tanstack/start-client-core'\nimport { fromJSON, toCrossJSONAsync, toCrossJSONStream } from 'seroval'\nimport { getResponse } from './request-response'\nimport { getServerFnById } from './getServerFnById'\n\nlet regex: RegExp | undefined = undefined\n\nexport const handleServerAction = async ({\n  request,\n  context,\n}: {\n  request: Request\n  context: any\n}) => {\n  const controller = new AbortController()\n  const signal = controller.signal\n  const abort = () => controller.abort()\n  request.signal.addEventListener('abort', abort)\n\n  if (regex === undefined) {\n    regex = new RegExp(`${process.env.TSS_SERVER_FN_BASE}([^/?#]+)`)\n  }\n\n  const method = request.method\n  const url = new URL(request.url, 'http://localhost:3000')\n  // extract the serverFnId from the url as host/_serverFn/:serverFnId\n  // Define a regex to match the path and extract the :thing part\n\n  // Execute the regex\n  const match = url.pathname.match(regex)\n  const serverFnId = match ? match[1] : null\n  const search = Object.fromEntries(url.searchParams.entries()) as {\n    payload?: any\n    createServerFn?: boolean\n  }\n\n  const isCreateServerFn = 'createServerFn' in search\n\n  if (typeof serverFnId !== 'string') {\n    throw new Error('Invalid server action param for serverFnId: ' + serverFnId)\n  }\n\n  const action = await getServerFnById(serverFnId, { fromClient: true })\n\n  // Known FormData 'Content-Type' header values\n  const formDataContentTypes = [\n    'multipart/form-data',\n    'application/x-www-form-urlencoded',\n  ]\n\n  const contentType = request.headers.get('Content-Type')\n  const serovalPlugins = getDefaultSerovalPlugins()\n\n  function parsePayload(payload: any) {\n    const parsedPayload = fromJSON(payload, { plugins: serovalPlugins })\n    return parsedPayload as any\n  }\n\n  const response = await (async () => {\n    try {\n      let result = await (async () => {\n        // FormData\n        if (\n          formDataContentTypes.some(\n            (type) => contentType && contentType.includes(type),\n          )\n        ) {\n          // We don't support GET requests with FormData payloads... that seems impossible\n          invariant(\n            method.toLowerCase() !== 'get',\n            'GET requests with FormData payloads are not supported',\n          )\n          const formData = await request.formData()\n          const serializedContext = formData.get(TSS_FORMDATA_CONTEXT)\n          formData.delete(TSS_FORMDATA_CONTEXT)\n\n          const params = {\n            context,\n            data: formData,\n          }\n          if (typeof serializedContext === 'string') {\n            try {\n              const parsedContext = JSON.parse(serializedContext)\n              const deserializedContext = fromJSON(parsedContext, {\n                plugins: serovalPlugins,\n              })\n              if (\n                typeof deserializedContext === 'object' &&\n                deserializedContext\n              ) {\n                params.context = { ...context, ...deserializedContext }\n              }\n            } catch {}\n          }\n\n          return await action(params, signal)\n        }\n\n        // Get requests use the query string\n        if (method.toLowerCase() === 'get') {\n          invariant(\n            isCreateServerFn,\n            'expected GET request to originate from createServerFn',\n          )\n          // By default the payload is the search params\n          let payload: any = search.payload\n          // If there's a payload, we should try to parse it\n          payload = payload ? parsePayload(JSON.parse(payload)) : {}\n          payload.context = { ...context, ...payload.context }\n          // Send it through!\n          return await action(payload, signal)\n        }\n\n        if (method.toLowerCase() !== 'post') {\n          throw new Error('expected POST method')\n        }\n\n        let jsonPayload\n        if (contentType?.includes('application/json')) {\n          jsonPayload = await request.json()\n        }\n\n        // If this POST request was created by createServerFn,\n        // its payload  will be the only argument\n        if (isCreateServerFn) {\n          const payload = jsonPayload ? parsePayload(jsonPayload) : {}\n          payload.context = { ...payload.context, ...context }\n          return await action(payload, signal)\n        }\n\n        // Otherwise, we'll spread the payload. Need to\n        // support `use server` functions that take multiple\n        // arguments.\n        return await action(...jsonPayload)\n      })()\n\n      // Any time we get a Response back, we should just\n      // return it immediately.\n      if (result.result instanceof Response) {\n        result.result.headers.set(X_TSS_RAW_RESPONSE, 'true')\n        return result.result\n      }\n\n      // If this is a non createServerFn request, we need to\n      // pull out the result from the result object\n      if (!isCreateServerFn) {\n        result = result.result\n\n        // The result might again be a response,\n        // and if it is, return it.\n        if (result instanceof Response) {\n          return result\n        }\n      }\n\n      // TODO: RSCs Where are we getting this package?\n      // if (isValidElement(result)) {\n      //   const { renderToPipeableStream } = await import(\n      //     // @ts-expect-error\n      //     'react-server-dom/server'\n      //   )\n\n      //   const pipeableStream = renderToPipeableStream(result)\n\n      //   setHeaders(event, {\n      //     'Content-Type': 'text/x-component',\n      //   } as any)\n\n      //   sendStream(event, response)\n      //   event._handled = true\n\n      //   return new Response(null, { status: 200 })\n      // }\n\n      if (isNotFound(result)) {\n        return isNotFoundResponse(result)\n      }\n\n      const response = getResponse()\n      let nonStreamingBody: any = undefined\n\n      if (result !== undefined) {\n        // first run without the stream in case `result` does not need streaming\n        let done = false as boolean\n        const callbacks: {\n          onParse: (value: any) => void\n          onDone: () => void\n          onError: (error: any) => void\n        } = {\n          onParse: (value) => {\n            nonStreamingBody = value\n          },\n          onDone: () => {\n            done = true\n          },\n          onError: (error) => {\n            throw error\n          },\n        }\n        toCrossJSONStream(result, {\n          refs: new Map(),\n          plugins: serovalPlugins,\n          onParse(value) {\n            callbacks.onParse(value)\n          },\n          onDone() {\n            callbacks.onDone()\n          },\n          onError: (error) => {\n            callbacks.onError(error)\n          },\n        })\n        if (done) {\n          return new Response(\n            nonStreamingBody ? JSON.stringify(nonStreamingBody) : undefined,\n            {\n              status: response.status,\n              statusText: response.statusText,\n              headers: {\n                'Content-Type': 'application/json',\n                [X_TSS_SERIALIZED]: 'true',\n              },\n            },\n          )\n        }\n\n        // not done yet, we need to stream\n        const encoder = new TextEncoder()\n        const stream = new ReadableStream({\n          start(controller) {\n            callbacks.onParse = (value) =>\n              controller.enqueue(encoder.encode(JSON.stringify(value) + '\\n'))\n            callbacks.onDone = () => {\n              try {\n                controller.close()\n              } catch (error) {\n                controller.error(error)\n              }\n            }\n            callbacks.onError = (error) => controller.error(error)\n            // stream the initial body\n            if (nonStreamingBody !== undefined) {\n              callbacks.onParse(nonStreamingBody)\n            }\n          },\n        })\n        return new Response(stream, {\n          status: response.status,\n          statusText: response.statusText,\n          headers: {\n            'Content-Type': 'application/x-ndjson',\n            [X_TSS_SERIALIZED]: 'true',\n          },\n        })\n      }\n\n      return new Response(undefined, {\n        status: response.status,\n        statusText: response.statusText,\n      })\n    } catch (error: any) {\n      if (error instanceof Response) {\n        return error\n      }\n      // else if (\n      //   isPlainObject(error) &&\n      //   'result' in error &&\n      //   error.result instanceof Response\n      // ) {\n      //   return error.result\n      // }\n\n      // Currently this server-side context has no idea how to\n      // build final URLs, so we need to defer that to the client.\n      // The client will check for __redirect and __notFound keys,\n      // and if they exist, it will handle them appropriately.\n\n      if (isNotFound(error)) {\n        return isNotFoundResponse(error)\n      }\n\n      console.info()\n      console.info('Server Fn Error!')\n      console.info()\n      console.error(error)\n      console.info()\n\n      const serializedError = JSON.stringify(\n        await Promise.resolve(\n          toCrossJSONAsync(error, {\n            refs: new Map(),\n            plugins: serovalPlugins,\n          }),\n        ),\n      )\n      const response = getResponse()\n      return new Response(serializedError, {\n        status: response.status ?? 500,\n        statusText: response.statusText,\n        headers: {\n          'Content-Type': 'application/json',\n          [X_TSS_SERIALIZED]: 'true',\n        },\n      })\n    }\n  })()\n\n  request.signal.removeEventListener('abort', abort)\n\n  return response\n}\n\nfunction isNotFoundResponse(error: any) {\n  const { headers, ...rest } = error\n\n  return new Response(JSON.stringify(rest), {\n    status: 404,\n    headers: {\n      'Content-Type': 'application/json',\n      ...(headers || {}),\n    },\n  })\n}\n"],"names":["response","controller"],"mappings":"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"}
+{"version":3,"file":"server-functions-handler.js","sources":["../../src/server-functions-handler.ts"],"sourcesContent":["import { isNotFound, isRedirect } from '@tanstack/router-core'\nimport invariant from 'tiny-invariant'\nimport {\n  TSS_FORMDATA_CONTEXT,\n  X_TSS_RAW_RESPONSE,\n  X_TSS_SERIALIZED,\n  getDefaultSerovalPlugins,\n  safeObjectMerge,\n} from '@tanstack/start-client-core'\nimport { fromJSON, toCrossJSONAsync, toCrossJSONStream } from 'seroval'\nimport { getResponse } from './request-response'\nimport { getServerFnById } from './getServerFnById'\nimport type { Plugin as SerovalPlugin } from 'seroval'\n\n// Cache serovalPlugins at module level to avoid repeated calls\nlet serovalPlugins: Array<SerovalPlugin<any, any>> | undefined = undefined\n\n// Known FormData 'Content-Type' header values - module-level constant\nconst FORM_DATA_CONTENT_TYPES = [\n  'multipart/form-data',\n  'application/x-www-form-urlencoded',\n]\n\n// Maximum payload size for GET requests (1MB)\nconst MAX_PAYLOAD_SIZE = 1_000_000\n\nexport const handleServerAction = async ({\n  request,\n  context,\n  serverFnId,\n}: {\n  request: Request\n  context: any\n  serverFnId: string\n}) => {\n  const controller = new AbortController()\n  const signal = controller.signal\n  const abort = () => controller.abort()\n  request.signal.addEventListener('abort', abort)\n\n  const method = request.method\n  const methodLower = method.toLowerCase()\n  const url = new URL(request.url)\n\n  const action = await getServerFnById(serverFnId, { fromClient: true })\n\n  const isServerFn = request.headers.get('x-tsr-serverFn') === 'true'\n\n  // Initialize serovalPlugins lazily (cached at module level)\n  if (!serovalPlugins) {\n    serovalPlugins = getDefaultSerovalPlugins()\n  }\n\n  const contentType = request.headers.get('Content-Type')\n\n  function parsePayload(payload: any) {\n    const parsedPayload = fromJSON(payload, { plugins: serovalPlugins })\n    return parsedPayload as any\n  }\n\n  const response = await (async () => {\n    try {\n      let res = await (async () => {\n        // FormData\n        if (\n          FORM_DATA_CONTENT_TYPES.some(\n            (type) => contentType && contentType.includes(type),\n          )\n        ) {\n          // We don't support GET requests with FormData payloads... that seems impossible\n          invariant(\n            methodLower !== 'get',\n            'GET requests with FormData payloads are not supported',\n          )\n          const formData = await request.formData()\n          const serializedContext = formData.get(TSS_FORMDATA_CONTEXT)\n          formData.delete(TSS_FORMDATA_CONTEXT)\n\n          const params = {\n            context,\n            data: formData,\n          }\n          if (typeof serializedContext === 'string') {\n            try {\n              const parsedContext = JSON.parse(serializedContext)\n              const deserializedContext = fromJSON(parsedContext, {\n                plugins: serovalPlugins,\n              })\n              if (\n                typeof deserializedContext === 'object' &&\n                deserializedContext\n              ) {\n                params.context = safeObjectMerge(\n                  context,\n                  deserializedContext as Record<string, unknown>,\n                )\n              }\n            } catch (e) {\n              // Log warning for debugging but don't expose to client\n              if (process.env.NODE_ENV === 'development') {\n                console.warn('Failed to parse FormData context:', e)\n              }\n            }\n          }\n\n          return await action(params, signal)\n        }\n\n        // Get requests use the query string\n        if (methodLower === 'get') {\n          // Get payload directly from searchParams\n          const payloadParam = url.searchParams.get('payload')\n          // Reject oversized payloads to prevent DoS\n          if (payloadParam && payloadParam.length > MAX_PAYLOAD_SIZE) {\n            throw new Error('Payload too large')\n          }\n          // If there's a payload, we should try to parse it\n          const payload: any = payloadParam\n            ? parsePayload(JSON.parse(payloadParam))\n            : {}\n          payload.context = safeObjectMerge(context, payload.context)\n          // Send it through!\n          return await action(payload, signal)\n        }\n\n        if (methodLower !== 'post') {\n          throw new Error('expected POST method')\n        }\n\n        let jsonPayload\n        if (contentType?.includes('application/json')) {\n          jsonPayload = await request.json()\n        }\n\n        const payload = jsonPayload ? parsePayload(jsonPayload) : {}\n        payload.context = safeObjectMerge(payload.context, context)\n        return await action(payload, signal)\n      })()\n\n      const unwrapped = res.result || res.error\n\n      if (isNotFound(res)) {\n        res = isNotFoundResponse(res)\n      }\n\n      if (!isServerFn) {\n        return unwrapped\n      }\n\n      if (unwrapped instanceof Response) {\n        if (isRedirect(unwrapped)) {\n          return unwrapped\n        }\n        unwrapped.headers.set(X_TSS_RAW_RESPONSE, 'true')\n        return unwrapped\n      }\n\n      return serializeResult(res)\n\n      function serializeResult(res: unknown): Response {\n        let nonStreamingBody: any = undefined\n\n        const alsResponse = getResponse()\n        if (res !== undefined) {\n          // first run without the stream in case `result` does not need streaming\n          let done = false as boolean\n          const callbacks: {\n            onParse: (value: any) => void\n            onDone: () => void\n            onError: (error: any) => void\n          } = {\n            onParse: (value) => {\n              nonStreamingBody = value\n            },\n            onDone: () => {\n              done = true\n            },\n            onError: (error) => {\n              throw error\n            },\n          }\n          toCrossJSONStream(res, {\n            refs: new Map(),\n            plugins: serovalPlugins,\n            onParse(value) {\n              callbacks.onParse(value)\n            },\n            onDone() {\n              callbacks.onDone()\n            },\n            onError: (error) => {\n              callbacks.onError(error)\n            },\n          })\n          if (done) {\n            return new Response(\n              nonStreamingBody ? JSON.stringify(nonStreamingBody) : undefined,\n              {\n                status: alsResponse.status,\n                statusText: alsResponse.statusText,\n                headers: {\n                  'Content-Type': 'application/json',\n                  [X_TSS_SERIALIZED]: 'true',\n                },\n              },\n            )\n          }\n\n          // not done yet, we need to stream\n          const encoder = new TextEncoder()\n          const stream = new ReadableStream({\n            start(controller) {\n              callbacks.onParse = (value) =>\n                controller.enqueue(encoder.encode(JSON.stringify(value) + '\\n'))\n              callbacks.onDone = () => {\n                try {\n                  controller.close()\n                } catch (error) {\n                  controller.error(error)\n                }\n              }\n              callbacks.onError = (error) => controller.error(error)\n              // stream the initial body\n              if (nonStreamingBody !== undefined) {\n                callbacks.onParse(nonStreamingBody)\n              }\n            },\n          })\n          return new Response(stream, {\n            status: alsResponse.status,\n            statusText: alsResponse.statusText,\n            headers: {\n              'Content-Type': 'application/x-ndjson',\n              [X_TSS_SERIALIZED]: 'true',\n            },\n          })\n        }\n\n        return new Response(undefined, {\n          status: alsResponse.status,\n          statusText: alsResponse.statusText,\n        })\n      }\n    } catch (error: any) {\n      if (error instanceof Response) {\n        return error\n      }\n      // else if (\n      //   isPlainObject(error) &&\n      //   'result' in error &&\n      //   error.result instanceof Response\n      // ) {\n      //   return error.result\n      // }\n\n      // Currently this server-side context has no idea how to\n      // build final URLs, so we need to defer that to the client.\n      // The client will check for __redirect and __notFound keys,\n      // and if they exist, it will handle them appropriately.\n\n      if (isNotFound(error)) {\n        return isNotFoundResponse(error)\n      }\n\n      console.info()\n      console.info('Server Fn Error!')\n      console.info()\n      console.error(error)\n      console.info()\n\n      const serializedError = JSON.stringify(\n        await Promise.resolve(\n          toCrossJSONAsync(error, {\n            refs: new Map(),\n            plugins: serovalPlugins,\n          }),\n        ),\n      )\n      const response = getResponse()\n      return new Response(serializedError, {\n        status: response.status ?? 500,\n        statusText: response.statusText,\n        headers: {\n          'Content-Type': 'application/json',\n          [X_TSS_SERIALIZED]: 'true',\n        },\n      })\n    }\n  })()\n\n  request.signal.removeEventListener('abort', abort)\n\n  return response\n}\n\nfunction isNotFoundResponse(error: any) {\n  const { headers, ...rest } = error\n\n  return new Response(JSON.stringify(rest), {\n    status: 404,\n    headers: {\n      'Content-Type': 'application/json',\n      ...(headers || {}),\n    },\n  })\n}\n"],"names":["res","controller","payload","response"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/start-server-core",
-  "version": "1.143.8",
+  "version": "1.143.12",
   "description": "Modern and scalable routing for React applications",
   "author": "Tanner Linsley",
   "license": "MIT",
@@ -64,9 +64,9 @@
     "seroval": "^1.4.1",
     "tiny-invariant": "^1.3.3",
     "@tanstack/history": "1.141.0",
-    "@tanstack/router-core": "1.143.6",
-    "@tanstack/start-client-core": "1.143.8",
-    "@tanstack/start-storage-context": "1.143.6"
+    "@tanstack/start-client-core": "1.143.12",
+    "@tanstack/start-storage-context": "1.143.12",
+    "@tanstack/router-core": "1.143.6"
   },
   "devDependencies": {
     "@standard-schema/spec": "^1.0.0",