hono 4.11.5 → 4.11.7

package/dist/adapter/bun/index.js

@@ -3,9 +3,11 @@ import { serveStatic } from "./serve-static.js";
 import { bunFileSystemModule, toSSG } from "./ssg.js";
 import { createBunWebSocket, upgradeWebSocket, websocket } from "./websocket.js";
 import { getConnInfo } from "./conninfo.js";
+import { getBunServer } from "./server.js";
 export {
   bunFileSystemModule,
   createBunWebSocket,
+  getBunServer,
   getConnInfo,
   serveStatic,
   toSSG,

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

@@ -20,7 +20,7 @@ var getContentFromKVAsset = async (path, options) => {
   } else {
     ASSET_NAMESPACE = __STATIC_CONTENT;
   }
-  const key = ASSET_MANIFEST[path] || path;
+  const key = ASSET_MANIFEST[path];
   if (!key) {
     return null;
   }

package/dist/cjs/adapter/bun/index.js

@@ -20,6 +20,7 @@ var bun_exports = {};
 __export(bun_exports, {
   bunFileSystemModule: () => import_ssg.bunFileSystemModule,
   createBunWebSocket: () => import_websocket.createBunWebSocket,
+  getBunServer: () => import_server.getBunServer,
   getConnInfo: () => import_conninfo.getConnInfo,
   serveStatic: () => import_serve_static.serveStatic,
   toSSG: () => import_ssg.toSSG,
@@ -31,10 +32,12 @@ var import_serve_static = require("./serve-static");
 var import_ssg = require("./ssg");
 var import_websocket = require("./websocket");
 var import_conninfo = require("./conninfo");
+var import_server = require("./server");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   bunFileSystemModule,
   createBunWebSocket,
+  getBunServer,
   getConnInfo,
   serveStatic,
   toSSG,

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

@@ -42,7 +42,7 @@ const getContentFromKVAsset = async (path, options) => {
   } else {
     ASSET_NAMESPACE = __STATIC_CONTENT;
   }
-  const key = ASSET_MANIFEST[path] || path;
+  const key = ASSET_MANIFEST[path];
   if (!key) {
     return null;
   }

package/dist/cjs/helper/streaming/sse.js

@@ -31,7 +31,7 @@ class SSEStreamingApi extends import_stream.StreamingApi {
   }
   async writeSSE(message) {
     const data = await (0, import_html.resolveCallback)(message.data, import_html.HtmlEscapedCallbackPhase.Stringify, false, {});
-    const dataLines = data.split("\n").map((line) => {
+    const dataLines = data.split(/\r\n|\r|\n/).map((line) => {
       return `data: ${line}`;
     }).join("\n");
     const sseData = [

package/dist/cjs/jsx/components.js

@@ -24,6 +24,7 @@ __export(components_exports, {
 module.exports = __toCommonJS(components_exports);
 var import_html = require("../helper/html");
 var import_html2 = require("../utils/html");
+var import_base = require("./base");
 var import_constants = require("./constants");
 var import_context = require("./context");
 var import_components = require("./dom/components");
@@ -41,6 +42,20 @@ const childrenToString = async (children) => {
     }
   }
 };
+const resolveChildEarly = (c) => {
+  if (c == null || typeof c === "boolean") {
+    return "";
+  } else if (typeof c === "string") {
+    return c;
+  } else {
+    const str = c.toString();
+    if (!(str instanceof Promise)) {
+      return (0, import_html.raw)(str);
+    } else {
+      return str;
+    }
+  }
+};
 const ErrorBoundary = async ({ children, fallback, fallbackRender, onError }) => {
   if (!children) {
     return (0, import_html.raw)("");
@@ -50,17 +65,26 @@ const ErrorBoundary = async ({ children, fallback, fallbackRender, onError }) =>
   }
   const nonce = (0, import_context.useContext)(import_streaming.StreamingContext)?.scriptNonce;
   let fallbackStr;
+  const resolveFallbackStr = async () => {
+    const awaitedFallback = await fallback;
+    if (typeof awaitedFallback === "string") {
+      fallbackStr = awaitedFallback;
+    } else {
+      fallbackStr = await awaitedFallback?.toString();
+      if (typeof fallbackStr === "string") {
+        fallbackStr = (0, import_html.raw)(fallbackStr);
+      }
+    }
+  };
   const fallbackRes = (error) => {
     onError?.(error);
-    return (fallbackStr || fallbackRender?.(error) || "").toString();
+    return fallbackStr || fallbackRender && (0, import_base.jsx)(import_base.Fragment, {}, fallbackRender(error)) || "";
   };
   let resArray = [];
   try {
-    resArray = children.map(
-      (c) => c == null || typeof c === "boolean" ? "" : c.toString()
-    );
+    resArray = children.map(resolveChildEarly);
   } catch (e) {
-    fallbackStr = await fallback?.toString();
+    await resolveFallbackStr();
     if (e instanceof Promise) {
       resArray = [
         e.then(() => childrenToString(children)).catch((e2) => fallbackRes(e2))
@@ -70,15 +94,17 @@ const ErrorBoundary = async ({ children, fallback, fallbackRender, onError }) =>
     }
   }
   if (resArray.some((res) => res instanceof Promise)) {
-    fallbackStr ||= await fallback?.toString();
+    await resolveFallbackStr();
     const index = errorBoundaryCounter++;
     const replaceRe = RegExp(`(<template id="E:${index}"></template>.*?)(.*?)(<!--E:${index}-->)`);
     const caught = false;
-    const catchCallback = ({ error: error2, buffer }) => {
+    const catchCallback = async ({ error: error2, buffer }) => {
       if (caught) {
         return "";
       }
-      const fallbackResString = fallbackRes(error2);
+      const fallbackResString = await (0, import_base.Fragment)({
+        children: fallbackRes(error2)
+      }).toString();
       if (buffer) {
         buffer[0] = buffer[0].replace(replaceRe, fallbackResString);
       }
@@ -165,7 +191,7 @@ d.remove()
       }
     ]);
   } else {
-    return (0, import_html.raw)(resArray.join(""));
+    return (0, import_base.Fragment)({ children: resArray });
   }
 };
 ErrorBoundary[import_constants.DOM_RENDERER] = import_components.ErrorBoundary;

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

@@ -24,7 +24,17 @@ module.exports = __toCommonJS(cache_exports);
 const defaultCacheableStatusCodes = [200];
 const shouldSkipCache = (res) => {
   const vary = res.headers.get("Vary");
-  return vary && vary.includes("*");
+  if (vary && vary.includes("*")) {
+    return true;
+  }
+  const cacheControl = res.headers.get("Cache-Control");
+  if (cacheControl && /(?:^|,\s*)(?:private|no-(?:store|cache))(?:\s*(?:=|,|$))/i.test(cacheControl)) {
+    return true;
+  }
+  if (res.headers.has("Set-Cookie")) {
+    return true;
+  }
+  return false;
 };
 const cache = (options) => {
   if (!globalThis.caches) {

package/dist/cjs/utils/ipaddr.js

@@ -47,7 +47,8 @@ const expandIPv6 = (ipV6) => {
   }
   return sections.join(":");
 };
-const IPV4_REGEX = /^[0-9]{0,3}\.[0-9]{0,3}\.[0-9]{0,3}\.[0-9]{0,3}$/;
+const IPV4_OCTET_PART = "(?:25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])";
+const IPV4_REGEX = new RegExp(`^(?:${IPV4_OCTET_PART}\\.){3}${IPV4_OCTET_PART}$`);
 const distinctRemoteAddr = (remoteAddr) => {
   if (IPV4_REGEX.test(remoteAddr)) {
     return "IPv4";

package/dist/helper/streaming/sse.js

@@ -8,7 +8,7 @@ var SSEStreamingApi = class extends StreamingApi {
   }
   async writeSSE(message) {
     const data = await resolveCallback(message.data, HtmlEscapedCallbackPhase.Stringify, false, {});
-    const dataLines = data.split("\n").map((line) => {
+    const dataLines = data.split(/\r\n|\r|\n/).map((line) => {
       return `data: ${line}`;
     }).join("\n");
     const sseData = [

package/dist/jsx/components.js

@@ -1,6 +1,7 @@
 // src/jsx/components.ts
 import { raw } from "../helper/html/index.js";
 import { HtmlEscapedCallbackPhase, resolveCallback } from "../utils/html.js";
+import { jsx, Fragment } from "./base.js";
 import { DOM_RENDERER } from "./constants.js";
 import { useContext } from "./context.js";
 import { ErrorBoundary as ErrorBoundaryDomRenderer } from "./dom/components.js";
@@ -18,6 +19,20 @@ var childrenToString = async (children) => {
     }
   }
 };
+var resolveChildEarly = (c) => {
+  if (c == null || typeof c === "boolean") {
+    return "";
+  } else if (typeof c === "string") {
+    return c;
+  } else {
+    const str = c.toString();
+    if (!(str instanceof Promise)) {
+      return raw(str);
+    } else {
+      return str;
+    }
+  }
+};
 var ErrorBoundary = async ({ children, fallback, fallbackRender, onError }) => {
   if (!children) {
     return raw("");
@@ -27,17 +42,26 @@ var ErrorBoundary = async ({ children, fallback, fallbackRender, onError }) => {
   }
   const nonce = useContext(StreamingContext)?.scriptNonce;
   let fallbackStr;
+  const resolveFallbackStr = async () => {
+    const awaitedFallback = await fallback;
+    if (typeof awaitedFallback === "string") {
+      fallbackStr = awaitedFallback;
+    } else {
+      fallbackStr = await awaitedFallback?.toString();
+      if (typeof fallbackStr === "string") {
+        fallbackStr = raw(fallbackStr);
+      }
+    }
+  };
   const fallbackRes = (error) => {
     onError?.(error);
-    return (fallbackStr || fallbackRender?.(error) || "").toString();
+    return fallbackStr || fallbackRender && jsx(Fragment, {}, fallbackRender(error)) || "";
   };
   let resArray = [];
   try {
-    resArray = children.map(
-      (c) => c == null || typeof c === "boolean" ? "" : c.toString()
-    );
+    resArray = children.map(resolveChildEarly);
   } catch (e) {
-    fallbackStr = await fallback?.toString();
+    await resolveFallbackStr();
     if (e instanceof Promise) {
       resArray = [
         e.then(() => childrenToString(children)).catch((e2) => fallbackRes(e2))
@@ -47,15 +71,17 @@ var ErrorBoundary = async ({ children, fallback, fallbackRender, onError }) => {
     }
   }
   if (resArray.some((res) => res instanceof Promise)) {
-    fallbackStr ||= await fallback?.toString();
+    await resolveFallbackStr();
     const index = errorBoundaryCounter++;
     const replaceRe = RegExp(`(<template id="E:${index}"></template>.*?)(.*?)(<!--E:${index}-->)`);
     const caught = false;
-    const catchCallback = ({ error: error2, buffer }) => {
+    const catchCallback = async ({ error: error2, buffer }) => {
       if (caught) {
         return "";
       }
-      const fallbackResString = fallbackRes(error2);
+      const fallbackResString = await Fragment({
+        children: fallbackRes(error2)
+      }).toString();
       if (buffer) {
         buffer[0] = buffer[0].replace(replaceRe, fallbackResString);
       }
@@ -142,7 +168,7 @@ d.remove()
       }
     ]);
   } else {
-    return raw(resArray.join(""));
+    return Fragment({ children: resArray });
   }
 };
 ErrorBoundary[DOM_RENDERER] = ErrorBoundaryDomRenderer;

package/dist/middleware/cache/index.js

@@ -2,7 +2,17 @@
 var defaultCacheableStatusCodes = [200];
 var shouldSkipCache = (res) => {
   const vary = res.headers.get("Vary");
-  return vary && vary.includes("*");
+  if (vary && vary.includes("*")) {
+    return true;
+  }
+  const cacheControl = res.headers.get("Cache-Control");
+  if (cacheControl && /(?:^|,\s*)(?:private|no-(?:store|cache))(?:\s*(?:=|,|$))/i.test(cacheControl)) {
+    return true;
+  }
+  if (res.headers.has("Set-Cookie")) {
+    return true;
+  }
+  return false;
 };
 var cache = (options) => {
   if (!globalThis.caches) {

package/dist/types/adapter/bun/index.d.ts

@@ -7,3 +7,4 @@ export { bunFileSystemModule, toSSG } from './ssg';
 export { createBunWebSocket, upgradeWebSocket, websocket } from './websocket';
 export type { BunWebSocketData, BunWebSocketHandler } from './websocket';
 export { getConnInfo } from './conninfo';
+export { getBunServer } from './server';

package/dist/types/adapter/bun/server.d.ts

@@ -3,22 +3,10 @@
  * @module
  */
 import type { Context } from '../../context';
-/**
- * Bun Server Object
- */
-export interface BunServer {
-    requestIP?: (req: Request) => {
-        address: string;
-        family: string;
-        port: number;
-    } | null;
-    upgrade<T>(req: Request, options?: {
-        data: T;
-    }): boolean;
-}
 /**
  * Get Bun Server Object from Context
+ * @template T - The type of Bun Server
  * @param c Context
  * @returns Bun Server
  */
-export declare const getBunServer: (c: Context) => BunServer | undefined;
+export declare const getBunServer: <T>(c: Context) => T | undefined;

package/dist/types/request/constants.d.ts

@@ -1 +1 @@
-export declare const GET_MATCH_RESULT: symbol;
+export declare const GET_MATCH_RESULT: unique symbol;

package/dist/types/request.d.ts

@@ -16,7 +16,6 @@ type BodyCache = Partial<Body & {
 }>;
 export declare class HonoRequest<P extends string = '/', I extends Input['out'] = {}> {
              
-    [GET_MATCH_RESULT]: Result<[unknown, RouterRoute]>;
     /**
      * `.raw` can get the raw Request object.
      *
@@ -232,6 +231,7 @@ export declare class HonoRequest<P extends string = '/', I extends Input['out']
      * ```
      */
     get method(): string;
+    get [GET_MATCH_RESULT](): Result<[unknown, RouterRoute]>;
     /**
      * `.matchedRoutes()` can return a matched route in the handler
      *

package/dist/utils/ipaddr.js

@@ -20,7 +20,8 @@ var expandIPv6 = (ipV6) => {
   }
   return sections.join(":");
 };
-var IPV4_REGEX = /^[0-9]{0,3}\.[0-9]{0,3}\.[0-9]{0,3}\.[0-9]{0,3}$/;
+var IPV4_OCTET_PART = "(?:25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])";
+var IPV4_REGEX = new RegExp(`^(?:${IPV4_OCTET_PART}\\.){3}${IPV4_OCTET_PART}$`);
 var distinctRemoteAddr = (remoteAddr) => {
   if (IPV4_REGEX.test(remoteAddr)) {
     return "IPv4";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hono",
-  "version": "4.11.5",
+  "version": "4.11.7",
   "description": "Web framework built on Web Standards",
   "main": "dist/cjs/index.js",
   "type": "module",