// TODO: myname, opppnents (optional, different style), people
// --> also show messages like "X offers draw ?" (probably not)
-
-
-myname: localStorage["username"] || "anonymous",
- oppName: "anonymous", //opponent name, revealed after a game (if provided)
+// myname: localStorage["username"] || "anonymous",
+Vue.component("my-chat", {
+ props: ["conn","myname","opponents","people"],
+ data: function() {
+ return {
chats: [], //chat messages after human game
-
-
-
- let chatEltsArray =
- [
- h('label',
- {
- attrs: { "id": "close-chat", "for": "modal-chat" },
- "class": { "modal-close": true },
- }
- ),
- h('h3',
- {
- attrs: { "id": "titleChat" },
- "class": { "section": true },
- domProps: { innerHTML: translations["Chat with "] + this.oppName },
- }
- )
- ];
- for (let chat of this.chats)
- {
- chatEltsArray.push(
- h('p',
- {
- "class": {
- "my-chatmsg": chat.author==this.myid,
- "opp-chatmsg": chat.author==this.oppid,
- },
- domProps: { innerHTML: chat.msg }
- }
- )
- );
- }
- chatEltsArray = chatEltsArray.concat([
- h('input',
- {
- attrs: {
- "id": "input-chat",
- type: "text",
- placeholder: translations["Type here"],
- },
- on: { keyup: this.trySendChat }, //if key is 'enter'
- }
- ),
- h('button',
- {
- attrs: { id: "sendChatBtn"},
- on: { click: this.sendChat },
- domProps: { innerHTML: translations["Send"] },
- }
- )
- ]);
- const modalChat = [
- h('input',
- {
- attrs: { "id": "modal-chat", type: "checkbox" },
- "class": { "modal": true },
- }),
- h('div',
- {
- attrs: { "role": "dialog", "aria-labelledby": "titleChat" },
- },
- [
- h('div',
- {
- "class": { "card": true, "smallpad": true },
- },
- chatEltsArray
- )
- ]
- )
- ];
- elementArray = elementArray.concat(modalChat);
-
-
+ };
+ },
+ // TODO: Chat modal sur petit écran, dans la page pour grand écran
+ template: `
+ <div>
+ <input id="modal-chat" type="checkbox" class="modal">
+ <div role="dialog" aria-labelledby="titleChat">
+ <div class="card smallpad">
+ <label id="close-chat" for="modal-chat" class="modal-close"></label>
+ <h3 v-if="!!opponents" id="titleChat" class="section">
+ <span>{{ translate("Chat with ") }}</span>
+ <span v-for="o in opponents">{{ o.name }}</span>
+ </h3>
+ <p v-for="chat in chats" :class={
+ "my-chatmsg": "chat.uid==user.id",
+ "opp-chatmsg": "opponents.any(o => o.id == chat.uid)"}
+ >
+ {{ chat.msg }}
+ </p>
+ <input id="input-chat" type="text" placeholder="translate('Type here')"
+ @keyup.enter="sendChat"/>
+ <button id="sendChatBtn" @click="sendChat">{{ translate("Send") }}</button>
+ </div>
+ </div>
+ </div>
+ `,
+ created: function() {
+ const socketMessageListener = msg => {
+ const data = JSON.parse(msg.data);
+ switch (data.code)
+ {
case "newchat":
- // Receive new chat
+ // TODO: new chat just arrived: data contain all informations
+ // (uid, name, message; no need for timestamp, we can use local time here)
this.chats.push({msg:data.msg, author:this.oppid});
break;
- case "oppname":
- // Receive opponent's name
- this.oppName = data.name;
+ // TODO: distinguish these (dis)connect events from their analogs in game.js
+ // TODO: implement and harmonize: opponents and people are arrays, not objects ?!
+ case "connect":
+ this.players.push({name:data.name, id:data.uid});
break;
-
-
- // TODO: complete this component
- trySendChat: function(e) {
- if (e.keyCode == 13) //'enter' key
- this.sendChat();
- },
+ case "disconnect":
+ const pIdx = this.players.findIndex(p => p.id == data.uid);
+ this.players.splice(pIdx);
+ break;
+ }
+ };
+ const socketCloseListener = () => {
+ this.conn.addEventListener('message', socketMessageListener);
+ this.conn.addEventListener('close', socketCloseListener);
+ };
+ this.conn.onmessage = socketMessageListener;
+ this.conn.onclose = socketCloseListener;
+ },
+ methods: {
+ // TODO: complete this component
sendChat: function() {
let chatInput = document.getElementById("input-chat");
const chatTxt = chatInput.value;
this.conn.send(JSON.stringify({
code:"newchat", oppid: this.oppid, msg: chatTxt}));
},
- startChat: function(e) {
- this.getRidOfTooltip(e.currentTarget);
- document.getElementById("modal-chat").checked = true;
- },
-
+// startChat: function(e) {
+// document.getElementById("modal-chat").checked = true;
+// },
+ },
+});
-// TODO: main playing hall, chat + online players + current challenges + button "new game"
-/*
-input#modal-newgame.modal(type="checkbox")
-div(role="dialog" aria-labelledby="newGameTxt")
- .card.smallpad.small-modal
- label#close-newgame.modal-close(for="modal-newgame")
- h3#newGameTxt= translations["New game"]
- p= translations["Waiting for opponent..."]
-*/
+// main playing hall: chat + online players + current challenges + button "new game"
// TODO: my-challenge-list, gérant clicks sur challenges, affichage, réception/émission des infos sur challenges ; de même, my-player-list
// TODO: si on est en train de jouer une partie, le notifier aux nouveaux connectés
/*
-Players + challenges : == "room" home of variant (surligner si nouveau défi perso et pas affichage courant)
-joueurs en ligne (dte),
-Nouvelle partie + défis en temps réel + parties en cours (milieu, tabs),
-chat général (gauche, activé ou non (bool global storage)).
+TODO: surligner si nouveau défi perso et pas affichage courant
(cadences base + incrément, corr == incr >= 1jour ou base >= 7j)
---> correspondance: stocker sur serveur lastMove + peerId + color + movesCount + gameId + variant + timeleft
-quand je poste un lastMove corr, supprimer mon ancien lastMove le cas échéant (tlm l'a eu)
-fin de partie corr: garder maxi nbPlayers lastMove sur serveur, pendant 7 jours (arbitraire)
+--> correspondance: stocker sur serveur lastMove + uid + color + movesCount + gameId + variant + timeleft
+fin de partie corr: supprimer partie du serveur au bout de 7 jours (arbitraire)
+main time should be positive (no 0+2 & cie...)
*/
// TODO: au moins l'échange des coups en P2P ?
+// TODO: objet game, objet challenge ? et player ?
Vue.component('my-room', {
props: ["conn","settings"],
data: {
- remoteGames: [],
+ gdisplay: "live",
+ liveGames: [],
corrGames: [],
+ players: [], //online players
+ challenges: [], //live challenges
},
// Modal new game, and then sub-components
template: `
</h3>
<input id="input-fen" type="text"/>
<p>TODO: cadence, adversaire (pre-filled if click on name)</p>
- <p>Note: leave FEN blank for random</p>
+ <p>cadence 2m+12s ou 7d+1d (m,s ou d,d) --> main, increment</p>
+ <p>Note: leave FEN blank for random; FEN only for targeted challenge</p>
<button @click="newGame">Launch game</button>
</div>
</div>
<div>
<my-chat :conn="conn" :myname="myname" :people="people"></my-chat>
- <my-challenge-list :conn="conn"></my-challenge-list>
+ <my-challenge-list :challenges="challenges" @click-challenge="clickChallenge">
+ </my-challenge-list>
</div>
+ <button onClick="doClick('modalNewgame')">New game</button>
<div>
- <my-player-list :conn="conn"></my-player-list>
- // TODO: also corr games (of pther players)
- // presentation ? table ?!
- <my-game-summary v-for="g in remoteGames"
- v-bind:vobj="g" v-bind:game="g" v-bind:key="g.id"
- @click="() => showGame(g.id,g.uid)">
- </my-game-summary>
+ <div>
+ <div v-for="p in players" @click="challenge(p)">
+ {{ p.name }}
+ </div>
+ </div>
+ <div class="button-group">
+ <button @click="gdisplay='live'>Live games</button>
+ <button @click="gdisplay='corr'>Correspondance games</button>
+ </div>
+ <my-game-list v-show="display=='live'" :games="liveGames" @show-game="showGame">
+ </my-game-list>
+ <my-game-list v-show="display=='corr'" :games="corrGames" @show-game="showGame">
+ </my-game-list>
</div>
</div>
`,
created: function() {
- // TODO: ask server for current corr games (all but mines)
+ // TODO: ask server for current corr games (all but mines: names, ID, time control)
const socketMessageListener = msg => {
const data = JSON.parse(msg.data);
switch (data.code)
{
- // TODO: also receive remote games summaries (update)
+ case "newgame":
+ // TODO: new game just started: data contain all informations
+ // (id, players, time control, fenStart ...)
+ break;
+ // TODO: also receive live games summaries (update)
// (just players names, time control, and ID + player ID)
- case "newgame": //challenge accepted
+ case "acceptchallenge":
// oppid: opponent socket ID (or DB id if registered)
- this.newGame("human", data.fen, data.color, data.oppid, data.gameid);
+ if (true) //TODO: if challenge is full
+ this.newGame(data.challenge, data.user); //user.id et user.name
+ break;
+ case "withdrawchallenge":
+ // TODO
+ break;
+ case "cancelchallenge":
+ // TODO
+ break;
+ // TODO: distinguish these (dis)connect events from their analogs in game.js
+ case "connect":
+ this.players.push({name:data.name, id:data.uid});
+ break;
+ case "disconnect":
+ const pIdx = this.players.findIndex(p => p.id == data.uid);
+ this.players.splice(pIdx);
break;
}
};
this.conn.onclose = socketCloseListener;
},
methods: {
- clickGameSeek: function(e) {
- if (this.mode == "human" && this.score == "*")
- return; //no newgame while playing
- if (this.seek)
+ showGame: function(game) {
+ let hash = "#game?id=" + game.id;
+ if (!!game.uid)
+ hash += "&uid=" + game.uid;
+ location.hash = hash;
+ },
+ challenge: function(player) {
+ this.conn.send(JSON.stringify({code:"sendchallenge", oppid:p.id,
+ user:{name:user.name,id:user.id}));
+ },
+ clickChallenge: function(challenge) {
+ const index = this.challenges.findIndex(c => c.id == challenge.id);
+ const toIdx = challenge.to.findIndex(p => p.id == user.id);
+ const me = {name:user.name,id:user.id};
+ if (toIdx >= 0)
{
- this.conn.send(JSON.stringify({code:"cancelnewgame"}));
- this.seek = false;
+ // It's a multiplayer challenge I accepted: withdraw
+ this.conn.send(JSON.stringify({code:"withdrawchallenge",
+ cid:challenge.id, user:me}));
+ this.challenges.to.splice(toIdx, 1);
}
- else
- this.newGame("human");
- },
- newGame: function(mode, fenInit, color, oppId, gameId) {
- const fen = fenInit || VariantRules.GenRandInitFen();
- console.log(fen); //DEBUG
- if (mode=="human" && !oppId)
+ else if (challenge.from.id == user.id) //it's my challenge: cancel it
{
- const storageVariant = localStorage.getItem("variant");
- if (!!storageVariant && storageVariant !== variant.name
- && localStorage["score"] == "*")
- {
- return alert(translations["Finish your "] +
- storageVariant + translations[" game first!"]);
- }
- // Send game request and wait..
- try {
- this.conn.send(JSON.stringify({code:"newgame", fen:fen, gameid: getRandString() }));
- } catch (INVALID_STATE_ERR) {
- return; //nothing achieved
- }
- this.seek = true;
- let modalBox = document.getElementById("modal-newgame");
- modalBox.checked = true;
- setTimeout(() => { modalBox.checked = false; }, 2000);
- return;
+ this.conn.send(JSON.stringify({code:"cancelchallenge", cid:challenge.id}));
+ this.challenges.splice(index, 1);
}
- this.vr = new VariantRules(fen, []);
- this.score = "*";
- this.pgnTxt = ""; //redundant with this.score = "*", but cleaner
- this.mode = mode;
- this.incheck = [];
- this.fenStart = V.ParseFen(fen).position; //this is enough
- if (mode=="human")
+ else //accept a challenge
{
- // Opponent found!
- this.gameId = gameId;
- this.oppid = oppId;
- this.oppConnected = true;
- this.mycolor = color;
- this.seek = false;
- if (this.sound >= 1)
- new Audio("/sounds/newgame.mp3").play().catch(err => {});
- document.getElementById("modal-newgame").checked = false;
+ this.conn.send(JSON.stringify({code:"acceptchallenge",
+ cid:challenge.id, user:me}));
+ this.challenges[index].to.push(me);
}
- this.setStorage(); //store game state in case of interruptions
},
- continueGame: function() {
- this.oppid = localStorage.getItem("oppid");
- this.mycolor = localStorage.getItem("mycolor");
- const moves = JSON.parse(localStorage.getItem("moves"));
- const fen = localStorage.getItem("fen");
- const score = localStorage.getItem("score"); //always "*" ?!
- this.fenStart = localStorage.getItem("fenStart");
- this.vr = new VariantRules(fen);
- this.incheck = this.vr.getCheckSquares(this.vr.turn);
- this.gameId = localStorage.getItem("gameId");
- // Send ping to server (answer pong if opponent is connected)
- this.conn.send(JSON.stringify({
- code:"ping",oppid:this.oppid,gameId:this.gameId}));
+ // user: last person to accept the challenge
+ newGame: function(chall, user) {
+ const fen = chall.fen || VariantRules.GenRandInitFen();
+ const game = {}; //TODO: fen, players, time ...
+ //setStorage(game); //TODO
+ game.players.forEach(p => {
+ this.conn.send(JSON.stringify({code:"newgame", oppid:p.id, game:game});
+ });
+ if (this.settings.sound >= 1)
+ new Audio("/sounds/newgame.mp3").play().catch(err => {});
},
},
});
projects / vchess.git / commitdiff
