X-Git-Url: https://git.auder.net/?p=vchess.git;a=blobdiff_plain;f=server%2Fsockets.js;h=3a776d1d70c392082dbd540c141782fe5ce0cbc6;hp=e791293e11175cab3f6a9dd4d8ae1f3b36ad0fdd;hb=49dad26138d3dee0cacbb94ad8d3d3eff12c477a;hpb=c0b036aaf5a2a8e477c955623df2a8e5ce826151

diff --git a/server/sockets.js b/server/sockets.js
index e791293e..3a776d1d 100644
--- a/server/sockets.js
+++ b/server/sockets.js
@@ -90,36 +90,6 @@ module.exports = function(wss) {
           // When page changes:
           doDisconnect();
           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].socket, { 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].socket,
-                    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 Game
           let sockIds = {};
@@ -319,7 +289,13 @@ module.exports = function(wss) {
 
         case "getfocus":
         case "losefocus":
-          clients[page][sid][tmpId].focus = (obj.code == "getfocus");
+          if (
+            !!clients[page] &&
+            !!clients[page][sid] &&
+            !!clients[page][sid][tmpId]
+          ) {
+            clients[page][sid][tmpId].focus = (obj.code == "getfocus");
+          }
           if (page == "/") notifyRoom("/", obj.code, { page: "/" }, [sid]);
           else {
             // Notify game room + Hall: