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
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);
},
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;
},
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.socketCloseListener = setInterval(
() => {
if (this.conn.readyState == 3) {
- this.conn.removeEventListener("message", this.socketMessageListener);
+ this.conn.removeEventListener(
+ "message", this.socketMessageListener);
this.conn = new WebSocket(this.connexionString);
this.conn.addEventListener("message", this.socketMessageListener);
}
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"); });
});
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: since socket init after game load, the game is supposedly ready
+ // 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,
}
},
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
- // Live games before 26/03/2020 don't have chat history. TODO: remove next line
- if (!game.chats) game.chats = [];
+ // "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") {
});
};
// 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