X-Git-Url: https://git.auder.net/?p=vchess.git;a=blobdiff_plain;f=client%2Fsrc%2Fviews%2FMyGames.vue;h=a29e0e98170fbd1bfd6162eadd815c9104daf95d;hp=4b5e33c2e440056167ce8ca7d5a0c8bec58c713b;hb=107dc1bd5361e2538b1551bdcc37c1e90a444b83;hpb=aae89b49a846b2c101d74db7dff9151392d6db34

diff --git a/client/src/views/MyGames.vue b/client/src/views/MyGames.vue
index 4b5e33c2..a29e0e98 100644
--- a/client/src/views/MyGames.vue
+++ b/client/src/views/MyGames.vue
@@ -7,31 +7,55 @@ main
           | {{ st.tr["Live games"] }}
         button.tabbtn#corrGames(@click="setDisplay('corr',$event)")
           | {{ st.tr["Correspondance games"] }}
+        button.tabbtn#importGames(@click="setDisplay('import',$event)")
+          | {{ st.tr["Imported games"] }}
       GameList(
+        ref="livegames"
         v-show="display=='live'"
         :games="liveGames"
         @show-game="showGame"
+        @abortgame="abortGame"
       )
       GameList(
         v-show="display=='corr'"
+        ref="corrgames"
         :games="corrGames"
         @show-game="showGame"
-        @abort="abortGame"
+        @abortgame="abortGame"
       )
+      UploadGame(
+        v-show="display=='import'"
+        @game-uploaded="addGameImport"
+      )
+      GameList(
+        v-show="display=='import'"
+        ref="importgames"
+        :games="importGames"
+        :show-both="true"
+        @show-game="showGame"
+      )
+      button#loadMoreBtn(
+        v-show="hasMore[display]"
+        @click="loadMore(display)"
+      )
+        | {{ st.tr["Load more"] }}
 </template>
 
 <script>
 import { store } from "@/store";
 import { GameStorage } from "@/utils/gameStorage";
+import { ImportgameStorage } from "@/utils/importgameStorage";
 import { ajax } from "@/utils/ajax";
 import { getScoreMessage } from "@/utils/scoring";
 import params from "@/parameters";
 import { getRandString } from "@/utils/alea";
 import GameList from "@/components/GameList.vue";
