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

diff --git a/server/sockets.js b/server/sockets.js
index fe82f6e3..3637c8f4 100644
--- a/server/sockets.js
+++ b/server/sockets.js
@@ -35,9 +35,10 @@ module.exports = function(wss) {
       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)}));
+              k != sid && clients[k].page == curPage)}));
           break;
         case "pagechange":
           notifyRoom(clients[sid].page, "disconnect");
@@ -45,28 +46,28 @@ 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}));
+          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(
@@ -81,32 +82,33 @@ module.exports = function(wss) {
             {code:"game", game:obj.game, from:sid}));
           break;
         case "newchat":
-          clients[obj.target].sock.send(JSON.stringify({code:"newchat",msg:obj.msg}));
+          clients[obj.target].sock.send(JSON.stringify(
+            {code:"newchat",msg:obj.msg}));
           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;
       }
     });