@tanstack/start-server-core 1.143.9 → 1.144.0

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/frame-protocol.d.ts

@@ -0,0 +1,32 @@
+import { FrameType } from '@tanstack/start-client-core';
+export { FRAME_HEADER_SIZE, FrameType, TSS_CONTENT_TYPE_FRAMED, TSS_CONTENT_TYPE_FRAMED_VERSIONED, TSS_FRAMED_PROTOCOL_VERSION, } from '@tanstack/start-client-core';
+/**
+ * Encodes a single frame with header and payload.
+ */
+export declare function encodeFrame(type: FrameType, streamId: number, payload: Uint8Array): Uint8Array;
+/**
+ * Encodes a JSON frame (type 0, streamId 0).
+ */
+export declare function encodeJSONFrame(json: string): Uint8Array;
+/**
+ * Encodes a raw stream chunk frame.
+ */
+export declare function encodeChunkFrame(streamId: number, chunk: Uint8Array): Uint8Array;
+/**
+ * Encodes a raw stream end frame.
+ */
+export declare function encodeEndFrame(streamId: number): Uint8Array;
+/**
+ * Encodes a raw stream error frame.
+ */
+export declare function encodeErrorFrame(streamId: number, error: unknown): Uint8Array;
+/**
+ * Creates a multiplexed ReadableStream from JSON stream and raw streams.
+ *
+ * The JSON stream emits NDJSON lines (from seroval's toCrossJSONStream).
+ * Raw streams are pumped concurrently, interleaved with JSON frames.
+ *
+ * @param jsonStream Stream of JSON strings (each string is one NDJSON line)
+ * @param rawStreams Map of stream IDs to raw binary streams
+ */
+export declare function createMultiplexedStream(jsonStream: ReadableStream<string>, rawStreams: Map<number, ReadableStream<Uint8Array>>): ReadableStream<Uint8Array>;

package/dist/esm/frame-protocol.js

@@ -0,0 +1,139 @@
+import { FrameType, FRAME_HEADER_SIZE } from "@tanstack/start-client-core";
+import { FRAME_HEADER_SIZE as FRAME_HEADER_SIZE2, FrameType as FrameType2, TSS_CONTENT_TYPE_FRAMED, TSS_CONTENT_TYPE_FRAMED_VERSIONED, TSS_FRAMED_PROTOCOL_VERSION } from "@tanstack/start-client-core";
+const textEncoder = new TextEncoder();
+const EMPTY_PAYLOAD = new Uint8Array(0);
+function encodeFrame(type, streamId, payload) {
+  const frame = new Uint8Array(FRAME_HEADER_SIZE + payload.length);
+  frame[0] = type;
+  frame[1] = streamId >>> 24 & 255;
+  frame[2] = streamId >>> 16 & 255;
+  frame[3] = streamId >>> 8 & 255;
+  frame[4] = streamId & 255;
+  frame[5] = payload.length >>> 24 & 255;
+  frame[6] = payload.length >>> 16 & 255;
+  frame[7] = payload.length >>> 8 & 255;
+  frame[8] = payload.length & 255;
+  frame.set(payload, FRAME_HEADER_SIZE);
+  return frame;
+}
+function encodeJSONFrame(json) {
+  return encodeFrame(FrameType.JSON, 0, textEncoder.encode(json));
+}
+function encodeChunkFrame(streamId, chunk) {
+  return encodeFrame(FrameType.CHUNK, streamId, chunk);
+}
+function encodeEndFrame(streamId) {
+  return encodeFrame(FrameType.END, streamId, EMPTY_PAYLOAD);
+}
+function encodeErrorFrame(streamId, error) {
+  const message = error instanceof Error ? error.message : String(error ?? "Unknown error");
+  return encodeFrame(FrameType.ERROR, streamId, textEncoder.encode(message));
+}
+function createMultiplexedStream(jsonStream, rawStreams) {
+  let activePumps = 1 + rawStreams.size;
+  let controllerRef = null;
+  let cancelled = false;
+  const cancelReaders = [];
+  const safeEnqueue = (chunk) => {
+    if (cancelled || !controllerRef) return;
+    try {
+      controllerRef.enqueue(chunk);
+    } catch {
+    }
+  };
+  const safeError = (err) => {
+    if (cancelled || !controllerRef) return;
+    try {
+      controllerRef.error(err);
+    } catch {
+    }
+  };
+  const safeClose = () => {
+    if (cancelled || !controllerRef) return;
+    try {
+      controllerRef.close();
+    } catch {
+    }
+  };
+  const checkComplete = () => {
+    activePumps--;
+    if (activePumps === 0) {
+      safeClose();
+    }
+  };
+  return new ReadableStream({
+    start(controller) {
+      controllerRef = controller;
+      cancelReaders.length = 0;
+      const pumpJSON = async () => {
+        const reader = jsonStream.getReader();
+        cancelReaders.push(() => {
+          reader.cancel().catch(() => {
+          });
+        });
+        try {
+          while (true) {
+            const { done, value } = await reader.read();
+            if (cancelled) break;
+            if (done) break;
+            safeEnqueue(encodeJSONFrame(value));
+          }
+        } catch (error) {
+          safeError(error);
+        } finally {
+          reader.releaseLock();
+          checkComplete();
+        }
+      };
+      const pumpRawStream = async (streamId, stream) => {
+        const reader = stream.getReader();
+        cancelReaders.push(() => {
+          reader.cancel().catch(() => {
+          });
+        });
+        try {
+          while (true) {
+            const { done, value } = await reader.read();
+            if (cancelled) break;
+            if (done) {
+              safeEnqueue(encodeEndFrame(streamId));
+              break;
+            }
+            safeEnqueue(encodeChunkFrame(streamId, value));
+          }
+        } catch (error) {
+          safeEnqueue(encodeErrorFrame(streamId, error));
+        } finally {
+          reader.releaseLock();
+          checkComplete();
+        }
+      };
+      pumpJSON();
+      for (const [streamId, stream] of rawStreams) {
+        pumpRawStream(streamId, stream);
+      }
+    },
+    cancel() {
+      cancelled = true;
+      controllerRef = null;
+      for (const cancelReader of cancelReaders) {
+        cancelReader();
+      }
+      cancelReaders.length = 0;
+    }
+  });
+}
+export {
+  FRAME_HEADER_SIZE2 as FRAME_HEADER_SIZE,
+  FrameType2 as FrameType,
+  TSS_CONTENT_TYPE_FRAMED,
+  TSS_CONTENT_TYPE_FRAMED_VERSIONED,
+  TSS_FRAMED_PROTOCOL_VERSION,
+  createMultiplexedStream,
+  encodeChunkFrame,
+  encodeEndFrame,
+  encodeErrorFrame,
+  encodeFrame,
+  encodeJSONFrame
+};
+//# sourceMappingURL=frame-protocol.js.map

