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

diff --git a/client/src/views/Hall.vue b/client/src/views/Hall.vue
index e76139a1..d65de3d7 100644
--- a/client/src/views/Hall.vue
+++ b/client/src/views/Hall.vue
@@ -1,38 +1,33 @@
 <template lang="pug">
 main
+  input#modalInfo.modal(type="checkbox")
+  div(role="dialog" aria-labelledby="infoMessage")
+    .card.smallpad.small-modal.text-center
+      label.modal-close(for="modalInfo")
+      h3#infoMessage.section
+        p(v-html="infoMessage")
   input#modalNewgame.modal(type="checkbox")
   div(role="dialog" aria-labelledby="titleFenedit")
-    .card.smallpad
+    .card.smallpad(@keyup.enter="newChallenge")
       label#closeNewgame.modal-close(for="modalNewgame")
       fieldset
         label(for="selectVariant") {{ st.tr["Variant"] }}
         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="newchallenge.nbPlayers")
-          option(v-show="possibleNbplayers(2)" value="2" selected) 2
-          option(v-show="possibleNbplayers(3)" value="3") 3
-          option(v-show="possibleNbplayers(4)" value="4") 4
       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)"] }}
-        #selectPlayers
-          input(type="text" v-model="newchallenge.to[0]")
-          input(v-show="newchallenge.nbPlayers>=3" type="text"
-            v-model="newchallenge.to[1]")
-          input(v-show="newchallenge.nbPlayers==4" type="text"
-            v-model="newchallenge.to[2]")
+        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
+    .col-sm-12
+      button#newGame(onClick="doClick('modalNewgame')") New game
   .row
     .col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
       .collapse
@@ -59,7 +54,7 @@ main
             )
               | {{ p.name + (!!p.count ? " ("+p.count+")" : "") }}
           #chat(v-show="pdisplay=='chat'")
-            h3 Chat (TODO)
+            Chat(:players="[]")
         input#gameSection(type="radio" aria-hidden="true" name="accordion")
         label(for="gameSection" aria-hidden="true") Games
         div
@@ -74,17 +69,18 @@ main
 
 <script>
 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 } from "@/utils/alea";
+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/storage";
+import { GameStorage } from "@/utils/gameStorage";
 export default {
   name: "my-hall",
   components: {
+    Chat,
     GameList,
     ChallengeList,
   },
@@ -96,69 +92,115 @@ export default {
       gdisplay: "live",
       games: [],
       challenges: [],
-      players: [], //online players (rename into "people" ?)
+      people: [], //people in main hall
+      infoMessage: "",
       newchallenge: {
         fen: "",
         vid: 0,
-        nbPlayers: 0,
-        to: ["", "", ""], //name(s) of challenged player(s)
+        to: "", //name of challenged player (if any)
         timeControl: "", //"2m+2s" ...etc
       },
     };
   },
