fix(proxy): split cookie headers properly with native node fetch (#408)

unjs · Jun 20, 2023 · eeaf03b · eeaf03b
1 parent bb59c69
commit eeaf03b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,12 +11,15 @@ on:
 jobs:
   ci:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node: [16, 18, 20]
     steps:
       - uses: actions/checkout@v3
       - run: corepack enable
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: ${{ matrix.node }}
           cache: "pnpm"
       - run: pnpm install
       - run: pnpm lint

diff --git a/src/utils/proxy.ts b/src/utils/proxy.ts
@@ -73,6 +73,8 @@ export async function sendProxy(
   );
   event.node.res.statusMessage = sanitizeStatusMessage(response.statusText);
 
+  const cookies: string[] = [];
+
   for (const [key, value] of response.headers.entries()) {
     if (key === "content-encoding") {
       continue;
@@ -81,7 +83,16 @@ export async function sendProxy(
       continue;
     }
     if (key === "set-cookie") {
-      const cookies = splitCookiesString(value).map((cookie) => {
+      cookies.push(...splitCookiesString(value));
+      continue;
+    }
+    event.node.res.setHeader(key, value);
+  }
+
+  if (cookies.length > 0) {
+    event.node.res.setHeader(
+      "set-cookie",
+      cookies.map((cookie) => {
         if (opts.cookieDomainRewrite) {
           cookie = rewriteCookieProperty(
             cookie,
@@ -97,12 +108,8 @@ export async function sendProxy(
           );
         }
         return cookie;
-      });
-      event.node.res.setHeader("set-cookie", cookies);
-      continue;
-    }
-
-    event.node.res.setHeader(key, value);
+      })
+    );
   }
 
   // Directly send consumed _data