X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fviews%2FGame.vue;h=d15e307ee70621f3730cd67d3d7ebdfef121841f;hb=cdb34c934db9f75fcc1d749b5dc23d7ea217a289;hp=7d20dbe0ca95a6e4fe603781929685eb26c0d37c;hpb=6fba6e0c029afc74a780ef845a02659da53c84e0;p=vchess.git

diff --git a/client/src/views/Game.vue b/client/src/views/Game.vue
index 7d20dbe0..d15e307e 100644
--- a/client/src/views/Game.vue
+++ b/client/src/views/Game.vue
@@ -113,7 +113,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', 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)
       {
@@ -185,6 +195,16 @@ export default {
         case "abort":
           this.$refs["basegame"].endGame("?", "Abort: " + data.msg);
           break;
+        case "draw":
+          this.$refs["basegame"].endGame("1/2", "Mutual agreement");
+          break;
+        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?
@@ -204,44 +224,23 @@ 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")
       {
-        if (!confirm("Offer draw?"))
+        if (!confirm("Accept draw?"))
           return;
         this.st.conn.send(JSON.stringify({code:"draw", target:this.game.oppid}));
+        this.$refs["basegame"].endGame("1/2", "Mutual agreement");
+      }
       else if (this.drawOffer == "sent")
         this.drawOffer = "";
       else
       {
         if (!confirm("Offer draw?"))
           return;
-      // Stay in "draw offer sent" state until next move is played
-      this.drawOfferSent = true;
-      if (this.subMode == "corr")
-      {
-        // TODO: set drawOffer on in game (how ?)
-      }
-      else //live game
-      {
-        this.opponents.forEach(o => {
-          if (!!o.online)
-          {
-            try {
-            } catch (INVALID_STATE_ERR) {
-              return;
-            }
-          }
-        });
+        this.st.conn.send(JSON.stringify({code:"drawoffer", target:this.game.oppid}));
       }
     },
     // + conn handling: "draw" message ==> agree for draw (if we have "drawOffered" at true)
@@ -303,14 +302,14 @@ export default {
         if (!!this.game.oppid)
         {
           // Send ping to server (answer pong if players[s] are connected)
-          this.st.conn.send(JSON.stringify({code:"ping",
-            target:this.game.oppid, gameId:this.gameRef.id}));
+          this.st.conn.send(JSON.stringify({code:"ping", target:this.game.oppid}));
         }
       };
       if (!!game)
         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
@@ -380,3 +379,7 @@ export default {
   },
 };
 </script>
+
+<style lang="sass">
+// TODO
+</style>