X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=server%2Fmodels%2FGame.js;h=7c3c8081bae3f21d4252c3f647f7392870c9e8c5;hb=eaa5ad3e93b761fefb16b32071be0b439761f843;hp=ed3fb436976cd2ac82be2de9b1cf82cd4176eda3;hpb=077ba3446c4ea3c6553c325fc8d16a96b7a9ff4f;p=vchess.git

diff --git a/server/models/Game.js b/server/models/Game.js
index ed3fb436..7c3c8081 100644
--- a/server/models/Game.js
+++ b/server/models/Game.js
@@ -34,8 +34,8 @@ const UserModel = require("./User");
  *   added: datetime
  */
 
-const GameModel =
-{
+const GameModel = {
+
   checkGameInfo: function(g) {
     return (
       g.vid.toString().match(/^[0-9]+$/) &&
@@ -47,6 +47,16 @@ const GameModel =
     );
   },
 
+  incrementCounter: function(vid, cb) {
+    db.serialize(function() {
+      let query =
+        "UPDATE GameStat " +
+        "SET total = total + 1 " +
+        "WHERE vid = " + vid;
+      db.run(query, cb);
+    });
+  },
+
   create: function(vid, fen, randomness, cadence, players, cb) {
     db.serialize(function() {
       let query =
@@ -74,14 +84,11 @@ const GameModel =
     db.serialize(function() {
       let query =
         "SELECT " +
-          "g.id, g.fen, g.fenStart, g.cadence, g.created, " +
-          "g.white, g.black, g.score, g.scoreMsg, " +
-          "g.chatReadWhite, g.chatReadBlack, " +
-          "g.drawOffer, g.rematchOffer, v.name AS vname " +
-        "FROM Games g " +
-        "JOIN Variants v " +
-        "  ON g.vid = v.id " +
-        "WHERE g.id = " + id;
+          "id, vid, fen, fenStart, cadence, created, " +
+          "white, black, randomness, score, scoreMsg, " +
+          "chatReadWhite, chatReadBlack, drawOffer, rematchOffer " +
+        "FROM Games " +
+        "WHERE id = " + id;
       db.get(query, (err, gameInfo) => {
         if (!gameInfo) {
           cb(err || { errmsg: "Game not found" }, undefined);
@@ -107,13 +114,12 @@ const GameModel =
               "WHERE gid = " + id;
             db.all(query, (err4, chats) => {
               const game = Object.assign(
-                {},
-                gameInfo,
                 {
                   players: players,
                   moves: moves,
                   chats: chats
-                }
+                },
+                gameInfo
               );
               cb(null, game);
             });
@@ -128,12 +134,13 @@ const GameModel =
     db.serialize(function() {
       let query =
         "SELECT id, vid, cadence, created, score, white, black " +
-        "FROM Games ";
-      if (uid > 0) query +=
-        "WHERE " +
-        "  created < " + cursor + " AND " +
-        "  white <> " + uid + " AND " +
-        "  black <> " + uid + " ";
+        "FROM Games " +
+        "WHERE created < " + cursor + " ";
+      if (uid > 0) {
+        query +=
+          "  AND white <> " + uid + " " +
+          "  AND black <> " + uid + " ";
+      }
       query +=
         "ORDER BY created DESC " +
         "LIMIT 20"; //TODO: 20 hard-coded...
@@ -174,11 +181,8 @@ const GameModel =
   getRunning: function(uid, cb) {
     db.serialize(function() {
       let query =
-        "SELECT g.id, g.cadence, g.created, " +
-          "g.white, g.black, v.name AS vname " +
-        "FROM Games g " +
-        "JOIN Variants v " +
-        "  ON g.vid = v.id " +
+        "SELECT id, vid, cadence, created, white, black " +
+        "FROM Games " +
         "WHERE score = '*' AND (white = " + uid + " OR black = " + uid + ")";
       db.all(query, (err, games) => {
         // Get movesCount (could be done in // with next query)
@@ -228,12 +232,9 @@ const GameModel =
   getCompleted: function(uid, cursor, cb) {
     db.serialize(function() {
       let query =
-        "SELECT g.id, g.cadence, g.created, g.score, g.scoreMsg, " +
-          "g.white, g.black, g.deletedByWhite, g.deletedByBlack, " +
-          "v.name AS vname " +
-        "FROM Games g " +
-        "JOIN Variants v " +
-        "  ON g.vid = v.id " +
+        "SELECT id, vid, cadence, created, score, scoreMsg, " +
+          "white, black, deletedByWhite, deletedByBlack " +
+        "FROM Games " +
         "WHERE " +
         "  score <> '*' AND" +
         "  created < " + cursor + " AND" +
@@ -267,7 +268,7 @@ const GameModel =
               g => {
                 return {
                   id: g.id,
-                  vname: g.vname,
+                  vid: g.vid,
                   cadence: g.cadence,
                   created: g.created,
                   score: g.score,
@@ -309,7 +310,7 @@ const GameModel =
       ) && (
         !obj.rematchOffer || !!(obj.rematchOffer.match(/^[wbn]$/))
       ) && (
-        !obj.fen || !!(obj.fen.match(/^[a-zA-Z0-9, /-]*$/))
+        !obj.fen || !!(obj.fen.match(/^[a-zA-Z0-9,.:{}\[\]" /-]*$/))
       ) && (
         !obj.score || !!(obj.score.match(/^[012?*\/-]+$/))
       ) && (
@@ -379,8 +380,10 @@ const GameModel =
                 "(" + id + ",?," + Date.now() + "," + obj.move.idx + ")";
               db.run(query, JSON.stringify(obj.move.squares));
               finishAndSendQuery();
-            } else cb({ errmsg: "Wrong move index" });
-          } else {
+            }
+            else cb({ errmsg: "Wrong move index" });
+          }
+          else {
             if (ret.maxIdx < 2) cb({ errmsg: "Time not over" });
             else {
               // We also need the game cadence
@@ -397,14 +400,16 @@ const GameModel =
             }
           }
         });
-      } else finishAndSendQuery();
+      }
+      else finishAndSendQuery();
       // NOTE: chat and delchat are mutually exclusive
       if (!!obj.chat) {
         const query =
           "INSERT INTO Chats (gid, msg, name, added) VALUES ("
             + id + ",?,'" + obj.chat.name + "'," + Date.now() + ")";
         db.run(query, obj.chat.msg);
-      } else if (obj.delchat) {
+      }
+      else if (obj.delchat) {
         const query =
           "DELETE " +
           "FROM Chats " +
@@ -456,7 +461,7 @@ const GameModel =
     const day = 86400000;
     db.serialize(function() {
       let query =
-        "SELECT id, created " +
+        "SELECT id, created, cadence, score " +
         "FROM Games";
       db.all(query, (err, games) => {
         query =
@@ -473,28 +478,56 @@ const GameModel =
             };
           });
           // Remove games still not really started,
-          // with no action in the last 2 weeks:
+          // with no action in the last 2 weeks, or result != '*':
           let toRemove = [];
+          let lostOnTime = [ [], [] ];
           games.forEach(g => {
             if (
               (
                 !movesGroups[g.id] &&
-                tsNow - g.created > 14*day
+                (g.score != '*' || tsNow - g.created > 14*day)
               )
               ||
               (
+                !!movesGroups[g.id] &&
                 movesGroups[g.id].nbMoves == 1 &&
-                tsNow - movesGroups[g.id].lastMaj > 14*day
+                (g.score != '*' || tsNow - movesGroups[g.id].lastMaj > 14*day)
               )
             ) {
               toRemove.push(g.id);
             }
+            // Set score if lost on time and >= 2 moves:
+            else if (
+              g.score == '*' &&
+              !!movesGroups[g.id] &&
+              movesGroups[g.id].nbMoves >= 2 &&
+              tsNow - movesGroups[g.id].lastMaj >
+                // cadence in days * nb seconds per day:
+                parseInt(g.cadence.slice(0, -1), 10) * day
+            ) {
+              lostOnTime[movesGroups[g.id].nbMoves % 2].push(g.id);
+            }
           });
           if (toRemove.length > 0) GameModel.remove(toRemove);
+          if (lostOnTime.some(l => l.length > 0)) {
+            db.parallelize(function() {
+              for (let i of [0, 1]) {
+                if (lostOnTime[i].length > 0) {
+                  const score = (i == 0 ? "0-1" : "1-0");
+                  const query =
+                    "UPDATE Games " +
+                    "SET score = '" + score + "', scoreMsg = 'Time' " +
+                    "WHERE id IN (" + lostOnTime[i].join(',') + ")";
+                  db.run(query);
+                }
+              }
+            });
+          }
         });
       });
     });
   }
-}
+
+};
 
 module.exports = GameModel;