<template lang="pug">
main
+ input#modalInfo.modal(type="checkbox")
+ div#infoDiv(
+ role="dialog"
+ data-checkbox="modalInfo"
+ )
+ .card.text-center
+ label.modal-close(for="modalInfo")
+ p(v-html="infoMessage")
input#modalNewgame.modal(type="checkbox")
- div(role="dialog" aria-labelledby="titleFenedit")
- .card.smallpad
+ div#newgameDiv(
+ role="dialog"
+ data-checkbox="modalNewgame"
+ )
+ .card
label#closeNewgame.modal-close(for="modalNewgame")
- fieldset
- label(for="selectVariant") {{ st.tr["Variant"] }}
- select#selectVariant(v-model="newchallenge.vid")
- option(v-for="v in st.variants" :value="v.id") {{ v.name }}
- fieldset
- label(for="selectNbPlayers") {{ st.tr["Number of players"] }}
- select#selectNbPlayers(v-model="newchallenge.nbPlayers")
- option(v-show="possibleNbplayers(2)" value="2" selected) 2
- option(v-show="possibleNbplayers(3)" value="3") 3
- option(v-show="possibleNbplayers(4)" value="4") 4
- fieldset
- label(for="timeControl") {{ st.tr["Time control"] }}
- input#timeControl(type="text" v-model="newchallenge.timeControl"
- placeholder="3m+2s, 1h+30s, 7d+1d ...")
- fieldset(v-if="st.user.id > 0")
- label(for="selectPlayers") {{ st.tr["Play with? (optional)"] }}
- #selectPlayers
- input(type="text" v-model="newchallenge.to[0]")
- input(v-show="newchallenge.nbPlayers>=3" type="text"
- v-model="newchallenge.to[1]")
- input(v-show="newchallenge.nbPlayers==4" type="text"
- v-model="newchallenge.to[2]")
- fieldset(v-if="st.user.id > 0")
- label(for="inputFen") {{ st.tr["FEN (optional)"] }}
- input#inputFen(type="text" v-model="newchallenge.fen")
- button(@click="newChallenge") {{ st.tr["Send challenge"] }}
+ form(@submit.prevent="newChallenge()" @keyup.enter="newChallenge()")
+ fieldset
+ label(for="selectVariant") {{ st.tr["Variant"] }} *
+ select#selectVariant(v-model="newchallenge.vid")
+ option(
+ v-for="v in st.variants"
+ :value="v.id"
+ :selected="newchallenge.vid==v.id"
+ )
+ | {{ v.name }}
+ fieldset
+ label(for="cadence") {{ st.tr["Cadence"] }} *
+ div#predefinedCadences
+ button(type="button") 3+2
+ button(type="button") 5+3
+ button(type="button") 15+5
+ input#cadence(
+ type="text"
+ v-model="newchallenge.cadence"
+ placeholder="5+0, 1h+30s, 7d+1d ..."
+ )
+ fieldset(v-if="st.user.id > 0")
+ label(for="selectPlayers") {{ st.tr["Play with?"] }}
+ input#selectPlayers(
+ type="text"
+ v-model="newchallenge.to"
+ )
+ fieldset(v-if="st.user.id > 0 && newchallenge.to.length > 0")
+ label(for="inputFen") FEN
+ input#inputFen(
+ type="text"
+ v-model="newchallenge.fen"
+ )
+ button(@click="newChallenge()") {{ st.tr["Send challenge"] }}
+ input#modalPeople.modal(
+ type="checkbox"
+ @click="resetChatColor()"
+ )
+ div#peopleWrap(
+ role="dialog"
+ data-checkbox="modalPeople"
+ )
+ .card
+ label.modal-close(for="modalPeople")
+ #people
+ #players
+ p(
+ v-for="sid in Object.keys(people)"
+ 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)"
+ )
+ | {{ getActionLabel(sid) }}
+ p.anonymous @nonymous ({{ anonymousCount }})
+ #chat
+ Chat(
+ :newChat="newChat"
+ @mychat="processChat"
+ :pastChats="[]"
+ )
+ .clearer
.row
.col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
- button(onClick="doClick('modalNewgame')") New game
+ .button-group
+ button#peopleBtn(onClick="window.doClick('modalPeople')")
+ | {{ st.tr["Who's there?"] }}
+ button(onClick="window.doClick('modalNewgame')")
+ | {{ st.tr["New game"] }}
.row
.col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
- .collapse
- input#challengeSection(type="radio" checked aria-hidden="true" name="accordion")
- label(for="challengeSection" aria-hidden="true") Challenges
- div
- .button-group
- button(@click="cdisplay='live'") Live Challenges
- button(@click="cdisplay='corr'") Correspondance challenges
- ChallengeList(v-show="cdisplay=='live'"
- :challenges="filterChallenges('live')" @click-challenge="clickChallenge")
- ChallengeList(v-show="cdisplay=='corr'"
- :challenges="filterChallenges('corr')" @click-challenge="clickChallenge")
- input#peopleSection(type="radio" aria-hidden="true" name="accordion")
- label(for="peopleSection" aria-hidden="true") People
- div
- .button-group
- button(@click="pdisplay='players'") Players
- button(@click="pdisplay='chat'") Chat
- #players(v-show="pdisplay=='players'")
- h3 Online players
- .player(v-for="p in uniquePlayers" @click="tryChallenge(p)"
- :class="{anonymous: !!p.count}"
- )
- | {{ p.name + (!!p.count ? " ("+p.count+")" : "") }}
- #chat(v-show="pdisplay=='chat'")
- h3 Chat (TODO)
- input#gameSection(type="radio" aria-hidden="true" name="accordion")
- label(for="gameSection" aria-hidden="true") Games
- div
- .button-group
- button(@click="gdisplay='live'") Live games
- button(@click="gdisplay='corr'") Correspondance games
- GameList(v-show="gdisplay=='live'" :games="filterGames('live')"
- @show-game="showGame")
- GameList(v-show="gdisplay=='corr'" :games="filterGames('corr')"
- @show-game="showGame")
+ div#div2
+ .button-group
+ button.tabbtn#btnClive(@click="setDisplay('c','live',$event)")
+ | {{ st.tr["Live challenges"] }}
+ button.tabbtn#btnCcorr(@click="setDisplay('c','corr',$event)")
+ | {{ st.tr["Correspondance challenges"] }}
+ ChallengeList(
+ v-show="cdisplay=='live'"
+ :challenges="filterChallenges('live')"
+ @click-challenge="clickChallenge"
+ )
+ ChallengeList(
+ v-show="cdisplay=='corr'"
+ :challenges="filterChallenges('corr')"
+ @click-challenge="clickChallenge"
+ )
+ div#div3
+ .button-group
+ button.tabbtn#btnGlive(@click="setDisplay('g','live',$event)")
+ | {{ st.tr["Live games"] }}
+ button.tabbtn#btnGcorr(@click="setDisplay('g','corr',$event)")
+ | {{ st.tr["Correspondance games"] }}
+ GameList(
+ v-show="gdisplay=='live'"
+ :games="filterGames('live')"
+ :showBoth="true"
+ @show-game="showGame"
+ )
+ GameList(
+ v-show="gdisplay=='corr'"
+ :games="filterGames('corr')"
+ :showBoth="true"
+ @show-game="showGame"
+ )
</template>
<script>
import { store } from "@/store";
-import { NbPlayers } from "@/data/nbPlayers";
import { checkChallenge } from "@/data/challengeCheck";
import { ArrayFun } from "@/utils/array";
import { ajax } from "@/utils/ajax";
-import { getRandString } from "@/utils/alea";
+import params from "@/parameters";
+import { getRandString, shuffle } from "@/utils/alea";
+import Chat from "@/components/Chat.vue";
import GameList from "@/components/GameList.vue";
import ChallengeList from "@/components/ChallengeList.vue";
+import { GameStorage } from "@/utils/gameStorage";
+import { processModalClick } from "@/utils/modalClick";
export default {
name: "my-hall",
components: {
+ Chat,
GameList,
- ChallengeList,
+ ChallengeList
},
- data: function () {
+ data: function() {
return {
st: store.state,
cdisplay: "live", //or corr
- pdisplay: "players", //or chat
gdisplay: "live",
games: [],
challenges: [],
- players: [], //online players (rename into "people" ?)
+ people: {},
+ infoMessage: "",
newchallenge: {
fen: "",
- vid: 0,
- nbPlayers: 0,
- to: ["", "", ""], //name of challenged players
- timeControl: "", //"2m+2s" ...etc
+ vid: localStorage.getItem("vid") || "",
+ to: "", //name of challenged player (if any)
+ cadence: localStorage.getItem("cadence") || ""
},
+ newChat: "",
+ conn: null,
+ connexionString: "",
+ // Related to (killing of) self multi-connects:
+ newConnect: {},
+ killed: {}
};
},
+ watch: {
+ // st.variants changes only once, at loading from [] to [...]
+ "st.variants": function() {
+ // Set potential challenges and games variant names:
+ this.challenges.concat(this.games).forEach(o => {
+ if (o.vname == "") o.vname = this.getVname(o.vid);
+ });
+ }
+ },
computed: {
- uniquePlayers: function() {
- // Show e.g. "@nonymous (5)", and do nothing on click on anonymous
- let anonymous = {id:0, name:"@nonymous", count:0};
- let playerList = [];
- this.players.forEach(p => {
- if (p.id > 0)
- playerList.push(p);
- else
- anonymous.count++;
+ anonymousCount: function() {
+ let count = 0;
+ Object.values(this.people).forEach(p => {
+ count += !p.name ? 1 : 0;
});
- if (anonymous.count > 0)
- playerList.push(anonymous);
- return playerList;
- },
+ return count;
+ }
},
created: function() {
- // Always add myself to players' list
- this.players.push(this.st.user);
+ const my = this.st.user;
+ this.$set(this.people, my.sid, { id: my.id, name: my.name, pages: ["/"] });
// Ask server for current corr games (all but mines)
-// ajax(
-// "",
-// "GET",
-// response => {
-//
-// }
-// );
-// // Also ask for corr challenges (all)
-// ajax(
-// "",
-// "GET",
-// response => {
-//
-// }
-// );
- // 0.1] Ask server for for room composition:
- const socketOpenListener = () => {
- 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;
- this.st.conn.onmessage = this.socketMessageListener;
- const oldOnclose = this.st.conn.onclose;
- const socketCloseListener = () => {
- oldOnclose(); //reinitialize connexion (in store.js)
- this.st.conn.addEventListener('message', this.socketMessageListener);
- this.st.conn.addEventListener('close', socketCloseListener);
+ ajax(
+ "/games",
+ "GET",
+ { uid: this.st.user.id, excluded: true },
+ response => {
+ this.games = this.games.concat(
+ response.games.map(g => {
+ 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 by/to me)
+ ajax("/challenges", "GET", { uid: this.st.user.id }, response => {
+ // Gather all senders names, and then retrieve full identity:
+ // (TODO [perf]: some might be online...)
+ let names = {};
+ response.challenges.forEach(c => {
+ if (c.uid != this.st.user.id) names[c.uid] = "";
+ //unknwon for now
+ else if (!!c.target && c.target != this.st.user.id)
+ names[c.target] = "";
+ });
+ const addChallenges = () => {
+ names[this.st.user.id] = this.st.user.name; //in case of
+ this.challenges = this.challenges.concat(
+ response.challenges.map(c => {
+ const from = { name: names[c.uid], id: c.uid }; //or just name
+ const type = this.classifyObject(c);
+ const vname = this.getVname(c.vid);
+ return Object.assign(
+ {},
+ {
+ type: type,
+ vname: vname,
+ from: from,
+ to: c.target ? names[c.target] : ""
+ },
+ c
+ );
+ })
+ );
+ };
+ if (Object.keys(names).length > 0) {
+ ajax(
+ "/users",
+ "GET",
+ { ids: Object.keys(names).join(",") },
+ response2 => {
+ response2.users.forEach(u => {
+ names[u.id] = u.name;
+ });
+ addChallenges();
+ }
+ );
+ } else addChallenges();
+ });
+ const connectAndPoll = () => {
+ this.send("connect");
+ this.send("pollclientsandgamers");
};
- this.st.conn.onclose = socketCloseListener;
+ // Initialize connection
+ this.connexionString =
+ params.socketUrl +
+ "/?sid=" +
+ this.st.user.sid +
+ "&tmpId=" +
+ getRandString() +
+ "&page=" +
+ encodeURIComponent(this.$route.path);
+ this.conn = new WebSocket(this.connexionString);
+ this.conn.onopen = connectAndPoll;
+ this.conn.onmessage = this.socketMessageListener;
+ this.conn.onclose = this.socketCloseListener;
+ },
+ mounted: function() {
+ ["peopleWrap", "infoDiv", "newgameDiv"].forEach(eltName => {
+ let elt = document.getElementById(eltName);
+ elt.addEventListener("click", processModalClick);
+ });
+ document.querySelectorAll("#predefinedCadences > button").forEach(b => {
+ b.addEventListener("click", () => {
+ this.newchallenge.cadence = b.innerHTML;
+ });
+ });
+ const dispCorr = this.$route.query["disp"];
+ const showCtype =
+ dispCorr || localStorage.getItem("type-challenges") || "live";
+ const showGtype =
+ dispCorr || localStorage.getItem("type-games") || "live";
+ this.setDisplay("c", showCtype);
+ this.setDisplay("g", showGtype);
+ },
+ beforeDestroy: function() {
+ this.send("disconnect");
},
methods: {
+ // Helpers:
+ send: function(code, obj) {
+ if (this.conn) {
+ this.conn.send(JSON.stringify(Object.assign({ code: code }, obj)));
+ }
+ },
+ getVname: function(vid) {
+ const variant = this.st.variants.find(v => v.id == vid);
+ // this.st.variants might be uninitialized (variant == null)
+ return variant ? variant.name : "";
+ },
filterChallenges: function(type) {
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
+ return o.cadence.indexOf("d") === -1 ? "live" : "corr";
+ },
+ setDisplay: function(letter, type, e) {
+ this[letter + "display"] = type;
+ localStorage.setItem(
+ "type-" + (letter == "c" ? "challenges" : "games"),
+ type
+ );
+ let elt = e
+ ? e.target
+ : document.getElementById("btn" + letter.toUpperCase() + type);
+ elt.classList.add("active");
+ elt.classList.remove("somethingnew"); //in case of
+ if (elt.previousElementSibling)
+ elt.previousElementSibling.classList.remove("active");
+ else elt.nextElementSibling.classList.remove("active");
+ },
+ isGamer: function(sid) {
+ return this.people[sid].pages.some(p => p.indexOf("/game/") >= 0);
},
- classifyChallenge: function(c) {
- // Heuristic: should work for most cases... (TODO)
- return (c.timeControl.indexOf('d') === -1 ? "live" : "corr");
+ getActionLabel: function(sid) {
+ return this.people[sid].pages.some(p => p == "/")
+ ? "Challenge"
+ : "Observe";
},
+ 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
+ }
+ },
+ 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
+ let url = "/game/" + g.id;
+ if (g.type == "live")
+ url += "?rid=" + g.rids[Math.floor(Math.random() * g.rids.length)];
+ this.$router.push(url);
+ },
+ resetChatColor: 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 });
+ },
+ // 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);
+ if (!this.conn) return;
const data = JSON.parse(msg.data);
- switch (data.code)
- {
- // 0.2] Receive clients list (just socket IDs)
- case "pollclients":
- {
- data.sockIds.forEach(sid => {
- this.players.push({sid:sid, id:0, name:""});
- // Ask identity, challenges and game(s)
- this.st.conn.send(JSON.stringify({code:"askidentity", target:sid}));
- this.st.conn.send(JSON.stringify({code:"askchallenges", target:sid}));
- this.st.conn.send(JSON.stringify({code:"askgame", target:sid}));
+ switch (data.code) {
+ case "pollclientsandgamers": {
+ // Since people can be both in Hall and Game,
+ // need to track "askIdentity" requests:
+ let identityAsked = {};
+ 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 });
+ }
+ if (!this.people[s.sid])
+ this.$set(this.people, s.sid, { id: 0, name: "", 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
+ this.send("askchallenge", { target: s.sid });
+ //peer is in Game
+ else this.send("askgame", { target: s.sid, page: page });
});
break;
}
- case "askidentity":
- {
- // Request for identification: reply if I'm not anonymous
- if (this.st.user.id > 0)
- {
- this.st.conn.send(JSON.stringify(
- {code:"identity", user:this.st.user, target:data.from}));
+ case "connect":
+ case "gconnect": {
+ const page = data.page || "/";
+ // NOTE: player could have been polled earlier, but might have logged in then
+ // 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]
+ });
+ 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
+ if (this.people[data.from].pages.indexOf(page) < 0)
+ this.people[data.from].pages.push(page);
+ }
+ if (this.people[data.from].id == 0) {
+ this.newConnect[data.from] = true; //for self multi-connects tests
+ this.send("askidentity", { target: data.from, page: page });
}
break;
}
- case "askchallenge":
- {
+ case "disconnect":
+ case "gdisconnect": {
+ // If the user reloads the page twice very quickly (experienced with Firefox),
+ // the first reload won't have time to connect but will trigger a "close" event anyway.
+ // ==> Next check is required.
+ if (!this.people[data.from]) return;
+ // Disconnect means no more tmpIds:
+ if (data.code == "disconnect") {
+ // Remove the live challenge sent by this player:
+ ArrayFun.remove(this.challenges, c => c.from.sid == data.from);
+ } else {
+ // Remove the matching live game if now unreachable
+ const gid = data.page.match(/[a-zA-Z0-9]+$/)[0];
+ const gidx = this.games.findIndex(g => g.id == gid);
+ if (gidx >= 0) {
+ const game = this.games[gidx];
+ if (
+ game.type == "live" &&
+ game.rids.length == 1 &&
+ game.rids[0] == data.from
+ ) {
+ this.games.splice(gidx, 1);
+ }
+ }
+ }
+ const page = data.page || "/";
+ ArrayFun.remove(this.people[data.from].pages, p => p == page);
+ if (this.people[data.from].pages.length == 0)
+ this.$delete(this.people, data.from);
+ break;
+ }
+ case "killed":
+ // I logged in elsewhere:
+ alert(this.st.tr["New connexion detected: tab now offline"]);
+ // TODO: this fails. See https://github.com/websockets/ws/issues/489
+ //this.conn.removeEventListener("message", this.socketMessageListener);
+ //this.conn.removeEventListener("close", this.socketCloseListener);
+ //this.conn.close();
+ this.conn = null;
+ break;
+ case "askidentity": {
+ // Request for identification (TODO: anonymous shouldn't need to reply)
+ const me = {
+ // Decompose to avoid revealing email
+ name: this.st.user.name,
+ sid: this.st.user.sid,
+ id: this.st.user.id
+ };
+ this.send("identity", { data: me, target: data.from });
+ break;
+ }
+ case "identity": {
+ const user = data.data;
+ if (user.name) {
+ // If I multi-connect, kill current connexion if no mark (I'm older)
+ if (
+ this.newConnect[user.sid] &&
+ user.id > 0 &&
+ user.id == this.st.user.id &&
+ user.sid != this.st.user.sid
+ ) {
+ if (!this.killed[this.st.user.sid]) {
+ this.send("killme", { sid: this.st.user.sid });
+ 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;
+ }
+ case "askchallenge": {
// Send my current live challenge (if any)
- const cIdx = this.challenges
- .findIndex(c => c.from.sid == this.st.user.sid && c.type == "live");
- if (cIdx >= 0)
- {
+ const cIdx = this.challenges.findIndex(
+ c => c.from.sid == this.st.user.sid && c.type == "live"
+ );
+ if (cIdx >= 0) {
const c = this.challenges[cIdx];
- const myChallenge =
- {
- // Minimal challenge informations: (from not required)
+ // NOTE: in principle, should only send targeted challenge to the target.
+ // But we may not know yet the identity of the target (just name),
+ // so cannot decide if data.from is the target or not.
+ const myChallenge = {
+ id: c.id,
+ from: this.st.user.sid,
to: c.to,
fen: c.fen,
vid: c.vid,
- timeControl: c.timeControl
+ cadence: c.cadence,
+ added: c.added
};
- this.st.conn.send(JSON.stringify({code:"challenge",
- challenge:myChallenge, target:data.from}));
+ this.send("challenge", { data: myChallenge, target: data.from });
}
break;
}
- case "askgame":
- {
- // TODO: Send my current live game (if any): variant, players, movesCount
- break;
- }
- case "identity":
- {
- const pIdx = this.players.findIndex(p => p.sid == data.user.sid);
- this.players[pIdx].id = data.user.id;
- this.players[pIdx].name = data.user.name;
- break;
- }
- case "challenge":
- {
- // Receive challenge from some player (+sid)
- let newChall = data.chall;
- newChall.type = this.classifyChallenge(data.chall);
- const pIdx = this.players.findIndex(p => p.sid == data.from);
- newChall.from = this.players[pIdx]; //may be anonymous
- newChall.added = Date.now();
- newChall.vname = this.getVname(newChall.vid);
- this.challenges.push(newChall);
+ case "challenge": //after "askchallenge"
+ case "newchallenge": {
+ // NOTE about next condition: see "askchallenge" case.
+ const chall = data.data;
+ if (
+ !chall.to ||
+ (this.people[chall.from].id > 0 &&
+ (chall.from == this.st.user.sid || chall.to == this.st.user.name))
+ ) {
+ let newChall = Object.assign({}, chall);
+ newChall.type = this.classifyObject(chall);
+ newChall.added = Date.now();
+ let fromValues = Object.assign({}, this.people[chall.from]);
+ delete fromValues["pages"]; //irrelevant in this context
+ newChall.from = Object.assign({ sid: chall.from }, fromValues);
+ newChall.vname = this.getVname(newChall.vid);
+ this.challenges.push(newChall);
+ if (
+ (newChall.type == "live" && this.cdisplay == "corr") ||
+ (newChall.type == "corr" && this.cdisplay == "live")
+ ) {
+ document
+ .getElementById("btnC" + newChall.type)
+ .classList.add("somethingnew");
+ }
+ }
break;
}
- case "game":
- {
- // Receive game from some player (+sid)
- // TODO: receive game summary (update, count moves)
- // (just players names, time control, and ID + player ID)
- // NOTE: it may be correspondance (if newgame while we are connected)
+ case "refusechallenge": {
+ const cid = data.data;
+ ArrayFun.remove(this.challenges, c => c.id == cid);
+ alert(this.st.tr["Challenge declined"]);
break;
}
-// * - receive "new game": if live, store locally + redirect to game
-// * If corr: notify "new game has started", give link, but do not redirect
- case "newgame":
- {
- // TODO: new game just started: data contain all informations
- // (id, players, time control, fenStart ...)
- // + cid to remove challenge from list
+ case "deletechallenge": {
+ // NOTE: the challenge may be already removed
+ const cid = data.data;
+ ArrayFun.remove(this.challenges, c => c.id == cid);
break;
}
-// * - receive "accept/withdraw/cancel challenge": apply action to challenges list
- case "acceptchallenge":
- {
- // Someone accept an open (or targeted) challenge
- // TODO: keep SIDs, since we need them to notify newgame after chall is complete
- const cIdx = this.challenges.findIndex(c => c.id == data.cid);
- let players = this.challenges[cIdx].to;
- const pIdx = this.players.findIndex(p => p.sid == data.from);
- for (let i=0; i<players.length; i++)
+ case "game": //individual request
+ case "newgame": {
+ // 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 (!players[i])
- {
- players[i] = this.players[pIdx].name;
- break;
+ let locGame = this.games.find(g => g.id == game.id);
+ if (!locGame) {
+ let newGame = game;
+ newGame.type = this.classifyObject(game);
+ newGame.vname = this.getVname(game.vid);
+ if (!game.score)
+ //if new game from Hall
+ newGame.score = "*";
+ newGame.rids = [game.rid];
+ delete newGame["rid"];
+ this.games.push(newGame);
+ if (
+ (newGame.type == "live" && this.gdisplay == "corr") ||
+ (newGame.type == "corr" && this.gdisplay == "live")
+ ) {
+ document
+ .getElementById("btnG" + newGame.type)
+ .classList.add("somethingnew");
+ }
+ } else {
+ // Append rid (if not already in list)
+ if (!locGame.rids.includes(game.rid)) locGame.rids.push(game.rid);
}
}
- // TODO: if challenge is complete, launch game
- //this.newGame(data.challenge, data.user); //user.id et user.name
- break;
- }
- case "withdrawchallenge":
- {
- const cIdx = this.challenges.findIndex(c => c.id == data.cid);
- let chall = this.challenges[cIdx]
- ArrayFun.remove(chall.players, p => p.id == data.uid);
- chall.players.push({id:0, name:""});
break;
}
- case "refusechallenge":
- {
- // TODO: show "player XXX refused challenge", and
- // remove challenge from list.
+ case "result": {
+ let g = this.games.find(g => g.id == data.gid);
+ if (g) g.score = data.score;
break;
}
- case "deletechallenge":
- {
- ArrayFun.remove(this.challenges, c => c.id == data.cid);
- break;
- }
- // TODO: distinguish hallConnect and gameConnect ?
- // Or global variable players
- // + game variable: "observers"
- case "connect":
-// * - receive "player connect": send our current challenge (to him or global)
-// * Also send all our games (live - max 1 - and corr) [in web worker ?]
- {
- this.players.push({name:"", id:0, sid:data.sid});
- this.st.conn.send(JSON.stringify({code:"askidentity", target:data.sid}));
+ case "startgame": {
+ // New game just started: data contain all information
+ const gameInfo = data.data;
+ if (this.classifyObject(gameInfo) == "live")
+ this.startNewGame(gameInfo);
+ else {
+ this.infoMessage =
+ this.st.tr["New correspondance game:"] +
+ " <a href='#/game/" +
+ gameInfo.id +
+ "'>" +
+ "#/game/" +
+ gameInfo.id +
+ "</a>";
+ let modalBox = document.getElementById("modalInfo");
+ modalBox.checked = true;
+ }
break;
}
-// * - receive "player disconnect": remove from players list
- case "disconnect":
- {
- ArrayFun.remove(this.players, p => p.sid == data.sid);
- // TODO: also remove all challenges sent by this player,
- // and all live games where he plays and no other opponent is online
+ case "newchat":
+ this.newChat = data.data;
+ if (!document.getElementById("modalPeople").checked)
+ document.getElementById("peopleBtn").classList.add("somethingnew");
break;
- }
}
},
- showGame: function(game) {
- // NOTE: if we are an observer, the game will be found in main games list
- // (sent by connected remote players)
- // TODO: game path ? /vname/gameId seems better
- this.$router.push("/" + game.id);
+ socketCloseListener: function() {
+ if (!this.conn) return;
+ this.conn = new WebSocket(this.connexionString);
+ this.conn.addEventListener("message", this.socketMessageListener);
+ this.conn.addEventListener("close", this.socketCloseListener);
},
- tryChallenge: function(player) {
- if (player.id == 0)
- return; //anonymous players cannot be challenged
- this.newchallenge.to[0] = player.name;
- doClick("modalNewgame");
- },
-// * - accept challenge (corr or live) --> send info to challenge creator
-// * - cancel challenge (click on sent challenge) --> send info to all concerned players
-// * - withdraw from challenge (if >= 3 players and previously accepted)
-// * --> send info to challenge creator
-// * - refuse challenge: send "refuse" to challenge sender, and "delete" to others
-// * - prepare and start new game (if challenge is full after acceptation)
-// * --> include challenge ID (so that opponents can delete the challenge too)
- clickChallenge: function(c) {
- // TODO: also correspondance case (send to server)
- if (!!c.accepted)
- {
- // It's a multiplayer challenge I accepted: withdraw
- this.sendSomethingTo(c.from.sid, "withdrawchallenge",
- {cid:c.id, user:this.st.user.sid});
- c.accepted = false;
- }
- else if (c.from.sid == this.st.user.sid) //it's my challenge: cancel it
- {
- this.sendSomethingTo(c.to, "deletechallenge", {cid:c.id});
- ArrayFun.remove(this.challenges, ch => ch.id == c.id);
- }
- else //accept (or refuse) a challenge
- {
- c.accepted = true;
- if (!!c.to[0])
- {
- // TODO: if special FEN, show diagram after loading variant
- c.accepted = confirm("Accept challenge?");
- }
- this.sendSomethingTo(c.from.sid,
- (c.accepted ? "accept" : "refuse") + "challenge", {cid: c.id});
- if (!c.accepted)
- ArrayFun.remove(this.challenges, ch => ch.id == c.id);
- }
- },
-// newGame: function(chall, user) {
-// const fen = chall.fen || V.GenRandInitFen();
-// const game = {}; //TODO: fen, players, time ...
-// //setStorage(game); //TODO
-// game.players.forEach(p => { //...even if game is by corr (could be played live, why not...)
-// this.conn.send(
-// JSON.stringify({code:"newgame", oppid:p.id, game:game}));
-// });
-// if (this.settings.sound >= 1)
-// new Audio("/sounds/newgame.mp3").play().catch(err => {});
-// },
- getVname: function(vid) {
- const vIdx = this.st.variants.findIndex(v => v.id == vid);
- return this.st.variants[vIdx].name;
- },
- sendSomethingTo: function(to, code, obj, warnDisconnected) {
- const doSend = (code, obj, sid) => {
- this.st.conn.send(JSON.stringify(Object.assign(
- {},
- {code: code},
- obj,
- {target: sid}
- )));
- };
- const getSid = (pname) => {
- const pIdx = this.players.findIndex(pl => pl.name == pname);
- if (!!warnDisconnected && ctype == "live" && pIdx === -1)
- alert("Warning: " + p.name + " is not connected");
- return this.players[pIdx].sid;
- };
- if (!Array.isArray(to)) //pass sid directly
- doSend(code, obj, to);
- else if (!!to[0])
- {
- // Challenge with targeted players
- to.forEach(pname => { doSend(code, obj, getSid(pname)); });
+ // Challenge lifecycle:
+ newChallenge: async function() {
+ if (this.newchallenge.cadence.match(/^[0-9]+$/))
+ this.newchallenge.cadence += "+0"; //assume minutes, no increment
+ const ctype = this.classifyObject(this.newchallenge);
+ // TODO: cadence still unchecked so ctype could be wrong...
+ let error = "";
+ if (!this.newchallenge.vid)
+ error = this.st.tr["Please select a variant"];
+ else if (ctype == "corr" && this.st.user.id <= 0)
+ error = this.st.tr["Please log in to play correspondance games"];
+ else if (this.newchallenge.to) {
+ if (this.newchallenge.to == this.st.user.name)
+ error = this.st.tr["Self-challenge is forbidden"];
+ else if (
+ ctype == "live" &&
+ Object.values(this.people).every(p => p.name != this.newchallenge.to)
+ )
+ error = this.newchallenge.to + " " + this.st.tr["is not online"];
}
- else
- {
- // Open challenge: send to all connected players (except us)
- this.players.forEach(p => {
- if (p.sid != this.st.user.sid) //only sid is always set
- doSend(code, obj, p.sid);
- });
+ if (error) {
+ alert(error);
+ return;
}
- },
- // Send new challenge (corr or live, cf. time control), with button or click on player
- newChallenge: async function() {
- // TODO: put this "load variant" block elsewhere
const vname = this.getVname(this.newchallenge.vid);
const vModule = await import("@/variants/" + vname + ".js");
window.V = vModule.VariantRules;
- const error = checkChallenge(this.newchallenge);
- if (!!error)
- return alert(error);
- const ctype = this.classifyChallenge(this.newchallenge);
- const cto = this.newchallenge.to.slice(0, this.newchallenge.nbPlayers);
+ error = checkChallenge(this.newchallenge);
+ if (error) {
+ alert(error);
+ return;
+ }
// NOTE: "from" information is not required here
- let chall =
- {
- fen: this.newchallenge.fen || V.GenRandInitFen(),
- to: cto,
- timeControl: this.newchallenge.timeControl,
- vid: this.newchallenge.vid,
- };
- const finishAddChallenge = (cid) => {
+ let chall = Object.assign({}, this.newchallenge);
+ const finishAddChallenge = cid => {
chall.id = cid || "c" + getRandString();
- // Send challenge to peers
- this.sendSomethingTo(cto, "challenge", {chall:chall}, "warnDisconnected");
+ // Remove old challenge if any (only one at a time of a given type):
+ const cIdx = this.challenges.findIndex(
+ c =>
+ (c.from.sid == this.st.user.sid || c.from.id == this.st.user.id) &&
+ c.type == ctype
+ );
+ if (cIdx >= 0) {
+ // Delete current challenge (will be replaced now)
+ this.send("deletechallenge", { data: this.challenges[cIdx].id });
+ if (ctype == "corr") {
+ ajax("/challenges", "DELETE", { id: this.challenges[cIdx].id });
+ }
+ this.challenges.splice(cIdx, 1);
+ }
+ this.send("newchallenge", {
+ data: Object.assign({ from: this.st.user.sid }, chall)
+ });
+ // Add new challenge:
+ chall.from = {
+ //decompose to avoid revealing email
+ sid: this.st.user.sid,
+ id: this.st.user.id,
+ name: this.st.user.name
+ };
chall.added = Date.now();
+ // NOTE: vname and type are redundant (can be deduced from cadence + vid)
chall.type = ctype;
chall.vname = vname;
- chall.from = this.st.user;
this.challenges.push(chall);
+ // Remember cadence + vid for quicker further challenges:
+ localStorage.setItem("cadence", chall.cadence);
+ localStorage.setItem("vid", chall.vid);
document.getElementById("modalNewgame").checked = false;
};
- const cIdx = this.challenges.findIndex(
- c => c.from.sid == this.st.user.sid && c.type == ctype);
- if (cIdx >= 0)
- {
- // Delete current challenge (will be replaced now)
- this.sendSomethingTo(this.challenges[cIdx].to,
- "deletechallenge", {cid:this.challenges[cIdx].id});
- if (ctype == "corr")
- {
- ajax(
- "/challenges",
- "DELETE",
- {id: this.challenges[cIdx].id}
- );
+ if (ctype == "live") {
+ // Live challenges have a random ID
+ finishAddChallenge(null);
+ } else {
+ // Correspondance game: send challenge to server
+ ajax("/challenges", "POST", { chall: chall }, response => {
+ finishAddChallenge(response.cid);
+ });
+ }
+ },
+ clickChallenge: function(c) {
+ 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) {
+ if (c.type == "corr" && this.st.user.id <= 0) {
+ alert(this.st.tr["Please log in to accept corr challenges"]);
+ return;
+ }
+ c.accepted = true;
+ if (c.to) {
+ //c.to == this.st.user.name (connected)
+ // TODO: if special FEN, show diagram after loading variant
+ c.accepted = confirm("Accept challenge?");
}
- this.challenges.splice(cIdx, 1);
+ if (c.accepted) {
+ c.seat = {
+ //again, avoid c.seat = st.user to not reveal email
+ sid: this.st.user.sid,
+ id: this.st.user.id,
+ name: this.st.user.name
+ };
+ this.launchGame(c);
+ } else {
+ this.send("refusechallenge", { data: c.id, target: c.from.sid });
+ }
+ this.send("deletechallenge", { data: c.id });
+ } //my challenge
+ else {
+ if (c.type == "corr") {
+ ajax("/challenges", "DELETE", { id: c.id });
+ }
+ this.send("deletechallenge", { data: c.id });
}
- if (ctype == "live")
- {
- // Live challenges have a random ID
- finishAddChallenge();
+ // In all cases, the challenge is consumed:
+ ArrayFun.remove(this.challenges, ch => ch.id == c.id);
+ },
+ // NOTE: when launching game, the challenge is already being deleted
+ launchGame: async function(c) {
+ const vModule = await import("@/variants/" + c.vname + ".js");
+ window.V = vModule.VariantRules;
+ // These game informations will be shared
+ let gameInfo = {
+ id: getRandString(),
+ fen: c.fen || V.GenRandInitFen(),
+ players: shuffle([c.from, c.seat]), //white then black
+ 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
+ );
}
- else
- {
- // Correspondance game: send challenge to server
+ const notifyNewgame = () => {
+ if (oppsid)
+ //opponent is online
+ this.send("startgame", { data: gameInfo, target: oppsid });
+ // Send game info (only if live) to everyone except me in this tab
+ this.send("newgame", { data: gameInfo });
+ };
+ if (c.type == "live") {
+ notifyNewgame();
+ this.startNewGame(gameInfo);
+ } //corr: game only on server
+ else {
ajax(
- "/challenges",
+ "/games",
"POST",
- chall,
- response => { finishAddChallenge(response.cid); }
+ { gameInfo: gameInfo, cid: c.id }, //cid useful to delete challenge
+ response => {
+ gameInfo.id = response.gameId;
+ notifyNewgame();
+ this.$router.push("/game/" + response.gameId);
+ }
);
}
},
- possibleNbplayers: function(nbp) {
- if (this.newchallenge.vid == 0)
- return false;
- const variants = this.st.variants;
- const idxInVariants =
- variants.findIndex(v => v.id == this.newchallenge.vid);
- return NbPlayers[variants[idxInVariants].name].includes(nbp);
- },
- newGame: function(cid) {
- // TODO: don't forget to send "deletechallenge" message to all concerned players
- // + setup colors and send game infos to players (message "newgame")
- },
- },
+ // NOTE: for live games only (corr games start on the server)
+ startNewGame: function(gameInfo) {
+ const game = Object.assign({}, gameInfo, {
+ // (other) Game infos: constant
+ fenStart: gameInfo.fen,
+ vname: this.getVname(gameInfo.vid),
+ created: Date.now(),
+ // Game state (including FEN): will be updated
+ moves: [],
+ clocks: [-1, -1], //-1 = unstarted
+ initime: [0, 0], //initialized later
+ score: "*"
+ });
+ GameStorage.add(game, (err) => {
+ // If an error occurred, game is not added: abort
+ if (!err) {
+ if (this.st.settings.sound >= 1)
+ new Audio("/sounds/newgame.mp3").play().catch(() => {});
+ this.$router.push("/game/" + gameInfo.id);
+ }
+ });
+ }
+ }
};
</script>
-<style lang="sass">
-// TODO
+<style lang="sass" scoped>
+.active
+ color: #42a983
+
+#infoDiv > .card
+ padding: 15px 0
+ max-width: 430px
+
+#newgameDiv > .card
+ max-width: 767px
+ max-height: 100%
+
+div#peopleWrap > .card
+ max-height: 100%
+
+@media screen and (min-width: 1281px)
+ div#peopleWrap > .card
+ max-width: 66.67%
+
+@media screen and (max-width: 1280px)
+ div#peopleWrap > .card
+ max-width: 83.33%
+
+@media screen and (max-width: 767px)
+ div#peopleWrap > .card
+ max-width: 100%
+
+#players
+ width: 50%
+ position: relative
+ float: left
+
+#chat
+ width: 50%
+ float: left
+ position: relative
+
+@media screen and (max-width: 767px)
+ #players, #chats
+ width: 100%
+
+#chat > .card
+ max-width: 100%
+ margin: 0;
+ border: none;
+
+#players > p
+ margin-left: 5px
+
+.anonymous
+ font-style: italic
+
+button.player-action
+ margin-left: 32px
+
+.somethingnew
+ background-color: #c5fefe !important
+
+.tabbtn
+ background-color: #f9faee
+
+#div2, #div3
+ margin-top: 15px
+@media screen and (max-width: 767px)
+ #div2, #div3
+ margin-top: 0
</style>