@tanstack/start-server-core 1.132.0-alpha.2 → 1.132.0-alpha.3

package/dist/esm/createServerRpc.d.ts

@@ -0,0 +1,4 @@
+export declare const createServerRpc: (functionId: string, splitImportFn: (...args: any) => any) => ((...args: any) => any) & {
+    url: string;
+    functionId: string;
+};

package/dist/esm/createServerRpc.js

@@ -0,0 +1,25 @@
+import invariant from "tiny-invariant";
+let baseUrl;
+function sanitizeBase(base) {
+  return base.replace(/^\/|\/$/g, "");
+}
+const createServerRpc = (functionId, splitImportFn) => {
+  if (!baseUrl) {
+    const sanitizedAppBase = sanitizeBase(process.env.TSS_APP_BASE || "/");
+    const sanitizedServerBase = sanitizeBase(process.env.TSS_SERVER_FN_BASE);
+    baseUrl = `${sanitizedAppBase ? `/${sanitizedAppBase}` : ""}/${sanitizedServerBase}/`;
+  }
+  invariant(
+    splitImportFn,
+    "🚨splitImportFn required for the server functions server runtime, but was not provided."
+  );
+  const url = baseUrl + functionId;
+  return Object.assign(splitImportFn, {
+    url,
+    functionId
+  });
+};
+export {
+  createServerRpc
+};
+//# sourceMappingURL=createServerRpc.js.map

package/dist/esm/createServerRpc.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"createServerRpc.js","sources":["../../src/createServerRpc.ts"],"sourcesContent":["import invariant from 'tiny-invariant'\n\nlet baseUrl: string\nfunction sanitizeBase(base: string) {\n  return base.replace(/^\\/|\\/$/g, '')\n}\n\nexport const createServerRpc = (\n  functionId: string,\n  splitImportFn: (...args: any) => any,\n) => {\n  if (!baseUrl) {\n    const sanitizedAppBase = sanitizeBase(process.env.TSS_APP_BASE || '/')\n    const sanitizedServerBase = sanitizeBase(process.env.TSS_SERVER_FN_BASE!)\n    baseUrl = `${sanitizedAppBase ? `/${sanitizedAppBase}` : ''}/${sanitizedServerBase}/`\n  }\n  invariant(\n    splitImportFn,\n    '🚨splitImportFn required for the server functions server runtime, but was not provided.',\n  )\n\n  const url = baseUrl + functionId\n\n  return Object.assign(splitImportFn, {\n    url,\n    functionId,\n  })\n}\n"],"names":[],"mappings":";AAEA,IAAI;AACJ,SAAS,aAAa,MAAc;AAClC,SAAO,KAAK,QAAQ,YAAY,EAAE;AACpC;AAEO,MAAM,kBAAkB,CAC7B,YACA,kBACG;AACH,MAAI,CAAC,SAAS;AACZ,UAAM,mBAAmB,aAAa,QAAQ,IAAI,gBAAgB,GAAG;AACrE,UAAM,sBAAsB,aAAa,QAAQ,IAAI,kBAAmB;AACxE,cAAU,GAAG,mBAAmB,IAAI,gBAAgB,KAAK,EAAE,IAAI,mBAAmB;AAAA,EACpF;AACA;AAAA,IACE;AAAA,IACA;AAAA,EAAA;AAGF,QAAM,MAAM,UAAU;AAEtB,SAAO,OAAO,OAAO,eAAe;AAAA,IAClC;AAAA,IACA;AAAA,EAAA,CACD;AACH;"}

package/dist/esm/createStartHandler.js

@@ -9,6 +9,7 @@ import { handleServerAction } from "./server-functions-handler.js";
 import { VIRTUAL_MODULES } from "./virtual-modules.js";
 import { loadVirtualModule } from "./loadVirtualModule.js";
 import { HEADERS } from "./constants.js";
