X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fviews%2FHall.vue;h=287788a17f781d404de53fb1591960c1f9110295;hb=11667c79617c057357f2a176c798bfee3b190771;hp=ca0caa266cdf90bc6ad9c7e91ebdb756db058911;hpb=cf2343cee5729c011770ace6d5b4f79d1ac3a2b6;p=vchess.git

diff --git a/client/src/views/Hall.vue b/client/src/views/Hall.vue
index ca0caa26..287788a1 100644
--- a/client/src/views/Hall.vue
+++ b/client/src/views/Hall.vue
@@ -1,73 +1,81 @@
 <template lang="pug">
-div
+main
+  input#modalInfo.modal(type="checkbox")
+  div(role="dialog" aria-labelledby="infoMessage")
+    .card.smallpad.small-modal.text-center
+      label.modal-close(for="modalInfo")
+      h3#infoMessage.section
+        p(v-html="infoMessage")
   input#modalNewgame.modal(type="checkbox")
   div(role="dialog" aria-labelledby="titleFenedit")
     .card.smallpad
       label#closeNewgame.modal-close(for="modalNewgame")
       fieldset
         label(for="selectVariant") {{ st.tr["Variant"] }}
-        select#selectVariant(v-model="newgameInfo.vid")
+        select#selectVariant(v-model="newchallenge.vid")
           option(v-for="v in st.variants" :value="v.id") {{ v.name }}
       fieldset
-        label(for="selectNbPlayers") {{ st.tr["Number of players"] }}
-        select#selectNbPlayers(v-model="newgameInfo.nbPlayers")
-          option(v-show="possibleNbplayers(2)" value="2") 2
-          option(v-show="possibleNbplayers(3)" value="3") 3
-          option(v-show="possibleNbplayers(4)" value="4") 4
-      fieldset
-        label(for="timeControl") Time control (in days)
-        #timeControl
-          input(type="number" v-model="newgameInfo.mainTime"
-            placeholder="Main time")
-          input(type="number" v-model="newgameInfo.increment"
-            placeholder="Increment")
-      fieldset
-        label(for="selectPlayers") {{ st.tr["Play with?"] }}
-        #selectPlayers
-          input(type="text" v-model="newgameInfo.players[0].name")
-          input(v-show="newgameInfo.nbPlayers>=3" type="text"
-            v-model="newgameInfo.players[1].name")
-          input(v-show="newgameInfo.nbPlayers==4" type="text"
-            v-model="newgameInfo.players[2].name")
-      fieldset
-        label(for="inputFen")
-          | {{ st.tr["FEN (ignored if players fields are blank)"] }}
-        input#inputFen(type="text" v-model="newgameInfo.fen")
-      button(@click="newGame") Launch game
-      p TODO: cadence, adversaire (pre-filled if click on name)
-      p cadence 2m+12s ou 7d+1d (m,s ou d,d) --> main, increment
-      p Note: leave FEN blank for random; FEN only for targeted challenge
-  div
-    ChallengeList(:challenges="challenges" @click-challenge="clickChallenge")
-    div(style="border:1px solid black")
-      h3 Online players
-      div(v-for="p in players" @click="challenge(p)") {{ p.name }}
-  button(onClick="doClick('modalNewgame')") New game
-  div
-    .button-group
-      button(@click="gdisplay='live'") Live games
-      button(@click="gdisplay='corr'") Correspondance games
-    GameList(v-show="gdisplay=='live'" :games="liveGames"
-      @show-game="showGame")
-    GameList(v-show="gdisplay=='corr'" :games="corrGames"
-      @show-game="showGame")
+        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"] }}
+  .row
+    .col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
+      button(onClick="doClick('modalNewgame')") 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")
 </template>
 
 <script>
-// main playing hall: online players + current challenges + button "new game"
-// TODO: si on est en train de jouer une partie, le notifier aux nouveaux connectés
-/*
-TODO: surligner si nouveau défi perso et pas affichage courant
-(cadences base + incrément, corr == incr >= 1jour ou base >= 7j)
---> correspondance: stocker sur serveur lastMove + uid + color + movesCount + gameId + variant + timeleft
-fin de partie corr: supprimer partie du serveur au bout de 7 jours (arbitraire)
-*/
-// TODO: au moins l'échange des coups en P2P ? et game chat ?
-// TODO: objet game, objet challenge ? et player ?
 import { store } from "@/store";
-import { NbPlayers } from "@/data/nbPlayers";
+import { checkChallenge } from "@/data/challengeCheck";
+import { ArrayFun } from "@/utils/array";
+import { ajax } from "@/utils/ajax";
+import { getRandString, shuffle } from "@/utils/alea";
 import GameList from "@/components/GameList.vue";
 import ChallengeList from "@/components/ChallengeList.vue";
+import { GameStorage } from "@/utils/gameStorage";
 export default {
   name: "my-hall",
   components: {
@@ -77,169 +85,516 @@ export default {
   data: function () {
     return {
       st: store.state,
+      cdisplay: "live", //or corr
+      pdisplay: "players", //or chat
       gdisplay: "live",
-      liveGames: [],
-      corrGames: [],
-      players: [], //online players
-      challenges: [], //live challenges
-      willPlay: [], //IDs of challenges in which I decide to play (>= 3 players)
-      newgameInfo: {
+      games: [],
+      challenges: [],
+      people: [], //people in main hall
+      infoMessage: "",
+      newchallenge: {
         fen: "",
         vid: 0,
-        nbPlayers: 0,
-        players: [{id:0,name:""},{id:0,name:""},{id:0,name:""}],
-        mainTime: 0,
-        increment: 0,
+        to: "", //name of challenged player (if any)
+        timeControl: "", //"2m+2s" ...etc
       },
     };
   },
   watch: {
-    "st.conn": function() {
-      // TODO: ask server for current corr games (all but mines: names, ID, time control)
-      const socketMessageListener = msg => {
-        const data = JSON.parse(msg.data);
-        switch (data.code)
-        {
-          case "newgame":
-            // TODO: new game just started: data contain all informations
-            // (id, players, time control, fenStart ...)
-            break;
-          // TODO: also receive live games summaries (update)
-          // (just players names, time control, and ID + player ID)
-          case "acceptchallenge":
-            // oppid: opponent socket ID (or DB id if registered)
-            if (true) //TODO: if challenge is full
-              this.newGame(data.challenge, data.user); //user.id et user.name
-            break;
-          case "withdrawchallenge":
-            // TODO
-            break;
-          case "cancelchallenge":
-            // TODO
-            break;
-          // TODO: distinguish these (dis)connect events from their analogs in game.js
-          case "connect":
-            this.players.push({name:data.name, id:data.uid});
-            break;
-          case "disconnect":
-            const pIdx = this.players.findIndex(p => p.id == data.uid);
-            this.players.splice(pIdx);
-            break;
-        }
-      };
-      const socketCloseListener = () => {
-        this.st.conn.addEventListener('message', socketMessageListener);
-        this.st.conn.addEventListener('close', socketCloseListener);
-      };
-      this.st.conn.onmessage = socketMessageListener;
-      this.st.conn.onclose = socketCloseListener;
+    // st.variants changes only once, at loading from [] to [...]
+    "st.variants": function(variantArray) {
+      // Set potential challenges and games variant names:
+      this.challenges.forEach(c => {
+        if (c.vname == "")
+          c.vname = this.getVname(c.vid);
+      });
+      this.games.forEach(g => {
+        if (g.vname == "")
+          g.vname = this.getVname(g.vid);
+      });
+    },
+  },
+  computed: {
+    uniquePlayers: function() {
+      // Show e.g. "@nonymous (5)", and do nothing on click on anonymous
+      let anonymous = {id:0, name:"@nonymous", count:0};
+      let playerList = [];
+      this.people.forEach(p => {
+        if (p.id > 0)
+          playerList.push(p);
+        else
+          anonymous.count++;
+      });
+      if (anonymous.count > 0)
+        playerList.push(anonymous);
+      return playerList;
     },
   },
+  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");
+    }
+    // Ask server for current corr games (all but mines)
+    ajax(
+      "/games",
+      "GET",
+      {uid: this.st.user.id, excluded: true},
+      response => {
+        this.games = this.games.concat(response.games.map(g => {
+          const type = this.classifyObject(g);
+          const vname = this.getVname(g.vid);
+          return Object.assign({}, g, {type: type, vname: vname});
+        }));
+      }
+    );
+    // Also ask for corr challenges (open + sent to me)
+    ajax(
+      "/challenges",
+      "GET",
+      {uid: this.st.user.id},
+      response => {
+        // Gather all senders names, and then retrieve full identity:
+        // (TODO [perf]: some might be online...)
+        const uids = response.challenges.map(c => { return c.uid });
+        ajax("/users",
+          "GET",
+          { ids: uids.join(",") },
+          response2 => {
+            let names = {};
+            response2.users.forEach(u => {names[u.id] = u.name});
+            this.challenges = this.challenges.concat(
+              response.challenges.map(c => {
+                // (just players names in fact)
+                const from = {name: names[c.uid], id: c.uid};
+                const type = this.classifyObject(c);
+                const vname = this.getVname(c.vid);
+                return Object.assign({}, c, {type: type, vname: vname, from: from});
+              })
+            )
+          }
+        );
+      }
+    );
+    // 0.1] Ask server for room composition:
+    const funcPollClients = () => {
+      this.st.conn.send(JSON.stringify({code:"pollclients"}));
+    };
+    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);
+    };
+    this.st.conn.onclose = socketCloseListener;
+  },
   methods: {
-    showGame: function(game) {
-      // NOTE: if we are an observer, the game will be found in main games list
-      // (sent by connected remote players)
-      this.$router.push("/" + game.id)
-    },
-    challenge: function(player) {
-      this.st.conn.send(JSON.stringify({code:"sendchallenge", oppid:p.id,
-        user:{name:this.st.user.name,id:this.st.user.id}}));
-    },
-    clickChallenge: function(challenge) {
-      const index = this.challenges.findIndex(c => c.id == challenge.id);
-      const toIdx = challenge.to.findIndex(p => p.id == user.id);
-      const me = {name:user.name,id:user.id};
-      if (toIdx >= 0)
+    // Helpers:
+    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");
+    },
+    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")
       {
-        // It's a multiplayer challenge I accepted: withdraw
-        this.st.conn.send(JSON.stringify({code:"withdrawchallenge",
-          cid:challenge.id, user:me}));
-        this.challenges.to.splice(toIdx, 1);
+        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;
       }
-      else if (challenge.from.id == user.id) //it's my challenge: cancel it
+      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);
+    },
+    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)
       {
-        this.st.conn.send(JSON.stringify({code:"cancelchallenge", cid:challenge.id}));
-        this.challenges.splice(index, 1);
+        // 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 //accept a challenge
+      else
       {
-        this.st.conn.send(JSON.stringify({code:"acceptchallenge",
-          cid:challenge.id, user:me}));
-        this.challenges[index].to.push(me);
+        // 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);
+        });
       }
