import GameList from "@/components/GameList.vue";
import ChallengeList from "@/components/ChallengeList.vue";
import { GameStorage } from "@/utils/gameStorage";
-import { extractTime } from "@/utils/timeControl";
export default {
name: "my-hall",
components: {
},
created: function() {
// Always add myself to players' list
- this.people.push(this.st.user);
+ const my = this.st.user;
+ this.people.push({sid:my.sid, id:my.id, name:my.name});
// Retrieve live challenge (not older than 30 minute) if any:
const chall = JSON.parse(localStorage.getItem("challenge") || "false");
if (!!chall)
"GET",
{uid: this.st.user.id, excluded: true},
response => {
- this.games = this.games.concat(response.games);
+ 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});
+ }));
}
);
// Also ask for corr challenges (open + sent to me)
"GET",
{uid: this.st.user.id},
response => {
- console.log(response.challenges);
- // TODO: post-treatment on challenges ?
- Array.prototype.push.apply(this.challenges, response.challenges);
+ // 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});
+ })
+ )
+ }
+ );
}
);
+ // TODO: I don't like this code below; improvement?
+ let retryForVnames = setInterval(() => {
+ if (this.st.variants.length > 0) //variants array is loaded
+ {
+ if (this.games.length > 0 && this.games[0].vname == "")
+ {
+ // Fix games' vnames:
+ this.games.forEach(g => { g.vname = this.getVname(g.vid); });
+ }
+ if (this.challenges.length > 0 && this.challenges[0].vname == "")
+ {
+ // Fix challenges' vnames:
+ this.challenges.forEach(c => { c.vname = this.getVname(c.vid); });
+ }
+ clearInterval(retryForVnames);
+ }
+ }, 50);
}
// 0.1] Ask server for room composition:
const funcPollClients = () => {
return this.challenges.filter(c => c.type == type);
},
filterGames: function(type) {
- return this.games.filter(c => c.type == type);
+ return this.games.filter(g => g.type == type);
},
classifyObject: function(o) { //challenge or game
// Heuristic: should work for most cases... (TODO)
// TODO: ...filter(...)[0].name, one-line, just remove this function
getVname: function(vid) {
const vIdx = this.st.variants.findIndex(v => v.id == vid);
- return this.st.variants[vIdx].name;
+ return vIdx >= 0 ? this.st.variants[vIdx].name : "";
},
getSid: function(pname) {
const pIdx = this.people.findIndex(pl => pl.name == pname);
if (this.st.user.id > 0)
{
this.st.conn.send(JSON.stringify(
- {code:"identity", user:this.st.user, target:data.from}));
+ // people[0] instead of st.user to avoid sending email
+ {code:"identity", user:this.people[0], target:data.from}));
}
break;
}
// Minimal game informations:
id: game.id,
players: game.players.map(p => p.name),
- vname: game.vname,
+ vid: game.vid,
timeControl: game.timeControl,
};
this.st.conn.send(JSON.stringify({code:"game",
const pIdx = this.people.findIndex(p => p.sid == data.from);
newChall.from = this.people[pIdx]; //may be anonymous
newChall.added = Date.now(); //TODO: this is reception timestamp, not creation
- newChall.vname = this.getVname(newChall.vid); //TODO: just send vname?
+ newChall.vname = this.getVname(newChall.vid);
this.challenges.push(newChall);
break;
}
{
let newGame = data.game;
newGame.type = this.classifyObject(data.game);
+ newGame.vname = this.getVname(data.game.vid);
newGame.rid = data.from;
newGame.score = "*";
this.games.push(newGame);
}
case "newgame":
{
+ // TODO: next line required ?!
+ //ArrayFun.remove(this.challenges, c => c.id == data.cid);
// New game just started: data contain all information
- if (data.gameInfo.type == "live")
- {
+ if (this.classifyObject(data.gameInfo) == "live")
this.startNewGame(data.gameInfo);
- // TODO: redirect to game
- }
else
{
// TODO: notify with game link but do not redirect
{
// NOTE: the challenge may be already removed
ArrayFun.remove(this.challenges, c => c.id == data.cid);
+ localStorage.removeItem("challenge"); //in case of
break;
}
case "connect":
if (!!error)
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");
// NOTE: "from" information is not required here
let chall = Object.assign({}, this.newchallenge);
const finishAddChallenge = (cid,warnDisconnected) => {
// Send challenge to peers (if connected)
this.sendSomethingTo(chall.to, "challenge", {chall:chall}, !!warnDisconnected);
chall.added = Date.now();
+ // NOTE: vname and type are redundant (can be deduced from timeControl + vid)
chall.type = ctype;
chall.vname = vname;
- chall.from = this.st.user;
+ chall.from = this.people[0]; //avoid sending email
this.challenges.push(chall);
localStorage.setItem("challenge", JSON.stringify(chall));
document.getElementById("modalNewgame").checked = false;
ajax(
"/challenges",
"POST",
- chall,
+ { chall: chall },
response => { finishAddChallenge(response.cid); }
);
}
},
clickChallenge: function(c) {
+ // In all cases, the challenge is consumed:
+ ArrayFun.remove(this.challenges, ch => ch.id == c.id);
+ // NOTE: deletechallenge event might be redundant (but it's easier this way)
+ this.sendSomethingTo((!!c.to ? c.from : null), "deletechallenge", {cid:c.id});
const myChallenge = (c.from.sid == this.st.user.sid //live
|| (this.st.user.id > 0 && c.from.id == this.st.user.id)); //corr
if (!myChallenge)
}
if (c.accepted)
{
- c.seat = this.st.user;
+ c.seat = this.people[0]; //== this.st.user, avoid revealing email
this.launchGame(c);
}
else
cid: c.id, target: c.from.sid}));
}
}
- else
- localStorage.removeItem("challenge");
- // In all cases, the challenge is consumed:
- ArrayFun.remove(this.challenges, ch => ch.id == c.id);
- // NOTE: deletechallenge event might be redundant (but it's easier this way)
- this.sendSomethingTo(c.to, "deletechallenge", {cid:c.id});
- if (c.type == "corr")
+ else //my challenge
{
- ajax(
- "/challenges",
- "DELETE",
- {id: this.challenges[cIdx].id}
- );
+ localStorage.removeItem("challenge");
+ if (c.type == "corr")
+ {
+ ajax(
+ "/challenges",
+ "DELETE",
+ {id: c.id}
+ );
+ }
}
},
// NOTE: when launching game, the challenge is already deleted
launchGame: async function(c) {
- const vname = this.getVname(c.vid);
- const vModule = await import("@/variants/" + vname + ".js");
+ const vModule = await import("@/variants/" + c.vname + ".js");
window.V = vModule.VariantRules;
- // Extract times (in [milli]seconds), set clocks
- const tc = extractTime(c.timeControl);
// These game informations will be sent to other players
const gameInfo =
{
fen: c.fen || V.GenRandInitFen(),
players: shuffle([c.from, c.seat]), //white then black
vid: c.vid,
- timeControl: tc.timeControl,
- mainTime: tc.mainTime,
- increment: tc.increment,
- type: c.type,
+ timeControl: c.timeControl,
};
- this.st.conn.send(JSON.stringify({code:"newgame",
- gameInfo:gameInfo, target:c.seat.sid}));
+ let target = c.from.sid; //may not be defined if corr + offline opp
+ if (!target)
+ {
+ const opponent = this.people.find(p => p.id == c.from.id);
+ if (!!opponent)
+ target = opponent.sid
+ }
+ if (!!target) //opponent is online
+ {
+ this.st.conn.send(JSON.stringify({code:"newgame",
+ gameInfo:gameInfo, target:target, cid:c.id}));
+ }
if (c.type == "live")
this.startNewGame(gameInfo);
else //corr: game only on server
ajax(
"/games",
"POST",
- {gameInfo: gameInfo}
+ {gameInfo: gameInfo, cid: c.id}, //cid useful to delete challenge
+ response => { this.$router.push("/game/" + response.gameId); }
);
}
},
- // NOTE: for live games only (corr games are launched on server)
+ // NOTE: for live games only (corr games start on the server)
startNewGame: function(gameInfo) {
- const game = Object.assign(gameInfo, {
- // More game infos: constant
- vname: this.getVname(gameInfo.vid),
+ const game = Object.assign({}, gameInfo, {
+ // (other) Game infos: constant
fenStart: gameInfo.fen,
- mode: "live", //function for live games only
- // Game state: will be updated
+ // Game state (including FEN): will be updated
moves: [],
- clocks: [tc.mainTime, tc.mainTime],
- initime: [Date.now(), 0],
+ clocks: [-1, -1], //-1 = unstarted
+ initime: [0, 0], //initialized later
score: "*",
});
GameStorage.add(game);
if (this.st.settings.sound >= 1)
new Audio("/sounds/newgame.mp3").play().catch(err => {});
- // TODO: redirect to game
+ this.$router.push("/game/" + gameInfo.gameId);
},
},
};
projects / vchess.git / blobdiff