@whatwg-node/server 0.0.4 → 0.1.0-alpha-20220811084127-98f74ee

package/index.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference lib="webworker" />
 import type { RequestListener, ServerResponse } from 'node:http';
 import { NodeRequest } from './utils';
 import { fetch } from '@whatwg-node/fetch';
@@ -25,7 +26,7 @@ export interface ServerAdapterObject<TServerContext> extends EventListenerObject
     /**
      * WHATWG Fetch spec compliant `fetch` function that can be used for testing purposes.
      */
-    fetch: typeof fetch;
+    fetch: typeof fetch | ((request: Request, ...ctx: any[]) => Promise<Response>);
     /**
      * This function takes Node's request object and returns a WHATWG Fetch spec compliant `Response` object.
      **/

package/index.js

@@ -7,16 +7,37 @@ const fetch = require('@whatwg-node/fetch');
 function isAsyncIterable(body) {
     return body != null && typeof body === 'object' && typeof body[Symbol.asyncIterator] === 'function';
 }
+function getPort(nodeRequest) {
+    var _a, _b, _c, _d, _e;
+    if ((_a = nodeRequest.socket) === null || _a === void 0 ? void 0 : _a.localPort) {
+        return (_b = nodeRequest.socket) === null || _b === void 0 ? void 0 : _b.localPort;
+    }
+    const portInHeader = (_e = (_d = (_c = nodeRequest.headers) === null || _c === void 0 ? void 0 : _c.host) === null || _d === void 0 ? void 0 : _d.split(':')) === null || _e === void 0 ? void 0 : _e[1];
+    if (portInHeader) {
+        return portInHeader;
+    }
+    return 80;
+}
+function getHostnameWithPort(nodeRequest) {
+    var _a, _b, _c;
+    if ((_a = nodeRequest.headers) === null || _a === void 0 ? void 0 : _a.host) {
+        return (_b = nodeRequest.headers) === null || _b === void 0 ? void 0 : _b.host;
+    }
+    const port = getPort(nodeRequest);
+    if (nodeRequest.hostname) {
+        return nodeRequest.hostname + ':' + port;
+    }
+    const localIp = (_c = nodeRequest.socket) === null || _c === void 0 ? void 0 : _c.localAddress;
+    if (localIp && !(localIp === null || localIp === void 0 ? void 0 : localIp.includes('::')) && !(localIp === null || localIp === void 0 ? void 0 : localIp.includes('ffff'))) {
+        return `${localIp}:${port}`;
+    }
+    return 'localhost';
+}
 function buildFullUrl(nodeRequest) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
-    const hostname = nodeRequest.hostname ||
-        ((_e = (_d = (_c = (_b = (_a = nodeRequest.socket) === null || _a === void 0 ? void 0 : _a.localAddress) === null || _b === void 0 ? void 0 : _b.split('ffff')) === null || _c === void 0 ? void 0 : _c.join('')) === null || _d === void 0 ? void 0 : _d.split(':')) === null || _e === void 0 ? void 0 : _e.join('')) ||
-        ((_g = (_f = nodeRequest.headers) === null || _f === void 0 ? void 0 : _f.host) === null || _g === void 0 ? void 0 : _g.split(':')[0]) ||
-        'localhost';
-    const port = ((_h = nodeRequest.socket) === null || _h === void 0 ? void 0 : _h.localPort) || 80;
+    const hostnameWithPort = getHostnameWithPort(nodeRequest);
     const protocol = nodeRequest.protocol || 'http';
     const endpoint = nodeRequest.originalUrl || nodeRequest.url || '/graphql';
-    return `${protocol}://${hostname}:${port}${endpoint}`;
+    return `${protocol}://${hostnameWithPort}${endpoint}`;
 }
 function configureSocket(rawRequest) {
     var _a, _b, _c, _d, _e, _f;
@@ -132,23 +153,26 @@ async function sendNodeResponse({ headers, status, statusText, body }, serverRes
     });
 }
 
