@hono/node-server 1.4.1 → 1.6.0

package/dist/globals.js

@@ -24,95 +24,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 
 // src/globals.ts
 var import_node_crypto = __toESM(require("crypto"));
-
-// src/utils.ts
-var buildOutgoingHttpHeaders = (headers) => {
-  const res = {};
-  const cookies = [];
-  for (const [k, v] of headers) {
-    if (k === "set-cookie") {
-      cookies.push(v);
-    } else {
-      res[k] = v;
-    }
-  }
-  if (cookies.length > 0) {
-    res["set-cookie"] = cookies;
-  }
-  res["content-type"] ??= "text/plain;charset=UTF-8";
-  return res;
-};
-
-// src/response.ts
-var responseCache = Symbol("responseCache");
-var cacheKey = Symbol("cache");
-var GlobalResponse = global.Response;
-var Response = class _Response {
-  #body;
-  #init;
-  get cache() {
-    delete this[cacheKey];
-    return this[responseCache] ||= new GlobalResponse(this.#body, this.#init);
-  }
-  constructor(body, init) {
-    this.#body = body;
-    if (init instanceof _Response) {
-      const cachedGlobalResponse = init[responseCache];
-      if (cachedGlobalResponse) {
-        this.#init = cachedGlobalResponse;
-        this.cache;
-        return;
-      } else {
-        this.#init = init.#init;
-      }
-    } else {
-      this.#init = init;
-    }
-    if (typeof body === "string" || body instanceof ReadableStream) {
-      let headers = init?.headers || { "content-type": "text/plain;charset=UTF-8" };
-      if (headers instanceof Headers) {
-        headers = buildOutgoingHttpHeaders(headers);
-      }
-      ;
-      this[cacheKey] = [init?.status || 200, body, headers];
-    }
-  }
-};
-[
-  "body",
-  "bodyUsed",
-  "headers",
-  "ok",
-  "redirected",
-  "status",
-  "statusText",
-  "trailers",
-  "type",
-  "url"
-].forEach((k) => {
-  Object.defineProperty(Response.prototype, k, {
-    get() {
-      return this.cache[k];
-    }
-  });
-});
-["arrayBuffer", "blob", "clone", "formData", "json", "text"].forEach((k) => {
-  Object.defineProperty(Response.prototype, k, {
-    value: function() {
-      return this.cache[k]();
-    }
-  });
-});
-Object.setPrototypeOf(Response, GlobalResponse);
-Object.setPrototypeOf(Response.prototype, GlobalResponse.prototype);
-Object.defineProperty(global, "Response", {
-  value: Response
-});
-
-// src/globals.ts
-Object.defineProperty(global, "Response", {
-  value: Response
-});
 var webFetch = global.fetch;
 if (typeof global.crypto === "undefined") {
   global.crypto = import_node_crypto.default;

package/dist/globals.mjs

@@ -1,94 +1,5 @@
 // src/globals.ts
 import crypto from "crypto";
-
-// src/utils.ts
-var buildOutgoingHttpHeaders = (headers) => {
-  const res = {};
-  const cookies = [];
-  for (const [k, v] of headers) {
-    if (k === "set-cookie") {
-      cookies.push(v);
-    } else {
-      res[k] = v;
-    }
-  }
-  if (cookies.length > 0) {
-    res["set-cookie"] = cookies;
-  }
-  res["content-type"] ??= "text/plain;charset=UTF-8";
-  return res;
-};
-
-// src/response.ts
-var responseCache = Symbol("responseCache");
-var cacheKey = Symbol("cache");
-var GlobalResponse = global.Response;
-var Response = class _Response {
-  #body;
-  #init;
-  get cache() {
-    delete this[cacheKey];
-    return this[responseCache] ||= new GlobalResponse(this.#body, this.#init);
-  }
-  constructor(body, init) {
-    this.#body = body;
-    if (init instanceof _Response) {
-      const cachedGlobalResponse = init[responseCache];
-      if (cachedGlobalResponse) {
-        this.#init = cachedGlobalResponse;
-        this.cache;
-        return;
-      } else {
-        this.#init = init.#init;
-      }
-    } else {
-      this.#init = init;
-    }
-    if (typeof body === "string" || body instanceof ReadableStream) {
-      let headers = init?.headers || { "content-type": "text/plain;charset=UTF-8" };
-      if (headers instanceof Headers) {
-        headers = buildOutgoingHttpHeaders(headers);
-      }
-      ;
-      this[cacheKey] = [init?.status || 200, body, headers];
-    }
-  }
-};
-[
-  "body",
-  "bodyUsed",
-  "headers",
-  "ok",
-  "redirected",
-  "status",
-  "statusText",
-  "trailers",
-  "type",
-  "url"
-].forEach((k) => {
-  Object.defineProperty(Response.prototype, k, {
-    get() {
-      return this.cache[k];
-    }
-  });
-});
-["arrayBuffer", "blob", "clone", "formData", "json", "text"].forEach((k) => {
-  Object.defineProperty(Response.prototype, k, {
-    value: function() {
-      return this.cache[k]();
-    }
-  });
-});
-Object.setPrototypeOf(Response, GlobalResponse);
-Object.setPrototypeOf(Response.prototype, GlobalResponse.prototype);
-Object.defineProperty(global, "Response", {
-  value: Response
-});
-
-// src/globals.ts
-Object.defineProperty(global, "Response", {
-  value: Response
-});
 var webFetch = global.fetch;
 if (typeof global.crypto === "undefined") {
   global.crypto = crypto;

package/dist/index.d.mts

@@ -1,7 +1,7 @@
 export { createAdaptorServer, serve } from './server.mjs';
 export { getRequestListener } from './listener.mjs';
+export { Http2Bindings, HttpBindings } from './types.mjs';
 import 'node:net';
-import './types.mjs';
 import 'node:http';
 import 'node:http2';
 import 'node:https';

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 export { createAdaptorServer, serve } from './server.js';
 export { getRequestListener } from './listener.js';
+export { Http2Bindings, HttpBindings } from './types.js';
 import 'node:net';
-import './types.js';
 import 'node:http';
 import 'node:http2';
 import 'node:https';

package/dist/index.js

@@ -40,13 +40,33 @@ module.exports = __toCommonJS(src_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,
@@ -54,28 +74,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]
+    );
   }
 };
 [
@@ -105,10 +123,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;
 };
 
@@ -131,8 +152,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);
@@ -236,9 +258,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;
@@ -265,8 +284,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);
   }
@@ -285,11 +305,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) {
@@ -298,8 +317,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 {
@@ -321,7 +347,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/index.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/listener.js

@@ -35,13 +35,33 @@ __export(listener_exports, {
 module.exports = __toCommonJS(listener_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);
       }