X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fviews%2FGame.vue;h=44341a8e8e06a806992bf9bbe7e98c803be8260d;hb=46284a2f440304a82210a2ddb2c05c43ff92e651;hp=d0e601cabac307c216a7e60020f2fac6cf4d41d5;hpb=a6088c906bbe6fae95707dc7028e45023fe39981;p=vchess.git

diff --git a/client/src/views/Game.vue b/client/src/views/Game.vue
index d0e601ca..44341a8e 100644
--- a/client/src/views/Game.vue
+++ b/client/src/views/Game.vue
@@ -1,24 +1,24 @@
 <!-- TODO: component Game, + handle players + observers connect/disconnect
   event = "gameconnect" ...etc
   connect/disconnect with sid+name (ID not required); name slightly redundant but easier
-
 quand on arrive dans la partie, on poll les sids pour savoir qui est en ligne (ping)
 (éventuel échange lastate avec les connectés, pong ...etc)
 ensuite quand qqun se deco il suffit d'écouter "disconnect"
 pareil quand quelqu'un reco.
 (c'est assez rudimentaire et écoute trop de messages, mais dans un premier temps...)
       // TODO: [in game] send move + elapsed time (in milliseconds); in case of "lastate" message too
+// TODO: if I'm an observer and player(s) disconnect/reconnect, how to find me ?
+//      onClick :: ask full game to remote player, and register as an observer in game
+//      (use gameId to communicate)
+//      on landing on game :: if gameId not found locally, check remotely
+//      ==> il manque un param dans game : "remoteId"
 -->
 <template lang="pug">
 .row
   .col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
-    BaseGame(:variant="variant.name" @game-over=".....TODO")
-
-
-
-localStorage["score"] = score;
-
-
+    BaseGame(:vname="variant.name" :analyze="analyze"
+      :vr="vr" :fen-start="fenStart" :players="players" :mycolor="mycolor"
+      ref="basegame" @newmove="processMove")
     .button-group(v-if="mode!='analyze'")
       button(@click="offerDraw") Draw
       button(@click="abortGame") Abort
@@ -29,12 +29,7 @@ localStorage["score"] = score;
 </template>
 
 <script>
-// TODO: if I'm an observer and player(s) disconnect/reconnect, how to find me ?
-//      onClick :: ask full game to remote player, and register as an observer in game
-//      (use gameId to communicate)
-//      on landing on game :: if gameId not found locally, check remotely
-//      ==> il manque un param dans game : "remoteId"
-import Board from "@/components/Board.vue";
+import BaseGame from "@/components/BaseGame.vue";
 //import Chat from "@/components/Chat.vue";
 //import MoveList from "@/components/MoveList.vue";
 import { store } from "@/store";
@@ -44,37 +39,56 @@ export default {
   components: {
     BaseGame,
   },
-  // gameId: to find the game in storage (assumption: it exists)
+  // gameRef: to find the game in (potentially remote) storage
   // mode: "live" or "corr" (correspondance game), or "analyze"
-  // gameRef in URL hash (listen for changes)
-  props: ["gid","mode","variant"],
   data: function() {
     return {
       st: store.state,
-      myname: store.state.user.name, //may be anonymous (thus no name)
-      opponents: {}, //filled later (potentially 2 or 3 opponents)
+      // variables passed to BaseGame:
+      fenStart: "",
+      vr: null,
+      players: ["Myself","Computer"], //always playing white for now
+      mycolor: "w",
+      ////////////
+      gameRef: {id: "", rid: ""}, //given in URL (rid = remote ID, if applicable)
+      mode: "live", //or "corr"
+      vname: "", //filled when game is retrieved
       drawOfferSent: false, //did I just ask for draw?
-      people: [], //observers
+      players: [], //filled later (2 to 4 players)
+      people: [], //potential observers
     };
   },
+  computed: {
+    analyze: function() {
+      return this.mode == "analyze";
+    },
+  },
   watch: {
-    gid: function() {
+    '$route' (to, from) {
+      this.gameRef.id = to.params["id"];
+      this.gameRef.rid = to.query["rid"];
       this.launchGame();
     },
   },
-  // Modal end of game, and then sub-components
   created: function() {
-    if (!!this.gid)
+    if (!!this.$route.params["id"])
+    {
+      this.gameRef.id = this.$route.params["id"];
+      this.gameRef.rid = this.$route.query["rid"];
       this.launchGame();
-    // TODO: if I'm one of the players in game, then:
-    // Send ping to server (answer pong if opponent[s] is connected)
-    if (true && !!this.conn && !!this.gameRef)
+    }
+    // Poll all players except me (if I'm playing) to know online status.
+    // --> Send ping to server (answer pong if players[s] are connected)
+    if (!!this.gameRef.id)
     {
-      this.conn.onopen = () => {
-        this.conn.send(JSON.stringify({
-          code:"ping",oppid:this.oppid,gameId:this.gameRef.id}));
-      };
+      this.players.forEach(p => {
+        if (p.sid != this.st.user.sid)
+          this.st.conn.send(JSON.stringify({code:"ping", oppid:p.sid}));
+      });
     }
+    // TODO: how to know who is observing ? Send message to everyone with game ID ?
+    // and then just listen to (dis)connect events
+
     // TODO: also handle "draw accepted" (use opponents array?)
     // --> must give this info also when sending lastState...
     // and, if all players agree then OK draw (end game ...etc)
@@ -83,12 +97,15 @@ export default {
       let L = undefined;
       switch (data.code)
       {
-        case "newmove": //..he played!
-          this.play(data.move, this.variant.name!="Dark" ? "animate" : null);
+        case "newmove":
+          // TODO: observer on dark games must see all board ? Or alternate ? (seems better)
+          // ...or just see nothing as on buho21
+          this.$refs["baseGame"].play(
+            data.move, this.vname!="Dark" ? "animate" : null);
           break;
         case "pong": //received if we sent a ping (game still alive on our side)
           if (this.gameRef.id != data.gameId)
-            break; //games IDs don't match: definitely over...
+            break; //games IDs don't match: the game is definitely over...
           this.oppConnected = true;
           // Send our "last state" informations to opponent(s)
           L = this.vr.moves.length;
@@ -102,7 +119,7 @@ export default {
             }));
           });
           break;
-        // TODO: refactor this, because at 3 or 4 players we may have missed 2 or 3 moves (not just one)
+        // TODO: refactor this, because at 3 or 4 players we may have missed 2 or 3 moves
         case "lastate": //got opponent infos about last move
           L = this.vr.moves.length;
           if (this.gameRef.id != data.gameId)
@@ -219,8 +236,9 @@ export default {
       }
       this.endGame(this.mycolor=="w"?"0-1":"1-0");
     },
+    // TODO: vname is unknown before game is loaded (vname is a field in memory)
     launchGame: async function() {
-      const vModule = await import("@/variants/" + this.variant.name + ".js");
+      const vModule = await import("@/variants/" + this.vname + ".js");
       window.V = vModule.VariantRules;
       this.loadGame(this.gid);
     },
@@ -237,6 +255,7 @@ export default {
       this.moves = game.moves;
       this.cursor = game.moves.length-1;
       this.lastMove = (game.moves.length > 0 ? game.moves[this.cursor] : null);
+      // TODO: fill players array
     },
     oppConnected: function(uid) {
       return this.opponents.any(o => o.id == uidi && o.online);