X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fviews%2FMyGames.vue;h=c9c34f348b68f25de69a3a97b88d3d2092b20577;hb=6b7b2cf720e6255e4da0dc34fee363c456346a58;hp=bcf7d18271ad08756e708ea901b5c581a3e13d5c;hpb=620a88ede2ad25e66d9cbb521388ee53e4a564c0;p=vchess.git diff --git a/client/src/views/MyGames.vue b/client/src/views/MyGames.vue index bcf7d182..c9c34f34 100644 --- a/client/src/views/MyGames.vue +++ b/client/src/views/MyGames.vue @@ -11,11 +11,13 @@ main v-show="display=='live'" :games="liveGames" @show-game="showGame" + @abortgame="abortGame" ) GameList( v-show="display=='corr'" :games="corrGames" @show-game="showGame" + @abortgame="abortGame" ) @@ -23,6 +25,7 @@ main import { store } from "@/store"; import { GameStorage } from "@/utils/gameStorage"; import { ajax } from "@/utils/ajax"; +import { getScoreMessage } from "@/utils/scoring"; import params from "@/parameters"; import { getRandString } from "@/utils/alea"; import GameList from "@/components/GameList.vue"; @@ -42,21 +45,39 @@ export default { }; }, created: function() { - GameStorage.getAll(true, localGames => { - localGames.forEach(g => (g.type = this.classifyObject(g))); + GameStorage.getAll(localGames => { + localGames.forEach(g => g.type = "live"); + this.decorate(localGames); this.liveGames = localGames; }); if (this.st.user.id > 0) { - ajax("/games", "GET", { uid: this.st.user.id }, res => { - res.games.forEach(g => (g.type = this.classifyObject(g))); - this.corrGames = res.games; - }); + ajax( + "/games", + "GET", + { + data: { uid: this.st.user.id }, + success: (res) => { + let serverGames = res.games.filter(g => { + const mySide = + g.players[0].uid == this.st.user.id + ? "White" + : "Black"; + return !g["deletedBy" + mySide]; + }); + serverGames.forEach(g => g.type = "corr"); + this.decorate(serverGames); + this.corrGames = serverGames; + } + } + ); } // Initialize connection this.connexionString = params.socketUrl + "/?sid=" + this.st.user.sid + + "&id=" + + this.st.user.id + "&tmpId=" + getRandString() + "&page=" + @@ -83,33 +104,92 @@ export default { elt.previousElementSibling.classList.remove("active"); else elt.nextElementSibling.classList.remove("active"); }, - // TODO: classifyObject is redundant (see Hall.vue) - classifyObject: function(o) { - return o.cadence.indexOf("d") === -1 ? "live" : "corr"; + tryShowNewsIndicator: function(type) { + if ( + (type == "live" && this.display == "corr") || + (type == "corr" && this.display == "live") + ) { + document + .getElementById(type + "Games") + .classList.add("somethingnew"); + } }, - showGame: function(game) { - // TODO: "isMyTurn" is duplicated (see GameList component). myColor also - const isMyTurn = (g) => { - if (g.score != "*") return false; - const myColor = - g.players[0].uid == this.st.user.id || - g.players[0].sid == this.st.user.sid - ? "w" - : "b"; - const rem = g.movesCount % 2; - return ( - (rem == 0 && myColor == "w") || - (rem == 1 && myColor == "b") - ); + // Called at loading to augment games with myColor + myTurn infos + decorate: function(games) { + games.forEach(g => { + g.myColor = + (g.type == "corr" && g.players[0].uid == this.st.user.id) || + (g.type == "live" && g.players[0].sid == this.st.user.sid) + ? 'w' + : 'b'; + // If game is over, myTurn doesn't exist: + if (g.score == "*") { + const rem = g.movesCount % 2; + if ((rem == 0 && g.myColor == 'w') || (rem == 1 && g.myColor == 'b')) + g.myTurn = true; + } + }); + }, + socketMessageListener: function(msg) { + const data = JSON.parse(msg.data); + let gamesArrays = { + "corr": this.corrGames, + "live": this.liveGames }; - if (game.type == "live" || !isMyTurn(game)) { + switch (data.code) { + case "notifyturn": + case "notifyscore": { + const info = data.data; + const type = (!!parseInt(info.gid) ? "corr" : "live"); + let game = gamesArrays[type].find(g => g.id == info.gid); + // "notifything" --> "thing": + const thing = data.code.substr(6); + game[thing] = info[thing]; + if (thing == "turn") game.myTurn = !game.myTurn; + this.$forceUpdate(); + this.tryShowNewsIndicator(type); + break; + } + case "notifynewgame": { + const gameInfo = data.data; + // st.variants might be uninitialized, + // if unlucky and newgame right after connect: + const v = this.st.variants.find(v => v.id == gameInfo.vid); + const vname = !!v ? v.name : ""; + const type = (gameInfo.cadence.indexOf('d') >= 0 ? "corr": "live"); + let game = Object.assign( + { + vname: vname, + type: type, + score: "*", + created: Date.now() + }, + gameInfo + ); + game.myTurn = + (type == "corr" && game.players[0].uid == this.st.user.id) || + (type == "live" && game.players[0].sid == this.st.user.sid); + gamesArrays[type].push(game); + this.$forceUpdate(); + this.tryShowNewsIndicator(type); + break; + } + } + }, + socketCloseListener: function() { + this.conn = new WebSocket(this.connexionString); + this.conn.addEventListener("message", this.socketMessageListener); + this.conn.addEventListener("close", this.socketCloseListener); + }, + showGame: function(game) { + if (game.type == "live" || !game.myTurn) { this.$router.push("/game/" + game.id); return; } // It's my turn in this game. Are there others? let nextIds = ""; - let otherCorrGamesMyTurn = this.corrGames.filter( - g => g.id != game.id && isMyTurn(g)); + let otherCorrGamesMyTurn = this.corrGames.filter(g => + g.id != game.id && !!g.myTurn); if (otherCorrGamesMyTurn.length > 0) { nextIds += "/?next=["; otherCorrGamesMyTurn.forEach(g => { nextIds += g.id + ","; }); @@ -118,29 +198,41 @@ export default { } this.$router.push("/game/" + game.id + nextIds); }, - socketMessageListener: function(msg) { - const data = JSON.parse(msg.data); - if (data.code == "changeturn") { - let games = !!parseInt(data.gid) - ? this.corrGames - : this.liveGames; - // NOTE: new move itself is not received, because it wouldn't be used. - let g = games.find(g => g.id == data.gid); - this.$set(g, "movesCount", g.movesCount + 1); - if ( - (g.type == "live" && this.display == "corr") || - (g.type == "corr" && this.display == "live") - ) { - document - .getElementById(g.type + "Games") - .classList.add("somethingnew"); - } + abortGame: function(game) { + // Special "trans-pages" case: from MyGames to Game + // TODO: also for corr games? (It's less important) + if (game.type == "live") { + const oppsid = + game.players[0].sid == this.st.user.sid + ? game.players[1].sid + : game.players[0].sid; + this.conn.send( + JSON.stringify( + { + code: "mabort", + gid: game.id, + // NOTE: target might not be online + target: oppsid + } + ) + ); + } + else if (!game.deletedByWhite || !game.deletedByBlack) { + // Set score if game isn't deleted on server: + ajax( + "/games", + "PUT", + { + data: { + gid: game.id, + newObj: { + score: "?", + scoreMsg: getScoreMessage("?") + } + } + } + ); } - }, - socketCloseListener: function() { - this.conn = new WebSocket(this.connexionString); - this.conn.addEventListener("message", this.socketMessageListener); - this.conn.addEventListener("close", this.socketCloseListener); } } };