@colyseus/core 0.16.0-preview.35 → 0.16.0-preview.37

package/build/Room.js

@@ -39,12 +39,13 @@ var import_events = require("events");
 var import_Logger = require("./Logger.js");
 var import_NoneSerializer = require("./serializer/NoneSerializer.js");
 var import_SchemaSerializer = require("./serializer/SchemaSerializer.js");
-var import_Protocol = require("./Protocol.js");
+var import_Protocol = require("./Protocol");
 var import_Utils = require("./utils/Utils.js");
 var import_DevMode = require("./utils/DevMode.js");
 var import_Debug = require("./Debug.js");
 var import_ServerError = require("./errors/ServerError.js");
-var import_Transport = require("./Transport.js");
+var import_Transport = require("./Transport");
+var import_RoomExceptions = require("./errors/RoomExceptions.js");
 const DEFAULT_PATCH_RATE = 1e3 / 20;
 const DEFAULT_SIMULATION_INTERVAL = 1e3 / 60;
 const noneSerializer = new import_NoneSerializer.NoneSerializer();
@@ -62,12 +63,15 @@ class Room {
      * Intervals and timeouts are cleared when the room is disposed.
      */
     this.clock = new import_timer.default();
+    this.#_onLeaveConcurrent = 0;
+    // number of onLeave calls in progress
     /**
      * Maximum number of clients allowed to connect into the room. When room reaches this limit,
      * it is locked automatically. Unless the room was explicitly locked by you via `lock()` method,
      * the room will be unlocked as soon as a client disconnects from it.
      */
     this.maxClients = Infinity;
+    this.#_maxClientsReached = false;
     /**
      * Automatically dispose the room when last client disconnects.
      *
@@ -110,12 +114,14 @@ class Room {
     this._serializer = noneSerializer;
     this._afterNextPatchQueue = [];
     this._internalState = 0 /* CREATING */;
-    this._locked = false;
     this._lockedExplicitly = false;
-    this._maxClientsReached = false;
+    this.#_locked = false;
     this._events.once("dispose", () => {
-      this._dispose().catch((e) => (0, import_Debug.debugAndPrintError)(`onDispose error: ${e && e.message || e || "promise rejected"}`)).finally(() => this._events.emit("disconnect"));
+      this._dispose().catch((e) => (0, import_Debug.debugAndPrintError)(`onDispose error: ${e && e.stack || e.message || e || "promise rejected"}`)).finally(() => this._events.emit("disconnect"));
     });
+    if (this.onUncaughtException !== void 0) {
+      this.#registerUncaughtExceptionHandlers();
+    }
   }
   /**
    * This property will change on these situations:
@@ -125,23 +131,68 @@ class Room {
    * @readonly
    */
   get locked() {
-    return this._locked;
+    return this.#_locked;
   }
   get metadata() {
     return this.listing.metadata;
   }
   #_roomId;
   #_roomName;
+  #_onLeaveConcurrent;
+  #_maxClientsReached;
+  #_maxClients;
   #_autoDispose;
   #_patchRate;
   #_patchInterval;
+  #_state;
+  #_locked;
+  /**
+   * This method is called by the MatchMaker before onCreate()
+   * @internal
+   */
   __init() {
-    if (this.state) {
-      this.setState(this.state);
-    }
+    this.#_state = this.state;
     this.#_autoDispose = this.autoDispose;
     this.#_patchRate = this.patchRate;
+    this.#_maxClients = this.maxClients;
     Object.defineProperties(this, {
+      state: {
+        enumerable: true,
+        get: () => this.#_state,
+        set: (newState) => {
+          if (newState[import_schema.$changes] !== void 0) {
+            this.setSerializer(new import_SchemaSerializer.SchemaSerializer());
+          } else if ("_definition" in newState) {
+            throw new Error("@colyseus/schema v2 compatibility currently missing (reach out if you need it)");
+          } else if (import_schema.$changes === void 0) {
+            throw new Error("Multiple @colyseus/schema versions detected. Please make sure you don't have multiple versions of @colyseus/schema installed.");
+          }
+          this._serializer.reset(newState);
+          this.#_state = newState;
+        }
+      },
+      maxClients: {
+        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();
+          }
+        }
+      },
       autoDispose: {
         enumerable: true,
         get: () => this.#_autoDispose,
@@ -168,7 +219,11 @@ class Room {
       }
     });
     this.patchRate = this.#_patchRate;
