hono 3.12.5 → 3.12.6

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/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/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/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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hono",
-  "version": "3.12.5",
+  "version": "3.12.6",
   "description": "Ultrafast web framework for the Edges",
   "main": "dist/cjs/index.js",
   "type": "module",
@@ -11,6 +11,7 @@
   ],
   "scripts": {
     "test": "tsc --noEmit && vitest --run",
+    "test:watch": "vitest --watch",
     "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:fastly": "vitest --run --config ./runtime_tests/fastly/vitest.config.ts",