Block actions until responses are received with WebSockets

diff --git a/trivabble.js b/trivabble.js
index 022b92d50571593af6900ecf16a260167ffbd2ad..eecd0736f77d5461455d7bcd8f20c5f72fe6711f 100644 (file)
--- a/trivabble.js
+++ b/trivabble.js
@@ -88,6 +88,9 @@
     let pollingServer = false;
     let connectionStopped = false;
 
+    let currentMessageId = 1;
+    const waitingMsgs = [];
+
     let serverVersion = 0;
 
     // HTTP path url prefix for any socket (xhr,ess or ws) from browser to server access
@@ -388,7 +391,7 @@
     function dragTileBegin(e) {
         preventDefault(e);
 
-        if (blockMove) {
+        if (blockMove || waitingMsgs.length) {
             return;
         }
 
@@ -678,6 +681,13 @@
             return;
         }
 
+        if (data.id) {
+            const pos = waitingMsgs.indexOf(data.id);
+            if (pos !== -1) {
+                waitingMsgs.splice(pos, 1);
+            }
+        }
+
         if (data.version) {
             serverVersion = data.version;
         }
@@ -1142,6 +1152,13 @@
 
     function sendCmds(cmds) {
         if (webSocket && webSocket.readyState === 1) {
+            if (serverVersion >= 202004281800) {
+                for (const cmd of cmds) {
+                    waitingMsgs.push(currentMessageId);
+                    cmd.id = currentMessageId++;
+                }
+            }
+
             webSocket.send(JSON.stringify(cmds));
             return;
         }
@@ -1229,7 +1246,7 @@
     function bagClicked(e) {
         preventDefault(e);
 
-        if (blockMove) {
+        if (blockMove || waitingMsgs.length) {
             return;
         }