hono 4.11.10 → 4.12.1

package/dist/adapter/aws-lambda/conninfo.js

@@ -0,0 +1,23 @@
+// src/adapter/aws-lambda/conninfo.ts
+var getConnInfo = (c) => {
+  const requestContext = c.env.requestContext;
+  let address;
+  if ("identity" in requestContext && requestContext.identity?.sourceIp) {
+    address = requestContext.identity.sourceIp;
+  } else if ("http" in requestContext && requestContext.http?.sourceIp) {
+    address = requestContext.http.sourceIp;
+  } else {
+    const xff = c.req.header("x-forwarded-for");
+    if (xff) {
+      address = xff.split(",")[0].trim();
+    }
+  }
+  return {
+    remote: {
+      address
+    }
+  };
+};
+export {
+  getConnInfo
+};

package/dist/adapter/aws-lambda/index.js

@@ -1,7 +1,9 @@
 // src/adapter/aws-lambda/index.ts
 import { handle, streamHandle, defaultIsContentTypeBinary } from "./handler.js";
+import { getConnInfo } from "./conninfo.js";
 export {
   defaultIsContentTypeBinary,
+  getConnInfo,
   handle,
   streamHandle
 };

package/dist/adapter/cloudflare-pages/conninfo.js

@@ -0,0 +1,9 @@
+// src/adapter/cloudflare-pages/conninfo.ts
+var getConnInfo = (c) => ({
+  remote: {
+    address: c.req.header("cf-connecting-ip")
+  }
+});
+export {
+  getConnInfo
+};

package/dist/adapter/cloudflare-pages/index.js

@@ -1,6 +1,8 @@
 // src/adapter/cloudflare-pages/index.ts
 import { handle, handleMiddleware, serveStatic } from "./handler.js";
+import { getConnInfo } from "./conninfo.js";
 export {
+  getConnInfo,
   handle,
   handleMiddleware,
   serveStatic

package/dist/adapter/netlify/conninfo.js

@@ -0,0 +1,9 @@
+// src/adapter/netlify/conninfo.ts
+var getConnInfo = (c) => ({
+  remote: {
+    address: c.env.context?.ip
+  }
+});
+export {
+  getConnInfo
+};

package/dist/adapter/netlify/mod.js

@@ -1,5 +1,7 @@
 // src/adapter/netlify/mod.ts
 import { handle } from "./handler.js";
+import { getConnInfo } from "./conninfo.js";
 export {
+  getConnInfo,
   handle
 };

package/dist/cjs/adapter/aws-lambda/conninfo.js

@@ -0,0 +1,46 @@
+"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);
+var conninfo_exports = {};
+__export(conninfo_exports, {
+  getConnInfo: () => getConnInfo
+});
+module.exports = __toCommonJS(conninfo_exports);
+const getConnInfo = (c) => {
+  const requestContext = c.env.requestContext;
+  let address;
+  if ("identity" in requestContext && requestContext.identity?.sourceIp) {
+    address = requestContext.identity.sourceIp;
+  } else if ("http" in requestContext && requestContext.http?.sourceIp) {
+    address = requestContext.http.sourceIp;
+  } else {
+    const xff = c.req.header("x-forwarded-for");
+    if (xff) {
+      address = xff.split(",")[0].trim();
+    }
+  }
+  return {
+    remote: {
+      address
+    }
+  };
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getConnInfo
+});

package/dist/cjs/adapter/aws-lambda/index.js

@@ -19,14 +19,17 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var aws_lambda_exports = {};
 __export(aws_lambda_exports, {
   defaultIsContentTypeBinary: () => import_handler.defaultIsContentTypeBinary,
+  getConnInfo: () => import_conninfo.getConnInfo,
   handle: () => import_handler.handle,
   streamHandle: () => import_handler.streamHandle
 });
 module.exports = __toCommonJS(aws_lambda_exports);
 var import_handler = require("./handler");