-      // TODO: accepter un challenge peut lancer une partie, il
-      // faut alors supprimer challenge + creer partie + la retourner et l'ajouter ici
-      // autres actions:
-      // supprime mon défi
-      // accepte un défi
-      // annule l'acceptation d'un défi (si >= 3 joueurs)
-      //
-      // si pas le mien et FEN speciale :: (charger code variante et)
-      // montrer diagramme + couleur (orienté)
-    },
-    // user: last person to accept the challenge
-    newGameLive: function(chall, user) {
-      const fen = chall.fen || V.GenRandInitFen();
-      const game = {}; //TODO: fen, players, time ...
-      //setStorage(game); //TODO
-      game.players.forEach(p => {
-        this.conn.send(
-          JSON.stringify({code:"newgame", oppid:p.id, game:game}));
-      });
-      if (this.settings.sound >= 1)
-        new Audio("/sounds/newgame.mp3").play().catch(err => {});
     },
-    newGame: function() {
-      const afterRulesAreLoaded = () => {
-        // NOTE: side-effect = set FEN
-        // TODO: (to avoid any cheating option) separate the GenRandInitFen() functions
-        // in separate files, load on server and generate FEN on server.
-        const error = checkChallenge(this.newgameInfo, vname);
-        if (!!error)
-          return alert(error);
-        // Possible (server) error if filled player does not exist
-        ajax(
-          "/challenges/" + this.newgameInfo.vid,
-          "POST",
-          this.newgameInfo,
-          response => {
-            const chall = Object.assign({},
-              this.newgameInfo,
+    // Messaging center:
+    socketMessageListener: function(msg) {
+      const data = JSON.parse(msg.data);
+      switch (data.code)
+      {
+        // 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}));
+          });
+          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}));
+          }
+          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 c = this.challenges[cIdx];
+            const myChallenge =
+            {
+              // Minimal challenge informations: (from not required)
+              id: c.id,
+              to: c.to,
+              fen: c.fen,
+              vid: c.vid,
+              timeControl: c.timeControl
+            };
+            this.st.conn.send(JSON.stringify({code:"challenge",
+              chall:myChallenge, target:data.from}));
+          }
+          break;
+        }
+        case "askgame":
+        {
+          // Send my current live game (if any)
+          GameStorage.getCurrent((game) => {
+            if (!!game)
+            {
+              const myGame =
               {
-                id: response.cid,
-                uid: user.id,
-                added: Date.now(),
-                vname: vname,
-              });
-            this.challenges.push(chall);
+                // Minimal game informations:
+                id: game.id,
+                players: game.players.map(p => p.name),
+                vid: game.vid,
+                timeControl: game.timeControl,
+              };
+              this.st.conn.send(JSON.stringify({code:"game",
+                game:myGame, target:data.from}));
+            }
+          });
+          break;
+        }
+        case "identity":
+        {
+          const pIdx = this.people.findIndex(p => p.sid == data.user.sid);
+          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(); //TODO: this is reception timestamp, not creation
+          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)
+          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 = "*";
+            this.games.push(newGame);
           }
