hono 3.2.0-rc.1 → 3.2.0-rc.2

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

@@ -9,11 +9,14 @@ var handle = (app) => {
   };
 };
 var createResult = async (res) => {
+  const contentType = res.headers.get("content-type");
+  const isBase64Encoded = contentType && isContentTypeBinary(contentType) ? true : false;
+  const body = isBase64Encoded ? await fromReadableToString(res) : await res.text();
   const result = {
-    body: await fromReadableToString(res),
+    body,
     headers: {},
     statusCode: res.status,
-    isBase64Encoded: true
+    isBase64Encoded
   };
   res.headers.forEach((value, key) => {
     result.headers[key] = value;
@@ -22,16 +25,17 @@ var createResult = async (res) => {
 };
 var createRequest = (event) => {
   const queryString = extractQueryString(event);
-  const urlPath = isProxyEventV2(event) ? `https://${event.requestContext.domainName}${event.rawPath}` : `https://${event.requestContext.domainName}${event.path}`;
+  const urlPath = `https://${event.requestContext.domainName}${isProxyEvent(event) ? event.path : event.rawPath}`;
   const url = queryString ? `${urlPath}?${queryString}` : urlPath;
   const headers = new Headers();
   for (const [k, v] of Object.entries(event.headers)) {
     if (v)
       headers.set(k, v);
   }
+  const method = "httpMethod" in event ? event.httpMethod : event.requestContext.http.method;
   const requestInit = {
     headers,
-    method: event.httpMethod
+    method
   };
   if (event.body) {
     requestInit.body = event.isBase64Encoded ? atob(event.body) : event.body;
@@ -39,10 +43,13 @@ var createRequest = (event) => {
   return new Request(url, requestInit);
 };
 var extractQueryString = (event) => {
-  if (isProxyEventV2(event)) {
-    return event.rawQueryString;
+  if (isProxyEvent(event)) {
+    return Object.entries(event.queryStringParameters || {}).filter(([, value]) => value).map(([key, value]) => `${key}=${value}`).join("&");
   }
-  return Object.entries(event.queryStringParameters || {}).filter(([, value]) => value).map(([key, value]) => `${key}=${value}`).join("&");
+  return isProxyEventV2(event) ? event.rawQueryString : event.rawQueryString;
+};
+var isProxyEvent = (event) => {
+  return Object.prototype.hasOwnProperty.call(event, "path");
 };
 var isProxyEventV2 = (event) => {
   return Object.prototype.hasOwnProperty.call(event, "rawPath");
@@ -56,6 +63,12 @@ var fromReadableToString = async (res) => {
   }
   return btoa(string);
 };
+var isContentTypeBinary = (contentType) => {
+  return !/^(text\/(plain|html|css|javascript|csv).*|application\/(.*json|.*xml).*|image\/svg\+xml)$/.test(
+    contentType
+  );
+};
 export {
-  handle
+  handle,
+  isContentTypeBinary
 };

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

@@ -24,7 +24,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var handler_exports = {};
 __export(handler_exports, {
-  handle: () => handle
+  handle: () => handle,
+  isContentTypeBinary: () => isContentTypeBinary
 });
 module.exports = __toCommonJS(handler_exports);
 var import_crypto = __toESM(require("crypto"), 1);
@@ -37,11 +38,14 @@ const handle = (app) => {
   };
 };
 const createResult = async (res) => {
+  const contentType = res.headers.get("content-type");
+  const isBase64Encoded = contentType && isContentTypeBinary(contentType) ? true : false;
+  const body = isBase64Encoded ? await fromReadableToString(res) : await res.text();
   const result = {
-    body: await fromReadableToString(res),
+    body,
     headers: {},
     statusCode: res.status,
-    isBase64Encoded: true
+    isBase64Encoded
   };
   res.headers.forEach((value, key) => {
     result.headers[key] = value;
@@ -50,16 +54,17 @@ const createResult = async (res) => {
 };
 const createRequest = (event) => {
   const queryString = extractQueryString(event);
-  const urlPath = isProxyEventV2(event) ? `https://${event.requestContext.domainName}${event.rawPath}` : `https://${event.requestContext.domainName}${event.path}`;
+  const urlPath = `https://${event.requestContext.domainName}${isProxyEvent(event) ? event.path : event.rawPath}`;
   const url = queryString ? `${urlPath}?${queryString}` : urlPath;
   const headers = new Headers();
   for (const [k, v] of Object.entries(event.headers)) {
     if (v)
       headers.set(k, v);
   }
+  const method = "httpMethod" in event ? event.httpMethod : event.requestContext.http.method;
   const requestInit = {
     headers,
-    method: event.httpMethod
+    method
   };
   if (event.body) {
     requestInit.body = event.isBase64Encoded ? atob(event.body) : event.body;
@@ -67,10 +72,13 @@ const createRequest = (event) => {
   return new Request(url, requestInit);
 };
 const extractQueryString = (event) => {
-  if (isProxyEventV2(event)) {
-    return event.rawQueryString;
+  if (isProxyEvent(event)) {
+    return Object.entries(event.queryStringParameters || {}).filter(([, value]) => value).map(([key, value]) => `${key}=${value}`).join("&");
   }
-  return Object.entries(event.queryStringParameters || {}).filter(([, value]) => value).map(([key, value]) => `${key}=${value}`).join("&");
+  return isProxyEventV2(event) ? event.rawQueryString : event.rawQueryString;
+};
+const isProxyEvent = (event) => {
+  return Object.prototype.hasOwnProperty.call(event, "path");
 };
 const isProxyEventV2 = (event) => {
   return Object.prototype.hasOwnProperty.call(event, "rawPath");
@@ -84,7 +92,13 @@ const fromReadableToString = async (res) => {
   }
   return btoa(string);
 };
+const isContentTypeBinary = (contentType) => {
+  return !/^(text\/(plain|html|css|javascript|csv).*|application\/(.*json|.*xml).*|image\/svg\+xml)$/.test(
+    contentType
+  );
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  handle
+  handle,
+  isContentTypeBinary
 });

package/dist/cjs/context.js

@@ -138,7 +138,7 @@ class Context {
         this._pH = {};
       }
       if (this._pH["content-type"]) {
-        this._pH["content-type"] = "text/plain; charset=UTF8";
+        this._pH["content-type"] = "text/plain; charset=UTF-8";
       }
       return typeof arg === "number" ? this.newResponse(text, arg, headers) : this.newResponse(text, arg);
     };

package/dist/cjs/utils/url.js

@@ -149,7 +149,7 @@ const _getQueryParam = (url, key, multiple) => {
       } else if (trailingKeyCode == 38 || isNaN(trailingKeyCode)) {
         return "";
       }
-      keyIndex2 = url.indexOf(`&${key}`, keyIndex2);
+      keyIndex2 = url.indexOf(`&${key}`, keyIndex2 + 1);
     }
     encoded = /[%+]/.test(url);
     if (!encoded) {

package/dist/context.js

@@ -116,7 +116,7 @@ var Context = class {
         this._pH = {};
       }
       if (this._pH["content-type"]) {
-        this._pH["content-type"] = "text/plain; charset=UTF8";
+        this._pH["content-type"] = "text/plain; charset=UTF-8";
       }
       return typeof arg === "number" ? this.newResponse(text, arg, headers) : this.newResponse(text, arg);
     };

package/dist/types/adapter/aws-lambda/handler.d.ts

@@ -21,6 +21,19 @@ interface APIGatewayProxyEvent {
         domainName: string;
     };
 }
+interface LambdaFunctionUrlEvent {
+    headers: Record<string, string | undefined>;
+    rawPath: string;
+    rawQueryString: string;
+    body: string | null;
+    isBase64Encoded: boolean;
+    requestContext: {
+        domainName: string;
+        http: {
+            method: string;
+        };
+    };
+}
 interface APIGatewayProxyResult {
     statusCode: number;
     body: string;
@@ -30,5 +43,6 @@ interface APIGatewayProxyResult {
 /**
  * Accepts events from API Gateway/ELB(`APIGatewayProxyEvent`) and directly through Function Url(`APIGatewayProxyEventV2`)
  */
-export declare const handle: (app: Hono) => (event: APIGatewayProxyEvent | APIGatewayProxyEventV2) => Promise<APIGatewayProxyResult>;
+export declare const handle: (app: Hono) => (event: APIGatewayProxyEvent | APIGatewayProxyEventV2 | LambdaFunctionUrlEvent) => Promise<APIGatewayProxyResult>;
+export declare const isContentTypeBinary: (contentType: string) => boolean;
 export {};

package/dist/utils/url.js

@@ -118,7 +118,7 @@ var _getQueryParam = (url, key, multiple) => {
       } else if (trailingKeyCode == 38 || isNaN(trailingKeyCode)) {
         return "";
       }
-      keyIndex2 = url.indexOf(`&${key}`, keyIndex2);
+      keyIndex2 = url.indexOf(`&${key}`, keyIndex2 + 1);
     }
     encoded = /[%+]/.test(url);
     if (!encoded) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hono",
-  "version": "3.2.0-rc.1",
+  "version": "3.2.0-rc.2",
   "description": "Ultrafast web framework for the Edge",
   "main": "dist/cjs/index.js",
   "type": "module",
@@ -358,7 +358,7 @@
     "jest-preset-fastly-js-compute": "^0.6.1",
     "msw": "^1.0.0",
     "node-fetch": "2",
-    "np": "^7.6.2",
+    "np": "^7.7.0",
     "prettier": "^2.6.2",
     "publint": "^0.1.8",
     "rimraf": "^3.0.2",