@tanstack/start-server-core 1.143.12 → 1.145.0

package/dist/esm/frame-protocol.d.ts

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

package/dist/esm/frame-protocol.js

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

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

@@ -0,0 +1 @@
+{"version":3,"file":"frame-protocol.js","sources":["../../src/frame-protocol.ts"],"sourcesContent":["/**\n * Binary frame protocol for multiplexing JSON and raw streams over HTTP.\n *\n * Frame format: [type:1][streamId:4][length:4][payload:length]\n * - type: 1 byte - frame type (JSON, CHUNK, END, ERROR)\n * - streamId: 4 bytes big-endian uint32 - stream identifier\n * - length: 4 bytes big-endian uint32 - payload length\n * - payload: variable length bytes\n */\n\n// Re-export constants from shared location\nimport { FRAME_HEADER_SIZE, FrameType } from '@tanstack/start-client-core'\n\nexport {\n  FRAME_HEADER_SIZE,\n  FrameType,\n  TSS_CONTENT_TYPE_FRAMED,\n  TSS_CONTENT_TYPE_FRAMED_VERSIONED,\n  TSS_FRAMED_PROTOCOL_VERSION,\n} from '@tanstack/start-client-core'\n\n/** Cached TextEncoder for frame encoding */\nconst textEncoder = new TextEncoder()\n\n/** Shared empty payload for END frames - avoids allocation per call */\nconst EMPTY_PAYLOAD = new Uint8Array(0)\n\n/**\n * Encodes a single frame with header and payload.\n */\nexport function encodeFrame(\n  type: FrameType,\n  streamId: number,\n  payload: Uint8Array,\n): Uint8Array {\n  const frame = new Uint8Array(FRAME_HEADER_SIZE + payload.length)\n  // Write header bytes directly to avoid DataView allocation per frame\n  // Frame format: [type:1][streamId:4 BE][length:4 BE]\n  frame[0] = type\n  frame[1] = (streamId >>> 24) & 0xff\n  frame[2] = (streamId >>> 16) & 0xff\n  frame[3] = (streamId >>> 8) & 0xff\n  frame[4] = streamId & 0xff\n  frame[5] = (payload.length >>> 24) & 0xff\n  frame[6] = (payload.length >>> 16) & 0xff\n  frame[7] = (payload.length >>> 8) & 0xff\n  frame[8] = payload.length & 0xff\n  frame.set(payload, FRAME_HEADER_SIZE)\n  return frame\n}\n\n/**\n * Encodes a JSON frame (type 0, streamId 0).\n */\nexport function encodeJSONFrame(json: string): Uint8Array {\n  return encodeFrame(FrameType.JSON, 0, textEncoder.encode(json))\n}\n\n/**\n * Encodes a raw stream chunk frame.\n */\nexport function encodeChunkFrame(\n  streamId: number,\n  chunk: Uint8Array,\n): Uint8Array {\n  return encodeFrame(FrameType.CHUNK, streamId, chunk)\n}\n\n/**\n * Encodes a raw stream end frame.\n */\nexport function encodeEndFrame(streamId: number): Uint8Array {\n  return encodeFrame(FrameType.END, streamId, EMPTY_PAYLOAD)\n}\n\n/**\n * Encodes a raw stream error frame.\n */\nexport function encodeErrorFrame(streamId: number, error: unknown): Uint8Array {\n  const message =\n    error instanceof Error ? error.message : String(error ?? 'Unknown error')\n  return encodeFrame(FrameType.ERROR, streamId, textEncoder.encode(message))\n}\n\n/**\n * Creates a multiplexed ReadableStream from JSON stream and raw streams.\n *\n * The JSON stream emits NDJSON lines (from seroval's toCrossJSONStream).\n * Raw streams are pumped concurrently, interleaved with JSON frames.\n *\n * @param jsonStream Stream of JSON strings (each string is one NDJSON line)\n * @param rawStreams Map of stream IDs to raw binary streams\n */\nexport function createMultiplexedStream(\n  jsonStream: ReadableStream<string>,\n  rawStreams: Map<number, ReadableStream<Uint8Array>>,\n): ReadableStream<Uint8Array> {\n  // Track active pumps for completion\n  let activePumps = 1 + rawStreams.size // 1 for JSON + raw streams\n  let controllerRef: ReadableStreamDefaultController<Uint8Array> | null = null\n  let cancelled = false as boolean\n  const cancelReaders: Array<() => void> = []\n\n  const safeEnqueue = (chunk: Uint8Array) => {\n    if (cancelled || !controllerRef) return\n    try {\n      controllerRef.enqueue(chunk)\n    } catch {\n      // Ignore enqueue after close/cancel\n    }\n  }\n\n  const safeError = (err: unknown) => {\n    if (cancelled || !controllerRef) return\n    try {\n      controllerRef.error(err)\n    } catch {\n      // Ignore\n    }\n  }\n\n  const safeClose = () => {\n    if (cancelled || !controllerRef) return\n    try {\n      controllerRef.close()\n    } catch {\n      // Ignore\n    }\n  }\n\n  const checkComplete = () => {\n    activePumps--\n    if (activePumps === 0) {\n      safeClose()\n    }\n  }\n\n  return new ReadableStream<Uint8Array>({\n    start(controller) {\n      controllerRef = controller\n      cancelReaders.length = 0\n\n      // Pump JSON stream (streamId 0)\n      const pumpJSON = async () => {\n        const reader = jsonStream.getReader()\n        cancelReaders.push(() => {\n          // Catch async rejection - reader may already be released\n          reader.cancel().catch(() => {})\n        })\n        try {\n          // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition\n          while (true) {\n            const { done, value } = await reader.read()\n            // Check cancelled after await - flag may have changed while waiting\n            if (cancelled) break\n            if (done) break\n            safeEnqueue(encodeJSONFrame(value))\n          }\n        } catch (error) {\n          // JSON stream error - fatal, error the whole response\n          safeError(error)\n        } finally {\n          reader.releaseLock()\n          checkComplete()\n        }\n      }\n\n      // Pump a single raw stream with its streamId\n      const pumpRawStream = async (\n        streamId: number,\n        stream: ReadableStream<Uint8Array>,\n      ) => {\n        const reader = stream.getReader()\n        cancelReaders.push(() => {\n          // Catch async rejection - reader may already be released\n          reader.cancel().catch(() => {})\n        })\n        try {\n          // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition\n          while (true) {\n            const { done, value } = await reader.read()\n            // Check cancelled after await - flag may have changed while waiting\n            if (cancelled) break\n            if (done) {\n              safeEnqueue(encodeEndFrame(streamId))\n              break\n            }\n            safeEnqueue(encodeChunkFrame(streamId, value))\n          }\n        } catch (error) {\n          // Stream error - send ERROR frame (non-fatal, other streams continue)\n          safeEnqueue(encodeErrorFrame(streamId, error))\n        } finally {\n          reader.releaseLock()\n          checkComplete()\n        }\n      }\n\n      // Start all pumps concurrently\n      pumpJSON()\n      for (const [streamId, stream] of rawStreams) {\n        pumpRawStream(streamId, stream)\n      }\n    },\n\n    cancel() {\n      cancelled = true\n      controllerRef = null\n      // Proactively cancel all underlying readers to stop work quickly.\n      for (const cancelReader of cancelReaders) {\n        cancelReader()\n      }\n      cancelReaders.length = 0\n    },\n  })\n}\n"],"names":[],"mappings":"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"}

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

