playsocketjs 1.1.2 → 1.1.4

package/dist/playsocket-client.js

@@ -2298,10 +2298,7 @@ class PlaySocket {
                         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.#triggerEvent("error", "Detected missing update – requesting full state.");
-                            this.#requestStateSync();
-                        }
+                        if (this.#roomVersion != message.version) this.#requestStateSyncIfConnected();
                         break;
 
                     case 'client_disconnected':
@@ -2374,12 +2371,17 @@ class PlaySocket {
     /**
      * If the local state is out of sync, request the room state
      */
-    async #requestStateSync() {
-        if (this.#pendingStateRequest) return; // Return if already requested
+    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 {
-            Promise.race([
-                new Promise(async (resolve) => {
-                    this.#pendingStateRequest = { resolve };
+            await Promise.race([
+                new Promise(async (resolve, reject) => {
+                    this.#pendingStateRequest = { resolve, reject };
                     this.#sendToServer({ type: 'request_state' });
                 }),
                 this.#createTimeout("State request")
@@ -2410,8 +2412,8 @@ class PlaySocket {
      * @private
      */
     #sendToServer(data) {
-        if (!this.#socket || this.#socket.readyState !== WebSocket.OPEN) {
-            return console.error(ERROR_PREFIX + "Cannot send message - not connected.");
+        if (!this.#socket || this.#socket?.readyState !== WebSocket.OPEN) {
+            return console.warn(WARNING_PREFIX + "Cannot send message - not connected.");
         }
         try {
             this.#socket.send(encode(data));
@@ -2500,10 +2502,7 @@ class PlaySocket {
             uuid: updateUuid
         });
         setTimeout(() => {
-            if (this.#initialized && this.#sentUpdates.has(updateUuid)) {
-                this.#triggerEvent("error", "Sent update did not go through – requesting state.");
-                this.#requestStateSync();
-            }
+            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)
     }
@@ -2527,10 +2526,7 @@ class PlaySocket {
             uuid: updateUuid
         });
         setTimeout(() => {
-            if (this.#initialized && this.#sentUpdates.has(updateUuid)) {
-                this.#triggerEvent("error", "Sent update did not go through – requesting state.");
-                this.#requestStateSync();
-            }
+            if (this.#sentUpdates.has(updateUuid)) this.#requestStateSyncIfConnected(true);
         }, TIMEOUT_MS);
         if (this.#crdtManager.didPropertiesChange) this.#triggerEvent("storageUpdated", this.getStorage);
     }

package/package.json

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