hono 3.3.3 → 3.4.0

package/README.md

@@ -26,7 +26,7 @@
 [![Discord badge](https://img.shields.io/discord/1011308539819597844?label=Discord&logo=Discord)](https://discord.gg/KMh2eNSdxV)
 
 Hono - _**\[炎\] means flame🔥 in Japanese**_ - is a small, simple, and ultrafast web framework for the Edges.
-It works on any JavaScript runtime: Cloudflare Workers, Fastly Compute@Edge, Deno, Bun, Vercel, Lagon, AWS Lambda, and Node.js.
+It works on any JavaScript runtime: Cloudflare Workers, Fastly Compute@Edge, Deno, Bun, Vercel, Lagon, AWS Lambda, Lambda@Edge, and Node.js.
 
 Fast, but not only fast.
 
@@ -49,7 +49,7 @@ npm create hono@latest my-app
 
 - **Ultrafast** 🚀 - The router `RegExpRouter` is really fast. Not using linear loops. Fast.
 - **Lightweight** 🪶 - The `hono/tiny` preset is under 12kB. Hono has zero dependencies and uses only the Web Standard API.
-- **Multi-runtime** 🌍 - Works on Cloudflare Workers, Fastly Compute@Edge, Deno, Bun, Lagon, AWS Lambda, or Node.js. The same code runs on all platforms.
+- **Multi-runtime** 🌍 - Works on Cloudflare Workers, Fastly Compute@Edge, Deno, Bun, Lagon, AWS Lambda, Lambda@Edge, or Node.js. The same code runs on all platforms.
 - **Batteries Included** 🔋 - Hono has built-in middleware, custom middleware, and third-party middleware. Batteries included.
 - **Delightful DX** 🛠️ - Super clean APIs. First-class TypeScript support. Now, we've got "Types".
 
@@ -58,12 +58,12 @@ npm create hono@latest my-app
 **Hono is the fastest**, compared to other routers for Cloudflare Workers.
 
 ```
-Hono x 402,820 ops/sec ±4.78% (80 runs sampled)
-itty-router x 212,598 ops/sec ±3.11% (87 runs sampled)
-sunder x 297,036 ops/sec ±4.76% (77 runs sampled)
-worktop x 197,345 ops/sec ±2.40% (88 runs sampled)
+Hono x 510,171 ops/sec ±4.61% (82 runs sampled)
+itty-router x 285,810 ops/sec ±4.13% (85 runs sampled)
+sunder x 345,272 ops/sec ±4.46% (87 runs sampled)
+worktop x 203,468 ops/sec ±3.03% (91 runs sampled)
 Fastest is Hono
-✨  Done in 28.06s.
+✨  Done in 28.68s.
 ```
 
 ## Documentation

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

@@ -11,7 +11,11 @@ var handle = (app) => {
 };
 var createResult = async (res) => {
   const contentType = res.headers.get("content-type");
-  const isBase64Encoded = contentType && isContentTypeBinary(contentType) ? true : false;
+  let isBase64Encoded = contentType && isContentTypeBinary(contentType) ? true : false;
+  if (!isBase64Encoded) {
+    const contentEncoding = res.headers.get("content-encoding");
+    isBase64Encoded = isContentEncodingBinary(contentEncoding);
+  }
   let body;
   if (isBase64Encoded) {
     const buffer = await res.arrayBuffer();
@@ -66,7 +70,14 @@ var isContentTypeBinary = (contentType) => {
     contentType
   );
 };
+var isContentEncodingBinary = (contentEncoding) => {
+  if (contentEncoding === null) {
+    return false;
+  }
+  return /^(gzip|deflate|compress|br)/.test(contentEncoding);
+};
 export {
   handle,
+  isContentEncodingBinary,
   isContentTypeBinary
 };

package/dist/adapter/bun/serve-static.js

@@ -17,6 +17,8 @@ var serveStatic = (options = { root: "" }) => {
       root: options.root,
       defaultDocument: DEFAULT_DOCUMENT
     });
+    if (!path)
+      return await next();
     path = `./${path}`;
     if (existsSync(path)) {
       const content = file(path);

package/dist/adapter/cloudflare-pages/handler.js

@@ -11,6 +11,17 @@ var handle = (subApp, path) => (eventContext) => {
     }
   );
 };
+var serveStatic = () => {
+  return async (c) => {
+    const env = c.env;
+    const res = await env.ASSETS.fetch(c.req.raw);
+    if (res.status === 404) {
+      return c.notFound();
+    }
+    return res;
+  };
+};
 export {
-  handle
+  handle,
+  serveStatic
 };

package/dist/adapter/cloudflare-pages/index.js

@@ -1,5 +1,6 @@
 // src/adapter/cloudflare-pages/index.ts
-import { handle } from "./handler.js";
+import { handle, serveStatic } from "./handler.js";
 export {
-  handle
+  handle,
+  serveStatic
 };

package/dist/adapter/cloudflare-workers/serve-static.js

@@ -16,6 +16,8 @@ var serveStatic = (options = { root: "" }) => {
       root: options.root,
       defaultDocument: DEFAULT_DOCUMENT
     });
