X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=server%2Fsockets.js;h=fcaab83c815a6a2ace407d9212009961fb4c2215;hb=a0c41e7e23c9ff64031739e072f38e493bac8dca;hp=d296efa1a073a47b1818b32bbbbb074263ee134d;hpb=ac8f441c6441d827b43aabeb812cb4c79e9ee96b;p=vchess.git

diff --git a/server/sockets.js b/server/sockets.js
index d296efa1..fcaab83c 100644
--- a/server/sockets.js
+++ b/server/sockets.js
@@ -1,6 +1,7 @@
 const url = require('url');
 
 // Node version in Ubuntu 16.04 does not know about URL class
+// NOTE: url is already transformed, without ?xxx=yyy... parts
 function getJsonFromUrl(url)
 {
   const query = url.substr(2); //starts with "/?"
@@ -18,7 +19,14 @@ module.exports = function(wss) {
     const query = getJsonFromUrl(req.url);
     const sid = query["sid"];
     if (!!clients[sid])
-      return socket.send(JSON.stringify({code:"duplicate"}));
+    {
+      // Dummy messages listener: just send "duplicate" event on anything
+      // ('connect' events for Hall and Game, 'askfullgame' for observers)
+      return socket.on("message", objtxt => {
+        if (["connect","askfullgame"].includes(JSON.parse(objtxt).code))
+          socket.send(JSON.stringify({code:"duplicate"}));
+      });
+    }
     clients[sid] = {sock: socket, page: query["page"]};
     const notifyRoom = (page,code,obj={},excluded=[]) => {
       Object.keys(clients).forEach(k => {
@@ -38,17 +46,16 @@ module.exports = function(wss) {
       let obj = JSON.parse(objtxt);
       if (!!obj.target && !clients[obj.target])
         return; //receiver not connected, nothing we can do
-
-// TODO: debug
-console.log(obj.code + " " + clients[sid].page);
-
       switch (obj.code)
       {
         case "connect":
-          notifyRoom(query["page"], "connect"); //Hall or Game
-          if (query["page"].indexOf("/game/") >= 0)
+        {
+          const curPage = clients[sid].page;
+          notifyRoom(curPage, "connect"); //Hall or Game
+          if (curPage.indexOf("/game/") >= 0)
             notifyRoom("/", "gconnect"); //notify main hall
           break;
+        }
         case "pollclients":
         {
           const curPage = clients[sid].page;
@@ -59,20 +66,20 @@ console.log(obj.code + " " + clients[sid].page);
           break;
         }
         case "pollgamers":
-        {
-          const curPage = clients[sid].page;
           socket.send(JSON.stringify({code:"pollgamers",
             sockIds: Object.keys(clients).filter(k =>
               k != sid && clients[k].page.indexOf("/game/") >= 0
             )}));
           break;
-        }
         case "pagechange":
+          // page change clients[sid].page --> obj.page
+          // TODO: some offline rooms don't need to receive disconnect event
           notifyRoom(clients[sid].page, "disconnect");
           if (clients[sid].page.indexOf("/game/") >= 0)
             notifyRoom("/", "gdisconnect");
           clients[sid].page = obj.page;
-          notifyRoom(obj.page, "connect");
+          // No need to notify connection: it's self-sent in .vue file
+          //notifyRoom(obj.page, "connect");
           if (obj.page.indexOf("/game/") >= 0)
             notifyRoom("/", "gconnect");
           break;
@@ -80,6 +87,10 @@ console.log(obj.code + " " + clients[sid].page);
           clients[obj.target].sock.send(JSON.stringify(
             {code:"askidentity",from:sid}));
           break;
+        case "asklastate":
+          clients[obj.target].sock.send(JSON.stringify(
+            {code:"asklastate",from:sid}));
+          break;
         case "askchallenge":
           clients[obj.target].sock.send(JSON.stringify(
             {code:"askchallenge",from:sid}));