diff --git a/index.js b/index.js index 45447f9..25038d2 100644 --- a/index.js +++ b/index.js @@ -29,6 +29,7 @@ fastify.register(require("fastify-secure-session"), { // options for setCookie, see https://github.com/fastify/fastify-cookie secure: false, httpOnly: true, + overwrite: true, }, }); fastify.register(fastifyFlash); @@ -125,76 +126,86 @@ fastify.get( console.log(err); } let balance = 0; - balance = await client.balance(req.session.get("user")); - console.log(balance); - let logsent; - console.log("start " + Date.now()); - try { - const user = req.session.get("user"); - const password = req.session.get("password"); - logsent = await client.log(user, password); - } catch (e) { - console.log(e); - } - console.log(logsent); - let logrec = logsent; - let graphlog = logsent; - if (graphlog != null) { - graphlog = graphlog.reverse(); - } let graphdata = ""; - let currentbal = balance; - if (graphlog) { - for (i = graphlog.length - 1; i > -1; i--) { - if (graphlog[i].from == req.session.get("user")) { - currentbal = parseInt(currentbal) + parseInt(graphlog[i].amount); - graphdata = graphdata + ", [" + parseInt(i) + "," + currentbal + "]"; - } else { - currentbal = parseInt(currentbal) - parseInt(graphlog[i].amount); - graphdata = graphdata + ", [" + parseInt(i) + "," + currentbal + "]"; + let logsent = []; + let logrec = []; + if (admin != 1) { + balance = await client.balance(req.session.get("user")); + console.log(balance); + let logsent; + console.log("start " + Date.now()); + try { + const user = req.session.get("user"); + const password = req.session.get("password"); + logsent = await client.log(user, password); + } catch (e) { + console.log(e); + } + console.log(logsent); + logrec = logsent; + graphlog = logsent; + if (graphlog != null) { + graphlog = graphlog.reverse(); + } + graphdata = ""; + let currentbal = balance; + if (graphlog) { + for (i = graphlog.length - 1; i > -1; i--) { + if (graphlog[i].from == req.session.get("user")) { + currentbal = parseInt(currentbal) + parseInt(graphlog[i].amount); + graphdata = + graphdata + ", [" + parseInt(i) + "," + currentbal + "]"; + } else { + currentbal = parseInt(currentbal) - parseInt(graphlog[i].amount); + graphdata = + graphdata + ", [" + parseInt(i) + "," + currentbal + "]"; + } + } + } else { + graphlog = undefined; + } + if (graphdata != "") { + graphdata = + ", [" + parseInt(graphlog.length) + "," + balance + "]" + graphdata; + graphdata = '["transaction", "balance"]' + graphdata; + } + if (logsent == null) { + logsent = undefined; + } else { + logsent = await logsent.filter( + ({ from }) => from === req.session.get("user") + ); + } + if (logrec == null) { + logrec = undefined; + } else { + logrec = await logrec.filter( + ({ to }) => to === req.session.get("user") + ); + } + if (logsent) { + for (i in logrec) { + logrec[i].time = new Date(logrec[i].time); } } - } else { - graphlog = undefined; - } - if (graphdata != "") { - graphdata = - ", [" + parseInt(graphlog.length) + "," + balance + "]" + graphdata; - graphdata = '["transaction", "balance"]' + graphdata; - } - if (logsent == null) { - logsent = undefined; - } else { - logsent = await logsent.filter( - ({ from }) => from === req.session.get("user") - ); - } - if (logrec == null) { - logrec = undefined; - } else { - logrec = await logrec.filter(({ to }) => to === req.session.get("user")); - } - if (logsent) { - for (i in logrec) { - logrec[i].time = new Date(logrec[i].time); + if (logrec) { + for (i in logsent) { + logsent[i].time = new Date(logsent[i].time); + } + } + if (logrec != null) { + logrec.reverse(); + } + if (logsent != null) { + logsent.reverse(); } } - if (logrec) { - for (i in logsent) { - logsent[i].time = new Date(logsent[i].time); - } - } - if (logrec != null) { - logrec.reverse(); - } - if (logsent != null) { - logsent.reverse(); - } + let maxgraph = balance + 1000; console.log("begin render " + Date.now()); res.view("bankf", { maxgraph: maxgraph, - graphdata: graphdata, + graphdata: graphdata || null, logrec: logrec, logsent: logsent, user: req.session.get("user"), @@ -343,7 +354,7 @@ process.on("SIGINT", function () { process.exit(); }); -fastify.listen(process.env.PORT || 3000, function (err, address) { +fastify.listen(process.env.PORT || 3000, "0.0.0.0", function (err, address) { if (err) { fastify.log.error(err); process.exit(1); diff --git a/routes/admin.js b/routes/admin.js index 49b729f..26fff84 100644 --- a/routes/admin.js +++ b/routes/admin.js @@ -1,13 +1,10 @@ const root = process.env.PWD; const path = require("path"); const pug = require("pug"); -const flash = require("connect-flash"); -const expressValidator = require("express-validator"); const { postUser } = require(`${root}/helpers/functions.js`); const got = require("got"); const fs = require("fs"); -const mongoose = require("mongoose"); const { CCashClient } = require("ccash-client-js"); diff --git a/routes/settings.js b/routes/settings.js index 09c6258..9ffe76d 100644 --- a/routes/settings.js +++ b/routes/settings.js @@ -1,9 +1,6 @@ const root = process.env.PWD; const path = require("path"); var pug = require("pug"); -const flash = require("connect-flash"); -const expressValidator = require("express-validator"); -const session = require("express-session"); const { postUser } = require(`${root}/helpers/functions.js`); const { CCashClient } = require("ccash-client-js");