X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fviews%2FMyGames.vue;h=ad330aec802c2454a4d4377dac8ad5961b4c0015;hb=16d06164d56332bd00fb22acc5b2b2997b942d73;hp=7522871f63d45f5f9fbb415e603caf93d7b83149;hpb=5f918a278904266a2a66a3c8e2a3655f37c2d2a7;p=vchess.git

diff --git a/client/src/views/MyGames.vue b/client/src/views/MyGames.vue
index 7522871f..ad330aec 100644
--- a/client/src/views/MyGames.vue
+++ b/client/src/views/MyGames.vue
@@ -6,7 +6,7 @@ main
         button.tabbtn#liveGames(@click="setDisplay('live',$event)")
           | {{ st.tr["Live games"] }}
         button.tabbtn#corrGames(@click="setDisplay('corr',$event)")
-          | {{ st.tr["Correspondance games"] }}
+          | {{ st.tr["Correspondence games"] }}
         button.tabbtn#importGames(@click="setDisplay('import',$event)")
           | {{ st.tr["Imported games"] }}
       GameList(
@@ -23,10 +23,15 @@ main
         @show-game="showGame"
         @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(
@@ -34,7 +39,6 @@ main
         @click="loadMore(display)"
       )
         | {{ st.tr["Load more"] }}
-      UploadGame(@game-uploaded="addGameImport")
 </template>
 
 <script>
@@ -46,6 +50,7 @@ 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: {
@@ -73,17 +78,25 @@ export default {
       },
       conn: null,
       connexionString: "",
-      socketCloseListener: 0
+      reopenTimeout: 0,
+      reconnectTimeout: 0
     };
   },
   watch: {
     $route: function(to, from) {
       if (to.path != "/mygames") this.cleanBeforeDestroy();
+    },
+    // st.variants changes only once, at loading from [] to [...]
+    "st.variants": function() {
+      // Set potential games variant names + display:
+      this.liveGames.concat(this.corrGames).concat(this.importGames)
+      .forEach(o => {
+        if (!o.vname) this.setVname(o);
+      });
     }
   },
   created: function() {
     window.addEventListener("beforeunload", this.cleanBeforeDestroy);
-    // Initialize connection
     this.connexionString =
       params.socketUrl +
       "/?sid=" + this.st.user.sid +
@@ -91,23 +104,11 @@ export default {
       "&tmpId=" + getRandString() +
       "&page=" +
       encodeURIComponent(this.$route.path);
-    this.conn = new WebSocket(this.connexionString);
-    this.conn.onmessage = this.socketMessageListener;
-    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
-    );
+    this.openConnection();
   },
   mounted: function() {
     const adjustAndSetDisplay = () => {
-      // showType is the last type viwed by the user (default)
+      // showType is the last type viewed 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";
@@ -144,51 +145,92 @@ export default {
               this.corrGames.forEach(g => {
                 g.type = "corr";
                 g.score = "*";
+                g.options = JSON.parse(g.options);
               });
               this.decorate(this.corrGames);
               // Now ask completed games (partial list)
               this.loadMore(
                 "live",
-                () => this.loadMore("corr", adjustAndSetDisplay)
+                () => this.loadMore("corr", () => {
+                  this.loadMore("import", adjustAndSetDisplay);
+                })
               );
             }
           }
         );
-      } else this.loadMore("live", adjustAndSetDisplay);
+      }
+      else {
+        this.loadMore("live", () => {
+          this.loadMore("import", adjustAndSetDisplay);
+        });
+      }
     });
   },
   beforeDestroy: function() {
     this.cleanBeforeDestroy();
   },
   methods: {
+    openConnection: function() {
+      // Initialize connection
+      this.conn = new WebSocket(this.connexionString);
+      this.conn.onopen = () => { this.reconnectTimeout = 250; };
+      this.conn.onmessage = this.socketMessageListener;
+      const closeConnection = () => {
+        this.reopenTimeout = setTimeout(
+          () => {
+            this.openConnection();
+            this.reconnectTimeout = Math.min(2*this.reconnectTimeout, 30000);
+          },
+          this.reconnectTimeout
+        );
+      };
+      this.conn.onerror = closeConnection;
+      this.conn.onclose = closeConnection;
+    },
     cleanBeforeDestroy: function() {
-      clearInterval(this.socketCloseListener);
       window.removeEventListener("beforeunload", this.cleanBeforeDestroy);
-      this.conn.removeEventListener("message", this.socketMessageListener);
+      clearTimeout(this.reopenTimeout);
       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");
+      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");
+      }
     },
