<template lang="pug">
main
input#modalInfo.modal(type="checkbox")
- div#infoDiv(role="dialog" data-checkbox="modalInfo" aria-labelledby="infoMessage")
- .card.smallpad.small-modal.text-center
+ div#infoDiv(role="dialog" data-checkbox="modalInfo")
+ .card.text-center
label.modal-close(for="modalInfo")
- h3#infoMessage.section
- p(v-html="infoMessage")
+ p(v-html="infoMessage")
input#modalNewgame.modal(type="checkbox")
- div#newgameDiv(role="dialog" data-checkbox="modalNewgame"
- aria-labelledby="titleFenedit")
- .card.smallpad(@keyup.enter="newChallenge")
+ div#newgameDiv(role="dialog" data-checkbox="modalNewgame")
+ .card
label#closeNewgame.modal-close(for="modalNewgame")
- fieldset
- label(for="selectVariant") {{ st.tr["Variant"] }} *
- select#selectVariant(v-model="newchallenge.vid")
- option(v-for="v in st.variants" :value="v.id"
- :selected="newchallenge.vid==v.id")
- | {{ v.name }}
- fieldset
- label(for="cadence") {{ st.tr["Cadence"] }} *
- div#predefinedCadences
- button 3+2
- button 5+3
- button 15+5
- input#cadence(type="text" v-model="newchallenge.cadence"
- placeholder="5+0, 1h+30s, 7d+1d ...")
- fieldset(v-if="st.user.id > 0")
- label(for="selectPlayers") {{ st.tr["Play with?"] }}
- input#selectPlayers(type="text" v-model="newchallenge.to")
- fieldset(v-if="st.user.id > 0 && newchallenge.to.length > 0")
- label(for="inputFen") FEN
- input#inputFen(type="text" v-model="newchallenge.fen")
- button(@click="newChallenge") {{ st.tr["Send challenge"] }}
+ form(@submit.prevent="newChallenge()" @keyup.enter="newChallenge()")
+ fieldset
+ label(for="selectVariant") {{ st.tr["Variant"] }} *
+ select#selectVariant(v-model="newchallenge.vid")
+ option(v-for="v in st.variants" :value="v.id"
+ :selected="newchallenge.vid==v.id")
+ | {{ v.name }}
+ fieldset
+ label(for="cadence") {{ st.tr["Cadence"] }} *
+ div#predefinedCadences
+ button 3+2
+ button 5+3
+ button 15+5
+ input#cadence(type="text" v-model="newchallenge.cadence"
+ placeholder="5+0, 1h+30s, 7d+1d ...")
+ fieldset(v-if="st.user.id > 0")
+ label(for="selectPlayers") {{ st.tr["Play with?"] }}
+ input#selectPlayers(type="text" v-model="newchallenge.to")
+ fieldset(v-if="st.user.id > 0 && newchallenge.to.length > 0")
+ label(for="inputFen") FEN
+ input#inputFen(type="text" v-model="newchallenge.fen")
+ button(@click="newChallenge()") {{ st.tr["Send challenge"] }}
+ input#modalPeople.modal(type="checkbox" @click="resetChatColor()")
+ div#peopleWrap(role="dialog" data-checkbox="modalPeople")
+ .card
+ label.modal-close(for="modalPeople")
+ #people
+ #players
+ p(v-for="sid in Object.keys(people)" v-if="!!people[sid].name")
+ span {{ people[sid].name }}
+ button.player-action(v-if="sid!=st.user.sid || isGamer(sid)" @click="challOrWatch(sid)")
+ | {{ getActionLabel(sid) }}
+ p.anonymous @nonymous ({{ anonymousCount }})
+ #chat
+ Chat(:newChat="newChat" @mychat="processChat" :pastChats="[]")
+ .clearer
.row
- .col-sm-12
- button#newGame(onClick="doClick('modalNewgame')") {{ st.tr["New game"] }}
+ .col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
+ .button-group
+ button#peopleBtn(onClick="doClick('modalPeople')") {{ st.tr["Social"] }}
+ button(onClick="doClick('modalNewgame')") {{ st.tr["New game"] }}
.row
.col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
- div
+ div#div2
.button-group
- button(@click="(e) => setDisplay('c','live',e)" class="active")
+ button.tabbtn#btnClive(@click="setDisplay('c','live',$event)")
| {{ st.tr["Live challenges"] }}
- button(@click="(e) => setDisplay('c','corr',e)")
+ button.tabbtn#btnCcorr(@click="setDisplay('c','corr',$event)")
| {{ st.tr["Correspondance challenges"] }}
ChallengeList(v-show="cdisplay=='live'"
:challenges="filterChallenges('live')" @click-challenge="clickChallenge")
ChallengeList(v-show="cdisplay=='corr'"
:challenges="filterChallenges('corr')" @click-challenge="clickChallenge")
- #people
- h3.text-center {{ st.tr["Who's there?"] }}
- #players
- p(v-for="sid in Object.keys(people)" v-if="!!people[sid].name")
- span {{ people[sid].name }}
- // Check: anonymous players cannot send individual challenges or be challenged individually
- button.player-action(
- v-if="sid != st.user.sid && !!st.user.name && people[sid].id > 0"
- @click="challOrWatch(sid)"
- )
- | {{ getActionLabel(sid) }}
- p.anonymous @nonymous ({{ anonymousCount }})
- #chat
- Chat(:newChat="newChat" @mychat="processChat")
- .clearer
- div
+ div#div3
.button-group
- button(@click="(e) => setDisplay('g','live',e)" class="active")
+ button.tabbtn#btnGlive(@click="setDisplay('g','live',$event)")
| {{ st.tr["Live games"] }}
- button(@click="(e) => setDisplay('g','corr',e)")
+ button.tabbtn#btnGcorr(@click="setDisplay('g','corr',$event)")
| {{ st.tr["Correspondance games"] }}
GameList(v-show="gdisplay=='live'" :games="filterGames('live')"
- @show-game="showGame")
+ :showBoth="true" @show-game="showGame")
GameList(v-show="gdisplay=='corr'" :games="filterGames('corr')"
- @show-game="showGame")
+ :showBoth="true" @show-game="showGame")
</template>
<script>
},
newChat: "",
conn: null,
+ connexionString: "",
+ // Related to (killing of) self multi-connects:
+ newConnect: {},
+ killed: {},
};
},
watch: {
})
);
};
- if (names !== {})
+ if (Object.keys(names).length > 0)
{
ajax("/users",
"GET",
this.send("pollclientsandgamers");
};
// Initialize connection
- const connexionString = params.socketUrl +
+ this.connexionString = params.socketUrl +
"/?sid=" + this.st.user.sid +
"&tmpId=" + getRandString() +
"&page=" + encodeURIComponent(this.$route.path);
- this.conn = new WebSocket(connexionString);
+ this.conn = new WebSocket(this.connexionString);
this.conn.onopen = connectAndPoll;
this.conn.onmessage = this.socketMessageListener;
- const socketCloseListener = () => {
- this.conn = new WebSocket(connexionString);
- this.conn.addEventListener('message', this.socketMessageListener);
- this.conn.addEventListener('close', socketCloseListener);
- };
- this.conn.onclose = socketCloseListener;
+ this.conn.onclose = this.socketCloseListener;
},
mounted: function() {
- [document.getElementById("infoDiv"),document.getElementById("newgameDiv")]
- .forEach(elt => elt.addEventListener("click", processModalClick));
+ ["peopleWrap","infoDiv","newgameDiv"].forEach(eltName => {
+ let elt = document.getElementById(eltName);
+ elt.addEventListener("click", processModalClick);
+ });
document.querySelectorAll("#predefinedCadences > button").forEach(
(b) => { b.addEventListener("click",
() => { this.newchallenge.cadence = b.innerHTML; }
)}
);
+ const showCtype = localStorage.getItem("type-challenges") || "live";
+ const showGtype = localStorage.getItem("type-games") || "live";
+ this.setDisplay('c', showCtype);
+ this.setDisplay('g', showGtype);
},
beforeDestroy: function() {
this.send("disconnect");
methods: {
// Helpers:
send: function(code, obj) {
- this.conn.send(JSON.stringify(
- Object.assign(
- {code: code},
- obj,
- )
- ));
+ if (!!this.conn)
+ {
+ this.conn.send(JSON.stringify(
+ Object.assign(
+ {code: code},
+ obj,
+ )
+ ));
+ }
},
getVname: function(vid) {
const variant = this.st.variants.find(v => v.id == vid);
},
setDisplay: function(letter, type, e) {
this[letter + "display"] = type;
- e.target.classList.add("active");
- if (!!e.target.previousElementSibling)
- e.target.previousElementSibling.classList.remove("active");
+ localStorage.setItem("type-" + (letter == 'c' ? "challenges" : "games"), type);
+ let elt = !!e
+ ? e.target
+ : document.getElementById("btn" + letter.toUpperCase() + type);
+ elt.classList.add("active");
+ elt.classList.remove("somethingnew"); //in case of
+ if (!!elt.previousElementSibling)
+ elt.previousElementSibling.classList.remove("active");
else
- e.target.nextElementSibling.classList.remove("active");
+ elt.nextElementSibling.classList.remove("active");
+ },
+ isGamer: function(sid) {
+ return this.people[sid].pages.some(p => p.indexOf("/game/") >= 0);
},
getActionLabel: function(sid) {
return this.people[sid].pages.some(p => p == "/")
{
// Available, in Hall
this.newchallenge.to = this.people[sid].name;
+ document.getElementById("modalPeople").checked = false;
doClick("modalNewgame");
}
else
{
- // In some game, maybe playing maybe not
- const gid = this.people[sid].page.match(/[a-zA-Z0-9]+$/)[0];
- this.showGame(this.games.find(g => g.id == gid)), sid;
+ // In some game, maybe playing maybe not: show a random one
+ let gids = [];
+ this.people[sid].pages.forEach(p => {
+ const matchGid = p.match(/[a-zA-Z0-9]+$/);
+ if (!!matchGid)
+ gids.push(matchGid[0]);
+ });
+ const gid = gids[Math.floor(Math.random() * gids.length)];
+ this.showGame(this.games.find(g => g.id == gid));
}
},
- showGame: function(g, obsId) {
+ showGame: function(g) {
// NOTE: we are an observer, since only games I don't play are shown here
// ==> Moves sent by connected remote player(s) if live game
let url = "/game/" + g.id;
if (g.type == "live")
- {
- let rids = [];
- for (let i of [0,1])
- {
- if (this.people[g.players[i].sid].pages.indexOf(url) >= 0)
- rids.push(g.players[i].sid);
- }
- if (!!obsId)
- rids.push(obsId); //observer can provide game too
- const ridIdx = Math.floor(Math.random() * rids.length);
- url += "?rid=" + rids[ridIdx];
- }
+ url += "?rid=" + g.rids[Math.floor(Math.random() * g.rids.length)];
this.$router.push(url);
},
+ resetChatColor: function() {
+ // TODO: this is called twice, once on opening an once on closing
+ document.getElementById("peopleBtn").classList.remove("somethingnew");
+ },
processChat: function(chat) {
this.send("newchat", {data:chat});
},
// Messaging center:
socketMessageListener: function(msg) {
+ if (!this.conn)
+ return;
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 = {};
data.sockIds.forEach(s => {
+ const page = s.page || "/";
if (s.sid != this.st.user.sid && !identityAsked[s.sid])
{
identityAsked[s.sid] = true;
- this.send("askidentity", {target:s.sid});
+ this.send("askidentity", {target:s.sid, page:page});
}
if (!this.people[s.sid])
- this.$set(this.people, s.sid, {id:0, name:"", pages:[s.page || "/"]});
- else if (!!s.page && this.people[s.sid].pages.indexOf(s.page) < 0)
- this.people[s.sid].pages.push(s.page);
- if (!s.page)
+ this.$set(this.people, s.sid, {id:0, name:"", pages:[page]});
+ else if (this.people[s.sid].pages.indexOf(page) < 0)
+ this.people[s.sid].pages.push(page);
+ if (!s.page) //peer is in Hall
this.send("askchallenge", {target:s.sid});
- else
- this.send("askgame", {target:s.sid});
+ else //peer is in Game
+ this.send("askgame", {target:s.sid, page:page});
});
break;
}
case "connect":
case "gconnect":
+ {
+ const page = data.page || "/";
// NOTE: player could have been polled earlier, but might have logged in then
// So it's a good idea to ask identity if he was anonymous.
// But only ask game / challenge if currently disconnected.
if (!this.people[data.from])
{
- this.$set(this.people, data.from, {name:"", id:0, pages:[data.page]});
+ this.$set(this.people, data.from, {name:"", id:0, pages:[page]});
if (data.code == "connect")
this.send("askchallenge", {target:data.from});
else
- this.send("askgame", {target:data.from});
+ this.send("askgame", {target:data.from, page:page});
}
else
{
// append page if not already in list
- if (this.people[data.from].pages.indexOf(data.page) < 0)
- this.people[data.from].pages.push(data.page);
+ if (this.people[data.from].pages.indexOf(page) < 0)
+ this.people[data.from].pages.push(page);
}
if (this.people[data.from].id == 0)
- this.send("askidentity", {target:data.from});
+ {
+ this.newConnect[data.from] = true; //for self multi-connects tests
+ this.send("askidentity", {target:data.from, page:page});
+ }
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.
+ // ==> Next check is required.
+ if (!this.people[data.from])
+ return;
// Disconnect means no more tmpIds:
if (data.code == "disconnect")
{
- this.$delete(this.people, data.from);
- // Also remove all challenges sent by this player:
+ // Remove the live challenge sent by this player:
ArrayFun.remove(this.challenges, c => c.from.sid == data.from);
}
else
{
- const pidx = this.people[data.from].pages.indexOf(data.page);
- this.people[data.from].pages.splice(pageIdx, 1);
- if (this.people[data.from].pages.length == 0)
+ // Remove the matching live game if now unreachable
+ const gid = data.page.match(/[a-zA-Z0-9]+$/)[0];
+ const gidx = this.games.findIndex(g => g.id == gid);
+ if (gidx >= 0)
{
- this.$delete(this.people, data.from);
- // And all live games where he plays and no other opponent is online
- ArrayFun.remove(this.games, g =>
- g.type == "live" && (g.players.every(p => p.sid == data.from
- || !this.people[p.sid])), "all");
+ const game = this.games[gidx];
+ if (game.type == "live" &&
+ game.rids.length == 1 && game.rids[0] == data.from)
+ {
+ this.games.splice(gidx, 1);
+ }
}
}
+ const page = data.page || "/";
+ ArrayFun.remove(this.people[data.from].pages, p => p == page);
+ if (this.people[data.from].pages.length == 0)
+ this.$delete(this.people, data.from);
+ break;
+ case "killed":
+ // I logged in elsewhere:
+ alert(this.st.tr["New connexion detected: tab now offline"]);
+ // TODO: this fails. See https://github.com/websockets/ws/issues/489
+ //this.conn.removeEventListener("message", this.socketMessageListener);
+ //this.conn.removeEventListener("close", this.socketCloseListener);
+ //this.conn.close();
+ this.conn = null;
break;
case "askidentity":
- // Request for identification: reply if I'm not anonymous
- if (this.st.user.id > 0)
- {
- const me = {
- // NOTE: decompose to avoid revealing email
- name: this.st.user.name,
- sid: this.st.user.sid,
- id: this.st.user.id,
- };
- this.send("identity", {data:me, target:data.from});
- }
+ {
+ // Request for identification (TODO: anonymous shouldn't need to reply)
+ const me = {
+ // Decompose to avoid revealing email
+ name: this.st.user.name,
+ sid: this.st.user.sid,
+ id: this.st.user.id,
+ };
+ this.send("identity", {data:me, target:data.from});
break;
+ }
case "identity":
{
const user = data.data;
- this.$set(this.people, user.sid,
+ if (!!user.name) //otherwise anonymous
+ {
+ // If I multi-connect, kill current connexion if no mark (I'm older)
+ if (this.newConnect[user.sid] && user.id > 0
+ && user.id == this.st.user.id && user.sid != this.st.user.sid)
{
- id: user.id,
- name: user.name,
- pages: this.people[user.sid].pages,
- });
-
-// // TODO: smarter, if multi-connect, send to all instances... (several sid's)
-// // Or better: just prevent multi-connect.
-// // Fix anomaly: if registered player multi-connect, should be left only one
-// const anomalies = Object.keys(this.people).filter(sid => this.people[sid].id == user.id);
-// if (anomalies.length == 2)
-// this.$delete(this.people, anomalies[0]);
-// // --> this isn't good, some sid's are just forgetted
-
+ if (!this.killed[this.st.user.sid])
+ {
+ this.send("killme", {sid:this.st.user.sid});
+ this.killed[this.st.user.sid] = true;
+ }
+ }
+ if (user.sid != this.st.user.sid) //I already know my identity...
+ {
+ this.$set(this.people, user.sid,
+ {
+ id: user.id,
+ name: user.name,
+ pages: this.people[user.sid].pages,
+ });
+ }
+ }
+ delete this.newConnect[user.sid];
break;
}
case "askchallenge":
newChall.from = Object.assign({sid:chall.from}, fromValues);
newChall.vname = this.getVname(newChall.vid);
this.challenges.push(newChall);
+ if ((newChall.type == "live" && this.cdisplay == "corr") ||
+ (newChall.type == "corr" && this.cdisplay == "live"))
+ {
+ document.getElementById("btnC" + newChall.type).classList.add("somethingnew");
+ }
}
break;
}
{
// NOTE: it may be live or correspondance
const game = data.data;
- if (this.games.findIndex(g => g.id == game.id) < 0)
+ let locGame = this.games.find(g => g.id == game.id);
+ if (!locGame)
{
let newGame = game;
newGame.type = this.classifyObject(game);
newGame.vname = this.getVname(game.vid);
if (!game.score) //if new game from Hall
newGame.score = "*";
+ newGame.rids = [game.rid];
+ delete newGame["rid"];
this.games.push(newGame);
+ if ((newGame.type == "live" && this.gdisplay == "corr") ||
+ (newGame.type == "corr" && this.gdisplay == "live"))
+ {
+ document.getElementById("btnG" + newGame.type).classList.add("somethingnew");
+ }
}
+ else
+ {
+ // Append rid (if not already in list)
+ if (!locGame.rids.includes(game.rid))
+ locGame.rids.push(game.rid);
+ }
+ break;
+ }
+ case "result":
+ {
+ let g = this.games.find(g => g.id == data.gid);
+ if (!!g)
+ g.score = data.score;
break;
}
case "startgame":
"#/game/" + gameInfo.id + "</a>";
let modalBox = document.getElementById("modalInfo");
modalBox.checked = true;
- setTimeout(() => { modalBox.checked = false; }, 3000);
}
break;
}
case "newchat":
this.newChat = data.data;
+ if (!document.getElementById("modalPeople").checked)
+ document.getElementById("peopleBtn").classList.add("somethingnew");
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);
+ },
// Challenge lifecycle:
newChallenge: async function() {
if (this.newchallenge.vid == "")
<style lang="sass" scoped>
.active
color: #42a983
-#newGame
- display: block
- margin: 10px auto 5px auto
-#people
- width: 100%
+
+#infoDiv > .card
+ padding: 15px 0
+ max-width: 430px
+
+#newgameDiv > .card
+ max-width: 767px
+ max-height: 100%
+
+div#peopleWrap > .card
+ max-height: 100%
+
+@media screen and (min-width: 1281px)
+ div#peopleWrap > .card
+ max-width: 66.67%
+
+@media screen and (max-width: 1280px)
+ div#peopleWrap > .card
+ max-width: 83.33%
+
+@media screen and (max-width: 767px)
+ div#peopleWrap > .card
+ max-width: 100%
+
#players
width: 50%
position: relative
font-style: italic
button.player-action
margin-left: 32px
+
+.somethingnew
+ background-color: #c5fefe !important
+
+.tabbtn
+ background-color: #f9faee
+
+#div2, #div3
+ margin-top: 15px
+@media screen and (max-width: 767px)
+ #div2, #div3
+ margin-top: 0
</style>
projects / vchess.git / blobdiff