stats counting implemented
This commit is contained in:
@@ -9,7 +9,14 @@ var app = express();
|
|||||||
|
|
||||||
app.use(bodyParser.urlencoded({ extended: true }));
|
app.use(bodyParser.urlencoded({ extended: true }));
|
||||||
|
|
||||||
var CACHE = new LRU(30);
|
var MODELS = {};
|
||||||
|
var CACHE = new LRU({
|
||||||
|
max: 50,
|
||||||
|
dispose: key => {
|
||||||
|
MODELS[key].save();
|
||||||
|
delete MODELS[key];
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
var getTimeStamp = () => {
|
var getTimeStamp = () => {
|
||||||
var timestamp = new Date().getTime();
|
var timestamp = new Date().getTime();
|
||||||
@@ -24,17 +31,17 @@ app.get('/new', function (req, res) {
|
|||||||
});
|
});
|
||||||
|
|
||||||
app.post('/note', function (req, res) {
|
app.post('/note', function (req, res) {
|
||||||
var body = req.body,
|
var body = req.body,
|
||||||
session = body.session,
|
session = body.session,
|
||||||
note = body.note,
|
note = body.note,
|
||||||
password = md5(body.password);
|
password = md5(body.password);
|
||||||
var goToNote = note => res.redirect("/" + note.id);
|
var goToNote = note => res.redirect("/" + note.id);
|
||||||
if (session.indexOf(getTimeStamp()) != 0)
|
if (session.indexOf(getTimeStamp()) != 0)
|
||||||
return sendResponse(res, 400, "Session expired");
|
return sendResponse(res, 400, "Session expired");
|
||||||
var expectedSignature = md5(session + note.replace(/[\n\r]/g, ""));
|
var expectedSignature = md5(session + note.replace(/[\n\r]/g, ""));
|
||||||
if (expectedSignature != body.signature)
|
if (expectedSignature != body.signature)
|
||||||
return sendResponse(res, 400, "Signature mismatch");
|
return sendResponse(res, 400, "Signature mismatch");
|
||||||
console.log(body)
|
console.log(body)
|
||||||
if (body.action == "POST")
|
if (body.action == "POST")
|
||||||
storage.addNote(note, password).then(goToNote);
|
storage.addNote(note, password).then(goToNote);
|
||||||
else
|
else
|
||||||
@@ -53,42 +60,53 @@ app.get("/:year/:month/:day/:title", function (req, res) {
|
|||||||
|
|
||||||
app.get(/\/([a-z0-9]+\/edit)/, function (req, res) {
|
app.get(/\/([a-z0-9]+\/edit)/, function (req, res) {
|
||||||
var link = req.params["0"].replace("/edit", "");
|
var link = req.params["0"].replace("/edit", "");
|
||||||
storage.getNote(link).then(note => res.send(note
|
storage.getNote(link).then(note => res.send(note
|
||||||
? view.editNotePage(getTimeStamp() + md5(Math.random()), note)
|
? view.editNotePage(getTimeStamp() + md5(Math.random()), note)
|
||||||
: notFound(res)));
|
: notFound(res)));
|
||||||
});
|
});
|
||||||
|
|
||||||
app.get(/\/([a-z0-9]+\/export)/, function (req, res) {
|
app.get(/\/([a-z0-9]+\/export)/, function (req, res) {
|
||||||
var link = req.params["0"].replace("/export", "");
|
var link = req.params["0"].replace("/export", "");
|
||||||
res.set({ 'Content-Type': 'text/plain', 'Charset': 'utf-8' });
|
res.set({ 'Content-Type': 'text/plain', 'Charset': 'utf-8' });
|
||||||
storage.getNote(link).then(note => note
|
storage.getNote(link).then(note => note
|
||||||
? res.send(note.text)
|
? res.send(note.text)
|
||||||
: notFound(res));
|
: notFound(res));
|
||||||
});
|
});
|
||||||
|
|
||||||
app.get(/\/([a-z0-9]+\/stats)/, function (req, res) {
|
app.get(/\/([a-z0-9]+\/stats)/, function (req, res) {
|
||||||
var link = req.params["0"].replace("/stats", "");
|
var link = req.params["0"].replace("/stats", "");
|
||||||
storage.getNote(link).then(note => note
|
var promise = link in MODELS
|
||||||
? res.send(view.buildStats(note))
|
? new Promise(resolve => resolve(MODELS[link]))
|
||||||
: notFound(res));
|
: storage.getNote(link);
|
||||||
|
promise.then(note => note
|
||||||
|
? res.send(view.renderStats(note))
|
||||||
|
: notFound(res));
|
||||||
});
|
});
|
||||||
|
|
||||||
app.get(/\/([a-z0-9]+)/, function (req, res) {
|
app.get(/\/([a-z0-9]+)/, function (req, res) {
|
||||||
var link = req.params["0"];
|
var link = req.params["0"];
|
||||||
if (CACHE.has(link)) res.send(CACHE.get(link));
|
if (CACHE.has(link)) {
|
||||||
else storage.getNote(link).then(note => {
|
(link in MODELS) && MODELS[link].views++;
|
||||||
|
res.send(CACHE.get(link));
|
||||||
|
} else storage.getNote(link).then(note => {
|
||||||
if (!note) return notFound(res);
|
if (!note) return notFound(res);
|
||||||
var content = view.buildNote(note);
|
var content = view.renderNote(note);
|
||||||
CACHE.set(link, content);
|
CACHE.set(link, content);
|
||||||
|
MODELS[link] = note;
|
||||||
res.send(content);
|
res.send(content);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
var sendResponse = (res, code, message) =>
|
var sendResponse = (res, code, message) =>
|
||||||
res.status(code).send(view.buildPage(message, "<h1>" + message + "</h1>", ""));
|
res.status(code).send(view.renderPage(message, "<h1>" + message + "</h1>", ""));
|
||||||
|
|
||||||
var notFound = res => sendResponse(res, 404, "Not found");
|
var notFound = res => sendResponse(res, 404, "Not found");
|
||||||
|
|
||||||
var server = app.listen(3000, function () {
|
var server = app.listen(3000, function () {
|
||||||
console.log('NoteHub server listening on port %s', server.address().port);
|
console.log('NoteHub server listening on port %s', server.address().port);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
setInterval(() => {
|
||||||
|
console.log("saving stats...");
|
||||||
|
Object.keys(MODELS).forEach(id => MODELS[id].save())
|
||||||
|
}, 60 * 5 * 1000);
|
||||||
+4
-4
@@ -9,14 +9,14 @@ var deriveTitle = text => text
|
|||||||
.split(/[\n\r]/)[0].slice(0,25)
|
.split(/[\n\r]/)[0].slice(0,25)
|
||||||
.replace(/[^a-zA-Z0-9\s]/g, "");
|
.replace(/[^a-zA-Z0-9\s]/g, "");
|
||||||
|
|
||||||
var buildPage = (title, content, footer) => pageTemplate
|
var renderPage = (title, content, footer) => pageTemplate
|
||||||
.replace("%TITLE%", title)
|
.replace("%TITLE%", title)
|
||||||
.replace("%CONTENT%", content)
|
.replace("%CONTENT%", content)
|
||||||
.replace("%FOOTER%", footer);
|
.replace("%FOOTER%", footer);
|
||||||
|
|
||||||
module.exports.buildPage = buildPage;
|
module.exports.renderPage = renderPage;
|
||||||
|
|
||||||
module.exports.buildStats = note => buildPage(deriveTitle(note.text),
|
module.exports.renderStats = note => renderPage(deriveTitle(note.text),
|
||||||
`<h2>Statistics</h2>
|
`<h2>Statistics</h2>
|
||||||
<table>
|
<table>
|
||||||
<tr><td>Published</td><td>${note.published}</td></tr>
|
<tr><td>Published</td><td>${note.published}</td></tr>
|
||||||
@@ -25,7 +25,7 @@ module.exports.buildStats = note => buildPage(deriveTitle(note.text),
|
|||||||
</table>`,
|
</table>`,
|
||||||
"");
|
"");
|
||||||
|
|
||||||
module.exports.buildNote = note => buildPage(deriveTitle(note.text),
|
module.exports.renderNote = note => renderPage(deriveTitle(note.text),
|
||||||
marked(note.text),
|
marked(note.text),
|
||||||
footerTemplate.replace(/%LINK%/g, note.id));
|
footerTemplate.replace(/%LINK%/g, note.id));
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user