X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=server%2Fsockets.js;h=ea95dc5dc0e4d5eb61e0c05a152f17de49e0d273;hb=aae89b49a846b2c101d74db7dff9151392d6db34;hp=3854ca2f533ccc764d90bd6a25e17e0f52af66f7;hpb=1051336271ad4d4128ef1f66953f54973601d774;p=vchess.git diff --git a/server/sockets.js b/server/sockets.js index 3854ca2f..ea95dc5d 100644 --- a/server/sockets.js +++ b/server/sockets.js @@ -14,7 +14,7 @@ function getJsonFromUrl(url) { // Helper to safe-send some message through a (web-)socket: function send(socket, message) { - if (socket && socket.readyState == 1) + if (!!socket && socket.readyState == 1) socket.send(JSON.stringify(message)); } @@ -35,7 +35,7 @@ module.exports = function(wss) { if (k == sid && x == tmpId) return; send( clients[page][k][x], - Object.assign({code: code, from: sid}, obj) + Object.assign({ code: code, from: sid }, obj) ); }); }); @@ -57,7 +57,7 @@ module.exports = function(wss) { // 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 +69,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": @@ -90,7 +90,7 @@ module.exports = function(wss) { Object.keys(clients[pg][k]).forEach(x => { send( clients[pg][k][x], - Object.assign({code: code, from: obj.sid}, o) + Object.assign({ code: code, from: obj.sid }, o) ); }); } @@ -101,7 +101,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 +113,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": { @@ -128,11 +128,11 @@ module.exports = function(wss) { if (p != "/") { 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; } @@ -145,7 +145,7 @@ module.exports = function(wss) { 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]) { + if (!!clients[pg] && !!clients[pg][obj.target]) { const tmpIds = Object.keys(clients[pg][obj.target]); if (obj.target == sid) { // Targetting myself @@ -155,7 +155,7 @@ 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]} + { code: obj.code, from: [sid,tmpId,page] } ); } break; @@ -168,7 +168,7 @@ module.exports = function(wss) { if (obj.target != sid || x != tmpId) send( clients[page][obj.target][x], - {code: obj.code, data: obj.data} + { code: obj.code, data: obj.data } ); }); break; @@ -178,7 +178,6 @@ module.exports = function(wss) { case "newchallenge": case "newgame": case "deletechallenge": - case "newmove": case "resign": case "abort": case "drawoffer": @@ -186,9 +185,37 @@ module.exports = function(wss) { 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}); + notifyRoom("/", "result", { gid: obj.gid, score: obj.score }); break; case "mconnect": @@ -201,7 +228,7 @@ module.exports = function(wss) { Object.keys(clients[pg][s]).forEach(x => { send( clients[pg][s][x], - {code: "mconnect", data: obj.data} + { code: "mconnect", data: obj.data } ); }); }); @@ -211,6 +238,18 @@ module.exports = function(wss) { // TODO // Also TODO: pass newgame to MyGames, and gameover (result) break; + case "mabort": { + const gamePg = "/game/" + obj.gid; + if (!!clients[gamePg] && !!clients[gamePg][obj.target]) { + Object.keys(clients[gamePg][target]).forEach(x => { + send( + clients[gamePg][obj.target][x], + { code: "abort" } + ); + }); + } + break; + } // Passing, relaying something: from isn't needed, // but target is fully identified (sid + tmpId) @@ -222,9 +261,13 @@ 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 ndefined - if (clients[pg] && clients[pg][obj.target[0]]) - send(clients[pg][obj.target[0]][obj.target[1]], {code:obj.code, data:obj.data}); + // 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; } } @@ -235,9 +278,9 @@ module.exports = function(wss) { }; // Update clients object: add new connexion if (!clients[page]) - clients[page] = {[sid]: {[tmpId]: socket}}; + clients[page] = { [sid]: {[tmpId]: socket } }; else if (!clients[page][sid]) - clients[page][sid] = {[tmpId]: socket}; + clients[page][sid] = { [tmpId]: socket }; else clients[page][sid][tmpId] = socket; socket.on("message", messageListener);