span {{ st.tr["Participant(s):"] }}
span(
v-for="p in Object.values(people)"
- v-if="p.focus && !!p.name"
+ v-if="participateInChat(p)"
)
| {{ p.name }}
- span.anonymous(
- v-if="Object.values(people).some(p => p.focus && !p.name)"
- )
- | + @nonymous
+ span.anonymous(v-if="someAnonymousPresent()") + @nonymous
Chat(
ref="chatcomp"
:players="game.players"
)
img(src="/images/icons/rematch.svg")
#playersInfo
- p
+ p(v-if="largeScreen")
span.name(:class="{connected: isConnected(0)}")
| {{ game.players[0].name || "@nonymous" }}
span.time(
span.time-separator(v-if="!!virtualClocks[1][1]") :
span.time-right(v-if="!!virtualClocks[1][1]")
| {{ virtualClocks[1][1] }}
+ p(v-else)
+ span.name(:class="{connected: isConnected(0)}")
+ | {{ game.players[0].name || "@nonymous" }}
+ span.split-names -
+ span.name(:class="{connected: isConnected(1)}")
+ | {{ game.players[1].name || "@nonymous" }}
+ br
+ span.time(
+ v-if="game.score=='*'"
+ :class="{yourturn: !!vr && vr.turn == 'w'}"
+ )
+ span.time-left {{ virtualClocks[0][0] }}
+ span.time-separator(v-if="!!virtualClocks[0][1]") :
+ span.time-right(v-if="!!virtualClocks[0][1]")
+ | {{ virtualClocks[0][1] }}
+ span.time(
+ v-if="game.score=='*'"
+ :class="{yourturn: !!vr && vr.turn == 'b'}"
+ )
+ span.time-left {{ virtualClocks[1][0] }}
+ span.time-separator(v-if="!!virtualClocks[1][1]") :
+ span.time-right(v-if="!!virtualClocks[1][1]")
+ | {{ virtualClocks[1][1] }}
BaseGame(
ref="basegame"
:game="game"
import { store } from "@/store";
import { GameStorage } from "@/utils/gameStorage";
import { ppt } from "@/utils/datetime";
+import { notify } from "@/utils/notifications";
import { ajax } from "@/utils/ajax";
import { extractTime } from "@/utils/timeControl";
import { getRandString } from "@/utils/alea";
gameRef: "",
nextIds: [],
game: {}, //passed to BaseGame
+ focus: !document.hidden, //will not always work... TODO
// virtualClocks will be initialized from true game.clocks
virtualClocks: [],
vr: null, //"variant rules" object initialized from FEN
// If newmove got no pingback, send again:
opponentGotMove: false,
connexionString: "",
+ socketCloseListener: 0,
// Incomplete info games: show move played
moveNotation: "",
// Intervals from setInterval():
retrySendmove: null,
clockUpdate: null,
// Related to (killing of) self multi-connects:
- newConnect: {},
- killed: {}
+ newConnect: {}
};
},
watch: {
$route: function(to, from) {
- if (from.params["id"] != to.params["id"]) {
+ if (to.path.length < 6 || to.path.substr(0, 6) != "/game/")
+ // Page change
+ this.cleanBeforeDestroy();
+ else if (from.params["id"] != to.params["id"]) {
// Change everything:
this.cleanBeforeDestroy();
let boardDiv = document.querySelector(".game");
this.atCreation();
},
mounted: function() {
- document.addEventListener('visibilitychange', this.visibilityChange);
["chatWrap", "infoDiv"].forEach(eltName => {
document.getElementById(eltName)
.addEventListener("click", processModalClick);
}
},
beforeDestroy: function() {
- document.removeEventListener('visibilitychange', this.visibilityChange);
this.cleanBeforeDestroy();
},
methods: {
+ cleanBeforeDestroy: function() {
+ clearInterval(this.socketCloseListener);
+ document.removeEventListener('visibilitychange', this.visibilityChange);
+ window.removeEventListener('focus', this.onFocus);
+ window.removeEventListener('blur', this.onBlur);
+ if (!!this.askLastate) clearInterval(this.askLastate);
+ if (!!this.retrySendmove) clearInterval(this.retrySendmove);
+ if (!!this.clockUpdate) clearInterval(this.clockUpdate);
+ this.conn.removeEventListener("message", this.socketMessageListener);
+ this.send("disconnect");
+ this.conn = null;
+ },
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");
+ if (!this.focus && !!this.rematchOffer) {
+ this.rematchOffer = "";
+ this.send("rematchoffer", { data: false });
+ // Do not remove rematch offer from (local) storage
+ }
+ this.send(this.focus ? "getfocus" : "losefocus");
+ },
+ onFocus: function() {
+ this.focus = true;
+ this.send("getfocus");
+ },
+ onBlur: function() {
+ this.focus = false;
+ if (!!this.rematchOffer) {
+ this.rematchOffer = "";
+ this.send("rematchoffer", { data: false });
+ }
+ this.send("losefocus");
+ },
+ participateInChat: function(p) {
+ return Object.keys(p.tmpIds).some(x => p.tmpIds[x].focus) && !!p.name;
+ },
+ someAnonymousPresent: function() {
+ return (
+ Object.values(this.people).some(p =>
+ !p.name && Object.keys(p.tmpIds).some(x => p.tmpIds[x].focus)
+ )
);
},
atCreation: function() {
+ document.addEventListener('visibilitychange', this.visibilityChange);
+ window.addEventListener('focus', this.onFocus);
+ window.addEventListener('blur', this.onBlur);
// 0] (Re)Set variables
this.gameRef = this.$route.params["id"];
// next = next corr games IDs to navigate faster (if applicable)
this.nextIds = JSON.parse(this.$route.query["next"] || "[]");
// Always add myself to players' list
const my = this.st.user;
+ const tmpId = getRandString();
this.$set(
this.people,
my.sid,
{
id: my.id,
name: my.name,
- focus: true
+ tmpIds: {
+ tmpId: { focus: true }
+ }
}
);
this.game = {
this.retrySendmove = null;
this.clockUpdate = null;
this.newConnect = {};
- this.killed = {};
// 1] 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=" +
// Discard potential "/?next=[...]" for page indication:
encodeURIComponent(this.$route.path.match(/\/game\/[a-zA-Z0-9]+/)[0]);
this.conn = new WebSocket(this.connexionString);
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
+ );
// Socket init required before loading remote game:
const socketInit = callback => {
if (this.conn.readyState == 1)
this.loadVariantThenGame(game, () => socketInit(this.roomInit));
else
// Live game stored remotely: need socket to retrieve it
- // NOTE: the callback "roomInit" will be lost, so we don't provide it.
+ // NOTE: the callback "roomInit" will be lost, so it's not provided.
// --> It will be given when receiving "fullgame" socket event.
socketInit(() => { this.send("askfullgame"); });
});
},
- cleanBeforeDestroy: function() {
- if (!!this.askLastate)
- clearInterval(this.askLastate);
- if (!!this.retrySendmove)
- clearInterval(this.retrySendmove);
- if (!!this.clockUpdate)
- clearInterval(this.clockUpdate);
- this.send("disconnect");
- },
roomInit: function() {
if (!this.roomInitialized) {
// Notify the room only now that I connected, because
}
},
send: function(code, obj) {
- if (!!this.conn)
+ if (!!this.conn && this.conn.readyState == 1)
this.conn.send(JSON.stringify(Object.assign({ code: code }, obj)));
},
isConnected: function(index) {
return (
(
!!player.sid &&
- Object.keys(this.people).some(sid =>
- sid == player.sid && this.people[sid].focus)
+ Object.keys(this.people).some(sid => {
+ return (
+ sid == player.sid &&
+ Object.values(this.people[sid].tmpIds).some(v => v.focus)
+ );
+ })
)
||
(
!!player.id &&
- Object.values(this.people).some(p =>
- p.id == player.id && p.focus)
+ Object.values(this.people).some(p => {
+ return (
+ p.id == player.id &&
+ Object.values(p.tmpIds).some(v => v.focus)
+ );
+ })
)
);
},
// NOTE: anonymous chats in corr games are not stored on server (TODO?)
if (this.game.type == "corr" && this.st.user.id > 0)
this.updateCorrGame({ chat: chat });
+ else if (this.game.type == "live") {
+ chat.added = Date.now();
+ GameStorage.update(this.gameRef, { chat: chat });
+ }
},
clearChat: function() {
- // Nothing more to do if game is live (chats not recorded)
- if (this.game.type == "corr") {
- if (!!this.game.mycolor) {
+ if (!!this.game.mycolor) {
+ if (this.game.type == "corr") {
ajax(
"/chats",
"DELETE",
{ data: { gid: this.game.id } }
);
+ } else {
+ // Live game
+ GameStorage.update(this.gameRef, { delchat: true });
}
this.$set(this.game, "chats", []);
}
const data = JSON.parse(msg.data);
switch (data.code) {
case "pollclients":
- // TODO: shuffling and random filtering on server, if
- // the room is really crowded.
- data.sockIds.forEach(sid => {
+ // 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) {
- this.people[sid] = { focus: true };
this.send("askidentity", { target: sid });
+ this.people[sid] = { tmpIds: data.sockIds[sid] };
+ } else {
+ // Complete my tmpIds:
+ Object.assign(this.people[sid].tmpIds, data.sockIds[sid]);
}
});
break;
case "connect":
- if (!this.people[data.from]) {
- this.people[data.from] = { focus: true };
- this.newConnect[data.from] = true; //for self multi-connects tests
- this.send("askidentity", { target: data.from });
+ if (!this.people[data.from[0]]) {
+ // focus depends on the tmpId (e.g. tab)
+ this.$set(
+ this.people,
+ data.from[0],
+ {
+ tmpIds: {
+ [data.from[1]]: { focus: true }
+ }
+ }
+ );
+ // For self multi-connects tests:
+ this.newConnect[data.from[0]] = true;
+ this.send("askidentity", { target: data.from[0] });
+ } else {
+ this.people[data.from[0]].tmpIds[data.from[1]] = { focus: true };
+ this.$forceUpdate(); //TODO: shouldn't be required
}
break;
case "disconnect":
- this.$delete(this.people, data.from);
+ 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
break;
case "getfocus": {
- let player = this.people[data.from];
+ let player = this.people[data.from[0]];
if (!!player) {
- player.focus = true;
+ player.tmpIds[data.from[1]].focus = true;
this.$forceUpdate(); //TODO: shouldn't be required
}
break;
}
case "losefocus": {
- let player = this.people[data.from];
+ let player = this.people[data.from[0]];
if (!!player) {
- player.focus = false;
+ 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.focus is already set
+ // player.tmpIds is already set
player.name = user.name;
player.id = user.id;
this.$forceUpdate(); //TODO: shouldn't be required
// 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;
+ this.cleanBeforeDestroy();
+ alert(this.st.tr["New connexion detected: tab now offline"]);
+ break;
}
- delete this.newConnect[user.sid];
}
- if (!this.killed[this.st.user.sid]) {
- // Ask potentially missed last state, if opponent and I play
- if (
- !!this.game.mycolor &&
- this.game.type == "live" &&
- this.game.score == "*" &&
- this.game.players.some(p => p.sid == user.sid)
- ) {
- this.send("asklastate", { target: user.sid });
- let counter = 1;
- this.askLastate = setInterval(
- () => {
- // Ask at most 3 times:
- // if no reply after that there should be a network issue.
- if (
- counter < 3 &&
- !this.gotLastate &&
- !!this.people[user.sid]
- ) {
- this.send("asklastate", { target: user.sid });
- counter++;
- } else {
- clearInterval(this.askLastate);
- }
- },
- 1500
- );
- }
+ // Ask potentially missed last state, if opponent and I play
+ if (
+ !this.gotLastate &&
+ !!this.game.mycolor &&
+ this.game.type == "live" &&
+ this.game.score == "*" &&
+ this.game.players.some(p => p.sid == user.sid)
+ ) {
+ this.send("asklastate", { target: user.sid });
+ let counter = 1;
+ this.askLastate = setInterval(
+ () => {
+ // Ask at most 3 times:
+ // if no reply after that there should be a network issue.
+ if (
+ counter < 3 &&
+ !this.gotLastate &&
+ !!this.people[user.sid]
+ ) {
+ this.send("asklastate", { target: user.sid });
+ counter++;
+ } else {
+ clearInterval(this.askLastate);
+ }
+ },
+ 1500
+ );
}
break;
}
this.send("fullgame", { data: gameToSend, target: data.from });
break;
case "fullgame":
- // Callback "roomInit" to poll clients only after game is loaded
- this.loadVariantThenGame(data.data, this.roomInit);
+ if (!!data.data.empty) {
+ alert(this.st.tr["The game should be in another tab"]);
+ this.$router.go(-1);
+ }
+ else
+ // Callback "roomInit" to poll clients only after game is loaded
+ this.loadVariantThenGame(data.data, this.roomInit);
break;
case "asklastate":
// Sending informative last state if I played a move or score != "*"
// If the game or moves aren't loaded yet, delay the sending:
+ // TODO: socket init after game load, so the game is supposedly ready
if (!this.game || !this.game.moves) this.lastateAsked = true;
else this.sendLastate(data.from);
break;
} else {
this.gotMoveIdx = movePlus.index;
const receiveMyMove = (movePlus.color == this.game.mycolor);
- if (!receiveMyMove && !!this.game.mycolor)
+ const moveColIdx = ["w", "b"].indexOf(movePlus.color);
+ if (!receiveMyMove && !!this.game.mycolor) {
// Notify opponent that I got the move:
- this.send("gotmove", {data: movePlus.index, target: data.from});
+ this.send(
+ "gotmove",
+ { data: movePlus.index, target: data.from }
+ );
+ // And myself if I'm elsewhere:
+ if (!this.focus) {
+ notify(
+ "New move",
+ {
+ body:
+ (this.game.players[moveColIdx].name || "@nonymous") +
+ " just played."
+ }
+ );
+ }
+ }
if (movePlus.cancelDrawOffer) {
// Opponent refuses draw
this.drawOffer = "";
GameStorage.update(this.gameRef, { drawOffer: "" });
}
}
- this.$refs["basegame"].play(movePlus.move, "received", null, true);
- const moveColIdx = ["w", "b"].indexOf(movePlus.color);
+ this.$refs["basegame"].play(
+ movePlus.move, "received", null, true);
this.game.clocks[moveColIdx] = movePlus.clock;
this.processMove(
movePlus.move,
this.opponentGotMove = true;
// Now his clock starts running on my side:
const oppIdx = ['w','b'].indexOf(this.vr.turn);
+ // NOTE: next line to avoid multi-resetClocks when several tabs
+ // on same game, resulting in a faster countdown.
+ if (!!this.clockUpdate) clearInterval(this.clockUpdate);
this.re_setClocks();
break;
}
}
break;
}
- case "newchat":
- this.$refs["chatcomp"].newChat(data.data);
+ case "newchat": {
+ let chat = data.data;
+ this.$refs["chatcomp"].newChat(chat);
+ if (this.game.type == "live") {
+ chat.added = Date.now();
+ GameStorage.update(this.gameRef, { chat: chat });
+ }
if (!document.getElementById("modalChat").checked)
document.getElementById("chatBtn").classList.add("somethingnew");
break;
+ }
}
},
- socketCloseListener: function() {
- this.conn = new WebSocket(this.connexionString);
- this.conn.addEventListener("message", this.socketMessageListener);
- this.conn.addEventListener("close", this.socketCloseListener);
- },
updateCorrGame: function(obj, callback) {
ajax(
"/games",
this.$refs["basegame"].play(data.lastMove, "received", null, true);
this.processMove(data.lastMove);
} else {
- clearInterval(this.clockUpdate);
+ if (!!this.clockUpdate) clearInterval(this.clockUpdate);
this.re_setClocks();
}
if (data.drawSent) this.drawOffer = "received";
this.send("rnewgame", { data: gameInfo, oppsid: oppsid });
// To main Hall if corr game:
if (this.game.type == "corr")
- this.send("newgame", { data: gameInfo });
+ this.send("newgame", { data: gameInfo, page: "/" });
// Also to MyGames page:
this.notifyMyGames("newgame", gameInfo);
};
}
},
abortGame: function() {
- if (!this.game.mycolor || !confirm(this.st.tr["Terminate game?"])) return;
+ if (!this.game.mycolor || !confirm(this.st.tr["Terminate game?"]))
+ return;
this.gameOver("?", "Stop");
this.send("abort");
},
const myIdx = game.players.findIndex(p => {
return p.sid == this.st.user.sid || p.id == this.st.user.id;
});
- const mycolor = [undefined, "w", "b"][myIdx + 1]; //undefined for observers
- if (!game.chats) game.chats = []; //live games don't have chat history
+ // "mycolor" is undefined for observers
+ const mycolor = [undefined, "w", "b"][myIdx + 1];
+ // Live games before 26/03/2020 don't have chat history:
+ if (!game.chats) game.chats = []; //TODO: remove line
+ // Sort chat messages from newest to oldest
+ game.chats.sort((c1, c2) => c2.added - c1.added);
if (gtype == "corr") {
// NOTE: clocks in seconds
game.moves.sort((m1, m2) => m1.idx - m2.idx); //in case of
(Date.now() - game.moves[L-1].played) / 1000;
}
}
- // Sort chat messages from newest to oldest
- game.chats.sort((c1, c2) => {
- return c2.added - c1.added;
- });
if (myIdx >= 0 && game.score == "*" && game.chats.length > 0) {
// Did a chat message arrive after my last move?
let dtLastMove = 0;
game.moves = game.moves.map(m => m.squares);
}
if (gtype == "live") {
+ if (
+ game.chats.length > 0 &&
+ (!game.initime || game.initime < game.chats[0].added)
+ ) {
+ document.getElementById("chatBtn").classList.add("somethingnew");
+ }
if (game.clocks[0] < 0) {
// Game is unstarted. clock is ignored until move 2
game.clocks = [tc.mainTime, tc.mainTime];
this.game.score != "*"
) {
clearInterval(this.clockUpdate);
+ this.clockUpdate = null;
if (this.game.clocks[colorIdx] < 0)
this.gameOver(
currentTurn == "w" ? "0-1" : "1-0",
const origMovescount = this.game.moves.length;
// The move is (about to be) played: stop clock
clearInterval(this.clockUpdate);
+ this.clockUpdate = null;
if (moveCol == this.game.mycolor && !data.receiveMyMove) {
if (this.drawOffer == "received")
// I refuse draw
});
};
// The active tab can update storage immediately
- if (!document.hidden) updateStorage();
+ if (this.focus) updateStorage();
// Small random delay otherwise
else setTimeout(updateStorage, 500 + 1000 * Math.random());
}
let sendMove = {
move: filtered_move,
index: origMovescount,
- // color is required to check if this is my move (if several tabs opened)
+ // color is required to check if this is my move
+ // (if several tabs opened)
color: moveCol,
cancelDrawOffer: this.drawOffer == ""
};
};
if (this.game.type == "live") {
GameStorage.update(this.gameRef, scoreObj);
+ // Notify myself locally if I'm elsewhere:
+ if (!this.focus) {
+ notify(
+ "Game over",
+ { body: score + " : " + scoreMsg }
+ );
+ }
if (!!callback) callback();
}
else this.updateCorrGame(scoreObj, callback);
- // Notify the score to main Hall. TODO: only one player (currently double send)
+ // Notify the score to main Hall.
+ // TODO: only one player (currently double send)
this.send("result", { gid: this.game.id, score: score });
// Also to MyGames page (TODO: doubled as well...)
this.notifyMyGames(
projects / vchess.git / blobdiff