Add bidirectional encoding

lxsmnsyc · lxsmnsyc · commit e918deb5eb75 · 2026-02-02T00:15:24.000+08:00
diff --git a/apps/tests/src/routes/server-function-blob.tsx b/apps/tests/src/routes/server-function-blob.tsx
@@ -0,0 +1,28 @@
+import { createEffect, createSignal } from "solid-js";
+
+async function ping(value: Blob) {
+  "use server";
+  return value;
+}
+
+const blobURI = 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIHZpZXdCb3g9JzAgMCAxNjYgMTU1LjMnPjxwYXRoIGQ9J00xNjMgMzVTMTEwLTQgNjkgNWwtMyAxYy02IDItMTEgNS0xNCA5bC0yIDMtMTUgMjYgMjYgNWMxMSA3IDI1IDEwIDM4IDdsNDYgOSAxOC0zMHonIGZpbGw9JyM3NmIzZTEnLz48bGluZWFyR3JhZGllbnQgaWQ9J2EnIGdyYWRpZW50VW5pdHM9J3VzZXJTcGFjZU9uVXNlJyB4MT0nMjcuNScgeTE9JzMnIHgyPScxNTInIHkyPSc2My41Jz48c3RvcCBvZmZzZXQ9Jy4xJyBzdG9wLWNvbG9yPScjNzZiM2UxJy8+PHN0b3Agb2Zmc2V0PScuMycgc3RvcC1jb2xvcj0nI2RjZjJmZCcvPjxzdG9wIG9mZnNldD0nMScgc3RvcC1jb2xvcj0nIzc2YjNlMScvPjwvbGluZWFyR3JhZGllbnQ+PHBhdGggZD0nTTE2MyAzNVMxMTAtNCA2OSA1bC0zIDFjLTYgMi0xMSA1LTE0IDlsLTIgMy0xNSAyNiAyNiA1YzExIDcgMjUgMTAgMzggN2w0NiA5IDE4LTMweicgb3BhY2l0eT0nLjMnIGZpbGw9J3VybCgjYSknLz48cGF0aCBkPSdNNTIgMzVsLTQgMWMtMTcgNS0yMiAyMS0xMyAzNSAxMCAxMyAzMSAyMCA0OCAxNWw2Mi0yMVM5MiAyNiA1MiAzNXonIGZpbGw9JyM1MThhYzgnLz48bGluZWFyR3JhZGllbnQgaWQ9J2InIGdyYWRpZW50VW5pdHM9J3VzZXJTcGFjZU9uVXNlJyB4MT0nOTUuOCcgeTE9JzMyLjYnIHgyPSc3NCcgeTI9JzEwNS4yJz48c3RvcCBvZmZzZXQ9JzAnIHN0b3AtY29sb3I9JyM3NmIzZTEnLz48c3RvcCBvZmZzZXQ9Jy41JyBzdG9wLWNvbG9yPScjNDM3N2JiJy8+PHN0b3Agb2Zmc2V0PScxJyBzdG9wLWNvbG9yPScjMWYzYjc3Jy8+PC9saW5lYXJHcmFkaWVudD48cGF0aCBkPSdNNTIgMzVsLTQgMWMtMTcgNS0yMiAyMS0xMyAzNSAxMCAxMyAzMSAyMCA0OCAxNWw2Mi0yMVM5MiAyNiA1MiAzNXonIG9wYWNpdHk9Jy4zJyBmaWxsPSd1cmwoI2IpJy8+PGxpbmVhckdyYWRpZW50IGlkPSdjJyBncmFkaWVudFVuaXRzPSd1c2VyU3BhY2VPblVzZScgeDE9JzE4LjQnIHkxPSc2NC4yJyB4Mj0nMTQ0LjMnIHkyPScxNDkuOCc+PHN0b3Agb2Zmc2V0PScwJyBzdG9wLWNvbG9yPScjMzE1YWE5Jy8+PHN0b3Agb2Zmc2V0PScuNScgc3RvcC1jb2xvcj0nIzUxOGFjOCcvPjxzdG9wIG9mZnNldD0nMScgc3RvcC1jb2xvcj0nIzMxNWFhOScvPjwvbGluZWFyR3JhZGllbnQ+PHBhdGggZD0nTTEzNCA4MGE0NSA0NSAwIDAwLTQ4LTE1TDI0IDg1IDQgMTIwbDExMiAxOSAyMC0zNmM0LTcgMy0xNS0yLTIzeicgZmlsbD0ndXJsKCNjKScvPjxsaW5lYXJHcmFkaWVudCBpZD0nZCcgZ3JhZGllbnRVbml0cz0ndXNlclNwYWNlT25Vc2UnIHgxPSc3NS4yJyB5MT0nNzQuNScgeDI9JzI0LjQnIHkyPScyNjAuOCc+PHN0b3Agb2Zmc2V0PScwJyBzdG9wLWNvbG9yPScjNDM3N2JiJy8+PHN0b3Agb2Zmc2V0PScuNScgc3RvcC1jb2xvcj0nIzFhMzM2YicvPjxzdG9wIG9mZnNldD0nMScgc3RvcC1jb2xvcj0nIzFhMzM2YicvPjwvbGluZWFyR3JhZGllbnQ+PHBhdGggZD0nTTExNCAxMTVhNDUgNDUgMCAwMC00OC0xNUw0IDEyMHM1MyA0MCA5NCAzMGwzLTFjMTctNSAyMy0yMSAxMy0zNHonIGZpbGw9J3VybCgjZCknLz48L3N2Zz4=';
+
+export default function App() {
+  const [output, setOutput] = createSignal<{ result?: boolean }>({});
+
+  createEffect(async () => {
+    const request = await fetch(blobURI);
+    const blob = await request.blob();
+    const result = await ping(blob);
+    const value = await blob.text();
+    const test = await result.text();
+
+    setOutput(prev => ({ ...prev, result: value === test }));
+  });
+
+  return (
+    <main>
+      <span id="server-fn-test">{JSON.stringify(output())}</span>
+    </main>
+  );
+}
diff --git a/packages/start/src/server/serialization.ts b/packages/start/src/server/serialization.ts
@@ -229,7 +229,7 @@ export async function deserializeJSONStream(response: Response | Request) {
   return undefined;
 }
 
