X-Git-Url: https://git.auder.net/js/index.js?a=blobdiff_plain;f=client%2Fsrc%2Fviews%2FHall.vue;h=e53dd56aa1231a8dcbb9a8ccd21e3cb044543b38;hb=8418f0d79395f40172b11d62eef8b83112f1d240;hp=636eabc3cca71d147411ed4ef0647b821c0b8888;hpb=2cc10cdbc230f82202bdddb7a244c903c05ab351;p=vchess.git

diff --git a/client/src/views/Hall.vue b/client/src/views/Hall.vue
index 636eabc3..e53dd56a 100644
--- a/client/src/views/Hall.vue
+++ b/client/src/views/Hall.vue
@@ -1,64 +1,76 @@
 <template lang="pug">
 main
+  input#modalInfo.modal(type="checkbox")
+  div#infoDiv(role="dialog" data-checkbox="modalInfo" 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
+  div#newgameDiv(role="dialog" data-checkbox="modalNewgame"
+      aria-labelledby="titleFenedit")
+    .card.smallpad(@keyup.enter="newChallenge")
       label#closeNewgame.modal-close(for="modalNewgame")
       fieldset
-        label(for="selectVariant") {{ st.tr["Variant"] }}
+        label(for="selectVariant") {{ st.tr["Variant"] }} *
         select#selectVariant(v-model="newchallenge.vid")
-          option(v-for="v in st.variants" :value="v.id") {{ v.name }}
+          option(v-for="v in st.variants" :value="v.id"
+              :selected="newchallenge.vid==v.id")
+            | {{ v.name }}
       fieldset
-        label(for="timeControl") {{ st.tr["Time control"] }}
+        label(for="timeControl") {{ st.tr["Cadence"] }} *
+        div#predefinedTimeControls
+          button 3+2
+          button 5+3
+          button 15+5
         input#timeControl(type="text" v-model="newchallenge.timeControl"
-          placeholder="3m+2s, 1h+30s, 7d+1d ...")
+          placeholder="5+0, 1h+30s, 7d+1d ...")
       fieldset(v-if="st.user.id > 0")
-        label(for="selectPlayers") {{ st.tr["Play with? (optional)"] }}
+        label(for="selectPlayers") {{ st.tr["Play with?"] }}
         input#selectPlayers(type="text" v-model="newchallenge.to")
-      fieldset(v-if="st.user.id > 0")
-        label(for="inputFen") {{ st.tr["FEN (optional)"] }}
+      fieldset(v-if="st.user.id > 0 && newchallenge.to.length > 0")
+        label(for="inputFen") FEN
         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
-      button(onClick="doClick('modalNewgame')") New game
+    .col-sm-12
+      button#newGame(onClick="doClick('modalNewgame')") {{ st.tr["New game"] }}
   .row
     .col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
