Fix clocks while playing live game

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

diff --git a/client/src/views/Game.vue b/client/src/views/Game.vue
index 5eeb7fd..47605c4 100644 (file)
--- a/client/src/views/Game.vue
+++ b/client/src/views/Game.vue
@@ -45,6 +45,7 @@ import BaseGame from "@/components/BaseGame.vue";
 import { store } from "@/store";
 import { GameStorage } from "@/utils/gameStorage";
 import { ppt } from "@/utils/datetime";
+import { extractTime } from "@/utils/timeControl";
 
 export default {
   name: 'my-game',
@@ -113,7 +114,17 @@ export default {
       this.gameRef.rid = this.$route.query["rid"];
       this.loadGame();
     }
-    const socketMessageListener = msg => {
+    // TODO: onopen, ask lastState informations + update observers and players status
+    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.onmessage = this.socketMessageListener;
+    this.st.conn.onclose = socketCloseListener;
+  },
+  methods: {
+    socketMessageListener: function(msg) {
       const data = JSON.parse(msg.data);
       switch (data.code)
       {
@@ -191,6 +202,10 @@ export default {
         case "drawoffer":
           this.drawOffer = "received";
           break;
+        case "askfullgame":
+          // TODO: just give game; observers are listed here anyway:
+          // gameconnect?
+          break;
         // TODO: drawaccepted (click draw button before sending move ==> draw offer in move)
           // ==> on "newmove", check "drawOffer" field
         // TODO: also use (dis)connect info to count online players?
@@ -210,15 +225,7 @@ export default {
           }
           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;
-  },
-  methods: {
+    },
     offerDraw: function() {
       // TODO: also for corr games
       if (this.drawOffer == "received")
@@ -280,7 +287,14 @@ export default {
     //  - from remote peer (one live game I don't play, finished or not)
     loadGame: function(game) {
       const afterRetrieval = async (game) => {
-        const vModule = await import("@/variants/" + game.vname + ".js");
+        const vname = this.st.variants.filter(v => v.id == game.vid)[0].name;
+        const tc = extractTime(game.timeControl);
+        if (game.clocks[0] < 0) //game unstarted
+        {
+          game.clocks = [tc.mainTime, tc.mainTime];
+          game.initime[0] = Date.now();
+        }
+        const vModule = await import("@/variants/" + vname + ".js");
         window.V = vModule.VariantRules;
         this.vr = new V(game.fen);
         const myIdx = game.players.findIndex(p => p.sid == this.st.user.sid);
@@ -288,6 +302,8 @@ export default {
           game,
           // NOTE: assign mycolor here, since BaseGame could also bs VS computer
           {
+            increment: tc.increment,
+            vname: vname,
             mycolor: [undefined,"w","b"][myIdx+1],
             // opponent sid not strictly required, but easier
             oppid: (myIdx < 0 ? undefined : game.players[1-myIdx].sid),
@@ -303,6 +319,7 @@ export default {
         return afterRetrival(game);
       if (!!this.gameRef.rid)
       {
+        this.st.conn.send(JSON.stringify({code:"askfullgame", target:this.gameRef.rid}));
         // TODO: just send a game request message to the remote player,
         // and when receiving answer just call loadGame(received_game)
         // + remote peer should have registered us as an observer
@@ -356,9 +373,8 @@ export default {
       // Also update current game object:
       this.game.moves.push(move);
       this.game.fen = move.fen;
-      //TODO: just this.game.clocks[colorIdx] += (!!addTime ? addTime : 0);
-      this.$set(this.game.clocks, colorIdx,
-        this.game.clocks[colorIdx] + (!!addTime ? addTime : 0));
+      //TODO: just this.game.clocks[colorIdx] += addTime;
+      this.$set(this.game.clocks, colorIdx, this.game.clocks[colorIdx] + addTime);
       this.game.initime[nextIdx] = Date.now();
     },
     // TODO: this update function should also work for corr games
@@ -372,3 +388,7 @@ export default {
   },
 };
 </script>
+
+<style lang="sass">
+// TODO
+</style>