@whatwg-node/server 0.4.2 → 0.4.4

package/README.md

@@ -192,6 +192,21 @@ import myServerAdapter from './myServerAdapter'
 export { myServerAdapter as get, myServerAdapter as post }
 ```
 
+### Bun
+
+[Bun](https://bun.sh/) is a modern JavaScript runtime like Node or Deno, and it supports Fetch API as a first class citizen.
+So the configuration is really simple like any other JS runtime;
+
+```ts
+import myServerAdapter from './myServerAdapter'
+
+Bun.serve(myServerAdapter)
+
+const server = Bun.serve(yoga)
+
+console.info(`Server is running on ${server.hostname}`)
+```
+
 ## File Uploads / Multipart Requests
 
 Multipart requests are a type of HTTP request that allows you to send blobs together with regular text data which has a mime-type `multipart/form-data`.

package/index.js

@@ -170,12 +170,6 @@ function createServerAdapter(serverAdapterBaseObject,
  */
 RequestCtor = fetch.Request) {
     const handleRequest = typeof serverAdapterBaseObject === 'function' ? serverAdapterBaseObject : serverAdapterBaseObject.handle;
-    function fetchFn(input, init, ...ctx) {
-        if (typeof input === 'string' || input instanceof URL) {
-            return handleRequest(new RequestCtor(input, init), Object.assign({}, ...ctx));
-        }
-        return handleRequest(input, Object.assign({}, init, ...ctx));
-    }
     function handleNodeRequest(nodeRequest, serverContext) {
         const request = normalizeNodeRequest(nodeRequest, RequestCtor);
         return handleRequest(request, serverContext);
@@ -209,27 +203,12 @@ RequestCtor = fetch.Request) {
         const response$ = handleRequest(event.request, event);
         event.respondWith(response$);
     }
-    function genericRequestHandler(input, ctx = {}, ...rest) {
+    function handleRequestWithWaitUntil(request, ctx = {}, ...rest) {
         var _a;
         if ('process' in globalThis && ((_a = process.versions) === null || _a === void 0 ? void 0 : _a['bun']) != null) {
             // This is required for bun
-            input.text();
-        }
-        // If it is a Node request
-        if (isReadable(input) && ctx != null && isServerResponse(ctx)) {
-            return requestListener(input, ctx);
+            request.text();
         }
-        // Is input a container object over Request?
-        if (input.request) {
-            // Is it FetchEvent?
-            if (input.respondWith) {
-                return handleEvent(input);
-            }
-            // In this input is also the context
-            return handleRequest(input.request, input);
-        }
-        // Or is it Request itself?
-        // Then ctx is present and it is the context
         if ((rest === null || rest === void 0 ? void 0 : rest.length) > 0) {
             ctx = Object.assign({}, ctx, ...rest);
         }
@@ -238,7 +217,7 @@ RequestCtor = fetch.Request) {
             ctx.waitUntil = (p) => {
                 waitUntilPromises.push(p);
             };
-            const response$ = handleRequest(input, {
+            const response$ = handleRequest(request, {
                 ...ctx,
                 waitUntil(p) {
                     waitUntilPromises.push(p);
@@ -247,8 +226,33 @@ RequestCtor = fetch.Request) {
             if (waitUntilPromises.length > 0) {
                 return handleWaitUntils(waitUntilPromises).then(() => response$);
             }
+            return response$;
+        }
+        return handleRequest(request, ctx);
+    }
+    function genericRequestHandler(input, ctx, ...rest) {
+        // If it is a Node request
+        if (isReadable(input) && ctx != null && isServerResponse(ctx)) {
+            return requestListener(input, ctx);
+        }
+        // Is input a container object over Request?
+        if (input.request) {
+            // Is it FetchEvent?
+            if (input.respondWith) {
+                return handleEvent(input);
+            }
+            // In this input is also the context
+            return handleRequestWithWaitUntil(input.request, input, ...rest);
+        }
+        // Or is it Request itself?
+        // Then ctx is present and it is the context
+        return handleRequestWithWaitUntil(input, ctx, ...rest);
+    }
+    function fetchFn(input, init, ...ctx) {
+        if (typeof input === 'string' || input instanceof URL) {
+            return handleRequestWithWaitUntil(new RequestCtor(input, init), ...ctx);
         }
-        return handleRequest(input, ctx);
+        return handleRequestWithWaitUntil(input, init, ...ctx);
     }
     const adapterObj = {
         handleRequest,

package/index.mjs

@@ -166,12 +166,6 @@ function createServerAdapter(serverAdapterBaseObject,
  */
 RequestCtor = Request) {
     const handleRequest = typeof serverAdapterBaseObject === 'function' ? serverAdapterBaseObject : serverAdapterBaseObject.handle;
-    function fetchFn(input, init, ...ctx) {
-        if (typeof input === 'string' || input instanceof URL) {
-            return handleRequest(new RequestCtor(input, init), Object.assign({}, ...ctx));
-        }
-        return handleRequest(input, Object.assign({}, init, ...ctx));
-    }
     function handleNodeRequest(nodeRequest, serverContext) {
         const request = normalizeNodeRequest(nodeRequest, RequestCtor);
         return handleRequest(request, serverContext);
@@ -205,27 +199,12 @@ RequestCtor = Request) {
         const response$ = handleRequest(event.request, event);
         event.respondWith(response$);
     }
-    function genericRequestHandler(input, ctx = {}, ...rest) {
+    function handleRequestWithWaitUntil(request, ctx = {}, ...rest) {
         var _a;
         if ('process' in globalThis && ((_a = process.versions) === null || _a === void 0 ? void 0 : _a['bun']) != null) {
             // This is required for bun
-            input.text();
-        }
-        // If it is a Node request
-        if (isReadable(input) && ctx != null && isServerResponse(ctx)) {
-            return requestListener(input, ctx);
+            request.text();
         }
-        // Is input a container object over Request?
-        if (input.request) {
-            // Is it FetchEvent?
-            if (input.respondWith) {
-                return handleEvent(input);
-            }
-            // In this input is also the context
-            return handleRequest(input.request, input);
-        }
-        // Or is it Request itself?
-        // Then ctx is present and it is the context
         if ((rest === null || rest === void 0 ? void 0 : rest.length) > 0) {
             ctx = Object.assign({}, ctx, ...rest);
         }
@@ -234,7 +213,7 @@ RequestCtor = Request) {
             ctx.waitUntil = (p) => {
                 waitUntilPromises.push(p);
             };
-            const response$ = handleRequest(input, {
+            const response$ = handleRequest(request, {
                 ...ctx,
                 waitUntil(p) {
                     waitUntilPromises.push(p);
@@ -243,8 +222,33 @@ RequestCtor = Request) {
             if (waitUntilPromises.length > 0) {
                 return handleWaitUntils(waitUntilPromises).then(() => response$);
             }
+            return response$;
+        }
+        return handleRequest(request, ctx);
+    }
+    function genericRequestHandler(input, ctx, ...rest) {
+        // If it is a Node request
+        if (isReadable(input) && ctx != null && isServerResponse(ctx)) {
+            return requestListener(input, ctx);
+        }
+        // Is input a container object over Request?
+        if (input.request) {
+            // Is it FetchEvent?
+            if (input.respondWith) {
+                return handleEvent(input);
+            }
+            // In this input is also the context
+            return handleRequestWithWaitUntil(input.request, input, ...rest);
+        }
+        // Or is it Request itself?
+        // Then ctx is present and it is the context
+        return handleRequestWithWaitUntil(input, ctx, ...rest);
+    }
+    function fetchFn(input, init, ...ctx) {
+        if (typeof input === 'string' || input instanceof URL) {
+            return handleRequestWithWaitUntil(new RequestCtor(input, init), ...ctx);
         }
-        return handleRequest(input, ctx);
+        return handleRequestWithWaitUntil(input, init, ...ctx);
     }
     const adapterObj = {
         handleRequest,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whatwg-node/server",
-  "version": "0.4.2",
+  "version": "0.4.4",
   "description": "Fetch API compliant HTTP Server adapter",
   "sideEffects": false,
   "peerDependencies": {