-      .collapse
-        input#challengeSection(type="radio" checked aria-hidden="true" name="accordion")
-        label(for="challengeSection" aria-hidden="true") Challenges
-        div
-          .button-group
-            button(@click="cdisplay='live'") Live Challenges
-            button(@click="cdisplay='corr'") Correspondance challenges
-          ChallengeList(v-show="cdisplay=='live'"
-            :challenges="filterChallenges('live')" @click-challenge="clickChallenge")
-          ChallengeList(v-show="cdisplay=='corr'"
-            :challenges="filterChallenges('corr')" @click-challenge="clickChallenge")
-        input#peopleSection(type="radio" aria-hidden="true" name="accordion")
-        label(for="peopleSection" aria-hidden="true") People
-        div
-          .button-group
-            button(@click="pdisplay='players'") Players
-            button(@click="pdisplay='chat'") Chat
-          #players(v-show="pdisplay=='players'")
-            h3 Online players
-            .player(v-for="p in uniquePlayers" @click="tryChallenge(p)"
-              :class="{anonymous: !!p.count}"
+      div
+        .button-group
+          button(@click="(e) => setDisplay('c','live',e)" class="active")
+            | {{ st.tr["Live challenges"] }}
+          button(@click="(e) => setDisplay('c','corr',e)")
+            | {{ st.tr["Correspondance challenges"] }}
+        ChallengeList(v-show="cdisplay=='live'"
+          :challenges="filterChallenges('live')" @click-challenge="clickChallenge")
+        ChallengeList(v-show="cdisplay=='corr'"
+          :challenges="filterChallenges('corr')" @click-challenge="clickChallenge")
+      #people
+        h3.text-center {{ st.tr["Who's there?"] }}
+        #players
+          p(v-for="sid in Object.keys(people)" v-if="!!people[sid].name")
+            span {{ people[sid].name }}
+            button.player-action(
+              v-if="people[sid].name != st.user.name"
+              @click="challOrWatch(sid, $event)"
             )
-              | {{ p.name + (!!p.count ? " ("+p.count+")" : "") }}
-          #chat(v-show="pdisplay=='chat'")
-            h3 Chat (TODO)
-        input#gameSection(type="radio" aria-hidden="true" name="accordion")
-        label(for="gameSection" aria-hidden="true") Games
-        div
-          .button-group
-            button(@click="gdisplay='live'") Live games
-            button(@click="gdisplay='corr'") Correspondance games
-          GameList(v-show="gdisplay=='live'" :games="filterGames('live')"
-            @show-game="showGame")
-          GameList(v-show="gdisplay=='corr'" :games="filterGames('corr')"
-            @show-game="showGame")
+              | {{ st.tr[!!people[sid].gamer ? 'Playing' : 'Available'] }}
+          p.anonymous @nonymous ({{ anonymousCount }})
+        #chat
+          Chat(:newChat="newChat" @mychat="processChat")
+        .clearer
+      div
+        .button-group
+          button(@click="(e) => setDisplay('g','live',e)" class="active")
+            | {{ st.tr["Live games"] }}
+          button(@click="(e) => setDisplay('g','corr',e)")
+            | {{ st.tr["Correspondance games"] }}
+        GameList(v-show="gdisplay=='live'" :games="filterGames('live')"
+          @show-game="showGame")
+        GameList(v-show="gdisplay=='corr'" :games="filterGames('corr')"
+          @show-game="showGame")
 </template>
 
 <script>
@@ -66,14 +78,18 @@ import { store } from "@/store";
 import { checkChallenge } from "@/data/challengeCheck";
 import { ArrayFun } from "@/utils/array";
 import { ajax } from "@/utils/ajax";
+import params from "@/parameters";
 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";
-import { extractTime } from "@/utils/timeControl";
+import { processModalClick } from "@/utils/modalClick";
+
 export default {
   name: "my-hall",
   components: {
+    Chat,
     GameList,
     ChallengeList,
   },
@@ -85,72 +101,140 @@ export default {
       gdisplay: "live",
       games: [],
       challenges: [],
-      people: [], //(all) online players
+      people: {}, //people in main hall
+      infoMessage: "",
       newchallenge: {
         fen: "",
-        vid: 0,
+        vid: localStorage.getItem("vid") || "",
         to: "", //name of challenged player (if any)
-        timeControl: "", //"2m+2s" ...etc
+        timeControl: localStorage.getItem("timeControl") || "",
       },
+      newChat: "",
+      conn: null,
+      page: "",
+      tempId: "", //to distinguish several tabs
     };
   },
-  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 = [];
-      this.people.forEach(p => {
-        if (p.id > 0)
-          playerList.push(p);
-        else
-          anonymous.count++;
+  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);
       });
-      if (anonymous.count > 0)
-        playerList.push(anonymous);
-      return playerList;
+    },
+  },
+  computed: {
+    anonymousCount: function() {
+      let count = 0;
+      Object.values(this.people).forEach(p => { count += (!p.name ? 1 : 0); });
+      return count;
     },
   },
   created: function() {
     // Always add myself to players' list
-    this.people.push(this.st.user);
-    if (this.st.user.id > 0)
-    {
+    const my = this.st.user;
+    this.tempId = getRandString();
+    this.$set(this.people, my.sid, {id:my.id, name:my.name, tmpId: [this.tempId]});
     // Ask server for current corr games (all but mines)
-//    ajax(
-//      "/games",
-//      "GET",
-//      {excluded: this.st.user.id},
-//      response => {
-//        this.games = this.games.concat(response.games);
-//      }
-//    );
-    // 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 ?
-          this.challenges = this.challenges.concat(response.challenges);
+    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 by/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...)
+        let names = {};
+        response.challenges.forEach(c => {
+          if (c.uid != this.st.user.id)
+            names[c.uid] = ""; //unknwon for now
+          else if (!!c.target && c.target != this.st.user.id)
+            names[c.target] = "";
+        });
+        const addChallenges = (newChalls) => {
+          names[this.st.user.id] = this.st.user.name; //in case of
+          this.challenges = this.challenges.concat(
+            response.challenges.map(c => {
+              const from = {name: names[c.uid], id: c.uid}; //or just name
+              const type = this.classifyObject(c);
+              const vname = this.getVname(c.vid);
+              return Object.assign({},
+                {
+                  type: type,
+                  vname: vname,
+                  from: from,
+                  to: (!!c.target ? names[c.target] : ""),
+                },
+                c);
+            })
+          );
+        };
+        if (names !== {})
+        {
+          ajax("/users",
+            "GET",
+            { ids: Object.keys(names).join(",") },
+            response2 => {
+              response2.users.forEach(u => {names[u.id] = u.name});
+              addChallenges();
+            }
+          );
         }
-      );
-    }
+        else
+          addChallenges();
+      }
+    );
     // 0.1] Ask server for room composition:
-    const socketOpenListener = () => {
-      this.st.conn.send(JSON.stringify({code:"pollclients"}));
+    const funcPollClients = () => {
+      this.conn.send(JSON.stringify({code:"connect"}));
+      this.conn.send(JSON.stringify({code:"pollclients"}));
+      this.conn.send(JSON.stringify({code:"pollgamers"}));
     };
-    this.st.conn.onopen = socketOpenListener;
-    // TODO: is this required here?
-    this.oldOnmessage = this.st.conn.onmessage || Function.prototype;
-    this.st.conn.onmessage = this.socketMessageListener;
-    const oldOnclose = this.st.conn.onclose;
+    // Initialize connection
+    this.page = this.$route.path;
+    const connexionString = params.socketUrl +
+      "/?sid=" + this.st.user.sid +
+      "&tmpId=" + this.tempId +
+      "&page=" + encodeURIComponent(this.page);
+    this.conn = new WebSocket(connexionString);
+    this.conn.onopen = funcPollClients;
+    this.conn.onmessage = this.socketMessageListener;
     const socketCloseListener = () => {
-      oldOnclose(); //reinitialize connexion (in store.js)
-      this.st.conn.addEventListener('message', this.socketMessageListener);
-      this.st.conn.addEventListener('close', socketCloseListener);
+      this.conn = new WebSocket(connexionString);
+      this.conn.addEventListener('message', this.socketMessageListener);
+      this.conn.addEventListener('close', socketCloseListener);
     };
-    this.st.conn.onclose = socketCloseListener;
+    this.conn.onclose = socketCloseListener;
+  },
+  mounted: function() {
+    [document.getElementById("infoDiv"),document.getElementById("newgameDiv")]
+      .forEach(elt => elt.addEventListener("click", processModalClick));
+    document.querySelectorAll("#predefinedTimeControls > button").forEach(
+      (b) => { b.addEventListener("click",
+        () => { this.newchallenge.timeControl = b.innerHTML; }
+      )}
+    );
+  },
+  beforeDestroy: function() {
+    this.conn.send(JSON.stringify({code:"disconnect",page:this.page}));
   },
   methods: {
     // Helpers:
@@ -158,108 +242,146 @@ export default {
       return this.challenges.filter(c => c.type == type);
     },
     filterGames: function(type) {
-      return this.games.filter(c => c.type == type);
+      return this.games.filter(g => g.type == type);
     },
     classifyObject: function(o) { //challenge or game
-      // Heuristic: should work for most cases... (TODO)
       return (o.timeControl.indexOf('d') === -1 ? "live" : "corr");
     },
     showGame: function(g) {
       // NOTE: we are an observer, since only games I don't play are shown here
       // ==> Moves sent by connected remote player(s) if live game
-      
-// TODO: this doesn't work: choose a SID at random
-
-      let url = "/" + g.id;
+      let url = "/game/" + g.id;
       if (g.type == "live")
-      {
-        const sids = g.players.map(p => p.sid).join(",");
-        url += "?sids=" + sids;
-      }
+        url += "?rid=" + g.rid;
       this.$router.push(url);
     },
-    getVname: function(vid) {
-      const vIdx = this.st.variants.findIndex(v => v.id == vid);
-      return this.st.variants[vIdx].name;
+    setDisplay: function(letter, type, e) {
+      this[letter + "display"] = type;
+      e.target.classList.add("active");
+      if (!!e.target.previousElementSibling)
+        e.target.previousElementSibling.classList.remove("active");
+      else
+        e.target.nextElementSibling.classList.remove("active");
     },
-    getSid: function(pname) {
-      const pIdx = this.people.findIndex(pl => pl.name == pname);
-      return (pIdx === -1 ? null : this.people[pIdx].sid);
+    getVname: function(vid) {
+      const variant = this.st.variants.find(v => v.id == vid);
+      // this.st.variants might be uninitialized (variant == null)
+      return (!!variant ? variant.name : "");
     },
-    getPname: function(sid) {
-      const pIdx = this.people.findIndex(pl => pl.sid == sid);
-      return (pIdx === -1 ? null : this.people[pIdx].name);
+    processChat: function(chat) {
+      // When received on server, this will trigger a "notifyRoom"
+      this.conn.send(JSON.stringify({code:"newchat", chat: chat}));
     },
     sendSomethingTo: function(to, code, obj, warnDisconnected) {
       const doSend = (code, obj, sid) => {
-        this.st.conn.send(JSON.stringify(Object.assign(
-          {},
+        this.conn.send(JSON.stringify(Object.assign(
           {code: code},
           obj,
           {target: sid}
         )));
       };
-      if (!!to[0])
+      if (!to || (!to.sid && !to.name))
       {
-        to.forEach(pname => {
+        // Open challenge: send to all connected players (me excepted)
+        Object.keys(this.people).forEach(sid => {
+          if (sid != this.st.user.sid)
+            doSend(code, obj, sid);
+        });
+      }
+      else
+      {
+        let targetSid = "";
+        if (!!to.sid)
+          targetSid = to.sid;
+        else
+        {
+          if (to.name == this.st.user.name)
+            return alert(this.st.tr["Cannot challenge self"]);
           // Challenge with targeted players
-          const targetSid = this.getSid(pname);
+          targetSid =
+            Object.keys(this.people).find(sid => this.people[sid].name == to.name);
           if (!targetSid)
           {
             if (!!warnDisconnected)
-              alert("Warning: " + pname + " is not connected");
+              alert(this.st.tr["Target is not connected"]);
+            return false;
           }
-          else
-            doSend(code, obj, targetSid);
-        });
-      }
-      else
-      {
-        // Open challenge: send to all connected players (except us)
-        this.people.forEach(p => {
-          if (p.sid != this.st.user.sid) //only sid is always set
-            doSend(code, obj, p.sid);
-        });
+        }
+        doSend(code, obj, targetSid);
       }
+      return true;
     },
     // Messaging center:
     socketMessageListener: function(msg) {
-      // Save and call current st.conn.onmessage if one was already defined
-      // --> also needed in future Game.vue (also in Chat.vue component)
-      this.oldOnmessage(msg);
       const data = JSON.parse(msg.data);
       switch (data.code)
       {
+        case "duplicate":
+          this.conn.send(JSON.stringify({code:"duplicate", page:"/"}));
+          this.conn.send = () => {};
+          alert(this.st.tr["This tab is now offline"]);
+          break;
         // 0.2] Receive clients list (just socket IDs)
         case "pollclients":
-        {
           data.sockIds.forEach(sid => {
-            this.people.push({sid:sid, id:0, name:""});
-            // 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}));
+            this.$set(this.people, sid, {id:0, name:""});
+            // Ask identity and challenges
+            this.conn.send(JSON.stringify({code:"askidentity", target:sid}));
+            this.conn.send(JSON.stringify({code:"askchallenge", target:sid}));
           });
           break;
-        }
+        case "pollgamers":
+          // NOTE: we could make a difference between people in hall
+          // and gamers, but is it necessary?
+          data.sockIds.forEach(sid => {
+            this.$set(this.people, sid, {id:0, name:"", gamer:true});
+            this.conn.send(JSON.stringify({code:"askidentity", target:sid}));
+          });
+          // Also ask current games to all playing peers (TODO: some design issue)
+          this.conn.send(JSON.stringify({code:"askgames"}));
+          break;
         case "askidentity":
-        {
           // Request for identification: reply if I'm not anonymous
           if (this.st.user.id > 0)
           {
-            this.st.conn.send(JSON.stringify(
-              {code:"identity", user:this.st.user, target:data.from}));
+            this.conn.send(JSON.stringify({code:"identity",
+              user: {
+                // NOTE: decompose to avoid revealing email
+                name: this.st.user.name,
+                sid: this.st.user.sid,
+                id: this.st.user.id,
+              },
+              target:data.from}));
           }
           break;
-        }
+        case "identity":
+          this.$set(this.people, data.user.sid,
+            {
+              id: data.user.id,
+              name: data.user.name,
+              gamer: this.people[data.user.sid].gamer,
+            });
+          break;
         case "askchallenge":
         {
           // Send my current live challenge (if any)
-          const cIdx = this.challenges
-            .findIndex(c => c.from.sid == this.st.user.sid && c.type == "live");
+          const cIdx = this.challenges.findIndex(c =>
+            c.from.sid == this.st.user.sid && c.type == "live");
           if (cIdx >= 0)
           {
             const c = this.challenges[cIdx];
+            // TODO: code below requires "c.to" to have given his identity,
+            // but it can happen that the identity arrives later, which
+            // prevent him from receiving the challenge.
+            // ==> Filter later (when receiving challenge)
+//            if (!!c.to)
+//            {
+//              // Only share targeted challenges to the targets:
+//              const toSid = Object.keys(this.people).find(k =>
+//                this.people[k].name == c.to);
+//              if (toSid != data.from)
+//                return;
+//            }
             const myChallenge =
             {
               // Minimal challenge informations: (from not required)
@@ -267,167 +389,182 @@ export default {
               to: c.to,
               fen: c.fen,
               vid: c.vid,
-              timeControl: c.timeControl
+              timeControl: c.timeControl,
+              added: c.added,
             };
-            this.st.conn.send(JSON.stringify({code:"challenge",
-              challenge:myChallenge, target:data.from}));
+            this.conn.send(JSON.stringify({code:"challenge",
+              chall:myChallenge, target:data.from}));
           }
           break;
         }
-        case "askgame":
-        {
-          // Send my current live games (if any)
-          // TODO: from indexedDB, through GameStorage.
-//          if (!!localStorage["gid"])
-//          {
-//            const myGame =
-//            {
-//              // Minimal game informations: (fen+clock not required)
-//              id: localStorage["gid"],
-//              players: JSON.parse(localStorage["players"]), //array sid+id+name
-//              vname: localStorage["vname"],
-//              timeControl: localStorage["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);
-          this.people[pIdx].id = data.user.id;
-          this.people[pIdx].name = data.user.name;
-          break;
-        }
         case "challenge":
-        {
           // Receive challenge from some player (+sid)
-          let newChall = data.chall;
-          newChall.type = this.classifyObject(data.chall);
-          const pIdx = this.people.findIndex(p => p.sid == data.from);
-          newChall.from = this.people[pIdx]; //may be anonymous
-          newChall.added = Date.now();
-          newChall.vname = this.getVname(newChall.vid);
-          this.challenges.push(newChall);
+          // NOTE about next condition: see "askchallenge" case.
+          if (!data.chall.to || data.chall.to == this.st.user.name)
+          {
+            let newChall = data.chall;
+            newChall.type = this.classifyObject(data.chall);
+            newChall.from =
+              Object.assign({sid:data.from}, this.people[data.from]);
+            newChall.vname = this.getVname(newChall.vid);
+            this.challenges.push(newChall);
+          }
           break;
-        }
         case "game":
         {
           // Receive game from some player (+sid)
           // NOTE: it may be correspondance (if newgame while we are connected)
-          // TODO: ambiguous naming "newGame" ==> rename function ?
-          let newGame = data.game;
-          newGame.type = this.classifyObject(data.game);
-          newGame.vname = newGame.vname;
-          this.games.push(newGame);
+          // If duplicate found: select rid (remote ID) at random
+          let game = this.games.find(g => g.id == data.game.id);
+          if (!!game)
+          {
+            if (Math.random() < 0.5)
+              game.rid = data.from;
+          }
+          else
+          {
+            let newGame = data.game;
+            newGame.type = this.classifyObject(data.game);
+            newGame.vname = this.getVname(data.game.vid);
+            newGame.rid = data.from;
+            if (!data.game.score)
+              newGame.score = "*";
+            this.games.push(newGame);
+          }
           break;
         }
-// *  - receive "new game": if live, store locally + redirect to game
-// *    If corr: notify "new game has started", give link, but do not redirect
         case "newgame":
-        {
-          // Delete corresponding challenge:
-          ArrayFun.remove(this.challenges, c => c.id == data.cid);
-          // New game just started: data contain all informations
-          this.newGame(data.gameInfo);
+          // New game just started: data contain all information
+          if (this.classifyObject(data.gameInfo) == "live")
+            this.startNewGame(data.gameInfo);
+          else
+          {
+            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;
-        }
-// *  - receive "accept/cancel challenge": apply action to challenges list
-        // NOTE: challenge "socket" actions accept+withdraw only for live challenges
-        case "acceptchallenge":
-        {
-          // Someone accept an open (or targeted) challenge
-          const cIdx = this.challenges.findIndex(c => c.id == data.cid);
-          let c = this.challenges[cIdx];
-          const pIdx = this.people.findIndex(p => p.sid == data.from);
-          c.seat = this.people[pIdx];
-          this.launchGame(c);
+        case "newchat":
+          this.newChat = data.chat;
           break;
-        }
         case "refusechallenge":
-        {
-          alert(this.getPname(data.from) + " refused your challenge");
           ArrayFun.remove(this.challenges, c => c.id == data.cid);
+          alert(this.st.tr["Challenge declined"]);
           break;
-        }
         case "deletechallenge":
-        {
+          // NOTE: the challenge may be already removed
           ArrayFun.remove(this.challenges, c => c.id == data.cid);
           break;
-        }
         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}));
+        case "gconnect":
+          this.$set(this.people, data.from, {name:"", id:0, gamer:data.code[0]=='g'});
+          this.conn.send(JSON.stringify({code:"askidentity", target:data.from}));
+          if (data.code == "connect")
+            this.conn.send(JSON.stringify({code:"askchallenge", target:data.from}));
+          else
+            this.conn.send(JSON.stringify({code:"askgame", target:data.from}));
           break;
-        }
         case "disconnect":
-        {
-          ArrayFun.remove(this.people, p => p.sid == data.sid);
-          // Also remove all challenges sent by this player:
-          ArrayFun.remove(this.challenges, c => c.from.sid == data.sid);
-          // 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
-              || !this.people.some(pl => pl.sid == p.sid))), "all");
+        case "gdisconnect":
+          this.$delete(this.people, data.from);
+          if (data.code == "disconnect")
+          {
+            // Also remove all challenges sent by this player:
+            ArrayFun.remove(this.challenges, c => c.from.sid == data.from);
+          }
+          else
+          {
+            // 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.from
+                || !this.people[p.sid])), "all");
+          }
           break;
-        }
       }
     },
     // Challenge lifecycle:
