X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fviews%2FMyGames.vue;h=3c3b9b5aa9dbe632fdb33c1db176394e49ddb309;hb=2c5d7b20742b802d9c47916915c1114bcfc9a9c3;hp=1e1c9e7cb420ea5d5c6fc4ada911b77e5e3f74b1;hpb=7ebc0408a76b4a966273190a2ade49e0f97099be;p=vchess.git diff --git a/client/src/views/MyGames.vue b/client/src/views/MyGames.vue index 1e1c9e7c..3c3b9b5a 100644 --- a/client/src/views/MyGames.vue +++ b/client/src/views/MyGames.vue @@ -55,7 +55,8 @@ export default { // 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 }; }, watch: { @@ -68,17 +69,24 @@ export default { // 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 adjustAndSetDisplay = () => { @@ -137,9 +145,9 @@ export default { }, methods: { cleanBeforeDestroy: function() { + clearInterval(this.socketCloseListener); window.removeEventListener("beforeunload", this.cleanBeforeDestroy); this.conn.removeEventListener("message", this.socketMessageListener); - this.conn.removeEventListener("close", this.socketCloseListener); this.conn.send(JSON.stringify({code: "disconnect"})); this.conn = null; }, @@ -231,11 +239,6 @@ export default { } } }, - 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); @@ -316,7 +319,7 @@ export default { GameStorage.getNext(this.cursor["live"], localGames => { const L = localGames.length; if (L > 0) { - // Add "-1" because IDBKeyRange.upperBound seems to include boundary + // Add "-1" because IDBKeyRange.upperBound includes boundary this.cursor["live"] = localGames[L - 1].created - 1; localGames.forEach(g => g.type = "live"); this.decorate(localGames);