X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fviews%2FMyGames.vue;h=5148c3cfd00ab5f21445fecec10d1b673c74cb83;hb=e57c4de4148d43e7635e09adcde4e56585aea303;hp=41cced56f55d8ba78c1d85fe1f6fb8b0ef656483;hpb=e2590fa82708a57d89b3c60266b2eb1a6e31a9ce;p=vchess.git diff --git a/client/src/views/MyGames.vue b/client/src/views/MyGames.vue index 41cced56..5148c3cf 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,9 @@ 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"; export default { name: "my-my-games", @@ -34,31 +39,63 @@ export default { st: store.state, display: "live", liveGames: [], - corrGames: [] + corrGames: [], + conn: null, + connexionString: "" }; }, created: function() { - GameStorage.getAll(localGames => { - localGames.forEach(g => (g.type = this.classifyObject(g))); + GameStorage.getAll(true, localGames => { + localGames.forEach(g => g.type = "live"); 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.corrGames = serverGames; + } + } + ); } + // Initialize connection + this.connexionString = + params.socketUrl + + "/?sid=" + + this.st.user.sid + + "&tmpId=" + + getRandString() + + "&page=" + + encodeURIComponent(this.$route.path); + this.conn = new WebSocket(this.connexionString); + this.conn.onmessage = this.socketMessageListener; + this.conn.onclose = this.socketCloseListener; }, mounted: function() { const showType = localStorage.getItem("type-myGames") || "live"; this.setDisplay(showType); }, + beforeDestroy: function() { + this.conn.send(JSON.stringify({code: "disconnect"})); + }, methods: { setDisplay: function(type, e) { this.display = type; localStorage.setItem("type-myGames", type); let elt = e ? e.target : document.getElementById(type + "Games"); elt.classList.add("active"); + elt.classList.remove("somethingnew"); //in case of if (elt.previousElementSibling) elt.previousElementSibling.classList.remove("active"); else elt.nextElementSibling.classList.remove("active"); @@ -67,8 +104,96 @@ export default { classifyObject: function(o) { return o.cadence.indexOf("d") === -1 ? "live" : "corr"; }, - showGame: function(g) { - this.$router.push("/game/" + g.id); + 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") + ); + }; + if (game.type == "live" || !isMyTurn(game)) { + 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)); + if (otherCorrGamesMyTurn.length > 0) { + nextIds += "/?next=["; + otherCorrGamesMyTurn.forEach(g => { nextIds += g.id + ","; }); + // Remove last comma and close array: + nextIds = nextIds.slice(0, -1) + "]"; + } + this.$router.push("/game/" + game.id + nextIds); + }, + 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("?") + } + } + } + ); + } + }, + 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"); + } + } + }, + socketCloseListener: function() { + this.conn = new WebSocket(this.connexionString); + this.conn.addEventListener("message", this.socketMessageListener); + this.conn.addEventListener("close", this.socketCloseListener); } } }; @@ -83,4 +208,7 @@ export default { table.game-list max-height: 100% + +.somethingnew + background-color: #c5fefe !important