X-Git-Url: https://git.auder.net/?p=vchess.git;a=blobdiff_plain;f=server%2Froutes%2Fgames.js;h=fbda66f80260080b1bb35b2022c8d92340f6a11c;hp=24bfc82cb8c70586a112e7ce54131001ecbbf6a9;hb=7a0c1b7e33a346195caebfdfa6489e7c6d0457e6;hpb=dac395887d96e2d642b209c6db6aaacc3ffacb34

diff --git a/server/routes/games.js b/server/routes/games.js
index 24bfc82c..fbda66f8 100644
--- a/server/routes/games.js
+++ b/server/routes/games.js
@@ -1,90 +1,127 @@
-var router = require("express").Router();
-var UserModel = require("../models/User");
-var ChallengeModel = require('../models/Challenge');
-var GameModel = require('../models/Game');
-var VariantModel = require('../models/Variant');
-var access = require("../utils/access");
-var params = require("../config/parameters");
+let router = require("express").Router();
+const UserModel = require("../models/User");
+const ChallengeModel = require('../models/Challenge');
+const GameModel = require('../models/Game');
+const access = require("../utils/access");
+const params = require("../config/parameters");
+
+router.post("/gamestat", access.ajax, (req,res) => {
+  const vid = req.body.vid;
+  if (!!vid && !!vid.toString().match(/^[0-9]+$/)) {
+    GameModel.incrementCounter(vid);
+    res.json({});
+  }
+});
 
 // From main hall, start game between players 0 and 1
 router.post("/games", access.logged, access.ajax, (req,res) => {
   const gameInfo = req.body.gameInfo;
-  if (!Array.isArray(gameInfo.players) ||
-    !gameInfo.players.some(p => p.id == req.userId))
-  {
-    return res.json({errmsg: "Cannot start someone else's game"});
-  }
+  // Challenge ID is provided if game start from Hall:
   const cid = req.body.cid;
-  // Check all entries of gameInfo + cid:
-  let error = GameModel.checkGameInfo(gameInfo);
-  if (!error)
-  {
-    if (!cid.toString().match(/^[0-9]+$/))
-      error = "Wrong challenge ID";
-  }
-  if (!!error)
-    return res.json({errmsg:error});
-  ChallengeModel.remove(cid);
-  GameModel.create(
-    gameInfo.vid, gameInfo.fen, gameInfo.timeControl, gameInfo.players,
-    (err,ret) => {
-      access.checkRequest(res, err, ret, "Cannot create game", () => {
+  if (
+    Array.isArray(gameInfo.players) &&
+    gameInfo.players.some(p => p.id == req.userId) &&
+    (!cid || !!cid.toString().match(/^[0-9]+$/)) &&
+    GameModel.checkGameInfo(gameInfo)
+  ) {
+    if (!!cid) ChallengeModel.remove(cid);
+    GameModel.create(
+      gameInfo.vid, gameInfo.fen, gameInfo.options,
+      gameInfo.cadence, gameInfo.players,
+      (err, ret) => {
         const oppIdx = (gameInfo.players[0].id == req.userId ? 1 : 0);
         const oppId = gameInfo.players[oppIdx].id;
         UserModel.tryNotify(oppId,
-          "New game: " + params.siteURL + "/game/" + ret.gid);
-        res.json({gameId: ret.gid});
-      });
-    }
-  );
+          "Game started: " + params.siteURL + "/#/game/" + ret.id);
+        res.json(err || ret);
+      }
+    );
+  }
 });
 