-export async function deserializeJSStream(id: string, response: Response) {
+export async function deserializeJSStream(id: string, response: Request | Response) {
   if (!response.body) {
     throw new Error("missing body");
   }
diff --git a/packages/start/src/server/server-functions-handler.ts b/packages/start/src/server/server-functions-handler.ts
@@ -9,11 +9,10 @@ import { getFetchEvent, mergeResponseHeaders } from "./fetchEvent.ts";
 import { createPageEvent } from "./handler.ts";
 import {
   deserializeFromJSONString,
-  deserializeJSONStream,
   serializeToJSONStream,
   serializeToJSStream,
 } from "./serialization.ts";
-import { BODY_FORMAL_FILE, BODY_FORMAT_KEY, BodyFormat } from "./server-functions-shared.ts";
+import { BODY_FORMAT_KEY, BodyFormat, extractBody, getHeadersAndBody } from "./server-functions-shared.ts";
 import type { FetchEvent, PageEvent } from "./types.ts";
 import { getExpectedRedirectStatus } from "./util.ts";
 
@@ -54,40 +53,7 @@ export async function handleServerFunction(h3Event: H3Event) {
     }
   }
   if (request.method === "POST") {
-    const contentType = request.headers.get("content-type");
-    const startType = request.headers.get(BODY_FORMAT_KEY);
-    const clone = request.clone();
-
-    switch (true) {
-      case startType === BodyFormat.Seroval:
-        parsed = (await deserializeJSONStream(clone)) as any[];
-        break;
-      case startType === BodyFormat.String:
-        parsed.push(await clone.text());
-        break;
-      case startType === BodyFormat.File: {
-        const formData = await clone.formData();
-        parsed.push(formData.get(BODY_FORMAL_FILE));
-        break;
-      }
-      case startType === BodyFormat.FormData:
-      case contentType?.startsWith("multipart/form-data"):
-        parsed.push(await clone.formData());
-        break;
-      case startType === BodyFormat.URLSearchParams:
-      case contentType?.startsWith("application/x-www-form-urlencoded"):
-        parsed.push(new URLSearchParams(await clone.text()));
-        break;
-      case startType === BodyFormat.Blob:
-        parsed.push(await clone.blob());
-        break;
-      case startType === BodyFormat.ArrayBuffer:
-        parsed.push(await clone.arrayBuffer());
-        break;
-      case startType === BodyFormat.Uint8Array:
-        parsed.push(await clone.bytes());
-        break;
-    }
+    parsed.push(await extractBody('', false, request.clone()));
   }
   try {
     let result = await provideRequestEvent(event, async () => {
@@ -121,12 +87,18 @@ export async function handleServerFunction(h3Event: H3Event) {
     // handle no JS success case
     if (!instance) return handleNoJS(result, request, parsed);
 
-    h3Event.res.headers.set(BODY_FORMAT_KEY, "true");
-    if (import.meta.env.SEROVAL_MODE === "js") {
-      h3Event.res.headers.set("content-type", "text/javascript");
-      return serializeToJSStream(instance, result);
-    }
-    return serializeToJSONStream(result);
+      const body = getHeadersAndBody(result);
+      if (body) {
+        return new Response(body.body, {
+          headers: body.headers,
+        });
+      }
+      h3Event.res.headers.set(BODY_FORMAT_KEY, BodyFormat.Seroval);
+      if (import.meta.env.SEROVAL_MODE === "js") {
+        h3Event.res.headers.set("content-type", "text/javascript");
+        return serializeToJSStream(instance, result);
+      }
+      return serializeToJSONStream(result);
   } catch (x) {
     if (x instanceof Response) {
       if (singleFlight && instance) {
@@ -153,7 +125,13 @@ export async function handleServerFunction(h3Event: H3Event) {
       x = handleNoJS(x, request, parsed, true);
     }
     if (instance) {
-      h3Event.res.headers.set(BODY_FORMAT_KEY, "true");
+      const body = getHeadersAndBody(x);
+      if (body) {
+        return new Response(body.body, {
+          headers: body.headers,
+        });
+      }
+      h3Event.res.headers.set(BODY_FORMAT_KEY, BodyFormat.Seroval);
       if (import.meta.env.SEROVAL_MODE === "js") {
         h3Event.res.headers.set("content-type", "text/javascript");
         return serializeToJSStream(instance, x);
diff --git a/packages/start/src/server/server-functions-shared.ts b/packages/start/src/server/server-functions-shared.ts
@@ -1,3 +1,4 @@
+import { deserializeJSONStream, deserializeJSStream } from "./serialization";
 
 export const BODY_FORMAT_KEY = "X-Start-Type";
 
@@ -13,3 +14,103 @@ export const enum BodyFormat {
   ArrayBuffer = "6",
   Uint8Array = "7",
 }
+
+export function getHeadersAndBody(body: any):
+  | {
+    headers?: HeadersInit;
+    body: BodyInit;
+  }
+  | undefined {
+  switch (true) {
+    case typeof body === "string":
+      return {
+        headers: {
+          "Content-Type": "text/plain",
+          [BODY_FORMAT_KEY]: BodyFormat.String,
+        },
+        body,
+      };
+    case body instanceof FormData:
+      return {
+        headers: {
+          [BODY_FORMAT_KEY]: BodyFormat.FormData,
+        },
+        body,
+      };
+    case body instanceof URLSearchParams:
+      return {
+        headers: {
+          "Content-Type": "application/x-www-form-urlencoded",
+          [BODY_FORMAT_KEY]: BodyFormat.URLSearchParams,
+        },
+        body,
+      };
+    case body instanceof File: {
+      const formData = new FormData();
+      formData.append(BODY_FORMAL_FILE, body, body.name);
+      return {
+        headers: {
+          [BODY_FORMAT_KEY]: BodyFormat.File,
+        },
+        body: formData,
+      };
+    }
+    case body instanceof Blob:
+      return {
+        headers: {
+          [BODY_FORMAT_KEY]: BodyFormat.Blob,
+        },
+        body,
+      };
+    case body instanceof ArrayBuffer:
+      return {
+        headers: {
+          [BODY_FORMAT_KEY]: BodyFormat.ArrayBuffer,
+        },
+        body,
+      };
+    case body instanceof Uint8Array:
+      return {
+        headers: {
+          [BODY_FORMAT_KEY]: BodyFormat.Uint8Array,
+        },
+        body: new Uint8Array(body),
+      };
+    default:
+      return undefined;
+  }
+}
+
+export async function extractBody(instance: string, client: boolean, source: Request | Response) {
+  const contentType = source.headers.get("content-type");
+  const startType = source.headers.get(BODY_FORMAT_KEY);
+  const clone = source.clone();
+
+  switch (true) {
+    case startType === BodyFormat.Seroval:
+      if (client && import.meta.env.SEROVAL_MODE === "js") {
+        return await deserializeJSStream(instance, clone);
+      }
+      return await deserializeJSONStream(clone);
+    case startType === BodyFormat.String:
+      return await clone.text();
+    case startType === BodyFormat.File: {
+      const formData = await clone.formData();
+      return formData.get(BODY_FORMAL_FILE);
+    }
+    case startType === BodyFormat.FormData:
+    case contentType?.startsWith("multipart/form-data"):
+      return await clone.formData();
+    case startType === BodyFormat.URLSearchParams:
+    case contentType?.startsWith("application/x-www-form-urlencoded"):
+      return new URLSearchParams(await clone.text());
+    case startType === BodyFormat.Blob:
+      return await clone.blob();
+    case startType === BodyFormat.ArrayBuffer:
+      return await clone.arrayBuffer();
+    case startType === BodyFormat.Uint8Array:
+      return await clone.bytes();
+  }
+
+  throw new Error("Unknown body format");
+}
diff --git a/packages/start/src/server/server-runtime.ts b/packages/start/src/server/server-runtime.ts
@@ -5,7 +5,7 @@ import {
   // serializeToJSONStream,
   serializeToJSONString,
 } from "./serialization.ts";
-import { BODY_FORMAL_FILE, BODY_FORMAT_KEY, BodyFormat } from "./server-functions-shared.ts";
+import { BODY_FORMAL_FILE, BODY_FORMAT_KEY, BodyFormat, extractBody, getHeadersAndBody } from "./server-functions-shared.ts";
 
 let INSTANCE = 0;
 
@@ -26,70 +26,6 @@ function createRequest(
   });
 }
 
-function getHeadersAndBody(body: any): {
-  headers?: HeadersInit;
-  body: BodyInit;
-} | undefined {
-  switch (true) {
-    case typeof body === "string":
-      return {
-        headers: {
-          "Content-Type": "text/plain",
-          [BODY_FORMAT_KEY]: BodyFormat.String,
-        },
-        body,
-      };
-    case body instanceof FormData:
-      return {
-        headers: {
-          [BODY_FORMAT_KEY]: BodyFormat.FormData,
-        },
-        body,
-      };
-    case body instanceof URLSearchParams:
-      return {
-        headers: {
-          "Content-Type": "application/x-www-form-urlencoded",
-          [BODY_FORMAT_KEY]: BodyFormat.URLSearchParams,
-        },
-        body,
-      };
-    case body instanceof File: {
-      const formData = new FormData();
-      formData.append(BODY_FORMAL_FILE, body, body.name);
-      return {
-        headers: {
-          [BODY_FORMAT_KEY]: BodyFormat.File,
-        },
-        body: formData,
-      };
-    }
-    case body instanceof Blob:
-      return {
-        headers: {
-          [BODY_FORMAT_KEY]: BodyFormat.Blob,
-        },
-        body,
-      };
-    case body instanceof ArrayBuffer:
-      return {
-        headers: {
-          [BODY_FORMAT_KEY]: BodyFormat.ArrayBuffer,
-        },
-        body,
-      };
-    case body instanceof Uint8Array:
-      return {
-        headers: {
-          [BODY_FORMAT_KEY]: BodyFormat.Uint8Array,
-        },
-        body: new Uint8Array(body),
-      };
-    default:
-      return undefined;
-  }
-}
-
 async function initializeResponse(
   base: string,
   id: string,
@@ -158,20 +94,8 @@ async function fetchServerFunction(
     return response;
   }
 
-  const contentType = response.headers.get("Content-Type");
   const clone = response.clone();
-  let result;
-  if (contentType?.startsWith("text/plain")) {
-    result = await clone.text();
-  } else if (contentType?.startsWith("application/json")) {
-    result = await clone.json();
-  } else if (response.headers.get(BODY_FORMAT_KEY)) {
-    if (import.meta.env.SEROVAL_MODE === "js") {
-      result = await deserializeJSStream(instance, clone);
-    } else {
-      result = await deserializeJSONStream(clone);
-    }
-  }
+  const result = await extractBody(instance, true, clone);
   if (response.headers.has("X-Error")) {
     throw result;
   }

Original file line number	Diff line number	Diff line change
`@@ -229,7 +229,7 @@ export async function deserializeJSONStream(response: Response \| Request) {`
`229`	`229`	`return undefined;`
`230`	`230`	`}`
`231`	`231`
`232`		`-export async function deserializeJSStream(id: string, response: Response) {`
	`232`	`+export async function deserializeJSStream(id: string, response: Request \| Response) {`
`233`	`233`	`if (!response.body) {`
`234`	`234`	`throw new Error("missing body");`
`235`	`235`	`}`