+import UploadGame from "@/components/UploadGame.vue";
 export default {
   name: "my-my-games",
   components: {
-    GameList
+    GameList,
+    UploadGame
   },
   data: function() {
     return {
@@ -39,90 +63,237 @@ export default {
       display: "live",
       liveGames: [],
       corrGames: [],
+      importGames: [],
+      // timestamp of last showed (oldest) game:
+      cursor: {
+        live: Number.MAX_SAFE_INTEGER,
+        "import": Number.MAX_SAFE_INTEGER,
+        corr: Number.MAX_SAFE_INTEGER
+      },
+      // hasMore == TRUE: a priori there could be more games to load
+      hasMore: {
+        live: true,
+        "import": true,
+        corr: (store.state.user.id > 0)
+      },
       conn: null,
-      connexionString: ""
+      connexionString: "",
+      socketCloseListener: 0
     };
   },
-  created: function() {
-    GameStorage.getAll(true, localGames => {
-      localGames.forEach(g => g.type = "live");
-      this.liveGames = localGames;
-    });
-    if (this.st.user.id > 0) {
-      ajax(
-        "/games",
-        "GET",
-        { uid: this.st.user.id },
-        res => {
-          let serverGames = res.games.filter(g => {
-            const mySide =
-              g.players[0].uid == this.st.user.id
-                ? "White"
-                : "Black";
-            return !g["deletedBy" + mySide];
-          });
-          serverGames.forEach(g => g.type = "corr");
-          this.corrGames = serverGames;
-      });
+  watch: {
+    $route: function(to, from) {
+      if (to.path != "/mygames") this.cleanBeforeDestroy();
     }
+  },
+  created: function() {
+    window.addEventListener("beforeunload", this.cleanBeforeDestroy);
     // Initialize connection
     this.connexionString =
       params.socketUrl +
-      "/?sid=" +
-      this.st.user.sid +
-      "&tmpId=" +
-      getRandString() +
+      "/?sid=" + this.st.user.sid +
+      "&id=" + this.st.user.id +
+      "&tmpId=" + getRandString() +
       "&page=" +
       encodeURIComponent(this.$route.path);
     this.conn = new WebSocket(this.connexionString);
     this.conn.onmessage = this.socketMessageListener;
-    this.conn.onclose = this.socketCloseListener;
+    this.socketCloseListener = setInterval(
+      () => {
+        if (this.conn.readyState == 3) {
+          // Connexion is closed: re-open
+          this.conn.removeEventListener("message", this.socketMessageListener);
+          this.conn = new WebSocket(this.connexionString);
+          this.conn.addEventListener("message", this.socketMessageListener);
+        }
+      },
+      1000
+    );
   },
   mounted: function() {
-    const showType = localStorage.getItem("type-myGames") || "live";
-    this.setDisplay(showType);
+    const adjustAndSetDisplay = () => {
+      // showType is the last type viwed by the user (default)
+      let showType = localStorage.getItem("type-myGames") || "live";
+      // Live games, my turn: highest priority:
+      if (this.liveGames.some(g => !!g.myTurn)) showType = "live";
+      // Then corr games, my turn:
+      else if (this.corrGames.some(g => !!g.myTurn)) showType = "corr";
+      else {
+        // If a listing is empty, try showing the other (if non-empty)
+        const types = ["corr", "live"];
+        for (let i of [0,1]) {
+          if (
+            this[types[i] + "Games"].length > 0 &&
+            this[types[1-i] + "Games"].length == 0
+          ) {
+            showType = types[i];
+          }
+        }
+      }
+      this.setDisplay(showType);
+    };
+    GameStorage.getRunning(localGames => {
+      localGames.forEach(g => g.type = "live");
+      this.decorate(localGames);
+      this.liveGames = localGames;
+      if (this.st.user.id > 0) {
+        // Ask running corr games first
+        ajax(
+          "/runninggames",
+          "GET",
+          {
+            credentials: true,
+            success: (res) => {
+              // These games are garanteed to not be deleted
+              this.corrGames = res.games;
+              this.corrGames.forEach(g => {
+                g.type = "corr";
+                g.score = "*";
+              });
+              this.decorate(this.corrGames);
+              // Now ask completed games (partial list)
+              this.loadMore(
+                "live",
+                () => this.loadMore("corr", () => {
+                  this.loadMore("import", adjustAndSetDisplay);
+                })
+              );
+            }
+          }
+        );
+      }
+      else {
+        this.loadMore("live", () => {
+          this.loadMore("import", adjustAndSetDisplay);
+        });
+      }
+    });
   },
   beforeDestroy: function() {
-    this.conn.send(JSON.stringify({code: "disconnect"}));
+    this.cleanBeforeDestroy();
   },
   methods: {
+    cleanBeforeDestroy: function() {
+      clearInterval(this.socketCloseListener);
+      window.removeEventListener("beforeunload", this.cleanBeforeDestroy);
+      this.conn.removeEventListener("message", this.socketMessageListener);
+      this.conn.send(JSON.stringify({code: "disconnect"}));
+      this.conn = null;
+    },
     setDisplay: function(type, e) {
       this.display = type;
       localStorage.setItem("type-myGames", type);
       let elt = e ? e.target : document.getElementById(type + "Games");
       elt.classList.add("active");
       elt.classList.remove("somethingnew"); //in case of
-      if (elt.previousElementSibling)
-        elt.previousElementSibling.classList.remove("active");
-      else elt.nextElementSibling.classList.remove("active");
+      for (let t of ["live","corr","import"]) {
+        if (t != type)
+          document.getElementById(t + "Games").classList.remove("active");
+      }
     },
-    // TODO: classifyObject is redundant (see Hall.vue)
-    classifyObject: function(o) {
-      return o.cadence.indexOf("d") === -1 ? "live" : "corr";
+    addGameImport(game) {
+      game.type = "import";
+      ImportgameStorage.add(game, (err) => {
+        if (!!err) {
+          if (err.message.indexOf("Key already exists") < 0) {
+            alert(this.st.tr["An error occurred. Try again!"]);
+            return;
+          }
+          // NOTE: since a random new ID is generated for imported games,
+          // this error will not occur.
+          else alert(this.st.tr["The game was already imported"]);
+        }
+        this.$router.push("/game/" + game.id);
+      });
     },
-    showGame: function(game) {
-      // TODO: "isMyTurn" is duplicated (see GameList component). myColor also
-      const isMyTurn = (g) => {
-        if (g.score != "*") return false;
-        const myColor =
-          g.players[0].uid == this.st.user.id ||
-          g.players[0].sid == this.st.user.sid
-            ? "w"
-            : "b";
-        const rem = g.movesCount % 2;
-        return (
-          (rem == 0 && myColor == "w") ||
-          (rem == 1 && myColor == "b")
-        );
+    tryShowNewsIndicator: function(type) {
+      if (
+        (type == "live" && this.display != "live") ||
+        (type == "corr" && this.display != "corr")
+      ) {
+        document
+          .getElementById(type + "Games")
+          .classList.add("somethingnew");
+      }
+    },
+    // Called at loading to augment games with myColor + myTurn infos
+    decorate: function(games) {
+      games.forEach(g => {
+        g.myColor =
+          (g.type == "corr" && g.players[0].id == this.st.user.id) ||
+          (g.type == "live" && g.players[0].sid == this.st.user.sid)
+            ? 'w'
+            : 'b';
+        // If game is over, myTurn doesn't exist:
+        if (g.score == "*") {
+          const rem = g.movesCount % 2;
+          if ((rem == 0 && g.myColor == 'w') || (rem == 1 && g.myColor == 'b'))
+            g.myTurn = true;
+        }
+      });
+    },
+    socketMessageListener: function(msg) {
+      if (!this.conn) return;
+      const data = JSON.parse(msg.data);
+      // NOTE: no imported games here
+      let gamesArrays = {
+        "corr": this.corrGames,
+        "live": this.liveGames
       };
-      if (game.type == "live" || !isMyTurn(game)) {
+      switch (data.code) {
+        case "notifyturn":
+        case "notifyscore": {
+          const info = data.data;
+          const type = (!!parseInt(info.gid) ? "corr" : "live");
+          let game = gamesArrays[type].find(g => g.id == info.gid);
+          // "notifything" --> "thing":
+          const thing = data.code.substr(6);
+          game[thing] = info[thing];
+          if (thing == "turn") {
+            game.myTurn = !game.myTurn;
+            if (game.myTurn) this.tryShowNewsIndicator(type);
+          } else game.myTurn = false;
+          // TODO: forcing refresh like that is ugly and wrong.
+          //       How to do it cleanly?
+          this.$refs[type + "games"].$forceUpdate();
+          break;
+        }
+        case "notifynewgame": {
+          const gameInfo = data.data;
+          // st.variants might be uninitialized,
+          // if unlucky and newgame right after connect:
+          const v = this.st.variants.find(v => v.id == gameInfo.vid);
+          const vname = !!v ? v.name : "";
+          const type = (gameInfo.cadence.indexOf('d') >= 0 ? "corr": "live");
+          let game = Object.assign(
+            {
+              vname: vname,
+              type: type,
+              score: "*",
+              created: Date.now()
+            },
+            gameInfo
+          );
+          game.myTurn =
+            (type == "corr" && game.players[0].id == this.st.user.id) ||
+            (type == "live" && game.players[0].sid == this.st.user.sid);
+          gamesArrays[type].push(game);
+          if (game.myTurn) this.tryShowNewsIndicator(type);
+          // TODO: cleaner refresh
+          this.$refs[type + "games"].$forceUpdate();
+          break;
+        }
+      }
+    },
+    showGame: function(game) {
+      if (game.type != "corr" || !game.myTurn) {
         this.$router.push("/game/" + game.id);
         return;
       }
       // It's my turn in this game. Are there others?
       let nextIds = "";
-      let otherCorrGamesMyTurn = this.corrGames.filter(
-        g => g.id != game.id && isMyTurn(g));
+      let otherCorrGamesMyTurn = this.corrGames.filter(g =>
+        g.id != game.id && !!g.myTurn);
       if (otherCorrGamesMyTurn.length > 0) {
         nextIds += "/?next=[";
         otherCorrGamesMyTurn.forEach(g => { nextIds += g.id + ","; });
@@ -139,70 +310,106 @@ export default {
           game.players[0].sid == this.st.user.sid
             ? game.players[1].sid
             : game.players[0].sid;
-        this.conn.send(
-          JSON.stringify(
-            {
-              code: "mabort",
-              gid: game.id,
-              // NOTE: target might not be online
-              target: oppsid
-            }
-          )
-        );
+        if (!!this.conn) {
+          this.conn.send(
+            JSON.stringify(
+              {
+                code: "mabort",
+                gid: game.id,
+                // NOTE: target might not be online
+                target: oppsid
+              }
+            )
+          );
+        }
       }
+      // NOTE: no imported games here
       else if (!game.deletedByWhite || !game.deletedByBlack) {
         // Set score if game isn't deleted on server:
         ajax(
           "/games",
           "PUT",
           {
-            gid: game.id,
-            newObj: {
-              score: "?",
-              scoreMsg: getScoreMessage("?")
+            data: {
+              gid: game.id,
+              newObj: {
+                score: "?",
+                scoreMsg: getScoreMessage("?")
+              }
             }
           }
         );
       }
     },
-    socketMessageListener: function(msg) {
-      const data = JSON.parse(msg.data);
-      if (data.code == "changeturn") {
-        let games = !!parseInt(data.gid)
-          ? this.corrGames
-          : this.liveGames;
-        // NOTE: new move itself is not received, because it wouldn't be used.
-        let g = games.find(g => g.id == data.gid);
-        this.$set(g, "movesCount", g.movesCount + 1);
-        if (
-          (g.type == "live" && this.display == "corr") ||
-          (g.type == "corr" && this.display == "live")
-        ) {
-          document
-            .getElementById(g.type + "Games")
-            .classList.add("somethingnew");
-        }
+    loadMore: function(type, cb) {
+      if (type == "corr" && this.st.user.id > 0) {
+        ajax(
+          "/completedgames",
+          "GET",
+          {
+            credentials: true,
+            data: { cursor: this.cursor["corr"] },
+            success: (res) => {
+              const L = res.games.length;
+              if (L > 0) {
+                this.cursor["corr"] = res.games[L - 1].created;
+                let moreGames = res.games;
+                moreGames.forEach(g => g.type = "corr");
+                this.decorate(moreGames);
+                this.corrGames = this.corrGames.concat(moreGames);
+              } else this.hasMore["corr"] = false;
+              if (!!cb) cb();
+            }
+          }
+        );
+      }
+      else if (type == "live") {
+        GameStorage.getNext(this.cursor["live"], localGames => {
+          const L = localGames.length;
+          if (L > 0) {
+            // Add "-1" because IDBKeyRange.upperBound includes boundary
+            this.cursor["live"] = localGames[L - 1].created - 1;
+            localGames.forEach(g => g.type = "live");
+            this.decorate(localGames);
+            this.liveGames = this.liveGames.concat(localGames);
+          } else this.hasMore["live"] = false;
+          if (!!cb) cb();
+        });
+      }
+      else if (type == "import") {
+        ImportgameStorage.getNext(this.cursor["import"], importGames => {
+          const L = importGames.length;
+          if (L > 0) {
+            // Add "-1" because IDBKeyRange.upperBound includes boundary
+            this.cursor["import"] = importGames[L - 1].created - 1;
+            importGames.forEach(g => g.type = "import");
+            this.importGames = this.importGames.concat(importGames);
+          } else this.hasMore["import"] = false;
+          if (!!cb) cb();
+        });
       }
-    },
-    socketCloseListener: function() {
-      this.conn = new WebSocket(this.connexionString);
-      this.conn.addEventListener("message", this.socketMessageListener);
-      this.conn.addEventListener("close", this.socketCloseListener);
     }
   }
 };
 </script>
 
-<style lang="sass">
+<style lang="sass" scoped>
 .active
-  color: #42a983
+  color: #388e3c
 
 .tabbtn
   background-color: #f9faee
 
-table.game-list
-  max-height: 100%
+button#loadMoreBtn
+  display: block
+  margin: 0 auto
 
 .somethingnew
-  background-color: #c5fefe !important
+  background-color: #90C4EC !important
+</style>
+
+<!-- Not scoped because acting on GameList -->
+<style lang="sass">
+table.game-list
+  max-height: 100%
 </style>