Fix ajax calls after whoami request; TODO: finish challenges system + laucnh games

[vchess.git] / client / src / views / Hall.vue

diff --git a/client/src/views/Hall.vue b/client/src/views/Hall.vue
index c91fb1e..b2ab334 100644 (file)
--- a/client/src/views/Hall.vue
+++ b/client/src/views/Hall.vue
@@ -122,25 +122,37 @@ export default {
       return playerList;
     },
   },
+  watch: {
+    // Watch event "user infos retrieved" (through /whoami)
+    "st.user.id": function(newId) {
+      if (newId > 0) //should always be the case
+      {
+      // Ask server for current corr games (all but mines)
+  //    ajax(
+  //      "/games",
+  //      "GET",
+  //      {excluded: this.st.user.id},
+  //      response => {
+  //        this.games = this.games.concat(response.games);
+  //      }
+  //    );
+      // Also ask for corr challenges (open + sent to me)
+        ajax(
+          "/challenges",
+          "GET",
+          {uid: this.st.user.id},
+          response => {
+            console.log(response.challenges);
+            // TODO: post-treatment on challenges ?
+            this.challenges = this.challenges.concat(response.challenges);
+          }
+        );
+      }
+    },
+  },
   created: function() {
     // Always add myself to players' list
     this.players.push(this.st.user);
-    // Ask server for current corr games (all but mines)
-//    ajax(
-//      "",
-//      "GET",
-//      response => {
-//
-//      }
-//    );
-    //    // Also ask for corr challenges (all) --> + accepted status if I play
-//    ajax(
-//      "",
-//      "GET",
-//      response => {
-//
-//      }
-//    );
     // 0.1] Ask server for room composition:
     const socketOpenListener = () => {
       this.st.conn.send(JSON.stringify({code:"pollclients"}));
@@ -208,7 +220,7 @@ export default {
           {target: sid}
         )));
       };
-      else if (!!to[0])
+      if (!!to[0])
       {
         to.forEach(pname => {
           // Challenge with targeted players
@@ -390,8 +402,8 @@ export default {
         {
           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:sid}));
-          this.st.conn.send(JSON.stringify({code:"askgame", target: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":
@@ -483,30 +495,34 @@ export default {
 // *  - 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) {
-      switch (c.type)
+      if (!!c.accepted)
       {
-        case "live":
-          if (!!c.accepted)
-          {
-            this.st.conn.send(JSON.stringify({code: "withdrawchallenge",
-              cid: c.id, target: c.from.sid}));
-          
-          break;
-        case "corr":
+        this.st.conn.send(JSON.stringify({code: "withdrawchallenge",
+          cid: c.id, target: c.from.sid}));
+        if (c.type == "corr")
+        {
           ajax(
             "/challenges",
             "PUT",
             {action:"withdraw", id: this.challenges[cIdx].id}
           );
-          break;
-      }
-      c.accepted = false;
-      {
+        }
+        c.accepted = false;
       }
-      else if (c.from.sid == this.st.user.sid) //it's my challenge: cancel it
+      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")
+        {
+          ajax(
+            "/challenges",
+            "DELETE",
+            {id: this.challenges[cIdx].id}
+          );
+        }
       }
       else //accept (or refuse) a challenge
       {
@@ -519,13 +535,30 @@ export default {
         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)
+        {
+          ajax(
+            "/challenges",
+            "PUT",
+            {action: "accept", id: this.challenges[cIdx].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}
+            );
+          }
+        }
       }
     },
-    // c.type == corr alors use id...sinon sid (figés)
-    // NOTE: only for live games ?
-    launchGame: function(c) {
+    // NOTE: for live games only (corr games are launched on server)
+    launchGame: async function(c) {
       // Just assign colors and pass the message
       const vname = this.getVname(c.vid);
       const vModule = await import("@/variants/" + vname + ".js");
@@ -537,7 +570,7 @@ export default {
         fen: c.fen || V.GenRandInitFen(),
         // Shuffle players order (white then black then other colors).
         // Players' names may be required if game start when a player is offline
-        players: shuffle(players).map(p => {name:p.name, sid:p.sid},
+        players: shuffle(players).map(p => { return {name:p.name, sid:p.sid} }),
         vid: c.vid,
         timeControl: c.timeControl,
       };