Add Castle Chess

[vchess.git] / server / sockets.js

diff --git a/server/sockets.js b/server/sockets.js
index 65e4163..9fa09bc 100644 (file)
--- a/server/sockets.js
+++ b/server/sockets.js
@@ -1,7 +1,4 @@
-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 "/?"
   let result = {};
@@ -90,47 +87,16 @@ 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 = {};
           Object.keys(clients[page]).forEach(k => {
-            // Avoid polling myself: no new information to get
-            if (k != sid) {
-              sockIds[k] = {};
-              Object.keys(clients[page][k]).forEach(x => {
+            sockIds[k] = {};
+            Object.keys(clients[page][k]).forEach(x => {
+              // Avoid polling my tmpId: no information to get
+              if (k != sid || x != tmpId)
                 sockIds[k][x] = { focus: clients[page][k][x].focus };
-              });
-            }
+            });
           });
           send(socket, { code: "pollclients", sockIds: sockIds });
           break;
@@ -139,30 +105,30 @@ module.exports = function(wss) {
           // From Hall
           let sockIds = {};
           Object.keys(clients["/"]).forEach(k => {
-            // Avoid polling myself: no new information to get
-            if (k != sid) {
-              sockIds[k] = {};
-              Object.keys(clients[page][k]).forEach(x => {
+            sockIds[k] = {};
+            Object.keys(clients[page][k]).forEach(x => {
+              // Avoid polling my tmpId: no information to get
+              if (k != sid || x != tmpId) {
                 sockIds[k][x] = {
                   page: "/",
                   focus: clients[page][k][x].focus
                 };
-              });
-            }
+              }
+            });
           });
           // NOTE: a "gamer" could also just be an observer
           Object.keys(clients).forEach(p => {
             if (p.indexOf("/game/") >= 0) {
               Object.keys(clients[p]).forEach(k => {
-                if (k != sid) {
-                  if (!sockIds[k]) sockIds[k] = {};
-                  Object.keys(clients[p][k]).forEach(x => {
+                if (!sockIds[k]) sockIds[k] = {};
+                Object.keys(clients[p][k]).forEach(x => {
+                  if (k != sid || x != tmpId) {
                     sockIds[k][x] = {
                       page: p,
                       focus: clients[p][k][x].focus
                     };
-                  });
-                }
+                  }
+                });
               });
             }
           });
@@ -210,6 +176,9 @@ module.exports = function(wss) {
                 clients[page][rid][rtmpId].socket,
                 { code: "askfullgame", from: [sid,tmpId] }
               );
+            } else {
+              // I'm the only person who have the game for the moment:
+              send(socket, { code: "fullgame", data: { empty: true } });
             }
           }
           break;
@@ -238,7 +207,8 @@ module.exports = function(wss) {
         case "rematchoffer":
         case "draw":
           // "newgame" message can provide a page (corr Game --> Hall)
-          notifyRoom(obj.page || page, obj.code, {data: obj.data}, obj.excluded);
+          notifyRoom(
+            obj.page || page, obj.code, {data: obj.data}, obj.excluded);
           break;
 
         case "rnewgame":
@@ -316,7 +286,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:
@@ -334,8 +310,8 @@ module.exports = function(wss) {
         case "lastate":
         {
           const pg = obj.target[2] || page; //required for identity and game
-          // NOTE: if in game we ask identity to opponent still in Hall,
-          // but leaving Hall, clients[pg] or clients[pg][target] could be undefined
+          // NOTE: if in game we ask identity to opponent still in Hall, but
+          // leaving Hall, clients[pg] or clients[pg][target] could be undef.
           if (!!clients[pg] && !!clients[pg][obj.target[0]]) {
             send(
               clients[pg][obj.target[0]][obj.target[1]].socket,