@colyseus/core 0.16.23 → 0.17.0

package/build/rooms/RankedQueueRoom.js

@@ -0,0 +1,224 @@
+"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 RankedQueueRoom_exports = {};
+__export(RankedQueueRoom_exports, {
+  RankedQueueRoom: () => RankedQueueRoom
+});
+module.exports = __toCommonJS(RankedQueueRoom_exports);
+var import_core = require("@colyseus/core");
+const DEFAULT_TEAM = /* @__PURE__ */ Symbol("$default_team");
+const DEFAULT_COMPARE = (client, matchGroup) => {
+  const diff = Math.abs(client.rank - matchGroup.averageRank);
+  const diffRatio = diff / matchGroup.averageRank;
+  return diff < 10 || diffRatio <= 2;
+};
+class RankedQueueRoom extends import_core.Room {
+  constructor() {
+    super(...arguments);
+    this.maxPlayers = 4;
+    this.allowIncompleteGroups = false;
+    this.maxWaitingCycles = 15;
+    this.maxWaitingCyclesForPriority = 10;
+    /**
+     * Evaluate groups for each client at interval
+     */
+    this.cycleTickInterval = 1e3;
+    /**
+     * Groups of players per iteration
+     */
+    this.groups = [];
+    this.highPriorityGroups = [];
+    this.compare = DEFAULT_COMPARE;
+    this.onGroupReady = (group) => import_core.matchMaker.createRoom(this.matchRoomName, {});
+    this.messages = {
+      confirm: (client, _) => {
+        const queueData = client.userData;
+        if (queueData && queueData.group && typeof queueData.group.confirmed === "number") {
+          queueData.confirmed = true;
+          queueData.group.confirmed++;
+          client.leave();
+        }
+      }
+    };
+  }
+  onCreate(options) {
+    if (typeof options.maxWaitingCycles === "number") {
+      this.maxWaitingCycles = options.maxWaitingCycles;
+    }
+    if (typeof options.maxPlayers === "number") {
+      this.maxPlayers = options.maxPlayers;
+    }
+    if (typeof options.maxTeamSize === "number") {
+      this.maxTeamSize = options.maxTeamSize;
+    }
+    if (typeof options.allowIncompleteGroups !== "undefined") {
+      this.allowIncompleteGroups = options.allowIncompleteGroups;
+    }
+    if (typeof options.compare === "function") {
+      this.compare = options.compare;
+    }
+    if (typeof options.onGroupReady === "function") {
+      this.onGroupReady = options.onGroupReady;
+    }
+    if (options.matchRoomName) {
+      this.matchRoomName = options.matchRoomName;
+    } else {
+      throw new import_core.ServerError(import_core.ErrorCode.APPLICATION_ERROR, "RankedQueueRoom: 'matchRoomName' option is required.");
+    }
+    (0, import_core.debugMatchMaking)("RankedQueueRoom#onCreate() maxPlayers: %d, maxWaitingCycles: %d, maxTeamSize: %d, allowIncompleteGroups: %d, roomNameToCreate: %s", this.maxPlayers, this.maxWaitingCycles, this.maxTeamSize, this.allowIncompleteGroups, this.matchRoomName);
+    this.setSimulationInterval(() => this.reassignMatchGroups(), this.cycleTickInterval);
+  }
+  onJoin(client, options, auth) {
+    this.addToQueue(client, {
+      rank: options.rank,
+      teamId: options.teamId,
+      options
+    });
+  }
+  addToQueue(client, queueData) {
+    if (queueData.currentCycle === void 0) {
+      queueData.currentCycle = 0;
+    }
+    client.userData = queueData;
+    client.send("clients", 1);
+  }
+  createMatchGroup() {
+    const group = { clients: [], averageRank: 0 };
+    this.groups.push(group);
+    return group;
+  }
+  reassignMatchGroups() {
+    this.groups.length = 0;
+    this.highPriorityGroups.length = 0;
+    const sortedClients = this.clients.filter((client) => {
+      return client.userData && client.userData.group?.ready !== true;
+    }).sort((a, b) => {
+      return a.userData.rank - b.userData.rank;
+    });
+    if (typeof this.maxTeamSize === "number") {
+      this.redistributeTeams(sortedClients);
+    } else {
+      this.redistributeClients(sortedClients);
+    }
+    this.evaluateHighPriorityGroups();
+    this.processGroupsReady();
+  }
+  redistributeTeams(sortedClients) {
+    const teamsByID = {};
+    sortedClients.forEach((client) => {
+      const teamId = client.userData.teamId || DEFAULT_TEAM;
+      if (!teamsByID[teamId]) {
+        teamsByID[teamId] = { teamId, clients: [], averageRank: 0 };
+      }
+      teamsByID[teamId].averageRank += client.userData.rank;
+      teamsByID[teamId].clients.push(client);
+    });
+    let teams = Object.values(teamsByID).map((team) => {
+      team.averageRank /= team.clients.length;
+      return team;
+    }).sort((a, b) => {
+      return a.averageRank - b.averageRank;
+    });
+    do {
+      let currentGroup = this.createMatchGroup();
+      teams = teams.filter((team) => {
+        const totalRank = team.averageRank * team.clients.length;
+        currentGroup = this.redistributeClients(team.clients.splice(0, this.maxTeamSize), currentGroup, totalRank);
+        if (team.clients.length >= this.maxTeamSize) {
+          return true;
+        }
+        team.clients.forEach((client) => client.userData.currentCycle++);
+        return false;
+      });
+    } while (teams.length >= 2);
+  }
+  redistributeClients(sortedClients, currentGroup = this.createMatchGroup(), totalRank = 0) {
+    for (let i = 0, l = sortedClients.length; i < l; i++) {
+      const client = sortedClients[i];
+      const userData = client.userData;
+      const currentCycle = userData.currentCycle++;
+      if (currentGroup.averageRank > 0) {
+        if (!this.compare(userData, currentGroup) && !userData.highPriority) {
+          currentGroup = this.createMatchGroup();
+          totalRank = 0;
+        }
+      }
+      userData.group = currentGroup;
+      currentGroup.clients.push(client);
+      totalRank += userData.rank;
+      currentGroup.averageRank = totalRank / currentGroup.clients.length;
+      if (currentGroup.clients.length === this.maxPlayers) {
+        currentGroup.ready = true;
+        currentGroup = this.createMatchGroup();
+        totalRank = 0;
+        continue;
+      }
+      if (currentCycle >= this.maxWaitingCycles && this.allowIncompleteGroups) {
+        if (this.highPriorityGroups.indexOf(currentGroup) === -1) {
+          this.highPriorityGroups.push(currentGroup);
+        }
+      } else if (this.maxWaitingCyclesForPriority !== void 0 && currentCycle >= this.maxWaitingCyclesForPriority) {
+        userData.highPriority = true;
+      }
+    }
+    return currentGroup;
+  }
+  evaluateHighPriorityGroups() {
+    this.highPriorityGroups.forEach((group) => {
+      group.ready = group.clients.every((c) => {
+        return c.userData?.currentCycle > 1;
+      });
+    });
+  }
+  processGroupsReady() {
+    this.groups.forEach(async (group) => {
+      if (group.ready) {
+        group.confirmed = 0;
+        try {
+          const room = await this.onGroupReady.call(this, group);
+          await import_core.matchMaker.reserveMultipleSeatsFor(
+            room,
+            group.clients.map((client) => ({
+              sessionId: client.sessionId,
+              options: client.userData.options,
+              auth: client.auth
+            }))
+          );
+          group.clients.forEach((client, i) => {
+            client.send("seat", import_core.matchMaker.buildSeatReservation(room, client.sessionId));
+          });
+        } catch (e) {
+          group.clients.forEach((client) => client.leave(1011, e.message));
+        }
+      } else {
+        group.clients.forEach((client) => {
+          const queueClientCount = group.clients.length;
+          if (client.userData.lastQueueClientCount !== queueClientCount) {
+            client.userData.lastQueueClientCount = queueClientCount;
+            client.send("clients", queueClientCount);
+          }
+        });
+      }
+    });
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  RankedQueueRoom
+});

