playsocketjs 1.1.8 → 1.1.9

package/dist/playsocket-client.js

@@ -2287,9 +2287,17 @@ class PlaySocket {
                         }
                         break;
 
+                    case 'server_stopped':
+                        this.#triggerEvent("error", "Server restart.");
+                        this.destroy();
+                        break;
+
+                    case 'host_migrated':
+                        this.#setHost(message.newHost);
+                        break;
+
                     case 'client_disconnected':
                         this.#connectionCount = message.participantCount - 1; // Counted without the user themselves
-                        this.#setHost(message.host);
                         this.#triggerEvent("clientDisconnected", message.client);
                         this.#triggerEvent("status", `Client ${message.client} disconnected.`);
                         break;

package/dist/playsocket-server.js

@@ -2306,7 +2306,7 @@ function requireServer () {
 	                            roomData = {
 	                                state: formerRoom.crdtManager.getState,
 	                                participantCount: formerRoom.participants.length,
-	                                host: formerRoom.participants[0],
+	                                host: formerRoom.host,
 	                                version: this.#roomVersions.get(formerRoomId)
 	                            };
 	                        }
@@ -2332,6 +2332,7 @@ function requireServer () {
 	                    this.#roomVersions.set(newRoomId, 0); // Start with version 0
 	                    this.#rooms[newRoomId] = {
 	                        participants: [ws.clientId],
+	                        host: ws.clientId,
 	                        maxSize: data.size || null,
 	                        crdtManager: new CRDTManager(crypto.randomUUID(), this.#debug)
 	                    };
@@ -2373,7 +2374,7 @@ function requireServer () {
 	                        type: 'join_accepted',
 	                        state: room.crdtManager.getState,
 	                        participantCount: room.participants.length,
-	                        host: room.participants[0],
+	                        host: room.host,
 	                        version: this.#roomVersions.get(roomId)
 	                    }), { binary: true });
 
@@ -2427,6 +2428,29 @@ function requireServer () {
 	        }
 	    }
 
+	    /**
+	     * If the client that disconnected (and is now in the reconnection-phase) was the room host,
+	     * pick a new room host immediately to avoid host-less phase (in case important logic is attached to the host)
+	     * @param {string} roomId
+	     * @param {string} clientId
+	     */
+	    #changeHostIfDisconnected(roomId, clientId) {
+	        const room = this.#rooms[roomId];
+	        if (room && room.host === clientId && room.participants.length > 1) {
+	            const participantsWithoutClient = room.participants.filter((e) => e !== clientId);
+	            room.host = participantsWithoutClient[0]; // Set new host
+
+	            // Inform all participants about the new host
+	            participantsWithoutClient.forEach(p => {
+	                const client = this.#clients.get(p);
+	                if (client) client.send(encode({
+	                    type: 'host_migrated',
+	                    newHost: room.host,
+	                }), { binary: true });
+	            });
+	        }
+	    }
+
 	    /**
 	     * Generate a random token to prevent malicious reconnect attempts
 	     * @returns {string} - Token
@@ -2473,6 +2497,10 @@ function requireServer () {
 	        if (!ws.clientId) return;
 	        this.#clients.delete(ws.clientId); // Immediately remove from active clients (otherwise, server would try to message this client)
 
+	        // If client was in a room, check if they were the host & migrate
+	        const roomId = this.#clientRooms.get(ws.clientId);
+	        if (roomId != null) this.#changeHostIfDisconnected(roomId, ws.clientId);
+
 	        if (ws.willfulDisconnect) {
 	            this.#disconnectClient(ws); // Immediate disconnection
 	        } else {
@@ -2512,7 +2540,6 @@ function requireServer () {
 	                    if (client) client.send(encode({
 	                        type: 'client_disconnected',
 	                        client: ws.clientId,
-	                        host: room.participants[0],
 	                        participantCount: room.participants.length
 	                    }), { binary: true });
 	                });
@@ -2551,7 +2578,10 @@ function requireServer () {
 	    stop() {
 	        clearInterval(this.#heartbeatInterval);
 	        if (this.#wss) {
-	            this.#wss.clients.forEach(client => client.close());
+	            this.#wss.clients.forEach(client => {
+	                client.send(encode({ type: 'server_stopped' }), { binary: true });
+	                client.close();
+	            });
 	            this.#wss.close();
 	        }
 	        if (this.#server && this.#ownsServer) {

package/package.json

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