@hono/node-server 1.4.1 → 1.6.0

package/dist/server.mjs

@@ -2,13 +2,33 @@
 import { createServer as createServerHTTP } from "http";
 
 // src/request.ts
-import { resolve } from "path";
+import { Http2ServerRequest } from "http2";
 import { Readable } from "stream";
+var GlobalRequest = global.Request;
+var Request = class extends GlobalRequest {
+  constructor(input, options) {
+    if (typeof input === "object" && getRequestCache in input) {
+      input = input[getRequestCache]();
+    }
+    if (options?.body instanceof ReadableStream) {
+      ;
+      options.duplex = "half";
+    }
+    super(input, options);
+  }
+};
+Object.defineProperty(global, "Request", {
+  value: Request
+});
 var newRequestFromIncoming = (method, url, incoming) => {
   const headerRecord = [];
-  const len = incoming.rawHeaders.length;
-  for (let i = 0; i < len; i += 2) {
-    headerRecord.push([incoming.rawHeaders[i], incoming.rawHeaders[i + 1]]);
+  const rawHeaders = incoming.rawHeaders;
+  for (let i = 0; i < rawHeaders.length; i += 2) {
+    const { [i]: key, [i + 1]: value } = rawHeaders;
+    if (key.charCodeAt(0) !== /*:*/
+    58) {
+      headerRecord.push([key, value]);
+    }
   }
   const init = {
     method,
@@ -16,28 +36,26 @@ var newRequestFromIncoming = (method, url, incoming) => {
   };
   if (!(method === "GET" || method === "HEAD")) {
     init.body = Readable.toWeb(incoming);
-    init.duplex = "half";
   }
   return new Request(url, init);
 };
 var getRequestCache = Symbol("getRequestCache");
 var requestCache = Symbol("requestCache");
 var incomingKey = Symbol("incomingKey");
+var urlKey = Symbol("urlKey");
 var requestPrototype = {
   get method() {
     return this[incomingKey].method || "GET";
   },
   get url() {
-    let path = this[incomingKey]["path"];
-    if (!path) {
-      const originalPath = this[incomingKey].url;
-      path = /\.\./.test(originalPath) ? resolve(originalPath) : originalPath;
-      this[incomingKey]["path"] = path;
-    }
-    return `http://${this[incomingKey].headers.host}${path}`;
+    return this[urlKey];
   },
   [getRequestCache]() {
-    return this[requestCache] ||= newRequestFromIncoming(this.method, this.url, this[incomingKey]);
+    return this[requestCache] ||= newRequestFromIncoming(
+      this.method,
+      this[urlKey],
+      this[incomingKey]
+    );
   }
 };
 [
@@ -67,10 +85,13 @@ var requestPrototype = {
     }
   });
 });
-Object.setPrototypeOf(requestPrototype, global.Request.prototype);
+Object.setPrototypeOf(requestPrototype, Request.prototype);
 var newRequest = (incoming) => {
   const req = Object.create(requestPrototype);
   req[incomingKey] = incoming;
+  req[urlKey] = new URL(
+    `http://${incoming instanceof Http2ServerRequest ? incoming.authority : incoming.headers.host}${incoming.url}`
+  ).href;
   return req;
 };
 
