X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fviews%2FGame.vue;h=96c711b6d956aa2c0d323690ab93a64a458edfa5;hb=9aa229f3fbc99657d1ce45e5deaf9643b24c58ea;hp=7aa7aa5f4c0d46d45376717d921faf2278593ca1;hpb=6ec161b904b068b0f07defce45dba936933f4a1b;p=vchess.git

diff --git a/client/src/views/Game.vue b/client/src/views/Game.vue
index 7aa7aa5f..96c711b6 100644
--- a/client/src/views/Game.vue
+++ b/client/src/views/Game.vue
@@ -1,38 +1,44 @@
-<!-- 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
-// 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"
--->
 <template lang="pug">
 .row
   .col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
+    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'")
+    // TODO: show players names + clocks state
+    div Time: {{ virtualClocks[0] }} - {{ virtualClocks[1] }}
+    .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="game.mode=='corr'")
       textarea(v-show="score=='*' && vr.turn==game.mycolor" v-model="corrMsg")
       div(v-show="cursor>=0") {{ moves[cursor].message }}
 </template>
 
+<!--
+// TODO: movelist dans basegame et chat ici
+// se limiter à 2 joueurs pour l'instant au moins tout en restant général
+// ==> après, implémenter/vérifier les passages de challenges + parties en cours
+// observer,
+// + problèmes, habiller et publier. (+ corr...)
+
+// refactor players.forEach(...) into sendTo(opponent, ...)
+-->
+
 <script>
 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/storage";
+import { GameStorage } from "@/utils/gameStorage";
+import { ppt } from "@/utils/datetime";
 
 export default {
   name: 'my-game',
@@ -48,8 +54,9 @@ export default {
         rid: ""
       },
       game: { }, //passed to BaseGame
+      virtualClocks: [0, 0], //initialized with true game.clocks
       vr: null, //"variant rules" object initialized from FEN
-      drawOfferSent: false, //did I just ask for draw? (TODO: draw variables?)
+      drawOfferSent: false, //did I just ask for draw? (TODO: use for button style)
       people: [ ], //potential observers (TODO)
     };
   },
@@ -62,6 +69,39 @@ export default {
         this.loadGame();
       }
     },
