From a9b131f10ee55bd96c60180c55666df4b1f4dc4d Mon Sep 17 00:00:00 2001
From: Benjamin Auder <benjamin.auder@somewhere>
Date: Thu, 7 Nov 2019 21:22:46 +0100
Subject: [PATCH] Finished Hall.js for now - TODO: live + corr games

---
 client/src/views/Game.vue |  6 ++++--
 client/src/views/Hall.vue | 38 +++++++++++++-------------------------
 server/models/Game.js     | 13 ++++++-------
 server/routes/games.js    | 25 +------------------------
 4 files changed, 24 insertions(+), 58 deletions(-)

diff --git a/client/src/views/Game.vue b/client/src/views/Game.vue
index d15e307e..0afbf078 100644
--- a/client/src/views/Game.vue
+++ b/client/src/views/Game.vue
@@ -116,7 +116,7 @@ export default {
     // 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('message', this.socketMessageListener);
       this.st.conn.addEventListener('close', socketCloseListener);
     };
     this.st.conn.onmessage = this.socketMessageListener;
@@ -286,7 +286,8 @@ 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 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);
@@ -294,6 +295,7 @@ export default {
           game,
           // NOTE: assign mycolor here, since BaseGame could also bs VS computer
           {
+            vname: vname,
             mycolor: [undefined,"w","b"][myIdx+1],
             // opponent sid not strictly required, but easier
             oppid: (myIdx < 0 ? undefined : game.players[1-myIdx].sid),
diff --git a/client/src/views/Hall.vue b/client/src/views/Hall.vue
index 59d544fc..fa892599 100644
--- a/client/src/views/Hall.vue
+++ b/client/src/views/Hall.vue
@@ -131,9 +131,10 @@ export default {
         {uid: this.st.user.id, excluded: true},
         response => {
           this.games = this.games.concat(response.games.map(g => {
-            const tc = 
-            return Object.assign({}, g, {mainT
-          });
+            const type = this.classifyObject(g);
+            const vname = this.getVname(g.vid);
+            return Object.assign({}, g, {type: type, vname: vname});
+          }));
         }
       );
       // Also ask for corr challenges (open + sent to me)
@@ -170,7 +171,7 @@ export default {
       return this.challenges.filter(c => c.type == type);
     },
     filterGames: function(type) {
-      return this.games.filter(c => c.type == type);
+      return this.games.filter(g => g.type == type);
     },
     classifyObject: function(o) { //challenge or game
       // Heuristic: should work for most cases... (TODO)
@@ -291,7 +292,7 @@ export default {
                 // Minimal game informations:
                 id: game.id,
                 players: game.players.map(p => p.name),
-                vname: game.vname,
+                vid: game.vid,
                 timeControl: game.timeControl,
               };
               this.st.conn.send(JSON.stringify({code:"game",
@@ -327,6 +328,7 @@ export default {
           {
             let newGame = data.game;
             newGame.type = this.classifyObject(data.game);
+            newGame.vname = this.getVname(data.game.vid);
             newGame.rid = data.from;
             newGame.score = "*";
             this.games.push(newGame);
@@ -337,10 +339,7 @@ export default {
         {
           // New game just started: data contain all information
           if (data.gameInfo.type == "live")
-          {
             this.startNewGame(data.gameInfo);
-            // TODO: redirect to game
-          }
           else
           {
             // TODO: notify with game link but do not redirect
@@ -402,17 +401,9 @@ export default {
         // Send challenge to peers (if connected)
         this.sendSomethingTo(chall.to, "challenge", {chall:chall}, !!warnDisconnected);
         chall.added = Date.now();
+        // NOTE: vname and type are redundant (can be deduced from timeControl + vid)
         chall.type = ctype;
         chall.vname = vname;
-
-
-
-
-// TODO: vname and type are redundant (can be deduced from timeControl + vid)
-
-
-
-
         chall.from = this.st.user;
         this.challenges.push(chall);
         localStorage.setItem("challenge", JSON.stringify(chall));
@@ -491,8 +482,7 @@ export default {
     },
     // NOTE: when launching game, the challenge is already deleted
     launchGame: async function(c) {
-      const vname = this.getVname(c.vid);
-      const vModule = await import("@/variants/" + vname + ".js");
+      const vModule = await import("@/variants/" + c.vname + ".js");
       window.V = vModule.VariantRules;
       // These game informations will be sent to other players
       const gameInfo =
@@ -501,7 +491,7 @@ export default {
         fen: c.fen || V.GenRandInitFen(),
         players: shuffle([c.from, c.seat]), //white then black
         vid: c.vid,
-        timeControl: tc.timeControl,
+        timeControl: c.timeControl,
       };
       this.st.conn.send(JSON.stringify({code:"newgame",
         gameInfo:gameInfo, target:c.seat.sid}));
@@ -516,17 +506,15 @@ export default {
         );
       }
     },
-    // NOTE: for live games only (corr games are launched on server)
+    // NOTE: for live games only (corr games start on the server)
     startNewGame: function(gameInfo) {
-      // Extract times (in [milli]seconds), set clocks
-      const tc = extractTime(c.timeControl);
       const game = Object.assign({}, gameInfo, {
         // (other) Game infos: constant
         fenStart: gameInfo.fen,
         // Game state (including FEN): will be updated
         moves: [],
-        clocks: [tc.mainTime, tc.mainTime],
-        initime: [Date.now(), 0],
+        clocks: [-1, -1], //-1 = unstarted
+        initime: [0, 0], //timer starts after first 2 half-moves
         score: "*",
       });
       GameStorage.add(game);
diff --git a/server/models/Game.js b/server/models/Game.js
index 30d29c73..94056c57 100644
--- a/server/models/Game.js
+++ b/server/models/Game.js
@@ -6,8 +6,7 @@ var db = require("../utils/database");
  *   vid: integer (variant id)
  *   fenStart: varchar (initial position)
  *   fen: varchar (current position)
- *   mainTime: integer
- *   addTime: integer (increment)
+ *   timeControl: string
  *   score: varchar (result)
  *
  * Structure table Players:
@@ -27,13 +26,12 @@ var db = require("../utils/database");
 
 const GameModel =
 {
-	// mainTime and increment in milliseconds
-	create: function(vid, fen, mainTime, increment, players, cb)
+	create: function(vid, fen, timeControl, players, cb)
 	{
 		db.serialize(function() {
 			let query =
-				"INSERT INTO Games (vid, fen, mainTime, addTime) " +
-				"VALUES (" + vid + ",'" + fen + "'," + mainTime + "," + increment + ")";
+				"INSERT INTO Games (vid, fen, timeControl) " +
+				"VALUES (" + vid + ",'" + fen + "'," + timeControl + ")";
 			db.run(insertQuery, err => {
 				if (!!err)
 					return cb(err);
@@ -41,7 +39,8 @@ const GameModel =
 					players.forEach(p => {
 						query =
 							"INSERT INTO Players VALUES " +
-							"(" + lastId["rowid"] + "," + p.id + "," + p.color + "," + mainTime + ")";
+              // Remaining time = -1 means "unstarted"
+							"(" + lastId["rowid"] + "," + p.id + "," + p.color + ", -1)";
 						db.run(query, cb);
 					});
 				});
diff --git a/server/routes/games.js b/server/routes/games.js
index a35f07d4..d1f233bd 100644
--- a/server/routes/games.js
+++ b/server/routes/games.js
@@ -40,7 +40,6 @@ router.post("/games", access.logged, access.ajax, (req,res) => {
 	);
 });
 
-// game page
 router.get("/games", access.ajax, (req,res) => {
 	const gameId = req.query["gid"];
 	if (!!gameId)
@@ -76,31 +75,9 @@ router.put("/games", access.logged, access.ajax, (req,res) => {
 	});
 });
 
-// variant page
-router.get("/gamesbyvariant", access.logged, access.ajax, (req,res) => {
-	if (req.query["uid"] != req.user._id)
-		return res.json({errmsg: "Not your games"});
-	let uid = ObjectId(req.query["uid"]);
-	let vid = ObjectId(req.query["vid"]);
-	GameModel.getByVariant(uid, vid, (err,gameArray) => {
-		// NOTE: res.json already stringify, no need to do it manually
-		res.json(err || {games: gameArray});
-	});
-});
-
-// For index: only moves count + myColor
-router.get("/gamesbyplayer", access.logged, access.ajax, (req,res) => {
-	if (req.query["uid"] != req.user._id)
-		return res.json({errmsg: "Not your games"});
-	let uid = ObjectId(req.query["uid"]);
-	GameModel.getByPlayer(uid, (err,games) => {
-		res.json(err || {games: games});
-	});
-});
-
 // TODO: if newmove fail, takeback in GUI
 // TODO: check move structure
-// TODO: for corr games, move should contain an optional "message" field ("corr chat" !)
+// TODO: move should contain an optional "message" field ("corr chat" !)
 router.post("/moves", access.logged, access.ajax, (req,res) => {
 	let gid = ObjectId(req.body.gid);
 	let fen = req.body.fen;
-- 
2.44.0