X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fviews%2FHall.vue;h=c943ff53097d2fc8661bb368520e19487c8a933e;hb=0c4c389681ffae83130e9b0b70fe51ebbaf5e5e9;hp=9bcfd05ea45746558e35807404eaed4039902300;hpb=1611a25f25911da6a95fc0095b31c4b096a6638e;p=vchess.git diff --git a/client/src/views/Hall.vue b/client/src/views/Hall.vue index 9bcfd05e..c943ff53 100644 --- a/client/src/views/Hall.vue +++ b/client/src/views/Hall.vue @@ -45,15 +45,21 @@ main fieldset label(for="cadence") {{ st.tr["Cadence"] }} * div#predefinedCadences - button(type="button") 5+3 button(type="button") 15+5 button(type="button") 45+30 - button(type="button") 7d+2d + button(type="button") 3d + button(type="button") 7d input#cadence( type="text" v-model="newchallenge.cadence" - placeholder="5+0, 1h+30s, 7d+1d ..." + placeholder="5+0, 1h+30s, 5d ..." ) + fieldset + label(for="selectRandomLevel") {{ st.tr["Randomness"] }} * + select#selectRandomLevel(v-model="newchallenge.randomness") + option(value="0") {{ st.tr["Deterministic"] }} + option(value="1") {{ st.tr["Symmetric random"] }} + option(value="2") {{ st.tr["Asymmetric random"] }} fieldset(v-if="st.user.id > 0") label(for="selectPlayers") {{ st.tr["Play with?"] }} input#selectPlayers( @@ -71,7 +77,7 @@ main button(@click="newChallenge()") {{ st.tr["Send challenge"] }} input#modalPeople.modal( type="checkbox" - @click="resetChatColor()" + @click="resetSocialColor()" ) div#peopleWrap( role="dialog" @@ -83,14 +89,19 @@ main #players p( v-for="sid in Object.keys(people)" - v-if="!!people[sid].name" + v-if="people[sid].name" ) span {{ people[sid].name }} button.player-action( - v-if="isGamer(sid) || (st.user.id > 0 && sid!=st.user.sid)" - @click="challOrWatch(sid)" + v-if="isGamer(sid)" + @click="watchGame(sid)" + ) + | {{ st.tr["Observe"] }} + button.player-action( + v-else-if="st.user.id > 0 && sid!=st.user.sid" + @click="challenge(sid)" ) - | {{ getActionLabel(sid) }} + | {{ st.tr["Challenge"] }} p.anonymous @nonymous ({{ anonymousCount }}) #chat Chat( @@ -178,6 +189,7 @@ export default { vid: parseInt(localStorage.getItem("vid")) || 0, to: "", //name of challenged player (if any) cadence: localStorage.getItem("cadence") || "", + randomness: parseInt(localStorage.getItem("randomness")) || 2, // VariantRules object, stored to not interfere with // diagrams of targetted challenges: V: null, @@ -209,7 +221,8 @@ export default { anonymousCount: function() { let count = 0; Object.values(this.people).forEach(p => { - count += !p.name ? 1 : 0; + // Do not cound people who did not send their identity yet: + count += (!p.name && p.id === 0) ? 1 : 0; }); return count; } @@ -241,7 +254,7 @@ export default { let names = {}; response.challenges.forEach(c => { if (c.uid != this.st.user.id) names[c.uid] = ""; - else if (!!c.target && c.target != this.st.user.id) + else if (c.target && c.target != this.st.user.id) names[c.target] = ""; }); const addChallenges = () => { @@ -361,29 +374,23 @@ export default { isGamer: function(sid) { return this.people[sid].pages.some(p => p.indexOf("/game/") >= 0); }, - getActionLabel: function(sid) { - return this.people[sid].pages.some(p => p == "/") - ? "Challenge" - : "Observe"; + challenge: function(sid) { + // Available, in Hall (only) + this.newchallenge.to = this.people[sid].name; + document.getElementById("modalPeople").checked = false; + window.doClick("modalNewgame"); }, - challOrWatch: function(sid) { - if (this.people[sid].pages.some(p => p == "/")) { - // Available, in Hall - this.newchallenge.to = this.people[sid].name; - document.getElementById("modalPeople").checked = false; - window.doClick("modalNewgame"); - } else { - // In some game, maybe playing maybe not: show a random one - let gids = []; - this.people[sid].pages.forEach(p => { - const matchGid = p.match(/[a-zA-Z0-9]+$/); - if (matchGid) gids.push(matchGid[0]); - }); - const gid = gids[Math.floor(Math.random() * gids.length)]; - const game = this.games.find(g => g.id == gid); - if (game) this.showGame(game); - else this.$router.push("/game/" + gid); //game vs. me - } + watchGame: function(sid) { + // In some game, maybe playing maybe not: show a random one + let gids = []; + this.people[sid].pages.forEach(p => { + const matchGid = p.match(/[a-zA-Z0-9]+$/); + if (matchGid) gids.push(matchGid[0]); + }); + const gid = gids[Math.floor(Math.random() * gids.length)]; + const game = this.games.find(g => g.id == gid); + if (game) this.showGame(game); + else this.$router.push("/game/" + gid); //game vs. me }, showGame: function(g) { // NOTE: we are an observer, since only games I don't play are shown here @@ -393,13 +400,22 @@ export default { url += "?rid=" + g.rids[Math.floor(Math.random() * g.rids.length)]; this.$router.push(url); }, - resetChatColor: function() { + resetSocialColor: function() { // TODO: this is called twice, once on opening an once on closing document.getElementById("peopleBtn").classList.remove("somethingnew"); }, processChat: function(chat) { this.send("newchat", { data: chat }); }, + getOppsid: function(c) { + let oppsid = c.from.sid; //may not be defined if corr + offline opp + if (!oppsid) { + oppsid = Object.keys(this.people).find( + sid => this.people[sid].id == c.from.id + ); + } + return oppsid; + }, // Messaging center: socketMessageListener: function(msg) { if (!this.conn) return; @@ -412,17 +428,18 @@ export default { data.sockIds.forEach(s => { const page = s.page || "/"; if (s.sid != this.st.user.sid && !identityAsked[s.sid]) { - identityAsked[s.sid] = true; this.send("askidentity", { target: s.sid, page: page }); + identityAsked[s.sid] = true; } if (!this.people[s.sid]) - this.$set(this.people, s.sid, { id: 0, name: "", pages: [page] }); + // Do not set name or id: identity unknown yet + this.$set(this.people, s.sid, { pages: [page] }); else if (this.people[s.sid].pages.indexOf(page) < 0) this.people[s.sid].pages.push(page); if (!s.page) - //peer is in Hall + // Peer is in Hall this.send("askchallenge", { target: s.sid }); - //peer is in Game + // Peer is in Game else this.send("askgame", { target: s.sid, page: page }); }); break; @@ -434,20 +451,17 @@ export default { // So it's a good idea to ask identity if he was anonymous. // But only ask game / challenge if currently disconnected. if (!this.people[data.from]) { - this.$set(this.people, data.from, { - name: "", - id: 0, - pages: [page] - }); + this.$set(this.people, data.from, { pages: [page] }); if (data.code == "connect") this.send("askchallenge", { target: data.from }); else this.send("askgame", { target: data.from, page: page }); } else { - // append page if not already in list + // Append page if not already in list if (this.people[data.from].pages.indexOf(page) < 0) this.people[data.from].pages.push(page); } - if (this.people[data.from].id == 0) { + if (!this.people[data.from].name && this.people[data.from].id !== 0) { + // Identity not known yet this.newConnect[data.from] = true; //for self multi-connects tests this.send("askidentity", { target: data.from, page: page }); } @@ -502,6 +516,11 @@ export default { } case "identity": { const user = data.data; + this.$set(this.people, user.sid, { + id: user.id, + name: user.name, + pages: this.people[user.sid].pages + }); if (user.name) { // If I multi-connect, kill current connexion if no mark (I'm older) if ( @@ -515,14 +534,6 @@ export default { this.killed[this.st.user.sid] = true; } } - if (user.sid != this.st.user.sid) { - //I already know my identity... - this.$set(this.people, user.sid, { - id: user.id, - name: user.name, - pages: this.people[user.sid].pages - }); - } } delete this.newConnect[user.sid]; break; @@ -541,6 +552,7 @@ export default { id: c.id, from: this.st.user.sid, to: c.to, + randomness: c.randomness, fen: c.fen, vid: c.vid, cadence: c.cadence, @@ -561,6 +573,7 @@ export default { ) { let newChall = Object.assign({}, chall); newChall.type = this.classifyObject(chall); + newChall.randomness = chall.randomness; newChall.added = Date.now(); let fromValues = Object.assign({}, this.people[chall.from]); delete fromValues["pages"]; //irrelevant in this context @@ -595,7 +608,8 @@ export default { // NOTE: it may be live or correspondance const game = data.data; // Ignore games where I play (corr games) - if (game.players.every(p => p.id != this.st.user.id)) + if (game.players.every(p => + p.sid != this.st.user.sid || p.id != this.st.user.id)) { let locGame = this.games.find(g => g.id == game.id); if (!locGame) { @@ -719,6 +733,8 @@ export default { } // NOTE: "from" information is not required here let chall = Object.assign({}, this.newchallenge); + delete chall["V"]; + delete chall["diag"]; const finishAddChallenge = cid => { chall.id = cid || "c" + getRandString(); // Remove old challenge if any (only one at a time of a given type): @@ -753,6 +769,7 @@ export default { // Remember cadence + vid for quicker further challenges: localStorage.setItem("cadence", chall.cadence); localStorage.setItem("vid", chall.vid); + localStorage.setItem("randomness", chall.randomness); document.getElementById("modalNewgame").checked = false; // Show the challenge if not on current display if ( @@ -789,7 +806,9 @@ export default { }; this.launchGame(c); } else { - this.send("refusechallenge", { data: c.id, target: c.from.sid }); + const oppsid = this.getOppsid(c); + if (oppsid) + this.send("refusechallenge", { data: c.id, target: oppsid }); } this.send("deletechallenge", { data: c.id }); }, @@ -841,7 +860,7 @@ export default { // These game informations will be shared let gameInfo = { id: getRandString(), - fen: c.fen || V.GenRandInitFen(), + fen: c.fen || V.GenRandInitFen(c.randomness), // White player index 0, black player index 1: players: c.mycolor ? (c.mycolor == "w" ? [c.seat, c.from] : [c.from, c.seat]) @@ -849,13 +868,8 @@ export default { vid: c.vid, cadence: c.cadence }; - let oppsid = c.from.sid; //may not be defined if corr + offline opp - if (!oppsid) { - oppsid = Object.keys(this.people).find( - sid => this.people[sid].id == c.from.id - ); - } const notifyNewgame = () => { + const oppsid = this.getOppsid(c); if (oppsid) //opponent is online this.send("startgame", { data: gameInfo, target: oppsid }); @@ -896,7 +910,7 @@ export default { // If an error occurred, game is not added: abort if (!err) { if (this.st.settings.sound) - new Audio("/sounds/newgame.wav").play().catch(() => {}); + new Audio("/sounds/newgame.flac").play().catch(() => {}); this.$router.push("/game/" + gameInfo.id); } });