+    "game.clocks": function(newState) {
+      this.virtualClocks = newState.map(s => ppt(s));
+      const currentTurn = this.vr.turn;
+      const colorIdx = ["w","b","g","r"].indexOf(currentTurn);
+      let countdown = newState[colorIdx] -
+        (Date.now() - this.game.initime[colorIdx])/1000;
+      const myTurn = (currentTurn == this.game.mycolor);
+      let clockUpdate = setInterval(() => {
+        if (countdown <= 0 || this.vr.turn != currentTurn)
+        {
+          clearInterval(clockUpdate);
+          if (countdown <= 0 && myTurn)
+          {
+            this.$refs["basegame"].endGame(
+              this.game.mycolor=="w" ? "0-1" : "1-0", "Time");
+            this.game.players.forEach(p => {
+              if (p.sid != this.st.user.sid)
+              {
+                this.st.conn.send(JSON.stringify({
+                  code: "timeover",
+                  target: p.sid,
+                }));
+              }
+            });
+          }
+        }
+        else
+        {
+          // TODO: with Vue 3, just do this.virtualClocks[colorIdx] = ppt(--countdown)
+          this.$set(this.virtualClocks, colorIdx, ppt(Math.max(0, --countdown)));
+        }
+      }, 1000);
+    },
   },
   created: function() {
     if (!!this.$route.params["id"])
@@ -72,19 +112,15 @@ export default {
     }
     // 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)
@@ -94,11 +130,9 @@ export default {
       switch (data.code)
       {
         case "newmove":
-          // 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.game.vname!="Dark" ? "animate" : null); //TODO: arg to know if opponent move (or comp) in case of dark variant...
-          this.processMove(data.move);
+          // 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)
@@ -117,6 +151,7 @@ export default {
           });
           break;
         // 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)
@@ -146,11 +181,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": //..you won!
-          this.endGame(this.game.mycolor=="w"?"1-0":"0-1");
+        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 "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":
@@ -211,51 +256,79 @@ 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?"))
-        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
+    abortGame: function(event) {
+      let modalBox = document.getElementById("modalAbort");
+      if (!event)
+      {
+        // First call show options:
+        modalBox.checked = true;
+      }
+      else
+      {
+        modalBox.checked = false; //decision made: box disappear
+        const message = event.target.innerText;
+        // Next line will trigger a "gameover" event, bubbling up till here
+        this.$refs["basegame"].endGame("?", "Abort: " + message);
+        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.st.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", "Resign");
     },
-    // 4 cases for loading a game:
-    //  - from localStorage (one running game I play)
-    //  - from indexedDB (one completed live game)
+    // 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() {
-      GameStorage.get(this.gameRef, async (game) => {
+    loadGame: function(game) {
+      const afterRetrieval = async (game) => {
+        const vModule = await import("@/variants/" + game.vname + ".js");
+        window.V = vModule.VariantRules;
+        this.vr = new V(game.fen);
         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)]},
         );
-        const vModule = await import("@/variants/" + game.vname + ".js");
-        window.V = vModule.VariantRules;
-        this.vr = new V(game.fen);
-        // Post-processing: decorate each move with current FEN:
-        // (to be able to jump to any position quickly)
-        game.moves.forEach(move => {
-          move.color = this.vr.turn;
-          vr.play(move);
-          move.fen = this.vr.getFen();
+      };
+      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);
         });
-        this.vr.re_init(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))
@@ -275,51 +348,60 @@ export default {
       if (!this.game.mycolor)
         return; //I'm just an observer
       // Update storage (corr or live)
-      const colorIdx = ["w","b","g","r"][move.color];
+      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] = raw[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() - GameStorage.getInitime();
+        const elapsed = Date.now() - this.game.initime[colorIdx];
+        // elapsed time is measured in milliseconds
+        addTime = this.game.increment - elapsed/1000;
         this.game.players.forEach(p => {
           if (p.sid != this.st.user.sid)
-            this.st.conn.send("newmove",
-            {
+          {
+            this.st.conn.send(JSON.stringify({
+              code: "newmove",
               target: p.sid,
-              move: Object.assign({}, filtered_move, {elapsed: elapsed}),
-            });
+              move: Object.assign({}, filtered_move, {addTime: addTime}),
+            }));
+          }
         });
-        move.elapsed = elapsed;
       }
-      GameStorage.update({
+      else
+        addTime = move.addTime; //supposed transmitted
+      const nextIdx = ["w","b","g","r"].indexOf(this.vr.turn);
+      GameStorage.update(this.gameRef.id,
+      {
         colorIdx: colorIdx,
+        nextIdx: nextIdx,
         move: filtered_move,
         fen: move.fen,
-        elapsed: move.elapsed,
-        increment: this.game.increment, //redundant but faster
-        initime: (this.vr.turn == this.game.mycolor), //is it my turn?
+        addTime: addTime,
       });
+      // Also update current game object:
+      this.game.moves.push(move);
+      this.game.fen = move.fen;
+      //TODO: just this.game.clocks[colorIdx] += (!!addTime ? addTime : 0);
+      this.$set(this.game.clocks, colorIdx,
+        this.game.clocks[colorIdx] + (!!addTime ? addTime : 0));
+      this.game.initime[nextIdx] = Date.now();
     },
-    // NOTE: this update function should also work for corr games
+    // TODO: this update function should also work for corr games
     gameOver: function(score) {
-      GameStorage.update({
+      this.game.mode = "analyze";
+      GameStorage.update(this.gameRef.id,
+      {
         score: score,
       });
     },
   },
 };
 </script>
-
-<!-- TODO:
-// Abort possible à tout moment avec message
-// Sorry I have to go / Game seems over / Game is not interesting
-// code "T" pour score "perte au temps" ?
--->