package/dist/esm/frame-protocol.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"frame-protocol.js","sources":["../../src/frame-protocol.ts"],"sourcesContent":["/**\n * Binary frame protocol for multiplexing JSON and raw streams over HTTP.\n *\n * Frame format: [type:1][streamId:4][length:4][payload:length]\n * - type: 1 byte - frame type (JSON, CHUNK, END, ERROR)\n * - streamId: 4 bytes big-endian uint32 - stream identifier\n * - length: 4 bytes big-endian uint32 - payload length\n * - payload: variable length bytes\n */\n\n// Re-export constants from shared location\nimport { FRAME_HEADER_SIZE, FrameType } from '@tanstack/start-client-core'\n\nexport {\n  FRAME_HEADER_SIZE,\n  FrameType,\n  TSS_CONTENT_TYPE_FRAMED,\n  TSS_CONTENT_TYPE_FRAMED_VERSIONED,\n  TSS_FRAMED_PROTOCOL_VERSION,\n} from '@tanstack/start-client-core'\n\n/** Cached TextEncoder for frame encoding */\nconst textEncoder = new TextEncoder()\n\n/** Shared empty payload for END frames - avoids allocation per call */\nconst EMPTY_PAYLOAD = new Uint8Array(0)\n\n/**\n * Encodes a single frame with header and payload.\n */\nexport function encodeFrame(\n  type: FrameType,\n  streamId: number,\n  payload: Uint8Array,\n): Uint8Array {\n  const frame = new Uint8Array(FRAME_HEADER_SIZE + payload.length)\n  // Write header bytes directly to avoid DataView allocation per frame\n  // Frame format: [type:1][streamId:4 BE][length:4 BE]\n  frame[0] = type\n  frame[1] = (streamId >>> 24) & 0xff\n  frame[2] = (streamId >>> 16) & 0xff\n  frame[3] = (streamId >>> 8) & 0xff\n  frame[4] = streamId & 0xff\n  frame[5] = (payload.length >>> 24) & 0xff\n  frame[6] = (payload.length >>> 16) & 0xff\n  frame[7] = (payload.length >>> 8) & 0xff\n  frame[8] = payload.length & 0xff\n  frame.set(payload, FRAME_HEADER_SIZE)\n  return frame\n}\n\n/**\n * Encodes a JSON frame (type 0, streamId 0).\n */\nexport function encodeJSONFrame(json: string): Uint8Array {\n  return encodeFrame(FrameType.JSON, 0, textEncoder.encode(json))\n}\n\n/**\n * Encodes a raw stream chunk frame.\n */\nexport function encodeChunkFrame(\n  streamId: number,\n  chunk: Uint8Array,\n): Uint8Array {\n  return encodeFrame(FrameType.CHUNK, streamId, chunk)\n}\n\n/**\n * Encodes a raw stream end frame.\n */\nexport function encodeEndFrame(streamId: number): Uint8Array {\n  return encodeFrame(FrameType.END, streamId, EMPTY_PAYLOAD)\n}\n\n/**\n * Encodes a raw stream error frame.\n */\nexport function encodeErrorFrame(streamId: number, error: unknown): Uint8Array {\n  const message =\n    error instanceof Error ? error.message : String(error ?? 'Unknown error')\n  return encodeFrame(FrameType.ERROR, streamId, textEncoder.encode(message))\n}\n\n/**\n * Creates a multiplexed ReadableStream from JSON stream and raw streams.\n *\n * The JSON stream emits NDJSON lines (from seroval's toCrossJSONStream).\n * Raw streams are pumped concurrently, interleaved with JSON frames.\n *\n * @param jsonStream Stream of JSON strings (each string is one NDJSON line)\n * @param rawStreams Map of stream IDs to raw binary streams\n */\nexport function createMultiplexedStream(\n  jsonStream: ReadableStream<string>,\n  rawStreams: Map<number, ReadableStream<Uint8Array>>,\n): ReadableStream<Uint8Array> {\n  // Track active pumps for completion\n  let activePumps = 1 + rawStreams.size // 1 for JSON + raw streams\n  let controllerRef: ReadableStreamDefaultController<Uint8Array> | null = null\n  let cancelled = false as boolean\n  const cancelReaders: Array<() => void> = []\n\n  const safeEnqueue = (chunk: Uint8Array) => {\n    if (cancelled || !controllerRef) return\n    try {\n      controllerRef.enqueue(chunk)\n    } catch {\n      // Ignore enqueue after close/cancel\n    }\n  }\n\n  const safeError = (err: unknown) => {\n    if (cancelled || !controllerRef) return\n    try {\n      controllerRef.error(err)\n    } catch {\n      // Ignore\n    }\n  }\n\n  const safeClose = () => {\n    if (cancelled || !controllerRef) return\n    try {\n      controllerRef.close()\n    } catch {\n      // Ignore\n    }\n  }\n\n  const checkComplete = () => {\n    activePumps--\n    if (activePumps === 0) {\n      safeClose()\n    }\n  }\n\n  return new ReadableStream<Uint8Array>({\n    start(controller) {\n      controllerRef = controller\n      cancelReaders.length = 0\n\n      // Pump JSON stream (streamId 0)\n      const pumpJSON = async () => {\n        const reader = jsonStream.getReader()\n        cancelReaders.push(() => {\n          // Catch async rejection - reader may already be released\n          reader.cancel().catch(() => {})\n        })\n        try {\n          // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition\n          while (true) {\n            const { done, value } = await reader.read()\n            // Check cancelled after await - flag may have changed while waiting\n            if (cancelled) break\n            if (done) break\n            safeEnqueue(encodeJSONFrame(value))\n          }\n        } catch (error) {\n          // JSON stream error - fatal, error the whole response\n          safeError(error)\n        } finally {\n          reader.releaseLock()\n          checkComplete()\n        }\n      }\n\n      // Pump a single raw stream with its streamId\n      const pumpRawStream = async (\n        streamId: number,\n        stream: ReadableStream<Uint8Array>,\n      ) => {\n        const reader = stream.getReader()\n        cancelReaders.push(() => {\n          // Catch async rejection - reader may already be released\n          reader.cancel().catch(() => {})\n        })\n        try {\n          // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition\n          while (true) {\n            const { done, value } = await reader.read()\n            // Check cancelled after await - flag may have changed while waiting\n            if (cancelled) break\n            if (done) {\n              safeEnqueue(encodeEndFrame(streamId))\n              break\n            }\n            safeEnqueue(encodeChunkFrame(streamId, value))\n          }\n        } catch (error) {\n          // Stream error - send ERROR frame (non-fatal, other streams continue)\n          safeEnqueue(encodeErrorFrame(streamId, error))\n        } finally {\n          reader.releaseLock()\n          checkComplete()\n        }\n      }\n\n      // Start all pumps concurrently\n      pumpJSON()\n      for (const [streamId, stream] of rawStreams) {\n        pumpRawStream(streamId, stream)\n      }\n    },\n\n    cancel() {\n      cancelled = true\n      controllerRef = null\n      // Proactively cancel all underlying readers to stop work quickly.\n      for (const cancelReader of cancelReaders) {\n        cancelReader()\n      }\n      cancelReaders.length = 0\n    },\n  })\n}\n"],"names":[],"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,35 +1,31 @@
-import { isNotFound } from "@tanstack/router-core";
+import { createRawStreamRPCPlugin, 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_CONTENT_TYPE_FRAMED_VERSIONED, 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 { createMultiplexedStream } from "./frame-protocol.js";
 import { getServerFnById } from "#tanstack-start-server-fn-resolver";
-let regex = void 0;
 let serovalPlugins = void 0;
+const textEncoder = new TextEncoder();
 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 methodLower = method.toLowerCase();
-  const url = new URL(request.url, "http://localhost:3000");
-  const match = url.pathname.match(regex);
-  const serverFnId = match ? match[1] : null;
-  if (typeof serverFnId !== "string") {
-    throw new Error("Invalid server action param for serverFnId: " + serverFnId);
-  }
+  const url = new URL(request.url);
   const action = await getServerFnById(serverFnId, { fromClient: true });
+  const isServerFn = request.headers.get("x-tsr-serverFn") === "true";
   if (!serovalPlugins) {
     serovalPlugins = getDefaultSerovalPlugins();
   }
@@ -40,7 +36,119 @@ const handleServerAction = async ({
   }
   const response = await (async () => {
     try {
-      const result = await (async () => {
+      let serializeResult = function(res2) {
+        let nonStreamingBody = void 0;
+        const alsResponse = getResponse();
+        if (res2 !== void 0) {
+          const rawStreams = /* @__PURE__ */ new Map();
+          const rawStreamPlugin = createRawStreamRPCPlugin(
+            (id, stream2) => {
+              rawStreams.set(id, stream2);
+            }
+          );
+          const plugins = [rawStreamPlugin, ...serovalPlugins || []];
+          let done = false;
+          const callbacks = {
+            onParse: (value) => {
+              nonStreamingBody = value;
+            },
+            onDone: () => {
+              done = true;
+            },
+            onError: (error) => {
+              throw error;
+            }
+          };
+          toCrossJSONStream(res2, {
+            refs: /* @__PURE__ */ new Map(),
+            plugins,
+            onParse(value) {
+              callbacks.onParse(value);
+            },
+            onDone() {
+              callbacks.onDone();
+            },
+            onError: (error) => {
+              callbacks.onError(error);
+            }
+          });
+          if (done && rawStreams.size === 0) {
+            return new Response(
+              nonStreamingBody ? JSON.stringify(nonStreamingBody) : void 0,
+              {
+                status: alsResponse.status,
+                statusText: alsResponse.statusText,
+                headers: {
+                  "Content-Type": "application/json",
+                  [X_TSS_SERIALIZED]: "true"
+                }
+              }
+            );
+          }
+          if (rawStreams.size > 0) {
+            const jsonStream = new ReadableStream({
+              start(controller2) {
+                callbacks.onParse = (value) => {
+                  controller2.enqueue(JSON.stringify(value) + "\n");
+                };
+                callbacks.onDone = () => {
+                  try {
+                    controller2.close();
+                  } catch {
+                  }
+                };
+                callbacks.onError = (error) => controller2.error(error);
+                if (nonStreamingBody !== void 0) {
+                  callbacks.onParse(nonStreamingBody);
+                }
+              }
+            });
+            const multiplexedStream = createMultiplexedStream(
+              jsonStream,
+              rawStreams
+            );
+            return new Response(multiplexedStream, {
+              status: alsResponse.status,
+              statusText: alsResponse.statusText,
+              headers: {
+                "Content-Type": TSS_CONTENT_TYPE_FRAMED_VERSIONED,
+                [X_TSS_SERIALIZED]: "true"
+              }
+            });
+          }
+          const stream = new ReadableStream({
+            start(controller2) {
+              callbacks.onParse = (value) => controller2.enqueue(
+                textEncoder.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)
         )) {
@@ -62,17 +170,26 @@ 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 (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 = { ...context, ...payload2.context };
+          payload2.context = safeObjectMerge(context, payload2.context);
           return await action(payload2, signal);
         }
         if (methodLower !== "post") {
@@ -83,87 +200,24 @@ const handleServerAction = async ({
           jsonPayload = await request.json();
         }
         const payload = jsonPayload ? parsePayload(jsonPayload) : {};
-        payload.context = { ...payload.context, ...context };
+        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;
+      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;