@@ -93,8 +114,9 @@ function writeFromReadableStream(stream, writable) {
   function cancel(error) {
     reader.cancel(error).catch(() => {
     });
-    if (error)
+    if (error) {
       writable.destroy(error);
+    }
   }
   function onDrain() {
     reader.read().then(flow, cancel);
@@ -198,9 +220,6 @@ Object.defineProperty(global, "Response", {
 
 // src/globals.ts
 import crypto from "crypto";
-Object.defineProperty(global, "Response", {
-  value: Response2
-});
 var webFetch = global.fetch;
 if (typeof global.crypto === "undefined") {
   global.crypto = crypto;
@@ -227,8 +246,9 @@ var handleResponseError = (e, outgoing) => {
     console.info("The user aborted a request.");
   } else {
     console.error(e);
-    if (!outgoing.headersSent)
+    if (!outgoing.headersSent) {
       outgoing.writeHead(500, { "Content-Type": "text/plain" });
+    }
     outgoing.end(`Error: ${err.message}`);
     outgoing.destroy(err);
   }
@@ -247,11 +267,10 @@ var responseViaCache = (res, outgoing) => {
   }
 };
 var responseViaResponseObject = async (res, outgoing) => {
-  if (res instanceof Promise) {
-    res = await res.catch(handleFetchError);
-  }
+  res = res instanceof Promise ? await res.catch(handleFetchError) : res;
   try {
-    if (cacheKey in res) {
+    const isCached = cacheKey in res;
+    if (isCached) {
       return responseViaCache(res, outgoing);
     }
   } catch (e) {
@@ -260,8 +279,15 @@ var responseViaResponseObject = async (res, outgoing) => {
   const resHeaderRecord = buildOutgoingHttpHeaders(res.headers);
   if (res.body) {
     try {
-      if (resHeaderRecord["transfer-encoding"] || resHeaderRecord["content-encoding"] || resHeaderRecord["content-length"] || // nginx buffering variant
-      resHeaderRecord["x-accel-buffering"] && regBuffer.test(resHeaderRecord["x-accel-buffering"]) || !regContentType.test(resHeaderRecord["content-type"])) {
+      const {
+        "transfer-encoding": transferEncoding,
+        "content-encoding": contentEncoding,
+        "content-length": contentLength,
+        "x-accel-buffering": accelBuffering,
+        "content-type": contentType
+      } = resHeaderRecord;
+      if (transferEncoding || contentEncoding || contentLength || // nginx buffering variant
+      accelBuffering && regBuffer.test(accelBuffering) || !regContentType.test(contentType)) {
         outgoing.writeHead(res.status, resHeaderRecord);
         await writeFromReadableStream(res.body, outgoing);
       } else {
@@ -283,7 +309,7 @@ var getRequestListener = (fetchCallback) => {
     let res;
     const req = newRequest(incoming);
     try {
-      res = fetchCallback(req);
+      res = fetchCallback(req, { incoming, outgoing });
       if (cacheKey in res) {
         return responseViaCache(res, outgoing);
       }

package/dist/types.d.mts

@@ -1,8 +1,16 @@
-import { Server, ServerOptions as ServerOptions$1, createServer } from 'node:http';
-import { Http2Server, Http2SecureServer, ServerOptions as ServerOptions$3, createServer as createServer$2, SecureServerOptions, createSecureServer } from 'node:http2';
+import { IncomingMessage, ServerResponse, Server, ServerOptions as ServerOptions$1, createServer } from 'node:http';
+import { Http2ServerRequest, Http2ServerResponse, Http2Server, Http2SecureServer, ServerOptions as ServerOptions$3, createServer as createServer$2, SecureServerOptions, createSecureServer } from 'node:http2';
 import { ServerOptions as ServerOptions$2, createServer as createServer$1 } from 'node:https';
 
-type FetchCallback = (request: Request) => Promise<unknown> | unknown;
+type HttpBindings = {
+    incoming: IncomingMessage;
+    outgoing: ServerResponse;
+};
+type Http2Bindings = {
+    incoming: Http2ServerRequest;
+    outgoing: Http2ServerResponse;
+};
+type FetchCallback = (request: Request, env: HttpBindings | Http2Bindings) => Promise<unknown> | unknown;
 type NextHandlerOption = {
     fetch: FetchCallback;
 };
@@ -30,4 +38,4 @@ type Options = {
     hostname?: string;
 } & ServerOptions;
 
-export { FetchCallback, NextHandlerOption, Options, ServerType };
+export { FetchCallback, Http2Bindings, HttpBindings, NextHandlerOption, Options, ServerType };

package/dist/types.d.ts

@@ -1,8 +1,16 @@
-import { Server, ServerOptions as ServerOptions$1, createServer } from 'node:http';
-import { Http2Server, Http2SecureServer, ServerOptions as ServerOptions$3, createServer as createServer$2, SecureServerOptions, createSecureServer } from 'node:http2';
+import { IncomingMessage, ServerResponse, Server, ServerOptions as ServerOptions$1, createServer } from 'node:http';
+import { Http2ServerRequest, Http2ServerResponse, Http2Server, Http2SecureServer, ServerOptions as ServerOptions$3, createServer as createServer$2, SecureServerOptions, createSecureServer } from 'node:http2';
 import { ServerOptions as ServerOptions$2, createServer as createServer$1 } from 'node:https';
 
-type FetchCallback = (request: Request) => Promise<unknown> | unknown;
+type HttpBindings = {
+    incoming: IncomingMessage;
+    outgoing: ServerResponse;
+};
+type Http2Bindings = {
+    incoming: Http2ServerRequest;
+    outgoing: Http2ServerResponse;
+};
+type FetchCallback = (request: Request, env: HttpBindings | Http2Bindings) => Promise<unknown> | unknown;
 type NextHandlerOption = {
     fetch: FetchCallback;
 };
@@ -30,4 +38,4 @@ type Options = {
     hostname?: string;
 } & ServerOptions;
 
-export { FetchCallback, NextHandlerOption, Options, ServerType };
+export { FetchCallback, Http2Bindings, HttpBindings, NextHandlerOption, Options, ServerType };

package/dist/utils.js

@@ -42,8 +42,9 @@ function writeFromReadableStream(stream, writable) {
   function cancel(error) {
     reader.cancel(error).catch(() => {
     });
-    if (error)
+    if (error) {
       writable.destroy(error);
+    }
   }
   function onDrain() {
     reader.read().then(flow, cancel);

package/dist/utils.mjs

@@ -17,8 +17,9 @@ function writeFromReadableStream(stream, writable) {
   function cancel(error) {
     reader.cancel(error).catch(() => {
     });
-    if (error)
+    if (error) {
       writable.destroy(error);
+    }
   }
   function onDrain() {
     reader.read().then(flow, cancel);

package/dist/vercel.js

@@ -35,13 +35,33 @@ __export(vercel_exports, {
 module.exports = __toCommonJS(vercel_exports);
 
 // src/request.ts
-var import_node_path = require("path");
+var import_node_http2 = require("http2");
 var import_node_stream = require("stream");
+var GlobalRequest = global.Request;
+var Request = class extends GlobalRequest {
+  constructor(input, options) {
+    if (typeof input === "object" && getRequestCache in input) {
+      input = input[getRequestCache]();
+    }
+    if (options?.body instanceof ReadableStream) {
+      ;
+      options.duplex = "half";
+    }
+    super(input, options);
+  }
+};
+Object.defineProperty(global, "Request", {
+  value: Request
+});
 var newRequestFromIncoming = (method, url, incoming) => {
   const headerRecord = [];
-  const len = incoming.rawHeaders.length;
-  for (let i = 0; i < len; i += 2) {
-    headerRecord.push([incoming.rawHeaders[i], incoming.rawHeaders[i + 1]]);
+  const rawHeaders = incoming.rawHeaders;
+  for (let i = 0; i < rawHeaders.length; i += 2) {
+    const { [i]: key, [i + 1]: value } = rawHeaders;
+    if (key.charCodeAt(0) !== /*:*/
+    58) {
+      headerRecord.push([key, value]);
+    }
   }
   const init = {
     method,
@@ -49,28 +69,26 @@ var newRequestFromIncoming = (method, url, incoming) => {
   };
   if (!(method === "GET" || method === "HEAD")) {
     init.body = import_node_stream.Readable.toWeb(incoming);
-    init.duplex = "half";
   }
   return new Request(url, init);
 };
 var getRequestCache = Symbol("getRequestCache");
 var requestCache = Symbol("requestCache");
 var incomingKey = Symbol("incomingKey");
+var urlKey = Symbol("urlKey");
 var requestPrototype = {
   get method() {
     return this[incomingKey].method || "GET";
   },
   get url() {
-    let path = this[incomingKey]["path"];
-    if (!path) {
-      const originalPath = this[incomingKey].url;
-      path = /\.\./.test(originalPath) ? (0, import_node_path.resolve)(originalPath) : originalPath;
-      this[incomingKey]["path"] = path;
-    }
-    return `http://${this[incomingKey].headers.host}${path}`;
+    return this[urlKey];
   },
   [getRequestCache]() {
-    return this[requestCache] ||= newRequestFromIncoming(this.method, this.url, this[incomingKey]);
+    return this[requestCache] ||= newRequestFromIncoming(
+      this.method,
+      this[urlKey],
+      this[incomingKey]
+    );
   }
 };
 [
@@ -100,10 +118,13 @@ var requestPrototype = {
     }
   });
 });
-Object.setPrototypeOf(requestPrototype, global.Request.prototype);
+Object.setPrototypeOf(requestPrototype, Request.prototype);
 var newRequest = (incoming) => {
   const req = Object.create(requestPrototype);
   req[incomingKey] = incoming;
+  req[urlKey] = new URL(
+    `http://${incoming instanceof import_node_http2.Http2ServerRequest ? incoming.authority : incoming.headers.host}${incoming.url}`
+  ).href;
   return req;
 };
 
@@ -126,8 +147,9 @@ function writeFromReadableStream(stream, writable) {
   function cancel(error) {
     reader.cancel(error).catch(() => {
     });
-    if (error)
+    if (error) {
       writable.destroy(error);
+    }
   }
   function onDrain() {
     reader.read().then(flow, cancel);
@@ -231,9 +253,6 @@ Object.defineProperty(global, "Response", {
 
 // src/globals.ts
 var import_node_crypto = __toESM(require("crypto"));
-Object.defineProperty(global, "Response", {
-  value: Response2
-});
 var webFetch = global.fetch;
 if (typeof global.crypto === "undefined") {
   global.crypto = import_node_crypto.default;
@@ -260,8 +279,9 @@ var handleResponseError = (e, outgoing) => {
     console.info("The user aborted a request.");
   } else {
     console.error(e);
-    if (!outgoing.headersSent)
+    if (!outgoing.headersSent) {
       outgoing.writeHead(500, { "Content-Type": "text/plain" });
+    }
     outgoing.end(`Error: ${err.message}`);
     outgoing.destroy(err);
   }
@@ -280,11 +300,10 @@ var responseViaCache = (res, outgoing) => {
   }
 };
 var responseViaResponseObject = async (res, outgoing) => {
-  if (res instanceof Promise) {
-    res = await res.catch(handleFetchError);
-  }
+  res = res instanceof Promise ? await res.catch(handleFetchError) : res;
   try {
-    if (cacheKey in res) {
+    const isCached = cacheKey in res;
+    if (isCached) {
       return responseViaCache(res, outgoing);
     }
   } catch (e) {
@@ -293,8 +312,15 @@ var responseViaResponseObject = async (res, outgoing) => {
   const resHeaderRecord = buildOutgoingHttpHeaders(res.headers);
   if (res.body) {
     try {
-      if (resHeaderRecord["transfer-encoding"] || resHeaderRecord["content-encoding"] || resHeaderRecord["content-length"] || // nginx buffering variant
-      resHeaderRecord["x-accel-buffering"] && regBuffer.test(resHeaderRecord["x-accel-buffering"]) || !regContentType.test(resHeaderRecord["content-type"])) {
+      const {
+        "transfer-encoding": transferEncoding,
+        "content-encoding": contentEncoding,
+        "content-length": contentLength,
+        "x-accel-buffering": accelBuffering,
+        "content-type": contentType
+      } = resHeaderRecord;
+      if (transferEncoding || contentEncoding || contentLength || // nginx buffering variant
+      accelBuffering && regBuffer.test(accelBuffering) || !regContentType.test(contentType)) {
         outgoing.writeHead(res.status, resHeaderRecord);
         await writeFromReadableStream(res.body, outgoing);
       } else {
@@ -316,7 +342,7 @@ var getRequestListener = (fetchCallback) => {
     let res;
     const req = newRequest(incoming);
     try {
-      res = fetchCallback(req);
+      res = fetchCallback(req, { incoming, outgoing });
       if (cacheKey in res) {
         return responseViaCache(res, outgoing);
       }

package/dist/vercel.mjs

@@ -1,11 +1,31 @@
 // src/request.ts
-import { resolve } from "path";
+import { Http2ServerRequest } from "http2";
 import { Readable } from "stream";
+var GlobalRequest = global.Request;
+var Request = class extends GlobalRequest {
+  constructor(input, options) {
+    if (typeof input === "object" && getRequestCache in input) {
+      input = input[getRequestCache]();
+    }
+    if (options?.body instanceof ReadableStream) {
+      ;
+      options.duplex = "half";
+    }
+    super(input, options);
+  }
+};
+Object.defineProperty(global, "Request", {
+  value: Request
+});
 var newRequestFromIncoming = (method, url, incoming) => {
   const headerRecord = [];
-  const len = incoming.rawHeaders.length;
-  for (let i = 0; i < len; i += 2) {
-    headerRecord.push([incoming.rawHeaders[i], incoming.rawHeaders[i + 1]]);
+  const rawHeaders = incoming.rawHeaders;
+  for (let i = 0; i < rawHeaders.length; i += 2) {
+    const { [i]: key, [i + 1]: value } = rawHeaders;
+    if (key.charCodeAt(0) !== /*:*/
+    58) {
+      headerRecord.push([key, value]);
+    }
   }
   const init = {
     method,
@@ -13,28 +33,26 @@ var newRequestFromIncoming = (method, url, incoming) => {
   };
   if (!(method === "GET" || method === "HEAD")) {
     init.body = Readable.toWeb(incoming);
-    init.duplex = "half";
   }
   return new Request(url, init);
 };
 var getRequestCache = Symbol("getRequestCache");
 var requestCache = Symbol("requestCache");
 var incomingKey = Symbol("incomingKey");
+var urlKey = Symbol("urlKey");
 var requestPrototype = {
   get method() {
     return this[incomingKey].method || "GET";
   },
   get url() {
-    let path = this[incomingKey]["path"];
-    if (!path) {
-      const originalPath = this[incomingKey].url;
-      path = /\.\./.test(originalPath) ? resolve(originalPath) : originalPath;
-      this[incomingKey]["path"] = path;
-    }
-    return `http://${this[incomingKey].headers.host}${path}`;
+    return this[urlKey];
   },
   [getRequestCache]() {
-    return this[requestCache] ||= newRequestFromIncoming(this.method, this.url, this[incomingKey]);
+    return this[requestCache] ||= newRequestFromIncoming(
+      this.method,
+      this[urlKey],
+      this[incomingKey]
+    );
   }
 };
 [
@@ -64,10 +82,13 @@ var requestPrototype = {
     }
   });
 });
-Object.setPrototypeOf(requestPrototype, global.Request.prototype);
+Object.setPrototypeOf(requestPrototype, Request.prototype);
 var newRequest = (incoming) => {
   const req = Object.create(requestPrototype);
   req[incomingKey] = incoming;
+  req[urlKey] = new URL(
+    `http://${incoming instanceof Http2ServerRequest ? incoming.authority : incoming.headers.host}${incoming.url}`
+  ).href;
   return req;
 };
 
@@ -90,8 +111,9 @@ function writeFromReadableStream(stream, writable) {
   function cancel(error) {
     reader.cancel(error).catch(() => {
     });
-    if (error)
+    if (error) {
       writable.destroy(error);
+    }
   }
   function onDrain() {
     reader.read().then(flow, cancel);
@@ -195,9 +217,6 @@ Object.defineProperty(global, "Response", {
 
 // src/globals.ts
 import crypto from "crypto";
-Object.defineProperty(global, "Response", {
-  value: Response2
-});
 var webFetch = global.fetch;
 if (typeof global.crypto === "undefined") {
   global.crypto = crypto;
@@ -224,8 +243,9 @@ var handleResponseError = (e, outgoing) => {
     console.info("The user aborted a request.");
   } else {
     console.error(e);
-    if (!outgoing.headersSent)
+    if (!outgoing.headersSent) {
       outgoing.writeHead(500, { "Content-Type": "text/plain" });
+    }
     outgoing.end(`Error: ${err.message}`);
     outgoing.destroy(err);
   }
@@ -244,11 +264,10 @@ var responseViaCache = (res, outgoing) => {
   }
 };
 var responseViaResponseObject = async (res, outgoing) => {
-  if (res instanceof Promise) {
-    res = await res.catch(handleFetchError);
-  }
+  res = res instanceof Promise ? await res.catch(handleFetchError) : res;
   try {
-    if (cacheKey in res) {
+    const isCached = cacheKey in res;
+    if (isCached) {
       return responseViaCache(res, outgoing);
     }
   } catch (e) {
@@ -257,8 +276,15 @@ var responseViaResponseObject = async (res, outgoing) => {
   const resHeaderRecord = buildOutgoingHttpHeaders(res.headers);
   if (res.body) {
     try {
-      if (resHeaderRecord["transfer-encoding"] || resHeaderRecord["content-encoding"] || resHeaderRecord["content-length"] || // nginx buffering variant
-      resHeaderRecord["x-accel-buffering"] && regBuffer.test(resHeaderRecord["x-accel-buffering"]) || !regContentType.test(resHeaderRecord["content-type"])) {
+      const {
+        "transfer-encoding": transferEncoding,
+        "content-encoding": contentEncoding,
+        "content-length": contentLength,
+        "x-accel-buffering": accelBuffering,
+        "content-type": contentType
+      } = resHeaderRecord;
+      if (transferEncoding || contentEncoding || contentLength || // nginx buffering variant
+      accelBuffering && regBuffer.test(accelBuffering) || !regContentType.test(contentType)) {
         outgoing.writeHead(res.status, resHeaderRecord);
         await writeFromReadableStream(res.body, outgoing);
       } else {
@@ -280,7 +306,7 @@ var getRequestListener = (fetchCallback) => {
     let res;
     const req = newRequest(incoming);
     try {
-      res = fetchCallback(req);
+      res = fetchCallback(req, { incoming, outgoing });
       if (cacheKey in res) {
         return responseViaCache(res, outgoing);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hono/node-server",
-  "version": "1.4.1",
+  "version": "1.6.0",
   "description": "Node.js Adapter for Hono",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -45,7 +45,9 @@
     "prerelease": "yarn build && yarn test",
     "release": "np",
     "lint": "eslint --ext js,ts src test",
-    "lint:fix": "eslint --ext js,ts src test --fix"
+    "lint:fix": "eslint --ext js,ts src test --fix",
+    "format": "prettier --check \"src/**/*.{js,ts}\" \"test/**/*.{js,ts}\"",
+    "format:fix": "prettier --write \"src/**/*.{js,ts}\" \"test/**/*.{js,ts}\""
   },
   "license": "MIT",
   "repository": {
@@ -62,7 +64,7 @@
     "node": ">=18.14.1"
   },
   "devDependencies": {
-    "@hono/eslint-config": "^0.0.2",
+    "@hono/eslint-config": "^0.0.4",
     "@types/jest": "^29.5.3",
     "@types/node": "^20.10.0",
     "@types/supertest": "^2.0.12",
@@ -71,6 +73,7 @@
     "hono": "^3.11.7",
     "jest": "^29.6.1",
     "np": "^7.7.0",
+    "prettier": "^3.2.4",
     "publint": "^0.1.16",
     "supertest": "^6.3.3",
     "ts-jest": "^29.1.1",