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

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 { TSS_FORMDATA_CONTEXT, X_TSS_SERIALIZED } from "@tanstack/start-client-core";
+import { toCrossJSONStream, toCrossJSONAsync, 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;
@@ -79,7 +27,6 @@ const handleServerAction = async ({ request }) => {
   const serverFnId = match ? match[1] : null;
   const search = Object.fromEntries(url.searchParams.entries());
   const isCreateServerFn = "createServerFn" in search;
-  const isRaw = "raw" in search;
   if (typeof serverFnId !== "string") {
     throw new Error("Invalid server action param for serverFnId: " + serverFnId);
   }
@@ -88,32 +35,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(TSS_FORMDATA_CONTEXT);
+          formData.delete(TSS_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");
+        }
+        if (!contentType || !contentType.includes("application/json")) {
+          throw new Error("expected application/json content type");
         }
-        const jsonPayloadAsString = await request.text();
-        const payload = await parsePayload(jsonPayloadAsString);
+        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 +101,75 @@ const handleServerAction = async ({ request }) => {
         return isNotFoundResponse(result);
       }
       const response2 = getResponse();
-      return new Response(
-        result !== void 0 ? startSerializer.stringify(result) : void 0,
-        {
+      let nonStreamingBody = void 0;
+      if (result !== void 0) {
+        let done = false;
+        const callbacks = {
+          onParse: (value) => {
+            nonStreamingBody = value;
+          },
+          onDone: () => {
+            done = true;
+          },
+          onError: (error) => {
+            throw error;
+          }
+        };
+        toCrossJSONStream(result, {
+          refs: /* @__PURE__ */ new Map(),
+          plugins: serovalPlugins,
+          onParse(value) {
+            callbacks.onParse(value);
+          },
+          onDone() {
+            callbacks.onDone();
+          },
+          onError: (error) => {
+            callbacks.onError(error);
+          }
+        });
+        if (done) {
+          return new Response(
+            nonStreamingBody ? JSON.stringify(nonStreamingBody) : void 0,
+            {
+              status: response2?.status,
+              statusText: response2?.statusText,
+              headers: {
+                "Content-Type": "application/json",
+                [X_TSS_SERIALIZED]: "true"
+              }
+            }
+          );
+        }
+        const stream = new ReadableStream({
+          start(controller2) {
+            callbacks.onParse = (value) => controller2.enqueue(JSON.stringify(value) + "\n");
+            callbacks.onDone = () => {
+              try {
+                controller2.close();
+              } catch (error) {
+                controller2.error(error);
+              }
+            };
+            callbacks.onError = (error) => controller2.error(error);
+            if (nonStreamingBody !== void 0) {
+              callbacks.onParse(nonStreamingBody);
+            }
+          }
+        });
+        return new Response(stream, {
           status: response2?.status,
           statusText: response2?.statusText,
           headers: {
-            "Content-Type": "application/json"
+            "Content-Type": "application/x-ndjson",
+            [X_TSS_SERIALIZED]: "true"
           }
-        }
-      );
+        });
+      }
+      return new Response(void 0, {
+        status: response2?.status,
+        statusText: response2?.statusText
+      });
     } catch (error) {
       if (error instanceof Response) {
         return error;
@@ -150,18 +182,26 @@ const handleServerAction = async ({ request }) => {
       console.info();
       console.error(error);
       console.info();
-      return new Response(startSerializer.stringify(error), {
-        status: 500,
+      const serializedError = JSON.stringify(
+        await Promise.resolve(
+          toCrossJSONAsync(error, {
+            refs: /* @__PURE__ */ new Map(),
+            plugins: serovalPlugins
+          })
+        )
+      );
+      const response2 = getResponse();
+      return new Response(serializedError, {
+        status: response2?.status ?? 500,
+        statusText: response2?.statusText,
         headers: {
-          "Content-Type": "application/json"
+          "Content-Type": "application/json",
+          [X_TSS_SERIALIZED]: "true"
         }
       });
     }
   })();
   request.signal.removeEventListener("abort", abort);
-  if (isRaw) {
-    return response;
-  }
   return response;
 };
 function isNotFoundResponse(error) {

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

@@ -1 +1 @@
-{"version":3,"file":"server-functions-handler.js","sources":["../../src/server-functions-handler.ts"],"sourcesContent":["import { isNotFound } from '@tanstack/router-core'\nimport invariant from 'tiny-invariant'\nimport { 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":"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"}
+{"version":3,"file":"server-functions-handler.js","sources":["../../src/server-functions-handler.ts"],"sourcesContent":["import { isNotFound } from '@tanstack/router-core'\nimport invariant from 'tiny-invariant'\nimport {\n  TSS_FORMDATA_CONTEXT,\n  X_TSS_SERIALIZED,\n} from '@tanstack/start-client-core'\nimport { fromJSON, toCrossJSONAsync, toCrossJSONStream } 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\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(TSS_FORMDATA_CONTEXT)\n          formData.delete(TSS_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      let nonStreamingBody: any = undefined\n\n      if (result !== undefined) {\n        // first run without the stream in case `result` does not need streaming\n        let done = false as boolean\n        const callbacks: {\n          onParse: (value: any) => void\n          onDone: () => void\n          onError: (error: any) => void\n        } = {\n          onParse: (value) => {\n            nonStreamingBody = value\n          },\n          onDone: () => {\n            done = true\n          },\n          onError: (error) => {\n            throw error\n          },\n        }\n        toCrossJSONStream(result, {\n          refs: new Map(),\n          plugins: serovalPlugins,\n          onParse(value) {\n            callbacks.onParse(value)\n          },\n          onDone() {\n            callbacks.onDone()\n          },\n          onError: (error) => {\n            callbacks.onError(error)\n          },\n        })\n        if (done) {\n          return new Response(\n            nonStreamingBody ? JSON.stringify(nonStreamingBody) : undefined,\n            {\n              status: response?.status,\n              statusText: response?.statusText,\n              headers: {\n                'Content-Type': 'application/json',\n                [X_TSS_SERIALIZED]: 'true',\n              },\n            },\n          )\n        }\n\n        // not done yet, we need to stream\n        const stream = new ReadableStream({\n          start(controller) {\n            callbacks.onParse = (value) =>\n              controller.enqueue(JSON.stringify(value) + '\\n')\n            callbacks.onDone = () => {\n              try {\n                controller.close()\n              } catch (error) {\n                controller.error(error)\n              }\n            }\n            callbacks.onError = (error) => controller.error(error)\n            // stream the initial body\n            if (nonStreamingBody !== undefined) {\n              callbacks.onParse(nonStreamingBody)\n            }\n          },\n        })\n        return new Response(stream, {\n          status: response?.status,\n          statusText: response?.statusText,\n          headers: {\n            'Content-Type': 'application/x-ndjson',\n            [X_TSS_SERIALIZED]: 'true',\n          },\n        })\n      }\n\n      return new Response(undefined, {\n        status: response?.status,\n        statusText: response?.statusText,\n      })\n    } catch (error: any) {\n      if (error instanceof Response) {\n        return error\n      }\n      // else if (\n      //   isPlainObject(error) &&\n      //   'result' in error &&\n      //   error.result instanceof Response\n      // ) {\n      //   return error.result\n      // }\n\n      // Currently this server-side context has no idea how to\n      // build final URLs, so we need to defer that to the client.\n      // The client will check for __redirect and __notFound keys,\n      // and if they exist, it will handle them appropriately.\n\n      if (isNotFound(error)) {\n        return isNotFoundResponse(error)\n      }\n\n      console.info()\n      console.info('Server Fn Error!')\n      console.info()\n      console.error(error)\n      console.info()\n\n      const serializedError = JSON.stringify(\n        await Promise.resolve(\n          toCrossJSONAsync(error, {\n            refs: new Map(),\n            plugins: serovalPlugins,\n          }),\n        ),\n      )\n      const response = getResponse()\n      return new Response(serializedError, {\n        status: response?.status ?? 500,\n        statusText: response?.statusText,\n        headers: {\n          'Content-Type': 'application/json',\n          [X_TSS_SERIALIZED]: 'true',\n        },\n      })\n    }\n  })()\n\n  request.signal.removeEventListener('abort', abort)\n\n  return response\n}\n\nfunction isNotFoundResponse(error: any) {\n  const { headers, ...rest } = error\n\n  return new Response(JSON.stringify(rest), {\n    status: 404,\n    headers: {\n      'Content-Type': 'application/json',\n      ...(headers || {}),\n    },\n  })\n}\n"],"names":["response","controller"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/start-server-core",
-  "version": "1.132.0-alpha.2",
+  "version": "1.132.0-alpha.20",
   "description": "Modern and scalable routing for React applications",
   "author": "Tanner Linsley",
   "license": "MIT",
@@ -40,18 +40,19 @@
     "src"
   ],
   "engines": {
-    "node": ">=12"
+    "node": ">=22.12.0"
   },
   "dependencies": {
     "@standard-schema/spec": "^1.0.0",
     "cookie-es": "^2.0.0",
     "fetchdts": "^0.1.6",
-    "h3": "2.0.0-beta.3",
+    "h3": "2.0.0-beta.4",
+    "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.20",
+    "@tanstack/router-core": "1.132.0-alpha.20",
+    "@tanstack/start-storage-context": "1.132.0-alpha.20"
   },
   "scripts": {}
 }

package/src/createServerRpc.ts

@@ -0,0 +1,30 @@
+import { TSS_SERVER_FUNCTION } from '@tanstack/start-client-core'
+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,
+    [TSS_SERVER_FUNCTION]: true,
+  })
+}

package/src/createStartHandler.ts

@@ -5,11 +5,13 @@ import {
   mergeHeaders,
 } from '@tanstack/start-client-core'
 import {
+  executeRewriteInput,
   getMatchedRoutes,
   isRedirect,
   isResolvedRedirect,
   joinPaths,
   processRouteTree,
+  rewriteBasepath,
   trimPath,
 } from '@tanstack/router-core'
 import { attachRouterServerSsrUtils } from '@tanstack/router-core/ssr/server'
@@ -21,6 +23,7 @@ import { VIRTUAL_MODULES } from './virtual-modules'
 import { loadVirtualModule } from './loadVirtualModule'
 
 import { HEADERS } from './constants'
+import { ServerFunctionSerializationAdapter } from './serializer/ServerFunctionSerializationAdapter'
 import type {
   AnyServerRouteWithTypes,
   ServerRouteMethodHandlerFn,
@@ -72,6 +75,17 @@ export function createStartHandler<TRouter extends AnyRouter>({
     const originalFetch = globalThis.fetch
 
     const startRequestResolver: RequestHandler = async (request) => {
+      function getOrigin() {
+        const originHeader = request.headers.get('Origin')
+        if (originHeader) {
+          return originHeader
+        }
+        try {
+          return new URL(request.url).origin
+        } catch (_) {}
+        return 'http://localhost'
+      }
+
       // Patching fetch function to use our request resolver
       // if the input starts with `/` which is a common pattern for
       // client-side routing.
@@ -83,14 +97,6 @@ export function createStartHandler<TRouter extends AnyRouter>({
           return startRequestResolver(fetchRequest)
         }
 
-        function getOrigin() {
-          return (
-            request.headers.get('Origin') ||
-            request.headers.get('Referer') ||
-            'http://localhost'
-          )
-        }
-
         if (typeof input === 'string' && input.startsWith('/')) {
           // e.g: fetch('/api/data')
           const url = new URL(input, getOrigin())
@@ -111,18 +117,13 @@ export function createStartHandler<TRouter extends AnyRouter>({
       }
 
       const url = new URL(request.url)
-      const href = decodeURIComponent(url.href.replace(url.origin, ''))
+      const href = url.href.replace(url.origin, '')
 
       const APP_BASE = process.env.TSS_APP_BASE || '/'
 
       // TODO how does this work with base path? does the router need to be configured the same as APP_BASE?
       const router = await createRouter()
 
-      // Create a history for the client-side router
-      const history = createMemoryHistory({
-        initialEntries: [href],
-      })
-
       // Update the client-side router with the history
       const isPrerendering = process.env.TSS_PRERENDERING === 'true'
       // env var is set during dev is SPA mode is enabled
@@ -133,13 +134,26 @@ 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 ?? []
+      ).concat(ServerFunctionSerializationAdapter)
+
+      // Create a history for the client-side router
+      const history = createMemoryHistory({
+        initialEntries: [href],
+      })
+
+      const origin = router.options.origin ?? getOrigin()
       router.update({
         history,
         isShell,
         isPrerendering,
+        serializationAdapters,
+        origin,
       })
 
-      const response = await (async () => {
+      const response = await runWithStartContext({ router }, async () => {
         try {
           if (!process.env.TSS_SERVER_FN_BASE) {
             throw new Error(
@@ -179,59 +193,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 +269,7 @@ export function createStartHandler<TRouter extends AnyRouter>({
 
           throw err
         }
-      })()
+      })
 
       if (isRedirect(response)) {
         if (isResolvedRedirect(response)) {
@@ -329,12 +342,14 @@ async function handleServerRoutes(opts: {
   basePath: string
   executeRouter: () => Promise<Response>
 }) {
-  const url = new URL(opts.request.url)
+  let url = new URL(opts.request.url)
+  if (opts.basePath) {
+    url = executeRewriteInput(rewriteBasepath({ basepath: opts.basePath }), url)
+  }
   const pathname = url.pathname
 
   const serverTreeResult = getMatchedRoutes<AnyServerRouteWithTypes>({
     pathname,
-    basepath: opts.basePath,
     caseSensitive: true,
     routesByPath: opts.processedServerRouteTree.routesByPath,
     routesById: opts.processedServerRouteTree.routesById,

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

@@ -3,7 +3,7 @@ declare global {
     interface ProcessEnv {
       TSS_APP_BASE?: string
       TSS_SERVER_FN_BASE?: string
-      TSS_OUTPUT_PUBLIC_DIR?: string
+      TSS_CLIENT_OUTPUT_DIR?: string
       TSS_SHELL?: 'true' | 'false'
       TSS_PRERENDERING?: 'true' | 'false'
       TSS_DEV_SERVER?: 'true' | 'false'