X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fviews%2FHall.vue;h=f9519fe2681d69493f80034f0436477d591876a7;hb=585d095517ca2aedab8ad125cc7c39b90e13d5cc;hp=fa42e8367acda162e9ab60362b8dccd06ac64966;hpb=f1e9798d91b10b7d30265305f5c26e3985669ef9;p=vchess.git diff --git a/client/src/views/Hall.vue b/client/src/views/Hall.vue index fa42e836..f9519fe2 100644 --- a/client/src/views/Hall.vue +++ b/client/src/views/Hall.vue @@ -280,6 +280,45 @@ export default { pages: [{ path: "/", focus: true }] } ); + const connectAndPoll = () => { + this.send("connect"); + this.send("pollclientsandgamers"); + }; + // Initialize connection + this.connexionString = + params.socketUrl + + "/?sid=" + + this.st.user.sid + + "&id=" + + this.st.user.id + + "&tmpId=" + + getRandString() + + "&page=" + + // Hall: path is "/" (could be hard-coded as well) + encodeURIComponent(this.$route.path); + this.conn = new WebSocket(this.connexionString); + this.conn.onopen = connectAndPoll; + this.conn.onmessage = this.socketMessageListener; + this.conn.onclose = this.socketCloseListener; + }, + mounted: function() { + document.addEventListener('visibilitychange', this.visibilityChange); + ["peopleWrap", "infoDiv", "newgameDiv"].forEach(eltName => { + document.getElementById(eltName) + .addEventListener("click", processModalClick); + }); + document.querySelectorAll("#predefinedCadences > button").forEach(b => { + b.addEventListener("click", () => { + this.newchallenge.cadence = b.innerHTML; + }); + }); + const dispCorr = this.$route.query["disp"]; + const showCtype = + dispCorr || localStorage.getItem("type-challenges") || "live"; + const showGtype = + dispCorr || localStorage.getItem("type-games") || "live"; + this.setDisplay('c', showCtype); + this.setDisplay('g', showGtype); // Ask server for current corr games (all but mines) ajax( "/games", @@ -287,6 +326,15 @@ export default { { data: { uid: this.st.user.id, excluded: true }, success: (response) => { + if ( + response.games.length > 0 && + this.games.length == 0 && + this.gdisplay == "live" + ) { + document + .getElementById("btnGcorr") + .classList.add("somethingnew"); + } this.games = this.games.concat( response.games.map(g => { const type = this.classifyObject(g); @@ -311,6 +359,15 @@ export default { { data: { uid: this.st.user.id }, success: (response) => { + if ( + response.challenges.length > 0 && + this.challenges.length == 0 && + this.cdisplay == "live" + ) { + document + .getElementById("btnCcorr") + .classList.add("somethingnew"); + } // Gather all senders names, and then retrieve full identity: // (TODO [perf]: some might be online...) let names = {}; @@ -357,68 +414,6 @@ export default { } } ); - const connectAndPoll = () => { - this.send("connect"); - this.send("pollclientsandgamers"); - }; - // Initialize connection - this.connexionString = - params.socketUrl + - "/?sid=" + - this.st.user.sid + - "&id=" + - this.st.user.id + - "&tmpId=" + - getRandString() + - "&page=" + - // Hall: path is "/" (could be hard-coded as well) - encodeURIComponent(this.$route.path); - this.conn = new WebSocket(this.connexionString); - this.conn.onopen = connectAndPoll; - this.conn.onmessage = this.socketMessageListener; - this.conn.onclose = this.socketCloseListener; - }, - mounted: function() { - document.addEventListener('visibilitychange', this.visibilityChange); - ["peopleWrap", "infoDiv", "newgameDiv"].forEach(eltName => { - document.getElementById(eltName) - .addEventListener("click", processModalClick); - }); - document.querySelectorAll("#predefinedCadences > button").forEach(b => { - b.addEventListener("click", () => { - this.newchallenge.cadence = b.innerHTML; - }); - }); - const dispCorr = this.$route.query["disp"]; - const showCtype = - dispCorr || localStorage.getItem("type-challenges") || "live"; - const showGtype = - dispCorr || localStorage.getItem("type-games") || "live"; - this.setDisplay('c', showCtype); - this.setDisplay('g', showGtype); - // Attempt to show something (at least a few correspondance challenges): - setTimeout( - () => { - const types = ["corr", "live"]; - for (let i of [0,1]) { - if ( - this.gdisplay == types[i] && - this.games.length > 0 && - this.games.every(g => g.type == types[1-i]) - ) { - this.setDisplay('g', types[1-i]); - } - if ( - this.cdisplay == types[i] && - this.challenges.length > 0 && - this.challenges.every(c => c.type == types[1-i]) - ) { - this.setDisplay('c', types[1-i]); - } - } - }, - 1500 - ); }, beforeDestroy: function() { document.removeEventListener('visibilitychange', this.visibilityChange); @@ -642,15 +637,14 @@ export default { } else { // Remove the matching live game if now unreachable const gid = data.page.match(/[a-zA-Z0-9]+$/)[0]; - const gidx = this.games.findIndex(g => g.id == gid); - if (gidx >= 0) { - const game = this.games[gidx]; - if ( - game.type == "live" && - game.rids.length == 1 && - game.rids[0] == data.from - ) { - this.games.splice(gidx, 1); + // Corr games are always reachable: + if (!gid.match(/^[0-9]+$/)) { + const gidx = this.games.findIndex(g => g.id == gid); + // NOTE: gidx should always be >= 0 (TODO?) + if (gidx >= 0) { + const game = this.games[gidx]; + ArrayFun.remove(game.rids, rid => rid == data.from); + if (game.rids.length == 0) this.games.splice(gidx, 1); } } } @@ -681,7 +675,7 @@ export default { alert(this.st.tr["New connexion detected: tab now offline"]); break; case "askidentity": { - // Request for identification (TODO: anonymous shouldn't need to reply) + // Request for identification const me = { // Decompose to avoid revealing email name: this.st.user.name, @@ -767,12 +761,12 @@ export default { } break; } - case "game": //individual request - case "newgame": { + case "game": { + // Individual request const game = data.data; // Ignore games where I play (will go in MyGames page) if (game.players.every(p => - p.sid != this.st.user.sid || p.uid != this.st.user.id)) + p.sid != this.st.user.sid && p.uid != this.st.user.id)) { let locGame = this.games.find(g => g.id == game.id); if (!locGame) { @@ -912,8 +906,9 @@ export default { else if ( ctype == "live" && Object.values(this.people).every(p => p.name != this.newchallenge.to) - ) + ) { error = this.newchallenge.to + " " + this.st.tr["is not online"]; + } } if (error) { alert(error); @@ -1125,10 +1120,7 @@ export default { if (!!oppsid) // Opponent is online this.send("startgame", { data: gameInfo, target: oppsid }); - // Send game info (only if live) to everyone except me and opponent - // TODO: this double message send could be avoided. - this.send("newgame", { data: gameInfo, oppsid: oppsid }); - // Also to MyGames page: + // Notify MyGames page: this.send( "notifynewgame", { @@ -1138,6 +1130,8 @@ export default { }) } ); + // NOTE: no need to send the game to the room, since I'll connect + // on game just after, the main Hall will be notified. }; if (c.type == "live") { notifyNewgame();