hono 4.1.0-rc.1 → 4.1.0

package/dist/adapter/bun/index.js

@@ -1,8 +1,10 @@
 // src/adapter/bun/index.ts
 import { serveStatic } from "./serve-static.js";
 import { bunFileSystemModule, toSSG } from "./ssg.js";
+import { createBunWebSocket } from "./websocket.js";
 export {
   bunFileSystemModule,
+  createBunWebSocket,
   serveStatic,
   toSSG
 };

package/dist/adapter/bun/websocket.js

@@ -0,0 +1,77 @@
+// src/adapter/bun/websocket.ts
+import {
+  createWSMessageEvent
+} from "../../helper/websocket/index.js";
+var createWSContext = (ws) => {
+  return {
+    send: (source, options) => {
+      const sendingData = typeof source === "string" ? source : source instanceof Uint8Array ? source.buffer : source;
+      ws.send(sendingData, 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 = c.env;
+      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);
+      }
+      await next();
+    };
+  };
+  const websocket = {
+    open(ws) {
+      const websocketListeners = websocketConns[ws.data.connId];
+      if (websocketListeners.onOpen) {
+        websocketListeners.onOpen(new Event("open"), createWSContext(ws));
+      }
+    },
+    close(ws, code, reason) {
+      const websocketListeners = websocketConns[ws.data.connId];
+      if (websocketListeners.onClose) {
+        websocketListeners.onClose(
+          new CloseEvent("close", {
+            code,
+            reason
+          }),
+          createWSContext(ws)
+        );
+      }
+    },
+    message(ws, message) {
+      const websocketListeners = websocketConns[ws.data.connId];
+      if (websocketListeners.onMessage) {
+        const normalizedReceiveData = typeof message === "string" ? message : message.buffer;
+        websocketListeners.onMessage(
+          createWSMessageEvent(normalizedReceiveData),
+          createWSContext(ws)
+        );
+      }
+    }
+  };
+  return {
+    upgradeWebSocket,
+    websocket
+  };
+};
+export {
+  createBunWebSocket
+};

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

@@ -1,5 +1,7 @@
 // src/adapter/cloudflare-workers/index.ts
 import { serveStatic } from "./serve-static-module.js";
+import { upgradeWebSocket } from "./websocket.js";
 export {
-  serveStatic
+  serveStatic,
+  upgradeWebSocket
 };

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

@@ -0,0 +1,57 @@
+// src/adapter/cloudflare-workers/websocket.ts
+var upgradeWebSocket = (createEvents) => async (c, next) => {
+  const CFWebSocketPair = globalThis.WebSocketPair;
+  const events = await createEvents(c);
+  const upgradeHeader = c.req.header("Upgrade");
+  if (upgradeHeader !== "websocket") {
+    return await next();
+  }
+  const webSocketPair = new CFWebSocketPair();
+  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 && events.onOpen(evt, wsContext)
+    );
+  }
+  if (events.onClose) {
+    server.addEventListener(
+      "close",
+      (evt) => events.onClose && events.onClose(evt, wsContext)
+    );
+  }
+  if (events.onMessage) {
+    server.addEventListener(
+      "message",
+      (evt) => events.onMessage && events.onMessage(evt, wsContext)
+    );
+  }
+  if (events.onError) {
+    server.addEventListener(
+      "error",
+      (evt) => events.onError && events.onError(evt, wsContext)
+    );
+  }
+  server.accept();
+  return new Response(null, {
+    status: 101,
+    webSocket: client
+  });
+};
+export {
+  upgradeWebSocket
+};

package/dist/adapter/deno/index.js

@@ -1,8 +1,10 @@
 // src/adapter/deno/index.ts
 import { serveStatic } from "./serve-static.js";
 import { toSSG, denoFileSystemModule } from "./ssg.js";
+import { upgradeWebSocket } from "./websocket.js";
 export {
   denoFileSystemModule,
   serveStatic,
-  toSSG
+  toSSG,
+  upgradeWebSocket
 };

