Start to catch up with code. Need to fnish at least live + corr games before publish

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

diff --git a/client/src/views/Game.vue b/client/src/views/Game.vue
index 2394cc6..c60b17c 100644 (file)
--- a/client/src/views/Game.vue
+++ b/client/src/views/Game.vue
@@ -16,8 +16,7 @@ pareil quand quelqu'un reco.
 <template lang="pug">
 .row
   .col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
-    BaseGame(:vname="variant.name" :analyze="analyze"
-      :vr="vr" :fen-start="fenStart" :players="players" :mycolor="mycolor"
+    BaseGame(:vname="vname" :game-info="gameInfo" :analyze="analyze" :vr="vr"
       ref="basegame" @newmove="processMove")
     .button-group(v-if="mode!='analyze'")
       button(@click="offerDraw") Draw
@@ -33,6 +32,7 @@ import BaseGame from "@/components/BaseGame.vue";
 //import Chat from "@/components/Chat.vue";
 //import MoveList from "@/components/MoveList.vue";
 import { store } from "@/store";
+import { GameStorage } from "@/utils/storage";
 
 export default {
   name: 'my-game',
@@ -44,18 +44,12 @@ export default {
   data: function() {
     return {
       st: store.state,
-      // 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?
-      players: [], //filled later (2 to 4 players)
-      people: [], //potential observers
+      gameRef: {id: "", rid: ""}, //given in URL (rid = remote ID)
+      gameInfo: {}, //passed to BaseGame
+      vr: null, //TODO
+      vname: "", //obtained from gameInfo (slightly redundant..)
+      drawOfferSent: false, //did I just ask for draw? (TODO: draw variables?)
+      people: [], //potential observers (TODO)
     };
   },
   computed: {
@@ -65,9 +59,12 @@ export default {
   },
   watch: {
     '$route' (to, from) {
-      this.gameRef.id = to.params["id"];
-      this.gameRef.rid = to.query["rid"];
-      this.loadGame();
+      if (!!to.params["id"])
+      {
+        this.gameRef.id = to.params["id"];
+        this.gameRef.rid = to.query["rid"];
+        this.loadGame();
+      }
     },
   },
   created: function() {
@@ -77,18 +74,20 @@ export default {
       this.gameRef.rid = this.$route.query["rid"];
       this.loadGame();
     }
-    // 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.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
 
+
+    // server always send "connect on " + URL ; then add to observers if game...
+    // detect multiple tabs connected (when connect ask server if my SID is already in use)
+// router when access a game page tell to server I joined + game ID (no need rid)
+// and ask server for current joined (= observers)
+// when send to chat (or a move), reach only this group (send gid along)
+
+    // --> doivent être enregistrés comme observers au niveau du serveur...
+    // non: poll users + events startObserving / stopObserving
+
+
     // 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)
@@ -100,7 +99,7 @@ export default {
         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(
+          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)
@@ -242,16 +241,21 @@ export default {
     //  - from server (one correspondance game I play[ed] or not)
     //  - from remote peer (one live game I don't play, finished or not)
     loadGame: async function() {
-      const game = getGameFromStorage(this.gameRef);
-      this.players = game.players;
-      this.score = game.score;
-      this.mycolor = game.mycolor; //may be irrelevant (if I don't play it)
-      this.fenStart = game.fenStart;
-      this.moves = game.moves;
-      this.cursor = game.moves.length-1;
-      this.lastMove = (game.moves.length > 0 ? game.moves[this.cursor] : null);
-      const vModule = await import("@/variants/" + game.vname + ".js");
+      this.gameInfo = GameStorage.get(this.gameRef);
+      this.vname = this.gameInfo.vname;
+      const vModule = await import("@/variants/" + this.vname + ".js");
       window.V = vModule.VariantRules;
+      this.vr = new V(this.gameInfo.fen);
+
+//    // 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.gameInfo.players.some(p => p.sid == this.st.user.sid))
+//    {
+//      this.game.players.forEach(p => {
+//        if (p.sid != this.st.user.sid)
+//          this.st.conn.send(JSON.stringify({code:"ping", oppid:p.sid}));
+//      });
+//    }
     },
     oppConnected: function(uid) {
       return this.opponents.some(o => o.id == uid && o.online);