forward set cookies through single-flight

Author: ryansolid

.changeset/config.json

@@ -23,6 +23,7 @@
     "example-with-trpc",
     "example-with-unocss",
     "example-with-vitest",
-    "solid-start-mdx"
+    "solid-start-mdx",
+    "solid-start-docs"
   ]
 }

.changeset/neat-glasses-kneel.md

@@ -0,0 +1,5 @@
+---
+"@solidjs/start": patch
+---
+
+forward set cookies through single-flight

docs/package.json

@@ -1,6 +1,7 @@
 {
   "name": "solid-start-docs",
   "type": "module",
+  "private": true,
   "scripts": {
     "dev": "vinxi dev",
     "build": "vinxi build",

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

@@ -16,7 +16,7 @@ import {
 import { sharedConfig } from "solid-js";
 import { renderToString } from "solid-js/web";
 import { provideRequestEvent } from "solid-js/web/storage";
-import { eventHandler, setHeader, setResponseStatus, type HTTPEvent } from "vinxi/http";
+import { eventHandler, parseCookies, setHeader, setResponseStatus, type HTTPEvent } from "vinxi/http";
 import invariant from "vinxi/lib/invariant";
 import { cloneEvent, getFetchEvent, mergeResponseHeaders } from "../server/fetchEvent";
 import { getExpectedRedirectStatus } from "../server/handler";
@@ -100,19 +100,19 @@ async function handleServerFunction(h3Event: HTTPEvent) {
       const json = JSON.parse(args);
       (json.t
         ? (fromJSON(json, {
-            plugins: [
-              CustomEventPlugin,
-              DOMExceptionPlugin,
-              EventPlugin,
-              FormDataPlugin,
-              HeadersPlugin,
-              ReadableStreamPlugin,
-              RequestPlugin,
-              ResponsePlugin,
-              URLSearchParamsPlugin,
-              URLPlugin
-            ]
-          }) as any)
+          plugins: [
+            CustomEventPlugin,
+            DOMExceptionPlugin,
+            EventPlugin,
+            FormDataPlugin,
+            HeadersPlugin,
+            ReadableStreamPlugin,
+            RequestPlugin,
+            ResponsePlugin,
+            URLSearchParamsPlugin,
+            URLPlugin
+          ]
+        }) as any)
         : json
       ).forEach((arg: any) => parsed.push(arg));
     }
@@ -270,6 +270,33 @@ function handleNoJS(result: any, request: Request, parsed: any[], thrown?: boole
 }
 
 let App: any;
+function createSingleFlightHeaders(sourceEvent: FetchEvent) {
+  // cookie handling logic is pretty simplistic so this might be imperfect
+  // unclear if h3 internals are available on all platforms but we need a way to
+  // update request headers on the underlying H3 event.
+
+  const headers = new Headers(sourceEvent.request.headers);
+  const cookies = parseCookies(sourceEvent.nativeEvent);
+  const SetCookies = sourceEvent.response.headers.getSetCookie();
+  headers.delete("cookie");
+  let useH3Internals = false;
+  if (sourceEvent.nativeEvent.node?.req) {
+    useH3Internals = true;
+    sourceEvent.nativeEvent.node.req.headers.cookie = "";
+  }
+  SetCookies.forEach((cookie) => {
+    if (!cookie) return;
+    const keyValue = cookie.split(";")[0]!;
+    const [key, value] = keyValue.split("=");
+    key && value && (cookies[key] = value);
+  });
+  Object.entries(cookies).forEach(([key, value]) => {
+    headers.append("cookie", `${key}=${value}`);
+    useH3Internals && (sourceEvent.nativeEvent.node.req.headers.cookie += `${key}=${value};`);
+  })
+
+  return headers;
+}
 async function handleSingleFlight(sourceEvent: FetchEvent, result: any): Promise<Response> {
   let revalidate: string[];
   let url = new URL(sourceEvent.request.headers.get("referer")!).toString();
@@ -283,7 +310,7 @@ async function handleSingleFlight(sourceEvent: FetchEvent, result: any): Promise
       ).toString();
   }
   const event = cloneEvent(sourceEvent) as PageEvent;
-  event.request = new Request(url, { headers: sourceEvent.request.headers });
+  event.request = new Request(url, { headers: createSingleFlightHeaders(sourceEvent) });
   return await provideRequestEvent(event, async () => {
     await createPageEvent(event);
     /* @ts-ignore */