hono 4.2.3 → 4.2.5

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

@@ -77,15 +77,24 @@ var createResult = async (event, res) => {
 };
 var createRequest = (event) => {
   const queryString = extractQueryString(event);
-  const domainName = event.requestContext && "domainName" in event.requestContext ? event.requestContext.domainName : event.headers["host"];
+  const domainName = event.requestContext && "domainName" in event.requestContext ? event.requestContext.domainName : event.headers?.["host"] ?? event.multiValueHeaders?.["host"]?.[0];
   const path = isProxyEventV2(event) ? event.rawPath : event.path;
   const urlPath = `https://${domainName}${path}`;
   const url = queryString ? `${urlPath}?${queryString}` : urlPath;
   const headers = new Headers();
   getCookies(event, headers);
-  for (const [k, v] of Object.entries(event.headers)) {
-    if (v) {
-      headers.set(k, v);
+  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) {
+        values.forEach((v) => headers.append(k, v));
+      }
     }
   }
   const method = isProxyEventV2(event) ? event.requestContext.http.method : event.httpMethod;

package/dist/adapter/cloudflare-workers/utils.js

@@ -1,6 +1,6 @@
 // src/adapter/cloudflare-workers/utils.ts
 var getContentFromKVAsset = async (path, options) => {
-  let ASSET_MANIFEST = {};
+  let ASSET_MANIFEST;
   if (options && options.manifest) {
     if (typeof options.manifest === "string") {
       ASSET_MANIFEST = JSON.parse(options.manifest);

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

@@ -108,15 +108,24 @@ const createResult = async (event, res) => {
 };
 const createRequest = (event) => {
   const queryString = extractQueryString(event);
-  const domainName = event.requestContext && "domainName" in event.requestContext ? event.requestContext.domainName : event.headers["host"];
+  const domainName = event.requestContext && "domainName" in event.requestContext ? event.requestContext.domainName : event.headers?.["host"] ?? event.multiValueHeaders?.["host"]?.[0];
   const path = isProxyEventV2(event) ? event.rawPath : event.path;
   const urlPath = `https://${domainName}${path}`;
   const url = queryString ? `${urlPath}?${queryString}` : urlPath;
   const headers = new Headers();
   getCookies(event, headers);
-  for (const [k, v] of Object.entries(event.headers)) {
-    if (v) {
-      headers.set(k, v);
+  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) {
+        values.forEach((v) => headers.append(k, v));
+      }
     }
   }
   const method = isProxyEventV2(event) ? event.requestContext.http.method : event.httpMethod;

package/dist/cjs/adapter/cloudflare-workers/utils.js

@@ -22,7 +22,7 @@ __export(utils_exports, {
 });
 module.exports = __toCommonJS(utils_exports);
 const getContentFromKVAsset = async (path, options) => {
-  let ASSET_MANIFEST = {};
+  let ASSET_MANIFEST;
   if (options && options.manifest) {
     if (typeof options.manifest === "string") {
       ASSET_MANIFEST = JSON.parse(options.manifest);

package/dist/cjs/client/client.js

@@ -85,7 +85,6 @@ class ClientRequestImpl {
       }
     }
     let methodUpperCase = this.method.toUpperCase();
-    let setBody = !(methodUpperCase === "GET" || methodUpperCase === "HEAD");
     const headerValues = {
       ...args?.header ?? {},
       ...typeof opt?.headers === "function" ? await opt.headers() : opt?.headers ? opt.headers : {}
@@ -108,7 +107,7 @@ class ClientRequestImpl {
       url = url + "?" + this.queryParams.toString();
     }
     methodUpperCase = this.method.toUpperCase();
-    setBody = !(methodUpperCase === "GET" || methodUpperCase === "HEAD");
+    const setBody = !(methodUpperCase === "GET" || methodUpperCase === "HEAD");
     return (opt?.fetch || fetch)(url, {
       body: setBody ? this.rBody : void 0,
       method: methodUpperCase,
@@ -116,8 +115,20 @@ class ClientRequestImpl {
     });
   };
 }
-const hc = (baseUrl, options) => createProxy((opts) => {
+const hc = (baseUrl, options) => createProxy(function proxyCallback(opts) {
   const parts = [...opts.path];
+  if (parts[parts.length - 1] === "toString") {
+    if (parts[parts.length - 2] === "name") {
+      return parts[parts.length - 3] || "";
+    }
+    return proxyCallback.toString();
+  }
+  if (parts[parts.length - 1] === "valueOf") {
+    if (parts[parts.length - 2] === "name") {
+      return parts[parts.length - 3] || "";
+    }
+    return proxyCallback;
+  }
   let method = "";
   if (/^\$/.test(parts[parts.length - 1])) {
     const last = parts.pop();

package/dist/cjs/client/utils.js

@@ -47,6 +47,9 @@ const replaceUrlProtocol = (urlString, protocol) => {
   }
 };
 const removeIndexString = (urlSting) => {
+  if (/^https?:\/\/[^\/]+?\/index$/.test(urlSting)) {
+    return urlSting.replace(/\/index$/, "/");
+  }
   return urlSting.replace(/\/index$/, "");
 };
 function isObject(item) {

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

@@ -165,7 +165,7 @@ const saveContentToFile = async (data, fsModule, outDir, extensionMap) => {
   return filePath;
 };
 const toSSG = async (app, fs, options) => {
-  let result = void 0;
+  let result;
   const getInfoPromises = [];
   const savePromises = [];
   try {

package/dist/cjs/helper/testing/index.js

@@ -26,7 +26,7 @@ const testClient = (app, Env, executionCtx) => {
   const customFetch = (input, init) => {
     return app.request(input, init, Env, executionCtx);
   };
-  return (0, import_client.hc)("", { fetch: customFetch });
+  return (0, import_client.hc)("http://localhost", { fetch: customFetch });
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/jsx/dom/render.js

@@ -40,7 +40,7 @@ const buildDataStack = [];
 let nameSpaceContext = void 0;
 const isNodeString = (node) => Array.isArray(node);
 const getEventSpec = (key) => {
-  const match = key.match(/^on([A-Z][a-zA-Z]+?)((?<!Pointer)Capture)?$/);
+  const match = key.match(/^on([A-Z][a-zA-Z]+?(?:PointerCapture)?)(Capture)?$/);
   if (match) {
     const [, eventName, capture] = match;
     return [(eventAliasMap[eventName] || eventName).toLowerCase(), !!capture];

package/dist/cjs/jsx/streaming.js

@@ -110,36 +110,46 @@ d.replaceWith(c.content)
 };
 Suspense[import_constants.DOM_RENDERER] = import_components2.Suspense;
 const textEncoder = new TextEncoder();
-const renderToReadableStream = (str) => {
+const renderToReadableStream = (str, onError = console.trace) => {
   const reader = new ReadableStream({
     async start(controller) {
-      const tmp = str instanceof Promise ? await str : await str.toString();
-      const context = typeof tmp === "object" ? tmp : {};
-      const resolved = await (0, import_html2.resolveCallback)(
-        tmp,
-        import_html2.HtmlEscapedCallbackPhase.BeforeStream,
-        true,
-        context
-      );
-      controller.enqueue(textEncoder.encode(resolved));
-      let resolvedCount = 0;
-      const callbacks = [];
-      const then = (promise) => {
-        callbacks.push(
-          promise.catch((err) => {
-            console.trace(err);
-            return "";
-          }).then(async (res) => {
-            res = await (0, import_html2.resolveCallback)(res, import_html2.HtmlEscapedCallbackPhase.BeforeStream, true, context);
-            res.callbacks?.map((c) => c({ phase: import_html2.HtmlEscapedCallbackPhase.Stream, context })).filter(Boolean).forEach(then);
-            resolvedCount++;
-            controller.enqueue(textEncoder.encode(res));
-          })
+      try {
+        const tmp = str instanceof Promise ? await str : await str.toString();
+        const context = typeof tmp === "object" ? tmp : {};
+        const resolved = await (0, import_html2.resolveCallback)(
+          tmp,
+          import_html2.HtmlEscapedCallbackPhase.BeforeStream,
+          true,
+          context
         );
-      };
-      resolved.callbacks?.map((c) => c({ phase: import_html2.HtmlEscapedCallbackPhase.Stream, context })).filter(Boolean).forEach(then);
-      while (resolvedCount !== callbacks.length) {
-        await Promise.all(callbacks);
+        controller.enqueue(textEncoder.encode(resolved));
+        let resolvedCount = 0;
+        const callbacks = [];
+        const then = (promise) => {
+          callbacks.push(
+            promise.catch((err) => {
+              console.log(err);
+              onError(err);
+              return "";
+            }).then(async (res) => {
+              res = await (0, import_html2.resolveCallback)(
+                res,
+                import_html2.HtmlEscapedCallbackPhase.BeforeStream,
+                true,
+                context
+              );
+              res.callbacks?.map((c) => c({ phase: import_html2.HtmlEscapedCallbackPhase.Stream, context })).filter(Boolean).forEach(then);
+              resolvedCount++;
+              controller.enqueue(textEncoder.encode(res));
+            })
+          );
+        };
+        resolved.callbacks?.map((c) => c({ phase: import_html2.HtmlEscapedCallbackPhase.Stream, context })).filter(Boolean).forEach(then);
+        while (resolvedCount !== callbacks.length) {
+          await Promise.all(callbacks);
+        }
+      } catch (e) {
+        onError(e);
       }
       controller.close();
     }

package/dist/cjs/middleware/serve-static/index.js

@@ -62,7 +62,7 @@ const serveStatic = (options) => {
       }
     }
     if (content) {
-      let mimeType = void 0;
+      let mimeType;
       if (options.mimes) {
         mimeType = (0, import_mime.getMimeType)(path, options.mimes) ?? (0, import_mime.getMimeType)(path);
       } else {

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

@@ -47,11 +47,9 @@ class Node {
     let curNode = this;
     const parts = (0, import_url.splitRoutingPath)(path);
     const possibleKeys = [];
-    const parentPatterns = [];
     for (let i = 0, len = parts.length; i < len; i++) {
       const p = parts[i];
       if (Object.keys(curNode.children).includes(p)) {
-        parentPatterns.push(...curNode.patterns);
         curNode = curNode.children[p];
         const pattern2 = (0, import_url.getPattern)(p);
         if (pattern2) {
@@ -63,10 +61,8 @@ class Node {
       const pattern = (0, import_url.getPattern)(p);
       if (pattern) {
         curNode.patterns.push(pattern);
-        parentPatterns.push(...curNode.patterns);
         possibleKeys.push(pattern[1]);
       }
-      parentPatterns.push(...curNode.patterns);
       curNode = curNode.children[p];
     }
     if (!curNode.methods.length) {

package/dist/cjs/utils/jwt/jwt.js

@@ -34,7 +34,7 @@ const encodeJwtPart = (part) => (0, import_encode.encodeBase64Url)(import_utf8.u
 const encodeSignaturePart = (buf) => (0, import_encode.encodeBase64Url)(buf).replace(/=/g, "");
 const decodeJwtPart = (part) => JSON.parse(import_utf8.utf8Decoder.decode((0, import_encode.decodeBase64Url)(part)));
 function isTokenHeader(obj) {
-  return typeof obj === "object" && obj !== null && "alg" in obj && Object.values(import_jwa.AlgorithmTypes).includes(obj.alg) && "typ" in obj && obj.typ === "JWT";
+  return typeof obj === "object" && obj !== null && "alg" in obj && Object.values(import_jwa.AlgorithmTypes).includes(obj.alg) && (!("typ" in obj) || obj.typ === "JWT");
 }
 const sign = async (payload, privateKey, alg = "HS256") => {
   const encodedPayload = encodeJwtPart(payload);

package/dist/client/client.js

@@ -69,7 +69,6 @@ var ClientRequestImpl = class {
       }
     }
     let methodUpperCase = this.method.toUpperCase();
-    let setBody = !(methodUpperCase === "GET" || methodUpperCase === "HEAD");
     const headerValues = {
       ...args?.header ?? {},
       ...typeof opt?.headers === "function" ? await opt.headers() : opt?.headers ? opt.headers : {}
@@ -92,7 +91,7 @@ var ClientRequestImpl = class {
       url = url + "?" + this.queryParams.toString();
     }
     methodUpperCase = this.method.toUpperCase();
-    setBody = !(methodUpperCase === "GET" || methodUpperCase === "HEAD");
+    const setBody = !(methodUpperCase === "GET" || methodUpperCase === "HEAD");
     return (opt?.fetch || fetch)(url, {
       body: setBody ? this.rBody : void 0,
       method: methodUpperCase,
@@ -100,8 +99,20 @@ var ClientRequestImpl = class {
     });
   };
 };
-var hc = (baseUrl, options) => createProxy((opts) => {
+var hc = (baseUrl, options) => createProxy(function proxyCallback(opts) {
   const parts = [...opts.path];
+  if (parts[parts.length - 1] === "toString") {
+    if (parts[parts.length - 2] === "name") {
+      return parts[parts.length - 3] || "";
+    }
+    return proxyCallback.toString();
+  }
+  if (parts[parts.length - 1] === "valueOf") {
+    if (parts[parts.length - 2] === "name") {
+      return parts[parts.length - 3] || "";
+    }
+    return proxyCallback;
+  }
   let method = "";
   if (/^\$/.test(parts[parts.length - 1])) {
     const last = parts.pop();

package/dist/client/utils.js

@@ -21,6 +21,9 @@ var replaceUrlProtocol = (urlString, protocol) => {
   }
 };
 var removeIndexString = (urlSting) => {
+  if (/^https?:\/\/[^\/]+?\/index$/.test(urlSting)) {
+    return urlSting.replace(/\/index$/, "/");
+  }
   return urlSting.replace(/\/index$/, "");
 };
 function isObject(item) {

package/dist/helper/ssg/ssg.js

@@ -140,7 +140,7 @@ var saveContentToFile = async (data, fsModule, outDir, extensionMap) => {
   return filePath;
 };
 var toSSG = async (app, fs, options) => {
-  let result = void 0;
+  let result;
   const getInfoPromises = [];
   const savePromises = [];
   try {

package/dist/helper/testing/index.js

@@ -4,7 +4,7 @@ var testClient = (app, Env, executionCtx) => {
   const customFetch = (input, init) => {
     return app.request(input, init, Env, executionCtx);
   };
-  return hc("", { fetch: customFetch });
+  return hc("http://localhost", { fetch: customFetch });
 };
 export {
   testClient

package/dist/jsx/dom/render.js

@@ -15,7 +15,7 @@ var buildDataStack = [];
 var nameSpaceContext = void 0;
 var isNodeString = (node) => Array.isArray(node);
 var getEventSpec = (key) => {
-  const match = key.match(/^on([A-Z][a-zA-Z]+?)((?<!Pointer)Capture)?$/);
+  const match = key.match(/^on([A-Z][a-zA-Z]+?(?:PointerCapture)?)(Capture)?$/);
   if (match) {
     const [, eventName, capture] = match;
     return [(eventAliasMap[eventName] || eventName).toLowerCase(), !!capture];

package/dist/jsx/streaming.js

@@ -87,36 +87,46 @@ d.replaceWith(c.content)
 };
 Suspense[DOM_RENDERER] = SuspenseDomRenderer;
 var textEncoder = new TextEncoder();
-var renderToReadableStream = (str) => {
+var renderToReadableStream = (str, onError = console.trace) => {
   const reader = new ReadableStream({
     async start(controller) {
-      const tmp = str instanceof Promise ? await str : await str.toString();
-      const context = typeof tmp === "object" ? tmp : {};
-      const resolved = await resolveCallback(
-        tmp,
-        HtmlEscapedCallbackPhase.BeforeStream,
-        true,
-        context
-      );
-      controller.enqueue(textEncoder.encode(resolved));
-      let resolvedCount = 0;
-      const callbacks = [];
-      const then = (promise) => {
-        callbacks.push(
-          promise.catch((err) => {
-            console.trace(err);
-            return "";
-          }).then(async (res) => {
-            res = await resolveCallback(res, HtmlEscapedCallbackPhase.BeforeStream, true, context);
-            res.callbacks?.map((c) => c({ phase: HtmlEscapedCallbackPhase.Stream, context })).filter(Boolean).forEach(then);
-            resolvedCount++;
-            controller.enqueue(textEncoder.encode(res));
-          })
+      try {
+        const tmp = str instanceof Promise ? await str : await str.toString();
+        const context = typeof tmp === "object" ? tmp : {};
+        const resolved = await resolveCallback(
+          tmp,
+          HtmlEscapedCallbackPhase.BeforeStream,
+          true,
+          context
         );
-      };
-      resolved.callbacks?.map((c) => c({ phase: HtmlEscapedCallbackPhase.Stream, context })).filter(Boolean).forEach(then);
-      while (resolvedCount !== callbacks.length) {
-        await Promise.all(callbacks);
+        controller.enqueue(textEncoder.encode(resolved));
+        let resolvedCount = 0;
+        const callbacks = [];
+        const then = (promise) => {
+          callbacks.push(
+            promise.catch((err) => {
+              console.log(err);
+              onError(err);
+              return "";
+            }).then(async (res) => {
+              res = await resolveCallback(
+                res,
+                HtmlEscapedCallbackPhase.BeforeStream,
+                true,
+                context
+              );
+              res.callbacks?.map((c) => c({ phase: HtmlEscapedCallbackPhase.Stream, context })).filter(Boolean).forEach(then);
+              resolvedCount++;
+              controller.enqueue(textEncoder.encode(res));
+            })
+          );
+        };
+        resolved.callbacks?.map((c) => c({ phase: HtmlEscapedCallbackPhase.Stream, context })).filter(Boolean).forEach(then);
+        while (resolvedCount !== callbacks.length) {
+          await Promise.all(callbacks);
+        }
+      } catch (e) {
+        onError(e);
       }
       controller.close();
     }

package/dist/middleware/serve-static/index.js

@@ -40,7 +40,7 @@ var serveStatic = (options) => {
       }
     }
     if (content) {
-      let mimeType = void 0;
+      let mimeType;
       if (options.mimes) {
         mimeType = getMimeType(path, options.mimes) ?? getMimeType(path);
       } else {

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

@@ -25,11 +25,9 @@ var Node = class {
     let curNode = this;
     const parts = splitRoutingPath(path);
     const possibleKeys = [];
-    const parentPatterns = [];
     for (let i = 0, len = parts.length; i < len; i++) {
       const p = parts[i];
       if (Object.keys(curNode.children).includes(p)) {
-        parentPatterns.push(...curNode.patterns);
         curNode = curNode.children[p];
         const pattern2 = getPattern(p);
         if (pattern2) {
@@ -41,10 +39,8 @@ var Node = class {
       const pattern = getPattern(p);
       if (pattern) {
         curNode.patterns.push(pattern);
-        parentPatterns.push(...curNode.patterns);
         possibleKeys.push(pattern[1]);
       }
-      parentPatterns.push(...curNode.patterns);
       curNode = curNode.children[p];
     }
     if (!curNode.methods.length) {

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

@@ -7,6 +7,7 @@ export interface APIGatewayProxyEventV2 {
     version: string;
     routeKey: string;
     headers: Record<string, string | undefined>;
+    multiValueHeaders?: undefined;
     cookies?: string[];
     rawPath: string;
     rawQueryString: string;
@@ -44,7 +45,8 @@ export interface APIGatewayProxyEvent {
 }
 export interface ALBProxyEvent {
     httpMethod: string;
-    headers: Record<string, string | undefined>;
+    headers?: Record<string, string | undefined>;
+    multiValueHeaders?: Record<string, string[] | undefined>;
     path: string;
     body: string | null;
     isBase64Encoded: boolean;

package/dist/types/jsx/streaming.d.ts

@@ -13,4 +13,4 @@ export declare const Suspense: FC<PropsWithChildren<{
  * `renderToReadableStream()` is an experimental feature.
  * The API might be changed.
  */
-export declare const renderToReadableStream: (str: HtmlEscapedString | Promise<HtmlEscapedString>) => ReadableStream<Uint8Array>;
+export declare const renderToReadableStream: (str: HtmlEscapedString | Promise<HtmlEscapedString>, onError?: (e: unknown) => void) => ReadableStream<Uint8Array>;

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

@@ -3,7 +3,7 @@ import type { SignatureKey } from './jws';
 import { type JWTPayload } from './types';
 export interface TokenHeader {
     alg: SignatureAlgorithm;
-    typ: 'JWT';
+    typ?: 'JWT';
 }
 export declare function isTokenHeader(obj: any): obj is TokenHeader;
 export declare const sign: (payload: JWTPayload, privateKey: SignatureKey, alg?: SignatureAlgorithm) => Promise<string>;

package/dist/types/validator/validator.d.ts

@@ -5,10 +5,10 @@ type ValidationTargetByMethod<M> = M extends 'get' | 'head' ? Exclude<keyof Vali
 export type ValidationFunction<InputType, OutputType, E extends Env = {}, P extends string = string> = (value: InputType, c: Context<E, P>) => OutputType | Response | Promise<OutputType> | Promise<Response>;
 type ExcludeResponseType<T> = T extends Response & TypedResponse<any> ? never : T;
 export declare const validator: <InputType, P extends string, M extends string, U extends ValidationTargetByMethod<M>, OutputType = ValidationTargets[U], OutputTypeExcludeResponseType = ExcludeResponseType<OutputType>, P2 extends string = P, V extends {
-    in: { [K in U]: K extends "json" ? InputType : { [K2 in keyof OutputTypeExcludeResponseType]: ValidationTargets[K][K2]; }; };
+    in: { [K in U]: K extends "json" ? unknown extends InputType ? OutputTypeExcludeResponseType : InputType : { [K2 in keyof OutputTypeExcludeResponseType]: ValidationTargets[K][K2]; }; };
     out: { [K_1 in U]: OutputTypeExcludeResponseType; };
 } = {
-    in: { [K_2 in U]: K_2 extends "json" ? InputType : { [K2_1 in keyof OutputTypeExcludeResponseType]: ValidationTargets[K_2][K2_1]; }; };
+    in: { [K_2 in U]: K_2 extends "json" ? unknown extends InputType ? OutputTypeExcludeResponseType : InputType : { [K2_1 in keyof OutputTypeExcludeResponseType]: ValidationTargets[K_2][K2_1]; }; };
     out: { [K_3 in U]: OutputTypeExcludeResponseType; };
 }, E extends Env = any>(target: U, validationFunc: ValidationFunction<unknown extends InputType ? ValidationTargets[U] : InputType, OutputType, E, P2>) => MiddlewareHandler<E, P, V>;
 export {};

package/dist/utils/jwt/jwt.js

@@ -15,7 +15,7 @@ var encodeJwtPart = (part) => encodeBase64Url(utf8Encoder.encode(JSON.stringify(
 var encodeSignaturePart = (buf) => encodeBase64Url(buf).replace(/=/g, "");
 var decodeJwtPart = (part) => JSON.parse(utf8Decoder.decode(decodeBase64Url(part)));
 function isTokenHeader(obj) {
-  return typeof obj === "object" && obj !== null && "alg" in obj && Object.values(AlgorithmTypes).includes(obj.alg) && "typ" in obj && obj.typ === "JWT";
+  return typeof obj === "object" && obj !== null && "alg" in obj && Object.values(AlgorithmTypes).includes(obj.alg) && (!("typ" in obj) || obj.typ === "JWT");
 }
 var sign = async (payload, privateKey, alg = "HS256") => {
   const encodedPayload = encodeJwtPart(payload);

package/package.json

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