+  watch: {
+    // st.variants changes only once, at loading from [] to [...]
+    "st.variants": function(variantArray) {
+      // Set potential challenges and games variant names:
+      this.challenges.forEach(c => {
+        if (c.vname == "")
+          c.vname = this.getVname(c.vid);
+      });
+      this.games.forEach(g => {
+        if (g.vname == "")
+          g.vname = this.getVname(g.vid);
+      });
+    },
+  },
   computed: {
     uniquePlayers: function() {
       // Show e.g. "@nonymous (5)", and do nothing on click on anonymous
-      let anonymous = {id:0, name:"@nonymous", count:0};
-      let playerList = [];
-      this.players.forEach(p => {
+      let anonymous = {name:"@nonymous", count:0};
+      let playerList = {};
+      this.people.forEach(p => {
         if (p.id > 0)
-          playerList.push(p);
+        {
+          // We don't count registered users connections: either they are here or not.
+          if (!playerList[p.id])
+            playerList[p.id] = {name: p.name, count: 0};
+        }
         else
           anonymous.count++;
       });
       if (anonymous.count > 0)
-        playerList.push(anonymous);
-      return playerList;
+        playerList[0] = anonymous;
+      return Object.values(playerList);
     },
   },
   created: function() {
     // Always add myself to players' list
-    this.players.push(this.st.user);
-    if (this.st.user.id > 0)
+    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",
-//      {excluded: this.st.user.id},
-//      response => {
-//        this.games = this.games.concat(response.games);
-//      }
-//    );
+    ajax(
+      "/games",
+      "GET",
+      {uid: this.st.user.id, excluded: true},
+      response => {
+        this.games = this.games.concat(response.games.map(g => {
+          const type = this.classifyObject(g);
+          const vname = this.getVname(g.vid);
+          return Object.assign({}, g, {type: type, vname: vname});
+        }));
+      }
+    );
     // Also ask for corr challenges (open + sent to me)
-      ajax(
-        "/challenges",
-        "GET",
-        {uid: this.st.user.id},
-        response => {
-          console.log(response.challenges);
-          // TODO: post-treatment on challenges ?
-          this.challenges = this.challenges.concat(response.challenges);
-        }
-      );
-    }
+    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 socketOpenListener = () => {
+    const funcPollClients = () => {
       this.st.conn.send(JSON.stringify({code:"pollclients"}));
     };
-    this.st.conn.onopen = socketOpenListener;
-    // TODO: is this required here?
-    this.oldOnmessage = this.st.conn.onmessage || Function.prototype;
+    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 oldOnclose = this.st.conn.onclose;
     const socketCloseListener = () => {
-      oldOnclose(); //reinitialize connexion (in store.js)
+      store.socketCloseListener(); //reinitialize connexion (in store.js)
       this.st.conn.addEventListener('message', this.socketMessageListener);
       this.st.conn.addEventListener('close', socketCloseListener);
     };
@@ -170,41 +212,32 @@ export default {
       return this.challenges.filter(c => c.type == type);
     },
     filterGames: function(type) {
-      return this.games.filter(c => c.type == type);
+      return this.games.filter(g => g.type == type);
     },
     classifyObject: function(o) { //challenge or game
       // Heuristic: should work for most cases... (TODO)
       return (o.timeControl.indexOf('d') === -1 ? "live" : "corr");
     },
-    possibleNbplayers: function(nbp) {
-      if (this.newchallenge.vid == 0)
-        return false;
-      const idxInVariants =
-        this.st.variants.findIndex(v => v.id == this.newchallenge.vid);
-      return NbPlayers[this.st.variants[idxInVariants].name].includes(nbp);
-    },
     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 = "/" + g.id;
+      let url = "/game/" + g.id;
       if (g.type == "live")
-      {
-        const sids = g.players.map(p => p.sid).join(",");
-        url += "?sids=" + sids;
-      }
+        url += "?rid=" + g.rid;
       this.$router.push(url);
     },
     getVname: function(vid) {
-      const vIdx = this.st.variants.findIndex(v => v.id == vid);
-      return this.st.variants[vIdx].name;
+      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.players.findIndex(pl => pl.name == pname);
-      return (pIdx === -1 ? null : this.players[pIdx].sid);
+      const pIdx = this.people.findIndex(pl => pl.name == pname);
+      return (pIdx === -1 ? null : this.people[pIdx].sid);
     },
     getPname: function(sid) {
-      const pIdx = this.players.findIndex(pl => pl.sid == sid);
-      return (pIdx === -1 ? null : this.players[pIdx].name);
+      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) => {
@@ -215,24 +248,22 @@ export default {
           {target: sid}
         )));
       };
-      if (!!to[0])
+      if (!!to)
       {
-        to.forEach(pname => {
-          // Challenge with targeted players
-          const targetSid = this.getSid(pname);
-          if (!targetSid)
-          {
-            if (!!warnDisconnected)
-              alert("Warning: " + pname + " is not connected");
-          }
-          else
-            doSend(code, obj, targetSid);
-        });
+        // 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.players.forEach(p => {
+        this.people.forEach(p => {
           if (p.sid != this.st.user.sid) //only sid is always set
             doSend(code, obj, p.sid);
         });
@@ -240,22 +271,23 @@ export default {
     },
     // Messaging center:
     socketMessageListener: function(msg) {
-      // Save and call current st.conn.onmessage if one was already defined
-      // --> also needed in future Game.vue (also in Chat.vue component)
-      this.oldOnmessage(msg);
       const data = JSON.parse(msg.data);
       switch (data.code)
       {
+        case "duplicate":
+          alert("Warning: duplicate 'offline' connection");
+          break;
         // 0.2] Receive clients list (just socket IDs)
         case "pollclients":
         {
           data.sockIds.forEach(sid => {
-            this.players.push({sid:sid, id:0, name:""});
+            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}));
           });
+          // Also ask current games to all playing peers (TODO: some design issue)
+          this.st.conn.send(JSON.stringify({code:"askgames"}));
           break;
         }
         case "askidentity":
