X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fviews%2FHall.vue;h=190717d0dbe2df25c4529f597aba68565102163c;hb=6808d7a16ec1e761c6a2dffec2281c96953e4d89;hp=d65de3d7e24ba1f74c132d15783019957e9a2f90;hpb=9ca1e26b79ec1873aa6ac914013160f8593d52cf;p=vchess.git

diff --git a/client/src/views/Hall.vue b/client/src/views/Hall.vue
index d65de3d7..190717d0 100644
--- a/client/src/views/Hall.vue
+++ b/client/src/views/Hall.vue
@@ -1,70 +1,77 @@
 <template lang="pug">
 main
   input#modalInfo.modal(type="checkbox")
-  div(role="dialog" aria-labelledby="infoMessage")
-    .card.smallpad.small-modal.text-center
+  div#infoDiv(role="dialog" data-checkbox="modalInfo")
+    .card.text-center
       label.modal-close(for="modalInfo")
-      h3#infoMessage.section
-        p(v-html="infoMessage")
+      p(v-html="infoMessage")
   input#modalNewgame.modal(type="checkbox")
-  div(role="dialog" aria-labelledby="titleFenedit")
-    .card.smallpad(@keyup.enter="newChallenge")
+  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"] }}
+  input#modalPeople.modal(type="checkbox" @click="resetChatColor()")
+  div#peopleWrap(role="dialog" data-checkbox="modalPeople")
+    .card
+      label.modal-close(for="modalPeople")
+      #people
+        #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
   .row
