@hono/node-server 1.16.0 → 1.17.1

package/README.md

@@ -128,6 +128,7 @@ serve({
 ### `autoCleanupIncoming`
 
 The default value is `true`. The Node.js Adapter automatically cleans up (explicitly call `destroy()` method) if application is not finished to consume the incoming request. If you don't want to do that, set `false`.
+
 If the application accepts connections from arbitrary clients, this cleanup must be done otherwise incomplete requests from clients may cause the application to stop responding. If your application only accepts connections from trusted clients, such as in a reverse proxy environment and there is no process that returns a response without reading the body of the POST request all the way through, you can improve performance by setting it to `false`.
 
 ```ts
@@ -167,7 +168,7 @@ import { serveStatic } from '@hono/node-server/serve-static'
 app.use('/static/*', serveStatic({ root: './' }))
 ```
 
-Note that `root` must be _relative_ to the current working directory from which the app was started. Absolute paths are not supported.
+If using a relative path, `root` will be relative to the current working directory from which the app was started.
 
 This can cause confusion when running your application locally.
 

package/dist/index.js

@@ -295,26 +295,23 @@ function writeFromReadableStream(stream, writable) {
   if (stream.locked) {
     throw new TypeError("ReadableStream is locked.");
   } else if (writable.destroyed) {
-    stream.cancel();
     return;
   }
   const reader = stream.getReader();
-  writable.on("close", cancel);
-  writable.on("error", cancel);
-  reader.read().then(flow, cancel);
+  const handleError = () => {
+  };
+  writable.on("error", handleError);
+  reader.read().then(flow, handleStreamError);
   return reader.closed.finally(() => {
-    writable.off("close", cancel);
-    writable.off("error", cancel);
+    writable.off("error", handleError);
   });
-  function cancel(error) {
-    reader.cancel(error).catch(() => {
-    });
+  function handleStreamError(error) {
     if (error) {
       writable.destroy(error);
     }
   }
   function onDrain() {
-    reader.read().then(flow, cancel);
+    reader.read().then(flow, handleStreamError);
   }
   function flow({ done, value }) {
     try {
@@ -323,10 +320,10 @@ function writeFromReadableStream(stream, writable) {
       } else if (!writable.write(value)) {
         writable.once("drain", onDrain);
       } else {
-        return reader.read().then(flow, cancel);
+        return reader.read().then(flow, handleStreamError);
       }
     } catch (e) {
-      cancel(e);
+      handleStreamError(e);
     }
   }
 }

package/dist/index.mjs

@@ -256,26 +256,23 @@ function writeFromReadableStream(stream, writable) {
   if (stream.locked) {
     throw new TypeError("ReadableStream is locked.");
   } else if (writable.destroyed) {
-    stream.cancel();
     return;
   }
   const reader = stream.getReader();
-  writable.on("close", cancel);
-  writable.on("error", cancel);
-  reader.read().then(flow, cancel);
+  const handleError = () => {
+  };
+  writable.on("error", handleError);
+  reader.read().then(flow, handleStreamError);
   return reader.closed.finally(() => {
-    writable.off("close", cancel);
-    writable.off("error", cancel);
+    writable.off("error", handleError);
   });
-  function cancel(error) {
-    reader.cancel(error).catch(() => {
-    });
+  function handleStreamError(error) {
     if (error) {
       writable.destroy(error);
     }
   }
   function onDrain() {
-    reader.read().then(flow, cancel);
+    reader.read().then(flow, handleStreamError);
   }
   function flow({ done, value }) {
     try {
@@ -284,10 +281,10 @@ function writeFromReadableStream(stream, writable) {
       } else if (!writable.write(value)) {
         writable.once("drain", onDrain);
       } else {
-        return reader.read().then(flow, cancel);
+        return reader.read().then(flow, handleStreamError);
       }
     } catch (e) {
-      cancel(e);
+      handleStreamError(e);
     }
   }
 }

package/dist/listener.js

@@ -287,26 +287,23 @@ function writeFromReadableStream(stream, writable) {
   if (stream.locked) {
     throw new TypeError("ReadableStream is locked.");
   } else if (writable.destroyed) {
-    stream.cancel();
     return;
   }
   const reader = stream.getReader();
-  writable.on("close", cancel);
-  writable.on("error", cancel);
-  reader.read().then(flow, cancel);
+  const handleError = () => {
+  };
+  writable.on("error", handleError);
+  reader.read().then(flow, handleStreamError);
   return reader.closed.finally(() => {
-    writable.off("close", cancel);
-    writable.off("error", cancel);
+    writable.off("error", handleError);
   });
-  function cancel(error) {
-    reader.cancel(error).catch(() => {
-    });
+  function handleStreamError(error) {
     if (error) {
       writable.destroy(error);
     }
   }
   function onDrain() {
-    reader.read().then(flow, cancel);
+    reader.read().then(flow, handleStreamError);
   }
   function flow({ done, value }) {
     try {
@@ -315,10 +312,10 @@ function writeFromReadableStream(stream, writable) {
       } else if (!writable.write(value)) {
         writable.once("drain", onDrain);
       } else {
-        return reader.read().then(flow, cancel);
+        return reader.read().then(flow, handleStreamError);
       }
     } catch (e) {
-      cancel(e);
+      handleStreamError(e);
     }
   }
 }

package/dist/listener.mjs

@@ -253,26 +253,23 @@ function writeFromReadableStream(stream, writable) {
   if (stream.locked) {
     throw new TypeError("ReadableStream is locked.");
   } else if (writable.destroyed) {
-    stream.cancel();
     return;
   }
   const reader = stream.getReader();
-  writable.on("close", cancel);
-  writable.on("error", cancel);
-  reader.read().then(flow, cancel);
+  const handleError = () => {
+  };
+  writable.on("error", handleError);
+  reader.read().then(flow, handleStreamError);
   return reader.closed.finally(() => {
-    writable.off("close", cancel);
-    writable.off("error", cancel);
+    writable.off("error", handleError);
   });
-  function cancel(error) {
-    reader.cancel(error).catch(() => {
-    });
+  function handleStreamError(error) {
     if (error) {
       writable.destroy(error);
     }
   }
   function onDrain() {
-    reader.read().then(flow, cancel);
+    reader.read().then(flow, handleStreamError);
   }
   function flow({ done, value }) {
     try {
@@ -281,10 +278,10 @@ function writeFromReadableStream(stream, writable) {
       } else if (!writable.write(value)) {
         writable.once("drain", onDrain);
       } else {
-        return reader.read().then(flow, cancel);
+        return reader.read().then(flow, handleStreamError);
       }
     } catch (e) {
-      cancel(e);
+      handleStreamError(e);
     }
   }
 }

package/dist/serve-static.js

@@ -23,9 +23,9 @@ __export(serve_static_exports, {
   serveStatic: () => serveStatic
 });
 module.exports = __toCommonJS(serve_static_exports);
-var import_filepath = require("hono/utils/filepath");
 var import_mime = require("hono/utils/mime");
 var import_node_fs = require("fs");
+var import_node_path = require("path");
 var COMPRESSIBLE_CONTENT_TYPE_REGEX = /^\s*(?:text\/[^;\s]+|application\/(?:javascript|json|xml|xml-dtd|ecmascript|dart|postscript|rtf|tar|toml|vnd\.dart|vnd\.ms-fontobject|vnd\.ms-opentype|wasm|x-httpd-php|x-javascript|x-ns-proxy-autoconfig|x-sh|x-tar|x-virtualbox-hdd|x-virtualbox-ova|x-virtualbox-ovf|x-virtualbox-vbox|x-virtualbox-vdi|x-virtualbox-vhd|x-virtualbox-vmdk|x-www-form-urlencoded)|font\/(?:otf|ttf)|image\/(?:bmp|vnd\.adobe\.photoshop|vnd\.microsoft\.icon|vnd\.ms-dds|x-icon|x-ms-bmp)|message\/rfc822|model\/gltf-binary|x-shader\/x-fragment|x-shader\/x-vertex|[^;\s]+?\+(?:json|text|xml|yaml))(?:[;\s]|$)/i;
 var ENCODINGS = {
   br: ".br",
@@ -49,9 +49,6 @@ var createStreamBody = (stream) => {
   });
   return body;
 };
-var addCurrentDirPrefix = (path) => {
-  return `./${path}`;
-};
 var getStats = (path) => {
   let stats;
   try {
@@ -61,38 +58,34 @@ var getStats = (path) => {
   return stats;
 };
 var serveStatic = (options = { root: "" }) => {
+  const root = options.root || "";
+  const optionPath = options.path;
   return async (c, next) => {
     if (c.finalized) {
       return next();
     }
     let filename;
-    try {
-      filename = options.path ?? decodeURIComponent(c.req.path);
-    } catch {
-      await options.onNotFound?.(c.req.path, c);
-      return next();
-    }
-    let path = (0, import_filepath.getFilePathWithoutDefaultDocument)({
-      filename: options.rewriteRequestPath ? options.rewriteRequestPath(filename, c) : filename,
-      root: options.root
-    });
-    if (path) {
-      path = addCurrentDirPrefix(path);
+    if (optionPath) {
+      filename = optionPath;
     } else {
-      return next();
+      try {
+        filename = decodeURIComponent(c.req.path);
+        if (/(?:^|[\/\\])\.\.(?:$|[\/\\])/.test(filename)) {
+          throw new Error();
+        }
+      } catch {
+        await options.onNotFound?.(c.req.path, c);
+        return next();
+      }
     }
+    let path = (0, import_node_path.join)(
+      root,
+      !optionPath && options.rewriteRequestPath ? options.rewriteRequestPath(filename, c) : filename
+    );
     let stats = getStats(path);
     if (stats && stats.isDirectory()) {
-      path = (0, import_filepath.getFilePath)({
-        filename: options.rewriteRequestPath ? options.rewriteRequestPath(filename, c) : filename,
-        root: options.root,
-        defaultDocument: options.index ?? "index.html"
-      });
-      if (path) {
-        path = addCurrentDirPrefix(path);
-      } else {
-        return next();
-      }
+      const indexFile = options.index ?? "index.html";
+      path = (0, import_node_path.join)(path, indexFile);
       stats = getStats(path);
     }
     if (!stats) {

package/dist/serve-static.mjs

@@ -1,7 +1,7 @@
 // src/serve-static.ts
-import { getFilePath, getFilePathWithoutDefaultDocument } from "hono/utils/filepath";
 import { getMimeType } from "hono/utils/mime";
 import { createReadStream, lstatSync } from "fs";
+import { join } from "path";
 var COMPRESSIBLE_CONTENT_TYPE_REGEX = /^\s*(?:text\/[^;\s]+|application\/(?:javascript|json|xml|xml-dtd|ecmascript|dart|postscript|rtf|tar|toml|vnd\.dart|vnd\.ms-fontobject|vnd\.ms-opentype|wasm|x-httpd-php|x-javascript|x-ns-proxy-autoconfig|x-sh|x-tar|x-virtualbox-hdd|x-virtualbox-ova|x-virtualbox-ovf|x-virtualbox-vbox|x-virtualbox-vdi|x-virtualbox-vhd|x-virtualbox-vmdk|x-www-form-urlencoded)|font\/(?:otf|ttf)|image\/(?:bmp|vnd\.adobe\.photoshop|vnd\.microsoft\.icon|vnd\.ms-dds|x-icon|x-ms-bmp)|message\/rfc822|model\/gltf-binary|x-shader\/x-fragment|x-shader\/x-vertex|[^;\s]+?\+(?:json|text|xml|yaml))(?:[;\s]|$)/i;
 var ENCODINGS = {
   br: ".br",
@@ -25,9 +25,6 @@ var createStreamBody = (stream) => {
   });
   return body;
 };
-var addCurrentDirPrefix = (path) => {
-  return `./${path}`;
-};
 var getStats = (path) => {
   let stats;
   try {
@@ -37,38 +34,34 @@ var getStats = (path) => {
   return stats;
 };
 var serveStatic = (options = { root: "" }) => {
+  const root = options.root || "";
+  const optionPath = options.path;
   return async (c, next) => {
     if (c.finalized) {
       return next();
     }
     let filename;
-    try {
-      filename = options.path ?? decodeURIComponent(c.req.path);
-    } catch {
-      await options.onNotFound?.(c.req.path, c);
-      return next();
-    }
-    let path = getFilePathWithoutDefaultDocument({
-      filename: options.rewriteRequestPath ? options.rewriteRequestPath(filename, c) : filename,
-      root: options.root
-    });
-    if (path) {
-      path = addCurrentDirPrefix(path);
+    if (optionPath) {
+      filename = optionPath;
     } else {
-      return next();
+      try {
+        filename = decodeURIComponent(c.req.path);
+        if (/(?:^|[\/\\])\.\.(?:$|[\/\\])/.test(filename)) {
+          throw new Error();
+        }
+      } catch {
+        await options.onNotFound?.(c.req.path, c);
+        return next();
+      }
     }
+    let path = join(
+      root,
+      !optionPath && options.rewriteRequestPath ? options.rewriteRequestPath(filename, c) : filename
+    );
     let stats = getStats(path);
     if (stats && stats.isDirectory()) {
-      path = getFilePath({
-        filename: options.rewriteRequestPath ? options.rewriteRequestPath(filename, c) : filename,
-        root: options.root,
-        defaultDocument: options.index ?? "index.html"
-      });
-      if (path) {
-        path = addCurrentDirPrefix(path);
-      } else {
-        return next();
-      }
+      const indexFile = options.index ?? "index.html";
+      path = join(path, indexFile);
       stats = getStats(path);
     }
     if (!stats) {

package/dist/server.js

@@ -291,26 +291,23 @@ function writeFromReadableStream(stream, writable) {
   if (stream.locked) {
     throw new TypeError("ReadableStream is locked.");
   } else if (writable.destroyed) {
-    stream.cancel();
     return;
   }
   const reader = stream.getReader();
-  writable.on("close", cancel);
-  writable.on("error", cancel);
-  reader.read().then(flow, cancel);
+  const handleError = () => {
+  };
+  writable.on("error", handleError);
+  reader.read().then(flow, handleStreamError);
   return reader.closed.finally(() => {
-    writable.off("close", cancel);
-    writable.off("error", cancel);
+    writable.off("error", handleError);
   });
-  function cancel(error) {
-    reader.cancel(error).catch(() => {
-    });
+  function handleStreamError(error) {
     if (error) {
       writable.destroy(error);
     }
   }
   function onDrain() {
-    reader.read().then(flow, cancel);
+    reader.read().then(flow, handleStreamError);
   }
   function flow({ done, value }) {
     try {
@@ -319,10 +316,10 @@ function writeFromReadableStream(stream, writable) {
       } else if (!writable.write(value)) {
         writable.once("drain", onDrain);
       } else {
-        return reader.read().then(flow, cancel);
+        return reader.read().then(flow, handleStreamError);
       }
     } catch (e) {
-      cancel(e);
+      handleStreamError(e);
     }
   }
 }

package/dist/server.mjs

@@ -256,26 +256,23 @@ function writeFromReadableStream(stream, writable) {
   if (stream.locked) {
     throw new TypeError("ReadableStream is locked.");
   } else if (writable.destroyed) {
-    stream.cancel();
     return;
   }
   const reader = stream.getReader();
-  writable.on("close", cancel);
-  writable.on("error", cancel);
-  reader.read().then(flow, cancel);
+  const handleError = () => {
+  };
+  writable.on("error", handleError);
+  reader.read().then(flow, handleStreamError);
   return reader.closed.finally(() => {
-    writable.off("close", cancel);
-    writable.off("error", cancel);
+    writable.off("error", handleError);
   });
-  function cancel(error) {
-    reader.cancel(error).catch(() => {
-    });
+  function handleStreamError(error) {
     if (error) {
       writable.destroy(error);
     }
   }
   function onDrain() {
-    reader.read().then(flow, cancel);
+    reader.read().then(flow, handleStreamError);
   }
   function flow({ done, value }) {
     try {
@@ -284,10 +281,10 @@ function writeFromReadableStream(stream, writable) {
       } else if (!writable.write(value)) {
         writable.once("drain", onDrain);
       } else {
-        return reader.read().then(flow, cancel);
+        return reader.read().then(flow, handleStreamError);
       }
     } catch (e) {
-      cancel(e);
+      handleStreamError(e);
     }
   }
 }

package/dist/utils.js

@@ -28,26 +28,23 @@ function writeFromReadableStream(stream, writable) {
   if (stream.locked) {
     throw new TypeError("ReadableStream is locked.");
   } else if (writable.destroyed) {
-    stream.cancel();
     return;
   }
   const reader = stream.getReader();
-  writable.on("close", cancel);
-  writable.on("error", cancel);
-  reader.read().then(flow, cancel);
+  const handleError = () => {
+  };
+  writable.on("error", handleError);
+  reader.read().then(flow, handleStreamError);
   return reader.closed.finally(() => {
-    writable.off("close", cancel);
-    writable.off("error", cancel);
+    writable.off("error", handleError);
   });
-  function cancel(error) {
-    reader.cancel(error).catch(() => {
-    });
+  function handleStreamError(error) {
     if (error) {
       writable.destroy(error);
     }
   }
   function onDrain() {
-    reader.read().then(flow, cancel);
+    reader.read().then(flow, handleStreamError);
   }
   function flow({ done, value }) {
     try {
@@ -56,10 +53,10 @@ function writeFromReadableStream(stream, writable) {
       } else if (!writable.write(value)) {
         writable.once("drain", onDrain);
       } else {
-        return reader.read().then(flow, cancel);
+        return reader.read().then(flow, handleStreamError);
       }
     } catch (e) {
-      cancel(e);
+      handleStreamError(e);
     }
   }
 }

package/dist/utils.mjs

@@ -3,26 +3,23 @@ function writeFromReadableStream(stream, writable) {
   if (stream.locked) {
     throw new TypeError("ReadableStream is locked.");
   } else if (writable.destroyed) {
-    stream.cancel();
     return;
   }
   const reader = stream.getReader();
-  writable.on("close", cancel);
-  writable.on("error", cancel);
-  reader.read().then(flow, cancel);
+  const handleError = () => {
+  };
+  writable.on("error", handleError);
+  reader.read().then(flow, handleStreamError);
   return reader.closed.finally(() => {
-    writable.off("close", cancel);
-    writable.off("error", cancel);
+    writable.off("error", handleError);
   });
-  function cancel(error) {
-    reader.cancel(error).catch(() => {
-    });
+  function handleStreamError(error) {
     if (error) {
       writable.destroy(error);
     }
   }
   function onDrain() {
-    reader.read().then(flow, cancel);
+    reader.read().then(flow, handleStreamError);
   }
   function flow({ done, value }) {
     try {
@@ -31,10 +28,10 @@ function writeFromReadableStream(stream, writable) {
       } else if (!writable.write(value)) {
         writable.once("drain", onDrain);
       } else {
-        return reader.read().then(flow, cancel);
+        return reader.read().then(flow, handleStreamError);
       }
     } catch (e) {
-      cancel(e);
+      handleStreamError(e);
     }
   }
 }

package/dist/vercel.js

@@ -289,26 +289,23 @@ function writeFromReadableStream(stream, writable) {
   if (stream.locked) {
     throw new TypeError("ReadableStream is locked.");
   } else if (writable.destroyed) {
-    stream.cancel();
     return;
   }
   const reader = stream.getReader();
-  writable.on("close", cancel);
-  writable.on("error", cancel);
-  reader.read().then(flow, cancel);
+  const handleError = () => {
+  };
+  writable.on("error", handleError);
+  reader.read().then(flow, handleStreamError);
   return reader.closed.finally(() => {
-    writable.off("close", cancel);
-    writable.off("error", cancel);
+    writable.off("error", handleError);
   });
-  function cancel(error) {
-    reader.cancel(error).catch(() => {
-    });
+  function handleStreamError(error) {
     if (error) {
       writable.destroy(error);
     }
   }
   function onDrain() {
-    reader.read().then(flow, cancel);
+    reader.read().then(flow, handleStreamError);
   }
   function flow({ done, value }) {
     try {
@@ -317,10 +314,10 @@ function writeFromReadableStream(stream, writable) {
       } else if (!writable.write(value)) {
         writable.once("drain", onDrain);
       } else {
-        return reader.read().then(flow, cancel);
+        return reader.read().then(flow, handleStreamError);
       }
     } catch (e) {
-      cancel(e);
+      handleStreamError(e);
     }
   }
 }

package/dist/vercel.mjs

@@ -253,26 +253,23 @@ function writeFromReadableStream(stream, writable) {
   if (stream.locked) {
     throw new TypeError("ReadableStream is locked.");
   } else if (writable.destroyed) {
-    stream.cancel();
     return;
   }
   const reader = stream.getReader();
-  writable.on("close", cancel);
-  writable.on("error", cancel);
-  reader.read().then(flow, cancel);
+  const handleError = () => {
+  };
+  writable.on("error", handleError);
+  reader.read().then(flow, handleStreamError);
   return reader.closed.finally(() => {
-    writable.off("close", cancel);
-    writable.off("error", cancel);
+    writable.off("error", handleError);
   });
-  function cancel(error) {
-    reader.cancel(error).catch(() => {
-    });
+  function handleStreamError(error) {
     if (error) {
       writable.destroy(error);
     }
   }
   function onDrain() {
-    reader.read().then(flow, cancel);
+    reader.read().then(flow, handleStreamError);
   }
   function flow({ done, value }) {
     try {
@@ -281,10 +278,10 @@ function writeFromReadableStream(stream, writable) {
       } else if (!writable.write(value)) {
         writable.once("drain", onDrain);
       } else {
-        return reader.read().then(flow, cancel);
+        return reader.read().then(flow, handleStreamError);
       }
     } catch (e) {
-      cancel(e);
+      handleStreamError(e);
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hono/node-server",
-  "version": "1.16.0",
+  "version": "1.17.1",
   "description": "Node.js Adapter for Hono",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -54,7 +54,7 @@
     }
   },
   "scripts": {
-    "test": "node --expose-gc ./node_modules/.bin/jest",
+    "test": "node --expose-gc node_modules/jest/bin/jest.js",
     "build": "tsup --external hono",
     "watch": "tsup --watch",
     "postbuild": "publint",