playsocketjs 1.0.9 → 1.0.11

package/dist/playsocket-client.js

@@ -254,17 +254,6 @@ class PlaySocket {
                         }
                         break;
 
-                    case 'storage_operation':
-                        if (message.key) {
-                            const updatedArray = this.#handleArrayUpdate(message.key, message.operation, message.value, message.updateValue);
-                            if (JSON.stringify(this.#storage[message.key]) !== JSON.stringify(updatedArray)) {
-                                this.#storage[message.key] = updatedArray;
-                                this.#storageTimestamps[message.key] = message.timestamp;
-                                this.#triggerEvent("storageUpdated", { ...this.#storage });
-                            }
-                        }
-                        break;
-
                     case 'client_disconnected':
                         this.#connectionCount = message.participantCount - 1; // Counted without the user themselves
                         this.#setHost(message.host);
@@ -366,7 +355,7 @@ class PlaySocket {
      * @param {number} maxSize - Max number of participants
      * @returns {Promise} Resolves with room ID
      */
-    createRoom(initialStorage = {}, maxSize) {
+    async createRoom(initialStorage = {}, maxSize) {
         if (!this.#initialized) {
             this.#triggerEvent("error", "Cannot create room - not initialized");
             return Promise.reject(new Error("Not initialized"));
@@ -397,7 +386,7 @@ class PlaySocket {
      * @param {string} roomId - ID of the room
      * @returns {Promise} Resolves when connected
      */
-    joinRoom(roomId) {
+    async joinRoom(roomId) {
         if (!this.#initialized) {
             this.#triggerEvent("error", "Cannot join room - not initialized");
             return Promise.reject(new Error("Not initialized"));
@@ -435,6 +424,7 @@ class PlaySocket {
             value,
             timestamp
         });
+        // Optimistic update for regular storage updates
         this.#storage[key] = value;
         this.#storageTimestamps[key] = timestamp;
         this.#triggerEvent("storageUpdated", { ...this.#storage });
@@ -448,54 +438,15 @@ class PlaySocket {
      * @param {*} updateValue - New value for update-matching
      */
     updateStorageArray(key, operation, value, updateValue) {
-        const updatedArray = this.#handleArrayUpdate(key, operation, value, updateValue);
-        if (JSON.stringify(this.#storage[key]) === JSON.stringify(updatedArray)) return; // Prevent updates without changes
-        const timestamp = this.#getTimestamp();
+        // 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.
         this.#sendToServer({
             type: 'room_storage_array_update',
             key,
             operation,
             value,
-            updateValue,
-            timestamp
+            updateValue
         });
-        this.#storage[key] = updatedArray;
-        this.#storageTimestamps[key] = timestamp;
-        this.#triggerEvent("storageUpdated", { ...this.#storage });
-    }
-
-    /**
-     * Handle array operations client-side
-     * @private
-     */
-    #handleArrayUpdate(key, operation, value, updateValue) {
-        let array = (!this.#storage[key] || !Array.isArray(this.#storage[key])) ? [] : [...this.#storage[key]];
-        const isObject = typeof value === 'object' && value !== null;
-        const compare = (item) => isObject ? JSON.stringify(item) === JSON.stringify(value) : item === value;
-
-        switch (operation) {
-            case 'add':
-                array.push(value);
-                break;
-
-            case 'add-unique':
-                if (!array.some(compare)) array.push(value);
-                break;
-
-            case 'remove-matching':
-                array = array.filter(item => !compare(item));
-                break;
-
-            case 'update-matching':
-                const index = array.findIndex(compare);
-                if (index !== -1) array[index] = updateValue;
-                break;
-
-            default:
-                console.error(ERROR_PREFIX + `Unknown array operation: ${operation}`);
-        }
-
-        return array;
     }
 
     /**

package/dist/playsocket-server.js

@@ -214,7 +214,7 @@ function requireServer () {
 	                        if (data.timestamp > existingTimestamp && JSON.stringify(updateRoom.storage[data.key]) !== JSON.stringify(data.value)) {
 	                            updateRoom.storage[data.key] = data.value;
 	                            updateRoom.storageTimestamps[data.key] = data.timestamp;
-	                            this.#syncRoomStorageKey(updateRoomId, ws.clientId, data.key, data.timestamp);
+	                            this.#syncRoomStorageKey(updateRoom, data.key, data.timestamp);
 	                        }
 	                    }
 	                    break;
@@ -227,8 +227,8 @@ function requireServer () {
 	                        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.#syncRoomStorageOperation(arrayRoomId, ws.clientId, data.key, data.operation, data.value, data.updateValue, data.timestamp);
+	                            arrayRoom.storageTimestamps[data.key] = Date.now();
+	                            this.#syncRoomStorageKey(arrayRoom, data.key, Date.now());
 	                        }
 	                    }
 	                    break;
@@ -284,52 +284,18 @@ function requireServer () {
 	    /**
 	     * Sync storage key with all clients in room
 	     * @private
-	     * @param {string} roomId 
-	     * @param {string} requesterId - Client id of whom initiated the operation
+	     * @param {Object} room
 	     * @param {string} key 
 	     * @param {number} timestamp - In milliseconds
 	     */
-	    #syncRoomStorageKey(roomId, requesterId, key, timestamp) {
-	        const room = this.#rooms[roomId];
-	        if (!room) return;
-	        room.participants.forEach(p => {
-	            if (p == requesterId) return; // Don't sync with the requester
+	    #syncRoomStorageKey(room, key, timestamp) {
+	        room?.participants?.forEach(p => {
 	            const client = this.#clients.get(p);
 	            if (client) {
 	                client.send(JSON.stringify({
 	                    type: 'storage_sync',
 	                    key,
-	                    value: room.storage[key],
-	                    timestamp
-	                }));
-	            }
-	        });
-	    }
-
-	    /**
-	     * Sync storage operations with all clients in room
-	     * @private
-	     * @param {string} roomId 
-	     * @param {string} requesterId - Client id of whom initiated the operation
-	     * @param {string} key 
-	     * @param {string} operation 
-	     * @param {*} value 
-	     * @param {*} updateValue 
-	     * @param {number} timestamp - In milliseconds
-	     */
-	    #syncRoomStorageOperation(roomId, requesterId, key, operation, value, updateValue, timestamp) {
-	        const room = this.#rooms[roomId];
-	        if (!room) return;
-	        room.participants.forEach(p => {
-	            if (p == requesterId) return; // Don't send the operation to the requester
-	            const client = this.#clients.get(p);
-	            if (client) {
-	                client.send(JSON.stringify({
-	                    type: 'storage_operation',
-	                    key,
-	                    operation,
-	                    value,
-	                    updateValue,
+	                    value: room?.storage?.[key],
 	                    timestamp
 	                }));
 	            }

package/package.json

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