jxp 2.12.3 → 2.13.0

package/bin/setup.js

@@ -81,8 +81,9 @@ async function main() {
 		await mkdir(path.join(destination_path, "models"));
 		await mkdir(path.join(destination_path, "config"));
 		await mkdir(path.join(destination_path, "logs"));
+		await mkdir(path.join(destination_path, "libs"));
 		await cp_replace("../config_sample.json", path.join(destination_path, "config/default.json"), opts, "{", "}");
-		await cp_replace("./server.js", path.join(destination_path, "bin/server.js"), { "../libs/jxp": "jxp" });
+		await cp_replace("./server.js", path.join(destination_path, "bin/server.js"), { "../libs/jxp": "jxp/libs/jxp", "../libs/connection_string": "jxp/libs/connection_string" });
 		for (let model of models) {
 			await cp("../models/" + model + "_model.js", path.join(destination_path, "models/" + model + "_model.js"));
 		}
@@ -149,7 +150,7 @@ async function main() {
  * Copy from to replacing text as we go
  *
  */
-function cp_replace(from, to, opts, startEnclosure, endEnclosure) {
+function cp_replace(from, to, opts, startEnclosure = "", endEnclosure = "") {
 	startEnclosure = startEnclosure || "";
 	endEnclosure = endEnclosure || "";
 	from = path.join(__dirname, from);

package/docs/caching.md

@@ -0,0 +1,12 @@
+# Caching
+
+Enable caching to speed up your queries. Caching is disabled by default. Enable caching through the config:
+
+```JSON
+{
+    "cache": {
+        "enabled": true,
+        "ttl": 3600
+    }
+}
+```

package/libs/cache.js

@@ -0,0 +1,47 @@
+const NodeCache = require('node-cache');
+const config = require('config');
+const cache = new NodeCache({ stdTTL: config.cache?.ttl || 5 * 60 });
+
+const generateKey = (req) => {
+    const url = req.url
+    return url
+}
+
+const set = (req, res, next) => {
+    if (!config.cache?.enabled) return next();
+    const key = generateKey(req)
+    cache.set(key, res.result)
+    next()
+}
+
+const get = (req, res, next) => {
+    if (!config.cache?.enabled) return next();
+    const key = generateKey(req)
+    const cached = cache.get(key)
+    if (cached) {
+        res.header('jxp-cache', 'hit')
+        res.result = cached
+        return res.send(res.result)
+    }
+    res.header('jxp-cache', 'miss')
+    next()
+}
+
+const clear = (req, res, next) => {
+    if (!config.cache?.enabled) return next();
+    cache.flushAll()
+    next()
+}
+
+const stats = (req, res, next) => {
+    if (!config.cache?.enabled) return {};
+    res.result = cache.getStats()
+    next()
+}
+
+module.exports = {
+    set,
+    get,
+    clear,
+    stats
+}

package/libs/jxp.js

@@ -15,6 +15,7 @@ const modeldir = require("./modeldir");
 const query_manipulation = require("./query_manipulation");
 const corsMiddleware = require('restify-cors-middleware2');
 const json2csv = require('json2csv').parse;
+const cache = require("./cache");
 global.JXPSchema = require("./schema");
 
 var models = {};
@@ -202,7 +203,7 @@ const actionGetOne = async (req, res) => {
 	console.time(opname);
 	try {
 		const data = await getOne(req.Model, req.params.item_id, req.query, { user: res.user });
-		res.send({ data });
+		res.result = { data };
 		if (debug) console.timeEnd(opname);
 	} catch(err) {
 		console.error(new Date(), err);
@@ -908,7 +909,9 @@ const JXP = function(options) {
 		security.login,
 		security.auth,
 		config.pre_hooks.get,
+		cache.get,
 		actionGet,
+		cache.set,
 		outputJSON
 	);
 	server.get(
@@ -916,8 +919,12 @@ const JXP = function(options) {
 		middlewareModel,
 		security.login,
 		security.auth,
+		cache.get,
 		config.pre_hooks.getOne,
-		actionGetOne
+		cache.get,
+		actionGetOne,
+		cache.set,
+		outputJSON
 	);
 	server.post(
 		"/api/:modelname",
@@ -927,6 +934,7 @@ const JXP = function(options) {
 		middlewarePasswords,
 		config.pre_hooks.post,
 		actionPost,
+		cache.clear,
 		(req, res, next) => {
 			next();
 		},
@@ -940,6 +948,7 @@ const JXP = function(options) {
 		middlewareCheckAdmin,
 		config.pre_hooks.put,
 		actionPut,
+		cache.clear,
 	);
 	server.del(
 		"/api/:modelname/:item_id",
@@ -948,6 +957,7 @@ const JXP = function(options) {
 		security.auth,
 		config.pre_hooks.delete,
 		actionDelete,
+		cache.clear,
 	);
 
 	// Count
@@ -957,7 +967,9 @@ const JXP = function(options) {
 		security.login,
 		security.auth,
 		config.pre_hooks.get,
+		cache.get,
 		actionCount,
+		cache.set,
 		outputJSON
 	);
 
@@ -1009,6 +1021,7 @@ const JXP = function(options) {
 		middlewareCheckAdmin,
 		config.pre_hooks.update,
 		actionUpdate,
+		cache.clear,
 	);
 
 	/* Batch routes - ROLLED BACK FOR NOW */
@@ -1020,21 +1033,24 @@ const JXP = function(options) {
 		middlewareModel,
 		security.login,
 		security.auth,
-		actionCall
+		actionCall,
+		cache.clear,
 	);
 	server.post(
 		"/call/:modelname/:method_name",
 		middlewareModel,
 		security.login,
 		security.auth,
-		actionCall
+		actionCall,
+		cache.clear,
 	);
 	server.get(
 		"/call/:modelname/:item_id/:method_name",
 		middlewareModel,
 		security.login,
 		security.auth,
-		actionCallItem
+		actionCallItem,
+		cache.clear,
 	);
 
 	/* Login and authentication */
@@ -1081,6 +1097,11 @@ const JXP = function(options) {
 
 	/* Websocket */
 	server.on("upgrade", ws.upgrade)
+
+	/* Cache */
+	server.get("/cache/stats", cache.stats, outputJSON);
+	server.get("/cache/clear", cache.clear, outputJSON);
+
 	return server;
 };
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "jxp",
   "description:": "An opinionated RESTful API library based on Mongoose and Restify. Make an API by just writing Mongoose models.",
-  "version": "2.12.3",
+  "version": "2.13.0",
   "private": false,
   "main": "libs/jxp.js",
   "scripts": {
@@ -45,6 +45,7 @@
     "mongoose": "6.8.4",
     "mongoose-friendly": "^0.1.4",
     "morgan": "^1.10.0",
+    "node-cache": "^5.1.2",
     "nodemailer": "^6.9.0",
     "nodemailer-smtp-transport": "^2.7.4",
     "path": "^0.12.7",

package/test/test.js

@@ -127,7 +127,6 @@ describe('Test', () => {
 				.get("/api/user")
 				.auth(init.email, init.password)
 				.end((err, res) => {
-					// console.log(res.body);
 					res.should.have.status(200);
 					res.body.data.should.be.an('array');
 					done();
@@ -166,7 +165,6 @@ describe('Test', () => {
 			chai.request(server)
 				.get(`/api/user`)
 				.end((err, res) => {
-					// console.log(res.body);
 					res.should.have.status(403);
 					done();
 				});
@@ -374,7 +372,6 @@ describe('Test', () => {
 			.get(`/api/test/${post_id}?populate=link`)
 			.auth(init.email, init.password)
 			.end((err, res) => {
-				// console.log(res.body);
 				res.should.have.status(200);
 				res.body.should.have.property("data");
 				res.body.data.should.have.property("link");
@@ -391,7 +388,6 @@ describe('Test', () => {
 				.get(`/api/test/${post_id}?populate=other_link`)
 				.auth(init.email, init.password)
 				.end((err, res) => {
-					// console.log(res.body);
 					res.should.have.status(200);
 					res.body.should.have.property("data");
 					res.body.data.should.have.property("other_link")
@@ -408,7 +404,6 @@ describe('Test', () => {
 			.get(`/api/test?autopopulate=true`)
 			.auth(init.email, init.password)
 			.end((err, res) => {
-				// console.log(res.body);
 				res.should.have.status(200);
 				res.body.data[0].should.have.property("link")
 				res.body.data[0].link.should.be.an('object');
@@ -426,7 +421,6 @@ describe('Test', () => {
 				.get(`/api/test/${post_id}?autopopulate=true`)
 				.auth(init.email, init.password)
 				.end((err, res) => {
-					// console.log(res.body);
 					res.should.have.status(200);
 					res.body.data.should.have.property("link")
 					res.body.data.link.should.be.an('object');
@@ -444,7 +438,6 @@ describe('Test', () => {
 			.get(`/api/test/${post_id}?populate=link`)
 			.auth(init.email, init.password)
 			.end((err, res) => {
-				console.log(res.body);
 				res.should.have.status(200);
 				res.body.should.have.property("data");
 				res.body.data.should.have.property("link")
@@ -573,7 +566,6 @@ describe('Test', () => {
 				.get(`/api/test?populate=array_link`)
 				.auth(init.email, init.password)
 				.end((err, res) => {
-					// console.log(res.body);
 					res.should.have.status(200);
 					res.body.data[0].should.have.property("array_link");
 					res.body.data[0].array_link.should.be.an("array");
@@ -727,7 +719,6 @@ describe('Test', () => {
 				.send({ query })
 				.end((err, res) => {
 					res.should.have.status(200);
-					// console.log(res.body);
 					res.body.data.should.be.an('array');
 					res.body.data[0].should.have.property("_id");
 					res.body.data[0].should.have.property("count");
@@ -876,7 +867,6 @@ describe('Test', () => {
 				.del(`/api/test/${post_id}`)
 				.auth(init.email, init.password)
 				.end((err, res) => {
-					// console.log(res.body);
 					res.should.have.status(200);
 					res.body.status.should.equal('ok');
 					done();
@@ -887,7 +877,6 @@ describe('Test', () => {
 				.get(`/api/test/${post_id}`)
 				.auth(init.email, init.password)
 				.end((err, res) => {
-					// console.log(res.body);
 					res.should.have.status(404);
 					res.body.message.should.equal(`Document ${post_id} is deleted on Test`);
 					res.body.code.should.equal('NotFound');
@@ -992,7 +981,6 @@ describe('Test', () => {
 				.auth(init.email, init.password)
 				.end((err, res) => {
 					res.should.have.status(409);
-					// console.log(res.body.message);
 					res.body.message.should.equal(`Parent link item exists in test/link_id`);
 					done();
 				});
@@ -1002,7 +990,6 @@ describe('Test', () => {
 				.del(`/api/link/${link_id}?_cascade=1`)
 				.auth(init.email, init.password)
 				.end((err, res) => {
-					// console.log(res.body, res.status);
 					res.should.have.status(200);
 					res.body.status.should.equal('ok');
 					done();
@@ -1133,12 +1120,66 @@ describe('Test', () => {
 				bar: "Throw an error"
 			})
 			.end((err, res) => {
-				// console.log(res.body);
-				console.log(res.headers);
 				res.should.have.status(418);
 				res.body.message.should.equal(`I'm a teapot`);
 				done();
 			});
 		})
 	});
+
+	describe("Caching", () => {
+		it ("should give us cache stats", (done) => {
+			chai.request(server)
+			.get("/cache/stats")
+			.end((err, res) => {
+				// console.log(res.body);
+				res.should.have.status(200);
+				res.body.should.have.property("hits");
+				done();
+			});
+		})
+		it ("should clear the cache stats", (done) => {
+			chai.request(server)
+			.get("/cache/clear")
+			.end((err, res) => {
+				console.log(res.body);
+				res.should.have.status(200);
+				done();
+			});
+		});
+		it ("should get an uncached request", (done) => {
+			chai.request(server)
+			.get("/api/test")
+			.auth(init.email, init.password)
+			.end((err, res) => {
+				res.should.have.status(200);
+				res.headers.should.have.property("jxp-cache");
+				res.headers["jxp-cache"].should.equal("miss");
+				done();
+			});
+		});
+		it ("should get an cached request", (done) => {
+			chai.request(server)
+			.get("/api/test")
+			.auth(init.email, init.password)
+			.end((err, res) => {
+				res.should.have.status(200);
+				res.headers.should.have.property("jxp-cache");
+				res.headers["jxp-cache"].should.equal("hit");
+				done();
+			});
+		});
+		it ("should give us cache stats", (done) => {
+			chai.request(server)
+			.get("/cache/stats")
+			.end((err, res) => {
+				// console.log(res.body);
+				res.should.have.status(200);
+				res.body.should.have.property("hits");
+				res.body.hits.should.equal(1);
+				res.body.misses.should.equal(1);
+				done();
+			});
+		})
+	});
 });