playsocketjs 1.1.4 → 1.1.6

package/dist/playsocket-client.js

@@ -1731,11 +1731,11 @@ function requireCrdtManager () {
 	            this.#propertyStore = {};
 	            this.#lastPropertyStore = {};
 
-	            this.#keyOperations = new Map(keyOperations); // Rebuild the map
-	            this.#vectorClock = new Map(vectorClock); // Also rebuild the map here
-	            if (!this.#vectorClock.has(this.#replicaId)) this.#vectorClock.set(this.#replicaId, 0); // Reset own vector clock if it wasn't present in the imported state
+	            this.#keyOperations = new Map(keyOperations); // Rebuild the operations map
+	            this.#vectorClock = new Map(vectorClock); // Rebuild the vector clock map
+	            if (!this.#vectorClock.has(this.#replicaId)) this.#vectorClock.set(this.#replicaId, 0); // Add own vector clock if it wasn't present in the imported state
 
-	            // Map operation uuids to timestamp
+	            // Map all operation uuids to current timestamp
 	            this.#keyOperations.forEach((value, key) => {
 	                value?.forEach((operation) => {
 	                    this.#opUuidTimestamp.set(operation?.uuid, Date.now());
@@ -2065,7 +2065,6 @@ class PlaySocket {
     #connectionCount = 0;
     #crdtManager;
     #roomVersion = 0; // Update version (used to compare local vs. remote state to detect package loss)
-    #sentUpdates = new Set(); // Contains update uuids
 
     // Event handling
     #callbacks = new Map(); // Event callbacks
@@ -2076,7 +2075,6 @@ class PlaySocket {
     #pendingRegistration;
     #pendingConnect;
     #pendingReconnect;
-    #pendingStateRequest;
 
     // Timeouts or intervals
     #reconnectTimeout;
@@ -2281,24 +2279,15 @@ class PlaySocket {
                         }
                         break;
 
-                    case 'state_sync':
-                        if (this.#pendingStateRequest) {
-                            if (this.#debug) console.log(LOG_PREFIX + "State received following state request:", message.state);
-                            this.#roomVersion = message.version;
-                            this.#crdtManager.importState(message.state);
-                            this.#triggerEvent("storageUpdated", this.getStorage);
-                            this.#triggerEvent("status", "State synchronized.");
-                            this.#pendingStateRequest.resolve();
-                        }
-                        break;
-
-                    case 'property_update':
+                    case 'property_updated':
                         this.#roomVersion++; // Increment room version
                         if (this.#debug) console.log(LOG_PREFIX + "Property update received:", message.update);
-                        this.#sentUpdates.delete(message.uuid); // If this is our sent update, delete it so that timeout check knows it was received
                         this.#crdtManager.importPropertyUpdate(message.update);
                         if (this.#crdtManager.didPropertiesChange) this.#triggerEvent("storageUpdated", this.getStorage);
-                        if (this.#roomVersion != message.version) this.#requestStateSyncIfConnected();
+                        if (this.#roomVersion != message.version && this.#initialized && this.#socket?.readyState === WebSocket.OPEN) {
+                            this.#triggerEvent("error", "Detected skipped update – forcing reconnect.");
+                            this.#socket?.close();
+                        }
                         break;
 
                     case 'client_disconnected':
@@ -2368,33 +2357,6 @@ class PlaySocket {
         }
     }
 
-    /**
-     * If the local state is out of sync, request the room state
-     */
-    async #requestStateSyncIfConnected(notSent = false) {
-        if (this.#pendingStateRequest || !this.#initialized || this.#socket?.readyState !== WebSocket.OPEN) return; // Return if already requested, destroyed or connection not open
-
-        // Trigger corresponding events
-        if (!notSent) this.#triggerEvent("error", "Detected skipped update – requesting state.");
-        else this.#triggerEvent("error", "Sent update did not go through – requesting state.");
-
-        try {
-            await Promise.race([
-                new Promise(async (resolve, reject) => {
-                    this.#pendingStateRequest = { resolve, reject };
-                    this.#sendToServer({ type: 'request_state' });
-                }),
-                this.#createTimeout("State request")
-            ]).finally(() => {
-                this.#pendingStateRequest = null;
-            });
-        } catch (error) {
-            if (!this.#initialized) return;
-            this.#triggerEvent("error", "Failed to re-sync state: " + error.message);
-            this.destroy();
-        }
-    }
-
     /**
      * Update the host in case a new one was chosen
      * @param {string} hostId - Client id of new host
@@ -2493,17 +2455,10 @@ class PlaySocket {
     updateStorage(key, value) {
         if (this.#debug) console.log(LOG_PREFIX + "Property set update for key '" + key + "':", value);
         const propUpdate = this.#crdtManager.updateProperty(key, "set", value);
-        const updateUuid = crypto.randomUUID();
-        this.#sentUpdates.add(updateUuid);
         this.#sendToServer({
-            type: 'property_update',
-            key,
-            update: propUpdate,
-            uuid: updateUuid
+            type: 'update_property',
+            update: propUpdate
         });
-        setTimeout(() => {
-            if (this.#sentUpdates.has(updateUuid)) this.#requestStateSyncIfConnected(true);
-        }, TIMEOUT_MS);
         if (this.#crdtManager.didPropertiesChange) this.#triggerEvent("storageUpdated", this.getStorage); // Always trigger callback after send in case msgs are sent in the callback (which would break the order)
     }
 
@@ -2517,17 +2472,10 @@ class PlaySocket {
     updateStorageArray(key, operation, value, updateValue) {
         if (this.#debug) console.log(LOG_PREFIX + `Property array update for key '${key}', operation '${operation}', value '${value}' and updateValue '${updateValue}'.`);
         const propUpdate = this.#crdtManager.updateProperty(key, "array-" + operation, value, updateValue);
-        const updateUuid = crypto.randomUUID();
-        this.#sentUpdates.add(updateUuid);
         this.#sendToServer({
-            type: 'property_update',
-            key,
-            update: propUpdate,
-            uuid: updateUuid
+            type: 'update_property',
+            update: propUpdate
         });
-        setTimeout(() => {
-            if (this.#sentUpdates.has(updateUuid)) this.#requestStateSyncIfConnected(true);
-        }, TIMEOUT_MS);
         if (this.#crdtManager.didPropertiesChange) this.#triggerEvent("storageUpdated", this.getStorage);
     }
 
@@ -2556,7 +2504,6 @@ class PlaySocket {
         this.#isReconnecting = false;
         this.#reconnectCount = 0;
         this.#roomVersion = 0;
-        this.#sentUpdates.clear();
 
         // Reject timeouts if currently active
         if (this.#pendingJoin) this.#pendingJoin.reject();
@@ -2564,7 +2511,6 @@ class PlaySocket {
         if (this.#pendingRegistration) this.#pendingRegistration.reject();
         if (this.#pendingConnect) this.#pendingConnect.reject();
         if (this.#pendingReconnect) this.#pendingReconnect.reject();
-        if (this.#pendingStateRequest) this.#pendingStateRequest.reject();
     }
 
     // Public getters

package/dist/playsocket-server.js

@@ -1857,11 +1857,11 @@ function requireCrdtManager () {
 	            this.#propertyStore = {};
 	            this.#lastPropertyStore = {};
 
-	            this.#keyOperations = new Map(keyOperations); // Rebuild the map
-	            this.#vectorClock = new Map(vectorClock); // Also rebuild the map here
-	            if (!this.#vectorClock.has(this.#replicaId)) this.#vectorClock.set(this.#replicaId, 0); // Reset own vector clock if it wasn't present in the imported state
+	            this.#keyOperations = new Map(keyOperations); // Rebuild the operations map
+	            this.#vectorClock = new Map(vectorClock); // Rebuild the vector clock map
+	            if (!this.#vectorClock.has(this.#replicaId)) this.#vectorClock.set(this.#replicaId, 0); // Add own vector clock if it wasn't present in the imported state
 
-	            // Map operation uuids to timestamp
+	            // Map all operation uuids to current timestamp
 	            this.#keyOperations.forEach((value, key) => {
 	                value?.forEach((operation) => {
 	                    this.#opUuidTimestamp.set(operation?.uuid, Date.now());
@@ -2239,7 +2239,7 @@ function requireServer () {
 	                ws.isAlive = false;
 	                ws.ping();
 	            });
-	        }, 30000);
+	        }, 15000);
 	    }
 
 	    /**
@@ -2309,18 +2309,6 @@ function requireServer () {
 	                    }
 	                    break;
 
-	                case 'request_state':
-	                    const stateRoomId = this.#clientRooms.get(ws.clientId);
-	                    const stateRoom = stateRoomId ? this.#rooms[stateRoomId] : null;
-	                    if (stateRoom) {
-	                        ws.send(encode({
-	                            type: 'state_sync',
-	                            state: stateRoom.crdtManager.getState,
-	                            version: this.#roomVersions.get(stateRoomId)
-	                        }), { binary: true });
-	                    }
-	                    break;
-
 	                case 'create_room':
 	                    if (!ws.clientId) return;
 	                    const newRoomId = ws.clientId;
@@ -2396,11 +2384,11 @@ function requireServer () {
 	                    this.#triggerEvent("roomJoined", ws.clientId, roomId);
 	                    break;
 
-	                case 'property_update':
+	                case 'update_property':
 	                    const updateRoomId = this.#clientRooms.get(ws.clientId);
 	                    const updateRoom = updateRoomId ? this.#rooms[updateRoomId] : null;
 
-	                    if (updateRoom && data.key && data.update && data.uuid) {
+	                    if (updateRoom && data.update) {
 	                        updateRoom.crdtManager.importPropertyUpdate(data.update);
 
 	                        // Increment version for this room
@@ -2412,10 +2400,9 @@ function requireServer () {
 	                            const client = this.#clients.get(p);
 	                            if (client) {
 	                                client.send(encode({
-	                                    type: 'property_update',
+	                                    type: 'property_updated',
 	                                    update: data.update,
-	                                    version: currentVersion,
-	                                    uuid: data.uuid
+	                                    version: currentVersion
 	                                }), { binary: true });
 	                            }
 	                        });

package/package.json

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