package/dist/adapter/deno/websocket.js

@@ -0,0 +1,29 @@
+// src/adapter/deno/websocket.ts
+var upgradeWebSocket = (createEvents) => async (c, next) => {
+  if (c.req.header("upgrade") !== "websocket") {
+    return await next();
+  }
+  const { response, socket } = Deno.upgradeWebSocket(c.req.raw);
+  const events = await createEvents(c);
+  const wsContext = {
+    binaryType: "arraybuffer",
+    close: (code, reason) => socket.close(code, reason),
+    get protocol() {
+      return socket.protocol;
+    },
+    raw: socket,
+    get readyState() {
+      return socket.readyState;
+    },
+    url: socket.url ? new URL(socket.url) : null,
+    send: (source) => socket.send(source)
+  };
+  socket.onopen = (evt) => events.onOpen && events.onOpen(evt, wsContext);
+  socket.onmessage = (evt) => events.onMessage && events.onMessage(evt, wsContext);
+  socket.onclose = (evt) => events.onClose && events.onClose(evt, wsContext);
+  socket.onerror = (evt) => events.onError && events.onError(evt, wsContext);
+  return response;
+};
+export {
+  upgradeWebSocket
+};

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

@@ -19,15 +19,18 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var bun_exports = {};
 __export(bun_exports, {
   bunFileSystemModule: () => import_ssg.bunFileSystemModule,
+  createBunWebSocket: () => import_websocket.createBunWebSocket,
   serveStatic: () => import_serve_static.serveStatic,
   toSSG: () => import_ssg.toSSG
 });
 module.exports = __toCommonJS(bun_exports);
 var import_serve_static = require("./serve-static");
 var import_ssg = require("./ssg");
+var import_websocket = require("./websocket");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   bunFileSystemModule,
+  createBunWebSocket,
   serveStatic,
   toSSG
 });

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

@@ -0,0 +1,98 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var websocket_exports = {};
+__export(websocket_exports, {
+  createBunWebSocket: () => createBunWebSocket
+});
+module.exports = __toCommonJS(websocket_exports);
+var import_websocket = require("../../helper/websocket");
+const createWSContext = (ws) => {
+  return {
+    send: (source, options) => {
+      const sendingData = typeof source === "string" ? source : source instanceof Uint8Array ? source.buffer : source;
+      ws.send(sendingData, 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 = c.env;
+      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);
+      }
+      await next();
+    };
+  };
+  const websocket = {
+    open(ws) {
+      const websocketListeners = websocketConns[ws.data.connId];
+      if (websocketListeners.onOpen) {
+        websocketListeners.onOpen(new Event("open"), createWSContext(ws));
+      }
+    },
+    close(ws, code, reason) {
+      const websocketListeners = websocketConns[ws.data.connId];
+      if (websocketListeners.onClose) {
+        websocketListeners.onClose(
+          new CloseEvent("close", {
+            code,
+            reason
+          }),
+          createWSContext(ws)
+        );
+      }
+    },
+    message(ws, message) {
+      const websocketListeners = websocketConns[ws.data.connId];
+      if (websocketListeners.onMessage) {
+        const normalizedReceiveData = typeof message === "string" ? message : message.buffer;
+        websocketListeners.onMessage(
+          (0, import_websocket.createWSMessageEvent)(normalizedReceiveData),
+          createWSContext(ws)
+        );
+      }
+    }
+  };
+  return {
+    upgradeWebSocket,
+    websocket
+  };
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  createBunWebSocket
+});

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

@@ -18,11 +18,14 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var cloudflare_workers_exports = {};
 __export(cloudflare_workers_exports, {
-  serveStatic: () => import_serve_static_module.serveStatic
+  serveStatic: () => import_serve_static_module.serveStatic,
+  upgradeWebSocket: () => import_websocket.upgradeWebSocket
 });
 module.exports = __toCommonJS(cloudflare_workers_exports);
 var import_serve_static_module = require("./serve-static-module");
