playsocketjs 1.1.11 → 1.1.13

package/dist/playsocket-client.js

@@ -2061,7 +2061,7 @@ class PlaySocket {
 
     // Room properties
     #roomHost;
-    #roomId; // ID of the host (client only)
+    #inRoom; // If the client is currently in  a room or not
     #connectionCount = 0;
     #crdtManager;
     #roomVersion = 0; // Update version (used to compare local vs. remote state to detect package loss)
@@ -2202,6 +2202,7 @@ class PlaySocket {
                         // Connected to room
                         if (this.#pendingJoin) {
                             if (this.#debug) console.log(LOG_PREFIX + "State received for join:", message.state);
+                            this.#inRoom = true;
                             this.#crdtManager.importState(message.state);
                             this.#connectionCount = message.participantCount - 1; // Counted without the user themselves
                             this.#roomHost = message.host;
@@ -2232,7 +2233,7 @@ class PlaySocket {
                                 this.#connectionCount = message.roomData.participantCount - 1; // Counted without the user themselves
                                 this.#setHost(message.roomData.host); // Set host before in case there are .isHost checks in the storageUpdate fallback
                                 this.#triggerEvent("storageUpdated", this.getStorage);
-                            } else if (this.#roomId) {
+                            } else if (this.#inRoom) {
                                 // If no room data received, but client thinks they were in a room...
                                 this.#triggerEvent("error", "Reconnected, but room no longer exists.");
                                 return this.destroy();
@@ -2248,8 +2249,9 @@ class PlaySocket {
 
                     case 'room_created':
                         if (this.#pendingCreate) {
+                            this.#inRoom = true;
                             this.#triggerEvent("status", `Room created${this.#pendingCreate.maxSize ? ` with max size ${this.#pendingCreate.maxSize}.` : '.'}`);
-                            this.#pendingCreate.resolve(this.#roomId);
+                            this.#pendingCreate.resolve(this.#pendingCreate.id);
                         }
                         break;
 
@@ -2408,9 +2410,8 @@ class PlaySocket {
                 Object.entries(initialStorage)?.forEach(([key, value]) => {
                     this.#crdtManager.updateProperty(key, "set", value);
                 });
-                this.#roomId = this.#id; // Create room with your own ID as the room ID to mimic p2p
                 this.#roomHost = this.#id;
-                this.#pendingCreate = { maxSize, resolve, reject };
+                this.#pendingCreate = { maxSize, id: this.#id, resolve, reject };
                 this.#sendToServer({
                     type: 'create_room',
                     state: this.#crdtManager.getState,
@@ -2437,7 +2438,6 @@ class PlaySocket {
 
         return Promise.race([
             new Promise((resolve, reject) => {
-                this.#roomId = roomId;
                 this.#pendingJoin = { resolve, reject };
 
                 // Send connection request
@@ -2495,6 +2495,9 @@ class PlaySocket {
             // Signal to the server that it can immediately remove this user
             if (this.#socket.readyState === WebSocket.OPEN) this.#sendToServer({ type: 'disconnect' });
             this.#socket.close();
+            this.#socket.onmessage = null;
+            this.#socket.onerror = null;
+            this.#socket.onclose = null;
             this.#socket = null;
 
             // Trigger events
@@ -2505,7 +2508,7 @@ class PlaySocket {
         // Reset state
         clearTimeout(this.#reconnectTimeout);
         this.#roomHost = null;
-        this.#roomId = null;
+        this.#inRoom = false;
         this.#connectionCount = 0;
         this.#isReconnecting = false;
         this.#reconnectCount = 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "playsocketjs",
-  "version": "1.1.11",
+  "version": "1.1.13",
   "description": "WebSocket wrapper for creating simple multiplayer systems with ease.",
   "module": "dist/playsocket-client.js",
   "exports": {