@hono/node-server 1.5.0 → 1.7.0

package/dist/server.mjs

@@ -4,6 +4,22 @@ import { createServer as createServerHTTP } from "http";
 // src/request.ts
 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 rawHeaders = incoming.rawHeaders;
@@ -20,7 +36,6 @@ var newRequestFromIncoming = (method, url, incoming) => {
   };
   if (!(method === "GET" || method === "HEAD")) {
     init.body = Readable.toWeb(incoming);
-    init.duplex = "half";
   }
   return new Request(url, init);
 };
@@ -70,7 +85,7 @@ var requestPrototype = {
     }
   });
 });
-Object.setPrototypeOf(requestPrototype, global.Request.prototype);
+Object.setPrototypeOf(requestPrototype, Request.prototype);
 var newRequest = (incoming) => {
   const req = Object.create(requestPrototype);
   req[incomingKey] = incoming;
@@ -99,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);
@@ -204,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;
@@ -233,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);
   }
@@ -252,12 +266,25 @@ var responseViaCache = (res, outgoing) => {
     );
   }
 };
-var responseViaResponseObject = async (res, outgoing) => {
+var responseViaResponseObject = async (res, outgoing, options = {}) => {
   if (res instanceof Promise) {
-    res = await res.catch(handleFetchError);
+    if (options.errorHandler) {
+      try {
+        res = await res;
+      } catch (err) {
+        const errRes = await options.errorHandler(err);
+        if (!errRes) {
+          return;
+        }
+        res = errRes;
+      }
+    } else {
+      res = await res.catch(handleFetchError);
+    }
   }
   try {
-    if (cacheKey in res) {
+    const isCached = cacheKey in res;
+    if (isCached) {
       return responseViaCache(res, outgoing);
     }
   } catch (e) {
@@ -266,8 +293,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 {
@@ -284,23 +318,30 @@ var responseViaResponseObject = async (res, outgoing) => {
     outgoing.end();
   }
 };
-var getRequestListener = (fetchCallback) => {
-  return (incoming, outgoing) => {
+var getRequestListener = (fetchCallback, options = {}) => {
+  return async (incoming, outgoing) => {
     let res;
     const req = newRequest(incoming);
     try {
-      res = fetchCallback(req);
+      res = fetchCallback(req, { incoming, outgoing });
       if (cacheKey in res) {
         return responseViaCache(res, outgoing);
       }
     } catch (e) {
       if (!res) {
-        res = handleFetchError(e);
+        if (options.errorHandler) {
+          res = await options.errorHandler(e);
+          if (!res) {
+            return;
+          }
+        } else {
+          res = handleFetchError(e);
+        }
       } else {
         return handleResponseError(e, outgoing);
       }
     }
-    return responseViaResponseObject(res, outgoing);
+    return responseViaResponseObject(res, outgoing, options);
   };
 };
 

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;
 };
@@ -29,5 +37,6 @@ type Options = {
     port?: number;
     hostname?: string;
 } & ServerOptions;
+type CustomErrorHandler = (err: unknown) => void | Response | Promise<void | Response>;
 
-export { FetchCallback, NextHandlerOption, Options, ServerType };
+export { CustomErrorHandler, 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;
 };
@@ -29,5 +37,6 @@ type Options = {
     port?: number;
     hostname?: string;
 } & ServerOptions;
+type CustomErrorHandler = (err: unknown) => void | Response | Promise<void | Response>;
 
-export { FetchCallback, NextHandlerOption, Options, ServerType };
+export { CustomErrorHandler, 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.d.mts

@@ -2,6 +2,6 @@ import * as http2 from 'http2';
 import * as http from 'http';
 import { Hono } from 'hono';
 
-declare const handle: (app: Hono<any, any, any>) => (incoming: http.IncomingMessage | http2.Http2ServerRequest, outgoing: http.ServerResponse<http.IncomingMessage> | http2.Http2ServerResponse) => void | Promise<void>;
+declare const handle: (app: Hono<any, any, any>) => (incoming: http.IncomingMessage | http2.Http2ServerRequest, outgoing: http.ServerResponse<http.IncomingMessage> | http2.Http2ServerResponse) => Promise<void>;
 
 export { handle };

package/dist/vercel.d.ts

@@ -2,6 +2,6 @@ import * as http2 from 'http2';
 import * as http from 'http';
 import { Hono } from 'hono';
 
-declare const handle: (app: Hono<any, any, any>) => (incoming: http.IncomingMessage | http2.Http2ServerRequest, outgoing: http.ServerResponse<http.IncomingMessage> | http2.Http2ServerResponse) => void | Promise<void>;
+declare const handle: (app: Hono<any, any, any>) => (incoming: http.IncomingMessage | http2.Http2ServerRequest, outgoing: http.ServerResponse<http.IncomingMessage> | http2.Http2ServerResponse) => Promise<void>;
 
 export { handle };

package/dist/vercel.js

@@ -37,6 +37,22 @@ module.exports = __toCommonJS(vercel_exports);
 // src/request.ts
 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 rawHeaders = incoming.rawHeaders;
@@ -53,7 +69,6 @@ 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);
 };
@@ -103,7 +118,7 @@ var requestPrototype = {
     }
   });
 });
