X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fviews%2FGame.vue;h=9bca38ee472e380ec08e751c0f2fb25c42c3b0ca;hb=57eb158fe8e37daaae11685df846003cda4aba19;hp=5255cf43703e89ad6c5e08811813b85df09dbf9a;hpb=9ef63965401837983286ac6a95767af3923405fe;p=vchess.git

diff --git a/client/src/views/Game.vue b/client/src/views/Game.vue
index 5255cf43..9bca38ee 100644
--- a/client/src/views/Game.vue
+++ b/client/src/views/Game.vue
@@ -1,37 +1,79 @@
 <template lang="pug">
 main
-  input#modalChat.modal(type="checkbox" @click="resetChatColor()")
-  div#chatWrap(role="dialog" data-checkbox="modalChat")
+  input#modalChat.modal(
+    type="checkbox"
+    @click="resetChatColor()"
+  )
+  div#chatWrap(
+    role="dialog"
+    data-checkbox="modalChat"
+  )
     #chat.card
       label.modal-close(for="modalChat")
       #participants
         span {{ Object.keys(people).length + " " + st.tr["participant(s):"] }} 
-        span(v-for="p in Object.values(people)" v-if="!!p.name")
+        span(
+          v-for="p in Object.values(people)"
+          v-if="p.name"
+        )
           | {{ p.name }} 
-        span.anonymous(v-if="Object.values(people).some(p => !p.name)")
+        span.anonymous(v-if="Object.values(people).some(p => !p.name && p.id === 0)")
           | + @nonymous
-      Chat(:players="game.players" :pastChats="game.chats"
-        :newChat="newChat" @mychat="processChat")
+      Chat(
+        :players="game.players"
+        :pastChats="game.chats"
+        :newChat="newChat"
+        @mychat="processChat"
+        @chatcleared="clearChat"
+      )
   .row
     #aboveBoard.col-sm-12.col-md-9.col-md-offset-3.col-lg-10.col-lg-offset-2
       span.variant-cadence {{ game.cadence }}
       span.variant-name {{ game.vname }}
-      button#chatBtn(onClick="doClick('modalChat')") Chat
+      button#chatBtn(onClick="window.doClick('modalChat')") Chat
       #actions(v-if="game.score=='*'")
-        button(@click="clickDraw()" :class="{['draw-' + drawOffer]: true}")
+        button(
+          @click="clickDraw()"
+          :class="{['draw-' + drawOffer]: true}"
+        )
           | {{ st.tr["Draw"] }}
-        button(v-if="!!game.mycolor" @click="abortGame()") {{ st.tr["Abort"] }}
-        button(v-if="!!game.mycolor" @click="resign()") {{ st.tr["Resign"] }}
+        button(
+          v-if="!!game.mycolor"
+          @click="abortGame()"
+        )
+          | {{ st.tr["Abort"] }}
+        button(
+          v-if="!!game.mycolor"
+          @click="resign()"
+        )
+          | {{ st.tr["Resign"] }}
       #playersInfo
         p
           span.name(:class="{connected: isConnected(0)}")
             | {{ game.players[0].name || "@nonymous" }}
-          span.time(v-if="game.score=='*'") {{ virtualClocks[0] }}
+          span.time(
+            v-if="game.score=='*'"
+            :class="{yourturn: !!vr && vr.turn == 'w'}"
+          )
+            span.time-left {{ virtualClocks[0][0] }}
+            span.time-separator(v-if="!!virtualClocks[0][1]") :
+            span.time-right(v-if="!!virtualClocks[0][1]") {{ virtualClocks[0][1] }}
           span.split-names -
           span.name(:class="{connected: isConnected(1)}")
             | {{ game.players[1].name || "@nonymous" }}
-          span.time(v-if="game.score=='*'") {{ virtualClocks[1] }}
-  BaseGame(:game="game" :vr="vr" @newmove="processMove" @gameover="gameOver")
+          span.time(
+            v-if="game.score=='*'"
+            :class="{yourturn: !!vr && vr.turn == 'b'}"
+          )
+            span.time-left {{ virtualClocks[1][0] }}
+            span.time-separator(v-if="!!virtualClocks[1][1]") :
+            span.time-right(v-if="!!virtualClocks[1][1]") {{ virtualClocks[1][1] }}
+  BaseGame(
+    ref="basegame"
+    :game="game"
+    @newmove="processMove"
+    @gameover="gameOver"
+  )
 </template>
 
 <script>
@@ -40,112 +82,129 @@ import Chat from "@/components/Chat.vue";
 import { store } from "@/store";
 import { GameStorage } from "@/utils/gameStorage";
 import { ppt } from "@/utils/datetime";
+import { ajax } from "@/utils/ajax";
 import { extractTime } from "@/utils/timeControl";
 import { getRandString } from "@/utils/alea";
-import { ArrayFun } from "@/utils/array";
 import { processModalClick } from "@/utils/modalClick";
+import { getFullNotation } from "@/utils/notation";
+import { playMove, getFilteredMove } from "@/utils/playUndo";
 import { getScoreMessage } from "@/utils/scoring";
