X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=server%2Fmodels%2FGame.js;h=16c050cd02cf8677238128072fdda3c6dd92230c;hb=714680114508183fba2c07231dbe8f90b5631b81;hp=017d195d2045c5f84a8878283cac2529fa355407;hpb=77c5096644d83aaae8ab1dd42a5cde524507cf9d;p=vchess.git

diff --git a/server/models/Game.js b/server/models/Game.js
index 017d195d..16c050cd 100644
--- a/server/models/Game.js
+++ b/server/models/Game.js
@@ -7,7 +7,7 @@ const UserModel = require("./User");
  *   vid: integer (variant id)
  *   fenStart: varchar (initial position)
  *   fen: varchar (current position)
- *   timeControl: string
+ *   cadence: string
  *   score: varchar (result)
  *   scoreMsg: varchar ("Time", "Mutual agreement"...)
  *   created: datetime
@@ -38,7 +38,7 @@ const GameModel =
       return "Wrong variant ID";
     if (!g.vname.match(/^[a-zA-Z0-9]+$/))
       return "Wrong variant name";
-    if (!g.timeControl.match(/^[0-9dhms +]+$/))
+    if (!g.cadence.match(/^[0-9dhms +]+$/))
       return "Wrong characters in time control";
     if (!g.fen.match(/^[a-zA-Z0-9, /-]*$/))
       return "Bad FEN string";
@@ -49,14 +49,14 @@ const GameModel =
     return "";
   },
 
-  create: function(vid, fen, timeControl, players, cb)
+  create: function(vid, fen, cadence, players, cb)
   {
     db.serialize(function() {
       let query =
-        "INSERT INTO Games"
-        + " (vid, fenStart, fen, score, timeControl, created, drawOffer)"
-        + " VALUES (" + vid + ",'" + fen + "','" + fen + "','*','"
-        + timeControl + "'," + Date.now() + ",'')";
+        "INSERT INTO Games " +
+        "(vid, fenStart, fen, score, cadence, created, drawOffer) " +
+        "VALUES " +
+        "(" + vid + ",'" + fen + "','" + fen + "','*','" + cadence + "'," + Date.now() + ",'')";
       db.run(query, function(err) {
         if (!!err)
           return cb(err);
@@ -72,16 +72,15 @@ const GameModel =
     });
   },
 
-  // TODO: queries here could be async, and wait for all to complete
-  getOne: function(id, cb)
+  // TODO: some queries here could be async
+  getOne: function(id, light, cb)
   {
     db.serialize(function() {
-      // TODO: optimize queries?
       let query =
         // NOTE: g.scoreMsg can be NULL
         // (in this case score = "*" and no reason to look at it)
-        "SELECT g.id, g.vid, g.fen, g.fenStart, g.timeControl, g.score, " +
-          "g.scoreMsg, v.name AS vname " +
+        "SELECT g.id, g.vid, g.fen, g.fenStart, g.cadence, g.score, " +
+          "g.scoreMsg, g.drawOffer, v.name AS vname " +
         "FROM Games g " +
         "JOIN Variants v " +
         "  ON g.vid = v.id " +
@@ -98,6 +97,14 @@ const GameModel =
         db.all(query, (err2,players) => {
           if (!!err2)
             return cb(err2);
+          if (light)
+          {
+            const game = Object.assign({},
+              gameInfo,
+              {players: players}
+            );
+            return cb(null, game);
+          }
           query =
             "SELECT squares, played, idx " +
             "FROM Moves " +
@@ -128,6 +135,7 @@ const GameModel =
     });
   },
 
+  // For display on MyGames or Hall: no need for moves or chats
   getByUser: function(uid, excluded, cb)
   {
     db.serialize(function() {
@@ -138,11 +146,12 @@ const GameModel =
       db.all(query, (err,gameIds) => {
         if (!!err)
           return cb(err);
-        gameIds = gameIds || []; //might be empty
+        if (gameIds.length == 0)
+          return cb(null, []);
         let gameArray = [];
         for (let i=0; i<gameIds.length; i++)
         {
-          GameModel.getOne(gameIds[i]["gid"], (err2,game) => {
+          GameModel.getOne(gameIds[i]["gid"], true, (err2,game) => {
             if (!!err2)
               return cb(err2);
             gameArray.push(game);
@@ -178,6 +187,8 @@ const GameModel =
       if (!obj.move.idx.toString().match(/^[0-9]+$/))
         return "Wrong move index";
     }
+    if (!!obj.drawOffer && !obj.drawOffer.match(/^[wbtn]$/))
+      return "Wrong draw offer format";
     if (!!obj.fen && !obj.fen.match(/^[a-zA-Z0-9, /-]*$/))
       return "Wrong FEN string";
     if (!!obj.score && !obj.score.match(/^[012?*\/-]+$/))
@@ -199,10 +210,14 @@ const GameModel =
       let modifs = "";
       if (!!obj.message)
         modifs += "message = message || ' ' || '" + obj.message + "',";
-      // NOTE: if drawOffer is true, we should check that it's player's turn
+      // NOTE: if drawOffer is set, we should check that it's player's turn
       // A bit overcomplicated. Let's trust the client on that for now...
       if (!!obj.drawOffer)
-        modifs += "drawOffer = " + obj.drawOffer + ",";
+      {
+        if (obj.drawOffer == "n") //Special "None" update
+          obj.drawOffer = "";
+        modifs += "drawOffer = '" + obj.drawOffer + "',";
+      }
       if (!!obj.fen)
         modifs += "fen = '" + obj.fen + "',";
       if (!!obj.score)
@@ -262,7 +277,7 @@ const GameModel =
     const day = 86400000;
     db.serialize(function() {
       let query =
-        "SELECT id,score " +
+        "SELECT id,score,created " +
         "FROM Games ";
       db.all(query, (err,games) => {
         games.forEach(g => {
@@ -271,13 +286,19 @@ const GameModel =
             "FROM Moves " +
             "WHERE gid = " + g.id;
           db.get(query, (err2,updated) => {
-            if (!updated && tsNow - g.created > 7*day)
-              return GameModel.remove(g.id);
-            const lastMaj = updated.lastMaj;
-            if (g.score != "*" && tsNow - lastMaj > 7*day ||
-              g.score == "*" && tsNow - lastMaj > 91*day)
+            if (!updated.lastMaj)
+            {
+              if (tsNow - g.created > 7*day)
+                return GameModel.remove(g.id);
+            }
+            else //at least one move
             {
-              GameModel.remove(g.id);
+              const lastMaj = updated.lastMaj;
+              if (g.score != "*" && tsNow - lastMaj > 7*day ||
+                g.score == "*" && tsNow - lastMaj > 91*day)
+              {
+                GameModel.remove(g.id);
+              }
             }
           });
         });