hono 4.2.0-rc.1 → 4.2.1

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

@@ -43,25 +43,38 @@ const auth = (req) => {
   return { username: userPass[1], password: userPass[2] };
 };
 const basicAuth = (options, ...users) => {
-  if (!options) {
-    throw new Error('basic auth middleware requires options for "username and password"');
+  const usernamePasswordInOptions = "username" in options && "password" in options;
+  const verifyUserInOptions = "verifyUser" in options;
+  if (!(usernamePasswordInOptions || verifyUserInOptions)) {
+    throw new Error(
+      'basic auth middleware requires options for "username and password" or "verifyUser"'
+    );
   }
   if (!options.realm) {
     options.realm = "Secure Area";
   }
-  users.unshift({ username: options.username, password: options.password });
+  if (usernamePasswordInOptions) {
+    users.unshift({ username: options.username, password: options.password });
+  }
   return async function basicAuth2(ctx, next) {
     const requestUser = auth(ctx.req);
     if (requestUser) {
-      for (const user of users) {
-        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) {
+      if (verifyUserInOptions) {
+        if (await options.verifyUser(requestUser.username, requestUser.password, ctx)) {
           await next();
           return;
         }
+      } else {
+        for (const user of users) {
+          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;
+          }
+        }
       }
     }
     const res = new Response("Unauthorized", {

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

@@ -26,7 +26,7 @@ var import_buffer = require("../../utils/buffer");
 const TOKEN_STRINGS = "[A-Za-z0-9._~+/-]+=*";
 const PREFIX = "Bearer";
 const bearerAuth = (options) => {
-  if (!options.token) {
+  if (!("token" in options || "verifyToken" in options)) {
     throw new Error('bearer auth middleware requires options for "token"');
   }
   if (!options.realm) {
@@ -59,7 +59,9 @@ const bearerAuth = (options) => {
         throw new import_http_exception.HTTPException(400, { res });
       } else {
         let equal = false;
-        if (typeof options.token === "string") {
+        if ("verifyToken" in options) {
+          equal = await options.verifyToken(match[1], c);
+        } else if (typeof options.token === "string") {
           equal = await (0, import_buffer.timingSafeEqual)(options.token, match[1], options.hashFunction);
         } else if (Array.isArray(options.token) && options.token.length > 0) {
           for (const token of options.token) {

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

@@ -68,21 +68,22 @@ const jwt = (options) => {
       });
     }
     let payload;
-    let msg = "";
+    let cause;
     try {
       payload = await import_jwt.Jwt.verify(token, options.secret, options.alg);
     } catch (e) {
-      msg = `${e}`;
+      cause = e;
     }
     if (!payload) {
       throw new import_http_exception.HTTPException(401, {
-        message: msg,
+        message: "Unauthorized",
         res: unauthorizedResponse({
           ctx,
           error: "invalid_token",
-          statusText: msg,
+          statusText: "Unauthorized",
           errDescription: "token verification failure"
-        })
+        }),
+        cause
       });
     }
     ctx.set("jwtPayload", payload);

package/dist/cjs/test-utils/setup-vitest.js

@@ -17,10 +17,12 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
-var import_node_crypto = __toESM(require("node:crypto"), 1);
+var nodeCrypto = __toESM(require("node:crypto"), 1);
 var import_vitest = require("vitest");
-import_vitest.vi.stubGlobal("crypto", import_node_crypto.default);
-import_vitest.vi.stubGlobal("CryptoKey", import_node_crypto.default.webcrypto.CryptoKey);
+if (!globalThis.crypto) {
+  import_vitest.vi.stubGlobal("crypto", nodeCrypto);
+  import_vitest.vi.stubGlobal("CryptoKey", nodeCrypto.webcrypto.CryptoKey);
+}
 class MockCache {
   name;
   store;

package/dist/cjs/utils/jwt/jws.js

@@ -22,7 +22,7 @@ __export(jws_exports, {
   verifying: () => verifying
 });
 module.exports = __toCommonJS(jws_exports);
-var import_helper = require("../../helper");
+var import_adapter = require("../../helper/adapter");
 var import_encode = require("../encode");
 var import_types = require("./types");
 var import_types2 = require("./types");
@@ -199,7 +199,7 @@ function getKeyAlgorithm(name) {
   }
 }
 function isCryptoKey(key) {
-  const runtime = (0, import_helper.getRuntimeKey)();
+  const runtime = (0, import_adapter.getRuntimeKey)();
   if (runtime === "node" && !!crypto.webcrypto) {
     return key instanceof crypto.webcrypto.CryptoKey;
   }

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

@@ -21,25 +21,38 @@ var auth = (req) => {
   return { username: userPass[1], password: userPass[2] };
 };
 var basicAuth = (options, ...users) => {
-  if (!options) {
-    throw new Error('basic auth middleware requires options for "username and password"');
+  const usernamePasswordInOptions = "username" in options && "password" in options;
+  const verifyUserInOptions = "verifyUser" in options;
+  if (!(usernamePasswordInOptions || verifyUserInOptions)) {
+    throw new Error(
+      'basic auth middleware requires options for "username and password" or "verifyUser"'
+    );
   }
   if (!options.realm) {
     options.realm = "Secure Area";
   }
-  users.unshift({ username: options.username, password: options.password });
+  if (usernamePasswordInOptions) {
+    users.unshift({ username: options.username, password: options.password });
+  }
   return async function basicAuth2(ctx, next) {
     const requestUser = auth(ctx.req);
     if (requestUser) {
-      for (const user of users) {
-        const [usernameEqual, passwordEqual] = await Promise.all([
-          timingSafeEqual(user.username, requestUser.username, options.hashFunction),
-          timingSafeEqual(user.password, requestUser.password, options.hashFunction)
-        ]);
-        if (usernameEqual && passwordEqual) {
+      if (verifyUserInOptions) {
+        if (await options.verifyUser(requestUser.username, requestUser.password, ctx)) {
           await next();
           return;
         }
+      } else {
+        for (const user of users) {
+          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;
+          }
+        }
       }
     }
     const res = new Response("Unauthorized", {

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

@@ -4,7 +4,7 @@ import { timingSafeEqual } from "../../utils/buffer.js";
 var TOKEN_STRINGS = "[A-Za-z0-9._~+/-]+=*";
 var PREFIX = "Bearer";
 var bearerAuth = (options) => {
-  if (!options.token) {
+  if (!("token" in options || "verifyToken" in options)) {
     throw new Error('bearer auth middleware requires options for "token"');
   }
   if (!options.realm) {
@@ -37,7 +37,9 @@ var bearerAuth = (options) => {
         throw new HTTPException(400, { res });
       } else {
         let equal = false;
-        if (typeof options.token === "string") {
+        if ("verifyToken" in options) {
+          equal = await options.verifyToken(match[1], c);
+        } else if (typeof options.token === "string") {
           equal = await timingSafeEqual(options.token, match[1], options.hashFunction);
         } else if (Array.isArray(options.token) && options.token.length > 0) {
           for (const token of options.token) {

package/dist/middleware/jwt/index.js

@@ -43,21 +43,22 @@ var jwt = (options) => {
       });
     }
     let payload;
-    let msg = "";
+    let cause;
     try {
       payload = await Jwt.verify(token, options.secret, options.alg);
     } catch (e) {
-      msg = `${e}`;
+      cause = e;
     }
     if (!payload) {
       throw new HTTPException(401, {
-        message: msg,
+        message: "Unauthorized",
         res: unauthorizedResponse({
           ctx,
           error: "invalid_token",
-          statusText: msg,
+          statusText: "Unauthorized",
           errDescription: "token verification failure"
-        })
+        }),
+        cause
       });
     }
     ctx.set("jwtPayload", payload);

package/dist/test-utils/setup-vitest.js

@@ -1,8 +1,10 @@
 // src/test-utils/setup-vitest.ts
-import crypto from "node:crypto";
+import * as nodeCrypto from "node:crypto";
 import { vi } from "vitest";
-vi.stubGlobal("crypto", crypto);
-vi.stubGlobal("CryptoKey", crypto.webcrypto.CryptoKey);
+if (!globalThis.crypto) {
+  vi.stubGlobal("crypto", nodeCrypto);
+  vi.stubGlobal("CryptoKey", nodeCrypto.webcrypto.CryptoKey);
+}
 var MockCache = class {
   name;
   store;

package/dist/types/middleware/basic-auth/index.d.ts

@@ -1,10 +1,17 @@
+import type { Context } from '../../context';
 import type { MiddlewareHandler } from '../../types';
-export declare const basicAuth: (options: {
+type BasicAuthOptions = {
     username: string;
     password: string;
     realm?: string;
     hashFunction?: Function;
-}, ...users: {
+} | {
+    verifyUser: (username: string, password: string, c: Context) => boolean | Promise<boolean>;
+    realm?: string;
+    hashFunction?: Function;
+};
+export declare const basicAuth: (options: BasicAuthOptions, ...users: {
     username: string;
     password: string;
 }[]) => MiddlewareHandler;
+export {};

package/dist/types/middleware/bearer-auth/index.d.ts

@@ -1,7 +1,15 @@
+import type { Context } from '../../context';
 import type { MiddlewareHandler } from '../../types';
-export declare const bearerAuth: (options: {
+type BearerAuthOptions = {
     token: string | string[];
     realm?: string;
     prefix?: string;
     hashFunction?: Function;
-}) => MiddlewareHandler;
+} | {
+    realm?: string;
+    prefix?: string;
+    verifyToken: (token: string, c: Context) => boolean | Promise<boolean>;
+    hashFunction?: Function;
+};
+export declare const bearerAuth: (options: BearerAuthOptions) => MiddlewareHandler;
+export {};

package/dist/types/middleware/jwt/index.d.ts

@@ -1,5 +1,6 @@
 import type { MiddlewareHandler } from '../../types';
 import '../../context';
+import type { SignatureAlgorithm } from '../../utils/jwt/jwa';
 declare module '../../context' {
     interface ContextVariableMap {
         jwtPayload: any;
@@ -8,7 +9,7 @@ declare module '../../context' {
 export declare const jwt: (options: {
     secret: string;
     cookie?: string;
-    alg?: string;
+    alg?: SignatureAlgorithm;
 }) => MiddlewareHandler;
 export declare const verify: (token: string, publicKey: import("../../utils/jwt/jws").SignatureKey, alg?: "HS256" | "HS384" | "HS512" | "RS256" | "RS384" | "RS512" | "PS256" | "PS384" | "PS512" | "ES256" | "ES384" | "ES512" | "EdDSA") => Promise<any>;
 export declare const decode: (token: string) => {

package/dist/utils/jwt/jws.js

@@ -1,5 +1,5 @@
 // src/utils/jwt/jws.ts
-import { getRuntimeKey } from "../../helper.js";
+import { getRuntimeKey } from "../../helper/adapter/index.js";
 import { decodeBase64 } from "../encode.js";
 import { JwtAlgorithmNotImplemented } from "./types.js";
 import { CryptoKeyUsage } from "./types.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hono",
-  "version": "4.2.0-rc.1",
+  "version": "4.2.1",
   "description": "Ultrafast web framework for the Edges",
   "main": "dist/cjs/index.js",
   "type": "module",

package/dist/types/helper.d.ts

@@ -1,12 +0,0 @@
-export * from './helper/accepts';
-export * from './helper/adapter';
-export * from './helper/cookie';
-export * from './helper/css';
-export * from './helper/factory';
-export * from './helper/html';
-export * from './helper/streaming';
-export * from './helper/testing';
-export * from './helper/dev';
-export * from './adapter/deno/ssg';
-export * from './adapter/deno/websocket';
-export { decode as jwtDecode, sign as jwtSign, verify as jwtVerify } from './middleware/jwt';