.button-group#buttonsTchall
button.acceptBtn(@click="decisionChallenge(true)") {{ st.tr["Accept challenge?"] }}
button.refuseBtn(@click="decisionChallenge(false)") {{ st.tr["Refuse"] }}
- input#modalNewgame.modal(type="checkbox")
+ input#modalNewgame.modal(
+ type="checkbox"
+ @change="cadenceFocusIfOpened($event)"
+ )
div#newgameDiv(
role="dialog"
data-checkbox="modalNewgame"
fieldset
label(for="cadence") {{ st.tr["Cadence"] }} *
div#predefinedCadences
- button(type="button") 3+2
- button(type="button") 5+3
button(type="button") 15+5
+ button(type="button") 45+30
+ 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(
button(@click="newChallenge()") {{ st.tr["Send challenge"] }}
input#modalPeople.modal(
type="checkbox"
- @click="resetChatColor()"
+ @click="resetSocialColor()"
)
div#peopleWrap(
role="dialog"
)
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(
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,
"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();
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;
}
},
methods: {
// 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);
},
- 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
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;
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;
// 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 });
}
// 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];
}
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;
+ alert(this.st.tr["New connexion detected: tab now offline"]);
break;
case "askidentity": {
// Request for identification (TODO: anonymous shouldn't need to reply)
}
case "identity": {
const user = data.data;
- if (user.name) {
- // If I multi-connect, kill current connexion if no mark (I'm older)
+ this.$set(this.people, user.sid, {
+ id: user.id,
+ name: user.name,
+ pages: this.people[user.sid].pages
+ });
+ // 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;
- }
- }
- 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];
}
- delete this.newConnect[user.sid];
break;
}
case "askchallenge": {
id: c.id,
from: this.st.user.sid,
to: c.to,
+ randomness: c.randomness,
fen: c.fen,
vid: c.vid,
cadence: c.cadence,
) {
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
// 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) {
}
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);
}
},
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 (
}
// 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):
// 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 (
+ (ctype == "live" && this.cdisplay == "corr") ||
+ (ctype == "corr" && this.cdisplay == "live")
+ ) {
+ this.setDisplay('c', ctype);
+ }
};
if (ctype == "live") {
// Live challenges have a random ID
};
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", { 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") {
+ if (c.type == "corr")
ajax("/challenges", "DELETE", { id: c.id });
- }
this.send("deletechallenge", { data: c.id });
}
// In all cases, the challenge is consumed:
// 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])
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
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(() => {});
+ if (this.st.settings.sound)
+ new Audio("/sounds/newgame.flac").play().catch(() => {});
this.$router.push("/game/" + gameInfo.id);
}
});