X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fviews%2FGame.vue;h=74dd01d229a8ef03f90778b59e3deb5af4a40945;hb=cf742aaf8995ca8be8fc1f2751e4cf28de5d69b6;hp=7d20dbe0ca95a6e4fe603781929685eb26c0d37c;hpb=6fba6e0c029afc74a780ef845a02659da53c84e0;p=vchess.git diff --git a/client/src/views/Game.vue b/client/src/views/Game.vue index 7d20dbe0..74dd01d2 100644 --- a/client/src/views/Game.vue +++ b/client/src/views/Game.vue @@ -45,6 +45,7 @@ import BaseGame from "@/components/BaseGame.vue"; import { store } from "@/store"; import { GameStorage } from "@/utils/gameStorage"; import { ppt } from "@/utils/datetime"; +import { extractTime } from "@/utils/timeControl"; export default { name: 'my-game', @@ -60,7 +61,7 @@ export default { rid: "" }, game: { }, //passed to BaseGame - oppConnected: false, + oppConnected: false, //TODO: use for styling corrMsg: "", //to send offline messages in corr games virtualClocks: [0, 0], //initialized with true game.clocks vr: null, //"variant rules" object initialized from FEN @@ -78,14 +79,25 @@ export default { } }, "game.clocks": function(newState) { - this.virtualClocks = newState.map(s => ppt(s)); + if (this.game.moves.length < 2) + { + // 1st move not completed yet: freeze time + this.virtualClocks = newState.map(s => ppt(s)); + return; + } const currentTurn = this.vr.turn; const colorIdx = ["w","b"].indexOf(currentTurn); let countdown = newState[colorIdx] - (Date.now() - this.game.initime[colorIdx])/1000; + this.virtualClocks = [0,1].map(i => { + const removeTime = i == colorIdx + ? (Date.now() - this.game.initime[colorIdx])/1000 + : 0; + return ppt(newState[i] - removeTime); + }); const myTurn = (currentTurn == this.game.mycolor); let clockUpdate = setInterval(() => { - if (countdown <= 0 || this.vr.turn != currentTurn) + if (countdown <= 0 || this.vr.turn != currentTurn || this.game.score != "*") { clearInterval(clockUpdate); if (countdown <= 0 && myTurn) @@ -105,6 +117,11 @@ export default { } }, 1000); }, + // In case variants array was't loaded when game was retrieved + "st.variants": function(variantArray) { + if (!!this.game.vname && this.game.vname == "") + this.game.vname = variantArray.filter(v => v.id == this.game.vid)[0].name; + }, }, created: function() { if (!!this.$route.params["id"]) @@ -113,7 +130,17 @@ export default { this.gameRef.rid = this.$route.query["rid"]; this.loadGame(); } - const socketMessageListener = msg => { + // TODO: onopen, ask lastState informations + update observers and players status + const socketCloseListener = () => { + store.socketCloseListener(); //reinitialize connexion (in store.js) + this.st.conn.addEventListener('message', this.socketMessageListener); + this.st.conn.addEventListener('close', socketCloseListener); + }; + this.st.conn.onmessage = this.socketMessageListener; + this.st.conn.onclose = socketCloseListener; + }, + methods: { + socketMessageListener: function(msg) { const data = JSON.parse(msg.data); switch (data.code) { @@ -125,18 +152,21 @@ export default { case "pong": //received if we sent a ping (game still alive on our side) { this.oppConnected = true; - // Send our "last state" informations to opponent(s) - const L = this.game.moves.length; - this.st.conn.send(JSON.stringify({ - code: "lastate", - target: this.game.oppid, - gameId: this.gameRef.id, - lastMove: (L>0 ? this.game.moves[L-1] : undefined), - score: this.game.score, - movesCount: L, - drawOffer: this.drawOffer, - clocks: this.game.clocks, - })); + if (this.game.type == "live") //corr games are always complete + { + // Send our "last state" informations to opponent(s) + const L = this.game.moves.length; + this.st.conn.send(JSON.stringify({ + code: "lastate", + target: this.game.oppid, + gameId: this.gameRef.id, + lastMove: (L>0 ? this.game.moves[L-1] : undefined), + score: this.game.score, + movesCount: L, + drawOffer: this.drawOffer, + clocks: this.game.clocks, + })); + } break; } case "lastate": //got opponent infos about last move @@ -185,6 +215,16 @@ export default { case "abort": this.$refs["basegame"].endGame("?", "Abort: " + data.msg); break; + case "draw": + this.$refs["basegame"].endGame("1/2", "Mutual agreement"); + break; + case "drawoffer": + this.drawOffer = "received"; + break; + case "askfullgame": + // TODO: just give game; observers are listed here anyway: + // gameconnect? + break; // TODO: drawaccepted (click draw button before sending move ==> draw offer in move) // ==> on "newmove", check "drawOffer" field // TODO: also use (dis)connect info to count online players? @@ -204,44 +244,23 @@ export default { } break; } - }; - const socketCloseListener = () => { - this.st.conn.addEventListener('message', socketMessageListener); - this.st.conn.addEventListener('close', socketCloseListener); - }; - this.st.conn.onmessage = socketMessageListener; - this.st.conn.onclose = socketCloseListener; - }, - methods: { + }, offerDraw: function() { + // TODO: also for corr games if (this.drawOffer == "received") { - if (!confirm("Offer draw?")) + if (!confirm("Accept draw?")) return; this.st.conn.send(JSON.stringify({code:"draw", target:this.game.oppid})); + this.$refs["basegame"].endGame("1/2", "Mutual agreement"); + } else if (this.drawOffer == "sent") this.drawOffer = ""; else { if (!confirm("Offer draw?")) return; - // Stay in "draw offer sent" state until next move is played - this.drawOfferSent = true; - if (this.subMode == "corr") - { - // TODO: set drawOffer on in game (how ?) - } - else //live game - { - this.opponents.forEach(o => { - if (!!o.online) - { - try { - } catch (INVALID_STATE_ERR) { - return; - } - } - }); + this.st.conn.send(JSON.stringify({code:"drawoffer", target:this.game.oppid})); } }, // + conn handling: "draw" message ==> agree for draw (if we have "drawOffered" at true) @@ -287,14 +306,60 @@ export default { // - from remote peer (one live game I don't play, finished or not) loadGame: function(game) { const afterRetrieval = async (game) => { - const vModule = await import("@/variants/" + game.vname + ".js"); + // NOTE: variants array might not be available yet, thus the two next lines + const variantCell = this.st.variants.filter(v => v.id == game.vid); + const vname = (variantCell.length > 0 ? variantCell[0].name : ""); + if (!game.fen) + game.fen = game.fenStart; //game wasn't started + const gtype = (game.timeControl.indexOf('d') >= 0 ? "corr" : "live"); + if (gtype == "corr") + { + // corr game: needs to compute the clocks + initime + //if (game.players[i].rtime < 0) initime = Date.now(), else compute, + //also using move.played fields + game.clocks = [-1, -1]; + game.initime = [0, 0]; + // TODO: compute clocks + initime + } + const tc = extractTime(game.timeControl); + // TODO: this is not really beautiful (uid on corr players...) + if (gtype == "corr" && game.players[0].color == "b") + [ game.players[0], game.players[1] ] = [ game.players[1], game.players[0] ]; + const myIdx = game.players.findIndex(p => { + return p.sid == this.st.user.sid || p.uid == this.st.user.id; + }); + if (game.clocks[0] < 0) //game unstarted + { + game.clocks = [tc.mainTime, tc.mainTime]; + game.initime[0] = Date.now(); + if (myIdx >= 0 && gtype == "live") + { + // I play in this live game; corr games don't have clocks+initime + GameStorage.update(game.id, + { + clocks: game.clocks, + initime: game.initime, + }); + } + } + const vModule = await import("@/variants/" + vname + ".js"); window.V = vModule.VariantRules; this.vr = new V(game.fen); - const myIdx = game.players.findIndex(p => p.sid == this.st.user.sid); + + + +//TODO: people, on connect, search for opponent....... +console.log(myIdx + " " + game.players[1-myIdx].sid); //otherwise this is undefined: + + + this.game = Object.assign({}, game, - // NOTE: assign mycolor here, since BaseGame could also bs VS computer + // NOTE: assign mycolor here, since BaseGame could also be VS computer { + type: gtype, + increment: tc.increment, + vname: vname, mycolor: [undefined,"w","b"][myIdx+1], // opponent sid not strictly required, but easier oppid: (myIdx < 0 ? undefined : game.players[1-myIdx].sid), @@ -303,14 +368,14 @@ export default { if (!!this.game.oppid) { // Send ping to server (answer pong if players[s] are connected) - this.st.conn.send(JSON.stringify({code:"ping", - target:this.game.oppid, gameId:this.gameRef.id})); + this.st.conn.send(JSON.stringify({code:"ping", target:this.game.oppid})); } }; if (!!game) return afterRetrival(game); if (!!this.gameRef.rid) { + this.st.conn.send(JSON.stringify({code:"askfullgame", target:this.gameRef.rid})); // TODO: just send a game request message to the remote player, // and when receiving answer just call loadGame(received_game) // + remote peer should have registered us as an observer @@ -338,12 +403,15 @@ export default { return obj; }, {}); // Send move ("newmove" event) to opponent(s) (if ours) - let addTime = undefined; + let addTime = 0; if (move.color == this.game.mycolor) { - const elapsed = Date.now() - this.game.initime[colorIdx]; - // elapsed time is measured in milliseconds - addTime = this.game.increment - elapsed/1000; + if (this.game.moves.length >= 2) //after first move + { + const elapsed = Date.now() - this.game.initime[colorIdx]; + // elapsed time is measured in milliseconds + addTime = this.game.increment - elapsed/1000; + } this.st.conn.send(JSON.stringify({ code: "newmove", target: this.game.oppid, @@ -355,28 +423,32 @@ export default { const nextIdx = ["w","b"].indexOf(this.vr.turn); GameStorage.update(this.gameRef.id, { - colorIdx: colorIdx, - nextIdx: nextIdx, move: filtered_move, fen: move.fen, - addTime: addTime, + clocks: this.game.clocks.map((t,i) => i==colorIdx + ? this.game.clocks[i] + addTime + : this.game.clocks[i]), + initime: this.game.initime.map((t,i) => i==nextIdx + ? Date.now() + : this.game.initime[i]), }); // Also update current game object: this.game.moves.push(move); this.game.fen = move.fen; - //TODO: just this.game.clocks[colorIdx] += (!!addTime ? addTime : 0); - this.$set(this.game.clocks, colorIdx, - this.game.clocks[colorIdx] + (!!addTime ? addTime : 0)); + //TODO: just this.game.clocks[colorIdx] += addTime; + this.$set(this.game.clocks, colorIdx, this.game.clocks[colorIdx] + addTime); this.game.initime[nextIdx] = Date.now(); }, // TODO: this update function should also work for corr games gameOver: function(score) { this.game.mode = "analyze"; - GameStorage.update(this.gameRef.id, - { - score: score, - }); + this.game.score = score; + GameStorage.update(this.gameRef.id, { score: score }); }, }, }; + +