X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fviews%2FGame.vue;h=3a2f03a51f18e82537e924591aaebfd24e06855c;hb=d6c1bf3726afae94867854dda76df2848770068c;hp=2f55cfa4e7f09c33b83c4833eeb44e32d638baff;hpb=f7121527579a543e01449e752d630ecf2452ec80;p=vchess.git

diff --git a/client/src/views/Game.vue b/client/src/views/Game.vue
index 2f55cfa4..3a2f03a5 100644
--- 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="game.vname" :game="game" :analyze="analyze" :vr="vr"
       ref="basegame" @newmove="processMove")
     .button-group(v-if="mode!='analyze'")
       button(@click="offerDraw") Draw
@@ -29,10 +28,11 @@ pareil quand quelqu'un reco.
 </template>
 
 <script>
-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";
+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"
-      variant: {}, //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)
+      game: {}, //passed to BaseGame
+      vr: null, //TODO
+      mode: "analyze", //mutable
+      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.launchGame();
+      if (!!to.params["id"])
+      {
+        this.gameRef.id = to.params["id"];
+        this.gameRef.rid = to.query["rid"];
+        this.loadGame();
+      }
     },
   },
   created: function() {
@@ -75,20 +72,22 @@ export default {
     {
       this.gameRef.id = this.$route.params["id"];
       this.gameRef.rid = this.$route.query["rid"];
-      this.launchGame();
-    }
-    // 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}));
-      });
+      this.loadGame();
     }
     // 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,8 +99,8 @@ 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(
-            data.move, this.variant.name!="Dark" ? "animate" : null);
+          this.$refs["basegame"].play(
+            data.move, this.game.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)
@@ -236,28 +235,35 @@ export default {
       }
       this.endGame(this.mycolor=="w"?"0-1":"1-0");
     },
-    launchGame: async function() {
-      const vModule = await import("@/variants/" + this.variant.name + ".js");
-      window.V = vModule.VariantRules;
-      this.loadGame(this.gid);
-    },
-    loadGame: function(gid) {
-      // TODO: ask game to remote peer if this.remoteId is set
-      // (or just if game not found locally)
-      // NOTE: if it's a corr game, ask it from server
-      const game = getGameFromStorage(gid); //, this.gameRef.uid); //uid may be blank
-      this.opponent.id = game.oppid; //opponent ID in case of running HH game
-      this.opponent.name = game.oppname; //maye be blank (if anonymous)
-      this.score = game.score;
-      this.mycolor = game.mycolor;
-      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);
-      // TODO: fill players array
+    // 4 cases for loading a game:
+    //  - from localStorage (one running game I play)
+    //  - from indexedDB (one completed live game)
+    //  - 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() {
+      GameStorage.get(this.gameRef, (game) => {
+        this.gameInfo = 
+        this.vname = game.vname;
+        this.mode = game.mode;
+        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.any(o => o.id == uidi && o.online);
+      return this.opponents.some(o => o.id == uid && o.online);
+    },
+    processMove: function(move) {
+      // TODO: process some opponent's move
     },
   },
 };