playsocketjs 1.0.10 → 1.0.12

package/dist/playsocket-client.js

@@ -17,11 +17,9 @@ class PlaySocket {
 
     // Room properties
     #storage = {}; // Shared storage object
-    #storageTimestamps = {}; // Tracks update timestamps per key to ensure that not-yet synced updates don't get overwritten
     #roomHost;
     #roomId; // ID of the host (client only)
     #connectionCount = 0;
-    #serverTimeOffset = 0; // Offset between server time and local time
 
     // Event handling
     #callbacks = new Map(); // Event callbacks
@@ -61,14 +59,6 @@ class PlaySocket {
         );
     }
 
-    /**
-     * Get synchronized timestamp
-     * @private
-     */
-    #getTimestamp() {
-        return Date.now() + this.#serverTimeOffset;
-    }
-
     /**
      * Register an event callback
      * @param {string} event - Event name
@@ -119,8 +109,7 @@ class PlaySocket {
                 this.#sendToServer({
                     type: 'register',
                     id: this.#id,
-                    customData: this.#customData || undefined,
-                    clientTime: Date.now()
+                    customData: this.#customData || undefined
                 });
             }),
             this.#createTimeout("Registration")
@@ -163,7 +152,6 @@ class PlaySocket {
                         // Connected to room
                         if (this.#pendingJoin) {
                             this.#storage = message.storage;
-                            this.#storageTimestamps = message.storageTimestamps;
                             this.#connectionCount = message.participantCount - 1; // Counted without the user themselves
                             this.#roomHost = message.host;
                             this.#triggerEvent("status", `Connected to room.`);
@@ -187,7 +175,6 @@ class PlaySocket {
                             this.#reconnectCount = 0;
                             if (message.roomData) {
                                 this.#storage = message.roomData.storage;
-                                this.#storageTimestamps = message.roomData.storageTimestamps;
                                 this.#connectionCount = message.roomData.participantCount - 1; // Counted without the user themselves
                                 this.#setHost(message.roomData.host);
                                 this.#triggerEvent("storageUpdated", { ...this.#storage });
@@ -233,9 +220,6 @@ class PlaySocket {
 
                     case 'registered':
                         if (this.#pendingRegistration) {
-                            const roundTripTime = Date.now() - message.clientTime;
-                            const serverTimeAtClientNow = message.serverTime + (roundTripTime / 2);
-                            this.#serverTimeOffset = serverTimeAtClientNow - Date.now();
                             this.#sessionToken = message.sessionToken;
                             this.#initialized = true;
                             this.#pendingRegistration.resolve();
@@ -245,10 +229,8 @@ class PlaySocket {
 
                     case 'storage_sync':
                         if (message.key) {
-                            const localTimestamp = this.#storageTimestamps[message.key] || 0;
-                            if (message.timestamp > localTimestamp && JSON.stringify(this.#storage[message.key]) !== JSON.stringify(message.value)) {
+                            if (JSON.stringify(this.#storage[message.key]) !== JSON.stringify(message.value)) {
                                 this.#storage[message.key] = message.value;
-                                this.#storageTimestamps[message.key] = message.timestamp;
                                 this.#triggerEvent("storageUpdated", { ...this.#storage });
                             }
                         }
@@ -417,16 +399,13 @@ class PlaySocket {
      */
     updateStorage(key, value) {
         if (JSON.stringify(this.#storage[key]) === JSON.stringify(value)) return; // Prevent updates without changes
-        const timestamp = this.#getTimestamp();
         this.#sendToServer({
             type: 'room_storage_update',
             key,
-            value,
-            timestamp
+            value
         });
         // Optimistic update for regular storage updates
         this.#storage[key] = value;
-        this.#storageTimestamps[key] = timestamp;
         this.#triggerEvent("storageUpdated", { ...this.#storage });
     }
 
@@ -440,14 +419,12 @@ class PlaySocket {
     updateStorageArray(key, operation, value, updateValue) {
         // Send operation to server (no optimistic update – we can't guarantee that it is correct)
         // If another client has sent an update to the server that is processed first, the end result will differ.
-        const timestamp = this.#getTimestamp();
         this.#sendToServer({
             type: 'room_storage_array_update',
             key,
             operation,
             value,
-            updateValue,
-            timestamp
+            updateValue
         });
     }
 
