@hono/node-server 1.19.4 → 1.19.6

package/dist/index.js

@@ -302,12 +302,16 @@ async function readWithoutBlocking(readPromise) {
   return Promise.race([readPromise, Promise.resolve().then(() => Promise.resolve(void 0))]);
 }
 function writeFromReadableStreamDefaultReader(reader, writable, currentReadPromise) {
-  const handleError = () => {
+  const cancel = (error) => {
+    reader.cancel(error).catch(() => {
+    });
   };
-  writable.on("error", handleError);
+  writable.on("close", cancel);
+  writable.on("error", cancel);
   (currentReadPromise ?? reader.read()).then(flow, handleStreamError);
   return reader.closed.finally(() => {
-    writable.off("error", handleError);
+    writable.off("close", cancel);
+    writable.off("error", cancel);
   });
   function handleStreamError(error) {
     if (error) {

package/dist/index.mjs

@@ -263,12 +263,16 @@ async function readWithoutBlocking(readPromise) {
   return Promise.race([readPromise, Promise.resolve().then(() => Promise.resolve(void 0))]);
 }
 function writeFromReadableStreamDefaultReader(reader, writable, currentReadPromise) {
-  const handleError = () => {
+  const cancel = (error) => {
+    reader.cancel(error).catch(() => {
+    });
   };
-  writable.on("error", handleError);
+  writable.on("close", cancel);
+  writable.on("error", cancel);
   (currentReadPromise ?? reader.read()).then(flow, handleStreamError);
   return reader.closed.finally(() => {
-    writable.off("error", handleError);
+    writable.off("close", cancel);
+    writable.off("error", cancel);
   });
   function handleStreamError(error) {
     if (error) {

package/dist/listener.js

@@ -294,12 +294,16 @@ async function readWithoutBlocking(readPromise) {
   return Promise.race([readPromise, Promise.resolve().then(() => Promise.resolve(void 0))]);
 }
 function writeFromReadableStreamDefaultReader(reader, writable, currentReadPromise) {
-  const handleError = () => {
+  const cancel = (error) => {
+    reader.cancel(error).catch(() => {
+    });
   };
-  writable.on("error", handleError);
+  writable.on("close", cancel);
+  writable.on("error", cancel);
   (currentReadPromise ?? reader.read()).then(flow, handleStreamError);
   return reader.closed.finally(() => {
-    writable.off("error", handleError);
+    writable.off("close", cancel);
+    writable.off("error", cancel);
   });
   function handleStreamError(error) {
     if (error) {

package/dist/listener.mjs

@@ -260,12 +260,16 @@ async function readWithoutBlocking(readPromise) {
   return Promise.race([readPromise, Promise.resolve().then(() => Promise.resolve(void 0))]);
 }
 function writeFromReadableStreamDefaultReader(reader, writable, currentReadPromise) {
-  const handleError = () => {
+  const cancel = (error) => {
+    reader.cancel(error).catch(() => {
+    });
   };
-  writable.on("error", handleError);
+  writable.on("close", cancel);
+  writable.on("error", cancel);
   (currentReadPromise ?? reader.read()).then(flow, handleStreamError);
   return reader.closed.finally(() => {
-    writable.off("error", handleError);
+    writable.off("close", cancel);
+    writable.off("error", cancel);
   });
   function handleStreamError(error) {
     if (error) {

package/dist/serve-static.js

@@ -98,7 +98,6 @@ var serveStatic = (options = { root: "" }) => {
       await options.onNotFound?.(path, c);
       return next();
     }
-    await options.onFound?.(path, c);
     const mimeType = (0, import_mime.getMimeType)(path);
     c.header("Content-Type", mimeType || "application/octet-stream");
     if (options.precompressed && (!mimeType || COMPRESSIBLE_CONTENT_TYPE_REGEX.test(mimeType))) {
@@ -119,30 +118,33 @@ var serveStatic = (options = { root: "" }) => {
         }
       }
     }
+    let result;
     const size = stats.size;
+    const range = c.req.header("range") || "";
     if (c.req.method == "HEAD" || c.req.method == "OPTIONS") {
       c.header("Content-Length", size.toString());
       c.status(200);
-      return c.body(null);
-    }
-    const range = c.req.header("range") || "";
-    if (!range) {
+      result = c.body(null);
+    } else if (!range) {
       c.header("Content-Length", size.toString());
-      return c.body(createStreamBody((0, import_node_fs.createReadStream)(path)), 200);
-    }
-    c.header("Accept-Ranges", "bytes");
-    c.header("Date", stats.birthtime.toUTCString());
-    const parts = range.replace(/bytes=/, "").split("-", 2);
-    const start = parseInt(parts[0], 10) || 0;
-    let end = parseInt(parts[1], 10) || size - 1;
-    if (size < end - start + 1) {
-      end = size - 1;
+      result = c.body(createStreamBody((0, import_node_fs.createReadStream)(path)), 200);
+    } else {
+      c.header("Accept-Ranges", "bytes");
+      c.header("Date", stats.birthtime.toUTCString());
+      const parts = range.replace(/bytes=/, "").split("-", 2);
+      const start = parseInt(parts[0], 10) || 0;
+      let end = parseInt(parts[1], 10) || size - 1;
+      if (size < end - start + 1) {
+        end = size - 1;
+      }
+      const chunksize = end - start + 1;
+      const stream = (0, import_node_fs.createReadStream)(path, { start, end });
+      c.header("Content-Length", chunksize.toString());
+      c.header("Content-Range", `bytes ${start}-${end}/${stats.size}`);
+      result = c.body(createStreamBody(stream), 206);
     }
-    const chunksize = end - start + 1;
-    const stream = (0, import_node_fs.createReadStream)(path, { start, end });
-    c.header("Content-Length", chunksize.toString());
-    c.header("Content-Range", `bytes ${start}-${end}/${stats.size}`);
-    return c.body(createStreamBody(stream), 206);
+    await options.onFound?.(path, c);
+    return result;
   };
 };
 // Annotate the CommonJS export names for ESM import in node:

package/dist/serve-static.mjs

@@ -74,7 +74,6 @@ var serveStatic = (options = { root: "" }) => {
       await options.onNotFound?.(path, c);
       return next();
     }
-    await options.onFound?.(path, c);
     const mimeType = getMimeType(path);
     c.header("Content-Type", mimeType || "application/octet-stream");
     if (options.precompressed && (!mimeType || COMPRESSIBLE_CONTENT_TYPE_REGEX.test(mimeType))) {
@@ -95,30 +94,33 @@ var serveStatic = (options = { root: "" }) => {
         }
       }
     }
+    let result;
     const size = stats.size;
+    const range = c.req.header("range") || "";
     if (c.req.method == "HEAD" || c.req.method == "OPTIONS") {
       c.header("Content-Length", size.toString());
       c.status(200);
-      return c.body(null);
-    }
-    const range = c.req.header("range") || "";
-    if (!range) {
+      result = c.body(null);
+    } else if (!range) {
       c.header("Content-Length", size.toString());
-      return c.body(createStreamBody(createReadStream(path)), 200);
-    }
-    c.header("Accept-Ranges", "bytes");
-    c.header("Date", stats.birthtime.toUTCString());
-    const parts = range.replace(/bytes=/, "").split("-", 2);
-    const start = parseInt(parts[0], 10) || 0;
-    let end = parseInt(parts[1], 10) || size - 1;
-    if (size < end - start + 1) {
-      end = size - 1;
+      result = c.body(createStreamBody(createReadStream(path)), 200);
+    } else {
+      c.header("Accept-Ranges", "bytes");
+      c.header("Date", stats.birthtime.toUTCString());
+      const parts = range.replace(/bytes=/, "").split("-", 2);
+      const start = parseInt(parts[0], 10) || 0;
+      let end = parseInt(parts[1], 10) || size - 1;
+      if (size < end - start + 1) {
+        end = size - 1;
+      }
+      const chunksize = end - start + 1;
+      const stream = createReadStream(path, { start, end });
+      c.header("Content-Length", chunksize.toString());
+      c.header("Content-Range", `bytes ${start}-${end}/${stats.size}`);
+      result = c.body(createStreamBody(stream), 206);
     }
-    const chunksize = end - start + 1;
-    const stream = createReadStream(path, { start, end });
-    c.header("Content-Length", chunksize.toString());
-    c.header("Content-Range", `bytes ${start}-${end}/${stats.size}`);
-    return c.body(createStreamBody(stream), 206);
+    await options.onFound?.(path, c);
+    return result;
   };
 };
 export {

package/dist/server.js

@@ -298,12 +298,16 @@ async function readWithoutBlocking(readPromise) {
   return Promise.race([readPromise, Promise.resolve().then(() => Promise.resolve(void 0))]);
 }
 function writeFromReadableStreamDefaultReader(reader, writable, currentReadPromise) {
-  const handleError = () => {
+  const cancel = (error) => {
+    reader.cancel(error).catch(() => {
+    });
   };
-  writable.on("error", handleError);
+  writable.on("close", cancel);
+  writable.on("error", cancel);
   (currentReadPromise ?? reader.read()).then(flow, handleStreamError);
   return reader.closed.finally(() => {
-    writable.off("error", handleError);
+    writable.off("close", cancel);
+    writable.off("error", cancel);
   });
   function handleStreamError(error) {
     if (error) {

package/dist/server.mjs

@@ -263,12 +263,16 @@ async function readWithoutBlocking(readPromise) {
   return Promise.race([readPromise, Promise.resolve().then(() => Promise.resolve(void 0))]);
 }
 function writeFromReadableStreamDefaultReader(reader, writable, currentReadPromise) {
-  const handleError = () => {
+  const cancel = (error) => {
+    reader.cancel(error).catch(() => {
+    });
   };
-  writable.on("error", handleError);
+  writable.on("close", cancel);
+  writable.on("error", cancel);
   (currentReadPromise ?? reader.read()).then(flow, handleStreamError);
   return reader.closed.finally(() => {
-    writable.off("error", handleError);
+    writable.off("close", cancel);
+    writable.off("error", cancel);
   });
   function handleStreamError(error) {
     if (error) {

package/dist/utils.js

@@ -30,12 +30,16 @@ async function readWithoutBlocking(readPromise) {
   return Promise.race([readPromise, Promise.resolve().then(() => Promise.resolve(void 0))]);
 }
 function writeFromReadableStreamDefaultReader(reader, writable, currentReadPromise) {
-  const handleError = () => {
+  const cancel = (error) => {
+    reader.cancel(error).catch(() => {
+    });
   };
-  writable.on("error", handleError);
+  writable.on("close", cancel);
+  writable.on("error", cancel);
   (currentReadPromise ?? reader.read()).then(flow, handleStreamError);
   return reader.closed.finally(() => {
-    writable.off("error", handleError);
+    writable.off("close", cancel);
+    writable.off("error", cancel);
   });
   function handleStreamError(error) {
     if (error) {

package/dist/utils.mjs

@@ -3,12 +3,16 @@ async function readWithoutBlocking(readPromise) {
   return Promise.race([readPromise, Promise.resolve().then(() => Promise.resolve(void 0))]);
 }
 function writeFromReadableStreamDefaultReader(reader, writable, currentReadPromise) {
-  const handleError = () => {
+  const cancel = (error) => {
+    reader.cancel(error).catch(() => {
+    });
   };
-  writable.on("error", handleError);
+  writable.on("close", cancel);
+  writable.on("error", cancel);
   (currentReadPromise ?? reader.read()).then(flow, handleStreamError);
   return reader.closed.finally(() => {
-    writable.off("error", handleError);
+    writable.off("close", cancel);
+    writable.off("error", cancel);
   });
   function handleStreamError(error) {
     if (error) {

package/dist/vercel.js

@@ -296,12 +296,16 @@ async function readWithoutBlocking(readPromise) {
   return Promise.race([readPromise, Promise.resolve().then(() => Promise.resolve(void 0))]);
 }
 function writeFromReadableStreamDefaultReader(reader, writable, currentReadPromise) {
-  const handleError = () => {
+  const cancel = (error) => {
+    reader.cancel(error).catch(() => {
+    });
   };
-  writable.on("error", handleError);
+  writable.on("close", cancel);
+  writable.on("error", cancel);
   (currentReadPromise ?? reader.read()).then(flow, handleStreamError);
   return reader.closed.finally(() => {
-    writable.off("error", handleError);
+    writable.off("close", cancel);
+    writable.off("error", cancel);
   });
   function handleStreamError(error) {
     if (error) {

package/dist/vercel.mjs

@@ -260,12 +260,16 @@ async function readWithoutBlocking(readPromise) {
   return Promise.race([readPromise, Promise.resolve().then(() => Promise.resolve(void 0))]);
 }
 function writeFromReadableStreamDefaultReader(reader, writable, currentReadPromise) {
-  const handleError = () => {
+  const cancel = (error) => {
+    reader.cancel(error).catch(() => {
+    });
   };
-  writable.on("error", handleError);
+  writable.on("close", cancel);
+  writable.on("error", cancel);
   (currentReadPromise ?? reader.read()).then(flow, handleStreamError);
   return reader.closed.finally(() => {
-    writable.off("error", handleError);
+    writable.off("close", cancel);
+    writable.off("error", cancel);
   });
   function handleStreamError(error) {
     if (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hono/node-server",
-  "version": "1.19.4",
+  "version": "1.19.6",
   "description": "Node.js Adapter for Hono",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",