X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fviews%2FMyGames.vue;h=3c3b9b5aa9dbe632fdb33c1db176394e49ddb309;hb=2c5d7b20742b802d9c47916915c1114bcfc9a9c3;hp=5faae8a5362f0189781ef51f4b99a2a8c4aeac8c;hpb=28b32b4fc7c23b1c72bed68e1897576c5be46c3d;p=vchess.git

diff --git a/client/src/views/MyGames.vue b/client/src/views/MyGames.vue
index 5faae8a5..3c3b9b5a 100644
--- a/client/src/views/MyGames.vue
+++ b/client/src/views/MyGames.vue
@@ -8,6 +8,7 @@ main
         button.tabbtn#corrGames(@click="setDisplay('corr',$event)")
           | {{ st.tr["Correspondance games"] }}
       GameList(
+        ref="livegames"
         v-show="display=='live'"
         :games="liveGames"
         @show-game="showGame"
@@ -15,10 +16,16 @@ main
       )
       GameList(
         v-show="display=='corr'"
+        ref="corrgames"
         :games="corrGames"
         @show-game="showGame"
         @abortgame="abortGame"
       )
+      button#loadMoreBtn(
+        v-show="hasMore[display]"
+        @click="loadMore(display)"
+      )
+        | {{ st.tr["Load more"] }}
 </template>
 
 <script>
@@ -40,60 +47,110 @@ export default {
       display: "live",
       liveGames: [],
       corrGames: [],
+      // timestamp of last showed (oldest) game:
+      cursor: {
+        live: Number.MAX_SAFE_INTEGER,
+        corr: Number.MAX_SAFE_INTEGER
+      },
+      // hasMore == TRUE: a priori there could be more games to load
+      hasMore: { live: 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.decorate(localGames);
-      this.liveGames = localGames;
-    });
-    if (this.st.user.id > 0) {
-      ajax(
-        "/games",
-        "GET",
-        {
-          data: { uid: this.st.user.id },
-          success: (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.decorate(serverGames);
-            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 +
-      "&id=" +
-      this.st.user.id +
-      "&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", adjustAndSetDisplay)
+              );
+            }
+          }
+        );
+      } else this.loadMore("live", 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);
@@ -117,21 +174,21 @@ export default {
     // Called at loading to augment games with myColor + myTurn infos
     decorate: function(games) {
       games.forEach(g => {
-        // If game is over, myColor and myTurn are ignored:
+        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 == "*") {
-          g.myColor =
-            (g.type == "corr" && g.players[0].uid == this.st.user.id) ||
-            (g.type == "live" && g.players[0].sid == this.st.user.sid)
-              ? 'w'
-              : 'b';
           const rem = g.movesCount % 2;
-          if ((rem == 0 && g.myColor == 'w') || (rem == 1 && g.myColor == 'b')) {
+          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);
       let gamesArrays = {
         "corr": this.corrGames,
@@ -146,9 +203,13 @@ export default {
           // "notifything" --> "thing":
           const thing = data.code.substr(6);
           game[thing] = info[thing];
-          if (thing == "turn") game.myTurn = !game.myTurn;
-          this.$forceUpdate();
-          this.tryShowNewsIndicator(type);
+          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": {
@@ -168,20 +229,16 @@ export default {
             gameInfo
           );
           game.myTurn =
-            (type == "corr" && game.players[0].uid == this.st.user.id) ||
+            (type == "corr" && game.players[0].id == this.st.user.id) ||
             (type == "live" && game.players[0].sid == this.st.user.sid);
           gamesArrays[type].push(game);
-          this.$forceUpdate();
-          this.tryShowNewsIndicator(type);
+          if (game.myTurn) this.tryShowNewsIndicator(type);
+          // TODO: cleaner refresh
+          this.$refs[type + "games"].$forceUpdate();
           break;
         }
       }
     },
-    socketCloseListener: function() {
-      this.conn = new WebSocket(this.connexionString);
-      this.conn.addEventListener("message", this.socketMessageListener);
-      this.conn.addEventListener("close", this.socketCloseListener);
-    },
     showGame: function(game) {
       if (game.type == "live" || !game.myTurn) {
         this.$router.push("/game/" + game.id);
@@ -207,16 +264,18 @@ 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
+              }
+            )
+          );
+        }
       }
       else if (!game.deletedByWhite || !game.deletedByBlack) {
         // Set score if game isn't deleted on server:
@@ -234,6 +293,41 @@ export default {
           }
         );
       }
+    },
+    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();
+        });
+      }
     }
   }
 };
@@ -249,6 +343,10 @@ export default {
 table.game-list
   max-height: 100%
 
+button#loadMoreBtn
+  display: block
+  margin: 0 auto
+
 .somethingnew
   background-color: #c5fefe !important
 </style>