X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fviews%2FHall.vue;h=ac2cb27e2ab8599a76d166d0fb01e3e885f8bcd4;hb=66d03f23c9ce085877c3f7272db44dc382762b5a;hp=59d544fca6c91a21a0943acb30db9a424e0a463a;hpb=25996aedafba5e983f324ada3db1da59206bec0a;p=vchess.git diff --git a/client/src/views/Hall.vue b/client/src/views/Hall.vue index 59d544fc..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) @@ -131,9 +131,10 @@ export default { {uid: this.st.user.id, excluded: true}, response => { this.games = this.games.concat(response.games.map(g => { - const tc = - return Object.assign({}, g, {mainT - }); + const type = this.classifyObject(g); + const vname = this.getVname(g.vid); + return Object.assign({}, g, {type: type, vname: vname}); + })); } ); // Also ask for corr challenges (open + sent to me) @@ -170,7 +171,7 @@ export default { return this.challenges.filter(c => c.type == type); }, filterGames: function(type) { - return this.games.filter(c => c.type == type); + return this.games.filter(g => g.type == type); }, classifyObject: function(o) { //challenge or game // Heuristic: should work for most cases... (TODO) @@ -254,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; } @@ -291,7 +293,7 @@ export default { // Minimal game informations: id: game.id, players: game.players.map(p => p.name), - vname: game.vname, + vid: game.vid, timeControl: game.timeControl, }; this.st.conn.send(JSON.stringify({code:"game", @@ -327,6 +329,7 @@ export default { { let newGame = data.game; newGame.type = this.classifyObject(data.game); + newGame.vname = this.getVname(data.game.vid); newGame.rid = data.from; newGame.score = "*"; this.games.push(newGame); @@ -335,12 +338,11 @@ 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); - // TODO: redirect to game - } else { // TODO: notify with game link but do not redirect @@ -357,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": @@ -402,18 +405,10 @@ export default { // Send challenge to peers (if connected) this.sendSomethingTo(chall.to, "challenge", {chall:chall}, !!warnDisconnected); chall.added = Date.now(); + // NOTE: vname and type are redundant (can be deduced from timeControl + vid) chall.type = ctype; chall.vname = vname; - - - - -// TODO: vname and type are redundant (can be deduced from timeControl + vid) - - - - - 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; @@ -452,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) @@ -464,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 @@ -476,23 +475,18 @@ 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} ); } }, // NOTE: when launching game, the challenge is already deleted launchGame: async function(c) { - const vname = this.getVname(c.vid); - const vModule = await import("@/variants/" + vname + ".js"); + const vModule = await import("@/variants/" + c.vname + ".js"); window.V = vModule.VariantRules; // These game informations will be sent to other players const gameInfo = @@ -501,10 +495,10 @@ export default { fen: c.fen || V.GenRandInitFen(), players: shuffle([c.from, c.seat]), //white then black vid: c.vid, - timeControl: tc.timeControl, + 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 @@ -514,25 +508,24 @@ export default { "POST", {gameInfo: gameInfo} ); + // TODO: redirection here } }, - // NOTE: for live games only (corr games are launched on server) + // NOTE: for live games only (corr games start on the server) startNewGame: function(gameInfo) { - // Extract times (in [milli]seconds), set clocks - const tc = extractTime(c.timeControl); const game = Object.assign({}, gameInfo, { // (other) Game infos: constant fenStart: gameInfo.fen, // Game state (including FEN): will be updated moves: [], - clocks: [tc.mainTime, tc.mainTime], - initime: [Date.now(), 0], + clocks: [-1, -1], //-1 = unstarted + 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); }, }, };