+import { ArrayFun } from "@/utils/array";
 import params from "@/parameters";
 export default {
-  name: 'my-game',
+  name: "my-game",
   components: {
     BaseGame,
-    Chat,
+    Chat
   },
   // gameRef: to find the game in (potentially remote) storage
   data: function() {
     return {
       st: store.state,
-      gameRef: { //given in URL (rid = remote ID)
+      gameRef: {
+        // rid = remote (socket) ID
         id: "",
         rid: ""
       },
-      game: { //passed to BaseGame
-        players:[{name:""},{name:""}],
+      game: {
+        // Passed to BaseGame
+        players: [{ name: "" }, { name: "" }],
         chats: [],
-        rendered: false,
+        rendered: false
       },
-      virtualClocks: [0, 0], //initialized with true game.clocks
+      virtualClocks: [[0,0], [0,0]], //initialized with true game.clocks
       vr: null, //"variant rules" object initialized from FEN
       drawOffer: "",
       people: {}, //players + observers
+      onMygames: [], //opponents (or me) on "MyGames" page
       lastate: undefined, //used if opponent send lastate before game is ready
       repeat: {}, //detect position repetition
       newChat: "",
       conn: null,
+      roomInitialized: false,
+      // If newmove has wrong index: ask fullgame again:
+      askGameTime: 0,
+      gameIsLoading: false,
+      // If asklastate got no reply, ask again:
+      gotLastate: false,
+      gotMoveIdx: -1, //last move index received
+      // If newmove got no pingback, send again:
+      opponentGotMove: false,
       connexionString: "",
       // Related to (killing of) self multi-connects:
       newConnect: {},
-      killed: {},
+      killed: {}
     };
   },
   watch: {
-    "$route": function(to, from) {
+    $route: function(to) {
       this.gameRef.id = to.params["id"];
       this.gameRef.rid = to.query["rid"];
       this.loadGame();
-    },
+    }
   },
   // NOTE: some redundant code with Hall.vue (mostly related to people array)
   created: function() {
     // Always add myself to players' list
     const my = this.st.user;
-    this.$set(this.people, 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
     // Initialize connection
-    this.connexionString = params.socketUrl +
-      "/?sid=" + this.st.user.sid +
-      "&tmpId=" + getRandString() +
-      "&page=" + encodeURIComponent(this.$route.path);
+    this.connexionString =
+      params.socketUrl +
+      "/?sid=" +
+      this.st.user.sid +
+      "&tmpId=" +
+      getRandString() +
+      "&page=" +
+      encodeURIComponent(this.$route.path);
     this.conn = new WebSocket(this.connexionString);
     this.conn.onmessage = this.socketMessageListener;
     this.conn.onclose = this.socketCloseListener;
     // Socket init required before loading remote game:
-    const socketInit = (callback) => {
-      if (!!this.conn && this.conn.readyState == 1) //1 == OPEN state
+    const socketInit = callback => {
+      if (!!this.conn && this.conn.readyState == 1)
+        // 1 == OPEN state
         callback();
-      else //socket not ready yet (initial loading)
-      {
+      else
+        // Socket not ready yet (initial loading)
         // NOTE: it's important to call callback without arguments,
         // otherwise first arg is Websocket object and loadGame fails.
-        this.conn.onopen = () => { return callback() };
-      }
+        this.conn.onopen = () => callback();
     };
-    if (!this.gameRef.rid) //game stored locally or on server
+    if (!this.gameRef.rid)
+      // Game stored locally or on server
       this.loadGame(null, () => socketInit(this.roomInit));
-    else //game stored remotely: need socket to retrieve it
-    {
+    else
+      // Game stored remotely: need socket to retrieve it
       // NOTE: the callback "roomInit" will be lost, so we don't provide it.
       // --> It will be given when receiving "fullgame" socket event.
-      // A more general approach would be to store it somewhere.
       socketInit(this.loadGame);
-    }
   },
   mounted: function() {
-    document.getElementById("chatWrap").addEventListener(
-      "click", processModalClick);
+    document
+      .getElementById("chatWrap")
+      .addEventListener("click", processModalClick);
   },
   beforeDestroy: function() {
     this.send("disconnect");
   },
   methods: {
     roomInit: function() {
-      // Notify the room only now that I connected, because
-      // messages might be lost otherwise (if game loading is slow)
-      this.send("connect");
-      this.send("pollclients");
+      if (!this.roomInitialized) {
+        // Notify the room only now that I connected, because
+        // messages might be lost otherwise (if game loading is slow)
+        this.send("connect");
+        this.send("pollclients");
+        // We may ask fullgame several times if some moves are lost,
+        // but room should be init only once:
+        this.roomInitialized = true;
+      }
     },
     send: function(code, obj) {
       if (!!this.conn)
-      {
-        this.conn.send(JSON.stringify(
-          Object.assign(
-            {code: code},
-            obj,
-          )
-        ));
-      }
+        this.conn.send(JSON.stringify(Object.assign({ code: code }, obj)));
     },
     isConnected: function(index) {
       const player = this.game.players[index];
@@ -153,96 +212,168 @@ export default {
       if (this.st.user.sid == player.sid || this.st.user.id == player.uid)
         return true;
       // Try to find a match in people:
-      return Object.keys(this.people).some(sid => sid == player.sid) ||
-        Object.values(this.people).some(p => p.id == player.uid);
+      return (
+        (
+          player.sid &&
+          Object.keys(this.people).some(sid => sid == player.sid)
+        )
+        ||
+        (
+          player.uid &&
+          Object.values(this.people).some(p => p.id == player.uid)
+        )
+      );
+    },
+    resetChatColor: function() {
+      // TODO: this is called twice, once on opening an once on closing
+      document.getElementById("chatBtn").classList.remove("somethingnew");
+    },
+    processChat: function(chat) {
+      this.send("newchat", { data: chat });
+      // NOTE: anonymous chats in corr games are not stored on server (TODO?)
+      if (this.game.type == "corr" && this.st.user.id > 0)
+        GameStorage.update(this.gameRef.id, { chat: chat });
+    },
+    clearChat: function() {
+      // Nothing more to do if game is live (chats not recorded)
+      if (this.game.type == "corr") {
+        if (!!this.game.mycolor)
+          ajax("/chats", "DELETE", {gid: this.game.id});
+        this.$set(this.game, "chats", []);
+      }
+    },
+    // Notify turn after a new move (to opponent and me on MyGames page)
+    notifyTurn: function(sid) {
+      const player = this.people[sid];
+      const colorIdx = this.game.players.findIndex(
+        p => p.sid == sid || p.id == player.id);
+      const color = ["w","b"][colorIdx];
+      const movesCount = this.game.moves.length;
+      const yourTurn =
+        (color == "w" && movesCount % 2 == 0) ||
+        (color == "b" && movesCount % 2 == 1);
+      this.send("turnchange", { target: sid, yourTurn: yourTurn });
+    },
+    askGameAgain: function() {
+      this.gameIsLoading = true;
+      const doAskGame = () => {
+        if (!this.gameRef.rid)
+          // This is my game: just reload.
+          this.loadGame();
+        else {
+          // Just ask fullgame again (once!), this is much simpler.
+          // If this fails, the user could just reload page :/
+          let self = this;
+          (function askIfPeerConnected() {
+            if (!!self.people[self.gameRef.rid])
+              self.send("askfullgame", { target: self.gameRef.rid });
+            else setTimeout(askIfPeerConnected, 1000);
+          })();
+        }
+      };
+      // Delay of at least 2s between two game requests
+      const now = Date.now();
+      const delay = Math.max(2000 - (now - this.askGameTime), 0);
+      this.askGameTime = now;
+      setTimeout(doAskGame, delay);
     },
     socketMessageListener: function(msg) {
-      if (!this.conn)
-        return;
+      if (!this.conn) return;
       const data = JSON.parse(msg.data);
-      switch (data.code)
-      {
+      switch (data.code) {
         case "pollclients":
           data.sockIds.forEach(sid => {
-            this.$set(this.people, sid, {id:0, name:""});
             if (sid != this.st.user.sid)
-            {
-              this.send("askidentity", {target:sid});
-              // Ask potentially missed last state, if opponent and I play
-              if (!!this.game.mycolor
-                && this.game.type == "live" && this.game.score == "*"
-                && this.game.players.some(p => p.sid == sid))
-              {
-                this.send("asklastate", {target:sid});
-              }
-            }
+              this.send("askidentity", { target: sid });
           });
           break;
         case "connect":
-          if (!this.people[data.from])
-            this.$set(this.people, data.from, {name:"", id:0});
-          if (!this.people[data.from].name)
-          {
+          if (!this.people[data.from]) {
             this.newConnect[data.from] = true; //for self multi-connects tests
-            this.send("askidentity", {target:data.from});
+            this.send("askidentity", { target: data.from });
           }
           break;
         case "disconnect":
           this.$delete(this.people, data.from);
           break;
+        case "mconnect": {
+          // TODO: from MyGames page : send mconnect message with the list of gid (live and corr)
+          // Either me (another tab) or opponent
+          const sid = data.from;
+          if (!this.onMygames.some(s => s == sid))
+          {
+            this.onMygames.push(sid);
+            this.notifyTurn(sid); //TODO: this may require server ID (so, notify after receiving identity)
+          }
+          break;
+          if (!this.people[sid])
+            this.send("askidentity", { target: sid });
+        }
+        case "mdisconnect":
+          ArrayFun.remove(this.onMygames, sid => sid == data.from);
+          break;
         case "killed":
           // I logged in elsewhere:
-          alert(this.st.tr["New connexion detected: tab now offline"]);
-          // TODO: this fails. See https://github.com/websockets/ws/issues/489
-          //this.conn.removeEventListener("message", this.socketMessageListener);
-          //this.conn.removeEventListener("close", this.socketCloseListener);
-          //this.conn.close();
           this.conn = null;
+          alert(this.st.tr["New connexion detected: tab now offline"]);
           break;
-        case "askidentity":
-        {
-          // Request for identification (TODO: anonymous shouldn't need to reply)
+        case "askidentity": {
+          // Request for identification
           const me = {
             // Decompose to avoid revealing email
             name: this.st.user.name,
             sid: this.st.user.sid,
-            id: this.st.user.id,
+            id: this.st.user.id
           };
-          this.send("identity", {data:me, target:data.from});
+          this.send("identity", { data: me, target: data.from });
           break;
         }
-        case "identity":
-        {
+        case "identity": {
           const user = data.data;
-          if (!!user.name) //otherwise anonymous
-          {
-            // If I multi-connect, kill current connexion if no mark (I'm older)
-            if (this.newConnect[user.sid] && user.id > 0
-              && user.id == this.st.user.id && user.sid != this.st.user.sid)
-            {
-              if (!this.killed[this.st.user.sid])
-              {
-                this.send("killme", {sid:this.st.user.sid});
+          this.$set(this.people, user.sid, { name: user.name, id: user.id });
+          // If I multi-connect, kill current connexion if no mark (I'm older)
+          if (this.newConnect[user.sid]) {
+            if (
+              user.id > 0 &&
+              user.id == this.st.user.id &&
+              user.sid != this.st.user.sid &&
+              !this.killed[this.st.user.sid]
+            ) {
+                this.send("killme", { sid: this.st.user.sid });
                 this.killed[this.st.user.sid] = true;
-              }
             }
-            if (user.sid != this.st.user.sid) //I already know my identity...
-            {
-              this.$set(this.people, user.sid,
-                {
-                  id: user.id,
-                  name: user.name,
-                });
+            delete this.newConnect[user.sid];
+          }
+          if (!this.killed[this.st.user.sid]) {
+            // Ask potentially missed last state, if opponent and I play
+            if (
+              !!this.game.mycolor &&
+              this.game.type == "live" &&
+              this.game.score == "*" &&
+              this.game.players.some(p => p.sid == user.sid)
+            ) {
+              let self = this;
+              (function askLastate() {
+                self.send("asklastate", { target: user.sid });
+                setTimeout(
+                  () => {
+                    // Ask until we got a reply (or opponent disconnect):
+                    if (!self.gotLastate && !!self.people[user.sid])
+                      askLastate();
+                  },
+                  1000
+                );
+              })();
             }
           }
-          delete this.newConnect[user.sid];
           break;
         }
         case "askgame":
           // Send current (live) game if not asked by any of the players
-          if (this.game.type == "live"
-            && this.game.players.every(p => p.sid != data.from[0]))
-          {
+          if (
+            this.game.type == "live" &&
+            this.game.players.every(p => p.sid != data.from[0])
+          ) {
             const myGame = {
               id: this.game.id,
               fen: this.game.fen,
@@ -250,63 +381,113 @@ export default {
               vid: this.game.vid,
               cadence: this.game.cadence,
               score: this.game.score,
-              rid: this.st.user.sid, //useful in Hall if I'm an observer
+              rid: this.st.user.sid //useful in Hall if I'm an observer
             };
-            this.send("game", {data:myGame, target:data.from});
+            this.send("game", { data: myGame, target: data.from });
           }
           break;
         case "askfullgame":
-          this.send("fullgame", {data:this.game, target:data.from});
+          this.send("fullgame", { data: this.game, target: data.from });
           break;
         case "fullgame":
           // Callback "roomInit" to poll clients only after game is loaded
           this.loadGame(data.data, this.roomInit);
           break;
         case "asklastate":
-          // Sending last state if I played a move or score != "*"
-          if ((this.game.moves.length > 0 && this.vr.turn != this.game.mycolor)
-              || this.game.score != "*" || this.drawOffer == "sent")
-          {
+          // Sending informative last state if I played a move or score != "*"
+          if (
+            (this.game.moves.length > 0 && this.vr.turn != this.game.mycolor) ||
+            this.game.score != "*" ||
+            this.drawOffer == "sent"
+          ) {
             // Send our "last state" informations to opponent
             const L = this.game.moves.length;
-            const myIdx = ["w","b"].indexOf(this.game.mycolor);
+            const myIdx = ["w", "b"].indexOf(this.game.mycolor);
             const myLastate = {
-              // NOTE: lastMove (when defined) includes addTime
-              lastMove: (L>0 ? this.game.moves[L-1] : undefined),
+              lastMove: L > 0 ? this.game.moves[L - 1] : undefined,
+              addTime: L > 0 ? this.game.addTimes[L - 1] : undefined,
               // Since we played a move (or abort or resign),
               // only drawOffer=="sent" is possible
               drawSent: this.drawOffer == "sent",
               score: this.game.score,
               movesCount: L,
-              initime: this.game.initime[1-myIdx], //relevant only if I played
+              initime: this.game.initime[1 - myIdx] //relevant only if I played
             };
-            this.send("lastate", {data:myLastate, target:data.from});
+            this.send("lastate", { data: myLastate, target: data.from });
+          } else {
+            this.send("lastate", { data: {nothing: true}, target: data.from });
           }
           break;
-        case "lastate": //got opponent infos about last move
-          this.lastate = data.data;
-          if (this.game.rendered) //game is rendered (Board component)
-            this.processLastate();
-          //else: will be processed when game is ready
+        case "lastate": {
+          // Got opponent infos about last move
+          this.gotLastate = true;
+          if (!data.data.nothing) {
+            this.lastate = data.data;
+            if (this.game.rendered)
+              // Game is rendered (Board component)
+              this.processLastate();
+            // Else: will be processed when game is ready
+          }
           break;
-        case "newmove":
-        {
-          const move = data.data;
-          if (!!move.cancelDrawOffer) //opponent refuses draw
-          {
-            this.drawOffer = "";
-            // NOTE for corr games: drawOffer reset by player in turn
-            if (this.game.type == "live" && !!this.game.mycolor)
-              GameStorage.update(this.gameRef.id, {drawOffer: ""});
+        }
+        case "newmove": {
+          const movePlus = data.data;
+          const movesCount = this.game.moves.length;
+          if (movePlus.index > movesCount) {
+            // This can only happen if I'm an observer and missed a move.
+            if (this.gotMoveIdx < movePlus.index)
+              this.gotMoveIdx = movePlus.index;
+            if (!this.gameIsLoading) this.askGameAgain();
+          }
+          else {
+            if (
+              movePlus.index < movesCount ||
+              this.gotMoveIdx >= movePlus.index
+            ) {
+              // Opponent re-send but we already have the move:
+              // (maybe he didn't receive our pingback...)
+              this.send("gotmove", {data: movePlus.index, target: data.from});
+            } else {
+              this.gotMoveIdx = movePlus.index;
+              const receiveMyMove = (movePlus.color == this.game.mycolor);
+              if (!receiveMyMove && !!this.game.mycolor)
+                // Notify opponent that I got the move:
+                this.send("gotmove", {data: movePlus.index, target: data.from});
+              if (movePlus.cancelDrawOffer) {
+                // Opponent refuses draw
+                this.drawOffer = "";
+                // NOTE for corr games: drawOffer reset by player in turn
+                if (
+                  this.game.type == "live" &&
+                  !!this.game.mycolor &&
+                  !receiveMyMove
+                ) {
+                  GameStorage.update(this.gameRef.id, { drawOffer: "" });
+                }
+              }
+              this.$refs["basegame"].play(movePlus.move, "received", null, true);
+              this.processMove(
+                movePlus.move,
+                {
+                  addTime: movePlus.addTime,
+                  receiveMyMove: receiveMyMove
+                }
+              );
+            }
           }
-          this.$set(this.game, "moveToPlay", move);
+          break;
+        }
+        case "gotmove": {
+          this.opponentGotMove = true;
           break;
         }
         case "resign":
-          this.gameOver(data.side=="b" ? "1-0" : "0-1", "Resign");
+          const score = data.side == "b" ? "1-0" : "0-1";
+          const side = data.side == "w" ? "White" : "Black";
+          this.gameOver(score, side + " surrender");
           break;
         case "abort":
-          this.gameOver("?", "Abort");
+          this.gameOver("?", "Stop");
           break;
         case "draw":
           this.gameOver("1/2", data.data);
@@ -324,187 +505,173 @@ export default {
     },
     socketCloseListener: function() {
       this.conn = new WebSocket(this.connexionString);
-      this.conn.addEventListener('message', this.socketMessageListener);
-      this.conn.addEventListener('close', this.socketCloseListener);
+      this.conn.addEventListener("message", this.socketMessageListener);
+      this.conn.addEventListener("close", this.socketCloseListener);
     },
     // lastate was received, but maybe game wasn't ready yet:
     processLastate: function() {
       const data = this.lastate;
       this.lastate = undefined; //security...
       const L = this.game.moves.length;
-      if (data.movesCount > L)
-      {
+      if (data.movesCount > L) {
         // Just got last move from him
-        this.$set(this.game, "moveToPlay", Object.assign({initime: data.initime}, data.lastMove));
+        this.$refs["basegame"].play(
+          data.lastMove,
+          "received",
+          null,
+          {addTime: data.addTime, initime: data.initime}
+        );
       }
-      if (data.drawSent)
-        this.drawOffer = "received";
-      if (data.score != "*")
-      {
+      if (data.drawSent) this.drawOffer = "received";
+      if (data.score != "*") {
         this.drawOffer = "";
-        if (this.game.score == "*")
-          this.gameOver(data.score);
+        if (this.game.score == "*") this.gameOver(data.score);
       }
     },
     clickDraw: function() {
-      if (!this.game.mycolor)
-        return; //I'm just spectator
-      if (["received","threerep"].includes(this.drawOffer))
-      {
-        if (!confirm(this.st.tr["Accept draw?"]))
-          return;
-        const message = (this.drawOffer == "received"
-          ? "Mutual agreement"
-          : "Three repetitions");
-        this.send("draw", {data:message});
+      if (!this.game.mycolor) return; //I'm just spectator
+      if (["received", "threerep"].includes(this.drawOffer)) {
+        if (!confirm(this.st.tr["Accept draw?"])) return;
+        const message =
+          this.drawOffer == "received"
+            ? "Mutual agreement"
+            : "Three repetitions";
+        this.send("draw", { data: message });
         this.gameOver("1/2", message);
-      }
-      else if (this.drawOffer == "") //no effect if drawOffer == "sent"
-      {
-        if (this.game.mycolor != this.vr.turn)
-          return alert(this.st.tr["Draw offer only in your turn"]);
-        if (!confirm(this.st.tr["Offer draw?"]))
+      } else if (this.drawOffer == "") {
+        // No effect if drawOffer == "sent"
+        if (!!this.game.mycolor != this.vr.turn) {
+          alert(this.st.tr["Draw offer only in your turn"]);
           return;
+        }
+        if (!confirm(this.st.tr["Offer draw?"])) return;
         this.drawOffer = "sent";
         this.send("drawoffer");
-        GameStorage.update(this.gameRef.id, {drawOffer: this.game.mycolor});
+        GameStorage.update(this.gameRef.id, { drawOffer: this.game.mycolor });
       }
     },
     abortGame: function() {
-      if (!this.game.mycolor || !confirm(this.st.tr["Terminate game?"]))
-        return;
-      this.gameOver("?", "Abort");
+      if (!this.game.mycolor || !confirm(this.st.tr["Terminate game?"])) return;
+      this.gameOver("?", "Stop");
       this.send("abort");
     },
-    resign: function(e) {
+    resign: function() {
       if (!this.game.mycolor || !confirm(this.st.tr["Resign the game?"]))
         return;
-      this.send("resign", {data:this.game.mycolor});
-      this.gameOver(this.game.mycolor=="w" ? "0-1" : "1-0", "Resign");
+      this.send("resign", { data: this.game.mycolor });
+      const score = this.game.mycolor == "w" ? "0-1" : "1-0";
+      const side = this.game.mycolor == "w" ? "White" : "Black";
+      this.gameOver(score, side + " surrender");
     },
     // 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, callback) {
-      const afterRetrieval = async (game) => {
+      const afterRetrieval = async game => {
         const vModule = await import("@/variants/" + game.vname + ".js");
         window.V = vModule.VariantRules;
         this.vr = new V(game.fen);
-        const gtype = (game.cadence.indexOf('d') >= 0 ? "corr" : "live");
+        const gtype = game.cadence.indexOf("d") >= 0 ? "corr" : "live";
         const tc = extractTime(game.cadence);
         const myIdx = game.players.findIndex(p => {
           return p.sid == this.st.user.sid || p.uid == this.st.user.id;
         });
-        const mycolor = [undefined,"w","b"][myIdx+1]; //undefined for observers
-        if (!game.chats)
-          game.chats = []; //live games don't have chat history
-        if (gtype == "corr")
-        {
-          if (game.players[0].color == "b")
-          {
+        const mycolor = [undefined, "w", "b"][myIdx + 1]; //undefined for observers
+        if (!game.chats) game.chats = []; //live games don't have chat history
+        if (gtype == "corr") {
+          if (game.players[0].color == "b") {
             // Adopt the same convention for live and corr games: [0] = white
-            [ game.players[0], game.players[1] ] =
-              [ game.players[1], game.players[0] ];
+            [game.players[0], game.players[1]] = [
+              game.players[1],
+              game.players[0]
+            ];
           }
-          // corr game: needs to compute the clocks + initime
           // NOTE: clocks in seconds, initime in milliseconds
-          game.clocks = [tc.mainTime, tc.mainTime];
-          game.moves.sort((m1,m2) => m1.idx - m2.idx); //in case of
-          if (game.score == "*") //otherwise no need to bother with time
-          {
+          game.moves.sort((m1, m2) => m1.idx - m2.idx); //in case of
+          const L = game.moves.length;
+          if (game.score == "*") {
+            // Set clocks + initime
+            game.clocks = [tc.mainTime, tc.mainTime];
             game.initime = [0, 0];
-            const L = game.moves.length;
-            if (L >= 3)
-            {
-              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;
+            if (L >= 1) {
+              const gameLastupdate = game.moves[L-1].played;
+              game.initime[L % 2] = gameLastupdate;
+              if (L >= 2) {
+                game.clocks[L % 2] =
+                  tc.mainTime - (Date.now() - gameLastupdate) / 1000;
               }
-              for (let i=0; i<=1; i++)
-                game.clocks[i] += addTime[i];
             }
-            if (L >= 1)
-              game.initime[L%2] = game.moves[L-1].played;
           }
-          const reformattedMoves = game.moves.map( (m) => {
-            const s = m.squares;
-            return {
-              appear: s.appear,
-              vanish: s.vanish,
-              start: s.start,
-              end: s.end,
-            };
-          });
           // Sort chat messages from newest to oldest
-          game.chats.sort( (c1,c2) => { return c2.added - c1.added; });
-          if (myIdx >= 0 && game.chats.length > 0)
-          {
-            // TODO: group multi-moves into an array, to deduce color from index
-            // and not need this (also repeated in BaseGame::re_setVariables())
-            let vr_tmp = new V(game.fenStart); //vr is already at end of game
-            for (let i=0; i<reformattedMoves.length; i++)
-            {
-              game.moves[i].color = vr_tmp.turn;
-              vr_tmp.play(reformattedMoves[i]);
-            }
-            // Blue background on chat button if last chat message arrived after my last move.
+          game.chats.sort((c1, c2) => {
+            return c2.added - c1.added;
+          });
+          if (myIdx >= 0 && game.score == "*" && game.chats.length > 0) {
+            // Did a chat message arrive after my last move?
             let dtLastMove = 0;
-            for (let midx = game.moves.length-1; midx >= 0; midx--)
-            {
-              if (game.moves[midx].color == mycolor)
-              {
-                dtLastMove = game.moves[midx].played;
-                break;
+            if (L == 1 && myIdx == 0)
+              dtLastMove = game.moves[0].played;
+            else if (L >= 2) {
+              if (L % 2 == 0) {
+                // It's now white turn
+                dtLastMove = game.moves[L-1-(1-myIdx)].played;
+              } else {
+                // Black turn:
+                dtLastMove = game.moves[L-1-myIdx].played;
               }
             }
             if (dtLastMove < game.chats[0].added)
               document.getElementById("chatBtn").classList.add("somethingnew");
           }
           // Now that we used idx and played, re-format moves as for live games
-          game.moves = reformattedMoves;
+          game.moves = game.moves.map(m => m.squares);
         }
-        if (gtype == "live" && game.clocks[0] < 0) //game unstarted
-        {
+        if (gtype == "live" && game.clocks[0] < 0) {
+          // Game is unstarted
           game.clocks = [tc.mainTime, tc.mainTime];
-          if (game.score == "*")
-          {
+          if (game.score == "*") {
             game.initime[0] = Date.now();
-            if (myIdx >= 0)
-            {
+            if (myIdx >= 0) {
               // I play in this live game; corr games don't have clocks+initime
-              GameStorage.update(game.id,
-              {
+              GameStorage.update(game.id, {
                 clocks: game.clocks,
-                initime: game.initime,
+                initime: game.initime
               });
             }
           }
         }
-        if (!!game.drawOffer)
-        {
-          if (game.drawOffer == "t") //three repetitions
+        if (game.drawOffer) {
+          if (game.drawOffer == "t")
+            // Three repetitions
             this.drawOffer = "threerep";
-          else
-          {
-            if (myIdx < 0)
-              this.drawOffer = "received"; //by any of the players
-            else
-            {
+          else {
+            // Draw offered by any of the players:
+            if (myIdx < 0) this.drawOffer = "received";
+            else {
               // I play in this game:
-              if ((game.drawOffer == "w" && myIdx==0) || (game.drawOffer=="b" && myIdx==1))
+              if (
+                (game.drawOffer == "w" && myIdx == 0) ||
+                (game.drawOffer == "b" && myIdx == 1)
+              )
                 this.drawOffer = "sent";
-              else //all other cases
-                this.drawOffer = "received";
+              else this.drawOffer = "received";
             }
           }
         }
-        if (!!game.scoreMsg)
-          game.scoreMsg = this.st.tr[game.scoreMsg]; //stored in english
-        this.game = Object.assign({},
-          game,
+        this.repeat = {}; //reset: scan past moves' FEN:
+        let repIdx = 0;
+        let vr_tmp = new V(game.fenStart);
+        let curTurn = "n";
+        game.moves.forEach(m => {
+          playMove(m, vr_tmp);
+          const fenIdx = vr_tmp.getFen().replace(/ /g, "_");
+          this.repeat[fenIdx] = this.repeat[fenIdx]
+            ? this.repeat[fenIdx] + 1
+            : 1;
+        });
+        if (this.repeat[repIdx] >= 3) this.drawOffer = "threerep";
+        this.game = Object.assign(
           // NOTE: assign mycolor here, since BaseGame could also be VS computer
           {
             type: gtype,
@@ -512,215 +679,250 @@ export default {
             mycolor: mycolor,
             // opponent sid not strictly required (or available), but easier
             // at least oppsid or oppid is available anyway:
-            oppsid: (myIdx < 0 ? undefined : game.players[1-myIdx].sid),
-            oppid: (myIdx < 0 ? undefined : game.players[1-myIdx].uid),
-          }
+            oppsid: myIdx < 0 ? undefined : game.players[1 - myIdx].sid,
+            oppid: myIdx < 0 ? undefined : game.players[1 - myIdx].uid,
+            addTimes: [], //used for live games
+          },
+          game,
         );
+        if (this.gameIsLoading)
+          // Re-load game because we missed some moves:
+          // artificially reset BaseGame (required if moves arrived in wrong order)
+          this.$refs["basegame"].re_setVariables();
         this.re_setClocks();
         this.$nextTick(() => {
           this.game.rendered = true;
           // Did lastate arrive before game was rendered?
-          if (!!this.lastate)
-            this.processLastate();
-        });
-        this.repeat = {}; //reset: scan past moves' FEN:
-        let repIdx = 0;
-        // NOTE: vr_tmp to obtain FEN strings is redundant with BaseGame
-        let vr_tmp = new V(game.fenStart);
-        game.moves.forEach(m => {
-          vr_tmp.play(m);
-          const fenObj = V.ParseFen( vr_tmp.getFen() );
-          repIdx = fenObj.position + "_" + fenObj.turn;
-          if (!!fenObj.flags)
-            repIdx += "_" + fenObj.flags;
-          this.repeat[repIdx] = (!!this.repeat[repIdx]
-            ? this.repeat[repIdx]+1
-            : 1);
+          if (this.lastate) this.processLastate();
         });
-        if (this.repeat[repIdx] >= 3)
-          this.drawOffer = "threerep";
-        if (!!callback)
-          callback();
+        if (this.gameIsLoading) {
+          this.gameIsLoading = false;
+          if (this.gotMoveIdx >= game.moves.length)
+            // Some moves arrived meanwhile...
+            this.askGameAgain();
+        }
+        if (!!callback) callback();
       };
-      if (!!game)
-        return afterRetrieval(game);
-      if (!!this.gameRef.rid)
-      {
-        // Remote live game: forgetting about callback func... (TODO: design)
-        this.send("askfullgame", {target:this.gameRef.rid});
+      if (!!game) {
+        afterRetrieval(game);
+        return;
       }
-      else
-      {
+      if (this.gameRef.rid) {
+        // Remote live game: forgetting about callback func... (TODO: design)
+        this.send("askfullgame", { target: this.gameRef.rid });
+      } else {
         // Local or corr game
+        // NOTE: afterRetrieval() is never called if game not found
         GameStorage.get(this.gameRef.id, afterRetrieval);
       }
     },
     re_setClocks: function() {
-      if (this.game.moves.length < 2 || this.game.score != "*")
-      {
+      if (this.game.moves.length < 2 || this.game.score != "*") {
         // 1st move not completed yet, or game over: freeze time
-        this.virtualClocks = this.game.clocks.map(s => ppt(s));
+        this.virtualClocks = this.game.clocks.map(s => ppt(s).split(':'));
         return;
       }
       const currentTurn = this.vr.turn;
-      const colorIdx = ["w","b"].indexOf(currentTurn);
-      let countdown = this.game.clocks[colorIdx] -
-        (Date.now() - this.game.initime[colorIdx])/1000;
-      this.virtualClocks = [0,1].map(i => {
-        const removeTime = i == colorIdx
-          ? (Date.now() - this.game.initime[colorIdx])/1000
-          : 0;
-        return ppt(this.game.clocks[i] - removeTime);
+      const currentMovesCount = this.game.moves.length;
+      const colorIdx = ["w", "b"].indexOf(currentTurn);
+      let countdown =
+        this.game.clocks[colorIdx] -
+        (Date.now() - this.game.initime[colorIdx]) / 1000;
+      this.virtualClocks = [0, 1].map(i => {
+        const removeTime =
+          i == colorIdx ? (Date.now() - this.game.initime[colorIdx]) / 1000 : 0;
+        return ppt(this.game.clocks[i] - removeTime).split(':');
       });
       let clockUpdate = setInterval(() => {
-        if (countdown < 0 || this.vr.turn != currentTurn || this.game.score != "*")
-        {
+        if (
+          countdown < 0 ||
+          this.game.moves.length > currentMovesCount ||
+          this.game.score != "*"
+        ) {
           clearInterval(clockUpdate);
           if (countdown < 0)
-            this.gameOver(this.vr.turn=="w" ? "0-1" : "1-0", this.st.tr["Time"]);
-        }
-        else
-          this.$set(this.virtualClocks, colorIdx, ppt(Math.max(0, --countdown)));
+            this.gameOver(
+              currentTurn == "w" ? "0-1" : "1-0",
+              "Time"
+            );
+        } else
+          this.$set(
+            this.virtualClocks,
+            colorIdx,
+            ppt(Math.max(0, --countdown)).split(':')
+          );
       }, 1000);
     },
-    // Post-process a move (which was just played in BaseGame)
-    processMove: function(move) {
-      if (this.game.type == "corr" && move.color == this.game.mycolor)
-      {
-        if (!confirm(this.st.tr["Move played:"] + " " + move.notation + "\n" + this.st.tr["Are you sure?"]))
-        {
-          return this.$set(this.game, "moveToUndo", move);
-        }
-      }
-      const colorIdx = ["w","b"].indexOf(move.color);
-      const nextIdx = ["w","b"].indexOf(this.vr.turn);
-      // https://stackoverflow.com/a/38750895
-      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)
-      {
-        if (this.drawOffer == "received") //I refuse draw
-          this.drawOffer = "";
-        if (this.game.moves.length >= 2) //after first move
-        {
-          const elapsed = Date.now() - this.game.initime[colorIdx];
-          // elapsed time is measured in milliseconds
-          addTime = this.game.increment - elapsed/1000;
+    // Update variables and storage after a move:
+    processMove: function(move, data) {
+      if (!data) data = {};
+      const moveCol = this.vr.turn;
+      const doProcessMove = () => {
+        const colorIdx = ["w", "b"].indexOf(moveCol);
+        const nextIdx = 1 - colorIdx;
+        const origMovescount = this.game.moves.length;
+        let addTime =
+          this.game.type == "live"
+            ? (data.addTime || 0)
+            : undefined;
+        if (moveCol == this.game.mycolor && !data.receiveMyMove) {
+          if (this.drawOffer == "received")
+            // I refuse draw
+            this.drawOffer = "";
+          if (this.game.type == "live" && origMovescount >= 2) {
+            const elapsed = Date.now() - this.game.initime[colorIdx];
+            // elapsed time is measured in milliseconds
+            addTime = this.game.increment - elapsed / 1000;
+          }
         }
-        const sendMove = Object.assign({},
-          filtered_move,
-          {
-            addTime: addTime,
-            cancelDrawOffer: this.drawOffer=="",
-          });
-        this.send("newmove", {data: sendMove});
-        // (Add)Time indication: useful in case of lastate infos requested
-        move.addTime = addTime;
-      }
-      else
-        addTime = move.addTime; //supposed transmitted
-      // Update current game object:
-      this.game.moves.push(move);
-      this.game.fen = move.fen;
-      this.game.clocks[colorIdx] += addTime;
-      // move.initime is set only when I receive a "lastate" move from opponent
-      this.game.initime[nextIdx] = move.initime || Date.now();
-      this.re_setClocks();
-      // 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";
-      else if (this.drawOffer == "threerep")
-        this.drawOffer = "";
-      // Since corr games are stored at only one location, update should be
-      // done only by one player for each move:
-      if (!!this.game.mycolor &&
-        (this.game.type == "live" || move.color == this.game.mycolor))
-      {
-        let drawCode = "";
-        switch (this.drawOffer)
-        {
-          case "threerep":
-            drawCode = "t";
-            break;
-          case "sent":
-            drawCode = this.game.mycolor;
-            break;
-          case "received":
-            drawCode = this.vr.turn;
-            break;
+        // Update current game object:
+        playMove(move, this.vr);
+// TODO: notifyTurn: "changeturn" message
+        this.game.moves.push(move);
+        // (add)Time indication: useful in case of lastate infos requested
+        if (this.game.type == "live")
+          this.game.addTimes.push(addTime);
+        this.game.fen = this.vr.getFen();
+        if (this.game.type == "live") this.game.clocks[colorIdx] += addTime;
+        // In corr games, just reset clock to mainTime:
+        else this.game.clocks[colorIdx] = extractTime(this.game.cadence).mainTime;
+        // data.initime is set only when I receive a "lastate" move from opponent
+        this.game.initime[nextIdx] = data.initime || Date.now();
+        this.re_setClocks();
+        // If repetition detected, consider that a draw offer was received:
+        const fenObj = this.vr.getFenForRepeat();
+        this.repeat[fenObj] = this.repeat[fenObj] ? this.repeat[fenObj] + 1 : 1;
+        if (this.repeat[fenObj] >= 3) this.drawOffer = "threerep";
+        else if (this.drawOffer == "threerep") this.drawOffer = "";
+        // Since corr games are stored at only one location, update should be
+        // done only by one player for each move:
+        if (!!this.game.mycolor && !data.receiveMyMove) {
+          // NOTE: 'var' to see that variable outside this block
+          var filtered_move = getFilteredMove(move);
         }
-        if (this.game.type == "corr")
-        {
-          GameStorage.update(this.gameRef.id,
-          {
-            fen: move.fen,
-            move:
-            {
-              squares: filtered_move,
-              played: Date.now(),
-              idx: this.game.moves.length - 1,
-            },
-            drawOffer: drawCode || "n", //"n" for "None" to force reset (otherwise it's ignored)
-          });
+        if (
+          !!this.game.mycolor &&
+          !data.receiveMyMove &&
+          (this.game.type == "live" || moveCol == this.game.mycolor)
+        ) {
+          let drawCode = "";
+          switch (this.drawOffer) {
+            case "threerep":
+              drawCode = "t";
+              break;
+            case "sent":
+              drawCode = this.game.mycolor;
+              break;
+            case "received":
+              drawCode = V.GetOppCol(this.game.mycolor);
+              break;
+          }
+          if (this.game.type == "corr") {
+            GameStorage.update(this.gameRef.id, {
+              fen: this.game.fen,
+              move: {
+                squares: filtered_move,
+                played: Date.now(),
+                idx: origMovescount
+              },
+              // Code "n" for "None" to force reset (otherwise it's ignored)
+              drawOffer: drawCode || "n"
+            });
+          }
+          else {
+            const updateStorage = () => {
+              GameStorage.update(this.gameRef.id, {
+                fen: this.game.fen,
+                move: filtered_move,
+                moveIdx: origMovescount,
+                clocks: this.game.clocks,
+                initime: this.game.initime,
+                drawOffer: drawCode
+              });
+            };
+            // The active tab can update storage immediately
+            if (!document.hidden) updateStorage();
+            // Small random delay otherwise
+            else setTimeout(updateStorage, 500 + 1000 * Math.random());
+          }
         }
-        else //live
-        {
-          GameStorage.update(this.gameRef.id,
-          {
-            fen: move.fen,
+        // Send move ("newmove" event) to people in the room (if our turn)
+        if (moveCol == this.game.mycolor && !data.receiveMyMove) {
+          const sendMove = {
             move: filtered_move,
-            clocks: this.game.clocks,
-            initime: this.game.initime,
-            drawOffer: drawCode,
-          });
+            index: origMovescount,
+            // color is required to check if this is my move (if several tabs opened)
+            color: moveCol,
+            addTime: addTime, //undefined for corr games
+            cancelDrawOffer: this.drawOffer == ""
+          };
+          this.opponentGotMove = false;
+          this.send("newmove", {data: sendMove});
+          // If the opponent doesn't reply gotmove soon enough, re-send move:
+          let retrySendmove = setInterval(
+            () => {
+              if (this.opponentGotMove) {
+                clearInterval(retrySendmove);
+                return;
+              }
+              let oppsid = this.game.players[nextIdx].sid;
+              if (!oppsid) {
+                oppsid = Object.keys(this.people).find(
+                  sid => this.people[sid].id == this.game.players[nextIdx].uid
+                );
+              }
+              if (!oppsid || !this.people[oppsid])
+                // Opponent is disconnected: he'll ask last state
+                clearInterval(retrySendmove);
+              else this.send("newmove", {data: sendMove, target: oppsid});
+            },
+            1000
+          );
         }
+      };
+      if (
+        this.game.type == "corr" &&
+        moveCol == this.game.mycolor &&
+        !data.receiveMyMove
+      ) {
+        setTimeout(() => {
+          // TODO: remplacer cette confirm box par qqch de plus discret
+          // (et de même pour challenge accepté / refusé)
+          if (
+            !confirm(
+              this.st.tr["Move played:"] +
+                " " +
+                getFullNotation(move) +
+                "\n" +
+                this.st.tr["Are you sure?"]
+            )
+          ) {
+            this.$refs["basegame"].cancelLastMove();
+            return;
+          }
+          doProcessMove();
+        // Let small time to finish drawing current move attempt:
+        }, 500);
       }
-    },
-    resetChatColor: function() {
-      // TODO: this is called twice, once on opening an once on closing
-      document.getElementById("chatBtn").classList.remove("somethingnew");
-    },
-    processChat: function(chat) {
-      this.send("newchat", {data:chat});
-      // NOTE: anonymous chats in corr games are not stored on server (TODO?)
-      if (this.game.type == "corr" && this.st.user.id > 0)
-        GameStorage.update(this.gameRef.id, {chat: chat});
+      else doProcessMove();
     },
     gameOver: function(score, scoreMsg) {
       this.game.score = score;
-      this.game.scoreMsg = this.st.tr[(!!scoreMsg
-        ? scoreMsg
-        : getScoreMessage(score))];
+      this.$set(this.game, "scoreMsg", scoreMsg || getScoreMessage(score));
       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, scoreMsg: scoreMsg});
+      if (myIdx >= 0) {
+        // OK, I play in this game
+        GameStorage.update(this.gameRef.id, {
+          score: score,
+          scoreMsg: scoreMsg
+        });
         // Notify the score to main Hall. TODO: only one player (currently double send)
-        this.send("result", {gid:this.game.id, score:score});
+        this.send("result", { gid: this.game.id, score: score });
       }
-    },
-  },
+    }
+  }
 };
 </script>
 
@@ -766,14 +968,29 @@ export default {
   font-weight: bold
   padding-right: 10px
 
-.name
+span.name
   font-size: 1.5rem
-  padding: 1px
+  padding: 0 3px
 
-.time
+span.time
   font-size: 2rem
   display: inline-block
-  margin-left: 10px
+  .time-left
+    margin-left: 10px
+  .time-right
+    margin-left: 5px
+  .time-separator
+    margin-left: 5px
+    position: relative
+    top: -1px
+
+span.yourturn
+  color: #831B1B
+  .time-separator
+    animation: blink-animation 2s steps(3, start) infinite
+@keyframes blink-animation
+  to
+    visibility: hidden
 
 .split-names
   display: inline-block