+/// <reference lib="webworker" />
 function createServerAdapter({ Request: RequestCtor = fetch.Request, handleRequest, baseObject, }) {
-    function fetchFn(...[input, init]) {
-        let request;
+    function fetchFn(input, init, ...ctx) {
         if (typeof input === 'string' || input instanceof URL) {
-            request = new RequestCtor(input, init);
-        }
-        else {
-            request = input;
+            return handleRequest(new RequestCtor(input, init), Object.assign({}, ...ctx));
         }
-        return handleRequest(request, init);
+        return handleRequest(input, Object.assign({}, init, ...ctx));
     }
     function handleNodeRequest(nodeRequest, serverContext) {
         const request = normalizeNodeRequest(nodeRequest, RequestCtor);
         return handleRequest(request, serverContext);
     }
     async function requestListener(nodeRequest, serverResponse) {
-        const response = await handleNodeRequest(nodeRequest, { req: nodeRequest, res: serverResponse });
+        const response = await handleNodeRequest(nodeRequest, {
+            req: nodeRequest,
+            res: serverResponse,
+            waitUntil(p) {
+                p.catch(err => console.error(err));
+            },
+        });
         return sendNodeResponse(response, serverResponse);
     }
     function handleEvent(event) {

package/index.mjs

@@ -3,16 +3,37 @@ import { Request } from '@whatwg-node/fetch';
 function isAsyncIterable(body) {
     return body != null && typeof body === 'object' && typeof body[Symbol.asyncIterator] === 'function';
 }
+function getPort(nodeRequest) {
+    var _a, _b, _c, _d, _e;
+    if ((_a = nodeRequest.socket) === null || _a === void 0 ? void 0 : _a.localPort) {
+        return (_b = nodeRequest.socket) === null || _b === void 0 ? void 0 : _b.localPort;
+    }
+    const portInHeader = (_e = (_d = (_c = nodeRequest.headers) === null || _c === void 0 ? void 0 : _c.host) === null || _d === void 0 ? void 0 : _d.split(':')) === null || _e === void 0 ? void 0 : _e[1];
+    if (portInHeader) {
+        return portInHeader;
+    }
+    return 80;
+}
+function getHostnameWithPort(nodeRequest) {
+    var _a, _b, _c;
+    if ((_a = nodeRequest.headers) === null || _a === void 0 ? void 0 : _a.host) {
+        return (_b = nodeRequest.headers) === null || _b === void 0 ? void 0 : _b.host;
+    }
+    const port = getPort(nodeRequest);
+    if (nodeRequest.hostname) {
+        return nodeRequest.hostname + ':' + port;
+    }
+    const localIp = (_c = nodeRequest.socket) === null || _c === void 0 ? void 0 : _c.localAddress;
+    if (localIp && !(localIp === null || localIp === void 0 ? void 0 : localIp.includes('::')) && !(localIp === null || localIp === void 0 ? void 0 : localIp.includes('ffff'))) {
+        return `${localIp}:${port}`;
+    }
+    return 'localhost';
+}
 function buildFullUrl(nodeRequest) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
-    const hostname = nodeRequest.hostname ||
-        ((_e = (_d = (_c = (_b = (_a = nodeRequest.socket) === null || _a === void 0 ? void 0 : _a.localAddress) === null || _b === void 0 ? void 0 : _b.split('ffff')) === null || _c === void 0 ? void 0 : _c.join('')) === null || _d === void 0 ? void 0 : _d.split(':')) === null || _e === void 0 ? void 0 : _e.join('')) ||
-        ((_g = (_f = nodeRequest.headers) === null || _f === void 0 ? void 0 : _f.host) === null || _g === void 0 ? void 0 : _g.split(':')[0]) ||
-        'localhost';
-    const port = ((_h = nodeRequest.socket) === null || _h === void 0 ? void 0 : _h.localPort) || 80;
+    const hostnameWithPort = getHostnameWithPort(nodeRequest);
     const protocol = nodeRequest.protocol || 'http';
     const endpoint = nodeRequest.originalUrl || nodeRequest.url || '/graphql';
-    return `${protocol}://${hostname}:${port}${endpoint}`;
+    return `${protocol}://${hostnameWithPort}${endpoint}`;
 }
 function configureSocket(rawRequest) {
     var _a, _b, _c, _d, _e, _f;
@@ -128,23 +149,26 @@ async function sendNodeResponse({ headers, status, statusText, body }, serverRes
     });
 }
 
+/// <reference lib="webworker" />
 function createServerAdapter({ Request: RequestCtor = Request, handleRequest, baseObject, }) {
-    function fetchFn(...[input, init]) {
-        let request;
+    function fetchFn(input, init, ...ctx) {
         if (typeof input === 'string' || input instanceof URL) {
-            request = new RequestCtor(input, init);
-        }
-        else {
-            request = input;
+            return handleRequest(new RequestCtor(input, init), Object.assign({}, ...ctx));
         }
-        return handleRequest(request, init);
+        return handleRequest(input, Object.assign({}, init, ...ctx));
     }
     function handleNodeRequest(nodeRequest, serverContext) {
         const request = normalizeNodeRequest(nodeRequest, RequestCtor);
         return handleRequest(request, serverContext);
     }
     async function requestListener(nodeRequest, serverResponse) {
-        const response = await handleNodeRequest(nodeRequest, { req: nodeRequest, res: serverResponse });
+        const response = await handleNodeRequest(nodeRequest, {
+            req: nodeRequest,
+            res: serverResponse,
+            waitUntil(p) {
+                p.catch(err => console.error(err));
+            },
+        });
         return sendNodeResponse(response, serverResponse);
     }
     function handleEvent(event) {

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@whatwg-node/server",
-  "version": "0.0.4",
+  "version": "0.1.0-alpha-20220811084127-98f74ee",
   "description": "Fetch API compliant HTTP Server adapter",
   "sideEffects": false,
   "peerDependencies": {
     "@types/node": "^18.0.6"
   },
   "dependencies": {
-    "@whatwg-node/fetch": "^0.1.0",
+    "@whatwg-node/fetch": "^0.2.0",
     "tslib": "^2.3.1"
   },
   "repository": {