X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fviews%2FHall.vue;h=e090d9e6d5907e968903fbf1f78918a315d9df73;hb=603b8a8b4a854efb168953da70e7b43ae99b50d9;hp=c47e89f109d1a8c57044d9799cfdebe56dcbd44c;hpb=098cd7f19e9ac858df6d635e5f37d356c1d5b1fa;p=vchess.git

diff --git a/client/src/views/Hall.vue b/client/src/views/Hall.vue
index c47e89f1..e090d9e6 100644
--- a/client/src/views/Hall.vue
+++ b/client/src/views/Hall.vue
@@ -1,8 +1,14 @@
 <template lang="pug">
 main
+  input#modalInfo.modal(type="checkbox")
+  div(role="dialog" aria-labelledby="infoMessage")
+    .card.smallpad.small-modal.text-center
+      label.modal-close(for="modalInfo")
+      h3#infoMessage.section
+        p(v-html="infoMessage")
   input#modalNewgame.modal(type="checkbox")
   div(role="dialog" aria-labelledby="titleFenedit")
-    .card.smallpad
+    .card.smallpad(@keyup.enter="newChallenge")
       label#closeNewgame.modal-close(for="modalNewgame")
       fieldset
         label(for="selectVariant") {{ st.tr["Variant"] }}
@@ -20,10 +26,12 @@ main
         input#inputFen(type="text" v-model="newchallenge.fen")
       button(@click="newChallenge") {{ st.tr["Send challenge"] }}
   .row
-    .col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
+    .col-sm-12.col-md-9.col-md-offset-3
       button(onClick="doClick('modalNewgame')") New game
   .row
-    .col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
+    .col-sm-12.col-md-3
+      Chat(:players="[]")
+    .col-sm-12.col-md-9
       .collapse
         input#challengeSection(type="radio" checked aria-hidden="true" name="accordion")
         label(for="challengeSection" aria-hidden="true") Challenges
@@ -67,12 +75,14 @@ import { checkChallenge } from "@/data/challengeCheck";
 import { ArrayFun } from "@/utils/array";
 import { ajax } from "@/utils/ajax";
 import { getRandString, shuffle } from "@/utils/alea";
