X-Git-Url: https://git.auder.net/doc/index.css?a=blobdiff_plain;ds=sidebyside;f=client%2Fsrc%2Fviews%2FGame.vue;h=35cec3a87c95de5ad7279eeb1bb2c72d6fa08e9f;hb=a0c41e7e23c9ff64031739e072f38e493bac8dca;hp=0c3de58f9150a4061f6f4ce68e30dcc6bc3b6b6b;hpb=cf94b843f223b34fd2f3680112a183f6d5cd409c;p=vchess.git
diff --git a/client/src/views/Game.vue b/client/src/views/Game.vue
index 0c3de58f..35cec3a8 100644
--- a/client/src/views/Game.vue
+++ b/client/src/views/Game.vue
@@ -1,20 +1,35 @@
main
- input#modalChat.modal(type="checkbox" @change="toggleChat")
- div(role="dialog" aria-labelledby="inputChat")
+ input#modalChat.modal(type="checkbox" @click="resetChatColor")
+ div#chatWrap(role="dialog" data-checkbox="modalChat" aria-labelledby="inputChat")
#chat.card
label.modal-close(for="modalChat")
+ #participants
+ span {{ Object.keys(people).length + " " + st.tr["participant(s):"] }}
+ span(v-for="p in Object.values(people)" v-if="!!p.name")
+ | {{ p.name }}
+ span.anonymous(v-if="Object.values(people).some(p => !p.name)")
+ | + @nonymous
Chat(:players="game.players" :pastChats="game.chats"
- @newchat-sent="finishSendChat" @newchat-received="processChat")
+ :newChat="newChat" @mychat="processChat")
.row
- .col-sm-12.col-md-9.col-md-offset-3.col-lg-10.col-lg-offset-2
+ #aboveBoard.col-sm-12.col-md-9.col-md-offset-3.col-lg-10.col-lg-offset-2
+ span.variant-info {{ game.vname }}
button#chatBtn(onClick="doClick('modalChat')") Chat
- #actions(v-if="game.mode!='analyze' && game.score=='*'")
- button(@click="offerDraw") Draw
- button(@click="abortGame") Abort
- button(@click="resign") Resign
- div Names: {{ game.players[0].name }} - {{ game.players[1].name }}
- div(v-if="game.score=='*'") Time: {{ virtualClocks[0] }} - {{ virtualClocks[1] }}
+ #actions(v-if="game.score=='*'")
+ button(@click="clickDraw" :class="{['draw-' + drawOffer]: true}")
+ | {{ st.tr["Draw"] }}
+ button(v-if="!!game.mycolor" @click="abortGame") {{ st.tr["Abort"] }}
+ button(v-if="!!game.mycolor" @click="resign") {{ st.tr["Resign"] }}
+ #playersInfo
+ p
+ span.name(:class="{connected: isConnected(0)}")
+ | {{ game.players[0].name || "@nonymous" }}
+ span.time(v-if="game.score=='*'") {{ virtualClocks[0] }}
+ span.split-names -
+ span.name(:class="{connected: isConnected(1)}")
+ | {{ game.players[1].name || "@nonymous" }}
+ span.time(v-if="game.score=='*'") {{ virtualClocks[1] }}
BaseGame(:game="game" :vr="vr" ref="basegame"
@newmove="processMove" @gameover="gameOver")
@@ -27,6 +42,8 @@ import { GameStorage } from "@/utils/gameStorage";
import { ppt } from "@/utils/datetime";
import { extractTime } from "@/utils/timeControl";
import { ArrayFun } from "@/utils/array";
+import { processModalClick } from "@/utils/modalClick";
+import { getScoreMessage } from "@/utils/scoring";
export default {
name: 'my-game',
@@ -42,13 +59,17 @@ export default {
id: "",
rid: ""
},
- game: {players:[{name:""},{name:""}]}, //passed to BaseGame
+ game: { //passed to BaseGame
+ players:[{name:""},{name:""}],
+ rendered: false,
+ },
virtualClocks: [0, 0], //initialized with true game.clocks
vr: null, //"variant rules" object initialized from FEN
- drawOffer: "", //TODO: use for button style
- people: [], //players + observers
+ drawOffer: "",
+ people: {}, //players + observers
lastate: undefined, //used if opponent send lastate before game is ready
repeat: {}, //detect position repetition
+ newChat: "",
};
},
watch: {
@@ -79,21 +100,18 @@ export default {
{
clearInterval(clockUpdate);
if (countdown < 0)
- this.gameOver(this.vr.turn=="w" ? "0-1" : "1-0", "Time");
+ this.gameOver(this.vr.turn=="w" ? "0-1" : "1-0", this.st.tr["Time"]);
}
else
- {
- // TODO: with Vue 3, just do this.virtualClocks[colorIdx] = ppt(--countdown)
this.$set(this.virtualClocks, colorIdx, ppt(Math.max(0, --countdown)));
- }
}, 1000);
},
},
- // TODO: redundant code with Hall.vue (related to people array)
+ // NOTE: some redundant code with Hall.vue (related to people array)
created: function() {
// Always add myself to players' list
const my = this.st.user;
- this.people.push({sid:my.sid, id:my.id, name:my.name});
+ this.$set(this.people, my.sid, {id:my.id, name:my.name});
this.gameRef.id = this.$route.params["id"];
this.gameRef.rid = this.$route.query["rid"]; //may be undefined
// Define socket .onmessage() and .onclose() events:
@@ -121,23 +139,38 @@ export default {
socketInit(this.loadGame);
}
},
+ mounted: function() {
+ document.getElementById("chatWrap").addEventListener(
+ "click", processModalClick);
+ },
methods: {
// O.1] Ask server for room composition:
roomInit: function() {
+ // Notify the room only now that I connected, because
+ // messages might be lost otherwise (if game loading is slow)
+ this.st.conn.send(JSON.stringify({code:"connect"}));
this.st.conn.send(JSON.stringify({code:"pollclients"}));
},
+ isConnected: function(index) {
+ const name = this.game.players[index].name;
+ if (this.st.user.name == name)
+ return true;
+ return Object.values(this.people).some(p => p.name == name);
+ },
socketMessageListener: function(msg) {
const data = JSON.parse(msg.data);
switch (data.code)
{
case "duplicate":
- alert("Warning: duplicate 'offline' connection");
+ alert(this.st.tr["Warning: multi-tabs not supported"]);
break;
// 0.2] Receive clients list (just socket IDs)
case "pollclients":
{
data.sockIds.forEach(sid => {
- this.people.push({sid:sid, id:0, name:""});
+ if (!!this.people[sid])
+ return;
+ this.$set(this.people, sid, {id:0, name:""});
// Ask only identity
this.st.conn.send(JSON.stringify({code:"askidentity", target:sid}));
});
@@ -148,63 +181,90 @@ export default {
// Request for identification: reply if I'm not anonymous
if (this.st.user.id > 0)
{
- this.st.conn.send(JSON.stringify(
- // people[0] instead of st.user to avoid sending email
- {code:"identity", user:this.people[0], target:data.from}));
+ this.st.conn.send(JSON.stringify({code:"identity",
+ user: {
+ // NOTE: decompose to avoid revealing email
+ name: this.st.user.name,
+ sid: this.st.user.sid,
+ id: this.st.user.id,
+ },
+ target:data.from}));
}
break;
}
case "identity":
{
- let player = this.people.find(p => p.sid == data.user.sid);
- // NOTE: sometimes player.id fails because player is undefined...
- // Probably because the event was meant for Hall?
- if (!player)
- return;
- player.id = data.user.id;
- player.name = data.user.name;
- // Sending last state only for live games: corr games are complete
- if (this.game.type == "live" && this.game.oppsid == player.sid)
+ this.$set(this.people, data.user.sid,
+ {id: data.user.id, name: data.user.name});
+ // 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 == data.user.sid))
+ {
+ this.st.conn.send(JSON.stringify({code:"asklastate", target:data.user.sid}));
+ }
+ break;
+ }
+ case "asklastate":
+ {
+ // Sending last state if I played a move or score != "*"
+ if ((this.game.moves.length > 0 && this.vr.turn != this.game.mycolor)
+ || this.game.score != "*")
{
// Send our "last state" informations to opponent
const L = this.game.moves.length;
- let lastMove = (L>0 ? this.game.moves[L-1] : undefined);
- if (!!lastMove && this.drawOffer == "sent")
- lastMove.draw = true;
+ const myIdx = ["w","b"].indexOf(this.game.mycolor);
this.st.conn.send(JSON.stringify({
code: "lastate",
- target: player.sid,
+ target: data.from,
state:
{
- lastMove: lastMove,
+ // NOTE: lastMove (when defined) includes addTime
+ lastMove: (L>0 ? this.game.moves[L-1] : undefined),
+ // Since we played a move (or abort or resign),
+ // only drawOffer=="sent" is possible
+ drawSent: this.drawOffer == "sent",
score: this.game.score,
movesCount: L,
- clocks: this.game.clocks,
+ initime: this.game.initime[1-myIdx], //relevant only if I played
}
}));
}
break;
}
case "askgame":
- // Send current (live) game
- const myGame =
+ // Send current (live) game if I play in (not an observer),
+ // and not asked by opponent (!)
+ if (this.game.type == "live"
+ && this.game.players.some(p => p.sid == this.st.user.sid)
+ && this.game.players.every(p => p.sid != data.from))
{
- // Minimal game informations:
- id: this.game.id,
- players: this.game.players.map(p => { return {name:p.name}; }),
- vid: this.game.vid,
- timeControl: this.game.timeControl,
- };
- this.st.conn.send(JSON.stringify({code:"game",
- game:myGame, target:data.from}));
+ const myGame =
+ {
+ // Minimal game informations:
+ id: this.game.id,
+ players: this.game.players,
+ vid: this.game.vid,
+ timeControl: this.game.timeControl,
+ };
+ this.st.conn.send(JSON.stringify({code:"game",
+ game:myGame, target:data.from}));
+ }
break;
case "newmove":
- this.$set(this.game, "moveToPlay", data.move); //TODO: Vue3...
+ if (!!data.move.cancelDrawOffer) //opponent refuses draw
+ this.drawOffer = "";
+ this.$set(this.game, "moveToPlay", data.move);
+ break;
+ case "newchat":
+ this.newChat = data.chat;
+ if (!document.getElementById("modalChat").checked)
+ document.getElementById("chatBtn").style.backgroundColor = "#c5fefe";
break;
case "lastate": //got opponent infos about last move
{
- this.lastate = data;
- if (!!this.game.type) //game is loaded
+ this.lastate = data.state;
+ if (this.game.rendered) //game is rendered (Board component)
this.processLastate();
//else: will be processed when game is ready
break;
@@ -216,13 +276,15 @@ export default {
this.gameOver("?", "Abort");
break;
case "draw":
- this.gameOver("1/2", "Mutual agreement");
+ this.gameOver("1/2", data.message);
break;
case "drawoffer":
- this.drawOffer = "received"; //TODO: observers don't know who offered draw
+ // NOTE: observers don't know who offered draw
+ this.drawOffer = "received";
break;
case "askfullgame":
- this.st.conn.send(JSON.stringify({code:"fullgame", game:this.game, target:data.from}));
+ this.st.conn.send(JSON.stringify({code:"fullgame",
+ game:this.game, target:data.from}));
break;
case "fullgame":
// Callback "roomInit" to poll clients only after game is loaded
@@ -230,12 +292,12 @@ export default {
break;
case "connect":
{
- this.people.push({name:"", id:0, sid:data.from});
+ this.$set(this.people, data.from, {name:"", id:0});
this.st.conn.send(JSON.stringify({code:"askidentity", target:data.from}));
break;
}
case "disconnect":
- ArrayFun.remove(this.people, p => p.sid == data.from);
+ this.$delete(this.people, data.from);
break;
}
},
@@ -247,73 +309,73 @@ export default {
if (data.movesCount > L)
{
// Just got last move from him
- this.$set(this.game, "moveToPlay", data.lastMove);
- if (data.score != "*" && this.game.score == "*")
- {
- // Opponent resigned or aborted game, or accepted draw offer
- // (this is not a stalemate or checkmate)
- this.gameOver(data.score, "Opponent action");
- }
- this.game.clocks = data.clocks; //TODO: check this?
- if (!!data.lastMove.draw)
+ const myIdx = ["w","b"].indexOf(this.game.mycolor);
+ if (!!data.drawSent)
this.drawOffer = "received";
+ this.$set(this.game, "moveToPlay", Object.assign({}, data.lastMove, {initime: data.initime}));
+ }
+ if (data.score != "*")
+ {
+ this.drawOffer = "";
+ if (this.game.score == "*")
+ this.gameOver(data.score);
}
},
- offerDraw: function() {
+ clickDraw: function() {
+ if (!this.game.mycolor)
+ return; //I'm just spectator
if (["received","threerep"].includes(this.drawOffer))
{
- if (!confirm("Accept draw?"))
+ if (!confirm(this.st.tr["Accept draw?"]))
return;
- this.people.forEach(p => {
- if (p.sid != this.st.user.sid)
- this.st.conn.send(JSON.stringify({code:"draw", target:p.sid}));
- });
const message = (this.drawOffer == "received"
? "Mutual agreement"
: "Three repetitions");
+ Object.keys(this.people).forEach(sid => {
+ if (sid != this.st.user.sid)
+ {
+ this.st.conn.send(JSON.stringify({code:"draw",
+ message:message, target:sid}));
+ }
+ });
this.gameOver("1/2", message);
}
- else if (this.drawOffer == "sent")
+ else if (this.drawOffer == "") //no effect if drawOffer == "sent"
{
- this.drawOffer = "";
- if (this.game.type == "corr")
- GameStorage.update(this.gameRef.id, {drawOffer: false});
- }
- else
- {
- if (!confirm("Offer draw?"))
+ if (this.game.mycolor != this.vr.turn)
+ return alert(this.st.tr["Draw offer only in your turn"]);
+ if (!confirm(this.st.tr["Offer draw?"]))
return;
this.drawOffer = "sent";
- this.people.forEach(p => {
- if (p.sid != this.st.user.sid)
- this.st.conn.send(JSON.stringify({code:"drawoffer", target:p.sid}));
+ Object.keys(this.people).forEach(sid => {
+ if (sid != this.st.user.sid)
+ this.st.conn.send(JSON.stringify({code:"drawoffer", target:sid}));
});
- if (this.game.type == "corr")
- GameStorage.update(this.gameRef.id, {drawOffer: true});
+ GameStorage.update(this.gameRef.id, {drawOffer: this.game.mycolor});
}
},
abortGame: function() {
- if (!confirm(this.st.tr["Terminate game?"]))
+ if (!this.game.mycolor || !confirm(this.st.tr["Terminate game?"]))
return;
this.gameOver("?", "Abort");
- this.people.forEach(p => {
- if (p.sid != this.st.user.sid)
+ Object.keys(this.people).forEach(sid => {
+ if (sid != this.st.user.sid)
{
this.st.conn.send(JSON.stringify({
code: "abort",
- target: p.sid,
+ target: sid,
}));
}
});
},
resign: function(e) {
- if (!confirm("Resign the game?"))
+ if (!this.game.mycolor || !confirm(this.st.tr["Resign the game?"]))
return;
- this.people.forEach(p => {
- if (p.sid != this.st.user.sid)
+ Object.keys(this.people).forEach(sid => {
+ if (sid != this.st.user.sid)
{
this.st.conn.send(JSON.stringify({code:"resign",
- side:this.game.mycolor, target:p.sid}));
+ side:this.game.mycolor, target:sid}));
}
});
this.gameOver(this.game.mycolor=="w" ? "0-1" : "1-0", "Resign");
@@ -358,8 +420,6 @@ export default {
}
if (L >= 1)
game.initime[L%2] = game.moves[L-1].played;
- if (game.drawOffer)
- this.drawOffer = "received";
}
// Now that we used idx and played, re-format moves as for live games
game.moves = game.moves.map( (m) => {
@@ -394,6 +454,26 @@ export default {
}
}
}
+ if (!!game.drawOffer)
+ {
+ if (game.drawOffer == "t") //three repetitions
+ this.drawOffer = "threerep";
+ else
+ {
+ if (myIdx < 0)
+ this.drawOffer = "received"; //by any of the players
+ else
+ {
+ // I play in this game:
+ if ((game.drawOffer == "w" && myIdx==0) || (game.drawOffer=="b" && myIdx==1))
+ this.drawOffer = "sent";
+ else //all other cases
+ this.drawOffer = "received";
+ }
+ }
+ }
+ if (!!game.scoreMsg)
+ game.scoreMsg = this.st.tr[game.scoreMsg]; //stored in english
this.game = Object.assign({},
game,
// NOTE: assign mycolor here, since BaseGame could also be VS computer
@@ -407,9 +487,28 @@ export default {
oppid: (myIdx < 0 ? undefined : game.players[1-myIdx].uid),
}
);
- this.repeat = {}; //reset
- if (!!this.lastate) //lastate arrived before game was loaded:
- this.processLastate();
+ this.$nextTick(() => {
+ this.game.rendered = true;
+ // Did lastate arrive before game was rendered?
+ if (!!this.lastate)
+ this.processLastate();
+ });
+ this.repeat = {}; //reset: scan past moves' FEN:
+ let repIdx = 0;
+ // NOTE: vr_tmp to obtain FEN strings is redundant with BaseGame
+ let vr_tmp = new V(game.fenStart);
+ game.moves.forEach(m => {
+ vr_tmp.play(m);
+ const fenObj = V.ParseFen( vr_tmp.getFen() );
+ repIdx = fenObj.position + "_" + fenObj.turn;
+ if (!!fenObj.flags)
+ repIdx += "_" + fenObj.flags;
+ this.repeat[repIdx] = (!!this.repeat[repIdx]
+ ? this.repeat[repIdx]+1
+ : 1);
+ });
+ if (this.repeat[repIdx] >= 3)
+ this.drawOffer = "threerep";
callback();
};
if (!!game)
@@ -430,6 +529,7 @@ export default {
processMove: function(move) {
// Update storage (corr or live) if I play in the game
const colorIdx = ["w","b"].indexOf(move.color);
+ const nextIdx = ["w","b"].indexOf(this.vr.turn);
// https://stackoverflow.com/a/38750895
if (!!this.game.mycolor)
{
@@ -446,6 +546,8 @@ export default {
let addTime = 0;
if (move.color == this.game.mycolor)
{
+ if (this.drawOffer == "received") //I refuse draw
+ this.drawOffer = "";
if (this.game.moves.length >= 2) //after first move
{
const elapsed = Date.now() - this.game.initime[colorIdx];
@@ -453,25 +555,58 @@ export default {
addTime = this.game.increment - elapsed/1000;
}
let sendMove = Object.assign({}, filtered_move, {addTime: addTime});
- this.people.forEach(p => {
- if (p.sid != this.st.user.sid)
+ Object.keys(this.people).forEach(sid => {
+ if (sid != this.st.user.sid)
{
this.st.conn.send(JSON.stringify({
code: "newmove",
- target: p.sid,
+ target: sid,
move: sendMove,
+ cancelDrawOffer: this.drawOffer=="",
}));
}
});
+ // (Add)Time indication: useful in case of lastate infos requested
+ move.addTime = addTime;
}
else
addTime = move.addTime; //supposed transmitted
- const nextIdx = ["w","b"].indexOf(this.vr.turn);
+ // Update current game object:
+ this.game.moves.push(move);
+ this.game.fen = move.fen;
+ this.$set(this.game.clocks, colorIdx, this.game.clocks[colorIdx] + addTime);
+ // move.initime is set only when I receive a "lastate" move from opponent
+ this.game.initime[nextIdx] = move.initime || Date.now();
+ // If repetition detected, consider that a draw offer was received:
+ const fenObj = V.ParseFen(move.fen);
+ let repIdx = fenObj.position + "_" + fenObj.turn;
+ if (!!fenObj.flags)
+ repIdx += "_" + fenObj.flags;
+ this.repeat[repIdx] = (!!this.repeat[repIdx]
+ ? this.repeat[repIdx]+1
+ : 1);
+ if (this.repeat[repIdx] >= 3)
+ this.drawOffer = "threerep";
+ else if (this.drawOffer == "threerep")
+ this.drawOffer = "";
// Since corr games are stored at only one location, update should be
// done only by one player for each move:
if (!!this.game.mycolor &&
(this.game.type == "live" || move.color == this.game.mycolor))
{
+ let drawCode = "";
+ switch (this.drawOffer)
+ {
+ case "threerep":
+ drawCode = "t";
+ break;
+ case "sent":
+ drawCode = this.game.mycolor;
+ break;
+ case "received":
+ drawCode = this.vr.turn;
+ break;
+ }
if (this.game.type == "corr")
{
GameStorage.update(this.gameRef.id,
@@ -480,9 +615,10 @@ export default {
move:
{
squares: filtered_move,
- played: Date.now(), //TODO: on server?
- idx: this.game.moves.length,
+ played: Date.now(),
+ idx: this.game.moves.length - 1,
},
+ drawOffer: drawCode,
});
}
else //live
@@ -491,62 +627,51 @@ export default {
{
fen: move.fen,
move: filtered_move,
- clocks: this.game.clocks.map((t,i) => i==colorIdx
- ? this.game.clocks[i] + addTime
- : this.game.clocks[i]),
- initime: this.game.initime.map((t,i) => i==nextIdx
- ? Date.now()
- : this.game.initime[i]),
+ clocks: this.game.clocks,
+ initime: this.game.initime,
+ drawOffer: drawCode,
});
}
}
- // Also update current game object:
- this.game.moves.push(move);
- this.game.fen = move.fen;
- //TODO: (Vue3) just this.game.clocks[colorIdx] += addTime;
- this.$set(this.game.clocks, colorIdx, this.game.clocks[colorIdx] + addTime);
- this.game.initime[nextIdx] = Date.now();
- // If repetition detected, consider that a draw offer was received:
- const fenObj = V.ParseFen(move.fen);
- let repIdx = fenObj.position + "_" + fenObj.turn;
- if (!!fenObj.flags)
- repIdx += "_" + fenObj.flags;
- this.repeat[repIdx] = (!!this.repeat[repIdx]
- ? this.repeat[repIdx]+1
- : 1);
- if (this.repeat[repIdx] >= 3)
- this.drawOffer = "threerep";
},
- toggleChat: function() {
+ resetChatColor: function() {
+ // TODO: this is called twice, once on opening an once on closing
document.getElementById("chatBtn").style.backgroundColor = "#e2e2e2";
},
- finishSendChat: function(chat) {
- if (this.game.type == "corr")
+ processChat: function(chat) {
+ this.st.conn.send(JSON.stringify({code:"newchat", chat:chat}));
+ // NOTE: anonymous chats in corr games are not stored on server (TODO?)
+ if (this.game.type == "corr" && this.st.user.id > 0)
GameStorage.update(this.gameRef.id, {chat: chat});
},
- processChat: function() {
- if (!document.getElementById("inputChat").checked)
- document.getElementById("chatBtn").style.backgroundColor = "#c5fefe";
- },
gameOver: function(score, scoreMsg) {
- this.game.mode = "analyze";
this.game.score = score;
- this.game.scoreMsg = scoreMsg;
+ this.game.scoreMsg = this.st.tr[(!!scoreMsg
+ ? scoreMsg
+ : getScoreMessage(score))];
const myIdx = this.game.players.findIndex(p => {
return p.sid == this.st.user.sid || p.uid == this.st.user.id;
});
if (myIdx >= 0) //OK, I play in this game
- GameStorage.update(this.gameRef.id, { score: score });
+ {
+ GameStorage.update(this.gameRef.id,
+ {score: score, scoreMsg: scoreMsg});
+ }
},
},
};
-