hono 3.3.0 → 3.3.2

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

@@ -45,7 +45,7 @@ var createRequest = (event) => {
     method
   };
   if (event.body) {
-    requestInit.body = event.isBase64Encoded ? atob(event.body) : event.body;
+    requestInit.body = event.isBase64Encoded ? Buffer.from(event.body, "base64") : event.body;
   }
   return new Request(url, requestInit);
 };

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

@@ -1,7 +1,7 @@
 // src/adapter/deno/serve-static.ts
 import { getFilePath } from "../../utils/filepath.js";
 import { getMimeType } from "../../utils/mime.js";
-var { readFile } = Deno;
+var { open } = Deno;
 var DEFAULT_DOCUMENT = "index.html";
 var serveStatic = (options = { root: "" }) => {
   return async (c, next) => {
@@ -17,18 +17,18 @@ var serveStatic = (options = { root: "" }) => {
       defaultDocument: DEFAULT_DOCUMENT
     });
     path = `./${path}`;
-    let content;
+    let file;
     try {
-      content = await readFile(path);
+      file = await open(path);
     } catch (e) {
       console.warn(`${e}`);
     }
-    if (content) {
+    if (file) {
       const mimeType = getMimeType(path);
       if (mimeType) {
         c.header("Content-Type", mimeType);
       }
-      return c.body(content);
+      return c.body(file.readable);
     } else {
       console.warn(`Static file: ${path} is not found`);
       await next();

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

@@ -41,7 +41,7 @@ var createRequest = (event) => {
     method
   };
   const requestBody = event.Records[0].cf.request.body;
-  requestInit.body = requestBody?.encoding === "base64" && requestBody?.data ? atob(requestBody.data) : requestBody?.data;
+  requestInit.body = requestBody?.encoding === "base64" && requestBody?.data ? Buffer.from(requestBody.data, "base64") : requestBody?.data;
   return new Request(url, requestInit);
 };
 var extractQueryString = (event) => {

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

@@ -74,7 +74,7 @@ const createRequest = (event) => {
     method
   };
   if (event.body) {
-    requestInit.body = event.isBase64Encoded ? atob(event.body) : event.body;
+    requestInit.body = event.isBase64Encoded ? Buffer.from(event.body, "base64") : event.body;
   }
   return new Request(url, requestInit);
 };

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

@@ -23,7 +23,7 @@ __export(serve_static_exports, {
 module.exports = __toCommonJS(serve_static_exports);
 var import_filepath = require("../../utils/filepath");
 var import_mime = require("../../utils/mime");
-const { readFile } = Deno;
+const { open } = Deno;
 const DEFAULT_DOCUMENT = "index.html";
 const serveStatic = (options = { root: "" }) => {
   return async (c, next) => {
@@ -39,18 +39,18 @@ const serveStatic = (options = { root: "" }) => {
       defaultDocument: DEFAULT_DOCUMENT
     });
     path = `./${path}`;
-    let content;
+    let file;
     try {
-      content = await readFile(path);
+      file = await open(path);
     } catch (e) {
       console.warn(`${e}`);
     }
-    if (content) {
+    if (file) {
       const mimeType = (0, import_mime.getMimeType)(path);
       if (mimeType) {
         c.header("Content-Type", mimeType);
       }
-      return c.body(content);
+      return c.body(file.readable);
     } else {
       console.warn(`Static file: ${path} is not found`);
       await next();

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

@@ -70,7 +70,7 @@ const createRequest = (event) => {
     method
   };
   const requestBody = event.Records[0].cf.request.body;
-  requestInit.body = requestBody?.encoding === "base64" && requestBody?.data ? atob(requestBody.data) : requestBody?.data;
+  requestInit.body = requestBody?.encoding === "base64" && requestBody?.data ? Buffer.from(requestBody.data, "base64") : requestBody?.data;
   return new Request(url, requestInit);
 };
 const extractQueryString = (event) => {

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

@@ -35,6 +35,9 @@ const cache = (options) => {
     const response = await cache2.match(key);
     if (!response) {
       await next();
+      if (!c.res.ok) {
+        return;
+      }
       addHeader(c.res);
       const response2 = c.res.clone();
       if (options.wait) {
@@ -43,7 +46,7 @@ const cache = (options) => {
         c.executionCtx.waitUntil(cache2.put(key, response2));
       }
     } else {
-      return response;
+      return new Response(response.body, response);
     }
   };
 };

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

@@ -40,15 +40,13 @@ const etag = (options) => {
     const ifNoneMatch = c.req.headers.get("If-None-Match");
     await next();
     const res = c.res;
-    let undisturbedRes = res;
     let etag2 = res.headers.get("ETag");
     if (!etag2) {
-      undisturbedRes = res.clone();
-      const hash = await (0, import_crypto.sha1)(res.body || "");
+      const hash = await (0, import_crypto.sha1)(res.clone().body || "");
       etag2 = weak ? `W/"${hash}"` : `"${hash}"`;
     }
     if (etagMatches(etag2, ifNoneMatch)) {
-      await undisturbedRes.blob();
+      await c.res.blob();
       c.res = new Response(null, {
         status: 304,
         statusText: "Not Modified",
@@ -62,7 +60,6 @@ const etag = (options) => {
         }
       });
     } else {
-      c.res = new Response(undisturbedRes.body, undisturbedRes);
       c.res.headers.set("ETag", etag2);
     }
   };

package/dist/cjs/preset/quick.js

@@ -23,10 +23,14 @@ __export(quick_exports, {
 module.exports = __toCommonJS(quick_exports);
 var import_hono_base = require("../hono-base");
 var import_linear_router = require("../router/linear-router");
+var import_smart_router = require("../router/smart-router");
+var import_trie_router = require("../router/trie-router");
 class Hono extends import_hono_base.HonoBase {
   constructor(init = {}) {
     super(init);
-    this.router = new import_linear_router.LinearRouter();
+    this.router = new import_smart_router.SmartRouter({
+      routers: [new import_linear_router.LinearRouter(), new import_trie_router.TrieRouter()]
+    });
   }
 }
 // Annotate the CommonJS export names for ESM import in node:

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

@@ -64,14 +64,11 @@ class PatternRouter {
     const handlers = [];
     const params = {};
     for (const [pattern, routeMethod, handler] of this.routes) {
-      const isRegExp = pattern.source.charCodeAt(pattern.source.length - 1) === 36;
       if (routeMethod === import_router.METHOD_NAME_ALL || routeMethod === method) {
         const match = pattern.exec(path);
         if (match) {
           handlers.push(handler);
-          if (isRegExp) {
-            Object.assign(params, match.groups);
-          }
+          Object.assign(params, match.groups);
         }
       }
     }

package/dist/cjs/router/trie-router/node.js

@@ -147,18 +147,22 @@ class Node {
           if (part === "")
             continue;
           const [key, name, matcher] = pattern;
+          const child = node.children[key];
           const restPathString = parts.slice(i).join("/");
           if (matcher instanceof RegExp && matcher.test(restPathString)) {
-            handlerSets.push(...this.gHSets(node.children[key], method));
+            handlerSets.push(...this.gHSets(child, method));
             params[name] = restPathString;
             continue;
           }
           if (matcher === true || matcher instanceof RegExp && matcher.test(part)) {
             if (typeof key === "string") {
               if (isLast === true) {
-                handlerSets.push(...this.gHSets(node.children[key], method));
+                handlerSets.push(...this.gHSets(child, method));
+                if (child.children["*"]) {
+                  handlerSets.push(...this.gHSets(child.children["*"], method));
+                }
               } else {
-                tempNodes.push(node.children[key]);
+                tempNodes.push(child);
               }
             }
             if (typeof name === "string" && !matched) {

package/dist/middleware/cache/index.js

@@ -13,6 +13,9 @@ var cache = (options) => {
     const response = await cache2.match(key);
     if (!response) {
       await next();
+      if (!c.res.ok) {
+        return;
+      }
       addHeader(c.res);
       const response2 = c.res.clone();
       if (options.wait) {
@@ -21,7 +24,7 @@ var cache = (options) => {
         c.executionCtx.waitUntil(cache2.put(key, response2));
       }
     } else {
-      return response;
+      return new Response(response.body, response);
     }
   };
 };

package/dist/middleware/etag/index.js

@@ -18,15 +18,13 @@ var etag = (options) => {
     const ifNoneMatch = c.req.headers.get("If-None-Match");
     await next();
     const res = c.res;
-    let undisturbedRes = res;
     let etag2 = res.headers.get("ETag");
     if (!etag2) {
-      undisturbedRes = res.clone();
-      const hash = await sha1(res.body || "");
+      const hash = await sha1(res.clone().body || "");
       etag2 = weak ? `W/"${hash}"` : `"${hash}"`;
     }
     if (etagMatches(etag2, ifNoneMatch)) {
-      await undisturbedRes.blob();
+      await c.res.blob();
       c.res = new Response(null, {
         status: 304,
         statusText: "Not Modified",
@@ -40,7 +38,6 @@ var etag = (options) => {
         }
       });
     } else {
-      c.res = new Response(undisturbedRes.body, undisturbedRes);
       c.res.headers.set("ETag", etag2);
     }
   };

package/dist/preset/quick.js

@@ -1,10 +1,14 @@
 // src/preset/quick.ts
 import { HonoBase } from "../hono-base.js";
 import { LinearRouter } from "../router/linear-router/index.js";
+import { SmartRouter } from "../router/smart-router/index.js";
+import { TrieRouter } from "../router/trie-router/index.js";
 var Hono = class extends HonoBase {
   constructor(init = {}) {
     super(init);
-    this.router = new LinearRouter();
+    this.router = new SmartRouter({
+      routers: [new LinearRouter(), new TrieRouter()]
+    });
   }
 };
 export {

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

@@ -42,14 +42,11 @@ var PatternRouter = class {
     const handlers = [];
     const params = {};
     for (const [pattern, routeMethod, handler] of this.routes) {
-      const isRegExp = pattern.source.charCodeAt(pattern.source.length - 1) === 36;
       if (routeMethod === METHOD_NAME_ALL || routeMethod === method) {
         const match = pattern.exec(path);
         if (match) {
           handlers.push(handler);
-          if (isRegExp) {
-            Object.assign(params, match.groups);
-          }
+          Object.assign(params, match.groups);
         }
       }
     }

package/dist/router/trie-router/node.js

@@ -125,18 +125,22 @@ var Node = class {
           if (part === "")
             continue;
           const [key, name, matcher] = pattern;
+          const child = node.children[key];
           const restPathString = parts.slice(i).join("/");
           if (matcher instanceof RegExp && matcher.test(restPathString)) {
-            handlerSets.push(...this.gHSets(node.children[key], method));
+            handlerSets.push(...this.gHSets(child, method));
             params[name] = restPathString;
             continue;
           }
           if (matcher === true || matcher instanceof RegExp && matcher.test(part)) {
             if (typeof key === "string") {
               if (isLast === true) {
-                handlerSets.push(...this.gHSets(node.children[key], method));
+                handlerSets.push(...this.gHSets(child, method));
+                if (child.children["*"]) {
+                  handlerSets.push(...this.gHSets(child.children["*"], method));
+                }
               } else {
-                tempNodes.push(node.children[key]);
+                tempNodes.push(child);
               }
             }
             if (typeof name === "string" && !matched) {

package/package.json

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