playsocketjs 3.1.0 → 3.1.2

package/dist/playsocket-client.js

@@ -2180,7 +2180,7 @@ class PlaySocket {
      */
     #createTimeout(name) {
         return new Promise((_, reject) =>
-            setTimeout(() => reject(new Error(`${name} timed out`)), TIMEOUT_MS)
+            setTimeout(() => reject(new Error(`${name} timed out.`)), TIMEOUT_MS)
         );
     }
 
@@ -2220,8 +2220,8 @@ class PlaySocket {
      * @returns {Promise} Resolves when connection is established
      */
     async init() {
-        if (this.#initialized) return Promise.reject(new Error("Already initialized"));
-        if (!this.#endpoint) return Promise.reject(new Error("No websocket endpoint provided"));
+        if (this.#initialized) return Promise.reject(new Error("Already initialized!"));
+        if (!this.#endpoint) return Promise.reject(new Error("No websocket endpoint provided!"));
         this.#triggerEvent("status", "Initializing...");
 
         // Connect to WS server
@@ -2400,7 +2400,7 @@ class PlaySocket {
         // Handle socket errors
         this.#socket.onerror = () => {
             this.#triggerEvent("error", "WebSocket error.");
-            if (this.#pendingConnect) this.#pendingConnect.reject(new Error("WebSocket error"));
+            if (this.#pendingConnect) this.#pendingConnect.reject(new Error("WebSocket error!"));
         };
 
         // Handle socket close & attempt reconnect
@@ -2467,7 +2467,7 @@ class PlaySocket {
      */
     #sendToServer(data) {
         if (!this.#socket || this.#socket?.readyState !== WebSocket.OPEN) {
-            console.warn(WARNING_PREFIX + "Cannot send message - not connected.");
+            console.warn(WARNING_PREFIX + "Failed to send message - not connected.");
             return;
         }
         try {
@@ -2486,8 +2486,8 @@ class PlaySocket {
      */
     async createRoom(initialStorage = {}, size) {
         if (!this.#initialized) {
-            this.#triggerEvent("error", "Cannot create room - not initialized");
-            return Promise.reject(new Error("Not initialized"));
+            this.#triggerEvent("error", "Failed to create room - not initialized");
+            return Promise.reject(new Error("Not initialized!"));
         }
 
         return Promise.race([
@@ -2513,8 +2513,8 @@ class PlaySocket {
      */
     async joinRoom(roomId) {
         if (!this.#initialized) {
-            this.#triggerEvent("error", "Cannot join room - not initialized");
-            return Promise.reject(new Error("Not initialized"));
+            this.#triggerEvent("error", "Failed to join room - not initialized");
+            return Promise.reject(new Error("Not initialized!"));
         }
 
         return Promise.race([
@@ -2543,7 +2543,7 @@ class PlaySocket {
      */
     updateStorage(key, type, value, updateValue) {
         if (!this.#inRoom) {
-            this.#triggerEvent("error", "Cannot update storage when not in a room.");
+            this.#triggerEvent("error", "Failed to update storage - not in a room.");
             return;
         }        if (this.#debug) console.log(LOG_PREFIX + `Property update for key ${key}, operation ${type}, value ${value} and updateValue ${updateValue}.`);
         const propUpdate = this.#crdtManager.updateProperty(key, type, value, updateValue);

package/dist/playsocket-server.js

@@ -2298,7 +2298,6 @@ class PlaySocketServer {
                         if (formerRoom) {
                             // If the room has no host (they were the only one and disconnected), restore them as host
                             if (formerRoom.host === null) formerRoom.host = data.id;
-
                             if (this.#debug) console.log(`State sent for reconnection for room ${formerRoomId}:`, formerRoom.crdtManager.state);
                             roomData = {
                                 state: formerRoom.crdtManager.state,
@@ -2334,7 +2333,7 @@ class PlaySocketServer {
 
                         const newRoom = this.createRoom(data.initialStorage, data.size, ws.clientId); // Create room
 
-                        // Check if client/creator is still connected - abort if not
+                        // Verify client is still connected and abort if not
                         if (!this.#clients.has(ws.clientId)) {
                             this.destroyRoom(newRoom.id);
                             if (this.#debug) console.log(`Room creation cancelled - client ${ws.clientId} disconnected during event callback.`);
@@ -2363,6 +2362,12 @@ class PlaySocketServer {
                     const joinAllowed = await this.#triggerEvent("clientJoinRequested", ws.clientId, roomId);
                     if (joinAllowed === false || typeof joinAllowed === 'string') return rejectJoin(typeof joinAllowed === 'string' ? joinAllowed : 'Denied.');
 
+                    // Verify client is still connected and abort if not
+                    if (!this.#clients.has(ws.clientId)) {
+                        if (this.#debug) console.log(`Room join cancelled - client ${ws.clientId} disconnected during event callback.`);
+                        return;
+                    }
+
                     try {
                         this.#joinRoom(ws.clientId, roomId);
                     } catch (error) {
@@ -2578,7 +2583,7 @@ class PlaySocketServer {
         const oldRoomId = this.#clientRooms.get(clientId);
         const oldRoom = this.#rooms[oldRoomId];
         const targetRoom = this.#rooms[roomId];
-        if (!client) throw new Error("Client not found.");
+        if (!client && !this.#pendingDisconnects.has(clientId)) throw new Error("Client not found.");
         if (!oldRoomId) throw new Error("Client is not in a room.");
         if (!oldRoom) throw new Error("Client room not found.");
         if (oldRoomId === roomId) throw new Error("Client is already in target room.");
@@ -2698,33 +2703,37 @@ class PlaySocketServer {
         const room = this.#rooms[roomId];
         const client = this.#clients.get(clientId);
         if (!room) throw new Error("Room not found.");
-        if (!client) throw new Error("Client not found.");
+        if (!client && !this.#pendingDisconnects.has(clientId)) throw new Error("Client not found.");
         if (this.#clientRooms.get(clientId)) throw new Error("Already in a room.");
         if (room.participants.length >= room.size) throw new Error("Room full.");
 
         room.participants.push(clientId);
         this.#clientRooms.set(clientId, roomId);
 
-        // Notify joiner with initial storage
-        if (this.#debug) console.log("Room state sent for join:", room.crdtManager.state);
-        client.send(encode({
-            type: 'join_accepted',
-            roomId,
-            state: room.crdtManager.state,
-            participantCount: room.participants.length,
-            host: room.host,
-            version: this.#roomVersions.get(roomId)
-        }), { binary: true });
+        // Notify joiner with initial storage (only if connected - pending disconnect clients get state on reconnect)
+        if (client) {
+            if (this.#debug) console.log("Room state sent for join:", room.crdtManager.state);
+            client.send(encode({
+                type: 'join_accepted',
+                roomId,
+                state: room.crdtManager.state,
+                participantCount: room.participants.length,
+                host: room.host,
+                version: this.#roomVersions.get(roomId)
+            }), { binary: true });
+        }
 
         // If the room has no host (previous host disconnected and was the only participant), make joiner the host
-        // Since the room had to be empty, only the joiner needs to be notified
+        // Set new host after join_accepted so hostMigrated event fires correctly on client
         const becameHost = room.host === null;
         if (becameHost) {
-            room.host = clientId;
-            client.send(encode({
-                type: 'host_migrated',
-                newHost: room.host,
-            }), { binary: true });
+            room.host = clientId; // Change host
+            if (client) {
+                client.send(encode({
+                    type: 'host_migrated',
+                    newHost: room.host,
+                }), { binary: true });
+            }
         }
 
         // Notify existing participants

package/package.json

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