hono 4.7.1 → 4.7.3

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/hono-base.js

@@ -89,10 +89,9 @@ class Hono {
       });
       return this;
     };
-    const strict = options.strict ?? true;
-    delete options.strict;
-    Object.assign(this, options);
-    this.getPath = strict ? options.getPath ?? import_url.getPath : import_url.getPathNoStrict;
+    const { strict, ...optionsWithoutStrict } = options;
+    Object.assign(this, optionsWithoutStrict);
+    this.getPath = strict ?? true ? options.getPath ?? import_url.getPath : import_url.getPathNoStrict;
   }
   #clone() {
     const clone = new Hono({

package/dist/cjs/router/pattern-router/router.js

@@ -41,13 +41,15 @@ class PatternRouter {
         return match ? `/(?<${match[1]}>${match[2] || "[^/]+"})` : part === "/*" ? "/[^/]+" : part.replace(/[.\\+*[^\]$()]/g, "\\$&");
       }
     );
-    let re;
     try {
-      re = new RegExp(`^${parts.join("")}${endsWithWildcard ? "" : "/?$"}`);
+      this.#routes.push([
+        new RegExp(`^${parts.join("")}${endsWithWildcard ? "" : "/?$"}`),
+        method,
+        handler
+      ]);
     } catch {
       throw new import_router.UnsupportedPathError();
     }
-    this.#routes.push([re, method, handler]);
   }
   match(method, path) {
     const handlers = [];

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

@@ -31,7 +31,7 @@ var import_jwa = require("./jwa");
 var import_jws = require("./jws");
 var import_types = require("./types");
 var import_utf8 = require("./utf8");
-const encodeJwtPart = (part) => (0, import_encode.encodeBase64Url)(import_utf8.utf8Encoder.encode(JSON.stringify(part))).replace(/=/g, "");
+const encodeJwtPart = (part) => (0, import_encode.encodeBase64Url)(import_utf8.utf8Encoder.encode(JSON.stringify(part)).buffer).replace(/=/g, "");
 const encodeSignaturePart = (buf) => (0, import_encode.encodeBase64Url)(buf).replace(/=/g, "");
 const decodeJwtPart = (part) => JSON.parse(import_utf8.utf8Decoder.decode((0, import_encode.decodeBase64Url)(part)));
 function isTokenHeader(obj) {

package/dist/cjs/utils/url.js

@@ -129,7 +129,7 @@ const mergePath = (base, sub, ...rest) => {
   return `${base?.[0] === "/" ? "" : "/"}${base}${sub === "/" ? "" : `${base?.at(-1) === "/" ? "" : "/"}${sub?.[0] === "/" ? sub.slice(1) : sub}`}`;
 };
 const checkOptionalParameter = (path) => {
-  if (!path.match(/\:.+\?$/)) {
+  if (path.charCodeAt(path.length - 1) !== 63 || !path.includes(":")) {
     return null;
   }
   const segments = path.split("/");

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/hono-base.js

@@ -67,10 +67,9 @@ var Hono = class {
       });
       return this;
     };
-    const strict = options.strict ?? true;
-    delete options.strict;
-    Object.assign(this, options);
-    this.getPath = strict ? options.getPath ?? getPath : getPathNoStrict;
+    const { strict, ...optionsWithoutStrict } = options;
+    Object.assign(this, optionsWithoutStrict);
+    this.getPath = strict ?? true ? options.getPath ?? getPath : getPathNoStrict;
   }
   #clone() {
     const clone = new Hono({

package/dist/router/pattern-router/router.js

@@ -19,13 +19,15 @@ var PatternRouter = class {
         return match ? `/(?<${match[1]}>${match[2] || "[^/]+"})` : part === "/*" ? "/[^/]+" : part.replace(/[.\\+*[^\]$()]/g, "\\$&");
       }
     );
-    let re;
     try {
-      re = new RegExp(`^${parts.join("")}${endsWithWildcard ? "" : "/?$"}`);
+      this.#routes.push([
+        new RegExp(`^${parts.join("")}${endsWithWildcard ? "" : "/?$"}`),
+        method,
+        handler
+      ]);
     } catch {
       throw new UnsupportedPathError();
     }
-    this.#routes.push([re, method, handler]);
   }
   match(method, path) {
     const handlers = [];

package/dist/types/adapter/bun/websocket.d.ts

@@ -9,7 +9,7 @@ export interface BunServerWebSocket<T> {
     data: T;
     readyState: 0 | 1 | 2 | 3;
 }
-interface BunWebSocketHandler<T> {
+export interface BunWebSocketHandler<T> {
     open(ws: BunServerWebSocket<T>): void;
     close(ws: BunServerWebSocket<T>, code?: number, reason?: string): void;
     message(ws: BunServerWebSocket<T>, message: string | {

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/helper/websocket/index.d.ts

@@ -27,7 +27,7 @@ export type WSReadyState = 0 | 1 | 2 | 3;
  * An argument for WSContext class
  */
 export interface WSContextInit<T = unknown> {
-    send(data: string | ArrayBuffer, options: SendOptions): void;
+    send(data: string | ArrayBuffer | Uint8Array, options: SendOptions): void;
     close(code?: number, reason?: string): void;
     raw?: T;
     readyState: WSReadyState;

package/dist/utils/jwt/jwt.js

@@ -12,7 +12,7 @@ import {
   JwtTokenSignatureMismatched
 } from "./types.js";
 import { utf8Decoder, utf8Encoder } from "./utf8.js";
-var encodeJwtPart = (part) => encodeBase64Url(utf8Encoder.encode(JSON.stringify(part))).replace(/=/g, "");
+var encodeJwtPart = (part) => encodeBase64Url(utf8Encoder.encode(JSON.stringify(part)).buffer).replace(/=/g, "");
 var encodeSignaturePart = (buf) => encodeBase64Url(buf).replace(/=/g, "");
 var decodeJwtPart = (part) => JSON.parse(utf8Decoder.decode(decodeBase64Url(part)));
 function isTokenHeader(obj) {

package/dist/utils/url.js

@@ -96,7 +96,7 @@ var mergePath = (base, sub, ...rest) => {
   return `${base?.[0] === "/" ? "" : "/"}${base}${sub === "/" ? "" : `${base?.at(-1) === "/" ? "" : "/"}${sub?.[0] === "/" ? sub.slice(1) : sub}`}`;
 };
 var checkOptionalParameter = (path) => {
-  if (!path.match(/\:.+\?$/)) {
+  if (path.charCodeAt(path.length - 1) !== 63 || !path.includes(":")) {
     return null;
   }
   const segments = path.split("/");

package/package.json

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