+var import_websocket = require("./websocket");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  serveStatic
+  serveStatic,
+  upgradeWebSocket
 });

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

@@ -0,0 +1,80 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var websocket_exports = {};
+__export(websocket_exports, {
+  upgradeWebSocket: () => upgradeWebSocket
+});
+module.exports = __toCommonJS(websocket_exports);
+const upgradeWebSocket = (createEvents) => async (c, next) => {
+  const CFWebSocketPair = globalThis.WebSocketPair;
+  const events = await createEvents(c);
+  const upgradeHeader = c.req.header("Upgrade");
+  if (upgradeHeader !== "websocket") {
+    return await next();
+  }
+  const webSocketPair = new CFWebSocketPair();
+  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 && events.onOpen(evt, wsContext)
+    );
+  }
+  if (events.onClose) {
+    server.addEventListener(
+      "close",
+      (evt) => events.onClose && events.onClose(evt, wsContext)
+    );
+  }
+  if (events.onMessage) {
+    server.addEventListener(
+      "message",
+      (evt) => events.onMessage && events.onMessage(evt, wsContext)
+    );
+  }
+  if (events.onError) {
+    server.addEventListener(
+      "error",
+      (evt) => events.onError && 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/index.js

@@ -20,14 +20,17 @@ var deno_exports = {};
 __export(deno_exports, {
   denoFileSystemModule: () => import_ssg.denoFileSystemModule,
   serveStatic: () => import_serve_static.serveStatic,
-  toSSG: () => import_ssg.toSSG
+  toSSG: () => import_ssg.toSSG,
+  upgradeWebSocket: () => import_websocket.upgradeWebSocket
 });
 module.exports = __toCommonJS(deno_exports);
 var import_serve_static = require("./serve-static");
 var import_ssg = require("./ssg");
+var import_websocket = require("./websocket");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   denoFileSystemModule,
   serveStatic,
-  toSSG
+  toSSG,
+  upgradeWebSocket
 });

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

@@ -0,0 +1,52 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var websocket_exports = {};
+__export(websocket_exports, {
+  upgradeWebSocket: () => upgradeWebSocket
+});
+module.exports = __toCommonJS(websocket_exports);
+const upgradeWebSocket = (createEvents) => async (c, next) => {
+  if (c.req.header("upgrade") !== "websocket") {
+    return await next();
+  }
+  const { response, socket } = Deno.upgradeWebSocket(c.req.raw);
+  const events = await createEvents(c);
+  const wsContext = {
+    binaryType: "arraybuffer",
+    close: (code, reason) => socket.close(code, reason),
+    get protocol() {
+      return socket.protocol;
+    },
+    raw: socket,
+    get readyState() {
+      return socket.readyState;
+    },
+    url: socket.url ? new URL(socket.url) : null,
+    send: (source) => socket.send(source)
+  };
+  socket.onopen = (evt) => events.onOpen && events.onOpen(evt, wsContext);
+  socket.onmessage = (evt) => events.onMessage && events.onMessage(evt, wsContext);
+  socket.onclose = (evt) => events.onClose && events.onClose(evt, wsContext);
+  socket.onerror = (evt) => events.onError && events.onError(evt, wsContext);
+  return response;
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  upgradeWebSocket
+});

package/dist/cjs/client/client.js

@@ -133,6 +133,10 @@ const hc = (baseUrl, options) => createProxy((opts) => {
     }
     return new URL(url);
   }
+  if (method === "ws") {
+    const targetUrl = opts.args[0] && opts.args[0].param ? (0, import_utils.replaceUrlParam)(url, opts.args[0].param) : url;
+    return new WebSocket(targetUrl);
+  }
   const req = new ClientRequestImpl(url, method);
   if (method) {
     options ??= {};