X-Git-Url: https://git.auder.net/pieces/Cwda/n_white_knight.svg?a=blobdiff_plain;f=server%2Fsockets.js;h=da748f0642fd12b60a94cb48ad03f83fb30effeb;hb=8b152adaed809e759bb2507ade9d2273783c4a39;hp=fea0f49e13848ba2cbe6283637761aecc49f82b2;hpb=714680114508183fba2c07231dbe8f90b5631b81;p=vchess.git

diff --git a/server/sockets.js b/server/sockets.js
index fea0f49e..da748f06 100644
--- a/server/sockets.js
+++ b/server/sockets.js
@@ -13,6 +13,13 @@ function getJsonFromUrl(url)
   return result;
 }
 
+// Helper to safe-send some message through a (web-)socket:
+function send(socket, message)
+{
+  if (!!socket && socket.readyState == 1)
+    socket.send(JSON.stringify(message));
+}
+
 module.exports = function(wss) {
   // Associative array page --> sid --> tmpId --> socket
   // "page" is either "/" for hall or "/game/some_gid" for Game,
@@ -24,12 +31,13 @@ module.exports = function(wss) {
     const tmpId = query["tmpId"];
     const page = query["page"];
     const notifyRoom = (page,code,obj={}) => {
+      if (!clients[page])
+        return;
       Object.keys(clients[page]).forEach(k => {
         Object.keys(clients[page][k]).forEach(x => {
           if (k == sid && x == tmpId)
             return;
-          clients[page][k][x].send(JSON.stringify(Object.assign(
-            {code:code, from:sid}, obj)));
+          send(clients[page][k][x], Object.assign({code:code, from:sid}, obj));
         });
       });
     };
@@ -46,21 +54,6 @@ module.exports = function(wss) {
     };
     const messageListener = (objtxt) => {
       let obj = JSON.parse(objtxt);
-      if (!!obj.target)
-      {
-        // Check if receiver is connected, because there may be some lag
-        // between a client disconnects and another notice.
-        if (Array.isArray(obj.target))
-        {
-          if (!clients[page][obj.target[0]] ||
-            !clients[page][obj.target[0]][obj.target[1]])
-          {
-            return;
-          }
-        }
-        else if (!clients[page][obj.target])
-          return;
-      }
       switch (obj.code)
       {
         // Wait for "connect" message to notify connection to the room,
@@ -76,7 +69,7 @@ module.exports = function(wss) {
         case "disconnect":
           // When page changes:
           deleteConnexion();
-          if (!clients[page][sid])
+          if (!clients[page] || !clients[page][sid])
           {
             // I effectively disconnected from this page:
             notifyRoom(page, "disconnect");
@@ -84,23 +77,53 @@ module.exports = function(wss) {
               notifyRoom("/", "gdisconnect", {page:page});
           }
           break;
+        case "killme":
+        {
+          // Self multi-connect: manual removal + disconnect
+          const doKill = (pg) => {
+            Object.keys(clients[pg][obj.sid]).forEach(x => {
+              send(clients[pg][obj.sid][x], {code: "killed"});
+            });
+            delete clients[pg][obj.sid];
+          };
+          const disconnectFromOtherConnexion = (pg,code,o={}) => {
+            Object.keys(clients[pg]).forEach(k => {
+              if (k != obj.sid)
+              {
+                Object.keys(clients[pg][k]).forEach(x => {
+                  send(clients[pg][k][x], Object.assign({code:code, from:obj.sid}, o));
+                });
+              }
+            });
+          };
+          Object.keys(clients).forEach(pg => {
+            if (!!clients[pg][obj.sid])
+            {
+              doKill(pg);
+              disconnectFromOtherConnexion(pg, "disconnect");
+              if (pg.indexOf("/game/") >= 0 && !!clients["/"])
+                disconnectFromOtherConnexion("/", "gdisconnect", {page:pg});
+            }
+          });
+          break;
+        }
         case "pollclients": //from Hall or Game
         {
           let sockIds = [];
           Object.keys(clients[page]).forEach(k => {
-            // Poll myself if I'm on at least another tab (same page)
-            if (k != sid || Object.keys(clients["/"][k]).length >= 2)
+            // Avoid polling myself: no new information to get
+            if (k != sid)
               sockIds.push(k);
           });
-          socket.send(JSON.stringify({code:"pollclients", sockIds:sockIds}));
+          send(socket, {code:"pollclients", sockIds:sockIds});
           break;
         }
         case "pollclientsandgamers": //from Hall
         {
           let sockIds = [];
           Object.keys(clients["/"]).forEach(k => {
-            // Poll myself if I'm on at least another tab (same page)
-            if (k != sid || Object.keys(clients["/"][k]).length >= 2)
+            // Avoid polling myself: no new information to get
+            if (k != sid)
               sockIds.push({sid:k});
           });
           // NOTE: a "gamer" could also just be an observer
@@ -113,7 +136,7 @@ module.exports = function(wss) {
               });
             }
           });
-          socket.send(JSON.stringify({code:"pollclientsandgamers", sockIds:sockIds}));
+          send(socket, {code:"pollclientsandgamers", sockIds:sockIds});
           break;
         }
 
@@ -125,7 +148,11 @@ module.exports = function(wss) {
         case "askgame":
         case "askfullgame":
         {
-          const tmpIds = Object.keys(clients[page][obj.target]);
+          // DEBUG:
+          //console.log(sid + " " + page + " " + obj.code + " " + obj.target + " " + obj.page);
+          //console.log(clients);
+          const pg = obj.page || page; //required for askidentity and askgame
+          const tmpIds = Object.keys(clients[pg][obj.target]);
           if (obj.target == sid) //targetting myself
           {
             const idx_myTmpid = tmpIds.findIndex(x => x == tmpId);
@@ -133,8 +160,7 @@ module.exports = function(wss) {
               tmpIds.splice(idx_myTmpid, 1);
           }
           const tmpId_idx = Math.floor(Math.random() * tmpIds.length);
-          clients[page][obj.target][tmpIds[tmpId_idx]].send(
-            JSON.stringify({code:obj.code, from:[sid,tmpId]}));
+          send(clients[pg][obj.target][tmpIds[tmpId_idx]], {code:obj.code, from:[sid,tmpId,page]});
           break;
         }
 
@@ -143,10 +169,7 @@ module.exports = function(wss) {
         case "startgame":
           Object.keys(clients[page][obj.target]).forEach(x => {
             if (obj.target != sid || x != tmpId)
-            {
-              clients[page][obj.target][x].send(JSON.stringify(
-                {code:obj.code, data:obj.data}));
-            }
+              send(clients[page][obj.target][x], {code:obj.code, data:obj.data});
           });
           break;
 
@@ -170,9 +193,11 @@ module.exports = function(wss) {
         case "game":
         case "identity":
         case "lastate":
-          clients[page][obj.target[0]][obj.target[1]].send(JSON.stringify(
-            {code:obj.code, data:obj.data}));
+        {
+          const pg = obj.target[2] || page; //required for identity and game
+          send(clients[pg][obj.target[0]][obj.target[1]], {code:obj.code, data:obj.data});
           break;
+        }
       }
     };
     const closeListener = () => {