X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=server%2Fsockets.js;h=406effeeea9553837274ddec62f784c7a5afeee5;hb=dcff8e82dd8bbc285d9c2d5d5e3b361a9ecfa9ac;hp=fea0f49e13848ba2cbe6283637761aecc49f82b2;hpb=714680114508183fba2c07231dbe8f90b5631b81;p=vchess.git diff --git a/server/sockets.js b/server/sockets.js index fea0f49e..406effee 100644 --- a/server/sockets.js +++ b/server/sockets.js @@ -2,8 +2,7 @@ const url = require('url'); // Node version in Ubuntu 16.04 does not know about URL class // NOTE: url is already transformed, without ?xxx=yyy... parts -function getJsonFromUrl(url) -{ +function getJsonFromUrl(url) { const query = url.substr(2); //starts with "/?" let result = {}; query.split("&").forEach((part) => { @@ -13,6 +12,12 @@ function getJsonFromUrl(url) return result; } +// Helper to safe-send some message through a (web-)socket: +function send(socket, message) { + if (!!socket && socket.readyState == 1) + socket.send(JSON.stringify(message)); +} + module.exports = function(wss) { // Associative array page --> sid --> tmpId --> socket // "page" is either "/" for hall or "/game/some_gid" for Game, @@ -24,12 +29,14 @@ module.exports = function(wss) { const tmpId = query["tmpId"]; const page = query["page"]; const notifyRoom = (page,code,obj={}) => { + if (!clients[page]) return; Object.keys(clients[page]).forEach(k => { Object.keys(clients[page][k]).forEach(x => { - if (k == sid && x == tmpId) - return; - clients[page][k][x].send(JSON.stringify(Object.assign( - {code:code, from:sid}, obj))); + if (k == sid && x == tmpId) return; + send( + clients[page][k][x], + Object.assign({code: code, from: sid}, obj) + ); }); }); }; @@ -37,37 +44,29 @@ module.exports = function(wss) { if (!clients[page] || !clients[page][sid] || !clients[page][sid][tmpId]) return; //job already done delete clients[page][sid][tmpId]; - if (Object.keys(clients[page][sid]).length == 0) - { + if (Object.keys(clients[page][sid]).length == 0) { delete clients[page][sid]; - if (Object.keys(clients[page]) == 0) + if (Object.keys(clients[page]).length == 0) delete clients[page]; } }; + + const doDisconnect = () => { + deleteConnexion(); + if (!clients[page] || !clients[page][sid]) { + // I effectively disconnected from this page: + notifyRoom(page, "disconnect"); + if (page.indexOf("/game/") >= 0) + notifyRoom("/", "gdisconnect", {page:page}); + } + }; const messageListener = (objtxt) => { let obj = JSON.parse(objtxt); - if (!!obj.target) - { - // Check if receiver is connected, because there may be some lag - // between a client disconnects and another notice. - if (Array.isArray(obj.target)) - { - if (!clients[page][obj.target[0]] || - !clients[page][obj.target[0]][obj.target[1]]) - { - return; - } - } - else if (!clients[page][obj.target]) - return; - } - switch (obj.code) - { + switch (obj.code) { // 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. - case "connect": - { + case "connect": { notifyRoom(page, "connect"); if (page.indexOf("/game/") >= 0) notifyRoom("/", "gconnect", {page:page}); @@ -75,45 +74,65 @@ module.exports = function(wss) { } case "disconnect": // When page changes: - deleteConnexion(); - if (!clients[page][sid]) - { - // I effectively disconnected from this page: - notifyRoom(page, "disconnect"); - if (page.indexOf("/game/") >= 0) - notifyRoom("/", "gdisconnect", {page:page}); - } + doDisconnect(); break; - case "pollclients": //from Hall or Game - { + case "killme": { + // 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"}); + }); + delete clients[pg][obj.sid]; + }; + const disconnectFromOtherConnexion = (pg,code,o={}) => { + Object.keys(clients[pg]).forEach(k => { + if (k != obj.sid) { + Object.keys(clients[pg][k]).forEach(x => { + send( + clients[pg][k][x], + Object.assign({code: code, from: obj.sid}, o) + ); + }); + } + }); + }; + Object.keys(clients).forEach(pg => { + if (clients[pg][obj.sid]) { + doKill(pg); + disconnectFromOtherConnexion(pg, "disconnect"); + if (pg.indexOf("/game/") >= 0 && clients["/"]) + disconnectFromOtherConnexion("/", "gdisconnect", {page: pg}); + } + }); + break; + } + case "pollclients": { + // From Hall or Game let sockIds = []; Object.keys(clients[page]).forEach(k => { - // Poll myself if I'm on at least another tab (same page) - if (k != sid || Object.keys(clients["/"][k]).length >= 2) - sockIds.push(k); + // Avoid polling myself: no new information to get + if (k != sid) sockIds.push(k); }); - socket.send(JSON.stringify({code:"pollclients", sockIds:sockIds})); + send(socket, {code: "pollclients", sockIds: sockIds}); break; } - case "pollclientsandgamers": //from Hall - { + case "pollclientsandgamers": { + // From Hall let sockIds = []; Object.keys(clients["/"]).forEach(k => { - // Poll myself if I'm on at least another tab (same page) - if (k != sid || Object.keys(clients["/"][k]).length >= 2) - sockIds.push({sid:k}); + // Avoid polling myself: no new information to get + if (k != sid) sockIds.push({sid:k}); }); // NOTE: a "gamer" could also just be an observer Object.keys(clients).forEach(p => { - if (p != "/") - { + if (p != "/") { Object.keys(clients[p]).forEach(k => { - if (k != sid) - sockIds.push({sid:k, page:p}); //page needed for gamers + // 'page' indicator is needed for gamers + if (k != sid) sockIds.push({sid:k, page:p}); }); } }); - socket.send(JSON.stringify({code:"pollclientsandgamers", sockIds:sockIds})); + send(socket, {code: "pollclientsandgamers", sockIds: sockIds}); break; } @@ -123,18 +142,22 @@ module.exports = function(wss) { case "asklastate": case "askchallenge": case "askgame": - case "askfullgame": - { - const tmpIds = Object.keys(clients[page][obj.target]); - if (obj.target == sid) //targetting myself - { - const idx_myTmpid = tmpIds.findIndex(x => x == tmpId); - if (idx_myTmpid >= 0) - tmpIds.splice(idx_myTmpid, 1); + case "askfullgame": { + const pg = obj.page || page; //required for askidentity and askgame + // In cas askfullgame to wrong SID for example, would crash: + if (!!clients[pg] && !!clients[pg][obj.target]) { + const tmpIds = Object.keys(clients[pg][obj.target]); + if (obj.target == sid) { + // Targetting myself + const idx_myTmpid = tmpIds.findIndex(x => x == tmpId); + if (idx_myTmpid >= 0) tmpIds.splice(idx_myTmpid, 1); + } + const tmpId_idx = Math.floor(Math.random() * tmpIds.length); + send( + clients[pg][obj.target][tmpIds[tmpId_idx]], + {code: obj.code, from: [sid,tmpId,page]} + ); } - const tmpId_idx = Math.floor(Math.random() * tmpIds.length); - clients[page][obj.target][tmpIds[tmpId_idx]].send( - JSON.stringify({code:obj.code, from:[sid,tmpId]})); break; } @@ -143,10 +166,10 @@ module.exports = function(wss) { case "startgame": Object.keys(clients[page][obj.target]).forEach(x => { if (obj.target != sid || x != tmpId) - { - clients[page][obj.target][x].send(JSON.stringify( - {code:obj.code, data:obj.data})); - } + send( + clients[page][obj.target][x], + {code: obj.code, data: obj.data} + ); }); break; @@ -155,12 +178,65 @@ module.exports = function(wss) { case "newchallenge": case "newgame": case "deletechallenge": - case "newmove": case "resign": case "abort": case "drawoffer": case "draw": - notifyRoom(page, obj.code, {data:obj.data}); + notifyRoom(page, obj.code, {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 && !!clients[page][obj.target]) { + Object.keys(clients[page][obj.target]).forEach(x => { + send( + clients[page][obj.target][x], + Object.assign({code: "newmove"}, dataWithFrom) + ); + }); + } else { + // NOTE: data.from is useful only to opponent + notifyRoom(page, "newmove", dataWithFrom); + } + break; + } + case "gotmove": + if ( + !!clients[page][obj.target[0]] && + !!clients[page][obj.target[0]][obj.target[1]] + ) { + send( + clients[page][obj.target[0]][obj.target[1]], + {code: "gotmove", data: obj.data} + ); + } + break; + + case "result": + // Special case: notify all, 'transroom': Game --> Hall + 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} + ); + }); + }); + }); + break; + case "mdisconnect": + // TODO + // Also TODO: pass newgame to MyGames, and gameover (result) break; // Passing, relaying something: from isn't needed, @@ -170,14 +246,19 @@ module.exports = function(wss) { case "game": case "identity": case "lastate": - clients[page][obj.target[0]][obj.target[1]].send(JSON.stringify( - {code:obj.code, data:obj.data})); + { + 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}); break; + } } }; const closeListener = () => { - // For tab or browser closing: - deleteConnexion(); + // For browser or tab closing (including page reload): + doDisconnect(); }; // Update clients object: add new connexion if (!clients[page])