X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fviews%2FGame.vue;h=ab6ae7a8b735b07c4475300e23b854f0509a3a56;hb=967a2686ea801d4b33129d78087651451ef1904b;hp=000035c69d7c038b85d858ae769a523e4972cfa4;hpb=b6c5641fbaa6b51088bf2fbf77e87fddd43c745f;p=vchess.git

diff --git a/client/src/views/Game.vue b/client/src/views/Game.vue
index 000035c6..ab6ae7a8 100644
--- a/client/src/views/Game.vue
+++ b/client/src/views/Game.vue
@@ -1,77 +1,79 @@
-<!-- TODO: component Game, + handle players + observers connect/disconnect
-  event = "gameconnect" ...etc
-  connect/disconnect with sid+name (ID not required); name slightly redundant but easier
-
-quand on arrive dans la partie, on poll les sids pour savoir qui est en ligne (ping)
-(éventuel échange lastate avec les connectés, pong ...etc)
-ensuite quand qqun se deco il suffit d'écouter "disconnect"
-pareil quand quelqu'un reco.
-(c'est assez rudimentaire et écoute trop de messages, mais dans un premier temps...)
-      // TODO: [in game] send move + elapsed time (in milliseconds); in case of "lastate" message too
--->
 <template lang="pug">
 .row
   .col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
-    //BaseGame(:variant="variant.name" @game-over=".....TODO")
-    //localStorage["score"] = score;
-
-
-    .button-group(v-if="mode!='analyze'")
+    input#modalAbort.modal(type="checkbox")
+    div(role="dialog" aria-labelledby="abortBoxTitle")
+      .card.smallpad.small-modal.text-center
+        label.modal-close(for="modalAbort")
+        h3#abortBoxTitle.section {{ st.tr["Terminate game?"] }}
+        button(@click="abortGame") {{ st.tr["Sorry I have to go"] }}
+        button(@click="abortGame") {{ st.tr["Game seems over"] }}
+        button(@click="abortGame") {{ st.tr["Game is too boring"] }}
+    BaseGame(:game="game" :vr="vr" ref="basegame"
+      @newmove="processMove" @gameover="gameOver")
+    .button-group(v-if="game.mode!='analyze' && game.score=='*'")
       button(@click="offerDraw") Draw
-      button(@click="abortGame") Abort
+      button(@click="() => abortGame()") Abort
       button(@click="resign") Resign
-    div(v-if="mode=='corr'")
-      textarea(v-show="score=='*' && vr.turn==mycolor" v-model="corrMsg")
+    div(v-if="game.mode=='corr'")
+      textarea(v-show="score=='*' && vr.turn==game.mycolor" v-model="corrMsg")
       div(v-show="cursor>=0") {{ moves[cursor].message }}
 </template>
 
 <script>
-// TODO: if I'm an observer and player(s) disconnect/reconnect, how to find me ?
-//      onClick :: ask full game to remote player, and register as an observer in game
-//      (use gameId to communicate)
-//      on landing on game :: if gameId not found locally, check remotely
-//      ==> il manque un param dans game : "remoteId"
-import Board from "@/components/Board.vue";
+import BaseGame from "@/components/BaseGame.vue";
 //import Chat from "@/components/Chat.vue";
 //import MoveList from "@/components/MoveList.vue";
 import { store } from "@/store";
+import { GameStorage } from "@/utils/gameStorage";
 
 export default {
   name: 'my-game',
   components: {
     BaseGame,
   },
-  // gameId: to find the game in storage (assumption: it exists)
-  // mode: "live" or "corr" (correspondance game), or "analyze"
-  // gameRef in URL hash (listen for changes)
-  props: ["gid","mode","variant"],
+  // gameRef: to find the game in (potentially remote) storage
   data: function() {
     return {
       st: store.state,
-      myname: store.state.user.name, //may be anonymous (thus no name)
-      opponents: {}, //filled later (potentially 2 or 3 opponents)
-      drawOfferSent: false, //did I just ask for draw?
-      people: [], //observers
+      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: use for button style)
+      people: [ ], //potential observers (TODO)
     };
   },
   watch: {
-    gid: function() {
-      this.launchGame();
+    '$route' (to, from) {
+      if (!!to.params["id"])
+      {
+        this.gameRef.id = to.params["id"];
+        this.gameRef.rid = to.query["rid"];
+        this.loadGame();
+      }
     },
   },
-  // Modal end of game, and then sub-components
   created: function() {
-    if (!!this.gid)
-      this.launchGame();
-    // TODO: if I'm one of the players in game, then:
-    // Send ping to server (answer pong if opponent[s] is connected)
-    if (true && !!this.conn && !!this.gameRef)
+    if (!!this.$route.params["id"])
     {
-      this.conn.onopen = () => {
-        this.conn.send(JSON.stringify({
-          code:"ping",oppid:this.oppid,gameId:this.gameRef.id}));
-      };
+      this.gameRef.id = this.$route.params["id"];
+      this.gameRef.rid = this.$route.query["rid"];
+      this.loadGame();
     }
+    // TODO: how to know who is observing ? Send message to everyone with game ID ?
+    // and then just listen to (dis)connect events
+    // server always send "connect on " + URL ; then add to observers if game...
+    // detect multiple tabs connected (when connect ask server if my SID is already in use)
+// router when access a game page tell to server I joined + game ID (no need rid)
+// and ask server for current joined (= observers)
+// when send to chat (or a move), reach only this group (send gid along)
+    // --> doivent être enregistrés comme observers au niveau du serveur...
+    // non: poll users + events startObserving / stopObserving
+    // (à faire au niveau du routeur ?)
+
     // TODO: also handle "draw accepted" (use opponents array?)
     // --> must give this info also when sending lastState...
     // and, if all players agree then OK draw (end game ...etc)
@@ -80,17 +82,19 @@ export default {
       let L = undefined;
       switch (data.code)
       {
-        case "newmove": //..he played!
-          this.play(data.move, this.variant.name!="Dark" ? "animate" : null);
+        case "newmove":
+          // NOTE: next call will trigger processMove()
+          this.$refs["basegame"].play(data.move,
+            "receive", 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)
-            break; //games IDs don't match: definitely over...
+            break; //games IDs don't match: the game is definitely over...
           this.oppConnected = true;
           // 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,
@@ -99,7 +103,8 @@ export default {
             }));
           });
           break;
-        // TODO: refactor this, because at 3 or 4 players we may have missed 2 or 3 moves (not just one)
+        // TODO: refactor this, because at 3 or 4 players we may have missed 2 or 3 moves
+        // TODO: need to send along clock state (my current time) with my last move
         case "lastate": //got opponent infos about last move
           L = this.vr.moves.length;
           if (this.gameRef.id != data.gameId)
@@ -108,7 +113,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,
@@ -120,7 +125,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,
@@ -129,11 +134,21 @@ export default {
             }));
           }
           else if (data.movesCount > L) //just got last move from him