+var import_conninfo = require("./conninfo");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   defaultIsContentTypeBinary,
+  getConnInfo,
   handle,
   streamHandle
 });

package/dist/cjs/adapter/cloudflare-pages/conninfo.js

@@ -0,0 +1,32 @@
+"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);
+var conninfo_exports = {};
+__export(conninfo_exports, {
+  getConnInfo: () => getConnInfo
+});
+module.exports = __toCommonJS(conninfo_exports);
+const getConnInfo = (c) => ({
+  remote: {
+    address: c.req.header("cf-connecting-ip")
+  }
+});
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getConnInfo
+});

package/dist/cjs/adapter/cloudflare-pages/index.js

@@ -18,14 +18,17 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var cloudflare_pages_exports = {};
 __export(cloudflare_pages_exports, {
+  getConnInfo: () => import_conninfo.getConnInfo,
   handle: () => import_handler.handle,
   handleMiddleware: () => import_handler.handleMiddleware,
   serveStatic: () => import_handler.serveStatic
 });
 module.exports = __toCommonJS(cloudflare_pages_exports);
 var import_handler = require("./handler");
+var import_conninfo = require("./conninfo");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  getConnInfo,
   handle,
   handleMiddleware,
   serveStatic

package/dist/cjs/adapter/netlify/conninfo.js

@@ -0,0 +1,32 @@
+"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);
+var conninfo_exports = {};
+__export(conninfo_exports, {
+  getConnInfo: () => getConnInfo
+});
+module.exports = __toCommonJS(conninfo_exports);
+const getConnInfo = (c) => ({
+  remote: {
+    address: c.env.context?.ip
+  }
+});
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getConnInfo
+});

package/dist/cjs/adapter/netlify/mod.js

@@ -18,11 +18,14 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var mod_exports = {};
 __export(mod_exports, {
+  getConnInfo: () => import_conninfo.getConnInfo,
   handle: () => import_handler.handle
 });
 module.exports = __toCommonJS(mod_exports);
 var import_handler = require("./handler");
+var import_conninfo = require("./conninfo");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  getConnInfo,
   handle
 });

package/dist/cjs/client/client.js