@@ -1,10 +1,12 @@
-import { isNotFound, isRedirect } from "@tanstack/router-core";
+import { createRawStreamRPCPlugin, isNotFound, isRedirect } from "@tanstack/router-core";
 import invariant from "tiny-invariant";
-import { getDefaultSerovalPlugins, X_TSS_SERIALIZED, TSS_FORMDATA_CONTEXT, safeObjectMerge, X_TSS_RAW_RESPONSE } from "@tanstack/start-client-core";
+import { getDefaultSerovalPlugins, X_TSS_SERIALIZED, TSS_CONTENT_TYPE_FRAMED_VERSIONED, TSS_FORMDATA_CONTEXT, safeObjectMerge, X_TSS_RAW_RESPONSE } from "@tanstack/start-client-core";
 import { toCrossJSONStream, fromJSON, toCrossJSONAsync } from "seroval";
 import { getResponse } from "./request-response.js";
+import { createMultiplexedStream } from "./frame-protocol.js";
 import { getServerFnById } from "#tanstack-start-server-fn-resolver";
 let serovalPlugins = void 0;
+const textEncoder = new TextEncoder();
 const FORM_DATA_CONTENT_TYPES = [
   "multipart/form-data",
   "application/x-www-form-urlencoded"
@@ -38,6 +40,13 @@ const handleServerAction = async ({
         let nonStreamingBody = void 0;
         const alsResponse = getResponse();
         if (res2 !== void 0) {
+          const rawStreams = /* @__PURE__ */ new Map();
+          const rawStreamPlugin = createRawStreamRPCPlugin(
+            (id, stream2) => {
+              rawStreams.set(id, stream2);
+            }
+          );
+          const plugins = [rawStreamPlugin, ...serovalPlugins || []];
           let done = false;
           const callbacks = {
             onParse: (value) => {
@@ -52,7 +61,7 @@ const handleServerAction = async ({
           };
           toCrossJSONStream(res2, {
             refs: /* @__PURE__ */ new Map(),
-            plugins: serovalPlugins,
+            plugins,
             onParse(value) {
               callbacks.onParse(value);
             },
@@ -63,7 +72,7 @@ const handleServerAction = async ({
               callbacks.onError(error);
             }
           });
-          if (done) {
+          if (done && rawStreams.size === 0) {
             return new Response(
               nonStreamingBody ? JSON.stringify(nonStreamingBody) : void 0,
               {
@@ -76,10 +85,42 @@ const handleServerAction = async ({
               }
             );
           }
-          const encoder = new TextEncoder();
+          if (rawStreams.size > 0) {
+            const jsonStream = new ReadableStream({
+              start(controller2) {
+                callbacks.onParse = (value) => {
+                  controller2.enqueue(JSON.stringify(value) + "\n");
+                };
+                callbacks.onDone = () => {
+                  try {
+                    controller2.close();
+                  } catch {
+                  }
+                };
+                callbacks.onError = (error) => controller2.error(error);
+                if (nonStreamingBody !== void 0) {
+                  callbacks.onParse(nonStreamingBody);
+                }
+              }
+            });
+            const multiplexedStream = createMultiplexedStream(
+              jsonStream,
+              rawStreams
+            );
+            return new Response(multiplexedStream, {
+              status: alsResponse.status,
+              statusText: alsResponse.statusText,
+              headers: {
+                "Content-Type": TSS_CONTENT_TYPE_FRAMED_VERSIONED,
+                [X_TSS_SERIALIZED]: "true"
+              }
+            });
+          }
           const stream = new ReadableStream({
             start(controller2) {
-              callbacks.onParse = (value) => controller2.enqueue(encoder.encode(JSON.stringify(value) + "\n"));
+              callbacks.onParse = (value) => controller2.enqueue(
+                textEncoder.encode(JSON.stringify(value) + "\n")
+              );
               callbacks.onDone = () => {
                 try {
                   controller2.close();

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, isRedirect } from '@tanstack/router-core'\nimport invariant from 'tiny-invariant'\nimport {\n  TSS_FORMDATA_CONTEXT,\n  X_TSS_RAW_RESPONSE,\n  X_TSS_SERIALIZED,\n  getDefaultSerovalPlugins,\n  safeObjectMerge,\n} from '@tanstack/start-client-core'\nimport { fromJSON, toCrossJSONAsync, toCrossJSONStream } from 'seroval'\nimport { getResponse } from './request-response'\nimport { getServerFnById } from './getServerFnById'\nimport type { Plugin as SerovalPlugin } from 'seroval'\n\n// Cache serovalPlugins at module level to avoid repeated calls\nlet serovalPlugins: Array<SerovalPlugin<any, any>> | undefined = undefined\n\n// Known FormData 'Content-Type' header values - module-level constant\nconst FORM_DATA_CONTENT_TYPES = [\n  'multipart/form-data',\n  'application/x-www-form-urlencoded',\n]\n\n// Maximum payload size for GET requests (1MB)\nconst MAX_PAYLOAD_SIZE = 1_000_000\n\nexport const handleServerAction = async ({\n  request,\n  context,\n  serverFnId,\n}: {\n  request: Request\n  context: any\n  serverFnId: string\n}) => {\n  const controller = new AbortController()\n  const signal = controller.signal\n  const abort = () => controller.abort()\n  request.signal.addEventListener('abort', abort)\n\n  const method = request.method\n  const methodLower = method.toLowerCase()\n  const url = new URL(request.url)\n\n  const action = await getServerFnById(serverFnId, { fromClient: true })\n\n  const isServerFn = request.headers.get('x-tsr-serverFn') === 'true'\n\n  // Initialize serovalPlugins lazily (cached at module level)\n  if (!serovalPlugins) {\n    serovalPlugins = getDefaultSerovalPlugins()\n  }\n\n  const contentType = request.headers.get('Content-Type')\n\n  function parsePayload(payload: any) {\n    const parsedPayload = fromJSON(payload, { plugins: serovalPlugins })\n    return parsedPayload as any\n  }\n\n  const response = await (async () => {\n    try {\n      let res = await (async () => {\n        // FormData\n        if (\n          FORM_DATA_CONTENT_TYPES.some(\n            (type) => contentType && contentType.includes(type),\n          )\n        ) {\n          // We don't support GET requests with FormData payloads... that seems impossible\n          invariant(\n            methodLower !== 'get',\n            'GET requests with FormData payloads are not supported',\n          )\n          const formData = await request.formData()\n          const serializedContext = formData.get(TSS_FORMDATA_CONTEXT)\n          formData.delete(TSS_FORMDATA_CONTEXT)\n\n          const params = {\n            context,\n            data: formData,\n          }\n          if (typeof serializedContext === 'string') {\n            try {\n              const parsedContext = JSON.parse(serializedContext)\n              const deserializedContext = fromJSON(parsedContext, {\n                plugins: serovalPlugins,\n              })\n              if (\n                typeof deserializedContext === 'object' &&\n                deserializedContext\n              ) {\n                params.context = safeObjectMerge(\n                  context,\n                  deserializedContext as Record<string, unknown>,\n                )\n              }\n            } catch (e) {\n              // Log warning for debugging but don't expose to client\n              if (process.env.NODE_ENV === 'development') {\n                console.warn('Failed to parse FormData context:', e)\n              }\n            }\n          }\n\n          return await action(params, signal)\n        }\n\n        // Get requests use the query string\n        if (methodLower === 'get') {\n          // Get payload directly from searchParams\n          const payloadParam = url.searchParams.get('payload')\n          // Reject oversized payloads to prevent DoS\n          if (payloadParam && payloadParam.length > MAX_PAYLOAD_SIZE) {\n            throw new Error('Payload too large')\n          }\n          // If there's a payload, we should try to parse it\n          const payload: any = payloadParam\n            ? parsePayload(JSON.parse(payloadParam))\n            : {}\n          payload.context = safeObjectMerge(context, payload.context)\n          // Send it through!\n          return await action(payload, signal)\n        }\n\n        if (methodLower !== 'post') {\n          throw new Error('expected POST method')\n        }\n\n        let jsonPayload\n        if (contentType?.includes('application/json')) {\n          jsonPayload = await request.json()\n        }\n\n        const payload = jsonPayload ? parsePayload(jsonPayload) : {}\n        payload.context = safeObjectMerge(payload.context, context)\n        return await action(payload, signal)\n      })()\n\n      const unwrapped = res.result || res.error\n\n      if (isNotFound(res)) {\n        res = isNotFoundResponse(res)\n      }\n\n      if (!isServerFn) {\n        return unwrapped\n      }\n\n      if (unwrapped instanceof Response) {\n        if (isRedirect(unwrapped)) {\n          return unwrapped\n        }\n        unwrapped.headers.set(X_TSS_RAW_RESPONSE, 'true')\n        return unwrapped\n      }\n\n      return serializeResult(res)\n\n      function serializeResult(res: unknown): Response {\n        let nonStreamingBody: any = undefined\n\n        const alsResponse = getResponse()\n        if (res !== undefined) {\n          // first run without the stream in case `result` does not need streaming\n          let done = false as boolean\n          const callbacks: {\n            onParse: (value: any) => void\n            onDone: () => void\n            onError: (error: any) => void\n          } = {\n            onParse: (value) => {\n              nonStreamingBody = value\n            },\n            onDone: () => {\n              done = true\n            },\n            onError: (error) => {\n              throw error\n            },\n          }\n          toCrossJSONStream(res, {\n            refs: new Map(),\n            plugins: serovalPlugins,\n            onParse(value) {\n              callbacks.onParse(value)\n            },\n            onDone() {\n              callbacks.onDone()\n            },\n            onError: (error) => {\n              callbacks.onError(error)\n            },\n          })\n          if (done) {\n            return new Response(\n              nonStreamingBody ? JSON.stringify(nonStreamingBody) : undefined,\n              {\n                status: alsResponse.status,\n                statusText: alsResponse.statusText,\n                headers: {\n                  'Content-Type': 'application/json',\n                  [X_TSS_SERIALIZED]: 'true',\n                },\n              },\n            )\n          }\n\n          // not done yet, we need to stream\n          const encoder = new TextEncoder()\n          const stream = new ReadableStream({\n            start(controller) {\n              callbacks.onParse = (value) =>\n                controller.enqueue(encoder.encode(JSON.stringify(value) + '\\n'))\n              callbacks.onDone = () => {\n                try {\n                  controller.close()\n                } catch (error) {\n                  controller.error(error)\n                }\n              }\n              callbacks.onError = (error) => controller.error(error)\n              // stream the initial body\n              if (nonStreamingBody !== undefined) {\n                callbacks.onParse(nonStreamingBody)\n              }\n            },\n          })\n          return new Response(stream, {\n            status: alsResponse.status,\n            statusText: alsResponse.statusText,\n            headers: {\n              'Content-Type': 'application/x-ndjson',\n              [X_TSS_SERIALIZED]: 'true',\n            },\n          })\n        }\n\n        return new Response(undefined, {\n          status: alsResponse.status,\n          statusText: alsResponse.statusText,\n        })\n      }\n    } catch (error: any) {\n      if (error instanceof Response) {\n        return error\n      }\n      // else if (\n      //   isPlainObject(error) &&\n      //   'result' in error &&\n      //   error.result instanceof Response\n      // ) {\n      //   return error.result\n      // }\n\n      // Currently this server-side context has no idea how to\n      // build final URLs, so we need to defer that to the client.\n      // The client will check for __redirect and __notFound keys,\n      // and if they exist, it will handle them appropriately.\n\n      if (isNotFound(error)) {\n        return isNotFoundResponse(error)\n      }\n\n      console.info()\n      console.info('Server Fn Error!')\n      console.info()\n      console.error(error)\n      console.info()\n\n      const serializedError = JSON.stringify(\n        await Promise.resolve(\n          toCrossJSONAsync(error, {\n            refs: new Map(),\n            plugins: serovalPlugins,\n          }),\n        ),\n      )\n      const response = getResponse()\n      return new Response(serializedError, {\n        status: response.status ?? 500,\n        statusText: response.statusText,\n        headers: {\n          'Content-Type': 'application/json',\n          [X_TSS_SERIALIZED]: 'true',\n        },\n      })\n    }\n  })()\n\n  request.signal.removeEventListener('abort', abort)\n\n  return response\n}\n\nfunction isNotFoundResponse(error: any) {\n  const { headers, ...rest } = error\n\n  return new Response(JSON.stringify(rest), {\n    status: 404,\n    headers: {\n      'Content-Type': 'application/json',\n      ...(headers || {}),\n    },\n  })\n}\n"],"names":["res","controller","payload","response"],"mappings":"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"}
+{"version":3,"file":"server-functions-handler.js","sources":["../../src/server-functions-handler.ts"],"sourcesContent":["import {\n  createRawStreamRPCPlugin,\n  isNotFound,\n  isRedirect,\n} from '@tanstack/router-core'\nimport invariant from 'tiny-invariant'\nimport {\n  TSS_FORMDATA_CONTEXT,\n  X_TSS_RAW_RESPONSE,\n  X_TSS_SERIALIZED,\n  getDefaultSerovalPlugins,\n  safeObjectMerge,\n} from '@tanstack/start-client-core'\nimport { fromJSON, toCrossJSONAsync, toCrossJSONStream } from 'seroval'\nimport { getResponse } from './request-response'\nimport { getServerFnById } from './getServerFnById'\nimport {\n  TSS_CONTENT_TYPE_FRAMED_VERSIONED,\n  createMultiplexedStream,\n} from './frame-protocol'\nimport type { Plugin as SerovalPlugin } from 'seroval'\n\n// Cache serovalPlugins at module level to avoid repeated calls\nlet serovalPlugins: Array<SerovalPlugin<any, any>> | undefined = undefined\n\n// Cache TextEncoder for NDJSON serialization\nconst textEncoder = new TextEncoder()\n\n// Known FormData 'Content-Type' header values - module-level constant\nconst FORM_DATA_CONTENT_TYPES = [\n  'multipart/form-data',\n  'application/x-www-form-urlencoded',\n]\n\n// Maximum payload size for GET requests (1MB)\nconst MAX_PAYLOAD_SIZE = 1_000_000\n\nexport const handleServerAction = async ({\n  request,\n  context,\n  serverFnId,\n}: {\n  request: Request\n  context: any\n  serverFnId: string\n}) => {\n  const controller = new AbortController()\n  const signal = controller.signal\n  const abort = () => controller.abort()\n  request.signal.addEventListener('abort', abort)\n\n  const method = request.method\n  const methodLower = method.toLowerCase()\n  const url = new URL(request.url)\n\n  const action = await getServerFnById(serverFnId, { fromClient: true })\n\n  const isServerFn = request.headers.get('x-tsr-serverFn') === 'true'\n\n  // Initialize serovalPlugins lazily (cached at module level)\n  if (!serovalPlugins) {\n    serovalPlugins = getDefaultSerovalPlugins()\n  }\n\n  const contentType = request.headers.get('Content-Type')\n\n  function parsePayload(payload: any) {\n    const parsedPayload = fromJSON(payload, { plugins: serovalPlugins })\n    return parsedPayload as any\n  }\n\n  const response = await (async () => {\n    try {\n      let res = await (async () => {\n        // FormData\n        if (\n          FORM_DATA_CONTENT_TYPES.some(\n            (type) => contentType && contentType.includes(type),\n          )\n        ) {\n          // We don't support GET requests with FormData payloads... that seems impossible\n          invariant(\n            methodLower !== 'get',\n            'GET requests with FormData payloads are not supported',\n          )\n          const formData = await request.formData()\n          const serializedContext = formData.get(TSS_FORMDATA_CONTEXT)\n          formData.delete(TSS_FORMDATA_CONTEXT)\n\n          const params = {\n            context,\n            data: formData,\n          }\n          if (typeof serializedContext === 'string') {\n            try {\n              const parsedContext = JSON.parse(serializedContext)\n              const deserializedContext = fromJSON(parsedContext, {\n                plugins: serovalPlugins,\n              })\n              if (\n                typeof deserializedContext === 'object' &&\n                deserializedContext\n              ) {\n                params.context = safeObjectMerge(\n                  context,\n                  deserializedContext as Record<string, unknown>,\n                )\n              }\n            } catch (e) {\n              // Log warning for debugging but don't expose to client\n              if (process.env.NODE_ENV === 'development') {\n                console.warn('Failed to parse FormData context:', e)\n              }\n            }\n          }\n\n          return await action(params, signal)\n        }\n\n        // Get requests use the query string\n        if (methodLower === 'get') {\n          // Get payload directly from searchParams\n          const payloadParam = url.searchParams.get('payload')\n          // Reject oversized payloads to prevent DoS\n          if (payloadParam && payloadParam.length > MAX_PAYLOAD_SIZE) {\n            throw new Error('Payload too large')\n          }\n          // If there's a payload, we should try to parse it\n          const payload: any = payloadParam\n            ? parsePayload(JSON.parse(payloadParam))\n            : {}\n          payload.context = safeObjectMerge(context, payload.context)\n          // Send it through!\n          return await action(payload, signal)\n        }\n\n        if (methodLower !== 'post') {\n          throw new Error('expected POST method')\n        }\n\n        let jsonPayload\n        if (contentType?.includes('application/json')) {\n          jsonPayload = await request.json()\n        }\n\n        const payload = jsonPayload ? parsePayload(jsonPayload) : {}\n        payload.context = safeObjectMerge(payload.context, context)\n        return await action(payload, signal)\n      })()\n\n      const unwrapped = res.result || res.error\n\n      if (isNotFound(res)) {\n        res = isNotFoundResponse(res)\n      }\n\n      if (!isServerFn) {\n        return unwrapped\n      }\n\n      if (unwrapped instanceof Response) {\n        if (isRedirect(unwrapped)) {\n          return unwrapped\n        }\n        unwrapped.headers.set(X_TSS_RAW_RESPONSE, 'true')\n        return unwrapped\n      }\n\n      return serializeResult(res)\n\n      function serializeResult(res: unknown): Response {\n        let nonStreamingBody: any = undefined\n\n        const alsResponse = getResponse()\n        if (res !== undefined) {\n          // Collect raw streams encountered during serialization\n          const rawStreams = new Map<number, ReadableStream<Uint8Array>>()\n          const rawStreamPlugin = createRawStreamRPCPlugin(\n            (id: number, stream: ReadableStream<Uint8Array>) => {\n              rawStreams.set(id, stream)\n            },\n          )\n\n          // Build plugins with RawStreamRPCPlugin first (before default SSR plugin)\n          const plugins = [rawStreamPlugin, ...(serovalPlugins || [])]\n\n          // first run without the stream in case `result` does not need streaming\n          let done = false as boolean\n          const callbacks: {\n            onParse: (value: any) => void\n            onDone: () => void\n            onError: (error: any) => void\n          } = {\n            onParse: (value) => {\n              nonStreamingBody = value\n            },\n            onDone: () => {\n              done = true\n            },\n            onError: (error) => {\n              throw error\n            },\n          }\n          toCrossJSONStream(res, {\n            refs: new Map(),\n            plugins,\n            onParse(value) {\n              callbacks.onParse(value)\n            },\n            onDone() {\n              callbacks.onDone()\n            },\n            onError: (error) => {\n              callbacks.onError(error)\n            },\n          })\n\n          // If no raw streams and done synchronously, return simple JSON\n          if (done && rawStreams.size === 0) {\n            return new Response(\n              nonStreamingBody ? JSON.stringify(nonStreamingBody) : undefined,\n              {\n                status: alsResponse.status,\n                statusText: alsResponse.statusText,\n                headers: {\n                  'Content-Type': 'application/json',\n                  [X_TSS_SERIALIZED]: 'true',\n                },\n              },\n            )\n          }\n\n          // If we have raw streams, use framed protocol\n          if (rawStreams.size > 0) {\n            // Create a stream of JSON chunks (NDJSON style)\n            const jsonStream = new ReadableStream<string>({\n              start(controller) {\n                callbacks.onParse = (value) => {\n                  controller.enqueue(JSON.stringify(value) + '\\n')\n                }\n                callbacks.onDone = () => {\n                  try {\n                    controller.close()\n                  } catch {\n                    // Already closed\n                  }\n                }\n                callbacks.onError = (error) => controller.error(error)\n                // Emit initial body if we have one\n                if (nonStreamingBody !== undefined) {\n                  callbacks.onParse(nonStreamingBody)\n                }\n              },\n            })\n\n            // Create multiplexed stream with JSON and raw streams\n            const multiplexedStream = createMultiplexedStream(\n              jsonStream,\n              rawStreams,\n            )\n\n            return new Response(multiplexedStream, {\n              status: alsResponse.status,\n              statusText: alsResponse.statusText,\n              headers: {\n                'Content-Type': TSS_CONTENT_TYPE_FRAMED_VERSIONED,\n                [X_TSS_SERIALIZED]: 'true',\n              },\n            })\n          }\n\n          // No raw streams but not done yet - use standard NDJSON streaming\n          const stream = new ReadableStream({\n            start(controller) {\n              callbacks.onParse = (value) =>\n                controller.enqueue(\n                  textEncoder.encode(JSON.stringify(value) + '\\n'),\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 initial body\n              if (nonStreamingBody !== undefined) {\n                callbacks.onParse(nonStreamingBody)\n              }\n            },\n          })\n          return new Response(stream, {\n            status: alsResponse.status,\n            statusText: alsResponse.statusText,\n            headers: {\n              'Content-Type': 'application/x-ndjson',\n              [X_TSS_SERIALIZED]: 'true',\n            },\n          })\n        }\n\n        return new Response(undefined, {\n          status: alsResponse.status,\n          statusText: alsResponse.statusText,\n        })\n      }\n    } catch (error: any) {\n      if (error instanceof Response) {\n        return error\n      }\n      // else if (\n      //   isPlainObject(error) &&\n      //   'result' in error &&\n      //   error.result instanceof Response\n      // ) {\n      //   return error.result\n      // }\n\n      // Currently this server-side context has no idea how to\n      // build final URLs, so we need to defer that to the client.\n      // The client will check for __redirect and __notFound keys,\n      // and if they exist, it will handle them appropriately.\n\n      if (isNotFound(error)) {\n        return isNotFoundResponse(error)\n      }\n\n      console.info()\n      console.info('Server Fn Error!')\n      console.info()\n      console.error(error)\n      console.info()\n\n      const serializedError = JSON.stringify(\n        await Promise.resolve(\n          toCrossJSONAsync(error, {\n            refs: new Map(),\n            plugins: serovalPlugins,\n          }),\n        ),\n      )\n      const response = getResponse()\n      return new Response(serializedError, {\n        status: response.status ?? 500,\n        statusText: response.statusText,\n        headers: {\n          'Content-Type': 'application/json',\n          [X_TSS_SERIALIZED]: 'true',\n        },\n      })\n    }\n  })()\n\n  request.signal.removeEventListener('abort', abort)\n\n  return response\n}\n\nfunction isNotFoundResponse(error: any) {\n  const { headers, ...rest } = error\n\n  return new Response(JSON.stringify(rest), {\n    status: 404,\n    headers: {\n      'Content-Type': 'application/json',\n      ...(headers || {}),\n    },\n  })\n}\n"],"names":["res","stream","controller","payload","response"],"mappings":"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"}

package/package.json

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

package/src/frame-protocol.ts

@@ -0,0 +1,216 @@
+/**
+ * Binary frame protocol for multiplexing JSON and raw streams over HTTP.
+ *
+ * Frame format: [type:1][streamId:4][length:4][payload:length]
+ * - type: 1 byte - frame type (JSON, CHUNK, END, ERROR)
+ * - streamId: 4 bytes big-endian uint32 - stream identifier
+ * - length: 4 bytes big-endian uint32 - payload length
+ * - payload: variable length bytes
+ */
+
+// Re-export constants from shared location
+import { FRAME_HEADER_SIZE, FrameType } from '@tanstack/start-client-core'
+
+export {
+  FRAME_HEADER_SIZE,
+  FrameType,
+  TSS_CONTENT_TYPE_FRAMED,
+  TSS_CONTENT_TYPE_FRAMED_VERSIONED,
+  TSS_FRAMED_PROTOCOL_VERSION,
+} from '@tanstack/start-client-core'
+
+/** Cached TextEncoder for frame encoding */
+const textEncoder = new TextEncoder()
+
+/** Shared empty payload for END frames - avoids allocation per call */
+const EMPTY_PAYLOAD = new Uint8Array(0)
+
+/**
+ * Encodes a single frame with header and payload.
+ */
+export function encodeFrame(
+  type: FrameType,
+  streamId: number,
+  payload: Uint8Array,
+): Uint8Array {
+  const frame = new Uint8Array(FRAME_HEADER_SIZE + payload.length)
+  // Write header bytes directly to avoid DataView allocation per frame
+  // Frame format: [type:1][streamId:4 BE][length:4 BE]
+  frame[0] = type
+  frame[1] = (streamId >>> 24) & 0xff
+  frame[2] = (streamId >>> 16) & 0xff
+  frame[3] = (streamId >>> 8) & 0xff
+  frame[4] = streamId & 0xff
+  frame[5] = (payload.length >>> 24) & 0xff
+  frame[6] = (payload.length >>> 16) & 0xff
+  frame[7] = (payload.length >>> 8) & 0xff
+  frame[8] = payload.length & 0xff
+  frame.set(payload, FRAME_HEADER_SIZE)
+  return frame
+}
+
+/**
+ * Encodes a JSON frame (type 0, streamId 0).
+ */
+export function encodeJSONFrame(json: string): Uint8Array {
+  return encodeFrame(FrameType.JSON, 0, textEncoder.encode(json))
+}
+
+/**
+ * Encodes a raw stream chunk frame.
+ */
+export function encodeChunkFrame(
+  streamId: number,
+  chunk: Uint8Array,
+): Uint8Array {
+  return encodeFrame(FrameType.CHUNK, streamId, chunk)
+}
+
+/**
+ * Encodes a raw stream end frame.
+ */
+export function encodeEndFrame(streamId: number): Uint8Array {
+  return encodeFrame(FrameType.END, streamId, EMPTY_PAYLOAD)
+}
+
+/**
+ * Encodes a raw stream error frame.
+ */
+export function encodeErrorFrame(streamId: number, error: unknown): Uint8Array {
+  const message =
+    error instanceof Error ? error.message : String(error ?? 'Unknown error')
+  return encodeFrame(FrameType.ERROR, streamId, textEncoder.encode(message))
+}
+
+/**
+ * Creates a multiplexed ReadableStream from JSON stream and raw streams.
+ *
+ * The JSON stream emits NDJSON lines (from seroval's toCrossJSONStream).
+ * Raw streams are pumped concurrently, interleaved with JSON frames.
+ *
+ * @param jsonStream Stream of JSON strings (each string is one NDJSON line)
+ * @param rawStreams Map of stream IDs to raw binary streams
+ */
+export function createMultiplexedStream(
+  jsonStream: ReadableStream<string>,
+  rawStreams: Map<number, ReadableStream<Uint8Array>>,
+): ReadableStream<Uint8Array> {
+  // Track active pumps for completion
+  let activePumps = 1 + rawStreams.size // 1 for JSON + raw streams
+  let controllerRef: ReadableStreamDefaultController<Uint8Array> | null = null
+  let cancelled = false as boolean
+  const cancelReaders: Array<() => void> = []
+
+  const safeEnqueue = (chunk: Uint8Array) => {
+    if (cancelled || !controllerRef) return
+    try {
+      controllerRef.enqueue(chunk)
+    } catch {
+      // Ignore enqueue after close/cancel
+    }
+  }
+
+  const safeError = (err: unknown) => {
+    if (cancelled || !controllerRef) return
+    try {
+      controllerRef.error(err)
+    } catch {
+      // Ignore
+    }
+  }
+
+  const safeClose = () => {
+    if (cancelled || !controllerRef) return
+    try {
+      controllerRef.close()
+    } catch {
+      // Ignore
+    }
+  }
+
+  const checkComplete = () => {
+    activePumps--
+    if (activePumps === 0) {
+      safeClose()
+    }
+  }
+
+  return new ReadableStream<Uint8Array>({
+    start(controller) {
+      controllerRef = controller
+      cancelReaders.length = 0
+
+      // Pump JSON stream (streamId 0)
+      const pumpJSON = async () => {
+        const reader = jsonStream.getReader()
+        cancelReaders.push(() => {
+          // Catch async rejection - reader may already be released
+          reader.cancel().catch(() => {})
+        })
+        try {
+          // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+          while (true) {
+            const { done, value } = await reader.read()
+            // Check cancelled after await - flag may have changed while waiting
+            if (cancelled) break
+            if (done) break
+            safeEnqueue(encodeJSONFrame(value))
+          }
+        } catch (error) {
+          // JSON stream error - fatal, error the whole response
+          safeError(error)
+        } finally {
+          reader.releaseLock()
+          checkComplete()
+        }
+      }
+
+      // Pump a single raw stream with its streamId
+      const pumpRawStream = async (
+        streamId: number,
+        stream: ReadableStream<Uint8Array>,
+      ) => {
+        const reader = stream.getReader()
+        cancelReaders.push(() => {
+          // Catch async rejection - reader may already be released
+          reader.cancel().catch(() => {})
+        })
+        try {
+          // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+          while (true) {
+            const { done, value } = await reader.read()
+            // Check cancelled after await - flag may have changed while waiting
+            if (cancelled) break
+            if (done) {
+              safeEnqueue(encodeEndFrame(streamId))
+              break
+            }
+            safeEnqueue(encodeChunkFrame(streamId, value))
+          }
+        } catch (error) {
+          // Stream error - send ERROR frame (non-fatal, other streams continue)
+          safeEnqueue(encodeErrorFrame(streamId, error))
+        } finally {
+          reader.releaseLock()
+          checkComplete()
+        }
+      }
+
+      // Start all pumps concurrently
+      pumpJSON()
+      for (const [streamId, stream] of rawStreams) {
+        pumpRawStream(streamId, stream)
+      }
+    },
+
+    cancel() {
+      cancelled = true
+      controllerRef = null
+      // Proactively cancel all underlying readers to stop work quickly.
+      for (const cancelReader of cancelReaders) {
+        cancelReader()
+      }
+      cancelReaders.length = 0
+    },
+  })
+}

package/src/server-functions-handler.ts

@@ -1,4 +1,8 @@
-import { isNotFound, isRedirect } from '@tanstack/router-core'
+import {
+  createRawStreamRPCPlugin,
+  isNotFound,
+  isRedirect,
+} from '@tanstack/router-core'
 import invariant from 'tiny-invariant'
 import {
   TSS_FORMDATA_CONTEXT,
@@ -10,11 +14,18 @@ import {
 import { fromJSON, toCrossJSONAsync, toCrossJSONStream } from 'seroval'
 import { getResponse } from './request-response'
 import { getServerFnById } from './getServerFnById'
+import {
+  TSS_CONTENT_TYPE_FRAMED_VERSIONED,
+  createMultiplexedStream,
+} from './frame-protocol'
 import type { Plugin as SerovalPlugin } from 'seroval'
 
 // Cache serovalPlugins at module level to avoid repeated calls
 let serovalPlugins: Array<SerovalPlugin<any, any>> | undefined = undefined
 
+// Cache TextEncoder for NDJSON serialization
+const textEncoder = new TextEncoder()
+
 // Known FormData 'Content-Type' header values - module-level constant
 const FORM_DATA_CONTENT_TYPES = [
   'multipart/form-data',
@@ -162,6 +173,17 @@ export const handleServerAction = async ({
 
         const alsResponse = getResponse()
         if (res !== undefined) {
+          // Collect raw streams encountered during serialization
+          const rawStreams = new Map<number, ReadableStream<Uint8Array>>()
+          const rawStreamPlugin = createRawStreamRPCPlugin(
+            (id: number, stream: ReadableStream<Uint8Array>) => {
+              rawStreams.set(id, stream)
+            },
+          )
+
+          // Build plugins with RawStreamRPCPlugin first (before default SSR plugin)
+          const plugins = [rawStreamPlugin, ...(serovalPlugins || [])]
+
           // first run without the stream in case `result` does not need streaming
           let done = false as boolean
           const callbacks: {
@@ -181,7 +203,7 @@ export const handleServerAction = async ({
           }
           toCrossJSONStream(res, {
             refs: new Map(),
-            plugins: serovalPlugins,
+            plugins,
             onParse(value) {
               callbacks.onParse(value)
             },
@@ -192,7 +214,9 @@ export const handleServerAction = async ({
               callbacks.onError(error)
             },
           })
-          if (done) {
+
+          // If no raw streams and done synchronously, return simple JSON
+          if (done && rawStreams.size === 0) {
             return new Response(
               nonStreamingBody ? JSON.stringify(nonStreamingBody) : undefined,
               {
@@ -206,12 +230,52 @@ export const handleServerAction = async ({
             )
           }
 
-          // not done yet, we need to stream
-          const encoder = new TextEncoder()
+          // If we have raw streams, use framed protocol
+          if (rawStreams.size > 0) {
+            // Create a stream of JSON chunks (NDJSON style)
+            const jsonStream = new ReadableStream<string>({
+              start(controller) {
+                callbacks.onParse = (value) => {
+                  controller.enqueue(JSON.stringify(value) + '\n')
+                }
+                callbacks.onDone = () => {
+                  try {
+                    controller.close()
+                  } catch {
+                    // Already closed
+                  }
+                }
+                callbacks.onError = (error) => controller.error(error)
+                // Emit initial body if we have one
+                if (nonStreamingBody !== undefined) {
+                  callbacks.onParse(nonStreamingBody)
+                }
+              },
+            })
+
+            // Create multiplexed stream with JSON and raw streams
+            const multiplexedStream = createMultiplexedStream(
+              jsonStream,
+              rawStreams,
+            )
+
+            return new Response(multiplexedStream, {
+              status: alsResponse.status,
+              statusText: alsResponse.statusText,
+              headers: {
+                'Content-Type': TSS_CONTENT_TYPE_FRAMED_VERSIONED,
+                [X_TSS_SERIALIZED]: 'true',
+              },
+            })
+          }
+
+          // No raw streams but not done yet - use standard NDJSON streaming
           const stream = new ReadableStream({
             start(controller) {
               callbacks.onParse = (value) =>
-                controller.enqueue(encoder.encode(JSON.stringify(value) + '\n'))
+                controller.enqueue(
+                  textEncoder.encode(JSON.stringify(value) + '\n'),
+                )
               callbacks.onDone = () => {
                 try {
                   controller.close()
@@ -220,7 +284,7 @@ export const handleServerAction = async ({
                 }
               }
               callbacks.onError = (error) => controller.error(error)
-              // stream the initial body
+              // stream initial body
               if (nonStreamingBody !== undefined) {
                 callbacks.onParse(nonStreamingBody)
               }