-            this.play(data.lastMove, "animate");
+            this.play(data.lastMove, "animate"); //TODO: wrong call (3 args)
+          break;
+        case "resign":
+          this.$refs["basegame"].endGame(
+            this.game.mycolor=="w" ? "1-0" : "0-1", "Resign");
+          break;
+        case "timeover":
+          this.$refs["basegame"].endGame(
+            this.game.mycolor=="w" ? "1-0" : "0-1", "Time");
           break;
-        case "resign": //..you won!
-          this.endGame(this.mycolor=="w"?"1-0":"0-1");
+        case "abort":
+          this.$refs["basegame"].endGame("?", "Abort: " + data.msg);
           break;
+        // TODO: drawaccepted (click draw button before sending move ==> draw offer in move)
+          // ==> on "newmove", check "drawOffer" field
         // TODO: also use (dis)connect info to count online players?
         case "gameconnect":
         case "gamedisconnect":
@@ -156,14 +171,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.
@@ -183,7 +195,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;
             }
@@ -197,46 +209,148 @@ export default {
       // TODO: ignore if preventDrawOffer is set; otherwise show modal box with option "prevent future offers"
       // if accept: send message "draw"
     },
-    abortGame: function() {
-      if (!confirm("Abort the game?"))
+    abortGame: function(event) {
+      if (!event)
+      {
+        // First call show options:
+        let modalBox = document.getElementById("modalAbort");
+        modalBox.checked = true;
+      }
+      else
+      {
+        console.log(event);
         return;
-      //+ bouton "abort" avec score == "?" + demander confirmation pour toutes ces actions,
-      //send message: "gameOver" avec score "?"
+        //const message = event.
+        // Next line will trigger a "gameover" event, bubbling up till here
+        this.$refs["basegame"].endGame("?");
+        this.game.players.forEach(p => {
+          if (!!p.sid && p.sid != this.st.user.sid)
+          {
+            this.st.conn.send(JSON.stringify({
+              code: "abort",
+              msg: message,
+              target: p.sid,
+            }));
+          }
+        });
+      }
     },
     resign: function(e) {
       if (!confirm("Resign the game?"))
         return;
-      if (this.mode == "human" && this.oppConnected(this.oppid))
-      {
-        try {
-          this.conn.send(JSON.stringify({code: "resign", oppid: this.oppid}));
-        } catch (INVALID_STATE_ERR) {
-          return;
+      this.game.players.forEach(p => {
+        if (!!p.sid && p.sid != this.st.user.sid)
+        {
+          this.st.conn.send(JSON.stringify({
+            code: "resign",
+            target: p.sid,
+          }));
         }
-      }
-      this.endGame(this.mycolor=="w"?"0-1":"1-0");
+      });
+      // Next line will trigger a "gameover" event, bubbling up till here
+      this.$refs["basegame"].endGame(this.game.mycolor=="w" ? "0-1" : "1-0");
     },
-    launchGame: async function() {
-      const vModule = await import("@/variants/" + this.variant.name + ".js");
-      window.V = vModule.VariantRules;
-      this.loadGame(this.gid);
+    // 3 cases for loading a game:
+    //  - from indexedDB (running or completed live game I play)
+    //  - from server (one correspondance game I play[ed] or not)
+    //  - from remote peer (one live game I don't play, finished or not)
+    loadGame: function(game) {
+      const afterRetrieval = async (game) => {
+        const vModule = await import("@/variants/" + game.vname + ".js");
+        window.V = vModule.VariantRules;
+        this.vr = new V(game.fenStart);
+        this.game = Object.assign({},
+          game,
+          // NOTE: assign mycolor here, since BaseGame could also bs VS computer
+          {mycolor: [undefined,"w","b"][1 + game.players.findIndex(
+            p => p.sid == this.st.user.sid)]},
+        );
+      };
+      if (!!game)
+        return afterRetrival(game);
+      if (!!this.gameRef.rid)
+      {
+        // TODO: just send a game request message to the remote player,
+        // and when receiving answer just call loadGame(received_game)
+        // + remote peer should have registered us as an observer
+        // (send moves updates + resign/abort/draw actions)
+        return;
+      }
+      else
+      {
+        GameStorage.get(this.gameRef.id, async (game) => {
+          afterRetrieval(game);
+        });
+      }
+//    // 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))
+//    {
+//      this.game.players.forEach(p => {
+//        if (p.sid != this.st.user.sid)
+//          this.st.conn.send(JSON.stringify({code:"ping", oppid:p.sid}));
+//      });
+//    }
     },
-    loadGame: function(gid) {
-      // TODO: ask game to remote peer if this.remoteId is set
-      // (or just if game not found locally)
-      // NOTE: if it's a corr game, ask it from server
-      const game = getGameFromStorage(gid); //, this.gameRef.uid); //uid may be blank
-      this.opponent.id = game.oppid; //opponent ID in case of running HH game
-      this.opponent.name = game.oppname; //maye be blank (if anonymous)
-      this.score = game.score;
-      this.mycolor = game.mycolor;
-      this.fenStart = game.fenStart;
-      this.moves = game.moves;
-      this.cursor = game.moves.length-1;
-      this.lastMove = (game.moves.length > 0 ? game.moves[this.cursor] : null);
+    // TODO: refactor this old "oppConnected" logic
+//    oppConnected: function(uid) {
+//      return this.opponents.some(o => o.id == uid && o.online);
+//    },
+    // Post-process a move (which was just played)
+    processMove: function(move) {
+      if (!this.game.mycolor)
+        return; //I'm just an observer
+      // Update storage (corr or live)
+      const colorIdx = ["w","b","g","r"].indexOf(move.color);
+      // https://stackoverflow.com/a/38750895
+      const allowed_fields = ["appear", "vanish", "start", "end"];
+      const filtered_move = Object.keys(move)
+        .filter(key => allowed_fields.includes(key))
+        .reduce((obj, key) => {
+          obj[key] = move[key];
+          return obj;
+        }, {});
+      // Send move ("newmove" event) to opponent(s) (if ours)
+      // (otherwise move.elapsed is supposed to be already transmitted)
+      let addTime = undefined;
+      if (move.color == this.game.mycolor)
+      {
+        const elapsed = Date.now() - this.game.initime;
+        this.game.players.forEach(p => {
+          if (p.sid != this.st.user.sid)
+          {
+            this.st.conn.send(JSON.stringify({
+              code: "newmove",
+              target: p.sid,
+              move: Object.assign({}, filtered_move, {elapsed: elapsed}),
+            }));
+          }
+        });
+        move.elapsed = elapsed;
+        // elapsed time is measured in milliseconds
+        addTime = this.game.increment - elapsed/1000;
+      }
+      const myTurnNow = (this.vr.turn == this.game.mycolor);
+      GameStorage.update(this.gameRef.id,
+      {
+        colorIdx: colorIdx,
+        move: filtered_move,
+        fen: move.fen,
+        addTime: addTime,
+        initime: myTurnNow,
+      });
+      // Also update current game object:
+      this.game.moves.push(move);
+      this.game.fen = move.fen;
+      this.game.clocks[colorIdx] += (!!addTime ? addTime : 0);
+      this.game.initime = (myTurnNow ? Date.now() : undefined);
     },
-    oppConnected: function(uid) {
-      return this.opponents.any(o => o.id == uidi && o.online);
+    // TODO: this update function should also work for corr games
+    gameOver: function(score) {
+      this.game.mode = "analyze";
+      GameStorage.update({
+        score: score,
+      });
     },
   },
 };