X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fviews%2FHall.vue;h=01f588f23dacc8acbe6abe9318df2a431b810640;hb=6c7cbfedc6ecf2b49f6b1e27a174039e92a36365;hp=8cbbf200fdf0158849f5719a72564b0271427185;hpb=1a0215292a1eda58217f90d59fd7cdce1dd4c07c;p=vchess.git

diff --git a/client/src/views/Hall.vue b/client/src/views/Hall.vue
index 8cbbf200..01f588f2 100644
--- a/client/src/views/Hall.vue
+++ b/client/src/views/Hall.vue
@@ -99,7 +99,7 @@ main
       button(@click="issueNewChallenge()") {{ st.tr["Send challenge"] }}
   input#modalPeople.modal(
     type="checkbox"
-    @click="resetSocialColor()"
+    @click="toggleSocialColor()"
   )
   div#peopleWrap(
     role="dialog"
@@ -135,7 +135,7 @@ main
   .row
     .col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
       .button-group
-        button#peopleBtn(@click="openModalPeople()")
+        button#peopleBtn(onClick="window.doClick('modalPeople')")
           | {{ st.tr["Who's there?"] }}
         button(@click="showNewchallengeForm()")
           | {{ st.tr["New game"] }}
@@ -186,13 +186,13 @@ main
         GameList(
           v-show="gdisplay=='live'"
           :games="filterGames('live')"
-          :showBoth="true"
+          :show-both="true"
           @show-game="showGame"
         )
         div(v-show="gdisplay=='corr'")
           GameList(
             :games="filterGames('corr')"
-            :showBoth="true"
+            :show-both="true"
             @show-game="showGame"
           )
           button#loadMoreBtn(
@@ -205,6 +205,7 @@ main
 <script>
 import { store } from "@/store";
 import { checkChallenge } from "@/data/challengeCheck";
+import { notify } from "@/utils/notifications";
 import { ArrayFun } from "@/utils/array";
 import { ajax } from "@/utils/ajax";
 import params from "@/parameters";