+import Chat from "@/components/Chat.vue";
 import GameList from "@/components/GameList.vue";
 import ChallengeList from "@/components/ChallengeList.vue";
 import { GameStorage } from "@/utils/gameStorage";
 export default {
   name: "my-hall",
   components: {
+    Chat,
     GameList,
     ChallengeList,
   },
@@ -84,7 +94,8 @@ export default {
       gdisplay: "live",
       games: [],
       challenges: [],
-      people: [], //(all) online players
+      people: [], //people in main hall
+      infoMessage: "",
       newchallenge: {
         fen: "",
         vid: 0,
@@ -93,20 +104,38 @@ export default {
       },
     };
   },
+  watch: {
+    // st.variants changes only once, at loading from [] to [...]
+    "st.variants": function(variantArray) {
+      // Set potential challenges and games variant names:
+      this.challenges.forEach(c => {
+        if (c.vname == "")
+          c.vname = this.getVname(c.vid);
+      });
+      this.games.forEach(g => {
+        if (g.vname == "")
+          g.vname = this.getVname(g.vid);
+      });
+    },
+  },
   computed: {
     uniquePlayers: function() {
       // Show e.g. "@nonymous (5)", and do nothing on click on anonymous
-      let anonymous = {id:0, name:"@nonymous", count:0};
-      let playerList = [];
+      let anonymous = {name:"@nonymous", count:0};
+      let playerList = {};
       this.people.forEach(p => {
         if (p.id > 0)
-          playerList.push(p);
+        {
+          // We don't count registered users connections: either they are here or not.
+          if (!playerList[p.id])
+            playerList[p.id] = {name: p.name, count: 0};
+        }
         else
           anonymous.count++;
       });
       if (anonymous.count > 0)
-        playerList.push(anonymous);
-      return playerList;
+        playerList[0] = anonymous;
+      return Object.values(playerList);
     },
   },
   created: function() {
@@ -122,33 +151,47 @@ export default {
       else
         localStorage.removeItem("challenge");
     }
-    if (this.st.user.id > 0)
-    {
-      // Ask server for current corr games (all but mines)
-      ajax(
-        "/games",
-        "GET",
-        {uid: this.st.user.id, excluded: true},
-        response => {
-          this.games = this.games.concat(response.games.map(g => {
-            const type = this.classifyObject(g);
-            const vname = this.getVname(g.vid);
-            return Object.assign({}, g, {type: type, vname: vname});
-          }));
-        }
-      );
-      // Also ask for corr challenges (open + sent to me)
-      ajax(
-        "/challenges",
-        "GET",
-        {uid: this.st.user.id},
-        response => {
-          console.log(response.challenges);
-          // TODO: post-treatment on challenges ?
-          Array.prototype.push.apply(this.challenges, response.challenges);
-        }
-      );
-    }
+    // Ask server for current corr games (all but mines)
+    ajax(
+      "/games",
+      "GET",
+      {uid: this.st.user.id, excluded: true},
+      response => {
+        this.games = this.games.concat(response.games.map(g => {
+          const type = this.classifyObject(g);
+          const vname = this.getVname(g.vid);
+          return Object.assign({}, g, {type: type, vname: vname});
+        }));
+      }
+    );
+    // Also ask for corr challenges (open + sent to me)
+    ajax(
+      "/challenges",
+      "GET",
+      {uid: this.st.user.id},
+      response => {
+        // Gather all senders names, and then retrieve full identity:
+        // (TODO [perf]: some might be online...)
+        const uids = response.challenges.map(c => { return c.uid });
+        ajax("/users",
+          "GET",
+          { ids: uids.join(",") },
+          response2 => {
+            let names = {};
+            response2.users.forEach(u => {names[u.id] = u.name});
+            this.challenges = this.challenges.concat(
+              response.challenges.map(c => {
+                // (just players names in fact)
+                const from = {name: names[c.uid], id: c.uid};
+                const type = this.classifyObject(c);
+                const vname = this.getVname(c.vid);
+                return Object.assign({}, c, {type: type, vname: vname, from: from});
+              })
+            )
+          }
+        );
+      }
+    );
     // 0.1] Ask server for room composition:
     const funcPollClients = () => {
       this.st.conn.send(JSON.stringify({code:"pollclients"}));
@@ -182,17 +225,13 @@ export default {
       // ==> Moves sent by connected remote player(s) if live game
       let url = "/game/" + g.id;
       if (g.type == "live")
-      {
-        const remotes = g.players.filter(p => this.people.some(pl => pl.sid == p.sid));
-        const rIdx = (remotes.length == 1 ? 0 : Math.floor(Math.random()*2));
-        url += "?rid=" + remotes[rIdx].sid;
-      }
+        url += "?rid=" + g.rid;
       this.$router.push(url);
     },
-    // TODO: ...filter(...)[0].name, one-line, just remove this function
     getVname: function(vid) {
-      const vIdx = this.st.variants.findIndex(v => v.id == vid);
-      return this.st.variants[vIdx].name;
+      const variant = this.st.variants.find(v => v.id == vid);
+      // this.st.variants might be uninitialized (variant == null)
+      return (!!variant ? variant.name : "");
     },
     getSid: function(pname) {
       const pIdx = this.people.findIndex(pl => pl.name == pname);
@@ -237,6 +276,9 @@ export default {
       const data = JSON.parse(msg.data);
       switch (data.code)
       {
+        case "duplicate":
+          alert("Warning: duplicate 'offline' connection");
+          break;
         // 0.2] Receive clients list (just socket IDs)
         case "pollclients":
         {
@@ -245,8 +287,9 @@ export default {
             // Ask identity, challenges and game(s)
             this.st.conn.send(JSON.stringify({code:"askidentity", target:sid}));
             this.st.conn.send(JSON.stringify({code:"askchallenge", target:sid}));
-            this.st.conn.send(JSON.stringify({code:"askgame", target:sid}));
           });
+          // Also ask current games to all playing peers (TODO: some design issue)
+          this.st.conn.send(JSON.stringify({code:"askgames"}));
           break;
         }
         case "askidentity":
@@ -282,26 +325,6 @@ export default {
           }
           break;
         }
-        case "askgame":
-        {
-          // Send my current live game (if any)
-          GameStorage.getCurrent((game) => {
-            if (!!game)
-            {
-              const myGame =
-              {
-                // Minimal game informations:
-                id: game.id,
-                players: game.players.map(p => p.name),
-                vid: game.vid,
-                timeControl: game.timeControl,
-              };
-              this.st.conn.send(JSON.stringify({code:"game",
-                game:myGame, target:data.from}));
-            }
-          });
-          break;
-        }
         case "identity":
         {
           const pIdx = this.people.findIndex(p => p.sid == data.user.sid);
@@ -345,7 +368,12 @@ export default {
             this.startNewGame(data.gameInfo);
           else
           {
-            // TODO: notify with game link but do not redirect
+            this.infoMessage = "New game started: " +
+              "<a href='#/game/" + data.gameInfo.id + "'>" +
+              "#/game/" + data.gameInfo.id + "</a>";
+            let modalBox = document.getElementById("modalInfo");
+            modalBox.checked = true;
+            setTimeout(() => { modalBox.checked = false; }, 3000);
           }
           break;
         }
@@ -364,20 +392,20 @@ export default {
         }
         case "connect":
         {
-          this.people.push({name:"", id:0, sid:data.sid});
-          this.st.conn.send(JSON.stringify({code:"askidentity", target:data.sid}));
-          this.st.conn.send(JSON.stringify({code:"askchallenge", target:data.sid}));
-          this.st.conn.send(JSON.stringify({code:"askgame", target:data.sid}));
+          this.people.push({name:"", id:0, sid:data.from});
+          this.st.conn.send(JSON.stringify({code:"askidentity", target:data.from}));
+          this.st.conn.send(JSON.stringify({code:"askchallenge", target:data.from}));
+          this.st.conn.send(JSON.stringify({code:"askgame", target:data.from}));
           break;
         }
         case "disconnect":
         {
-          ArrayFun.remove(this.people, p => p.sid == data.sid);
+          ArrayFun.remove(this.people, p => p.sid == data.from);
           // Also remove all challenges sent by this player:
-          ArrayFun.remove(this.challenges, c => c.from.sid == data.sid);
+          ArrayFun.remove(this.challenges, c => c.from.sid == data.from);
           // And all live games where he plays and no other opponent is online
           ArrayFun.remove(this.games, g =>
-            g.type == "live" && (g.players.every(p => p.sid == data.sid
+            g.type == "live" && (g.players.every(p => p.sid == data.from
               || !this.people.some(pl => pl.sid == p.sid))), "all");
           break;
         }
@@ -412,7 +440,8 @@ export default {
         chall.vname = vname;
         chall.from = this.people[0]; //avoid sending email
         this.challenges.push(chall);
-        localStorage.setItem("challenge", JSON.stringify(chall));
+        if (ctype == "live")
+          localStorage.setItem("challenge", JSON.stringify(chall));
         document.getElementById("modalNewgame").checked = false;
       };
       const cIdx = this.challenges.findIndex(
@@ -443,20 +472,18 @@ export default {
         ajax(
           "/challenges",
           "POST",
-          chall,
+          { chall: chall },
           response => { finishAddChallenge(response.cid); }
         );
       }
     },
     clickChallenge: function(c) {
-      // In all cases, the challenge is consumed:
-      ArrayFun.remove(this.challenges, ch => ch.id == c.id);
-      // NOTE: deletechallenge event might be redundant (but it's easier this way)
-      this.sendSomethingTo((!!c.to ? c.from : null), "deletechallenge", {cid:c.id});
       const myChallenge = (c.from.sid == this.st.user.sid //live
         || (this.st.user.id > 0 && c.from.id == this.st.user.id)); //corr
       if (!myChallenge)
       {
+        if (c.type == "corr" && this.st.user.id <= 0)
+          return alert("Please log in to accept corr challenges");
         c.accepted = true;
         if (!!c.to) //c.to == this.st.user.name (connected)
         {
@@ -465,7 +492,7 @@ export default {
         }
         if (c.accepted)
         {
-          c.seat = this.people[0]; //avoid sending email
+          c.seat = this.people[0]; //== this.st.user, avoid revealing email
           this.launchGame(c);
         }
         else
@@ -475,16 +502,23 @@ export default {
             cid: c.id, target: c.from.sid}));
         }
       }
-      else
-        localStorage.removeItem("challenge");
-      if (c.type == "corr")
+      else //my challenge
       {
-        ajax(
-          "/challenges",
-          "DELETE",
-          {id: c.id}
-        );
+        if (c.type == "corr")
+        {
+          ajax(
+            "/challenges",
+            "DELETE",
+            {id: c.id}
+          );
+        }
+        else //live
+          localStorage.removeItem("challenge");
       }
+      // In (almost) all cases, the challenge is consumed:
+      ArrayFun.remove(this.challenges, ch => ch.id == c.id);
+      // NOTE: deletechallenge event might be redundant (but it's easier this way)
+      this.sendSomethingTo((!!c.to ? c.from : null), "deletechallenge", {cid:c.id});
     },
     // NOTE: when launching game, the challenge is already deleted
     launchGame: async function(c) {
@@ -493,31 +527,61 @@ export default {
       // These game informations will be sent to other players
       const gameInfo =
       {
-        gameId: getRandString(),
+        id: getRandString(),
         fen: c.fen || V.GenRandInitFen(),
         players: shuffle([c.from, c.seat]), //white then black
         vid: c.vid,
+        vname: c.vname, //theoretically vid is enough, but much easier with vname
         timeControl: c.timeControl,
       };
-      this.st.conn.send(JSON.stringify({code:"newgame",
-        gameInfo:gameInfo, target:c.from.sid, cid:c.id}));
+      let target = c.from.sid; //may not be defined if corr + offline opp
+      if (!target)
+      {
+        const opponent = this.people.find(p => p.id == c.from.id);
+        if (!!opponent)
+          target = opponent.sid
+      }
+      const tryNotifyOpponent = () => {
+        if (!!target) //opponent is online
+        {
+          this.st.conn.send(JSON.stringify({code:"newgame",
+            gameInfo:gameInfo, target:target, cid:c.id}));
+        }
+      };
       if (c.type == "live")
+      {
+        tryNotifyOpponent();
         this.startNewGame(gameInfo);
+      }
       else //corr: game only on server
       {
         ajax(
           "/games",
           "POST",
-          {gameInfo: gameInfo}
+          {gameInfo: gameInfo, cid: c.id}, //cid useful to delete challenge
+          response => {
+            gameInfo.id = response.gameId;
+            tryNotifyOpponent();
+            this.$router.push("/game/" + response.gameId);
+          }
         );
-        // TODO: redirection here
       }
+      // Send game info to everyone except opponent (and me)
+      this.st.conn.send(JSON.stringify({code:"game",
+        game: { //minimal game info:
+          id: gameInfo.id,
+          players: gameInfo.players.map(p => p.name),
+          vid: gameInfo.vid,
+          timeControl: gameInfo.timeControl,
+        },
+        oppsid: target}));
     },
     // NOTE: for live games only (corr games start on the server)
     startNewGame: function(gameInfo) {
       const game = Object.assign({}, gameInfo, {
         // (other) Game infos: constant
         fenStart: gameInfo.fen,
+        added: Date.now(),
         // Game state (including FEN): will be updated
         moves: [],
         clocks: [-1, -1], //-1 = unstarted
@@ -527,7 +591,7 @@ export default {
       GameStorage.add(game);
       if (this.st.settings.sound >= 1)
         new Audio("/sounds/newgame.mp3").play().catch(err => {});
-      this.$router.push("/game/" + gameInfo.gameId);
+      this.$router.push("/game/" + gameInfo.id);
     },
   },
 };