-    .col-sm-12
-      button#newGame(onClick="doClick('modalNewgame')") New game
+    .col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
+      .button-group
+        button#peopleBtn(onClick="doClick('modalPeople')") {{ st.tr["Social"] }}
+        button(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'")
-            Chat(:players="[]")
-        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#div2
+        .button-group
+          button.tabbtn#btnClive(@click="setDisplay('c','live',$event)")
+            | {{ st.tr["Live challenges"] }}
+          button.tabbtn#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")
+      div#div3
+        .button-group
+          button.tabbtn#btnGlive(@click="setDisplay('g','live',$event)")
+            | {{ st.tr["Live games"] }}
+          button.tabbtn#btnGcorr(@click="setDisplay('g','corr',$event)")
+            | {{ st.tr["Correspondance games"] }}
+        GameList(v-show="gdisplay=='live'" :games="filterGames('live')"
+          :showBoth="true" @show-game="showGame")
+        GameList(v-show="gdisplay=='corr'" :games="filterGames('corr')"
+          :showBoth="true" @show-game="showGame")
 </template>
 
 <script>
@@ -72,531 +79,729 @@ 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 { processModalClick } from "@/utils/modalClick";
 export default {
   name: "my-hall",
   components: {
     Chat,
     GameList,
-    ChallengeList,
+    ChallengeList
   },
-  data: function () {
+  data: function() {
     return {
       st: store.state,
       cdisplay: "live", //or corr
-      pdisplay: "players", //or chat
       gdisplay: "live",
       games: [],
       challenges: [],
-      people: [], //people in main hall
+      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: {}
     };
   },
   watch: {
     // st.variants changes only once, at loading from [] to [...]
-    "st.variants": function(variantArray) {
+    "st.variants": function() {
       // 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);
+      this.challenges.concat(this.games).forEach(o => {
+        if (o.vname == "") o.vname = this.getVname(o.vid);
       });
-    },
+    }
   },
   computed: {
-    uniquePlayers: function() {
-      // Show e.g. "@nonymous (5)", and do nothing on click on anonymous
-      let anonymous = {name:"@nonymous", count:0};
-      let playerList = {};
-      this.people.forEach(p => {
-        if (p.id > 0)
-        {
-          // 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++;
+    anonymousCount: function() {
+      let count = 0;
+      Object.values(this.people).forEach(p => {
+        count += !p.name ? 1 : 0;
       });
-      if (anonymous.count > 0)
-        playerList[0] = anonymous;
-      return Object.values(playerList);
-    },
+      return count;
+    }
   },
   created: function() {
-    // Always add myself to players' list
     const my = this.st.user;
-    this.people.push({sid:my.sid, id:my.id, name:my.name});
-    // 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");
-    }
+    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",
-      {uid: this.st.user.id, excluded: true},
+      { 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});
-        }));
+        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",
+    // 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 = () => {
+        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 (Object.keys(names).length > 0) {
+        ajax(
+          "/users",
           "GET",
-          { ids: uids.join(",") },
+          { ids: Object.keys(names).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});
-              })
-            )
+            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)
-      this.st.conn.onopen = funcPollClients;
-    this.st.conn.onmessage = this.socketMessageListener;
-    const socketCloseListener = () => {
-      store.socketCloseListener(); //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() {
+    ["peopleWrap", "infoDiv", "newgameDiv"].forEach(eltName => {
+      let elt = document.getElementById(eltName);
+      elt.addEventListener("click", processModalClick);
+    });
+    document.querySelectorAll("#predefinedCadences > button").forEach(b => {
+      b.addEventListener("click", () => {
+        this.newchallenge.cadence = b.innerHTML;
+      });
+    });
+    const showCtype = localStorage.getItem("type-challenges") || "live";
+    const showGtype = localStorage.getItem("type-games") || "live";
+    this.setDisplay("c", showCtype);
+    this.setDisplay("g", showGtype);
+  },
+  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(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");
+    classifyObject: function(o) {
+      //challenge or game
+      return o.cadence.indexOf("d") === -1 ? "live" : "corr";
+    },
+    setDisplay: function(letter, type, e) {
+      this[letter + "display"] = type;
+      localStorage.setItem(
+        "type-" + (letter == "c" ? "challenges" : "games"),
+        type
+      );
+      let elt = e
+        ? e.target
+        : document.getElementById("btn" + letter.toUpperCase() + type);
+      elt.classList.add("active");
+      elt.classList.remove("somethingnew"); //in case of
+      if (elt.previousElementSibling)
+        elt.previousElementSibling.classList.remove("active");
+      else elt.nextElementSibling.classList.remove("active");
+    },
+    isGamer: function(sid) {
+      return this.people[sid].pages.some(p => p.indexOf("/game/") >= 0);
+    },
+    getActionLabel: function(sid) {
+      return this.people[sid].pages.some(p => p == "/")
+        ? "Challenge"
+        : "Observe";
+    },
+    challOrWatch: function(sid) {
+      if (this.people[sid].pages.some(p => p == "/")) {
+        // Available, in Hall
+        this.newchallenge.to = this.people[sid].name;
+        document.getElementById("modalPeople").checked = false;
+        window.doClick("modalNewgame");
+      } else {
+        // 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.rid;
+        url += "?rid=" + g.rids[Math.floor(Math.random() * g.rids.length)];
       this.$router.push(url);
     },
-    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 : "");
-    },
-    getSid: function(pname) {
-      const pIdx = this.people.findIndex(pl => pl.name == pname);
-      return (pIdx === -1 ? null : this.people[pIdx].sid);
+    resetChatColor: function() {
+      // TODO: this is called twice, once on opening an once on closing
+      document.getElementById("peopleBtn").classList.remove("somethingnew");
     },
-    getPname: function(sid) {
-      const pIdx = this.people.findIndex(pl => pl.sid == sid);
-      return (pIdx === -1 ? null : this.people[pIdx].name);
-    },
-    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)
-      {
-        // Challenge with targeted players
-        const targetSid = this.getSid(to);
-        if (!targetSid)
-        {
-          if (!!warnDisconnected)
-            alert("Warning: " + pname + " is not connected");
-        }
-        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);
-        });
-      }
+    processChat: function(chat) {
+      this.send("newchat", { data: chat });
     },
     // Messaging center:
     socketMessageListener: function(msg) {
+      if (!this.conn) return;
       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":
-        {
-          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}));
+      switch (data.code) {
+        case "pollclientsandgamers": {
+          // 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 });
+            //peer is in Game
+            else this.send("askgame", { target: s.sid, page: page });
           });
-          // Also ask current games to all playing peers (TODO: some design issue)
-          this.st.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(
-              // people[0] instead of st.user to avoid sending email
-              {code:"identity", user:this.people[0], target:data.from}));
+        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 "askchallenge":
-        {
+        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 (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
+            // 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");
-          if (cIdx >= 0)
-          {
+          const cIdx = this.challenges.findIndex(
+            c => c.from.sid == this.st.user.sid && c.type == "live"
+          );
+          if (cIdx >= 0) {
             const c = this.challenges[cIdx];
-            const myChallenge =
-            {
-              // Minimal challenge informations: (from not required)
+            // 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 = {
               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
             };
-            this.st.conn.send(JSON.stringify({code:"challenge",
-              chall:myChallenge, target:data.from}));
+            this.send("challenge", { data: myChallenge, 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;
+        case "challenge": //after "askchallenge"
+        case "newchallenge": {
+          // 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);
+            if (
+              (newChall.type == "live" && this.cdisplay == "corr") ||
+              (newChall.type == "corr" && this.cdisplay == "live")
+            ) {
+              document
+                .getElementById("btnC" + newChall.type)
+                .classList.add("somethingnew");
+            }
+          }
           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(); //TODO: this is reception timestamp, not creation
-          newChall.vname = this.getVname(newChall.vid);
-          this.challenges.push(newChall);
+        case "refusechallenge": {
+          const cid = data.data;
+          ArrayFun.remove(this.challenges, c => c.id == cid);
+          alert(this.st.tr["Challenge declined"]);
+          break;
+        }
+        case "deletechallenge": {
+          // NOTE: the challenge may be already removed
+          const cid = data.data;
+          ArrayFun.remove(this.challenges, c => c.id == cid);
           break;
         }
-        case "game":
-        {
-          // 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
-          {
-            let newGame = data.game;
-            newGame.type = this.classifyObject(data.game);
-            newGame.vname = this.getVname(data.game.vid);
-            newGame.rid = data.from;
-            newGame.score = "*";
+        case "game": //individual request
+        case "newgame": {
+          // 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 = 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);
+            if (
+              (newGame.type == "live" && this.gdisplay == "corr") ||
+              (newGame.type == "corr" && this.gdisplay == "live")
+            ) {
+              document
+                .getElementById("btnG" + newGame.type)
+                .classList.add("somethingnew");
+            }
+          } else {
+            // Append rid (if not already in list)
+            if (!locGame.rids.includes(game.rid)) locGame.rids.push(game.rid);
           }
           break;
         }
-        case "newgame":
-        {
-          // TODO: next line required ?!
-          //ArrayFun.remove(this.challenges, c => c.id == data.cid);
+        case "result": {
+          let g = this.games.find(g => g.id == data.gid);
+          if (g) g.score = data.score;
+          break;
+        }
+        case "startgame": {
           // 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>";
+          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;
-            setTimeout(() => { modalBox.checked = false; }, 3000);
           }
           break;
         }
-        case "refusechallenge":
-        {
-          alert(this.getPname(data.from) + " declined your challenge");
-          ArrayFun.remove(this.challenges, c => c.id == data.cid);
-          break;
-        }
-        case "deletechallenge":
-        {
-          // NOTE: the challenge may be already removed
-          ArrayFun.remove(this.challenges, c => c.id == data.cid);
-          localStorage.removeItem("challenge"); //in case of
-          break;
-        }
-        case "connect":
-        {
-          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.from);
-          // Also remove all challenges sent by this player:
-          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.from
-              || !this.people.some(pl => pl.sid == p.sid))), "all");
+        case "newchat":
+          this.newChat = data.data;
+          if (!document.getElementById("modalPeople").checked)
+            document.getElementById("peopleBtn").classList.add("somethingnew");
           break;
-        }
       }
     },
-    // Challenge lifecycle:
-    tryChallenge: function(player) {
-      if (player.id == 0)
-        return; //anonymous players cannot be challenged
-      this.newchallenge.to = 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() {
+      let error = "";
+      if (this.newchallenge.vid == "")
+        error = this.st.tr["Please select a variant"];
+      else if (!!this.newchallenge.to && this.newchallenge.to == this.st.user.name)
+        error = this.st.tr["Self-challenge is forbidden"];
+      if (error) {
+        alert(error);
+        return;
+      }
       const vname = this.getVname(this.newchallenge.vid);
       const vModule = await import("@/variants/" + vname + ".js");
       window.V = vModule.VariantRules;
-      const error = checkChallenge(this.newchallenge);
-      if (!!error)
-        return alert(error);
+      if (this.newchallenge.cadence.match(/^[0-9]+$/))
+        this.newchallenge.cadence += "+0"; //assume minutes, no increment
       const ctype = this.classifyObject(this.newchallenge);
-      if (ctype == "corr" && this.st.user.id <= 0)
-        return alert("Please log in to play correspondance games");
+      error = checkChallenge(this.newchallenge);
+      if (!error && ctype == "corr" && this.st.user.id <= 0)
+        error = this.st.tr["Please log in to play correspondance games"];
+      if (error) {
+        alert(error);
+        return;
+      }
       // NOTE: "from" information is not required here
       let chall = Object.assign({}, this.newchallenge);
-      const finishAddChallenge = (cid,warnDisconnected) => {
+      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 timeControl + vid)
+        // NOTE: vname and type are redundant (can be deduced from cadence + vid)
         chall.type = ctype;
         chall.vname = vname;
-        chall.from = this.people[0]; //avoid sending email
         this.challenges.push(chall);
-        if (ctype == "live")
-          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")
-      {
+      if (ctype == "live") {
         // Live challenges have a random ID
-        finishAddChallenge(null, "warnDisconnected");
-      }
-      else
-      {
+        finishAddChallenge(null);
+      } else {
         // Correspondance game: send challenge to server
-        ajax(
-          "/challenges",
-          "POST",
-          { chall: chall },
-          response => { finishAddChallenge(response.cid); }
-        );
+        ajax("/challenges", "POST", { chall: chall }, response => {
+          finishAddChallenge(response.cid);
+        });
       }
     },
     clickChallenge: function(c) {
-      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");
+      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) {
+          alert(this.st.tr["Please log in to accept corr challenges"]);
+          return;
+        }
         c.accepted = true;
-        if (!!c.to) //c.to == this.st.user.name (connected)
-        {
+        if (c.to) {
+          //c.to == this.st.user.name (connected)
           // TODO: if special FEN, show diagram after loading variant
           c.accepted = confirm("Accept challenge?");
         }
-        if (c.accepted)
-        {
-          c.seat = this.people[0]; //== this.st.user, avoid revealing email
+        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.send("refusechallenge", { data: c.id, target: c.from.sid });
         }
-        else
-        {
-          this.st.conn.send(JSON.stringify({
-            code: "refusechallenge",
-            cid: c.id, target: c.from.sid}));
-        }
-      }
-      else //my challenge
-      {
-        if (c.type == "corr")
-        {
-          ajax(
-            "/challenges",
-            "DELETE",
-            {id: c.id}
-          );
+        this.send("deletechallenge", { data: c.id });
+      } //my challenge
+      else {
+        if (c.type == "corr") {
+          ajax("/challenges", "DELETE", { id: c.id });
         }
-        else //live
-          localStorage.removeItem("challenge");
+        this.send("deletechallenge", { data: c.id });
       }
-      // In (almost) all cases, the challenge is consumed:
+      // 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});
     },
-    // NOTE: when launching game, the challenge is already deleted
+    // NOTE: when launching game, the challenge is already being deleted
     launchGame: async function(c) {
       const vModule = await import("@/variants/" + c.vname + ".js");
       window.V = vModule.VariantRules;
-      // These game informations will be sent to other players
-      const gameInfo =
-      {
+      // These game informations will be shared
+      let gameInfo = {
         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,
+        cadence: c.cadence
       };
-      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
+      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 (!!target) //opponent is online
-        {
-          this.st.conn.send(JSON.stringify({code:"newgame",
-            gameInfo:gameInfo, target:target, cid:c.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 });
       };
-      if (c.type == "live")
-      {
-        tryNotifyOpponent();
+      if (c.type == "live") {
+        notifyNewgame();
         this.startNewGame(gameInfo);
-      }
-      else //corr: game only on server
-      {
+      } //corr: game only on server
+      else {
         ajax(
           "/games",
           "POST",
-          {gameInfo: gameInfo, cid: c.id}, //cid useful to delete challenge
+          { gameInfo: gameInfo, cid: c.id }, //cid useful to delete challenge
           response => {
             gameInfo.id = response.gameId;
-            tryNotifyOpponent();
+            notifyNewgame();
             this.$router.push("/game/" + response.gameId);
           }
         );
       }
-      // 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(),
+        vname: this.getVname(gameInfo.vid),
+        created: Date.now(),
         // Game state (including FEN): will be updated
         moves: [],
         clocks: [-1, -1], //-1 = unstarted
         initime: [0, 0], //initialized later
-        score: "*",
+        score: "*"
       });
       GameStorage.add(game);
       if (this.st.settings.sound >= 1)
-        new Audio("/sounds/newgame.mp3").play().catch(err => {});
+        new Audio("/sounds/newgame.mp3").play().catch(() => {});
       this.$router.push("/game/" + gameInfo.id);
-    },
-  },
+    }
+  }
 };
 </script>
 
-<style lang="sass">
-#newGame
-  display: block
-  margin: auto
+<style lang="sass" scoped>
+.active
+  color: #42a983
+
+#infoDiv > .card
+  padding: 15px 0
+  max-width: 430px
+
+#newgameDiv > .card
+  max-width: 767px
+  max-height: 100%
+
+div#peopleWrap > .card
+  max-height: 100%
+
+@media screen and (min-width: 1281px)
+  div#peopleWrap > .card
+    max-width: 66.67%
+
+@media screen and (max-width: 1280px)
+  div#peopleWrap > .card
+    max-width: 83.33%
+
+@media screen and (max-width: 767px)
+  div#peopleWrap > .card
+    max-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
+
+.somethingnew
+  background-color: #c5fefe !important
+
+.tabbtn
+  background-color: #f9faee
+
+#div2, #div3
+  margin-top: 15px
+@media screen and (max-width: 767px)
+  #div2, #div3
+    margin-top: 0
 </style>