Fix client-server comms

Author: lxsmnsyc

packages/start/src/server/server-functions-handler.ts

@@ -60,7 +60,7 @@ export async function handleServerFunction(h3Event: H3Event) {
       contentType?.startsWith("application/x-www-form-urlencoded")
     ) {
       parsed.push(await event.request.formData());
-    } else {
+    } else if (contentType?.startsWith('text/plain')) {
       parsed = (await deserializeJSONStream(event.request.clone())) as any[];
     }
   }
@@ -96,11 +96,11 @@ export async function handleServerFunction(h3Event: H3Event) {
     // handle no JS success case
     if (!instance) return handleNoJS(result, request, parsed);
 
+    h3Event.res.headers.set("x-serialized", "true");
     if (import.meta.env.SEROVAL_MODE === "js") {
       h3Event.res.headers.set("content-type", "text/javascript");
       return serializeToJSStream(instance, result);
     }
-    h3Event.res.headers.set("content-type", "text/plain");
     return serializeToJSONStream(result);
   } catch (x) {
     if (x instanceof Response) {

packages/start/src/server/server-runtime.ts

@@ -47,8 +47,11 @@ async function fetchServerFunction(
         })
         : createRequest(base, id, instance, {
           ...options,
-          body: serializeToJSONStream(args),
-          headers: { ...options.headers, "Content-Type": "application/json" },
+          // TODO(Alexis): move to serializeToJSONStream
+          body: await serializeToJSONString(args),
+          // duplex: 'half',
+          // body: serializeToJSONStream(args),
+          headers: { ...options.headers, "Content-Type": "text/plain" },
         }));
 
   if (
@@ -70,14 +73,16 @@ async function fetchServerFunction(
 
   const contentType = response.headers.get("Content-Type");
   let result;
-  if (contentType && contentType.startsWith("text/plain")) {
+  if (contentType?.startsWith("text/plain")) {
     result = await response.text();
-  } else if (contentType && contentType.startsWith("application/json")) {
+  } else if (contentType?.startsWith("application/json")) {
     result = await response.json();
-  } else if (import.meta.env.SEROVAL_MODE === "js") {
-    result = await deserializeJSStream(instance, response);
-  } else {
-    result = await deserializeJSONStream(response);
+  } else if (response.headers.get('x-serialized')) {
+    if (import.meta.env.SEROVAL_MODE === "js") {
+      result = await deserializeJSStream(instance, response);
+    } else {
+      result = await deserializeJSONStream(response);
+    }
   }
   if (response.headers.has("X-Error")) {
     throw result;