<template lang="pug">
main
input#modalInfo.modal(type="checkbox")
- div(role="dialog" aria-labelledby="infoMessage")
+ div#infoDiv(role="dialog" data-checkbox="modalInfo" aria-labelledby="infoMessage")
.card.smallpad.small-modal.text-center
label.modal-close(for="modalInfo")
h3#infoMessage.section
p(v-html="infoMessage")
input#modalNewgame.modal(type="checkbox")
- div(role="dialog" data-checkbox="modalNewgame"
+ div#newgameDiv(role="dialog" data-checkbox="modalNewgame"
aria-labelledby="titleFenedit")
.card.smallpad(@keyup.enter="newChallenge")
label#closeNewgame.modal-close(for="modalNewgame")
fieldset
- label(for="selectVariant") {{ st.tr["Variant"] }}
+ 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="timeControl") {{ st.tr["Time control"] }}
+ label(for="timeControl") {{ st.tr["Cadence"] }} *
div#predefinedTimeControls
button 3+2
button 5+3
input#timeControl(type="text" v-model="newchallenge.timeControl"
placeholder="5+0, 1h+30s, 7d+1d ...")
fieldset(v-if="st.user.id > 0")
- label(for="selectPlayers") {{ st.tr["Play with? (optional)"] }}
+ 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") {{ st.tr["FEN (optional)"] }}
+ label(for="inputFen") FEN
input#inputFen(type="text" v-model="newchallenge.fen")
button(@click="newChallenge") {{ st.tr["Send challenge"] }}
.row
.col-sm-12
- button#newGame(onClick="doClick('modalNewgame')") New game
+ button#newGame(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
.button-group
button(@click="(e) => setDisplay('c','live',e)" class="active")
- | Live Challenges
+ | {{ st.tr["Live challenges"] }}
button(@click="(e) => setDisplay('c','corr',e)")
- | Correspondance challenges
+ | {{ 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 Who's there?
+ h3.text-center {{ st.tr["Who's there?"] }}
#players
- p(v-for="p in Object.values(people)" v-if="!!p.name")
- span {{ p.name }}
+ p(v-for="sid in Object.keys(people)" v-if="!!people[sid].name")
+ span {{ people[sid].name }}
button.player-action(
- v-if="p.name != st.user.name"
- @click="challOrWatch(p,$event)"
+ v-if="people[sid].name != st.user.name"
+ @click="challOrWatch(sid, $event)"
)
- | {{ whatPlayerDoes(p) }}
+ | {{ st.tr[!!people[sid].gamer ? 'Playing' : 'Available'] }}
p.anonymous @nonymous ({{ anonymousCount }})
#chat
- Chat(:players="[]")
+ Chat(:newChat="newChat" @mychat="processChat")
.clearer
div
.button-group
button(@click="(e) => setDisplay('g','live',e)" class="active")
- | Live games
+ | {{ st.tr["Live games"] }}
button(@click="(e) => setDisplay('g','corr',e)")
- | Correspondance games
+ | {{ st.tr["Correspondance games"] }}
GameList(v-show="gdisplay=='live'" :games="filterGames('live')"
@show-game="showGame")
GameList(v-show="gdisplay=='corr'" :games="filterGames('corr')"
import GameList from "@/components/GameList.vue";
import ChallengeList from "@/components/ChallengeList.vue";
import { GameStorage } from "@/utils/gameStorage";
+import { processModalClick } from "@/utils/modalClick";
+
export default {
name: "my-hall",
components: {
to: "", //name of challenged player (if any)
timeControl: localStorage.getItem("timeControl") || "",
},
+ newChat: "",
};
},
watch: {
}));
}
);
- // Also ask for corr challenges (open + sent to me)
+ // Also ask for corr challenges (open + sent by/to me)
ajax(
"/challenges",
"GET",
response => {
// Gather all senders names, and then retrieve full identity:
// (TODO [perf]: some might be online...)
- const uids = response.challenges.map(c => { return c.uid });
- ajax("/users",
- "GET",
- { ids: uids.join(",") },
- response2 => {
- let names = {};
- response2.users.forEach(u => {names[u.id] = u.name});
- this.challenges = this.challenges.concat(
- response.challenges.map(c => {
- // (just players names in fact)
- const from = {name: names[c.uid], id: c.uid};
- const type = this.classifyObject(c);
- const vname = this.getVname(c.vid);
- return Object.assign({}, c, {type: type, vname: vname, from: from});
- })
- )
- }
- );
+ let names = {};
+ response.challenges.forEach(c => {
+ if (c.uid != this.st.user.id)
+ names[c.uid] = ""; //unknwon for now
+ else if (!!c.target && c.target != this.st.user.id)
+ names[c.target] = "";
+ });
+ const addChallenges = (newChalls) => {
+ 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 (names !== {})
+ {
+ ajax("/users",
+ "GET",
+ { ids: Object.keys(names).join(",") },
+ response2 => {
+ response2.users.forEach(u => {names[u.id] = u.name});
+ addChallenges();
+ }
+ );
+ }
+ else
+ addChallenges();
}
);
// 0.1] Ask server for room composition:
// after we're sure WebSocket is initialized
this.st.conn.send(JSON.stringify({code:"connect"}));
this.st.conn.send(JSON.stringify({code:"pollclients"}));
+ this.st.conn.send(JSON.stringify({code:"pollgamers"}));
};
if (!!this.st.conn && this.st.conn.readyState == 1) //1 == OPEN state
funcPollClients();
this.st.conn.onclose = socketCloseListener;
},
mounted: function() {
+ [document.getElementById("infoDiv"),document.getElementById("newgameDiv")]
+ .forEach(elt => elt.addEventListener("click", processModalClick));
document.querySelectorAll("#predefinedTimeControls > button").forEach(
(b) => { b.addEventListener("click",
() => { this.newchallenge.timeControl = b.innerHTML; }
return this.games.filter(g => g.type == type);
},
classifyObject: function(o) { //challenge or game
- // Heuristic: should work for most cases... (TODO)
return (o.timeControl.indexOf('d') === -1 ? "live" : "corr");
},
showGame: function(g) {
// this.st.variants might be uninitialized (variant == null)
return (!!variant ? variant.name : "");
},
- whatPlayerDoes: function(p) {
- if (this.games.some(g => g.type == "live"
- && g.players.some(pl => pl.sid == p.sid)))
- {
- return "Playing";
- }
- return "Challenge"; //player is available
+ processChat: function(chat) {
+ // When received on server, this will trigger a "notifyRoom"
+ this.st.conn.send(JSON.stringify({code:"newchat", chat: chat}));
},
sendSomethingTo: function(to, code, obj, warnDisconnected) {
const doSend = (code, obj, sid) => {
{target: sid}
)));
};
- if (!!to)
- {
- // Challenge with targeted players
- const targetSid =
- Object.keys(this.people).find(sid => this.people[sid].name == to);
- if (!targetSid)
- {
- if (!!warnDisconnected)
- alert("Warning: " + to + " is not connected");
- return false;
- }
- else
- doSend(code, obj, targetSid);
- }
- else
+ if (!to || (!to.sid && !to.name))
{
// Open challenge: send to all connected players (me excepted)
Object.keys(this.people).forEach(sid => {
doSend(code, obj, sid);
});
}
+ else
+ {
+ let targetSid = "";
+ if (!!to.sid)
+ targetSid = to.sid;
+ else
+ {
+ if (to.name == this.st.user.name)
+ return alert(this.st.tr["Cannot challenge self"]);
+ // Challenge with targeted players
+ targetSid =
+ Object.keys(this.people).find(sid => this.people[sid].name == to.name);
+ if (!targetSid)
+ {
+ if (!!warnDisconnected)
+ alert(this.st.tr["Warning: target is not connected"]);
+ return false;
+ }
+ }
+ doSend(code, obj, targetSid);
+ }
return true;
},
// Messaging center:
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.$set(this.people, sid, {id:0, name:""});
- // Ask identity, challenges and game(s)
+ // Ask identity and challenges
this.st.conn.send(JSON.stringify({code:"askidentity", target:sid}));
this.st.conn.send(JSON.stringify({code:"askchallenge", target:sid}));
});
+ break;
+ case "pollgamers":
+ // NOTE: we could make a difference between people in hall
+ // and gamers, but is it necessary?
+ data.sockIds.forEach(sid => {
+ this.$set(this.people, sid, {id:0, name:"", gamer:true});
+ this.st.conn.send(JSON.stringify({code:"askidentity", target:sid}));
+ });
// Also ask current games to all playing peers (TODO: some design issue)
this.st.conn.send(JSON.stringify({code:"askgames"}));
break;
- }
case "askidentity":
{
// Request for identification: reply if I'm not anonymous
case "identity":
{
this.$set(this.people, data.user.sid,
- {id: data.user.id, name: data.user.name});
+ {
+ id: data.user.id,
+ name: data.user.name,
+ gamer: this.people[data.user.sid].gamer,
+ });
break;
}
case "askchallenge":
if (cIdx >= 0)
{
const c = this.challenges[cIdx];
- if (!!c.to)
- {
- // Only share targeted challenges to the targets:
- const toSid = Object.keys(this.people).find(k =>
- this.people[k].name == c.to);
- if (toSid != data.from)
- return;
- }
+ // TODO: code below requires "c.to" to have given his identity,
+ // but it can happen that the identity arrives later, which
+ // prevent him from receiving the challenge.
+ // ==> Filter later (when receiving challenge)
+// if (!!c.to)
+// {
+// // Only share targeted challenges to the targets:
+// const toSid = Object.keys(this.people).find(k =>
+// this.people[k].name == c.to);
+// if (toSid != data.from)
+// return;
+// }
const myChallenge =
{
// Minimal challenge informations: (from not required)
fen: c.fen,
vid: c.vid,
timeControl: c.timeControl,
+ added: c.added,
};
this.st.conn.send(JSON.stringify({code:"challenge",
chall:myChallenge, target:data.from}));
case "challenge":
{
// Receive challenge from some player (+sid)
- let newChall = data.chall;
- newChall.type = this.classifyObject(data.chall);
- newChall.from =
- Object.assign({sid:data.from}, this.people[data.from]);
- newChall.added = Date.now(); //TODO: this is reception timestamp, not creation
- newChall.vname = this.getVname(newChall.vid);
- this.challenges.push(newChall);
+ // NOTE about next condition: see "askchallenge" case.
+ if (!data.chall.to || data.chall.to == this.st.user.name)
+ {
+ let newChall = data.chall;
+ newChall.type = this.classifyObject(data.chall);
+ newChall.from =
+ Object.assign({sid:data.from}, this.people[data.from]);
+ newChall.vname = this.getVname(newChall.vid);
+ this.challenges.push(newChall);
+ }
break;
}
case "game":
// NOTE: it may be correspondance (if newgame while we are connected)
// If duplicate found: select rid (remote ID) at random
let game = this.games.find(g => g.id == data.game.id);
- if (!!game && Math.random() < 0.5)
- game.rid = data.from;
+ if (!!game)
+ {
+ if (Math.random() < 0.5)
+ game.rid = data.from;
+ }
else
{
let newGame = data.game;
newGame.type = this.classifyObject(data.game);
newGame.vname = this.getVname(data.game.vid);
newGame.rid = data.from;
- newGame.score = "*";
+ if (!data.game.score)
+ newGame.score = "*";
this.games.push(newGame);
}
break;
}
case "newgame":
{
- // TODO: next line required ?!
- //ArrayFun.remove(this.challenges, c => c.id == data.cid);
// New game just started: data contain all information
if (this.classifyObject(data.gameInfo) == "live")
this.startNewGame(data.gameInfo);
}
break;
}
+ case "newchat":
+ this.newChat = data.chat;
+ break;
case "refusechallenge":
{
ArrayFun.remove(this.challenges, c => c.id == data.cid);
localStorage.removeItem("challenge");
- alert(this.people[data.from].name + " declined your challenge");
+ alert(this.st.tr["Challenge declined"]);
break;
}
case "deletechallenge":
break;
}
case "connect":
- {
- this.$set(this.people, data.from, {name:"", id:0});
+ case "gconnect":
+ this.$set(this.people, data.from, {name:"", id:0, gamer:data.code[0]=='g'});
this.st.conn.send(JSON.stringify({code:"askidentity", target:data.from}));
- this.st.conn.send(JSON.stringify({code:"askchallenge", target:data.from}));
- this.st.conn.send(JSON.stringify({code:"askgame", target:data.from}));
+ if (data.code == "connect")
+ this.st.conn.send(JSON.stringify({code:"askchallenge", target:data.from}));
+ else
+ this.st.conn.send(JSON.stringify({code:"askgame", target:data.from}));
break;
- }
case "disconnect":
- {
+ case "gdisconnect":
this.$delete(this.people, data.from);
- // Also remove all challenges sent by this player:
- ArrayFun.remove(this.challenges, c => c.from.sid == 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");
+ if (data.code == "disconnect")
+ {
+ // Also remove all challenges sent by this player:
+ ArrayFun.remove(this.challenges, c => c.from.sid == data.from);
+ }
+ else
+ {
+ // 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");
+ }
break;
- }
}
},
// Challenge lifecycle:
- tryChallenge: function(player) {
- if (player.id == 0)
+ tryChallenge: function(sid) {
+ if (this.people[sid].id == 0)
return; //anonymous players cannot be challenged
- this.newchallenge.to = player.name;
+ // TODO: SID is available, so we could use it instead of searching from name
+ this.newchallenge.to = this.people[sid].name;
doClick("modalNewgame");
},
- challOrWatch: function(p, e) {
- switch (e.target.innerHTML)
+ challOrWatch: function(sid) {
+ if (!this.people[sid].gamer)
{
- case "Challenge":
- this.tryChallenge(p);
- break;
- case "Playing":
- // NOTE: this search for game was already done for rendering
- this.showGame(this.games.find(
- g => g.type=="live" && g.players.some(pl => pl.sid == p.sid)));
- break;
- };
+ // Available, in Hall
+ this.tryChallenge(sid);
+ }
+ else
+ {
+ // Playing, in Game
+ this.showGame(this.games.find(
+ g => g.players.some(pl => pl.sid == sid || pl.uid == this.people[sid].id)));
+ }
},
newChallenge: async function() {
if (this.newchallenge.vid == "")
- return alert("Please select a variant");
+ return alert(this.st.tr["Please select a variant"]);
+ if (!!this.newchallenge.to && this.newchallenge.to == this.st.user.name)
+ return alert(this.st.tr["Self-challenge is forbidden"]);
const vname = this.getVname(this.newchallenge.vid);
const vModule = await import("@/variants/" + vname + ".js");
window.V = vModule.VariantRules;
return alert(error);
const ctype = this.classifyObject(this.newchallenge);
if (ctype == "corr" && this.st.user.id <= 0)
- return alert("Please log in to play correspondance games");
+ return alert(this.st.tr["Please log in to play correspondance games"]);
// NOTE: "from" information is not required here
let chall = Object.assign({}, this.newchallenge);
const finishAddChallenge = (cid,warnDisconnected) => {
chall.id = cid || "c" + getRandString();
// Send challenge to peers (if connected)
- const isSent = this.sendSomethingTo(chall.to, "challenge",
+ const isSent = this.sendSomethingTo({name:chall.to}, "challenge",
{chall:chall}, !!warnDisconnected);
if (!isSent)
return;
- // Remove old challenge if any (only one at a time):
+ // 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.type == ctype);
+ (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.sendSomethingTo(this.challenges[cIdx].to,
+ this.sendSomethingTo({name:this.challenges[cIdx].to},
"deletechallenge", {cid:this.challenges[cIdx].id});
if (ctype == "corr")
{
if (!myChallenge)
{
if (c.type == "corr" && this.st.user.id <= 0)
- return alert("Please log in to accept corr challenges");
+ return alert(this.st.tr["Please log in to accept corr challenges"]);
c.accepted = true;
if (!!c.to) //c.to == this.st.user.name (connected)
{
code: "refusechallenge",
cid: c.id, target: c.from.sid}));
}
- // TODO: refactor the "sendSomethingTo()" function
- if (!c.to)
- this.sendSomethingTo(null, "deletechallenge", {cid:c.id});
- else
- {
- this.st.conn.send(JSON.stringify({
- code:"deletechallenge", target: c.from.sid, cid: c.id}));
- }
+ this.sendSomethingTo(!!c.to ? {sid:c.from.sid} : null, "deletechallenge", {cid:c.id});
}
else //my challenge
{
}
else //live
localStorage.removeItem("challenge");
- this.sendSomethingTo(c.to, "deletechallenge", {cid:c.id});
+ this.sendSomethingTo({name:c.to}, "deletechallenge", {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 deleted
+ // NOTE: when launching game, the challenge is already being deleted
launchGame: async function(c) {
const vModule = await import("@/variants/" + c.vname + ".js");
window.V = vModule.VariantRules;
projects / vchess.git / blobdiff