X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fviews%2FGame.vue;h=ddbd3309e530766cc2177c3d44ac2f16a40d0d69;hb=a8f0bbcb3808c8a8af548ab335c61674cffcb6c3;hp=55b36887e04a3ea0d6bb01254b42768c30800275;hpb=5aa14a21484cf36838b5541afe2ee76b6d5c274b;p=vchess.git

diff --git a/client/src/views/Game.vue b/client/src/views/Game.vue
index 55b36887..ddbd3309 100644
--- a/client/src/views/Game.vue
+++ b/client/src/views/Game.vue
@@ -1,8 +1,20 @@
 <template lang="pug">
 main
+  input#modalInfo.modal(type="checkbox")
+  div#infoDiv(
+    role="dialog"
+    data-checkbox="modalInfo"
+  )
+    .card.text-center
+      label.modal-close(for="modalInfo")
+      a(
+        :href="'#/game/' + rematchId"
+        onClick="document.getElementById('modalInfo').checked=false"
+      )
+        | {{ st.tr["Rematch in progress"] }}
   input#modalChat.modal(
     type="checkbox"
-    @click="resetChatColor()"
+    @click="toggleChat()"
   )
   div#chatWrap(
     role="dialog"
@@ -11,26 +23,35 @@ main
     .card
       label.modal-close(for="modalChat")
       #participants
-        span {{ Object.keys(people).length + " " + st.tr["participant(s):"] }} 
+        span {{ st.tr["Participant(s):"] }} 
         span(
           v-for="p in Object.values(people)"
-          v-if="p.name"
+          v-if="p.focus && !!p.name"
         )
           | {{ p.name }} 
-        span.anonymous(v-if="Object.values(people).some(p => !p.name && p.id === 0)")
+        span.anonymous(
+          v-if="Object.values(people).some(p => p.focus && !p.name)"
+        )
           | + @nonymous
       Chat(
         ref="chatcomp"
         :players="game.players"
         :pastChats="game.chats"
-        :newChat="newChat"
         @mychat="processChat"
         @chatcleared="clearChat"
       )
   input#modalConfirm.modal(type="checkbox")
   div#confirmDiv(role="dialog")
     .card
-      .diagram(v-html="curDiag")
+      .diagram(
+        v-if="!!vr && ['all','byrow'].includes(vr.showMoves)"
+        v-html="curDiag"
+      )
+      p.text-center(v-else)
+        span {{ st.tr["Move played:"] + " " }}
+        span.bold {{ moveNotation }}
+        br
+        span {{ st.tr["Are you sure?"] }}
       .button-group#buttonsConfirm
         // onClick for acceptBtn: set dynamically
         button.acceptBtn
@@ -71,8 +92,9 @@ main
         )
           img(src="/images/icons/resign.svg")
       button.tooltip(
-        v-else-if="!!game.mycolor"
-        @click="rematch()"
+        v-else
+        @click="clickRematch()"
+        :class="{['rematch-' + rematchOffer]: true}"
         :aria-label="st.tr['Rematch']"
       )
         img(src="/images/icons/rematch.svg")
