@colyseus/core 0.16.23 → 0.17.0

package/build/Room.mjs

@@ -1,28 +1,33 @@
 // packages/core/src/Room.ts
 import { unpack } from "@colyseus/msgpackr";
 import { decode, $changes } from "@colyseus/schema";
-import Clock from "@colyseus/timer";
+import { ClockTimer as Clock } from "@colyseus/timer";
 import { EventEmitter } from "events";
 import { logger } from "./Logger.mjs";
 import { NoneSerializer } from "./serializer/NoneSerializer.mjs";
 import { SchemaSerializer } from "./serializer/SchemaSerializer.mjs";
-import { ErrorCode, getMessageBytes, Protocol } from "./Protocol.mjs";
+import { CloseCode, ErrorCode, getMessageBytes, Protocol } from "./Protocol.mjs";
 import { Deferred, generateId, wrapTryCatch } from "./utils/Utils.mjs";
+import { createNanoEvents } from "./utils/nanoevents.mjs";
 import { isDevMode } from "./utils/DevMode.mjs";
 import { debugAndPrintError, debugMatchMaking, debugMessage } from "./Debug.mjs";
 import { ServerError } from "./errors/ServerError.mjs";
-import { ClientArray, ClientState } from "./Transport.mjs";
+import { ClientState, ClientArray } from "./Transport.mjs";
 import { OnAuthException, OnCreateException, OnDisposeException, OnJoinException, OnLeaveException, OnMessageException, SimulationIntervalException, TimedEventException } from "./errors/RoomExceptions.mjs";
+import { standardValidate } from "./utils/StandardSchema.mjs";
+import { matchMaker } from "@colyseus/core";
 var DEFAULT_PATCH_RATE = 1e3 / 20;
 var DEFAULT_SIMULATION_INTERVAL = 1e3 / 60;
 var noneSerializer = new NoneSerializer();
 var DEFAULT_SEAT_RESERVATION_TIME = Number(process.env.COLYSEUS_SEAT_RESERVATION_TIME || 15);