+import { ServerFunctionSerializationAdapter } from "./serializer/ServerFunctionSerializationAdapter.js";
 function getStartResponseHeaders(opts) {
   const headers = mergeHeaders(
     getResponseHeaders(),
@@ -59,12 +60,15 @@ function createStartHandler({
       if (isPrerendering && !isShell) {
         isShell = request.headers.get(HEADERS.TSS_SHELL) === "true";
       }
+      const serializationAdapters = router.options.serializationAdapters ?? [];
+      serializationAdapters.push(ServerFunctionSerializationAdapter);
       router.update({
         history,
         isShell,
-        isPrerendering
+        isPrerendering,
+        serializationAdapters
       });
-      const response = await (async () => {
+      const response = await runWithStartContext({ router }, async () => {
         try {
           if (!process.env.TSS_SERVER_FN_BASE) {
             throw new Error(
@@ -98,7 +102,7 @@ function createStartHandler({
               console.log(e);
             }
           }
-          const executeRouter = () => runWithStartContext({ router }, async () => {
+          const executeRouter = async () => {
             const requestAcceptHeader = request.headers.get("Accept") || "*/*";
             const splitRequestAcceptHeader = requestAcceptHeader.split(",");
             const supportedMimeTypes = ["*/*", "text/html"];
@@ -135,7 +139,7 @@ function createStartHandler({
               responseHeaders
             });
             return response2;
-          });
+          };
           if (processedServerRouteTree) {
             const [_matchedRoutes, response2] = await handleServerRoutes({
               processedServerRouteTree,
@@ -154,7 +158,7 @@ function createStartHandler({
           }
           throw err;
         }
-      })();
+      });
       if (isRedirect(response)) {
         if (isResolvedRedirect(response)) {
           if (request.headers.get("x-tsr-redirect") === "manual") {

package/dist/esm/createStartHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"createStartHandler.js","sources":["../../src/createStartHandler.ts"],"sourcesContent":["import { createMemoryHistory } from '@tanstack/history'\nimport {\n  flattenMiddlewares,\n  json,\n  mergeHeaders,\n} from '@tanstack/start-client-core'\nimport {\n  getMatchedRoutes,\n  isRedirect,\n  isResolvedRedirect,\n  joinPaths,\n  processRouteTree,\n  trimPath,\n} from '@tanstack/router-core'\nimport { attachRouterServerSsrUtils } from '@tanstack/router-core/ssr/server'\nimport { runWithStartContext } from '@tanstack/start-storage-context'\nimport { getResponseHeaders, requestHandler } from './request-response'\nimport { getStartManifest } from './router-manifest'\nimport { handleServerAction } from './server-functions-handler'\nimport { VIRTUAL_MODULES } from './virtual-modules'\nimport { loadVirtualModule } from './loadVirtualModule'\n\nimport { HEADERS } from './constants'\nimport type {\n  AnyServerRouteWithTypes,\n  ServerRouteMethodHandlerFn,\n} from './serverRoute'\nimport type { RequestHandler } from './request-response'\nimport type {\n  AnyRoute,\n  AnyRouter,\n  Awaitable,\n  Manifest,\n  ProcessRouteTreeResult,\n} from '@tanstack/router-core'\nimport type { HandlerCallback } from '@tanstack/router-core/ssr/server'\n\ntype TODO = any\n\nexport type CustomizeStartHandler<TRouter extends AnyRouter> = (\n  cb: HandlerCallback<TRouter>,\n) => RequestHandler\n\nfunction getStartResponseHeaders(opts: { router: AnyRouter }) {\n  const headers = mergeHeaders(\n    getResponseHeaders() as Headers,\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<TRouter extends AnyRouter>({\n  createRouter,\n}: {\n  createRouter: () => Awaitable<TRouter>\n}): CustomizeStartHandler<TRouter> {\n  let routeTreeModule: {\n    serverRouteTree: AnyServerRouteWithTypes | undefined\n    routeTree: AnyRoute | undefined\n  } | null = null\n  let startRoutesManifest: Manifest | null = null\n  let processedServerRouteTree:\n    | ProcessRouteTreeResult<AnyServerRouteWithTypes>\n    | undefined = undefined\n\n  return (cb) => {\n    const originalFetch = globalThis.fetch\n\n    const startRequestResolver: RequestHandler = async (request) => {\n      // Patching fetch function to use our request resolver\n      // if the input starts with `/` which is a common pattern for\n      // client-side routing.\n      // When we encounter similar requests, we can assume that the\n      // user wants to use the same origin as the current request.\n      globalThis.fetch = async function (input, init) {\n        function resolve(url: URL, requestOptions: RequestInit | undefined) {\n          const fetchRequest = new Request(url, requestOptions)\n          return startRequestResolver(fetchRequest)\n        }\n\n        function getOrigin() {\n          return (\n            request.headers.get('Origin') ||\n            request.headers.get('Referer') ||\n            'http://localhost'\n          )\n        }\n\n        if (typeof input === 'string' && input.startsWith('/')) {\n          // e.g: fetch('/api/data')\n          const url = new URL(input, getOrigin())\n          return resolve(url, init)\n        } else if (\n          typeof input === 'object' &&\n          'url' in input &&\n          typeof input.url === 'string' &&\n          input.url.startsWith('/')\n        ) {\n          // e.g: fetch(new Request('/api/data'))\n          const url = new URL(input.url, getOrigin())\n          return resolve(url, init)\n        }\n\n        // If not, it should just use the original fetch\n        return originalFetch(input, init)\n      }\n\n      const url = new URL(request.url)\n      const href = decodeURIComponent(url.href.replace(url.origin, ''))\n\n      const APP_BASE = process.env.TSS_APP_BASE || '/'\n\n      // TODO how does this work with base path? does the router need to be configured the same as APP_BASE?\n      const router = await createRouter()\n\n      // Create a history for the client-side router\n      const history = createMemoryHistory({\n        initialEntries: [href],\n      })\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      router.update({\n        history,\n        isShell,\n        isPrerendering,\n      })\n\n      const response = await (async () => {\n        try {\n          if (!process.env.TSS_SERVER_FN_BASE) {\n            throw new Error(\n              'tanstack/start-server-core: TSS_SERVER_FN_BASE must be defined in your environment for createStartHandler()',\n            )\n          }\n\n          // First, let's attempt to handle server functions\n          // Add trailing slash to sanitise user defined TSS_SERVER_FN_BASE\n          const serverFnBase = joinPaths([\n            APP_BASE,\n            trimPath(process.env.TSS_SERVER_FN_BASE),\n            '/',\n          ])\n          if (href.startsWith(serverFnBase)) {\n            return await handleServerAction({ request })\n          }\n\n          if (routeTreeModule === null) {\n            try {\n              routeTreeModule = await loadVirtualModule(\n                VIRTUAL_MODULES.routeTree,\n              )\n              if (routeTreeModule.serverRouteTree) {\n                processedServerRouteTree =\n                  processRouteTree<AnyServerRouteWithTypes>({\n                    routeTree: routeTreeModule.serverRouteTree,\n                    initRoute: (route, i) => {\n                      route.init({\n                        originalIndex: i,\n                      })\n                    },\n                  })\n              }\n            } catch (e) {\n              console.log(e)\n            }\n          }\n\n          const executeRouter = () =>\n            runWithStartContext({ router }, async () => {\n              const requestAcceptHeader = request.headers.get('Accept') || '*/*'\n              const splitRequestAcceptHeader = 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 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                  basePath: APP_BASE,\n                })\n              }\n\n              // Attach the server-side SSR utils to the client-side router\n              attachRouterServerSsrUtils(router, startRoutesManifest)\n\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              const response = await cb({\n                request,\n                router,\n                responseHeaders,\n              })\n\n              return response\n            })\n\n          // If we have a server route tree, then we try matching to see if we have a\n          // server route that matches the request.\n          if (processedServerRouteTree) {\n            const [_matchedRoutes, response] = await handleServerRoutes({\n              processedServerRouteTree,\n              router,\n              request,\n              basePath: APP_BASE,\n              executeRouter,\n            })\n\n            if (response) return response\n          }\n\n          // Server Routes did not produce a response, so fallback to normal SSR matching using the router\n          const routerResponse = await executeRouter()\n          return routerResponse\n        } catch (err) {\n          if (err instanceof Response) {\n            return err\n          }\n\n          throw err\n        }\n      })()\n\n      if (isRedirect(response)) {\n        if (isResolvedRedirect(response)) {\n          if (request.headers.get('x-tsr-redirect') === 'manual') {\n            return json(\n              {\n                ...response.options,\n                isSerializedRedirect: true,\n              },\n              {\n                headers: response.headers,\n              },\n            )\n          }\n          return response\n        }\n        if (\n          response.options.to &&\n          typeof response.options.to === 'string' &&\n          !response.options.to.startsWith('/')\n        ) {\n          throw new Error(\n            `Server side redirects must use absolute paths via the 'href' or 'to' options. 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 redirect = router.resolveRedirect(response)\n\n        if (request.headers.get('x-tsr-redirect') === 'manual') {\n          return json(\n            {\n              ...response.options,\n              isSerializedRedirect: true,\n            },\n            {\n              headers: response.headers,\n            },\n          )\n        }\n\n        return redirect\n      }\n\n      return response\n    }\n\n    return requestHandler(startRequestResolver)\n  }\n}\n\nasync function handleServerRoutes(opts: {\n  router: AnyRouter\n  processedServerRouteTree: ProcessRouteTreeResult<AnyServerRouteWithTypes>\n  request: Request\n  basePath: string\n  executeRouter: () => Promise<Response>\n}) {\n  const url = new URL(opts.request.url)\n  const pathname = url.pathname\n\n  const serverTreeResult = getMatchedRoutes<AnyServerRouteWithTypes>({\n    pathname,\n    basepath: opts.basePath,\n    caseSensitive: true,\n    routesByPath: opts.processedServerRouteTree.routesByPath,\n    routesById: opts.processedServerRouteTree.routesById,\n    flatRoutes: opts.processedServerRouteTree.flatRoutes,\n  })\n\n  const routeTreeResult = opts.router.getMatchedRoutes(pathname, undefined)\n\n  let response: Response | undefined\n  let matchedRoutes: Array<AnyServerRouteWithTypes> = []\n  matchedRoutes = serverTreeResult.matchedRoutes\n  // check if the app route tree found a match that is deeper than the server route tree\n  if (routeTreeResult.foundRoute) {\n    if (\n      serverTreeResult.matchedRoutes.length <\n      routeTreeResult.matchedRoutes.length\n    ) {\n      const closestCommon = [...routeTreeResult.matchedRoutes]\n        .reverse()\n        .find((r) => {\n          return opts.processedServerRouteTree.routesById[r.id] !== undefined\n        })\n      if (closestCommon) {\n        // walk up the tree and collect all parents\n        let routeId = closestCommon.id\n        matchedRoutes = []\n        do {\n          const route = opts.processedServerRouteTree.routesById[routeId]\n          if (!route) {\n            break\n          }\n          matchedRoutes.push(route)\n          routeId = route.parentRoute?.id\n        } while (routeId)\n\n        matchedRoutes.reverse()\n      }\n    }\n  }\n\n  if (matchedRoutes.length) {\n    // We've found a server route that (partially) matches the request, so we can call it.\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.middleware).filter(Boolean),\n    ).map((d) => d.options.server)\n\n    if (serverTreeResult.foundRoute?.options.methods) {\n      const method = Object.keys(\n        serverTreeResult.foundRoute.options.methods,\n      ).find(\n        (method) => method.toLowerCase() === opts.request.method.toLowerCase(),\n      )\n\n      if (method) {\n        const handler = serverTreeResult.foundRoute.options.methods[method]\n        if (handler) {\n          if (typeof handler === 'function') {\n            middlewares.push(handlerToMiddleware(handler) as TODO)\n          } else {\n            if (\n              handler._options.middlewares &&\n              handler._options.middlewares.length\n            ) {\n              middlewares.push(\n                ...flattenMiddlewares(handler._options.middlewares as any).map(\n                  (d) => d.options.server,\n                ),\n              )\n            }\n            if (handler._options.handler) {\n              middlewares.push(handlerToMiddleware(handler._options.handler))\n            }\n          }\n        }\n      }\n    }\n\n    // eventually, execute the router\n    middlewares.push(handlerToMiddleware(opts.executeRouter))\n\n    // TODO: This is starting to feel too much like a server function\n    // Do generalize the existing middleware execution? Or do we need to\n    // build a new middleware execution system for server routes?\n    const ctx = await executeMiddleware(middlewares, {\n      request: opts.request,\n      context: {},\n      params: serverTreeResult.routeParams,\n      pathname,\n    })\n\n    response = ctx.response\n  }\n\n  // We return the matched routes too so if\n  // the app router happens to match the same path,\n  // it can use any request middleware from server routes\n  return [matchedRoutes, response] as const\n}\n\nfunction handlerToMiddleware(\n  handler: ServerRouteMethodHandlerFn<\n    AnyServerRouteWithTypes,\n    any,\n    any,\n    any,\n    any\n  >,\n) {\n  return async ({ next: _next, ...rest }: TODO) => {\n    const response = await handler(rest)\n    if (response) {\n      return { response }\n    }\n    return _next(rest)\n  }\n}\n\nfunction executeMiddleware(middlewares: TODO, ctx: TODO) {\n  let index = -1\n\n  const next = async (ctx: TODO) => {\n    index++\n    const middleware = middlewares[index]\n    if (!middleware) return ctx\n\n    const result = await middleware({\n      ...ctx,\n      // Allow the middleware to call the next middleware in the chain\n      next: async (nextCtx: TODO) => {\n        // Allow the caller to extend the context for the next middleware\n        const nextResult = await next({\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    }).catch((err: TODO) => {\n      if (isSpecialResponse(err)) {\n        return {\n          response: err,\n        }\n      }\n\n      throw err\n    })\n\n    // Merge the middleware result into the context, just in case it\n    // returns a partial context\n    return Object.assign(ctx, handleCtxResult(result))\n  }\n\n  return handleCtxResult(next(ctx))\n}\n\nfunction handleCtxResult(result: TODO) {\n  if (isSpecialResponse(result)) {\n    return {\n      response: result,\n    }\n  }\n\n  return result\n}\n\nfunction isSpecialResponse(err: TODO) {\n  return isResponse(err) || isRedirect(err)\n}\n\nfunction isResponse(response: Response): response is Response {\n  return response instanceof Response\n}\n"],"names":["url","response","method","ctx"],"mappings":"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"}
+{"version":3,"file":"createStartHandler.js","sources":["../../src/createStartHandler.ts"],"sourcesContent":["import { createMemoryHistory } from '@tanstack/history'\nimport {\n  flattenMiddlewares,\n  json,\n  mergeHeaders,\n} from '@tanstack/start-client-core'\nimport {\n  getMatchedRoutes,\n  isRedirect,\n  isResolvedRedirect,\n  joinPaths,\n  processRouteTree,\n  trimPath,\n} from '@tanstack/router-core'\nimport { attachRouterServerSsrUtils } from '@tanstack/router-core/ssr/server'\nimport { runWithStartContext } from '@tanstack/start-storage-context'\nimport { getResponseHeaders, requestHandler } from './request-response'\nimport { getStartManifest } from './router-manifest'\nimport { handleServerAction } from './server-functions-handler'\nimport { VIRTUAL_MODULES } from './virtual-modules'\nimport { loadVirtualModule } from './loadVirtualModule'\n\nimport { HEADERS } from './constants'\nimport { ServerFunctionSerializationAdapter } from './serializer/ServerFunctionSerializationAdapter'\nimport type {\n  AnyServerRouteWithTypes,\n  ServerRouteMethodHandlerFn,\n} from './serverRoute'\nimport type { RequestHandler } from './request-response'\nimport type {\n  AnyRoute,\n  AnyRouter,\n  Awaitable,\n  Manifest,\n  ProcessRouteTreeResult,\n} from '@tanstack/router-core'\nimport type { HandlerCallback } from '@tanstack/router-core/ssr/server'\n\ntype TODO = any\n\nexport type CustomizeStartHandler<TRouter extends AnyRouter> = (\n  cb: HandlerCallback<TRouter>,\n) => RequestHandler\n\nfunction getStartResponseHeaders(opts: { router: AnyRouter }) {\n  const headers = mergeHeaders(\n    getResponseHeaders() as Headers,\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<TRouter extends AnyRouter>({\n  createRouter,\n}: {\n  createRouter: () => Awaitable<TRouter>\n}): CustomizeStartHandler<TRouter> {\n  let routeTreeModule: {\n    serverRouteTree: AnyServerRouteWithTypes | undefined\n    routeTree: AnyRoute | undefined\n  } | null = null\n  let startRoutesManifest: Manifest | null = null\n  let processedServerRouteTree:\n    | ProcessRouteTreeResult<AnyServerRouteWithTypes>\n    | undefined = undefined\n\n  return (cb) => {\n    const originalFetch = globalThis.fetch\n\n    const startRequestResolver: RequestHandler = async (request) => {\n      // Patching fetch function to use our request resolver\n      // if the input starts with `/` which is a common pattern for\n      // client-side routing.\n      // When we encounter similar requests, we can assume that the\n      // user wants to use the same origin as the current request.\n      globalThis.fetch = async function (input, init) {\n        function resolve(url: URL, requestOptions: RequestInit | undefined) {\n          const fetchRequest = new Request(url, requestOptions)\n          return startRequestResolver(fetchRequest)\n        }\n\n        function getOrigin() {\n          return (\n            request.headers.get('Origin') ||\n            request.headers.get('Referer') ||\n            'http://localhost'\n          )\n        }\n\n        if (typeof input === 'string' && input.startsWith('/')) {\n          // e.g: fetch('/api/data')\n          const url = new URL(input, getOrigin())\n          return resolve(url, init)\n        } else if (\n          typeof input === 'object' &&\n          'url' in input &&\n          typeof input.url === 'string' &&\n          input.url.startsWith('/')\n        ) {\n          // e.g: fetch(new Request('/api/data'))\n          const url = new URL(input.url, getOrigin())\n          return resolve(url, init)\n        }\n\n        // If not, it should just use the original fetch\n        return originalFetch(input, init)\n      }\n\n      const url = new URL(request.url)\n      const href = decodeURIComponent(url.href.replace(url.origin, ''))\n\n      const APP_BASE = process.env.TSS_APP_BASE || '/'\n\n      // TODO how does this work with base path? does the router need to be configured the same as APP_BASE?\n      const router = await createRouter()\n\n      // Create a history for the client-side router\n      const history = createMemoryHistory({\n        initialEntries: [href],\n      })\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      // insert start specific default serialization adapters\n      const serializationAdapters = router.options.serializationAdapters ?? []\n      // TODO: client side needs to install that plugin in hydrateStart!\n      serializationAdapters.push(ServerFunctionSerializationAdapter)\n      router.update({\n        history,\n        isShell,\n        isPrerendering,\n        serializationAdapters,\n      })\n\n      const response = await runWithStartContext({ router }, async () => {\n        try {\n          if (!process.env.TSS_SERVER_FN_BASE) {\n            throw new Error(\n              'tanstack/start-server-core: TSS_SERVER_FN_BASE must be defined in your environment for createStartHandler()',\n            )\n          }\n\n          // First, let's attempt to handle server functions\n          // Add trailing slash to sanitise user defined TSS_SERVER_FN_BASE\n          const serverFnBase = joinPaths([\n            APP_BASE,\n            trimPath(process.env.TSS_SERVER_FN_BASE),\n            '/',\n          ])\n          if (href.startsWith(serverFnBase)) {\n            return await handleServerAction({ request })\n          }\n\n          if (routeTreeModule === null) {\n            try {\n              routeTreeModule = await loadVirtualModule(\n                VIRTUAL_MODULES.routeTree,\n              )\n              if (routeTreeModule.serverRouteTree) {\n                processedServerRouteTree =\n                  processRouteTree<AnyServerRouteWithTypes>({\n                    routeTree: routeTreeModule.serverRouteTree,\n                    initRoute: (route, i) => {\n                      route.init({\n                        originalIndex: i,\n                      })\n                    },\n                  })\n              }\n            } catch (e) {\n              console.log(e)\n            }\n          }\n\n          const executeRouter = async () => {\n            const requestAcceptHeader = request.headers.get('Accept') || '*/*'\n            const splitRequestAcceptHeader = 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 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                basePath: APP_BASE,\n              })\n            }\n\n            // Attach the server-side SSR utils to the client-side router\n            attachRouterServerSsrUtils(router, startRoutesManifest)\n\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            const response = await cb({\n              request,\n              router,\n              responseHeaders,\n            })\n\n            return response\n          }\n\n          // If we have a server route tree, then we try matching to see if we have a\n          // server route that matches the request.\n          if (processedServerRouteTree) {\n            const [_matchedRoutes, response] = await handleServerRoutes({\n              processedServerRouteTree,\n              router,\n              request,\n              basePath: APP_BASE,\n              executeRouter,\n            })\n\n            if (response) return response\n          }\n\n          // Server Routes did not produce a response, so fallback to normal SSR matching using the router\n          const routerResponse = await executeRouter()\n          return routerResponse\n        } catch (err) {\n          if (err instanceof Response) {\n            return err\n          }\n\n          throw err\n        }\n      })\n\n      if (isRedirect(response)) {\n        if (isResolvedRedirect(response)) {\n          if (request.headers.get('x-tsr-redirect') === 'manual') {\n            return json(\n              {\n                ...response.options,\n                isSerializedRedirect: true,\n              },\n              {\n                headers: response.headers,\n              },\n            )\n          }\n          return response\n        }\n        if (\n          response.options.to &&\n          typeof response.options.to === 'string' &&\n          !response.options.to.startsWith('/')\n        ) {\n          throw new Error(\n            `Server side redirects must use absolute paths via the 'href' or 'to' options. 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 redirect = router.resolveRedirect(response)\n\n        if (request.headers.get('x-tsr-redirect') === 'manual') {\n          return json(\n            {\n              ...response.options,\n              isSerializedRedirect: true,\n            },\n            {\n              headers: response.headers,\n            },\n          )\n        }\n\n        return redirect\n      }\n\n      return response\n    }\n\n    return requestHandler(startRequestResolver)\n  }\n}\n\nasync function handleServerRoutes(opts: {\n  router: AnyRouter\n  processedServerRouteTree: ProcessRouteTreeResult<AnyServerRouteWithTypes>\n  request: Request\n  basePath: string\n  executeRouter: () => Promise<Response>\n}) {\n  const url = new URL(opts.request.url)\n  const pathname = url.pathname\n\n  const serverTreeResult = getMatchedRoutes<AnyServerRouteWithTypes>({\n    pathname,\n    basepath: opts.basePath,\n    caseSensitive: true,\n    routesByPath: opts.processedServerRouteTree.routesByPath,\n    routesById: opts.processedServerRouteTree.routesById,\n    flatRoutes: opts.processedServerRouteTree.flatRoutes,\n  })\n\n  const routeTreeResult = opts.router.getMatchedRoutes(pathname, undefined)\n\n  let response: Response | undefined\n  let matchedRoutes: Array<AnyServerRouteWithTypes> = []\n  matchedRoutes = serverTreeResult.matchedRoutes\n  // check if the app route tree found a match that is deeper than the server route tree\n  if (routeTreeResult.foundRoute) {\n    if (\n      serverTreeResult.matchedRoutes.length <\n      routeTreeResult.matchedRoutes.length\n    ) {\n      const closestCommon = [...routeTreeResult.matchedRoutes]\n        .reverse()\n        .find((r) => {\n          return opts.processedServerRouteTree.routesById[r.id] !== undefined\n        })\n      if (closestCommon) {\n        // walk up the tree and collect all parents\n        let routeId = closestCommon.id\n        matchedRoutes = []\n        do {\n          const route = opts.processedServerRouteTree.routesById[routeId]\n          if (!route) {\n            break\n          }\n          matchedRoutes.push(route)\n          routeId = route.parentRoute?.id\n        } while (routeId)\n\n        matchedRoutes.reverse()\n      }\n    }\n  }\n\n  if (matchedRoutes.length) {\n    // We've found a server route that (partially) matches the request, so we can call it.\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.middleware).filter(Boolean),\n    ).map((d) => d.options.server)\n\n    if (serverTreeResult.foundRoute?.options.methods) {\n      const method = Object.keys(\n        serverTreeResult.foundRoute.options.methods,\n      ).find(\n        (method) => method.toLowerCase() === opts.request.method.toLowerCase(),\n      )\n\n      if (method) {\n        const handler = serverTreeResult.foundRoute.options.methods[method]\n        if (handler) {\n          if (typeof handler === 'function') {\n            middlewares.push(handlerToMiddleware(handler) as TODO)\n          } else {\n            if (\n              handler._options.middlewares &&\n              handler._options.middlewares.length\n            ) {\n              middlewares.push(\n                ...flattenMiddlewares(handler._options.middlewares as any).map(\n                  (d) => d.options.server,\n                ),\n              )\n            }\n            if (handler._options.handler) {\n              middlewares.push(handlerToMiddleware(handler._options.handler))\n            }\n          }\n        }\n      }\n    }\n\n    // eventually, execute the router\n    middlewares.push(handlerToMiddleware(opts.executeRouter))\n\n    // TODO: This is starting to feel too much like a server function\n    // Do generalize the existing middleware execution? Or do we need to\n    // build a new middleware execution system for server routes?\n    const ctx = await executeMiddleware(middlewares, {\n      request: opts.request,\n      context: {},\n      params: serverTreeResult.routeParams,\n      pathname,\n    })\n\n    response = ctx.response\n  }\n\n  // We return the matched routes too so if\n  // the app router happens to match the same path,\n  // it can use any request middleware from server routes\n  return [matchedRoutes, response] as const\n}\n\nfunction handlerToMiddleware(\n  handler: ServerRouteMethodHandlerFn<\n    AnyServerRouteWithTypes,\n    any,\n    any,\n    any,\n    any\n  >,\n) {\n  return async ({ next: _next, ...rest }: TODO) => {\n    const response = await handler(rest)\n    if (response) {\n      return { response }\n    }\n    return _next(rest)\n  }\n}\n\nfunction executeMiddleware(middlewares: TODO, ctx: TODO) {\n  let index = -1\n\n  const next = async (ctx: TODO) => {\n    index++\n    const middleware = middlewares[index]\n    if (!middleware) return ctx\n\n    const result = await middleware({\n      ...ctx,\n      // Allow the middleware to call the next middleware in the chain\n      next: async (nextCtx: TODO) => {\n        // Allow the caller to extend the context for the next middleware\n        const nextResult = await next({\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    }).catch((err: TODO) => {\n      if (isSpecialResponse(err)) {\n        return {\n          response: err,\n        }\n      }\n\n      throw err\n    })\n\n    // Merge the middleware result into the context, just in case it\n    // returns a partial context\n    return Object.assign(ctx, handleCtxResult(result))\n  }\n\n  return handleCtxResult(next(ctx))\n}\n\nfunction handleCtxResult(result: TODO) {\n  if (isSpecialResponse(result)) {\n    return {\n      response: result,\n    }\n  }\n\n  return result\n}\n\nfunction isSpecialResponse(err: TODO) {\n  return isResponse(err) || isRedirect(err)\n}\n\nfunction isResponse(response: Response): response is Response {\n  return response instanceof Response\n}\n"],"names":["url","response","method","ctx"],"mappings":"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"}

package/dist/esm/getServerFnById.d.ts

@@ -0,0 +1 @@
+export declare function getServerFnById(serverFnId: string): Promise<(...args: Array<any>) => Promise<any>>;

package/dist/esm/getServerFnById.js

@@ -0,0 +1,30 @@
+import { loadVirtualModule } from "./loadVirtualModule.js";
+import { VIRTUAL_MODULES } from "./virtual-modules.js";
+async function getServerFnById(serverFnId) {
+  const { default: serverFnManifest } = await loadVirtualModule(
+    VIRTUAL_MODULES.serverFnManifest
+  );
+  const serverFnInfo = serverFnManifest[serverFnId];
+  if (!serverFnInfo) {
+    console.info("serverFnManifest", serverFnManifest);
+    throw new Error("Server function info not found for " + serverFnId);
+  }
+  const fnModule = await serverFnInfo.importer();
+  if (!fnModule) {
+    console.info("serverFnInfo", serverFnInfo);
+    throw new Error("Server function module not resolved for " + serverFnId);
+  }
+  const action = fnModule[serverFnInfo.functionName];
+  if (!action) {
+    console.info("serverFnInfo", serverFnInfo);
+    console.info("fnModule", fnModule);
+    throw new Error(
+      `Server function module export not resolved for serverFn ID: ${serverFnId}`
+    );
+  }
+  return action;
+}
+export {
+  getServerFnById
+};
+//# sourceMappingURL=getServerFnById.js.map

package/dist/esm/getServerFnById.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getServerFnById.js","sources":["../../src/getServerFnById.ts"],"sourcesContent":["import { loadVirtualModule } from './loadVirtualModule'\nimport { VIRTUAL_MODULES } from './virtual-modules'\n\nexport async function getServerFnById(serverFnId: string) {\n  const { default: serverFnManifest } = await loadVirtualModule(\n    VIRTUAL_MODULES.serverFnManifest,\n  )\n\n  const serverFnInfo = serverFnManifest[serverFnId]\n\n  if (!serverFnInfo) {\n    console.info('serverFnManifest', serverFnManifest)\n    throw new Error('Server function info not found for ' + serverFnId)\n  }\n\n  const fnModule = await serverFnInfo.importer()\n\n  if (!fnModule) {\n    console.info('serverFnInfo', serverFnInfo)\n    throw new Error('Server function module not resolved for ' + serverFnId)\n  }\n\n  const action = fnModule[serverFnInfo.functionName]\n\n  if (!action) {\n    console.info('serverFnInfo', serverFnInfo)\n    console.info('fnModule', fnModule)\n    throw new Error(\n      `Server function module export not resolved for serverFn ID: ${serverFnId}`,\n    )\n  }\n  return action\n}\n"],"names":[],"mappings":";;AAGA,eAAsB,gBAAgB,YAAoB;AACxD,QAAM,EAAE,SAAS,iBAAA,IAAqB,MAAM;AAAA,IAC1C,gBAAgB;AAAA,EAAA;AAGlB,QAAM,eAAe,iBAAiB,UAAU;AAEhD,MAAI,CAAC,cAAc;AACjB,YAAQ,KAAK,oBAAoB,gBAAgB;AACjD,UAAM,IAAI,MAAM,wCAAwC,UAAU;AAAA,EACpE;AAEA,QAAM,WAAW,MAAM,aAAa,SAAA;AAEpC,MAAI,CAAC,UAAU;AACb,YAAQ,KAAK,gBAAgB,YAAY;AACzC,UAAM,IAAI,MAAM,6CAA6C,UAAU;AAAA,EACzE;AAEA,QAAM,SAAS,SAAS,aAAa,YAAY;AAEjD,MAAI,CAAC,QAAQ;AACX,YAAQ,KAAK,gBAAgB,YAAY;AACzC,YAAQ,KAAK,YAAY,QAAQ;AACjC,UAAM,IAAI;AAAA,MACR,+DAA+D,UAAU;AAAA,IAAA;AAAA,EAE7E;AACA,SAAO;AACT;"}

package/dist/esm/index.d.ts

@@ -8,3 +8,4 @@ export { createServerRoute, createServerFileRoute, createServerRootRoute, } from
 export type { CreateServerFileRoute, ServerFileRoutesByPath, ServerRouteOptions, ServerRouteManifest, ServerRouteAddFileChildrenFn, ServerRouteMethodBuilderOptions, AnyServerRouteWithTypes, ServerRouteWithTypes, ServerRouteTypes, ResolveAllServerContext, AnyServerRoute, ServerRoute, ServerRouteMiddleware, ServerRouteAfterMiddleware, ServerRouteMethods, ServerRouteMethodsOptions, ServerRouteMethodsRecord, ServerRouteMethodRecordValue, ServerRouteVerb, ServerRouteMethodHandlerFn, ServerRouteMethodHandlerCtx, MergeMethodMiddlewares, AssignAllMethodContext, AnyRouteMethodsBuilder, ServerRouteMethodBuilder, ServerRouteMethodBuilderWithTypes, ServerRouteMethodBuilderTypes, ServerRouteMethodBuilderMiddleware, ServerRouteMethodBuilderAfterMiddleware, ServerRouteMethodBuilderHandler, ServerRouteMethodBuilderAfterHandler, ServerRouteMethod, ServerRouteAfterMethods, } from './serverRoute.js';
 export * from './virtual-modules.js';
 export { HEADERS } from './constants.js';
+export { createServerRpc } from './createServerRpc.js';

package/dist/esm/index.js

@@ -5,6 +5,7 @@ import { clearResponseHeaders, clearSession, deleteCookie, getCookie, getCookies
 import { createServerFileRoute, createServerRootRoute, createServerRoute } from "./serverRoute.js";
 import { VIRTUAL_MODULES } from "./virtual-modules.js";
 import { HEADERS } from "./constants.js";
+import { createServerRpc } from "./createServerRpc.js";
 export {
   HEADERS,
   VIRTUAL_MODULES,
@@ -15,6 +16,7 @@ export {
   createServerFileRoute,
   createServerRootRoute,
   createServerRoute,
+  createServerRpc,
   createStartHandler,
   defineHandlerCallback,
   deleteCookie,

package/dist/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;"}
+{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;"}

package/dist/esm/serializer/ServerFunctionSerializationAdapter.d.ts

@@ -0,0 +1,5 @@
+export declare const ServerFunctionSerializationAdapter: import('@tanstack/router-core').Transformer<{
+    functionId: string;
+}, {
+    functionId: string;
+}>;

package/dist/esm/serializer/ServerFunctionSerializationAdapter.js

@@ -0,0 +1,20 @@
+import { createSerializationAdapter } from "@tanstack/router-core";
+import { createServerRpc } from "../createServerRpc.js";
+import { getServerFnById } from "../getServerFnById.js";
+const ServerFunctionSerializationAdapter = createSerializationAdapter({
+  key: "$TSS/serverfn",
+  test: (v) => typeof v == "function" && "functionId" in v,
+  toSerializable: ({ functionId }) => ({ functionId }),
+  fromSerializable: ({ functionId }) => {
+    const fn = async (opts, signal) => {
+      const serverFn = await getServerFnById(functionId);
+      const result = await serverFn(opts ?? {}, signal);
+      return result.result;
+    };
+    return createServerRpc(functionId, fn);
+  }
+});
+export {
+  ServerFunctionSerializationAdapter
+};
+//# sourceMappingURL=ServerFunctionSerializationAdapter.js.map

package/dist/esm/serializer/ServerFunctionSerializationAdapter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ServerFunctionSerializationAdapter.js","sources":["../../../src/serializer/ServerFunctionSerializationAdapter.ts"],"sourcesContent":["import { createSerializationAdapter } from '@tanstack/router-core'\nimport { createServerRpc } from '../createServerRpc'\nimport { getServerFnById } from '../getServerFnById'\n\nexport const ServerFunctionSerializationAdapter = createSerializationAdapter({\n  key: '$TSS/serverfn',\n  test: (v): v is { functionId: string } =>\n    typeof v == 'function' && 'functionId' in v,\n  toSerializable: ({ functionId }) => ({ functionId }),\n  fromSerializable: ({ functionId }) => {\n    const fn = async (opts: any, signal: any): Promise<any> => {\n      const serverFn = await getServerFnById(functionId)\n      const result = await serverFn(opts ?? {}, signal)\n      return result.result\n    }\n    return createServerRpc(functionId, fn)\n  },\n})\n"],"names":[],"mappings":";;;AAIO,MAAM,qCAAqC,2BAA2B;AAAA,EAC3E,KAAK;AAAA,EACL,MAAM,CAAC,MACL,OAAO,KAAK,cAAc,gBAAgB;AAAA,EAC5C,gBAAgB,CAAC,EAAE,kBAAkB,EAAE,WAAA;AAAA,EACvC,kBAAkB,CAAC,EAAE,iBAAiB;AACpC,UAAM,KAAK,OAAO,MAAW,WAA8B;AACzD,YAAM,WAAW,MAAM,gBAAgB,UAAU;AACjD,YAAM,SAAS,MAAM,SAAS,QAAQ,CAAA,GAAI,MAAM;AAChD,aAAO,OAAO;AAAA,IAChB;AACA,WAAO,gBAAgB,YAAY,EAAE;AAAA,EACvC;AACF,CAAC;"}

package/dist/esm/serializer/getSerovalPlugins.d.ts

@@ -0,0 +1,3 @@
+export declare function getSerovalPlugins(): (import('seroval').Plugin<Error, any> | import('seroval').Plugin<ReadableStream<any>, any> | import('seroval').Plugin<FormData, any> | import('seroval').Plugin<any, import('seroval').SerovalNode> | import('seroval').Plugin<{
+    functionId: string;
+}, import('seroval').SerovalNode>)[];

package/dist/esm/serializer/getSerovalPlugins.js

@@ -0,0 +1,13 @@
+import { makeSerovalPlugin } from "@tanstack/router-core";
+import { getDefaultSerovalPlugins } from "@tanstack/start-client-core";
+import { ServerFunctionSerializationAdapter } from "./ServerFunctionSerializationAdapter.js";
+function getSerovalPlugins() {
+  return [
+    ...getDefaultSerovalPlugins(),
+    makeSerovalPlugin(ServerFunctionSerializationAdapter)
+  ];
+}
+export {
+  getSerovalPlugins
+};
+//# sourceMappingURL=getSerovalPlugins.js.map

package/dist/esm/serializer/getSerovalPlugins.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getSerovalPlugins.js","sources":["../../../src/serializer/getSerovalPlugins.ts"],"sourcesContent":["import { makeSerovalPlugin } from '@tanstack/router-core'\nimport { getDefaultSerovalPlugins } from '@tanstack/start-client-core'\nimport { ServerFunctionSerializationAdapter } from './ServerFunctionSerializationAdapter'\n\nexport function getSerovalPlugins() {\n  return [\n    ...getDefaultSerovalPlugins(),\n    makeSerovalPlugin(ServerFunctionSerializationAdapter),\n  ]\n}\n"],"names":[],"mappings":";;;AAIO,SAAS,oBAAoB;AAClC,SAAO;AAAA,IACL,GAAG,yBAAA;AAAA,IACH,kBAAkB,kCAAkC;AAAA,EAAA;AAExD;"}

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

@@ -1,9 +1,10 @@
 import { isNotFound } from "@tanstack/router-core";
 import invariant from "tiny-invariant";
-import { startSerializer } from "@tanstack/start-client-core";
-import { VIRTUAL_MODULES } from "./virtual-modules.js";
-import { loadVirtualModule } from "./loadVirtualModule.js";
+import { TSR_FORMDATA_CONTEXT } from "@tanstack/start-client-core";
+import { toCrossJSONStream, toJSONAsync, fromJSON } from "seroval";
 import { getResponse } from "./request-response.js";
+import { getServerFnById } from "./getServerFnById.js";
+import { getSerovalPlugins } from "./serializer/getSerovalPlugins.js";
 function sanitizeBase(base) {
   if (!base) {
     throw new Error(
@@ -12,59 +13,6 @@ function sanitizeBase(base) {
   }
   return base.replace(/^\/|\/$/g, "");
 }
-async function revive(root, reviver) {
-  async function reviveNode(holder2, key) {
-    const value = holder2[key];
-    if (value && typeof value === "object") {
-      await Promise.all(Object.keys(value).map((k) => reviveNode(value, k)));
-    }
-    if (reviver) {
-      holder2[key] = await reviver(key, holder2[key]);
-    }
-  }
-  const holder = { "": root };
-  await reviveNode(holder, "");
-  return holder[""];
-}
-async function reviveServerFns(key, value) {
-  if (value && value.__serverFn === true && value.functionId) {
-    const serverFn = await getServerFnById(value.functionId);
-    return async (opts, signal) => {
-      const result = await serverFn(opts ?? {}, signal);
-      return result.result;
-    };
-  }
-  return value;
-}
-async function getServerFnById(serverFnId) {
-  const { default: serverFnManifest } = await loadVirtualModule(
-    VIRTUAL_MODULES.serverFnManifest
-  );
-  const serverFnInfo = serverFnManifest[serverFnId];
-  if (!serverFnInfo) {
-    console.info("serverFnManifest", serverFnManifest);
-    throw new Error("Server function info not found for " + serverFnId);
-  }
-  const fnModule = await serverFnInfo.importer();
-  if (!fnModule) {
-    console.info("serverFnInfo", serverFnInfo);
-    throw new Error("Server function module not resolved for " + serverFnId);
-  }
-  const action = fnModule[serverFnInfo.functionName];
-  if (!action) {
-    console.info("serverFnInfo", serverFnInfo);
-    console.info("fnModule", fnModule);
-    throw new Error(
-      `Server function module export not resolved for serverFn ID: ${serverFnId}`
-    );
-  }
-  return action;
-}
-async function parsePayload(payload) {
-  const parsedPayload = startSerializer.parse(payload);
-  await revive(parsedPayload, reviveServerFns);
-  return parsedPayload;
-}
 const handleServerAction = async ({ request }) => {
   const controller = new AbortController();
   const signal = controller.signal;
@@ -88,32 +36,58 @@ const handleServerAction = async ({ request }) => {
     "multipart/form-data",
     "application/x-www-form-urlencoded"
   ];
+  const contentType = request.headers.get("Content-Type");
+  const serovalPlugins = getSerovalPlugins();
+  function parsePayload(payload) {
+    const parsedPayload = fromJSON(payload, { plugins: serovalPlugins });
+    return parsedPayload;
+  }
   const response = await (async () => {
     try {
       let result = await (async () => {
-        if (request.headers.get("Content-Type") && formDataContentTypes.some(
-          (type) => request.headers.get("Content-Type")?.includes(type)
+        if (formDataContentTypes.some(
+          (type) => contentType && contentType.includes(type)
         )) {
           invariant(
             method.toLowerCase() !== "get",
             "GET requests with FormData payloads are not supported"
           );
-          return await action(await request.formData(), signal);
+          const formData = await request.formData();
+          const serializedContext = formData.get(TSR_FORMDATA_CONTEXT);
+          formData.delete(TSR_FORMDATA_CONTEXT);
+          const params = {
+            context: {},
+            data: formData
+          };
+          if (typeof serializedContext === "string") {
+            try {
+              params.context = parsePayload(JSON.parse(serializedContext));
+            } catch {
+            }
+          }
+          return await action(params, signal);
         }
         if (method.toLowerCase() === "get") {
-          let payload2 = search;
-          if (isCreateServerFn) {
-            payload2 = search.payload;
-          }
-          payload2 = payload2 ? await parsePayload(payload2) : payload2;
-          return await action(payload2, signal);
+          invariant(
+            isCreateServerFn,
+            "expected GET request to originate from createServerFn"
+          );
+          let payload = search.payload;
+          payload = payload ? await parsePayload(JSON.parse(payload)) : payload;
+          return await action(payload, signal);
+        }
+        if (method.toLowerCase() !== "post") {
+          throw new Error("expected POST method");
         }
-        const jsonPayloadAsString = await request.text();
-        const payload = await parsePayload(jsonPayloadAsString);
+        if (!contentType || !contentType.includes("application/json")) {
+          throw new Error("expected application/json content type");
+        }
+        const jsonPayload = await request.json();
         if (isCreateServerFn) {
+          const payload = await parsePayload(jsonPayload);
           return await action(payload, signal);
         }
-        return await action(...payload, signal);
+        return await action(...jsonPayload);
       })();
       if (result.result instanceof Response) {
         return result.result;
@@ -128,16 +102,38 @@ const handleServerAction = async ({ request }) => {
         return isNotFoundResponse(result);
       }
       const response2 = getResponse();
-      return new Response(
-        result !== void 0 ? startSerializer.stringify(result) : void 0,
-        {
-          status: response2?.status,
-          statusText: response2?.statusText,
-          headers: {
-            "Content-Type": "application/json"
+      let body = void 0;
+      if (result !== void 0) {
+        body = new ReadableStream({
+          start(controller2) {
+            toCrossJSONStream(result, {
+              refs: /* @__PURE__ */ new Map(),
+              plugins: serovalPlugins,
+              onParse: (value) => {
+                controller2.enqueue(JSON.stringify(value) + "\n");
+              },
+              onDone: () => {
+                try {
+                  controller2.close();
+                } catch (error) {
+                  controller2.error(error);
+                }
+              },
+              onError: (error) => {
+                controller2.error(error);
+              }
+            });
           }
+        });
+      }
+      return new Response(body, {
+        status: response2?.status,
+        statusText: response2?.statusText,
+        headers: {
+          "Content-Type": "application/x-ndjson; charset=utf-8",
+          "x-tss-serialized": "true"
         }
-      );
+      });
     } catch (error) {
       if (error instanceof Response) {
         return error;
@@ -150,10 +146,14 @@ const handleServerAction = async ({ request }) => {
       console.info();
       console.error(error);
       console.info();
-      return new Response(startSerializer.stringify(error), {
+      const serializedError = JSON.stringify(
+        await Promise.resolve(toJSONAsync(error))
+      );
+      return new Response(serializedError, {
         status: 500,
         headers: {
-          "Content-Type": "application/json"
+          "Content-Type": "application/json",
+          "x-tss-serialized": "true"
         }
       });
     }

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 { startSerializer } from '@tanstack/start-client-core'\nimport { VIRTUAL_MODULES } from './virtual-modules'\nimport { loadVirtualModule } from './loadVirtualModule'\nimport { getResponse } from './request-response'\n\nfunction sanitizeBase(base: string | undefined) {\n  if (!base) {\n    throw new Error(\n      '🚨 process.env.TSS_SERVER_FN_BASE is required in start/server-handler/index',\n    )\n  }\n\n  return base.replace(/^\\/|\\/$/g, '')\n}\n\nasync function revive(root: any, reviver?: (key: string, value: any) => any) {\n  async function reviveNode(holder: any, key: string) {\n    const value = holder[key]\n\n    if (value && typeof value === 'object') {\n      await Promise.all(Object.keys(value).map((k) => reviveNode(value, k)))\n    }\n\n    if (reviver) {\n      holder[key] = await reviver(key, holder[key])\n    }\n  }\n\n  const holder = { '': root }\n  await reviveNode(holder, '')\n  return holder['']\n}\n\nasync function reviveServerFns(key: string, value: any) {\n  if (value && value.__serverFn === true && value.functionId) {\n    const serverFn = await getServerFnById(value.functionId)\n    return async (opts: any, signal: any): Promise<any> => {\n      const result = await serverFn(opts ?? {}, signal)\n      return result.result\n    }\n  }\n  return value\n}\n\nasync function getServerFnById(serverFnId: string) {\n  const { default: serverFnManifest } = await loadVirtualModule(\n    VIRTUAL_MODULES.serverFnManifest,\n  )\n\n  const serverFnInfo = serverFnManifest[serverFnId]\n\n  if (!serverFnInfo) {\n    console.info('serverFnManifest', serverFnManifest)\n    throw new Error('Server function info not found for ' + serverFnId)\n  }\n\n  const fnModule = await serverFnInfo.importer()\n\n  if (!fnModule) {\n    console.info('serverFnInfo', serverFnInfo)\n    throw new Error('Server function module not resolved for ' + serverFnId)\n  }\n\n  const action = fnModule[serverFnInfo.functionName]\n\n  if (!action) {\n    console.info('serverFnInfo', serverFnInfo)\n    console.info('fnModule', fnModule)\n    throw new Error(\n      `Server function module export not resolved for serverFn ID: ${serverFnId}`,\n    )\n  }\n  return action\n}\n\nasync function parsePayload(payload: any) {\n  const parsedPayload = startSerializer.parse(payload)\n  await revive(parsedPayload, reviveServerFns)\n  return parsedPayload\n}\n\nexport const handleServerAction = async ({ request }: { request: Request }) => {\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 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  const regex = new RegExp(\n    `${sanitizeBase(process.env.TSS_SERVER_FN_BASE)}/([^/?#]+)`,\n  )\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  const isRaw = 'raw' 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)\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 response = await (async () => {\n    try {\n      let result = await (async () => {\n        // FormData\n        if (\n          request.headers.get('Content-Type') &&\n          formDataContentTypes.some((type) =>\n            request.headers.get('Content-Type')?.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\n          return await action(await request.formData(), signal)\n        }\n\n        // Get requests use the query string\n        if (method.toLowerCase() === 'get') {\n          // By default the payload is the search params\n          let payload: any = search\n\n          // If this GET request was created by createServerFn,\n          // then the payload will be on the payload param\n          if (isCreateServerFn) {\n            payload = search.payload\n          }\n\n          // If there's a payload, we should try to parse it\n          payload = payload ? await parsePayload(payload) : payload\n\n          // Send it through!\n          return await action(payload, signal)\n        }\n\n        // This must be a POST request, likely JSON???\n        const jsonPayloadAsString = await request.text()\n\n        // We should probably try to deserialize the payload\n        // as JSON, but we'll just pass it through for now.\n        const payload = await parsePayload(jsonPayloadAsString)\n\n        // If this POST request was created by createServerFn,\n        // it's payload will be the only argument\n        if (isCreateServerFn) {\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(...(payload as any), signal)\n      })()\n\n      // Any time we get a Response back, we should just\n      // return it immediately.\n      if (result.result instanceof Response) {\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      // if (!search.createServerFn) {\n      //   result = result.result\n      // }\n\n      // else if (\n      //   isPlainObject(result) &&\n      //   'result' in result &&\n      //   result.result instanceof Response\n      // ) {\n      //   return result.result\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      return new Response(\n        result !== undefined ? startSerializer.stringify(result) : undefined,\n        {\n          status: response?.status,\n          statusText: response?.statusText,\n          headers: {\n            'Content-Type': 'application/json',\n          },\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      return new Response(startSerializer.stringify(error), {\n        status: 500,\n        headers: {\n          'Content-Type': 'application/json',\n        },\n      })\n    }\n  })()\n\n  request.signal.removeEventListener('abort', abort)\n\n  if (isRaw) {\n    return response\n  }\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":["holder","payload","response"],"mappings":";;;;;;AAOA,SAAS,aAAa,MAA0B;AAC9C,MAAI,CAAC,MAAM;AACT,UAAM,IAAI;AAAA,MACR;AAAA,IAAA;AAAA,EAEJ;AAEA,SAAO,KAAK,QAAQ,YAAY,EAAE;AACpC;AAEA,eAAe,OAAO,MAAW,SAA4C;AAC3E,iBAAe,WAAWA,SAAa,KAAa;AAClD,UAAM,QAAQA,QAAO,GAAG;AAExB,QAAI,SAAS,OAAO,UAAU,UAAU;AACtC,YAAM,QAAQ,IAAI,OAAO,KAAK,KAAK,EAAE,IAAI,CAAC,MAAM,WAAW,OAAO,CAAC,CAAC,CAAC;AAAA,IACvE;AAEA,QAAI,SAAS;AACXA,cAAO,GAAG,IAAI,MAAM,QAAQ,KAAKA,QAAO,GAAG,CAAC;AAAA,IAC9C;AAAA,EACF;AAEA,QAAM,SAAS,EAAE,IAAI,KAAA;AACrB,QAAM,WAAW,QAAQ,EAAE;AAC3B,SAAO,OAAO,EAAE;AAClB;AAEA,eAAe,gBAAgB,KAAa,OAAY;AACtD,MAAI,SAAS,MAAM,eAAe,QAAQ,MAAM,YAAY;AAC1D,UAAM,WAAW,MAAM,gBAAgB,MAAM,UAAU;AACvD,WAAO,OAAO,MAAW,WAA8B;AACrD,YAAM,SAAS,MAAM,SAAS,QAAQ,CAAA,GAAI,MAAM;AAChD,aAAO,OAAO;AAAA,IAChB;AAAA,EACF;AACA,SAAO;AACT;AAEA,eAAe,gBAAgB,YAAoB;AACjD,QAAM,EAAE,SAAS,iBAAA,IAAqB,MAAM;AAAA,IAC1C,gBAAgB;AAAA,EAAA;AAGlB,QAAM,eAAe,iBAAiB,UAAU;AAEhD,MAAI,CAAC,cAAc;AACjB,YAAQ,KAAK,oBAAoB,gBAAgB;AACjD,UAAM,IAAI,MAAM,wCAAwC,UAAU;AAAA,EACpE;AAEA,QAAM,WAAW,MAAM,aAAa,SAAA;AAEpC,MAAI,CAAC,UAAU;AACb,YAAQ,KAAK,gBAAgB,YAAY;AACzC,UAAM,IAAI,MAAM,6CAA6C,UAAU;AAAA,EACzE;AAEA,QAAM,SAAS,SAAS,aAAa,YAAY;AAEjD,MAAI,CAAC,QAAQ;AACX,YAAQ,KAAK,gBAAgB,YAAY;AACzC,YAAQ,KAAK,YAAY,QAAQ;AACjC,UAAM,IAAI;AAAA,MACR,+DAA+D,UAAU;AAAA,IAAA;AAAA,EAE7E;AACA,SAAO;AACT;AAEA,eAAe,aAAa,SAAc;AACxC,QAAM,gBAAgB,gBAAgB,MAAM,OAAO;AACnD,QAAM,OAAO,eAAe,eAAe;AAC3C,SAAO;AACT;AAEO,MAAM,qBAAqB,OAAO,EAAE,cAAoC;AAC7E,QAAM,aAAa,IAAI,gBAAA;AACvB,QAAM,SAAS,WAAW;AAC1B,QAAM,QAAQ,MAAM,WAAW,MAAA;AAC/B,UAAQ,OAAO,iBAAiB,SAAS,KAAK;AAE9C,QAAM,SAAS,QAAQ;AACvB,QAAM,MAAM,IAAI,IAAI,QAAQ,KAAK,uBAAuB;AAGxD,QAAM,QAAQ,IAAI;AAAA,IAChB,GAAG,aAAa,QAAQ,IAAI,kBAAkB,CAAC;AAAA,EAAA;AAIjD,QAAM,QAAQ,IAAI,SAAS,MAAM,KAAK;AACtC,QAAM,aAAa,QAAQ,MAAM,CAAC,IAAI;AACtC,QAAM,SAAS,OAAO,YAAY,IAAI,aAAa,SAAS;AAK5D,QAAM,mBAAmB,oBAAoB;AAC7C,QAAM,QAAQ,SAAS;AAEvB,MAAI,OAAO,eAAe,UAAU;AAClC,UAAM,IAAI,MAAM,iDAAiD,UAAU;AAAA,EAC7E;AAEA,QAAM,SAAS,MAAM,gBAAgB,UAAU;AAG/C,QAAM,uBAAuB;AAAA,IAC3B;AAAA,IACA;AAAA,EAAA;AAGF,QAAM,WAAW,OAAO,YAAY;AAClC,QAAI;AACF,UAAI,SAAS,OAAO,YAAY;AAE9B,YACE,QAAQ,QAAQ,IAAI,cAAc,KAClC,qBAAqB;AAAA,UAAK,CAAC,SACzB,QAAQ,QAAQ,IAAI,cAAc,GAAG,SAAS,IAAI;AAAA,QAAA,GAEpD;AAEA;AAAA,YACE,OAAO,kBAAkB;AAAA,YACzB;AAAA,UAAA;AAGF,iBAAO,MAAM,OAAO,MAAM,QAAQ,SAAA,GAAY,MAAM;AAAA,QACtD;AAGA,YAAI,OAAO,YAAA,MAAkB,OAAO;AAElC,cAAIC,WAAe;AAInB,cAAI,kBAAkB;AACpBA,uBAAU,OAAO;AAAA,UACnB;AAGAA,qBAAUA,WAAU,MAAM,aAAaA,QAAO,IAAIA;AAGlD,iBAAO,MAAM,OAAOA,UAAS,MAAM;AAAA,QACrC;AAGA,cAAM,sBAAsB,MAAM,QAAQ,KAAA;AAI1C,cAAM,UAAU,MAAM,aAAa,mBAAmB;AAItD,YAAI,kBAAkB;AACpB,iBAAO,MAAM,OAAO,SAAS,MAAM;AAAA,QACrC;AAKA,eAAO,MAAM,OAAO,GAAI,SAAiB,MAAM;AAAA,MACjD,GAAA;AAIA,UAAI,OAAO,kBAAkB,UAAU;AACrC,eAAO,OAAO;AAAA,MAChB;AAIA,UAAI,CAAC,kBAAkB;AACrB,iBAAS,OAAO;AAIhB,YAAI,kBAAkB,UAAU;AAC9B,iBAAO;AAAA,QACT;AAAA,MACF;AAiCA,UAAI,WAAW,MAAM,GAAG;AACtB,eAAO,mBAAmB,MAAM;AAAA,MAClC;AAEA,YAAMC,YAAW,YAAA;AACjB,aAAO,IAAI;AAAA,QACT,WAAW,SAAY,gBAAgB,UAAU,MAAM,IAAI;AAAA,QAC3D;AAAA,UACE,QAAQA,WAAU;AAAA,UAClB,YAAYA,WAAU;AAAA,UACtB,SAAS;AAAA,YACP,gBAAgB;AAAA,UAAA;AAAA,QAClB;AAAA,MACF;AAAA,IAEJ,SAAS,OAAY;AACnB,UAAI,iBAAiB,UAAU;AAC7B,eAAO;AAAA,MACT;AAcA,UAAI,WAAW,KAAK,GAAG;AACrB,eAAO,mBAAmB,KAAK;AAAA,MACjC;AAEA,cAAQ,KAAA;AACR,cAAQ,KAAK,kBAAkB;AAC/B,cAAQ,KAAA;AACR,cAAQ,MAAM,KAAK;AACnB,cAAQ,KAAA;AAER,aAAO,IAAI,SAAS,gBAAgB,UAAU,KAAK,GAAG;AAAA,QACpD,QAAQ;AAAA,QACR,SAAS;AAAA,UACP,gBAAgB;AAAA,QAAA;AAAA,MAClB,CACD;AAAA,IACH;AAAA,EACF,GAAA;AAEA,UAAQ,OAAO,oBAAoB,SAAS,KAAK;AAEjD,MAAI,OAAO;AACT,WAAO;AAAA,EACT;AAEA,SAAO;AACT;AAEA,SAAS,mBAAmB,OAAY;AACtC,QAAM,EAAE,SAAS,GAAG,KAAA,IAAS;AAE7B,SAAO,IAAI,SAAS,KAAK,UAAU,IAAI,GAAG;AAAA,IACxC,QAAQ;AAAA,IACR,SAAS;AAAA,MACP,gBAAgB;AAAA,MAChB,GAAI,WAAW,CAAA;AAAA,IAAC;AAAA,EAClB,CACD;AACH;"}
+{"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 { TSR_FORMDATA_CONTEXT } from '@tanstack/start-client-core'\nimport { fromJSON, toCrossJSONStream, toJSONAsync } from 'seroval'\nimport { getResponse } from './request-response'\nimport { getServerFnById } from './getServerFnById'\nimport { getSerovalPlugins } from './serializer/getSerovalPlugins'\n\nfunction sanitizeBase(base: string | undefined) {\n  if (!base) {\n    throw new Error(\n      '🚨 process.env.TSS_SERVER_FN_BASE is required in start/server-handler/index',\n    )\n  }\n\n  return base.replace(/^\\/|\\/$/g, '')\n}\n\nexport const handleServerAction = async ({ request }: { request: Request }) => {\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 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  const regex = new RegExp(\n    `${sanitizeBase(process.env.TSS_SERVER_FN_BASE)}/([^/?#]+)`,\n  )\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  const isRaw = 'raw' 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)\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 = getSerovalPlugins()\n\n  function parsePayload(payload: any) {\n    const parsedPayload = fromJSON(payload, { plugins: serovalPlugins })\n    return parsedPayload\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(TSR_FORMDATA_CONTEXT)\n          formData.delete(TSR_FORMDATA_CONTEXT)\n\n          const params = {\n            context: {} as any,\n            data: formData,\n          }\n          if (typeof serializedContext === 'string') {\n            try {\n              params.context = parsePayload(JSON.parse(serializedContext))\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 ? await parsePayload(JSON.parse(payload)) : payload\n\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        if (!contentType || !contentType.includes('application/json')) {\n          throw new Error('expected application/json content type')\n        }\n\n        const jsonPayload = await request.json()\n\n        // If this POST request was created by createServerFn,\n        // its payload will be the only argument\n        if (isCreateServerFn) {\n          const payload = await parsePayload(jsonPayload)\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        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\n      let body = undefined\n      if (result !== undefined) {\n        body = new ReadableStream({\n          start(controller) {\n            toCrossJSONStream(result, {\n              refs: new Map(),\n              plugins: serovalPlugins,\n              onParse: (value) => {\n                controller.enqueue(JSON.stringify(value) + '\\n')\n              },\n              onDone: () => {\n                try {\n                  controller.close()\n                } catch (error) {\n                  controller.error(error)\n                }\n              },\n              onError: (error) => {\n                controller.error(error)\n              },\n            })\n          },\n        })\n      }\n      return new Response(body, {\n        status: response?.status,\n        statusText: response?.statusText,\n        headers: {\n          'Content-Type': 'application/x-ndjson; charset=utf-8',\n          'x-tss-serialized': 'true',\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(toJSONAsync(error)),\n      )\n      return new Response(serializedError, {\n        status: 500,\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  if (isRaw) {\n    return response\n  }\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":";;;;;;;AAQA,SAAS,aAAa,MAA0B;AAC9C,MAAI,CAAC,MAAM;AACT,UAAM,IAAI;AAAA,MACR;AAAA,IAAA;AAAA,EAEJ;AAEA,SAAO,KAAK,QAAQ,YAAY,EAAE;AACpC;AAEO,MAAM,qBAAqB,OAAO,EAAE,cAAoC;AAC7E,QAAM,aAAa,IAAI,gBAAA;AACvB,QAAM,SAAS,WAAW;AAC1B,QAAM,QAAQ,MAAM,WAAW,MAAA;AAC/B,UAAQ,OAAO,iBAAiB,SAAS,KAAK;AAE9C,QAAM,SAAS,QAAQ;AACvB,QAAM,MAAM,IAAI,IAAI,QAAQ,KAAK,uBAAuB;AAGxD,QAAM,QAAQ,IAAI;AAAA,IAChB,GAAG,aAAa,QAAQ,IAAI,kBAAkB,CAAC;AAAA,EAAA;AAIjD,QAAM,QAAQ,IAAI,SAAS,MAAM,KAAK;AACtC,QAAM,aAAa,QAAQ,MAAM,CAAC,IAAI;AACtC,QAAM,SAAS,OAAO,YAAY,IAAI,aAAa,SAAS;AAK5D,QAAM,mBAAmB,oBAAoB;AAC7C,QAAM,QAAQ,SAAS;AAEvB,MAAI,OAAO,eAAe,UAAU;AAClC,UAAM,IAAI,MAAM,iDAAiD,UAAU;AAAA,EAC7E;AAEA,QAAM,SAAS,MAAM,gBAAgB,UAAU;AAG/C,QAAM,uBAAuB;AAAA,IAC3B;AAAA,IACA;AAAA,EAAA;AAGF,QAAM,cAAc,QAAQ,QAAQ,IAAI,cAAc;AACtD,QAAM,iBAAiB,kBAAA;AAEvB,WAAS,aAAa,SAAc;AAClC,UAAM,gBAAgB,SAAS,SAAS,EAAE,SAAS,gBAAgB;AACnE,WAAO;AAAA,EACT;AAEA,QAAM,WAAW,OAAO,YAAY;AAClC,QAAI;AACF,UAAI,SAAS,OAAO,YAAY;AAE9B,YACE,qBAAqB;AAAA,UACnB,CAAC,SAAS,eAAe,YAAY,SAAS,IAAI;AAAA,QAAA,GAEpD;AAEA;AAAA,YACE,OAAO,kBAAkB;AAAA,YACzB;AAAA,UAAA;AAEF,gBAAM,WAAW,MAAM,QAAQ,SAAA;AAC/B,gBAAM,oBAAoB,SAAS,IAAI,oBAAoB;AAC3D,mBAAS,OAAO,oBAAoB;AAEpC,gBAAM,SAAS;AAAA,YACb,SAAS,CAAA;AAAA,YACT,MAAM;AAAA,UAAA;AAER,cAAI,OAAO,sBAAsB,UAAU;AACzC,gBAAI;AACF,qBAAO,UAAU,aAAa,KAAK,MAAM,iBAAiB,CAAC;AAAA,YAC7D,QAAQ;AAAA,YAAC;AAAA,UACX;AAEA,iBAAO,MAAM,OAAO,QAAQ,MAAM;AAAA,QACpC;AAGA,YAAI,OAAO,YAAA,MAAkB,OAAO;AAClC;AAAA,YACE;AAAA,YACA;AAAA,UAAA;AAGF,cAAI,UAAe,OAAO;AAE1B,oBAAU,UAAU,MAAM,aAAa,KAAK,MAAM,OAAO,CAAC,IAAI;AAG9D,iBAAO,MAAM,OAAO,SAAS,MAAM;AAAA,QACrC;AAEA,YAAI,OAAO,YAAA,MAAkB,QAAQ;AACnC,gBAAM,IAAI,MAAM,sBAAsB;AAAA,QACxC;AAEA,YAAI,CAAC,eAAe,CAAC,YAAY,SAAS,kBAAkB,GAAG;AAC7D,gBAAM,IAAI,MAAM,wCAAwC;AAAA,QAC1D;AAEA,cAAM,cAAc,MAAM,QAAQ,KAAA;AAIlC,YAAI,kBAAkB;AACpB,gBAAM,UAAU,MAAM,aAAa,WAAW;AAC9C,iBAAO,MAAM,OAAO,SAAS,MAAM;AAAA,QACrC;AAKA,eAAO,MAAM,OAAO,GAAG,WAAW;AAAA,MACpC,GAAA;AAIA,UAAI,OAAO,kBAAkB,UAAU;AACrC,eAAO,OAAO;AAAA,MAChB;AAIA,UAAI,CAAC,kBAAkB;AACrB,iBAAS,OAAO;AAIhB,YAAI,kBAAkB,UAAU;AAC9B,iBAAO;AAAA,QACT;AAAA,MACF;AAqBA,UAAI,WAAW,MAAM,GAAG;AACtB,eAAO,mBAAmB,MAAM;AAAA,MAClC;AAEA,YAAMA,YAAW,YAAA;AAEjB,UAAI,OAAO;AACX,UAAI,WAAW,QAAW;AACxB,eAAO,IAAI,eAAe;AAAA,UACxB,MAAMC,aAAY;AAChB,8BAAkB,QAAQ;AAAA,cACxB,0BAAU,IAAA;AAAA,cACV,SAAS;AAAA,cACT,SAAS,CAAC,UAAU;AAClBA,4BAAW,QAAQ,KAAK,UAAU,KAAK,IAAI,IAAI;AAAA,cACjD;AAAA,cACA,QAAQ,MAAM;AACZ,oBAAI;AACFA,8BAAW,MAAA;AAAA,gBACb,SAAS,OAAO;AACdA,8BAAW,MAAM,KAAK;AAAA,gBACxB;AAAA,cACF;AAAA,cACA,SAAS,CAAC,UAAU;AAClBA,4BAAW,MAAM,KAAK;AAAA,cACxB;AAAA,YAAA,CACD;AAAA,UACH;AAAA,QAAA,CACD;AAAA,MACH;AACA,aAAO,IAAI,SAAS,MAAM;AAAA,QACxB,QAAQD,WAAU;AAAA,QAClB,YAAYA,WAAU;AAAA,QACtB,SAAS;AAAA,UACP,gBAAgB;AAAA,UAChB,oBAAoB;AAAA,QAAA;AAAA,MACtB,CACD;AAAA,IACH,SAAS,OAAY;AACnB,UAAI,iBAAiB,UAAU;AAC7B,eAAO;AAAA,MACT;AAcA,UAAI,WAAW,KAAK,GAAG;AACrB,eAAO,mBAAmB,KAAK;AAAA,MACjC;AAEA,cAAQ,KAAA;AACR,cAAQ,KAAK,kBAAkB;AAC/B,cAAQ,KAAA;AACR,cAAQ,MAAM,KAAK;AACnB,cAAQ,KAAA;AAER,YAAM,kBAAkB,KAAK;AAAA,QAC3B,MAAM,QAAQ,QAAQ,YAAY,KAAK,CAAC;AAAA,MAAA;AAE1C,aAAO,IAAI,SAAS,iBAAiB;AAAA,QACnC,QAAQ;AAAA,QACR,SAAS;AAAA,UACP,gBAAgB;AAAA,UAChB,oBAAoB;AAAA,QAAA;AAAA,MACtB,CACD;AAAA,IACH;AAAA,EACF,GAAA;AAEA,UAAQ,OAAO,oBAAoB,SAAS,KAAK;AAEjD,MAAI,OAAO;AACT,WAAO;AAAA,EACT;AAEA,SAAO;AACT;AAEA,SAAS,mBAAmB,OAAY;AACtC,QAAM,EAAE,SAAS,GAAG,KAAA,IAAS;AAE7B,SAAO,IAAI,SAAS,KAAK,UAAU,IAAI,GAAG;AAAA,IACxC,QAAQ;AAAA,IACR,SAAS;AAAA,MACP,gBAAgB;AAAA,MAChB,GAAI,WAAW,CAAA;AAAA,IAAC;AAAA,EAClB,CACD;AACH;"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/start-server-core",
-  "version": "1.132.0-alpha.2",
+  "version": "1.132.0-alpha.3",
   "description": "Modern and scalable routing for React applications",
   "author": "Tanner Linsley",
   "license": "MIT",
@@ -47,11 +47,12 @@
     "cookie-es": "^2.0.0",
     "fetchdts": "^0.1.6",
     "h3": "2.0.0-beta.3",
+    "seroval": "^1.3.2",
     "tiny-invariant": "^1.3.3",
     "@tanstack/history": "1.132.0-alpha.1",
-    "@tanstack/router-core": "1.132.0-alpha.2",
-    "@tanstack/start-client-core": "1.132.0-alpha.2",
-    "@tanstack/start-storage-context": "1.132.0-alpha.2"
+    "@tanstack/start-client-core": "1.132.0-alpha.3",
+    "@tanstack/router-core": "1.132.0-alpha.3",
+    "@tanstack/start-storage-context": "1.132.0-alpha.3"
   },
   "scripts": {}
 }

package/src/createServerRpc.ts

@@ -0,0 +1,28 @@
+import invariant from 'tiny-invariant'
+
+let baseUrl: string
+function sanitizeBase(base: string) {
+  return base.replace(/^\/|\/$/g, '')
+}
+
+export const createServerRpc = (
+  functionId: string,
+  splitImportFn: (...args: any) => any,
+) => {
+  if (!baseUrl) {
+    const sanitizedAppBase = sanitizeBase(process.env.TSS_APP_BASE || '/')
+    const sanitizedServerBase = sanitizeBase(process.env.TSS_SERVER_FN_BASE!)
+    baseUrl = `${sanitizedAppBase ? `/${sanitizedAppBase}` : ''}/${sanitizedServerBase}/`
+  }
+  invariant(
+    splitImportFn,
+    '🚨splitImportFn required for the server functions server runtime, but was not provided.',
+  )
+
+  const url = baseUrl + functionId
+
+  return Object.assign(splitImportFn, {
+    url,
+    functionId,
+  })
+}

package/src/createStartHandler.ts

@@ -21,6 +21,7 @@ import { VIRTUAL_MODULES } from './virtual-modules'
 import { loadVirtualModule } from './loadVirtualModule'
 
 import { HEADERS } from './constants'
+import { ServerFunctionSerializationAdapter } from './serializer/ServerFunctionSerializationAdapter'
 import type {
   AnyServerRouteWithTypes,
   ServerRouteMethodHandlerFn,
@@ -133,13 +134,18 @@ export function createStartHandler<TRouter extends AnyRouter>({
         // the header is set by the prerender plugin
         isShell = request.headers.get(HEADERS.TSS_SHELL) === 'true'
       }
+      // insert start specific default serialization adapters
+      const serializationAdapters = router.options.serializationAdapters ?? []
+      // TODO: client side needs to install that plugin in hydrateStart!
+      serializationAdapters.push(ServerFunctionSerializationAdapter)
       router.update({
         history,
         isShell,
         isPrerendering,
+        serializationAdapters,
       })
 
-      const response = await (async () => {
+      const response = await runWithStartContext({ router }, async () => {
         try {
           if (!process.env.TSS_SERVER_FN_BASE) {
             throw new Error(
@@ -179,59 +185,58 @@ export function createStartHandler<TRouter extends AnyRouter>({
             }
           }
 
-          const executeRouter = () =>
-            runWithStartContext({ router }, async () => {
-              const requestAcceptHeader = request.headers.get('Accept') || '*/*'
-              const splitRequestAcceptHeader = requestAcceptHeader.split(',')
-
-              const supportedMimeTypes = ['*/*', 'text/html']
-              const isRouterAcceptSupported = supportedMimeTypes.some(
-                (mimeType) =>
-                  splitRequestAcceptHeader.some((acceptedMimeType) =>
-                    acceptedMimeType.trim().startsWith(mimeType),
-                  ),
-              )
+          const executeRouter = async () => {
+            const requestAcceptHeader = request.headers.get('Accept') || '*/*'
+            const splitRequestAcceptHeader = requestAcceptHeader.split(',')
 
-              if (!isRouterAcceptSupported) {
-                return json(
-                  {
-                    error: 'Only HTML requests are supported here',
-                  },
-                  {
-                    status: 500,
-                  },
-                )
-              }
+            const supportedMimeTypes = ['*/*', 'text/html']
+            const isRouterAcceptSupported = supportedMimeTypes.some(
+              (mimeType) =>
+                splitRequestAcceptHeader.some((acceptedMimeType) =>
+                  acceptedMimeType.trim().startsWith(mimeType),
+                ),
+            )
 
-              // if the startRoutesManifest is not loaded yet, load it once
-              if (startRoutesManifest === null) {
-                startRoutesManifest = await getStartManifest({
-                  basePath: APP_BASE,
-                })
-              }
+            if (!isRouterAcceptSupported) {
+              return json(
+                {
+                  error: 'Only HTML requests are supported here',
+                },
+                {
+                  status: 500,
+                },
+              )
+            }
 
-              // Attach the server-side SSR utils to the client-side router
-              attachRouterServerSsrUtils(router, startRoutesManifest)
+            // if the startRoutesManifest is not loaded yet, load it once
+            if (startRoutesManifest === null) {
+              startRoutesManifest = await getStartManifest({
+                basePath: APP_BASE,
+              })
+            }
 
-              await router.load()
+            // Attach the server-side SSR utils to the client-side router
+            attachRouterServerSsrUtils(router, startRoutesManifest)
 
-              // If there was a redirect, skip rendering the page at all
-              if (router.state.redirect) {
-                return router.state.redirect
-              }
+            await router.load()
 
-              await router.serverSsr!.dehydrate()
+            // If there was a redirect, skip rendering the page at all
+            if (router.state.redirect) {
+              return router.state.redirect
+            }
 
-              const responseHeaders = getStartResponseHeaders({ router })
-              const response = await cb({
-                request,
-                router,
-                responseHeaders,
-              })
+            await router.serverSsr!.dehydrate()
 
-              return response
+            const responseHeaders = getStartResponseHeaders({ router })
+            const response = await cb({
+              request,
+              router,
+              responseHeaders,
             })
 
+            return response
+          }
+
           // If we have a server route tree, then we try matching to see if we have a
           // server route that matches the request.
           if (processedServerRouteTree) {
@@ -256,7 +261,7 @@ export function createStartHandler<TRouter extends AnyRouter>({
 
           throw err
         }
-      })()
+      })
 
       if (isRedirect(response)) {
         if (isResolvedRedirect(response)) {

package/src/getServerFnById.ts

@@ -0,0 +1,33 @@
+import { loadVirtualModule } from './loadVirtualModule'
+import { VIRTUAL_MODULES } from './virtual-modules'
+
+export async function getServerFnById(serverFnId: string) {
+  const { default: serverFnManifest } = await loadVirtualModule(
+    VIRTUAL_MODULES.serverFnManifest,
+  )
+
+  const serverFnInfo = serverFnManifest[serverFnId]
+
+  if (!serverFnInfo) {
+    console.info('serverFnManifest', serverFnManifest)
+    throw new Error('Server function info not found for ' + serverFnId)
+  }
+
+  const fnModule = await serverFnInfo.importer()
+
+  if (!fnModule) {
+    console.info('serverFnInfo', serverFnInfo)
+    throw new Error('Server function module not resolved for ' + serverFnId)
+  }
+
+  const action = fnModule[serverFnInfo.functionName]
+
+  if (!action) {
+    console.info('serverFnInfo', serverFnInfo)
+    console.info('fnModule', fnModule)
+    throw new Error(
+      `Server function module export not resolved for serverFn ID: ${serverFnId}`,
+    )
+  }
+  return action
+}

package/src/index.tsx

@@ -58,3 +58,5 @@ export type {
 export * from './virtual-modules'
 
 export { HEADERS } from './constants'
+
+export { createServerRpc } from './createServerRpc'

package/src/serializer/ServerFunctionSerializationAdapter.ts

@@ -0,0 +1,18 @@
+import { createSerializationAdapter } from '@tanstack/router-core'
+import { createServerRpc } from '../createServerRpc'
+import { getServerFnById } from '../getServerFnById'
+
+export const ServerFunctionSerializationAdapter = createSerializationAdapter({
+  key: '$TSS/serverfn',
+  test: (v): v is { functionId: string } =>
+    typeof v == 'function' && 'functionId' in v,
+  toSerializable: ({ functionId }) => ({ functionId }),
+  fromSerializable: ({ functionId }) => {
+    const fn = async (opts: any, signal: any): Promise<any> => {
+      const serverFn = await getServerFnById(functionId)
+      const result = await serverFn(opts ?? {}, signal)
+      return result.result
+    }
+    return createServerRpc(functionId, fn)
+  },
+})

package/src/serializer/getSerovalPlugins.ts

@@ -0,0 +1,10 @@
+import { makeSerovalPlugin } from '@tanstack/router-core'
+import { getDefaultSerovalPlugins } from '@tanstack/start-client-core'
+import { ServerFunctionSerializationAdapter } from './ServerFunctionSerializationAdapter'
+
+export function getSerovalPlugins() {
+  return [
+    ...getDefaultSerovalPlugins(),
+    makeSerovalPlugin(ServerFunctionSerializationAdapter),
+  ]
+}

package/src/server-functions-handler.ts

@@ -1,9 +1,10 @@
 import { isNotFound } from '@tanstack/router-core'
 import invariant from 'tiny-invariant'
-import { startSerializer } from '@tanstack/start-client-core'
-import { VIRTUAL_MODULES } from './virtual-modules'
-import { loadVirtualModule } from './loadVirtualModule'
+import { TSR_FORMDATA_CONTEXT } from '@tanstack/start-client-core'
+import { fromJSON, toCrossJSONStream, toJSONAsync } from 'seroval'
 import { getResponse } from './request-response'
+import { getServerFnById } from './getServerFnById'
+import { getSerovalPlugins } from './serializer/getSerovalPlugins'
 
 function sanitizeBase(base: string | undefined) {
   if (!base) {
@@ -15,72 +16,6 @@ function sanitizeBase(base: string | undefined) {
   return base.replace(/^\/|\/$/g, '')
 }
 
-async function revive(root: any, reviver?: (key: string, value: any) => any) {
-  async function reviveNode(holder: any, key: string) {
-    const value = holder[key]
-
-    if (value && typeof value === 'object') {
-      await Promise.all(Object.keys(value).map((k) => reviveNode(value, k)))
-    }
-
-    if (reviver) {
-      holder[key] = await reviver(key, holder[key])
-    }
-  }
-
-  const holder = { '': root }
-  await reviveNode(holder, '')
-  return holder['']
-}
-
-async function reviveServerFns(key: string, value: any) {
-  if (value && value.__serverFn === true && value.functionId) {
-    const serverFn = await getServerFnById(value.functionId)
-    return async (opts: any, signal: any): Promise<any> => {
-      const result = await serverFn(opts ?? {}, signal)
-      return result.result
-    }
-  }
-  return value
-}
-
-async function getServerFnById(serverFnId: string) {
-  const { default: serverFnManifest } = await loadVirtualModule(
-    VIRTUAL_MODULES.serverFnManifest,
-  )
-
-  const serverFnInfo = serverFnManifest[serverFnId]
-
-  if (!serverFnInfo) {
-    console.info('serverFnManifest', serverFnManifest)
-    throw new Error('Server function info not found for ' + serverFnId)
-  }
-
-  const fnModule = await serverFnInfo.importer()
-
-  if (!fnModule) {
-    console.info('serverFnInfo', serverFnInfo)
-    throw new Error('Server function module not resolved for ' + serverFnId)
-  }
-
-  const action = fnModule[serverFnInfo.functionName]
-
-  if (!action) {
-    console.info('serverFnInfo', serverFnInfo)
-    console.info('fnModule', fnModule)
-    throw new Error(
-      `Server function module export not resolved for serverFn ID: ${serverFnId}`,
-    )
-  }
-  return action
-}
-
-async function parsePayload(payload: any) {
-  const parsedPayload = startSerializer.parse(payload)
-  await revive(parsedPayload, reviveServerFns)
-  return parsedPayload
-}
-
 export const handleServerAction = async ({ request }: { request: Request }) => {
   const controller = new AbortController()
   const signal = controller.signal
@@ -118,14 +53,21 @@ export const handleServerAction = async ({ request }: { request: Request }) => {
     'application/x-www-form-urlencoded',
   ]
 
+  const contentType = request.headers.get('Content-Type')
+  const serovalPlugins = getSerovalPlugins()
+
+  function parsePayload(payload: any) {
+    const parsedPayload = fromJSON(payload, { plugins: serovalPlugins })
+    return parsedPayload
+  }
+
   const response = await (async () => {
     try {
       let result = await (async () => {
         // FormData
         if (
-          request.headers.get('Content-Type') &&
-          formDataContentTypes.some((type) =>
-            request.headers.get('Content-Type')?.includes(type),
+          formDataContentTypes.some(
+            (type) => contentType && contentType.includes(type),
           )
         ) {
           // We don't support GET requests with FormData payloads... that seems impossible
@@ -133,45 +75,59 @@ export const handleServerAction = async ({ request }: { request: Request }) => {
             method.toLowerCase() !== 'get',
             'GET requests with FormData payloads are not supported',
           )
+          const formData = await request.formData()
+          const serializedContext = formData.get(TSR_FORMDATA_CONTEXT)
+          formData.delete(TSR_FORMDATA_CONTEXT)
+
+          const params = {
+            context: {} as any,
+            data: formData,
+          }
+          if (typeof serializedContext === 'string') {
+            try {
+              params.context = parsePayload(JSON.parse(serializedContext))
+            } catch {}
+          }
 
-          return await action(await request.formData(), signal)
+          return await action(params, signal)
         }
 
         // Get requests use the query string
         if (method.toLowerCase() === 'get') {
+          invariant(
+            isCreateServerFn,
+            'expected GET request to originate from createServerFn',
+          )
           // By default the payload is the search params
-          let payload: any = search
-
-          // If this GET request was created by createServerFn,
-          // then the payload will be on the payload param
-          if (isCreateServerFn) {
-            payload = search.payload
-          }
-
+          let payload: any = search.payload
           // If there's a payload, we should try to parse it
-          payload = payload ? await parsePayload(payload) : payload
+          payload = payload ? await parsePayload(JSON.parse(payload)) : payload
 
           // Send it through!
           return await action(payload, signal)
         }
 
-        // This must be a POST request, likely JSON???
-        const jsonPayloadAsString = await request.text()
+        if (method.toLowerCase() !== 'post') {
+          throw new Error('expected POST method')
+        }
 
-        // We should probably try to deserialize the payload
-        // as JSON, but we'll just pass it through for now.
-        const payload = await parsePayload(jsonPayloadAsString)
+        if (!contentType || !contentType.includes('application/json')) {
+          throw new Error('expected application/json content type')
+        }
+
+        const jsonPayload = await request.json()
 
         // If this POST request was created by createServerFn,
-        // it's payload will be the only argument
+        // its payload will be the only argument
         if (isCreateServerFn) {
+          const payload = await parsePayload(jsonPayload)
           return await action(payload, signal)
         }
 
         // Otherwise, we'll spread the payload. Need to
         // support `use server` functions that take multiple
         // arguments.
-        return await action(...(payload as any), signal)
+        return await action(...jsonPayload)
       })()
 
       // Any time we get a Response back, we should just
@@ -192,18 +148,6 @@ export const handleServerAction = async ({ request }: { request: Request }) => {
         }
       }
 
-      // if (!search.createServerFn) {
-      //   result = result.result
-      // }
-
-      // else if (
-      //   isPlainObject(result) &&
-      //   'result' in result &&
-      //   result.result instanceof Response
-      // ) {
-      //   return result.result
-      // }
-
       // TODO: RSCs Where are we getting this package?
       // if (isValidElement(result)) {
       //   const { renderToPipeableStream } = await import(
@@ -228,16 +172,39 @@ export const handleServerAction = async ({ request }: { request: Request }) => {
       }
 
       const response = getResponse()
-      return new Response(
-        result !== undefined ? startSerializer.stringify(result) : undefined,
-        {
-          status: response?.status,
-          statusText: response?.statusText,
-          headers: {
-            'Content-Type': 'application/json',
+
+      let body = undefined
+      if (result !== undefined) {
+        body = new ReadableStream({
+          start(controller) {
+            toCrossJSONStream(result, {
+              refs: new Map(),
+              plugins: serovalPlugins,
+              onParse: (value) => {
+                controller.enqueue(JSON.stringify(value) + '\n')
+              },
+              onDone: () => {
+                try {
+                  controller.close()
+                } catch (error) {
+                  controller.error(error)
+                }
+              },
+              onError: (error) => {
+                controller.error(error)
+              },
+            })
           },
+        })
+      }
+      return new Response(body, {
+        status: response?.status,
+        statusText: response?.statusText,
+        headers: {
+          'Content-Type': 'application/x-ndjson; charset=utf-8',
+          'x-tss-serialized': 'true',
         },
-      )
+      })
     } catch (error: any) {
       if (error instanceof Response) {
         return error
@@ -265,10 +232,14 @@ export const handleServerAction = async ({ request }: { request: Request }) => {
       console.error(error)
       console.info()
 
-      return new Response(startSerializer.stringify(error), {
+      const serializedError = JSON.stringify(
+        await Promise.resolve(toJSONAsync(error)),
+      )
+      return new Response(serializedError, {
         status: 500,
         headers: {
           'Content-Type': 'application/json',
+          'x-tss-serialized': 'true',
         },
       })
     }