X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=server%2Fsockets.js;h=cf5ea1b82bbc558f9f87c651f4c16c607b91b48e;hb=db1f1f9adb920605c7a16b060a7737e54636ee08;hp=c2fd552bc697c4fed96e982f375bb78463d44df9;hpb=5c8e044f7bab43ca8573fdf631f9b87daeda3ad0;p=vchess.git

diff --git a/server/sockets.js b/server/sockets.js
index c2fd552b..cf5ea1b8 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 "/?"
@@ -12,113 +13,242 @@ 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) {
-  let clients = {}; //associative array sid --> socket
+  // Associative array page --> sid --> tmpId --> socket
+  // "page" is either "/" for hall or "/game/some_gid" for Game,
+  // tmpId is required if a same user (browser) has different tabs
+  let clients = {};
   wss.on("connection", (socket, req) => {
     const query = getJsonFromUrl(req.url);
     const sid = query["sid"];
-    // TODO: later, allow duplicate connections (shouldn't be much more complicated)
-    if (!!clients[sid])
-      return socket.send(JSON.stringify({code:"duplicate"}));
-    clients[sid] = {sock: socket, page: query["page"]};
-    const notifyRoom = (page,code,obj) => {
-      Object.keys(clients).forEach(k => {
-        if (k != sid && clients[k].page == page)
-        {
-          clients[k].sock.send(JSON.stringify(Object.assign(
-            {code:code}, obj)));
-        }
+    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;
+          send(clients[page][k][x], Object.assign({code:code, from:sid}, obj));
+        });
       });
     };
-    notifyRoom(query["page"],"connect",{sid:sid});
-    socket.on("message", objtxt => {
+    const deleteConnexion = () => {
+      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)
+      {
+        delete clients[page][sid];
+        if (Object.keys(clients[page]) == 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 && !clients[obj.target])
-        return; //receiver not connected, nothing we can do
       switch (obj.code)
       {
-        case "pollclients":
-          const curPage = clients[sid].page;
-          socket.send(JSON.stringify({code:"pollclients",
-            sockIds: Object.keys(clients).filter(k =>
-              k != sid && clients[k].page == curPage)}));
+        // 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":
+        {
+          notifyRoom(page, "connect");
+          if (page.indexOf("/game/") >= 0)
+            notifyRoom("/", "gconnect", {page:page});
           break;
-        case "pagechange":
-          notifyRoom(clients[sid].page, "disconnect", {sid:sid});
-          clients[sid].page = obj.page;
-          notifyRoom(obj.page, "connect", {sid:sid});
+        }
+        case "disconnect":
+          // When page changes:
+          doDisconnect();
           break;
-        case "askidentity":
-          clients[obj.target].sock.send(JSON.stringify(
-            {code:"askidentity",from:sid}));
+        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 "askchallenge":
-          clients[obj.target].sock.send(JSON.stringify(
-            {code:"askchallenge",from:sid}));
+        }
+        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);
+          });
+          send(socket, {code:"pollclients", sockIds:sockIds});
           break;
-        case "askgame":
-          clients[obj.target].sock.send(JSON.stringify(
-            {code:"askgame",from:sid}));
+        }
+        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});
+          });
+          // NOTE: a "gamer" could also just be an observer
+          Object.keys(clients).forEach(p => {
+            if (p != "/")
+            {
+              Object.keys(clients[p]).forEach(k => {
+                if (k != sid)
+                  sockIds.push({sid:k, page:p}); //page needed for gamers
+              });
+            }
+          });
+          send(socket, {code:"pollclientsandgamers", sockIds:sockIds});
           break;
-        case "identity":
-          clients[obj.target].sock.send(JSON.stringify(
-            {code:"identity",user:obj.user}));
+        }
+
+        // Asking something: from is fully identified,
+        // but the requested resource can be from any tmpId (except current!)
+        case "askidentity":
+        case "asklastate":
+        case "askchallenge":
+        case "askgame":
+        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]],
+              {code:obj.code, from:[sid,tmpId,page]}
+            );
+          }
           break;
+        }
+
+        // Some Hall events: target all tmpId's (except mine),
         case "refusechallenge":