-        );
-        // TODO: else, if live game: send infos (socket), and...
+          break;
+        }
+        case "newgame":
+        {
+          // TODO: next line required ?!
+          //ArrayFun.remove(this.challenges, c => c.id == data.cid);
+          // 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;
+        }
+        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.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}));
+          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");
+          break;
+        }
+      }
+    },
+    // Challenge lifecycle:
+    tryChallenge: function(player) {
+      if (player.id == 0)
+        return; //anonymous players cannot be challenged
+      this.newchallenge.to = player.name;
+      doClick("modalNewgame");
+    },
+    newChallenge: async function() {
+      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);
+      const ctype = this.classifyObject(this.newchallenge);
+      if (ctype == "corr" && this.st.user.id <= 0)
+        return alert("Please log in to play correspondance games");
+      // NOTE: "from" information is not required here
+      let chall = Object.assign({}, this.newchallenge);
+      const finishAddChallenge = (cid,warnDisconnected) => {
+        chall.id = cid || "c" + getRandString();
+        // Send challenge to peers (if connected)
+        this.sendSomethingTo(chall.to, "challenge", {chall:chall}, !!warnDisconnected);
+        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.people[0]; //avoid sending email
+        this.challenges.push(chall);
+        if (ctype == "live")
+          localStorage.setItem("challenge", JSON.stringify(chall));
+        document.getElementById("modalNewgame").checked = false;
       };
-      const idxInVariants =
-        variantArray.findIndex(v => v.id == this.newgameInfo.vid);
-      const vname = variantArray[idxInVariants].name;
-      const scriptId = vname + "RulesScript";
-      if (!document.getElementById(scriptId))
+      const cIdx = this.challenges.findIndex(
+        c => c.from.sid == this.st.user.sid && c.type == ctype);
+      if (cIdx >= 0)
       {
-        // Load variant rules (only once)
-        var script = document.createElement("script");
-        script.id = scriptId;
-        script.onload = afterRulesAreLoaded;
-        //script.addEventListener ("load", afterRulesAreLoaded, false);
-        script.src = "/javascripts/variants/" + vname + ".js";
-        document.body.appendChild(script);
+        // 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");
       }
       else
-        afterRulesAreLoaded();
-    },
-    possibleNbplayers: function(nbp) {
-      if (this.newgameInfo.vid == 0)
-        return false;
-      const variants = this.st.variants;
-      const idxInVariants =
-        variants.findIndex(v => v.id == this.newgameInfo.vid);
-      return NbPlayers[variants[idxInVariants].name].includes(nbp);
+      {
+        // Correspondance game: send challenge to server
+        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");
+        c.accepted = true;
+        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
+          this.launchGame(c);
+        }
+        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}
+          );
+        }
+        else //live
+          localStorage.removeItem("challenge");
+      }
+      // In (almost) all cases, the challenge is consumed:
+      ArrayFun.remove(this.challenges, ch => ch.id == c.id);
+      // NOTE: deletechallenge event might be redundant (but it's easier this way)
+      this.sendSomethingTo((!!c.to ? c.from : null), "deletechallenge", {cid:c.id});
+    },
+    // NOTE: when launching game, the challenge is already deleted
+    launchGame: async function(c) {
+      const vModule = await import("@/variants/" + c.vname + ".js");
+      window.V = vModule.VariantRules;
+      // These game informations will be sent to other players
+      const 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,
+      };
+      let target = c.from.sid; //may not be defined if corr + offline opp
+      if (!target)
+      {
+        const opponent = this.people.find(p => p.id == c.from.id);
+        if (!!opponent)
+          target = opponent.sid
+      }
+      const tryNotifyOpponent = () => {
+        if (!!target) //opponent is online
+        {
+          this.st.conn.send(JSON.stringify({code:"newgame",
+            gameInfo:gameInfo, target:target, cid:c.id}));
+        }
+      };
+      if (c.type == "live")
+      {
+        tryNotifyOpponent();
+        this.startNewGame(gameInfo);
+      }
+      else //corr: game only on server
+      {
+        ajax(
+          "/games",
+          "POST",
+          {gameInfo: gameInfo, cid: c.id}, //cid useful to delete challenge
+          response => {
+            gameInfo.id = response.gameId;
+            tryNotifyOpponent();
+            this.$router.push("/game/" + response.gameId);
+          }
+        );
+      }
+    },
+    // NOTE: for live games only (corr games start on the server)
+    startNewGame: function(gameInfo) {
+      const game = Object.assign({}, gameInfo, {
+        // (other) Game infos: constant
+        fenStart: gameInfo.fen,
+        added: Date.now(),
+        // Game state (including FEN): will be updated
+        moves: [],
+        clocks: [-1, -1], //-1 = unstarted
+        initime: [0, 0], //initialized later
+        score: "*",
+      });
+      GameStorage.add(game);
+      if (this.st.settings.sound >= 1)
+        new Audio("/sounds/newgame.mp3").play().catch(err => {});
+      this.$router.push("/game/" + gameInfo.id);
     },
   },
 };