@hono/node-server 1.11.4 → 1.12.0

package/README.md

@@ -169,7 +169,7 @@ my-hono-project/
     index.html
 ```
 
-Typically, you would run your app from the project's root directory (`my-hono-project`), 
+Typically, you would run your app from the project's root directory (`my-hono-project`),
 so you would need the following code to serve the `static` folder:
 
 ```ts
@@ -210,6 +210,19 @@ app.use(
 )
 ```
 
+## ConnInfo Helper
+
+You can use the [ConnInfo Helper](https://hono.dev/docs/helpers/conninfo) by importing `getConnInfo` from `@hono/node-server/conninfo`.
+
+```ts
+import { getConnInfo } from '@hono/node-server/conninfo'
+
+app.get('/', (c) => {
+  const info = getConnInfo(c) // info is `ConnInfo`
+  return c.text(`Your remote address is ${info.remote.address}`)
+})
+```
+
 ## Accessing Node.js API
 
 You can access the Node.js API from `c.env` in Node.js. For example, if you want to specify a type, you can write the following.

package/dist/conninfo.d.mts

@@ -0,0 +1,10 @@
+import { GetConnInfo } from 'hono/conninfo';
+
+/**
+ * ConnInfo Helper for Node.js
+ * @param c Context
+ * @returns ConnInfo
+ */
+declare const getConnInfo: GetConnInfo;
+
+export { getConnInfo };

package/dist/conninfo.d.ts

@@ -0,0 +1,10 @@
+import { GetConnInfo } from 'hono/conninfo';
+
+/**
+ * ConnInfo Helper for Node.js
+ * @param c Context
+ * @returns ConnInfo
+ */
+declare const getConnInfo: GetConnInfo;
+
+export { getConnInfo };

package/dist/conninfo.js

@@ -0,0 +1,45 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/conninfo.ts
+var conninfo_exports = {};
+__export(conninfo_exports, {
+  getConnInfo: () => getConnInfo
+});
+module.exports = __toCommonJS(conninfo_exports);
+var getConnInfo = (c) => {
+  const bindings = c.env.server ? c.env.server : c.env;
+  const address = bindings.incoming.socket.address();
+  if (!("address" in address)) {
+    return {
+      remote: {}
+    };
+  }
+  return {
+    remote: {
+      address: address.address,
+      addressType: address.family === "IPv4" ? "IPv4" : address.family === "IPv6" ? "IPv6" : "unknown",
+      port: address.port
+    }
+  };
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getConnInfo
+});

package/dist/conninfo.mjs

@@ -0,0 +1,20 @@
+// src/conninfo.ts
+var getConnInfo = (c) => {
+  const bindings = c.env.server ? c.env.server : c.env;
+  const address = bindings.incoming.socket.address();
+  if (!("address" in address)) {
+    return {
+      remote: {}
+    };
+  }
+  return {
+    remote: {
+      address: address.address,
+      addressType: address.family === "IPv4" ? "IPv4" : address.family === "IPv6" ? "IPv6" : "unknown",
+      port: address.port
+    }
+  };
+};
+export {
+  getConnInfo
+};

package/dist/serve-static.js

@@ -24,100 +24,8 @@ __export(serve_static_exports, {
 });
 module.exports = __toCommonJS(serve_static_exports);
 var import_fs = require("fs");
-
-// node_modules/hono/dist/utils/filepath.js
-var getFilePath = (options) => {
-  let filename = options.filename;
-  if (/(?:^|[\/\\])\.\.(?:$|[\/\\])/.test(filename)) {
-    return;
-  }
-  let root = options.root || "";
-  const defaultDocument = options.defaultDocument || "index.html";
-  if (filename.endsWith("/")) {
-    filename = filename.concat(defaultDocument);
-  } else if (!filename.match(/\.[a-zA-Z0-9]+$/)) {
-    filename = filename.concat("/" + defaultDocument);
-  }
-  filename = filename.replace(/^\.?[\/\\]/, "");
-  filename = filename.replace(/\\/, "/");
-  root = root.replace(/\/$/, "");
-  let path = root ? root + "/" + filename : filename;
-  path = path.replace(/^\.?\//, "");
-  return path;
-};
-
-// node_modules/hono/dist/utils/mime.js
-var getMimeType = (filename, mimes = baseMimes) => {
-  const regexp = /\.([a-zA-Z0-9]+?)$/;
-  const match = filename.match(regexp);
-  if (!match) {
-    return;
-  }
-  let mimeType = mimes[match[1]];
-  if (mimeType && mimeType.startsWith("text") || mimeType === "application/json") {
-    mimeType += "; charset=utf-8";
-  }
-  return mimeType;
-};
-var baseMimes = {
-  aac: "audio/aac",
-  avi: "video/x-msvideo",
-  avif: "image/avif",
-  av1: "video/av1",
-  bin: "application/octet-stream",
-  bmp: "image/bmp",
-  css: "text/css",
-  csv: "text/csv",
-  eot: "application/vnd.ms-fontobject",
-  epub: "application/epub+zip",
-  gif: "image/gif",
-  gz: "application/gzip",
-  htm: "text/html",
-  html: "text/html",
-  ico: "image/x-icon",
-  ics: "text/calendar",
-  jpeg: "image/jpeg",
-  jpg: "image/jpeg",
-  js: "text/javascript",
-  json: "application/json",
-  jsonld: "application/ld+json",
-  map: "application/json",
-  mid: "audio/x-midi",
-  midi: "audio/x-midi",
-  mjs: "text/javascript",
-  mp3: "audio/mpeg",
-  mp4: "video/mp4",
-  mpeg: "video/mpeg",
-  oga: "audio/ogg",
-  ogv: "video/ogg",
-  ogx: "application/ogg",
-  opus: "audio/opus",
-  otf: "font/otf",
-  pdf: "application/pdf",
-  png: "image/png",
-  rtf: "application/rtf",
-  svg: "image/svg+xml",
-  tif: "image/tiff",
-  tiff: "image/tiff",
-  ts: "video/mp2t",
-  ttf: "font/ttf",
-  txt: "text/plain",
-  wasm: "application/wasm",
-  webm: "video/webm",
-  weba: "audio/webm",
-  webp: "image/webp",
-  woff: "font/woff",
-  woff2: "font/woff2",
-  xhtml: "application/xhtml+xml",
-  xml: "application/xml",
-  zip: "application/zip",
-  "3gp": "video/3gpp",
-  "3g2": "video/3gpp2",
-  gltf: "model/gltf+json",
-  glb: "model/gltf-binary"
-};
-
-// src/serve-static.ts
+var import_filepath = require("hono/utils/filepath");
+var import_mime = require("hono/utils/mime");
 var createStreamBody = (stream) => {
   const body = new ReadableStream({
     start(controller) {
@@ -134,31 +42,55 @@ var createStreamBody = (stream) => {
   });
   return body;
 };
+var addCurrentDirPrefix = (path) => {
+  return `./${path}`;
+};
+var getStats = (path) => {
+  let stats;
+  try {
+    stats = (0, import_fs.lstatSync)(path);
+  } catch {
+  }
+  return stats;
+};
 var serveStatic = (options = { root: "" }) => {
   return async (c, next) => {
     if (c.finalized) {
       return next();
     }
     const filename = options.path ?? decodeURIComponent(c.req.path);
-    let path = getFilePath({
+    let path = (0, import_filepath.getFilePathWithoutDefaultDocument)({
       filename: options.rewriteRequestPath ? options.rewriteRequestPath(filename) : filename,
-      root: options.root,
-      defaultDocument: options.index ?? "index.html"
+      root: options.root
     });
-    if (!path) {
+    if (path) {
+      path = addCurrentDirPrefix(path);
+    } else {
       return next();
     }
-    path = `./${path}`;
-    if (!(0, import_fs.existsSync)(path)) {
+    let stats = getStats(path);
+    if (stats && stats.isDirectory()) {
+      path = (0, import_filepath.getFilePath)({
+        filename: options.rewriteRequestPath ? options.rewriteRequestPath(filename) : filename,
+        root: options.root,
+        defaultDocument: options.index ?? "index.html"
+      });
+      if (path) {
+        path = addCurrentDirPrefix(path);
+      } else {
+        return next();
+      }
+      stats = getStats(path);
+    }
+    if (!stats) {
       await options.onNotFound?.(path, c);
       return next();
     }
-    const mimeType = getMimeType(path);
+    const mimeType = (0, import_mime.getMimeType)(path);
     if (mimeType) {
       c.header("Content-Type", mimeType);
     }
-    const stat = (0, import_fs.lstatSync)(path);
-    const size = stat.size;
+    const size = stats.size;
     if (c.req.method == "HEAD" || c.req.method == "OPTIONS") {
       c.header("Content-Length", size.toString());
       c.status(200);
@@ -170,17 +102,17 @@ var serveStatic = (options = { root: "" }) => {
       return c.body(createStreamBody((0, import_fs.createReadStream)(path)), 200);
     }
     c.header("Accept-Ranges", "bytes");
-    c.header("Date", stat.birthtime.toUTCString());
+    c.header("Date", stats.birthtime.toUTCString());
     const parts = range.replace(/bytes=/, "").split("-", 2);
     const start = parts[0] ? parseInt(parts[0], 10) : 0;
-    let end = parts[1] ? parseInt(parts[1], 10) : stat.size - 1;
+    let end = parts[1] ? parseInt(parts[1], 10) : stats.size - 1;
     if (size < end - start + 1) {
       end = size - 1;
     }
     const chunksize = end - start + 1;
     const stream = (0, import_fs.createReadStream)(path, { start, end });
     c.header("Content-Length", chunksize.toString());
-    c.header("Content-Range", `bytes ${start}-${end}/${stat.size}`);
+    c.header("Content-Range", `bytes ${start}-${end}/${stats.size}`);
     return c.body(createStreamBody(stream), 206);
   };
 };

package/dist/serve-static.mjs

@@ -1,99 +1,7 @@
 // src/serve-static.ts
-import { createReadStream, existsSync, lstatSync } from "fs";
-
-// node_modules/hono/dist/utils/filepath.js
-var getFilePath = (options) => {
-  let filename = options.filename;
-  if (/(?:^|[\/\\])\.\.(?:$|[\/\\])/.test(filename)) {
-    return;
-  }
-  let root = options.root || "";
-  const defaultDocument = options.defaultDocument || "index.html";
-  if (filename.endsWith("/")) {
-    filename = filename.concat(defaultDocument);
-  } else if (!filename.match(/\.[a-zA-Z0-9]+$/)) {
-    filename = filename.concat("/" + defaultDocument);
-  }
-  filename = filename.replace(/^\.?[\/\\]/, "");
-  filename = filename.replace(/\\/, "/");
-  root = root.replace(/\/$/, "");
-  let path = root ? root + "/" + filename : filename;
-  path = path.replace(/^\.?\//, "");
-  return path;
-};
-
-// node_modules/hono/dist/utils/mime.js
-var getMimeType = (filename, mimes = baseMimes) => {
-  const regexp = /\.([a-zA-Z0-9]+?)$/;
-  const match = filename.match(regexp);
-  if (!match) {
-    return;
-  }
-  let mimeType = mimes[match[1]];
-  if (mimeType && mimeType.startsWith("text") || mimeType === "application/json") {
-    mimeType += "; charset=utf-8";
-  }
-  return mimeType;
-};
-var baseMimes = {
-  aac: "audio/aac",
-  avi: "video/x-msvideo",
-  avif: "image/avif",
-  av1: "video/av1",
-  bin: "application/octet-stream",
-  bmp: "image/bmp",
-  css: "text/css",
-  csv: "text/csv",
-  eot: "application/vnd.ms-fontobject",
-  epub: "application/epub+zip",
-  gif: "image/gif",
-  gz: "application/gzip",
-  htm: "text/html",
-  html: "text/html",
-  ico: "image/x-icon",
-  ics: "text/calendar",
-  jpeg: "image/jpeg",
-  jpg: "image/jpeg",
-  js: "text/javascript",
-  json: "application/json",
-  jsonld: "application/ld+json",
-  map: "application/json",
-  mid: "audio/x-midi",
-  midi: "audio/x-midi",
-  mjs: "text/javascript",
-  mp3: "audio/mpeg",
-  mp4: "video/mp4",
-  mpeg: "video/mpeg",
-  oga: "audio/ogg",
-  ogv: "video/ogg",
-  ogx: "application/ogg",
-  opus: "audio/opus",
-  otf: "font/otf",
-  pdf: "application/pdf",
-  png: "image/png",
-  rtf: "application/rtf",
-  svg: "image/svg+xml",
-  tif: "image/tiff",
-  tiff: "image/tiff",
-  ts: "video/mp2t",
-  ttf: "font/ttf",
-  txt: "text/plain",
-  wasm: "application/wasm",
-  webm: "video/webm",
-  weba: "audio/webm",
-  webp: "image/webp",
-  woff: "font/woff",
-  woff2: "font/woff2",
-  xhtml: "application/xhtml+xml",
-  xml: "application/xml",
-  zip: "application/zip",
-  "3gp": "video/3gpp",
-  "3g2": "video/3gpp2",
-  gltf: "model/gltf+json",
-  glb: "model/gltf-binary"
-};
-
-// src/serve-static.ts
+import { createReadStream, lstatSync } from "fs";
+import { getFilePath, getFilePathWithoutDefaultDocument } from "hono/utils/filepath";
+import { getMimeType } from "hono/utils/mime";
 var createStreamBody = (stream) => {
   const body = new ReadableStream({
     start(controller) {
@@ -110,22 +18,47 @@ var createStreamBody = (stream) => {
   });
   return body;
 };
+var addCurrentDirPrefix = (path) => {
+  return `./${path}`;
+};
+var getStats = (path) => {
+  let stats;
+  try {
+    stats = lstatSync(path);
+  } catch {
+  }
+  return stats;
+};
 var serveStatic = (options = { root: "" }) => {
   return async (c, next) => {
     if (c.finalized) {
       return next();
     }
     const filename = options.path ?? decodeURIComponent(c.req.path);
-    let path = getFilePath({
+    let path = getFilePathWithoutDefaultDocument({
       filename: options.rewriteRequestPath ? options.rewriteRequestPath(filename) : filename,
-      root: options.root,
-      defaultDocument: options.index ?? "index.html"
+      root: options.root
     });
-    if (!path) {
+    if (path) {
+      path = addCurrentDirPrefix(path);
+    } else {
       return next();
     }
-    path = `./${path}`;
-    if (!existsSync(path)) {
+    let stats = getStats(path);
+    if (stats && stats.isDirectory()) {
+      path = getFilePath({
+        filename: options.rewriteRequestPath ? options.rewriteRequestPath(filename) : filename,
+        root: options.root,
+        defaultDocument: options.index ?? "index.html"
+      });
+      if (path) {
+        path = addCurrentDirPrefix(path);
+      } else {
+        return next();
+      }
+      stats = getStats(path);
+    }
+    if (!stats) {
       await options.onNotFound?.(path, c);
       return next();
     }
@@ -133,8 +66,7 @@ var serveStatic = (options = { root: "" }) => {
     if (mimeType) {
       c.header("Content-Type", mimeType);
     }
-    const stat = lstatSync(path);
-    const size = stat.size;
+    const size = stats.size;
     if (c.req.method == "HEAD" || c.req.method == "OPTIONS") {
       c.header("Content-Length", size.toString());
       c.status(200);
@@ -146,17 +78,17 @@ var serveStatic = (options = { root: "" }) => {
       return c.body(createStreamBody(createReadStream(path)), 200);
     }
     c.header("Accept-Ranges", "bytes");
-    c.header("Date", stat.birthtime.toUTCString());
+    c.header("Date", stats.birthtime.toUTCString());
     const parts = range.replace(/bytes=/, "").split("-", 2);
     const start = parts[0] ? parseInt(parts[0], 10) : 0;
-    let end = parts[1] ? parseInt(parts[1], 10) : stat.size - 1;
+    let end = parts[1] ? parseInt(parts[1], 10) : stats.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}/${stat.size}`);
+    c.header("Content-Range", `bytes ${start}-${end}/${stats.size}`);
     return c.body(createStreamBody(stream), 206);
   };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hono/node-server",
