hono 3.3.1 → 3.3.3

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

@@ -2,14 +2,23 @@
 import crypto from "crypto";
 import { encodeBase64 } from "../../utils/encode.js";
 globalThis.crypto ?? (globalThis.crypto = crypto);
+var convertHeaders = (headers) => {
+  const cfHeaders = {};
+  headers.forEach((value, key) => {
+    cfHeaders[key.toLowerCase()] = [{ key: key.toLowerCase(), value }];
+  });
+  return cfHeaders;
+};
 var handle = (app) => {
   return async (event, context, callback) => {
-    const req = createRequest(event);
-    const res = await app.fetch(req, {
+    const res = await app.fetch(createRequest(event), {
       event,
       context,
-      callback,
-      request: event.Records[0].cf.request
+      callback: (err, result) => {
+        callback?.(err, result);
+      },
+      request: event.Records[0].cf.request,
+      response: event.Records[0].cf.response
     });
     return createResult(res);
   };
@@ -17,35 +26,27 @@ var handle = (app) => {
 var createResult = async (res) => {
   const isBase64Encoded = isContentTypeBinary(res.headers.get("content-type") || "");
   const body = isBase64Encoded ? encodeBase64(await res.arrayBuffer()) : await res.text();
-  const headers = {};
-  res.headers.forEach((value, key) => {
-    headers[key.toLowerCase()] = [{ key: key.toLowerCase(), value }];
-  });
   return {
     status: res.status.toString(),
-    headers,
+    headers: convertHeaders(res.headers),
     body
   };
 };
 var createRequest = (event) => {
-  const queryString = extractQueryString(event);
+  const queryString = event.Records[0].cf.request.querystring;
   const urlPath = `https://${event.Records[0].cf.config.distributionDomainName}${event.Records[0].cf.request.uri}`;
   const url = queryString ? `${urlPath}?${queryString}` : urlPath;
   const headers = new Headers();
-  for (const [k, v] of Object.entries(event.Records[0].cf.request.headers)) {
+  Object.entries(event.Records[0].cf.request.headers).forEach(([k, v]) => {
     v.forEach((header) => headers.set(k, header.value));
-  }
-  const method = event.Records[0].cf.request.method;
-  const requestInit = {
-    headers,
-    method
-  };
+  });
   const requestBody = event.Records[0].cf.request.body;
-  requestInit.body = requestBody?.encoding === "base64" && requestBody?.data ? Buffer.from(requestBody.data, "base64") : requestBody?.data;
-  return new Request(url, requestInit);
-};
-var extractQueryString = (event) => {
-  return event.Records[0].cf.request.querystring;
+  const body = requestBody?.encoding === "base64" && requestBody?.data ? Buffer.from(requestBody.data, "base64") : requestBody?.data;
+  return new Request(url, {
+    headers,
+    method: event.Records[0].cf.request.method,
+    body
+  });
 };
 var isContentTypeBinary = (contentType) => {
   return !/^(text\/(plain|html|css|javascript|csv).*|application\/(.*json|.*xml).*|image\/svg\+xml)$/.test(

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

@@ -31,14 +31,23 @@ module.exports = __toCommonJS(handler_exports);
 var import_crypto = __toESM(require("crypto"), 1);
 var import_encode = require("../../utils/encode");
 globalThis.crypto ?? (globalThis.crypto = import_crypto.default);
+const convertHeaders = (headers) => {
+  const cfHeaders = {};
+  headers.forEach((value, key) => {
+    cfHeaders[key.toLowerCase()] = [{ key: key.toLowerCase(), value }];
+  });
+  return cfHeaders;
+};
 const handle = (app) => {
   return async (event, context, callback) => {
-    const req = createRequest(event);
-    const res = await app.fetch(req, {
+    const res = await app.fetch(createRequest(event), {
       event,
       context,
-      callback,
-      request: event.Records[0].cf.request
+      callback: (err, result) => {
+        callback?.(err, result);
+      },
+      request: event.Records[0].cf.request,
+      response: event.Records[0].cf.response
     });
     return createResult(res);
   };
@@ -46,35 +55,27 @@ const handle = (app) => {
 const createResult = async (res) => {
   const isBase64Encoded = isContentTypeBinary(res.headers.get("content-type") || "");
   const body = isBase64Encoded ? (0, import_encode.encodeBase64)(await res.arrayBuffer()) : await res.text();
-  const headers = {};
-  res.headers.forEach((value, key) => {
-    headers[key.toLowerCase()] = [{ key: key.toLowerCase(), value }];
-  });
   return {
     status: res.status.toString(),
-    headers,
+    headers: convertHeaders(res.headers),
     body
   };
 };
 const createRequest = (event) => {
-  const queryString = extractQueryString(event);
+  const queryString = event.Records[0].cf.request.querystring;
   const urlPath = `https://${event.Records[0].cf.config.distributionDomainName}${event.Records[0].cf.request.uri}`;
   const url = queryString ? `${urlPath}?${queryString}` : urlPath;
   const headers = new Headers();
-  for (const [k, v] of Object.entries(event.Records[0].cf.request.headers)) {
+  Object.entries(event.Records[0].cf.request.headers).forEach(([k, v]) => {
     v.forEach((header) => headers.set(k, header.value));
-  }
-  const method = event.Records[0].cf.request.method;
-  const requestInit = {
-    headers,
-    method
-  };
+  });
   const requestBody = event.Records[0].cf.request.body;
-  requestInit.body = requestBody?.encoding === "base64" && requestBody?.data ? Buffer.from(requestBody.data, "base64") : requestBody?.data;
-  return new Request(url, requestInit);
-};
-const extractQueryString = (event) => {
-  return event.Records[0].cf.request.querystring;
+  const body = requestBody?.encoding === "base64" && requestBody?.data ? Buffer.from(requestBody.data, "base64") : requestBody?.data;
+  return new Request(url, {
+    headers,
+    method: event.Records[0].cf.request.method,
+    body
+  });
 };
 const isContentTypeBinary = (contentType) => {
   return !/^(text\/(plain|html|css|javascript|csv).*|application\/(.*json|.*xml).*|image\/svg\+xml)$/.test(

package/dist/cjs/hono-base.js

@@ -117,7 +117,7 @@ class Hono extends defineDynamicClass() {
     const strict = init.strict ?? true;
     delete init.strict;
     Object.assign(this, init);
-    this.getPath || (this.getPath = strict ? import_url.getPath : import_url.getPathNoStrict);
+    this.getPath = strict ? init.getPath ?? import_url.getPath : import_url.getPathNoStrict;
   }
   clone() {
     const clone = new Hono({

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

@@ -95,7 +95,7 @@ var Hono = class extends defineDynamicClass() {
     const strict = init.strict ?? true;
     delete init.strict;
     Object.assign(this, init);
-    this.getPath || (this.getPath = strict ? getPath : getPathNoStrict);
+    this.getPath = strict ? init.getPath ?? getPath : getPathNoStrict;
   }
   clone() {
     const clone = new Hono({

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/dist/types/adapter/lambda-edge/handler.d.ts

@@ -32,6 +32,11 @@ export interface CloudFrontRequest {
         custom: CloudFrontCustomOrigin;
     };
 }
+export interface CloudFrontResponse {
+    headers: CloudFrontHeaders;
+    status: string;
+    statusDescription?: string;
+}
 interface CloudFrontConfig {
     distributionDomainName: string;
     distributionId: string;
@@ -42,6 +47,7 @@ interface CloudFrontEvent {
     cf: {
         config: CloudFrontConfig;
         request: CloudFrontRequest;
+        response?: CloudFrontResponse;
     };
 }
 export interface CloudFrontEdgeEvent {
@@ -63,10 +69,6 @@ interface CloudFrontResult {
     body?: string;
     bodyEncoding?: 'text' | 'base64';
 }
-/**
- * Accepts events from 'Lambda@Edge' event
- * https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/lambda-event-structure.html
- */
 export declare const handle: (app: Hono<any>) => (event: CloudFrontEdgeEvent, context?: CloudFrontContext, callback?: Callback) => Promise<CloudFrontResult>;
 export declare const isContentTypeBinary: (contentType: string) => boolean;
 export {};

package/package.json

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