@@ -240,7 +241,9 @@ export default {
         vid: parseInt(localStorage.getItem("vid")) || 0,
         to: "", //name of challenged player (if any)
         cadence: localStorage.getItem("cadence") || "",
-        randomness: parseInt(localStorage.getItem("challRandomness")) || 2,
+        randomness:
+          // Warning: randomness can be 0, then !!randomness is false
+          (parseInt(localStorage.getItem("challRandomness"))+1 || 3) - 1,
         // VariantRules object, stored to not interfere with
         // diagrams of targetted challenges:
         V: null,
@@ -248,6 +251,7 @@ export default {
         diag: "", //visualizing FEN
         memorize: false //put settings in localStorage
       },
+      focus: true,
       tchallDiag: "",
       curChallToAccept: {from: {}},
       presetChalls: JSON.parse(localStorage.getItem("presetChalls") || "[]"),
@@ -255,8 +259,7 @@ export default {
       connexionString: "",
       socketCloseListener: 0,
       // Related to (killing of) self multi-connects:
-      newConnect: {},
-      killed: {}
+      newConnect: {}
     };
   },
   watch: {
@@ -275,6 +278,8 @@ export default {
   },
   created: function() {
     document.addEventListener('visibilitychange', this.visibilityChange);
+    window.addEventListener('focus', this.onFocus);
+    window.addEventListener('blur', this.onBlur);
     window.addEventListener("beforeunload", this.cleanBeforeDestroy);
     if (this.st.variants.length > 0 && this.newchallenge.vid > 0)
       this.loadNewchallVariant();
@@ -319,7 +324,13 @@ export default {
     );
   },
   mounted: function() {
-    ["peopleWrap", "infoDiv", "newgameDiv"].forEach(eltName => {
+    document.getElementById("peopleWrap")
+      .addEventListener("click", (e) => {
+        processModalClick(e, () => {
+          this.toggleSocialColor("close")
+        });
+      });
+    ["infoDiv", "newgameDiv"].forEach(eltName => {
       document.getElementById(eltName)
         .addEventListener("click", processModalClick);
     });
@@ -408,6 +419,8 @@ export default {
     cleanBeforeDestroy: function() {
       clearInterval(this.socketCloseListener);
       document.removeEventListener('visibilitychange', this.visibilityChange);
+      window.removeEventListener('focus', this.onFocus);
+      window.removeEventListener('blur', this.onBlur);
       window.removeEventListener("beforeunload", this.cleanBeforeDestroy);
       this.conn.removeEventListener("message", this.socketMessageListener);
       this.send("disconnect");
@@ -418,10 +431,6 @@ export default {
         ["random-" + pc.randomness]: true
       };
     },
-    openModalPeople: function() {
-      window.doClick("modalPeople");
-      document.getElementById("inputChat").focus();
-    },
     anonymousCount: function() {
       let count = 0;
       Object.values(this.people).forEach(p => {
@@ -432,11 +441,16 @@ export default {
     },
     visibilityChange: function() {
       // TODO: Use document.hidden? https://webplatform.news/issues/2019-03-27
-      this.send(
-        document.visibilityState == "visible"
-          ? "getfocus"
-          : "losefocus"
-      );
+      this.focus = (document.visibilityState == "visible");
+      this.send(this.focus ? "getfocus" : "losefocus");
+    },
+    onFocus: function() {
+      this.focus = true;
+      this.send("getfocus");
+    },
+    onBlur: function() {
+      this.focus = false;
+      this.send("losefocus");
     },
     partialResetNewchallenge: function() {
       // Reset potential target and custom FEN:
@@ -470,7 +484,8 @@ export default {
     },
     removePresetChall: function(e, pchall) {
       e.stopPropagation();
-      const pchallIdx = this.presetChalls.findIndex(pc => pc.index == pchall.index);
+      const pchallIdx =
+        this.presetChalls.findIndex(pc => pc.index == pchall.index);
       this.presetChalls.splice(pchallIdx, 1);
       localStorage.setItem("presetChalls", JSON.stringify(this.presetChalls));
     },
@@ -490,7 +505,7 @@ export default {
         document.getElementById("cadence").focus();
     },
     send: function(code, obj) {
-      if (!!this.conn) {
+      if (!!this.conn && this.conn.readyState == 1) {
         this.conn.send(JSON.stringify(Object.assign({ code: code }, obj)));
       }
     },
@@ -505,8 +520,10 @@ export default {
     filterGames: function(type) {
       return this.games.filter(g => g.type == type);
     },
+    // o: challenge or game
     classifyObject: function(o) {
-      // o: challenge or game
+      // Consider imports as live games (TODO)
+      if (!!o.id && !!o.id.toString().match(/^i/)) return "live";
       return o.cadence.indexOf("d") === -1 ? "live" : "corr";
     },
     setDisplay: function(letter, type, e) {
@@ -533,7 +550,8 @@ export default {
         // This is meant to challenge people, thus the next 2 conditions:
         this.st.user.id > 0 &&
         sid != this.st.user.sid &&
-        Object.values(this.people[sid].tmpIds).some(v => v.focus && v.page == "/")
+        Object.values(this.people[sid].tmpIds)
+          .some(v => v.focus && v.page == "/")
       );
     },
     challenge: function(sid) {
@@ -563,9 +581,11 @@ export default {
       // ==> Moves sent by connected remote player(s) if live game
       this.$router.push("/game/" + g.id);
     },
-    resetSocialColor: function() {
-      // TODO: this is called twice, once on opening an once on closing
-      document.getElementById("peopleBtn").classList.remove("somethingnew");
+    toggleSocialColor: function(action) {
+      if (!action && document.getElementById("modalPeople").checked)
+        document.getElementById("inputChat").focus();
+      else
+        document.getElementById("peopleBtn").classList.remove("somethingnew");
     },
     processChat: function(chat) {
       this.send("newchat", { data: chat });
@@ -625,13 +645,13 @@ export default {
           const page = data.page || "/";
           if (data.code == "connect") {
             // Ask challenges only on first connexion:
-            if (!this.people[data.from])
+            if (!this.people[data.from[0]])
               this.send("askchallenges", { target: data.from[0] });
           }
           // Ask game only if live:
           else if (!page.match(/\/[0-9]+$/))
             this.send("askgame", { target: data.from[0], page: page });
-          if (!this.people[data.from]) {
+          if (!this.people[data.from[0]]) {
             this.$set(
               this.people,
               data.from[0],
@@ -641,7 +661,8 @@ export default {
                 }
               }
             );
-            this.newConnect[data.from] = true; //for self multi-connects tests
+            // For self multi-connects tests:
+            this.newConnect[data.from[0]] = true;
             this.send("askidentity", { target: data.from[0], page: page });
           } else {
             this.people[data.from[0]].tmpIds[data.from[1]] =
@@ -652,8 +673,9 @@ export default {
         }
         case "disconnect":
         case "gdisconnect": {
-          // If the user reloads the page twice very quickly (experienced with Firefox),
-          // the first reload won't have time to connect but will trigger a "close" event anyway.
+          // If the user reloads the page twice very quickly
+          // (experienced with Firefox), the first reload won't have time to
+          // connect but will trigger a "close" event anyway.
           // ==> Next check is required.
           if (!this.people[data.from[0]]) return;
           delete this.people[data.from[0]].tmpIds[data.from[1]];
@@ -661,18 +683,25 @@ export default {
             this.$delete(this.people, data.from[0]);
           else this.$forceUpdate(); //TODO: shouldn't be required
           if (data.code == "disconnect") {
-            // Remove the live challenges sent by this player:
-            ArrayFun.remove(
-              this.challenges,
-              c => c.type == "live" && c.from.sid == data.from[0],
-              "all"
-            );
+            // Remove the live challenges sent by this player, if
+            // he isn't connected on another tab:
+            if (
+              !this.people[data.from[0]] ||
+              Object.values(this.people[data.from[0]].tmpIds)
+                .every(v => v.page != "/")
+            ) {
+              ArrayFun.remove(
+                this.challenges,
+                c => c.type == "live" && c.from.sid == data.from[0],
+                "all"
+              );
+            }
           } else {
             // Remove the matching live game if now unreachable
             const gid = data.page.match(/[a-zA-Z0-9]+$/)[0];
             // Corr games are always reachable:
             if (!gid.match(/^[0-9]+$/)) {
-              // Live games are reachable as long as someone is on the game page
+              // Live games are reachable if someone is on the game page
               if (Object.values(this.people).every(p =>
                 Object.values(p.tmpIds).every(v => v.page != data.page))
               ) {
@@ -699,13 +728,6 @@ export default {
           }
           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;
         case "askidentity": {
           // Request for identification
           const me = {
@@ -728,16 +750,16 @@ export default {
           this.$forceUpdate();
           // If I multi-connect, kill current connexion if no mark (I'm older)
           if (this.newConnect[user.sid]) {
+            delete this.newConnect[user.sid];
             if (
               user.id > 0 &&
               user.id == this.st.user.id &&
-              user.sid != this.st.user.sid &&
-              !this.killed[this.st.user.sid]
+              user.sid != this.st.user.sid
             ) {
-                this.send("killme", { sid: this.st.user.sid });
-                this.killed[this.st.user.sid] = true;
+              // I logged in elsewhere:
+              this.cleanBeforeDestroy();
+              alert(this.st.tr["New connexion detected: tab now offline"]);
             }
-            delete this.newConnect[user.sid];
           }
           break;
         }
@@ -748,9 +770,9 @@ export default {
               c.from.sid == this.st.user.sid && c.type == "live"
             )
             .map(c => {
-              // NOTE: in principle, should only send targeted challenge to the target.
-              // But we may not know yet the identity of the target (just name),
-              // so cannot decide if data.from is the target or not.
+              // NOTE: in principle, should only send targeted challenge to the
+              // target. But we may not know yet the identity of the target
+              // (just name), so can't decide if data.from is the target.
               return {
                 id: c.id,
                 from: this.st.user.sid,
@@ -781,7 +803,8 @@ export default {
         case "deletechallenge_s": {
           // NOTE: the challenge(s) may be already removed
           const cref = data.data;
-          if (!!cref.cid) ArrayFun.remove(this.challenges, c => c.id == cref.cid);
+          if (!!cref.cid)
+            ArrayFun.remove(this.challenges, c => c.id == cref.cid);
           else if (!!cref.sids) {
             cref.sids.forEach(s => {
               ArrayFun.remove(
@@ -799,9 +822,13 @@ export default {
           // Ignore games where I play (will go in MyGames page),
           // and also games that I already received.
           if (
-            game.players.every(p =>
-              p.sid != this.st.user.sid && p.id != this.st.user.id) &&
-            this.games.findIndex(g => g.id == game.id) == -1
+            this.games.findIndex(g => g.id == game.id) == -1 &&
+            game.players.every(p => {
+              return (
+                p.sid != this.st.user.sid &&
+                (p.id == 0 || p.id != this.st.user.id)
+              );
+            })
           ) {
             let newGame = game;
             newGame.type = this.classifyObject(game);
@@ -811,6 +838,7 @@ export default {
               newGame.score = "*";
             this.games.push(newGame);
             if (
+              newGame.score == '*' &&
               (newGame.type == "live" && this.gdisplay == "corr") ||
               (newGame.type == "corr" && this.gdisplay == "live")
             ) {
@@ -862,7 +890,8 @@ export default {
               if (
                 this.cursor == Number.MAX_SAFE_INTEGER &&
                 this.games.length == 0 &&
-                this.gdisplay == "live"
+                this.gdisplay == "live" &&
+                res.games.some(g => g.score == '*')
               ) {
                 // First loading: show indicators
                 document
@@ -912,6 +941,15 @@ export default {
             .getElementById("btnC" + newChall.type)
             .classList.add("somethingnew");
         }
+        if (!!chall.to) {
+          notify(
+            "New challenge",
+            // fromValues.name should exist since the player is online, but
+            // let's consider there is some chance that the challenge arrives
+            // right after we connected and before receiving the poll result:
+            { body: "from " + (fromValues.name || "unknown yet...") }
+          );
+        }
       }
     },
     loadNewchallVariant: async function(cb) {
@@ -984,7 +1022,11 @@ export default {
       let chall = Object.assign({}, this.newchallenge);
       // Add only if not already issued (not counting target or FEN):
       if (this.challenges.some(c =>
-        (c.from.sid == this.st.user.sid || c.from.id == this.st.user.id) &&
+        (
+          c.from.sid == this.st.user.sid ||
+          (c.from.id > 0 && c.from.id == this.st.user.id)
+        )
+        &&
         c.vid == chall.vid &&
         c.cadence == chall.cadence &&
         c.randomness == chall.randomness
@@ -1006,7 +1048,10 @@ export default {
           const c = this.challenges[i];
           if (
             c.type == ctype &&
-            (c.from.sid == this.st.user.sid || c.from.id == this.st.user.id)
+            (
+              c.from.sid == this.st.user.sid ||
+              (c.from.id > 0 && c.from.id == this.st.user.id)
+            )
           ) {
             countMyChalls++;
             if (c.added < oldestAdded) {
@@ -1039,7 +1084,7 @@ export default {
           name: this.st.user.name
         };
         chall.added = Date.now();
-        // NOTE: vname and type are redundant (can be deduced from cadence + vid)
+        // NOTE: vname and type are redundant (deduced from cadence + vid)
         chall.type = ctype;
         chall.vname = this.newchallenge.vname;
         this.challenges.push(chall);
@@ -1088,9 +1133,13 @@ export default {
           name: this.st.user.name
         };
         this.launchGame(c);
-        if (c.type == "live")
+        if (c.type == "live") {
           // Remove all live challenges of both players
-          this.send("deletechallenge_s", { data: { sids: [c.from.sid, c.seat.sid] } });
+          this.send(
+            "deletechallenge_s",
+            { data: { sids: [c.from.sid, c.seat.sid] } }
+          );
+        }
         else
           // Corr challenge: just remove the challenge
           this.send("deletechallenge_s", { data: { cid: c.id } });
@@ -1155,10 +1204,13 @@ export default {
     // NOTE: when launching game, the challenge is already being deleted
     launchGame: function(c) {
       // White player index 0, black player index 1:
-      const players =
+      let players =
         !!c.mycolor
           ? (c.mycolor == "w" ? [c.seat, c.from] : [c.from, c.seat])
           : shuffle([c.from, c.seat]);
+      players.forEach(p => {
+        if (!!p["tmpIds"]) delete p["tmpIds"];
+      });
       // These game informations will be shared
       let gameInfo = {
         id: getRandString(),
@@ -1236,6 +1288,7 @@ export default {
       );
       setTimeout(
         () => {
+          const myIdx = (game.players[0].sid == this.st.user.sid ? 0 : 1);
           GameStorage.add(game, (err) => {
             // If an error occurred, game is not added: a tab already
             // added the game. Maybe a focused one, maybe not.
@@ -1243,10 +1296,16 @@ export default {
             // ==> Do not play it again.
             if (!err && this.st.settings.sound)
               new Audio("/sounds/newgame.flac").play().catch(() => {});
+            if (!this.focus) {
+              notify(
+                "New live game",
+                { body: "vs " + game.players[1-myIdx].name || "@nonymous" }
+              );
+            }
             this.$router.push("/game/" + gameInfo.id);
           });
         },
-        document.hidden ? 500 + 1000 * Math.random() : 0
+        this.focus ? 500 + 1000 * Math.random() : 0
       );
     }
   }