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

diff --git a/server/sockets.js b/server/sockets.js
index c2fd552b..553f8c60 100644
--- a/server/sockets.js
+++ b/server/sockets.js
@@ -17,36 +17,59 @@ module.exports = function(wss) {
   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) => {
+    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(Object.assign(
-            {code:code}, obj)));
+            {code:code, from:sid}, obj)));
         }
       });
     };
-    notifyRoom(query["page"],"connect",{sid:sid});
+    // 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.
     socket.on("message", objtxt => {
       let obj = JSON.parse(objtxt);
       if (!!obj.target && !clients[obj.target])
         return; //receiver not connected, nothing we can do
       switch (obj.code)
       {
+        case "connect":
+          notifyRoom(query["page"], "connect"); //Hall or Game
+          if (query["page"].indexOf("/game/") >= 0)
+            notifyRoom("/", "gconnect"); //notify main hall
+          break;
         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)}));
+              k != sid && clients[k].page == curPage
+            )}));
+          break;
+        }
+        case "pollgamers":
+          socket.send(JSON.stringify({code:"pollgamers",
+            sockIds: Object.keys(clients).filter(k =>
+              k != sid && clients[k].page.indexOf("/game/") >= 0
+            )}));
           break;
         case "pagechange":
-          notifyRoom(clients[sid].page, "disconnect", {sid:sid});
+          // page change clients[sid].page --> obj.page
+console.log(sid + " : page change: " + clients[sid].page + " --> " + obj.page);
+          notifyRoom(clients[sid].page, "disconnect");
+          if (clients[sid].page.indexOf("/game/") >= 0)
+            notifyRoom("/", "gdisconnect");
           clients[sid].page = obj.page;
-          notifyRoom(obj.page, "connect", {sid:sid});
+          notifyRoom(obj.page, "connect");
+          if (obj.page.indexOf("/game/") >= 0)
+            notifyRoom("/", "gconnect");
           break;
         case "askidentity":
           clients[obj.target].sock.send(JSON.stringify(
@@ -56,9 +79,41 @@ module.exports = function(wss) {
           clients[obj.target].sock.send(JSON.stringify(
             {code:"askchallenge",from:sid}));
           break;
-        case "askgame":
+        case "askgames":
+        {
+          // Check all clients playing, and send them a "askgame" message
+          let gameSids = {}; //game ID --> [sid1, sid2]
+          const regexpGid = /\/[a-zA-Z0-9]+$/;
+          Object.keys(clients).forEach(k => {
+            if (k != sid && clients[k].page.indexOf("/game/") >= 0)
+            {
+              const gid = clients[k].page.match(regexpGid)[0];
+              if (!gameSids[gid])
+                gameSids[gid] = [k];
+              else
+                gameSids[gid].push(k);
+            }
+          });
+          // Request only one client out of 2 (TODO: this is a bit heavy)
+          // Alt: ask game to all, and filter later?
+          Object.keys(gameSids).forEach(gid => {
+            const L = gameSids[gid].length;
+            const idx = L > 1
+              ? Math.floor(Math.random() * Math.floor(L))
+              : 0;
+            const rid = gameSids[gid][idx];
+            clients[rid].sock.send(JSON.stringify(
+              {code:"askgame", from: sid}));
+          });
+          break;
+        }
+        case "askfullgame":
           clients[obj.target].sock.send(JSON.stringify(
-            {code:"askgame",from:sid}));
+            {code:"askfullgame", from:sid}));
+          break;
+        case "fullgame":
+          clients[obj.target].sock.send(JSON.stringify(
+            {code:"fullgame", game:obj.game}));
           break;
         case "identity":
           clients[obj.target].sock.send(JSON.stringify(
@@ -81,17 +136,25 @@ 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":
-          notifyRoom(query["page"], "newchat",
-            {msg:obj.msg, name:obj.name, sid:sid})
+          notifyRoom(clients[sid].page, "newchat", {chat:obj.chat});
           break;
         // TODO: WebRTC instead in this case (most demanding?)
+        // --> At least do a "notifyRoom"
         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(
@@ -99,11 +162,11 @@ module.exports = function(wss) {
           break;
         case "resign":
           clients[obj.target].sock.send(JSON.stringify(
-            {code:"resign"}));
+            {code:"resign", side:obj.side}));
           break;
         case "abort":
           clients[obj.target].sock.send(JSON.stringify(
-            {code:"abort",msg:obj.msg}));
+            {code:"abort"}));
           break;
         case "drawoffer":
           clients[obj.target].sock.send(JSON.stringify(
@@ -111,7 +174,7 @@ module.exports = function(wss) {
           break;
         case "draw":
           clients[obj.target].sock.send(JSON.stringify(
-            {code:"draw"}));
+            {code:"draw", message:obj.message}));
           break;
       }
     });
@@ -119,6 +182,8 @@ module.exports = function(wss) {
       const page = clients[sid].page;
       delete clients[sid];
       notifyRoom(page, "disconnect");
+      if (page.indexOf("/game/") >= 0)
+        notifyRoom("/", "gdisconnect"); //notify main hall
     });
   });
 }