+    if (this.#_state) {
+      this.state = this.#_state;
+    }
     this.resetAutoDisposeTimeout(this.seatReservationTime);
+    this.clock.start();
   }
   /**
    * The name of the room you provided as first argument for `gameServer.define()`.
@@ -210,18 +265,23 @@ class Room {
     }
     this.#_roomId = roomId;
   }
-  // TODO: flag as @deprecated on v0.16
-  // TOOD: remove instance level `onAuth` on 1.0
-  /**
-   * onAuth at the instance level will be deprecated in the future.
-   * Please use "static onAuth(token, req) instead
-   */
-  onAuth(client, options, request) {
+  onAuth(client, options, context) {
     return true;
   }
-  static async onAuth(token, req) {
+  static async onAuth(token, options, context) {
     return true;
   }
+  /**
+   * This method is called during graceful shutdown of the server process
+   * You may override this method to dispose the room in your own way.
+   *
+   * Once process reaches room count of 0, the room process will be terminated.
+   */
+  onBeforeShutdown() {
+    this.disconnect(
+      import_DevMode.isDevMode ? import_Protocol.Protocol.WS_CLOSE_DEVMODE_RESTART : import_Protocol.Protocol.WS_CLOSE_CONSENTED
+    );
+  }
   /**
    * Returns whether the sum of connected clients and reserved seats exceeds maximum number of clients.
    *
@@ -281,6 +341,9 @@ class Room {
       clearInterval(this._simulationInterval);
     }
     if (onTickCallback) {
+      if (this.onUncaughtException !== void 0) {
+        onTickCallback = (0, import_Utils.wrapTryCatch)(onTickCallback, this.onUncaughtException.bind(this), import_RoomExceptions.SimulationIntervalException, "setSimulationInterval");
+      }
       this._simulationInterval = setInterval(() => {
         this.clock.tick();
         onTickCallback(this.clock.deltaTime);
@@ -293,14 +356,10 @@ class Room {
   setPatchRate(milliseconds) {
     this.patchRate = milliseconds;
   }
+  /**
+   * @deprecated Use `.state =` instead.
+   */
   setState(newState) {
-    this.clock.start();
-    if (newState[import_schema.$changes] !== void 0) {
-      this.setSerializer(new import_SchemaSerializer.SchemaSerializer());
-    } else if (import_schema.$changes === void 0) {
-      throw new Error("@colyseus/schema v2 compatibility currently missing (reach out if you need it)");
-    }
-    this._serializer.reset(newState);
     this.state = newState;
   }
   setSerializer(serializer) {
@@ -337,12 +396,12 @@ class Room {
    */
   async lock() {
     this._lockedExplicitly = arguments[0] === void 0;
-    if (this._locked) {
+    if (this.#_locked) {
       return;
     }
-    this._locked = true;
+    this.#_locked = true;
     await this.listing.updateOne({
-      $set: { locked: this._locked }
+      $set: { locked: this.#_locked }
     });
     this._events.emit("lock");
   }
@@ -353,12 +412,12 @@ class Room {
     if (arguments[0] === void 0) {
       this._lockedExplicitly = false;
     }
-    if (!this._locked) {
+    if (!this.#_locked) {
       return;
     }
-    this._locked = false;
+    this.#_locked = false;
     await this.listing.updateOne({
-      $set: { locked: this._locked }
+      $set: { locked: this.#_locked }
     });
     this._events.emit("unlock");
   }
@@ -403,7 +462,7 @@ class Room {
     return hasChanges;
   }
   onMessage(messageType, callback, validate) {
-    this.onMessageHandlers[messageType] = { callback, validate };
+    this.onMessageHandlers[messageType] = this.onUncaughtException !== void 0 ? { validate, callback: (0, import_Utils.wrapTryCatch)(callback, this.onUncaughtException.bind(this), import_RoomExceptions.OnMessageException, "onMessage", false, messageType) } : { validate, callback };
     return () => delete this.onMessageHandlers[messageType];
   }
   /**
@@ -423,7 +482,7 @@ class Room {
     this.#_autoDispose = true;
     const delayedDisconnection = new Promise((resolve) => this._events.once("disconnect", () => resolve()));
     for (const [_, reconnection] of Object.values(this._reconnections)) {
-      reconnection.reject();
+      reconnection.reject(new Error("disconnecting"));
     }
     let numClients = this.clients.length;
     if (numClients > 0) {
@@ -435,7 +494,7 @@ class Room {
     }
     return delayedDisconnection;
   }
-  async ["_onJoin"](client, req) {
+  async ["_onJoin"](client, authContext) {
     const sessionId = client.sessionId;
     client.reconnectionToken = (0, import_Utils.generateId)();
     if (this.reservedSeatTimeouts[sessionId]) {
@@ -451,6 +510,7 @@ class Room {
       throw new import_ServerError.ServerError(import_Protocol.ErrorCode.MATCHMAKE_EXPIRED, "already consumed");
     }
     this.reservedSeats[sessionId][2] = true;
+    (0, import_Debug.debugMatchMaking)("consuming seat reservation, sessionId: '%s'", client.sessionId);
     client._afterNextPatchQueue = this._afterNextPatchQueue;
     client.ref["onleave"] = (_) => client.state = import_Transport.ClientState.LEAVING;
     client.ref.once("close", client.ref["onleave"]);
@@ -468,9 +528,15 @@ class Room {
         if (authData) {
           client.auth = authData;
         } else if (this.onAuth !== Room.prototype.onAuth) {
-          client.auth = await this.onAuth(client, joinOptions, req);
-          if (!client.auth) {
-            throw new import_ServerError.ServerError(import_Protocol.ErrorCode.AUTH_FAILED, "onAuth failed");
+          try {
+            client.auth = await this.onAuth(client, joinOptions, authContext);
+            if (!client.auth) {
+              throw new import_ServerError.ServerError(import_Protocol.ErrorCode.AUTH_FAILED, "onAuth failed");
+            }
+          } catch (e) {
+            delete this.reservedSeats[sessionId];
+            await this._decrementClientCount();
+            throw e;
           }
         }
         if (client.state === import_Transport.ClientState.LEAVING) {
@@ -484,15 +550,15 @@ class Room {
         if (this.onJoin) {
           await this.onJoin(client, joinOptions, client.auth);
         }
-        this._events.emit("join", client);
-        delete this.reservedSeats[sessionId];
         if (client.state === import_Transport.ClientState.LEAVING) {
-          await this._onLeave(client, import_Protocol.Protocol.WS_CLOSE_GOING_AWAY);
+          throw new Error("early_leave");
+        } else {
+          delete this.reservedSeats[sessionId];
+          this._events.emit("join", client);
         }
       } catch (e) {
-        this.clients.delete(client);
+        await this._onLeave(client, import_Protocol.Protocol.WS_CLOSE_GOING_AWAY);
         delete this.reservedSeats[sessionId];
-        this._decrementClientCount();
         if (!e.code) {
           e.code = import_Protocol.ErrorCode.APPLICATION_ERROR;
         }
@@ -523,7 +589,7 @@ class Room {
    */
   allowReconnection(previousClient, seconds) {
     if (previousClient._enqueuedMessages !== void 0) {
-      return import_Utils.Deferred.reject("client not joined");
+      return Promise.reject(new Error("not joined"));
     }
     if (seconds === void 0) {
       console.warn('DEPRECATED: allowReconnection() requires a second argument. Using "manual" mode.');
@@ -533,8 +599,7 @@ class Room {
       seconds = Infinity;
     }
     if (this._internalState === 2 /* DISPOSING */) {
-      this._disposeIfEmpty();
-      return import_Utils.Deferred.reject("disconnecting");
+      return Promise.reject(new Error("disposing"));
     }
     const sessionId = previousClient.sessionId;
     const reconnectionToken = previousClient.reconnectionToken;
@@ -622,7 +687,8 @@ class Room {
     return true;
   }
   _disposeIfEmpty() {
-    const willDispose = this.#_autoDispose && this._autoDisposeTimeout === void 0 && this.clients.length === 0 && Object.keys(this.reservedSeats).length === 0;
+    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;
     if (willDispose) {
       this._events.emit("dispose");
     }
@@ -714,15 +780,19 @@ class Room {
     this._onLeave(client, closeCode).then(() => client.leave(closeCode));
   }
   async _onLeave(client, code) {
-    const success = this.clients.delete(client);
-    if (success) {
-      client.state = import_Transport.ClientState.LEAVING;
-      if (this.onLeave) {
-        try {
-          await this.onLeave(client, code === import_Protocol.Protocol.WS_CLOSE_CONSENTED);
-        } catch (e) {
-          (0, import_Debug.debugAndPrintError)(`onLeave error: ${e && e.message || e || "promise rejected"}`);
-        }
+    (0, import_Debug.debugMatchMaking)("onLeave, sessionId: '%s'", client.sessionId);
+    client.state = import_Transport.ClientState.LEAVING;
+    if (!this.clients.delete(client)) {
+      return;
+    }
+    if (this.onLeave) {
+      try {
+        this.#_onLeaveConcurrent++;
+        await this.onLeave(client, code === import_Protocol.Protocol.WS_CLOSE_CONSENTED);
+      } catch (e) {
+        (0, import_Debug.debugAndPrintError)(`onLeave error: ${e && e.message || e || "promise rejected"}`);
+      } finally {
+        this.#_onLeaveConcurrent--;
       }
     }
     if (this._reconnections[client.reconnectionToken]) {
@@ -740,13 +810,13 @@ class Room {
     }
   }
   async _incrementClientCount() {
-    if (!this._locked && this.hasReachedMaxClients()) {
-      this._maxClientsReached = true;
+    if (!this.#_locked && this.hasReachedMaxClients()) {
+      this.#_maxClientsReached = true;
       this.lock.call(this, true);
     }
     await this.listing.updateOne({
       $inc: { clients: 1 },
-      $set: { locked: this._locked }
+      $set: { locked: this.#_locked }
     });
   }
   async _decrementClientCount() {
@@ -755,17 +825,43 @@ class Room {
       return true;
     }
     if (!willDispose) {
-      if (this._maxClientsReached && !this._lockedExplicitly) {
-        this._maxClientsReached = false;
+      if (this.#_maxClientsReached && !this._lockedExplicitly) {
+        this.#_maxClientsReached = false;
         this.unlock.call(this, true);
       }
       await this.listing.updateOne({
         $inc: { clients: -1 },
-        $set: { locked: this._locked }
+        $set: { locked: this.#_locked }
       });
     }
     return willDispose;
   }
+  #registerUncaughtExceptionHandlers() {
+    const onUncaughtException = this.onUncaughtException.bind(this);
+    const originalSetTimeout = this.clock.setTimeout;
+    this.clock.setTimeout = (cb, timeout, ...args) => {
+      return originalSetTimeout.call(this.clock, (0, import_Utils.wrapTryCatch)(cb, onUncaughtException, import_RoomExceptions.TimedEventException, "setTimeout"), timeout, ...args);
+    };
+    const originalSetInterval = this.clock.setInterval;
+    this.clock.setInterval = (cb, timeout, ...args) => {
+      return originalSetInterval.call(this.clock, (0, import_Utils.wrapTryCatch)(cb, onUncaughtException, import_RoomExceptions.TimedEventException, "setInterval"), timeout, ...args);
+    };
+    if (this.onCreate !== void 0) {
+      this.onCreate = (0, import_Utils.wrapTryCatch)(this.onCreate.bind(this), onUncaughtException, import_RoomExceptions.OnCreateException, "onCreate", true);
+    }
+    if (this.onAuth !== void 0) {
+      this.onAuth = (0, import_Utils.wrapTryCatch)(this.onAuth.bind(this), onUncaughtException, import_RoomExceptions.OnAuthException, "onAuth", true);
+    }
+    if (this.onJoin !== void 0) {
+      this.onJoin = (0, import_Utils.wrapTryCatch)(this.onJoin.bind(this), onUncaughtException, import_RoomExceptions.OnJoinException, "onJoin", true);
+    }
+    if (this.onLeave !== void 0) {
+      this.onLeave = (0, import_Utils.wrapTryCatch)(this.onLeave.bind(this), onUncaughtException, import_RoomExceptions.OnLeaveException, "onLeave", true);
+    }
+    if (this.onDispose !== void 0) {
+      this.onDispose = (0, import_Utils.wrapTryCatch)(this.onDispose.bind(this), onUncaughtException, import_RoomExceptions.OnDisposeException, "onDispose");
+    }
+  }
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {