X-Git-Url: https://git.auder.net/images/pieces/%22%20%20VariantRules.getPpath%28board%5Bi%5D%5Bj%5D%29%20%20%20%22.svg?a=blobdiff_plain;f=client%2Fsrc%2Fviews%2FHall.vue;h=079584c02fedc155365842a29206ad31955e3c0e;hb=89021f181ac0689bbc785ce0ebd9a910e66352b0;hp=6e536ecc6f2f09f33b22a46cb59a325752da7baf;hpb=7b01e4470c228c99d3e54c8319a1be20237563c6;p=vchess.git

diff --git a/client/src/views/Hall.vue b/client/src/views/Hall.vue
index 6e536ecc..079584c0 100644
--- a/client/src/views/Hall.vue
+++ b/client/src/views/Hall.vue
@@ -1,64 +1,72 @@
 <template lang="pug">
 main
+  input#modalInfo.modal(type="checkbox")
+  div#infoDiv(role="dialog" data-checkbox="modalInfo")
+    .card.text-center
+      label.modal-close(for="modalInfo")
+      p(v-html="infoMessage")
   input#modalNewgame.modal(type="checkbox")
-  div(role="dialog" aria-labelledby="titleFenedit")
-    .card.smallpad
+  div#newgameDiv(role="dialog" data-checkbox="modalNewgame")
+    .card
       label#closeNewgame.modal-close(for="modalNewgame")
-      fieldset
-        label(for="selectVariant") {{ st.tr["Variant"] }}
-        select#selectVariant(v-model="newchallenge.vid")
-          option(v-for="v in st.variants" :value="v.id") {{ v.name }}
-      fieldset
-        label(for="timeControl") {{ st.tr["Time control"] }}
-        input#timeControl(type="text" v-model="newchallenge.timeControl"
-          placeholder="3m+2s, 1h+30s, 7d+1d ...")
-      fieldset(v-if="st.user.id > 0")
-        label(for="selectPlayers") {{ st.tr["Play with? (optional)"] }}
-        input#selectPlayers(type="text" v-model="newchallenge.to")
-      fieldset(v-if="st.user.id > 0")
-        label(for="inputFen") {{ st.tr["FEN (optional)"] }}
-        input#inputFen(type="text" v-model="newchallenge.fen")
-      button(@click="newChallenge") {{ st.tr["Send challenge"] }}
+      form(@submit.prevent="newChallenge()" @keyup.enter="newChallenge()")
+        fieldset
+          label(for="selectVariant") {{ st.tr["Variant"] }} *
+          select#selectVariant(v-model="newchallenge.vid")
+            option(v-for="v in st.variants" :value="v.id"
+                :selected="newchallenge.vid==v.id")
+              | {{ v.name }}
+        fieldset
+          label(for="cadence") {{ st.tr["Cadence"] }} *
+          div#predefinedCadences
+            button 3+2
+            button 5+3
+            button 15+5
+          input#cadence(type="text" v-model="newchallenge.cadence"
+            placeholder="5+0, 1h+30s, 7d+1d ...")
+        fieldset(v-if="st.user.id > 0")
+          label(for="selectPlayers") {{ st.tr["Play with?"] }}
+          input#selectPlayers(type="text" v-model="newchallenge.to")
+        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}"
-            )
-              | {{ 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")
+      div
+        .button-group
+          button#btnClive(@click="setDisplay('c','live',$event)" class="active")
+            | {{ st.tr["Live challenges"] }}
+          button#btnCcorr(@click="setDisplay('c','corr',$event)")
+            | {{ 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="sid!=st.user.sid || isGamer(sid)" @click="challOrWatch(sid)")
+              | {{ getActionLabel(sid) }}
+          p.anonymous @nonymous ({{ anonymousCount }})
+        #chat
+          Chat(:newChat="newChat" @mychat="processChat" :pastChats="[]")
+        .clearer
+      div
+        .button-group
+          button#btnGlive(@click="setDisplay('g','live',$event)" class="active")
+            | {{ st.tr["Live games"] }}
+          button#btnGcorr(@click="setDisplay('g','corr',$event)")
+            | {{ 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 +74,17 @@ 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,
   },
@@ -81,367 +92,557 @@ export default {
     return {
       st: store.state,
       cdisplay: "live", //or corr
-      pdisplay: "players", //or chat
       gdisplay: "live",
       games: [],
       challenges: [],
-      people: [], //(all) online players
+      people: {},
+      infoMessage: "",
       newchallenge: {
         fen: "",
-        vid: 0,
+        vid: localStorage.getItem("vid") || "",
         to: "", //name of challenged player (if any)
-        timeControl: "", //"2m+2s" ...etc
+        cadence: localStorage.getItem("cadence") || "",
       },
+      newChat: "",
+      conn: null,
+      connexionString: "",
+      // Related to (killing of) self multi-connects:
+      newConnect: {},
+      killed: {},
     };
   },
-  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.concat(this.games).forEach(o => {
+        if (o.vname == "")
+          o.vname = this.getVname(o.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);
-    // Retrieve live challenge (not older than 30 minute) if any:
-    const chall = JSON.parse(localStorage.getItem("challenge") || "false");
-    if (!!chall)
-    {
-      if ((Date.now() - chall.added)/1000 <= 30*60)
-        this.challenges.push(chall);
-      else
-        localStorage.removeItem("challenge");
-    }
-    if (this.st.user.id > 0)
-    {
+    const my = this.st.user;
+    this.$set(this.people, my.sid, {id:my.id, name:my.name, pages:["/"]});
     // 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 ?
-          Array.prototype.push.apply(this.challenges, response.challenges);
+    ajax(
+      "/games",
+      "GET",
+      {uid: this.st.user.id, excluded: true},
+      response => {
+        // Show corr tab with timeout, to let enough time for (socket) polling
+        setTimeout(
+          () => {
+            if (response.games.length > 0 &&
+              this.games.length == response.games.length)
+            {
+              this.setDisplay('g', "corr");
+            }
+          },
+          1000
+        );
+        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 => {
+        setTimeout(
+          () => {
+            if (response.challenges.length > 0 &&
+              this.challenges.length == response.challenges.length)
+            {
+              this.setDisplay('c', "corr");
+            }
+          },
+          1000
+        );
+        // 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();
+            }
+          );
         }
-      );
-    }
-    // 0.1] Ask server for room composition:
-    const funcPollClients = () => {
-      this.st.conn.send(JSON.stringify({code:"pollclients"}));
-    };
-    if (!!this.st.conn && this.st.conn.readyState == 1) //1 == OPEN state
-      funcPollClients();
-    else //socket not ready yet (initial loading)
-    {
-      const socketOpenListener = funcPollClients;
-      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;
-    const socketCloseListener = () => {
-      oldOnclose(); //reinitialize connexion (in store.js)
-      this.st.conn.addEventListener('message', this.socketMessageListener);
-      this.st.conn.addEventListener('close', socketCloseListener);
+        else
+          addChallenges();
+      }
+    );
+    const connectAndPoll = () => {
+      this.send("connect");
+      this.send("pollclientsandgamers");
     };
-    this.st.conn.onclose = socketCloseListener;
+    // Initialize connection
+    this.connexionString = params.socketUrl +
+      "/?sid=" + this.st.user.sid +
+      "&tmpId=" + getRandString() +
+      "&page=" + encodeURIComponent(this.$route.path);
+    this.conn = new WebSocket(this.connexionString);
+    this.conn.onopen = connectAndPoll;
+    this.conn.onmessage = this.socketMessageListener;
+    this.conn.onclose = this.socketCloseListener;
+  },
+  mounted: function() {
+    [document.getElementById("infoDiv"),document.getElementById("newgameDiv")]
+      .forEach(elt => elt.addEventListener("click", processModalClick));
+    document.querySelectorAll("#predefinedCadences > button").forEach(
+      (b) => { b.addEventListener("click",
+        () => { this.newchallenge.cadence = b.innerHTML; }
+      )}
+    );
+  },
+  beforeDestroy: function() {
+    this.send("disconnect");
   },
   methods: {
     // Helpers:
+    send: function(code, obj) {
+      if (!!this.conn)
+      {
+        this.conn.send(JSON.stringify(
+          Object.assign(
+            {code: code},
+            obj,
+          )
+        ));
+      }
+    },
+    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 : "");
+    },
     filterChallenges: function(type) {
       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
-      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;
-      }
-      this.$router.push(url);
+      return (o.cadence.indexOf('d') === -1 ? "live" : "corr");
     },
-    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;
+      let elt = !!e
+        ? e.target
+        : document.getElementById("btn" + letter.toUpperCase() + type);
+      elt.classList.add("active");
+      if (!!elt.previousElementSibling)
+        elt.previousElementSibling.classList.remove("active");
+      else
+        elt.nextElementSibling.classList.remove("active");
     },
-    getSid: function(pname) {
-      const pIdx = this.people.findIndex(pl => pl.name == pname);
-      return (pIdx === -1 ? null : this.people[pIdx].sid);
+    isGamer: function(sid) {
+      return this.people[sid].pages.some(p => p.indexOf("/game/") >= 0);
     },
-    getPname: function(sid) {
-      const pIdx = this.people.findIndex(pl => pl.sid == sid);
-      return (pIdx === -1 ? null : this.people[pIdx].name);
+    getActionLabel: function(sid) {
+      return this.people[sid].pages.some(p => p == "/")
+        ? "Challenge"
+        : "Observe";
     },
-    sendSomethingTo: function(to, code, obj, warnDisconnected) {
-      const doSend = (code, obj, sid) => {
-        this.st.conn.send(JSON.stringify(Object.assign(
-          {},
-          {code: code},
-          obj,
-          {target: sid}
-        )));
-      };
-      if (!!to)
+    challOrWatch: function(sid) {
+      if (this.people[sid].pages.some(p => p == "/"))
       {
-        // Challenge with targeted players
-        const targetSid = this.getSid(to);
-        if (!targetSid)
-        {
-          if (!!warnDisconnected)
-            alert("Warning: " + pname + " is not connected");
-        }
-        else
-          doSend(code, obj, targetSid);
+        // Available, in Hall
+        this.newchallenge.to = this.people[sid].name;
+        doClick("modalNewgame");
       }
       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);
+        // In some game, maybe playing maybe not: show a random one
+        let gids = [];
+        this.people[sid].pages.forEach(p => {
+          const matchGid = p.match(/[a-zA-Z0-9]+$/);
+          if (!!matchGid)
+            gids.push(matchGid[0]);
         });
+        const gid = gids[Math.floor(Math.random() * gids.length)];
+        this.showGame(this.games.find(g => g.id == gid));
       }
     },
+    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
+      let url = "/game/" + g.id;
+      if (g.type == "live")
+        url += "?rid=" + g.rids[Math.floor(Math.random() * g.rids.length)];
+      this.$router.push(url);
+    },
+    processChat: function(chat) {
+      this.send("newchat", {data:chat});
+    },
     // 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);
+      if (!this.conn)
+        return;
       const data = JSON.parse(msg.data);
       switch (data.code)
       {
-        // 0.2] Receive clients list (just socket IDs)
-        case "pollclients":
+        case "pollclientsandgamers":
         {
-          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}));
+          // Since people can be both in Hall and Game,
+          // need to track "askIdentity" requests:
+          let identityAsked = {};
+          data.sockIds.forEach(s => {
+            const page = s.page || "/";
+            if (s.sid != this.st.user.sid && !identityAsked[s.sid])
+            {
+              identityAsked[s.sid] = true;
+              this.send("askidentity", {target:s.sid, page:page});
+            }
+            if (!this.people[s.sid])
+              this.$set(this.people, s.sid, {id:0, name:"", pages:[page]});
+            else if (this.people[s.sid].pages.indexOf(page) < 0)
+              this.people[s.sid].pages.push(page);
+            if (!s.page) //peer is in Hall
+              this.send("askchallenge", {target:s.sid});
+            else //peer is in Game
+              this.send("askgame", {target:s.sid, page:page});
           });
           break;
         }
+        case "connect":
+        case "gconnect":
+        {
+          const page = data.page || "/";
+          // NOTE: player could have been polled earlier, but might have logged in then
+          // So it's a good idea to ask identity if he was anonymous.
+          // But only ask game / challenge if currently disconnected.
+          if (!this.people[data.from])
+          {
+            this.$set(this.people, data.from, {name:"", id:0, pages:[page]});
+            if (data.code == "connect")
+              this.send("askchallenge", {target:data.from});
+            else
+              this.send("askgame", {target:data.from, page:page});
+          }
+          else
+          {
+            // append page if not already in list
+            if (this.people[data.from].pages.indexOf(page) < 0)
+              this.people[data.from].pages.push(page);
+          }
+          if (this.people[data.from].id == 0)
+          {
+            this.newConnect[data.from] = true; //for self multi-connects tests
+            this.send("askidentity", {target:data.from, page:page});
+          }
+          break;
+        }
+        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.
+          // ==> Next check is required.
+          if (!this.people[data.from])
+            return;
+          // Disconnect means no more tmpIds:
+          if (data.code == "disconnect")
+          {
+            // Remove the live challenge sent by this player:
+            ArrayFun.remove(this.challenges, c => c.from.sid == data.from);
+          }
+          else
+          {
+            // Remove the matching live game if now unreachable
+            const gid = data.page.match(/[a-zA-Z0-9]+$/)[0];
+            const gidx = this.games.findIndex(g => g.id == gid);
+            if (gidx >= 0)
+            {
+              const game = this.games[gidx];
+              if (game.type == "live" &&
+                game.rids.length == 1 && game.rids[0] == data.from)
+              {
+                this.games.splice(gidx, 1);
+              }
+            }
+          }
+          const page = data.page || "/";
+          ArrayFun.remove(this.people[data.from].pages, p => p == page);
+          if (this.people[data.from].pages.length == 0)
+            this.$delete(this.people, data.from);
+          break;
+        case "killed":
+          // I logged in elsewhere:
+          alert(this.st.tr["New connexion detected: tab now offline"]);
+          // TODO: this fails. See https://github.com/websockets/ws/issues/489
+          //this.conn.removeEventListener("message", this.socketMessageListener);
+          //this.conn.removeEventListener("close", this.socketCloseListener);
+          //this.conn.close();
+          this.conn = null;
+          break;
         case "askidentity":
         {
-          // Request for identification: reply if I'm not anonymous
-          if (this.st.user.id > 0)
+          // Request for identification (TODO: anonymous shouldn't need to reply)
+          const me = {
+            // Decompose to avoid revealing email
+            name: this.st.user.name,
+            sid: this.st.user.sid,
+            id: this.st.user.id,
+          };
+          this.send("identity", {data:me, target:data.from});
+          break;
+        }
+        case "identity":
+        {
+          const user = data.data;
+          if (!!user.name) //otherwise anonymous
           {
-            this.st.conn.send(JSON.stringify(
-              {code:"identity", user:this.st.user, target:data.from}));
+            // If I multi-connect, kill current connexion if no mark (I'm older)
+            if (this.newConnect[user.sid] && user.id > 0
+              && user.id == this.st.user.id && user.sid != this.st.user.sid)
+            {
+              if (!this.killed[this.st.user.sid])
+              {
+                this.send("killme", {sid:this.st.user.sid});
+                this.killed[this.st.user.sid] = true;
+              }
+            }
+            if (user.sid != this.st.user.sid) //I already know my identity...
+            {
+              this.$set(this.people, user.sid,
+                {
+                  id: user.id,
+                  name: user.name,
+                  pages: this.people[user.sid].pages,
+                });
+            }
           }
+          delete this.newConnect[user.sid];
           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];
+            // 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.
             const myChallenge =
             {
-              // Minimal challenge informations: (from not required)
               id: c.id,
+              from: this.st.user.sid,
               to: c.to,
               fen: c.fen,
               vid: c.vid,
-              timeControl: c.timeControl
+              cadence: c.cadence,
+              added: c.added,
             };
-
-            // TODO: understand multiple (increasing) "send challenge" events.... (when potential opponent navigate Hall --> variants --> Hall)
-console.log("send challenge to " + data.from);
-
-            this.st.conn.send(JSON.stringify({code:"challenge",
-              chall:myChallenge, target:data.from}));
+            this.send("challenge", {data:myChallenge, target:data.from});
           }
           break;
         }
-        case "askgame":
+        case "challenge": //after "askchallenge"
+        case "newchallenge":
         {
-          // 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),
-                vname: game.vname,
-                timeControl: game.timeControl,
-              };
-              this.st.conn.send(JSON.stringify({code:"game",
-                game:myGame, target:data.from}));
-            }
-          });
+          // NOTE about next condition: see "askchallenge" case.
+          const chall = data.data;
+          if (!chall.to || (this.people[chall.from].id > 0 &&
+            (chall.from == this.st.user.sid || chall.to == this.st.user.name)))
+          {
+            let newChall = Object.assign({}, chall);
+            newChall.type = this.classifyObject(chall);
+            newChall.added = Date.now();
+            let fromValues = Object.assign({}, this.people[chall.from]);
+            delete fromValues["pages"]; //irrelevant in this context
+            newChall.from = Object.assign({sid:chall.from}, fromValues);
+            newChall.vname = this.getVname(newChall.vid);
+            this.challenges.push(newChall);
+            // Adjust visual:
+            if (newChall.type == "live" && this.cdisplay == "corr" && !this.challenges.some(c => c.type == "corr"))
+              this.setDisplay('c', "live");
+            else if (newChall.type == "corr" && this.cdisplay == "live" && !this.challenges.some(c => c.type == "live"))
+              this.setDisplay('c', "corr");
+          }
           break;
         }
-        case "identity":
+        case "refusechallenge":
         {
-          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;
+          const cid = data.data;
+          ArrayFun.remove(this.challenges, c => c.id == cid);
+          alert(this.st.tr["Challenge declined"]);
           break;
         }
-        case "challenge":
+        case "deletechallenge":
         {
-
-console.log(data.chall);
-
-          // 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(); //TODO: this is reception timestamp, not creation
-          newChall.vname = this.getVname(newChall.vid); //TODO: just send vname?
-          this.challenges.push(newChall);
+          // NOTE: the challenge may be already removed
+          const cid = data.data;
+          ArrayFun.remove(this.challenges, c => c.id == cid);
           break;
         }
-        case "game":
+        case "game": //individual request
+        case "newgame":
         {
-          // Receive game from some player (+sid)
-          // NOTE: it may be correspondance (if newgame while we are connected)
-          if (!this.games.some(g => g.id == data.game.id)) //ignore duplicates
+          // NOTE: it may be live or correspondance
+          const game = data.data;
+          let locGame = this.games.find(g => g.id == game.id);
+          if (!locGame)
           {
-            let newGame = data.game;
-            newGame.type = this.classifyObject(data.game);
-            newGame.rid = data.from;
-            newGame.score = "*";
+            let newGame = game;
+            newGame.type = this.classifyObject(game);
+            newGame.vname = this.getVname(game.vid);
+            if (!game.score) //if new game from Hall
+              newGame.score = "*";
+            newGame.rids = [game.rid];
+            delete newGame["rid"];
             this.games.push(newGame);
+            // Adjust visual:
+            if (newGame.type == "live" && this.gdisplay == "corr" && !this.games.some(g => g.type == "corr"))
+              this.setDisplay('g', "live");
+            else if (newGame.type == "live" && this.gdisplay == "live" && !this.games.some(g => g.type == "live"))
+              this.setDisplay('g', "corr");
+          }
+          else
+          {
+            // Append rid (if not already in list)
+            if (!locGame.rids.includes(game.rid))
+              locGame.rids.push(game.rid);
           }
           break;
         }
-        case "newgame":
-        {
-          // New game just started: data contain all informations
-          this.startNewGame(data.gameInfo);
-          // TODO: if live, redirect to game
-          // if corr, notify with link but do not redirect
-          break;
-        }
-        case "refusechallenge":
-        {
-          alert(this.getPname(data.from) + " declined your challenge");
-          ArrayFun.remove(this.challenges, c => c.id == data.cid);
-          break;
-        }
-        case "deletechallenge":
+        case "result":
         {
-          // NOTE: the challenge may be already removed
-          ArrayFun.remove(this.challenges, c => c.id == data.cid);
+          let g = this.games.find(g => g.id == data.gid);
+          if (!!g)
+            g.score = data.score;
           break;
         }
-        case "connect":
+        case "startgame":
         {
-          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}));
+          // New game just started: data contain all information
+          const gameInfo = data.data;
+          if (this.classifyObject(gameInfo) == "live")
+            this.startNewGame(gameInfo);
+          else
+          {
+            this.infoMessage = this.st.tr["New correspondance game:"] +
+              " <a href='#/game/" + gameInfo.id + "'>" +
+              "#/game/" + gameInfo.id + "</a>";
+            let modalBox = document.getElementById("modalInfo");
+            modalBox.checked = true;
+          }
           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 "newchat":
+          this.newChat = data.data;
           break;
-        }
       }
     },
-    // Challenge lifecycle:
-    tryChallenge: function(player) {
-      if (player.id == 0)
-        return; //anonymous players cannot be challenged
-      this.newchallenge.to[0] = player.name;
-      doClick("modalNewgame");
+    socketCloseListener: function() {
+      if (!this.conn)
+        return;
+      this.conn = new WebSocket(this.connexionString);
+      this.conn.addEventListener("message", this.socketMessageListener);
+      this.conn.addEventListener("close", this.socketCloseListener);
     },
+    // Challenge lifecycle:
     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.cadence.match(/^[0-9]+$/))
+        this.newchallenge.cadence += "+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,
-      };
-      const finishAddChallenge = (cid,warnDisconnected) => {
+      let chall = Object.assign({}, this.newchallenge);
+      const finishAddChallenge = (cid) => {
         chall.id = cid || "c" + getRandString();
-        // Send challenge to peers (if connected)
-        this.sendSomethingTo(chall.to, "challenge", {chall:chall}, !!warnDisconnected);
+        // 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.send("deletechallenge", {data:this.challenges[cIdx].id});
+          if (ctype == "corr")
+          {
+            ajax(
+              "/challenges",
+              "DELETE",
+              {id: this.challenges[cIdx].id}
+            );
+          }
+          this.challenges.splice(cIdx, 1);
+        }
+        this.send("newchallenge", {data:Object.assign({from:this.st.user.sid}, chall)});
+        // Add new challenge:
+        chall.from = { //decompose to avoid revealing email
+          sid: this.st.user.sid,
+          id: this.st.user.id,
+          name: this.st.user.name,
+        };
         chall.added = Date.now();
+        // NOTE: vname and type are redundant (can be deduced from cadence + vid)
         chall.type = ctype;
         chall.vname = vname;
-        chall.from = this.st.user;
         this.challenges.push(chall);
-        localStorage.setItem("challenge", JSON.stringify(chall));
+        // Remember cadence  + vid for quicker further challenges:
+        localStorage.setItem("cadence", chall.cadence);
+        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
-        finishAddChallenge(null, "warnDisconnected");
+        finishAddChallenge(null);
       }
       else
       {
@@ -449,7 +650,7 @@ console.log(data.chall);
         ajax(
           "/challenges",
           "POST",
-          chall,
+          { chall: chall },
           response => { finishAddChallenge(response.cid); }
         );
       }
@@ -459,6 +660,8 @@ console.log(data.chall);
         || (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) //c.to == this.st.user.name (connected)
         {
@@ -467,91 +670,136 @@ console.log(data.chall);
         }
         if (c.accepted)
         {
-          c.seat = this.st.user;
+          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.st.conn.send(JSON.stringify({
-            code: "refusechallenge",
-            cid: c.id, target: c.from.sid}));
+          this.send("refusechallenge", {data:c.id, target:c.from.sid});
         }
+        this.send("deletechallenge", {data:c.id});
       }
-      // 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, "deletechallenge", {cid:c.id});
-      if (c.type == "corr")
+      else //my challenge
       {
-        ajax(
-          "/challenges",
-          "DELETE",
-          {id: this.challenges[cIdx].id}
-        );
+        if (c.type == "corr")
+        {
+          ajax(
+            "/challenges",
+            "DELETE",
+            {id: c.id}
+          );
+        }
+        this.send("deletechallenge", {data:c.id});
       }
+      // In all cases, the challenge is consumed:
+      ArrayFun.remove(this.challenges, ch => ch.id == c.id);
     },
-    // NOTE: when launching game, the challenge is already deleted
+    // NOTE: when launching game, the challenge is already being deleted
     launchGame: async function(c) {
-      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 =
+      // These game informations will be shared
+      let 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).
-        players: shuffle(players.map(p => { return {name:p.name, sid:p.sid} })),
+        players: shuffle([c.from, c.seat]), //white then black
         vid: c.vid,
-        timeControl: c.timeControl,
+        cadence: c.cadence,
+      };
+      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 notifyNewgame = () => {
+        if (!!oppsid) //opponent is online
+          this.send("startgame", {data:gameInfo, target:oppsid});
+        // Send game info (only if live) to everyone except me in this tab
+        this.send("newgame", {data:gameInfo});
       };
-      this.st.conn.send(JSON.stringify({code:"newgame",
-        gameInfo:gameInfo, target:c.seat.sid}));
       if (c.type == "live")
+      {
+        notifyNewgame();
         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;
+            notifyNewgame();
+            this.$router.push("/game/" + response.gameId);
+          }
         );
       }
     },
-    // NOTE: for live games only (corr games are launched on server)
+    // NOTE: for live games only (corr games start on the server)
     startNewGame: 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 =
-      {
-        // Game infos: constant
-        gameId: gameInfo.gameId,
-        vname: this.getVname(gameInfo.vid),
+      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,
+        vname: this.getVname(gameInfo.vid),
+        created: 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
+
+#infoDiv > .card
+  padding: 15px 0
+  max-width: 430px
+
+#newgameDiv > .card
+  max-width: 767px
+  max-height: 100%
+
+#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>