-Object.setPrototypeOf(requestPrototype, global.Request.prototype);
+Object.setPrototypeOf(requestPrototype, Request.prototype);
 var newRequest = (incoming) => {
   const req = Object.create(requestPrototype);
   req[incomingKey] = incoming;
@@ -132,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);
@@ -237,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;
@@ -266,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);
   }
@@ -285,12 +299,25 @@ var responseViaCache = (res, outgoing) => {
     );
   }
 };
-var responseViaResponseObject = async (res, outgoing) => {
+var responseViaResponseObject = async (res, outgoing, options = {}) => {
   if (res instanceof Promise) {
-    res = await res.catch(handleFetchError);
+    if (options.errorHandler) {
+      try {
+        res = await res;
+      } catch (err) {
+        const errRes = await options.errorHandler(err);
+        if (!errRes) {
+          return;
+        }
+        res = errRes;
+      }
+    } else {
+      res = await res.catch(handleFetchError);
+    }
   }
   try {
-    if (cacheKey in res) {
+    const isCached = cacheKey in res;
+    if (isCached) {
       return responseViaCache(res, outgoing);
     }
   } catch (e) {
@@ -299,8 +326,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 {
@@ -317,23 +351,30 @@ var responseViaResponseObject = async (res, outgoing) => {
     outgoing.end();
   }
 };
-var getRequestListener = (fetchCallback) => {
-  return (incoming, outgoing) => {
+var getRequestListener = (fetchCallback, options = {}) => {
+  return async (incoming, outgoing) => {
     let res;
     const req = newRequest(incoming);
     try {
-      res = fetchCallback(req);
+      res = fetchCallback(req, { incoming, outgoing });
       if (cacheKey in res) {
         return responseViaCache(res, outgoing);
       }
     } catch (e) {
       if (!res) {
-        res = handleFetchError(e);
+        if (options.errorHandler) {
+          res = await options.errorHandler(e);
+          if (!res) {
+            return;
+          }
+        } else {
+          res = handleFetchError(e);
+        }
       } else {
         return handleResponseError(e, outgoing);
       }
     }
-    return responseViaResponseObject(res, outgoing);
+    return responseViaResponseObject(res, outgoing, options);
   };
 };
 

package/dist/vercel.mjs

@@ -1,6 +1,22 @@
 // src/request.ts
 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 rawHeaders = incoming.rawHeaders;
@@ -17,7 +33,6 @@ var newRequestFromIncoming = (method, url, incoming) => {
   };
   if (!(method === "GET" || method === "HEAD")) {
     init.body = Readable.toWeb(incoming);
-    init.duplex = "half";
   }
   return new Request(url, init);
 };
@@ -67,7 +82,7 @@ var requestPrototype = {
     }
   });
 });
-Object.setPrototypeOf(requestPrototype, global.Request.prototype);
+Object.setPrototypeOf(requestPrototype, Request.prototype);
 var newRequest = (incoming) => {
   const req = Object.create(requestPrototype);
   req[incomingKey] = incoming;
@@ -96,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);
@@ -201,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;
@@ -230,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);
   }
@@ -249,12 +263,25 @@ var responseViaCache = (res, outgoing) => {
     );
   }
 };
-var responseViaResponseObject = async (res, outgoing) => {
+var responseViaResponseObject = async (res, outgoing, options = {}) => {
   if (res instanceof Promise) {
-    res = await res.catch(handleFetchError);
+    if (options.errorHandler) {
+      try {
+        res = await res;
+      } catch (err) {
+        const errRes = await options.errorHandler(err);
+        if (!errRes) {
+          return;
+        }
+        res = errRes;
+      }
+    } else {
+      res = await res.catch(handleFetchError);
+    }
   }
   try {
-    if (cacheKey in res) {
+    const isCached = cacheKey in res;
+    if (isCached) {
       return responseViaCache(res, outgoing);
     }
   } catch (e) {
@@ -263,8 +290,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 {
@@ -281,23 +315,30 @@ var responseViaResponseObject = async (res, outgoing) => {
     outgoing.end();
   }
 };
-var getRequestListener = (fetchCallback) => {
-  return (incoming, outgoing) => {
+var getRequestListener = (fetchCallback, options = {}) => {
+  return async (incoming, outgoing) => {
     let res;
     const req = newRequest(incoming);
     try {
-      res = fetchCallback(req);
+      res = fetchCallback(req, { incoming, outgoing });
       if (cacheKey in res) {
         return responseViaCache(res, outgoing);
       }
     } catch (e) {
       if (!res) {
-        res = handleFetchError(e);
+        if (options.errorHandler) {
+          res = await options.errorHandler(e);
+          if (!res) {
+            return;
+          }
+        } else {
+          res = handleFetchError(e);
+        }
       } else {
         return handleResponseError(e, outgoing);
       }
     }
-    return responseViaResponseObject(res, outgoing);
+    return responseViaResponseObject(res, outgoing, options);
   };
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hono/node-server",
-  "version": "1.5.0",
+  "version": "1.7.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",