hono 3.12.5 → 3.12.7

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

@@ -62,13 +62,7 @@ var createResult = async (event, res) => {
     const contentEncoding = res.headers.get("content-encoding");
     isBase64Encoded = isContentEncodingBinary(contentEncoding);
   }
-  let body;
-  if (isBase64Encoded) {
-    const buffer = await res.arrayBuffer();
-    body = encodeBase64(buffer);
-  } else {
-    body = await res.text();
-  }
+  const body = isBase64Encoded ? encodeBase64(await res.arrayBuffer()) : await res.text();
   const result = {
     body,
     headers: {},

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

@@ -93,13 +93,7 @@ const createResult = async (event, res) => {
     const contentEncoding = res.headers.get("content-encoding");
     isBase64Encoded = isContentEncodingBinary(contentEncoding);
   }
-  let body;
-  if (isBase64Encoded) {
-    const buffer = await res.arrayBuffer();
-    body = (0, import_encode.encodeBase64)(buffer);
-  } else {
-    body = await res.text();
-  }
+  const body = isBase64Encoded ? (0, import_encode.encodeBase64)(await res.arrayBuffer()) : await res.text();
   const result = {
     body,
     headers: {},

package/dist/cjs/context.js

@@ -45,6 +45,10 @@ var import_html = require("./utils/html");
 var import_stream = require("./utils/stream");
 var _status, _executionCtx, _headers, _preparedHeaders, _res, _isFresh;
 const TEXT_PLAIN = "text/plain; charset=UTF-8";
+const setHeaders = (headers, map = {}) => {
+  Object.entries(map).forEach(([key, value]) => headers.set(key, value));
+  return headers;
+};
 class Context {
   constructor(req, options) {
     this.env = {};
@@ -116,21 +120,21 @@ class Context {
         });
       }
       if (arg && typeof arg !== "number") {
-        this.res = new Response(data, arg);
+        const headers2 = setHeaders(new Headers(arg.headers), __privateGet(this, _preparedHeaders));
+        return new Response(data, {
+          headers: headers2,
+          status: arg.status
+        });
       }
-      const status = typeof arg === "number" ? arg : arg ? arg.status : __privateGet(this, _status);
+      const status = typeof arg === "number" ? arg : __privateGet(this, _status);
       __privateGet(this, _preparedHeaders) ?? __privateSet(this, _preparedHeaders, {});
       __privateGet(this, _headers) ?? __privateSet(this, _headers, new Headers());
-      for (const [k, v] of Object.entries(__privateGet(this, _preparedHeaders))) {
-        __privateGet(this, _headers).set(k, v);
-      }
+      setHeaders(__privateGet(this, _headers), __privateGet(this, _preparedHeaders));
       if (__privateGet(this, _res)) {
         __privateGet(this, _res).headers.forEach((v, k) => {
           __privateGet(this, _headers)?.set(k, v);
         });
-        for (const [k, v] of Object.entries(__privateGet(this, _preparedHeaders))) {
-          __privateGet(this, _headers).set(k, v);
-        }
+        setHeaders(__privateGet(this, _headers), __privateGet(this, _preparedHeaders));
       }
       headers ?? (headers = {});
       for (const [k, v] of Object.entries(headers)) {

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

@@ -43,6 +43,9 @@ const inspectRoutes = (hono) => {
   });
 };
 const showRoutes = (hono, opts) => {
+  const { process, Deno } = globalThis;
+  const isNoColor = typeof process !== "undefined" ? "NO_COLOR" in process?.env : typeof Deno?.noColor === "boolean" ? Deno.noColor : false;
+  const colorEnabled = opts?.colorize ?? !isNoColor;
   const routeData = {};
   let maxMethodLength = 0;
   let maxPathLength = 0;
@@ -60,7 +63,7 @@ const showRoutes = (hono, opts) => {
       return;
     }
     const { method, path, routes } = data;
-    const methodStr = opts?.colorize ?? true ? `\x1B[32m${method}\x1B[0m` : method;
+    const methodStr = colorEnabled ? `\x1B[32m${method}\x1B[0m` : method;
     console.log(`${methodStr} ${" ".repeat(maxMethodLength - method.length)} ${path}`);
     if (!opts?.verbose) {
       return;

package/dist/cjs/hono-base.js

@@ -248,27 +248,16 @@ const _Hono = class extends defineDynamicClass() {
       let res;
       try {
         res = matchResult[0][0][0][0](c, async () => {
+          c.res = await this.notFoundHandler(c);
         });
-        if (!res) {
-          return this.notFoundHandler(c);
-        }
       } catch (err) {
         return this.handleError(err, c);
       }
       if (res instanceof Response)
         return res;
-      return (async () => {
-        let awaited;
-        try {
-          awaited = await res;
-          if (!awaited) {
-            return this.notFoundHandler(c);
-          }
-        } catch (err) {
-          return this.handleError(err, c);
-        }
-        return awaited;
-      })();
+      return res.then(
+        (resolved) => resolved || (c.finalized ? c.res : this.notFoundHandler(c))
+      ).catch((err) => this.handleError(err, c));
     }
     const composed = (0, import_compose.compose)(matchResult[0], this.errorHandler, this.notFoundHandler);
     return (async () => {

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

@@ -54,16 +54,10 @@ const basicAuth = (options, ...users) => {
     const requestUser = auth(ctx.req);
     if (requestUser) {
       for (const user of users) {
-        const usernameEqual = await (0, import_buffer.timingSafeEqual)(
-          user.username,
-          requestUser.username,
-          options.hashFunction
-        );
-        const passwordEqual = await (0, import_buffer.timingSafeEqual)(
-          user.password,
-          requestUser.password,
-          options.hashFunction
-        );
+        const [usernameEqual, passwordEqual] = await Promise.all([
+          (0, import_buffer.timingSafeEqual)(user.username, requestUser.username, options.hashFunction),
+          (0, import_buffer.timingSafeEqual)(user.password, requestUser.password, options.hashFunction)
+        ]);
         if (usernameEqual && passwordEqual) {
           await next();
           return;

package/dist/cjs/middleware/cache/index.js

@@ -42,21 +42,20 @@ const cache = (options) => {
     const key = c.req.url;
     const cache3 = await caches.open(options.cacheName);
     const response = await cache3.match(key);
-    if (!response) {
-      await next();
-      if (!c.res.ok) {
-        return;
-      }
-      addHeader(c);
-      const response2 = c.res.clone();
-      if (options.wait) {
-        await cache3.put(key, response2);
-      } else {
-        c.executionCtx.waitUntil(cache3.put(key, response2));
-      }
-    } else {
+    if (response) {
       return new Response(response.body, response);
     }
+    await next();
+    if (!c.res.ok) {
+      return;
+    }
+    addHeader(c);
+    const res = c.res.clone();
+    if (options.wait) {
+      await cache3.put(key, res);
+    } else {
+      c.executionCtx.waitUntil(cache3.put(key, res));
+    }
   };
 };
 // Annotate the CommonJS export names for ESM import in node:

package/dist/cjs/middleware/cors/index.js

@@ -58,9 +58,7 @@ const cors = (options) => {
     if (opts.exposeHeaders?.length) {
       set("Access-Control-Expose-Headers", opts.exposeHeaders.join(","));
     }
-    if (c.req.method !== "OPTIONS") {
-      await next();
-    } else {
+    if (c.req.method === "OPTIONS") {
       if (opts.maxAge != null) {
         set("Access-Control-Max-Age", opts.maxAge.toString());
       }
@@ -86,6 +84,7 @@ const cors = (options) => {
         statusText: c.res.statusText
       });
     }
+    await next();
   };
 };
 // Annotate the CommonJS export names for ESM import in node:

package/dist/cjs/middleware/jwt/index.js

@@ -40,13 +40,13 @@ const jwt = (options) => {
     if (credentials) {
       const parts = credentials.split(/\s+/);
       if (parts.length !== 2) {
-        const res = new Response("Unauthorized", {
-          status: 401,
-          headers: {
-            "WWW-Authenticate": `Bearer realm="${ctx.req.url}",error="invalid_request",error_description="invalid credentials structure"`
-          }
+        throw new import_http_exception.HTTPException(401, {
+          res: unauthorizedResponse({
+            ctx,
+            error: "invalid_request",
+            errDescription: "invalid credentials structure"
+          })
         });
-        throw new import_http_exception.HTTPException(401, { res });
       } else {
         token = parts[1];
       }
@@ -54,13 +54,13 @@ const jwt = (options) => {
       token = ctx.req.cookie(options.cookie);
     }
     if (!token) {
-      const res = new Response("Unauthorized", {
-        status: 401,
-        headers: {
-          "WWW-Authenticate": `Bearer realm="${ctx.req.url}",error="invalid_request",error_description="no authorization included in request"`
-        }
+      throw new import_http_exception.HTTPException(401, {
+        res: unauthorizedResponse({
+          ctx,
+          error: "invalid_request",
+          errDescription: "no authorization included in request"
+        })
       });
-      throw new import_http_exception.HTTPException(401, { res });
     }
     let payload;
     let msg = "";
@@ -70,19 +70,28 @@ const jwt = (options) => {
       msg = `${e}`;
     }
     if (!payload) {
-      const res = new Response("Unauthorized", {
-        status: 401,
-        statusText: msg,
-        headers: {
-          "WWW-Authenticate": `Bearer realm="${ctx.req.url}",error="invalid_token",error_description="token verification failure"`
-        }
+      throw new import_http_exception.HTTPException(401, {
+        res: unauthorizedResponse({
+          ctx,
+          error: "invalid_token",
+          statusText: msg,
+          errDescription: "token verification failure"
+        })
       });
-      throw new import_http_exception.HTTPException(401, { res });
     }
     ctx.set("jwtPayload", payload);
     await next();
   };
 };
+function unauthorizedResponse(opts) {
+  return new Response("Unauthorized", {
+    status: 401,
+    statusText: opts.statusText,
+    headers: {
+      "WWW-Authenticate": `Bearer realm="${opts.ctx.req.url}",error="${opts.error}",error_description="${opts.errDescription}"`
+    }
+  });
+}
 const verify = import_jwt.Jwt.verify;
 const decode = import_jwt.Jwt.decode;
 const sign = import_jwt.Jwt.sign;

package/dist/cjs/middleware/secure-headers/index.js

@@ -51,38 +51,48 @@ const DEFAULT_OPTIONS = {
 };
 const secureHeaders = (customOptions) => {
   const options = { ...DEFAULT_OPTIONS, ...customOptions };
-  const headersToSet = Object.entries(HEADERS_MAP).filter(([key]) => options[key]).map(([key, defaultValue]) => {
-    const overrideValue = options[key];
-    if (typeof overrideValue === "string")
-      return [defaultValue[0], overrideValue];
-    return defaultValue;
-  });
+  const headersToSet = getFilteredHeaders(options);
   if (options.contentSecurityPolicy) {
-    const cspDirectives = Object.entries(options.contentSecurityPolicy).map(([directive, value]) => {
-      directive = directive.replace(
-        /[A-Z]+(?![a-z])|[A-Z]/g,
-        (match, offset) => (offset ? "-" : "") + match.toLowerCase()
-      );
-      return `${directive} ${Array.isArray(value) ? value.join(" ") : value}`;
-    }).join("; ");
-    headersToSet.push(["Content-Security-Policy", cspDirectives]);
+    headersToSet.push(["Content-Security-Policy", getCSPDirectives(options.contentSecurityPolicy)]);
   }
   if (options.reportingEndpoints) {
-    const reportingEndpoints = options.reportingEndpoints.map((endpoint) => `${endpoint.name}="${endpoint.url}"`).join(", ");
-    headersToSet.push(["Reporting-Endpoints", reportingEndpoints]);
+    headersToSet.push(["Reporting-Endpoints", getReportingEndpoints(options.reportingEndpoints)]);
   }
   if (options.reportTo) {
-    const reportToOptions = options.reportTo.map((option) => JSON.stringify(option)).join(", ");
-    headersToSet.push(["Report-To", reportToOptions]);
+    headersToSet.push(["Report-To", getReportToOptions(options.reportTo)]);
   }
   return async function secureHeaders2(ctx, next) {
     await next();
-    headersToSet.forEach(([header, value]) => {
-      ctx.res.headers.set(header, value);
-    });
+    setHeaders(ctx, headersToSet);
     ctx.res.headers.delete("X-Powered-By");
   };
 };
+function getFilteredHeaders(options) {
+  return Object.entries(HEADERS_MAP).filter(([key]) => options[key]).map(([key, defaultValue]) => {
+    const overrideValue = options[key];
+    return typeof overrideValue === "string" ? [defaultValue[0], overrideValue] : defaultValue;
+  });
+}
+function getCSPDirectives(contentSecurityPolicy) {
+  return Object.entries(contentSecurityPolicy || []).map(([directive, value]) => {
+    const kebabCaseDirective = directive.replace(
+      /[A-Z]+(?![a-z])|[A-Z]/g,
+      (match, offset) => offset ? "-" + match.toLowerCase() : match.toLowerCase()
+    );
+    return `${kebabCaseDirective} ${Array.isArray(value) ? value.join(" ") : value}`;
+  }).join("; ");
+}
+function getReportingEndpoints(reportingEndpoints = []) {
+  return reportingEndpoints.map((endpoint) => `${endpoint.name}="${endpoint.url}"`).join(", ");
+}
+function getReportToOptions(reportTo = []) {
+  return reportTo.map((option) => JSON.stringify(option)).join(", ");
+}
+function setHeaders(ctx, headersToSet) {
+  headersToSet.forEach(([header, value]) => {
+    ctx.res.headers.set(header, value);
+  });
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   secureHeaders

package/dist/cjs/utils/body.js

@@ -21,39 +21,55 @@ __export(body_exports, {
   parseBody: () => parseBody
 });
 module.exports = __toCommonJS(body_exports);
-const isArrayField = (value) => {
-  return Array.isArray(value);
-};
-const parseBody = async (request, options = {
-  all: false
-}) => {
-  let body = {};
+const parseBody = async (request, options = { all: false }) => {
   const contentType = request.headers.get("Content-Type");
-  if (contentType && (contentType.startsWith("multipart/form-data") || contentType.startsWith("application/x-www-form-urlencoded"))) {
-    const formData = await request.formData();
-    if (formData) {
-      const form = {};
-      formData.forEach((value, key) => {
-        const shouldParseAllValues = options.all || key.slice(-2) === "[]";
-        if (!shouldParseAllValues) {
-          form[key] = value;
-          return;
-        }
-        if (form[key] && isArrayField(form[key])) {
-          ;
-          form[key].push(value);
-          return;
-        }
-        if (form[key]) {
-          form[key] = [form[key], value];
-          return;
-        }
-        form[key] = value;
-      });
-      body = form;
+  if (isFormDataContent(contentType)) {
+    return parseFormData(request, options);
+  }
+  return {};
+};
+function isFormDataContent(contentType) {
+  if (contentType === null) {
+    return false;
+  }
+  return contentType.startsWith("multipart/form-data") || contentType.startsWith("application/x-www-form-urlencoded");
+}
+async function parseFormData(request, options) {
+  const formData = await request.formData();
+  if (formData) {
+    return convertFormDataToBodyData(formData, options);
+  }
+  return {};
+}
+function convertFormDataToBodyData(formData, options) {
+  const form = {};
+  formData.forEach((value, key) => {
+    const shouldParseAllValues = options.all || key.endsWith("[]");
+    if (!shouldParseAllValues) {
+      form[key] = value;
+    } else {
+      handleParsingAllValues(form, key, value);
     }
+  });
+  return form;
+}
+const handleParsingAllValues = (form, key, value) => {
+  if (form[key] && isArrayField(form[key])) {
+    appendToExistingArray(form[key], value);
+  } else if (form[key]) {
+    convertToNewArray(form, key, value);
+  } else {
+    form[key] = value;
   }
-  return body;
+};
+function isArrayField(field) {
+  return Array.isArray(field);
+}
+const appendToExistingArray = (arr, value) => {
+  arr.push(value);
+};
+const convertToNewArray = (form, key, value) => {
+  form[key] = [form[key], value];
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/utils/stream.js

@@ -31,11 +31,7 @@ class StreamingApi {
     this.responseReadable = new ReadableStream({
       async pull(controller) {
         const { done, value } = await reader.read();
-        if (done) {
-          controller.close();
-        } else {
-          controller.enqueue(value);
-        }
+        done ? controller.close() : controller.enqueue(value);
       },
       cancel: () => {
         this.abortSubscribers.forEach((subscriber) => subscriber());

package/dist/cjs/utils/url.js

@@ -38,29 +38,25 @@ const splitPath = (path) => {
   }
   return paths;
 };
-const splitRoutingPath = (path) => {
+const splitRoutingPath = (routePath) => {
+  const { groups, path } = extractGroupsFromPath(routePath);
+  const paths = splitPath(path);
+  return replaceGroupMarks(paths, groups);
+};
+const extractGroupsFromPath = (path) => {
   const groups = [];
-  for (let i = 0; ; ) {
-    let replaced = false;
-    path = path.replace(/\{[^}]+\}/g, (m) => {
-      const mark = `@\\${i}`;
-      groups[i] = [mark, m];
-      i++;
-      replaced = true;
-      return mark;
-    });
-    if (!replaced) {
-      break;
-    }
-  }
-  const paths = path.split("/");
-  if (paths[0] === "") {
-    paths.shift();
-  }
+  path = path.replace(/\{[^}]+\}/g, (match, index) => {
+    const mark = `@${index}`;
+    groups.push([mark, match]);
+    return mark;
+  });
+  return { groups, path };
+};
+const replaceGroupMarks = (paths, groups) => {
   for (let i = groups.length - 1; i >= 0; i--) {
     const [mark] = groups[i];
     for (let j = paths.length - 1; j >= 0; j--) {
-      if (paths[j].indexOf(mark) !== -1) {
+      if (paths[j].includes(mark)) {
         paths[j] = paths[j].replace(mark, groups[i][1]);
         break;
       }

package/dist/context.js

@@ -22,6 +22,10 @@ import { serialize } from "./utils/cookie.js";
 import { resolveCallback, HtmlEscapedCallbackPhase } from "./utils/html.js";
 import { StreamingApi } from "./utils/stream.js";
 var TEXT_PLAIN = "text/plain; charset=UTF-8";
+var setHeaders = (headers, map = {}) => {
+  Object.entries(map).forEach(([key, value]) => headers.set(key, value));
+  return headers;
+};
 var _status, _executionCtx, _headers, _preparedHeaders, _res, _isFresh;
 var Context = class {
   constructor(req, options) {
@@ -94,21 +98,21 @@ var Context = class {
         });
       }
       if (arg && typeof arg !== "number") {
-        this.res = new Response(data, arg);
+        const headers2 = setHeaders(new Headers(arg.headers), __privateGet(this, _preparedHeaders));
+        return new Response(data, {
+          headers: headers2,
+          status: arg.status
+        });
       }
-      const status = typeof arg === "number" ? arg : arg ? arg.status : __privateGet(this, _status);
+      const status = typeof arg === "number" ? arg : __privateGet(this, _status);
       __privateGet(this, _preparedHeaders) ?? __privateSet(this, _preparedHeaders, {});
       __privateGet(this, _headers) ?? __privateSet(this, _headers, new Headers());
-      for (const [k, v] of Object.entries(__privateGet(this, _preparedHeaders))) {
-        __privateGet(this, _headers).set(k, v);
-      }
+      setHeaders(__privateGet(this, _headers), __privateGet(this, _preparedHeaders));
       if (__privateGet(this, _res)) {
         __privateGet(this, _res).headers.forEach((v, k) => {
           __privateGet(this, _headers)?.set(k, v);
         });
-        for (const [k, v] of Object.entries(__privateGet(this, _preparedHeaders))) {
-          __privateGet(this, _headers).set(k, v);
-        }
+        setHeaders(__privateGet(this, _headers), __privateGet(this, _preparedHeaders));
       }
       headers ?? (headers = {});
       for (const [k, v] of Object.entries(headers)) {

package/dist/helper/dev/index.js

@@ -19,6 +19,9 @@ var inspectRoutes = (hono) => {
   });
 };
 var showRoutes = (hono, opts) => {
+  const { process, Deno } = globalThis;
+  const isNoColor = typeof process !== "undefined" ? "NO_COLOR" in process?.env : typeof Deno?.noColor === "boolean" ? Deno.noColor : false;
+  const colorEnabled = opts?.colorize ?? !isNoColor;
   const routeData = {};
   let maxMethodLength = 0;
   let maxPathLength = 0;
@@ -36,7 +39,7 @@ var showRoutes = (hono, opts) => {
       return;
     }
     const { method, path, routes } = data;
-    const methodStr = opts?.colorize ?? true ? `\x1B[32m${method}\x1B[0m` : method;
+    const methodStr = colorEnabled ? `\x1B[32m${method}\x1B[0m` : method;
     console.log(`${methodStr} ${" ".repeat(maxMethodLength - method.length)} ${path}`);
     if (!opts?.verbose) {
       return;

package/dist/hono-base.js

@@ -226,27 +226,16 @@ var _Hono = class extends defineDynamicClass() {
       let res;
       try {
         res = matchResult[0][0][0][0](c, async () => {
+          c.res = await this.notFoundHandler(c);
         });
-        if (!res) {
-          return this.notFoundHandler(c);
-        }
       } catch (err) {
         return this.handleError(err, c);
       }
       if (res instanceof Response)
         return res;
-      return (async () => {
-        let awaited;
-        try {
-          awaited = await res;
-          if (!awaited) {
-            return this.notFoundHandler(c);
-          }
-        } catch (err) {
-          return this.handleError(err, c);
-        }
-        return awaited;
-      })();
+      return res.then(
+        (resolved) => resolved || (c.finalized ? c.res : this.notFoundHandler(c))
+      ).catch((err) => this.handleError(err, c));
     }
     const composed = compose(matchResult[0], this.errorHandler, this.notFoundHandler);
     return (async () => {

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

@@ -32,16 +32,10 @@ var basicAuth = (options, ...users) => {
     const requestUser = auth(ctx.req);
     if (requestUser) {
       for (const user of users) {
-        const usernameEqual = await timingSafeEqual(
-          user.username,
-          requestUser.username,
-          options.hashFunction
-        );
-        const passwordEqual = await timingSafeEqual(
-          user.password,
-          requestUser.password,
-          options.hashFunction
-        );
+        const [usernameEqual, passwordEqual] = await Promise.all([
+          timingSafeEqual(user.username, requestUser.username, options.hashFunction),
+          timingSafeEqual(user.password, requestUser.password, options.hashFunction)
+        ]);
         if (usernameEqual && passwordEqual) {
           await next();
           return;

package/dist/middleware/cache/index.js

@@ -20,21 +20,20 @@ var cache = (options) => {
     const key = c.req.url;
     const cache3 = await caches.open(options.cacheName);
     const response = await cache3.match(key);
-    if (!response) {
-      await next();
-      if (!c.res.ok) {
-        return;
-      }
-      addHeader(c);
-      const response2 = c.res.clone();
-      if (options.wait) {
-        await cache3.put(key, response2);
-      } else {
-        c.executionCtx.waitUntil(cache3.put(key, response2));
-      }
-    } else {
+    if (response) {
       return new Response(response.body, response);
     }
+    await next();
+    if (!c.res.ok) {
+      return;
+    }
+    addHeader(c);
+    const res = c.res.clone();
+    if (options.wait) {
+      await cache3.put(key, res);
+    } else {
+      c.executionCtx.waitUntil(cache3.put(key, res));
+    }
   };
 };
 export {

package/dist/middleware/cors/index.js

@@ -36,9 +36,7 @@ var cors = (options) => {
     if (opts.exposeHeaders?.length) {
       set("Access-Control-Expose-Headers", opts.exposeHeaders.join(","));
     }
-    if (c.req.method !== "OPTIONS") {
-      await next();
-    } else {
+    if (c.req.method === "OPTIONS") {
       if (opts.maxAge != null) {
         set("Access-Control-Max-Age", opts.maxAge.toString());
       }
@@ -64,6 +62,7 @@ var cors = (options) => {
         statusText: c.res.statusText
       });
     }
+    await next();
   };
 };
 export {

package/dist/middleware/jwt/index.js

@@ -15,13 +15,13 @@ var jwt = (options) => {
     if (credentials) {
       const parts = credentials.split(/\s+/);
       if (parts.length !== 2) {
-        const res = new Response("Unauthorized", {
-          status: 401,
-          headers: {
-            "WWW-Authenticate": `Bearer realm="${ctx.req.url}",error="invalid_request",error_description="invalid credentials structure"`
-          }
+        throw new HTTPException(401, {
+          res: unauthorizedResponse({
+            ctx,
+            error: "invalid_request",
+            errDescription: "invalid credentials structure"
+          })
         });
-        throw new HTTPException(401, { res });
       } else {
         token = parts[1];
       }
@@ -29,13 +29,13 @@ var jwt = (options) => {
       token = ctx.req.cookie(options.cookie);
     }
     if (!token) {
-      const res = new Response("Unauthorized", {
-        status: 401,
-        headers: {
-          "WWW-Authenticate": `Bearer realm="${ctx.req.url}",error="invalid_request",error_description="no authorization included in request"`
-        }
+      throw new HTTPException(401, {
+        res: unauthorizedResponse({
+          ctx,
+          error: "invalid_request",
+          errDescription: "no authorization included in request"
+        })
       });
-      throw new HTTPException(401, { res });
     }
     let payload;
     let msg = "";
@@ -45,19 +45,28 @@ var jwt = (options) => {
       msg = `${e}`;
     }
     if (!payload) {
-      const res = new Response("Unauthorized", {
-        status: 401,
-        statusText: msg,
-        headers: {
-          "WWW-Authenticate": `Bearer realm="${ctx.req.url}",error="invalid_token",error_description="token verification failure"`
-        }
+      throw new HTTPException(401, {
+        res: unauthorizedResponse({
+          ctx,
+          error: "invalid_token",
+          statusText: msg,
+          errDescription: "token verification failure"
+        })
       });
-      throw new HTTPException(401, { res });
     }
     ctx.set("jwtPayload", payload);
     await next();
   };
 };
+function unauthorizedResponse(opts) {
+  return new Response("Unauthorized", {
+    status: 401,
+    statusText: opts.statusText,
+    headers: {
+      "WWW-Authenticate": `Bearer realm="${opts.ctx.req.url}",error="${opts.error}",error_description="${opts.errDescription}"`
+    }
+  });
+}
 var verify = Jwt.verify;
 var decode = Jwt.decode;
 var sign = Jwt.sign;

package/dist/middleware/secure-headers/index.js

@@ -29,38 +29,48 @@ var DEFAULT_OPTIONS = {
 };
 var secureHeaders = (customOptions) => {
   const options = { ...DEFAULT_OPTIONS, ...customOptions };
-  const headersToSet = Object.entries(HEADERS_MAP).filter(([key]) => options[key]).map(([key, defaultValue]) => {
-    const overrideValue = options[key];
-    if (typeof overrideValue === "string")
-      return [defaultValue[0], overrideValue];
-    return defaultValue;
-  });
+  const headersToSet = getFilteredHeaders(options);
   if (options.contentSecurityPolicy) {
-    const cspDirectives = Object.entries(options.contentSecurityPolicy).map(([directive, value]) => {
-      directive = directive.replace(
-        /[A-Z]+(?![a-z])|[A-Z]/g,
-        (match, offset) => (offset ? "-" : "") + match.toLowerCase()
-      );
-      return `${directive} ${Array.isArray(value) ? value.join(" ") : value}`;
-    }).join("; ");
-    headersToSet.push(["Content-Security-Policy", cspDirectives]);
+    headersToSet.push(["Content-Security-Policy", getCSPDirectives(options.contentSecurityPolicy)]);
   }
   if (options.reportingEndpoints) {
-    const reportingEndpoints = options.reportingEndpoints.map((endpoint) => `${endpoint.name}="${endpoint.url}"`).join(", ");
-    headersToSet.push(["Reporting-Endpoints", reportingEndpoints]);
+    headersToSet.push(["Reporting-Endpoints", getReportingEndpoints(options.reportingEndpoints)]);
   }
   if (options.reportTo) {
-    const reportToOptions = options.reportTo.map((option) => JSON.stringify(option)).join(", ");
-    headersToSet.push(["Report-To", reportToOptions]);
+    headersToSet.push(["Report-To", getReportToOptions(options.reportTo)]);
   }
   return async function secureHeaders2(ctx, next) {
     await next();
-    headersToSet.forEach(([header, value]) => {
-      ctx.res.headers.set(header, value);
-    });
+    setHeaders(ctx, headersToSet);
     ctx.res.headers.delete("X-Powered-By");
   };
 };
+function getFilteredHeaders(options) {
+  return Object.entries(HEADERS_MAP).filter(([key]) => options[key]).map(([key, defaultValue]) => {
+    const overrideValue = options[key];
+    return typeof overrideValue === "string" ? [defaultValue[0], overrideValue] : defaultValue;
+  });
+}
+function getCSPDirectives(contentSecurityPolicy) {
+  return Object.entries(contentSecurityPolicy || []).map(([directive, value]) => {
+    const kebabCaseDirective = directive.replace(
+      /[A-Z]+(?![a-z])|[A-Z]/g,
+      (match, offset) => offset ? "-" + match.toLowerCase() : match.toLowerCase()
+    );
+    return `${kebabCaseDirective} ${Array.isArray(value) ? value.join(" ") : value}`;
+  }).join("; ");
+}
+function getReportingEndpoints(reportingEndpoints = []) {
+  return reportingEndpoints.map((endpoint) => `${endpoint.name}="${endpoint.url}"`).join(", ");
+}
+function getReportToOptions(reportTo = []) {
+  return reportTo.map((option) => JSON.stringify(option)).join(", ");
+}
+function setHeaders(ctx, headersToSet) {
+  headersToSet.forEach(([header, value]) => {
+    ctx.res.headers.set(header, value);
+  });
+}
 export {
   secureHeaders
 };

package/dist/types/adapter/lambda-edge/handler.d.ts

@@ -16,6 +16,20 @@ interface CloudFrontCustomOrigin {
     readTimeout: number;
     sslProtocols: string[];
 }
+interface CloudFrontS3Origin {
+    authMethod: 'origin-access-identity' | 'none';
+    customHeaders: CloudFrontHeaders;
+    domainName: string;
+    path: string;
+    region: string;
+}
+type CloudFrontOrigin = {
+    s3: CloudFrontS3Origin;
+    custom?: never;
+} | {
+    custom: CloudFrontCustomOrigin;
+    s3?: never;
+};
 export interface CloudFrontRequest {
     clientIp: string;
     headers: CloudFrontHeaders;
@@ -28,9 +42,7 @@ export interface CloudFrontRequest {
         encoding: string;
         data: string;
     };
-    origin?: {
-        custom: CloudFrontCustomOrigin;
-    };
+    origin?: CloudFrontOrigin;
 }
 export interface CloudFrontResponse {
     headers: CloudFrontHeaders;

package/dist/types/types.d.ts

@@ -152,7 +152,73 @@ export interface HandlerInterface<E extends Env = Env, M extends string = string
     <P extends string, I extends Input = {}, R extends HandlerResponse<any> = any>(path: P, ...handlers: H<E, MergePath<BasePath, P>, I, R>[]): Hono<E, S & ToSchema<M, MergePath<BasePath, P>, I['in'], MergeTypedResponseData<R>>, BasePath>;
 }
 export interface MiddlewareHandlerInterface<E extends Env = Env, S extends Schema = {}, BasePath extends string = '/'> {
-    <E2 extends Env = E>(...handlers: MiddlewareHandler<E2, MergePath<BasePath, ExtractKey<S>>>[]): Hono<E, S, BasePath>;
+    <E2 extends Env = E>(...handlers: MiddlewareHandler<E2, MergePath<BasePath, ExtractKey<S>>>[]): Hono<IntersectNonAnyTypes<[E, E2]>, S, BasePath>;
+    <E2 extends Env = E>(handler: MiddlewareHandler<E2, MergePath<BasePath, ExtractKey<S>>>): Hono<IntersectNonAnyTypes<[E, E2]>, S, BasePath>;
+    <E2 extends Env = E, E3 extends Env = IntersectNonAnyTypes<[E, E2]>, P extends string = MergePath<BasePath, ExtractKey<S>>>(...handlers: [MiddlewareHandler<E2, P>, MiddlewareHandler<E3, P>]): Hono<IntersectNonAnyTypes<[E, E2, E3]>, S, BasePath>;
+    <E2 extends Env = E, E3 extends Env = E, E4 extends Env = IntersectNonAnyTypes<[E, E2, E3]>, P extends string = MergePath<BasePath, ExtractKey<S>>>(...handlers: [MiddlewareHandler<E2, P>, MiddlewareHandler<E3, P>, MiddlewareHandler<E4, P>]): Hono<IntersectNonAnyTypes<[E, E2, E3, E4]>, S, BasePath>;
+    <E2 extends Env = E, E3 extends Env = E, E4 extends Env = E, E5 extends Env = IntersectNonAnyTypes<[E, E2, E3, E4]>, P extends string = MergePath<BasePath, ExtractKey<S>>>(...handlers: [
+        MiddlewareHandler<E2, P>,
+        MiddlewareHandler<E3, P>,
+        MiddlewareHandler<E4, P>,
+        MiddlewareHandler<E5, P>
+    ]): Hono<IntersectNonAnyTypes<[E, E2, E3, E4, E5]>, S, BasePath>;
+    <E2 extends Env = E, E3 extends Env = E, E4 extends Env = E, E5 extends Env = E, E6 extends Env = IntersectNonAnyTypes<[E, E2, E3, E4, E5]>, P extends string = MergePath<BasePath, ExtractKey<S>>>(...handlers: [
+        MiddlewareHandler<E2, P>,
+        MiddlewareHandler<E3, P>,
+        MiddlewareHandler<E4, P>,
+        MiddlewareHandler<E5, P>,
+        MiddlewareHandler<E6, P>
+    ]): Hono<IntersectNonAnyTypes<[E, E2, E3, E4, E5, E6]>, S, BasePath>;
+    <E2 extends Env = E, E3 extends Env = E, E4 extends Env = E, E5 extends Env = E, E6 extends Env = E, E7 extends Env = IntersectNonAnyTypes<[E, E2, E3, E4, E5, E6]>, P extends string = MergePath<BasePath, ExtractKey<S>>>(...handlers: [
+        MiddlewareHandler<E2, P>,
+        MiddlewareHandler<E3, P>,
+        MiddlewareHandler<E4, P>,
+        MiddlewareHandler<E5, P>,
+        MiddlewareHandler<E6, P>,
+        MiddlewareHandler<E7, P>
+    ]): Hono<IntersectNonAnyTypes<[E, E2, E3, E4, E5, E6, E7]>, S, BasePath>;
+    <E2 extends Env = E, E3 extends Env = E, E4 extends Env = E, E5 extends Env = E, E6 extends Env = E, E7 extends Env = E, E8 extends Env = IntersectNonAnyTypes<[E, E2, E3, E4, E5, E6, E7]>, P extends string = MergePath<BasePath, ExtractKey<S>>>(...handlers: [
+        MiddlewareHandler<E2, P>,
+        MiddlewareHandler<E3, P>,
+        MiddlewareHandler<E4, P>,
+        MiddlewareHandler<E5, P>,
+        MiddlewareHandler<E6, P>,
+        MiddlewareHandler<E7, P>,
+        MiddlewareHandler<E8, P>
+    ]): Hono<IntersectNonAnyTypes<[E, E2, E3, E4, E5, E6, E7, E8]>, S, BasePath>;
+    <E2 extends Env = E, E3 extends Env = E, E4 extends Env = E, E5 extends Env = E, E6 extends Env = E, E7 extends Env = E, E8 extends Env = E, E9 extends Env = IntersectNonAnyTypes<[E, E2, E3, E4, E5, E6, E7, E8]>, P extends string = MergePath<BasePath, ExtractKey<S>>>(...handlers: [
+        MiddlewareHandler<E2, P>,
+        MiddlewareHandler<E3, P>,
+        MiddlewareHandler<E4, P>,
+        MiddlewareHandler<E5, P>,
+        MiddlewareHandler<E6, P>,
+        MiddlewareHandler<E7, P>,
+        MiddlewareHandler<E8, P>,
+        MiddlewareHandler<E9, P>
+    ]): Hono<IntersectNonAnyTypes<[E, E2, E3, E4, E5, E6, E7, E8, E9]>, S, BasePath>;
+    <E2 extends Env = E, E3 extends Env = E, E4 extends Env = E, E5 extends Env = E, E6 extends Env = E, E7 extends Env = E, E8 extends Env = E, E9 extends Env = E, E10 extends Env = IntersectNonAnyTypes<[E, E2, E3, E4, E5, E6, E7, E8, E9]>, P extends string = MergePath<BasePath, ExtractKey<S>>>(...handlers: [
+        MiddlewareHandler<E2, P>,
+        MiddlewareHandler<E3, P>,
+        MiddlewareHandler<E4, P>,
+        MiddlewareHandler<E5, P>,
+        MiddlewareHandler<E6, P>,
+        MiddlewareHandler<E7, P>,
+        MiddlewareHandler<E8, P>,
+        MiddlewareHandler<E9, P>,
+        MiddlewareHandler<E10, P>
+    ]): Hono<IntersectNonAnyTypes<[E, E2, E3, E4, E5, E6, E7, E8, E9, E10]>, S, BasePath>;
+    <E2 extends Env = E, E3 extends Env = E, E4 extends Env = E, E5 extends Env = E, E6 extends Env = E, E7 extends Env = E, E8 extends Env = E, E9 extends Env = E, E10 extends Env = E, E11 extends Env = IntersectNonAnyTypes<[E, E2, E3, E4, E5, E6, E7, E8, E9, E10]>, P extends string = MergePath<BasePath, ExtractKey<S>>>(...handlers: [
+        MiddlewareHandler<E2, P>,
+        MiddlewareHandler<E3, P>,
+        MiddlewareHandler<E4, P>,
+        MiddlewareHandler<E5, P>,
+        MiddlewareHandler<E6, P>,
+        MiddlewareHandler<E7, P>,
+        MiddlewareHandler<E8, P>,
+        MiddlewareHandler<E9, P>,
+        MiddlewareHandler<E10, P>,
+        MiddlewareHandler<E11, P>
+    ]): Hono<IntersectNonAnyTypes<[E, E2, E3, E4, E5, E6, E7, E8, E9, E10, E11]>, S, BasePath>;
     <P extends string, E2 extends Env = E>(path: P, ...handlers: MiddlewareHandler<E2, MergePath<BasePath, P>>[]): Hono<E, S, BasePath>;
 }
 export interface OnHandlerInterface<E extends Env = Env, S extends Schema = {}, BasePath extends string = '/'> {

package/dist/types/utils/url.d.ts

@@ -1,6 +1,6 @@
 export type Pattern = readonly [string, string, RegExp | true] | '*';
 export declare const splitPath: (path: string) => string[];
-export declare const splitRoutingPath: (path: string) => string[];
+export declare const splitRoutingPath: (routePath: string) => string[];
 export declare const getPattern: (label: string) => Pattern | null;
 export declare const getPath: (request: Request) => string;
 export declare const getQueryStrings: (url: string) => string;

package/dist/utils/body.js

@@ -1,37 +1,53 @@
 // src/utils/body.ts
-var isArrayField = (value) => {
-  return Array.isArray(value);
-};
-var parseBody = async (request, options = {
-  all: false
-}) => {
-  let body = {};
+var parseBody = async (request, options = { all: false }) => {
   const contentType = request.headers.get("Content-Type");
-  if (contentType && (contentType.startsWith("multipart/form-data") || contentType.startsWith("application/x-www-form-urlencoded"))) {
-    const formData = await request.formData();
-    if (formData) {
-      const form = {};
-      formData.forEach((value, key) => {
-        const shouldParseAllValues = options.all || key.slice(-2) === "[]";
-        if (!shouldParseAllValues) {
-          form[key] = value;
-          return;
-        }
-        if (form[key] && isArrayField(form[key])) {
-          ;
-          form[key].push(value);
-          return;
-        }
-        if (form[key]) {
-          form[key] = [form[key], value];
-          return;
-        }
-        form[key] = value;
-      });
-      body = form;
+  if (isFormDataContent(contentType)) {
+    return parseFormData(request, options);
+  }
+  return {};
+};
+function isFormDataContent(contentType) {
+  if (contentType === null) {
+    return false;
+  }
+  return contentType.startsWith("multipart/form-data") || contentType.startsWith("application/x-www-form-urlencoded");
+}
+async function parseFormData(request, options) {
+  const formData = await request.formData();
+  if (formData) {
+    return convertFormDataToBodyData(formData, options);
+  }
+  return {};
+}
+function convertFormDataToBodyData(formData, options) {
+  const form = {};
+  formData.forEach((value, key) => {
+    const shouldParseAllValues = options.all || key.endsWith("[]");
+    if (!shouldParseAllValues) {
+      form[key] = value;
+    } else {
+      handleParsingAllValues(form, key, value);
     }
+  });
+  return form;
+}
+var handleParsingAllValues = (form, key, value) => {
+  if (form[key] && isArrayField(form[key])) {
+    appendToExistingArray(form[key], value);
+  } else if (form[key]) {
+    convertToNewArray(form, key, value);
+  } else {
+    form[key] = value;
   }
-  return body;
+};
+function isArrayField(field) {
+  return Array.isArray(field);
+}
+var appendToExistingArray = (arr, value) => {
+  arr.push(value);
+};
+var convertToNewArray = (form, key, value) => {
+  form[key] = [form[key], value];
 };
 export {
   parseBody

package/dist/utils/stream.js

@@ -9,11 +9,7 @@ var StreamingApi = class {
     this.responseReadable = new ReadableStream({
       async pull(controller) {
         const { done, value } = await reader.read();
-        if (done) {
-          controller.close();
-        } else {
-          controller.enqueue(value);
-        }
+        done ? controller.close() : controller.enqueue(value);
       },
       cancel: () => {
         this.abortSubscribers.forEach((subscriber) => subscriber());

package/dist/utils/url.js

@@ -6,29 +6,25 @@ var splitPath = (path) => {
   }
   return paths;
 };
-var splitRoutingPath = (path) => {
+var splitRoutingPath = (routePath) => {
+  const { groups, path } = extractGroupsFromPath(routePath);
+  const paths = splitPath(path);
+  return replaceGroupMarks(paths, groups);
+};
+var extractGroupsFromPath = (path) => {
   const groups = [];
-  for (let i = 0; ; ) {
-    let replaced = false;
-    path = path.replace(/\{[^}]+\}/g, (m) => {
-      const mark = `@\\${i}`;
-      groups[i] = [mark, m];
-      i++;
-      replaced = true;
-      return mark;
-    });
-    if (!replaced) {
-      break;
-    }
-  }
-  const paths = path.split("/");
-  if (paths[0] === "") {
-    paths.shift();
-  }
+  path = path.replace(/\{[^}]+\}/g, (match, index) => {
+    const mark = `@${index}`;
+    groups.push([mark, match]);
+    return mark;
+  });
+  return { groups, path };
+};
+var replaceGroupMarks = (paths, groups) => {
   for (let i = groups.length - 1; i >= 0; i--) {
     const [mark] = groups[i];
     for (let j = paths.length - 1; j >= 0; j--) {
-      if (paths[j].indexOf(mark) !== -1) {
+      if (paths[j].includes(mark)) {
         paths[j] = paths[j].replace(mark, groups[i][1]);
         break;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hono",
-  "version": "3.12.5",
+  "version": "3.12.7",
   "description": "Ultrafast web framework for the Edges",
   "main": "dist/cjs/index.js",
   "type": "module",
@@ -11,14 +11,15 @@
   ],
   "scripts": {
     "test": "tsc --noEmit && vitest --run",
-    "test:deno": "env NAME=Deno deno test --allow-read --allow-env runtime_tests/deno && deno test --no-lock -c runtime_tests/deno-jsx/deno.precompile.json runtime_tests/deno-jsx && deno test --no-lock -c runtime_tests/deno-jsx/deno.react-jsx.json runtime_tests/deno-jsx",
-    "test:bun": "env NAME=Bun bun test --jsx-import-source ../../src/jsx runtime_tests/bun/index.test.tsx",
+    "test:watch": "vitest --watch",
+    "test:deno": "deno test --allow-read --allow-env runtime_tests/deno && deno test --no-lock -c runtime_tests/deno-jsx/deno.precompile.json runtime_tests/deno-jsx && deno test --no-lock -c runtime_tests/deno-jsx/deno.react-jsx.json runtime_tests/deno-jsx",
+    "test:bun": "bun test --jsx-import-source ../../src/jsx runtime_tests/bun/index.test.tsx",
     "test:fastly": "vitest --run --config ./runtime_tests/fastly/vitest.config.ts",
     "test:lagon": "start-server-and-test \"lagon dev runtime_tests/lagon/index.ts -e runtime_tests/lagon/.env.lagon\" http://127.0.0.1:1234 \"yarn vitest --run runtime_tests/lagon/index.test.ts --config runtime_tests/lagon/vitest.config.ts\"",
-    "test:node": "env NAME=Node vitest --run --config ./runtime_tests/node/vitest.config.ts",
+    "test:node": "vitest --run --config ./runtime_tests/node/vitest.config.ts",
     "test:wrangler": "vitest --run --config ./runtime_tests/wrangler/vitest.config.ts",
-    "test:lambda": "env NAME=Node vitest --run --config ./runtime_tests/lambda/vitest.config.ts",
-    "test:lambda-edge": "env NAME=Node vitest --run --config ./runtime_tests/lambda-edge/vitest.config.ts",
+    "test:lambda": "vitest --run --config ./runtime_tests/lambda/vitest.config.ts",
+    "test:lambda-edge": "vitest --run --config ./runtime_tests/lambda-edge/vitest.config.ts",
     "test:all": "yarn test && yarn test:deno && yarn test:bun && yarn test:fastly && yarn test:lagon && yarn test:node && yarn test:wrangler && yarn test:lambda && yarn test:lambda-edge",
     "lint": "eslint --ext js,ts src runtime_tests",
     "lint:fix": "eslint --ext js,ts src runtime_tests --fix",