X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fviews%2FHall.vue;h=59d544fca6c91a21a0943acb30db9a424e0a463a;hb=25996aedafba5e983f324ada3db1da59206bec0a;hp=d0cfdd17c975d54cfbb16163dccdee91a251b1f9;hpb=485fccd5c925e796b61d5ed0674f29d742ea1a13;p=vchess.git diff --git a/client/src/views/Hall.vue b/client/src/views/Hall.vue index d0cfdd17..59d544fc 100644 --- a/client/src/views/Hall.vue +++ b/client/src/views/Hall.vue @@ -124,16 +124,19 @@ export default { } if (this.st.user.id > 0) { - // Ask server for current corr games (all but mines) -// ajax( -// "/games", -// "GET", -// {excluded: this.st.user.id}, -// response => { -// this.games = this.games.concat(response.games); -// } -// ); - // Also ask for corr challenges (open + sent to me) + // Ask server for current corr games (all but mines) + ajax( + "/games", + "GET", + {uid: this.st.user.id, excluded: true}, + response => { + this.games = this.games.concat(response.games.map(g => { + const tc = + return Object.assign({}, g, {mainT + }); + } + ); + // Also ask for corr challenges (open + sent to me) ajax( "/challenges", "GET", @@ -146,16 +149,16 @@ export default { ); } // 0.1] Ask server for room composition: - const socketOpenListener = () => { + const funcPollClients = () => { this.st.conn.send(JSON.stringify({code:"pollclients"})); }; - this.st.conn.onopen = socketOpenListener; - // TODO: is this required here? - this.oldOnmessage = this.st.conn.onmessage || Function.prototype; + if (!!this.st.conn && this.st.conn.readyState == 1) //1 == OPEN state + funcPollClients(); + else //socket not ready yet (initial loading) + this.st.conn.onopen = funcPollClients; this.st.conn.onmessage = this.socketMessageListener; - const oldOnclose = this.st.conn.onclose; const socketCloseListener = () => { - oldOnclose(); //reinitialize connexion (in store.js) + store.socketCloseListener(); //reinitialize connexion (in store.js) this.st.conn.addEventListener('message', this.socketMessageListener); this.st.conn.addEventListener('close', socketCloseListener); }; @@ -176,18 +179,16 @@ export default { showGame: function(g) { // NOTE: we are an observer, since only games I don't play are shown here // ==> Moves sent by connected remote player(s) if live game - -// TODO: this doesn't work: choose a SID at random - // --> do we have players' names ? - - let url = "/" + g.id; + let url = "/game/" + g.id; if (g.type == "live") { - const sids = g.players.map(p => p.sid).join(","); - url += "?sids=" + sids; + const remotes = g.players.filter(p => this.people.some(pl => pl.sid == p.sid)); + const rIdx = (remotes.length == 1 ? 0 : Math.floor(Math.random()*2)); + url += "?rid=" + remotes[rIdx].sid; } this.$router.push(url); }, + // TODO: ...filter(...)[0].name, one-line, just remove this function getVname: function(vid) { const vIdx = this.st.variants.findIndex(v => v.id == vid); return this.st.variants[vIdx].name; @@ -232,9 +233,6 @@ export default { }, // Messaging center: socketMessageListener: function(msg) { - // Save and call current st.conn.onmessage if one was already defined - // --> also needed in future Game.vue (also in Chat.vue component) - this.oldOnmessage(msg); const data = JSON.parse(msg.data); switch (data.code) { @@ -317,7 +315,7 @@ export default { const pIdx = this.people.findIndex(p => p.sid == data.from); newChall.from = this.people[pIdx]; //may be anonymous newChall.added = Date.now(); //TODO: this is reception timestamp, not creation - newChall.vname = this.getVname(newChall.vid); //TODO: just send vname? + newChall.vname = this.getVname(newChall.vid); this.challenges.push(newChall); break; } @@ -325,19 +323,28 @@ export default { { // Receive game from some player (+sid) // NOTE: it may be correspondance (if newgame while we are connected) - let newGame = data.game; - newGame.type = this.classifyObject(data.game); - newGame.rid = data.from; - newGame.score = "*"; - this.games.push(newGame); + if (!this.games.some(g => g.id == data.game.id)) //ignore duplicates + { + let newGame = data.game; + newGame.type = this.classifyObject(data.game); + newGame.rid = data.from; + newGame.score = "*"; + this.games.push(newGame); + } break; } case "newgame": { - // New game just started: data contain all informations - this.startNewGame(data.gameInfo); - // TODO: if live, redirect to game - // if corr, notify with link but do not redirect + // New game just started: data contain all information + if (data.gameInfo.type == "live") + { + this.startNewGame(data.gameInfo); + // TODO: redirect to game + } + else + { + // TODO: notify with game link but do not redirect + } break; } case "refusechallenge": @@ -377,7 +384,7 @@ export default { tryChallenge: function(player) { if (player.id == 0) return; //anonymous players cannot be challenged - this.newchallenge.to[0] = player.name; + this.newchallenge.to = player.name; doClick("modalNewgame"); }, newChallenge: async function() { @@ -389,13 +396,7 @@ export default { return alert(error); const ctype = this.classifyObject(this.newchallenge); // NOTE: "from" information is not required here - let chall = - { - fen: this.newchallenge.fen, - to: this.newchallenge.to, - timeControl: this.newchallenge.timeControl, - vid: this.newchallenge.vid, - }; + let chall = Object.assign({}, this.newchallenge); const finishAddChallenge = (cid,warnDisconnected) => { chall.id = cid || "c" + getRandString(); // Send challenge to peers (if connected) @@ -403,6 +404,15 @@ export default { chall.added = Date.now(); chall.type = ctype; chall.vname = vname; + + + + +// TODO: vname and type are redundant (can be deduced from timeControl + vid) + + + + chall.from = this.st.user; this.challenges.push(chall); localStorage.setItem("challenge", JSON.stringify(chall)); @@ -464,6 +474,8 @@ export default { cid: c.id, target: c.from.sid})); } } + 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) @@ -482,17 +494,14 @@ export default { const vname = this.getVname(c.vid); const vModule = await import("@/variants/" + vname + ".js"); window.V = vModule.VariantRules; - let players = [c.from, c.seat]; // These game informations will be sent to other players const gameInfo = { gameId: getRandString(), fen: c.fen || V.GenRandInitFen(), - // Players' names may be required if game start when a player is offline - // Shuffle players order (white then black). - players: shuffle(players.map(p => { return {name:p.name, sid:p.sid} })), + players: shuffle([c.from, c.seat]), //white then black vid: c.vid, - timeControl: c.timeControl, + timeControl: tc.timeControl, }; this.st.conn.send(JSON.stringify({code:"newgame", gameInfo:gameInfo, target:c.seat.sid})); @@ -510,26 +519,16 @@ export default { // NOTE: for live games only (corr games are launched on server) startNewGame: function(gameInfo) { // Extract times (in [milli]seconds), set clocks - const tc = extractTime(gameInfo.timeControl); - let initime = [...Array(gameInfo.players.length)]; - initime[0] = Date.now(); - const game = - { - // Game infos: constant - gameId: gameInfo.gameId, - vname: this.getVname(gameInfo.vid), + const tc = extractTime(c.timeControl); + const game = Object.assign({}, gameInfo, { + // (other) Game infos: constant fenStart: gameInfo.fen, - players: gameInfo.players, - timeControl: gameInfo.timeControl, - increment: tc.increment, - mode: "live", //function for live games only - // Game state: will be updated - fen: gameInfo.fen, + // Game state (including FEN): will be updated moves: [], - clocks: [...Array(gameInfo.players.length)].fill(tc.mainTime), - initime: initime, + clocks: [tc.mainTime, tc.mainTime], + initime: [Date.now(), 0], score: "*", - }; + }); GameStorage.add(game); if (this.st.settings.sound >= 1) new Audio("/sounds/newgame.mp3").play().catch(err => {}); @@ -542,9 +541,3 @@ export default { - -