p(v-html="infoMessage")
input#modalAccept.modal(type="checkbox")
div#acceptDiv(role="dialog")
- .card.text-center
- p
+ .card
+ p.text-center
span.variantName {{ curChallToAccept.vname }}
span {{ curChallToAccept.cadence }}
span {{ st.tr["with"] + " " + curChallToAccept.from.name }}
.diagram(v-html="tchallDiag")
.button-group#buttonsTchall
- button.acceptBtn(@click="decisionChallenge(true)") {{ st.tr["Accept challenge?"] }}
- button.refuseBtn(@click="decisionChallenge(false)") {{ st.tr["Refuse"] }}
+ button.acceptBtn(@click="decisionChallenge(true)")
+ span {{ st.tr["Accept challenge?"] }}
+ button.refuseBtn(@click="decisionChallenge(false)")
+ span {{ st.tr["Refuse"] }}
input#modalNewgame.modal(
type="checkbox"
@change="cadenceFocusIfOpened($event)"
placeholder="5+0, 1h+30s, 5d ..."
)
fieldset
- label(for="selectRandomLevel") {{ st.tr["Randomness"] }}
+ 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"] }}
#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)"
)
- | {{ getActionLabel(sid) }}
+ | {{ st.tr["Observe"] }}
+ button.player-action(
+ v-else-if="isFocusedOnHall(sid)"
+ @click="challenge(sid)"
+ )
+ | {{ st.tr["Challenge"] }}
p.anonymous @nonymous ({{ anonymousCount }})
#chat
Chat(
"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);
+ if (!o.vname) o.vname = this.getVname(o.vid);
});
if (!this.newchallenge.V && this.newchallenge.vid > 0)
this.loadNewchallVariant();
if (this.st.variants.length > 0 && this.newchallenge.vid > 0)
this.loadNewchallVariant();
const my = this.st.user;
- this.$set(this.people, my.sid, { id: my.id, name: my.name, pages: ["/"] });
+ this.$set(
+ this.people,
+ my.sid,
+ {
+ id: my.id,
+ name: my.name,
+ pages: [{ path: "/", focus: true }]
+ }
+ );
// 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 type = this.classifyObject(g);
- const vname = this.getVname(g.vid);
- return Object.assign({}, g, { type: type, vname: vname });
- })
- );
+ {
+ data: { uid: this.st.user.id, excluded: true },
+ success: (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] = "";
- 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(
- {},
+ ajax(
+ "/challenges",
+ "GET",
+ {
+ data: { uid: this.st.user.id },
+ success: (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] = "";
+ 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",
{
- type: type,
- vname: vname,
- from: from,
- to: c.target ? names[c.target] : ""
- },
- c
+ data: { ids: Object.keys(names).join(",") },
+ success: (response2) => {
+ response2.users.forEach(u => {
+ names[u.id] = u.name;
+ });
+ addChallenges();
+ }
+ }
);
- })
- );
- };
- 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();
- });
+ } else addChallenges();
+ }
+ }
+ );
const connectAndPoll = () => {
this.send("connect");
this.send("pollclientsandgamers");
"&tmpId=" +
getRandString() +
"&page=" +
+ // Hall: path is "/" (could be hard-coded as well)
encodeURIComponent(this.$route.path);
this.conn = new WebSocket(this.connexionString);
this.conn.onopen = connectAndPoll;
this.conn.onclose = this.socketCloseListener;
},
mounted: function() {
+ document.addEventListener('visibilitychange', this.visibilityChange);
["peopleWrap", "infoDiv", "newgameDiv"].forEach(eltName => {
let elt = document.getElementById(eltName);
elt.addEventListener("click", processModalClick);
this.setDisplay("g", showGtype);
},
beforeDestroy: function() {
+ document.removeEventListener('visibilitychange', this.visibilityChange);
this.send("disconnect");
},
methods: {
+ visibilityChange: function() {
+ // TODO: Use document.hidden? https://webplatform.news/issues/2019-03-27
+ this.send(
+ document.visibilityState == "visible"
+ ? "getfocus"
+ : "losefocus"
+ );
+ },
// Helpers:
cadenceFocusIfOpened: function() {
if (event.target.checked)
document.getElementById("cadence").focus();
},
send: function(code, obj) {
- if (this.conn) {
+ if (!!this.conn) {
this.conn.send(JSON.stringify(Object.assign({ code: code }, obj)));
}
},
: document.getElementById("btn" + letter.toUpperCase() + type);
elt.classList.add("active");
elt.classList.remove("somethingnew"); //in case of
- if (elt.previousElementSibling)
+ 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);
+ return this.people[sid].pages
+ .some(p => p.focus && p.path.indexOf("/game/") >= 0);
},
- getActionLabel: function(sid) {
-
-
-console.log(this.people[sid]);
-
-
- return this.people[sid].pages.some(p => p == "/")
- ? "Challenge"
- : "Observe";
+ isFocusedOnHall: function(sid) {
+ return (
+ // This is meant to challenge people, thus the next 2 conditions:
+ this.st.user.id > 0 &&
+ sid != this.st.user.sid &&
+ this.people[sid].pages.some(p => p.path == "/" && p.focus)
+ );
},
- 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
- }
+ challenge: function(sid) {
+ // Available, in Hall (only)
+ this.newchallenge.to = this.people[sid].name;
+ document.getElementById("modalPeople").checked = false;
+ window.doClick("modalNewgame");
+ },
+ watchGame: function(sid) {
+ // In some game, maybe playing maybe not: show a random one
+ let gids = [];
+ this.people[sid].pages.forEach(p => {
+ if (p.focus) {
+ const matchGid = p.path.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
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;
this.send("askidentity", { target: s.sid, page: page });
identityAsked[s.sid] = true;
}
- if (!this.people[s.sid])
+ if (!this.people[s.sid]) {
// 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);
+ this.people[s.sid] = { pages: [{path: page, focus: true}] };
+ }
+ else if (!(this.people[s.sid].pages.find(p => p.path == page)))
+ this.people[s.sid].pages.push({ path: page, focus: true });
if (!s.page)
// Peer is in Hall
this.send("askchallenge", { target: s.sid });
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.
+ // Only ask game / challenge if first connexion:
if (!this.people[data.from]) {
- this.$set(this.people, data.from, { pages: [page] });
+ this.people[data.from] = { pages: [{ path: page, focus: true }] };
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].pages.find(p => p.path == page)))
+ this.people[data.from].pages.push({ path: page, focus: true });
}
if (!this.people[data.from].name && this.people[data.from].id !== 0) {
// Identity not known yet
// 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);
+ ArrayFun.remove(
+ this.challenges,
+ c => c.type == "live" && 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 page = data.page || "/";
- ArrayFun.remove(this.people[data.from].pages, p => p == page);
+ ArrayFun.remove(this.people[data.from].pages, p => p.path == page);
if (this.people[data.from].pages.length == 0)
this.$delete(this.people, data.from);
break;
}
+ case "getfocus":
+ // If user reload a page, focus may arrive earlier than connect
+ if (!!this.people[data.from]) {
+ this.people[data.from].pages
+ .find(p => p.path == data.page).focus = true;
+ this.$forceUpdate(); //TODO: shouldn't be required
+ }
+ break;
+ case "losefocus":
+ if (!!this.people[data.from]) {
+ this.people[data.from].pages
+ .find(p => p.path == data.page).focus = false;
+ this.$forceUpdate(); //TODO: shouldn't be required
+ }
+ break;
case "killed":
// I logged in elsewhere:
this.conn = null;
}
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)
+ let player = this.people[user.sid];
+ // player.pages is already set
+ player.id = user.id;
+ player.name = user.name;
+ // TODO: this.$set(people, ...) fails. So forceUpdate.
+ // But this shouldn't be like that!
+ this.$forceUpdate();
+ // If I multi-connect, kill current connexion if no mark (I'm older)
+ if (this.newConnect[user.sid]) {
if (
- this.newConnect[user.sid] &&
user.id > 0 &&
user.id == this.st.user.id &&
- user.sid != this.st.user.sid
+ user.sid != this.st.user.sid &&
+ !this.killed[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;
- }
}
+ delete this.newConnect[user.sid];
}
- delete this.newConnect[user.sid];
break;
}
case "askchallenge": {
}
case "result": {
let g = this.games.find(g => g.id == data.gid);
- if (g) g.score = data.score;
+ if (!!g) g.score = data.score;
break;
}
case "startgame": {
const vModule = await import("@/variants/" + vname + ".js");
this.newchallenge.V = vModule.VariantRules;
this.newchallenge.vname = vname;
- if (cb)
+ if (!!cb)
cb();
},
trySetNewchallDiag: function() {
window.V = this.newchallenge.V;
if (
this.newchallenge.vid > 0 &&
- this.newchallenge.fen &&
+ !!this.newchallenge.fen &&
V.IsGoodFen(this.newchallenge.fen)
) {
const parsedFen = V.ParseFen(this.newchallenge.fen);
this.newchallenge.diag = getDiagram({
position: parsedFen.position,
- orientation: V.GetOppCol(parsedFen.turn)
+ orientation: parsedFen.turn
});
}
},
newChallenge: async function() {
- if (this.newchallenge.cadence.match(/^[0-9]+$/))
+ 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...
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) {
+ else if (!!this.newchallenge.to) {
if (this.newchallenge.to == this.st.user.name)
error = this.st.tr["Self-challenge is forbidden"];
else if (
// 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 });
+ ajax(
+ "/challenges",
+ "DELETE",
+ { data: { id: this.challenges[cIdx].id } }
+ );
}
this.challenges.splice(cIdx, 1);
}
finishAddChallenge(null);
} else {
// Correspondance game: send challenge to server
- ajax("/challenges", "POST", { chall: chall }, response => {
- finishAddChallenge(response.cid);
- });
+ ajax(
+ "/challenges",
+ "POST",
+ {
+ data: { chall: chall },
+ success: (response) => {
+ finishAddChallenge(response.cid);
+ }
+ }
+ );
}
},
// Callback function after a diagram was showed to accept
};
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 });
+ if (c.type == "corr") {
+ ajax(
+ "/challenges",
+ "DELETE",
+ { data: { id: c.id } }
+ );
+ }
}
this.send("deletechallenge", { data: c.id });
},
c.accepted = true;
const vModule = await import("@/variants/" + c.vname + ".js");
window.V = vModule.VariantRules;
- if (c.to) {
+ if (!!c.to) {
// c.to == this.st.user.name (connected)
- if (c.fen) {
+ if (!!c.fen) {
const parsedFen = V.ParseFen(c.fen);
c.mycolor = V.GetOppCol(parsedFen.turn);
this.tchallDiag = getDiagram({
else {
// My challenge
if (c.type == "corr") {
- ajax("/challenges", "DELETE", { id: c.id });
+ ajax(
+ "/challenges",
+ "DELETE",
+ { data: { id: c.id } }
+ );
}
this.send("deletechallenge", { data: c.id });
}
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 = () => {
- if (oppsid)
+ const oppsid = this.getOppsid(c);
+ 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
ajax(
"/games",
"POST",
- { gameInfo: gameInfo, cid: c.id }, //cid useful to delete challenge
- response => {
- gameInfo.id = response.gameId;
- notifyNewgame();
- this.$router.push("/game/" + response.gameId);
+ {
+ // cid is useful to delete the challenge:
+ data: { gameInfo: gameInfo, cid: c.id },
+ success: (response) => {
+ gameInfo.id = response.gameId;
+ notifyNewgame();
+ this.$router.push("/game/" + response.gameId);
+ }
}
);
}
#buttonsTchall
margin-top: 10px
+ & > button > span
+ width: 100%
+ text-align: center
.variantName
font-weight: bold
.diagram
margin: 0 auto
max-width: 400px
+ // width: 100% required for Firefox
+ width: 100%
#inputFen
width: 100%