+// Get only one game (for Game page)
 router.get("/games", access.ajax, (req,res) => {
   const gameId = req.query["gid"];
-  if (!!gameId)
-  {
-    GameModel.getOne(gameId, (err,game) => {
-      access.checkRequest(res, err, game, "Game not found", () => {
-        res.json({game: game});
-      });
+  if (!!gameId && gameId.match(/^[0-9]+$/)) {
+    GameModel.getOne(gameId, (err, game) => {
+      res.json(err || { game: game });
     });
   }
-  else
-  {
-    // Get by (non-)user ID:
-    const userId = req.query["uid"];
-    const excluded = !!req.query["excluded"];
-    GameModel.getByUser(userId, excluded, (err,games) => {
-      if (!!err)
-        return res.json({errmsg: err.errmsg || err.toString()});
-      res.json({games: games});
+});
+
+// Get by (non-)user ID, for Hall
+router.get("/observedgames", access.ajax, (req,res) => {
+  const userId = req.query["uid"];
+  const cursor = req.query["cursor"];
+  if (!!userId.match(/^[0-9]+$/) && !!cursor.match(/^[0-9]+$/)) {
+    GameModel.getObserved(userId, cursor, (err, games) => {
+      res.json({ games: games });
     });
   }
 });
 
-// New move + fen update + score, potentially
-// TODO: if newmove fail, takeback in GUI
+// Get by user ID, for MyGames page
+router.get("/runninggames", access.logged, access.ajax, (req,res) => {
+  GameModel.getRunning(req.userId, (err, games) => {
+    res.json({ games: games });
+  });
+});
+
+router.get("/completedgames", access.logged, access.ajax, (req,res) => {
+  const cursor = req.query["cursor"];
+  if (!!cursor.match(/^[0-9]+$/)) {
+    GameModel.getCompleted(req.userId, cursor, (err, games) => {
+      res.json({ games: games });
+    });
+  }
+});
+
+// FEN update + score(Msg) + draw status / and new move + chats
 router.put("/games", access.logged, access.ajax, (req,res) => {
   const gid = req.body.gid;
-  let error = "";
-  if (!gid.toString().match(/^[0-9]+$/))
-    error = "Wrong game ID";
-  const obj = req.body.newObj;
-  error = GameModel.checkGameUpdate(obj);
-  if (!!error)
-    return res.json({errmsg: error});
-  GameModel.update(gid, obj, (err) => {
-    if (!!err)
-      return res.json(err);
-    // Notify opponent if he enabled notifications:
-    GameModel.getPlayers(gid, (err2,players) => {
-      if (!!err2)
-        return res.json(err);
-      const oppid = (players[0].id == req.userId ? players[1].id : players[0].id);
-      UserModel.tryNotify(oppid,
-        "New move in game: " + params.siteURL + "/game/" + gid);
+  let obj = req.body.newObj;
+  if (gid.toString().match(/^[0-9]+$/) && GameModel.checkGameUpdate(obj)) {
+    GameModel.getPlayers(gid, (err, players) => {
+      let myColor = '';
+      if (players.white == req.userId) myColor = 'w';
+      else if (players.black == req.userId) myColor = 'b';
+      if (!!myColor) {
+        // Did I mark the game for deletion?
+        if (!!obj.removeFlag) {
+          obj.deletedBy = myColor;
+          delete obj["removeFlag"];
+        }
+        GameModel.update(gid, obj, (err) => {
+          if (!err && (!!obj.move || !!obj.score)) {
+            // Notify opponent if he enabled notifications:
+            const oppid = (myColor == 'w' ? players.black : players.white);
+            const messagePrefix =
+              !!obj.move
+                ? "New move in game : "
+                : "Game ended : ";
+            UserModel.tryNotify(
+              oppid,
+              messagePrefix + params.siteURL + "/#/game/" + gid
+            );
+          }
+          res.json(err || {});
+        });
+      }
     });
-    res.json({});
+  }
+});
+
+// TODO: chats deletion here, but could/should be elsewhere.
+// Moves update also could, although logical unit in a game.
+router.delete("/chats", access.logged, access.ajax, (req,res) => {
+  const gid = req.query["gid"];
+  GameModel.getPlayers(gid, (err, players) => {
+    if ([players.white, players.black].includes(req.userId))
+    {
+      GameModel.update(gid, { delchat: true }, () => {
+        res.json({});
+      });
+    }
   });
 });