X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=server%2Fsockets.js;h=4907965d041a38575ee7a2959b547b9fe9dac2ab;hb=059228c9fd737361dc97de69811daed5abbd6254;hp=614696f327fe9bd4d7e181177fb22327a45b5239;hpb=f9c36b2da005b596ad656f4b6cc4e09ef3c656f1;p=vchess.git diff --git a/server/sockets.js b/server/sockets.js index 614696f3..4907965d 100644 --- a/server/sockets.js +++ b/server/sockets.js @@ -21,21 +21,27 @@ function send(socket, message) { module.exports = function(wss) { // Associative array page --> sid --> tmpId --> socket // "page" is either "/" for hall or "/game/some_gid" for Game, + // or "/mygames" for Mygames page (simpler: no 'people' array). // tmpId is required if a same user (browser) has different tabs let clients = {}; + let sidToPages = {}; + let idToSid = {}; wss.on("connection", (socket, req) => { const query = getJsonFromUrl(req.url); const sid = query["sid"]; + const id = query["id"]; const tmpId = query["tmpId"]; const page = query["page"]; - const notifyRoom = (page,code,obj={}) => { + const notifyRoom = (page, code, obj={}, except) => { if (!clients[page]) return; + except = except || []; Object.keys(clients[page]).forEach(k => { + if (except.includes(k)) return; Object.keys(clients[page][k]).forEach(x => { if (k == sid && x == tmpId) return; send( - clients[page][k][x], - Object.assign({code: code, from: sid}, obj) + clients[page][k][x].socket, + Object.assign({ code: code, from: sid }, obj) ); }); }); @@ -46,18 +52,26 @@ module.exports = function(wss) { delete clients[page][sid][tmpId]; if (Object.keys(clients[page][sid]).length == 0) { delete clients[page][sid]; + const pgIndex = sidToPages[sid].findIndex(pg => pg == page); + sidToPages[sid].splice(pgIndex, 1); if (Object.keys(clients[page]).length == 0) delete clients[page]; + // Am I totally offline? + if (sidToPages[sid].length == 0) { + delete sidToPages[sid]; + delete idToSid[id]; + } } }; const doDisconnect = () => { deleteConnexion(); - if (!clients[page] || !clients[page][sid]) { + // Nothing to notify when disconnecting from MyGames page: + if (page != "/mygames" && (!clients[page] || !clients[page][sid])) { // I effectively disconnected from this page: notifyRoom(page, "disconnect"); if (page.indexOf("/game/") >= 0) - notifyRoom("/", "gdisconnect", {page:page}); + notifyRoom("/", "gdisconnect", { page:page }); } }; const messageListener = (objtxt) => { @@ -69,7 +83,7 @@ module.exports = function(wss) { case "connect": { notifyRoom(page, "connect"); if (page.indexOf("/game/") >= 0) - notifyRoom("/", "gconnect", {page:page}); + notifyRoom("/", "gconnect", { page:page }); break; } case "disconnect": @@ -80,7 +94,7 @@ module.exports = function(wss) { // Self multi-connect: manual removal + disconnect const doKill = (pg) => { Object.keys(clients[pg][obj.sid]).forEach(x => { - send(clients[pg][obj.sid][x], {code: "killed"}); + send(clients[pg][obj.sid][x].socket, { code: "killed" }); }); delete clients[pg][obj.sid]; }; @@ -89,8 +103,8 @@ module.exports = function(wss) { if (k != obj.sid) { Object.keys(clients[pg][k]).forEach(x => { send( - clients[pg][k][x], - Object.assign({code: code, from: obj.sid}, o) + clients[pg][k][x].socket, + Object.assign({ code: code, from: obj.sid }, o) ); }); } @@ -101,7 +115,7 @@ module.exports = function(wss) { doKill(pg); disconnectFromOtherConnexion(pg, "disconnect"); if (pg.indexOf("/game/") >= 0 && clients["/"]) - disconnectFromOtherConnexion("/", "gdisconnect", {page: pg}); + disconnectFromOtherConnexion("/", "gdisconnect", { page: pg }); } }); break; @@ -113,7 +127,7 @@ module.exports = function(wss) { // Avoid polling myself: no new information to get if (k != sid) sockIds.push(k); }); - send(socket, {code: "pollclients", sockIds: sockIds}); + send(socket, { code: "pollclients", sockIds: sockIds }); break; } case "pollclientsandgamers": { @@ -125,14 +139,14 @@ module.exports = function(wss) { }); // NOTE: a "gamer" could also just be an observer Object.keys(clients).forEach(p => { - if (p != "/") { + if (p.indexOf("/game/") >= 0) { Object.keys(clients[p]).forEach(k => { // 'page' indicator is needed for gamers - if (k != sid) sockIds.push({sid:k, page:p}); + if (k != sid) sockIds.push({ sid:k, page:p }); }); } }); - send(socket, {code: "pollclientsandgamers", sockIds: sockIds}); + send(socket, { code: "pollclientsandgamers", sockIds: sockIds }); break; } @@ -140,7 +154,7 @@ module.exports = function(wss) { // but the requested resource can be from any tmpId (except current!) case "askidentity": case "asklastate": - case "askchallenge": + case "askchallenges": case "askgame": case "askfullgame": { const pg = obj.page || page; //required for askidentity and askgame @@ -154,8 +168,8 @@ module.exports = function(wss) { } const tmpId_idx = Math.floor(Math.random() * tmpIds.length); send( - clients[pg][obj.target][tmpIds[tmpId_idx]], - {code: obj.code, from: [sid,tmpId,page]} + clients[pg][obj.target][tmpIds[tmpId_idx]].socket, + { code: obj.code, from: [sid,tmpId,page] } ); } break; @@ -167,8 +181,8 @@ module.exports = function(wss) { Object.keys(clients[page][obj.target]).forEach(x => { if (obj.target != sid || x != tmpId) send( - clients[page][obj.target][x], - {code: obj.code, data: obj.data} + clients[page][obj.target][x].socket, + { code: obj.code, data: obj.data } ); }); break; @@ -176,68 +190,102 @@ module.exports = function(wss) { // Notify all room: mostly game events case "newchat": case "newchallenge": + case "deletechallenge_s": case "newgame": - case "deletechallenge": - case "newmove": case "resign": case "abort": case "drawoffer": + case "rematchoffer": case "draw": - // TODO: if newmove, change "from" field to fully specified sid + tmpId - // ==> allow "gotmove" messages to be fully targetted + notifyRoom(page, obj.code, {data: obj.data}, obj.excluded); + break; + + case "rnewgame": + // A rematch game started: + notifyRoom(page, "newgame", {data: obj.data}); + // Explicitely notify Hall if gametype == corr. + // Live games will be polled from Hall after gconnect event. + if (obj.data.cadence.indexOf('d') >= 0) + notifyRoom("/", "newgame", {data: obj.data}); + break; + + case "newmove": { + const dataWithFrom = { from: [sid,tmpId], data: obj.data }; // Special case re-send newmove only to opponent: - if (!!obj.target) { + if (!!obj.target && !!clients[page][obj.target]) { Object.keys(clients[page][obj.target]).forEach(x => { send( - clients[page][obj.target][x], - {code: "newmove", data: obj.data} + clients[page][obj.target][x].socket, + Object.assign({ code: "newmove" }, dataWithFrom) ); }); + } else { + // NOTE: data.from is useful only to opponent + notifyRoom(page, "newmove", dataWithFrom); } - else notifyRoom(page, obj.code, {data: obj.data}); break; - + } case "gotmove": - // TODO: should fully specify the target and be included in the last case below - if (!!clients[page][obj.target]) { - Object.keys(clients[page][obj.target]).forEach(x => { - send( - clients[pg][obj.target][x], - {code: "gotmove", data: obj.data} - ); - }); + if ( + !!clients[page][obj.target[0]] && + !!clients[page][obj.target[0]][obj.target[1]] + ) { + send( + clients[page][obj.target[0]][obj.target[1]].socket, + { code: "gotmove" } + ); } break; case "result": // Special case: notify all, 'transroom': Game --> Hall - notifyRoom("/", "result", {gid: obj.gid, score: obj.score}); + notifyRoom("/", "result", { gid: obj.gid, score: obj.score }); break; - case "mconnect": - // Special case: notify some game rooms that - // I'm watching game state from MyGames - // TODO: this code is ignored for now - obj.gids.forEach(gid => { - const pg = "/game/" + gid; - Object.keys(clients[pg]).forEach(s => { - Object.keys(clients[pg][s]).forEach(x => { - send( - clients[pg][s][x], - {code: "mconnect", data: obj.data} - ); - }); + case "mabort": { + const gamePg = "/game/" + obj.gid; + if (!!clients[gamePg] && !!clients[gamePg][obj.target]) { + Object.keys(clients[gamePg][obj.target]).forEach(x => { + send( + clients[gamePg][obj.target][x].socket, + { code: "abort" } + ); }); - }); + } + break; + } + + case "notifyscore": + case "notifyturn": + case "notifynewgame": + if (!!clients["/mygames"]) { + obj.targets.forEach(t => { + const k = t.sid || idToSid[t.id]; + if (!!clients["/mygames"][k]) { + Object.keys(clients["/mygames"][k]).forEach(x => { + send( + clients["/mygames"][k][x].socket, + { code: obj.code, data: obj.data } + ); + }); + } + }); + } break; - case "mdisconnect": - // TODO - // Also TODO: pass newgame to MyGames, and gameover (result) + + case "getfocus": + case "losefocus": + if (page == "/") notifyRoom("/", obj.code, { page: "/" }, [sid]); + else { + // Notify game room + Hall: + notifyRoom(page, obj.code, {}, [sid]); + notifyRoom("/", obj.code, { page: page }, [sid]); + } break; // Passing, relaying something: from isn't needed, // but target is fully identified (sid + tmpId) - case "challenge": + case "challenges": case "fullgame": case "game": case "identity": @@ -246,8 +294,12 @@ module.exports = function(wss) { const pg = obj.target[2] || page; //required for identity and game // NOTE: if in game we ask identity to opponent still in Hall, // but leaving Hall, clients[pg] or clients[pg][target] could be undefined - if (!!clients[pg] && !!clients[pg][obj.target[0]]) - send(clients[pg][obj.target[0]][obj.target[1]], {code:obj.code, data:obj.data}); + if (!!clients[pg] && !!clients[pg][obj.target[0]]) { + send( + clients[pg][obj.target[0]][obj.target[1]].socket, + { code:obj.code, data:obj.data } + ); + } break; } } @@ -257,12 +309,18 @@ module.exports = function(wss) { doDisconnect(); }; // Update clients object: add new connexion + const newElt = { socket: socket, focus: true }; if (!clients[page]) - clients[page] = {[sid]: {[tmpId]: socket}}; + clients[page] = { [sid]: {[tmpId]: newElt } }; else if (!clients[page][sid]) - clients[page][sid] = {[tmpId]: socket}; + clients[page][sid] = { [tmpId]: newElt }; else - clients[page][sid][tmpId] = socket; + clients[page][sid][tmpId] = newElt; + // Also update helper correspondances + if (!idToSid[id]) idToSid[id] = sid; + if (!sidToPages[sid]) sidToPages[sid] = []; + const pgIndex = sidToPages[sid].findIndex(pg => pg == page); + if (pgIndex === -1) sidToPages[sid].push(page); socket.on("message", messageListener); socket.on("close", closeListener); });