Some adjustments, next: fix time control handling + finish corr play

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

diff --git a/client/src/views/Hall.vue b/client/src/views/Hall.vue
index 6e536ec..a6102fd 100644 (file)
--- a/client/src/views/Hall.vue
+++ b/client/src/views/Hall.vue
@@ -124,16 +124,16 @@ export default {
     }
     if (this.st.user.id > 0)
     {
-    // 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)
+      // 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);
+        }
+      );
+      // Also ask for corr challenges (open + sent to me)
       ajax(
         "/challenges",
         "GET",
@@ -152,16 +152,10 @@ export default {
     if (!!this.st.conn && this.st.conn.readyState == 1) //1 == OPEN state
       funcPollClients();
     else //socket not ready yet (initial loading)
-    {
-      const socketOpenListener = funcPollClients;
-      this.st.conn.onopen = socketOpenListener;
-    }
-    // TODO: is this required here?
-    this.oldOnmessage = this.st.conn.onmessage || Function.prototype;
+      this.st.conn.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);
     };
@@ -235,9 +229,6 @@ 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)
       {
@@ -280,10 +271,6 @@ export default {
               vid: c.vid,
               timeControl: c.timeControl
             };
-
-            // TODO: understand multiple (increasing) "send challenge" events.... (when potential opponent navigate Hall --> variants --> Hall)
-console.log("send challenge to " + data.from);
-
             this.st.conn.send(JSON.stringify({code:"challenge",
               chall:myChallenge, target:data.from}));
           }
@@ -301,6 +288,15 @@ console.log("send challenge to " + data.from);
                 id: game.id,
                 players: game.players.map(p => p.name),
                 vname: game.vname,
+                
+
+
+
+// TODO: timeControl only in challenge - no need in game (info in mainTime + increment)
+
+
+
+
                 timeControl: game.timeControl,
               };
               this.st.conn.send(JSON.stringify({code:"game",
@@ -318,9 +314,6 @@ console.log("send challenge to " + data.from);
         }
         case "challenge":
         {
-
-console.log(data.chall);
-
           // Receive challenge from some player (+sid)
           let newChall = data.chall;
           newChall.type = this.classifyObject(data.chall);
@@ -347,10 +340,16 @@ console.log(data.chall);
         }
         case "newgame":
         {
-          // New game just started: data contain all informations
-          this.startNewGame(data.gameInfo);
-          // TODO: if live, redirect to game
-          // if corr, notify with link but do not redirect
+          // New game just started: data contain all information
+          if (data.gameInfo.type == "live")
+          {
+            this.startNewGame(data.gameInfo);
+            // TODO: redirect to game
+          }
+          else
+          {
+            // TODO: notify with game link but do not redirect
+          }
           break;
         }
         case "refusechallenge":
@@ -477,6 +476,8 @@ console.log(data.chall);
             cid: c.id, target: c.from.sid}));
         }
       }
+      else
+        localStorage.removeItem("challenge");
       // 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)
@@ -495,17 +496,15 @@ console.log(data.chall);
       const vname = this.getVname(c.vid);
       const vModule = await import("@/variants/" + vname + ".js");
       window.V = vModule.VariantRules;
-      let players = [c.from, c.seat];
       // These game informations will be sent to other players
       const gameInfo =
       {
         gameId: getRandString(),
         fen: c.fen || V.GenRandInitFen(),
-        // Players' names may be required if game start when a player is offline
-        // Shuffle players order (white then black).
-        players: shuffle(players.map(p => { return {name:p.name, sid:p.sid} })),
+        players: shuffle([c.from, c.seat]), //white then black
         vid: c.vid,
         timeControl: c.timeControl,
+        type: c.type,
       };
       this.st.conn.send(JSON.stringify({code:"newgame",
         gameInfo:gameInfo, target:c.seat.sid}));
@@ -533,7 +532,7 @@ console.log(data.chall);
         vname: this.getVname(gameInfo.vid),
         fenStart: gameInfo.fen,
         players: gameInfo.players,
-        timeControl: gameInfo.timeControl,
+        mainTime: tc.mainTime,
         increment: tc.increment,
         mode: "live", //function for live games only
         // Game state: will be updated