hono 3.3.2 → 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/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/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.2",
+  "version": "3.3.3",
   "description": "Ultrafast web framework for the Edges",
   "main": "dist/cjs/index.js",
   "type": "module",