hono 4.6.5 → 4.6.7

package/dist/adapter/bun/websocket.js

@@ -1,44 +1,40 @@
 // src/adapter/bun/websocket.ts
-import { createWSMessageEvent } from "../../helper/websocket/index.js";
+import { createWSMessageEvent, defineWebSocketHelper, WSContext } from "../../helper/websocket/index.js";
 import { getBunServer } from "./server.js";
 var createWSContext = (ws) => {
-  return {
+  return new WSContext({
     send: (source, options) => {
-      const sendingData = typeof source === "string" ? source : source instanceof Uint8Array ? source.buffer : source;
-      ws.send(sendingData, options?.compress);
+      ws.send(source, options?.compress);
     },
     raw: ws,
-    binaryType: "arraybuffer",
     readyState: ws.readyState,
     url: ws.data.url,
     protocol: ws.data.protocol,
     close(code, reason) {
       ws.close(code, reason);
     }
-  };
+  });
 };
 var createBunWebSocket = () => {
   const websocketConns = [];
-  const upgradeWebSocket = (createEvents) => {
-    return async (c, next) => {
-      const server = getBunServer(c);
-      if (!server) {
-        throw new TypeError("env has to include the 2nd argument of fetch.");
-      }
-      const connId = websocketConns.push(await createEvents(c)) - 1;
-      const upgradeResult = server.upgrade(c.req.raw, {
-        data: {
-          connId,
-          url: new URL(c.req.url),
-          protocol: c.req.url
-        }
-      });
-      if (upgradeResult) {
-        return new Response(null);
+  const upgradeWebSocket = defineWebSocketHelper((c, events) => {
+    const server = getBunServer(c);
+    if (!server) {
+      throw new TypeError("env has to include the 2nd argument of fetch.");
+    }
+    const connId = websocketConns.push(events) - 1;
+    const upgradeResult = server.upgrade(c.req.raw, {
+      data: {
+        connId,
+        url: new URL(c.req.url),
+        protocol: c.req.url
       }
-      await next();
-    };
-  };
+    });
+    if (upgradeResult) {
+      return new Response(null);
+    }
+    return;
+  });
   const websocket = {
     open(ws) {
       const websocketListeners = websocketConns[ws.data.connId];
@@ -75,5 +71,6 @@ var createBunWebSocket = () => {
   };
 };
 export {
-  createBunWebSocket
+  createBunWebSocket,
+  createWSContext
 };

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

@@ -1,44 +1,45 @@
 // src/adapter/cloudflare-workers/websocket.ts
-var upgradeWebSocket = (createEvents) => async (c, next) => {
-  const events = await createEvents(c);
-  const upgradeHeader = c.req.header("Upgrade");
-  if (upgradeHeader !== "websocket") {
-    return await next();
+import { WSContext, defineWebSocketHelper } from "../../helper/websocket/index.js";
+var upgradeWebSocket = defineWebSocketHelper(
+  async (c, events) => {
+    const upgradeHeader = c.req.header("Upgrade");
+    if (upgradeHeader !== "websocket") {
+      return;
+    }
+    const webSocketPair = new WebSocketPair();
+    const client = webSocketPair[0];
+    const server = webSocketPair[1];
+    const wsContext = new WSContext({
+      close: (code, reason) => server.close(code, reason),
+      get protocol() {
+        return server.protocol;
+      },
+      raw: server,
+      get readyState() {
+        return server.readyState;
+      },
+      url: server.url ? new URL(server.url) : null,
+      send: (source) => server.send(source)
+    });
+    if (events.onOpen) {
+      server.addEventListener("open", (evt) => events.onOpen?.(evt, wsContext));
+    }
+    if (events.onClose) {
+      server.addEventListener("close", (evt) => events.onClose?.(evt, wsContext));
+    }
+    if (events.onMessage) {
+      server.addEventListener("message", (evt) => events.onMessage?.(evt, wsContext));
+    }
+    if (events.onError) {
+      server.addEventListener("error", (evt) => events.onError?.(evt, wsContext));
+    }
+    server.accept?.();
+    return new Response(null, {
+      status: 101,
+      webSocket: client
+    });
   }
-  const webSocketPair = new WebSocketPair();
-  const client = webSocketPair[0];
-  const server = webSocketPair[1];
-  const wsContext = {
-    binaryType: "arraybuffer",
-    close: (code, reason) => server.close(code, reason),
-    get protocol() {
-      return server.protocol;
-    },
-    raw: server,
-    get readyState() {
-      return server.readyState;
-    },
-    url: server.url ? new URL(server.url) : null,
-    send: (source) => server.send(source)
-  };
-  if (events.onOpen) {
-    server.addEventListener("open", (evt) => events.onOpen?.(evt, wsContext));
-  }
-  if (events.onClose) {
-    server.addEventListener("close", (evt) => events.onClose?.(evt, wsContext));
-  }
-  if (events.onMessage) {
-    server.addEventListener("message", (evt) => events.onMessage?.(evt, wsContext));
-  }
-  if (events.onError) {
-    server.addEventListener("error", (evt) => events.onError?.(evt, wsContext));
-  }
-  server.accept?.();
-  return new Response(null, {
-    status: 101,
-    webSocket: client
-  });
-};
+);
 export {
   upgradeWebSocket
 };

package/dist/adapter/deno/serve-static.js

@@ -1,6 +1,6 @@
 // src/adapter/deno/serve-static.ts
 import { serveStatic as baseServeStatic } from "../../middleware/serve-static/index.js";
-var { open, lstatSync } = Deno;
+var { open, lstatSync, errors } = Deno;
 var serveStatic = (options) => {
   return async function serveStatic2(c, next) {
     const getContent = async (path) => {
@@ -8,7 +8,9 @@ var serveStatic = (options) => {
         const file = await open(path);
         return file ? file.readable : null;
       } catch (e) {
-        console.warn(`${e}`);
+        if (!(e instanceof errors.NotFound)) {
+          console.warn(`${e}`);
+        }
       }
     };
     const pathResolve = (path) => {

package/dist/adapter/deno/websocket.js

@@ -1,12 +1,11 @@
 // src/adapter/deno/websocket.ts
-var upgradeWebSocket = (createEvents, options) => async (c, next) => {
+import { WSContext, defineWebSocketHelper } from "../../helper/websocket/index.js";
+var upgradeWebSocket = defineWebSocketHelper(async (c, events, options) => {
   if (c.req.header("upgrade") !== "websocket") {
-    return await next();
+    return;
   }
-  const events = await createEvents(c);
-  const { response, socket } = Deno.upgradeWebSocket(c.req.raw, options || {});
-  const wsContext = {
-    binaryType: "arraybuffer",
+  const { response, socket } = Deno.upgradeWebSocket(c.req.raw, options ?? {});
+  const wsContext = new WSContext({
     close: (code, reason) => socket.close(code, reason),
     get protocol() {
       return socket.protocol;
@@ -17,13 +16,13 @@ var upgradeWebSocket = (createEvents, options) => async (c, next) => {
     },
     url: socket.url ? new URL(socket.url) : null,
     send: (source) => socket.send(source)
-  };
+  });
   socket.onopen = (evt) => events.onOpen?.(evt, wsContext);
   socket.onmessage = (evt) => events.onMessage?.(evt, wsContext);
   socket.onclose = (evt) => events.onClose?.(evt, wsContext);
   socket.onerror = (evt) => events.onError?.(evt, wsContext);
   return response;
-};
+});
 export {
   upgradeWebSocket
 };

package/dist/adapter/vercel/handler.js

@@ -1,6 +1,6 @@
 // src/adapter/vercel/handler.ts
-var handle = (app) => (req, requestContext) => {
-  return app.fetch(req, {}, requestContext);
+var handle = (app) => (req) => {
+  return app.fetch(req);
 };
 export {
   handle

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

@@ -18,49 +18,46 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var websocket_exports = {};
 __export(websocket_exports, {
-  createBunWebSocket: () => createBunWebSocket
+  createBunWebSocket: () => createBunWebSocket,
+  createWSContext: () => createWSContext
 });
 module.exports = __toCommonJS(websocket_exports);
 var import_websocket = require("../../helper/websocket");
 var import_server = require("./server");
 const createWSContext = (ws) => {
-  return {
+  return new import_websocket.WSContext({
     send: (source, options) => {
-      const sendingData = typeof source === "string" ? source : source instanceof Uint8Array ? source.buffer : source;
-      ws.send(sendingData, options?.compress);
+      ws.send(source, options?.compress);
     },
     raw: ws,
-    binaryType: "arraybuffer",
     readyState: ws.readyState,
     url: ws.data.url,
     protocol: ws.data.protocol,
     close(code, reason) {
       ws.close(code, reason);
     }
-  };
+  });
 };
 const createBunWebSocket = () => {
   const websocketConns = [];
-  const upgradeWebSocket = (createEvents) => {
-    return async (c, next) => {
-      const server = (0, import_server.getBunServer)(c);
-      if (!server) {
-        throw new TypeError("env has to include the 2nd argument of fetch.");
-      }
-      const connId = websocketConns.push(await createEvents(c)) - 1;
-      const upgradeResult = server.upgrade(c.req.raw, {
-        data: {
-          connId,
-          url: new URL(c.req.url),
-          protocol: c.req.url
-        }
-      });
-      if (upgradeResult) {
-        return new Response(null);
+  const upgradeWebSocket = (0, import_websocket.defineWebSocketHelper)((c, events) => {
+    const server = (0, import_server.getBunServer)(c);
+    if (!server) {
+      throw new TypeError("env has to include the 2nd argument of fetch.");
+    }
+    const connId = websocketConns.push(events) - 1;
+    const upgradeResult = server.upgrade(c.req.raw, {
+      data: {
+        connId,
+        url: new URL(c.req.url),
+        protocol: c.req.url
       }
-      await next();
-    };
-  };
+    });
+    if (upgradeResult) {
+      return new Response(null);
+    }
+    return;
+  });
   const websocket = {
     open(ws) {
       const websocketListeners = websocketConns[ws.data.connId];
@@ -98,5 +95,6 @@ const createBunWebSocket = () => {
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  createBunWebSocket
+  createBunWebSocket,
+  createWSContext
 });

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

@@ -21,46 +21,47 @@ __export(websocket_exports, {
   upgradeWebSocket: () => upgradeWebSocket
 });
 module.exports = __toCommonJS(websocket_exports);
-const upgradeWebSocket = (createEvents) => async (c, next) => {
-  const events = await createEvents(c);
-  const upgradeHeader = c.req.header("Upgrade");
-  if (upgradeHeader !== "websocket") {
-    return await next();
+var import_websocket = require("../../helper/websocket");
+const upgradeWebSocket = (0, import_websocket.defineWebSocketHelper)(
+  async (c, events) => {
+    const upgradeHeader = c.req.header("Upgrade");
+    if (upgradeHeader !== "websocket") {
+      return;
+    }
+    const webSocketPair = new WebSocketPair();
+    const client = webSocketPair[0];
+    const server = webSocketPair[1];
+    const wsContext = new import_websocket.WSContext({
+      close: (code, reason) => server.close(code, reason),
+      get protocol() {
+        return server.protocol;
+      },
+      raw: server,
+      get readyState() {
+        return server.readyState;
+      },
+      url: server.url ? new URL(server.url) : null,
+      send: (source) => server.send(source)
+    });
+    if (events.onOpen) {
+      server.addEventListener("open", (evt) => events.onOpen?.(evt, wsContext));
+    }
+    if (events.onClose) {
+      server.addEventListener("close", (evt) => events.onClose?.(evt, wsContext));
+    }
+    if (events.onMessage) {
+      server.addEventListener("message", (evt) => events.onMessage?.(evt, wsContext));
+    }
+    if (events.onError) {
+      server.addEventListener("error", (evt) => events.onError?.(evt, wsContext));
+    }
+    server.accept?.();
+    return new Response(null, {
+      status: 101,
+      webSocket: client
+    });
   }
-  const webSocketPair = new WebSocketPair();
-  const client = webSocketPair[0];
-  const server = webSocketPair[1];
-  const wsContext = {
-    binaryType: "arraybuffer",
-    close: (code, reason) => server.close(code, reason),
-    get protocol() {
-      return server.protocol;
-    },
-    raw: server,
-    get readyState() {
-      return server.readyState;
-    },
-    url: server.url ? new URL(server.url) : null,
-    send: (source) => server.send(source)
-  };
-  if (events.onOpen) {
-    server.addEventListener("open", (evt) => events.onOpen?.(evt, wsContext));
-  }
-  if (events.onClose) {
-    server.addEventListener("close", (evt) => events.onClose?.(evt, wsContext));
-  }
-  if (events.onMessage) {
-    server.addEventListener("message", (evt) => events.onMessage?.(evt, wsContext));
-  }
-  if (events.onError) {
-    server.addEventListener("error", (evt) => events.onError?.(evt, wsContext));
-  }
-  server.accept?.();
-  return new Response(null, {
-    status: 101,
-    webSocket: client
-  });
-};
+);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   upgradeWebSocket

package/dist/cjs/adapter/deno/serve-static.js

@@ -22,7 +22,7 @@ __export(serve_static_exports, {
 });
 module.exports = __toCommonJS(serve_static_exports);
 var import_serve_static = require("../../middleware/serve-static");
-const { open, lstatSync } = Deno;
+const { open, lstatSync, errors } = Deno;
 const serveStatic = (options) => {
   return async function serveStatic2(c, next) {
     const getContent = async (path) => {
@@ -30,7 +30,9 @@ const serveStatic = (options) => {
         const file = await open(path);
         return file ? file.readable : null;
       } catch (e) {
-        console.warn(`${e}`);
+        if (!(e instanceof errors.NotFound)) {
+          console.warn(`${e}`);
+        }
       }
     };
     const pathResolve = (path) => {

package/dist/cjs/adapter/deno/websocket.js

@@ -21,14 +21,13 @@ __export(websocket_exports, {
   upgradeWebSocket: () => upgradeWebSocket
 });
 module.exports = __toCommonJS(websocket_exports);
-const upgradeWebSocket = (createEvents, options) => async (c, next) => {
+var import_websocket = require("../../helper/websocket");
+const upgradeWebSocket = (0, import_websocket.defineWebSocketHelper)(async (c, events, options) => {
   if (c.req.header("upgrade") !== "websocket") {
-    return await next();
+    return;
   }
-  const events = await createEvents(c);
-  const { response, socket } = Deno.upgradeWebSocket(c.req.raw, options || {});
-  const wsContext = {
-    binaryType: "arraybuffer",
+  const { response, socket } = Deno.upgradeWebSocket(c.req.raw, options ?? {});
+  const wsContext = new import_websocket.WSContext({
     close: (code, reason) => socket.close(code, reason),
     get protocol() {
       return socket.protocol;
@@ -39,13 +38,13 @@ const upgradeWebSocket = (createEvents, options) => async (c, next) => {
     },
     url: socket.url ? new URL(socket.url) : null,
     send: (source) => socket.send(source)
-  };
+  });
   socket.onopen = (evt) => events.onOpen?.(evt, wsContext);
   socket.onmessage = (evt) => events.onMessage?.(evt, wsContext);
   socket.onclose = (evt) => events.onClose?.(evt, wsContext);
   socket.onerror = (evt) => events.onError?.(evt, wsContext);
   return response;
-};
+});
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   upgradeWebSocket

package/dist/cjs/adapter/vercel/handler.js

@@ -21,8 +21,8 @@ __export(handler_exports, {
   handle: () => handle
 });
 module.exports = __toCommonJS(handler_exports);
-const handle = (app) => (req, requestContext) => {
-  return app.fetch(req, {}, requestContext);
+const handle = (app) => (req) => {
+  return app.fetch(req);
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/client/client.js

@@ -55,19 +55,7 @@ class ClientRequestImpl {
   fetch = async (args, opt) => {
     if (args) {
       if (args.query) {
-        for (const [k, v] of Object.entries(args.query)) {
-          if (v === void 0) {
-            continue;
-          }
-          this.queryParams ||= new URLSearchParams();
-          if (Array.isArray(v)) {
-            for (const v2 of v) {
-              this.queryParams.append(k, v2);
-            }
-          } else {
-            this.queryParams.set(k, v);
-          }
-        }
+        this.queryParams = (0, import_utils.buildSearchParams)(args.query);
       }
       if (args.form) {
         const form = new FormData();
@@ -146,10 +134,16 @@ const hc = (baseUrl, options) => createProxy(function proxyCallback(opts) {
   const path = parts.join("/");
   const url = (0, import_utils.mergePath)(baseUrl, path);
   if (method === "url") {
-    if (opts.args[0] && opts.args[0].param) {
-      return new URL((0, import_utils.replaceUrlParam)(url, opts.args[0].param));
+    let result = url;
+    if (opts.args[0]) {
+      if (opts.args[0].param) {
+        result = (0, import_utils.replaceUrlParam)(url, opts.args[0].param);
+      }
+      if (opts.args[0].query) {
+        result = result + "?" + (0, import_utils.buildSearchParams)(opts.args[0].query).toString();
+      }
     }
-    return new URL(url);
+    return new URL(result);
   }
   if (method === "ws") {
     const webSocketUrl = (0, import_utils.replaceUrlProtocol)(

package/dist/cjs/client/utils.js

@@ -18,6 +18,7 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var utils_exports = {};
 __export(utils_exports, {
+  buildSearchParams: () => buildSearchParams,
   deepMerge: () => deepMerge,
   mergePath: () => mergePath,
   removeIndexString: () => removeIndexString,
@@ -38,6 +39,22 @@ const replaceUrlParam = (urlString, params) => {
   }
   return urlString;
 };
+const buildSearchParams = (query) => {
+  const searchParams = new URLSearchParams();
+  for (const [k, v] of Object.entries(query)) {
+    if (v === void 0) {
+      continue;
+    }
+    if (Array.isArray(v)) {
+      for (const v2 of v) {
+        searchParams.append(k, v2);
+      }
+    } else {
+      searchParams.set(k, v);
+    }
+  }
+  return searchParams;
+};
 const replaceUrlProtocol = (urlString, protocol) => {
   switch (protocol) {
     case "ws":
@@ -72,6 +89,7 @@ function deepMerge(target, source) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  buildSearchParams,
   deepMerge,
   mergePath,
   removeIndexString,

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

@@ -18,15 +18,56 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var websocket_exports = {};
 __export(websocket_exports, {
-  createWSMessageEvent: () => createWSMessageEvent
+  WSContext: () => WSContext,
+  createWSMessageEvent: () => createWSMessageEvent,
+  defineWebSocketHelper: () => defineWebSocketHelper
 });
 module.exports = __toCommonJS(websocket_exports);
+class WSContext {
+  #init;
+  constructor(init) {
+    this.#init = init;
+    this.raw = init.raw;
+    this.url = init.url ? new URL(init.url) : null;
+    this.protocol = init.protocol ?? null;
+  }
+  send(source, options) {
+    this.#init.send(
+      typeof source === "string" ? source : source instanceof Uint8Array ? source.buffer : source,
+      options ?? {}
+    );
+  }
+  raw;
+  binaryType = "arraybuffer";
+  get readyState() {
+    return this.#init.readyState;
+  }
+  url;
+  protocol;
+  close(code, reason) {
+    this.#init.close(code, reason);
+  }
+}
 const createWSMessageEvent = (source) => {
   return new MessageEvent("message", {
     data: source
   });
 };
+const defineWebSocketHelper = (handler) => {
+  return (createEvents, options) => {
+    return async function UpgradeWebSocket(c, next) {
+      const events = await createEvents(c);
+      const result = await handler(c, events, options);
+      if (result) {
+        return result;
+      }
+      await next();
+    };
+  };
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  createWSMessageEvent
+  WSContext,
+  createWSMessageEvent,
+  defineWebSocketHelper
 });

package/dist/cjs/middleware/secure-headers/secure-headers.js

@@ -59,11 +59,12 @@ const generateNonce = () => {
   return (0, import_encode.encodeBase64)(buffer);
 };
 const NONCE = (ctx) => {
-  const nonce = ctx.get("secureHeadersNonce") || (() => {
-    const newNonce = generateNonce();
-    ctx.set("secureHeadersNonce", newNonce);
-    return newNonce;
-  })();
+  const key = "secureHeadersNonce";
+  const init = ctx.get(key);
+  const nonce = init || generateNonce();
+  if (init == null) {
+    ctx.set(key, nonce);
+  }
   return `'nonce-${nonce}'`;
 };
 const secureHeaders = (customOptions) => {