@colyseus/bun-websockets 0.16.5 → 0.17.1

package/build/BunWebSockets.js

@@ -1,8 +1,7 @@
-var __create = Object.create;
+"use strict";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -16,50 +15,24 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var BunWebSockets_exports = {};
 __export(BunWebSockets_exports, {
   BunWebSockets: () => BunWebSockets
 });
 module.exports = __toCommonJS(BunWebSockets_exports);
-var import_bun_serve_express = __toESM(require("bun-serve-express"));
+var import_bun = require("bun");
 var import_core = require("@colyseus/core");
-var import_WebSocketClient = require("./WebSocketClient.js");
+var import_WebSocketClient = require("./WebSocketClient.ts");
 class BunWebSockets extends import_core.Transport {
   constructor(options = {}) {
     super();
-    this.options = options;
     this.clients = [];
     this.clientWrappers = /* @__PURE__ */ new WeakMap();
     this._originalRawSend = null;
+    this.options = {};
     const self = this;
-    this.expressApp = (0, import_bun_serve_express.default)({
-      websocket: {
-        ...this.options,
-        async open(ws) {
-          await self.onConnection(ws);
-        },
-        message(ws, message) {
-          self.clientWrappers.get(ws)?.emit("message", message);
-        },
-        close(ws, code, reason) {
-          (0, import_core.spliceOne)(self.clients, self.clients.indexOf(ws));
-          const clientWrapper = self.clientWrappers.get(ws);
-          if (clientWrapper) {
-            self.clientWrappers.delete(ws);
-            clientWrapper.emit("close", code);
-          }
-        }
-      }
-    });
+    this.options = options;
     if (!this.server) {
       this.server = new import_core.HttpServerMock();
     }
@@ -68,7 +41,6 @@ class BunWebSockets extends import_core.Transport {
     this._listening = this.expressApp.listen(port, listeningListener);
     this.expressApp.use(`/${import_core.matchMaker.controller.matchmakeRoute}`, async (req, res) => {
       try {
-        await this.handleMatchMakeRequest(req, res);
       } catch (e) {
         res.status(500).json({
           code: e.code,
@@ -104,82 +76,30 @@ class BunWebSockets extends import_core.Transport {
     const sessionId = parsedURL.searchParams.get("sessionId");
     const processAndRoomId = parsedURL.pathname.match(/\/[a-zA-Z0-9_\-]+\/([a-zA-Z0-9_\-]+)$/);
     const roomId = processAndRoomId && processAndRoomId[1];
+    if (!sessionId && !roomId) {
+      const timeout = setTimeout(() => rawClient.close(import_core.CloseCode.NORMAL_CLOSURE), 1e3);
+      wrapper.on("message", (_) => rawClient.send(new Uint8Array([import_core.Protocol.PING])));
+      wrapper.on("close", () => clearTimeout(timeout));
+      return;
+    }
     const room = import_core.matchMaker.getLocalRoomById(roomId);
     const client = new import_WebSocketClient.WebSocketClient(sessionId, wrapper);
+    const reconnectionToken = parsedURL.searchParams.get("reconnectionToken");
+    const skipHandshake = parsedURL.searchParams.has("skipHandshake");
     try {
-      if (!room || !room.hasReservedSeat(sessionId, parsedURL.searchParams.get("reconnectionToken"))) {
-        throw new Error("seat reservation expired.");
-      }
-      await room._onJoin(client, {
+      await (0, import_core.connectClientToRoom)(room, client, {
         token: parsedURL.searchParams.get("_authToken") ?? (0, import_core.getBearerToken)(rawClient.data.headers["authorization"]),
         headers: rawClient.data.headers,
         ip: rawClient.data.headers["x-real-ip"] ?? rawClient.data.headers["x-forwarded-for"] ?? rawClient.remoteAddress
+      }, {
+        reconnectionToken,
+        skipHandshake
       });
     } catch (e) {
       (0, import_core.debugAndPrintError)(e);
       client.error(e.code, e.message, () => rawClient.close());
     }
   }
-  async handleMatchMakeRequest(req, res) {
-    const writeHeaders = (req2, res2) => {
-      if (res2.destroyed) return;
-      res2.set(Object.assign(
-        {},
-        import_core.matchMaker.controller.DEFAULT_CORS_HEADERS,
-        import_core.matchMaker.controller.getCorsHeaders.call(void 0, req2)
-      ));
-      return true;
-    };
-    try {
-      switch (req.method) {
-        case "OPTIONS": {
-          writeHeaders(req, res);
-          res.status(200).end();
-          break;
-        }
-        case "GET": {
-          writeHeaders(req, res);
-          res.status(404).end();
-          break;
-        }
-        case "POST": {
-          if (import_core.matchMaker.state === import_core.matchMaker.MatchMakerState.SHUTTING_DOWN) {
-            throw new import_core.ServerError(503, "server is shutting down");
-          }
-          const matchedParams = req.path.match(import_core.matchMaker.controller.allowedRoomNameChars);
-          const matchmakeIndex = matchedParams.indexOf(import_core.matchMaker.controller.matchmakeRoute);
-          let clientOptions = req.body;
-          if (clientOptions == null) {
-            throw new import_core.ServerError(500, "invalid JSON input");
-          }
-          if (typeof clientOptions === "string" && clientOptions.length > 2) {
-            clientOptions = JSON.parse(clientOptions);
-          } else if (typeof clientOptions !== "object") {
-            clientOptions = {};
-          }
-          const method = matchedParams[matchmakeIndex + 1];
-          const roomName = matchedParams[matchmakeIndex + 2] || "";
-          writeHeaders(req, res);
-          res.json(await import_core.matchMaker.controller.invokeMethod(
-            method,
-            roomName,
-            clientOptions,
-            {
-              token: (0, import_core.getBearerToken)(req.headers["authorization"]),
-              headers: req.headers,
-              ip: req.headers["x-real-ip"] ?? req.headers["x-forwarded-for"] ?? req.ips
-            }
-          ));
-          break;
-        }
-        default:
-          throw new import_core.ServerError(500, "invalid request method");
-      }
-    } catch (e) {
-      writeHeaders(req, res);
-      res.status(500).json({ code: e.code, error: e.message });
-    }
-  }
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/build/BunWebSockets.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/BunWebSockets.ts"],
-  "sourcesContent": ["// <reference types=\"bun-types\" />\n\n// \"bun-types\" is currently conflicting with \"ws\" types.\n// @ts-ignore\nimport { ServerWebSocket, WebSocketHandler } from 'bun';\n\nimport type http from 'http';\nimport bunExpress from 'bun-serve-express';\nimport type { Application, Request, Response } from \"express\";\n\nimport { HttpServerMock, matchMaker, Transport, debugAndPrintError, spliceOne, ServerError, getBearerToken } from '@colyseus/core';\nimport { WebSocketClient, WebSocketWrapper } from './WebSocketClient.js';\n\nexport type TransportOptions = Partial<Omit<WebSocketHandler, \"message\" | \"open\" | \"drain\" | \"close\" | \"ping\" | \"pong\">>;\n\ninterface WebSocketData {\n  url: URL;\n  headers: any;\n}\n\nexport class BunWebSockets extends Transport {\n  public expressApp: Application;\n\n  protected clients: ServerWebSocket<WebSocketData>[] = [];\n  protected clientWrappers = new WeakMap<ServerWebSocket<WebSocketData>, WebSocketWrapper>();\n\n  private _listening: any;\n  private _originalRawSend: typeof WebSocketClient.prototype.raw | null = null;\n\n  constructor(private options: TransportOptions = {}) {\n    super();\n\n    const self = this;\n\n    this.expressApp = bunExpress({\n      websocket: {\n        ...this.options,\n\n        async open(ws) {\n          await self.onConnection(ws);\n        },\n\n        message(ws, message) {\n          self.clientWrappers.get(ws)?.emit('message', message);\n        },\n\n        close(ws, code, reason) {\n          // remove from client list\n          spliceOne(self.clients, self.clients.indexOf(ws));\n\n          const clientWrapper = self.clientWrappers.get(ws);\n          if (clientWrapper) {\n            self.clientWrappers.delete(ws);\n\n            // emit 'close' on wrapper\n            clientWrapper.emit('close', code);\n          }\n        },\n      }\n    });\n\n    // Adding a mock object for Transport.server\n    if (!this.server) {\n      // @ts-ignore\n      this.server = new HttpServerMock();\n    }\n  }\n\n  public listen(port: number, hostname?: string, backlog?: number, listeningListener?: () => void) {\n    this._listening = this.expressApp.listen(port, listeningListener);\n\n    this.expressApp.use(`/${matchMaker.controller.matchmakeRoute}`, async (req, res) => {\n      try {\n        await this.handleMatchMakeRequest(req, res);\n      } catch (e) {\n        res.status(500).json({\n          code: e.code,\n          error: e.message\n        });\n      }\n    });\n\n    // Mocking Transport.server behaviour, https://github.com/colyseus/colyseus/issues/458\n    // @ts-ignore\n    this.server.emit(\"listening\");\n\n    return this;\n  }\n\n  public shutdown() {\n    if (this._listening) {\n      this._listening.close();\n\n      // @ts-ignore\n      this.server.emit(\"close\"); // Mocking Transport.server behaviour, https://github.com/colyseus/colyseus/issues/458\n    }\n  }\n\n  public simulateLatency(milliseconds: number) {\n    if (this._originalRawSend == null) {\n      this._originalRawSend = WebSocketClient.prototype.raw;\n    }\n\n    const originalRawSend = this._originalRawSend;\n    WebSocketClient.prototype.raw = milliseconds <= Number.EPSILON ? originalRawSend : function (...args: any[]) {\n      let [buf, ...rest] = args;\n      buf = Buffer.from(buf);\n      setTimeout(() => originalRawSend.apply(this, [buf, ...rest]), milliseconds);\n    };\n  }\n\n  protected async onConnection(rawClient: ServerWebSocket<WebSocketData>) {\n    const wrapper = new WebSocketWrapper(rawClient);\n    // keep reference to client and its wrapper\n    this.clients.push(rawClient);\n    this.clientWrappers.set(rawClient, wrapper);\n\n    const parsedURL = new URL(rawClient.data.url);\n\n    const sessionId = parsedURL.searchParams.get(\"sessionId\");\n    const processAndRoomId = parsedURL.pathname.match(/\\/[a-zA-Z0-9_\\-]+\\/([a-zA-Z0-9_\\-]+)$/);\n    const roomId = processAndRoomId && processAndRoomId[1];\n\n    const room = matchMaker.getLocalRoomById(roomId);\n    const client = new WebSocketClient(sessionId, wrapper);\n\n    //\n    // TODO: DRY code below with all transports\n    //\n\n    try {\n      if (!room || !room.hasReservedSeat(sessionId, parsedURL.searchParams.get(\"reconnectionToken\") as string)) {\n        throw new Error('seat reservation expired.');\n      }\n\n      await room._onJoin(client, {\n        token: parsedURL.searchParams.get(\"_authToken\") ?? getBearerToken(rawClient.data.headers['authorization']),\n        headers: rawClient.data.headers,\n        ip: rawClient.data.headers['x-real-ip'] ?? rawClient.data.headers['x-forwarded-for'] ?? rawClient.remoteAddress,\n      });\n\n    } catch (e) {\n      debugAndPrintError(e);\n\n      // send error code to client then terminate\n      client.error(e.code, e.message, () => rawClient.close());\n    }\n  }\n\n  protected async handleMatchMakeRequest(req: Request, res: Response) {\n    const writeHeaders = (req: Request, res: Response) => {\n      if (res.destroyed) return;\n\n      res.set(Object.assign(\n        {},\n        matchMaker.controller.DEFAULT_CORS_HEADERS,\n        matchMaker.controller.getCorsHeaders.call(undefined, req)\n      ));\n\n      return true;\n    };\n\n    try {\n      switch (req.method) {\n        case 'OPTIONS': {\n          writeHeaders(req, res);\n          res.status(200).end();\n          break;\n        }\n\n        case 'GET': {\n          writeHeaders(req, res);\n          res.status(404).end();\n          break;\n        }\n\n        case 'POST': {\n          // do not accept matchmaking requests if already shutting down\n          if (matchMaker.state === matchMaker.MatchMakerState.SHUTTING_DOWN) {\n            throw new ServerError(503, \"server is shutting down\");\n          }\n\n          const matchedParams = req.path.match(matchMaker.controller.allowedRoomNameChars);\n          const matchmakeIndex = matchedParams.indexOf(matchMaker.controller.matchmakeRoute);\n          let clientOptions = req.body; // Bun.readableStreamToJSON(req.body);\n\n          if (clientOptions == null) {\n            throw new ServerError(500, \"invalid JSON input\");\n          }\n\n          if (typeof clientOptions === 'string' && clientOptions.length > 2) {\n            clientOptions = JSON.parse(clientOptions);\n          } else if (typeof clientOptions !== 'object') {\n            clientOptions = {};\n          }\n\n          const method = matchedParams[matchmakeIndex + 1];\n          const roomName = matchedParams[matchmakeIndex + 2] || '';\n\n          writeHeaders(req, res);\n          res.json(await matchMaker.controller.invokeMethod(\n            method,\n            roomName,\n            clientOptions,\n            {\n              token: getBearerToken(req.headers['authorization']),\n              headers: req.headers,\n              ip: req.headers['x-real-ip'] ?? req.headers['x-forwarded-for'] ?? req.ips,\n            },\n          ));\n          break;\n        }\n\n        default: throw new ServerError(500, \"invalid request method\");\n      }\n\n    } catch (e) {\n      writeHeaders(req, res);\n      res.status(500)\n        .json({ code: e.code, error: e.message });\n    }\n  }\n\n}\n"],
-  "mappings": "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",
-  "names": ["bunExpress", "req", "res"]
+  "sourcesContent": ["// <reference types=\"bun-types\" />\n\n// \"bun-types\" is currently conflicting with \"ws\" types.\n// @ts-ignore\nimport { ServerWebSocket, WebSocketHandler } from 'bun';\n\n// import bunExpress from 'bun-serve-express';\nimport type { Application, Request, Response } from \"express\";\n\nimport { HttpServerMock, matchMaker, Protocol, Transport, debugAndPrintError, getBearerToken, CloseCode, connectClientToRoom } from '@colyseus/core';\nimport { WebSocketClient, WebSocketWrapper } from './WebSocketClient.ts';\n\nexport type TransportOptions = Partial<Omit<WebSocketHandler, \"message\" | \"open\" | \"drain\" | \"close\" | \"ping\" | \"pong\">>;\n\ninterface WebSocketData {\n  url: URL;\n  headers: any;\n}\n\nexport class BunWebSockets extends Transport {\n  public expressApp: Application;\n\n  protected clients: ServerWebSocket<WebSocketData>[] = [];\n  protected clientWrappers = new WeakMap<ServerWebSocket<WebSocketData>, WebSocketWrapper>();\n\n  private _listening: any;\n  private _originalRawSend: typeof WebSocketClient.prototype.raw | null = null;\n  private options: TransportOptions = {};\n\n  constructor(options: TransportOptions = {}) {\n    super();\n\n    const self = this;\n\n    this.options = options;\n\n    // this.expressApp = bunExpress({\n    //   websocket: {\n    //     ...this.options,\n\n    //     async open(ws) {\n    //       await self.onConnection(ws);\n    //     },\n\n    //     message(ws, message) {\n    //       self.clientWrappers.get(ws)?.emit('message', message);\n    //     },\n\n    //     close(ws, code, reason) {\n    //       // remove from client list\n    //       spliceOne(self.clients, self.clients.indexOf(ws));\n\n    //       const clientWrapper = self.clientWrappers.get(ws);\n    //       if (clientWrapper) {\n    //         self.clientWrappers.delete(ws);\n\n    //         // emit 'close' on wrapper\n    //         clientWrapper.emit('close', code);\n    //       }\n    //     },\n    //   }\n    // });\n\n    // Adding a mock object for Transport.server\n    if (!this.server) {\n      // @ts-ignore\n      this.server = new HttpServerMock();\n    }\n  }\n\n  public listen(port: number, hostname?: string, backlog?: number, listeningListener?: () => void) {\n    this._listening = this.expressApp.listen(port, listeningListener);\n\n    this.expressApp.use(`/${matchMaker.controller.matchmakeRoute}`, async (req, res) => {\n      try {\n        // TODO: use shared handler here\n        // await this.handleMatchMakeRequest(req, res);\n      } catch (e: any) {\n        res.status(500).json({\n          code: e.code,\n          error: e.message\n        });\n      }\n    });\n\n    // Mocking Transport.server behaviour, https://github.com/colyseus/colyseus/issues/458\n    // @ts-ignore\n    this.server.emit(\"listening\");\n\n    return this;\n  }\n\n  public shutdown() {\n    if (this._listening) {\n      this._listening.close();\n\n      // @ts-ignore\n      this.server.emit(\"close\"); // Mocking Transport.server behaviour, https://github.com/colyseus/colyseus/issues/458\n    }\n  }\n\n  public simulateLatency(milliseconds: number) {\n    if (this._originalRawSend == null) {\n      this._originalRawSend = WebSocketClient.prototype.raw;\n    }\n\n    const originalRawSend = this._originalRawSend;\n    WebSocketClient.prototype.raw = milliseconds <= Number.EPSILON ? originalRawSend : function (...args: any[]) {\n      let [buf, ...rest] = args;\n      buf = Buffer.from(buf);\n      // @ts-ignore\n      setTimeout(() => originalRawSend.apply(this, [buf, ...rest]), milliseconds);\n    };\n  }\n\n  protected async onConnection(rawClient: ServerWebSocket<WebSocketData>) {\n    const wrapper = new WebSocketWrapper(rawClient);\n    // keep reference to client and its wrapper\n    this.clients.push(rawClient);\n    this.clientWrappers.set(rawClient, wrapper);\n\n    const parsedURL = new URL(rawClient.data.url);\n\n    const sessionId = parsedURL.searchParams.get(\"sessionId\");\n    const processAndRoomId = parsedURL.pathname.match(/\\/[a-zA-Z0-9_\\-]+\\/([a-zA-Z0-9_\\-]+)$/);\n    const roomId = processAndRoomId && processAndRoomId[1];\n\n    // If sessionId is not provided, allow ping-pong utility.\n    if (!sessionId && !roomId) {\n      // Disconnect automatically after 1 second if no message is received.\n      const timeout = setTimeout(() => rawClient.close(CloseCode.NORMAL_CLOSURE), 1000);\n      wrapper.on('message', (_) => rawClient.send(new Uint8Array([Protocol.PING])));\n      wrapper.on('close', () => clearTimeout(timeout));\n      return;\n    }\n\n    const room = matchMaker.getLocalRoomById(roomId);\n    const client = new WebSocketClient(sessionId, wrapper);\n    const reconnectionToken = parsedURL.searchParams.get(\"reconnectionToken\");\n    const skipHandshake = (parsedURL.searchParams.has(\"skipHandshake\"));\n\n    try {\n      await connectClientToRoom(room, client, {\n        token: parsedURL.searchParams.get(\"_authToken\") ?? getBearerToken(rawClient.data.headers['authorization']),\n        headers: rawClient.data.headers,\n        ip: rawClient.data.headers['x-real-ip'] ?? rawClient.data.headers['x-forwarded-for'] ?? rawClient.remoteAddress,\n      }, {\n        reconnectionToken,\n        skipHandshake\n      });\n\n    } catch (e: any) {\n      debugAndPrintError(e);\n\n      // send error code to client then terminate\n      client.error(e.code, e.message, () => rawClient.close());\n    }\n  }\n\n}\n"],
+  "mappings": "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",
+  "names": []
 }

package/build/BunWebSockets.mjs

@@ -1,34 +1,16 @@
 // packages/transport/bun-websockets/src/BunWebSockets.ts
-import bunExpress from "bun-serve-express";
-import { HttpServerMock, matchMaker, Transport, debugAndPrintError, spliceOne, ServerError, getBearerToken } from "@colyseus/core";
+import "bun";
+import { HttpServerMock, matchMaker, Protocol, Transport, debugAndPrintError, getBearerToken, CloseCode, connectClientToRoom } from "@colyseus/core";
 import { WebSocketClient, WebSocketWrapper } from "./WebSocketClient.mjs";
 var BunWebSockets = class extends Transport {
   constructor(options = {}) {
     super();
-    this.options = options;
     this.clients = [];
     this.clientWrappers = /* @__PURE__ */ new WeakMap();
     this._originalRawSend = null;
+    this.options = {};
     const self = this;
-    this.expressApp = bunExpress({
-      websocket: {
-        ...this.options,
-        async open(ws) {
-          await self.onConnection(ws);
-        },
-        message(ws, message) {
-          self.clientWrappers.get(ws)?.emit("message", message);
-        },
-        close(ws, code, reason) {
-          spliceOne(self.clients, self.clients.indexOf(ws));
-          const clientWrapper = self.clientWrappers.get(ws);
-          if (clientWrapper) {
-            self.clientWrappers.delete(ws);
-            clientWrapper.emit("close", code);
-          }
-        }
-      }
-    });
+    this.options = options;
     if (!this.server) {
       this.server = new HttpServerMock();
     }
@@ -37,7 +19,6 @@ var BunWebSockets = class extends Transport {
     this._listening = this.expressApp.listen(port, listeningListener);
     this.expressApp.use(`/${matchMaker.controller.matchmakeRoute}`, async (req, res) => {
       try {
-        await this.handleMatchMakeRequest(req, res);
       } catch (e) {
         res.status(500).json({
           code: e.code,
@@ -73,82 +54,30 @@ var BunWebSockets = class extends Transport {
     const sessionId = parsedURL.searchParams.get("sessionId");
     const processAndRoomId = parsedURL.pathname.match(/\/[a-zA-Z0-9_\-]+\/([a-zA-Z0-9_\-]+)$/);
     const roomId = processAndRoomId && processAndRoomId[1];
+    if (!sessionId && !roomId) {
+      const timeout = setTimeout(() => rawClient.close(CloseCode.NORMAL_CLOSURE), 1e3);
+      wrapper.on("message", (_) => rawClient.send(new Uint8Array([Protocol.PING])));
+      wrapper.on("close", () => clearTimeout(timeout));
+      return;
+    }
     const room = matchMaker.getLocalRoomById(roomId);
     const client = new WebSocketClient(sessionId, wrapper);
+    const reconnectionToken = parsedURL.searchParams.get("reconnectionToken");
+    const skipHandshake = parsedURL.searchParams.has("skipHandshake");
     try {
-      if (!room || !room.hasReservedSeat(sessionId, parsedURL.searchParams.get("reconnectionToken"))) {
-        throw new Error("seat reservation expired.");
-      }
-      await room._onJoin(client, {
+      await connectClientToRoom(room, client, {
         token: parsedURL.searchParams.get("_authToken") ?? getBearerToken(rawClient.data.headers["authorization"]),
         headers: rawClient.data.headers,
         ip: rawClient.data.headers["x-real-ip"] ?? rawClient.data.headers["x-forwarded-for"] ?? rawClient.remoteAddress
+      }, {
+        reconnectionToken,
+        skipHandshake
       });
     } catch (e) {
       debugAndPrintError(e);
       client.error(e.code, e.message, () => rawClient.close());
     }
   }
-  async handleMatchMakeRequest(req, res) {
-    const writeHeaders = (req2, res2) => {
-      if (res2.destroyed) return;
-      res2.set(Object.assign(
-        {},
-        matchMaker.controller.DEFAULT_CORS_HEADERS,
-        matchMaker.controller.getCorsHeaders.call(void 0, req2)
-      ));
-      return true;
-    };
-    try {
-      switch (req.method) {
-        case "OPTIONS": {
-          writeHeaders(req, res);
-          res.status(200).end();
-          break;
-        }
-        case "GET": {
-          writeHeaders(req, res);
-          res.status(404).end();
-          break;
-        }
-        case "POST": {
-          if (matchMaker.state === matchMaker.MatchMakerState.SHUTTING_DOWN) {
-            throw new ServerError(503, "server is shutting down");
-          }
-          const matchedParams = req.path.match(matchMaker.controller.allowedRoomNameChars);
-          const matchmakeIndex = matchedParams.indexOf(matchMaker.controller.matchmakeRoute);
-          let clientOptions = req.body;
-          if (clientOptions == null) {
-            throw new ServerError(500, "invalid JSON input");
-          }
-          if (typeof clientOptions === "string" && clientOptions.length > 2) {
-            clientOptions = JSON.parse(clientOptions);
-          } else if (typeof clientOptions !== "object") {
-            clientOptions = {};
-          }
-          const method = matchedParams[matchmakeIndex + 1];
-          const roomName = matchedParams[matchmakeIndex + 2] || "";
-          writeHeaders(req, res);
-          res.json(await matchMaker.controller.invokeMethod(
-            method,
-            roomName,
-            clientOptions,
-            {
-              token: getBearerToken(req.headers["authorization"]),
-              headers: req.headers,
-              ip: req.headers["x-real-ip"] ?? req.headers["x-forwarded-for"] ?? req.ips
-            }
-          ));
-          break;
-        }
-        default:
-          throw new ServerError(500, "invalid request method");
-      }
-    } catch (e) {
-      writeHeaders(req, res);
-      res.status(500).json({ code: e.code, error: e.message });
-    }
-  }
 };
 export {
   BunWebSockets

package/build/BunWebSockets.mjs.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/BunWebSockets.ts"],
-  "sourcesContent": ["// <reference types=\"bun-types\" />\n\n// \"bun-types\" is currently conflicting with \"ws\" types.\n// @ts-ignore\nimport { ServerWebSocket, WebSocketHandler } from 'bun';\n\nimport type http from 'http';\nimport bunExpress from 'bun-serve-express';\nimport type { Application, Request, Response } from \"express\";\n\nimport { HttpServerMock, matchMaker, Transport, debugAndPrintError, spliceOne, ServerError, getBearerToken } from '@colyseus/core';\nimport { WebSocketClient, WebSocketWrapper } from './WebSocketClient.js';\n\nexport type TransportOptions = Partial<Omit<WebSocketHandler, \"message\" | \"open\" | \"drain\" | \"close\" | \"ping\" | \"pong\">>;\n\ninterface WebSocketData {\n  url: URL;\n  headers: any;\n}\n\nexport class BunWebSockets extends Transport {\n  public expressApp: Application;\n\n  protected clients: ServerWebSocket<WebSocketData>[] = [];\n  protected clientWrappers = new WeakMap<ServerWebSocket<WebSocketData>, WebSocketWrapper>();\n\n  private _listening: any;\n  private _originalRawSend: typeof WebSocketClient.prototype.raw | null = null;\n\n  constructor(private options: TransportOptions = {}) {\n    super();\n\n    const self = this;\n\n    this.expressApp = bunExpress({\n      websocket: {\n        ...this.options,\n\n        async open(ws) {\n          await self.onConnection(ws);\n        },\n\n        message(ws, message) {\n          self.clientWrappers.get(ws)?.emit('message', message);\n        },\n\n        close(ws, code, reason) {\n          // remove from client list\n          spliceOne(self.clients, self.clients.indexOf(ws));\n\n          const clientWrapper = self.clientWrappers.get(ws);\n          if (clientWrapper) {\n            self.clientWrappers.delete(ws);\n\n            // emit 'close' on wrapper\n            clientWrapper.emit('close', code);\n          }\n        },\n      }\n    });\n\n    // Adding a mock object for Transport.server\n    if (!this.server) {\n      // @ts-ignore\n      this.server = new HttpServerMock();\n    }\n  }\n\n  public listen(port: number, hostname?: string, backlog?: number, listeningListener?: () => void) {\n    this._listening = this.expressApp.listen(port, listeningListener);\n\n    this.expressApp.use(`/${matchMaker.controller.matchmakeRoute}`, async (req, res) => {\n      try {\n        await this.handleMatchMakeRequest(req, res);\n      } catch (e) {\n        res.status(500).json({\n          code: e.code,\n          error: e.message\n        });\n      }\n    });\n\n    // Mocking Transport.server behaviour, https://github.com/colyseus/colyseus/issues/458\n    // @ts-ignore\n    this.server.emit(\"listening\");\n\n    return this;\n  }\n\n  public shutdown() {\n    if (this._listening) {\n      this._listening.close();\n\n      // @ts-ignore\n      this.server.emit(\"close\"); // Mocking Transport.server behaviour, https://github.com/colyseus/colyseus/issues/458\n    }\n  }\n\n  public simulateLatency(milliseconds: number) {\n    if (this._originalRawSend == null) {\n      this._originalRawSend = WebSocketClient.prototype.raw;\n    }\n\n    const originalRawSend = this._originalRawSend;\n    WebSocketClient.prototype.raw = milliseconds <= Number.EPSILON ? originalRawSend : function (...args: any[]) {\n      let [buf, ...rest] = args;\n      buf = Buffer.from(buf);\n      setTimeout(() => originalRawSend.apply(this, [buf, ...rest]), milliseconds);\n    };\n  }\n\n  protected async onConnection(rawClient: ServerWebSocket<WebSocketData>) {\n    const wrapper = new WebSocketWrapper(rawClient);\n    // keep reference to client and its wrapper\n    this.clients.push(rawClient);\n    this.clientWrappers.set(rawClient, wrapper);\n\n    const parsedURL = new URL(rawClient.data.url);\n\n    const sessionId = parsedURL.searchParams.get(\"sessionId\");\n    const processAndRoomId = parsedURL.pathname.match(/\\/[a-zA-Z0-9_\\-]+\\/([a-zA-Z0-9_\\-]+)$/);\n    const roomId = processAndRoomId && processAndRoomId[1];\n\n    const room = matchMaker.getLocalRoomById(roomId);\n    const client = new WebSocketClient(sessionId, wrapper);\n\n    //\n    // TODO: DRY code below with all transports\n    //\n\n    try {\n      if (!room || !room.hasReservedSeat(sessionId, parsedURL.searchParams.get(\"reconnectionToken\") as string)) {\n        throw new Error('seat reservation expired.');\n      }\n\n      await room._onJoin(client, {\n        token: parsedURL.searchParams.get(\"_authToken\") ?? getBearerToken(rawClient.data.headers['authorization']),\n        headers: rawClient.data.headers,\n        ip: rawClient.data.headers['x-real-ip'] ?? rawClient.data.headers['x-forwarded-for'] ?? rawClient.remoteAddress,\n      });\n\n    } catch (e) {\n      debugAndPrintError(e);\n\n      // send error code to client then terminate\n      client.error(e.code, e.message, () => rawClient.close());\n    }\n  }\n\n  protected async handleMatchMakeRequest(req: Request, res: Response) {\n    const writeHeaders = (req: Request, res: Response) => {\n      if (res.destroyed) return;\n\n      res.set(Object.assign(\n        {},\n        matchMaker.controller.DEFAULT_CORS_HEADERS,\n        matchMaker.controller.getCorsHeaders.call(undefined, req)\n      ));\n\n      return true;\n    };\n\n    try {\n      switch (req.method) {\n        case 'OPTIONS': {\n          writeHeaders(req, res);\n          res.status(200).end();\n          break;\n        }\n\n        case 'GET': {\n          writeHeaders(req, res);\n          res.status(404).end();\n          break;\n        }\n\n        case 'POST': {\n          // do not accept matchmaking requests if already shutting down\n          if (matchMaker.state === matchMaker.MatchMakerState.SHUTTING_DOWN) {\n            throw new ServerError(503, \"server is shutting down\");\n          }\n\n          const matchedParams = req.path.match(matchMaker.controller.allowedRoomNameChars);\n          const matchmakeIndex = matchedParams.indexOf(matchMaker.controller.matchmakeRoute);\n          let clientOptions = req.body; // Bun.readableStreamToJSON(req.body);\n\n          if (clientOptions == null) {\n            throw new ServerError(500, \"invalid JSON input\");\n          }\n\n          if (typeof clientOptions === 'string' && clientOptions.length > 2) {\n            clientOptions = JSON.parse(clientOptions);\n          } else if (typeof clientOptions !== 'object') {\n            clientOptions = {};\n          }\n\n          const method = matchedParams[matchmakeIndex + 1];\n          const roomName = matchedParams[matchmakeIndex + 2] || '';\n\n          writeHeaders(req, res);\n          res.json(await matchMaker.controller.invokeMethod(\n            method,\n            roomName,\n            clientOptions,\n            {\n              token: getBearerToken(req.headers['authorization']),\n              headers: req.headers,\n              ip: req.headers['x-real-ip'] ?? req.headers['x-forwarded-for'] ?? req.ips,\n            },\n          ));\n          break;\n        }\n\n        default: throw new ServerError(500, \"invalid request method\");\n      }\n\n    } catch (e) {\n      writeHeaders(req, res);\n      res.status(500)\n        .json({ code: e.code, error: e.message });\n    }\n  }\n\n}\n"],
-  "mappings": "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",
-  "names": ["req", "res"]
+  "sourcesContent": ["// <reference types=\"bun-types\" />\n\n// \"bun-types\" is currently conflicting with \"ws\" types.\n// @ts-ignore\nimport { ServerWebSocket, WebSocketHandler } from 'bun';\n\n// import bunExpress from 'bun-serve-express';\nimport type { Application, Request, Response } from \"express\";\n\nimport { HttpServerMock, matchMaker, Protocol, Transport, debugAndPrintError, getBearerToken, CloseCode, connectClientToRoom } from '@colyseus/core';\nimport { WebSocketClient, WebSocketWrapper } from './WebSocketClient.ts';\n\nexport type TransportOptions = Partial<Omit<WebSocketHandler, \"message\" | \"open\" | \"drain\" | \"close\" | \"ping\" | \"pong\">>;\n\ninterface WebSocketData {\n  url: URL;\n  headers: any;\n}\n\nexport class BunWebSockets extends Transport {\n  public expressApp: Application;\n\n  protected clients: ServerWebSocket<WebSocketData>[] = [];\n  protected clientWrappers = new WeakMap<ServerWebSocket<WebSocketData>, WebSocketWrapper>();\n\n  private _listening: any;\n  private _originalRawSend: typeof WebSocketClient.prototype.raw | null = null;\n  private options: TransportOptions = {};\n\n  constructor(options: TransportOptions = {}) {\n    super();\n\n    const self = this;\n\n    this.options = options;\n\n    // this.expressApp = bunExpress({\n    //   websocket: {\n    //     ...this.options,\n\n    //     async open(ws) {\n    //       await self.onConnection(ws);\n    //     },\n\n    //     message(ws, message) {\n    //       self.clientWrappers.get(ws)?.emit('message', message);\n    //     },\n\n    //     close(ws, code, reason) {\n    //       // remove from client list\n    //       spliceOne(self.clients, self.clients.indexOf(ws));\n\n    //       const clientWrapper = self.clientWrappers.get(ws);\n    //       if (clientWrapper) {\n    //         self.clientWrappers.delete(ws);\n\n    //         // emit 'close' on wrapper\n    //         clientWrapper.emit('close', code);\n    //       }\n    //     },\n    //   }\n    // });\n\n    // Adding a mock object for Transport.server\n    if (!this.server) {\n      // @ts-ignore\n      this.server = new HttpServerMock();\n    }\n  }\n\n  public listen(port: number, hostname?: string, backlog?: number, listeningListener?: () => void) {\n    this._listening = this.expressApp.listen(port, listeningListener);\n\n    this.expressApp.use(`/${matchMaker.controller.matchmakeRoute}`, async (req, res) => {\n      try {\n        // TODO: use shared handler here\n        // await this.handleMatchMakeRequest(req, res);\n      } catch (e: any) {\n        res.status(500).json({\n          code: e.code,\n          error: e.message\n        });\n      }\n    });\n\n    // Mocking Transport.server behaviour, https://github.com/colyseus/colyseus/issues/458\n    // @ts-ignore\n    this.server.emit(\"listening\");\n\n    return this;\n  }\n\n  public shutdown() {\n    if (this._listening) {\n      this._listening.close();\n\n      // @ts-ignore\n      this.server.emit(\"close\"); // Mocking Transport.server behaviour, https://github.com/colyseus/colyseus/issues/458\n    }\n  }\n\n  public simulateLatency(milliseconds: number) {\n    if (this._originalRawSend == null) {\n      this._originalRawSend = WebSocketClient.prototype.raw;\n    }\n\n    const originalRawSend = this._originalRawSend;\n    WebSocketClient.prototype.raw = milliseconds <= Number.EPSILON ? originalRawSend : function (...args: any[]) {\n      let [buf, ...rest] = args;\n      buf = Buffer.from(buf);\n      // @ts-ignore\n      setTimeout(() => originalRawSend.apply(this, [buf, ...rest]), milliseconds);\n    };\n  }\n\n  protected async onConnection(rawClient: ServerWebSocket<WebSocketData>) {\n    const wrapper = new WebSocketWrapper(rawClient);\n    // keep reference to client and its wrapper\n    this.clients.push(rawClient);\n    this.clientWrappers.set(rawClient, wrapper);\n\n    const parsedURL = new URL(rawClient.data.url);\n\n    const sessionId = parsedURL.searchParams.get(\"sessionId\");\n    const processAndRoomId = parsedURL.pathname.match(/\\/[a-zA-Z0-9_\\-]+\\/([a-zA-Z0-9_\\-]+)$/);\n    const roomId = processAndRoomId && processAndRoomId[1];\n\n    // If sessionId is not provided, allow ping-pong utility.\n    if (!sessionId && !roomId) {\n      // Disconnect automatically after 1 second if no message is received.\n      const timeout = setTimeout(() => rawClient.close(CloseCode.NORMAL_CLOSURE), 1000);\n      wrapper.on('message', (_) => rawClient.send(new Uint8Array([Protocol.PING])));\n      wrapper.on('close', () => clearTimeout(timeout));\n      return;\n    }\n\n    const room = matchMaker.getLocalRoomById(roomId);\n    const client = new WebSocketClient(sessionId, wrapper);\n    const reconnectionToken = parsedURL.searchParams.get(\"reconnectionToken\");\n    const skipHandshake = (parsedURL.searchParams.has(\"skipHandshake\"));\n\n    try {\n      await connectClientToRoom(room, client, {\n        token: parsedURL.searchParams.get(\"_authToken\") ?? getBearerToken(rawClient.data.headers['authorization']),\n        headers: rawClient.data.headers,\n        ip: rawClient.data.headers['x-real-ip'] ?? rawClient.data.headers['x-forwarded-for'] ?? rawClient.remoteAddress,\n      }, {\n        reconnectionToken,\n        skipHandshake\n      });\n\n    } catch (e: any) {\n      debugAndPrintError(e);\n\n      // send error code to client then terminate\n      client.error(e.code, e.message, () => rawClient.close());\n    }\n  }\n\n}\n"],
+  "mappings": "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",
+  "names": []
 }

package/build/WebSocketClient.js

@@ -1,3 +1,4 @@
+"use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -31,7 +32,7 @@ __export(WebSocketClient_exports, {
   WebSocketWrapper: () => WebSocketWrapper
 });
 module.exports = __toCommonJS(WebSocketClient_exports);
-var import_events = __toESM(require("events"));
+var import_events = __toESM(require("events"), 1);
 var import_core = require("@colyseus/core");
 class WebSocketWrapper extends import_events.default {
   constructor(ws) {
@@ -41,11 +42,10 @@ class WebSocketWrapper extends import_events.default {
 }
 class WebSocketClient {
   constructor(id, ref) {
-    this.id = id;
-    this.ref = ref;
     this.state = import_core.ClientState.JOINING;
     this._enqueuedMessages = [];
-    this.sessionId = id;
+    this.id = this.sessionId = id;
+    this.ref = ref;
   }
   sendBytes(type, bytes, options) {
     (0, import_core.debugMessage)("send bytes(to %s): '%s' -> %j", this.sessionId, type, bytes);

package/build/WebSocketClient.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/WebSocketClient.ts"],
-  "sourcesContent": ["// <reference types=\"bun-types\" />\n\n// \"bun-types\" is currently conflicting with \"ws\" types.\n// @ts-ignore\nimport type { ServerWebSocket } from 'bun';\nimport EventEmitter from 'events';\n\nimport { Protocol, Client, ClientPrivate, ClientState, ISendOptions, getMessageBytes, logger, debugMessage } from '@colyseus/core';\n\nexport class WebSocketWrapper extends EventEmitter {\n  constructor(public ws: ServerWebSocket<any>) {\n    super();\n  }\n}\n\nexport class WebSocketClient implements Client, ClientPrivate {\n  public sessionId: string;\n  public state: ClientState = ClientState.JOINING;\n  public reconnectionToken: string;\n\n  public _enqueuedMessages: any[] = [];\n  public _afterNextPatchQueue;\n  public _reconnectionToken: string;\n  public _joinedAt: number;\n\n  constructor(\n    public id: string,\n    public ref: WebSocketWrapper,\n  ) {\n    this.sessionId = id;\n  }\n\n  public sendBytes(type: string | number, bytes: Buffer | Uint8Array, options?: ISendOptions) {\n    debugMessage(\"send bytes(to %s): '%s' -> %j\", this.sessionId, type, bytes);\n\n    this.enqueueRaw(\n      getMessageBytes.raw(Protocol.ROOM_DATA_BYTES, type, undefined, bytes),\n      options,\n    );\n  }\n\n  public send(messageOrType: any, messageOrOptions?: any | ISendOptions, options?: ISendOptions) {\n    debugMessage(\"send(to %s): '%s' -> %j\", this.sessionId, messageOrType, messageOrOptions);\n\n    this.enqueueRaw(\n      getMessageBytes.raw(Protocol.ROOM_DATA, messageOrType, messageOrOptions),\n      options,\n    );\n  }\n\n  public enqueueRaw(data: Uint8Array | Buffer, options?: ISendOptions) {\n    // use room's afterNextPatch queue\n    if (options?.afterNextPatch) {\n      this._afterNextPatchQueue.push([this, [data]]);\n      return;\n    }\n\n    if (this.state === ClientState.JOINING) {\n      // sending messages during `onJoin`.\n      // - the client-side cannot register \"onMessage\" callbacks at this point.\n      // - enqueue the messages to be send after JOIN_ROOM message has been sent\n      // - create a new buffer for enqueued messages, as the underlying buffer might be modified\n      this._enqueuedMessages.push(data);\n      return;\n    }\n\n    this.raw(data, options);\n  }\n\n  public raw(data: Uint8Array | Buffer, options?: ISendOptions, cb?: (err?: Error) => void) {\n    // skip if client not open\n\n    // WebSocket is globally available on Bun runtime\n    // @ts-ignore\n    if (this.ref.ws.readyState !== WebSocket.OPEN) {\n      return;\n    }\n\n    // FIXME: can we avoid creating a new buffer here?\n    this.ref.ws.sendBinary(data);\n  }\n\n  public error(code: number, message: string = '', cb?: (err?: Error) => void) {\n    this.raw(getMessageBytes[Protocol.ERROR](code, message));\n\n    if (cb) {\n      // (same API as \"ws\" transport)\n      setTimeout(cb, 1);\n    }\n  }\n\n  get readyState() {\n    return this.ref.ws.readyState;\n  }\n\n  public leave(code?: number, data?: string) {\n    this.ref.ws.close(code, data);\n  }\n\n  public close(code?: number, data?: string) {\n    logger.warn('DEPRECATION WARNING: use client.leave() instead of client.close()');\n    try {\n      throw new Error();\n    } catch (e) {\n      logger.info(e.stack);\n    }\n    this.leave(code, data);\n  }\n\n  public toJSON() {\n    return { sessionId: this.sessionId, readyState: this.readyState };\n  }\n}\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAKA,oBAAyB;AAEzB,kBAAkH;AAE3G,MAAM,yBAAyB,cAAAA,QAAa;AAAA,EACjD,YAAmB,IAA0B;AAC3C,UAAM;AADW;AAAA,EAEnB;AACF;AAEO,MAAM,gBAAiD;AAAA,EAU5D,YACS,IACA,KACP;AAFO;AACA;AAVT,SAAO,QAAqB,wBAAY;AAGxC,SAAO,oBAA2B,CAAC;AASjC,SAAK,YAAY;AAAA,EACnB;AAAA,EAEO,UAAU,MAAuB,OAA4B,SAAwB;AAC1F,kCAAa,iCAAiC,KAAK,WAAW,MAAM,KAAK;AAEzE,SAAK;AAAA,MACH,4BAAgB,IAAI,qBAAS,iBAAiB,MAAM,QAAW,KAAK;AAAA,MACpE;AAAA,IACF;AAAA,EACF;AAAA,EAEO,KAAK,eAAoB,kBAAuC,SAAwB;AAC7F,kCAAa,2BAA2B,KAAK,WAAW,eAAe,gBAAgB;AAEvF,SAAK;AAAA,MACH,4BAAgB,IAAI,qBAAS,WAAW,eAAe,gBAAgB;AAAA,MACvE;AAAA,IACF;AAAA,EACF;AAAA,EAEO,WAAW,MAA2B,SAAwB;AAEnE,QAAI,SAAS,gBAAgB;AAC3B,WAAK,qBAAqB,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;AAC7C;AAAA,IACF;AAEA,QAAI,KAAK,UAAU,wBAAY,SAAS;AAKtC,WAAK,kBAAkB,KAAK,IAAI;AAChC;AAAA,IACF;AAEA,SAAK,IAAI,MAAM,OAAO;AAAA,EACxB;AAAA,EAEO,IAAI,MAA2B,SAAwB,IAA4B;AAKxF,QAAI,KAAK,IAAI,GAAG,eAAe,UAAU,MAAM;AAC7C;AAAA,IACF;AAGA,SAAK,IAAI,GAAG,WAAW,IAAI;AAAA,EAC7B;AAAA,EAEO,MAAM,MAAc,UAAkB,IAAI,IAA4B;AAC3E,SAAK,IAAI,4BAAgB,qBAAS,KAAK,EAAE,MAAM,OAAO,CAAC;AAEvD,QAAI,IAAI;AAEN,iBAAW,IAAI,CAAC;AAAA,IAClB;AAAA,EACF;AAAA,EAEA,IAAI,aAAa;AACf,WAAO,KAAK,IAAI,GAAG;AAAA,EACrB;AAAA,EAEO,MAAM,MAAe,MAAe;AACzC,SAAK,IAAI,GAAG,MAAM,MAAM,IAAI;AAAA,EAC9B;AAAA,EAEO,MAAM,MAAe,MAAe;AACzC,uBAAO,KAAK,mEAAmE;AAC/E,QAAI;AACF,YAAM,IAAI,MAAM;AAAA,IAClB,SAAS,GAAG;AACV,yBAAO,KAAK,EAAE,KAAK;AAAA,IACrB;AACA,SAAK,MAAM,MAAM,IAAI;AAAA,EACvB;AAAA,EAEO,SAAS;AACd,WAAO,EAAE,WAAW,KAAK,WAAW,YAAY,KAAK,WAAW;AAAA,EAClE;AACF;",
+  "sourcesContent": ["// <reference types=\"bun-types\" />\n\n// \"bun-types\" is currently conflicting with \"ws\" types.\n// @ts-ignore\nimport type { ServerWebSocket } from 'bun';\nimport EventEmitter from 'events';\n\nimport { Protocol, type Client, type ClientPrivate, ClientState, type ISendOptions, getMessageBytes, logger, debugMessage } from '@colyseus/core';\n\nexport class WebSocketWrapper extends EventEmitter {\n  public ws: ServerWebSocket<any>;\n\n  constructor(ws: ServerWebSocket<any>) {\n    super();\n    this.ws = ws;\n  }\n}\n\nexport class WebSocketClient implements Client, ClientPrivate {\n  '~messages': any;\n\n  public id: string;\n  public ref: WebSocketWrapper;\n\n  public sessionId: string;\n  public state: ClientState = ClientState.JOINING;\n  public reconnectionToken: string;\n\n  public _enqueuedMessages: any[] = [];\n  public _afterNextPatchQueue;\n  public _reconnectionToken: string;\n  public _joinedAt: number;\n\n  constructor(id: string, ref: WebSocketWrapper,) {\n    this.id = this.sessionId = id;\n    this.ref = ref;\n  }\n\n  public sendBytes(type: string | number, bytes: Buffer | Uint8Array, options?: ISendOptions) {\n    debugMessage(\"send bytes(to %s): '%s' -> %j\", this.sessionId, type, bytes);\n\n    this.enqueueRaw(\n      getMessageBytes.raw(Protocol.ROOM_DATA_BYTES, type, undefined, bytes),\n      options,\n    );\n  }\n\n  public send(messageOrType: any, messageOrOptions?: any | ISendOptions, options?: ISendOptions) {\n    debugMessage(\"send(to %s): '%s' -> %j\", this.sessionId, messageOrType, messageOrOptions);\n\n    this.enqueueRaw(\n      getMessageBytes.raw(Protocol.ROOM_DATA, messageOrType, messageOrOptions),\n      options,\n    );\n  }\n\n  public enqueueRaw(data: Uint8Array | Buffer, options?: ISendOptions) {\n    // use room's afterNextPatch queue\n    if (options?.afterNextPatch) {\n      this._afterNextPatchQueue.push([this, [data]]);\n      return;\n    }\n\n    if (this.state === ClientState.JOINING) {\n      // sending messages during `onJoin`.\n      // - the client-side cannot register \"onMessage\" callbacks at this point.\n      // - enqueue the messages to be send after JOIN_ROOM message has been sent\n      // - create a new buffer for enqueued messages, as the underlying buffer might be modified\n      this._enqueuedMessages.push(data);\n      return;\n    }\n\n    this.raw(data, options);\n  }\n\n  public raw(data: Uint8Array | Buffer, options?: ISendOptions, cb?: (err?: Error) => void) {\n    // skip if client not open\n\n    // WebSocket is globally available on Bun runtime\n    // @ts-ignore\n    if (this.ref.ws.readyState !== WebSocket.OPEN) {\n      return;\n    }\n\n    // FIXME: can we avoid creating a new buffer here?\n    this.ref.ws.sendBinary(data);\n  }\n\n  public error(code: number, message: string = '', cb?: (err?: Error) => void) {\n    this.raw(getMessageBytes[Protocol.ERROR](code, message));\n\n    if (cb) {\n      // (same API as \"ws\" transport)\n      setTimeout(cb, 1);\n    }\n  }\n\n  get readyState() {\n    return this.ref.ws.readyState;\n  }\n\n  public leave(code?: number, data?: string) {\n    this.ref.ws.close(code, data);\n  }\n\n  public close(code?: number, data?: string) {\n    logger.warn('DEPRECATION WARNING: use client.leave() instead of client.close()');\n    try {\n      throw new Error();\n    } catch (e: any) {\n      logger.info(e.stack);\n    }\n    this.leave(code, data);\n  }\n\n  public toJSON() {\n    return { sessionId: this.sessionId, readyState: this.readyState };\n  }\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAKA,oBAAyB;AAEzB,kBAAiI;AAE1H,MAAM,yBAAyB,cAAAA,QAAa;AAAA,EAGjD,YAAY,IAA0B;AACpC,UAAM;AACN,SAAK,KAAK;AAAA,EACZ;AACF;AAEO,MAAM,gBAAiD;AAAA,EAe5D,YAAY,IAAY,KAAwB;AARhD,SAAO,QAAqB,wBAAY;AAGxC,SAAO,oBAA2B,CAAC;AAMjC,SAAK,KAAK,KAAK,YAAY;AAC3B,SAAK,MAAM;AAAA,EACb;AAAA,EAEO,UAAU,MAAuB,OAA4B,SAAwB;AAC1F,kCAAa,iCAAiC,KAAK,WAAW,MAAM,KAAK;AAEzE,SAAK;AAAA,MACH,4BAAgB,IAAI,qBAAS,iBAAiB,MAAM,QAAW,KAAK;AAAA,MACpE;AAAA,IACF;AAAA,EACF;AAAA,EAEO,KAAK,eAAoB,kBAAuC,SAAwB;AAC7F,kCAAa,2BAA2B,KAAK,WAAW,eAAe,gBAAgB;AAEvF,SAAK;AAAA,MACH,4BAAgB,IAAI,qBAAS,WAAW,eAAe,gBAAgB;AAAA,MACvE;AAAA,IACF;AAAA,EACF;AAAA,EAEO,WAAW,MAA2B,SAAwB;AAEnE,QAAI,SAAS,gBAAgB;AAC3B,WAAK,qBAAqB,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;AAC7C;AAAA,IACF;AAEA,QAAI,KAAK,UAAU,wBAAY,SAAS;AAKtC,WAAK,kBAAkB,KAAK,IAAI;AAChC;AAAA,IACF;AAEA,SAAK,IAAI,MAAM,OAAO;AAAA,EACxB;AAAA,EAEO,IAAI,MAA2B,SAAwB,IAA4B;AAKxF,QAAI,KAAK,IAAI,GAAG,eAAe,UAAU,MAAM;AAC7C;AAAA,IACF;AAGA,SAAK,IAAI,GAAG,WAAW,IAAI;AAAA,EAC7B;AAAA,EAEO,MAAM,MAAc,UAAkB,IAAI,IAA4B;AAC3E,SAAK,IAAI,4BAAgB,qBAAS,KAAK,EAAE,MAAM,OAAO,CAAC;AAEvD,QAAI,IAAI;AAEN,iBAAW,IAAI,CAAC;AAAA,IAClB;AAAA,EACF;AAAA,EAEA,IAAI,aAAa;AACf,WAAO,KAAK,IAAI,GAAG;AAAA,EACrB;AAAA,EAEO,MAAM,MAAe,MAAe;AACzC,SAAK,IAAI,GAAG,MAAM,MAAM,IAAI;AAAA,EAC9B;AAAA,EAEO,MAAM,MAAe,MAAe;AACzC,uBAAO,KAAK,mEAAmE;AAC/E,QAAI;AACF,YAAM,IAAI,MAAM;AAAA,IAClB,SAAS,GAAQ;AACf,yBAAO,KAAK,EAAE,KAAK;AAAA,IACrB;AACA,SAAK,MAAM,MAAM,IAAI;AAAA,EACvB;AAAA,EAEO,SAAS;AACd,WAAO,EAAE,WAAW,KAAK,WAAW,YAAY,KAAK,WAAW;AAAA,EAClE;AACF;",
   "names": ["EventEmitter"]
 }

package/build/WebSocketClient.mjs

@@ -9,11 +9,10 @@ var WebSocketWrapper = class extends EventEmitter {
 };
 var WebSocketClient = class {
   constructor(id, ref) {
-    this.id = id;
-    this.ref = ref;
     this.state = ClientState.JOINING;
     this._enqueuedMessages = [];
-    this.sessionId = id;
+    this.id = this.sessionId = id;
+    this.ref = ref;
   }
   sendBytes(type, bytes, options) {
     debugMessage("send bytes(to %s): '%s' -> %j", this.sessionId, type, bytes);

package/build/WebSocketClient.mjs.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/WebSocketClient.ts"],
-  "sourcesContent": ["// <reference types=\"bun-types\" />\n\n// \"bun-types\" is currently conflicting with \"ws\" types.\n// @ts-ignore\nimport type { ServerWebSocket } from 'bun';\nimport EventEmitter from 'events';\n\nimport { Protocol, Client, ClientPrivate, ClientState, ISendOptions, getMessageBytes, logger, debugMessage } from '@colyseus/core';\n\nexport class WebSocketWrapper extends EventEmitter {\n  constructor(public ws: ServerWebSocket<any>) {\n    super();\n  }\n}\n\nexport class WebSocketClient implements Client, ClientPrivate {\n  public sessionId: string;\n  public state: ClientState = ClientState.JOINING;\n  public reconnectionToken: string;\n\n  public _enqueuedMessages: any[] = [];\n  public _afterNextPatchQueue;\n  public _reconnectionToken: string;\n  public _joinedAt: number;\n\n  constructor(\n    public id: string,\n    public ref: WebSocketWrapper,\n  ) {\n    this.sessionId = id;\n  }\n\n  public sendBytes(type: string | number, bytes: Buffer | Uint8Array, options?: ISendOptions) {\n    debugMessage(\"send bytes(to %s): '%s' -> %j\", this.sessionId, type, bytes);\n\n    this.enqueueRaw(\n      getMessageBytes.raw(Protocol.ROOM_DATA_BYTES, type, undefined, bytes),\n      options,\n    );\n  }\n\n  public send(messageOrType: any, messageOrOptions?: any | ISendOptions, options?: ISendOptions) {\n    debugMessage(\"send(to %s): '%s' -> %j\", this.sessionId, messageOrType, messageOrOptions);\n\n    this.enqueueRaw(\n      getMessageBytes.raw(Protocol.ROOM_DATA, messageOrType, messageOrOptions),\n      options,\n    );\n  }\n\n  public enqueueRaw(data: Uint8Array | Buffer, options?: ISendOptions) {\n    // use room's afterNextPatch queue\n    if (options?.afterNextPatch) {\n      this._afterNextPatchQueue.push([this, [data]]);\n      return;\n    }\n\n    if (this.state === ClientState.JOINING) {\n      // sending messages during `onJoin`.\n      // - the client-side cannot register \"onMessage\" callbacks at this point.\n      // - enqueue the messages to be send after JOIN_ROOM message has been sent\n      // - create a new buffer for enqueued messages, as the underlying buffer might be modified\n      this._enqueuedMessages.push(data);\n      return;\n    }\n\n    this.raw(data, options);\n  }\n\n  public raw(data: Uint8Array | Buffer, options?: ISendOptions, cb?: (err?: Error) => void) {\n    // skip if client not open\n\n    // WebSocket is globally available on Bun runtime\n    // @ts-ignore\n    if (this.ref.ws.readyState !== WebSocket.OPEN) {\n      return;\n    }\n\n    // FIXME: can we avoid creating a new buffer here?\n    this.ref.ws.sendBinary(data);\n  }\n\n  public error(code: number, message: string = '', cb?: (err?: Error) => void) {\n    this.raw(getMessageBytes[Protocol.ERROR](code, message));\n\n    if (cb) {\n      // (same API as \"ws\" transport)\n      setTimeout(cb, 1);\n    }\n  }\n\n  get readyState() {\n    return this.ref.ws.readyState;\n  }\n\n  public leave(code?: number, data?: string) {\n    this.ref.ws.close(code, data);\n  }\n\n  public close(code?: number, data?: string) {\n    logger.warn('DEPRECATION WARNING: use client.leave() instead of client.close()');\n    try {\n      throw new Error();\n    } catch (e) {\n      logger.info(e.stack);\n    }\n    this.leave(code, data);\n  }\n\n  public toJSON() {\n    return { sessionId: this.sessionId, readyState: this.readyState };\n  }\n}\n"],
-  "mappings": ";AAKA,OAAO,kBAAkB;AAEzB,SAAS,UAAiC,aAA2B,iBAAiB,QAAQ,oBAAoB;AAE3G,IAAM,mBAAN,cAA+B,aAAa;AAAA,EACjD,YAAmB,IAA0B;AAC3C,UAAM;AADW;AAAA,EAEnB;AACF;AAEO,IAAM,kBAAN,MAAuD;AAAA,EAU5D,YACS,IACA,KACP;AAFO;AACA;AAVT,SAAO,QAAqB,YAAY;AAGxC,SAAO,oBAA2B,CAAC;AASjC,SAAK,YAAY;AAAA,EACnB;AAAA,EAEO,UAAU,MAAuB,OAA4B,SAAwB;AAC1F,iBAAa,iCAAiC,KAAK,WAAW,MAAM,KAAK;AAEzE,SAAK;AAAA,MACH,gBAAgB,IAAI,SAAS,iBAAiB,MAAM,QAAW,KAAK;AAAA,MACpE;AAAA,IACF;AAAA,EACF;AAAA,EAEO,KAAK,eAAoB,kBAAuC,SAAwB;AAC7F,iBAAa,2BAA2B,KAAK,WAAW,eAAe,gBAAgB;AAEvF,SAAK;AAAA,MACH,gBAAgB,IAAI,SAAS,WAAW,eAAe,gBAAgB;AAAA,MACvE;AAAA,IACF;AAAA,EACF;AAAA,EAEO,WAAW,MAA2B,SAAwB;AAEnE,QAAI,SAAS,gBAAgB;AAC3B,WAAK,qBAAqB,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;AAC7C;AAAA,IACF;AAEA,QAAI,KAAK,UAAU,YAAY,SAAS;AAKtC,WAAK,kBAAkB,KAAK,IAAI;AAChC;AAAA,IACF;AAEA,SAAK,IAAI,MAAM,OAAO;AAAA,EACxB;AAAA,EAEO,IAAI,MAA2B,SAAwB,IAA4B;AAKxF,QAAI,KAAK,IAAI,GAAG,eAAe,UAAU,MAAM;AAC7C;AAAA,IACF;AAGA,SAAK,IAAI,GAAG,WAAW,IAAI;AAAA,EAC7B;AAAA,EAEO,MAAM,MAAc,UAAkB,IAAI,IAA4B;AAC3E,SAAK,IAAI,gBAAgB,SAAS,KAAK,EAAE,MAAM,OAAO,CAAC;AAEvD,QAAI,IAAI;AAEN,iBAAW,IAAI,CAAC;AAAA,IAClB;AAAA,EACF;AAAA,EAEA,IAAI,aAAa;AACf,WAAO,KAAK,IAAI,GAAG;AAAA,EACrB;AAAA,EAEO,MAAM,MAAe,MAAe;AACzC,SAAK,IAAI,GAAG,MAAM,MAAM,IAAI;AAAA,EAC9B;AAAA,EAEO,MAAM,MAAe,MAAe;AACzC,WAAO,KAAK,mEAAmE;AAC/E,QAAI;AACF,YAAM,IAAI,MAAM;AAAA,IAClB,SAAS,GAAG;AACV,aAAO,KAAK,EAAE,KAAK;AAAA,IACrB;AACA,SAAK,MAAM,MAAM,IAAI;AAAA,EACvB;AAAA,EAEO,SAAS;AACd,WAAO,EAAE,WAAW,KAAK,WAAW,YAAY,KAAK,WAAW;AAAA,EAClE;AACF;",
+  "sourcesContent": ["// <reference types=\"bun-types\" />\n\n// \"bun-types\" is currently conflicting with \"ws\" types.\n// @ts-ignore\nimport type { ServerWebSocket } from 'bun';\nimport EventEmitter from 'events';\n\nimport { Protocol, type Client, type ClientPrivate, ClientState, type ISendOptions, getMessageBytes, logger, debugMessage } from '@colyseus/core';\n\nexport class WebSocketWrapper extends EventEmitter {\n  public ws: ServerWebSocket<any>;\n\n  constructor(ws: ServerWebSocket<any>) {\n    super();\n    this.ws = ws;\n  }\n}\n\nexport class WebSocketClient implements Client, ClientPrivate {\n  '~messages': any;\n\n  public id: string;\n  public ref: WebSocketWrapper;\n\n  public sessionId: string;\n  public state: ClientState = ClientState.JOINING;\n  public reconnectionToken: string;\n\n  public _enqueuedMessages: any[] = [];\n  public _afterNextPatchQueue;\n  public _reconnectionToken: string;\n  public _joinedAt: number;\n\n  constructor(id: string, ref: WebSocketWrapper,) {\n    this.id = this.sessionId = id;\n    this.ref = ref;\n  }\n\n  public sendBytes(type: string | number, bytes: Buffer | Uint8Array, options?: ISendOptions) {\n    debugMessage(\"send bytes(to %s): '%s' -> %j\", this.sessionId, type, bytes);\n\n    this.enqueueRaw(\n      getMessageBytes.raw(Protocol.ROOM_DATA_BYTES, type, undefined, bytes),\n      options,\n    );\n  }\n\n  public send(messageOrType: any, messageOrOptions?: any | ISendOptions, options?: ISendOptions) {\n    debugMessage(\"send(to %s): '%s' -> %j\", this.sessionId, messageOrType, messageOrOptions);\n\n    this.enqueueRaw(\n      getMessageBytes.raw(Protocol.ROOM_DATA, messageOrType, messageOrOptions),\n      options,\n    );\n  }\n\n  public enqueueRaw(data: Uint8Array | Buffer, options?: ISendOptions) {\n    // use room's afterNextPatch queue\n    if (options?.afterNextPatch) {\n      this._afterNextPatchQueue.push([this, [data]]);\n      return;\n    }\n\n    if (this.state === ClientState.JOINING) {\n      // sending messages during `onJoin`.\n      // - the client-side cannot register \"onMessage\" callbacks at this point.\n      // - enqueue the messages to be send after JOIN_ROOM message has been sent\n      // - create a new buffer for enqueued messages, as the underlying buffer might be modified\n      this._enqueuedMessages.push(data);\n      return;\n    }\n\n    this.raw(data, options);\n  }\n\n  public raw(data: Uint8Array | Buffer, options?: ISendOptions, cb?: (err?: Error) => void) {\n    // skip if client not open\n\n    // WebSocket is globally available on Bun runtime\n    // @ts-ignore\n    if (this.ref.ws.readyState !== WebSocket.OPEN) {\n      return;\n    }\n\n    // FIXME: can we avoid creating a new buffer here?\n    this.ref.ws.sendBinary(data);\n  }\n\n  public error(code: number, message: string = '', cb?: (err?: Error) => void) {\n    this.raw(getMessageBytes[Protocol.ERROR](code, message));\n\n    if (cb) {\n      // (same API as \"ws\" transport)\n      setTimeout(cb, 1);\n    }\n  }\n\n  get readyState() {\n    return this.ref.ws.readyState;\n  }\n\n  public leave(code?: number, data?: string) {\n    this.ref.ws.close(code, data);\n  }\n\n  public close(code?: number, data?: string) {\n    logger.warn('DEPRECATION WARNING: use client.leave() instead of client.close()');\n    try {\n      throw new Error();\n    } catch (e: any) {\n      logger.info(e.stack);\n    }\n    this.leave(code, data);\n  }\n\n  public toJSON() {\n    return { sessionId: this.sessionId, readyState: this.readyState };\n  }\n}\n"],
+  "mappings": ";AAKA,OAAO,kBAAkB;AAEzB,SAAS,UAA2C,aAAgC,iBAAiB,QAAQ,oBAAoB;AAE1H,IAAM,mBAAN,cAA+B,aAAa;AAAA,EAGjD,YAAY,IAA0B;AACpC,UAAM;AACN,SAAK,KAAK;AAAA,EACZ;AACF;AAEO,IAAM,kBAAN,MAAuD;AAAA,EAe5D,YAAY,IAAY,KAAwB;AARhD,SAAO,QAAqB,YAAY;AAGxC,SAAO,oBAA2B,CAAC;AAMjC,SAAK,KAAK,KAAK,YAAY;AAC3B,SAAK,MAAM;AAAA,EACb;AAAA,EAEO,UAAU,MAAuB,OAA4B,SAAwB;AAC1F,iBAAa,iCAAiC,KAAK,WAAW,MAAM,KAAK;AAEzE,SAAK;AAAA,MACH,gBAAgB,IAAI,SAAS,iBAAiB,MAAM,QAAW,KAAK;AAAA,MACpE;AAAA,IACF;AAAA,EACF;AAAA,EAEO,KAAK,eAAoB,kBAAuC,SAAwB;AAC7F,iBAAa,2BAA2B,KAAK,WAAW,eAAe,gBAAgB;AAEvF,SAAK;AAAA,MACH,gBAAgB,IAAI,SAAS,WAAW,eAAe,gBAAgB;AAAA,MACvE;AAAA,IACF;AAAA,EACF;AAAA,EAEO,WAAW,MAA2B,SAAwB;AAEnE,QAAI,SAAS,gBAAgB;AAC3B,WAAK,qBAAqB,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;AAC7C;AAAA,IACF;AAEA,QAAI,KAAK,UAAU,YAAY,SAAS;AAKtC,WAAK,kBAAkB,KAAK,IAAI;AAChC;AAAA,IACF;AAEA,SAAK,IAAI,MAAM,OAAO;AAAA,EACxB;AAAA,EAEO,IAAI,MAA2B,SAAwB,IAA4B;AAKxF,QAAI,KAAK,IAAI,GAAG,eAAe,UAAU,MAAM;AAC7C;AAAA,IACF;AAGA,SAAK,IAAI,GAAG,WAAW,IAAI;AAAA,EAC7B;AAAA,EAEO,MAAM,MAAc,UAAkB,IAAI,IAA4B;AAC3E,SAAK,IAAI,gBAAgB,SAAS,KAAK,EAAE,MAAM,OAAO,CAAC;AAEvD,QAAI,IAAI;AAEN,iBAAW,IAAI,CAAC;AAAA,IAClB;AAAA,EACF;AAAA,EAEA,IAAI,aAAa;AACf,WAAO,KAAK,IAAI,GAAG;AAAA,EACrB;AAAA,EAEO,MAAM,MAAe,MAAe;AACzC,SAAK,IAAI,GAAG,MAAM,MAAM,IAAI;AAAA,EAC9B;AAAA,EAEO,MAAM,MAAe,MAAe;AACzC,WAAO,KAAK,mEAAmE;AAC/E,QAAI;AACF,YAAM,IAAI,MAAM;AAAA,IAClB,SAAS,GAAQ;AACf,aAAO,KAAK,EAAE,KAAK;AAAA,IACrB;AACA,SAAK,MAAM,MAAM,IAAI;AAAA,EACvB;AAAA,EAEO,SAAS;AACd,WAAO,EAAE,WAAW,KAAK,WAAW,YAAY,KAAK,WAAW;AAAA,EAClE;AACF;",
   "names": []
 }

package/build/index.js

@@ -1,3 +1,4 @@
+"use strict";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
@@ -15,14 +16,14 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var src_exports = {};
-__export(src_exports, {
+var index_exports = {};
+__export(index_exports, {
   BunWebSockets: () => import_BunWebSockets.BunWebSockets,
   WebSocketClient: () => import_WebSocketClient.WebSocketClient
 });
-module.exports = __toCommonJS(src_exports);
-var import_WebSocketClient = require("./WebSocketClient.js");
-var import_BunWebSockets = require("./BunWebSockets.js");
+module.exports = __toCommonJS(index_exports);
+var import_WebSocketClient = require("./WebSocketClient.ts");
+var import_BunWebSockets = require("./BunWebSockets.ts");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   BunWebSockets,

package/build/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/index.ts"],
-  "sourcesContent": ["export { WebSocketClient } from './WebSocketClient.js';\nexport { BunWebSockets, type TransportOptions } from './BunWebSockets.js';"],
-  "mappings": ";;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,6BAAgC;AAChC,2BAAqD;",
+  "sourcesContent": ["export { WebSocketClient } from './WebSocketClient.ts';\nexport { BunWebSockets, type TransportOptions } from './BunWebSockets.ts';"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,6BAAgC;AAChC,2BAAqD;",
   "names": []
 }

package/build/index.mjs.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/index.ts"],
-  "sourcesContent": ["export { WebSocketClient } from './WebSocketClient.js';\nexport { BunWebSockets, type TransportOptions } from './BunWebSockets.js';"],
+  "sourcesContent": ["export { WebSocketClient } from './WebSocketClient.ts';\nexport { BunWebSockets, type TransportOptions } from './BunWebSockets.ts';"],
   "mappings": ";AAAA,SAAS,uBAAuB;AAChC,SAAS,qBAA4C;",
   "names": []
 }

package/build/{BunWebSockets.d.ts → src/BunWebSockets.d.ts}

@@ -1,24 +1,23 @@
 import { ServerWebSocket, WebSocketHandler } from 'bun';
-import type { Application, Request, Response } from "express";
+import type { Application } from "express";
 import { Transport } from '@colyseus/core';
-import { WebSocketWrapper } from './WebSocketClient.js';
+import { WebSocketWrapper } from './WebSocketClient.ts';
 export type TransportOptions = Partial<Omit<WebSocketHandler, "message" | "open" | "drain" | "close" | "ping" | "pong">>;
 interface WebSocketData {
     url: URL;
     headers: any;
 }
 export declare class BunWebSockets extends Transport {
-    private options;
     expressApp: Application;
     protected clients: ServerWebSocket<WebSocketData>[];
     protected clientWrappers: WeakMap<ServerWebSocket<WebSocketData>, WebSocketWrapper>;
     private _listening;
     private _originalRawSend;
+    private options;
     constructor(options?: TransportOptions);
     listen(port: number, hostname?: string, backlog?: number, listeningListener?: () => void): this;
     shutdown(): void;
     simulateLatency(milliseconds: number): void;
     protected onConnection(rawClient: ServerWebSocket<WebSocketData>): Promise<void>;
-    protected handleMatchMakeRequest(req: Request, res: Response): Promise<void>;
 }
 export {};

package/build/{WebSocketClient.d.ts → src/WebSocketClient.d.ts}

@@ -1,11 +1,12 @@
 import type { ServerWebSocket } from 'bun';
 import EventEmitter from 'events';
-import { Client, ClientPrivate, ClientState, ISendOptions } from '@colyseus/core';
+import { type Client, type ClientPrivate, ClientState, type ISendOptions } from '@colyseus/core';
 export declare class WebSocketWrapper extends EventEmitter {
     ws: ServerWebSocket<any>;
     constructor(ws: ServerWebSocket<any>);
 }
 export declare class WebSocketClient implements Client, ClientPrivate {
+    '~messages': any;
     id: string;
     ref: WebSocketWrapper;
     sessionId: string;

package/build/src/index.d.ts

@@ -0,0 +1,2 @@
+export { WebSocketClient } from './WebSocketClient.ts';
+export { BunWebSockets, type TransportOptions } from './BunWebSockets.ts';

package/package.json

@@ -1,24 +1,29 @@
 {
   "name": "@colyseus/bun-websockets",
-  "version": "0.16.5",
+  "version": "0.17.1",
+  "type": "module",
   "input": "./src/index.ts",
   "main": "./build/index.js",
-  "module": "./build/index.mjs",
+  "module": "./src/index.ts",
   "typings": "./build/index.d.ts",
   "exports": {
     ".": {
       "types": "./build/index.d.ts",
-      "import": "./build/index.mjs",
+      "import": "./src/index.ts",
       "require": "./build/index.js"
+    },
+    "./*": {
+      "types": "./build/*.d.ts",
+      "import": "./src/*.ts",
+      "require": "./build/*.js"
     }
   },
   "dependencies": {
-    "bun-serve-express": "^1.0.5",
-    "express": ">=4.16.0",
-    "@colyseus/core": "^0.16.21"
+    "@colyseus/core": "^0.17.1"
   },
   "devDependencies": {
-    "@colyseus/core": "^0.16.21"
+    "bun-types": "^1.2.0",
+    "@colyseus/core": "^0.17.1"
   },
   "author": "Endel Dreyer",
   "license": "MIT",
@@ -30,8 +35,7 @@
   ],
   "files": [
     "build",
-    "LICENSE",
-    "README.md"
+    "src"
   ],
   "repository": {
     "type": "git",

package/src/BunWebSockets.ts

@@ -0,0 +1,160 @@
+// <reference types="bun-types" />
+
+// "bun-types" is currently conflicting with "ws" types.
+// @ts-ignore
+import { ServerWebSocket, WebSocketHandler } from 'bun';
+
+// import bunExpress from 'bun-serve-express';
+import type { Application, Request, Response } from "express";
+
+import { HttpServerMock, matchMaker, Protocol, Transport, debugAndPrintError, getBearerToken, CloseCode, connectClientToRoom } from '@colyseus/core';
+import { WebSocketClient, WebSocketWrapper } from './WebSocketClient.ts';
+
+export type TransportOptions = Partial<Omit<WebSocketHandler, "message" | "open" | "drain" | "close" | "ping" | "pong">>;
+
+interface WebSocketData {
+  url: URL;
+  headers: any;
+}
+
+export class BunWebSockets extends Transport {
+  public expressApp: Application;
+
+  protected clients: ServerWebSocket<WebSocketData>[] = [];
+  protected clientWrappers = new WeakMap<ServerWebSocket<WebSocketData>, WebSocketWrapper>();
+
+  private _listening: any;
+  private _originalRawSend: typeof WebSocketClient.prototype.raw | null = null;
+  private options: TransportOptions = {};
+
+  constructor(options: TransportOptions = {}) {
+    super();
+
+    const self = this;
+
+    this.options = options;
+
+    // this.expressApp = bunExpress({
+    //   websocket: {
+    //     ...this.options,
+
+    //     async open(ws) {
+    //       await self.onConnection(ws);
+    //     },
+
+    //     message(ws, message) {
+    //       self.clientWrappers.get(ws)?.emit('message', message);
+    //     },
+
+    //     close(ws, code, reason) {
+    //       // remove from client list
+    //       spliceOne(self.clients, self.clients.indexOf(ws));
+
+    //       const clientWrapper = self.clientWrappers.get(ws);
+    //       if (clientWrapper) {
+    //         self.clientWrappers.delete(ws);
+
+    //         // emit 'close' on wrapper
+    //         clientWrapper.emit('close', code);
+    //       }
+    //     },
+    //   }
+    // });
+
+    // Adding a mock object for Transport.server
+    if (!this.server) {
+      // @ts-ignore
+      this.server = new HttpServerMock();
+    }
+  }
+
+  public listen(port: number, hostname?: string, backlog?: number, listeningListener?: () => void) {
+    this._listening = this.expressApp.listen(port, listeningListener);
+
+    this.expressApp.use(`/${matchMaker.controller.matchmakeRoute}`, async (req, res) => {
+      try {
+        // TODO: use shared handler here
+        // await this.handleMatchMakeRequest(req, res);
+      } catch (e: any) {
+        res.status(500).json({
+          code: e.code,
+          error: e.message
+        });
+      }
+    });
+
+    // Mocking Transport.server behaviour, https://github.com/colyseus/colyseus/issues/458
+    // @ts-ignore
+    this.server.emit("listening");
+
+    return this;
+  }
+
+  public shutdown() {
+    if (this._listening) {
+      this._listening.close();
+
+      // @ts-ignore
+      this.server.emit("close"); // Mocking Transport.server behaviour, https://github.com/colyseus/colyseus/issues/458
+    }
+  }
+
+  public simulateLatency(milliseconds: number) {
+    if (this._originalRawSend == null) {
+      this._originalRawSend = WebSocketClient.prototype.raw;
+    }
+
+    const originalRawSend = this._originalRawSend;
+    WebSocketClient.prototype.raw = milliseconds <= Number.EPSILON ? originalRawSend : function (...args: any[]) {
+      let [buf, ...rest] = args;
+      buf = Buffer.from(buf);
+      // @ts-ignore
+      setTimeout(() => originalRawSend.apply(this, [buf, ...rest]), milliseconds);
+    };
+  }
+
+  protected async onConnection(rawClient: ServerWebSocket<WebSocketData>) {
+    const wrapper = new WebSocketWrapper(rawClient);
+    // keep reference to client and its wrapper
+    this.clients.push(rawClient);
+    this.clientWrappers.set(rawClient, wrapper);
+
+    const parsedURL = new URL(rawClient.data.url);
+
+    const sessionId = parsedURL.searchParams.get("sessionId");
+    const processAndRoomId = parsedURL.pathname.match(/\/[a-zA-Z0-9_\-]+\/([a-zA-Z0-9_\-]+)$/);
+    const roomId = processAndRoomId && processAndRoomId[1];
+
+    // If sessionId is not provided, allow ping-pong utility.
+    if (!sessionId && !roomId) {
+      // Disconnect automatically after 1 second if no message is received.
+      const timeout = setTimeout(() => rawClient.close(CloseCode.NORMAL_CLOSURE), 1000);
+      wrapper.on('message', (_) => rawClient.send(new Uint8Array([Protocol.PING])));
+      wrapper.on('close', () => clearTimeout(timeout));
+      return;
+    }
+
+    const room = matchMaker.getLocalRoomById(roomId);
+    const client = new WebSocketClient(sessionId, wrapper);
+    const reconnectionToken = parsedURL.searchParams.get("reconnectionToken");
+    const skipHandshake = (parsedURL.searchParams.has("skipHandshake"));
+
+    try {
+      await connectClientToRoom(room, client, {
+        token: parsedURL.searchParams.get("_authToken") ?? getBearerToken(rawClient.data.headers['authorization']),
+        headers: rawClient.data.headers,
+        ip: rawClient.data.headers['x-real-ip'] ?? rawClient.data.headers['x-forwarded-for'] ?? rawClient.remoteAddress,
+      }, {
+        reconnectionToken,
+        skipHandshake
+      });
+
+    } catch (e: any) {
+      debugAndPrintError(e);
+
+      // send error code to client then terminate
+      client.error(e.code, e.message, () => rawClient.close());
+    }
+  }
+
+}

package/src/WebSocketClient.ts

@@ -0,0 +1,119 @@
+// <reference types="bun-types" />
+
+// "bun-types" is currently conflicting with "ws" types.
+// @ts-ignore
+import type { ServerWebSocket } from 'bun';
+import EventEmitter from 'events';
+
+import { Protocol, type Client, type ClientPrivate, ClientState, type ISendOptions, getMessageBytes, logger, debugMessage } from '@colyseus/core';
+
+export class WebSocketWrapper extends EventEmitter {
+  public ws: ServerWebSocket<any>;
+
+  constructor(ws: ServerWebSocket<any>) {
+    super();
+    this.ws = ws;
+  }
+}
+
+export class WebSocketClient implements Client, ClientPrivate {
+  '~messages': any;
+
+  public id: string;
+  public ref: WebSocketWrapper;
+
+  public sessionId: string;
+  public state: ClientState = ClientState.JOINING;
+  public reconnectionToken: string;
+
+  public _enqueuedMessages: any[] = [];
+  public _afterNextPatchQueue;
+  public _reconnectionToken: string;
+  public _joinedAt: number;
+
+  constructor(id: string, ref: WebSocketWrapper,) {
+    this.id = this.sessionId = id;
+    this.ref = ref;
+  }
+
+  public sendBytes(type: string | number, bytes: Buffer | Uint8Array, options?: ISendOptions) {
+    debugMessage("send bytes(to %s): '%s' -> %j", this.sessionId, type, bytes);
+
+    this.enqueueRaw(
+      getMessageBytes.raw(Protocol.ROOM_DATA_BYTES, type, undefined, bytes),
+      options,
+    );
+  }
+
+  public send(messageOrType: any, messageOrOptions?: any | ISendOptions, options?: ISendOptions) {
+    debugMessage("send(to %s): '%s' -> %j", this.sessionId, messageOrType, messageOrOptions);
+
+    this.enqueueRaw(
+      getMessageBytes.raw(Protocol.ROOM_DATA, messageOrType, messageOrOptions),
+      options,
+    );
+  }
+
+  public enqueueRaw(data: Uint8Array | Buffer, options?: ISendOptions) {
+    // use room's afterNextPatch queue
+    if (options?.afterNextPatch) {
+      this._afterNextPatchQueue.push([this, [data]]);
+      return;
+    }
+
+    if (this.state === ClientState.JOINING) {
+      // sending messages during `onJoin`.
+      // - the client-side cannot register "onMessage" callbacks at this point.
+      // - enqueue the messages to be send after JOIN_ROOM message has been sent
+      // - create a new buffer for enqueued messages, as the underlying buffer might be modified
+      this._enqueuedMessages.push(data);
+      return;
+    }
+
+    this.raw(data, options);
+  }
+
+  public raw(data: Uint8Array | Buffer, options?: ISendOptions, cb?: (err?: Error) => void) {
+    // skip if client not open
+
+    // WebSocket is globally available on Bun runtime
+    // @ts-ignore
+    if (this.ref.ws.readyState !== WebSocket.OPEN) {
+      return;
+    }
+
+    // FIXME: can we avoid creating a new buffer here?
+    this.ref.ws.sendBinary(data);
+  }
+
+  public error(code: number, message: string = '', cb?: (err?: Error) => void) {
+    this.raw(getMessageBytes[Protocol.ERROR](code, message));
+
+    if (cb) {
+      // (same API as "ws" transport)
+      setTimeout(cb, 1);
+    }
+  }
+
+  get readyState() {
+    return this.ref.ws.readyState;
+  }
+
+  public leave(code?: number, data?: string) {
+    this.ref.ws.close(code, data);
+  }
+
+  public close(code?: number, data?: string) {
+    logger.warn('DEPRECATION WARNING: use client.leave() instead of client.close()');
+    try {
+      throw new Error();
+    } catch (e: any) {
+      logger.info(e.stack);
+    }
+    this.leave(code, data);
+  }
+
+  public toJSON() {
+    return { sessionId: this.sessionId, readyState: this.readyState };
+  }
+}

package/src/index.ts

@@ -0,0 +1,2 @@
+export { WebSocketClient } from './WebSocketClient.ts';
+export { BunWebSockets, type TransportOptions } from './BunWebSockets.ts';

package/build/index.d.ts

@@ -1,2 +0,0 @@
-export { WebSocketClient } from './WebSocketClient.js';
-export { BunWebSockets, type TransportOptions } from './BunWebSockets.js';