X-Git-Url: https://git.auder.net/?p=vchess.git;a=blobdiff_plain;f=server%2Fsockets.js;h=ef2f07b4d1e57b146c58c140e6a8366f3a3db1a7;hp=fae711066e912709883aa853e05d162c91a351b6;hb=5fd5fb22de02ed6c585e86a1c3dda50ff6071d2f;hpb=3837d4f7885a3c3cdb468da2f3fa3fa1e5a1415a

diff --git a/server/sockets.js b/server/sockets.js
index fae71106..ef2f07b4 100644
--- a/server/sockets.js
+++ b/server/sockets.js
@@ -31,15 +31,20 @@ module.exports = function(wss) {
         }
       });
     };
-    notifyRoom(query["page"], "connect"); //Hall or Game
-    if (query["page"].indexOf("/game/") >= 0)
-      notifyRoom("/", "connect"); //notify main hall
+    // Wait for "connect" message to notify connection to the room,
+    // because if game loading is slow the message listener might
+    // not be ready too early.
     socket.on("message", objtxt => {
       let obj = JSON.parse(objtxt);
       if (!!obj.target && !clients[obj.target])
         return; //receiver not connected, nothing we can do
       switch (obj.code)
       {
+        case "connect":
+          notifyRoom(query["page"], "connect"); //Hall or Game
+          if (query["page"].indexOf("/game/") >= 0)
+            notifyRoom("/", "connect"); //notify main hall
+          break;
         case "pollclients":
           const curPage = clients[sid].page;
           socket.send(JSON.stringify({code:"pollclients",
@@ -162,7 +167,7 @@ module.exports = function(wss) {
           break;
         case "draw":
           clients[obj.target].sock.send(JSON.stringify(
-            {code:"draw"}));
+            {code:"draw", message:obj.message}));
           break;
       }
     });