X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=server%2Fsockets.js;h=d1489f71c394685ee45431d525c2c0d4dfb630fa;hb=584f81b93154313a3856112400b7df98e0eb2632;hp=f1853b50bc37af1a4e7740791a35d10cf91cd889;hpb=f854c94f5ba65f1797fd803416e53f057f29f151;p=vchess.git

diff --git a/server/sockets.js b/server/sockets.js
index f1853b50..d1489f71 100644
--- a/server/sockets.js
+++ b/server/sockets.js
@@ -2,8 +2,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)
-{
+function getJsonFromUrl(url) {
   const query = url.substr(2); //starts with "/?"
   let result = {};
   query.split("&").forEach((part) => {
@@ -13,9 +12,16 @@ 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,
+  // or "/mygames" for Mygames page (simpler: no 'people' array).
   // tmpId is required if a same user (browser) has different tabs
   let clients = {};
   wss.on("connection", (socket, req) => {
@@ -24,14 +30,27 @@ module.exports = function(wss) {
     const tmpId = query["tmpId"];
     const page = query["page"];
     const notifyRoom = (page,code,obj={}) => {
-      if (!clients[page])
-        return;
+      if (!clients[page]) return;
+      Object.keys(clients[page]).forEach(k => {
+        Object.keys(clients[page][k]).forEach(x => {
+          if (k == sid && x == tmpId) return;
+          send(
+            clients[page][k][x].socket,
+            Object.assign({ code: code, from: sid }, obj)
+          );
+        });
+      });
+    };
+    // For focus events: no need to target self
+    const notifyAllBut = (page,code,obj={},except) => {
+      if (!clients[page]) return;
       Object.keys(clients[page]).forEach(k => {
+        if (except.includes(k)) return;
         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].socket,
+            Object.assign({ code: code, from: sid }, obj)
+          );
         });
       });
     };
@@ -39,114 +58,95 @@ module.exports = function(wss) {
       if (!clients[page] || !clients[page][sid] || !clients[page][sid][tmpId])
         return; //job already done
       delete clients[page][sid][tmpId];
-      if (Object.keys(clients[page][sid]).length == 0)
-      {
+      if (Object.keys(clients[page][sid]).length == 0) {
         delete clients[page][sid];
-        if (Object.keys(clients[page]) == 0)
+        if (Object.keys(clients[page]).length == 0)
           delete clients[page];
       }
     };
+
+    const doDisconnect = () => {
+      deleteConnexion();
+      if (!clients[page] || !clients[page][sid]) {
+        // I effectively disconnected from this page:
+        notifyRoom(page, "disconnect");
+        if (page.indexOf("/game/") >= 0)
+          notifyRoom("/", "gdisconnect", { page:page });
+      }
+    };
     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)
-      {
+      switch (obj.code) {
         // 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.
-        case "connect":
-        {
+        case "connect": {
           notifyRoom(page, "connect");
           if (page.indexOf("/game/") >= 0)
-            notifyRoom("/", "gconnect", {page:page});
+            notifyRoom("/", "gconnect", { page:page });
           break;
         }
         case "disconnect":
           // When page changes:
-          deleteConnexion();
-          if (!clients[page] || !clients[page][sid])
-          {
-            // I effectively disconnected from this page:
-            notifyRoom(page, "disconnect");
-            if (page.indexOf("/game/") >= 0)
-              notifyRoom("/", "gdisconnect", {page:page});
-          }
+          doDisconnect();
           break;
-        case "killme":
-        {
+        case "killme": {
           // Self multi-connect: manual removal + disconnect
           const doKill = (pg) => {
             Object.keys(clients[pg][obj.sid]).forEach(x => {
-              clients[pg][obj.sid][x].send(JSON.stringify({code: "killed"}));
+              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)
-              {
+              if (k != obj.sid) {
                 Object.keys(clients[pg][k]).forEach(x => {
-                  clients[pg][k][x].send(JSON.stringify(Object.assign(
-                    {code:code, from:obj.sid}, o)));
+                  send(
+                    clients[pg][k][x].socket,
+                    Object.assign({ code: code, from: obj.sid }, o)
+                  );
                 });
               }
             });
           };
           Object.keys(clients).forEach(pg => {
-            if (!!clients[pg][obj.sid])
-            {
+            if (clients[pg][obj.sid]) {
               doKill(pg);
               disconnectFromOtherConnexion(pg, "disconnect");
-              if (pg.indexOf("/game/") >= 0 && !!clients["/"])
-                disconnectFromOtherConnexion("/", "gdisconnect", {page:pg});
+              if (pg.indexOf("/game/") >= 0 && clients["/"])
+                disconnectFromOtherConnexion("/", "gdisconnect", { page: pg });
             }
           });
           break;
         }
-        case "pollclients": //from Hall or Game
-        {
+        case "pollclients": {
+          // From Hall or Game
           let sockIds = [];
           Object.keys(clients[page]).forEach(k => {
             // Avoid polling myself: no new information to get
-            if (k != sid)
-              sockIds.push(k);
+            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
-        {
+        case "pollclientsandgamers": {
+          // From Hall
           let sockIds = [];
           Object.keys(clients["/"]).forEach(k => {
             // Avoid polling myself: no new information to get
-            if (k != sid)
-              sockIds.push({sid:k});
+            if (k != sid) sockIds.push({sid:k});
           });
           // NOTE: a "gamer" could also just be an observer
           Object.keys(clients).forEach(p => {
-            if (p != "/")
-            {
+            if (p != "/") {
               Object.keys(clients[p]).forEach(k => {
-                if (k != sid)
-                  sockIds.push({sid:k, page:p}); //page needed for gamers
+                // 'page' indicator is needed for gamers
+                if (k != sid) sockIds.push({ sid:k, page:p });
               });
             }
           });
-          socket.send(JSON.stringify({code:"pollclientsandgamers", sockIds:sockIds}));
+          send(socket, { code: "pollclientsandgamers", sockIds: sockIds });
           break;
         }
 
@@ -156,18 +156,22 @@ module.exports = function(wss) {
         case "asklastate":
         case "askchallenge":
         case "askgame":
-        case "askfullgame":
-        {
-          const tmpIds = Object.keys(clients[page][obj.target]);
-          if (obj.target == sid) //targetting myself
-          {
-            const idx_myTmpid = tmpIds.findIndex(x => x == tmpId);
-            if (idx_myTmpid >= 0)
-              tmpIds.splice(idx_myTmpid, 1);
+        case "askfullgame": {
+          const pg = obj.page || page; //required for askidentity and askgame
+          // In cas askfullgame to wrong SID for example, would crash:
+          if (!!clients[pg] && !!clients[pg][obj.target]) {
+            const tmpIds = Object.keys(clients[pg][obj.target]);
+            if (obj.target == sid) {
+              // Targetting myself
+              const idx_myTmpid = tmpIds.findIndex(x => x == tmpId);
+              if (idx_myTmpid >= 0) tmpIds.splice(idx_myTmpid, 1);
+            }
+            const tmpId_idx = Math.floor(Math.random() * tmpIds.length);
+            send(
+              clients[pg][obj.target][tmpIds[tmpId_idx]].socket,
+              { code: obj.code, from: [sid,tmpId,page] }
+            );
           }
-          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]}));
           break;
         }
 
@@ -176,24 +180,110 @@ 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].socket,
+                { code: obj.code, data: obj.data }
+              );
           });
           break;
 
         // Notify all room: mostly game events
         case "newchat":
         case "newchallenge":
-        case "newgame":
         case "deletechallenge":
-        case "newmove":
+        case "newgame":
         case "resign":
         case "abort":
         case "drawoffer":
+        case "rematchoffer":
         case "draw":
-          notifyRoom(page, obj.code, {data:obj.data});
+          if (!!obj.oppsid)
+            // "newgame" message from Hall: do not target players
+            notifyAllBut(page, "newgame", {data: obj.data}, [sid, obj.oppsid]);
+          else notifyRoom(page, obj.code, {data: obj.data});
+          break;
+
+        case "rnewgame":
+          // A rematch game started: players are already informed
+          notifyAllBut(page, "newgame", {data: obj.data}, [sid]);
+          notifyAllBut("/", "newgame", {data: obj.data}, [sid, obj.oppsid]);
+          notifyRoom("/mygames", "newgame", {data: obj.data});
+          break;
+
+        case "newmove": {
+          const dataWithFrom = { from: [sid,tmpId], data: obj.data };
+          // Special case re-send newmove only to opponent:
+          if (!!obj.target && !!clients[page][obj.target]) {
+            Object.keys(clients[page][obj.target]).forEach(x => {
+              send(
+                clients[page][obj.target][x].socket,
+                Object.assign({ code: "newmove" }, dataWithFrom)
+              );
+            });
+          } else {
+            // NOTE: data.from is useful only to opponent
+            notifyRoom(page, "newmove", dataWithFrom);
+          }
+          break;
+        }
+        case "gotmove":
+          if (
+            !!clients[page][obj.target[0]] &&
+            !!clients[page][obj.target[0]][obj.target[1]]
+          ) {
+            send(
+              clients[page][obj.target[0]][obj.target[1]].socket,
+              { code: "gotmove" }
+            );
+          }
+          break;
+
+        case "result":
+          // Special case: notify all, 'transroom': Game --> Hall
+          notifyRoom("/", "result", { gid: obj.gid, score: obj.score });
+          break;
+
+        case "mconnect":
+          // Special case: notify some game rooms that
+          // I'm watching game state from MyGames
+          // TODO: this code is ignored for now
+          obj.gids.forEach(gid => {
+            const pg = "/game/" + gid;
+            Object.keys(clients[pg]).forEach(s => {
+              Object.keys(clients[pg][s]).forEach(x => {
+                send(
+                  clients[pg][s][x].socket,
+                  { code: "mconnect", from: sid }
+                );
+              });
+            });
+          });
+          break;
+        case "mdisconnect":
+          // TODO
+          // Also TODO: pass newgame to MyGames, and gameover (result)
+          break;
+        case "mabort": {
+          const gamePg = "/game/" + obj.gid;
+          if (!!clients[gamePg] && !!clients[gamePg][obj.target]) {
+            Object.keys(clients[gamePg][obj.target]).forEach(x => {
+              send(
+                clients[gamePg][obj.target][x].socket,
+                { code: "abort" }
+              );
+            });
+          }
+          break;
+        }
+
+        case "getfocus":
+        case "losefocus":
+          if (page == "/") notifyAllBut("/", obj.code, { page: "/" }, [sid]);
+          else {
+            // Notify game room + Hall:
+            notifyAllBut(page, obj.code, {}, [sid]);
+            notifyAllBut("/", obj.code, { page: page }, [sid]);
+          }
           break;
 
         // Passing, relaying something: from isn't needed,
@@ -203,22 +293,32 @@ 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
+          // NOTE: if in game we ask identity to opponent still in Hall,
+          // but leaving Hall, clients[pg] or clients[pg][target] could be undefined
+          if (!!clients[pg] && !!clients[pg][obj.target[0]]) {
+            send(
+              clients[pg][obj.target[0]][obj.target[1]].socket,
+              { code:obj.code, data:obj.data }
+            );
+          }
           break;
+        }
       }
     };
     const closeListener = () => {
-      // For tab or browser closing:
-      deleteConnexion();
+      // For browser or tab closing (including page reload):
+      doDisconnect();
     };
     // Update clients object: add new connexion
+    const newElt = { socket: socket, focus: true };
     if (!clients[page])
-      clients[page] = {[sid]: {[tmpId]: socket}};
+      clients[page] = { [sid]: {[tmpId]: newElt } };
     else if (!clients[page][sid])
-      clients[page][sid] = {[tmpId]: socket};
+      clients[page][sid] = { [tmpId]: newElt };
     else
-      clients[page][sid][tmpId] = socket;
+      clients[page][sid][tmpId] = newElt;
     socket.on("message", messageListener);
     socket.on("close", closeListener);
   });