hono 4.6.6 → 4.6.8

package/dist/adapter/bun/websocket.js

@@ -1,53 +1,47 @@
 // 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 upgradeResult = server.upgrade(c.req.raw, {
+      data: {
+        events,
+        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];
+      const websocketListeners = ws.data.events;
       if (websocketListeners.onOpen) {
         websocketListeners.onOpen(new Event("open"), createWSContext(ws));
       }
     },
     close(ws, code, reason) {
-      const websocketListeners = websocketConns[ws.data.connId];
+      const websocketListeners = ws.data.events;
       if (websocketListeners.onClose) {
         websocketListeners.onClose(
           new CloseEvent("close", {
@@ -59,7 +53,7 @@ var createBunWebSocket = () => {
       }
     },
     message(ws, message) {
-      const websocketListeners = websocketConns[ws.data.connId];
+      const websocketListeners = ws.data.events;
       if (websocketListeners.onMessage) {
         const normalizedReceiveData = typeof message === "string" ? message : message.buffer;
         websocketListeners.onMessage(
@@ -75,5 +69,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/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,58 +18,53 @@ 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 upgradeResult = server.upgrade(c.req.raw, {
+      data: {
+        events,
+        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];
+      const websocketListeners = ws.data.events;
       if (websocketListeners.onOpen) {
         websocketListeners.onOpen(new Event("open"), createWSContext(ws));
       }
     },
     close(ws, code, reason) {
-      const websocketListeners = websocketConns[ws.data.connId];
+      const websocketListeners = ws.data.events;
       if (websocketListeners.onClose) {
         websocketListeners.onClose(
           new CloseEvent("close", {
@@ -81,7 +76,7 @@ const createBunWebSocket = () => {
       }
     },
     message(ws, message) {
-      const websocketListeners = websocketConns[ws.data.connId];
+      const websocketListeners = ws.data.events;
       if (websocketListeners.onMessage) {
         const normalizedReceiveData = typeof message === "string" ? message : message.buffer;
         websocketListeners.onMessage(
@@ -98,5 +93,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/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/helper/cookie/index.js

@@ -82,7 +82,7 @@ const setCookie = (c, name, value, opt) => {
   } else {
     cookie = (0, import_cookie.serialize)(name, value, { path: "/", ...opt });
   }
-  c.header("set-cookie", cookie, { append: true });
+  c.header("Set-Cookie", cookie, { append: true });
 };
 const setSignedCookie = async (c, name, value, secret, opt) => {
   let cookie;

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

@@ -18,15 +18,53 @@ 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(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
 });