-var RoomInternalState = /* @__PURE__ */ ((RoomInternalState2) => {
-  RoomInternalState2[RoomInternalState2["CREATING"] = 0] = "CREATING";
-  RoomInternalState2[RoomInternalState2["CREATED"] = 1] = "CREATED";
-  RoomInternalState2[RoomInternalState2["DISPOSING"] = 2] = "DISPOSING";
-  return RoomInternalState2;
-})(RoomInternalState || {});
+function validate(format, handler) {
+  return { format, handler };
+}
+var RoomInternalState = {
+  CREATING: 0,
+  CREATED: 1,
+  DISPOSING: 2
+};
 var Room = class _Room {
   constructor() {
     /**
@@ -51,40 +56,52 @@ var Room = class _Room {
      * @default 50ms (20fps)
      */
     this.patchRate = DEFAULT_PATCH_RATE;
+    /**
+     * Maximum number of messages a client can send to the server per second.
+     * If a client sends more messages than this, it will be disconnected.
+     *
+     * @default 60
+     */
+    this.maxMessagesPerSecond = 60;
     /**
      * The array of connected clients.
      *
-     * @see {@link https://docs.colyseus.io/colyseus/server/room/#client|Client instance}
+     * @see [Client instance](https://docs.colyseus.io/room#client)
      */
     this.clients = new ClientArray();
-    /** @internal */
+    /**
+     * Set the number of seconds a room can wait for a client to effectively join the room.
+     * You should consider how long your `onAuth()` will have to wait for setting a different seat reservation time.
+     * The default value is 15 seconds. You may set the `COLYSEUS_SEAT_RESERVATION_TIME`
+     * environment variable if you'd like to change the seat reservation time globally.
+     *
+     * @default 15 seconds
+     */
+    this.seatReservationTimeout = DEFAULT_SEAT_RESERVATION_TIME;
     this._events = new EventEmitter();
-    // seat reservation & reconnection
-    this.seatReservationTime = DEFAULT_SEAT_RESERVATION_TIME;
-    this.reservedSeats = {};
-    this.reservedSeatTimeouts = {};
+    this._reservedSeats = {};
+    this._reservedSeatTimeouts = {};
     this._reconnections = {};
-    this._reconnectingSessionId = /* @__PURE__ */ new Map();
-    this.onMessageHandlers = {
-      "__no_message_handler": {
-        callback: (client, messageType, _) => {
-          const errorMessage = `room onMessage for "${messageType}" not registered.`;
-          debugAndPrintError(`${errorMessage} (roomId: ${this.roomId})`);
-          if (isDevMode) {
-            client.error(ErrorCode.INVALID_PAYLOAD, errorMessage);
-          } else {
-            client.leave(Protocol.WS_CLOSE_WITH_ERROR, errorMessage);
-          }
+    this.onMessageEvents = createNanoEvents();
+    this.onMessageValidators = {};
+    this.onMessageFallbacks = {
+      "__no_message_handler": (client, messageType, _) => {
+        const errorMessage = `room onMessage for "${messageType}" not registered.`;
+        debugMessage(`${errorMessage} (roomId: ${this.roomId})`);
+        if (isDevMode) {
+          client.error(ErrorCode.INVALID_PAYLOAD, errorMessage);
+        } else {
+          client.leave(CloseCode.WITH_ERROR, errorMessage);
         }
       }
     };
     this._serializer = noneSerializer;
     this._afterNextPatchQueue = [];
-    this._internalState = 0 /* CREATING */;
+    this._internalState = RoomInternalState.CREATING;
     this._lockedExplicitly = false;
     this.#_locked = false;
     this._events.once("dispose", () => {
-      this._dispose().catch((e) => debugAndPrintError(`onDispose error: ${e && e.stack || e.message || e || "promise rejected"} (roomId: ${this.roomId})`)).finally(() => this._events.emit("disconnect"));
+      this.#_dispose().catch((e) => debugAndPrintError(`onDispose error: ${e && e.stack || e.message || e || "promise rejected"} (roomId: ${this.roomId})`)).finally(() => this._events.emit("disconnect"));
     });
     if (this.onUncaughtException !== void 0) {
       this.#registerUncaughtExceptionHandlers();
@@ -100,8 +117,31 @@ var Room = class _Room {
   get locked() {
     return this.#_locked;
   }
+  /**
+   * Get the room's matchmaking metadata.
+   */
   get metadata() {
-    return this.listing.metadata;
+    return this._listing.metadata;
+  }
+  /**
+   * Set the room's matchmaking metadata.
+   *
+   * **Note**: This setter does NOT automatically persist. Use `setMatchmaking()` for automatic persistence.
+   *
+   * @example
+   * ```typescript
+   * class MyRoom extends Room<{ metadata: { difficulty: string; rating: number } }> {
+   *   async onCreate() {
+   *     this.metadata = { difficulty: "hard", rating: 1500 };
+   *   }
+   * }
+   * ```
+   */
+  set metadata(meta) {
+    if (this._internalState !== RoomInternalState.CREATING) {
+      throw new ServerError(ErrorCode.APPLICATION_ERROR, "'metadata' can only be manually set during onCreate(). Use setMatchmaking() instead.");
+    }
+    this._listing.metadata = meta;
   }
   #_roomId;
   #_roomName;
@@ -142,29 +182,14 @@ var Room = class _Room {
         enumerable: true,
         get: () => this.#_maxClients,
         set: (value) => {
-          this.#_maxClients = value;
-          if (this._internalState === 1 /* CREATED */) {
-            const hasReachedMaxClients = this.hasReachedMaxClients();
-            if (!this._lockedExplicitly && this.#_maxClientsReached && !hasReachedMaxClients) {
-              this.#_maxClientsReached = false;
-              this.#_locked = false;
-              this.listing.locked = false;
-            }
-            if (hasReachedMaxClients) {
-              this.#_maxClientsReached = true;
-              this.#_locked = true;
-              this.listing.locked = true;
-            }
-            this.listing.maxClients = value;
-            this.listing.save();
-          }
+          this.setMatchmaking({ maxClients: value });
         }
       },
       autoDispose: {
         enumerable: true,
         get: () => this.#_autoDispose,
         set: (value) => {
-          if (value !== this.#_autoDispose && this._internalState !== 2 /* DISPOSING */) {
+          if (value !== this.#_autoDispose && this._internalState !== RoomInternalState.DISPOSING) {
             this.#_autoDispose = value;
             this.resetAutoDisposeTimeout();
           }
@@ -181,6 +206,8 @@ var Room = class _Room {
           }
           if (milliseconds !== null && milliseconds !== 0) {
             this.#_patchInterval = setInterval(() => this.broadcastPatch(), milliseconds);
+          } else if (!this._simulationInterval) {
+            this.#_patchInterval = setInterval(() => this.clock.tick(), DEFAULT_SIMULATION_INTERVAL);
           }
         }
       }
@@ -189,7 +216,16 @@ var Room = class _Room {
     if (this.#_state) {
       this.state = this.#_state;
     }
-    this.resetAutoDisposeTimeout(this.seatReservationTime);
+    if (this.messages !== void 0) {
+      Object.entries(this.messages).forEach(([messageType, callback]) => {
+        if (typeof callback === "function") {
+          this.onMessage(messageType, callback.bind(this));
+        } else {
+          this.onMessage(messageType, callback.format, callback.handler.bind(this));
+        }
+      });
+    }
+    this.resetAutoDisposeTimeout(this.seatReservationTimeout);
     this.clock.start();
   }
   /**
@@ -227,11 +263,27 @@ var Room = class _Room {
    * @returns roomId string
    */
   set roomId(roomId) {
-    if (this._internalState !== 0 /* CREATING */ && !isDevMode) {
+    if (this._internalState !== RoomInternalState.CREATING && !isDevMode) {
       throw new ServerError(ErrorCode.APPLICATION_ERROR, "'roomId' can only be overridden upon room creation.");
     }
     this.#_roomId = roomId;
   }
+  /**
+   * This method is called before onJoin() - this is where you should authenticate the client
+   * @param client - The client that is authenticating.
+   * @param options - The options passed to the client when it is authenticating.
+   * @param context - The authentication context, including the token and the client's IP address.
+   * @returns The authentication result.
+   *
+   * @example
+   * ```typescript
+   * return {
+   *   userId: 123,
+   *   username: "John Doe",
+   *   email: "john.doe@example.com",
+   * };
+   * ```
+   */
   onAuth(client, options, context) {
     return true;
   }
@@ -246,7 +298,7 @@ var Room = class _Room {
    */
   onBeforeShutdown() {
     this.disconnect(
-      isDevMode ? Protocol.WS_CLOSE_DEVMODE_RESTART : Protocol.WS_CLOSE_CONSENTED
+      isDevMode ? CloseCode.DEVMODE_RESTART : CloseCode.SERVER_SHUTDOWN
     );
   }
   /**
@@ -255,39 +307,31 @@ var Room = class _Room {
    * @returns boolean
    */
   hasReachedMaxClients() {
-    return this.clients.length + Object.keys(this.reservedSeats).length >= this.maxClients || this._internalState === 2 /* DISPOSING */;
+    return this.clients.length + Object.keys(this._reservedSeats).length >= this.#_maxClients || this._internalState === RoomInternalState.DISPOSING;
   }
   /**
-   * Set the number of seconds a room can wait for a client to effectively join the room.
-   * You should consider how long your `onAuth()` will have to wait for setting a different seat reservation time.
-   * The default value is 15 seconds. You may set the `COLYSEUS_SEAT_RESERVATION_TIME`
-   * environment variable if you'd like to change the seat reservation time globally.
-   *
-   * @default 15 seconds
-   *
-   * @param seconds - number of seconds.
-   * @returns The modified Room object.
+   * @deprecated Use `seatReservationTimeout=` instead.
    */
   setSeatReservationTime(seconds) {
-    this.seatReservationTime = seconds;
+    console.warn(`DEPRECATED: .setSeatReservationTime(${seconds}) is deprecated. Assign a .seatReservationTimeout property value instead.`);
+    this.seatReservationTimeout = seconds;
     return this;
   }
   hasReservedSeat(sessionId, reconnectionToken) {
-    const reservedSeat = this.reservedSeats[sessionId];
+    const reservedSeat = this._reservedSeats[sessionId];
     if (reservedSeat === void 0) {
       return false;
     }
     if (reservedSeat[3]) {
-      return reconnectionToken && this._reconnections[reconnectionToken]?.[0] === sessionId && this._reconnectingSessionId.has(sessionId);
+      return reconnectionToken && this._reconnections[reconnectionToken]?.[0] === sessionId;
     } else {
       return reservedSeat[2] === false;
     }
   }
   checkReconnectionToken(reconnectionToken) {
     const sessionId = this._reconnections[reconnectionToken]?.[0];
-    const reservedSeat = this.reservedSeats[sessionId];
+    const reservedSeat = this._reservedSeats[sessionId];
     if (reservedSeat && reservedSeat[3]) {
-      this._reconnectingSessionId.set(sessionId, reconnectionToken);
       return sessionId;
     } else {
       return void 0;
@@ -332,34 +376,125 @@ var Room = class _Room {
   setSerializer(serializer) {
     this._serializer = serializer;
   }
-  async setMetadata(meta) {
-    if (!this.listing.metadata) {
-      this.listing.metadata = meta;
+  async setMetadata(meta, persist = true) {
+    if (!this._listing.metadata) {
+      this._listing.metadata = meta;
     } else {
       for (const field in meta) {
         if (!meta.hasOwnProperty(field)) {
           continue;
         }
-        this.listing.metadata[field] = meta[field];
+        this._listing.metadata[field] = meta[field];
       }
-      if ("markModified" in this.listing) {
-        this.listing.markModified("metadata");
+      if ("markModified" in this._listing) {
+        this._listing.markModified("metadata");
       }
     }
-    if (this._internalState === 1 /* CREATED */) {
-      await this.listing.save();
+    if (persist && this._internalState === RoomInternalState.CREATED) {
+      await matchMaker.driver.persist(this._listing);
+      this._events.emit("metadata-change");
     }
   }
-  async setPrivate(bool = true) {
-    if (this.listing.private === bool) return;
-    this.listing.private = bool;
-    if (this._internalState === 1 /* CREATED */) {
-      await this.listing.save();
+  async setPrivate(bool = true, persist = true) {
+    if (this._listing.private === bool) return;
+    this._listing.private = bool;
+    if (persist && this._internalState === RoomInternalState.CREATED) {
+      await matchMaker.driver.persist(this._listing);
     }
     this._events.emit("visibility-change", bool);
   }
   /**
-   * Locking the room will remove it from the pool of available rooms for new clients to connect to.
+   * Update multiple matchmaking/listing properties at once with a single persist operation.
+   * This is the recommended way to update room listing properties.
+   *
+   * @param updates - Object containing the properties to update
+   *
+   * @example
+   * ```typescript
+   * // Update multiple properties at once
+   * await this.setMatchmaking({
+   *   metadata: { difficulty: "hard", rating: 1500 },
+   *   private: true,
+   *   locked: true,
+   *   maxClients: 10
+   * });
+   * ```
+   *
+   * @example
+   * ```typescript
+   * // Update only metadata
+   * await this.setMatchmaking({
+   *   metadata: { status: "in_progress" }
+   * });
+   * ```
+   *
+   * @example
+   * ```typescript
+   * // Partial metadata update (merges with existing)
+   * await this.setMatchmaking({
+   *   metadata: { ...this.metadata, round: this.metadata.round + 1 }
+   * });
+   * ```
+   */
+  async setMatchmaking(updates) {
+    for (const key in updates) {
+      if (!updates.hasOwnProperty(key)) {
+        continue;
+      }
+      switch (key) {
+        case "metadata": {
+          this.setMetadata(updates.metadata, false);
+          break;
+        }
+        case "private": {
+          this.setPrivate(updates.private, false);
+          break;
+        }
+        case "locked": {
+          if (updates[key]) {
+            this.lock.call(this, true);
+            this._lockedExplicitly = true;
+          } else {
+            this.unlock.call(this, true);
+            this._lockedExplicitly = false;
+          }
+          break;
+        }
+        case "maxClients": {
+          this.#_maxClients = updates.maxClients;
+          this._listing.maxClients = updates.maxClients;
+          const hasReachedMaxClients = this.hasReachedMaxClients();
+          if (!this._lockedExplicitly && this.#_maxClientsReached && !hasReachedMaxClients) {
+            this.#_maxClientsReached = false;
+            this.#_locked = false;
+            this._listing.locked = false;
+            updates.locked = false;
+          }
+          if (hasReachedMaxClients) {
+            this.#_maxClientsReached = true;
+            this.#_locked = true;
+            this._listing.locked = true;
+            updates.locked = true;
+          }
+          break;
+        }
+        case "clients": {
+          console.warn("setMatchmaking() does not allow updating 'clients' property.");
+          break;
+        }
+        default: {
+          this._listing[key] = updates[key];
+          break;
+        }
+      }
+    }
+    if (this._internalState === RoomInternalState.CREATED) {
+      await matchMaker.driver.update(this._listing, { $set: updates });
+      this._events.emit("metadata-change");
+    }
+  }
+  /**
+   * Lock the room. This prevents new clients from joining this room.
    */
   async lock() {
     this._lockedExplicitly = arguments[0] === void 0;
@@ -367,13 +502,15 @@ var Room = class _Room {
       return;
     }
     this.#_locked = true;
-    await this.listing.updateOne({
-      $set: { locked: this.#_locked }
-    });
+    if (this._lockedExplicitly) {
+      await matchMaker.driver.update(this._listing, {
+        $set: { locked: this.#_locked }
+      });
+    }
     this._events.emit("lock");
   }
   /**
-   * Unlocking the room returns it to the pool of available rooms for new clients to connect to.
+   * Unlock the room. This allows new clients to join this room, if maxClients is not reached.
    */
   async unlock() {
     if (arguments[0] === void 0) {
@@ -383,19 +520,33 @@ var Room = class _Room {
       return;
     }
     this.#_locked = false;
-    await this.listing.updateOne({
-      $set: { locked: this.#_locked }
-    });
+    if (arguments[0] === void 0) {
+      await matchMaker.driver.update(this._listing, {
+        $set: { locked: this.#_locked }
+      });
+    }
     this._events.emit("unlock");
   }
   send(client, messageOrType, messageOrOptions, options) {
     logger.warn("DEPRECATION WARNING: use client.send(...) instead of this.send(client, ...)");
     client.send(messageOrType, messageOrOptions, options);
   }
-  broadcast(type, message, options) {
+  /**
+   * Broadcast a message to all connected clients.
+   * @param type - The type of the message.
+   * @param message - The message to broadcast.
+   * @param options - The options for the broadcast.
+   *
+   * @example
+   * ```typescript
+   * this.broadcast('message', { message: 'Hello, world!' });
+   * ```
+   */
+  broadcast(type, ...args) {
+    const [message, options] = args;
     if (options && options.afterNextPatch) {
       delete options.afterNextPatch;
-      this._afterNextPatchQueue.push(["broadcast", arguments]);
+      this._afterNextPatchQueue.push(["broadcast", [type, ...args]]);
       return;
     }
     this.broadcastMessageType(type, message, options);
@@ -428,9 +579,30 @@ var Room = class _Room {
     this._dequeueAfterPatchMessages();
     return hasChanges;
   }
-  onMessage(messageType, callback, validate) {
-    this.onMessageHandlers[messageType] = this.onUncaughtException !== void 0 ? { validate, callback: wrapTryCatch(callback, this.onUncaughtException.bind(this), OnMessageException, "onMessage", false, messageType) } : { validate, callback };
-    return () => delete this.onMessageHandlers[messageType];
+  onMessage(_messageType, _validationSchema, _callback) {
+    const messageType = _messageType.toString();
+    const validationSchema = typeof _callback === "function" ? _validationSchema : void 0;
+    const callback = validationSchema === void 0 ? _validationSchema : _callback;
+    const removeListener = this.onMessageEvents.on(messageType, this.onUncaughtException !== void 0 ? wrapTryCatch(callback, this.onUncaughtException.bind(this), OnMessageException, "onMessage", false, _messageType) : callback);
+    if (validationSchema !== void 0) {
+      this.onMessageValidators[messageType] = validationSchema;
+    }
+    return () => {
+      removeListener();
+      if (this.onMessageEvents.events[messageType].length === 0) {
+        delete this.onMessageValidators[messageType];
+      }
+    };
+  }
+  onMessageBytes(_messageType, _validationSchema, _callback) {
+    const messageType = `_$b${_messageType}`;
+    const validationSchema = typeof _callback === "function" ? _validationSchema : void 0;
+    const callback = validationSchema === void 0 ? _validationSchema : _callback;
+    if (validationSchema !== void 0) {
+      return this.onMessage(messageType, validationSchema, callback);
+    } else {
+      return this.onMessage(messageType, callback);
+    }
   }
   /**
    * Disconnect all connected clients, and then dispose the room.
@@ -438,14 +610,14 @@ var Room = class _Room {
    * @param closeCode WebSocket close code (default = 4000, which is a "consented leave")
    * @returns Promise<void>
    */
-  disconnect(closeCode = Protocol.WS_CLOSE_CONSENTED) {
-    if (this._internalState === 2 /* DISPOSING */) {
+  disconnect(closeCode = CloseCode.CONSENTED) {
+    if (this._internalState === RoomInternalState.DISPOSING) {
       return Promise.resolve(`disconnect() ignored: room (${this.roomId}) is already disposing.`);
-    } else if (this._internalState === 0 /* CREATING */) {
+    } else if (this._internalState === RoomInternalState.CREATING) {
       throw new Error("cannot disconnect during onCreate()");
     }
-    this._internalState = 2 /* DISPOSING */;
-    this.listing.remove();
+    this._internalState = RoomInternalState.DISPOSING;
+    matchMaker.driver.remove(this._listing.roomId);
     this.#_autoDispose = true;
     const delayedDisconnection = new Promise((resolve) => this._events.once("disconnect", () => resolve()));
     for (const [_, reconnection] of Object.values(this._reconnections)) {
@@ -454,38 +626,41 @@ var Room = class _Room {
     let numClients = this.clients.length;
     if (numClients > 0) {
       while (numClients--) {
-        this._forciblyCloseClient(this.clients[numClients], closeCode);
+        this.#_forciblyCloseClient(this.clients[numClients], closeCode);
       }
     } else {
       this._events.emit("dispose");
     }
     return delayedDisconnection;
   }
-  async ["_onJoin"](client, authContext) {
+  async _onJoin(client, authContext, connectionOptions) {
     const sessionId = client.sessionId;
     client.reconnectionToken = generateId();
-    if (this.reservedSeatTimeouts[sessionId]) {
-      clearTimeout(this.reservedSeatTimeouts[sessionId]);
-      delete this.reservedSeatTimeouts[sessionId];
+    if (this._reservedSeatTimeouts[sessionId]) {
+      clearTimeout(this._reservedSeatTimeouts[sessionId]);
+      delete this._reservedSeatTimeouts[sessionId];
     }
     if (this._autoDisposeTimeout) {
       clearTimeout(this._autoDisposeTimeout);
       this._autoDisposeTimeout = void 0;
     }
-    const [joinOptions, authData, isConsumed, isWaitingReconnection] = this.reservedSeats[sessionId];
+    const [joinOptions, authData, isConsumed, isWaitingReconnection] = this._reservedSeats[sessionId];
     if (isConsumed) {
       throw new ServerError(ErrorCode.MATCHMAKE_EXPIRED, "already consumed");
     }
-    this.reservedSeats[sessionId][2] = true;
+    this._reservedSeats[sessionId][2] = true;
     debugMatchMaking("consuming seat reservation, sessionId: '%s' (roomId: %s)", client.sessionId, this.roomId);
     client._afterNextPatchQueue = this._afterNextPatchQueue;
     client.ref["onleave"] = (_) => client.state = ClientState.LEAVING;
     client.ref.once("close", client.ref["onleave"]);
     if (isWaitingReconnection) {
-      const previousReconnectionToken = this._reconnectingSessionId.get(sessionId);
-      if (previousReconnectionToken) {
+      const reconnectionToken = connectionOptions?.reconnectionToken;
+      if (reconnectionToken && this._reconnections[reconnectionToken]?.[0] === sessionId) {
         this.clients.push(client);
-        await this._reconnections[previousReconnectionToken]?.[1].resolve(client);
+        await this._reconnections[reconnectionToken]?.[1].resolve(client);
+        if (this.onReconnect) {
+          await this.onReconnect(client);
+        }
       } else {
         const errorMessage = process.env.NODE_ENV === "production" ? "already consumed" : "bad reconnection token";
         throw new ServerError(ErrorCode.MATCHMAKE_EXPIRED, errorMessage);
@@ -501,31 +676,31 @@ var Room = class _Room {
               throw new ServerError(ErrorCode.AUTH_FAILED, "onAuth failed");
             }
           } catch (e) {
-            delete this.reservedSeats[sessionId];
-            await this._decrementClientCount();
+            delete this._reservedSeats[sessionId];
+            await this.#_decrementClientCount();
             throw e;
           }
         }
         if (client.state === ClientState.LEAVING) {
-          throw new ServerError(Protocol.WS_CLOSE_GOING_AWAY, "already disconnected");
+          throw new ServerError(CloseCode.WITH_ERROR, "already disconnected");
         }
         this.clients.push(client);
-        Object.defineProperty(this.reservedSeats, sessionId, {
-          value: this.reservedSeats[sessionId],
+        Object.defineProperty(this._reservedSeats, sessionId, {
+          value: this._reservedSeats[sessionId],
           enumerable: false
         });
         if (this.onJoin) {
-          await this.onJoin(client, joinOptions, client.auth);
+          await this.onJoin(client, joinOptions);
         }
         if (client.state === ClientState.LEAVING) {
-          throw new Error("early_leave");
+          throw new ServerError(ErrorCode.MATCHMAKE_UNHANDLED, "early_leave");
         } else {
-          delete this.reservedSeats[sessionId];
+          delete this._reservedSeats[sessionId];
           this._events.emit("join", client);
         }
       } catch (e) {
-        await this._onLeave(client, Protocol.WS_CLOSE_GOING_AWAY);
-        delete this.reservedSeats[sessionId];
+        await this._onLeave(client, CloseCode.WITH_ERROR);
+        delete this._reservedSeats[sessionId];
         if (!e.code) {
           e.code = ErrorCode.APPLICATION_ERROR;
         }
@@ -540,7 +715,11 @@ var Room = class _Room {
       client.raw(getMessageBytes[Protocol.JOIN_ROOM](
         client.reconnectionToken,
         this._serializer.id,
-        this._serializer.handshake && this._serializer.handshake()
+        /**
+         * if skipHandshake is true, we don't need to send the handshake
+         * (in case client already has handshake data)
+         */
+        connectionOptions?.skipHandshake ? void 0 : this._serializer.handshake && this._serializer.handshake()
       ));
     }
   }
@@ -548,11 +727,19 @@ var Room = class _Room {
    * Allow the specified client to reconnect into the room. Must be used inside `onLeave()` method.
    * If seconds is provided, the reconnection is going to be cancelled after the provided amount of seconds.
    *
-   * @param previousClient - The client which is to be waiting until re-connection happens.
-   * @param seconds - Timeout period on re-connection in seconds.
+   * @param client - The client that is allowed to reconnect into the room.
+   * @param seconds - The time in seconds that the client is allowed to reconnect into the room.
    *
    * @returns Deferred<Client> - The differed is a promise like type.
    *  This type can forcibly reject the promise by calling `.reject()`.
+   *
+   * @example
+   * ```typescript
+   * onDrop(client: Client, code: CloseCode) {
+   *   // Allow the client to reconnect into the room with a 15 seconds timeout.
+   *   this.allowReconnection(client, 15);
+   * }
+   * ```
    */
   allowReconnection(previousClient, seconds) {
     if (previousClient._enqueuedMessages !== void 0) {
@@ -565,7 +752,7 @@ var Room = class _Room {
     if (seconds === "manual") {
       seconds = Infinity;
     }
-    if (this._internalState === 2 /* DISPOSING */) {
+    if (this._internalState === RoomInternalState.DISPOSING) {
       return Promise.reject(new Error("disposing"));
     }
     const sessionId = previousClient.sessionId;
@@ -574,13 +761,12 @@ var Room = class _Room {
     const reconnection = new Deferred();
     this._reconnections[reconnectionToken] = [sessionId, reconnection];
     if (seconds !== Infinity) {
-      this.reservedSeatTimeouts[sessionId] = setTimeout(() => reconnection.reject(false), seconds * 1e3);
+      this._reservedSeatTimeouts[sessionId] = setTimeout(() => reconnection.reject(false), seconds * 1e3);
     }
     const cleanup = () => {
       delete this._reconnections[reconnectionToken];
-      delete this.reservedSeats[sessionId];
-      delete this.reservedSeatTimeouts[sessionId];
-      this._reconnectingSessionId.delete(sessionId);
+      delete this._reservedSeats[sessionId];
+      delete this._reservedSeatTimeouts[sessionId];
     };
     reconnection.then((newClient) => {
       newClient.auth = previousClient.auth;
@@ -589,11 +775,11 @@ var Room = class _Room {
       previousClient.state = ClientState.RECONNECTED;
       previousClient.ref = newClient.ref;
       previousClient.reconnectionToken = newClient.reconnectionToken;
-      clearTimeout(this.reservedSeatTimeouts[sessionId]);
-      cleanup();
-    }).catch(() => {
-      cleanup();
+      clearTimeout(this._reservedSeatTimeouts[sessionId]);
+    }, () => {
       this.resetAutoDisposeTimeout();
+    }).finally(() => {
+      cleanup();
     });
     return reconnection;
   }
@@ -604,7 +790,7 @@ var Room = class _Room {
     }
     this._autoDisposeTimeout = setTimeout(() => {
       this._autoDisposeTimeout = void 0;
-      this._disposeIfEmpty();
+      this.#_disposeIfEmpty();
     }, timeoutInSeconds * 1e3);
   }
   broadcastMessageType(type, message, options = {}) {
@@ -636,36 +822,52 @@ var Room = class _Room {
       this._afterNextPatchQueue.splice(0, length);
     }
   }
-  async _reserveSeat(sessionId, joinOptions = true, authData = void 0, seconds = this.seatReservationTime, allowReconnection = false, devModeReconnection) {
+  async _reserveSeat(sessionId, joinOptions = true, authData = void 0, seconds = this.seatReservationTimeout, allowReconnection = false, devModeReconnectionToken) {
     if (!allowReconnection && this.hasReachedMaxClients()) {
       return false;
     }
-    this.reservedSeats[sessionId] = [joinOptions, authData, false, allowReconnection];
+    debugMatchMaking(
+      "reserving seat. sessionId: '%s', roomId: '%s', processId: '%s'",
+      sessionId,
+      this.roomId,
+      matchMaker.processId
+    );
+    this._reservedSeats[sessionId] = [joinOptions, authData, false, allowReconnection];
     if (!allowReconnection) {
-      await this._incrementClientCount();
-      this.reservedSeatTimeouts[sessionId] = setTimeout(async () => {
-        delete this.reservedSeats[sessionId];
-        delete this.reservedSeatTimeouts[sessionId];
-        await this._decrementClientCount();
+      await this.#_incrementClientCount();
+      this._reservedSeatTimeouts[sessionId] = setTimeout(async () => {
+        delete this._reservedSeats[sessionId];
+        delete this._reservedSeatTimeouts[sessionId];
+        await this.#_decrementClientCount();
       }, seconds * 1e3);
       this.resetAutoDisposeTimeout(seconds);
     }
-    if (devModeReconnection) {
-      this._reconnectingSessionId.set(sessionId, sessionId);
+    if (devModeReconnectionToken) {
+      const reconnection = new Deferred();
+      this._reconnections[devModeReconnectionToken] = [sessionId, reconnection];
     }
     return true;
   }
-  _disposeIfEmpty() {
+  async _reserveMultipleSeats(multipleSessionIds, multipleJoinOptions = true, multipleAuthData = void 0, seconds = this.seatReservationTimeout) {
+    let promises = [];
+    for (let i = 0; i < multipleSessionIds.length; i++) {
+      promises.push(this._reserveSeat(multipleSessionIds[i], multipleJoinOptions[i], multipleAuthData[i], seconds));
+    }
+    return await Promise.all(promises);
+  }
+  #_disposeIfEmpty() {
     const willDispose = this.#_onLeaveConcurrent === 0 && // no "onLeave" calls in progress
-    this.#_autoDispose && this._autoDisposeTimeout === void 0 && this.clients.length === 0 && Object.keys(this.reservedSeats).length === 0;
+    this.#_autoDispose && this._autoDisposeTimeout === void 0 && this.clients.length === 0 && Object.keys(this._reservedSeats).length === 0;
     if (willDispose) {
       this._events.emit("dispose");
     }
     return willDispose;
   }
-  async _dispose() {
-    this._internalState = 2 /* DISPOSING */;
-    this.listing.remove();
+  async #_dispose() {
+    this._internalState = RoomInternalState.DISPOSING;
+    if (this._listing?.roomId !== void 0) {
+      await matchMaker.driver.remove(this._listing.roomId);
+    }
     let userReturnData;
     if (this.onDispose) {
       userReturnData = this.onDispose();
@@ -690,44 +892,59 @@ var Room = class _Room {
     if (client.state === ClientState.LEAVING) {
       return;
     }
-    const it = { offset: 1 };
-    const code = buffer[0];
     if (!buffer) {
       debugAndPrintError(`${this.roomName} (roomId: ${this.roomId}), couldn't decode message: ${buffer}`);
       return;
     }
+    if (this.clock.currentTime - client._lastMessageTime >= 1e3) {
+      client._numMessagesLastSecond = 0;
+      client._lastMessageTime = this.clock.currentTime;
+    } else if (++client._numMessagesLastSecond > this.maxMessagesPerSecond) {
+      return this.#_forciblyCloseClient(client, CloseCode.WITH_ERROR);
+    }
+    const it = { offset: 1 };
+    const code = buffer[0];
     if (code === Protocol.ROOM_DATA) {
       const messageType = decode.stringCheck(buffer, it) ? decode.string(buffer, it) : decode.number(buffer, it);
-      const messageTypeHandler = this.onMessageHandlers[messageType];
       let message;
       try {
         message = buffer.byteLength > it.offset ? unpack(buffer.subarray(it.offset, buffer.byteLength)) : void 0;
         debugMessage("received: '%s' -> %j (roomId: %s)", messageType, message, this.roomId);
-        if (messageTypeHandler?.validate !== void 0) {
-          message = messageTypeHandler.validate(message);
+        if (this.onMessageValidators[messageType] !== void 0) {
+          message = standardValidate(this.onMessageValidators[messageType], message);
         }
       } catch (e) {
         debugAndPrintError(e);
-        client.leave(Protocol.WS_CLOSE_WITH_ERROR);
+        client.leave(CloseCode.WITH_ERROR);
         return;
       }
-      if (messageTypeHandler) {
-        messageTypeHandler.callback(client, message);
+      if (this.onMessageEvents.events[messageType]) {
+        this.onMessageEvents.emit(messageType, client, message);
+      } else if (this.onMessageEvents.events["*"]) {
+        this.onMessageEvents.emit("*", client, messageType, message);
       } else {
-        (this.onMessageHandlers["*"] || this.onMessageHandlers["__no_message_handler"]).callback(client, messageType, message);
+        this.onMessageFallbacks["__no_message_handler"](client, messageType, message);
       }
     } else if (code === Protocol.ROOM_DATA_BYTES) {
       const messageType = decode.stringCheck(buffer, it) ? decode.string(buffer, it) : decode.number(buffer, it);
-      const messageTypeHandler = this.onMessageHandlers[messageType];
       let message = buffer.subarray(it.offset, buffer.byteLength);
       debugMessage("received: '%s' -> %j (roomId: %s)", messageType, message, this.roomId);
-      if (messageTypeHandler?.validate !== void 0) {
-        message = messageTypeHandler.validate(message);
+      const bytesMessageType = `_$b${messageType}`;
+      try {
+        if (this.onMessageValidators[bytesMessageType] !== void 0) {
+          message = standardValidate(this.onMessageValidators[bytesMessageType], message);
+        }
+      } catch (e) {
+        debugAndPrintError(e);
+        client.leave(CloseCode.WITH_ERROR);
+        return;
       }
-      if (messageTypeHandler) {
-        messageTypeHandler.callback(client, message);
+      if (this.onMessageEvents.events[bytesMessageType]) {
+        this.onMessageEvents.emit(bytesMessageType, client, message);
+      } else if (this.onMessageEvents.events["*"]) {
+        this.onMessageEvents.emit("*", client, messageType, message);
       } else {
-        (this.onMessageHandlers["*"] || this.onMessageHandlers["__no_message_handler"]).callback(client, messageType, message);
+        this.onMessageFallbacks["__no_message_handler"](client, messageType, message);
       }
     } else if (code === Protocol.JOIN_ROOM && client.state === ClientState.JOINING) {
       client.state = ClientState.JOINED;
@@ -739,58 +956,64 @@ var Room = class _Room {
         client._enqueuedMessages.forEach((enqueued) => client.raw(enqueued));
       }
       delete client._enqueuedMessages;
+    } else if (code === Protocol.PING) {
+      client.raw(getMessageBytes[Protocol.PING]());
     } else if (code === Protocol.LEAVE_ROOM) {
-      this._forciblyCloseClient(client, Protocol.WS_CLOSE_CONSENTED);
+      this.#_forciblyCloseClient(client, CloseCode.CONSENTED);
     }
   }
-  _forciblyCloseClient(client, closeCode) {
+  #_forciblyCloseClient(client, closeCode) {
     client.ref.removeAllListeners("message");
     client.ref.removeListener("close", client.ref["onleave"]);
     this._onLeave(client, closeCode).then(() => client.leave(closeCode));
   }
   async _onLeave(client, code) {
-    debugMatchMaking("onLeave, sessionId: '%s' (close code: %d, roomId: %s)", client.sessionId, code, this.roomId);
     client.state = ClientState.LEAVING;
     if (!this.clients.delete(client)) {
       return;
     }
-    if (this.onLeave) {
+    const method = code === CloseCode.CONSENTED ? this.onLeave : this.onDrop || this.onLeave;
+    if (method) {
+      debugMatchMaking(`${method.name}, sessionId: '%s' (close code: %d, roomId: %s)`, client.sessionId, code, this.roomId);
       try {
         this.#_onLeaveConcurrent++;
-        await this.onLeave(client, code === Protocol.WS_CLOSE_CONSENTED);
+        await method.call(this, client, code);
       } catch (e) {
-        debugAndPrintError(`onLeave error: ${e && e.message || e || "promise rejected"} (roomId: ${this.roomId})`);
+        debugAndPrintError(`${method.name} error: ${e && e.message || e || "promise rejected"} (roomId: ${this.roomId})`);
       } finally {
         this.#_onLeaveConcurrent--;
       }
     }
     if (this._reconnections[client.reconnectionToken]) {
       this._reconnections[client.reconnectionToken][1].catch(async () => {
-        await this._onAfterLeave(client);
+        await this.#_onAfterLeave(client, code, method === this.onDrop);
       });
     } else if (client.state !== ClientState.RECONNECTED) {
-      await this._onAfterLeave(client);
+      await this.#_onAfterLeave(client, code, method === this.onDrop);
     }
   }
-  async _onAfterLeave(client) {
-    const willDispose = await this._decrementClientCount();
-    if (this.reservedSeats[client.sessionId] === void 0) {
+  async #_onAfterLeave(client, code, isDrop = false) {
+    if (isDrop && this.onLeave) {
+      await this.onLeave(client, code);
+    }
+    const willDispose = await this.#_decrementClientCount();
+    if (this._reservedSeats[client.sessionId] === void 0) {
       this._events.emit("leave", client, willDispose);
     }
   }
-  async _incrementClientCount() {
+  async #_incrementClientCount() {
     if (!this.#_locked && this.hasReachedMaxClients()) {
       this.#_maxClientsReached = true;
       this.lock.call(this, true);
     }
-    await this.listing.updateOne({
+    await matchMaker.driver.update(this._listing, {
       $inc: { clients: 1 },
       $set: { locked: this.#_locked }
     });
   }
-  async _decrementClientCount() {
-    const willDispose = this._disposeIfEmpty();
-    if (this._internalState === 2 /* DISPOSING */) {
+  async #_decrementClientCount() {
+    const willDispose = this.#_disposeIfEmpty();
+    if (this._internalState === RoomInternalState.DISPOSING) {
       return true;
     }
     if (!willDispose) {
@@ -798,7 +1021,7 @@ var Room = class _Room {
         this.#_maxClientsReached = false;
         this.unlock.call(this, true);
       }
-      await this.listing.updateOne({
+      await matchMaker.driver.update(this._listing, {
         $inc: { clients: -1 },
         $set: { locked: this.#_locked }
       });
@@ -832,8 +1055,27 @@ var Room = class _Room {
     }
   }
 };
+function room(options) {
+  class _ extends Room {
+    constructor() {
+      super();
+      this.messages = options.messages;
+      if (options.state && typeof options.state === "function") {
+        this.state = options.state();
+      }
+    }
+  }
+  for (const key in options) {
+    if (typeof options[key] === "function") {
+      _.prototype[key] = options[key];
+    }
+  }
+  return _;
+}
 export {
   DEFAULT_SEAT_RESERVATION_TIME,
   Room,
-  RoomInternalState
+  RoomInternalState,
+  room,
+  validate
 };