X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=server%2Fsockets.js;h=7de7abb94638189e3d0cc0c7f306e96d9f5ab2cb;hb=0234201fb338fc239d6f613c677fa932c7c3697c;hp=39cf260bf44929ca9b50d07b107ee8114ea44c2f;hpb=a041d5d84031f29fc001597a9ac958d6a3e6de76;p=vchess.git

diff --git a/server/sockets.js b/server/sockets.js
index 39cf260b..7de7abb9 100644
--- a/server/sockets.js
+++ b/server/sockets.js
@@ -24,9 +24,12 @@ module.exports = function(wss) {
   // or "/mygames" for Mygames page (simpler: no 'people' array).
   // tmpId is required if a same user (browser) has different tabs
   let clients = {};
+  let sidToPages = {};
+  let idToSid = {};
   wss.on("connection", (socket, req) => {
     const query = getJsonFromUrl(req.url);
     const sid = query["sid"];
+    const id = query["id"];
     const tmpId = query["tmpId"];
     const page = query["page"];
     const notifyRoom = (page,code,obj={}) => {
@@ -42,10 +45,10 @@ module.exports = function(wss) {
       });
     };
     // For focus events: no need to target self
-    const notifyAllButMe = (page,code,obj={}) => {
+    const notifyAllBut = (page,code,obj={},except) => {
       if (!clients[page]) return;
       Object.keys(clients[page]).forEach(k => {
-        if (k == sid) return;
+        if (except.includes(k)) return;
         Object.keys(clients[page][k]).forEach(x => {
           send(
             clients[page][k][x].socket,
@@ -60,14 +63,22 @@ module.exports = function(wss) {
       delete clients[page][sid][tmpId];
       if (Object.keys(clients[page][sid]).length == 0) {
         delete clients[page][sid];
+        const pgIndex = sidToPages[sid].findIndex(pg => pg == page);
+        sidToPages[sid].splice(pgIndex, 1);
         if (Object.keys(clients[page]).length == 0)
           delete clients[page];
+        // Am I totally offline?
+        if (sidToPages[sid].length == 0) {
+          delete sidToPages[sid];
+          delete idToSid[id];
+        }
       }
     };
 
     const doDisconnect = () => {
       deleteConnexion();
-      if (!clients[page] || !clients[page][sid]) {
+      // Nothing to notify when disconnecting from MyGames page:
+      if (page != "/mygames" && (!clients[page] || !clients[page][sid])) {
         // I effectively disconnected from this page:
         notifyRoom(page, "disconnect");
         if (page.indexOf("/game/") >= 0)
@@ -139,7 +150,7 @@ module.exports = function(wss) {
           });
           // NOTE: a "gamer" could also just be an observer
           Object.keys(clients).forEach(p => {
-            if (p != "/") {
+            if (p.indexOf("/game/") >= 0) {
               Object.keys(clients[p]).forEach(k => {
                 // 'page' indicator is needed for gamers
                 if (k != sid) sockIds.push({ sid:k, page:p });
@@ -154,7 +165,7 @@ module.exports = function(wss) {
         // but the requested resource can be from any tmpId (except current!)
         case "askidentity":
         case "asklastate":
-        case "askchallenge":
+        case "askchallenges":
         case "askgame":
         case "askfullgame": {
           const pg = obj.page || page; //required for askidentity and askgame
@@ -190,15 +201,23 @@ module.exports = function(wss) {
         // Notify all room: mostly game events
         case "newchat":
         case "newchallenge":
+        case "deletechallenge_s":
         case "newgame":
-        case "deletechallenge":
         case "resign":
         case "abort":
         case "drawoffer":
+        case "rematchoffer":
         case "draw":
           notifyRoom(page, obj.code, {data: obj.data});
           break;
 
+        case "rnewgame":
+          // A rematch game started:
+          // NOTE: no need to explicitely notify Hall: the game will be sent
+          notifyAllBut(page, "newgame", {data: obj.data}, [sid]);
+          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:
@@ -232,26 +251,6 @@ module.exports = function(wss) {
           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]) {
@@ -265,19 +264,37 @@ module.exports = function(wss) {
           break;
         }
 
+        case "notifyscore":
+        case "notifyturn":
+        case "notifynewgame":
+          if (!!clients["/mygames"]) {
+            obj.targets.forEach(t => {
+              const k = t.sid || idToSid[t.id];
+              if (!!clients["/mygames"][k]) {
+                Object.keys(clients["/mygames"][k]).forEach(x => {
+                  send(
+                    clients["/mygames"][k][x].socket,
+                    { code: obj.code, data: obj.data }
+                  );
+                });
+              }
+            });
+          }
+          break;
+
         case "getfocus":
         case "losefocus":
-          if (page == "/") notifyAllButMe("/", obj.code, { page: "/" });
+          if (page == "/") notifyAllBut("/", obj.code, { page: "/" }, [sid]);
           else {
             // Notify game room + Hall:
-            notifyAllButMe(page, obj.code);
-            notifyAllButMe("/", obj.code, { page: page });
+            notifyAllBut(page, obj.code, {}, [sid]);
+            notifyAllBut("/", obj.code, { page: page }, [sid]);
           }
           break;
 
         // Passing, relaying something: from isn't needed,
         // but target is fully identified (sid + tmpId)
-        case "challenge":
+        case "challenges":
         case "fullgame":
         case "game":
         case "identity":
@@ -308,6 +325,11 @@ module.exports = function(wss) {
       clients[page][sid] = { [tmpId]: newElt };
     else
       clients[page][sid][tmpId] = newElt;
+    // Also update helper correspondances
+    if (!idToSid[id]) idToSid[id] = sid;
+    if (!sidToPages[sid]) sidToPages[sid] = [];
+    const pgIndex = sidToPages[sid].findIndex(pg => pg == page);
+    if (pgIndex === -1) sidToPages[sid].push(page);
     socket.on("message", messageListener);
     socket.on("close", closeListener);
   });