package/build/rooms/RankedQueueRoom.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../src/rooms/RankedQueueRoom.ts"],
+  "sourcesContent": ["import { Room, type Client, matchMaker, type IRoomCache, debugMatchMaking, ServerError, ErrorCode, isDevMode, } from \"@colyseus/core\";\n\nexport interface RankedQueueOptions {\n  /**\n   * number of players on each match\n   */\n  maxPlayers?: number;\n\n  /**\n   * name of the room to create\n   */\n  matchRoomName: string;\n\n  /**\n   * after these cycles, create a match with a bot\n   */\n  maxWaitingCycles?: number;\n\n  /**\n   * after this time, try to fit this client with a not-so-compatible group\n   */\n  maxWaitingCyclesForPriority?: number;\n\n  /**\n   * If set, teams must have the same size to be matched together\n   */\n  maxTeamSize?: number;\n\n  /**\n   * If `allowIncompleteGroups` is true, players inside an unmatched group (that\n   * did not reached `maxPlayers`, and `maxWaitingCycles` has been\n   * reached) will be matched together. Your room should fill the remaining\n   * spots with \"bots\" on this case.\n   */\n  allowIncompleteGroups?: boolean;\n\n  /**\n   * Comparison function for matching clients to groups\n   * Returns true if the client is compatible with the group\n   */\n  compare?: (client: ClientQueueData, matchGroup: MatchGroup) => boolean;\n\n  /**\n   *\n   * When onGroupReady is set, the \"roomNameToCreate\" option is ignored.\n   */\n  onGroupReady?: (this: RankedQueueRoom, group: MatchGroup) => Promise<IRoomCache>;\n}\n\nexport interface MatchGroup {\n  averageRank: number;\n  clients: Array<Client<{ userData: ClientQueueData }>>,\n  ready?: boolean;\n  confirmed?: number;\n}\n\nexport interface MatchTeam {\n  averageRank: number;\n  clients: Array<Client<{ userData: ClientQueueData }>>,\n  teamId: string | symbol;\n}\n\nexport interface ClientQueueData {\n  /**\n   * Rank of the client\n   */\n  rank: number;\n\n  /**\n   * Timestamp of when the client entered the queue\n   */\n  currentCycle?: number;\n\n  /**\n   * Optional: if matching with a team, the team ID\n   */\n  teamId?: string;\n\n  /**\n   * Additional options passed by the client when joining the room\n   */\n  options?: any;\n\n  /**\n   * Match group the client is currently in\n   */\n  group?: MatchGroup;\n\n  /**\n   * Whether the client has confirmed the connection to the room\n   */\n  confirmed?: boolean;\n\n  /**\n   * Whether the client should be prioritized in the queue\n   * (e.g. for players that are waiting for a long time)\n   */\n  highPriority?: boolean;\n\n  /**\n   * The last number of clients in the queue sent to the client\n   */\n  lastQueueClientCount?: number;\n}\n\nconst DEFAULT_TEAM = Symbol(\"$default_team\");\nconst DEFAULT_COMPARE = (client: ClientQueueData, matchGroup: MatchGroup) => {\n  const diff = Math.abs(client.rank - matchGroup.averageRank);\n  const diffRatio = (diff / matchGroup.averageRank);\n  // If diff ratio is too high, create a new match group\n  return (diff < 10 || diffRatio <= 2);\n}\n\nexport class RankedQueueRoom extends Room {\n  maxPlayers = 4;\n  maxTeamSize: number;\n  allowIncompleteGroups: boolean = false;\n\n  maxWaitingCycles = 15;\n  maxWaitingCyclesForPriority?: number = 10;\n\n  /**\n   * Evaluate groups for each client at interval\n   */\n  cycleTickInterval = 1000;\n\n  /**\n   * Groups of players per iteration\n   */\n  groups: MatchGroup[] = [];\n  highPriorityGroups: MatchGroup[] = [];\n\n  matchRoomName: string;\n\n  protected compare = DEFAULT_COMPARE;\n  protected onGroupReady = (group: MatchGroup) => matchMaker.createRoom(this.matchRoomName, {});\n\n  messages = {\n    confirm: (client: Client, _: unknown) => {\n      const queueData = client.userData;\n\n      if (queueData && queueData.group && typeof (queueData.group.confirmed) === \"number\") {\n        queueData.confirmed = true;\n        queueData.group.confirmed++;\n        client.leave();\n      }\n    },\n  }\n\n  onCreate(options: RankedQueueOptions) {\n    if (typeof(options.maxWaitingCycles) === \"number\") {\n      this.maxWaitingCycles = options.maxWaitingCycles;\n    }\n\n    if (typeof(options.maxPlayers) === \"number\") {\n      this.maxPlayers = options.maxPlayers;\n    }\n\n    if (typeof(options.maxTeamSize) === \"number\") {\n      this.maxTeamSize = options.maxTeamSize;\n    }\n\n    if (typeof(options.allowIncompleteGroups) !== \"undefined\") {\n      this.allowIncompleteGroups = options.allowIncompleteGroups;\n    }\n\n    if (typeof(options.compare) === \"function\") {\n      this.compare = options.compare;\n    }\n\n    if (typeof(options.onGroupReady) === \"function\") {\n      this.onGroupReady = options.onGroupReady;\n    }\n\n    if (options.matchRoomName) {\n      this.matchRoomName = options.matchRoomName;\n\n    } else {\n      throw new ServerError(ErrorCode.APPLICATION_ERROR, \"RankedQueueRoom: 'matchRoomName' option is required.\");\n    }\n\n    debugMatchMaking(\"RankedQueueRoom#onCreate() maxPlayers: %d, maxWaitingCycles: %d, maxTeamSize: %d, allowIncompleteGroups: %d, roomNameToCreate: %s\", this.maxPlayers, this.maxWaitingCycles, this.maxTeamSize, this.allowIncompleteGroups, this.matchRoomName);\n\n    /**\n     * Redistribute clients into groups at every interval\n     */\n    this.setSimulationInterval(() => this.reassignMatchGroups(), this.cycleTickInterval);\n  }\n\n  onJoin(client: Client, options: any, auth?: unknown) {\n    this.addToQueue(client, {\n      rank: options.rank,\n      teamId: options.teamId,\n      options,\n    });\n  }\n\n  addToQueue(client: Client, queueData: ClientQueueData) {\n    if (queueData.currentCycle === undefined) {\n      queueData.currentCycle = 0;\n    }\n    client.userData = queueData;\n\n    // FIXME: reassign groups upon joining [?] (without incrementing cycle count)\n    client.send(\"clients\", 1);\n  }\n\n  createMatchGroup() {\n    const group: MatchGroup = { clients: [], averageRank: 0 };\n    this.groups.push(group);\n    return group;\n  }\n\n  reassignMatchGroups() {\n    // Re-set all groups\n    this.groups.length = 0;\n    this.highPriorityGroups.length = 0;\n\n    const sortedClients = (this.clients)\n      .filter((client) => {\n        // Filter out:\n        // - clients that are not in the queue\n        // - clients that are already in a \"ready\" group\n        return (\n          client.userData &&\n          client.userData.group?.ready !== true\n        );\n      })\n      .sort((a, b) => {\n        //\n        // Sort by rank ascending\n        //\n        return a.userData.rank - b.userData.rank;\n      });\n\n    //\n    // The room either distribute by teams or by clients\n    //\n    if (typeof(this.maxTeamSize) === \"number\") {\n      this.redistributeTeams(sortedClients);\n\n    } else {\n      this.redistributeClients(sortedClients);\n    }\n\n    this.evaluateHighPriorityGroups();\n    this.processGroupsReady();\n  }\n\n  redistributeTeams(sortedClients: Client<{ userData: ClientQueueData }>[]) {\n    const teamsByID: { [teamId: string | symbol]: MatchTeam } = {};\n\n    sortedClients.forEach((client) => {\n      const teamId = client.userData.teamId || DEFAULT_TEAM;\n\n      // Create a new team if it doesn't exist\n      if (!teamsByID[teamId]) {\n        teamsByID[teamId] = { teamId: teamId, clients: [], averageRank: 0, };\n      }\n\n      teamsByID[teamId].averageRank += client.userData.rank;\n      teamsByID[teamId].clients.push(client);\n    });\n\n    // Calculate average rank for each team\n    let teams = Object.values(teamsByID).map((team) => {\n      team.averageRank /= team.clients.length;\n      return team;\n    }).sort((a, b) => {\n      // Sort by average rank ascending\n      return a.averageRank - b.averageRank;\n    });\n\n    // Iterate over teams multiple times until all clients are assigned to a group\n    do {\n      let currentGroup: MatchGroup = this.createMatchGroup();\n      teams = teams.filter((team) => {\n        // Remove clients from the team and add them to the current group\n        const totalRank = team.averageRank * team.clients.length;\n\n        // currentGroup.averageRank = (currentGroup.averageRank === undefined)\n        //   ? team.averageRank\n        //   : (currentGroup.averageRank + team.averageRank) / ;\n        currentGroup = this.redistributeClients(team.clients.splice(0, this.maxTeamSize), currentGroup, totalRank);\n\n        if (team.clients.length >= this.maxTeamSize) {\n          // team still has enough clients to form a group\n          return true;\n        }\n\n        // increment cycle count for all clients in the team\n        team.clients.forEach((client) => client.userData.currentCycle++);\n\n        return false;\n      });\n    } while (teams.length >= 2);\n  }\n\n  redistributeClients(\n    sortedClients: Client<{ userData: ClientQueueData }>[],\n    currentGroup: MatchGroup = this.createMatchGroup(),\n    totalRank: number = 0,\n  ) {\n    for (let i = 0, l = sortedClients.length; i < l; i++) {\n      const client = sortedClients[i];\n      const userData = client.userData;\n      const currentCycle = userData.currentCycle++;\n\n      if (currentGroup.averageRank > 0) {\n        if (\n          !this.compare(userData, currentGroup) &&\n          !userData.highPriority\n        ) {\n          currentGroup = this.createMatchGroup();\n          totalRank = 0;\n        }\n      }\n\n      userData.group = currentGroup;\n      currentGroup.clients.push(client);\n\n      totalRank += userData.rank;\n      currentGroup.averageRank = totalRank / currentGroup.clients.length;\n\n      // Enough players in the group, mark it as ready!\n      if (currentGroup.clients.length === this.maxPlayers) {\n        currentGroup.ready = true;\n        currentGroup = this.createMatchGroup();\n        totalRank = 0;\n        continue;\n      }\n\n      if (currentCycle >= this.maxWaitingCycles && this.allowIncompleteGroups) {\n        /**\n         * Match long-waiting clients with bots\n         */\n        if (this.highPriorityGroups.indexOf(currentGroup) === -1) {\n          this.highPriorityGroups.push(currentGroup);\n        }\n\n      } else if (\n        this.maxWaitingCyclesForPriority !== undefined &&\n        currentCycle >= this.maxWaitingCyclesForPriority\n      ) {\n        /**\n         * Force this client to join a group, even if rank is incompatible\n         */\n        userData.highPriority = true;\n      }\n    }\n\n    return currentGroup;\n  }\n\n  evaluateHighPriorityGroups() {\n    /**\n     * Evaluate groups with high priority clients\n     */\n    this.highPriorityGroups.forEach((group) => {\n      group.ready = group.clients.every((c) => {\n        // Give new clients another chance to join a group that is not \"high priority\"\n        return c.userData?.currentCycle > 1;\n        // return c.userData?.currentCycle >= this.maxWaitingCycles;\n      });\n    });\n  }\n\n  processGroupsReady() {\n    this.groups.forEach(async (group) => {\n      if (group.ready) {\n        group.confirmed = 0;\n\n        try {\n          /**\n           * Create room instance in the server.\n           */\n          const room = await this.onGroupReady.call(this, group);\n\n          /**\n           * Reserve a seat for each client in the group.\n           * (If one fails, force all clients to leave, re-queueing is up to the client-side logic)\n           */\n          await matchMaker.reserveMultipleSeatsFor(\n            room,\n            group.clients.map((client) => ({\n              sessionId: client.sessionId,\n              options: client.userData.options,\n              auth: client.auth,\n            })),\n          );\n\n          /**\n           * Send room data for new WebSocket connection!\n           */\n          group.clients.forEach((client, i) => {\n            client.send(\"seat\", matchMaker.buildSeatReservation(room, client.sessionId));\n          });\n\n        } catch (e: any) {\n          //\n          // If creating a room, or reserving a seat failed - fail all clients\n          // Whether the clients retry or not is up to the client-side logic\n          //\n          group.clients.forEach(client => client.leave(1011, e.message));\n        }\n\n      } else {\n        /**\n         * Notify clients within the group on how many players are in the queue\n         */\n        group.clients.forEach((client) => {\n          //\n          // avoid sending the same number of clients to the client if it hasn't changed\n          //\n          const queueClientCount = group.clients.length;\n          if (client.userData.lastQueueClientCount !== queueClientCount) {\n            client.userData.lastQueueClientCount = queueClientCount;\n            client.send(\"clients\", queueClientCount);\n          }\n        });\n      }\n    });\n  }\n\n}"],
+  "mappings": "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",
+  "names": []
+}

