button(@click="issueNewChallenge()") {{ st.tr["Send challenge"] }}
input#modalPeople.modal(
type="checkbox"
- @click="resetSocialColor()"
+ @click="toggleSocialColor()"
)
div#peopleWrap(
role="dialog"
.row
.col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
.button-group
- button#peopleBtn(@click="openModalPeople()")
+ button#peopleBtn(onClick="window.doClick('modalPeople')")
| {{ st.tr["Who's there?"] }}
button(@click="showNewchallengeForm()")
| {{ st.tr["New game"] }}
<script>
import { store } from "@/store";
import { checkChallenge } from "@/data/challengeCheck";
+import { notify } from "@/utils/notifications";
import { ArrayFun } from "@/utils/array";
import { ajax } from "@/utils/ajax";
import params from "@/parameters";
-import { getRandString, shuffle } from "@/utils/alea";
+import { getRandString, shuffle, randInt } from "@/utils/alea";
import { getDiagram } from "@/utils/printDiagram";
import Chat from "@/components/Chat.vue";
import GameList from "@/components/GameList.vue";
diag: "", //visualizing FEN
memorize: false //put settings in localStorage
},
+ focus: true,
tchallDiag: "",
curChallToAccept: {from: {}},
presetChalls: JSON.parse(localStorage.getItem("presetChalls") || "[]"),
conn: null,
connexionString: "",
+ socketCloseListener: 0,
// Related to (killing of) self multi-connects:
- newConnect: {},
- killed: {}
+ newConnect: {}
};
},
watch: {
},
created: function() {
document.addEventListener('visibilitychange', this.visibilityChange);
+ window.addEventListener('focus', this.onFocus);
+ window.addEventListener('blur', this.onBlur);
window.addEventListener("beforeunload", this.cleanBeforeDestroy);
if (this.st.variants.length > 0 && this.newchallenge.vid > 0)
this.loadNewchallVariant();
const my = this.st.user;
+ const tmpId = getRandString();
this.$set(
this.people,
my.sid,
{
id: my.id,
name: my.name,
- pages: [{ path: "/", focus: true }]
+ tmpIds: {
+ tmpId: { page: "/", focus: true }
+ }
}
);
const connectAndPoll = () => {
// Initialize connection
this.connexionString =
params.socketUrl +
- "/?sid=" +
- this.st.user.sid +
- "&id=" +
- this.st.user.id +
- "&tmpId=" +
- getRandString() +
+ "/?sid=" + this.st.user.sid +
+ "&id=" + this.st.user.id +
+ "&tmpId=" + tmpId +
"&page=" +
- // Hall: path is "/" (could be hard-coded as well)
+ // Hall: path is "/" (TODO: could be hard-coded as well)
encodeURIComponent(this.$route.path);
this.conn = new WebSocket(this.connexionString);
this.conn.onopen = connectAndPoll;
this.conn.addEventListener("message", this.socketMessageListener);
- this.conn.addEventListener("close", this.socketCloseListener);
+ this.socketCloseListener = setInterval(
+ () => {
+ if (this.conn.readyState == 3) {
+ this.conn.removeEventListener("message", this.socketMessageListener);
+ this.conn = new WebSocket(this.connexionString);
+ this.conn.addEventListener("message", this.socketMessageListener);
+ }
+ },
+ 1000
+ );
},
mounted: function() {
- ["peopleWrap", "infoDiv", "newgameDiv"].forEach(eltName => {
+ document.getElementById("peopleWrap")
+ .addEventListener("click", (e) => {
+ processModalClick(e, () => {
+ this.toggleSocialColor("close")
+ });
+ });
+ ["infoDiv", "newgameDiv"].forEach(eltName => {
document.getElementById(eltName)
.addEventListener("click", processModalClick);
});
},
methods: {
cleanBeforeDestroy: function() {
+ clearInterval(this.socketCloseListener);
document.removeEventListener('visibilitychange', this.visibilityChange);
+ window.removeEventListener('focus', this.onFocus);
+ window.removeEventListener('blur', this.onBlur);
window.removeEventListener("beforeunload", this.cleanBeforeDestroy);
+ this.conn.removeEventListener("message", this.socketMessageListener);
this.send("disconnect");
+ this.conn = null;
},
getRandomnessClass: function(pc) {
return {
["random-" + pc.randomness]: true
};
},
- openModalPeople: function() {
- window.doClick("modalPeople");
- document.getElementById("inputChat").focus();
- },
anonymousCount: function() {
let count = 0;
Object.values(this.people).forEach(p => {
},
visibilityChange: function() {
// TODO: Use document.hidden? https://webplatform.news/issues/2019-03-27
- this.send(
- document.visibilityState == "visible"
- ? "getfocus"
- : "losefocus"
- );
+ this.focus = (document.visibilityState == "visible");
+ this.send(this.focus ? "getfocus" : "losefocus");
+ },
+ onFocus: function() {
+ this.focus = true;
+ this.send("getfocus");
+ },
+ onBlur: function() {
+ this.focus = false;
+ this.send("losefocus");
},
partialResetNewchallenge: function() {
// Reset potential target and custom FEN:
},
removePresetChall: function(e, pchall) {
e.stopPropagation();
- const pchallIdx = this.presetChalls.findIndex(pc => pc.index == pchall.index);
+ const pchallIdx =
+ this.presetChalls.findIndex(pc => pc.index == pchall.index);
this.presetChalls.splice(pchallIdx, 1);
localStorage.setItem("presetChalls", JSON.stringify(this.presetChalls));
},
document.getElementById("cadence").focus();
},
send: function(code, obj) {
- if (!!this.conn) {
+ if (!!this.conn && this.conn.readyState == 1) {
this.conn.send(JSON.stringify(Object.assign({ code: code }, obj)));
}
},
filterGames: function(type) {
return this.games.filter(g => g.type == type);
},
+ // o: challenge or game
classifyObject: function(o) {
- // o: challenge or game
+ // Consider imports as live games (TODO)
+ if (!!o.id && !!o.id.toString().match(/^i/)) return "live";
return o.cadence.indexOf("d") === -1 ? "live" : "corr";
},
setDisplay: function(letter, type, e) {
else elt.nextElementSibling.classList.remove("active");
},
isGamer: function(sid) {
- return this.people[sid].pages
- .some(p => p.focus && p.path.indexOf("/game/") >= 0);
+ return Object.values(this.people[sid].tmpIds)
+ .some(v => v.focus && v.page.indexOf("/game/") >= 0);
},
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)
+ Object.values(this.people[sid].tmpIds)
+ .some(v => v.focus && v.page == "/")
);
},
challenge: function(sid) {
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]+$/);
+ Object.values(this.people[sid].tmpIds).forEach(v => {
+ if (v.focus) {
+ const matchGid = v.page.match(/[a-zA-Z0-9]+$/);
if (!!matchGid) gids.push(matchGid[0]);
}
});
// ==> Moves sent by connected remote player(s) if live game
this.$router.push("/game/" + g.id);
},
- resetSocialColor: function() {
- // TODO: this is called twice, once on opening an once on closing
- document.getElementById("peopleBtn").classList.remove("somethingnew");
+ toggleSocialColor: function(action) {
+ if (!action && document.getElementById("modalPeople").checked)
+ document.getElementById("inputChat").focus();
+ else
+ document.getElementById("peopleBtn").classList.remove("somethingnew");
},
processChat: function(chat) {
this.send("newchat", { data: chat });
const data = JSON.parse(msg.data);
switch (data.code) {
case "pollclientsandgamers": {
- // Since people can be both in Hall and Game,
- // need to track "askIdentity" requests:
- let identityAsked = {};
- // TODO: shuffling and random filtering on server, if
- // the room is really crowded.
- data.sockIds.forEach(s => {
- const page = s.page || "/";
- if (s.sid != this.st.user.sid && !identityAsked[s.sid]) {
- this.send("askidentity", { target: s.sid, page: page });
- identityAsked[s.sid] = true;
+ // TODO: shuffling and random filtering on server,
+ // if the room is really crowded.
+ Object.keys(data.sockIds).forEach(sid => {
+ if (sid != this.st.user.sid) {
+ // Pick a target tmpId (+page) at random:
+ const pt = Object.values(data.sockIds[sid]);
+ const randPage = pt[randInt(pt.length)].page;
+ this.send(
+ "askidentity",
+ {
+ target: sid,
+ page: randPage
+ }
+ );
}
- if (!this.people[s.sid]) {
+ if (!this.people[sid])
// Do not set name or id: identity unknown yet
- 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)
+ this.people[sid] = { tmpIds: data.sockIds[sid] };
+ else
+ Object.assign(this.people[sid].tmpIds, data.sockIds[sid]);
+ if (Object.values(data.sockIds[sid]).some(v => v.page == "/"))
// Peer is in Hall
- this.send("askchallenges", { target: s.sid });
- // Peer is in Game: ask only if live game
- else if (!page.match(/\/[0-9]+$/))
- this.send("askgame", { target: s.sid, page: page });
+ this.send("askchallenges", { target: sid });
+ Object.values(data.sockIds[sid]).forEach(v => {
+ if (
+ v.page.indexOf("/game/") >= 0 &&
+ !v.page.match(/\/[0-9]+$/)
+ ) {
+ // Peer is in Game: ask only if live game
+ this.send("askgame", { target: sid, page: v.page });
+ }
+ });
});
break;
}
const page = data.page || "/";
if (data.code == "connect") {
// Ask challenges only on first connexion:
- if (!this.people[data.from])
- this.send("askchallenges", { target: data.from });
+ if (!this.people[data.from[0]])
+ this.send("askchallenges", { target: data.from[0] });
}
// Ask game only if live:
else if (!page.match(/\/[0-9]+$/))
- this.send("askgame", { target: data.from, page: page });
- if (!this.people[data.from])
- this.people[data.from] = { pages: [{ path: page, focus: true }] };
- else {
- // Append page if not already in list
- 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
- this.newConnect[data.from] = true; //for self multi-connects tests
- this.send("askidentity", { target: data.from, page: page });
+ this.send("askgame", { target: data.from[0], page: page });
+ if (!this.people[data.from[0]]) {
+ this.$set(
+ this.people,
+ data.from[0],
+ {
+ tmpIds: {
+ [data.from[1]]: { page: page, focus: true }
+ }
+ }
+ );
+ // For self multi-connects tests:
+ this.newConnect[data.from[0]] = true;
+ this.send("askidentity", { target: data.from[0], page: page });
+ } else {
+ this.people[data.from[0]].tmpIds[data.from[1]] =
+ { page: page, focus: true };
+ this.$forceUpdate(); //TODO: shouldn't be required
}
break;
}
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.
+ // 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;
- const page = data.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);
- // Disconnect means no more tmpIds:
+ if (!this.people[data.from[0]]) return;
+ delete this.people[data.from[0]].tmpIds[data.from[1]];
+ if (Object.keys(this.people[data.from[0]].tmpIds).length == 0)
+ this.$delete(this.people, data.from[0]);
+ else this.$forceUpdate(); //TODO: shouldn't be required
if (data.code == "disconnect") {
// Remove the live challenges sent by this player:
ArrayFun.remove(
this.challenges,
- c => c.type == "live" && c.from.sid == data.from,
+ c => c.type == "live" && c.from.sid == data.from[0],
"all"
);
} else {
// Remove the matching live game if now unreachable
- const gid = page.match(/[a-zA-Z0-9]+$/)[0];
+ const gid = data.page.match(/[a-zA-Z0-9]+$/)[0];
// Corr games are always reachable:
if (!gid.match(/^[0-9]+$/)) {
- // Live games are reachable as long as someone is on the game page
+ // Live games are reachable if someone is on the game page
if (Object.values(this.people).every(p =>
- p.pages.every(pg => pg.path != page))) {
+ Object.values(p.tmpIds).every(v => v.page != data.page))
+ ) {
ArrayFun.remove(this.games, g => g.id == gid);
}
}
}
break;
}
- case "getfocus":
+ case "getfocus": {
+ let player = this.people[data.from[0]];
// 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;
+ if (!!player) {
+ player.tmpIds[data.from[1]].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;
+ }
+ case "losefocus": {
+ let player = this.people[data.from[0]];
+ if (!!player) {
+ player.tmpIds[data.from[1]].focus = false;
this.$forceUpdate(); //TODO: shouldn't be required
}
break;
- case "killed":
- // I logged in elsewhere:
- this.conn.removeEventListener("message", this.socketMessageListener);
- this.conn.removeEventListener("close", this.socketCloseListener);
- this.conn = null;
- alert(this.st.tr["New connexion detected: tab now offline"]);
- break;
+ }
case "askidentity": {
// Request for identification
const me = {
case "identity": {
const user = data.data;
let player = this.people[user.sid];
- // player.pages is already set
+ // player.tmpIds is already set
player.id = user.id;
player.name = user.name;
// TODO: this.$set(people, ...) fails. So forceUpdate.
this.$forceUpdate();
// If I multi-connect, kill current connexion if no mark (I'm older)
if (this.newConnect[user.sid]) {
+ delete this.newConnect[user.sid];
if (
user.id > 0 &&
user.id == this.st.user.id &&
- user.sid != this.st.user.sid &&
- !this.killed[this.st.user.sid]
+ user.sid != this.st.user.sid
) {
- this.send("killme", { sid: this.st.user.sid });
- this.killed[this.st.user.sid] = true;
+ // I logged in elsewhere:
+ this.cleanBeforeDestroy();
+ alert(this.st.tr["New connexion detected: tab now offline"]);
}
- delete this.newConnect[user.sid];
}
break;
}
c.from.sid == this.st.user.sid && c.type == "live"
)
.map(c => {
- // 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.
+ // 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 can't decide if data.from is the target.
return {
id: c.id,
from: this.st.user.sid,
case "deletechallenge_s": {
// NOTE: the challenge(s) may be already removed
const cref = data.data;
- if (!!cref.cid) ArrayFun.remove(this.challenges, c => c.id == cref.cid);
+ if (!!cref.cid)
+ ArrayFun.remove(this.challenges, c => c.id == cref.cid);
else if (!!cref.sids) {
cref.sids.forEach(s => {
ArrayFun.remove(
this.startNewGame(gameInfo);
else {
this.infoMessage =
- this.st.tr["New correspondance game:"] +
- " <a href='#/game/" +
- gameInfo.id +
- "'>" +
- "#/game/" +
- gameInfo.id +
- "</a>";
+ this.st.tr["New correspondance game:"] + " " +
+ "<a href='#/game/" + gameInfo.id + "'>" +
+ "#/game/" + gameInfo.id + "</a>";
document.getElementById("modalInfo").checked = true;
}
break;
break;
}
},
- socketCloseListener: function() {
- if (!this.conn) return;
- this.conn = new WebSocket(this.connexionString);
- this.conn.addEventListener("message", this.socketMessageListener);
- this.conn.addEventListener("close", this.socketCloseListener);
- },
loadMoreCorr: function() {
ajax(
"/observedgames",
.getElementById("btnC" + newChall.type)
.classList.add("somethingnew");
}
+ if (!!chall.to) {
+ notify(
+ "New challenge",
+ // fromValues.name should exist since the player is online, but
+ // let's consider there is some chance that the challenge arrives
+ // right after we connected and before receiving the poll result:
+ { body: "from " + (fromValues.name || "unknown yet...") }
+ );
+ }
}
},
loadNewchallVariant: async function(cb) {
name: this.st.user.name
};
chall.added = Date.now();
- // NOTE: vname and type are redundant (can be deduced from cadence + vid)
+ // NOTE: vname and type are redundant (deduced from cadence + vid)
chall.type = ctype;
chall.vname = this.newchallenge.vname;
this.challenges.push(chall);
name: this.st.user.name
};
this.launchGame(c);
- if (c.type == "live")
+ if (c.type == "live") {
// Remove all live challenges of both players
- this.send("deletechallenge_s", { data: { sids: [c.from.sid, c.seat.sid] } });
+ this.send(
+ "deletechallenge_s",
+ { data: { sids: [c.from.sid, c.seat.sid] } }
+ );
+ }
else
// Corr challenge: just remove the challenge
this.send("deletechallenge_s", { data: { cid: c.id } });
// Game state (including FEN): will be updated
moves: [],
clocks: [-1, -1], //-1 = unstarted
+ chats: [],
score: "*"
}
);
setTimeout(
() => {
+ const myIdx = (game.players[0].sid == this.st.user.sid ? 0 : 1);
GameStorage.add(game, (err) => {
// If an error occurred, game is not added: a tab already
// added the game. Maybe a focused one, maybe not.
// ==> Do not play it again.
if (!err && this.st.settings.sound)
new Audio("/sounds/newgame.flac").play().catch(() => {});
+ if (!this.focus) {
+ notify(
+ "New live game",
+ { body: "vs " + game.players[1-myIdx].name || "@nonymous" }
+ );
+ }
this.$router.push("/game/" + gameInfo.id);
});
},
- document.hidden ? 500 + 1000 * Math.random() : 0
+ this.focus ? 500 + 1000 * Math.random() : 0
);
}
}
projects / vchess.git / blobdiff