<template lang="pug">
main
- input#modalInfo.modal(type="checkbox")
- div#infoDiv(
+ input#modalScore.modal(type="checkbox")
+ div#scoreDiv(
role="dialog"
- data-checkbox="modalInfo"
+ data-checkbox="modalScore"
)
.card.text-center
- label.modal-close(for="modalInfo")
+ label.modal-close(for="modalScore")
+ p.score-section
+ span.score {{ game.score }}
+ | :
+ span.score-msg {{ st.tr[game.scoreMsg] }}
+ input#modalRematch.modal(type="checkbox")
+ div#rematchDiv(
+ role="dialog"
+ data-checkbox="modalRematch"
+ )
+ .card.text-center
+ label.modal-close(for="modalRematch")
a(
:href="'#/game/' + rematchId"
- onClick="document.getElementById('modalInfo').checked=false"
+ onClick="document.getElementById('modalRematch').checked=false"
)
| {{ st.tr["Rematch in progress"] }}
input#modalChat.modal(
span {{ st.tr["Cancel"] }}
.row
#aboveBoard.col-sm-12.col-md-9.col-md-offset-3.col-lg-10.col-lg-offset-2
- span.variant-cadence {{ game.cadence }}
+ span.variant-cadence(v-if="game.type!='import'") {{ game.cadence }}
span.variant-name {{ game.vname }}
span#nextGame(
v-if="nextIds.length > 0"
)
img(src="/images/icons/rematch.svg")
#playersInfo
- p
+ p(v-if="isLargeScreen()")
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 Chat from "@/components/Chat.vue";
import { store } from "@/store";
import { GameStorage } from "@/utils/gameStorage";
+import { ImportgameStorage } from "@/utils/importgameStorage";
import { ppt } from "@/utils/datetime";
import { notify } from "@/utils/notifications";
import { ajax } from "@/utils/ajax";
retrySendmove: null,
clockUpdate: null,
// Related to (killing of) self multi-connects:
- newConnect: {},
- killed: {}
+ newConnect: {}
};
},
watch: {
this.atCreation();
},
mounted: function() {
- ["chatWrap", "infoDiv"].forEach(eltName => {
- document.getElementById(eltName)
- .addEventListener("click", processModalClick);
- });
+ document.getElementById("chatWrap")
+ .addEventListener("click", (e) => {
+ processModalClick(e, () => {
+ this.toggleChat("close")
+ });
+ });
+ ["rematchDiv", "scoreDiv"].forEach(
+ (eltName) => {
+ document.getElementById(eltName)
+ .addEventListener("click", processModalClick);
+ }
+ );
if ("ontouchstart" in window) {
// Disable tooltips on smartphones:
document.querySelectorAll("#aboveBoard .tooltip").forEach(elt => {
}
this.send("losefocus");
},
+ isLargeScreen: function() {
+ return window.innerWidth >= 500;
+ },
participateInChat: function(p) {
return Object.keys(p.tmpIds).some(x => p.tmpIds[x].focus) && !!p.name;
},
this.retrySendmove = null;
this.clockUpdate = null;
this.newConnect = {};
- this.killed = {};
// 1] Initialize connection
this.connexionString =
params.socketUrl +
if (!!oppsid && !!this.people[oppsid]) return oppsid;
return null;
},
- toggleChat: function() {
- if (document.getElementById("modalChat").checked)
+ // NOTE: action if provided is always a closing action
+ toggleChat: function(action) {
+ if (!action && document.getElementById("modalChat").checked)
// Entering chat
document.getElementById("inputChat").focus();
- // TODO: next line is only required when exiting chat,
- // but the event for now isn't well detected.
- document.getElementById("chatBtn").classList.remove("somethingnew");
+ else {
+ document.getElementById("chatBtn").classList.remove("somethingnew");
+ if (!!this.game.mycolor) {
+ // Update "chatRead" variable either on server or locally
+ if (this.game.type == "corr")
+ this.updateCorrGame({ chatRead: this.game.mycolor });
+ else if (this.game.type == "live")
+ GameStorage.update(this.gameRef, { chatRead: true });
+ }
+ }
},
processChat: function(chat) {
this.send("newchat", { data: chat });
// 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 });
+ if (!!this.game.mycolor) {
+ if (this.game.type == "corr")
+ this.updateCorrGame({ chat: chat });
+ else {
+ // Live game
+ chat.added = Date.now();
+ GameStorage.update(this.gameRef, { chat: chat });
+ }
}
},
clearChat: function() {
}
},
getGameType: function(game) {
+ if (!!game.id.toString().match(/^i/)) return "import";
return game.cadence.indexOf("d") >= 0 ? "corr" : "live";
},
// Notify something after a new move (to opponent and me on MyGames page)
if (sid != this.st.user.sid) {
this.send("askidentity", { target: sid });
this.people[sid] = { tmpIds: data.sockIds[sid] };
- } else {
+ }
+ else {
// Complete my tmpIds:
Object.assign(this.people[sid].tmpIds, data.sockIds[sid]);
}
}
}
);
- this.newConnect[data.from] = true; //for self multi-connects tests
+ // 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 };
}
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 = {
// player.tmpIds is already set
player.name = user.name;
player.id = user.id;
+ if (this.game.type == "live") {
+ const myGidx =
+ this.game.players.findIndex(p => p.sid == this.st.user.sid);
+ // Sometimes a player name isn't stored yet (TODO: why?)
+ if (
+ myGidx >= 0 &&
+ !this.game.players[1 - myGidx].name &&
+ this.game.players[1 - myGidx].sid == user.sid &&
+ !!user.name
+ ) {
+ this.game.players[1-myGidx].name = user.name;
+ GameStorage.update(
+ this.gameRef,
+ { playerName: { idx: 1 - myGidx, name: user.name } }
+ );
+ }
+ }
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.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
- );
- }
+ // 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;
}
case "askgame":
- // Send current (live) game if not asked by any of the players
+ // Send current (live or import) game,
+ // if not asked by any of the players
if (
- this.game.type == "live" &&
+ this.game.type != "corr" &&
this.game.players.every(p => p.sid != data.from[0])
) {
const myGame = {
id: this.game.id,
+ // FEN is current position, unused for now
fen: this.game.fen,
players: this.game.players,
vid: this.game.vid,
case "drawoffer":
// NOTE: observers don't know who offered draw
this.drawOffer = "received";
- if (this.game.type == "live") {
+ if (!!this.game.mycolor && this.game.type == "live") {
GameStorage.update(
this.gameRef,
{ drawOffer: V.GetOppCol(this.game.mycolor) }
case "rematchoffer":
// NOTE: observers don't know who offered rematch
this.rematchOffer = data.data ? "received" : "";
- if (this.game.type == "live") {
+ if (!!this.game.mycolor && this.game.type == "live") {
GameStorage.update(
this.gameRef,
{ rematchOffer: V.GetOppCol(this.game.mycolor) }
this.$router.push("/game/" + gameInfo.id);
} else {
this.rematchId = gameInfo.id;
- document.getElementById("modalInfo").checked = true;
+ document.getElementById("modalRematch").checked = true;
}
break;
}
this.$refs["chatcomp"].newChat(chat);
if (this.game.type == "live") {
chat.added = Date.now();
- GameStorage.update(this.gameRef, { chat: chat });
+ if (!!this.game.mycolor)
+ GameStorage.update(this.gameRef, { chat: chat });
}
if (!document.getElementById("modalChat").checked)
document.getElementById("chatBtn").classList.add("somethingnew");
}
},
clickDraw: function() {
- if (!this.game.mycolor) return; //I'm just spectator
+ if (!this.game.mycolor || this.game.type == "import") return;
if (["received", "threerep"].includes(this.drawOffer)) {
if (!confirm(this.st.tr["Accept draw?"])) return;
const message =
});
},
clickRematch: function() {
- if (!this.game.mycolor) return; //I'm just spectator
+ if (!this.game.mycolor || this.game.type == "import") return;
if (this.rematchOffer == "received") {
// Start a new game!
let gameInfo = {
this.gameOver(score, side + " surrender");
},
loadGame: function(game, callback) {
- this.vr = new V(game.fen);
- const gtype = this.getGameType(game);
+ const gtype = game.type || this.getGameType(game);
const tc = extractTime(game.cadence);
const myIdx = game.players.findIndex(p => {
return p.sid == this.st.user.sid || p.id == this.st.user.id;
});
+ // Sometimes the name isn't stored yet (TODO: why?)
+ if (
+ myIdx >= 0 &&
+ gtype == "live" &&
+ !game.players[myIdx].name &&
+ !!this.st.user.name
+ ) {
+ game.players[myIdx].name = this.st.user.name;
+ GameStorage.update(
+ game.id,
+ { playerName: { idx: myIdx, name: this.st.user.name } }
+ );
+ }
// "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") {
+ if (mycolor == 'w') game.chatRead = game.chatReadWhite;
+ else if (mycolor == 'b') game.chatRead = game.chatReadBlack;
// NOTE: clocks in seconds
game.moves.sort((m1, m2) => m1.idx - m2.idx); //in case of
game.clocks = [tc.mainTime, tc.mainTime];
(Date.now() - game.moves[L-1].played) / 1000;
}
}
- if (myIdx >= 0 && game.score == "*" && game.chats.length > 0) {
- // Did a chat message arrive after my last move?
- let dtLastMove = 0;
- if (L == 1 && myIdx == 0)
- dtLastMove = game.moves[0].played;
- else if (L >= 2) {
- if (L % 2 == 0) {
- // It's now white turn
- dtLastMove = game.moves[L-1-(1-myIdx)].played;
- } else {
- // Black turn:
- dtLastMove = game.moves[L-1-myIdx].played;
- }
- }
- if (dtLastMove < game.chats[0].added)
- document.getElementById("chatBtn").classList.add("somethingnew");
- }
// Now that we used idx and played, re-format moves as for live games
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");
- }
+ else if (gtype == "live") {
if (game.clocks[0] < 0) {
// Game is unstarted. clock is ignored until move 2
game.clocks = [tc.mainTime, tc.mainTime];
if (myIdx >= 0) {
// I play in this live game
- GameStorage.update(game.id, {
- clocks: game.clocks
- });
+ GameStorage.update(
+ game.id,
+ { clocks: game.clocks }
+ );
}
} else {
if (!!game.initime)
game.clocks[myIdx] -= (Date.now() - game.initime) / 1000;
}
}
+ else
+ // gtype == "import"
+ game.clocks = [tc.mainTime, tc.mainTime];
+ // 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 (
+ myIdx >= 0 &&
+ game.chats.length > 0 &&
+ (!game.chatRead || game.chatRead < game.chats[0].added)
+ ) {
+ // A chat message arrived since my last reading:
+ document.getElementById("chatBtn").classList.add("somethingnew");
+ }
// TODO: merge next 2 "if" conditions
if (!!game.drawOffer) {
if (game.drawOffer == "t")
}
this.repeat = {}; //reset: scan past moves' FEN:
let repIdx = 0;
- let vr_tmp = new V(game.fenStart);
+ this.vr = new V(game.fenStart);
let curTurn = "n";
game.moves.forEach(m => {
- playMove(m, vr_tmp);
- const fenIdx = vr_tmp.getFen().replace(/ /g, "_");
+ playMove(m, this.vr);
+ const fenIdx = this.vr.getFenForRepeat();
this.repeat[fenIdx] = this.repeat[fenIdx]
? this.repeat[fenIdx] + 1
: 1;
});
+ // Imported games don't have current FEN
+ if (!game.fen) game.fen = this.vr.getFen();
if (this.repeat[repIdx] >= 3) this.drawOffer = "threerep";
this.game = Object.assign(
// NOTE: assign mycolor here, since BaseGame could also be VS computer
}
}
);
- } else
- // Local game (or live remote)
+ }
+ else if (!!this.gameRef.match(/^i/))
+ // Game import (maybe remote)
+ ImportgameStorage.get(this.gameRef, callback);
+ else
+ // Local live game (or remote)
GameStorage.get(this.gameRef, callback);
},
re_setClocks: function() {
},
// Update variables and storage after a move:
processMove: function(move, data) {
+ if (this.game.type == "import")
+ // Shouldn't receive any messages in this mode:
+ return;
if (!data) data = {};
const moveCol = this.vr.turn;
const colorIdx = ["w", "b"].indexOf(moveCol);
}
);
// PlayOnBoard is enough, and more appropriate for Synchrone Chess
- V.PlayOnBoard(this.vr.board, move);
+ const arMove = (Array.isArray(move) ? move : [move]);
+ for (let i = 0; i < arMove.length; i++)
+ V.PlayOnBoard(this.vr.board, arMove[i]);
const position = this.vr.getBaseFen();
- V.UndoOnBoard(this.vr.board, move);
+ for (let i = arMove.length - 1; i >= 0; i--)
+ V.UndoOnBoard(this.vr.board, arMove[i]);
if (["all","byrow"].includes(V.ShowMoves)) {
this.curDiag = getDiagram({
position: position,
this.game.score = score;
if (!scoreMsg) scoreMsg = getScoreMessage(score);
this.game.scoreMsg = scoreMsg;
+ // Display result in a un-missable way:
+ document.getElementById("modalScore").checked = true;
this.$set(this.game, "scoreMsg", scoreMsg);
const myIdx = this.game.players.findIndex(p => {
return p.sid == this.st.user.sid || p.id == this.st.user.id;
</script>
<style lang="sass" scoped>
-#infoDiv > .card
+#scoreDiv > .card, #rematchDiv > .card
padding: 15px 0
max-width: 430px
+p.score-section
+ font-size: 1.3em
+ span.score
+ font-weight: bold
+
.connected
background-color: lightgreen
projects / vchess.git / blobdiff