X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fviews%2FGame.vue;h=dd04b8698e6b9a049ca2291a5a194ab011a379a7;hb=2c4ea524d5acf3793e6f1283f888e4ed4e767644;hp=c60b17c741b744d0099a6402391292943435028b;hpb=4fe5664d48e37cf7e0de7562e8e76e8698b0ea74;p=vchess.git diff --git a/client/src/views/Game.vue b/client/src/views/Game.vue index c60b17c7..dd04b869 100644 --- a/client/src/views/Game.vue +++ b/client/src/views/Game.vue @@ -16,14 +16,13 @@ pareil quand quelqu'un reco. @@ -40,23 +39,19 @@ export default { BaseGame, }, // gameRef: to find the game in (potentially remote) storage - // mode: "live" or "corr" (correspondance game), or "analyze" data: function() { return { st: store.state, - gameRef: {id: "", rid: ""}, //given in URL (rid = remote ID) - gameInfo: {}, //passed to BaseGame - vr: null, //TODO - vname: "", //obtained from gameInfo (slightly redundant..) + gameRef: { //given in URL (rid = remote ID) + id: "", + rid: "" + }, + game: { }, //passed to BaseGame + vr: null, //"variant rules" object initialized from FEN drawOfferSent: false, //did I just ask for draw? (TODO: draw variables?) - people: [], //potential observers (TODO) + people: [ ], //potential observers (TODO) }; }, - computed: { - analyze: function() { - return this.mode == "analyze"; - }, - }, watch: { '$route' (to, from) { if (!!to.params["id"]) @@ -100,7 +95,7 @@ export default { // TODO: observer on dark games must see all board ? Or alternate ? (seems better) // ...or just see nothing as on buho21 this.$refs["basegame"].play( - data.move, this.vname!="Dark" ? "animate" : null); + data.move, this.game.vname!="Dark" ? "animate" : null); break; case "pong": //received if we sent a ping (game still alive on our side) if (this.gameRef.id != data.gameId) @@ -109,7 +104,7 @@ export default { // Send our "last state" informations to opponent(s) L = this.vr.moves.length; Object.keys(this.opponents).forEach(oid => { - this.conn.send(JSON.stringify({ + this.st.conn.send(JSON.stringify({ code: "lastate", oppid: oid, gameId: this.gameRef.id, @@ -127,7 +122,7 @@ export default { if (this.score != "*") { // We finished the game (any result possible) - this.conn.send(JSON.stringify({ + this.st.conn.send(JSON.stringify({ code: "lastate", oppid: data.oppid, gameId: this.gameRef.id, @@ -139,7 +134,7 @@ export default { else if (data.movesCount < L) { // We must tell last move to opponent - this.conn.send(JSON.stringify({ + this.st.conn.send(JSON.stringify({ code: "lastate", oppid: this.opponent.id, gameId: this.gameRef.id, @@ -151,7 +146,7 @@ export default { this.play(data.lastMove, "animate"); break; case "resign": //..you won! - this.endGame(this.mycolor=="w"?"1-0":"0-1"); + this.endGame(this.game.mycolor=="w"?"1-0":"0-1"); break; // TODO: also use (dis)connect info to count online players? case "gameconnect": @@ -175,14 +170,11 @@ export default { } }; const socketCloseListener = () => { - this.conn.addEventListener('message', socketMessageListener); - this.conn.addEventListener('close', socketCloseListener); + this.st.conn.addEventListener('message', socketMessageListener); + this.st.conn.addEventListener('close', socketCloseListener); }; - if (!!this.conn) - { - this.conn.onmessage = socketMessageListener; - this.conn.onclose = socketCloseListener; - } + this.st.conn.onmessage = socketMessageListener; + this.st.conn.onclose = socketCloseListener; }, // dans variant.js (plutôt room.js) conn gère aussi les challenges // et les chats dans chat.js. Puis en webRTC, repenser tout ça. @@ -202,7 +194,7 @@ export default { if (!!o.online) { try { - this.conn.send(JSON.stringify({code: "draw", oppid: o.id})); + this.st.conn.send(JSON.stringify({code: "draw", oppid: o.id})); } catch (INVALID_STATE_ERR) { return; } @@ -221,6 +213,7 @@ export default { return; //+ bouton "abort" avec score == "?" + demander confirmation pour toutes ces actions, //send message: "gameOver" avec score "?" + // ==> BaseGame must listen to game.score change, and call "endgame(score)" in this case }, resign: function(e) { if (!confirm("Resign the game?")) @@ -228,7 +221,7 @@ export default { if (this.mode == "human" && this.oppConnected(this.oppid)) { try { - this.conn.send(JSON.stringify({code: "resign", oppid: this.oppid})); + this.st.conn.send(JSON.stringify({code: "resign", oppid: this.oppid})); } catch (INVALID_STATE_ERR) { return; } @@ -240,13 +233,17 @@ export default { // - from indexedDB (one completed live game) // - from server (one correspondance game I play[ed] or not) // - from remote peer (one live game I don't play, finished or not) - loadGame: async function() { - this.gameInfo = GameStorage.get(this.gameRef); - this.vname = this.gameInfo.vname; - const vModule = await import("@/variants/" + this.vname + ".js"); - window.V = vModule.VariantRules; - this.vr = new V(this.gameInfo.fen); - + loadGame: function() { + GameStorage.get(this.gameRef, async (game) => { + this.game = Object.assign({}, + game, + // NOTE: assign mycolor here, since BaseGame could also bs VS computer + {mycolor: ["w","b"][game.players.findIndex(p => p.sid == this.st.user.sid)]}, + ); + const vModule = await import("@/variants/" + game.vname + ".js"); + window.V = vModule.VariantRules; + this.vr = new V(game.fen); + }); // // Poll all players except me (if I'm playing) to know online status. // // --> Send ping to server (answer pong if players[s] are connected) // if (this.gameInfo.players.some(p => p.sid == this.st.user.sid)) @@ -260,6 +257,12 @@ export default { oppConnected: function(uid) { return this.opponents.some(o => o.id == uid && o.online); }, + processMove: function(move) { + // TODO: process some opponent's move + + // update storage (corr or live), send move to opponent (if ours) / + // notify BaseGame if opponents move (how ?) --> need a game.newmove field ? + }, }, };