package/build/rooms/RankedQueueRoom.mjs

@@ -0,0 +1,201 @@
+// packages/core/src/rooms/RankedQueueRoom.ts
+import { Room, matchMaker, debugMatchMaking, ServerError, ErrorCode } from "@colyseus/core";
+var DEFAULT_TEAM = /* @__PURE__ */ Symbol("$default_team");
+var DEFAULT_COMPARE = (client, matchGroup) => {
+  const diff = Math.abs(client.rank - matchGroup.averageRank);
+  const diffRatio = diff / matchGroup.averageRank;
+  return diff < 10 || diffRatio <= 2;
+};
+var RankedQueueRoom = class extends Room {
+  constructor() {
+    super(...arguments);
+    this.maxPlayers = 4;
+    this.allowIncompleteGroups = false;
+    this.maxWaitingCycles = 15;
+    this.maxWaitingCyclesForPriority = 10;
+    /**
+     * Evaluate groups for each client at interval
+     */
+    this.cycleTickInterval = 1e3;
+    /**
+     * Groups of players per iteration
+     */
+    this.groups = [];
+    this.highPriorityGroups = [];
+    this.compare = DEFAULT_COMPARE;
+    this.onGroupReady = (group) => matchMaker.createRoom(this.matchRoomName, {});
+    this.messages = {
+      confirm: (client, _) => {
+        const queueData = client.userData;
+        if (queueData && queueData.group && typeof queueData.group.confirmed === "number") {
+          queueData.confirmed = true;
+          queueData.group.confirmed++;
+          client.leave();
+        }
+      }
+    };
+  }
+  onCreate(options) {
+    if (typeof options.maxWaitingCycles === "number") {
+      this.maxWaitingCycles = options.maxWaitingCycles;
+    }
+    if (typeof options.maxPlayers === "number") {
+      this.maxPlayers = options.maxPlayers;
+    }
+    if (typeof options.maxTeamSize === "number") {
+      this.maxTeamSize = options.maxTeamSize;
+    }
+    if (typeof options.allowIncompleteGroups !== "undefined") {
+      this.allowIncompleteGroups = options.allowIncompleteGroups;
+    }
+    if (typeof options.compare === "function") {
+      this.compare = options.compare;
+    }
+    if (typeof options.onGroupReady === "function") {
+      this.onGroupReady = options.onGroupReady;
+    }
+    if (options.matchRoomName) {
+      this.matchRoomName = options.matchRoomName;
+    } else {
+      throw new ServerError(ErrorCode.APPLICATION_ERROR, "RankedQueueRoom: 'matchRoomName' option is required.");
+    }
+    debugMatchMaking("RankedQueueRoom#onCreate() maxPlayers: %d, maxWaitingCycles: %d, maxTeamSize: %d, allowIncompleteGroups: %d, roomNameToCreate: %s", this.maxPlayers, this.maxWaitingCycles, this.maxTeamSize, this.allowIncompleteGroups, this.matchRoomName);
+    this.setSimulationInterval(() => this.reassignMatchGroups(), this.cycleTickInterval);
+  }
+  onJoin(client, options, auth) {
+    this.addToQueue(client, {
+      rank: options.rank,
+      teamId: options.teamId,
+      options
+    });
+  }
+  addToQueue(client, queueData) {
+    if (queueData.currentCycle === void 0) {
+      queueData.currentCycle = 0;
+    }
+    client.userData = queueData;
+    client.send("clients", 1);
+  }
+  createMatchGroup() {
+    const group = { clients: [], averageRank: 0 };
+    this.groups.push(group);
+    return group;
+  }
+  reassignMatchGroups() {
+    this.groups.length = 0;
+    this.highPriorityGroups.length = 0;
+    const sortedClients = this.clients.filter((client) => {
+      return client.userData && client.userData.group?.ready !== true;
+    }).sort((a, b) => {
+      return a.userData.rank - b.userData.rank;
+    });
+    if (typeof this.maxTeamSize === "number") {
+      this.redistributeTeams(sortedClients);
+    } else {
+      this.redistributeClients(sortedClients);
+    }
+    this.evaluateHighPriorityGroups();
+    this.processGroupsReady();
+  }
+  redistributeTeams(sortedClients) {
+    const teamsByID = {};
+    sortedClients.forEach((client) => {
+      const teamId = client.userData.teamId || DEFAULT_TEAM;
+      if (!teamsByID[teamId]) {
+        teamsByID[teamId] = { teamId, clients: [], averageRank: 0 };
+      }
+      teamsByID[teamId].averageRank += client.userData.rank;
+      teamsByID[teamId].clients.push(client);
+    });
+    let teams = Object.values(teamsByID).map((team) => {
+      team.averageRank /= team.clients.length;
+      return team;
+    }).sort((a, b) => {
+      return a.averageRank - b.averageRank;
+    });
+    do {
+      let currentGroup = this.createMatchGroup();
+      teams = teams.filter((team) => {
+        const totalRank = team.averageRank * team.clients.length;
+        currentGroup = this.redistributeClients(team.clients.splice(0, this.maxTeamSize), currentGroup, totalRank);
+        if (team.clients.length >= this.maxTeamSize) {
+          return true;
+        }
+        team.clients.forEach((client) => client.userData.currentCycle++);
+        return false;
+      });
+    } while (teams.length >= 2);
+  }
+  redistributeClients(sortedClients, currentGroup = this.createMatchGroup(), totalRank = 0) {
+    for (let i = 0, l = sortedClients.length; i < l; i++) {
+      const client = sortedClients[i];
+      const userData = client.userData;
+      const currentCycle = userData.currentCycle++;
+      if (currentGroup.averageRank > 0) {
+        if (!this.compare(userData, currentGroup) && !userData.highPriority) {
+          currentGroup = this.createMatchGroup();
+          totalRank = 0;
+        }
+      }
+      userData.group = currentGroup;
+      currentGroup.clients.push(client);
+      totalRank += userData.rank;
+      currentGroup.averageRank = totalRank / currentGroup.clients.length;
+      if (currentGroup.clients.length === this.maxPlayers) {
+        currentGroup.ready = true;
+        currentGroup = this.createMatchGroup();
+        totalRank = 0;
+        continue;
+      }
+      if (currentCycle >= this.maxWaitingCycles && this.allowIncompleteGroups) {
+        if (this.highPriorityGroups.indexOf(currentGroup) === -1) {
+          this.highPriorityGroups.push(currentGroup);
+        }
+      } else if (this.maxWaitingCyclesForPriority !== void 0 && currentCycle >= this.maxWaitingCyclesForPriority) {
+        userData.highPriority = true;
+      }
+    }
+    return currentGroup;
+  }
+  evaluateHighPriorityGroups() {
+    this.highPriorityGroups.forEach((group) => {
+      group.ready = group.clients.every((c) => {
+        return c.userData?.currentCycle > 1;
+      });
+    });
+  }
+  processGroupsReady() {
+    this.groups.forEach(async (group) => {
+      if (group.ready) {
+        group.confirmed = 0;
+        try {
+          const room = await this.onGroupReady.call(this, group);
+          await matchMaker.reserveMultipleSeatsFor(
+            room,
+            group.clients.map((client) => ({
+              sessionId: client.sessionId,
+              options: client.userData.options,
+              auth: client.auth
+            }))
+          );
+          group.clients.forEach((client, i) => {
+            client.send("seat", matchMaker.buildSeatReservation(room, client.sessionId));
+          });
+        } catch (e) {
+          group.clients.forEach((client) => client.leave(1011, e.message));
+        }
+      } else {
+        group.clients.forEach((client) => {
+          const queueClientCount = group.clients.length;
+          if (client.userData.lastQueueClientCount !== queueClientCount) {
+            client.userData.lastQueueClientCount = queueClientCount;
+            client.send("clients", queueClientCount);
+          }
+        });
+      }
+    });
+  }
+};
+export {
+  RankedQueueRoom
+};