@@ -131,23 +153,21 @@ export default {
   data: function() {
     return {
       st: store.state,
-      gameRef: {
-        // rid = remote (socket) ID
-        id: "",
-        rid: ""
-      },
+      // gameRef can point to a corr game, local game or remote live game
+      gameRef: "",
       nextIds: [],
       game: {}, //passed to BaseGame
       // virtualClocks will be initialized from true game.clocks
       virtualClocks: [],
       vr: null, //"variant rules" object initialized from FEN
       drawOffer: "",
+      rematchId: "",
+      rematchOffer: "",
+      lastateAsked: false,
       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
       curDiag: "", //for corr moves confirmation
-      newChat: "",
       conn: null,
       roomInitialized: false,
       // If newmove has wrong index: ask fullgame again:
@@ -159,9 +179,9 @@ export default {
       // If newmove got no pingback, send again:
       opponentGotMove: false,
       connexionString: "",
+      // Incomplete info games: show move played
+      moveNotation: "",
       // Intervals from setInterval():
-      // TODO: limit them to e.g. 3 retries ?!
-      askIfPeerConnected: null,
       askLastate: null,
       retrySendmove: null,
       clockUpdate: null,
@@ -180,13 +200,9 @@ export default {
           // In case of incomplete information variant:
           boardDiv.style.visibility = "hidden";
         this.atCreation();
-      } else {
+      } else
         // Same game ID
-        this.gameRef.id = to.params["id"];
-        this.gameRef.rid = to.query["rid"];
         this.nextIds = JSON.parse(this.$route.query["next"] || "[]");
-        this.loadGame();
-      }
     }
   },
   // NOTE: some redundant code with Hall.vue (mostly related to people array)
@@ -194,31 +210,47 @@ export default {
     this.atCreation();
   },
   mounted: function() {
-    document
-      .getElementById("chatWrap")
-      .addEventListener("click", processModalClick);
+    document.addEventListener('visibilitychange', this.visibilityChange);
+    ["chatWrap", "infoDiv"].forEach(eltName => {
+      document.getElementById(eltName)
+        .addEventListener("click", processModalClick);
+    });
     if ("ontouchstart" in window) {
       // Disable tooltips on smartphones:
-      document.getElementsByClassName("tooltip").forEach(elt => {
+      document.querySelectorAll("#aboveBoard .tooltip").forEach(elt => {
         elt.classList.remove("tooltip");
       });
     }
   },
   beforeDestroy: function() {
+    document.removeEventListener('visibilitychange', this.visibilityChange);
     this.cleanBeforeDestroy();
   },
   methods: {
+    visibilityChange: function() {
+      // TODO: Use document.hidden? https://webplatform.news/issues/2019-03-27
+      this.send(
+        document.visibilityState == "visible"
+          ? "getfocus"
+          : "losefocus"
+      );
+    },
     atCreation: function() {
       // 0] (Re)Set variables
-      this.gameRef.id = this.$route.params["id"];
-      // rid = remote ID to find an observed live game,
-      // next = next corr games IDs to navigate faster
-      // (Both might be undefined)
-      this.gameRef.rid = this.$route.query["rid"];
+      this.gameRef = this.$route.params["id"];
+      // next = next corr games IDs to navigate faster (if applicable)
       this.nextIds = JSON.parse(this.$route.query["next"] || "[]");
       // 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,
+          focus: true
+        }
+      );
       this.game = {
         players: [{ name: "" }, { name: "" }],
         chats: [],
@@ -229,16 +261,15 @@ export default {
       this.virtualClocks = [[0,0], [0,0]];
       this.vr = null;
       this.drawOffer = "";
-      this.onMygames = [];
+      this.lastateAsked = false;
+      this.rematchOffer = "";
       this.lastate = undefined;
-      this.newChat = "";
       this.roomInitialized = false;
       this.askGameTime = 0;
       this.gameIsLoading = false;
       this.gotLastate = false;
       this.gotMoveIdx = -1;
       this.opponentGotMove = false;
-      this.askIfPeerConnected = null;
       this.askLastate = null;
       this.retrySendmove = null;
       this.clockUpdate = null;
@@ -249,37 +280,37 @@ export default {
         params.socketUrl +
         "/?sid=" +
         this.st.user.sid +
+        "&id=" +
+        this.st.user.id +
         "&tmpId=" +
         getRandString() +
         "&page=" +
         // Discard potential "/?next=[...]" for page indication:
         encodeURIComponent(this.$route.path.match(/\/game\/[a-zA-Z0-9]+/)[0]);
       this.conn = new WebSocket(this.connexionString);
-      this.conn.onmessage = this.socketMessageListener;
-      this.conn.onclose = this.socketCloseListener;
+      this.conn.addEventListener("message", this.socketMessageListener);
+      this.conn.addEventListener("close", this.socketCloseListener);
       // Socket init required before loading remote game:
       const socketInit = callback => {
-        if (!!this.conn && this.conn.readyState == 1)
+        if (this.conn.readyState == 1)
           // 1 == OPEN state
           callback();
         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.
+          // NOTE: first arg is Websocket object, unused here:
           this.conn.onopen = () => callback();
       };
-      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
-        // NOTE: the callback "roomInit" will be lost, so we don't provide it.
-        // --> It will be given when receiving "fullgame" socket event.
-        socketInit(this.loadGame);
+      this.fetchGame((game) => {
+        if (!!game)
+          this.loadVariantThenGame(game, () => socketInit(this.roomInit));
+        else
+          // Live 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.
+          socketInit(() => { this.send("askfullgame"); });
+      });
     },
     cleanBeforeDestroy: function() {
-      if (!!this.askIfPeerConnected)
-        clearInterval(this.askIfPeerConnected);
       if (!!this.askLastate)
         clearInterval(this.askLastate);
       if (!!this.retrySendmove)
@@ -305,26 +336,43 @@ export default {
     },
     isConnected: function(index) {
       const player = this.game.players[index];
-      // Is it me ?
-      if (this.st.user.sid == player.sid || this.st.user.id == player.uid)
+      // Is it me ? In this case no need to bother with focus
+      if (this.st.user.sid == player.sid || this.st.user.id == player.id)
         // Still have to check for name (because of potential multi-accounts
         // on same browser, although this should be rare...)
         return (!this.st.user.name || this.st.user.name == player.name);
       // Try to find a match in people:
       return (
         (
-          player.sid &&
-          Object.keys(this.people).some(sid => sid == player.sid)
+          !!player.sid &&
+          Object.keys(this.people).some(sid =>
+            sid == player.sid && this.people[sid].focus)
         )
         ||
         (
-          player.uid &&
-          Object.values(this.people).some(p => p.id == player.uid)
+          !!player.id &&
+          Object.values(this.people).some(p =>
+            p.id == player.id && p.focus)
         )
       );
     },
-    resetChatColor: function() {
-      // TODO: this is called twice, once on opening an once on closing
+    getOppsid: function() {
+      let oppsid = this.game.oppsid;
+      if (!oppsid) {
+        oppsid = Object.keys(this.people).find(
+          sid => this.people[sid].id == this.game.oppid
+        );
+      }
+      // oppsid is useful only if opponent is online:
+      if (!!oppsid && !!this.people[oppsid]) return oppsid;
+      return null;
+    },
+    toggleChat: function() {
+      if (document.getElementById("modalChat").checked)
+        // Entering chat
+        document.getElementById("inputChat").focus();
+      // TODO: next line is only required when exiting chat,
+      // but the event for now isn't well detected.
       document.getElementById("chatBtn").classList.remove("somethingnew");
     },
     processChat: function(chat) {
@@ -336,22 +384,30 @@ export default {
     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});
+        if (!!this.game.mycolor) {
+          ajax(
+            "/chats",
+            "DELETE",
+            { data: { 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.uid == 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 });
+    getGameType: function(game) {
+      return game.cadence.indexOf("d") >= 0 ? "corr" : "live";
+    },
+    // Notify something after a new move (to opponent and me on MyGames page)
+    notifyMyGames: function(thing, data) {
+      this.send(
+        "notify" + thing,
+        {
+          data: data,
+          targets: this.game.players.map(p => {
+            return { sid: p.sid, id: p.id };
+          })
+        }
+      );
     },
     showNextGame: function() {
       // Did I play in current game? If not, add it to nextIds list
@@ -361,35 +417,20 @@ export default {
       this.$router.push(
         "/game/" + nextGid + "/?next=" + JSON.stringify(this.nextIds));
     },
-    rematch: function() {
-      alert("Unimplemented yet (soon :) )");
-      // TODO: same logic as for draw, but re-click remove rematch offer (toggle)
-    },
     askGameAgain: function() {
       this.gameIsLoading = true;
       const currentUrl = document.location.href;
       const doAskGame = () => {
-        if (currentUrl != document.location.href) return; //page change
-        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 :/
-          this.send("askfullgame", { target: this.gameRef.rid });
-          this.askIfPeerConnected = setInterval(
-            () => {
-              if (
-                !!this.people[this.gameRef.rid] &&
-                currentUrl != document.location.href
-              ) {
-                this.send("askfullgame", { target: this.gameRef.rid });
-                clearInterval(this.askIfPeerConnected);
-              }
-            },
-            1000
-          );
-        }
+        if (document.location.href != currentUrl) return; //page change
+        this.fetchGame((game) => {
+          if (!!game)
+            // This is my game: just reload.
+            this.loadGame(game);
+          else
+            // Just ask fullgame again (once!), this is much simpler.
+            // If this fails, the user could just reload page :/
+            this.send("askfullgame");
+        });
       };
       // Delay of at least 2s between two game requests
       const now = Date.now();
@@ -402,13 +443,18 @@ export default {
       const data = JSON.parse(msg.data);
       switch (data.code) {
         case "pollclients":
+          // TODO: shuffling and random filtering on server, if
+          // the room is really crowded.
           data.sockIds.forEach(sid => {
-            if (sid != this.st.user.sid)
+            if (sid != this.st.user.sid) {
+              this.people[sid] = { focus: true };
               this.send("askidentity", { target: sid });
+            }
           });
           break;
         case "connect":
           if (!this.people[data.from]) {
+            this.people[data.from] = { focus: true };
             this.newConnect[data.from] = true; //for self multi-connects tests
             this.send("askidentity", { target: data.from });
           }
@@ -416,24 +462,26 @@ export default {
         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)
+        case "getfocus": {
+          let player = this.people[data.from];
+          if (!!player) {
+            player.focus = true;
+            this.$forceUpdate(); //TODO: shouldn't be required
           }
           break;
-          if (!this.people[sid])
-            this.send("askidentity", { target: sid });
         }
-        case "mdisconnect":
-          ArrayFun.remove(this.onMygames, sid => sid == data.from);
+        case "losefocus": {
+          let player = this.people[data.from];
+          if (!!player) {
+            player.focus = false;
+            this.$forceUpdate(); //TODO: shouldn't be required
+          }
           break;
+        }
         case "killed":
           // I logged in elsewhere:
+          this.conn.removeEventListener("message", this.socketMessageListener);
+          this.conn.removeEventListener("close", this.socketCloseListener);
           this.conn = null;
           alert(this.st.tr["New connexion detected: tab now offline"]);
           break;
@@ -450,7 +498,11 @@ export default {
         }
         case "identity": {
           const user = data.data;
-          this.$set(this.people, user.sid, { name: user.name, id: user.id });
+          let player = this.people[user.sid];
+          // player.focus is already set
+          player.name = user.name;
+          player.id = user.id;
+          this.$forceUpdate(); //TODO: shouldn't be required
           // If I multi-connect, kill current connexion if no mark (I'm older)
           if (this.newConnect[user.sid]) {
             if (
@@ -473,15 +525,23 @@ export default {
               this.game.players.some(p => p.sid == user.sid)
             ) {
               this.send("asklastate", { target: user.sid });
+              let counter = 1;
               this.askLastate = setInterval(
                 () => {
-                  // Ask until we got a reply (or opponent disconnect):
-                  if (!this.gotLastate && !!this.people[user.sid])
+                  // Ask at most 3 times:
+                  // if no reply after that there should be a network issue.
+                  if (
+                    counter < 3 &&
+                    !this.gotLastate &&
+                    !!this.people[user.sid]
+                  ) {
                     this.send("asklastate", { target: user.sid });
-                  else
+                    counter++;
+                  } else {
                     clearInterval(this.askLastate);
+                  }
                 },
-                1000
+                1500
               );
             }
           }
@@ -499,8 +559,7 @@ export default {
               players: this.game.players,
               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
+              score: this.game.score
             };
             this.send("game", { data: myGame, target: data.from });
           }
@@ -510,7 +569,7 @@ export default {
             .filter(k =>
               [
                 "id","fen","players","vid","cadence","fenStart","vname",
-                "moves","clocks","initime","score","drawOffer"
+                "moves","clocks","score","drawOffer","rematchOffer"
               ].includes(k))
             .reduce(
               (obj, k) => {
@@ -523,43 +582,22 @@ export default {
           break;
         case "fullgame":
           // Callback "roomInit" to poll clients only after game is loaded
-          this.loadGame(data.data, this.roomInit);
+          this.loadVariantThenGame(data.data, this.roomInit);
           break;
         case "asklastate":
           // 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 myLastate = {
-              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
-            };
-            this.send("lastate", { data: myLastate, target: data.from });
-          } else {
-            this.send("lastate", { data: {nothing: true}, target: data.from });
-          }
+          // If the game or moves aren't loaded yet, delay the sending:
+          if (!this.game || !this.game.moves) this.lastateAsked = true;
+          else this.sendLastate(data.from);
           break;
         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
-          }
+          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": {
@@ -594,16 +632,15 @@ export default {
                   !!this.game.mycolor &&
                   !receiveMyMove
                 ) {
-                  GameStorage.update(this.gameRef.id, { drawOffer: "" });
+                  GameStorage.update(this.gameRef, { drawOffer: "" });
                 }
               }
               this.$refs["basegame"].play(movePlus.move, "received", null, true);
+              const moveColIdx = ["w", "b"].indexOf(movePlus.color);
+              this.game.clocks[moveColIdx] = movePlus.clock;
               this.processMove(
                 movePlus.move,
-                {
-                  addTime: movePlus.addTime,
-                  receiveMyMove: receiveMyMove
-                }
+                { receiveMyMove: receiveMyMove }
               );
             }
           }
@@ -611,11 +648,14 @@ export default {
         }
         case "gotmove": {
           this.opponentGotMove = true;
+          // Now his clock starts running on my side:
+          const oppIdx = ['w','b'].indexOf(this.vr.turn);
+          this.re_setClocks();
           break;
         }
         case "resign":
-          const score = data.side == "b" ? "1-0" : "0-1";
-          const side = data.side == "w" ? "White" : "Black";
+          const score = (data.data == "b" ? "1-0" : "0-1");
+          const side = (data.data == "w" ? "White" : "Black");
           this.gameOver(score, side + " surrender");
           break;
         case "abort":
@@ -627,9 +667,45 @@ export default {
         case "drawoffer":
           // NOTE: observers don't know who offered draw
           this.drawOffer = "received";
+          if (this.game.type == "live") {
+            GameStorage.update(
+              this.gameRef,
+              { drawOffer: V.GetOppCol(this.game.mycolor) }
+            );
+          }
+          break;
+        case "rematchoffer":
+          // NOTE: observers don't know who offered rematch
+          this.rematchOffer = data.data ? "received" : "";
+          if (this.game.type == "live") {
+            GameStorage.update(
+              this.gameRef,
+              { rematchOffer: V.GetOppCol(this.game.mycolor) }
+            );
+          }
+          break;
+        case "newgame": {
+          // A game started, redirect if I'm playing in
+          const gameInfo = data.data;
+          const gameType = this.getGameType(gameInfo);
+          if (
+            gameType == "live" &&
+            gameInfo.players.some(p => p.sid == this.st.user.sid)
+          ) {
+            this.addAndGotoLiveGame(gameInfo);
+          } else if (
+            gameType == "corr" &&
+            gameInfo.players.some(p => p.id == this.st.user.id)
+          ) {
+            this.$router.push("/game/" + gameInfo.id);
+          } else {
+            this.rematchId = gameInfo.id;
+            document.getElementById("modalInfo").checked = true;
+          }
           break;
+        }
         case "newchat":
-          this.newChat = data.data;
+          this.$refs["chatcomp"].newChat(data.data);
           if (!document.getElementById("modalChat").checked)
             document.getElementById("chatBtn").classList.add("somethingnew");
           break;
@@ -645,34 +721,57 @@ export default {
         "/games",
         "PUT",
         {
-          gid: this.gameRef.id,
-          newObj: obj
-        },
-        () => {
-          if (!!callback) callback();
+          data: {
+            gid: this.gameRef,
+            newObj: obj
+          },
+          success: () => {
+            if (!!callback) callback();
+          }
         }
       );
     },
+    sendLastate: function(target) {
+      // Send our "last state" informations to opponent
+      const L = this.game.moves.length;
+      const myIdx = ["w", "b"].indexOf(this.game.mycolor);
+      const myLastate = {
+        lastMove:
+          (L > 0 && this.vr.turn != this.game.mycolor)
+            ? this.game.moves[L - 1]
+            : undefined,
+        clock: this.game.clocks[myIdx],
+        // Since we played a move (or abort or resign),
+        // only drawOffer=="sent" is possible
+        drawSent: this.drawOffer == "sent",
+        rematchSent: this.rematchOffer == "sent",
+        score: this.game.score != "*" ? this.game.score : undefined,
+        scoreMsg: this.game.score != "*" ? this.game.scoreMsg : undefined,
+        movesCount: L
+      };
+      this.send("lastate", { data: myLastate, target: target });
+    },
     // 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;
+      const oppIdx = 1 - ["w", "b"].indexOf(this.game.mycolor);
+      this.game.clocks[oppIdx] = data.clock;
       if (data.movesCount > L) {
         // Just got last move from him
-        this.$refs["basegame"].play(
-          data.lastMove,
-          "received",
-          null,
-          {addTime: data.addTime, initime: data.initime}
-        );
+        this.$refs["basegame"].play(data.lastMove, "received", null, true);
+        this.processMove(data.lastMove);
+      } else {
+        clearInterval(this.clockUpdate);
+        this.re_setClocks();
       }
       if (data.drawSent) this.drawOffer = "received";
-      if (data.score != "*") {
+      if (data.rematchSent) this.rematchOffer = "received";
+      if (!!data.score) {
         this.drawOffer = "";
         if (this.game.score == "*")
-          // TODO: also pass scoreMsg in lastate
-          this.gameOver(data.score);
+          this.gameOver(data.score, data.scoreMsg);
       }
     },
     clickDraw: function() {
@@ -696,12 +795,96 @@ export default {
         this.send("drawoffer");
         if (this.game.type == "live") {
           GameStorage.update(
-            this.gameRef.id,
+            this.gameRef,
             { drawOffer: this.game.mycolor }
           );
         } else this.updateCorrGame({ drawOffer: this.game.mycolor });
       }
     },
+    addAndGotoLiveGame: function(gameInfo, callback) {
+      const game = Object.assign(
+        {},
+        gameInfo,
+        {
+          // (other) Game infos: constant
+          fenStart: gameInfo.fen,
+          vname: this.game.vname,
+          created: Date.now(),
+          // Game state (including FEN): will be updated
+          moves: [],
+          clocks: [-1, -1], //-1 = unstarted
+          score: "*"
+        }
+      );
+      GameStorage.add(game, (err) => {
+        // No error expected.
+        if (!err) {
+          if (this.st.settings.sound)
+            new Audio("/sounds/newgame.flac").play().catch(() => {});
+          if (!!callback) callback();
+          this.$router.push("/game/" + gameInfo.id);
+        }
+      });
+    },
+    clickRematch: function() {
+      if (!this.game.mycolor) return; //I'm just spectator
+      if (this.rematchOffer == "received") {
+        // Start a new game!
+        let gameInfo = {
+          id: getRandString(), //ignored if corr
+          fen: V.GenRandInitFen(this.game.randomness),
+          players: this.game.players.reverse(),
+          vid: this.game.vid,
+          cadence: this.game.cadence
+        };
+        const notifyNewGame = () => {
+          const oppsid = this.getOppsid(); //may be null
+          this.send("rnewgame", { data: gameInfo, oppsid: oppsid });
+          // To main Hall if corr game:
+          if (this.game.type == "corr")
+            this.send("newgame", { data: gameInfo });
+          // Also to MyGames page:
+          this.notifyMyGames("newgame", gameInfo);
+        };
+        if (this.game.type == "live")
+          this.addAndGotoLiveGame(gameInfo, notifyNewGame);
+        else {
+          // corr game
+          ajax(
+            "/games",
+            "POST",
+            {
+              // cid is useful to delete the challenge:
+              data: { gameInfo: gameInfo },
+              success: (response) => {
+                gameInfo.id = response.gameId;
+                notifyNewGame();
+                this.$router.push("/game/" + response.gameId);
+              }
+            }
+          );
+        }
+      } else if (this.rematchOffer == "") {
+        this.rematchOffer = "sent";
+        this.send("rematchoffer", { data: true });
+        if (this.game.type == "live") {
+          GameStorage.update(
+            this.gameRef,
+            { rematchOffer: this.game.mycolor }
+          );
+        } else this.updateCorrGame({ rematchOffer: this.game.mycolor });
+      } else if (this.rematchOffer == "sent") {
+        // Toggle rematch offer (on --> off)
+        this.rematchOffer = "";
+        this.send("rematchoffer", { data: false });
+        if (this.game.type == "live") {
+          GameStorage.update(
+            this.gameRef,
+            { rematchOffer: '' }
+          );
+        } else this.updateCorrGame({ rematchOffer: 'n' });
+      }
+    },
     abortGame: function() {
       if (!this.game.mycolor || !confirm(this.st.tr["Terminate game?"])) return;
       this.gameOver("?", "Stop");
@@ -711,272 +894,296 @@ export default {
       if (!this.game.mycolor || !confirm(this.st.tr["Resign the game?"]))
         return;
       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";
+      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 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 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") {
-            // Adopt the same convention for live and corr games: [0] = white
-            [game.players[0], game.players[1]] = [
-              game.players[1],
-              game.players[0]
-            ];
-          }
-          // NOTE: clocks in seconds, initime in milliseconds
-          game.moves.sort((m1, m2) => m1.idx - m2.idx); //in case of
-          game.clocks = [tc.mainTime, tc.mainTime];
-          const L = game.moves.length;
-          if (game.score == "*") {
-            // Set clocks + initime
-            game.initime = [0, 0];
-            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;
-              }
-            }
+      this.vr = new V(game.fen);
+      const gtype = this.getGameType(game);
+      const tc = extractTime(game.cadence);
+      const myIdx = game.players.findIndex(p => {
+        return p.sid == this.st.user.sid || p.id == 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") {
+        // NOTE: clocks in seconds
+        game.moves.sort((m1, m2) => m1.idx - m2.idx); //in case of
+        game.clocks = [tc.mainTime, tc.mainTime];
+        const L = game.moves.length;
+        if (game.score == "*") {
+          // Adjust clocks
+          if (L >= 2) {
+            game.clocks[L % 2] -=
+              (Date.now() - game.moves[L-1].played) / 1000;
           }
-          // Sort chat messages from newest to oldest
-          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;
-            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;
-              }
+        }
+        // Sort chat messages from newest to oldest
+        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;
+          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 = game.moves.map(m => m.squares);
+          if (dtLastMove < game.chats[0].added)
+            document.getElementById("chatBtn").classList.add("somethingnew");
         }
-        if (gtype == "live" && game.clocks[0] < 0) {
-          // Game is unstarted
+        // Now that we used idx and played, re-format moves as for live games
+        game.moves = game.moves.map(m => m.squares);
+      }
+      if (gtype == "live") {
+        if (game.clocks[0] < 0) {
+          // Game is unstarted. clock is ignored until move 2
           game.clocks = [tc.mainTime, tc.mainTime];
-          if (game.score == "*") {
-            game.initime[0] = Date.now();
-            if (myIdx >= 0) {
-              // I play in this live game; corr games don't have clocks+initime
-              GameStorage.update(game.id, {
-                clocks: game.clocks,
-                initime: game.initime
-              });
-            }
+          if (myIdx >= 0) {
+            // I play in this live game
+            GameStorage.update(game.id, {
+              clocks: game.clocks
+            });
           }
+        } else {
+          if (!!game.initime)
+            // It's my turn: clocks not updated yet
+            game.clocks[myIdx] -= (Date.now() - game.initime) / 1000;
         }
-        if (!!game.drawOffer) {
-          if (game.drawOffer == "t")
-            // Three repetitions
-            this.drawOffer = "threerep";
+      }
+      // TODO: merge next 2 "if" conditions
+      if (!!game.drawOffer) {
+        if (game.drawOffer == "t")
+          // Three repetitions
+          this.drawOffer = "threerep";
+        else {
+          // Draw offered by any of the players:
+          if (myIdx < 0) this.drawOffer = "received";
           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)
-              )
-                this.drawOffer = "sent";
-              else this.drawOffer = "received";
-            }
+            // I play in this game:
+            if (
+              (game.drawOffer == "w" && myIdx == 0) ||
+              (game.drawOffer == "b" && myIdx == 1)
+            )
+              this.drawOffer = "sent";
+            else this.drawOffer = "received";
           }
         }
-        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,
-            increment: tc.increment,
-            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,
-            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();
+      }
+      if (!!game.rematchOffer) {
+        if (myIdx < 0) this.rematchOffer = "received";
         else {
-          // Initial loading:
-          this.gotMoveIdx = game.moves.length - 1;
-          // If we arrive here after 'nextGame' action, the board might be hidden
-          let boardDiv = document.querySelector(".game");
-          if (!!boardDiv && boardDiv.style.visibility == "hidden")
-            boardDiv.style.visibility = "visible";
-        }
-        this.re_setClocks();
-        this.$nextTick(() => {
-          this.game.rendered = true;
-          // Did lastate arrive before game was rendered?
-          if (this.lastate) this.processLastate();
-        });
-        if (this.gameIsLoading) {
-          this.gameIsLoading = false;
-          if (this.gotMoveIdx >= game.moves.length)
-            // Some moves arrived meanwhile...
-            this.askGameAgain();
+          // I play in this game:
+          if (
+            (game.rematchOffer == "w" && myIdx == 0) ||
+            (game.rematchOffer == "b" && myIdx == 1)
+          )
+            this.rematchOffer = "sent";
+          else this.rematchOffer = "received";
         }
-        if (!!callback) callback();
-      };
-      if (!!game) {
-        afterRetrieval(game);
-        return;
       }
-      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 on server.
-        // NOTE: afterRetrieval() is never called if game not found
-        const gid = this.gameRef.id;
-        if (Number.isInteger(gid) || !isNaN(parseInt(gid))) {
-          // corr games identifiers are integers
-          ajax("/games", "GET", { gid: gid }, res => {
-            let g = res.game;
-            g.moves.forEach(m => {
-              m.squares = JSON.parse(m.squares);
-            });
-            afterRetrieval(g);
-          });
-        }
-        else
-          // Local game
-          GameStorage.get(this.gameRef.id, afterRetrieval);
+      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,
+          increment: tc.increment,
+          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].id
+        },
+        game
+      );
+      this.$refs["basegame"].re_setVariables(this.game);
+      if (!this.gameIsLoading) {
+        // Initial loading:
+        this.gotMoveIdx = game.moves.length - 1;
+        // If we arrive here after 'nextGame' action, the board might be hidden
+        let boardDiv = document.querySelector(".game");
+        if (!!boardDiv && boardDiv.style.visibility == "hidden")
+          boardDiv.style.visibility = "visible";
       }
+      this.re_setClocks();
+      this.$nextTick(() => {
+        this.game.rendered = true;
+        // Did lastate arrive before game was rendered?
+        if (this.lastate) this.processLastate();
+      });
+      if (this.lastateAsked) {
+        this.lastateAsked = false;
+        this.sendLastate(game.oppsid);
+      }
+      if (this.gameIsLoading) {
+        this.gameIsLoading = false;
+        if (this.gotMoveIdx >= game.moves.length)
+          // Some moves arrived meanwhile...
+          this.askGameAgain();
+      }
+      if (!!callback) callback();
+    },
+    loadVariantThenGame: async function(game, callback) {
+      await import("@/variants/" + game.vname + ".js")
+      .then((vModule) => {
+        window.V = vModule[game.vname + "Rules"];
+        this.loadGame(game, callback);
+      });
+    },
+    // 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)
+    fetchGame: function(callback) {
+      if (Number.isInteger(this.gameRef) || !isNaN(parseInt(this.gameRef))) {
+        // corr games identifiers are integers
+        ajax(
+          "/games",
+          "GET",
+          {
+            data: { gid: this.gameRef },
+            success: (res) => {
+              res.game.moves.forEach(m => {
+                m.squares = JSON.parse(m.squares);
+              });
+              callback(res.game);
+            }
+          }
+        );
+      } else
+        // Local game (or live remote)
+        GameStorage.get(this.gameRef, callback);
     },
     re_setClocks: function() {
+      this.virtualClocks = this.game.clocks.map(s => ppt(s).split(':'));
       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).split(':'));
         return;
       }
       const currentTurn = this.vr.turn;
       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(':');
-      });
-      this.clockUpdate = setInterval(() => {
-        if (
-          countdown < 0 ||
-          this.game.moves.length > currentMovesCount ||
-          this.game.score != "*"
-        ) {
-          clearInterval(this.clockUpdate);
-          if (countdown < 0)
-            this.gameOver(
-              currentTurn == "w" ? "0-1" : "1-0",
-              "Time"
+      this.clockUpdate = setInterval(
+        () => {
+          if (
+            this.game.clocks[colorIdx] < 0 ||
+            this.game.moves.length > currentMovesCount ||
+            this.game.score != "*"
+          ) {
+            clearInterval(this.clockUpdate);
+            if (this.game.clocks[colorIdx] < 0)
+              this.gameOver(
+                currentTurn == "w" ? "0-1" : "1-0",
+                "Time"
+              );
+          } else {
+            this.$set(
+              this.virtualClocks,
+              colorIdx,
+              ppt(Math.max(0, --this.game.clocks[colorIdx])).split(':')
             );
-        } else
-          this.$set(
-            this.virtualClocks,
-            colorIdx,
-            ppt(Math.max(0, --countdown)).split(':')
-          );
-      }, 1000);
+          }
+        },
+        1000
+      );
     },
     // Update variables and storage after a move:
     processMove: function(move, data) {
       if (!data) data = {};
       const moveCol = this.vr.turn;
+      const colorIdx = ["w", "b"].indexOf(moveCol);
+      const nextIdx = 1 - colorIdx;
       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;
+        // The move is (about to be) played: stop clock
+        clearInterval(this.clockUpdate);
         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;
+            this.game.clocks[colorIdx] += this.game.increment;
+            // For a correct display in casqe of disconnected opponent:
+            this.$set(
+              this.virtualClocks,
+              colorIdx,
+              ppt(this.game.clocks[colorIdx]).split(':')
+            );
+            GameStorage.update(this.gameRef, {
+              // It's not my turn anymore:
+              initime: null
+            });
           }
         }
         // Update current game object:
         playMove(move, this.vr);
