hono 4.3.5 → 4.3.7

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

@@ -64,23 +64,7 @@ var EventProcessor = class {
     const path = this.getPath(event);
     const urlPath = `https://${domainName}${path}`;
     const url = queryString ? `${urlPath}?${queryString}` : urlPath;
-    const headers = new Headers();
-    this.getCookies(event, headers);
-    if (event.headers) {
-      for (const [k, v] of Object.entries(event.headers)) {
-        if (v) {
-          headers.set(k, v);
-        }
-      }
-    }
-    if (event.multiValueHeaders) {
-      for (const [k, values] of Object.entries(event.multiValueHeaders)) {
-        if (values) {
-          const foundK = headers.get(k);
-          values.forEach((v) => (!foundK || !foundK.includes(v)) && headers.append(k, v));
-        }
-      }
-    }
+    const headers = this.getHeaders(event);
     const method = this.getMethod(event);
     const requestInit = {
       headers,
@@ -102,24 +86,28 @@ var EventProcessor = class {
     const result = {
       body,
       headers: {},
+      multiValueHeaders: event.multiValueHeaders ? {} : void 0,
       statusCode: res.status,
       isBase64Encoded
     };
     this.setCookies(event, res, result);
     res.headers.forEach((value, key) => {
       result.headers[key] = value;
+      if (event.multiValueHeaders && result.multiValueHeaders) {
+        result.multiValueHeaders[key] = [value];
+      }
     });
     return result;
   }
-  setCookies = (event, res, result) => {
+  setCookies(event, res, result) {
     if (res.headers.has("set-cookie")) {
       const cookies = res.headers.get("set-cookie")?.split(", ");
       if (Array.isArray(cookies)) {
-        this.setCookiesToResult(result, cookies);
+        this.setCookiesToResult(event, result, cookies);
         res.headers.delete("set-cookie");
       }
     }
-  };
+  }
 };
 var v2Processor = new class EventV2Processor extends EventProcessor {
   getPath(event) {
@@ -136,9 +124,21 @@ var v2Processor = new class EventV2Processor extends EventProcessor {
       headers.set("Cookie", event.cookies.join("; "));
     }
   }
-  setCookiesToResult(result, cookies) {
+  setCookiesToResult(_, result, cookies) {
     result.cookies = cookies;
   }
+  getHeaders(event) {
+    const headers = new Headers();
+    this.getCookies(event, headers);
+    if (event.headers) {
+      for (const [k, v] of Object.entries(event.headers)) {
+        if (v) {
+          headers.set(k, v);
+        }
+      }
+    }
+    return headers;
+  }
 }();
 var v1Processor = new class EventV1Processor extends EventProcessor {
   getPath(event) {
@@ -152,18 +152,104 @@ var v1Processor = new class EventV1Processor extends EventProcessor {
   }
   getCookies(event, headers) {
   }
-  setCookiesToResult(result, cookies) {
+  getHeaders(event) {
+    const headers = new Headers();
+    this.getCookies(event, headers);
+    if (event.headers) {
+      for (const [k, v] of Object.entries(event.headers)) {
+        if (v) {
+          headers.set(k, v);
+        }
+      }
+    }
+    if (event.multiValueHeaders) {
+      for (const [k, values] of Object.entries(event.multiValueHeaders)) {
+        if (values) {
+          const foundK = headers.get(k);
+          values.forEach((v) => (!foundK || !foundK.includes(v)) && headers.append(k, v));
+        }
+      }
+    }
+    return headers;
+  }
+  setCookiesToResult(_, result, cookies) {
     result.multiValueHeaders = {
       "set-cookie": cookies
     };
   }
 }();
+var albProcessor = new class ALBProcessor extends EventProcessor {
+  getHeaders(event) {
+    const headers = new Headers();
+    if (event.multiValueHeaders) {
+      for (const [key, values] of Object.entries(event.multiValueHeaders)) {
+        if (values && Array.isArray(values)) {
+          headers.set(key, values.join("; "));
+        }
+      }
+    } else {
+      for (const [key, value] of Object.entries(event.headers ?? {})) {
+        if (value) {
+          headers.set(key, value);
+        }
+      }
+    }
+    return headers;
+  }
+  setHeadersToResult(event, result, headers) {
+    if (event.multiValueHeaders) {
+      const multiValueHeaders = {};
+      for (const [key, value] of headers.entries()) {
+        multiValueHeaders[key] = [value];
+      }
+      result.multiValueHeaders = multiValueHeaders;
+    } else {
+      const singleValueHeaders = {};
+      for (const [key, value] of headers.entries()) {
+        singleValueHeaders[key] = value;
+      }
+      result.headers = singleValueHeaders;
+    }
+  }
+  getPath(event) {
+    return event.path;
+  }
+  getMethod(event) {
+    return event.httpMethod;
+  }
+  getQueryString(event) {
+    return Object.entries(event.queryStringParameters || {}).filter(([, value]) => value).map(([key, value]) => `${key}=${value}`).join("&");
+  }
+  getCookies(event, headers) {
+    let cookie;
+    if (event.multiValueHeaders) {
+      cookie = event.multiValueHeaders["cookie"]?.join("; ");
+    } else {
+      cookie = event.headers ? event.headers["cookie"] : void 0;
+    }
+    if (cookie) {
+      headers.append("Cookie", cookie);
+    }
+  }
+  setCookiesToResult(event, result, cookies) {
+    if (event.multiValueHeaders && result.multiValueHeaders) {
+      result.multiValueHeaders["set-cookie"] = cookies;
+    } else {
+      result.headers["set-cookie"] = cookies.join(", ");
+    }
+  }
+}();
 var getProcessor = (event) => {
+  if (isProxyEventALB(event)) {
+    return albProcessor;
+  }
   if (isProxyEventV2(event)) {
     return v2Processor;
-  } else {
-    return v1Processor;
   }
+  return v1Processor;
+};
+var isProxyEventALB = (event) => {
+  return Object.prototype.hasOwnProperty.call(event.requestContext, "elb");
 };
 var isProxyEventV2 = (event) => {
   return Object.prototype.hasOwnProperty.call(event, "rawPath");

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

@@ -96,23 +96,7 @@ class EventProcessor {
     const path = this.getPath(event);
     const urlPath = `https://${domainName}${path}`;
     const url = queryString ? `${urlPath}?${queryString}` : urlPath;
-    const headers = new Headers();
-    this.getCookies(event, headers);
-    if (event.headers) {
-      for (const [k, v] of Object.entries(event.headers)) {
-        if (v) {
-          headers.set(k, v);
-        }
-      }
-    }
-    if (event.multiValueHeaders) {
-      for (const [k, values] of Object.entries(event.multiValueHeaders)) {
-        if (values) {
-          const foundK = headers.get(k);
-          values.forEach((v) => (!foundK || !foundK.includes(v)) && headers.append(k, v));
-        }
-      }
-    }
+    const headers = this.getHeaders(event);
     const method = this.getMethod(event);
     const requestInit = {
       headers,
@@ -134,24 +118,28 @@ class EventProcessor {
     const result = {
       body,
       headers: {},
+      multiValueHeaders: event.multiValueHeaders ? {} : void 0,
       statusCode: res.status,
       isBase64Encoded
     };
     this.setCookies(event, res, result);
     res.headers.forEach((value, key) => {
       result.headers[key] = value;
+      if (event.multiValueHeaders && result.multiValueHeaders) {
+        result.multiValueHeaders[key] = [value];
+      }
     });
     return result;
   }
-  setCookies = (event, res, result) => {
+  setCookies(event, res, result) {
     if (res.headers.has("set-cookie")) {
       const cookies = res.headers.get("set-cookie")?.split(", ");
       if (Array.isArray(cookies)) {
-        this.setCookiesToResult(result, cookies);
+        this.setCookiesToResult(event, result, cookies);
         res.headers.delete("set-cookie");
       }
     }
-  };
+  }
 }
 const v2Processor = new class EventV2Processor extends EventProcessor {
   getPath(event) {
@@ -168,9 +156,21 @@ const v2Processor = new class EventV2Processor extends EventProcessor {
       headers.set("Cookie", event.cookies.join("; "));
     }
   }
-  setCookiesToResult(result, cookies) {
+  setCookiesToResult(_, result, cookies) {
     result.cookies = cookies;
   }
+  getHeaders(event) {
+    const headers = new Headers();
+    this.getCookies(event, headers);
+    if (event.headers) {
+      for (const [k, v] of Object.entries(event.headers)) {
+        if (v) {
+          headers.set(k, v);
+        }
+      }
+    }
+    return headers;
+  }
 }();
 const v1Processor = new class EventV1Processor extends EventProcessor {
   getPath(event) {
@@ -184,18 +184,104 @@ const v1Processor = new class EventV1Processor extends EventProcessor {
   }
   getCookies(event, headers) {
   }
-  setCookiesToResult(result, cookies) {
+  getHeaders(event) {
+    const headers = new Headers();
+    this.getCookies(event, headers);
+    if (event.headers) {
+      for (const [k, v] of Object.entries(event.headers)) {
+        if (v) {
+          headers.set(k, v);
+        }
+      }
+    }
+    if (event.multiValueHeaders) {
+      for (const [k, values] of Object.entries(event.multiValueHeaders)) {
+        if (values) {
+          const foundK = headers.get(k);
+          values.forEach((v) => (!foundK || !foundK.includes(v)) && headers.append(k, v));
+        }
+      }
+    }
+    return headers;
+  }
+  setCookiesToResult(_, result, cookies) {
     result.multiValueHeaders = {
       "set-cookie": cookies
     };
   }
 }();
+const albProcessor = new class ALBProcessor extends EventProcessor {
+  getHeaders(event) {
+    const headers = new Headers();
+    if (event.multiValueHeaders) {
+      for (const [key, values] of Object.entries(event.multiValueHeaders)) {
+        if (values && Array.isArray(values)) {
+          headers.set(key, values.join("; "));
+        }
+      }
+    } else {
+      for (const [key, value] of Object.entries(event.headers ?? {})) {
+        if (value) {
+          headers.set(key, value);
+        }
+      }
+    }
+    return headers;
+  }
+  setHeadersToResult(event, result, headers) {
+    if (event.multiValueHeaders) {
+      const multiValueHeaders = {};
+      for (const [key, value] of headers.entries()) {
+        multiValueHeaders[key] = [value];
+      }
+      result.multiValueHeaders = multiValueHeaders;
+    } else {
+      const singleValueHeaders = {};
+      for (const [key, value] of headers.entries()) {
+        singleValueHeaders[key] = value;
+      }
+      result.headers = singleValueHeaders;
+    }
+  }
+  getPath(event) {
+    return event.path;
+  }
+  getMethod(event) {
+    return event.httpMethod;
+  }
+  getQueryString(event) {
+    return Object.entries(event.queryStringParameters || {}).filter(([, value]) => value).map(([key, value]) => `${key}=${value}`).join("&");
+  }
+  getCookies(event, headers) {
+    let cookie;
+    if (event.multiValueHeaders) {
+      cookie = event.multiValueHeaders["cookie"]?.join("; ");
+    } else {
+      cookie = event.headers ? event.headers["cookie"] : void 0;
+    }
+    if (cookie) {
+      headers.append("Cookie", cookie);
+    }
+  }
+  setCookiesToResult(event, result, cookies) {
+    if (event.multiValueHeaders && result.multiValueHeaders) {
+      result.multiValueHeaders["set-cookie"] = cookies;
+    } else {
+      result.headers["set-cookie"] = cookies.join(", ");
+    }
+  }
+}();
 const getProcessor = (event) => {
+  if (isProxyEventALB(event)) {
+    return albProcessor;
+  }
   if (isProxyEventV2(event)) {
     return v2Processor;
-  } else {
-    return v1Processor;
   }
+  return v1Processor;
+};
+const isProxyEventALB = (event) => {
+  return Object.prototype.hasOwnProperty.call(event.requestContext, "elb");
 };
 const isProxyEventV2 = (event) => {
   return Object.prototype.hasOwnProperty.call(event, "rawPath");

package/dist/cjs/helper/ssg/ssg.js

@@ -30,6 +30,7 @@ var import_mime = require("../../utils/mime");
 var import_middleware = require("./middleware");
 var import_utils2 = require("./utils");
 const DEFAULT_CONCURRENCY = 2;
+const DEFAULT_CONTENT_TYPE = "text/plain";
 const generateFilePath = (routePath, outDir, mimeType, extensionMap) => {
   const extension = determineExtension(mimeType, extensionMap);
   if (routePath.endsWith(`.${extension}`)) {
@@ -121,7 +122,7 @@ const fetchRoutesContent = function* (app, beforeRequestHook, afterResponseHook,
                     }
                     response = maybeResponse;
                   }
-                  const mimeType = response.headers.get("Content-Type")?.split(";")[0] || "text/plain";
+                  const mimeType = response.headers.get("Content-Type")?.split(";")[0] || DEFAULT_CONTENT_TYPE;
                   const content = await parseResponseContent(response);
                   resolveReq({
                     routePath: replacedUrlParam,

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

@@ -62,8 +62,12 @@ const cache = (options) => {
     }
   };
   return async function cache2(c, next) {
-    const key = c.req.url;
-    const cache3 = await caches.open(options.cacheName);
+    let key = c.req.url;
+    if (options.keyGenerator) {
+      key = await options.keyGenerator(c);
+    }
+    const cacheName = typeof options.cacheName === "function" ? await options.cacheName(c) : options.cacheName;
+    const cache3 = await caches.open(cacheName);
     const response = await cache3.match(key);
     if (response) {
       return new Response(response.body, response);

package/dist/cjs/middleware/method-override/index.js

@@ -21,7 +21,6 @@ __export(method_override_exports, {
   methodOverride: () => methodOverride
 });
 module.exports = __toCommonJS(method_override_exports);
-var import_url = require("url");
 var import_body = require("../../utils/body");
 const DEFAULT_METHOD_FORM_NAME = "_method";
 const methodOverride = (options) => async function methodOverride2(c, next) {
@@ -56,7 +55,7 @@ const methodOverride = (options) => async function methodOverride2(c, next) {
       const method = params[methodFormName];
       if (method) {
         delete params[methodFormName];
-        const newParams = new import_url.URLSearchParams(params);
+        const newParams = new URLSearchParams(params);
         const request = new Request(newRequest, {
           body: newParams,
           method

package/dist/cjs/test-utils/setup-vitest.js

@@ -33,6 +33,9 @@ class MockCache {
   async match(key) {
     return this.store.get(key) || null;
   }
+  async keys() {
+    return this.store.keys();
+  }
   async put(key, response) {
     this.store.set(key, response);
   }

package/dist/cjs/utils/body.js

@@ -51,11 +51,11 @@ function convertFormDataToBodyData(formData, options) {
 }
 const handleParsingAllValues = (form, key, value) => {
   const formKey = form[key];
-  if (form[key] && Array.isArray(form[key])) {
-    formKey.push(value);
-  } else if (form[key]) {
-    const parsedKey = [...formKey].join("").replace(",", "");
-    form[key] = [parsedKey, value];
+  if (formKey && Array.isArray(formKey)) {
+    ;
+    form[key].push(value);
+  } else if (formKey) {
+    form[key] = [formKey, value];
   } else {
     form[key] = value;
   }

package/dist/cjs/utils/cookie.js

@@ -134,7 +134,7 @@ const _serialize = (name, value, opt = {}) => {
     cookie += "; Secure";
   }
   if (opt.sameSite) {
-    cookie += `; SameSite=${opt.sameSite}`;
+    cookie += `; SameSite=${opt.sameSite.charAt(0).toUpperCase() + opt.sameSite.slice(1)}`;
   }
   if (opt.partitioned) {
     if (!opt.secure) {

package/dist/helper/ssg/ssg.js

@@ -5,6 +5,7 @@ import { getExtension } from "../../utils/mime.js";
 import { X_HONO_DISABLE_SSG_HEADER_KEY, SSG_CONTEXT } from "./middleware.js";
 import { joinPaths, dirname, filterStaticGenerateRoutes } from "./utils.js";
 var DEFAULT_CONCURRENCY = 2;
+var DEFAULT_CONTENT_TYPE = "text/plain";
 var generateFilePath = (routePath, outDir, mimeType, extensionMap) => {
   const extension = determineExtension(mimeType, extensionMap);
   if (routePath.endsWith(`.${extension}`)) {
@@ -96,7 +97,7 @@ var fetchRoutesContent = function* (app, beforeRequestHook, afterResponseHook, c
                     }
                     response = maybeResponse;
                   }
-                  const mimeType = response.headers.get("Content-Type")?.split(";")[0] || "text/plain";
+                  const mimeType = response.headers.get("Content-Type")?.split(";")[0] || DEFAULT_CONTENT_TYPE;
                   const content = await parseResponseContent(response);
                   resolveReq({
                     routePath: replacedUrlParam,

package/dist/middleware/cache/index.js

@@ -40,8 +40,12 @@ var cache = (options) => {
     }
   };
   return async function cache2(c, next) {
-    const key = c.req.url;
-    const cache3 = await caches.open(options.cacheName);
+    let key = c.req.url;
+    if (options.keyGenerator) {
+      key = await options.keyGenerator(c);
+    }
+    const cacheName = typeof options.cacheName === "function" ? await options.cacheName(c) : options.cacheName;
+    const cache3 = await caches.open(cacheName);
     const response = await cache3.match(key);
     if (response) {
       return new Response(response.body, response);

package/dist/middleware/method-override/index.js

@@ -1,5 +1,4 @@
 // src/middleware/method-override/index.ts
-import { URLSearchParams } from "url";
 import { parseBody } from "../../utils/body.js";
 var DEFAULT_METHOD_FORM_NAME = "_method";
 var methodOverride = (options) => async function methodOverride2(c, next) {

package/dist/test-utils/setup-vitest.js

@@ -15,6 +15,9 @@ var MockCache = class {
   async match(key) {
     return this.store.get(key) || null;
   }
+  async keys() {
+    return this.store.keys();
+  }
   async put(key, response) {
     this.store.set(key, response);
   }

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

@@ -73,11 +73,12 @@ declare abstract class EventProcessor<E extends LambdaEvent> {
     protected abstract getPath(event: E): string;
     protected abstract getMethod(event: E): string;
     protected abstract getQueryString(event: E): string;
+    protected abstract getHeaders(event: E): Headers;
     protected abstract getCookies(event: E, headers: Headers): void;
-    protected abstract setCookiesToResult(result: APIGatewayProxyResult, cookies: string[]): void;
+    protected abstract setCookiesToResult(event: E, result: APIGatewayProxyResult, cookies: string[]): void;
     createRequest(event: E): Request;
     createResult(event: E, res: Response): Promise<APIGatewayProxyResult>;
-    setCookies: (event: LambdaEvent, res: Response, result: APIGatewayProxyResult) => void;
+    setCookies(event: E, res: Response, result: APIGatewayProxyResult): void;
 }
 export declare const getProcessor: (event: LambdaEvent) => EventProcessor<LambdaEvent>;
 export declare const isContentTypeBinary: (contentType: string) => boolean;

package/dist/types/middleware/cache/index.d.ts

@@ -1,7 +1,9 @@
+import type { Context } from '../../context';
 import type { MiddlewareHandler } from '../../types';
 export declare const cache: (options: {
-    cacheName: string;
-    wait?: boolean;
-    cacheControl?: string;
-    vary?: string | string[];
+    cacheName: string | ((c: Context) => Promise<string> | string);
+    wait?: boolean | undefined;
+    cacheControl?: string | undefined;
+    vary?: string | string[] | undefined;
+    keyGenerator?: ((c: Context) => Promise<string> | string) | undefined;
 }) => MiddlewareHandler;

package/dist/types/utils/cookie.d.ts

@@ -23,7 +23,7 @@ export type CookieOptions = {
     path?: string;
     secure?: boolean;
     signingSecret?: string;
-    sameSite?: 'Strict' | 'Lax' | 'None';
+    sameSite?: 'Strict' | 'Lax' | 'None' | 'strict' | 'lax' | 'none';
     partitioned?: boolean;
     prefix?: CookiePrefixOptions;
 } & PartitionCookieConstraint;

package/dist/utils/body.js

@@ -29,11 +29,11 @@ function convertFormDataToBodyData(formData, options) {
 }
 var handleParsingAllValues = (form, key, value) => {
   const formKey = form[key];
-  if (form[key] && Array.isArray(form[key])) {
-    formKey.push(value);
-  } else if (form[key]) {
-    const parsedKey = [...formKey].join("").replace(",", "");
-    form[key] = [parsedKey, value];
+  if (formKey && Array.isArray(formKey)) {
+    ;
+    form[key].push(value);
+  } else if (formKey) {
+    form[key] = [formKey, value];
   } else {
     form[key] = value;
   }

package/dist/utils/cookie.js

@@ -109,7 +109,7 @@ var _serialize = (name, value, opt = {}) => {
     cookie += "; Secure";
   }
   if (opt.sameSite) {
-    cookie += `; SameSite=${opt.sameSite}`;
+    cookie += `; SameSite=${opt.sameSite.charAt(0).toUpperCase() + opt.sameSite.slice(1)}`;
   }
   if (opt.partitioned) {
     if (!opt.secure) {

package/package.json

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