@@ -264,7 +296,8 @@ export default {
           if (this.st.user.id > 0)
           {
             this.st.conn.send(JSON.stringify(
-              {code:"identity", user:this.st.user, target:data.from}));
+              // people[0] instead of st.user to avoid sending email
+              {code:"identity", user:this.people[0], target:data.from}));
           }
           break;
         }
@@ -286,33 +319,15 @@ export default {
               timeControl: c.timeControl
             };
             this.st.conn.send(JSON.stringify({code:"challenge",
-              challenge:myChallenge, target:data.from}));
-          }
-          break;
-        }
-        case "askgame":
-        {
-          // Send my current live game (if any)
-          if (!!localStorage["gid"])
-          {
-            const myGame =
-            {
-              // Minimal game informations: (fen+clock not required)
-              id: localStorage["gid"],
-              players: JSON.parse(localStorage["players"]), //array sid+id+name
-              vname: localStorage["vname"],
-              timeControl: localStorage["timeControl"],
-            };
-            this.st.conn.send(JSON.stringify({code:"game",
-              game:myGame, target:data.from}));
+              chall:myChallenge, target:data.from}));
           }
           break;
         }
         case "identity":
         {
-          const pIdx = this.players.findIndex(p => p.sid == data.user.sid);
-          this.players[pIdx].id = data.user.id;
-          this.players[pIdx].name = data.user.name;
+          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":
@@ -320,9 +335,9 @@ export default {
           // Receive challenge from some player (+sid)
           let newChall = data.chall;
           newChall.type = this.classifyObject(data.chall);
-          const pIdx = this.players.findIndex(p => p.sid == data.from);
-          newChall.from = this.players[pIdx]; //may be anonymous
-          newChall.added = Date.now();
+          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;
@@ -331,85 +346,65 @@ export default {
         {
           // Receive game from some player (+sid)
           // NOTE: it may be correspondance (if newgame while we are connected)
-          let newGame = data.game;
-          newGame.type = this.classifyObject(data.game);
-          newGame.vname = newGame.vname;
-          this.games.push(newGame);
+          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);
+          }
           break;
         }
-// *  - receive "new game": if live, store locally + redirect to game
-// *    If corr: notify "new game has started", give link, but do not redirect
         case "newgame":
         {
-          // Delete corresponding challenge:
-          ArrayFun.remove(this.challenges, c => c.id == data.cid);
-          // New game just started: data contain all informations
-          this.newGame(data.gameInfo);
-          break;
-        }
-// *  - receive "accept/withdraw/cancel challenge": apply action to challenges list
-        // NOTE: challenge "socket" actions accept+withdraw only for live challenges
-        case "acceptchallenge":
-        {
-          // Someone accept an open (or targeted) challenge
-          const cIdx = this.challenges.findIndex(c => c.id == data.cid);
-          let c = this.challenges[cIdx];
-          if (!c.seats)
-            c.seats = [...Array(c.to.length)];
-          const pIdx = this.players.findIndex(p => p.sid == data.from);
-          // Put this player in the first empty seat we find:
-          let sIdx = 0;
-          for (; sIdx<c.seats.length; sIdx++)
-          {
-            if (!c.seats[sIdx])
-            {
-              c.seats[sIdx] = this.players[pIdx];
-              break;
-            }
-          }
-          if (sIdx == c.seats.length - 1)
+          // 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
           {
-            // All seats are taken: game can start
-            this.launchGame(c);
+            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 "withdrawchallenge":
-        {
-          const cIdx = this.challenges.findIndex(c => c.id == data.cid);
-          let seats = this.challenges[cIdx].seats;
-          const sIdx = seats.findIndex(s => s.sid == data.sid);
-          seats[sIdx] = undefined;
-          break;
-        }
         case "refusechallenge":
         {
-          alert(this.getPname(data.from) + " refused your challenge");
+          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.players.push({name:"", id:0, sid:data.sid});
-          this.st.conn.send(JSON.stringify({code:"askidentity", target:data.sid}));
-          this.st.conn.send(JSON.stringify({code:"askchallenge", target:data.sid}));
-          this.st.conn.send(JSON.stringify({code:"askgame", target:data.sid}));
+          this.people.push({name:"", id:0, sid:data.from});
+          this.st.conn.send(JSON.stringify({code:"askidentity", target:data.from}));
+          this.st.conn.send(JSON.stringify({code:"askchallenge", target:data.from}));
+          this.st.conn.send(JSON.stringify({code:"askgame", target:data.from}));
           break;
         }
         case "disconnect":
         {
-          ArrayFun.remove(this.players, p => p.sid == data.sid);
+          ArrayFun.remove(this.people, p => p.sid == data.from);
           // Also remove all challenges sent by this player:
-          ArrayFun.remove(this.challenges, c => c.from.sid == data.sid);
+          ArrayFun.remove(this.challenges, c => c.from.sid == data.from);
           // And all live games where he plays and no other opponent is online
           ArrayFun.remove(this.games, g =>
-            g.type == "live" && (g.players.every(p => p.sid == data.sid
-              || !this.players.some(pl => pl.sid == p.sid))), "all");
+            g.type == "live" && (g.players.every(p => p.sid == data.from
+              || !this.people.some(pl => pl.sid == p.sid))), "all");
           break;
         }
       }
@@ -418,7 +413,7 @@ export default {
     tryChallenge: function(player) {
       if (player.id == 0)
         return; //anonymous players cannot be challenged
-      this.newchallenge.to[0] = player.name;
+      this.newchallenge.to = player.name;
       doClick("modalNewgame");
     },
     newChallenge: async function() {
@@ -429,24 +424,22 @@ export default {
       if (!!error)
         return alert(error);
       const ctype = this.classifyObject(this.newchallenge);
-      const cto = this.newchallenge.to.slice(0, this.newchallenge.nbPlayers - 1);
+      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 =
-      {
-        fen: this.newchallenge.fen,
-        to: cto,
-        timeControl: this.newchallenge.timeControl,
-        vid: this.newchallenge.vid,
-      };
+      let chall = Object.assign({}, this.newchallenge);
       const finishAddChallenge = (cid,warnDisconnected) => {
         chall.id = cid || "c" + getRandString();
         // Send challenge to peers (if connected)
-        this.sendSomethingTo(cto, "challenge", {chall:chall}, !!warnDisconnected);
+        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.st.user;
+        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 cIdx = this.challenges.findIndex(
@@ -477,127 +470,133 @@ export default {
         ajax(
           "/challenges",
           "POST",
-          chall,
+          { chall: chall },
           response => { finishAddChallenge(response.cid); }
         );
       }
     },
-// *  - accept challenge (corr or live) --> send info to challenge creator
-// *  - cancel challenge (click on sent challenge) --> send info to all concerned players
-// *  - withdraw from challenge (if >= 3 players and previously accepted)
-// *    --> send info to challenge creator
-// *  - refuse challenge: send "refuse" to challenge sender, and "delete" to others
-// *  - prepare and start new game (if challenge is full after acceptation)
-// *    --> include challenge ID (so that opponents can delete the challenge too)
     clickChallenge: function(c) {
-
-      console.log("click challenge");
-      console.log(c);
-
-      if (!!c.accepted)
+      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)
       {
-        this.st.conn.send(JSON.stringify({code: "withdrawchallenge",
-          cid: c.id, target: c.from.sid}));
-        if (c.type == "corr")
+        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)
         {
-          ajax(
-            "/challenges",
-            "PUT",
-            {action:"withdraw", id: this.challenges[cIdx].id}
-          );
+          // TODO: if special FEN, show diagram after loading variant
+          c.accepted = confirm("Accept challenge?");
         }
-        c.accepted = false;
-      }
-      else if (c.from.sid == this.st.user.sid
-        || (this.st.user.id > 0 && c.from.id == this.st.user.id))
-      {
-        // It's my challenge: cancel it
-        this.sendSomethingTo(c.to, "deletechallenge", {cid:c.id});
-        ArrayFun.remove(this.challenges, ch => ch.id == c.id);
-        if (c.type == "corr")
+        if (c.accepted)
         {
-          ajax(
-            "/challenges",
-            "DELETE",
-            {id: this.challenges[cIdx].id}
-          );
+          c.seat = this.people[0]; //== this.st.user, avoid revealing email
+          this.launchGame(c);
         }
-      }
-      else //accept (or refuse) a challenge
-      {
-        c.accepted = true;
-        if (!!c.to[0])
+        else
         {
-          // TODO: if special FEN, show diagram after loading variant
-          c.accepted = confirm("Accept challenge?");
+          this.st.conn.send(JSON.stringify({
+            code: "refusechallenge",
+            cid: c.id, target: c.from.sid}));
         }
-        this.st.conn.send(JSON.stringify({
-          code: (c.accepted ? "accept" : "refuse") + "challenge",
-          cid: c.id, target: c.from.sid}));
-        if (c.type == "corr" && c.accepted)
+      }
+      else //my challenge
+      {
+        if (c.type == "corr")
         {
           ajax(
             "/challenges",
-            "PUT",
-            {action: "accept", id: this.challenges[cIdx].id}
+            "DELETE",
+            {id: c.id}
           );
         }
-        if (!c.accepted)
-        {
-          ArrayFun.remove(this.challenges, ch => ch.id == c.id);
-          if (c.type == "corr")
-          {
-            ajax(
-              "/challenges",
-              "DELETE",
-              {id: this.challenges[cIdx].id}
-            );
-          }
-        }
+        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: for live games only (corr games are launched on server)
+    // NOTE: when launching game, the challenge is already deleted
     launchGame: async function(c) {
-      // Just assign colors and pass the message
-      const vname = this.getVname(c.vid);
-      const vModule = await import("@/variants/" + vname + ".js");
+      const vModule = await import("@/variants/" + c.vname + ".js");
       window.V = vModule.VariantRules;
-      let players = [c.from];
-      Array.prototype.push.apply(players, c.seats);
-      let gameInfo =
+      // These game informations will be sent to other players
+      const gameInfo =
       {
+        id: getRandString(),
         fen: c.fen || V.GenRandInitFen(),
-        // Players' names may be required if game start when a player is offline
-        players: players.map(p => { return {name:p.name, sid:p.sid} }),
+        players: shuffle([c.from, c.seat]), //white then black
         vid: c.vid,
+        vname: c.vname, //theoretically vid is enough, but much easier with vname
         timeControl: c.timeControl,
       };
-      c.seats.forEach(s => {
-        // NOTE: cid required to remove challenge
-        this.st.conn.send(JSON.stringify({code:"newgame",
-          gameInfo:gameInfo, cid:c.id, target:s.sid}));
-      });
-      // Delete corresponding challenge:
-      ArrayFun.remove(this.challenges, ch => ch.id == c.id);
-      this.newGame(gameInfo); //also!
+      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);
+          }
+        );
+      }
+      // 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 are launched on server)
-    newGame: function(gameInfo) {
-      GameStorage.init({
-        gameId: getRandString(),
-        vname: this.getVname(gameInfo.vid),
+    // NOTE: for live games only (corr games start on the server)
+    startNewGame: function(gameInfo) {
+      const game = Object.assign({}, gameInfo, {
+        // (other) Game infos: constant
         fenStart: gameInfo.fen,
-        players: gameInfo.players,
-        timeControl: gameInfo.timeControl,
+        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 => {});
-      // TODO: redirect to game
+      this.$router.push("/game/" + gameInfo.id);
     },
   },
 };
 </script>
 
 <style lang="sass">
-// TODO
+#newGame
+  display: block
+  margin: auto
 </style>