label(for="selectVariant") {{ st.tr["Variant"] }}
select#selectVariant(v-model="newchallenge.vid")
option(v-for="v in st.variants" :value="v.id") {{ v.name }}
- fieldset
- label(for="selectNbPlayers") {{ st.tr["Number of players"] }}
- select#selectNbPlayers(v-model="newchallenge.nbPlayers")
- option(v-show="possibleNbplayers(2)" value="2" selected) 2
- option(v-show="possibleNbplayers(3)" value="3") 3
- option(v-show="possibleNbplayers(4)" value="4") 4
fieldset
label(for="timeControl") {{ st.tr["Time control"] }}
input#timeControl(type="text" v-model="newchallenge.timeControl"
placeholder="3m+2s, 1h+30s, 7d+1d ...")
fieldset(v-if="st.user.id > 0")
label(for="selectPlayers") {{ st.tr["Play with? (optional)"] }}
- #selectPlayers
- input(type="text" v-model="newchallenge.to[0]")
- input(v-show="newchallenge.nbPlayers>=3" type="text"
- v-model="newchallenge.to[1]")
- input(v-show="newchallenge.nbPlayers==4" type="text"
- v-model="newchallenge.to[2]")
+ input#selectPlayers(type="text" v-model="newchallenge.to")
fieldset(v-if="st.user.id > 0")
label(for="inputFen") {{ st.tr["FEN (optional)"] }}
input#inputFen(type="text" v-model="newchallenge.fen")
<script>
import { store } from "@/store";
-import { NbPlayers } from "@/data/nbPlayers";
import { checkChallenge } from "@/data/challengeCheck";
import { ArrayFun } from "@/utils/array";
import { ajax } from "@/utils/ajax";
import { getRandString, shuffle } from "@/utils/alea";
-import { extractTime } from "@/utils/timeControl";
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: {
gdisplay: "live",
games: [],
challenges: [],
- players: [], //online players (rename into "people" ?)
+ people: [], //(all) online players
newchallenge: {
fen: "",
vid: 0,
- nbPlayers: 0,
- to: ["", "", ""], //name of challenged players
+ to: "", //name of challenged player (if any)
timeControl: "", //"2m+2s" ...etc
},
};
// Show e.g. "@nonymous (5)", and do nothing on click on anonymous
let anonymous = {id:0, name:"@nonymous", count:0};
let playerList = [];
- this.players.forEach(p => {
+ this.people.forEach(p => {
if (p.id > 0)
playerList.push(p);
else
return playerList;
},
},
- watch: {
- // Watch event "user infos retrieved" (through /whoami)
- "st.user.id": function(newId) {
- if (newId > 0) //should always be the case
- {
- // Ask server for current corr games (all but mines)
- // ajax(
- // "/games",
- // "GET",
- // {excluded: this.st.user.id},
- // response => {
- // this.games = this.games.concat(response.games);
- // }
- // );
- // Also ask for corr challenges (open + sent to me)
- ajax(
- "/challenges",
- "GET",
- {uid: this.st.user.id},
- response => {
- console.log(response.challenges);
- // TODO: post-treatment on challenges ?
- this.challenges = this.challenges.concat(response.challenges);
- }
- );
- }
- },
- },
created: function() {
// Always add myself to players' list
- this.players.push(this.st.user);
+ this.people.push(this.st.user);
+ // Retrieve live challenge (not older than 30 minute) if any:
+ const chall = JSON.parse(localStorage.getItem("challenge") || "false");
+ if (!!chall)
+ {
+ if ((Date.now() - chall.added)/1000 <= 30*60)
+ this.challenges.push(chall);
+ else
+ localStorage.removeItem("challenge");
+ }
+ if (this.st.user.id > 0)
+ {
+ // Ask server for current corr games (all but mines)
+// ajax(
+// "/games",
+// "GET",
+// {excluded: this.st.user.id},
+// response => {
+// this.games = this.games.concat(response.games);
+// }
+// );
+ // Also ask for corr challenges (open + sent to me)
+ ajax(
+ "/challenges",
+ "GET",
+ {uid: this.st.user.id},
+ response => {
+ console.log(response.challenges);
+ // TODO: post-treatment on challenges ?
+ Array.prototype.push.apply(this.challenges, response.challenges);
+ }
+ );
+ }
// 0.1] Ask server for room composition:
const socketOpenListener = () => {
this.st.conn.send(JSON.stringify({code:"pollclients"}));
// Heuristic: should work for most cases... (TODO)
return (o.timeControl.indexOf('d') === -1 ? "live" : "corr");
},
- possibleNbplayers: function(nbp) {
- if (this.newchallenge.vid == 0)
- return false;
- const idxInVariants =
- this.st.variants.findIndex(v => v.id == this.newchallenge.vid);
- return NbPlayers[this.st.variants[idxInVariants].name].includes(nbp);
- },
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
+
+// TODO: this doesn't work: choose a SID at random
+ // --> do we have players' names ?
+
let url = "/" + g.id;
if (g.type == "live")
{
return this.st.variants[vIdx].name;
},
getSid: function(pname) {
- const pIdx = this.players.findIndex(pl => pl.name == pname);
- return (pIdx === -1 ? null : this.players[pIdx].sid);
+ const pIdx = this.people.findIndex(pl => pl.name == pname);
+ return (pIdx === -1 ? null : this.people[pIdx].sid);
},
getPname: function(sid) {
- const pIdx = this.players.findIndex(pl => pl.sid == sid);
- return (pIdx === -1 ? null : this.players[pIdx].name);
+ const pIdx = this.people.findIndex(pl => pl.sid == sid);
+ return (pIdx === -1 ? null : this.people[pIdx].name);
},
sendSomethingTo: function(to, code, obj, warnDisconnected) {
const doSend = (code, obj, sid) => {
{target: sid}
)));
};
- if (!!to[0])
+ if (!!to)
{
- to.forEach(pname => {
- // Challenge with targeted players
- const targetSid = this.getSid(pname);
- if (!targetSid)
- {
- if (!!warnDisconnected)
- alert("Warning: " + pname + " is not connected");
- }
- else
- doSend(code, obj, targetSid);
- });
+ // Challenge with targeted players
+ const targetSid = this.getSid(to);
+ if (!targetSid)
+ {
+ if (!!warnDisconnected)
+ alert("Warning: " + pname + " is not connected");
+ }
+ else
+ doSend(code, obj, targetSid);
}
else
{
// Open challenge: send to all connected players (except us)
- this.players.forEach(p => {
+ this.people.forEach(p => {
if (p.sid != this.st.user.sid) //only sid is always set
doSend(code, obj, p.sid);
});
case "pollclients":
{
data.sockIds.forEach(sid => {
- this.players.push({sid:sid, id:0, name:""});
+ this.people.push({sid:sid, id:0, name:""});
// Ask identity, challenges and game(s)
this.st.conn.send(JSON.stringify({code:"askidentity", target:sid}));
this.st.conn.send(JSON.stringify({code:"askchallenge", target:sid}));
timeControl: c.timeControl
};
this.st.conn.send(JSON.stringify({code:"challenge",
- challenge:myChallenge, target:data.from}));
+ chall:myChallenge, target:data.from}));
}
break;
}
case "askgame":
{
// Send my current live game (if any)
- if (!!localStorage["gid"])
- {
- const myGame =
+ GameStorage.getCurrent((game) => {
+ if (!!game)
{
- // Minimal game informations: (fen+clock not required)
- id: localStorage["gid"],
- players: JSON.parse(localStorage["players"]), //array sid+id+name
- vname: localStorage["vname"],
- timeControl: localStorage["timeControl"],
- };
- this.st.conn.send(JSON.stringify({code:"game",
- game:myGame, target:data.from}));
- }
+ const myGame =
+ {
+ // Minimal game informations:
+ id: game.id,
+ players: game.players.map(p => p.name),
+ vname: game.vname,
+ timeControl: game.timeControl,
+ };
+ this.st.conn.send(JSON.stringify({code:"game",
+ game:myGame, target:data.from}));
+ }
+ });
break;
}
case "identity":
{
- const pIdx = this.players.findIndex(p => p.sid == data.user.sid);
- this.players[pIdx].id = data.user.id;
- this.players[pIdx].name = data.user.name;
+ const pIdx = this.people.findIndex(p => p.sid == data.user.sid);
+ this.people[pIdx].id = data.user.id;
+ this.people[pIdx].name = data.user.name;
break;
}
case "challenge":
// Receive challenge from some player (+sid)
let newChall = data.chall;
newChall.type = this.classifyObject(data.chall);
- const pIdx = this.players.findIndex(p => p.sid == data.from);
- newChall.from = this.players[pIdx]; //may be anonymous
- newChall.added = Date.now();
- newChall.vname = this.getVname(newChall.vid);
+ 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?
this.challenges.push(newChall);
break;
}
// NOTE: it may be correspondance (if newgame while we are connected)
let newGame = data.game;
newGame.type = this.classifyObject(data.game);
- newGame.vname = newGame.vname;
+ newGame.rid = data.from;
+ newGame.score = "*";
this.games.push(newGame);
break;
}
// Delete corresponding challenge:
ArrayFun.remove(this.challenges, c => c.id == data.cid);
// New game just started: data contain all informations
- this.newGame(data.gameInfo);
+ this.startNewGame(data.gameInfo);
break;
}
-// * - receive "accept/withdraw/cancel challenge": apply action to challenges list
+// * - receive "accept/cancel challenge": apply action to challenges list
// NOTE: challenge "socket" actions accept+withdraw only for live challenges
case "acceptchallenge":
{
// Someone accept an open (or targeted) challenge
const cIdx = this.challenges.findIndex(c => c.id == data.cid);
let c = this.challenges[cIdx];
- if (!c.seats)
- c.seats = [...Array(c.to.length)];
- const pIdx = this.players.findIndex(p => p.sid == data.from);
- // Put this player in the first empty seat we find:
- let sIdx = 0;
- for (; sIdx<c.seats.length; sIdx++)
- {
- if (!c.seats[sIdx])
- {
- c.seats[sIdx] = this.players[pIdx];
- break;
- }
- }
- if (sIdx == c.seats.length - 1)
- {
- // All seats are taken: game can start
- this.launchGame(c);
- }
- break;
- }
- case "withdrawchallenge":
- {
- const cIdx = this.challenges.findIndex(c => c.id == data.cid);
- let seats = this.challenges[cIdx].seats;
- const sIdx = seats.findIndex(s => s.sid == data.sid);
- seats[sIdx] = undefined;
+ const pIdx = this.people.findIndex(p => p.sid == data.from);
+ c.seat = this.people[pIdx];
+ this.launchGame(c);
break;
}
case "refusechallenge":
}
case "deletechallenge":
{
- console.log("receive delete");
+ // NOTE: the challenge may be already removed
ArrayFun.remove(this.challenges, c => c.id == data.cid);
break;
}
case "connect":
{
- this.players.push({name:"", id:0, sid:data.sid});
+ this.people.push({name:"", id:0, sid:data.sid});
this.st.conn.send(JSON.stringify({code:"askidentity", target:data.sid}));
this.st.conn.send(JSON.stringify({code:"askchallenge", target:data.sid}));
this.st.conn.send(JSON.stringify({code:"askgame", target:data.sid}));
}
case "disconnect":
{
- ArrayFun.remove(this.players, p => p.sid == data.sid);
+ ArrayFun.remove(this.people, p => p.sid == data.sid);
// Also remove all challenges sent by this player:
ArrayFun.remove(this.challenges, c => c.from.sid == data.sid);
// 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.sid
- || !this.players.some(pl => pl.sid == p.sid))), "all");
+ || !this.people.some(pl => pl.sid == p.sid))), "all");
break;
}
}
if (!!error)
return alert(error);
const ctype = this.classifyObject(this.newchallenge);
- const cto = this.newchallenge.to.slice(0, this.newchallenge.nbPlayers);
// NOTE: "from" information is not required here
let chall =
{
fen: this.newchallenge.fen,
- to: cto,
+ to: this.newchallenge.to,
timeControl: this.newchallenge.timeControl,
vid: this.newchallenge.vid,
};
const finishAddChallenge = (cid,warnDisconnected) => {
chall.id = cid || "c" + getRandString();
// Send challenge to peers (if connected)
- this.sendSomethingTo(cto, "challenge", {chall:chall}, !!warnDisconnected);
+ this.sendSomethingTo(chall.to, "challenge", {chall:chall}, !!warnDisconnected);
chall.added = Date.now();
chall.type = ctype;
chall.vname = vname;
chall.from = this.st.user;
this.challenges.push(chall);
+ localStorage.setItem("challenge", JSON.stringify(chall));
document.getElementById("modalNewgame").checked = false;
};
const cIdx = this.challenges.findIndex(
},
// * - accept challenge (corr or live) --> send info to challenge creator
// * - cancel challenge (click on sent challenge) --> send info to all concerned players
-// * - withdraw from challenge (if >= 3 players and previously accepted)
// * --> send info to challenge creator
// * - refuse challenge: send "refuse" to challenge sender, and "delete" to others
// * - prepare and start new game (if challenge is full after acceptation)
// * --> include challenge ID (so that opponents can delete the challenge too)
clickChallenge: function(c) {
-
+
+ console.log("click challenge");
console.log(c);
-
- if (!!c.accepted)
- {
- this.st.conn.send(JSON.stringify({code: "withdrawchallenge",
- cid: c.id, target: c.from.sid}));
- if (c.type == "corr")
- {
- ajax(
- "/challenges",
- "PUT",
- {action:"withdraw", id: this.challenges[cIdx].id}
- );
- }
- c.accepted = false;
- }
- else if (c.from.sid == this.st.user.sid
- || (this.st.user.id > 0 && c.from.id == this.st.user.id))
+
+ // In all cases, the challenge is consumed:
+ ArrayFun.remove(this.challenges, ch => ch.id == c.id);
+
+ if (c.from.sid == this.st.user.sid //live
+ || (this.st.user.id > 0 && c.from.id == this.st.user.id)) //corr
{
- console.log("send delete");
// It's my challenge: cancel it
this.sendSomethingTo(c.to, "deletechallenge", {cid:c.id});
- ArrayFun.remove(this.challenges, ch => ch.id == c.id);
if (c.type == "corr")
{
ajax(
else //accept (or refuse) a challenge
{
c.accepted = true;
- if (!!c.to[0])
+ if (!!c.to)
{
// TODO: if special FEN, show diagram after loading variant
c.accepted = confirm("Accept challenge?");
this.st.conn.send(JSON.stringify({
code: (c.accepted ? "accept" : "refuse") + "challenge",
cid: c.id, target: c.from.sid}));
- if (c.type == "corr" && c.accepted)
+ if (c.type == "corr")
{
ajax(
"/challenges",
- "PUT",
- {action: "accept", id: this.challenges[cIdx].id}
+ accepted ? "PUT" : "DELETE",
+ {id: this.challenges[cIdx].id}
);
}
- if (!c.accepted)
- {
- ArrayFun.remove(this.challenges, ch => ch.id == c.id);
- if (c.type == "corr")
- {
- ajax(
- "/challenges",
- "DELETE",
- {id: this.challenges[cIdx].id}
- );
- }
- }
}
},
// NOTE: for live games only (corr games are launched on server)
const vname = this.getVname(c.vid);
const vModule = await import("@/variants/" + vname + ".js");
window.V = vModule.VariantRules;
- let players = [c.from];
- Array.prototype.push.apply(players, c.seats);
- let gameInfo =
+ let players = [c.from, c.seat];
+ // These game informations will be sent to other players
+ const gameInfo =
{
+ gameId: getRandString(),
fen: c.fen || V.GenRandInitFen(),
- // Shuffle players order (white then black then other colors).
// Players' names may be required if game start when a player is offline
- players: shuffle(players).map(p => { return {name:p.name, sid:p.sid} }),
+ // Shuffle players order (white then black then other colors).
+ players: shuffle(players.map(p => { return {name:p.name, sid:p.sid} })),
vid: c.vid,
timeControl: c.timeControl,
};
- c.seats.forEach(s => {
- // NOTE: cid required to remove challenge
- this.st.conn.send(JSON.stringify({code:"newgame",
- gameInfo:gameInfo, cid:c.id, target:s.sid}));
- });
+ // NOTE: cid required to remove challenge
+ this.st.conn.send(JSON.stringify({code:"newgame",
+ gameInfo:gameInfo, cid:c.id, target:c.seat.sid}));
// Delete corresponding challenge:
ArrayFun.remove(this.challenges, ch => ch.id == c.id);
- this.newGame(gameInfo); //also!
+ this.startNewGame(gameInfo); //also!
},
// NOTE: for live games only (corr games are launched on server)
- newGame: function(gameInfo) {
- localStorage["gid"] = getRandString();
- // Extract times (in [milli]seconds), set clocks, store in localStorage
+ startNewGame: function(gameInfo) {
+ // Extract times (in [milli]seconds), set clocks
const tc = extractTime(gameInfo.timeControl);
- localStorage["timeControl"] = gameInfo.timeControl;
- localStorage["clocks"] = JSON.stringify(
- [...Array(gameInfo.players.length)].fill(tc.mainTime));
- localStorage["increment"] = tc.increment;
- localStorage["started"] = JSON.stringify(
- [...Array(gameInfo.players.length)].fill(false));
- localStorage["mysid"] = this.st.user.sid;
- localStorage["vname"] = this.getVname(gameInfo.vid);
- localStorage["fenInit"] = gameInfo.fen;
- localStorage["players"] = JSON.stringify(gameInfo.players);
+ let initime = [...Array(gameInfo.players.length)];
+ initime[0] = Date.now();
+ const game =
+ {
+ // Game infos: constant
+ gameId: gameInfo.gameId,
+ vname: this.getVname(gameInfo.vid),
+ fenStart: gameInfo.fen,
+ players: gameInfo.players,
+ timeControl: gameInfo.timeControl,
+ increment: tc.increment,
+ mode: "live", //function for live games only
+ // Game state: will be updated
+ fen: gameInfo.fen,
+ moves: [],
+ clocks: [...Array(gameInfo.players.length)].fill(tc.mainTime),
+ initime: initime,
+ score: "*",
+ };
+ GameStorage.add(game);
if (this.st.settings.sound >= 1)
new Audio("/sounds/newgame.mp3").play().catch(err => {});
+ // TODO: redirect to game
},
},
};
<style lang="sass">
// TODO
</style>
+
+<!--
+// TODO:
+// Remove duplicates if several players of one game send their game info (Hall)
+// When click on it, assign a random rid among online players (max. 4).
+-->
projects / vchess.git / blobdiff