X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=server%2Froutes%2Fgames.js;h=24bfc82cb8c70586a112e7ce54131001ecbbf6a9;hb=dac395887d96e2d642b209c6db6aaacc3ffacb34;hp=ec824f73025c6d744ecb7dabfd478c8726fb6246;hpb=5d04793e1bce0d448b4ffc532f1e8eb47a72e972;p=vchess.git diff --git a/server/routes/games.js b/server/routes/games.js index ec824f73..24bfc82c 100644 --- a/server/routes/games.js +++ b/server/routes/games.js @@ -1,59 +1,53 @@ -router.get("/games", access.logged, access.ajax, (req,res) => { - const excluded = req.query["excluded"]; //TODO: think about query params here -}); - var router = require("express").Router(); var UserModel = require("../models/User"); -var sendEmail = require('../utils/mailer'); +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"); -// Notify about a game (start, new move) -function tryNotify(uid, gid, vname, subject) -{ - UserModel.getOne("id", uid, (err,user) => { - if (!!err && user.notify) - { - sendEmail(params.mailFrom, user.email, subject, - params.siteURL + "?v=" + vname + "&g=" + gid, err => { - res.json(err || {}); // TODO: log error somewhere. - } - ); - } - )}; -} - -// From main hall, start game between player 0 and 1 +// From main hall, start game between players 0 and 1 router.post("/games", access.logged, access.ajax, (req,res) => { - const gameInfo = JSON.parse(req.body.gameInfo); - if (!gameInfo.players.some(p => p.id == req.user.id)) - return res.json({errmsg: "Cannot start someone else's game"}); - let fen = req.body.fen; - GameModel.create(gameInfo.vid, - gameInfo.fen, gameInfo.mainTime, gameInfo.increment, gameInfo.players, - (err,game) => { - access.checkRequest(res, err, game, "Cannot create game", () => { - if (!!req.body.offlineOpp) - UserModel.tryNotify(req.body.offlineOpp, game.id, variant.name, - "New game: " + "game link"); //TODO: give game link - res.json({game: game}); - }); - } - ); + 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"}); + } + 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", () => { + 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 page router.get("/games", access.ajax, (req,res) => { - const gameId = req.query["gid"]; - if (!!gameId) + const gameId = req.query["gid"]; + if (!!gameId) { GameModel.getOne(gameId, (err,game) => { - access.checkRequest(res, err, game, "Game not found", () => { - res.json({game: game}); - }); - }); + access.checkRequest(res, err, game, "Game not found", () => { + res.json({game: game}); + }); + }); } else { @@ -61,63 +55,37 @@ router.get("/games", access.ajax, (req,res) => { const userId = req.query["uid"]; const excluded = !!req.query["excluded"]; GameModel.getByUser(userId, excluded, (err,games) => { - access.checkRequest(res, err, games, "Games not found", () => { - res.json({games: games}); - }); - }); + if (!!err) + return res.json({errmsg: err.errmsg || err.toString()}); + res.json({games: games}); + }); } }); -// TODO: -router.put("/games", access.logged, access.ajax, (req,res) => { - let gid = ObjectId(req.body.gid); - let result = req.body.result; - // NOTE: only game-level life update is "gameover" - GameModel.gameOver(gid, result, ObjectId(req.user._id), (err,game) => { - access.checkRequest(res, err, game, "Cannot find game", () => { - res.json({}); - }); - }); -}); - -// 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}); - }); -}); - +// New move + fen update + score, potentially // TODO: if newmove fail, takeback in GUI -// TODO: check move structure -// TODO: for corr games, 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; - let vname = req.body.vname; //defined only if !!offlineOpp - // NOTE: storing the moves encoded lead to double stringify --> error at parsing - let move = JSON.parse(req.body.move); - GameModel.addMove(gid, move, fen, req._user._id, (err,game) => { - access.checkRequest(res, err, game, "Cannot find game", () => { - if (!!req.body.offlineOpp) - UserModel.tryNotify(ObjectId(req.body.offlineOpp), gid, vname, "New move"); - res.json({}); - }); - }); +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); + }); + res.json({}); + }); }); module.exports = router;