package/build/rooms/RankedQueueRoom.mjs.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../src/rooms/RankedQueueRoom.ts"],
+  "sourcesContent": ["import { Room, type Client, matchMaker, type IRoomCache, debugMatchMaking, ServerError, ErrorCode, isDevMode, } from \"@colyseus/core\";\n\nexport interface RankedQueueOptions {\n  /**\n   * number of players on each match\n   */\n  maxPlayers?: number;\n\n  /**\n   * name of the room to create\n   */\n  matchRoomName: string;\n\n  /**\n   * after these cycles, create a match with a bot\n   */\n  maxWaitingCycles?: number;\n\n  /**\n   * after this time, try to fit this client with a not-so-compatible group\n   */\n  maxWaitingCyclesForPriority?: number;\n\n  /**\n   * If set, teams must have the same size to be matched together\n   */\n  maxTeamSize?: number;\n\n  /**\n   * If `allowIncompleteGroups` is true, players inside an unmatched group (that\n   * did not reached `maxPlayers`, and `maxWaitingCycles` has been\n   * reached) will be matched together. Your room should fill the remaining\n   * spots with \"bots\" on this case.\n   */\n  allowIncompleteGroups?: boolean;\n\n  /**\n   * Comparison function for matching clients to groups\n   * Returns true if the client is compatible with the group\n   */\n  compare?: (client: ClientQueueData, matchGroup: MatchGroup) => boolean;\n\n  /**\n   *\n   * When onGroupReady is set, the \"roomNameToCreate\" option is ignored.\n   */\n  onGroupReady?: (this: RankedQueueRoom, group: MatchGroup) => Promise<IRoomCache>;\n}\n\nexport interface MatchGroup {\n  averageRank: number;\n  clients: Array<Client<{ userData: ClientQueueData }>>,\n  ready?: boolean;\n  confirmed?: number;\n}\n\nexport interface MatchTeam {\n  averageRank: number;\n  clients: Array<Client<{ userData: ClientQueueData }>>,\n  teamId: string | symbol;\n}\n\nexport interface ClientQueueData {\n  /**\n   * Rank of the client\n   */\n  rank: number;\n\n  /**\n   * Timestamp of when the client entered the queue\n   */\n  currentCycle?: number;\n\n  /**\n   * Optional: if matching with a team, the team ID\n   */\n  teamId?: string;\n\n  /**\n   * Additional options passed by the client when joining the room\n   */\n  options?: any;\n\n  /**\n   * Match group the client is currently in\n   */\n  group?: MatchGroup;\n\n  /**\n   * Whether the client has confirmed the connection to the room\n   */\n  confirmed?: boolean;\n\n  /**\n   * Whether the client should be prioritized in the queue\n   * (e.g. for players that are waiting for a long time)\n   */\n  highPriority?: boolean;\n\n  /**\n   * The last number of clients in the queue sent to the client\n   */\n  lastQueueClientCount?: number;\n}\n\nconst DEFAULT_TEAM = Symbol(\"$default_team\");\nconst DEFAULT_COMPARE = (client: ClientQueueData, matchGroup: MatchGroup) => {\n  const diff = Math.abs(client.rank - matchGroup.averageRank);\n  const diffRatio = (diff / matchGroup.averageRank);\n  // If diff ratio is too high, create a new match group\n  return (diff < 10 || diffRatio <= 2);\n}\n\nexport class RankedQueueRoom extends Room {\n  maxPlayers = 4;\n  maxTeamSize: number;\n  allowIncompleteGroups: boolean = false;\n\n  maxWaitingCycles = 15;\n  maxWaitingCyclesForPriority?: number = 10;\n\n  /**\n   * Evaluate groups for each client at interval\n   */\n  cycleTickInterval = 1000;\n\n  /**\n   * Groups of players per iteration\n   */\n  groups: MatchGroup[] = [];\n  highPriorityGroups: MatchGroup[] = [];\n\n  matchRoomName: string;\n\n  protected compare = DEFAULT_COMPARE;\n  protected onGroupReady = (group: MatchGroup) => matchMaker.createRoom(this.matchRoomName, {});\n\n  messages = {\n    confirm: (client: Client, _: unknown) => {\n      const queueData = client.userData;\n\n      if (queueData && queueData.group && typeof (queueData.group.confirmed) === \"number\") {\n        queueData.confirmed = true;\n        queueData.group.confirmed++;\n        client.leave();\n      }\n    },\n  }\n\n  onCreate(options: RankedQueueOptions) {\n    if (typeof(options.maxWaitingCycles) === \"number\") {\n      this.maxWaitingCycles = options.maxWaitingCycles;\n    }\n\n    if (typeof(options.maxPlayers) === \"number\") {\n      this.maxPlayers = options.maxPlayers;\n    }\n\n    if (typeof(options.maxTeamSize) === \"number\") {\n      this.maxTeamSize = options.maxTeamSize;\n    }\n\n    if (typeof(options.allowIncompleteGroups) !== \"undefined\") {\n      this.allowIncompleteGroups = options.allowIncompleteGroups;\n    }\n\n    if (typeof(options.compare) === \"function\") {\n      this.compare = options.compare;\n    }\n\n    if (typeof(options.onGroupReady) === \"function\") {\n      this.onGroupReady = options.onGroupReady;\n    }\n\n    if (options.matchRoomName) {\n      this.matchRoomName = options.matchRoomName;\n\n    } else {\n      throw new ServerError(ErrorCode.APPLICATION_ERROR, \"RankedQueueRoom: 'matchRoomName' option is required.\");\n    }\n\n    debugMatchMaking(\"RankedQueueRoom#onCreate() maxPlayers: %d, maxWaitingCycles: %d, maxTeamSize: %d, allowIncompleteGroups: %d, roomNameToCreate: %s\", this.maxPlayers, this.maxWaitingCycles, this.maxTeamSize, this.allowIncompleteGroups, this.matchRoomName);\n\n    /**\n     * Redistribute clients into groups at every interval\n     */\n    this.setSimulationInterval(() => this.reassignMatchGroups(), this.cycleTickInterval);\n  }\n\n  onJoin(client: Client, options: any, auth?: unknown) {\n    this.addToQueue(client, {\n      rank: options.rank,\n      teamId: options.teamId,\n      options,\n    });\n  }\n\n  addToQueue(client: Client, queueData: ClientQueueData) {\n    if (queueData.currentCycle === undefined) {\n      queueData.currentCycle = 0;\n    }\n    client.userData = queueData;\n\n    // FIXME: reassign groups upon joining [?] (without incrementing cycle count)\n    client.send(\"clients\", 1);\n  }\n\n  createMatchGroup() {\n    const group: MatchGroup = { clients: [], averageRank: 0 };\n    this.groups.push(group);\n    return group;\n  }\n\n  reassignMatchGroups() {\n    // Re-set all groups\n    this.groups.length = 0;\n    this.highPriorityGroups.length = 0;\n\n    const sortedClients = (this.clients)\n      .filter((client) => {\n        // Filter out:\n        // - clients that are not in the queue\n        // - clients that are already in a \"ready\" group\n        return (\n          client.userData &&\n          client.userData.group?.ready !== true\n        );\n      })\n      .sort((a, b) => {\n        //\n        // Sort by rank ascending\n        //\n        return a.userData.rank - b.userData.rank;\n      });\n\n    //\n    // The room either distribute by teams or by clients\n    //\n    if (typeof(this.maxTeamSize) === \"number\") {\n      this.redistributeTeams(sortedClients);\n\n    } else {\n      this.redistributeClients(sortedClients);\n    }\n\n    this.evaluateHighPriorityGroups();\n    this.processGroupsReady();\n  }\n\n  redistributeTeams(sortedClients: Client<{ userData: ClientQueueData }>[]) {\n    const teamsByID: { [teamId: string | symbol]: MatchTeam } = {};\n\n    sortedClients.forEach((client) => {\n      const teamId = client.userData.teamId || DEFAULT_TEAM;\n\n      // Create a new team if it doesn't exist\n      if (!teamsByID[teamId]) {\n        teamsByID[teamId] = { teamId: teamId, clients: [], averageRank: 0, };\n      }\n\n      teamsByID[teamId].averageRank += client.userData.rank;\n      teamsByID[teamId].clients.push(client);\n    });\n\n    // Calculate average rank for each team\n    let teams = Object.values(teamsByID).map((team) => {\n      team.averageRank /= team.clients.length;\n      return team;\n    }).sort((a, b) => {\n      // Sort by average rank ascending\n      return a.averageRank - b.averageRank;\n    });\n\n    // Iterate over teams multiple times until all clients are assigned to a group\n    do {\n      let currentGroup: MatchGroup = this.createMatchGroup();\n      teams = teams.filter((team) => {\n        // Remove clients from the team and add them to the current group\n        const totalRank = team.averageRank * team.clients.length;\n\n        // currentGroup.averageRank = (currentGroup.averageRank === undefined)\n        //   ? team.averageRank\n        //   : (currentGroup.averageRank + team.averageRank) / ;\n        currentGroup = this.redistributeClients(team.clients.splice(0, this.maxTeamSize), currentGroup, totalRank);\n\n        if (team.clients.length >= this.maxTeamSize) {\n          // team still has enough clients to form a group\n          return true;\n        }\n\n        // increment cycle count for all clients in the team\n        team.clients.forEach((client) => client.userData.currentCycle++);\n\n        return false;\n      });\n    } while (teams.length >= 2);\n  }\n\n  redistributeClients(\n    sortedClients: Client<{ userData: ClientQueueData }>[],\n    currentGroup: MatchGroup = this.createMatchGroup(),\n    totalRank: number = 0,\n  ) {\n    for (let i = 0, l = sortedClients.length; i < l; i++) {\n      const client = sortedClients[i];\n      const userData = client.userData;\n      const currentCycle = userData.currentCycle++;\n\n      if (currentGroup.averageRank > 0) {\n        if (\n          !this.compare(userData, currentGroup) &&\n          !userData.highPriority\n        ) {\n          currentGroup = this.createMatchGroup();\n          totalRank = 0;\n        }\n      }\n\n      userData.group = currentGroup;\n      currentGroup.clients.push(client);\n\n      totalRank += userData.rank;\n      currentGroup.averageRank = totalRank / currentGroup.clients.length;\n\n      // Enough players in the group, mark it as ready!\n      if (currentGroup.clients.length === this.maxPlayers) {\n        currentGroup.ready = true;\n        currentGroup = this.createMatchGroup();\n        totalRank = 0;\n        continue;\n      }\n\n      if (currentCycle >= this.maxWaitingCycles && this.allowIncompleteGroups) {\n        /**\n         * Match long-waiting clients with bots\n         */\n        if (this.highPriorityGroups.indexOf(currentGroup) === -1) {\n          this.highPriorityGroups.push(currentGroup);\n        }\n\n      } else if (\n        this.maxWaitingCyclesForPriority !== undefined &&\n        currentCycle >= this.maxWaitingCyclesForPriority\n      ) {\n        /**\n         * Force this client to join a group, even if rank is incompatible\n         */\n        userData.highPriority = true;\n      }\n    }\n\n    return currentGroup;\n  }\n\n  evaluateHighPriorityGroups() {\n    /**\n     * Evaluate groups with high priority clients\n     */\n    this.highPriorityGroups.forEach((group) => {\n      group.ready = group.clients.every((c) => {\n        // Give new clients another chance to join a group that is not \"high priority\"\n        return c.userData?.currentCycle > 1;\n        // return c.userData?.currentCycle >= this.maxWaitingCycles;\n      });\n    });\n  }\n\n  processGroupsReady() {\n    this.groups.forEach(async (group) => {\n      if (group.ready) {\n        group.confirmed = 0;\n\n        try {\n          /**\n           * Create room instance in the server.\n           */\n          const room = await this.onGroupReady.call(this, group);\n\n          /**\n           * Reserve a seat for each client in the group.\n           * (If one fails, force all clients to leave, re-queueing is up to the client-side logic)\n           */\n          await matchMaker.reserveMultipleSeatsFor(\n            room,\n            group.clients.map((client) => ({\n              sessionId: client.sessionId,\n              options: client.userData.options,\n              auth: client.auth,\n            })),\n          );\n\n          /**\n           * Send room data for new WebSocket connection!\n           */\n          group.clients.forEach((client, i) => {\n            client.send(\"seat\", matchMaker.buildSeatReservation(room, client.sessionId));\n          });\n\n        } catch (e: any) {\n          //\n          // If creating a room, or reserving a seat failed - fail all clients\n          // Whether the clients retry or not is up to the client-side logic\n          //\n          group.clients.forEach(client => client.leave(1011, e.message));\n        }\n\n      } else {\n        /**\n         * Notify clients within the group on how many players are in the queue\n         */\n        group.clients.forEach((client) => {\n          //\n          // avoid sending the same number of clients to the client if it hasn't changed\n          //\n          const queueClientCount = group.clients.length;\n          if (client.userData.lastQueueClientCount !== queueClientCount) {\n            client.userData.lastQueueClientCount = queueClientCount;\n            client.send(\"clients\", queueClientCount);\n          }\n        });\n      }\n    });\n  }\n\n}"],
+  "mappings": "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",
+  "names": []
+}

