X-Git-Url: https://git.auder.net/?p=vchess.git;a=blobdiff_plain;f=server%2Fsockets.js;h=b547c6a1fe9893b34346aede7e922cd9b1afaa45;hp=fe82f6e3166068cf2f744120123813462b8afa91;hb=80ee5d5a70f17f78900a8a3ae2d803ed1f2f14c9;hpb=92a523d1a74cbabcfd7d6ade45f25fa622815f0b

diff --git a/server/sockets.js b/server/sockets.js
index fe82f6e3..b547c6a1 100644
--- a/server/sockets.js
+++ b/server/sockets.js
@@ -21,23 +21,36 @@ 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
     socket.on("message", objtxt => {
       let obj = JSON.parse(objtxt);
       if (!!obj.target && !clients[obj.target])
         return; //receiver not connected, nothing we can do
+
+console.log(obj.code);
+console.log(clients);
+
       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 == obj.page)}));
+            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");
@@ -45,28 +58,36 @@ module.exports = function(wss) {
           notifyRoom(obj.page, "connect");
           break;
         case "askidentity":
-          clients[obj.target].sock.send(
-            JSON.stringify({code:"askidentity",from:sid}));
+          clients[obj.target].sock.send(JSON.stringify(
+            {code:"askidentity",from:sid}));
           break;
         case "askchallenge":
-          clients[obj.target].sock.send(
-            JSON.stringify({code:"askchallenge",from:sid}));
+          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}));
+          // 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}));
+            }
+          });
+          clients[obj.target].sock.send(JSON.stringify(
+            {code:"askgame",from:sid}));
           break;
         case "identity":
-          clients[obj.target].sock.send(
-            JSON.stringify({code:"identity",user:obj.user}));
+          clients[obj.target].sock.send(JSON.stringify(
+            {code:"identity",user:obj.user}));
           break;
         case "refusechallenge":
-          clients[obj.target].sock.send(
-            JSON.stringify({code:"refusechallenge", cid:obj.cid, from:sid}));
+          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}));
+          clients[obj.target].sock.send(JSON.stringify(
+            {code:"deletechallenge", cid:obj.cid, from:sid}));
           break;
         case "newgame":
           clients[obj.target].sock.send(JSON.stringify(
@@ -77,36 +98,44 @@ 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}));
+          notifyRoom(query["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}));
-          break;
-        case "ping":
-          // If this code is reached, then obj.target is connected
-          socket.send(JSON.stringify({code:"pong"}));
+          clients[obj.target].sock.send(JSON.stringify(
+            {code:"newmove", move:obj.move}));
           break;
         case "lastate":
-          const oppId = obj.target;
-          obj.oppid = sid; //I'm the opponent of my opponent
-          clients[oppId].sock.send(JSON.stringify(obj));
+          clients[obj.target].sock.send(JSON.stringify(
+            {code:"lastate", state:obj.state}));
           break;
         case "resign":
-          clients[obj.target].sock.send(JSON.stringify({code:"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}));
+          clients[obj.target].sock.send(JSON.stringify(
+            {code:"abort",msg:obj.msg}));
           break;
         case "drawoffer":
-          clients[obj.target].sock.send(JSON.stringify({code:"drawoffer"}));
+          clients[obj.target].sock.send(JSON.stringify(
+            {code:"drawoffer"}));
           break;
         case "draw":
-          clients[obj.target].sock.send(JSON.stringify({code:"draw"}));
+          clients[obj.target].sock.send(JSON.stringify(
+            {code:"draw"}));
           break;
       }
     });