-        if (!data.score) {
-          // Received move, score has not been computed in BaseGame (!!noemit)
-          const score = this.vr.getCurrentScore();
-          if (score != "*") this.gameOver(score);
-        }
-// TODO: notifyTurn: "changeturn" message
+        if (!data.score)
+          // Received move, score is computed in BaseGame, but maybe not yet.
+          // ==> Compute it here, although this is redundant (TODO)
+          data.score = this.vr.getCurrentScore();
+        if (data.score != "*") this.gameOver(data.score);
         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();
+        if (this.game.type == "corr") {
+          // In corr games, just reset clock to mainTime:
+          this.game.clocks[colorIdx] = extractTime(this.game.cadence).mainTime;
+        }
         // 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;
+        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 = "";
         if (!!this.game.mycolor && !data.receiveMyMove) {
           // NOTE: 'var' to see that variable outside this block
           var filtered_move = getFilteredMove(move);
         }
+        if (moveCol == this.game.mycolor && !data.receiveMyMove) {
+          // Notify turn on MyGames page:
+          this.notifyMyGames(
+            "turn",
+            {
+              gid: this.gameRef,
+              turn: 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" &&
+          !!this.game.mycolor &&
+          moveCol != this.game.mycolor &&
+          this.game.moves.length >= 2
+        ) {
+          // Receive a move: update initime
+          this.game.initime = Date.now();
+          GameStorage.update(this.gameRef, {
+            // It's my turn now!
+            initime: this.game.initime
+          });
+        }
         if (
           !!this.game.mycolor &&
           !data.receiveMyMove &&
@@ -1000,7 +1207,6 @@ export default {
               fen: this.game.fen,
               move: {
                 squares: filtered_move,
-                played: Date.now(),
                 idx: origMovescount
               },
               // Code "n" for "None" to force reset (otherwise it's ignored)
@@ -1009,12 +1215,11 @@ export default {
           }
           else {
             const updateStorage = () => {
-              GameStorage.update(this.gameRef.id, {
+              GameStorage.update(this.gameRef, {
                 fen: this.game.fen,
                 move: filtered_move,
                 moveIdx: origMovescount,
                 clocks: this.game.clocks,
-                initime: this.game.initime,
                 drawOffer: drawCode
               });
             };
@@ -1026,112 +1231,110 @@ export default {
         }
         // Send move ("newmove" event) to people in the room (if our turn)
         if (moveCol == this.game.mycolor && !data.receiveMyMove) {
-          const sendMove = {
+          let sendMove = {
             move: filtered_move,
             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 == ""
           };
+          if (this.game.type == "live")
+            sendMove["clock"] = this.game.clocks[colorIdx];
+          // (Live) Clocks will re-start when the opponent pingback arrive
           this.opponentGotMove = false;
           this.send("newmove", {data: sendMove});
           // If the opponent doesn't reply gotmove soon enough, re-send move:
+          // Do this at most 2 times, because mpore would mean network issues,
+          // opponent would then be expected to disconnect/reconnect.
+          let counter = 1;
+          const currentUrl = document.location.href;
           this.retrySendmove = setInterval(
             () => {
-              if (this.opponentGotMove) {
+              if (
+                counter >= 3 ||
+                this.opponentGotMove ||
+                document.location.href != currentUrl //page change
+              ) {
                 clearInterval(this.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])
+              const oppsid = this.getOppsid();
+              if (!oppsid)
                 // Opponent is disconnected: he'll ask last state
                 clearInterval(this.retrySendmove);
-              else this.send("newmove", {data: sendMove, target: oppsid});
+              else {
+                this.send("newmove", { data: sendMove, target: oppsid });
+                counter++;
+              }
             },
-            1000
+            1500
           );
         }
+        else
+          // Not my move or I'm an observer: just start other player's clock
+          this.re_setClocks();
       };
       if (
         this.game.type == "corr" &&
         moveCol == this.game.mycolor &&
         !data.receiveMyMove
       ) {
+        let boardDiv = document.querySelector(".game");
         const afterSetScore = () => {
           doProcessMove();
           if (this.st.settings.gotonext && this.nextIds.length > 0)
             this.showNextGame();
           else {
-            this.re_setClocks();
             // The board might have been hidden:
-            let boardDiv = document.querySelector(".game");
             if (boardDiv.style.visibility == "hidden")
               boardDiv.style.visibility = "visible";
+            if (data.score == "*") this.re_setClocks();
           }
         };
+        let el = document.querySelector("#buttonsConfirm > .acceptBtn");
+        // We may play several moves in a row: in case of, remove listener:
+        let elClone = el.cloneNode(true);
+        el.parentNode.replaceChild(elClone, el);
+        elClone.addEventListener(
+          "click",
+          () => {
+            document.getElementById("modalConfirm").checked = false;
+            if (!!data.score && data.score != "*")
+              // Set score first
+              this.gameOver(data.score, null, afterSetScore);
+            else afterSetScore();
+          }
+        );
+        // PlayOnBoard is enough, and more appropriate for Synchrone Chess
+        V.PlayOnBoard(this.vr.board, move);
+        const position = this.vr.getBaseFen();
+        V.UndoOnBoard(this.vr.board, move);
         if (["all","byrow"].includes(V.ShowMoves)) {
-          let el = document.querySelector("#buttonsConfirm > .acceptBtn");
-          // We may play several moves in a row: in case of, remove listener:
-          let elClone = el.cloneNode(true);
-          el.parentNode.replaceChild(elClone, el);
-          elClone.addEventListener(
-            "click",
-            () => {
-              document.getElementById("modalConfirm").checked = false;
-              if (!!data.score && data.score != "*")
-                // Set score first
-                this.gameOver(data.score, null, afterSetScore);
-              else afterSetScore();
-            }
-          );
-          // PlayOnBoard is enough, and more appropriate for Synchrone Chess
-          V.PlayOnBoard(this.vr.board, move);
-          const position = this.vr.getBaseFen();
-          V.UndoOnBoard(this.vr.board, move);
           this.curDiag = getDiagram({
             position: position,
             orientation: V.CanFlip ? this.game.mycolor : "w"
           });
-          document.getElementById("modalConfirm").checked = true;
+          document.querySelector("#confirmDiv > .card").style.width =
+            boardDiv.offsetWidth + "px";
         } else {
           // Incomplete information: just ask confirmation
-          // Hide the board, because otherwise it could be revealed (TODO?)
-          let boardDiv = document.querySelector(".game");
+          // Hide the board, because otherwise it could reveal infos
           boardDiv.style.visibility = "hidden";
-          if (
-            !confirm(
-              this.st.tr["Move played:"] + " " +
-              getFullNotation(move) + "\n" +
-              this.st.tr["Are you sure?"]
-            )
-          ) {
-            this.$refs["basegame"].cancelLastMove();
-            boardDiv.style.visibility = "visible";
-            return;
-          }
-          if (!!data.score && data.score != "*")
-            this.gameOver(data.score, null, afterSetScore);
-          else afterSetScore();
+          this.moveNotation = getFullNotation(move);
         }
+        document.getElementById("modalConfirm").checked = true;
       }
       else {
         // Normal situation
-        const afterSetScore = () => {
-          doProcessMove();
-          this.re_setClocks();
-        };
         if (!!data.score && data.score != "*")
-          this.gameOver(data.score, null, afterSetScore);
-        else afterSetScore();
+          this.gameOver(data.score, null, doProcessMove);
+        else doProcessMove();
       }
     },
     cancelMove: function() {
+      let boardDiv = document.querySelector(".game");
+      if (boardDiv.style.visibility == "hidden")
+        boardDiv.style.visibility = "visible";
       document.getElementById("modalConfirm").checked = false;
       this.$refs["basegame"].cancelLastMove();
     },
@@ -1139,9 +1342,10 @@ export default {
     gameOver: function(score, scoreMsg, callback) {
       this.game.score = score;
       if (!scoreMsg) scoreMsg = getScoreMessage(score);
+      this.game.scoreMsg = scoreMsg;
       this.$set(this.game, "scoreMsg", scoreMsg);
       const myIdx = this.game.players.findIndex(p => {
-        return p.sid == this.st.user.sid || p.uid == this.st.user.id;
+        return p.sid == this.st.user.sid || p.id == this.st.user.id;
       });
       if (myIdx >= 0) {
         // OK, I play in this game
@@ -1150,12 +1354,20 @@ export default {
           scoreMsg: scoreMsg
         };
         if (this.game.type == "live") {
-          GameStorage.update(this.gameRef.id, scoreObj);
+          GameStorage.update(this.gameRef, scoreObj);
           if (!!callback) callback();
         }
         else this.updateCorrGame(scoreObj, callback);
         // Notify the score to main Hall. TODO: only one player (currently double send)
         this.send("result", { gid: this.game.id, score: score });
+        // Also to MyGames page (TODO: doubled as well...)
+        this.notifyMyGames(
+          "score",
+          {
+            gid: this.gameRef,
+            score: score
+          }
+        );
       }
       else if (!!callback) callback();
     }
@@ -1164,6 +1376,10 @@ export default {
 </script>
 
 <style lang="sass" scoped>
+#infoDiv > .card
+  padding: 15px 0
+  max-width: 430px
+
 .connected
   background-color: lightgreen
 
@@ -1193,7 +1409,7 @@ button
   margin: 0
   display: inline-flex
   img
-    height: 24px
+    height: 22px
     display: flex
     @media screen and (max-width: 767px)
       height: 18px
@@ -1264,13 +1480,17 @@ span.yourturn
 .draw-threerep, .draw-threerep:hover
   background-color: #e4d1fc
 
+.rematch-sent, .rematch-sent:hover
+  background-color: lightyellow
+
+.rematch-received, .rematch-received:hover
+  background-color: lightgreen
+
 .somethingnew
   background-color: #c5fefe
 
 .diagram
   margin: 0 auto
-  max-width: 400px
-  // width: 100% required for Firefox
   width: 100%
 
 #buttonsConfirm