package/build/rooms/RelayRoom.js

@@ -1,3 +1,4 @@
+"use strict";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
@@ -21,7 +22,8 @@ __export(RelayRoom_exports, {
 });
 module.exports = __toCommonJS(RelayRoom_exports);
 var import_schema = require("@colyseus/schema");
-var import_Room = require("../Room.js");
+var import_Room = require("../Room.ts");
+var import_Protocol = require("../Protocol.ts");
 class Player extends import_schema.Schema {
 }
 (0, import_schema.defineTypes)(Player, {
@@ -32,7 +34,6 @@ class Player extends import_schema.Schema {
 class State extends import_schema.Schema {
   constructor() {
     super(...arguments);
-    // tslint:disable-line
     this.players = new import_schema.MapSchema();
   }
 }
@@ -42,11 +43,10 @@ class State extends import_schema.Schema {
 class RelayRoom extends import_Room.Room {
   constructor() {
     super(...arguments);
-    // tslint:disable-line
+    this.state = new State();
     this.allowReconnectionTime = 0;
   }
   onCreate(options) {
-    this.setState(new State());
     if (options.maxClients) {
       this.maxClients = options.maxClients;
     }
@@ -69,12 +69,12 @@ class RelayRoom extends import_Room.Room {
     }
     this.state.players.set(client.sessionId, player);
   }
-  async onLeave(client, consented) {
+  async onLeave(client, code) {
     if (this.allowReconnectionTime > 0) {
       const player = this.state.players.get(client.sessionId);
       player.connected = false;
       try {
-        if (consented) {
+        if (code === import_Protocol.CloseCode.CONSENTED) {
           throw new Error("consented leave");
         }
         await this.allowReconnection(client, this.allowReconnectionTime);

package/build/rooms/RelayRoom.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/rooms/RelayRoom.ts"],
-  "sourcesContent": ["import { defineTypes, MapSchema, Schema } from '@colyseus/schema';\n\nimport { Room } from '../Room.js';\nimport { Client } from '../Transport.js';\n\nclass Player extends Schema { // tslint:disable-line\n  public connected: boolean;\n  public name: string;\n  public sessionId: string;\n}\ndefineTypes(Player, {\n  connected: 'boolean',\n  name: 'string',\n  sessionId: 'string',\n});\n\nclass State extends Schema { // tslint:disable-line\n  public players = new MapSchema<Player>();\n}\ndefineTypes(State, {\n  players: { map: Player },\n});\n\n/**\n * client.joinOrCreate(\"relayroom\", {\n *   maxClients: 10,\n *   allowReconnectionTime: 20\n * });\n */\n\nexport class RelayRoom extends Room<State> { // tslint:disable-line\n  public allowReconnectionTime: number = 0;\n\n  public onCreate(options: Partial<{\n    maxClients: number,\n    allowReconnectionTime: number,\n    metadata: any,\n  }>) {\n    this.setState(new State());\n\n    if (options.maxClients) {\n      this.maxClients = options.maxClients;\n    }\n\n    if (options.allowReconnectionTime) {\n      this.allowReconnectionTime = Math.min(options.allowReconnectionTime, 40);\n    }\n\n    if (options.metadata) {\n      this.setMetadata(options.metadata);\n    }\n\n    this.onMessage('*', (client: Client, type: string, message: any) => {\n      this.broadcast(type, [client.sessionId, message], { except: client });\n    });\n  }\n\n  public onJoin(client: Client, options: any = {}) {\n    const player = new Player();\n\n    player.connected = true;\n    player.sessionId = client.sessionId;\n\n    if (options.name) {\n      player.name = options.name;\n    }\n\n    this.state.players.set(client.sessionId, player);\n  }\n\n  public async onLeave(client: Client, consented: boolean) {\n    if (this.allowReconnectionTime > 0) {\n      const player = this.state.players.get(client.sessionId);\n      player.connected = false;\n\n      try {\n        if (consented) {\n          throw new Error('consented leave');\n        }\n\n        await this.allowReconnection(client, this.allowReconnectionTime);\n        player.connected = true;\n\n      } catch (e) {\n        this.state.players.delete(client.sessionId);\n      }\n    }\n  }\n\n}\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAA+C;AAE/C,kBAAqB;AAGrB,MAAM,eAAe,qBAAO;AAI5B;AAAA,IACA,2BAAY,QAAQ;AAAA,EAClB,WAAW;AAAA,EACX,MAAM;AAAA,EACN,WAAW;AACb,CAAC;AAED,MAAM,cAAc,qBAAO;AAAA,EAA3B;AAAA;AACE;AAAA,SAAO,UAAU,IAAI,wBAAkB;AAAA;AACzC;AAAA,IACA,2BAAY,OAAO;AAAA,EACjB,SAAS,EAAE,KAAK,OAAO;AACzB,CAAC;AASM,MAAM,kBAAkB,iBAAY;AAAA,EAApC;AAAA;AACL;AAAA,SAAO,wBAAgC;AAAA;AAAA,EAEhC,SAAS,SAIZ;AACF,SAAK,SAAS,IAAI,MAAM,CAAC;AAEzB,QAAI,QAAQ,YAAY;AACtB,WAAK,aAAa,QAAQ;AAAA,IAC5B;AAEA,QAAI,QAAQ,uBAAuB;AACjC,WAAK,wBAAwB,KAAK,IAAI,QAAQ,uBAAuB,EAAE;AAAA,IACzE;AAEA,QAAI,QAAQ,UAAU;AACpB,WAAK,YAAY,QAAQ,QAAQ;AAAA,IACnC;AAEA,SAAK,UAAU,KAAK,CAAC,QAAgB,MAAc,YAAiB;AAClE,WAAK,UAAU,MAAM,CAAC,OAAO,WAAW,OAAO,GAAG,EAAE,QAAQ,OAAO,CAAC;AAAA,IACtE,CAAC;AAAA,EACH;AAAA,EAEO,OAAO,QAAgB,UAAe,CAAC,GAAG;AAC/C,UAAM,SAAS,IAAI,OAAO;AAE1B,WAAO,YAAY;AACnB,WAAO,YAAY,OAAO;AAE1B,QAAI,QAAQ,MAAM;AAChB,aAAO,OAAO,QAAQ;AAAA,IACxB;AAEA,SAAK,MAAM,QAAQ,IAAI,OAAO,WAAW,MAAM;AAAA,EACjD;AAAA,EAEA,MAAa,QAAQ,QAAgB,WAAoB;AACvD,QAAI,KAAK,wBAAwB,GAAG;AAClC,YAAM,SAAS,KAAK,MAAM,QAAQ,IAAI,OAAO,SAAS;AACtD,aAAO,YAAY;AAEnB,UAAI;AACF,YAAI,WAAW;AACb,gBAAM,IAAI,MAAM,iBAAiB;AAAA,QACnC;AAEA,cAAM,KAAK,kBAAkB,QAAQ,KAAK,qBAAqB;AAC/D,eAAO,YAAY;AAAA,MAErB,SAAS,GAAG;AACV,aAAK,MAAM,QAAQ,OAAO,OAAO,SAAS;AAAA,MAC5C;AAAA,IACF;AAAA,EACF;AAEF;",
+  "sourcesContent": ["import { defineTypes, MapSchema, Schema } from '@colyseus/schema';\n\nimport { Room } from '../Room.ts';\nimport type { Client } from '../Transport.ts';\nimport { CloseCode } from '../Protocol.ts';\n\nclass Player extends Schema {\n  public connected: boolean;\n  public name: string;\n  public sessionId: string;\n}\ndefineTypes(Player, {\n  connected: 'boolean',\n  name: 'string',\n  sessionId: 'string',\n});\n\nclass State extends Schema {\n  public players = new MapSchema<Player>();\n}\ndefineTypes(State, {\n  players: { map: Player },\n});\n\n/**\n * client.joinOrCreate(\"relayroom\", {\n *   maxClients: 10,\n *   allowReconnectionTime: 20\n * });\n */\n\nexport class RelayRoom extends Room {\n  public state = new State();\n  public allowReconnectionTime: number = 0;\n\n  public onCreate(options: Partial<{\n    maxClients: number,\n    allowReconnectionTime: number,\n    metadata: any,\n  }>) {\n    if (options.maxClients) {\n      this.maxClients = options.maxClients;\n    }\n\n    if (options.allowReconnectionTime) {\n      this.allowReconnectionTime = Math.min(options.allowReconnectionTime, 40);\n    }\n\n    if (options.metadata) {\n      this.setMetadata(options.metadata);\n    }\n\n    this.onMessage('*', (client: Client, type: string | number, message: any) => {\n      this.broadcast(type, [client.sessionId, message], { except: client });\n    });\n  }\n\n  public onJoin(client: Client, options: any = {}) {\n    const player = new Player();\n\n    player.connected = true;\n    player.sessionId = client.sessionId;\n\n    if (options.name) {\n      player.name = options.name;\n    }\n\n    this.state.players.set(client.sessionId, player);\n  }\n\n  public async onLeave(client: Client, code: number) {\n    if (this.allowReconnectionTime > 0) {\n      const player = this.state.players.get(client.sessionId);\n      player.connected = false;\n\n      try {\n        if (code === CloseCode.CONSENTED) {\n          throw new Error('consented leave');\n        }\n\n        await this.allowReconnection(client, this.allowReconnectionTime);\n        player.connected = true;\n\n      } catch (e) {\n        this.state.players.delete(client.sessionId);\n      }\n    }\n  }\n\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAA+C;AAE/C,kBAAqB;AAErB,sBAA0B;AAE1B,MAAM,eAAe,qBAAO;AAI5B;AAAA,IACA,2BAAY,QAAQ;AAAA,EAClB,WAAW;AAAA,EACX,MAAM;AAAA,EACN,WAAW;AACb,CAAC;AAED,MAAM,cAAc,qBAAO;AAAA,EAA3B;AAAA;AACE,SAAO,UAAU,IAAI,wBAAkB;AAAA;AACzC;AAAA,IACA,2BAAY,OAAO;AAAA,EACjB,SAAS,EAAE,KAAK,OAAO;AACzB,CAAC;AASM,MAAM,kBAAkB,iBAAK;AAAA,EAA7B;AAAA;AACL,SAAO,QAAQ,IAAI,MAAM;AACzB,SAAO,wBAAgC;AAAA;AAAA,EAEhC,SAAS,SAIZ;AACF,QAAI,QAAQ,YAAY;AACtB,WAAK,aAAa,QAAQ;AAAA,IAC5B;AAEA,QAAI,QAAQ,uBAAuB;AACjC,WAAK,wBAAwB,KAAK,IAAI,QAAQ,uBAAuB,EAAE;AAAA,IACzE;AAEA,QAAI,QAAQ,UAAU;AACpB,WAAK,YAAY,QAAQ,QAAQ;AAAA,IACnC;AAEA,SAAK,UAAU,KAAK,CAAC,QAAgB,MAAuB,YAAiB;AAC3E,WAAK,UAAU,MAAM,CAAC,OAAO,WAAW,OAAO,GAAG,EAAE,QAAQ,OAAO,CAAC;AAAA,IACtE,CAAC;AAAA,EACH;AAAA,EAEO,OAAO,QAAgB,UAAe,CAAC,GAAG;AAC/C,UAAM,SAAS,IAAI,OAAO;AAE1B,WAAO,YAAY;AACnB,WAAO,YAAY,OAAO;AAE1B,QAAI,QAAQ,MAAM;AAChB,aAAO,OAAO,QAAQ;AAAA,IACxB;AAEA,SAAK,MAAM,QAAQ,IAAI,OAAO,WAAW,MAAM;AAAA,EACjD;AAAA,EAEA,MAAa,QAAQ,QAAgB,MAAc;AACjD,QAAI,KAAK,wBAAwB,GAAG;AAClC,YAAM,SAAS,KAAK,MAAM,QAAQ,IAAI,OAAO,SAAS;AACtD,aAAO,YAAY;AAEnB,UAAI;AACF,YAAI,SAAS,0BAAU,WAAW;AAChC,gBAAM,IAAI,MAAM,iBAAiB;AAAA,QACnC;AAEA,cAAM,KAAK,kBAAkB,QAAQ,KAAK,qBAAqB;AAC/D,eAAO,YAAY;AAAA,MAErB,SAAS,GAAG;AACV,aAAK,MAAM,QAAQ,OAAO,OAAO,SAAS;AAAA,MAC5C;AAAA,IACF;AAAA,EACF;AAEF;",
   "names": []
 }

package/build/rooms/RelayRoom.mjs

@@ -1,6 +1,7 @@
 // packages/core/src/rooms/RelayRoom.ts
 import { defineTypes, MapSchema, Schema } from "@colyseus/schema";
 import { Room } from "../Room.mjs";
+import { CloseCode } from "../Protocol.mjs";
 var Player = class extends Schema {
 };
 defineTypes(Player, {
@@ -11,7 +12,6 @@ defineTypes(Player, {
 var State = class extends Schema {
   constructor() {
     super(...arguments);
-    // tslint:disable-line
     this.players = new MapSchema();
   }
 };
@@ -21,11 +21,10 @@ defineTypes(State, {
 var RelayRoom = class extends Room {
   constructor() {
     super(...arguments);
-    // tslint:disable-line
+    this.state = new State();
     this.allowReconnectionTime = 0;
   }
   onCreate(options) {
-    this.setState(new State());
     if (options.maxClients) {
       this.maxClients = options.maxClients;
     }
@@ -48,12 +47,12 @@ var RelayRoom = class extends Room {
     }
     this.state.players.set(client.sessionId, player);
   }
-  async onLeave(client, consented) {
+  async onLeave(client, code) {
     if (this.allowReconnectionTime > 0) {
       const player = this.state.players.get(client.sessionId);
       player.connected = false;
       try {
-        if (consented) {
+        if (code === CloseCode.CONSENTED) {
           throw new Error("consented leave");
         }
         await this.allowReconnection(client, this.allowReconnectionTime);

package/build/rooms/RelayRoom.mjs.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/rooms/RelayRoom.ts"],
-  "sourcesContent": ["import { defineTypes, MapSchema, Schema } from '@colyseus/schema';\n\nimport { Room } from '../Room.js';\nimport { Client } from '../Transport.js';\n\nclass Player extends Schema { // tslint:disable-line\n  public connected: boolean;\n  public name: string;\n  public sessionId: string;\n}\ndefineTypes(Player, {\n  connected: 'boolean',\n  name: 'string',\n  sessionId: 'string',\n});\n\nclass State extends Schema { // tslint:disable-line\n  public players = new MapSchema<Player>();\n}\ndefineTypes(State, {\n  players: { map: Player },\n});\n\n/**\n * client.joinOrCreate(\"relayroom\", {\n *   maxClients: 10,\n *   allowReconnectionTime: 20\n * });\n */\n\nexport class RelayRoom extends Room<State> { // tslint:disable-line\n  public allowReconnectionTime: number = 0;\n\n  public onCreate(options: Partial<{\n    maxClients: number,\n    allowReconnectionTime: number,\n    metadata: any,\n  }>) {\n    this.setState(new State());\n\n    if (options.maxClients) {\n      this.maxClients = options.maxClients;\n    }\n\n    if (options.allowReconnectionTime) {\n      this.allowReconnectionTime = Math.min(options.allowReconnectionTime, 40);\n    }\n\n    if (options.metadata) {\n      this.setMetadata(options.metadata);\n    }\n\n    this.onMessage('*', (client: Client, type: string, message: any) => {\n      this.broadcast(type, [client.sessionId, message], { except: client });\n    });\n  }\n\n  public onJoin(client: Client, options: any = {}) {\n    const player = new Player();\n\n    player.connected = true;\n    player.sessionId = client.sessionId;\n\n    if (options.name) {\n      player.name = options.name;\n    }\n\n    this.state.players.set(client.sessionId, player);\n  }\n\n  public async onLeave(client: Client, consented: boolean) {\n    if (this.allowReconnectionTime > 0) {\n      const player = this.state.players.get(client.sessionId);\n      player.connected = false;\n\n      try {\n        if (consented) {\n          throw new Error('consented leave');\n        }\n\n        await this.allowReconnection(client, this.allowReconnectionTime);\n        player.connected = true;\n\n      } catch (e) {\n        this.state.players.delete(client.sessionId);\n      }\n    }\n  }\n\n}\n"],
-  "mappings": ";AAAA,SAAS,aAAa,WAAW,cAAc;AAE/C,SAAS,YAAY;AAGrB,IAAM,SAAN,cAAqB,OAAO;AAI5B;AACA,YAAY,QAAQ;AAAA,EAClB,WAAW;AAAA,EACX,MAAM;AAAA,EACN,WAAW;AACb,CAAC;AAED,IAAM,QAAN,cAAoB,OAAO;AAAA,EAA3B;AAAA;AACE;AAAA,SAAO,UAAU,IAAI,UAAkB;AAAA;AACzC;AACA,YAAY,OAAO;AAAA,EACjB,SAAS,EAAE,KAAK,OAAO;AACzB,CAAC;AASM,IAAM,YAAN,cAAwB,KAAY;AAAA,EAApC;AAAA;AACL;AAAA,SAAO,wBAAgC;AAAA;AAAA,EAEhC,SAAS,SAIZ;AACF,SAAK,SAAS,IAAI,MAAM,CAAC;AAEzB,QAAI,QAAQ,YAAY;AACtB,WAAK,aAAa,QAAQ;AAAA,IAC5B;AAEA,QAAI,QAAQ,uBAAuB;AACjC,WAAK,wBAAwB,KAAK,IAAI,QAAQ,uBAAuB,EAAE;AAAA,IACzE;AAEA,QAAI,QAAQ,UAAU;AACpB,WAAK,YAAY,QAAQ,QAAQ;AAAA,IACnC;AAEA,SAAK,UAAU,KAAK,CAAC,QAAgB,MAAc,YAAiB;AAClE,WAAK,UAAU,MAAM,CAAC,OAAO,WAAW,OAAO,GAAG,EAAE,QAAQ,OAAO,CAAC;AAAA,IACtE,CAAC;AAAA,EACH;AAAA,EAEO,OAAO,QAAgB,UAAe,CAAC,GAAG;AAC/C,UAAM,SAAS,IAAI,OAAO;AAE1B,WAAO,YAAY;AACnB,WAAO,YAAY,OAAO;AAE1B,QAAI,QAAQ,MAAM;AAChB,aAAO,OAAO,QAAQ;AAAA,IACxB;AAEA,SAAK,MAAM,QAAQ,IAAI,OAAO,WAAW,MAAM;AAAA,EACjD;AAAA,EAEA,MAAa,QAAQ,QAAgB,WAAoB;AACvD,QAAI,KAAK,wBAAwB,GAAG;AAClC,YAAM,SAAS,KAAK,MAAM,QAAQ,IAAI,OAAO,SAAS;AACtD,aAAO,YAAY;AAEnB,UAAI;AACF,YAAI,WAAW;AACb,gBAAM,IAAI,MAAM,iBAAiB;AAAA,QACnC;AAEA,cAAM,KAAK,kBAAkB,QAAQ,KAAK,qBAAqB;AAC/D,eAAO,YAAY;AAAA,MAErB,SAAS,GAAG;AACV,aAAK,MAAM,QAAQ,OAAO,OAAO,SAAS;AAAA,MAC5C;AAAA,IACF;AAAA,EACF;AAEF;",
+  "sourcesContent": ["import { defineTypes, MapSchema, Schema } from '@colyseus/schema';\n\nimport { Room } from '../Room.ts';\nimport type { Client } from '../Transport.ts';\nimport { CloseCode } from '../Protocol.ts';\n\nclass Player extends Schema {\n  public connected: boolean;\n  public name: string;\n  public sessionId: string;\n}\ndefineTypes(Player, {\n  connected: 'boolean',\n  name: 'string',\n  sessionId: 'string',\n});\n\nclass State extends Schema {\n  public players = new MapSchema<Player>();\n}\ndefineTypes(State, {\n  players: { map: Player },\n});\n\n/**\n * client.joinOrCreate(\"relayroom\", {\n *   maxClients: 10,\n *   allowReconnectionTime: 20\n * });\n */\n\nexport class RelayRoom extends Room {\n  public state = new State();\n  public allowReconnectionTime: number = 0;\n\n  public onCreate(options: Partial<{\n    maxClients: number,\n    allowReconnectionTime: number,\n    metadata: any,\n  }>) {\n    if (options.maxClients) {\n      this.maxClients = options.maxClients;\n    }\n\n    if (options.allowReconnectionTime) {\n      this.allowReconnectionTime = Math.min(options.allowReconnectionTime, 40);\n    }\n\n    if (options.metadata) {\n      this.setMetadata(options.metadata);\n    }\n\n    this.onMessage('*', (client: Client, type: string | number, message: any) => {\n      this.broadcast(type, [client.sessionId, message], { except: client });\n    });\n  }\n\n  public onJoin(client: Client, options: any = {}) {\n    const player = new Player();\n\n    player.connected = true;\n    player.sessionId = client.sessionId;\n\n    if (options.name) {\n      player.name = options.name;\n    }\n\n    this.state.players.set(client.sessionId, player);\n  }\n\n  public async onLeave(client: Client, code: number) {\n    if (this.allowReconnectionTime > 0) {\n      const player = this.state.players.get(client.sessionId);\n      player.connected = false;\n\n      try {\n        if (code === CloseCode.CONSENTED) {\n          throw new Error('consented leave');\n        }\n\n        await this.allowReconnection(client, this.allowReconnectionTime);\n        player.connected = true;\n\n      } catch (e) {\n        this.state.players.delete(client.sessionId);\n      }\n    }\n  }\n\n}\n"],
+  "mappings": ";AAAA,SAAS,aAAa,WAAW,cAAc;AAE/C,SAAS,YAAY;AAErB,SAAS,iBAAiB;AAE1B,IAAM,SAAN,cAAqB,OAAO;AAI5B;AACA,YAAY,QAAQ;AAAA,EAClB,WAAW;AAAA,EACX,MAAM;AAAA,EACN,WAAW;AACb,CAAC;AAED,IAAM,QAAN,cAAoB,OAAO;AAAA,EAA3B;AAAA;AACE,SAAO,UAAU,IAAI,UAAkB;AAAA;AACzC;AACA,YAAY,OAAO;AAAA,EACjB,SAAS,EAAE,KAAK,OAAO;AACzB,CAAC;AASM,IAAM,YAAN,cAAwB,KAAK;AAAA,EAA7B;AAAA;AACL,SAAO,QAAQ,IAAI,MAAM;AACzB,SAAO,wBAAgC;AAAA;AAAA,EAEhC,SAAS,SAIZ;AACF,QAAI,QAAQ,YAAY;AACtB,WAAK,aAAa,QAAQ;AAAA,IAC5B;AAEA,QAAI,QAAQ,uBAAuB;AACjC,WAAK,wBAAwB,KAAK,IAAI,QAAQ,uBAAuB,EAAE;AAAA,IACzE;AAEA,QAAI,QAAQ,UAAU;AACpB,WAAK,YAAY,QAAQ,QAAQ;AAAA,IACnC;AAEA,SAAK,UAAU,KAAK,CAAC,QAAgB,MAAuB,YAAiB;AAC3E,WAAK,UAAU,MAAM,CAAC,OAAO,WAAW,OAAO,GAAG,EAAE,QAAQ,OAAO,CAAC;AAAA,IACtE,CAAC;AAAA,EACH;AAAA,EAEO,OAAO,QAAgB,UAAe,CAAC,GAAG;AAC/C,UAAM,SAAS,IAAI,OAAO;AAE1B,WAAO,YAAY;AACnB,WAAO,YAAY,OAAO;AAE1B,QAAI,QAAQ,MAAM;AAChB,aAAO,OAAO,QAAQ;AAAA,IACxB;AAEA,SAAK,MAAM,QAAQ,IAAI,OAAO,WAAW,MAAM;AAAA,EACjD;AAAA,EAEA,MAAa,QAAQ,QAAgB,MAAc;AACjD,QAAI,KAAK,wBAAwB,GAAG;AAClC,YAAM,SAAS,KAAK,MAAM,QAAQ,IAAI,OAAO,SAAS;AACtD,aAAO,YAAY;AAEnB,UAAI;AACF,YAAI,SAAS,UAAU,WAAW;AAChC,gBAAM,IAAI,MAAM,iBAAiB;AAAA,QACnC;AAEA,cAAM,KAAK,kBAAkB,QAAQ,KAAK,qBAAqB;AAC/D,eAAO,YAAY;AAAA,MAErB,SAAS,GAAG;AACV,aAAK,MAAM,QAAQ,OAAO,OAAO,SAAS;AAAA,MAC5C;AAAA,IACF;AAAA,EACF;AAEF;",
   "names": []
 }