X-Git-Url: https://git.auder.net/?p=vchess.git;a=blobdiff_plain;f=server%2Fsockets.js;h=3b16653016a96e3deb40931a490f098e23efbd6c;hp=3637c8f47ea4ef495b4ecd59c44f40a0c26ee205;hb=c97830ea3ee97c6c408c62dab6c59da46cfd03d5;hpb=f41ce5806b989c06091a403d7e26ff3c457650c9

diff --git a/server/sockets.js b/server/sockets.js
index 3637c8f4..3b166530 100644
--- a/server/sockets.js
+++ b/server/sockets.js
@@ -21,13 +21,20 @@ module.exports = function(wss) {
     if (!!clients[sid])
       return socket.send(JSON.stringify({code:"duplicate"}));
     clients[sid] = {sock: socket, page: query["page"]};
-    const notifyRoom = (page,code) => {
+    const notifyRoom = (page,code,obj={},excluded=[]) => {
       Object.keys(clients).forEach(k => {
+        if (k in excluded)
+          return;
         if (k != sid && clients[k].page == page)
-          clients[k].sock.send(JSON.stringify({code:code,sid:sid}));
+        {
+          clients[k].sock.send(JSON.stringify(Object.assign(
+            {code:code, from:sid}, obj)));
+        }
       });
     };
-    notifyRoom(query["page"],"connect");
+    notifyRoom(query["page"], "connect"); //Hall or Game
+    if (query["page"].indexOf("/game/") >= 0)
+      notifyRoom("/", "connect"); //notify main hall
     socket.on("message", objtxt => {
       let obj = JSON.parse(objtxt);
       if (!!obj.target && !clients[obj.target])
@@ -37,13 +44,20 @@ module.exports = function(wss) {
         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)}));
+            sockIds: Object.keys(clients).filter(k => k != sid &&
+              (clients[k].page == curPage ||
+              // Consider that people playing are in Hall too:
+              (curPage == "/" && clients[k].page.indexOf("/game/") >= 0))
+            )}));
           break;
         case "pagechange":
           notifyRoom(clients[sid].page, "disconnect");
+          if (clients[sid].page.indexOf("/game/") >= 0)
+            notifyRoom("/", "disconnect");
           clients[sid].page = obj.page;
           notifyRoom(obj.page, "connect");
+          if (obj.page.indexOf("/game/") >= 0)
+            notifyRoom("/", "connect");
           break;
         case "askidentity":
           clients[obj.target].sock.send(JSON.stringify(
@@ -53,9 +67,15 @@ module.exports = function(wss) {
           clients[obj.target].sock.send(JSON.stringify(
             {code:"askchallenge",from:sid}));
           break;
-        case "askgame":
-          clients[obj.target].sock.send(JSON.stringify(
-            {code:"askgame",from:sid}));
+        case "askgames":
+          // Check all clients playing, and send them a "askgame" message
+          Object.keys(clients).forEach(k => {
+            if (k != sid && clients[k].page.indexOf("/game/") >= 0)
+            {
+              clients[k].sock.send(JSON.stringify(
+                {code:"askgame", from: sid}));
+            }
+          });
           break;
         case "identity":
           clients[obj.target].sock.send(JSON.stringify(
@@ -78,17 +98,26 @@ module.exports = function(wss) {
             {code:"challenge", chall:obj.chall, from:sid}));
           break;
         case "game":
-          clients[obj.target].sock.send(JSON.stringify(
-            {code:"game", game:obj.game, from:sid}));
+          if (!!obj.target)
+          {
+            clients[obj.target].sock.send(JSON.stringify(
+              {code:"game", game:obj.game, from:sid}));
+          }
+          else
+          {
+            // Notify all room except opponent and me:
+            notifyRoom("/", "game", {game:obj.game}, [obj.oppsid]);
+          }
           break;
         case "newchat":
-          clients[obj.target].sock.send(JSON.stringify(
-            {code:"newchat",msg:obj.msg}));
+          // WARNING: do not use query["page"], because the page may change
+          notifyRoom(clients[sid].page, "newchat",
+            {msg: obj.msg, name: obj.name});
           break;
         // TODO: WebRTC instead in this case (most demanding?)
         case "newmove":
           clients[obj.target].sock.send(JSON.stringify(
-            {code:"newmove",move:obj.move}));
+            {code:"newmove", move:obj.move}));
           break;
         case "lastate":
           clients[obj.target].sock.send(JSON.stringify(
@@ -116,6 +145,8 @@ module.exports = function(wss) {
       const page = clients[sid].page;
       delete clients[sid];
       notifyRoom(page, "disconnect");
+      if (page.indexOf("/game/") >= 0)
+        notifyRoom("/", "disconnect"); //notify main hall
     });
   });
 }