@@ -472,8 +449,6 @@ class PlaySocket {
         clearTimeout(this.#reconnectTimeout);
         this.#roomHost = null;
         this.#storage = {};
-        this.#storageTimestamps = {};
-        this.#serverTimeOffset = 0;
         this.#roomId = null;
         this.#connectionCount = 0;
         this.#isReconnecting = false;

package/dist/playsocket-server.js

@@ -102,7 +102,7 @@ function requireServer () {
 	                    this.#clients.set(data.id, ws);
 	                    const sessionToken = this.#generateSessionToken();
 	                    this.#clientTokens.set(data.id, sessionToken); // Token is used when reconnecting to prevent impersonation attacks
-	                    ws.send(JSON.stringify({ type: 'registered', sessionToken, serverTime: Date.now(), clientTime: data.clientTime }));
+	                    ws.send(JSON.stringify({ type: 'registered', sessionToken }));
 	                    this.#triggerEvent("clientRegistered", data.id, data.customData);
 	                    break;
 
@@ -127,7 +127,6 @@ function requireServer () {
 	                        if (formerRoom) {
 	                            roomData = {
 	                                storage: formerRoom.storage,
-	                                storageTimestamps: formerRoom.storageTimestamps,
 	                                participantCount: formerRoom.participants.length,
 	                                host: formerRoom.participants[0]
 	                            };
@@ -153,8 +152,7 @@ function requireServer () {
 	                    this.#rooms[newRoomId] = {
 	                        participants: [ws.clientId],
 	                        maxSize: data.size || null,
-	                        storage: data.storage || {},
-	                        storageTimestamps: {},
+	                        storage: data.storage || {}
 	                    };
 
 	                    this.#clientRooms.set(ws.clientId, newRoomId);
@@ -186,7 +184,6 @@ function requireServer () {
 	                    ws.send(JSON.stringify({
 	                        type: 'join_accepted',
 	                        storage: room.storage,
-	                        storageTimestamps: room.storageTimestamps,
 	                        participantCount: room.participants.length,
 	                        host: room.participants[0]
 	                    }));
@@ -210,11 +207,9 @@ function requireServer () {
 	                    const updateRoomId = this.#clientRooms.get(ws.clientId);
 	                    const updateRoom = updateRoomId ? this.#rooms[updateRoomId] : null;
 	                    if (updateRoom && data.key) {
-	                        const existingTimestamp = updateRoom.storageTimestamps[data.key] || 0;
-	                        if (data.timestamp > existingTimestamp && JSON.stringify(updateRoom.storage[data.key]) !== JSON.stringify(data.value)) {
+	                        if (JSON.stringify(updateRoom.storage[data.key]) !== JSON.stringify(data.value)) {
 	                            updateRoom.storage[data.key] = data.value;
-	                            updateRoom.storageTimestamps[data.key] = data.timestamp;
-	                            this.#syncRoomStorageKey(updateRoom, data.key, data.timestamp);
+	                            this.#syncRoomStorageKey(updateRoom, data.key, ws.clientId);
 	                        }
 	                    }
 	                    break;
@@ -223,12 +218,10 @@ function requireServer () {
 	                    const arrayRoomId = this.#clientRooms.get(ws.clientId);
 	                    const arrayRoom = arrayRoomId ? this.#rooms[arrayRoomId] : null;
 	                    if (arrayRoom && data.key) {
-	                        // No timestamp check for array operations as they are designed to work unordered
 	                        const updatedArray = this.#arrayUpdate(arrayRoom.storage, data.key, data.operation, data.value, data.updateValue);
 	                        if (JSON.stringify(arrayRoom.storage[data.key]) !== JSON.stringify(updatedArray)) {
 	                            arrayRoom.storage[data.key] = updatedArray;
-	                            arrayRoom.storageTimestamps[data.key] = data.timestamp;
-	                            this.#syncRoomStorageKey(arrayRoom, data.key, data.timestamp);
+	                            this.#syncRoomStorageKey(arrayRoom, data.key);
 	                        }
 	                    }
 	                    break;
@@ -286,17 +279,17 @@ function requireServer () {
 	     * @private
 	     * @param {Object} room
 	     * @param {string} key 
-	     * @param {number} timestamp - In milliseconds
+	     * @param {string} exclude
 	     */
-	    #syncRoomStorageKey(room, key, timestamp) {
+	    #syncRoomStorageKey(room, key, exclude) {
 	        room?.participants?.forEach(p => {
+	            if (p === exclude) return;
 	            const client = this.#clients.get(p);
 	            if (client) {
 	                client.send(JSON.stringify({
 	                    type: 'storage_sync',
 	                    key,
-	                    value: room?.storage?.[key],
-	                    timestamp
+	                    value: room?.storage?.[key]
 	                }));
 	            }
 	        });

package/package.json

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