p(v-html="infoMessage")
input#modalAccept.modal(type="checkbox")
div#acceptDiv(role="dialog")
- .card.text-center
- p
+ .card
+ p.text-center
span.variantName {{ curChallToAccept.vname }}
span {{ curChallToAccept.cadence }}
span {{ st.tr["with"] + " " + curChallToAccept.from.name }}
- .diagram(v-html="tchallDiag")
- .button-group#buttonsTchall
- button.acceptBtn(@click="decisionChallenge(true)") {{ st.tr["Accept challenge?"] }}
- button.refuseBtn(@click="decisionChallenge(false)") {{ st.tr["Refuse"] }}
+ p.text-center(v-if="!!curChallToAccept.color")
+ | {{ st.tr["Your color:"] + " " + invColor(curChallToAccept.color) }}
+ .diagram(
+ v-if="!!curChallToAccept.fen"
+ v-html="tchallDiag"
+ )
+ .button-group#buttonsTchall(:style="tchallButtonsMargin()")
+ button.acceptBtn(@click="decisionChallenge(true)")
+ span {{ st.tr["Accept challenge?"] }}
+ button.refuseBtn(@click="decisionChallenge(false)")
+ span {{ st.tr["Refuse"] }}
input#modalNewgame.modal(
type="checkbox"
@change="cadenceFocusIfOpened($event)"
)
.card
label#closeNewgame.modal-close(for="modalNewgame")
- div(@keyup.enter="newChallenge()")
+ div(@keyup.enter="issueNewChallenge()")
fieldset
label(for="selectVariant") {{ st.tr["Variant"] }} *
select#selectVariant(
:value="v.id"
:selected="newchallenge.vid==v.id"
)
- | {{ v.name }}
+ | {{ v.display }}
fieldset
label(for="cadence") {{ st.tr["Cadence"] }} *
div#predefinedCadences
- button(type="button") 5+3
button(type="button") 15+5
button(type="button") 45+30
- button(type="button") 7d+2d
+ button(type="button") 3d
+ button(type="button") 7d
input#cadence(
type="text"
v-model="newchallenge.cadence"
- placeholder="5+0, 1h+30s, 7d+1d ..."
+ placeholder="5+0, 1h+30s, 5d ..."
+ )
+ fieldset
+ label(for="selectRandomLevel") {{ st.tr["Randomness"] }} *
+ select#selectRandomLevel(v-model="newchallenge.randomness")
+ option(value="0") {{ st.tr["Deterministic"] }}
+ option(value="1") {{ st.tr["Symmetric random"] }}
+ option(value="2") {{ st.tr["Asymmetric random"] }}
+ fieldset
+ label(for="memorizeChall") {{ st.tr["Memorize"] }}
+ input#memorizeChall(
+ type="checkbox"
+ v-model="newchallenge.memorize"
)
fieldset(v-if="st.user.id > 0")
- label(for="selectPlayers") {{ st.tr["Play with?"] }}
+ label(for="selectPlayers") {{ st.tr["Play with"] }}
+ select#selectPlayersInList(
+ v-model="newchallenge.to"
+ @change="changeChallTarget()"
+ )
+ option(value="")
+ option(
+ v-for="p in Object.values(people)"
+ v-if="!!p.name"
+ :value="p.name"
+ )
+ | {{ p.name }}
input#selectPlayers(
type="text"
v-model="newchallenge.to"
)
- fieldset(v-if="st.user.id > 0 && newchallenge.to.length > 0")
+ fieldset(v-show="st.user.id > 0 && newchallenge.to.length > 0")
+ label(for="selectColor") {{ st.tr["Color"] }}
+ select#selectColor(v-model="newchallenge.color")
+ option(value='')
+ option(value='w') {{ st.tr["White"] }}
+ option(value='b') {{ st.tr["Black"] }}
+ br
input#inputFen(
placeholder="FEN"
@input="trySetNewchallDiag()"
v-model="newchallenge.fen"
)
.diagram(v-html="newchallenge.diag")
- button(@click="newChallenge()") {{ st.tr["Send challenge"] }}
+ button(@click="issueNewChallenge()") {{ st.tr["Send challenge"] }}
input#modalPeople.modal(
type="checkbox"
- @click="resetChatColor()"
+ @click="toggleSocialColor()"
)
div#peopleWrap(
role="dialog"
v-for="sid in Object.keys(people)"
v-if="!!people[sid].name"
)
- span {{ people[sid].name }}
+ UserBio.user-bio(:uid="people[sid].id" :uname="people[sid].name")
button.player-action(
- v-if="isGamer(sid) || (st.user.id > 0 && sid!=st.user.sid)"
- @click="challOrWatch(sid)"
+ v-if="isGamer(sid)"
+ @click="watchGame(sid)"
)
- | {{ getActionLabel(sid) }}
- p.anonymous @nonymous ({{ anonymousCount }})
+ | {{ st.tr["Observe"] }}
+ button.player-action(
+ v-else-if="st.user.sid != sid"
+ :class="{focused: isFocusedOnHall(sid)}"
+ @click="challenge(sid)"
+ )
+ | {{ st.tr["Challenge"] }}
+ p.anonymous @nonymous ({{ anonymousCount() }})
#chat
Chat(
- :newChat="newChat"
+ ref="chatcomp"
@mychat="processChat"
:pastChats="[]"
)
.button-group
button#peopleBtn(onClick="window.doClick('modalPeople')")
| {{ st.tr["Who's there?"] }}
- button(onClick="window.doClick('modalNewgame')")
+ button(@click="showNewchallengeForm()")
| {{ st.tr["New game"] }}
+ .row(v-if="presetChalls.length > 0")
+ .col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
+ h4.text-center {{ st.tr["Preset challenges"] }}
+ table
+ thead
+ tr
+ th {{ st.tr["Variant"] }}
+ th {{ st.tr["Cadence"] }}
+ th {{ st.tr["Random?"] }}
+ th
+ tbody
+ tr(
+ v-for="pc in presetChalls"
+ @click="newChallFromPreset(pc)"
+ )
+ td {{ pc.vname }}
+ td {{ pc.cadence }}
+ td(:class="getRandomnessClass(pc)")
+ td.remove-preset(@click="removePresetChall($event, pc)")
+ img(src="/images/icons/delete.svg")
.row
.col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
div#div2
button.tabbtn#btnClive(@click="setDisplay('c','live',$event)")
| {{ st.tr["Live challenges"] }}
button.tabbtn#btnCcorr(@click="setDisplay('c','corr',$event)")
- | {{ st.tr["Correspondance challenges"] }}
+ | {{ st.tr["Correspondence challenges"] }}
ChallengeList(
v-show="cdisplay=='live'"
:challenges="filterChallenges('live')"
button.tabbtn#btnGlive(@click="setDisplay('g','live',$event)")
| {{ st.tr["Live games"] }}
button.tabbtn#btnGcorr(@click="setDisplay('g','corr',$event)")
- | {{ st.tr["Correspondance games"] }}
+ | {{ st.tr["Correspondence games"] }}
GameList(
v-show="gdisplay=='live'"
:games="filterGames('live')"
- :showBoth="true"
- @show-game="showGame"
- )
- GameList(
- v-show="gdisplay=='corr'"
- :games="filterGames('corr')"
- :showBoth="true"
+ :show-both="true"
@show-game="showGame"
)
+ div(v-show="gdisplay=='corr'")
+ GameList(
+ :games="filterGames('corr')"
+ :show-both="true"
+ @show-game="showGame"
+ )
+ button#loadMoreBtn(
+ v-if="hasMore"
+ @click="loadMoreCorr()"
+ )
+ | {{ st.tr["Load more"] }}
</template>
<script>
import { store } from "@/store";
import { checkChallenge } from "@/data/challengeCheck";
+import { notify } from "@/utils/notifications";
import { ArrayFun } from "@/utils/array";
import { ajax } from "@/utils/ajax";
import params from "@/parameters";
-import { getRandString, shuffle } from "@/utils/alea";
+import { getRandString, shuffle, randInt } from "@/utils/alea";
import { getDiagram } from "@/utils/printDiagram";
import Chat from "@/components/Chat.vue";
+import UserBio from "@/components/UserBio.vue";
import GameList from "@/components/GameList.vue";
import ChallengeList from "@/components/ChallengeList.vue";
import { GameStorage } from "@/utils/gameStorage";
name: "my-hall",
components: {
Chat,
+ UserBio,
GameList,
ChallengeList
},
st: store.state,
cdisplay: "live", //or corr
gdisplay: "live",
+ // timestamp of last showed (oldest) corr game:
+ cursor: Number.MAX_SAFE_INTEGER,
+ // hasMore == TRUE: a priori there could be more games to load
+ hasMore: true,
games: [],
challenges: [],
people: {},
infoMessage: "",
newchallenge: {
fen: "",
- vid: parseInt(localStorage.getItem("vid")) || 0,
+ vid: parseInt(localStorage.getItem("vid"), 10) || 0,
to: "", //name of challenged player (if any)
+ color: '',
cadence: localStorage.getItem("cadence") || "",
+ randomness:
+ // Warning: randomness can be 0, then !!randomness is false
+ (parseInt(localStorage.getItem("challRandomness"),10)+1 || 3) - 1,
// VariantRules object, stored to not interfere with
// diagrams of targetted challenges:
V: null,
vname: "",
- diag: "" //visualizing FEN
+ diag: "", //visualizing FEN
+ memorize: false //put settings in localStorage
},
+ focus: true,
tchallDiag: "",
- curChallToAccept: {from: {}},
- newChat: "",
+ curChallToAccept: { from: {} },
+ presetChalls: JSON.parse(localStorage.getItem("presetChalls") || "[]"),
conn: null,
connexionString: "",
+ socketCloseListener: 0,
// Related to (killing of) self multi-connects:
- newConnect: {},
- killed: {}
+ newConnect: {}
};
},
watch: {
"st.variants": function() {
// Set potential challenges and games variant names:
this.challenges.concat(this.games).forEach(o => {
- if (o.vname == "") o.vname = this.getVname(o.vid);
+ if (!o.vname) this.setVname(o);
});
if (!this.newchallenge.V && this.newchallenge.vid > 0)
this.loadNewchallVariant();
- }
- },
- computed: {
- anonymousCount: function() {
- let count = 0;
- Object.values(this.people).forEach(p => {
- count += !p.name ? 1 : 0;
- });
- return count;
+ },
+ $route: function(to, from) {
+ if (to.path != "/") this.cleanBeforeDestroy();
}
},
created: function() {
+ document.addEventListener('visibilitychange', this.visibilityChange);
+ window.addEventListener('focus', this.onFocus);
+ window.addEventListener('blur', this.onBlur);
+ window.addEventListener("beforeunload", this.cleanBeforeDestroy);
if (this.st.variants.length > 0 && this.newchallenge.vid > 0)
this.loadNewchallVariant();
const my = this.st.user;
- this.$set(this.people, my.sid, { id: my.id, name: my.name, pages: ["/"] });
- // Ask server for current corr games (all but mines)
- ajax(
- "/games",
- "GET",
- { uid: this.st.user.id, excluded: true },
- response => {
- this.games = this.games.concat(
- response.games.map(g => {
- const type = this.classifyObject(g);
- const vname = this.getVname(g.vid);
- return Object.assign({}, g, { type: type, vname: vname });
- })
- );
+ const tmpId = getRandString();
+ this.$set(
+ this.people,
+ my.sid,
+ {
+ id: my.id,
+ name: my.name,
+ tmpIds: {
+ tmpId: { page: "/", focus: true }
+ }
}
);
- // Also ask for corr challenges (open + sent by/to me)
- ajax("/challenges", "GET", { uid: this.st.user.id }, response => {
- // Gather all senders names, and then retrieve full identity:
- // (TODO [perf]: some might be online...)
- let names = {};
- response.challenges.forEach(c => {
- if (c.uid != this.st.user.id) names[c.uid] = "";
- else if (!!c.target && c.target != this.st.user.id)
- names[c.target] = "";
- });
- const addChallenges = () => {
- names[this.st.user.id] = this.st.user.name; //in case of
- this.challenges = this.challenges.concat(
- response.challenges.map(c => {
- const from = { name: names[c.uid], id: c.uid }; //or just name
- const type = this.classifyObject(c);
- const vname = this.getVname(c.vid);
- return Object.assign(
- {},
- {
- type: type,
- vname: vname,
- from: from,
- to: c.target ? names[c.target] : ""
- },
- c
- );
- })
- );
- };
- if (Object.keys(names).length > 0) {
- ajax(
- "/users",
- "GET",
- { ids: Object.keys(names).join(",") },
- response2 => {
- response2.users.forEach(u => {
- names[u.id] = u.name;
- });
- addChallenges();
- }
- );
- } else addChallenges();
- });
const connectAndPoll = () => {
this.send("connect");
this.send("pollclientsandgamers");
+ if (!!this.$route.query["challenge"]) {
+ // Automatic challenge sending, for tournaments
+ this.loadNewchallVariant(
+ () => {
+ Object.assign(
+ this.newchallenge,
+ {
+ fen: "",
+ vid:
+ this.st.variants
+ .find(v => v.name == this.$route.query["variant"])
+ .id,
+ to: this.$route.query["challenge"],
+ color: this.$route.query["color"] || '',
+ cadence: this.$route.query["cadence"],
+ // Tournament: no randomness (TODO: for now at least)
+ randomness: 0,
+ memorize: false
+ }
+ );
+ window.doClick("modalNewgame");
+ //this.issueNewChallenge(); //NOTE: doesn't work yet.
+ },
+ this.$route.query["variant"]
+ );
+ }
};
// Initialize connection
this.connexionString =
params.socketUrl +
- "/?sid=" +
- this.st.user.sid +
- "&tmpId=" +
- getRandString() +
+ "/?sid=" + this.st.user.sid +
+ "&id=" + this.st.user.id +
+ "&tmpId=" + tmpId +
"&page=" +
+ // Hall: path is "/" (TODO: could be hard-coded as well)
encodeURIComponent(this.$route.path);
this.conn = new WebSocket(this.connexionString);
this.conn.onopen = connectAndPoll;
- this.conn.onmessage = this.socketMessageListener;
- this.conn.onclose = this.socketCloseListener;
+ this.conn.addEventListener("message", this.socketMessageListener);
+ 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
+ );
},
mounted: function() {
- ["peopleWrap", "infoDiv", "newgameDiv"].forEach(eltName => {
- let elt = document.getElementById(eltName);
- elt.addEventListener("click", processModalClick);
+ document.getElementById("peopleWrap")
+ .addEventListener("click", (e) => {
+ processModalClick(e, () => {
+ this.toggleSocialColor("close")
+ });
+ });
+ ["infoDiv", "newgameDiv"].forEach(eltName => {
+ document.getElementById(eltName)
+ .addEventListener("click", processModalClick);
});
document.querySelectorAll("#predefinedCadences > button").forEach(b => {
b.addEventListener("click", () => {
dispCorr || localStorage.getItem("type-challenges") || "live";
const showGtype =
dispCorr || localStorage.getItem("type-games") || "live";
- this.setDisplay("c", showCtype);
- this.setDisplay("g", showGtype);
+ this.setDisplay('c', showCtype);
+ this.setDisplay('g', showGtype);
+ // Ask server for current corr games (all but mines)
+ this.loadMoreCorr();
+ // Also ask for corr challenges (open + sent by/to me)
+ // List them all, because they are not supposed to be that many (TODO?)
+ ajax(
+ "/challenges",
+ "GET",
+ {
+ data: { uid: this.st.user.id },
+ success: (response) => {
+ if (
+ response.challenges.length > 0 &&
+ this.challenges.length == 0 &&
+ this.cdisplay == "live"
+ ) {
+ document
+ .getElementById("btnCcorr")
+ .classList.add("somethingnew");
+ }
+ // Gather all senders names, and then retrieve full identity:
+ // (TODO [perf]: some might be online...)
+ let names = {};
+ response.challenges.forEach(c => {
+ if (c.uid != this.st.user.id) names[c.uid] = "";
+ else if (!!c.target && c.target != this.st.user.id)
+ names[c.target] = "";
+ });
+ const addChallenges = () => {
+ names[this.st.user.id] = this.st.user.name; //in case of
+ this.challenges = this.challenges.concat(
+ response.challenges.map(c => {
+ const from = { name: names[c.uid], id: c.uid }; //or just name
+ const type = this.classifyObject(c);
+ const vname = this.getVname(c.vid);
+ return Object.assign(
+ {
+ type: type,
+ vname: vname,
+ from: from,
+ to: c.target ? names[c.target] : ""
+ },
+ c
+ );
+ })
+ );
+ };
+ if (Object.keys(names).length > 0) {
+ ajax(
+ "/users",
+ "GET",
+ {
+ data: { ids: Object.keys(names).join(",") },
+ success: (response2) => {
+ response2.users.forEach(u => {
+ names[u.id] = u.name;
+ });
+ addChallenges();
+ }
+ }
+ );
+ }
+ else addChallenges();
+ }
+ }
+ );
},
beforeDestroy: function() {
- this.send("disconnect");
+ this.cleanBeforeDestroy();
},
methods: {
- // Helpers:
+ cleanBeforeDestroy: function() {
+ clearInterval(this.socketCloseListener);
+ document.removeEventListener('visibilitychange', this.visibilityChange);
+ window.removeEventListener('focus', this.onFocus);
+ window.removeEventListener('blur', this.onBlur);
+ window.removeEventListener("beforeunload", this.cleanBeforeDestroy);
+ this.conn.removeEventListener("message", this.socketMessageListener);
+ this.send("disconnect");
+ this.conn = null;
+ },
+ getRandomnessClass: function(pc) {
+ return {
+ ["random-" + pc.randomness]: true
+ };
+ },
+ anonymousCount: function() {
+ let count = 0;
+ Object.values(this.people).forEach(p => {
+ // Do not cound people who did not send their identity yet:
+ count += (!p.name && p.id === 0) ? 1 : 0;
+ });
+ return count;
+ },
+ visibilityChange: function() {
+ // TODO: Use document.hidden? https://webplatform.news/issues/2019-03-27
+ this.focus = (document.visibilityState == "visible");
+ this.send(this.focus ? "getfocus" : "losefocus");
+ },
+ onFocus: function() {
+ this.focus = true;
+ this.send("getfocus");
+ },
+ onBlur: function() {
+ this.focus = false;
+ this.send("losefocus");
+ },
+ invColor: function(c) {
+ if (c == 'w') return this.st.tr["Black"];
+ return this.tr.tr["White"];
+ },
+ partialResetNewchallenge: function() {
+ // Reset potential target and custom FEN:
+ this.newchallenge.to = "";
+ this.newchallenge.color = '';
+ this.newchallenge.fen = "";
+ this.newchallenge.diag = "";
+ this.newchallenge.memorize = false;
+ },
+ showNewchallengeForm: function() {
+ this.partialResetNewchallenge();
+ window.doClick("modalNewgame");
+ },
+ addPresetChall: function(chall) {
+ // Add only if not already existing:
+ if (this.presetChalls.some(c =>
+ c.vid == chall.vid &&
+ c.cadence == chall.cadence &&
+ c.randomness == chall.randomness
+ )) {
+ return;
+ }
+ const L = this.presetChalls.length;
+ this.presetChalls.push({
+ index: L,
+ vid: chall.vid,
+ vname: chall.vname, //redundant, but easier
+ cadence: chall.cadence,
+ randomness: chall.randomness
+ });
+ localStorage.setItem("presetChalls", JSON.stringify(this.presetChalls));
+ },
+ removePresetChall: function(e, pchall) {
+ e.stopPropagation();
+ const pchallIdx =
+ this.presetChalls.findIndex(pc => pc.index == pchall.index);
+ this.presetChalls.splice(pchallIdx, 1);
+ localStorage.setItem("presetChalls", JSON.stringify(this.presetChalls));
+ },
+ tchallButtonsMargin: function() {
+ if (!!this.curChallToAccept.fen) return { "margin-top": "10px" };
+ return {};
+ },
+ changeChallTarget: function() {
+ if (!this.newchallenge.to) {
+ // Reset potential FEN + diagram
+ this.newchallenge.fen = "";
+ this.newchallenge.color = '';
+ this.newchallenge.diag = "";
+ }
+ },
cadenceFocusIfOpened: function() {
if (event.target.checked)
document.getElementById("cadence").focus();
},
send: function(code, obj) {
- if (this.conn) {
+ if (!!this.conn && this.conn.readyState == 1) {
this.conn.send(JSON.stringify(Object.assign({ code: code }, obj)));
}
},
- getVname: function(vid) {
- const variant = this.st.variants.find(v => v.id == vid);
+ setVname: function(obj) {
+ const variant = this.st.variants.find(v => v.id == obj.vid);
// this.st.variants might be uninitialized (variant == null)
- return variant ? variant.name : "";
+ if (!!variant) {
+ obj.vname = variant.name;
+ obj.vdisp = variant.display;
+ }
+ // NOTE: Next line is used in loadNewchallVariant
+ return (!variant ? "" : variant.name);
},
filterChallenges: function(type) {
return this.challenges.filter(c => c.type == type);
filterGames: function(type) {
return this.games.filter(g => g.type == type);
},
+ // o: challenge or game
classifyObject: function(o) {
- //challenge or game
- return o.cadence.indexOf("d") === -1 ? "live" : "corr";
+ // No imported games here
+ return (o.cadence.indexOf("d") >= 0 ? "corr" : "live");
},
setDisplay: function(letter, type, e) {
this[letter + "display"] = type;
: document.getElementById("btn" + letter.toUpperCase() + type);
elt.classList.add("active");
elt.classList.remove("somethingnew"); //in case of
- if (elt.previousElementSibling)
+ if (!!elt.previousElementSibling)
elt.previousElementSibling.classList.remove("active");
else 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 == "/")
- ? "Challenge"
- : "Observe";
- },
- challOrWatch: function(sid) {
- if (this.people[sid].pages.some(p => p == "/")) {
- // Available, in Hall
- this.newchallenge.to = this.people[sid].name;
- document.getElementById("modalPeople").checked = false;
- window.doClick("modalNewgame");
- } else {
- // 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)];
- const game = this.games.find(g => g.id == gid);
- if (game) this.showGame(game);
- else this.$router.push("/game/" + gid); //game vs. me
- }
+ return Object.values(this.people[sid].tmpIds)
+ .some(v => v.focus && v.page.indexOf("/game/") >= 0);
+ },
+ isFocusedOnHall: function(sid) {
+ return (
+ // This is meant to challenge people, thus the next 2 conditions:
+ this.st.user.id > 0 &&
+ sid != this.st.user.sid &&
+ Object.values(this.people[sid].tmpIds)
+ .some(v => v.focus && v.page == "/")
+ );
+ },
+ challenge: function(sid) {
+ this.partialResetNewchallenge();
+ // Available, in Hall
+ this.newchallenge.to = this.people[sid].name;
+ // TODO: also store target sid to not re-search for it
+ document.getElementById("modalPeople").checked = false;
+ window.doClick("modalNewgame");
+ },
+ watchGame: function(sid) {
+ // In some game, maybe playing maybe not: show a random one
+ let gids = [];
+ Object.values(this.people[sid].tmpIds).forEach(v => {
+ if (v.focus) {
+ const matchGid = v.page.match(/[a-zA-Z0-9]+$/);
+ if (!!matchGid) gids.push(matchGid[0]);
+ }
+ });
+ const gid = gids[Math.floor(Math.random() * gids.length)];
+ window.open("/#/game/" + gid, "_blank");
},
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")
- url += "?rid=" + g.rids[Math.floor(Math.random() * g.rids.length)];
- this.$router.push(url);
+ window.open("/#/game/" + g.id, "_blank");
},
- resetChatColor: function() {
- // TODO: this is called twice, once on opening an once on closing
- document.getElementById("peopleBtn").classList.remove("somethingnew");
+ toggleSocialColor: function(action) {
+ if (!action && document.getElementById("modalPeople").checked)
+ document.getElementById("inputChat").focus();
+ else
+ document.getElementById("peopleBtn").classList.remove("somethingnew");
},
processChat: function(chat) {
this.send("newchat", { data: chat });
},
+ getOppsid: function(c) {
+ let oppsid = c.from.sid; //may not be defined if corr + offline opp
+ if (!oppsid) {
+ oppsid = Object.keys(this.people).find(
+ sid => this.people[sid].id == c.from.id
+ );
+ }
+ return oppsid;
+ },
// 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, page: page });
+ // 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) {
+ // Pick a target tmpId (+page) at random:
+ const pt = Object.values(data.sockIds[sid]);
+ const randPage = pt[randInt(pt.length)].page;
+ this.send(
+ "askidentity",
+ {
+ target: sid,
+ page: randPage
+ }
+ );
}
- if (!this.people[s.sid])
- 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 });
- //peer is in Game
- else this.send("askgame", { target: s.sid, page: page });
+ if (!this.people[sid])
+ // Do not set name or id: identity unknown yet
+ this.people[sid] = { tmpIds: data.sockIds[sid] };
+ else
+ Object.assign(this.people[sid].tmpIds, data.sockIds[sid]);
+ if (Object.values(data.sockIds[sid]).some(v => v.page == "/"))
+ // Peer is in Hall
+ this.send("askchallenges", { target: sid });
+ Object.values(data.sockIds[sid]).forEach(v => {
+ if (
+ v.page.indexOf("/game/") >= 0 &&
+ !v.page.match(/\/[0-9]+$/)
+ ) {
+ // Peer is in Game: ask only if live game
+ this.send("askgame", { target: sid, page: v.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: [page]
- });
- if (data.code == "connect")
- this.send("askchallenge", { target: data.from });
- else this.send("askgame", { target: data.from, page: page });
- } else {
- // append page if not already in list
- if (this.people[data.from].pages.indexOf(page) < 0)
- this.people[data.from].pages.push(page);
+ if (data.code == "connect") {
+ // Ask challenges only on first connexion:
+ if (!this.people[data.from[0]])
+ this.send("askchallenges", { target: data.from[0] });
}
- if (this.people[data.from].id == 0) {
- this.newConnect[data.from] = true; //for self multi-connects tests
- this.send("askidentity", { target: data.from, page: page });
+ // Ask game only if live:
+ else if (!page.match(/\/[0-9]+$/))
+ this.send("askgame", { target: data.from[0], page: page });
+ if (!this.people[data.from[0]]) {
+ this.$set(
+ this.people,
+ data.from[0],
+ {
+ tmpIds: {
+ [data.from[1]]: { page: page, focus: true }
+ }
+ }
+ );
+ // For self multi-connects tests:
+ this.newConnect[data.from[0]] = true;
+ this.send("askidentity", { target: data.from[0], page: page });
+ }
+ else {
+ this.people[data.from[0]].tmpIds[data.from[1]] =
+ { page: page, focus: true };
+ this.$forceUpdate(); //TODO: shouldn't be required
}
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.
+ // 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 (!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
if (data.code == "disconnect") {
- // Remove the live challenge sent by this player:
- ArrayFun.remove(this.challenges, c => c.from.sid == data.from);
- } else {
+ // Remove the live challenges sent by this player, if
+ // he isn't connected on another tab:
+ if (
+ !this.people[data.from[0]] ||
+ Object.values(this.people[data.from[0]].tmpIds)
+ .every(v => v.page != "/")
+ ) {
+ ArrayFun.remove(
+ this.challenges,
+ c => c.type == "live" && c.from.sid == data.from[0],
+ "all"
+ );
+ }
+ }
+ else {
// 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) {
- const game = this.games[gidx];
- if (
- game.type == "live" &&
- game.rids.length == 1 &&
- game.rids[0] == data.from
+ // Corr games are always reachable:
+ if (!gid.match(/^[0-9]+$/)) {
+ // Live games are reachable if someone is on the game page
+ if (Object.values(this.people).every(p =>
+ Object.values(p.tmpIds).every(v => v.page != data.page))
) {
- this.games.splice(gidx, 1);
+ ArrayFun.remove(this.games, g => g.id == gid);
}
}
}
- 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:
- this.conn = null;
- alert(this.st.tr["New connexion detected: tab now offline"]);
+ case "getfocus": {
+ let player = this.people[data.from[0]];
+ // If user reload a page, focus may arrive earlier than connect
+ if (!!player) {
+ player.tmpIds[data.from[1]].focus = true;
+ this.$forceUpdate(); //TODO: shouldn't be required
+ }
+ break;
+ }
+ case "losefocus": {
+ let player = this.people[data.from[0]];
+ if (!!player) {
+ player.tmpIds[data.from[1]].focus = false;
+ this.$forceUpdate(); //TODO: shouldn't be required
+ }
break;
+ }
case "askidentity": {
- // Request for identification (TODO: anonymous shouldn't need to reply)
+ // Request for identification
const me = {
// Decompose to avoid revealing email
name: this.st.user.name,
}
case "identity": {
const user = data.data;
- if (user.name) {
- // If I multi-connect, kill current connexion if no mark (I'm older)
+ let player = this.people[user.sid];
+ // player.tmpIds is already set
+ player.id = user.id;
+ player.name = user.name;
+ // TODO: this.$set(people, ...) fails. So forceUpdate.
+ // But this shouldn't be like that!
+ this.$forceUpdate();
+ // If I multi-connect, kill current connexion if no mark (I'm older)
+ if (this.newConnect[user.sid]) {
+ delete this.newConnect[user.sid];
if (
- this.newConnect[user.sid] &&
user.id > 0 &&
user.id == this.st.user.id &&
user.sid != this.st.user.sid
) {
- 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
- });
+ // I logged in elsewhere:
+ this.cleanBeforeDestroy();
+ alert(this.st.tr["New connexion detected: tab now offline"]);
}
}
- delete this.newConnect[user.sid];
break;
}
- case "askchallenge": {
- // Send my current live challenge (if any)
- const cIdx = this.challenges.findIndex(
- c => c.from.sid == this.st.user.sid && c.type == "live"
- );
- if (cIdx >= 0) {
- const c = this.challenges[cIdx];
- // NOTE: in principle, should only send targeted challenge to the target.
- // But we may not know yet the identity of the target (just name),
- // so cannot decide if data.from is the target or not.
- const myChallenge = {
- id: c.id,
- from: this.st.user.sid,
- to: c.to,
- fen: c.fen,
- vid: c.vid,
- cadence: c.cadence,
- added: c.added
- };
- this.send("challenge", { data: myChallenge, target: data.from });
- }
+ case "askchallenges": {
+ // Send my current live challenges (if any)
+ const myChallenges = this.challenges
+ .filter(c =>
+ c.from.sid == this.st.user.sid && c.type == "live"
+ )
+ .map(c => {
+ // NOTE: in principle, should only send targeted challenge to the
+ // target. But we may not know yet the identity of the target
+ // (just name), so can't decide if data.from is the target.
+ return {
+ id: c.id,
+ from: this.st.user.sid,
+ to: c.to,
+ randomness: c.randomness,
+ fen: c.fen,
+ vid: c.vid,
+ cadence: c.cadence,
+ added: c.added
+ };
+ });
+ if (myChallenges.length > 0)
+ this.send("challenges", { data: myChallenges, target: data.from });
break;
}
- case "challenge": //after "askchallenge"
- case "newchallenge": {
- // NOTE about next condition: see "askchallenge" case.
- const chall = data.data;
- if (
- !chall.to ||
- (this.people[chall.from].id > 0 &&
- (chall.from == this.st.user.sid || chall.to == this.st.user.name))
- ) {
- let newChall = Object.assign({}, chall);
- newChall.type = this.classifyObject(chall);
- newChall.added = Date.now();
- let fromValues = Object.assign({}, this.people[chall.from]);
- delete fromValues["pages"]; //irrelevant in this context
- 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");
- }
- }
+ case "challenges": //after "askchallenges"
+ data.data.forEach(this.addChallenge);
+ break;
+ case "newchallenge":
+ this.addChallenge(data.data);
break;
- }
case "refusechallenge": {
const cid = data.data;
ArrayFun.remove(this.challenges, c => c.id == cid);
alert(this.st.tr["Challenge declined"]);
break;
}
- case "deletechallenge": {
- // NOTE: the challenge may be already removed
- const cid = data.data;
- ArrayFun.remove(this.challenges, c => c.id == cid);
+ case "deletechallenge_s": {
+ // NOTE: the challenge(s) may be already removed
+ const cref = data.data;
+ if (!!cref.cid)
+ ArrayFun.remove(this.challenges, c => c.id == cref.cid);
+ else if (!!cref.sids) {
+ cref.sids.forEach(s => {
+ ArrayFun.remove(
+ this.challenges,
+ c => c.type == "live" && c.from.sid == s,
+ "all"
+ );
+ });
+ }
break;
}
- case "game": //individual request
+ case "game": // Individual request
case "newgame": {
- // NOTE: it may be live or correspondance
const game = data.data;
- // Ignore games where I play (corr games)
- if (game.players.every(p => p.id != this.st.user.id))
- {
- 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);
+ // Ignore games where I play (will go in MyGames page),
+ // and also games that I already received.
+ if (
+ this.games.findIndex(g => g.id == game.id) == -1 &&
+ game.players.every(p => {
+ return (
+ p.sid != this.st.user.sid &&
+ (p.id == 0 || p.id != this.st.user.id)
+ );
+ })
+ ) {
+ let newGame = game;
+ newGame.type = this.classifyObject(game);
+ this.setVname(game);
+ if (!game.score)
+ // New game from Hall
+ newGame.score = "*";
+ this.games.push(newGame);
+ if (
+ newGame.score == '*' &&
+ (newGame.type == "live" && this.gdisplay == "corr") ||
+ (newGame.type == "corr" && this.gdisplay == "live")
+ ) {
+ document
+ .getElementById("btnG" + newGame.type)
+ .classList.add("somethingnew");
}
}
break;
}
case "result": {
let g = this.games.find(g => g.id == data.gid);
- if (g) g.score = data.score;
+ if (!!g) g.score = data.score;
break;
}
case "startgame": {
- // New game just started: data contain all information
+ // New game just started, I'm involved
const gameInfo = data.data;
if (this.classifyObject(gameInfo) == "live")
this.startNewGame(gameInfo);
else {
this.infoMessage =
- this.st.tr["New correspondance game:"] +
- " <a href='#/game/" +
- gameInfo.id +
- "'>" +
- "#/game/" +
- gameInfo.id +
- "</a>";
- let modalBox = document.getElementById("modalInfo");
- modalBox.checked = true;
+ this.st.tr["New correspondence game:"] + " " +
+ "<a href='#/game/" + gameInfo.id + "'>" +
+ "#/game/" + gameInfo.id + "</a>";
+ document.getElementById("modalInfo").checked = true;
}
break;
}
case "newchat":
- this.newChat = data.data;
+ this.$refs["chatcomp"].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);
+ loadMoreCorr: function() {
+ ajax(
+ "/observedgames",
+ "GET",
+ {
+ data: {
+ uid: this.st.user.id,
+ cursor: this.cursor
+ },
+ success: (res) => {
+ const L = res.games.length;
+ if (L > 0) {
+ if (
+ this.cursor == Number.MAX_SAFE_INTEGER &&
+ this.games.length == 0 &&
+ this.gdisplay == "live" &&
+ res.games.some(g => g.score == '*')
+ ) {
+ // First loading: show indicators
+ document
+ .getElementById("btnGcorr")
+ .classList.add("somethingnew");
+ }
+ this.cursor = res.games[L - 1].created;
+ let moreGames = res.games.map(g => {
+ this.setVname(g);
+ g.type = "corr";
+ return g;
+ });
+ this.games = this.games.concat(moreGames);
+ }
+ else this.hasMore = false;
+ }
+ }
+ );
},
// Challenge lifecycle:
- loadNewchallVariant: async function(cb) {
- const vname = this.getVname(this.newchallenge.vid);
- const vModule = await import("@/variants/" + vname + ".js");
- this.newchallenge.V = vModule.VariantRules;
- this.newchallenge.vname = vname;
- if (cb)
- cb();
+ addChallenge: function(chall) {
+ // NOTE about next condition: see "askchallenges" case.
+ if (
+ !chall.to ||
+ (this.people[chall.from].id > 0 &&
+ (chall.from == this.st.user.sid || chall.to == this.st.user.name))
+ ) {
+ let newChall = Object.assign({}, chall);
+ newChall.type = this.classifyObject(chall);
+ newChall.randomness = chall.randomness;
+ newChall.added = Date.now();
+ let fromValues = Object.assign({}, this.people[chall.from]);
+ delete fromValues["pages"]; //irrelevant in this context
+ newChall.from = Object.assign({ sid: chall.from }, fromValues);
+ this.setVname(newChall);
+ 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");
+ }
+ if (!!chall.to && chall.to == this.st.user.name) {
+ notify(
+ "New challenge",
+ // fromValues.name should exist since the player is online, but
+ // let's consider there is some chance that the challenge arrives
+ // right after we connected and before receiving the poll result:
+ { body: "from " + (fromValues.name || "@nonymous") }
+ );
+ }
+ }
+ },
+ loadNewchallVariant: async function(cb, vname) {
+ vname = vname || this.setVname(this.newchallenge);
+ await import("@/variants/" + vname + ".js")
+ .then((vModule) => {
+ window.V = vModule[vname + "Rules"];
+ this.newchallenge.V = window.V;
+ if (!!cb) cb();
+ });
},
trySetNewchallDiag: function() {
if (!this.newchallenge.fen) {
window.V = this.newchallenge.V;
if (
this.newchallenge.vid > 0 &&
- this.newchallenge.fen &&
+ !!this.newchallenge.fen &&
V.IsGoodFen(this.newchallenge.fen)
) {
const parsedFen = V.ParseFen(this.newchallenge.fen);
this.newchallenge.diag = getDiagram({
- position: parsedFen.position,
- orientation: V.GetOppCol(parsedFen.turn)
+ position: parsedFen.position
+ //,orientation: parsedFen.turn
});
}
+ else this.newchallenge.diag = "";
},
- newChallenge: async function() {
- if (this.newchallenge.cadence.match(/^[0-9]+$/))
+ newChallFromPreset(pchall) {
+ this.partialResetNewchallenge();
+ this.newchallenge.vid = pchall.vid;
+ this.newchallenge.cadence = pchall.cadence;
+ this.newchallenge.randomness = pchall.randomness;
+ this.loadNewchallVariant(this.issueNewChallenge);
+ },
+ issueNewChallenge: async function() {
+ if (!!(this.newchallenge.cadence.match(/^[0-9]+$/)))
this.newchallenge.cadence += "+0"; //assume minutes, no increment
const ctype = this.classifyObject(this.newchallenge);
// TODO: cadence still unchecked so ctype could be wrong...
if (!this.newchallenge.vid)
error = this.st.tr["Please select a variant"];
else if (ctype == "corr" && this.st.user.id <= 0)
- error = this.st.tr["Please log in to play correspondance games"];
- else if (this.newchallenge.to) {
+ error = this.st.tr["Please log in to play correspondence games"];
+ else if (!this.newchallenge.to && !!this.newchallenge.color)
+ error = this.st.tr["Color option only for targeted challenge"];
+ else if (!!this.newchallenge.to) {
if (this.newchallenge.to == this.st.user.name)
error = this.st.tr["Self-challenge is forbidden"];
else if (
ctype == "live" &&
Object.values(this.people).every(p => p.name != this.newchallenge.to)
- )
+ ) {
error = this.newchallenge.to + " " + this.st.tr["is not online"];
+ }
+ if (
+ !!this.newchallenge.color &&
+ !['w', 'b'].includes(this.newchallenge.color)
+ ) {
+ error = this.st.tr["Wrong color"];
+ }
}
- if (error) {
+ if (!!error) {
alert(error);
return;
}
}
// NOTE: "from" information is not required here
let chall = Object.assign({}, this.newchallenge);
+ // Add only if not already issued (not counting FEN):
+ if (this.challenges.some(c =>
+ (
+ c.from.sid == this.st.user.sid ||
+ (c.from.id > 0 && c.from.id == this.st.user.id)
+ )
+ &&
+ (
+ (!c.to && !chall.to) ||
+ c.to == chall.to
+ )
+ &&
+ c.vid == chall.vid &&
+ c.cadence == chall.cadence &&
+ c.randomness == chall.randomness
+ )) {
+ alert(this.st.tr["Challenge already exists"]);
+ return;
+ }
+ if (this.newchallenge.memorize) this.addPresetChall(this.newchallenge);
+ delete chall["V"];
+ delete chall["diag"];
const finishAddChallenge = cid => {
chall.id = cid || "c" + getRandString();
- // Remove old challenge if any (only one at a time of a given type):
- const cIdx = this.challenges.findIndex(
- c =>
- (c.from.sid == this.st.user.sid || c.from.id == this.st.user.id) &&
- c.type == ctype
- );
- if (cIdx >= 0) {
- // Delete current challenge (will be replaced now)
- this.send("deletechallenge", { data: this.challenges[cIdx].id });
+ const MAX_ALLOWED_CHALLS = 3;
+ // Remove oldest challenge if 3 found: only 3 at a time of a given type
+ let countMyChalls = 0;
+ let challToDelIdx = 0;
+ let oldestAdded = Number.MAX_SAFE_INTEGER;
+ for (let i=0; i<this.challenges.length; i++) {
+ const c = this.challenges[i];
+ if (
+ c.type == ctype &&
+ (
+ c.from.sid == this.st.user.sid ||
+ (c.from.id > 0 && c.from.id == this.st.user.id)
+ )
+ ) {
+ countMyChalls++;
+ if (c.added < oldestAdded) {
+ challToDelIdx = i;
+ oldestAdded = c.added;
+ }
+ }
+ }
+ if (countMyChalls >= MAX_ALLOWED_CHALLS) {
+ this.send(
+ "deletechallenge_s",
+ { data: { cid: this.challenges[challToDelIdx].id } }
+ );
if (ctype == "corr") {
- ajax("/challenges", "DELETE", { id: this.challenges[cIdx].id });
+ ajax(
+ "/challenges",
+ "DELETE",
+ { data: { id: this.challenges[challToDelIdx].id } }
+ );
}
- this.challenges.splice(cIdx, 1);
+ this.challenges.splice(challToDelIdx, 1);
}
this.send("newchallenge", {
- data: Object.assign({ from: this.st.user.sid }, chall)
+ data: Object.assign(
+ // Temporarily add sender infos to display challenge on Discord.
+ { from: this.st.user.sid, sender: this.st.user.name }, chall)
});
// Add new challenge:
chall.from = {
- // Decompose to avoid revealing email
sid: this.st.user.sid,
id: this.st.user.id,
name: this.st.user.name
};
chall.added = Date.now();
- // NOTE: vname and type are redundant (can be deduced from cadence + vid)
+ // NOTE: vname and type are redundant (deduced from cadence + vid)
chall.type = ctype;
chall.vname = this.newchallenge.vname;
this.challenges.push(chall);
// Remember cadence + vid for quicker further challenges:
localStorage.setItem("cadence", chall.cadence);
localStorage.setItem("vid", chall.vid);
+ localStorage.setItem("challRandomness", chall.randomness);
document.getElementById("modalNewgame").checked = false;
// Show the challenge if not on current display
if (
if (ctype == "live") {
// Live challenges have a random ID
finishAddChallenge(null);
- } else {
- // Correspondance game: send challenge to server
- ajax("/challenges", "POST", { chall: chall }, response => {
- finishAddChallenge(response.cid);
- });
+ }
+ else {
+ // Correspondence game: send challenge to server
+ ajax(
+ "/challenges",
+ "POST",
+ {
+ data: { chall: chall },
+ success: (response) => {
+ finishAddChallenge(response.id);
+ }
+ }
+ );
}
},
// Callback function after a diagram was showed to accept
finishProcessingChallenge: function(c) {
if (c.accepted) {
c.seat = {
- // Again, avoid c.seat = st.user to not reveal email
sid: this.st.user.sid,
id: this.st.user.id,
name: this.st.user.name
};
this.launchGame(c);
- } else {
- this.send("refusechallenge", { data: c.id, target: c.from.sid });
+ if (c.type == "live") {
+ // Remove all live challenges of both players
+ this.send(
+ "deletechallenge_s",
+ { data: { sids: [c.from.sid, c.seat.sid] } }
+ );
+ }
+ else
+ // Corr challenge: just remove the challenge
+ this.send("deletechallenge_s", { data: { cid: c.id } });
+ }
+ else {
+ const oppsid = this.getOppsid(c);
+ if (!!oppsid)
+ this.send("refusechallenge", { data: c.id, target: oppsid });
+ if (c.type == "corr") {
+ ajax(
+ "/challenges",
+ "DELETE",
+ { data: { id: c.id } }
+ );
+ }
+ this.send("deletechallenge_s", { data: { cid: c.id } });
}
- this.send("deletechallenge", { data: c.id });
},
+ // TODO: if several players click same challenge at the same time: problem
clickChallenge: async function(c) {
const myChallenge =
c.from.sid == this.st.user.sid || //live
alert(this.st.tr["Please log in to accept corr challenges"]);
return;
}
- c.accepted = true;
- const vModule = await import("@/variants/" + c.vname + ".js");
- window.V = vModule.VariantRules;
- if (c.to) {
- // c.to == this.st.user.name (connected)
- if (c.fen) {
- const parsedFen = V.ParseFen(c.fen);
- c.mycolor = V.GetOppCol(parsedFen.turn);
- this.tchallDiag = getDiagram({
- position: parsedFen.position,
- orientation: c.mycolor
- });
- this.curChallToAccept = c;
- document.getElementById("modalAccept").checked = true;
- }
- else {
- if (!confirm(this.st.tr["Accept challenge?"]))
- c.accepted = false;
- this.finishProcessingChallenge(c);
- }
+ else {
+ c.accepted = true;
+ await import("@/variants/" + c.vname + ".js")
+ .then((vModule) => {
+ window.V = vModule[c.vname + "Rules"];
+ if (!!c.to) {
+ // c.to == this.st.user.name (connected)
+ if (!!c.fen) {
+ const parsedFen = V.ParseFen(c.fen);
+ this.tchallDiag = getDiagram({
+ position: parsedFen.position,
+ orientation: parsedFen.turn
+ });
+ }
+ this.curChallToAccept = c;
+ document.getElementById("modalAccept").checked = true;
+ }
+ else this.finishProcessingChallenge(c);
+ });
}
- else
- this.finishProcessingChallenge(c);
}
else {
// My challenge
if (c.type == "corr") {
- ajax("/challenges", "DELETE", { id: c.id });
+ ajax(
+ "/challenges",
+ "DELETE",
+ { data: { id: c.id } }
+ );
}
- this.send("deletechallenge", { data: c.id });
+ this.send("deletechallenge_s", { data: { cid: c.id } });
}
// In all cases, the challenge is consumed:
ArrayFun.remove(this.challenges, ch => ch.id == c.id);
},
// NOTE: when launching game, the challenge is already being deleted
launchGame: function(c) {
+ // White player index 0, black player index 1:
+ let players =
+ !!c.color
+ ? (c.color == "w" ? [c.from, c.seat] : [c.seat, c.from])
+ : shuffle([c.from, c.seat]);
+ players.forEach(p => {
+ if (!!p["tmpIds"]) delete p["tmpIds"];
+ });
// These game informations will be shared
let gameInfo = {
id: getRandString(),
- fen: c.fen || V.GenRandInitFen(),
- // White player index 0, black player index 1:
- players: c.mycolor
- ? (c.mycolor == "w" ? [c.seat, c.from] : [c.from, c.seat])
- : shuffle([c.from, c.seat]),
+ fen: c.fen || V.GenRandInitFen(c.randomness),
+ randomness: c.randomness, //for rematch
+ players: players,
vid: c.vid,
cadence: c.cadence
};
- let oppsid = c.from.sid; //may not be defined if corr + offline opp
- if (!oppsid) {
- oppsid = Object.keys(this.people).find(
- sid => this.people[sid].id == c.from.id
- );
- }
const notifyNewgame = () => {
- if (oppsid)
- //opponent is online
+ const oppsid = this.getOppsid(c);
+ if (!!oppsid)
+ // Opponent is online
this.send("startgame", { data: gameInfo, target: oppsid });
- // Send game info (only if live) to everyone except me in this tab
- this.send("newgame", { data: gameInfo });
+ // If new corr game, notify Hall (except opponent and me)
+ if (c.type == "corr") {
+ this.send(
+ "newgame",
+ {
+ data: gameInfo,
+ excluded: [this.st.user.sid, oppsid]
+ }
+ );
+ }
+ // Notify MyGames page:
+ this.send(
+ "notifynewgame",
+ {
+ data: gameInfo,
+ targets: gameInfo.players
+ }
+ );
+ // NOTE: no need to send the game to the room, since I'll connect
+ // on game just after, the main Hall will be notified.
};
if (c.type == "live") {
+ // TODO: ask my IP + opp IP, to add to game infos? (potential bans)
notifyNewgame();
this.startNewGame(gameInfo);
- } //corr: game only on server
+ // Increment game stats counter in DB
+ ajax(
+ "/gamestat",
+ "POST",
+ { data: { vid: gameInfo.vid } }
+ );
+ }
else {
+ // corr: game only on server
ajax(
"/games",
"POST",
- { gameInfo: gameInfo, cid: c.id }, //cid useful to delete challenge
- response => {
- gameInfo.id = response.gameId;
- notifyNewgame();
- this.$router.push("/game/" + response.gameId);
+ {
+ // cid is useful to delete the challenge:
+ data: {
+ gameInfo: gameInfo,
+ cid: c.id
+ },
+ success: (response) => {
+ gameInfo.id = response.id;
+ notifyNewgame();
+ this.$router.push("/game/" + response.id);
+ }
}
);
}
},
// NOTE: for live games only (corr games start on the server)
startNewGame: function(gameInfo) {
- const game = Object.assign({}, gameInfo, {
- // (other) Game infos: constant
- fenStart: gameInfo.fen,
- vname: this.getVname(gameInfo.vid),
- created: Date.now(),
- // Game state (including FEN): will be updated
- moves: [],
- clocks: [-1, -1], //-1 = unstarted
- initime: [0, 0], //initialized later
- score: "*"
- });
- GameStorage.add(game, (err) => {
- // If an error occurred, game is not added: abort
- if (!err) {
- if (this.st.settings.sound)
- new Audio("/sounds/newgame.wav").play().catch(() => {});
- this.$router.push("/game/" + gameInfo.id);
+ this.setVname(gameInfo);
+ const game = Object.assign(
+ {},
+ gameInfo,
+ {
+ // (other) Game infos: constant
+ fenStart: gameInfo.fen,
+ created: Date.now(),
+ // Game state (including FEN): will be updated
+ moves: [],
+ clocks: [-1, -1], //-1 = unstarted
+ chats: [],
+ score: "*"
}
- });
+ );
+ setTimeout(
+ () => {
+ const myIdx = (game.players[0].sid == this.st.user.sid ? 0 : 1);
+ GameStorage.add(game, (err) => {
+ // If an error occurred, game is not added: the focused tab
+ // already added the game.
+ if (!this.focus) {
+ if (this.st.settings.sound)
+ // This will be played several times if several hidden tabs
+ // on Hall... TODO: fix that (how ?!)
+ new Audio("/sounds/newgame.flac").play().catch(() => {});
+ notify(
+ "New live game",
+ { body: "vs " + (game.players[1-myIdx].name || "@nonymous") }
+ );
+ }
+ this.$router.push("/game/" + gameInfo.id);
+ });
+ },
+ this.focus ? 0 : 500 + 1000 * Math.random()
+ );
}
}
};
<style lang="sass" scoped>
.active
- color: #42a983
+ color: #388e3c
#infoDiv > .card
padding: 15px 0
button.player-action
margin-left: 32px
+ &.focused
+ background-color: #E6D271
.somethingnew
- background-color: #c5fefe !important
+ background-color: #90C4EC !important
.tabbtn
background-color: #f9faee
background-color: red
#buttonsTchall
- margin-top: 10px
+ // margin-top set dynamically (depends if diagram showed or not)
+ & > button > span
+ width: 100%
+ text-align: center
.variantName
font-weight: bold
.diagram
margin: 0 auto
max-width: 400px
+ // width: 100% required for Firefox
+ width: 100%
#inputFen
width: 100%
@media screen and (max-width: 767px)
#div2, #div3
margin-top: 0
+
+.user-bio
+ display: inline
+
+tr > td
+ &.random-0
+ background-color: #FF5733
+ &.random-1
+ background-color: #2B63B4
+ &.random-2
+ background-color: #33B42B
+
+@media screen and (max-width: 767px)
+ h4
+ margin: 5px 0
+
+button#loadMoreBtn
+ display: block
+ margin: 0 auto
+
+td.remove-preset
+ background-color: lightgrey
+ text-align: center
+ & > img
+ height: 1em
</style>