-  "version": "1.11.4",
+  "version": "1.12.0",
   "description": "Node.js Adapter for Hono",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -27,6 +27,11 @@
       "types": "./dist/utils/*.d.ts",
       "require": "./dist/utils/*.js",
       "import": "./dist/utils/*.mjs"
+    },
+    "./conninfo": {
+      "types": "./dist/conninfo.d.ts",
+      "require": "./dist/conninfo.js",
+      "import": "./dist/conninfo.mjs"
     }
   },
   "typesVersions": {
@@ -42,12 +47,15 @@
       ],
       "utils/*": [
         "./dist/utils/*.d.ts"
+      ],
+      "conninfo": [
+        "./dist/conninfo.d.ts"
       ]
     }
   },
   "scripts": {
     "test": "node --expose-gc ./node_modules/.bin/jest",
-    "build": "tsup",
+    "build": "tsup --external hono",
     "watch": "tsup --watch",
     "postbuild": "publint",
     "prerelease": "yarn build && yarn test",
@@ -78,7 +86,7 @@
     "@types/supertest": "^2.0.12",
     "@whatwg-node/fetch": "^0.9.14",
     "eslint": "^8.55.0",
-    "hono": "^4.0.3",
+    "hono": "^4.4.10",
     "jest": "^29.6.1",
     "np": "^7.7.0",
     "prettier": "^3.2.4",