-    tryChallenge: function(player) {
-      if (player.id == 0)
+    tryChallenge: function(sid) {
+      if (this.people[sid].id == 0)
         return; //anonymous players cannot be challenged
-      this.newchallenge.to[0] = player.name;
+      // TODO: SID is available, so we could use it instead of searching from name
+      this.newchallenge.to = this.people[sid].name;
       doClick("modalNewgame");
     },
+    challOrWatch: function(sid) {
+      if (!this.people[sid].gamer)
+      {
+        // Available, in Hall
+        this.tryChallenge(sid);
+      }
+      else
+      {
+        // Playing, in Game
+        this.showGame(this.games.find(
+          g => g.players.some(pl => pl.sid == sid || pl.uid == this.people[sid].id)));
+      }
+    },
     newChallenge: async function() {
+      if (this.newchallenge.vid == "")
+        return alert(this.st.tr["Please select a variant"]);
+      if (!!this.newchallenge.to && this.newchallenge.to == this.st.user.name)
+        return alert(this.st.tr["Self-challenge is forbidden"]);
       const vname = this.getVname(this.newchallenge.vid);
       const vModule = await import("@/variants/" + vname + ".js");
       window.V = vModule.VariantRules;
+      if (!!this.newchallenge.timeControl.match(/^[0-9]+$/))
+        this.newchallenge.timeControl += "+0"; //assume minutes, no increment
       const error = checkChallenge(this.newchallenge);
       if (!!error)
         return alert(error);
       const ctype = this.classifyObject(this.newchallenge);
+      if (ctype == "corr" && this.st.user.id <= 0)
+        return alert(this.st.tr["Please log in to play correspondance games"]);
       // NOTE: "from" information is not required here
-      let chall =
-      {
-        fen: this.newchallenge.fen,
-        to: this.newchallenge.to,
-        timeControl: this.newchallenge.timeControl,
-        vid: this.newchallenge.vid,
-      };
+      let chall = Object.assign({}, this.newchallenge);
       const finishAddChallenge = (cid,warnDisconnected) => {
         chall.id = cid || "c" + getRandString();
         // Send challenge to peers (if connected)
-        this.sendSomethingTo(cto, "challenge", {chall:chall}, !!warnDisconnected);
+        const isSent = this.sendSomethingTo({name:chall.to}, "challenge",
+          {chall:chall}, !!warnDisconnected);
+        if (!isSent)
+          return;
+        // Remove old challenge if any (only one at a time of a given type):
+        const cIdx = this.challenges.findIndex(c =>
+          (c.from.sid == this.st.user.sid || c.from.id == this.st.user.id) && c.type == ctype);
+        if (cIdx >= 0)
+        {
+          // Delete current challenge (will be replaced now)
+          this.sendSomethingTo({name:this.challenges[cIdx].to},
+            "deletechallenge", {cid:this.challenges[cIdx].id});
+          if (ctype == "corr")
+          {
+            ajax(
+              "/challenges",
+              "DELETE",
+              {id: this.challenges[cIdx].id}
+            );
+          }
+          this.challenges.splice(cIdx, 1);
+        }
+        // Add new challenge:
         chall.added = Date.now();
+        // NOTE: vname and type are redundant (can be deduced from timeControl + vid)
         chall.type = ctype;
         chall.vname = vname;
-        chall.from = this.st.user;
+        chall.from = { //decompose to avoid revealing email
+          sid: this.st.user.sid,
+          id: this.st.user.id,
+          name: this.st.user.name,
+        };
         this.challenges.push(chall);
+        // Remember timeControl  + vid for quicker further challenges:
+        localStorage.setItem("timeControl", chall.timeControl);
+        localStorage.setItem("vid", chall.vid);
         document.getElementById("modalNewgame").checked = false;
       };
-      const cIdx = this.challenges.findIndex(
-        c => c.from.sid == this.st.user.sid && c.type == ctype);
-      if (cIdx >= 0)
-      {
-        // Delete current challenge (will be replaced now)
-        this.sendSomethingTo(this.challenges[cIdx].to,
-          "deletechallenge", {cid:this.challenges[cIdx].id});
-        if (ctype == "corr")
-        {
-          ajax(
-            "/challenges",
-            "DELETE",
-            {id: this.challenges[cIdx].id}
-          );
-        }
-        this.challenges.splice(cIdx, 1);
-      }
       if (ctype == "live")
       {
         // Live challenges have a random ID
@@ -439,133 +576,165 @@ export default {
         ajax(
           "/challenges",
           "POST",
-          chall,
+          { chall: chall },
           response => { finishAddChallenge(response.cid); }
         );
       }
     },
-// *  - accept challenge (corr or live) --> send info to challenge creator
-// *  - cancel challenge (click on sent challenge) --> send info to all concerned players
-// *    --> send info to challenge creator
-// *  - refuse challenge: send "refuse" to challenge sender, and "delete" to others
-// *  - prepare and start new game (if challenge is full after acceptation)
-// *    --> include challenge ID (so that opponents can delete the challenge too)
     clickChallenge: function(c) {
-
-      console.log("click challenge");
-      console.log(c);
-
-      if (c.from.sid == this.st.user.sid
-        || (this.st.user.id > 0 && c.from.id == this.st.user.id))
-      {
-        // It's my challenge: cancel it
-        this.sendSomethingTo(c.to, "deletechallenge", {cid:c.id});
-        ArrayFun.remove(this.challenges, ch => ch.id == c.id);
-        if (c.type == "corr")
-        {
-          ajax(
-            "/challenges",
-            "DELETE",
-            {id: this.challenges[cIdx].id}
-          );
-        }
-      }
-      else //accept (or refuse) a challenge
+      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(this.st.tr["Please log in to accept corr challenges"]);
         c.accepted = true;
-        if (!!c.to[0])
+        if (!!c.to) //c.to == this.st.user.name (connected)
         {
           // TODO: if special FEN, show diagram after loading variant
           c.accepted = confirm("Accept challenge?");
         }
-        this.st.conn.send(JSON.stringify({
-          code: (c.accepted ? "accept" : "refuse") + "challenge",
-          cid: c.id, target: c.from.sid}));
-        if (c.type == "corr" && c.accepted)
+        if (c.accepted)
+        {
+          c.seat = { //again, avoid c.seat = st.user to not reveal email
+            sid: this.st.user.sid,
+            id: this.st.user.id,
+            name: this.st.user.name,
+          };
+          this.launchGame(c);
+        }
+        else
+        {
+          this.conn.send(JSON.stringify({
+            code: "refusechallenge",
+            cid: c.id, target: c.from.sid}));
+        }
+        this.sendSomethingTo(!!c.to ? {sid:c.from.sid} : null, "deletechallenge", {cid:c.id});
+      }
+      else //my challenge
+      {
+        if (c.type == "corr")
         {
           ajax(
             "/challenges",
-            "PUT",
-            {id: this.challenges[cIdx].id}
+            "DELETE",
+            {id: c.id}
           );
         }
-        if (!c.accepted)
-        {
-          ArrayFun.remove(this.challenges, ch => ch.id == c.id);
-          if (c.type == "corr")
-          {
-            ajax(
-              "/challenges",
-              "DELETE",
-              {id: this.challenges[cIdx].id}
-            );
-          }
-        }
+        this.sendSomethingTo({name:c.to}, "deletechallenge", {cid:c.id});
       }
+      // In all cases, the challenge is consumed:
+      ArrayFun.remove(this.challenges, ch => ch.id == c.id);
     },
-    // NOTE: for live games only (corr games are launched on server)
+    // NOTE: when launching game, the challenge is already being deleted
     launchGame: async function(c) {
-      // Just assign colors and pass the message
-      const vname = this.getVname(c.vid);
-      const vModule = await import("@/variants/" + vname + ".js");
+      const vModule = await import("@/variants/" + c.vname + ".js");
       window.V = vModule.VariantRules;
-      let players = [c.from, c.seat];
       // These game informations will be sent to other players
       const gameInfo =
       {
-        gameId: getRandString(),
+        id: getRandString(),
         fen: c.fen || V.GenRandInitFen(),
-        // Players' names may be required if game start when a player is offline
-        // Shuffle players order (white then black then other colors).
-        players: shuffle(players.map(p => { return {name:p.name, sid:p.sid} })),
+        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,
       };
-      // NOTE: cid required to remove challenge
-      this.st.conn.send(JSON.stringify({code:"newgame",
-        gameInfo:gameInfo, cid:c.id, target:c.seat.sid}));
-      // Delete corresponding challenge:
-      ArrayFun.remove(this.challenges, ch => ch.id == c.id);
-      this.newGame(gameInfo); //also!
-    },
-    // NOTE: for live games only (corr games are launched on server)
-    newGame: function(gameInfo) {
-      // Extract times (in [milli]seconds), set clocks
-      const tc = extractTime(gameInfo.timeControl);
-      let initime = [...Array(gameInfo.players.length)];
-      initime[0] = Date.now();
-      const game =
+      let oppsid = c.from.sid; //may not be defined if corr + offline opp
+      if (!oppsid)
+      {
+        oppsid = Object.keys(this.people).find(sid =>
+          this.people[sid].id == c.from.id);
+      }
+      const tryNotifyOpponent = () => {
+        if (!!oppsid) //opponent is online
+        {
+          this.conn.send(JSON.stringify({code:"newgame",
+            gameInfo:gameInfo, target:oppsid, cid:c.id}));
+        }
+      };
+      if (c.type == "live")
+      {
+        // NOTE: in this case we are sure opponent is online
+        tryNotifyOpponent();
+        this.startNewGame(gameInfo);
+      }
+      else //corr: game only on server
       {
-        // Game infos: constant
-        gameId: gameInfo.gameId,
-        vname: this.getVname(gameInfo.vid),
+        ajax(
+          "/games",
+          "POST",
+          {gameInfo: gameInfo, cid: c.id}, //cid useful to delete challenge
+          response => {
+            gameInfo.id = response.gameId;
+            tryNotifyOpponent();
+            this.$router.push("/game/" + response.gameId);
+          }
+        );
+      }
+      // Send game info to everyone except opponent (and me)
+      Object.keys(this.people).forEach(sid => {
+        if (![this.st.user.sid,oppsid].includes(sid))
+        {
+          this.conn.send(JSON.stringify({code:"game",
+            game: { //minimal game info:
+              id: gameInfo.id,
+              players: gameInfo.players,
+              vid: gameInfo.vid,
+              timeControl: gameInfo.timeControl,
+            },
+            target: sid}));
+        }
+      });
+    },
+    // 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,
-        players: gameInfo.players,
-        timeControl: gameInfo.timeControl,
-        increment: tc.increment,
-        mode: "live", //function for live games only
-        // Game state: will be updated
-        fen: gameInfo.fen,
+        added: Date.now(),
+        // Game state (including FEN): will be updated
         moves: [],
-        clocks: [...Array(gameInfo.players.length)].fill(tc.mainTime),
-        initime: initime,
+        clocks: [-1, -1], //-1 = unstarted
+        initime: [0, 0], //initialized later
         score: "*",
-      };
+      });
       GameStorage.add(game);
       if (this.st.settings.sound >= 1)
         new Audio("/sounds/newgame.mp3").play().catch(err => {});
-      // TODO: redirect to game
+      this.$router.push("/game/" + gameInfo.id);
     },
   },
 };
 </script>
 
-<style lang="sass">
-// TODO
+<style lang="sass" scoped>
+.active
+  color: #42a983
+#newGame
+  display: block
+  margin: 10px auto 5px auto
+#people
+  width: 100%
+#players
+  width: 50%
+  position: relative
+  float: left
+#chat
+  width: 50%
+  float: left
+  position: relative
+@media screen and (max-width: 767px)
+  #players, #chats
+    width: 100%
+#chat > .card
+  max-width: 100%
+  margin: 0;
+  border: none;
+#players > p
+  margin-left: 5px
+.anonymous
+  font-style: italic
+button.player-action
+  margin-left: 32px
 </style>
-
-<!--
-// TODO:
-// Remove duplicates if several players of one game send their game info (Hall)
-// When click on it, assign a random rid among online players (max. 4).
--->