@hono/node-server 1.4.1 → 1.6.0

package/dist/listener.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/dist/request.d.mts

@@ -1,6 +1,13 @@
 import { IncomingMessage } from 'node:http';
 import { Http2ServerRequest } from 'node:http2';
 
+declare const GlobalRequest: {
+    new (input: RequestInfo | URL, init?: RequestInit | undefined): globalThis.Request;
+    prototype: globalThis.Request;
+};
+declare class Request extends GlobalRequest {
+    constructor(input: string | Request, options?: RequestInit);
+}
 declare const newRequest: (incoming: IncomingMessage | Http2ServerRequest) => any;
 
-export { newRequest };
+export { GlobalRequest, Request, newRequest };

package/dist/request.d.ts

@@ -1,6 +1,13 @@
 import { IncomingMessage } from 'node:http';
 import { Http2ServerRequest } from 'node:http2';
 
+declare const GlobalRequest: {
+    new (input: RequestInfo | URL, init?: RequestInit | undefined): globalThis.Request;
+    prototype: globalThis.Request;
+};
+declare class Request extends GlobalRequest {
+    constructor(input: string | Request, options?: RequestInit);
+}
 declare const newRequest: (incoming: IncomingMessage | Http2ServerRequest) => any;
 
-export { newRequest };
+export { GlobalRequest, Request, newRequest };

package/dist/request.js

@@ -20,16 +20,38 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/request.ts
 var request_exports = {};
 __export(request_exports, {
+  GlobalRequest: () => GlobalRequest,
+  Request: () => Request,
   newRequest: () => newRequest
 });
 module.exports = __toCommonJS(request_exports);
-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,
@@ -37,28 +59,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]
+    );
   }
 };
 [
@@ -88,13 +108,18 @@ 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;
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  GlobalRequest,
+  Request,
   newRequest
 });

package/dist/request.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,12 +82,17 @@ 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;
 };
 export {
+  GlobalRequest,
+  Request,
   newRequest
 };

package/dist/serve-static.js

@@ -158,8 +158,9 @@ var createStreamBody = (stream) => {
 };
 var serveStatic = (options = { root: "" }) => {
   return async (c, next) => {
-    if (c.finalized)
+    if (c.finalized) {
       return next();
+    }
     const url = new URL(c.req.url);
     const filename = options.path ?? decodeURIComponent(url.pathname);
     let path = getFilePath({
@@ -167,8 +168,9 @@ var serveStatic = (options = { root: "" }) => {
       root: options.root,
       defaultDocument: options.index ?? "index.html"
     });
-    if (!path)
+    if (!path) {
       return next();
+    }
     path = `./${path}`;
     if (!(0, import_fs.existsSync)(path)) {
       await options.onNotFound?.(path, c);

package/dist/serve-static.mjs

@@ -134,8 +134,9 @@ var createStreamBody = (stream) => {
 };
 var serveStatic = (options = { root: "" }) => {
   return async (c, next) => {
-    if (c.finalized)
+    if (c.finalized) {
       return next();
+    }
     const url = new URL(c.req.url);
     const filename = options.path ?? decodeURIComponent(url.pathname);
     let path = getFilePath({
@@ -143,8 +144,9 @@ var serveStatic = (options = { root: "" }) => {
       root: options.root,
       defaultDocument: options.index ?? "index.html"
     });
-    if (!path)
+    if (!path) {
       return next();
+    }
     path = `./${path}`;
     if (!existsSync(path)) {
       await options.onNotFound?.(path, c);

package/dist/server.js

@@ -37,13 +37,33 @@ module.exports = __toCommonJS(server_exports);
 var import_node_http = require("http");
 
 // 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,
@@ -51,28 +71,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]
+    );
   }
 };
 [
@@ -102,10 +120,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;
 };
 
@@ -128,8 +149,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);
@@ -233,9 +255,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;
@@ -262,8 +281,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);
   }
@@ -282,11 +302,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) {
@@ -295,8 +314,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 {
@@ -318,7 +344,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);
       }