@whatwg-node/server 0.8.11-alpha-20230613182236-ce4ebc7 → 0.8.11

package/cjs/createServerAdapter.js

@@ -150,7 +150,7 @@ function createServerAdapter(serverAdapterBaseObject, options) {
         event.respondWith(response$);
     }
     function handleRequestWithWaitUntil(request, ...ctx) {
-        const serverContext = ctx.length > 1 ? (0, utils_js_1.completeAssign)(...ctx) : ctx[0] || {};
+        const serverContext = (ctx.length > 1 ? (0, utils_js_1.completeAssign)(...ctx) : ctx[0]) || {};
         if (serverContext.waitUntil == null) {
             const waitUntilPromises = [];
             addWaitUntil(serverContext, waitUntilPromises);

package/cjs/utils.js

@@ -145,6 +145,20 @@ function endResponse(serverResponse) {
     // @ts-expect-error Avoid arguments adaptor trampoline https://v8.dev/blog/adaptor-frame
     serverResponse.end(null, null, null);
 }
+function getHeadersArray(headers) {
+    const headersArray = [];
+    headers.forEach((value, key) => {
+        if (key === 'set-cookie') {
+            const setCookieValues = value.split(',');
+            setCookieValues.forEach(setCookieValue => {
+                headersArray.push('set-cookie', setCookieValue.trim());
+            });
+            return;
+        }
+        headersArray.push(key, value);
+    });
+    return headersArray;
+}
 async function sendAsyncIterable(serverResponse, asyncIterable) {
     for await (const chunk of asyncIterable) {
         if (!serverResponse
@@ -156,19 +170,12 @@ async function sendAsyncIterable(serverResponse, asyncIterable) {
     endResponse(serverResponse);
 }
 function sendNodeResponse(fetchResponse, serverResponse, nodeRequest) {
-    fetchResponse.headers.forEach((value, key) => {
-        if (key === 'set-cookie') {
-            const setCookieValues = value.split(',');
-            serverResponse.setHeader('set-cookie', setCookieValues);
-            return;
-        }
-        serverResponse.setHeader(key, value);
-    });
-    serverResponse.statusCode = fetchResponse.status;
-    serverResponse.statusMessage = fetchResponse.statusText;
+    serverResponse.writeHead(fetchResponse.status, fetchResponse.statusText, 
+    // @ts-expect-error Node supports arrays as headers
+    getHeadersArray(fetchResponse.headers));
     // Optimizations for node-fetch
-    if (fetchResponse.bodyType === 'String' ||
-        fetchResponse.bodyType === 'Buffer' ||
+    if (fetchResponse.bodyType === 'Buffer' ||
+        fetchResponse.bodyType === 'String' ||
         fetchResponse.bodyType === 'Uint8Array') {
         // @ts-expect-error http and http2 writes are actually compatible
         serverResponse.write(fetchResponse.bodyInit);

package/esm/createServerAdapter.js

@@ -146,7 +146,7 @@ function createServerAdapter(serverAdapterBaseObject, options) {
         event.respondWith(response$);
     }
     function handleRequestWithWaitUntil(request, ...ctx) {
-        const serverContext = ctx.length > 1 ? completeAssign(...ctx) : ctx[0] || {};
+        const serverContext = (ctx.length > 1 ? completeAssign(...ctx) : ctx[0]) || {};
         if (serverContext.waitUntil == null) {
             const waitUntilPromises = [];
             addWaitUntil(serverContext, waitUntilPromises);

package/esm/utils.js

@@ -135,6 +135,20 @@ function endResponse(serverResponse) {
     // @ts-expect-error Avoid arguments adaptor trampoline https://v8.dev/blog/adaptor-frame
     serverResponse.end(null, null, null);
 }
+function getHeadersArray(headers) {
+    const headersArray = [];
+    headers.forEach((value, key) => {
+        if (key === 'set-cookie') {
+            const setCookieValues = value.split(',');
+            setCookieValues.forEach(setCookieValue => {
+                headersArray.push('set-cookie', setCookieValue.trim());
+            });
+            return;
+        }
+        headersArray.push(key, value);
+    });
+    return headersArray;
+}
 async function sendAsyncIterable(serverResponse, asyncIterable) {
     for await (const chunk of asyncIterable) {
         if (!serverResponse
@@ -146,19 +160,12 @@ async function sendAsyncIterable(serverResponse, asyncIterable) {
     endResponse(serverResponse);
 }
 export function sendNodeResponse(fetchResponse, serverResponse, nodeRequest) {
-    fetchResponse.headers.forEach((value, key) => {
-        if (key === 'set-cookie') {
-            const setCookieValues = value.split(',');
-            serverResponse.setHeader('set-cookie', setCookieValues);
-            return;
-        }
-        serverResponse.setHeader(key, value);
-    });
-    serverResponse.statusCode = fetchResponse.status;
-    serverResponse.statusMessage = fetchResponse.statusText;
+    serverResponse.writeHead(fetchResponse.status, fetchResponse.statusText, 
+    // @ts-expect-error Node supports arrays as headers
+    getHeadersArray(fetchResponse.headers));
     // Optimizations for node-fetch
-    if (fetchResponse.bodyType === 'String' ||
-        fetchResponse.bodyType === 'Buffer' ||
+    if (fetchResponse.bodyType === 'Buffer' ||
+        fetchResponse.bodyType === 'String' ||
         fetchResponse.bodyType === 'Uint8Array') {
         // @ts-expect-error http and http2 writes are actually compatible
         serverResponse.write(fetchResponse.bodyInit);

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@whatwg-node/server",
-  "version": "0.8.11-alpha-20230613182236-ce4ebc7",
+  "version": "0.8.11",
   "description": "Fetch API compliant HTTP Server adapter",
   "sideEffects": false,
   "dependencies": {
-    "@whatwg-node/fetch": "0.9.7-alpha-20230613182236-ce4ebc7",
+    "@whatwg-node/fetch": "^0.9.6",
     "tslib": "^2.3.1"
   },
   "repository": {