@whatwg-node/server 0.5.4 → 0.5.6-alpha-20230109165738-8edf269

package/README.md

@@ -242,16 +242,14 @@ You can learn more about [File API](https://developer.mozilla.org/en-US/docs/Web
 
 ## Routing and Middlewares
 
-We'd recommend to use [itty-router](https://github.com/kwhitley/itty-router) to handle routing and middleware approach. So it is really easy to integrate your router to `@whatwg-node/server`.
+We'd recommend to use `@whatwg-node/router` to handle routing and middleware approach. It uses `@whatwg-node/server` under the hood.
 
 ### Basic Routing
 
 ```ts
-import { Router } from 'itty-router'
-import { createServerAdapter } from '@whatwg-node/server'
+import { createRouter, Router } from '@whatwg-node/router'
 
-// now let's create a router (note the lack of "new")
-const router = Router()
+const router = createRouter()
 // GET collection index
 router.get('/todos', () => new Response('Todos Index!'))
 // GET item
@@ -268,21 +266,18 @@ router.get('/google', () => Response.redirect('http://www.google.com'))
 // 404 for everything else
 router.all('*', () => new Response('Not Found.', { status: 404 }))
 
-// attach the router to our server adapter
-const myServerAdapter = createServerAdapter(router)
-
 // Then use it in any environment
 import { createServer } from 'http'
-const httpServer = createServer(myServer)
+const httpServer = createServer(router)
 httpServer.listen(4000)
 ```
 
 ### Middlewares to handle CORS, cookies and more
 
-There is another package called [itty-router-extras](https://www.npmjs.com/package/itty-router-extras) that provides some utilities for your platform agnostic server implementation. The following example shows how to get the cookies as an object from the request.
+This package also provides some utilities for your platform agnostic server implementation. The following example shows how to get the cookies as an object from the request.
 
 ```ts
-import { withCookies } from 'itty-router-extras'
+import { withCookies } from '@whatwg-node/server'
 
 router.get('/foo', withCookies, ({ cookies }) => {
   // cookies are parsed from the header into request.cookies
@@ -293,15 +288,12 @@ router.get('/foo', withCookies, ({ cookies }) => {
 You can also setup a CORS middleware to handle preflight CORS requests.
 
 ```ts
-import { withCors } from 'itty-router-extras'
-
-router.all(
-  '*',
-  withCors({
-    origin: 'http://localhost:4000',
-    methods: 'GET, POST, PATCH, DELETE',
-    headers: 'authorization, referer, origin, content-type',
-    credentials: false
-  })
-)
+import { withCors } from '@whatwg-node/server'
+
+const corsWithRouter = withCors(router, {
+  origin: 'http://localhost:4000',
+  methods: 'GET, POST, PATCH, DELETE',
+  headers: 'authorization, referer, origin, content-type',
+  credentials: false
+})
 ```

package/index.js

@@ -12,22 +12,26 @@ function getPort(nodeRequest) {
     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];
+    const hostInHeader = ((_c = nodeRequest.headers) === null || _c === void 0 ? void 0 : _c[':authority']) || ((_d = nodeRequest.headers) === null || _d === void 0 ? void 0 : _d.host);
+    const portInHeader = (_e = hostInHeader === null || hostInHeader === void 0 ? void 0 : hostInHeader.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;
+    var _a, _b, _c, _d, _e;
+    if ((_a = nodeRequest.headers) === null || _a === void 0 ? void 0 : _a[':authority']) {
+        return (_b = nodeRequest.headers) === null || _b === void 0 ? void 0 : _b[':authority'];
+    }
+    if ((_c = nodeRequest.headers) === null || _c === void 0 ? void 0 : _c.host) {
+        return (_d = nodeRequest.headers) === null || _d === void 0 ? void 0 : _d.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;
+    const localIp = (_e = nodeRequest.socket) === null || _e === void 0 ? void 0 : _e.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}`;
     }
@@ -210,8 +214,10 @@ RequestCtor = fetch.Request) {
         const defaultServerContext = {
             req: nodeRequest,
             res: serverResponse,
-            waitUntil(p) {
-                waitUntilPromises.push(p);
+            waitUntil(promise) {
+                if (promise != null) {
+                    waitUntilPromises.push(promise);
+                }
             },
         };
         const response = await handleNodeRequest(nodeRequest, defaultServerContext, ...ctx);
@@ -243,8 +249,10 @@ RequestCtor = fetch.Request) {
             const waitUntilPromises = [];
             const response$ = handleRequest(request, {
                 ...serverContext,
-                waitUntil(p) {
-                    waitUntilPromises.push(p);
+                waitUntil(promise) {
+                    if (promise != null) {
+                        waitUntilPromises.push(promise);
+                    }
                 },
             });
             if (waitUntilPromises.length > 0) {

package/index.mjs

@@ -9,22 +9,26 @@ function getPort(nodeRequest) {
     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];
+    const hostInHeader = ((_c = nodeRequest.headers) === null || _c === void 0 ? void 0 : _c[':authority']) || ((_d = nodeRequest.headers) === null || _d === void 0 ? void 0 : _d.host);
+    const portInHeader = (_e = hostInHeader === null || hostInHeader === void 0 ? void 0 : hostInHeader.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;
+    var _a, _b, _c, _d, _e;
+    if ((_a = nodeRequest.headers) === null || _a === void 0 ? void 0 : _a[':authority']) {
+        return (_b = nodeRequest.headers) === null || _b === void 0 ? void 0 : _b[':authority'];
+    }
+    if ((_c = nodeRequest.headers) === null || _c === void 0 ? void 0 : _c.host) {
+        return (_d = nodeRequest.headers) === null || _d === void 0 ? void 0 : _d.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;
+    const localIp = (_e = nodeRequest.socket) === null || _e === void 0 ? void 0 : _e.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}`;
     }
@@ -207,8 +211,10 @@ RequestCtor = Request) {
         const defaultServerContext = {
             req: nodeRequest,
             res: serverResponse,
-            waitUntil(p) {
-                waitUntilPromises.push(p);
+            waitUntil(promise) {
+                if (promise != null) {
+                    waitUntilPromises.push(promise);
+                }
             },
         };
         const response = await handleNodeRequest(nodeRequest, defaultServerContext, ...ctx);
@@ -240,8 +246,10 @@ RequestCtor = Request) {
             const waitUntilPromises = [];
             const response$ = handleRequest(request, {
                 ...serverContext,
-                waitUntil(p) {
-                    waitUntilPromises.push(p);
+                waitUntil(promise) {
+                    if (promise != null) {
+                        waitUntilPromises.push(promise);
+                    }
                 },
             });
             if (waitUntilPromises.length > 0) {

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@whatwg-node/server",
-  "version": "0.5.4",
+  "version": "0.5.6-alpha-20230109165738-8edf269",
   "description": "Fetch API compliant HTTP Server adapter",
   "sideEffects": false,
   "peerDependencies": {
     "@types/node": "^18.0.6"
   },
   "dependencies": {
-    "@whatwg-node/fetch": "0.6.1",
+    "@whatwg-node/fetch": "0.6.2-alpha-20230109165738-8edf269",
     "tslib": "^2.3.1"
   },
   "repository": {

package/types.d.ts

@@ -2,7 +2,7 @@
 import type { RequestListener } from 'node:http';
 import type { NodeRequest, NodeResponse } from './utils';
 export interface FetchEvent extends Event {
-    waitUntil(f: Promise<any>): void;
+    waitUntil(f: Promise<void> | void): void;
     request: Request;
     respondWith(r: Response | PromiseLike<Response>): void;
 }
@@ -51,5 +51,5 @@ export type ServerAdapterRequestHandler<TServerContext> = (request: Request, ctx
 export type DefaultServerAdapterContext = {
     req: NodeRequest;
     res: NodeResponse;
-    waitUntil(promise: Promise<unknown>): void;
+    waitUntil(promise: Promise<void> | void): void;
 };

package/utils.d.ts

@@ -2,7 +2,7 @@
 /// <reference types="node" />
 /// <reference types="node" />
 /// <reference types="node" />
-import { IncomingMessage, ServerResponse } from 'node:http';
+import type { IncomingMessage, ServerResponse } from 'node:http';
 import type { Http2ServerRequest, Http2ServerResponse } from 'node:http2';
 import type { Socket } from 'node:net';
 import type { Readable } from 'node:stream';