@whatwg-node/server 0.6.1 → 0.6.2-alpha-20230205160101-d3a1033

package/index.js

@@ -132,32 +132,41 @@ function isReadableStream(stream) {
 function isFetchEvent(event) {
     return event != null && event.request != null && event.respondWith != null;
 }
-async function sendNodeResponse({ headers, status, statusText, body }, serverResponse) {
-    headers.forEach((value, name) => {
+async function sendNodeResponse(fetchResponse, serverResponse) {
+    fetchResponse.headers.forEach((value, name) => {
         serverResponse.setHeader(name, value);
     });
-    serverResponse.statusCode = status;
-    serverResponse.statusMessage = statusText;
+    serverResponse.statusCode = fetchResponse.status;
+    serverResponse.statusMessage = fetchResponse.statusText;
     // eslint-disable-next-line no-async-promise-executor
     return new Promise(async (resolve) => {
         serverResponse.once('close', resolve);
-        if (body == null) {
+        // Our Node-fetch enhancements
+        if ('bodyType' in fetchResponse && fetchResponse.bodyType != null && (fetchResponse.bodyType === 'String' || fetchResponse.bodyType === 'Uint8Array')) {
+            // @ts-expect-error http and http2 writes are actually compatible
+            serverResponse.write(fetchResponse.bodyInit);
             serverResponse.end();
+            return;
         }
-        else if (body[Symbol.toStringTag] === 'Uint8Array') {
+        // Other fetch implementations
+        const fetchBody = fetchResponse.body;
+        if (fetchBody == null) {
+            serverResponse.end();
+        }
+        else if (fetchBody[Symbol.toStringTag] === 'Uint8Array') {
             serverResponse
                 // @ts-expect-error http and http2 writes are actually compatible
-                .write(body);
+                .write(fetchBody);
             serverResponse.end();
         }
-        else if (isReadable(body)) {
+        else if (isReadable(fetchBody)) {
             serverResponse.once('close', () => {
-                body.destroy();
+                fetchBody.destroy();
             });
-            body.pipe(serverResponse);
+            fetchBody.pipe(serverResponse);
         }
-        else if (isAsyncIterable(body)) {
-            for await (const chunk of body) {
+        else if (isAsyncIterable(fetchBody)) {
+            for await (const chunk of fetchBody) {
                 if (!serverResponse
                     // @ts-expect-error http and http2 writes are actually compatible
                     .write(chunk)) {

package/index.mjs

@@ -129,32 +129,41 @@ function isReadableStream(stream) {
 function isFetchEvent(event) {
     return event != null && event.request != null && event.respondWith != null;
 }
-async function sendNodeResponse({ headers, status, statusText, body }, serverResponse) {
-    headers.forEach((value, name) => {
+async function sendNodeResponse(fetchResponse, serverResponse) {
+    fetchResponse.headers.forEach((value, name) => {
         serverResponse.setHeader(name, value);
     });
-    serverResponse.statusCode = status;
-    serverResponse.statusMessage = statusText;
+    serverResponse.statusCode = fetchResponse.status;
+    serverResponse.statusMessage = fetchResponse.statusText;
     // eslint-disable-next-line no-async-promise-executor
     return new Promise(async (resolve) => {
         serverResponse.once('close', resolve);
-        if (body == null) {
+        // Our Node-fetch enhancements
+        if ('bodyType' in fetchResponse && fetchResponse.bodyType != null && (fetchResponse.bodyType === 'String' || fetchResponse.bodyType === 'Uint8Array')) {
+            // @ts-expect-error http and http2 writes are actually compatible
+            serverResponse.write(fetchResponse.bodyInit);
             serverResponse.end();
+            return;
         }
-        else if (body[Symbol.toStringTag] === 'Uint8Array') {
+        // Other fetch implementations
+        const fetchBody = fetchResponse.body;
+        if (fetchBody == null) {
+            serverResponse.end();
+        }
+        else if (fetchBody[Symbol.toStringTag] === 'Uint8Array') {
             serverResponse
                 // @ts-expect-error http and http2 writes are actually compatible
-                .write(body);
+                .write(fetchBody);
             serverResponse.end();
         }
-        else if (isReadable(body)) {
+        else if (isReadable(fetchBody)) {
             serverResponse.once('close', () => {
-                body.destroy();
+                fetchBody.destroy();
             });
-            body.pipe(serverResponse);
+            fetchBody.pipe(serverResponse);
         }
-        else if (isAsyncIterable(body)) {
-            for await (const chunk of body) {
+        else if (isAsyncIterable(fetchBody)) {
+            for await (const chunk of fetchBody) {
                 if (!serverResponse
                     // @ts-expect-error http and http2 writes are actually compatible
                     .write(chunk)) {

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@whatwg-node/server",
-  "version": "0.6.1",
+  "version": "0.6.2-alpha-20230205160101-d3a1033",
   "description": "Fetch API compliant HTTP Server adapter",
   "sideEffects": false,
   "dependencies": {
-    "@whatwg-node/fetch": "0.6.6",
+    "@whatwg-node/fetch": "0.6.7-alpha-20230205160101-d3a1033",
     "tslib": "^2.3.1"
   },
   "repository": {

package/utils.d.ts

@@ -28,5 +28,5 @@ export declare function isNodeRequest(request: any): request is NodeRequest;
 export declare function isServerResponse(stream: any): stream is NodeResponse;
 export declare function isReadableStream(stream: any): stream is ReadableStream;
 export declare function isFetchEvent(event: any): event is FetchEvent;
-export declare function sendNodeResponse({ headers, status, statusText, body }: Response, serverResponse: NodeResponse): Promise<void>;
+export declare function sendNodeResponse(fetchResponse: Response, serverResponse: NodeResponse): Promise<void>;
 export declare function isRequestInit(val: unknown): val is RequestInit;