-    addGameImport(game) {
-      if (!game.id) {
-        alert(this.st.tr[
-          "No identifier found: use the upload button in analysis mode"]);
+    // TODO: duplicated from Hall.vue:
+    setVname: function(obj) {
+      const variant = this.st.variants.find(v => v.id == obj.vid);
+      if (!!variant) {
+        obj.vname = variant.name;
+        obj.vdisp = variant.display;
       }
-      else this.importGames.push(game);
+    },
+    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);
+      });
     },
     tryShowNewsIndicator: function(type) {
       if (
-        (type == "live" && this.display == "corr") ||
-        (type == "corr" && this.display == "live")
+        (type == "live" && this.display != "live") ||
+        (type == "corr" && this.display != "corr")
       ) {
         document
           .getElementById(type + "Games")
@@ -209,6 +251,7 @@ export default {
           if ((rem == 0 && g.myColor == 'w') || (rem == 1 && g.myColor == 'b'))
             g.myTurn = true;
         }
+        this.setVname(g);
       });
     },
     socketMessageListener: function(msg) {
@@ -223,7 +266,7 @@ export default {
         case "notifyturn":
         case "notifyscore": {
           const info = data.data;
-          const type = (!!parseInt(info.gid) ? "corr" : "live");
+          const type = (!!parseInt(info.gid, 10) ? "corr" : "live");
           let game = gamesArrays[type].find(g => g.id == info.gid);
           // "notifything" --> "thing":
           const thing = data.code.substr(6);
@@ -231,22 +274,21 @@ export default {
           if (thing == "turn") {
             game.myTurn = !game.myTurn;
             if (game.myTurn) this.tryShowNewsIndicator(type);
-          } else game.myTurn = false;
+          }
+          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 : "";
+          let gameInfo = data.data;
+          this.setVname(gameInfo);
+          // TODO: remove patch on next line (options || "{}")
+          gameInfo.options = JSON.parse(gameInfo.options || "{}");
           const type = (gameInfo.cadence.indexOf('d') >= 0 ? "corr": "live");
           let game = Object.assign(
             {
-              vname: vname,
               type: type,
               score: "*",
               created: Date.now()
@@ -333,10 +375,14 @@ export default {
               if (L > 0) {
                 this.cursor["corr"] = res.games[L - 1].created;
                 let moreGames = res.games;
-                moreGames.forEach(g => g.type = "corr");
+                moreGames.forEach(g => {
+                  g.type = "corr";
+                  g.options = JSON.parse(g.options);
+                });
                 this.decorate(moreGames);
                 this.corrGames = this.corrGames.concat(moreGames);
-              } else this.hasMore["corr"] = false;
+              }
+              else this.hasMore["corr"] = false;
               if (!!cb) cb();
             }
           }
@@ -348,10 +394,15 @@ export default {
           if (L > 0) {
             // Add "-1" because IDBKeyRange.upperBound includes boundary
             this.cursor["live"] = localGames[L - 1].created - 1;
-            localGames.forEach(g => g.type = "live");
+            localGames.forEach(g => {
+              g.type = "live";
+              // TODO: remove patch on next line (options || "{}")
+              g.options = JSON.parse(g.options || "{}");
+            });
             this.decorate(localGames);
             this.liveGames = this.liveGames.concat(localGames);
-          } else this.hasMore["live"] = false;
+          }
+          else this.hasMore["live"] = false;
           if (!!cb) cb();
         });
       }
@@ -361,9 +412,15 @@ export default {
           if (L > 0) {
             // Add "-1" because IDBKeyRange.upperBound includes boundary
             this.cursor["import"] = importGames[L - 1].created - 1;
-            importGames.forEach(g => g.type = "import");
+            importGames.forEach(g => {
+              g.type = "import";
+              // TODO: remove following patch (options || "{}")
+              g.options = JSON.parse(g.options || "{}");
+              this.setVname(g);
+            });
             this.importGames = this.importGames.concat(importGames);
-          } else this.hasMore["import"] = false;
+          }
+          else this.hasMore["import"] = false;
           if (!!cb) cb();
         });
       }
@@ -372,20 +429,23 @@ export default {
 };
 </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>