-          clients[obj.target].sock.send(JSON.stringify(
-            {code:"refusechallenge", cid:obj.cid, from:sid}));
-          break;
-        case "deletechallenge":
-          clients[obj.target].sock.send(JSON.stringify(
-            {code:"deletechallenge", cid:obj.cid, from:sid}));
-          break;
-        case "newgame":
-          clients[obj.target].sock.send(JSON.stringify(
-            {code:"newgame", gameInfo:obj.gameInfo, cid:obj.cid}));
-          break;
-        case "challenge":
-          clients[obj.target].sock.send(JSON.stringify(
-            {code:"challenge", chall:obj.chall, from:sid}));
-          break;
-        case "game":
-          clients[obj.target].sock.send(JSON.stringify(
-            {code:"game", game:obj.game, from:sid}));
+        case "startgame":
+          Object.keys(clients[page][obj.target]).forEach(x => {
+            if (obj.target != sid || x != tmpId)
+              send(clients[page][obj.target][x], {code:obj.code, data:obj.data});
+          });
           break;
+
+        // Notify all room: mostly game events
         case "newchat":
-          notifyRoom(query["page"], "newchat",
-            {msg:obj.msg, name:obj.name, sid:sid})
-          break;
-        // TODO: WebRTC instead in this case (most demanding?)
+        case "newchallenge":
+        case "newgame":
+        case "deletechallenge":
         case "newmove":
-          clients[obj.target].sock.send(JSON.stringify(
-            {code:"newmove",move:obj.move}));
-          break;
-        case "lastate":
-          clients[obj.target].sock.send(JSON.stringify(
-            {code:"lastate", state:obj.state}));
-          break;
         case "resign":
-          clients[obj.target].sock.send(JSON.stringify(
-            {code:"resign"}));
-          break;
         case "abort":
-          clients[obj.target].sock.send(JSON.stringify(
-            {code:"abort",msg:obj.msg}));
-          break;
         case "drawoffer":
-          clients[obj.target].sock.send(JSON.stringify(
-            {code:"drawoffer"}));
-          break;
         case "draw":
-          clients[obj.target].sock.send(JSON.stringify(
-            {code:"draw"}));
+        {
+          notifyRoom(page, obj.code, {data:obj.data});
+          const mygamesPg = "/mygames";
+          if (obj.code == "newmove" && clients[mygamesPg])
+          {
+            // Relay newmove info to myGames page
+            // NOTE: the move itself is not needed (for now at least)
+            const newmoveForMygames = {
+              gid: page.split("/")[2] //format is "/game/gid"
+            };
+            obj.data.players.forEach(pSid => {
+              if (clients[mygamesPg][pSid])
+              {
+                Object.keys(clients[mygamesPg][pSid]).forEach(x => {
+                  send(
+                    clients[mygamesPg][pSid][x],
+                    {code:"newmove", data:newmoveForMygames}
+                  );
+                });
+              }
+            });
+          }
+          break;
+        }
+
+        case "result":
+          // Special case: notify all, 'transroom': Game --> Hall
+          notifyRoom("/", "result", {gid:obj.gid, score:obj.score});
           break;
+
+        // Passing, relaying something: from isn't needed,
+        // but target is fully identified (sid + tmpId)
+        case "challenge":
+        case "fullgame":
+        case "game":
+        case "identity":
+        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 ndefined
+          if (clients[pg] && clients[pg][obj.target[0]])
+            send(clients[pg][obj.target[0]][obj.target[1]], {code:obj.code, data:obj.data});
+          break;
+        }
       }
-    });
-    socket.on("close", () => {
-      const page = clients[sid].page;
-      delete clients[sid];
-      notifyRoom(page, "disconnect");
-    });
+    };
+    const closeListener = () => {
+      // For browser or tab closing (including page reload):
+      doDisconnect();
+    };
+    // Update clients object: add new connexion
+    if (!clients[page])
+      clients[page] = {[sid]: {[tmpId]: socket}};
+    else if (!clients[page][sid])
+      clients[page][sid] = {[tmpId]: socket};
+    else
+      clients[page][sid][tmpId] = socket;
+    socket.on("message", messageListener);
+    socket.on("close", closeListener);
   });
 }