X-Git-Url: https://git.auder.net/images/doc/screen_pairings_new.png?a=blobdiff_plain;f=client%2Fsrc%2Fviews%2FGame.vue;h=30fbc39b9608fca600fbe3ec20b30b5ad2554e6a;hb=dcd68c4108412f45b8ce119ae80ce8f6e296800b;hp=56c98d271cf6a60b86dd0ad537d51d66049696ee;hpb=760adbcee11c8953d97514768a5d5382ef518953;p=vchess.git

diff --git a/client/src/views/Game.vue b/client/src/views/Game.vue
index 56c98d27..30fbc39b 100644
--- a/client/src/views/Game.vue
+++ b/client/src/views/Game.vue
@@ -1,16 +1,28 @@
 <template lang="pug">
-.row
-  .col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
-    BaseGame(:game="game" :vr="vr" ref="basegame"
-      @newmove="processMove" @gameover="gameOver")
-    div Names: {{ game.players[0].name }} - {{ game.players[1].name }}
-    div(v-if="game.score=='*'") Time: {{ virtualClocks[0] }} - {{ virtualClocks[1] }}
-    .button-group(v-if="game.mode!='analyze' && game.score=='*'")
-      button(@click="offerDraw") Draw
-      button(@click="abortGame") Abort
-      button(@click="resign") Resign
-    textarea(v-if="game.score=='*'" v-model="corrMsg")
-    Chat(:players="game.players")
+main
+  input#modalChat.modal(type="checkbox" @change="toggleChat")
+  div#chatWrap(role="dialog" data-checkbox="modalChat"
+      aria-labelledby="inputChat")
+    #chat.card
+      label.modal-close(for="modalChat")
+      Chat(:players="game.players" :pastChats="game.chats"
+        @newchat-sent="finishSendChat" @newchat-received="processChat")
+  .row
+    #aboveBoard.col-sm-12.col-md-9.col-md-offset-3.col-lg-10.col-lg-offset-2
+      button#chatBtn(onClick="doClick('modalChat')") Chat
+      #actions(v-if="game.mode!='analyze' && game.score=='*'")
+        button(@click="clickDraw" :class="{['draw-' + drawOffer]: true}") Draw
+        button(@click="abortGame") Abort
+        button(@click="resign") Resign
+      #playersInfo
+        p
+          span.name(:class="{connected: isConnected(0)}") {{ game.players[0].name }}
+          span.time(v-if="game.score=='*'") {{ virtualClocks[0] }}
+          span.split-names -
+          span.name(:class="{connected: isConnected(1)}") {{ game.players[1].name }}
+          span.time(v-if="game.score=='*'") {{ virtualClocks[1] }}
+  BaseGame(:game="game" :vr="vr" ref="basegame"
+    @newmove="processMove" @gameover="gameOver")
 </template>
 
 <script>
@@ -21,6 +33,7 @@ import { GameStorage } from "@/utils/gameStorage";
 import { ppt } from "@/utils/datetime";
 import { extractTime } from "@/utils/timeControl";
 import { ArrayFun } from "@/utils/array";