@@ -62,6 +62,9 @@ class ClientRequestImpl {
       if (args.form) {
         const form = new FormData();
         for (const [k, v] of Object.entries(args.form)) {
+          if (v === void 0) {
+            continue;
+          }
           if (Array.isArray(v)) {
             for (const v2 of v) {
               form.append(k, v2);
@@ -137,7 +140,7 @@ const hc = (baseUrl, options) => createProxy(function proxyCallback(opts) {
   }
   const path = parts.join("/");
   const url = (0, import_utils.mergePath)(baseUrl, path);
-  if (method === "url") {
+  if (method === "url" || method === "path") {
     let result = url;
     if (opts.args[0]) {
       if (opts.args[0].param) {
@@ -148,7 +151,10 @@ const hc = (baseUrl, options) => createProxy(function proxyCallback(opts) {
       }
     }
     result = (0, import_utils.removeIndexString)(result);
-    return new URL(result);
+    if (method === "url") {
+      return new URL(result);
+    }
+    return result.slice(baseUrl.replace(/\/+$/, "").length).replace(/^\/?/, "/");
   }
   if (method === "ws") {
     const webSocketUrl = (0, import_utils.replaceUrlProtocol)(

package/dist/cjs/context.js

@@ -31,6 +31,7 @@ const setDefaultContentType = (contentType, headers) => {
     ...headers
   };
 };
+const createResponseInstance = (body, init) => new Response(body, init);
 class Context {
   #rawRequest;
   #req;
@@ -129,7 +130,7 @@ class Context {
    * The Response object for the current request.
    */
   get res() {
-    return this.#res ||= new Response(null, {
+    return this.#res ||= createResponseInstance(null, {
       headers: this.#preparedHeaders ??= new Headers()
     });
   }
@@ -140,7 +141,7 @@ class Context {
    */
   set res(_res) {
     if (this.#res && _res) {
-      _res = new Response(_res.body, _res);
+      _res = createResponseInstance(_res.body, _res);
       for (const [k, v] of this.#res.headers.entries()) {
         if (k === "content-type") {
           continue;
@@ -230,7 +231,7 @@ class Context {
    */
   header = (name, value, options) => {
     if (this.finalized) {
-      this.#res = new Response(this.#res.body, this.#res);
+      this.#res = createResponseInstance(this.#res.body, this.#res);
     }
     const headers = this.#res ? this.#res.headers : this.#preparedHeaders ??= new Headers();
     if (value === void 0) {
@@ -319,7 +320,7 @@ class Context {
       }
     }
     const status = typeof arg === "number" ? arg : arg?.status ?? this.#status;
-    return new Response(data, { status, headers: responseHeaders });
+    return createResponseInstance(data, { status, headers: responseHeaders });
   }
   newResponse = (...args) => this.#newResponse(...args);
   /**
@@ -344,6 +345,9 @@ class Context {
    * ```
    */
   body = (data, arg, headers) => this.#newResponse(data, arg, headers);
+  #useFastPath() {
+    return !this.#preparedHeaders && !this.#status && !this.finalized;
+  }
   /**
    * `.text()` can render text as `Content-Type:text/plain`.
    *
@@ -357,7 +361,7 @@ class Context {
    * ```
    */
   text = (text, arg, headers) => {
-    return !this.#preparedHeaders && !this.#status && !arg && !headers && !this.finalized ? new Response(text) : this.#newResponse(
+    return this.#useFastPath() && !arg && !headers ? createResponseInstance(text) : this.#newResponse(
       text,
       arg,
       setDefaultContentType(TEXT_PLAIN, headers)
@@ -376,7 +380,7 @@ class Context {
    * ```
    */
   json = (object, arg, headers) => {
-    return this.#newResponse(
+    return this.#useFastPath() && !arg && !headers ? Response.json(object) : this.#newResponse(
       JSON.stringify(object),
       arg,
       setDefaultContentType("application/json", headers)
@@ -424,7 +428,7 @@ class Context {
    * ```
    */
   notFound = () => {
-    this.#notFoundHandler ??= () => new Response();
+    this.#notFoundHandler ??= () => createResponseInstance();
     return this.#notFoundHandler(this);
   };
 }

package/dist/cjs/helper/ssg/index.js

@@ -20,20 +20,25 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var ssg_exports = {};
 __export(ssg_exports, {
   X_HONO_DISABLE_SSG_HEADER_KEY: () => import_middleware.X_HONO_DISABLE_SSG_HEADER_KEY,
+  defaultPlugin: () => import_plugins.defaultPlugin,
   disableSSG: () => import_middleware.disableSSG,
   isSSGContext: () => import_middleware.isSSGContext,
   onlySSG: () => import_middleware.onlySSG,
+  redirectPlugin: () => import_plugins.redirectPlugin,
   ssgParams: () => import_middleware.ssgParams
 });
 module.exports = __toCommonJS(ssg_exports);
 __reExport(ssg_exports, require("./ssg"), module.exports);
 var import_middleware = require("./middleware");
+var import_plugins = require("./plugins");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   X_HONO_DISABLE_SSG_HEADER_KEY,
+  defaultPlugin,
   disableSSG,
   isSSGContext,
   onlySSG,
+  redirectPlugin,
   ssgParams,
   ...require("./ssg")
 });

package/dist/cjs/helper/ssg/plugins.js

@@ -0,0 +1,71 @@
+"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);
+var plugins_exports = {};
+__export(plugins_exports, {
+  defaultPlugin: () => defaultPlugin,
+  redirectPlugin: () => redirectPlugin
+});
+module.exports = __toCommonJS(plugins_exports);
+var import_html = require("../html");
+const defaultPlugin = () => {
+  return {
+    afterResponseHook: (res) => {
+      if (res.status !== 200) {
+        return false;
+      }
+      return res;
+    }
+  };
+};
+const REDIRECT_STATUS_CODES = /* @__PURE__ */ new Set([301, 302, 303, 307, 308]);
+const generateRedirectHtml = (location) => {
+  const content = import_html.html`<!DOCTYPE html>
+<title>Redirecting to: ${location}</title>
+<meta http-equiv="refresh" content="0;url=${location}" />
+<meta name="robots" content="noindex" />
+<link rel="canonical" href="${location}" />
+<body>
+<a href="${location}">Redirecting to <code>${location}</code></a>
+</body>
+`;
+  return content.toString().replace(/\n/g, "");
+};
+const redirectPlugin = () => {
+  return {
+    afterResponseHook: (res) => {
+      if (REDIRECT_STATUS_CODES.has(res.status)) {
+        const location = res.headers.get("Location");
+        if (!location) {
+          return false;
+        }
+        const htmlBody = generateRedirectHtml(location);
+        return new Response(htmlBody, {
+          status: 200,
+          headers: { "Content-Type": "text/html; charset=utf-8" }
+        });
+      }
+      return res;
+    }
+  };
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  defaultPlugin,
+  redirectPlugin
+});

package/dist/cjs/helper/ssg/ssg.js

@@ -23,7 +23,6 @@ __export(ssg_exports, {
   combineAfterResponseHooks: () => combineAfterResponseHooks,
   combineBeforeRequestHooks: () => combineBeforeRequestHooks,
   defaultExtensionMap: () => defaultExtensionMap,
-  defaultPlugin: () => defaultPlugin,
   fetchRoutesContent: () => fetchRoutesContent,
   saveContentToFile: () => saveContentToFile,
   toSSG: () => toSSG
@@ -33,6 +32,7 @@ var import_utils = require("../../client/utils");
 var import_concurrent = require("../../utils/concurrent");
 var import_mime = require("../../utils/mime");
 var import_middleware = require("./middleware");
+var import_plugins = require("./plugins");
 var import_utils2 = require("./utils");
 const DEFAULT_CONCURRENCY = 2;
 const DEFAULT_CONTENT_TYPE = "text/plain";
@@ -214,19 +214,11 @@ const saveContentToFile = async (data, fsModule, outDir, extensionMap) => {
   }
   return filePath;
 };
-const defaultPlugin = {
-  afterResponseHook: (res) => {
-    if (res.status !== 200) {
-      return false;
-    }
-    return res;
-  }
-};
 const toSSG = async (app, fs, options) => {
   let result;
   const getInfoPromises = [];
   const savePromises = [];
-  const plugins = options?.plugins || [defaultPlugin];
+  const plugins = options?.plugins || [(0, import_plugins.defaultPlugin)()];
   const beforeRequestHooks = [];
   const afterResponseHooks = [];
   const afterGenerateHooks = [];
@@ -319,7 +311,6 @@ const toSSG = async (app, fs, options) => {
   combineAfterResponseHooks,
   combineBeforeRequestHooks,
   defaultExtensionMap,
-  defaultPlugin,
   fetchRoutesContent,
   saveContentToFile,
   toSSG

package/dist/cjs/jsx/dom/render.js

@@ -350,7 +350,9 @@ const build = (context, node, children) => {
     let prevNode;
     for (let i = 0; i < children.length; i++) {
       if (Array.isArray(children[i])) {
-        children.splice(i, 1, ...children[i].flat());
+        children.splice(i, 1, ...children[i].flat(Infinity));
+        i--;
+        continue;
       }
       let child = buildNode(children[i]);
       if (child) {

package/dist/cjs/middleware/basic-auth/index.js

@@ -46,6 +46,9 @@ const basicAuth = (options, ...users) => {
     if (requestUser) {
       if (verifyUserInOptions) {
         if (await options.verifyUser(requestUser.username, requestUser.password, ctx)) {
+          if (options.onAuthSuccess) {
+            await options.onAuthSuccess(ctx, requestUser.username);
+          }
           await next();
           return;
         }
@@ -56,6 +59,9 @@ const basicAuth = (options, ...users) => {
             (0, import_buffer.timingSafeEqual)(user.password, requestUser.password, options.hashFunction)
           ]);
           if (usernameEqual && passwordEqual) {
+            if (options.onAuthSuccess) {
+              await options.onAuthSuccess(ctx, requestUser.username);
+            }
             await next();
             return;
           }

package/dist/cjs/middleware/language/language.js

@@ -66,8 +66,19 @@ const normalizeLanguage = (lang, options) => {
     const compSupported = options.supportedLanguages.map(
       (l) => options.ignoreCase ? l.toLowerCase() : l
     );
-    const matchedLang = compSupported.find((l) => l === compLang);
-    return matchedLang ? options.supportedLanguages[compSupported.indexOf(matchedLang)] : void 0;
+    const exactIndex = compSupported.indexOf(compLang);
+    if (exactIndex !== -1) {
+      return options.supportedLanguages[exactIndex];
+    }
+    const parts = compLang.split("-");
+    for (let i = parts.length - 1; i > 0; i--) {
+      const candidate = parts.slice(0, i).join("-");
+      const prefixIndex = compSupported.indexOf(candidate);
+      if (prefixIndex !== -1) {
+        return options.supportedLanguages[prefixIndex];
+      }
+    }
+    return void 0;
   } catch {
     return void 0;
   }

package/dist/cjs/middleware/trailing-slash/index.js

@@ -22,20 +22,34 @@ __export(trailing_slash_exports, {
   trimTrailingSlash: () => trimTrailingSlash
 });
 module.exports = __toCommonJS(trailing_slash_exports);
-const trimTrailingSlash = () => {
+const trimTrailingSlash = (options) => {
   return async function trimTrailingSlash2(c, next) {
+    if (options?.alwaysRedirect) {
+      if ((c.req.method === "GET" || c.req.method === "HEAD") && c.req.path !== "/" && c.req.path.at(-1) === "/") {
+        const url = new URL(c.req.url);
+        url.pathname = url.pathname.substring(0, url.pathname.length - 1);
+        return c.redirect(url.toString(), 301);
+      }
+    }
     await next();
-    if (c.res.status === 404 && (c.req.method === "GET" || c.req.method === "HEAD") && c.req.path !== "/" && c.req.path.at(-1) === "/") {
+    if (!options?.alwaysRedirect && c.res.status === 404 && (c.req.method === "GET" || c.req.method === "HEAD") && c.req.path !== "/" && c.req.path.at(-1) === "/") {
       const url = new URL(c.req.url);
       url.pathname = url.pathname.substring(0, url.pathname.length - 1);
       c.res = c.redirect(url.toString(), 301);
     }
   };
 };
-const appendTrailingSlash = () => {
+const appendTrailingSlash = (options) => {
   return async function appendTrailingSlash2(c, next) {
+    if (options?.alwaysRedirect) {
+      if ((c.req.method === "GET" || c.req.method === "HEAD") && c.req.path.at(-1) !== "/") {
+        const url = new URL(c.req.url);
+        url.pathname += "/";
+        return c.redirect(url.toString(), 301);
+      }
+    }
     await next();
-    if (c.res.status === 404 && (c.req.method === "GET" || c.req.method === "HEAD") && c.req.path.at(-1) !== "/") {
+    if (!options?.alwaysRedirect && c.res.status === 404 && (c.req.method === "GET" || c.req.method === "HEAD") && c.req.path.at(-1) !== "/") {
       const url = new URL(c.req.url);
       url.pathname += "/";
       c.res = c.redirect(url.toString(), 301);