X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=server%2Fsockets.js;h=ed7275ff54250430091282e59c85ce2bedcae05e;hb=ab6f48ea4d9c549830f549f077c597f57ea4a57d;hp=891c516dd4b9d398f49acfcd7d54f8102733f197;hpb=cd0d7743323309fcfd241ccba959df81a77970c7;p=vchess.git diff --git a/server/sockets.js b/server/sockets.js index 891c516d..ed7275ff 100644 --- a/server/sockets.js +++ b/server/sockets.js @@ -68,14 +68,40 @@ module.exports = function(wss) { {code:"askchallenge",from:sid})); break; 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) { - clients[k].sock.send(JSON.stringify( - {code:"askgame", from: sid})); + 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:"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( @@ -110,7 +136,9 @@ module.exports = function(wss) { } break; case "newchat": - notifyRoom(query["page"], "newchat", {msg:obj.msg, name:obj.name}); + // 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":