@hono/node-server 1.3.2 → 1.3.4

package/dist/globals.js

@@ -45,31 +45,35 @@ var buildOutgoingHttpHeaders = (headers) => {
 
 // src/response.ts
 var responseCache = Symbol("responseCache");
-var newGlobalResponseKey = Symbol("newGlobalResponse");
 var cacheKey = Symbol("cache");
 var GlobalResponse = global.Response;
 var Response = class _Response {
   #body;
   #init;
-  [newGlobalResponseKey]() {
-    return new GlobalResponse(
-      this.#body,
-      this.#init instanceof _Response ? this.#init[newGlobalResponseKey]() : this.#init
-    );
-  }
-  // @ts-ignore
   get cache() {
     delete this[cacheKey];
-    return this[responseCache] ||= this[newGlobalResponseKey]();
+    return this[responseCache] ||= new GlobalResponse(this.#body, this.#init);
   }
   constructor(body, init) {
     this.#body = body;
-    this.#init = init;
+    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];
     }
   }

package/dist/globals.mjs

@@ -21,31 +21,35 @@ var buildOutgoingHttpHeaders = (headers) => {
 
 // src/response.ts
 var responseCache = Symbol("responseCache");
-var newGlobalResponseKey = Symbol("newGlobalResponse");
 var cacheKey = Symbol("cache");
 var GlobalResponse = global.Response;
 var Response = class _Response {
   #body;
   #init;
-  [newGlobalResponseKey]() {
-    return new GlobalResponse(
-      this.#body,
-      this.#init instanceof _Response ? this.#init[newGlobalResponseKey]() : this.#init
-    );
-  }
-  // @ts-ignore
   get cache() {
     delete this[cacheKey];
-    return this[responseCache] ||= this[newGlobalResponseKey]();
+    return this[responseCache] ||= new GlobalResponse(this.#body, this.#init);
   }
   constructor(body, init) {
     this.#body = body;
-    this.#init = init;
+    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];
     }
   }

package/dist/index.d.mts

@@ -3,5 +3,5 @@ export { getRequestListener } from './listener.mjs';
 import 'node:net';
 import './types.mjs';
 import 'node:http';
-import 'node:https';
 import 'node:http2';
+import 'node:https';

package/dist/index.d.ts

@@ -3,5 +3,5 @@ export { getRequestListener } from './listener.js';
 import 'node:net';
 import './types.js';
 import 'node:http';
-import 'node:https';
 import 'node:http2';
+import 'node:https';

package/dist/index.js

@@ -39,8 +39,71 @@ module.exports = __toCommonJS(src_exports);
 // src/server.ts
 var import_node_http = require("http");
 
-// src/globals.ts
-var import_node_crypto = __toESM(require("crypto"));
+// src/request.ts
+var import_node_stream = require("stream");
+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 init = {
+    method,
+    headers: headerRecord
+  };
+  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 requestPrototype = {
+  get method() {
+    return this[incomingKey].method || "GET";
+  },
+  get url() {
+    return `http://${this[incomingKey].headers.host}${this[incomingKey].url}`;
+  },
+  [getRequestCache]() {
+    return this[requestCache] ||= newRequestFromIncoming(this.method, this.url, this[incomingKey]);
+  }
+};
+[
+  "body",
+  "bodyUsed",
+  "cache",
+  "credentials",
+  "destination",
+  "headers",
+  "integrity",
+  "mode",
+  "redirect",
+  "referrer",
+  "referrerPolicy",
+  "signal"
+].forEach((k) => {
+  Object.defineProperty(requestPrototype, k, {
+    get() {
+      return this[getRequestCache]()[k];
+    }
+  });
+});
+["arrayBuffer", "blob", "clone", "formData", "json", "text"].forEach((k) => {
+  Object.defineProperty(requestPrototype, k, {
+    value: function() {
+      return this[getRequestCache]()[k]();
+    }
+  });
+});
+Object.setPrototypeOf(requestPrototype, global.Request.prototype);
+var newRequest = (incoming) => {
+  const req = Object.create(requestPrototype);
+  req[incomingKey] = incoming;
+  return req;
+};
 
 // src/utils.ts
 function writeFromReadableStream(stream, writable) {
@@ -100,31 +163,35 @@ var buildOutgoingHttpHeaders = (headers) => {
 
 // src/response.ts
 var responseCache = Symbol("responseCache");
-var newGlobalResponseKey = Symbol("newGlobalResponse");
 var cacheKey = Symbol("cache");
 var GlobalResponse = global.Response;
 var Response2 = class _Response {
   #body;
   #init;
-  [newGlobalResponseKey]() {
-    return new GlobalResponse(
-      this.#body,
-      this.#init instanceof _Response ? this.#init[newGlobalResponseKey]() : this.#init
-    );
-  }
-  // @ts-ignore
   get cache() {
     delete this[cacheKey];
-    return this[responseCache] ||= this[newGlobalResponseKey]();
+    return this[responseCache] ||= new GlobalResponse(this.#body, this.#init);
   }
   constructor(body, init) {
     this.#body = body;
-    this.#init = init;
+    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];
     }
   }
@@ -161,6 +228,7 @@ Object.defineProperty(global, "Response", {
 });
 
 // src/globals.ts
+var import_node_crypto = __toESM(require("crypto"));
 Object.defineProperty(global, "Response", {
   value: Response2
 });
@@ -178,72 +246,6 @@ global.fetch = (info, init) => {
   return webFetch(info, init);
 };
 
-// src/request.ts
-var import_node_stream = require("stream");
-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 init = {
-    method,
-    headers: headerRecord
-  };
-  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 requestPrototype = {
-  get method() {
-    return this[incomingKey].method || "GET";
-  },
-  get url() {
-    return `http://${this[incomingKey].headers.host}${this[incomingKey].url}`;
-  },
-  [getRequestCache]() {
-    return this[requestCache] ||= newRequestFromIncoming(this.method, this.url, this[incomingKey]);
-  }
-};
-[
-  "body",
-  "bodyUsed",
-  "cache",
-  "credentials",
-  "destination",
-  "headers",
-  "integrity",
-  "mode",
-  "redirect",
-  "referrer",
-  "referrerPolicy",
-  "signal"
-].forEach((k) => {
-  Object.defineProperty(requestPrototype, k, {
-    get() {
-      return this[getRequestCache]()[k];
-    }
-  });
-});
-["arrayBuffer", "blob", "clone", "formData", "json", "text"].forEach((k) => {
-  Object.defineProperty(requestPrototype, k, {
-    value: function() {
-      return this[getRequestCache]()[k]();
-    }
-  });
-});
-Object.setPrototypeOf(requestPrototype, global.Request.prototype);
-var newRequest = (incoming) => {
-  const req = Object.create(requestPrototype);
-  req[incomingKey] = incoming;
-  return req;
-};
-
 // src/listener.ts
 var regBuffer = /^no$/i;
 var regContentType = /^(application\/json\b|text\/(?!event-stream\b))/i;
@@ -256,6 +258,9 @@ var handleResponseError = (e, outgoing) => {
     console.info("The user aborted a request.");
   } else {
     console.error(e);
+    if (!outgoing.headersSent)
+      outgoing.writeHead(500, { "Content-Type": "text/plain" });
+    outgoing.end(`Error: ${err.message}`);
     outgoing.destroy(err);
   }
 };
@@ -276,6 +281,13 @@ var responseViaResponseObject = async (res, outgoing) => {
   if (res instanceof Promise) {
     res = await res.catch(handleFetchError);
   }
+  if (!(res instanceof Response)) {
+    return handleResponseError(
+      // @ts-expect-error the object must have `toString()`
+      new Error(`The response is not an instance of Response, but ${res.toString()}`),
+      outgoing
+    );
+  }
   if (cacheKey in res) {
     try {
       return responseViaCache(res, outgoing);

package/dist/index.mjs

@@ -1,8 +1,71 @@
 // src/server.ts
 import { createServer as createServerHTTP } from "http";
 
-// src/globals.ts
-import crypto from "crypto";
+// src/request.ts
+import { Readable } from "stream";
+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 init = {
+    method,
+    headers: headerRecord
+  };
+  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 requestPrototype = {
+  get method() {
+    return this[incomingKey].method || "GET";
+  },
+  get url() {
+    return `http://${this[incomingKey].headers.host}${this[incomingKey].url}`;
+  },
+  [getRequestCache]() {
+    return this[requestCache] ||= newRequestFromIncoming(this.method, this.url, this[incomingKey]);
+  }
+};
+[
+  "body",
+  "bodyUsed",
+  "cache",
+  "credentials",
+  "destination",
+  "headers",
+  "integrity",
+  "mode",
+  "redirect",
+  "referrer",
+  "referrerPolicy",
+  "signal"
+].forEach((k) => {
+  Object.defineProperty(requestPrototype, k, {
+    get() {
+      return this[getRequestCache]()[k];
+    }
+  });
+});
+["arrayBuffer", "blob", "clone", "formData", "json", "text"].forEach((k) => {
+  Object.defineProperty(requestPrototype, k, {
+    value: function() {
+      return this[getRequestCache]()[k]();
+    }
+  });
+});
+Object.setPrototypeOf(requestPrototype, global.Request.prototype);
+var newRequest = (incoming) => {
+  const req = Object.create(requestPrototype);
+  req[incomingKey] = incoming;
+  return req;
+};
 
 // src/utils.ts
 function writeFromReadableStream(stream, writable) {
@@ -62,31 +125,35 @@ var buildOutgoingHttpHeaders = (headers) => {
 
 // src/response.ts
 var responseCache = Symbol("responseCache");
-var newGlobalResponseKey = Symbol("newGlobalResponse");
 var cacheKey = Symbol("cache");
 var GlobalResponse = global.Response;
 var Response2 = class _Response {
   #body;
   #init;
-  [newGlobalResponseKey]() {
-    return new GlobalResponse(
-      this.#body,
-      this.#init instanceof _Response ? this.#init[newGlobalResponseKey]() : this.#init
-    );
-  }
-  // @ts-ignore
   get cache() {
     delete this[cacheKey];
-    return this[responseCache] ||= this[newGlobalResponseKey]();
+    return this[responseCache] ||= new GlobalResponse(this.#body, this.#init);
   }
   constructor(body, init) {
     this.#body = body;
-    this.#init = init;
+    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];
     }
   }
@@ -123,6 +190,7 @@ Object.defineProperty(global, "Response", {
 });
 
 // src/globals.ts
+import crypto from "crypto";
 Object.defineProperty(global, "Response", {
   value: Response2
 });
@@ -140,72 +208,6 @@ global.fetch = (info, init) => {
   return webFetch(info, init);
 };
 
-// src/request.ts
-import { Readable } from "stream";
-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 init = {
-    method,
-    headers: headerRecord
-  };
-  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 requestPrototype = {
-  get method() {
-    return this[incomingKey].method || "GET";
-  },
-  get url() {
-    return `http://${this[incomingKey].headers.host}${this[incomingKey].url}`;
-  },
-  [getRequestCache]() {
-    return this[requestCache] ||= newRequestFromIncoming(this.method, this.url, this[incomingKey]);
-  }
-};
-[
-  "body",
-  "bodyUsed",
-  "cache",
-  "credentials",
-  "destination",
-  "headers",
-  "integrity",
-  "mode",
-  "redirect",
-  "referrer",
-  "referrerPolicy",
-  "signal"
-].forEach((k) => {
-  Object.defineProperty(requestPrototype, k, {
-    get() {
-      return this[getRequestCache]()[k];
-    }
-  });
-});
-["arrayBuffer", "blob", "clone", "formData", "json", "text"].forEach((k) => {
-  Object.defineProperty(requestPrototype, k, {
-    value: function() {
-      return this[getRequestCache]()[k]();
-    }
-  });
-});
-Object.setPrototypeOf(requestPrototype, global.Request.prototype);
-var newRequest = (incoming) => {
-  const req = Object.create(requestPrototype);
-  req[incomingKey] = incoming;
-  return req;
-};
-
 // src/listener.ts
 var regBuffer = /^no$/i;
 var regContentType = /^(application\/json\b|text\/(?!event-stream\b))/i;
@@ -218,6 +220,9 @@ var handleResponseError = (e, outgoing) => {
     console.info("The user aborted a request.");
   } else {
     console.error(e);
+    if (!outgoing.headersSent)
+      outgoing.writeHead(500, { "Content-Type": "text/plain" });
+    outgoing.end(`Error: ${err.message}`);
     outgoing.destroy(err);
   }
 };
@@ -238,6 +243,13 @@ var responseViaResponseObject = async (res, outgoing) => {
   if (res instanceof Promise) {
     res = await res.catch(handleFetchError);
   }
+  if (!(res instanceof Response)) {
+    return handleResponseError(
+      // @ts-expect-error the object must have `toString()`
+      new Error(`The response is not an instance of Response, but ${res.toString()}`),
+      outgoing
+    );
+  }
   if (cacheKey in res) {
     try {
       return responseViaCache(res, outgoing);