hono 4.7.0 → 4.7.1

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

@@ -1,7 +1,5 @@
 // src/adapter/aws-lambda/handler.ts
-import crypto from "node:crypto";
 import { decodeBase64, encodeBase64 } from "../../utils/encode.js";
-globalThis.crypto ??= crypto;
 var getRequestContext = (event) => {
   return event.requestContext;
 };

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

@@ -1,9 +1,7 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -17,10 +15,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var handler_exports = {};
 __export(handler_exports, {
@@ -35,9 +29,7 @@ __export(handler_exports, {
   streamHandle: () => streamHandle
 });
 module.exports = __toCommonJS(handler_exports);
-var import_node_crypto = __toESM(require("node:crypto"), 1);
 var import_encode = require("../../utils/encode");
-globalThis.crypto ??= import_node_crypto.default;
 const getRequestContext = (event) => {
   return event.requestContext;
 };

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

@@ -28,12 +28,17 @@ var import_router = require("../../router");
 var import_trie_router = require("../../router/trie-router");
 const some = (...middleware) => {
   return async function some2(c, next) {
+    let isNextCalled = false;
+    const wrappedNext = () => {
+      isNextCalled = true;
+      return next();
+    };
     let lastError;
     for (const handler of middleware) {
       try {
-        const result = await handler(c, next);
+        const result = await handler(c, wrappedNext);
         if (result === true && !c.finalized) {
-          await next();
+          await wrappedNext();
         } else if (result === false) {
           lastError = new Error("No successful middleware found");
           continue;
@@ -42,7 +47,9 @@ const some = (...middleware) => {
         break;
       } catch (error) {
         lastError = error;
-        continue;
+        if (isNextCalled) {
+          break;
+        }
       }
     }
     if (lastError) {

package/dist/cjs/middleware/etag/digest.js

@@ -31,7 +31,7 @@ const mergeBuffers = (buffer1, buffer2) => {
   return merged;
 };
 const generateDigest = async (stream, generator) => {
-  if (!stream || !crypto || !crypto.subtle) {
+  if (!stream) {
     return null;
   }
   let result = void 0;

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

@@ -34,21 +34,32 @@ const RETAINED_304_HEADERS = [
 function etagMatches(etag2, ifNoneMatch) {
   return ifNoneMatch != null && ifNoneMatch.split(/,\s*/).indexOf(etag2) > -1;
 }
+function initializeGenerator(generator) {
+  if (!generator) {
+    if (crypto && crypto.subtle) {
+      generator = (body) => crypto.subtle.digest(
+        {
+          name: "SHA-1"
+        },
+        body
+      );
+    }
+  }
+  return generator;
+}
 const etag = (options) => {
   const retainedHeaders = options?.retainedHeaders ?? RETAINED_304_HEADERS;
   const weak = options?.weak ?? false;
-  const generator = options?.generateDigest ?? ((body) => crypto.subtle.digest(
-    {
-      name: "SHA-1"
-    },
-    body
-  ));
+  const generator = initializeGenerator(options?.generateDigest);
   return async function etag2(c, next) {
     const ifNoneMatch = c.req.header("If-None-Match") ?? null;
     await next();
     const res = c.res;
     let etag3 = res.headers.get("ETag");
     if (!etag3) {
+      if (!generator) {
+        return;
+      }
       const hash = await (0, import_digest.generateDigest)(res.clone().body, generator);
       if (hash === null) {
         return;

package/dist/cjs/utils/url.js

@@ -122,27 +122,11 @@ const getPathNoStrict = (request) => {
   const result = getPath(request);
   return result.length > 1 && result.at(-1) === "/" ? result.slice(0, -1) : result;
 };
-const mergePath = (...paths) => {
-  let p = "";
-  let endsWithSlash = false;
-  for (let path of paths) {
-    if (p.at(-1) === "/") {
-      p = p.slice(0, -1);
-      endsWithSlash = true;
-    }
-    if (path[0] !== "/") {
-      path = `/${path}`;
-    }
-    if (path === "/" && endsWithSlash) {
-      p = `${p}/`;
-    } else if (path !== "/") {
-      p = `${p}${path}`;
-    }
-    if (path === "/" && p === "") {
-      p = "/";
-    }
+const mergePath = (base, sub, ...rest) => {
+  if (rest.length) {
+    sub = mergePath(sub, ...rest);
   }
-  return p;
+  return `${base?.[0] === "/" ? "" : "/"}${base}${sub === "/" ? "" : `${base?.at(-1) === "/" ? "" : "/"}${sub?.[0] === "/" ? sub.slice(1) : sub}`}`;
 };
 const checkOptionalParameter = (path) => {
   if (!path.match(/\:.+\?$/)) {

package/dist/middleware/combine/index.js

@@ -4,12 +4,17 @@ import { METHOD_NAME_ALL } from "../../router.js";
 import { TrieRouter } from "../../router/trie-router/index.js";
 var some = (...middleware) => {
   return async function some2(c, next) {
+    let isNextCalled = false;
+    const wrappedNext = () => {
+      isNextCalled = true;
+      return next();
+    };
     let lastError;
     for (const handler of middleware) {
       try {
-        const result = await handler(c, next);
+        const result = await handler(c, wrappedNext);
         if (result === true && !c.finalized) {
-          await next();
+          await wrappedNext();
         } else if (result === false) {
           lastError = new Error("No successful middleware found");
           continue;
@@ -18,7 +23,9 @@ var some = (...middleware) => {
         break;
       } catch (error) {
         lastError = error;
-        continue;
+        if (isNextCalled) {
+          break;
+        }
       }
     }
     if (lastError) {

package/dist/middleware/etag/digest.js

@@ -9,7 +9,7 @@ var mergeBuffers = (buffer1, buffer2) => {
   return merged;
 };
 var generateDigest = async (stream, generator) => {
-  if (!stream || !crypto || !crypto.subtle) {
+  if (!stream) {
     return null;
   }
   let result = void 0;

package/dist/middleware/etag/index.js

@@ -11,21 +11,32 @@ var RETAINED_304_HEADERS = [
 function etagMatches(etag2, ifNoneMatch) {
   return ifNoneMatch != null && ifNoneMatch.split(/,\s*/).indexOf(etag2) > -1;
 }
+function initializeGenerator(generator) {
+  if (!generator) {
+    if (crypto && crypto.subtle) {
+      generator = (body) => crypto.subtle.digest(
+        {
+          name: "SHA-1"
+        },
+        body
+      );
+    }
+  }
+  return generator;
+}
 var etag = (options) => {
   const retainedHeaders = options?.retainedHeaders ?? RETAINED_304_HEADERS;
   const weak = options?.weak ?? false;
-  const generator = options?.generateDigest ?? ((body) => crypto.subtle.digest(
-    {
-      name: "SHA-1"
-    },
-    body
-  ));
+  const generator = initializeGenerator(options?.generateDigest);
   return async function etag2(c, next) {
     const ifNoneMatch = c.req.header("If-None-Match") ?? null;
     await next();
     const res = c.res;
     let etag3 = res.headers.get("ETag");
     if (!etag3) {
+      if (!generator) {
+        return;
+      }
       const hash = await generateDigest(res.clone().body, generator);
       if (hash === null) {
         return;

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

@@ -15,6 +15,16 @@ export declare const tryDecode: (str: string, decoder: Decoder) => string;
 export declare const getPath: (request: Request) => string;
 export declare const getQueryStrings: (url: string) => string;
 export declare const getPathNoStrict: (request: Request) => string;
+/**
+ * Merge paths.
+ * @param {string[]} ...paths - The paths to merge.
+ * @returns {string} The merged path.
+ * @example
+ * mergePath('/api', '/users') // '/api/users'
+ * mergePath('/api/', '/users') // '/api/users'
+ * mergePath('/api', '/') // '/api'
+ * mergePath('/api/', '/') // '/api/'
+ */
 export declare const mergePath: (...paths: string[]) => string;
 export declare const checkOptionalParameter: (path: string) => string[] | null;
 export declare const getQueryParam: (url: string, key?: string) => string | undefined | Record<string, string>;

package/dist/utils/url.js

@@ -89,27 +89,11 @@ var getPathNoStrict = (request) => {
   const result = getPath(request);
   return result.length > 1 && result.at(-1) === "/" ? result.slice(0, -1) : result;
 };
-var mergePath = (...paths) => {
-  let p = "";
-  let endsWithSlash = false;
-  for (let path of paths) {
-    if (p.at(-1) === "/") {
-      p = p.slice(0, -1);
-      endsWithSlash = true;
-    }
-    if (path[0] !== "/") {
-      path = `/${path}`;
-    }
-    if (path === "/" && endsWithSlash) {
-      p = `${p}/`;
-    } else if (path !== "/") {
-      p = `${p}${path}`;
-    }
-    if (path === "/" && p === "") {
-      p = "/";
-    }
+var mergePath = (base, sub, ...rest) => {
+  if (rest.length) {
+    sub = mergePath(sub, ...rest);
   }
-  return p;
+  return `${base?.[0] === "/" ? "" : "/"}${base}${sub === "/" ? "" : `${base?.at(-1) === "/" ? "" : "/"}${sub?.[0] === "/" ? sub.slice(1) : sub}`}`;
 };
 var checkOptionalParameter = (path) => {
   if (!path.match(/\:.+\?$/)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hono",
-  "version": "4.7.0",
+  "version": "4.7.1",
   "description": "Web framework built on Web Standards",
   "main": "dist/cjs/index.js",
   "type": "module",