From: Benjamin Auder Date: Fri, 8 Nov 2019 16:59:44 +0000 (+0100) Subject: Fix clocks while playing live game X-Git-Url: https://git.auder.net/variants/img/DESCRIPTION?a=commitdiff_plain;h=66d03f23c9ce085877c3f7272db44dc382762b5a;p=vchess.git Fix clocks while playing live game --- diff --git a/client/src/store.js b/client/src/store.js index a999b0ac..f95e488f 100644 --- a/client/src/store.js +++ b/client/src/store.js @@ -39,7 +39,7 @@ export const store = this.state.user.notify = res.notify; }); } - this.state.conn = new WebSocket(params.socketUrl + "/?sid=" + this.state.user.sid); + this.state.conn = new WebSocket(params.socketUrl + "/?sid=" + mysid); // Settings initialized with values from localStorage this.state.settings = { bcolor: localStorage["bcolor"] || "lichess", @@ -50,6 +50,7 @@ export const store = sqSize: parseInt(localStorage["sqSize"]), }; this.socketCloseListener = () => { + // Next line may fail at first, but should retry and eventually success (TODO?) this.state.conn = new WebSocket(params.socketUrl + "/?sid=" + mysid); }; this.state.conn.onclose = this.socketCloseListener; diff --git a/client/src/utils/gameStorage.js b/client/src/utils/gameStorage.js index 3bd99347..77acf943 100644 --- a/client/src/utils/gameStorage.js +++ b/client/src/utils/gameStorage.js @@ -75,8 +75,7 @@ export const GameStorage = { game.moves.push(obj.move); game.fen = obj.fen; - if (!!obj.addTime) //NaN if first move in game - game.clocks[obj.colorIdx] += obj.addTime; + game.clocks[obj.colorIdx] += obj.addTime; game.initime[obj.nextIdx] = Date.now(); } if (!!obj.score) diff --git a/client/src/views/Game.vue b/client/src/views/Game.vue index 0afbf078..47605c47 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', @@ -287,6 +288,12 @@ export default { loadGame: function(game) { const afterRetrieval = async (game) => { const vname = this.st.variants.filter(v => v.id == game.vid)[0].name; + const tc = extractTime(game.timeControl); + if (game.clocks[0] < 0) //game unstarted + { + game.clocks = [tc.mainTime, tc.mainTime]; + game.initime[0] = Date.now(); + } const vModule = await import("@/variants/" + vname + ".js"); window.V = vModule.VariantRules; this.vr = new V(game.fen); @@ -295,6 +302,7 @@ export default { game, // NOTE: assign mycolor here, since BaseGame could also bs VS computer { + increment: tc.increment, vname: vname, mycolor: [undefined,"w","b"][myIdx+1], // opponent sid not strictly required, but easier @@ -365,9 +373,8 @@ export default { // 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 diff --git a/client/src/views/Hall.vue b/client/src/views/Hall.vue index fa892599..ac2cb27e 100644 --- a/client/src/views/Hall.vue +++ b/client/src/views/Hall.vue @@ -70,7 +70,6 @@ import { getRandString, shuffle } from "@/utils/alea"; import GameList from "@/components/GameList.vue"; import ChallengeList from "@/components/ChallengeList.vue"; import { GameStorage } from "@/utils/gameStorage"; -import { extractTime } from "@/utils/timeControl"; export default { name: "my-hall", components: { @@ -112,7 +111,8 @@ export default { }, created: function() { // Always add myself to players' list - this.people.push(this.st.user); + const my = this.st.user; + this.people.push({sid:my.sid, id:my.id, name:my.name}); // Retrieve live challenge (not older than 30 minute) if any: const chall = JSON.parse(localStorage.getItem("challenge") || "false"); if (!!chall) @@ -255,7 +255,8 @@ export default { if (this.st.user.id > 0) { this.st.conn.send(JSON.stringify( - {code:"identity", user:this.st.user, target:data.from})); + // people[0] instead of st.user to avoid sending email + {code:"identity", user:this.people[0], target:data.from})); } break; } @@ -337,8 +338,10 @@ export default { } case "newgame": { + // TODO: next line required ?! + //ArrayFun.remove(this.challenges, c => c.id == data.cid); // New game just started: data contain all information - if (data.gameInfo.type == "live") + if (this.classifyObject(data.gameInfo) == "live") this.startNewGame(data.gameInfo); else { @@ -356,6 +359,7 @@ export default { { // NOTE: the challenge may be already removed ArrayFun.remove(this.challenges, c => c.id == data.cid); + localStorage.removeItem("challenge"); //in case of break; } case "connect": @@ -404,7 +408,7 @@ export default { // NOTE: vname and type are redundant (can be deduced from timeControl + vid) chall.type = ctype; chall.vname = vname; - chall.from = this.st.user; + chall.from = this.people[0]; //avoid sending email this.challenges.push(chall); localStorage.setItem("challenge", JSON.stringify(chall)); document.getElementById("modalNewgame").checked = false; @@ -443,6 +447,10 @@ export default { } }, clickChallenge: function(c) { + // In all cases, the challenge is consumed: + ArrayFun.remove(this.challenges, ch => ch.id == c.id); + // NOTE: deletechallenge event might be redundant (but it's easier this way) + this.sendSomethingTo((!!c.to ? c.from : null), "deletechallenge", {cid:c.id}); const myChallenge = (c.from.sid == this.st.user.sid //live || (this.st.user.id > 0 && c.from.id == this.st.user.id)); //corr if (!myChallenge) @@ -455,7 +463,7 @@ export default { } if (c.accepted) { - c.seat = this.st.user; + c.seat = this.people[0]; //avoid sending email this.launchGame(c); } else @@ -467,16 +475,12 @@ export default { } else localStorage.removeItem("challenge"); - // In all cases, the challenge is consumed: - ArrayFun.remove(this.challenges, ch => ch.id == c.id); - // NOTE: deletechallenge event might be redundant (but it's easier this way) - this.sendSomethingTo(c.to, "deletechallenge", {cid:c.id}); if (c.type == "corr") { ajax( "/challenges", "DELETE", - {id: this.challenges[cIdx].id} + {id: c.id} ); } }, @@ -494,7 +498,7 @@ export default { timeControl: c.timeControl, }; this.st.conn.send(JSON.stringify({code:"newgame", - gameInfo:gameInfo, target:c.seat.sid})); + gameInfo:gameInfo, target:c.from.sid, cid:c.id})); if (c.type == "live") this.startNewGame(gameInfo); else //corr: game only on server @@ -504,6 +508,7 @@ export default { "POST", {gameInfo: gameInfo} ); + // TODO: redirection here } }, // NOTE: for live games only (corr games start on the server) @@ -514,13 +519,13 @@ export default { // Game state (including FEN): will be updated moves: [], clocks: [-1, -1], //-1 = unstarted - initime: [0, 0], //timer starts after first 2 half-moves + initime: [0, 0], //initialized later score: "*", }); GameStorage.add(game); if (this.st.settings.sound >= 1) new Audio("/sounds/newgame.mp3").play().catch(err => {}); - // TODO: redirect to game + this.$router.push("/game/" + gameInfo.gameId); }, }, };