hono 4.7.0 → 4.7.2

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/compose.js

@@ -21,11 +21,9 @@ __export(compose_exports, {
   compose: () => compose
 });
 module.exports = __toCommonJS(compose_exports);
-var import_context = require("./context");
 const compose = (middleware, onError, onNotFound) => {
   return (context, next) => {
     let index = -1;
-    const isContext = context instanceof import_context.Context;
     return dispatch(0);
     async function dispatch(i) {
       if (i <= index) {
@@ -37,23 +35,15 @@ const compose = (middleware, onError, onNotFound) => {
       let handler;
       if (middleware[i]) {
         handler = middleware[i][0][0];
-        if (isContext) {
-          context.req.routeIndex = i;
-        }
+        context.req.routeIndex = i;
       } else {
         handler = i === middleware.length && next || void 0;
       }
-      if (!handler) {
-        if (isContext && context.finalized === false && onNotFound) {
-          res = await onNotFound(context);
-        }
-      } else {
+      if (handler) {
         try {
-          res = await handler(context, () => {
-            return dispatch(i + 1);
-          });
+          res = await handler(context, () => dispatch(i + 1));
         } catch (err) {
-          if (err instanceof Error && isContext && onError) {
+          if (err instanceof Error && onError) {
             context.error = err;
             res = await onError(err, context);
             isError = true;
@@ -61,6 +51,10 @@ const compose = (middleware, onError, onNotFound) => {
             throw err;
           }
         }
+      } else {
+        if (context.finalized === false && onNotFound) {
+          res = await onNotFound(context);
+        }
       }
       if (res && (context.finalized === false || isError)) {
         context.res = res;

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

@@ -42,18 +42,31 @@ const buildRequestInitFromRequest = (request) => {
     method: request.method,
     body: request.body,
     duplex: request.body ? "half" : void 0,
-    headers
+    headers,
+    signal: request.signal
   };
 };
+const preprocessRequestInit = (requestInit) => {
+  if (!requestInit.headers || Array.isArray(requestInit.headers) || requestInit.headers instanceof Headers) {
+    return requestInit;
+  }
+  const headers = new Headers();
+  for (const [key, value] of Object.entries(requestInit.headers)) {
+    if (value == null) {
+      headers.delete(key);
+    } else {
+      headers.set(key, value);
+    }
+  }
+  requestInit.headers = headers;
+  return requestInit;
+};
 const proxy = async (input, proxyInit) => {
   const { raw, ...requestInit } = proxyInit ?? {};
-  const req = new Request(
-    input,
-    {
-      ...buildRequestInitFromRequest(raw),
-      ...requestInit
-    }
-  );
+  const req = new Request(input, {
+    ...buildRequestInitFromRequest(raw),
+    ...preprocessRequestInit(requestInit)
+  });
   req.headers.delete("accept-encoding");
   const res = await fetch(req);
   const resHeaders = new Headers(res.headers);
@@ -65,7 +78,8 @@ const proxy = async (input, proxyInit) => {
     resHeaders.delete("content-length");
   }
   return new Response(res.body, {
-    ...res,
+    status: res.status,
+    statusText: res.statusText,
     headers: resHeaders
   });
 };

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/compose.js

@@ -1,9 +1,7 @@
 // src/compose.ts
-import { Context } from "./context.js";
 var compose = (middleware, onError, onNotFound) => {
   return (context, next) => {
     let index = -1;
-    const isContext = context instanceof Context;
     return dispatch(0);
     async function dispatch(i) {
       if (i <= index) {
@@ -15,23 +13,15 @@ var compose = (middleware, onError, onNotFound) => {
       let handler;
       if (middleware[i]) {
         handler = middleware[i][0][0];
-        if (isContext) {
-          context.req.routeIndex = i;
-        }
+        context.req.routeIndex = i;
       } else {
         handler = i === middleware.length && next || void 0;
       }
-      if (!handler) {
-        if (isContext && context.finalized === false && onNotFound) {
-          res = await onNotFound(context);
-        }
-      } else {
+      if (handler) {
         try {
-          res = await handler(context, () => {
-            return dispatch(i + 1);
-          });
+          res = await handler(context, () => dispatch(i + 1));
         } catch (err) {
-          if (err instanceof Error && isContext && onError) {
+          if (err instanceof Error && onError) {
             context.error = err;
             res = await onError(err, context);
             isError = true;
@@ -39,6 +29,10 @@ var compose = (middleware, onError, onNotFound) => {
             throw err;
           }
         }
+      } else {
+        if (context.finalized === false && onNotFound) {
+          res = await onNotFound(context);
+        }
       }
       if (res && (context.finalized === false || isError)) {
         context.res = res;

package/dist/helper/proxy/index.js

@@ -20,18 +20,31 @@ var buildRequestInitFromRequest = (request) => {
     method: request.method,
     body: request.body,
     duplex: request.body ? "half" : void 0,
-    headers
+    headers,
+    signal: request.signal
   };
 };
+var preprocessRequestInit = (requestInit) => {
+  if (!requestInit.headers || Array.isArray(requestInit.headers) || requestInit.headers instanceof Headers) {
+    return requestInit;
+  }
+  const headers = new Headers();
+  for (const [key, value] of Object.entries(requestInit.headers)) {
+    if (value == null) {
+      headers.delete(key);
+    } else {
+      headers.set(key, value);
+    }
+  }
+  requestInit.headers = headers;
+  return requestInit;
+};
 var proxy = async (input, proxyInit) => {
   const { raw, ...requestInit } = proxyInit ?? {};
-  const req = new Request(
-    input,
-    {
-      ...buildRequestInitFromRequest(raw),
-      ...requestInit
-    }
-  );
+  const req = new Request(input, {
+    ...buildRequestInitFromRequest(raw),
+    ...preprocessRequestInit(requestInit)
+  });
   req.headers.delete("accept-encoding");
   const res = await fetch(req);
   const resHeaders = new Headers(res.headers);
@@ -43,7 +56,8 @@ var proxy = async (input, proxyInit) => {
     resHeaders.delete("content-length");
   }
   return new Response(res.body, {
-    ...res,
+    status: res.status,
+    statusText: res.statusText,
     headers: resHeaders
   });
 };

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/compose.d.ts

@@ -1,31 +1,17 @@
+import type { Context } from './context';
 import type { Env, ErrorHandler, NotFoundHandler } from './types';
-/**
- * Interface representing the context for a composition operation.
- */
-interface ComposeContext {
-    /**
-     * Indicates whether the composition process has been finalized.
-     */
-    finalized: boolean;
-    /**
-     * The result of the composition process. The type is unknown and should be
-     * specified based on the context where this interface is used.
-     */
-    res: unknown;
-}
 /**
  * Compose middleware functions into a single function based on `koa-compose` package.
  *
- * @template C - The context type.
  * @template E - The environment type.
  *
  * @param {[[Function, unknown], ParamIndexMap | Params][]} middleware - An array of middleware functions and their corresponding parameters.
  * @param {ErrorHandler<E>} [onError] - An optional error handler function.
  * @param {NotFoundHandler<E>} [onNotFound] - An optional not-found handler function.
  *
- * @returns {(context: C, next?: Function) => Promise<C>} - A composed middleware function.
+ * @returns {(context: Context, next?: Function) => Promise<>} - A composed middleware function.
  */
-export declare const compose: <C extends ComposeContext, E extends Env = Env>(middleware: [
+export declare const compose: <E extends Env = Env>(middleware: [
     [
         Function,
         unknown
@@ -35,5 +21,4 @@ export declare const compose: <C extends ComposeContext, E extends Env = Env>(mi
     [
         Function
     ]
-][], onError?: ErrorHandler<E>, onNotFound?: NotFoundHandler<E>) => ((context: C, next?: Function) => Promise<C>);
-export {};
+][], onError?: ErrorHandler<E>, onNotFound?: NotFoundHandler<E>) => ((context: Context, next?: Function) => Promise<Context>);

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.2",
   "description": "Web framework built on Web Standards",
   "main": "dist/cjs/index.js",
   "type": "module",