+import { processModalClick } from "@/utils/modalClick";
 
 export default {
   name: 'my-game',
@@ -37,12 +50,12 @@ export default {
         rid: ""
       },
       game: {players:[{name:""},{name:""}]}, //passed to BaseGame
-      corrMsg: "", //to send offline messages in corr games
       virtualClocks: [0, 0], //initialized with true game.clocks
       vr: null, //"variant rules" object initialized from FEN
-      drawOffer: "", //TODO: use for button style
-      people: [], //players + observers
+      drawOffer: "",
+      people: {}, //players + observers
       lastate: undefined, //used if opponent send lastate before game is ready
+      repeat: {}, //detect position repetition
     };
   },
   watch: {
@@ -52,9 +65,9 @@ export default {
       this.loadGame();
     },
     "game.clocks": function(newState) {
-      if (this.game.moves.length < 2)
+      if (this.game.moves.length < 2 || this.game.score != "*")
       {
-        // 1st move not completed yet: freeze time
+        // 1st move not completed yet, or game over: freeze time
         this.virtualClocks = newState.map(s => ppt(s));
         return;
       }
@@ -73,10 +86,7 @@ export default {
         {
           clearInterval(clockUpdate);
           if (countdown < 0)
-          {
-            this.$refs["basegame"].endGame(
-              this.vr.turn=="w" ? "0-1" : "1-0", "Time");
-          }
+            this.gameOver(this.vr.turn=="w" ? "0-1" : "1-0", "Time");
         }
         else
         {
@@ -86,11 +96,11 @@ export default {
       }, 1000);
     },
   },
-  // TODO: redundant code with Hall.vue (related to people array)
+  // NOTE: some redundant code with Hall.vue (related to people array)
   created: function() {
     // Always add myself to players' list
     const my = this.st.user;
-    this.people.push({sid:my.sid, id:my.id, name:my.name});
+    this.$set(this.people, my.sid, {id:my.id, name:my.name});
     this.gameRef.id = this.$route.params["id"];
     this.gameRef.rid = this.$route.query["rid"]; //may be undefined
     // Define socket .onmessage() and .onclose() events:
@@ -118,11 +128,21 @@ export default {
       socketInit(this.loadGame);
     }
   },
+  mounted: function() {
+    document.getElementById("chatWrap").addEventListener(
+      "click", processModalClick);
+  },
   methods: {
     // O.1] Ask server for room composition:
     roomInit: function() {
       this.st.conn.send(JSON.stringify({code:"pollclients"}));
     },
+    isConnected: function(index) {
+      const name = this.game.players[index].name;
+      if (this.st.user.name == name)
+        return true;
+      return Object.values(this.people).some(p => p.name == name);
+    },
     socketMessageListener: function(msg) {
       const data = JSON.parse(msg.data);
       switch (data.code)
@@ -134,7 +154,11 @@ export default {
         case "pollclients":
         {
           data.sockIds.forEach(sid => {
-            this.people.push({sid:sid, id:0, name:""});
+            // TODO: understand clearly what happens here, problems when a
+            // game is quit, and then launch a new game from hall.
+            if (!!this.people[sid])
+              return;
+            this.$set(this.people, sid, {id:0, name:""});
             // Ask only identity
             this.st.conn.send(JSON.stringify({code:"askidentity", target:sid}));
           });
@@ -145,15 +169,20 @@ export default {
           // Request for identification: reply if I'm not anonymous
           if (this.st.user.id > 0)
           {
-            this.st.conn.send(JSON.stringify(
-              // people[0] instead of st.user to avoid sending email
-              {code:"identity", user:this.people[0], target:data.from}));
+            this.st.conn.send(JSON.stringify({code:"identity",
+              user: {
+                // NOTE: decompose to avoid revealing email
+                name: this.st.user.name,
+                sid: this.st.user.sid,
+                id: this.st.user.id,
+              },
+              target:data.from}));
           }
           break;
         }
         case "identity":
         {
-          let player = this.people.find(p => p.sid == data.user.sid);
+          let player = this.people[data.user.sid];
           // NOTE: sometimes player.id fails because player is undefined...
           // Probably because the event was meant for Hall?
           if (!player)
@@ -161,7 +190,7 @@ export default {
           player.id = data.user.id;
           player.name = data.user.name;
           // Sending last state only for live games: corr games are complete
-          if (this.game.type == "live" && this.game.oppsid == player.sid)
+          if (this.game.type == "live" && this.game.oppsid == data.user.sid)
           {
             // Send our "last state" informations to opponent
             const L = this.game.moves.length;
@@ -170,7 +199,7 @@ export default {
               lastMove.draw = true;
             this.st.conn.send(JSON.stringify({
               code: "lastate",
-              target: player.sid,
+              target: data.user.sid,
               state:
               {
                 lastMove: lastMove,
@@ -196,9 +225,7 @@ export default {
             game:myGame, target:data.from}));
           break;
         case "newmove":
-          // NOTE: this call to play() will trigger processMove()
-          this.$refs["basegame"].play(data.move,
-            "receive", this.game.vname!="Dark" ? "animate" : null);
+          this.$set(this.game, "moveToPlay", data.move); //TODO: Vue3...
           break;
         case "lastate": //got opponent infos about last move
         {
@@ -209,14 +236,13 @@ export default {
           break;
         }
         case "resign":
-          this.$refs["basegame"].endGame(
-            (data.side=="b" ? "1-0" : "0-1"), "Resign");
+          this.gameOver(data.side=="b" ? "1-0" : "0-1", "Resign");
           break;
         case "abort":
-          this.$refs["basegame"].endGame("?", "Abort");
+          this.gameOver("?", "Abort");
           break;
         case "draw":
-          this.$refs["basegame"].endGame("1/2", "Mutual agreement");
+          this.gameOver("1/2", data.message);
           break;
         case "drawoffer":
           this.drawOffer = "received"; //TODO: observers don't know who offered draw
@@ -230,12 +256,16 @@ export default {
           break;
         case "connect":
         {
-          this.people.push({name:"", id:0, sid:data.from});
-          this.st.conn.send(JSON.stringify({code:"askidentity", target:data.from}));
+          // TODO: next condition is probably not required. See note line 150
+          if (!this.people[data.from])
+          {
+            this.$set(this.people, data.from, {name:"", id:0});
+            this.st.conn.send(JSON.stringify({code:"askidentity", target:data.from}));
+          }
           break;
         }
         case "disconnect":
-          ArrayFun.remove(this.people, p => p.sid == data.from);
+          this.$delete(this.people, data.from);
           break;
       }
     },
@@ -247,55 +277,64 @@ export default {
       if (data.movesCount > L)
       {
         // Just got last move from him
-        this.$refs["basegame"].play(data.lastMove,
-          "receive", this.game.vname!="Dark" ? "animate" : null);
+        this.$set(this.game, "moveToPlay", data.lastMove);
         if (data.score != "*" && this.game.score == "*")
         {
           // Opponent resigned or aborted game, or accepted draw offer
           // (this is not a stalemate or checkmate)
-          this.$refs["basegame"].endGame(data.score, "Opponent action");
+          this.gameOver(data.score, "Opponent action");
         }
         this.game.clocks = data.clocks; //TODO: check this?
         if (!!data.lastMove.draw)
           this.drawOffer = "received";
       }
     },
-    offerDraw: function() {
-      // TODO: also for corr games
-      if (this.drawOffer == "received")
+    clickDraw: function() {
+      if (["received","threerep"].includes(this.drawOffer))
       {
         if (!confirm("Accept draw?"))
           return;
-        this.people.forEach(p => {
-          if (p.sid != this.st.user.sid)
-            this.st.conn.send(JSON.stringify({code:"draw", target:p.sid}));
+        const message = (this.drawOffer == "received"
+          ? "Mutual agreement"
+          : "Three repetitions");
+        Object.keys(this.people).forEach(sid => {
+          if (sid != this.st.user.sid)
+          {
+            this.st.conn.send(JSON.stringify({code:"draw",
+              message:message, target:sid}));
+          }
         });
-        this.$refs["basegame"].endGame("1/2", "Mutual agreement");
+        this.gameOver("1/2", message);
       }
       else if (this.drawOffer == "sent")
+      {
         this.drawOffer = "";
+        if (this.game.type == "corr")
+          GameStorage.update(this.gameRef.id, {drawOffer: false});
+      }
       else
       {
         if (!confirm("Offer draw?"))
           return;
         this.drawOffer = "sent";
-        this.people.forEach(p => {
-          if (p.sid != this.st.user.sid)
-            this.st.conn.send(JSON.stringify({code:"drawoffer", target:p.sid}));
+        Object.keys(this.people).forEach(sid => {
+          if (sid != this.st.user.sid)
+            this.st.conn.send(JSON.stringify({code:"drawoffer", target:sid}));
         });
+        if (this.game.type == "corr")
+          GameStorage.update(this.gameRef.id, {drawOffer: true});
       }
     },
     abortGame: function() {
       if (!confirm(this.st.tr["Terminate game?"]))
         return;
-      // Next line will trigger a "gameover" event, bubbling up till here
-      this.$refs["basegame"].endGame("?", "Abort");
-      this.people.forEach(p => {
-        if (p.sid != this.st.user.sid)
+      this.gameOver("?", "Abort");
+      Object.keys(this.people).forEach(sid => {
+        if (sid != this.st.user.sid)
         {
           this.st.conn.send(JSON.stringify({
             code: "abort",
-            target: p.sid,
+            target: sid,
           }));
         }
       });
@@ -303,16 +342,14 @@ export default {
     resign: function(e) {
       if (!confirm("Resign the game?"))
         return;
-      this.people.forEach(p => {
-        if (p.sid != this.st.user.sid)
+      Object.keys(this.people).forEach(sid => {
+        if (sid != this.st.user.sid)
         {
           this.st.conn.send(JSON.stringify({code:"resign",
-            side:this.game.mycolor, target:p.sid}));
+            side:this.game.mycolor, target:sid}));
         }
       });
-      // Next line will trigger a "gameover" event, bubbling up till here
-      this.$refs["basegame"].endGame(
-        this.game.mycolor=="w" ? "0-1" : "1-0", "Resign");
+      this.gameOver(this.game.mycolor=="w" ? "0-1" : "1-0", "Resign");
     },
     // 3 cases for loading a game:
     //  - from indexedDB (running or completed live game I play)
@@ -336,22 +373,27 @@ export default {
           // corr game: needs to compute the clocks + initime
           // NOTE: clocks in seconds, initime in milliseconds
           game.clocks = [tc.mainTime, tc.mainTime];
-          game.initime = [0, 0];
-          const L = game.moves.length;
           game.moves.sort((m1,m2) => m1.idx - m2.idx); //in case of
-          if (L >= 3)
+          if (game.score == "*") //otherwise no need to bother with time
           {
-            let addTime = [0, 0];
-            for (let i=2; i<L; i++)
+            game.initime = [0, 0];
+            const L = game.moves.length;
+            if (L >= 3)
             {
-              addTime[i%2] += tc.increment -
-                (game.moves[i].played - game.moves[i-1].played) / 1000;
+              let addTime = [0, 0];
+              for (let i=2; i<L; i++)
+              {
+                addTime[i%2] += tc.increment -
+                  (game.moves[i].played - game.moves[i-1].played) / 1000;
+              }
+              for (let i=0; i<=1; i++)
+                game.clocks[i] += addTime[i];
             }
-            for (let i=0; i<=1; i++)
-              game.clocks[i] += addTime[i];
+            if (L >= 1)
+              game.initime[L%2] = game.moves[L-1].played;
+            if (game.drawOffer)
+              this.drawOffer = "received";
           }
-          if (L >= 1)
-            game.initime[L%2] = game.moves[L-1].played;
           // Now that we used idx and played, re-format moves as for live games
           game.moves = game.moves.map( (m) => {
             const s = m.squares;
@@ -360,9 +402,10 @@ export default {
               vanish: s.vanish,
               start: s.start,
               end: s.end,
-              message: m.message,
             };
           });
+          // Also sort chat messages (if any)
+          game.chats.sort( (c1,c2) => { return c2.added - c1.added; });
         }
         const myIdx = game.players.findIndex(p => {
           return p.sid == this.st.user.sid || p.uid == this.st.user.id;
@@ -370,15 +413,18 @@ export default {
         if (gtype == "live" && game.clocks[0] < 0) //game unstarted
         {
           game.clocks = [tc.mainTime, tc.mainTime];
-          game.initime[0] = Date.now();
-          if (myIdx >= 0)
+          if (game.score == "*")
           {
-            // I play in this live game; corr games don't have clocks+initime
-            GameStorage.update(game.id,
+            game.initime[0] = Date.now();
+            if (myIdx >= 0)
             {
-              clocks: game.clocks,
-              initime: game.initime,
-            });
+              // I play in this live game; corr games don't have clocks+initime
+              GameStorage.update(game.id,
+              {
+                clocks: game.clocks,
+                initime: game.initime,
+              });
+            }
           }
         }
         this.game = Object.assign({},
@@ -394,6 +440,7 @@ export default {
             oppid: (myIdx < 0 ? undefined : game.players[1-myIdx].uid),
           }
         );
+        this.repeat = {}; //reset
         if (!!this.lastate) //lastate arrived before game was loaded:
           this.processLastate();
         callback();
@@ -414,18 +461,20 @@ export default {
     },
     // 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)
+      // Update storage (corr or live) if I play in the game
       const colorIdx = ["w","b"].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;
-        }, {});
+      if (!!this.game.mycolor)
+      {
+        const allowed_fields = ["appear", "vanish", "start", "end"];
+        // NOTE: 'var' to see this variable outside this block
+        var 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 people in the room (if our turn)
       let addTime = 0;
       if (move.color == this.game.mycolor)
@@ -437,31 +486,24 @@ export default {
           addTime = this.game.increment - elapsed/1000;
         }
         let sendMove = Object.assign({}, filtered_move, {addTime: addTime});
-        if (this.game.type == "corr")
-          sendMove.message = this.corrMsg;
-        this.people.forEach(p => {
-          if (p.sid != this.st.user.sid)
+        Object.keys(this.people).forEach(sid => {
+          if (sid != this.st.user.sid)
           {
             this.st.conn.send(JSON.stringify({
               code: "newmove",
-              target: p.sid,
+              target: sid,
               move: sendMove,
             }));
           }
         });
-        if (this.game.type == "corr" && this.corrMsg != "")
-        {
-          // Add message to last move in BaseGame:
-          // TODO: not very good style...
-          this.$refs["basegame"].setCurrentMessage(this.corrMsg);
-        }
       }
       else
         addTime = move.addTime; //supposed transmitted
       const nextIdx = ["w","b"].indexOf(this.vr.turn);
       // Since corr games are stored at only one location, update should be
       // done only by one player for each move:
-      if (this.game.type == "live" || move.color == this.game.mycolor)
+      if (!!this.game.mycolor &&
+        (this.game.type == "live" || move.color == this.game.mycolor))
       {
         if (this.game.type == "corr")
         {
@@ -471,7 +513,6 @@ export default {
             move:
             {
               squares: filtered_move,
-              message: this.corrMsg,
               played: Date.now(), //TODO: on server?
               idx: this.game.moves.length,
             },
@@ -498,23 +539,95 @@ export default {
       //TODO: (Vue3) just this.game.clocks[colorIdx] += addTime;
       this.$set(this.game.clocks, colorIdx, this.game.clocks[colorIdx] + addTime);
       this.game.initime[nextIdx] = Date.now();
-      // Finally reset curMoveMessage if needed
-      if (this.game.type == "corr" && move.color == this.game.mycolor)
-        this.corrMsg = "";
+      // If repetition detected, consider that a draw offer was received:
+      const fenObj = V.ParseFen(move.fen);
+      let repIdx = fenObj.position + "_" + fenObj.turn;
+      if (!!fenObj.flags)
+        repIdx += "_" + fenObj.flags;
+      this.repeat[repIdx] = (!!this.repeat[repIdx]
+        ? this.repeat[repIdx]+1
+        : 1);
+      if (this.repeat[repIdx] >= 3)
+        this.drawOffer = "threerep";
+    },
+    toggleChat: function() {
+      document.getElementById("chatBtn").style.backgroundColor = "#e2e2e2";
+    },
+    finishSendChat: function(chat) {
+      if (this.game.type == "corr")
+        GameStorage.update(this.gameRef.id, {chat: chat});
+    },
+    processChat: function() {
+      if (!document.getElementById("inputChat").checked)
+        document.getElementById("chatBtn").style.backgroundColor = "#c5fefe";
     },
-    gameOver: function(score) {
+    gameOver: function(score, scoreMsg) {
       this.game.mode = "analyze";
       this.game.score = score;
+      this.game.scoreMsg = scoreMsg;
       const myIdx = this.game.players.findIndex(p => {
         return p.sid == this.st.user.sid || p.uid == this.st.user.id;
       });
       if (myIdx >= 0) //OK, I play in this game
-        GameStorage.update(this.gameRef.id, { score: score });
+      {
+        GameStorage.update(this.gameRef.id,
+          {score: score, scoreMsg: scoreMsg});
+      }
     },
   },
 };
 </script>
 
 <style lang="sass">
-// TODO
+.connected
+  background-color: lightgreen
+
+@media screen and (min-width: 768px)
+  #actions
+    width: 300px
+@media screen and (max-width: 767px)
+  .game
+    width: 100%
+
+#actions
+  display: inline-block
+  margin-top: 10px
+  button
+    display: inline-block
+    width: 33%
+    margin: 0
+
+@media screen and (max-width: 767px)
+  #aboveBoard
+    text-align: center
+
+.name
+  font-size: 1.5rem
+  padding: 1px
+
+.time
+  font-size: 2rem
+  display: inline-block
+  margin-left: 10px
+
+.split-names
+  display: inline-block
+  margin: 0 15px
+
+#chat
+  padding-top: 20px
+  max-width: 600px
+  border: none;
+
+#chatBtn
+  margin: 0 10px 0 0
+
+.draw-sent, .draw-sent:hover
+  background-color: lightyellow
+
+.draw-received, .draw-received:hover
+  background-color: lightgreen
+
+.draw-threerep, .draw-threerep:hover
+  background-color: #e4d1fc
 </style>