@whatwg-node/server 0.5.8 → 0.5.9-alpha-20230126122734-e16acbb

package/README.md

@@ -127,7 +127,7 @@ app.route({
 
     reply.status(response.status)
 
-    reply.send(Readable.from(response.body))
+    reply.send(response.body)
 
     return reply
   }
@@ -157,7 +157,7 @@ app.use(async ctx => {
     ctx.append(key, value)
   })
 
-  ctx.body = Readable.from(response.body)
+  ctx.body = response.body
 })
 
 app.listen(4000, () => {

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}`;
     }

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}`;
     }

package/package.json

@@ -1,13 +1,10 @@
 {
   "name": "@whatwg-node/server",
-  "version": "0.5.8",
+  "version": "0.5.9-alpha-20230126122734-e16acbb",
   "description": "Fetch API compliant HTTP Server adapter",
   "sideEffects": false,
-  "peerDependencies": {
-    "@types/node": "^18.0.6"
-  },
   "dependencies": {
-    "@whatwg-node/fetch": "0.6.2",
+    "@whatwg-node/fetch": "0.6.3-alpha-20230126122734-e16acbb",
     "tslib": "^2.3.1"
   },
   "repository": {

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';