@colyseus/core 0.18.2 → 0.18.4

package/build/Room.mjs

@@ -1065,7 +1065,7 @@ 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 client - The client that is allowed to reconnect into the room.
+   * @param previousClient - 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.
@@ -1332,7 +1332,12 @@ var Room = class _Room {
   #_forciblyCloseClient(client, closeCode, reason) {
     client.ref.removeAllListeners("message");
     client.ref.removeListener("close", client.ref["onleave"]);
-    this._onLeave(client, closeCode).then(() => client.leave(closeCode, reason));
+    const ref = client.ref;
+    this._onLeave(client, closeCode).then(() => {
+      if (client.ref === ref) {
+        client.leave(closeCode, reason);
+      }
+    });
   }
   async _onLeave(client, code) {
     const method = code === CloseCode.CONSENTED || client.state === ClientState.RECONNECTING ? this.onLeave : this.onDrop || this.onLeave;
@@ -1353,11 +1358,14 @@ var Room = class _Room {
         this.#_onLeaveConcurrent--;
       }
     }
+    if (client.state === ClientState.RECONNECTED) {
+      return;
+    }
     if (this._reconnections[client.reconnectionToken]) {
       this._reconnections[client.reconnectionToken][1].catch(async () => {
         await this.#_onAfterLeave(client, code, method === this.onDrop);
       });
-    } else if (client.state !== ClientState.RECONNECTED) {
+    } else {
       await this.#_onAfterLeave(client, code, method === this.onDrop);
     }
   }