+    if (!path)
+      return await next();
     const content = await getContentFromKVAsset(path, {
       manifest: options.manifest,
       namespace: options.namespace ? options.namespace : c.env ? c.env.__STATIC_CONTENT : void 0

package/dist/adapter/deno/serve-static.js

@@ -16,6 +16,8 @@ var serveStatic = (options = { root: "" }) => {
       root: options.root,
       defaultDocument: DEFAULT_DOCUMENT
     });
+    if (!path)
+      return await next();
     path = `./${path}`;
     let file;
     try {

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

@@ -17,6 +17,7 @@ var handle = (app) => {
       callback: (err, result) => {
         callback?.(err, result);
       },
+      config: event.Records[0].cf.config,
       request: event.Records[0].cf.request,
       response: event.Records[0].cf.response
     });

package/dist/adapter/netlify/handler.js

@@ -0,0 +1,9 @@
+// src/adapter/netlify/handler.ts
+var handle = (app) => {
+  return (req, context) => {
+    return app.fetch(req, { context });
+  };
+};
+export {
+  handle
+};

package/dist/adapter/netlify/mod.js

@@ -0,0 +1,5 @@
+// src/adapter/netlify/mod.ts
+import { handle } from "./handler.ts";
+export {
+  handle
+};

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

@@ -25,6 +25,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var handler_exports = {};
 __export(handler_exports, {
   handle: () => handle,
+  isContentEncodingBinary: () => isContentEncodingBinary,
   isContentTypeBinary: () => isContentTypeBinary
 });
 module.exports = __toCommonJS(handler_exports);
@@ -40,7 +41,11 @@ const handle = (app) => {
 };
 const createResult = async (res) => {
   const contentType = res.headers.get("content-type");
-  const isBase64Encoded = contentType && isContentTypeBinary(contentType) ? true : false;
+  let isBase64Encoded = contentType && isContentTypeBinary(contentType) ? true : false;
+  if (!isBase64Encoded) {
+    const contentEncoding = res.headers.get("content-encoding");
+    isBase64Encoded = isContentEncodingBinary(contentEncoding);
+  }
   let body;
   if (isBase64Encoded) {
     const buffer = await res.arrayBuffer();
@@ -95,8 +100,15 @@ const isContentTypeBinary = (contentType) => {
     contentType
   );
 };
+const isContentEncodingBinary = (contentEncoding) => {
+  if (contentEncoding === null) {
+    return false;
+  }
+  return /^(gzip|deflate|compress|br)/.test(contentEncoding);
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   handle,
+  isContentEncodingBinary,
   isContentTypeBinary
 });

package/dist/cjs/adapter/bun/serve-static.js

@@ -39,6 +39,8 @@ const serveStatic = (options = { root: "" }) => {
       root: options.root,
       defaultDocument: DEFAULT_DOCUMENT
     });
+    if (!path)
+      return await next();
     path = `./${path}`;
     if ((0, import_fs.existsSync)(path)) {
       const content = file(path);

package/dist/cjs/adapter/cloudflare-pages/handler.js

@@ -18,7 +18,8 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var handler_exports = {};
 __export(handler_exports, {
-  handle: () => handle
+  handle: () => handle,
+  serveStatic: () => serveStatic
 });
 module.exports = __toCommonJS(handler_exports);
 var import_hono = require("../../hono");
@@ -33,7 +34,18 @@ const handle = (subApp, path) => (eventContext) => {
     }
   );
 };
+const serveStatic = () => {
+  return async (c) => {
+    const env = c.env;
+    const res = await env.ASSETS.fetch(c.req.raw);
+    if (res.status === 404) {
+      return c.notFound();
+    }
+    return res;
+  };
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  handle
+  handle,
+  serveStatic
 });

package/dist/cjs/adapter/cloudflare-pages/index.js

@@ -18,11 +18,13 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var cloudflare_pages_exports = {};
 __export(cloudflare_pages_exports, {
-  handle: () => import_handler.handle
+  handle: () => import_handler.handle,
+  serveStatic: () => import_handler.serveStatic
 });
 module.exports = __toCommonJS(cloudflare_pages_exports);
 var import_handler = require("./handler");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  handle
+  handle,
+  serveStatic
 });

package/dist/cjs/adapter/cloudflare-workers/serve-static.js

@@ -38,6 +38,8 @@ const serveStatic = (options = { root: "" }) => {
       root: options.root,
       defaultDocument: DEFAULT_DOCUMENT
     });
+    if (!path)
+      return await next();
     const content = await (0, import_cloudflare.getContentFromKVAsset)(path, {
       manifest: options.manifest,
       namespace: options.namespace ? options.namespace : c.env ? c.env.__STATIC_CONTENT : void 0

package/dist/cjs/adapter/deno/serve-static.js

@@ -38,6 +38,8 @@ const serveStatic = (options = { root: "" }) => {
       root: options.root,
       defaultDocument: DEFAULT_DOCUMENT
     });
+    if (!path)
+      return await next();
     path = `./${path}`;
     let file;
     try {

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

@@ -46,6 +46,7 @@ const handle = (app) => {
       callback: (err, result) => {
         callback?.(err, result);
       },
+      config: event.Records[0].cf.config,
       request: event.Records[0].cf.request,
       response: event.Records[0].cf.response
     });

package/dist/cjs/adapter/netlify/handler.js

@@ -0,0 +1,32 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var handler_exports = {};
+__export(handler_exports, {
+  handle: () => handle
+});
+module.exports = __toCommonJS(handler_exports);
+const handle = (app) => {
+  return (req, context) => {
+    return app.fetch(req, { context });
+  };
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  handle
+});

package/dist/cjs/adapter/netlify/mod.js

@@ -0,0 +1,28 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var mod_exports = {};
+__export(mod_exports, {
+  handle: () => import_handler.handle
+});
+module.exports = __toCommonJS(mod_exports);
+var import_handler = require("./handler.ts");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  handle
+});

package/dist/cjs/context.js

@@ -30,11 +30,10 @@ class Context {
     this.finalized = false;
     this.error = void 0;
     this._status = 200;
-    this._pre = false;
-    this._preS = 2;
     this._h = void 0;
     this._pH = void 0;
     this._path = "/";
+    this._init = true;
     this.notFoundHandler = () => new Response();
     this.header = (name, value, options) => {
       if (value === void 0) {
@@ -50,6 +49,7 @@ class Context {
       }
       if (options?.append) {
         if (!this._h) {
+          this._init = false;
           this._h = new Headers(this._pH);
           this._pH = {};
         }
@@ -80,12 +80,8 @@ class Context {
     this.get = (key) => {
       return this._map ? this._map[key] : void 0;
     };
-    this.pretty = (prettyJSON, space = 2) => {
-      this._pre = prettyJSON;
-      this._preS = space;
-    };
     this.newResponse = (data, arg, headers) => {
-      if (!headers && !this._h && !this._res && !arg && this._status === 200) {
+      if (this._init && !headers && !arg && this._status === 200) {
         return new Response(data, {
           headers: this._pH
         });
@@ -133,7 +129,7 @@ class Context {
     };
     this.text = (text, arg, headers) => {
       if (!this._pH) {
-        if (!headers && !this._res && !this._h && !arg) {
+        if (this._init && !headers && !arg) {
           return new Response(text);
         }
         this._pH = {};
@@ -144,7 +140,7 @@ class Context {
       return typeof arg === "number" ? this.newResponse(text, arg, headers) : this.newResponse(text, arg);
     };
     this.json = (object, arg, headers) => {
-      const body = this._pre ? JSON.stringify(object, null, this._preS) : JSON.stringify(object);
+      const body = JSON.stringify(object);
       this._pH ?? (this._pH = {});
       this._pH["content-type"] = "application/json; charset=UTF-8";
       return typeof arg === "number" ? this.newResponse(body, arg, headers) : this.newResponse(body, arg);
@@ -209,9 +205,11 @@ class Context {
     }
   }
   get res() {
+    this._init = false;
     return this._res || (this._res = new Response("404 Not Found", { status: 404 }));
   }
   set res(_res) {
+    this._init = false;
     if (this._res && _res) {
       this._res.headers.delete("content-type");
       this._res.headers.forEach((v, k) => {

package/dist/cjs/hono-base.js

@@ -59,21 +59,21 @@ class Hono extends defineDynamicClass() {
     this.fetch = (request, Env, executionCtx) => {
       return this.dispatch(request, executionCtx, Env, request.method);
     };
-    this.request = async (input, requestInit) => {
+    this.request = (input, requestInit) => {
       if (input instanceof Request) {
         if (requestInit !== void 0) {
           input = new Request(input, requestInit);
         }
-        return await this.fetch(input);
+        return this.fetch(input);
       }
       input = input.toString();
       const path = /^https?:\/\//.test(input) ? input : `http://localhost${(0, import_url.mergePath)("/", input)}`;
       const req = new Request(path, requestInit);
-      return await this.fetch(req);
+      return this.fetch(req);
     };
     this.fire = () => {
       addEventListener("fetch", (event) => {
-        void event.respondWith(this.handleEvent(event));
+        event.respondWith(this.dispatch(event.request, event, void 0, event.request.method));
       });
     };
     const allMethods = [...import_router.METHODS, import_router.METHOD_NAME_ALL_LOWERCASE];

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

@@ -20,7 +20,9 @@ var cookie_exports = {};
 __export(cookie_exports, {
   deleteCookie: () => deleteCookie,
   getCookie: () => getCookie,
-  setCookie: () => setCookie
+  getSignedCookie: () => getSignedCookie,
+  setCookie: () => setCookie,
+  setSignedCookie: () => setSignedCookie
 });
 module.exports = __toCommonJS(cookie_exports);
 var import_cookie = require("../../utils/cookie");
@@ -37,10 +39,27 @@ const getCookie = (c, key) => {
   const obj = (0, import_cookie.parse)(cookie);
   return obj;
 };
+const getSignedCookie = async (c, secret, key) => {
+  const cookie = c.req.raw.headers.get("Cookie");
+  if (typeof key === "string") {
+    if (!cookie)
+      return void 0;
+    const obj2 = await (0, import_cookie.parseSigned)(cookie, secret, key);
+    return obj2[key];
+  }
+  if (!cookie)
+    return {};
+  const obj = await (0, import_cookie.parseSigned)(cookie, secret);
+  return obj;
+};
 const setCookie = (c, name, value, opt) => {
   const cookie = (0, import_cookie.serialize)(name, value, opt);
   c.header("set-cookie", cookie, { append: true });
 };
+const setSignedCookie = async (c, name, value, secret, opt) => {
+  const cookie = await (0, import_cookie.serializeSigned)(name, value, secret, opt);
+  c.header("set-cookie", cookie, { append: true });
+};
 const deleteCookie = (c, name, opt) => {
   setCookie(c, name, "", { ...opt, maxAge: 0 });
 };
@@ -48,5 +67,7 @@ const deleteCookie = (c, name, opt) => {
 0 && (module.exports = {
   deleteCookie,
   getCookie,
-  setCookie
+  getSignedCookie,
+  setCookie,
+  setSignedCookie
 });

package/dist/cjs/middleware/pretty-json/index.js

@@ -24,8 +24,11 @@ module.exports = __toCommonJS(pretty_json_exports);
 const prettyJSON = (options = { space: 2 }) => {
   return async (c, next) => {
     const pretty = c.req.query("pretty") || c.req.query("pretty") === "" ? true : false;
-    c.pretty(pretty, options.space);
     await next();
+    if (pretty && c.res.headers.get("Content-Type")?.startsWith("application/json")) {
+      const obj = await c.res.json();
+      c.res = new Response(JSON.stringify(obj, null, options.space), c.res);
+    }
   };
 };
 // Annotate the CommonJS export names for ESM import in node:

package/dist/cjs/utils/body.js

@@ -21,7 +21,7 @@ __export(body_exports, {
   parseBody: () => parseBody
 });
 module.exports = __toCommonJS(body_exports);
-async function parseBody(r) {
+const parseBody = async (r) => {
   let body = {};
   const contentType = r.headers.get("Content-Type");
   if (contentType && (contentType.startsWith("multipart/form-data") || contentType.startsWith("application/x-www-form-urlencoded"))) {
@@ -32,7 +32,7 @@ async function parseBody(r) {
     body = form;
   }
   return body;
-}
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   parseBody

package/dist/cjs/utils/cookie.js

@@ -19,21 +19,62 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var cookie_exports = {};
 __export(cookie_exports, {
   parse: () => parse,
-  serialize: () => serialize
+  parseSigned: () => parseSigned,
+  serialize: () => serialize,
+  serializeSigned: () => serializeSigned
 });
 module.exports = __toCommonJS(cookie_exports);
 var import_url = require("./url");
-const parse = (cookie) => {
+const makeSignature = async (value, secret) => {
+  const algorithm = { name: "HMAC", hash: "SHA-256" };
+  const encoder = new TextEncoder();
+  const key = await crypto.subtle.importKey("raw", encoder.encode(secret), algorithm, false, [
+    "sign",
+    "verify"
+  ]);
+  const signature = await crypto.subtle.sign(algorithm.name, key, encoder.encode(value));
+  return btoa(String.fromCharCode(...new Uint8Array(signature)));
+};
+const _parseCookiePairs = (cookie, name) => {
   const pairs = cookie.split(/;\s*/g);
+  const cookiePairs = pairs.map((pairStr) => pairStr.split(/\s*=\s*([^\s]+)/));
+  if (!name)
+    return cookiePairs;
+  return cookiePairs.filter((pair) => pair[0] === name);
+};
+const parse = (cookie, name) => {
   const parsedCookie = {};
-  for (let i = 0, len = pairs.length; i < len; i++) {
-    const pair = pairs[i].split(/\s*=\s*([^\s]+)/);
-    parsedCookie[pair[0]] = (0, import_url.decodeURIComponent_)(pair[1]);
+  const unsingedCookies = _parseCookiePairs(cookie, name).filter((pair) => {
+    if (pair[1].split(".").length === 2)
+      return false;
+    return true;
+  });
+  for (let [key, value] of unsingedCookies) {
+    value = (0, import_url.decodeURIComponent_)(value);
+    parsedCookie[key] = value;
   }
   return parsedCookie;
 };
-const serialize = (name, value, opt = {}) => {
-  value = encodeURIComponent(value);
+const parseSigned = async (cookie, secret, name) => {
+  const parsedCookie = {};
+  const signedCookies = _parseCookiePairs(cookie, name).filter((pair) => {
+    if (pair[1].split(".").length !== 2)
+      return false;
+    return true;
+  });
+  for (let [key, value] of signedCookies) {
+    value = (0, import_url.decodeURIComponent_)(value);
+    const signedPair = value.split(".");
+    const signatureToCompare = await makeSignature(signedPair[0], secret);
+    if (signedPair[1] !== signatureToCompare) {
+      parsedCookie[key] = false;
+      continue;
+    }
+    parsedCookie[key] = signedPair[0];
+  }
+  return parsedCookie;
+};
+const _serialize = (name, value, opt = {}) => {
   let cookie = `${name}=${value}`;
   if (opt && typeof opt.maxAge === "number" && opt.maxAge >= 0) {
     cookie += `; Max-Age=${Math.floor(opt.maxAge)}`;
@@ -58,8 +99,20 @@ const serialize = (name, value, opt = {}) => {
   }
   return cookie;
 };
+const serialize = (name, value, opt = {}) => {
+  value = encodeURIComponent(value);
+  return _serialize(name, value, opt);
+};
+const serializeSigned = async (name, value, secret, opt = {}) => {
+  const signature = await makeSignature(value, secret);
+  value = `${value}.${signature}`;
+  value = encodeURIComponent(value);
+  return _serialize(name, value, opt);
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   parse,
-  serialize
+  parseSigned,
+  serialize,
+  serializeSigned
 });

package/dist/cjs/utils/filepath.js

@@ -23,6 +23,8 @@ __export(filepath_exports, {
 module.exports = __toCommonJS(filepath_exports);
 const getFilePath = (options) => {
   let filename = options.filename;
+  if (/(?:^|\/)\.\.(?:$|\/)/.test(filename))
+    return;
   let root = options.root || "";
   const defaultDocument = options.defaultDocument || "index.html";
   if (filename.endsWith("/")) {

package/dist/cjs/utils/html.js

@@ -21,7 +21,7 @@ __export(html_exports, {
   escapeToBuffer: () => escapeToBuffer
 });
 module.exports = __toCommonJS(html_exports);
-const escapeRe = /[&<>"]/;
+const escapeRe = /[&<>'"]/;
 const escapeToBuffer = (str, buffer) => {
   const match = str.search(escapeRe);
   if (match === -1) {
@@ -36,6 +36,9 @@ const escapeToBuffer = (str, buffer) => {
       case 34:
         escape = "&quot;";
         break;
+      case 39:
+        escape = "&#39;";
+        break;
       case 38:
         escape = "&amp;";
         break;

package/dist/cjs/utils/url.js

@@ -87,9 +87,8 @@ const getPattern = (label) => {
   return null;
 };
 const getPath = (request) => {
-  const url = request.url;
-  const queryIndex = url.indexOf("?", 8);
-  return url.slice(url.indexOf("/", 8), queryIndex === -1 ? void 0 : queryIndex);
+  const match = request.url.match(/^https?:\/\/[^/]+(\/[^?]*)/);
+  return match ? match[1] : "";
 };
 const getQueryStrings = (url) => {
   const queryIndex = url.indexOf("?", 8);
@@ -136,7 +135,7 @@ const _decodeURI = (value) => {
   if (value.indexOf("+") !== -1) {
     value = value.replace(/\+/g, " ");
   }
-  return value.indexOf("%") === -1 ? value : decodeURIComponent_(value);
+  return /%/.test(value) ? decodeURIComponent_(value) : value;
 };
 const _getQueryParam = (url, key, multiple) => {
   let encoded;

package/dist/cjs/validator/validator.js

@@ -57,8 +57,8 @@ const validator = (target, validationFunc) => {
         value = c.req.param();
         break;
     }
-    const res = validationFunc(value, c);
-    if (res instanceof Response || res instanceof Promise) {
+    const res = await validationFunc(value, c);
+    if (res instanceof Response) {
       return res;
     }
     c.req.addValidatedData(target, res);