larvitcms 2.0.0 → 3.0.0

package/dataWriter.js

@@ -1,25 +1,15 @@
 'use strict';
 
-const EventEmitter = require('events').EventEmitter;
-const topLogPrefix = 'larvitcms: dataWriter.js: ';
-const DbMigration = require('larvitdbmigration');
-const slugify = require('larvitslugify');
-const LUtils = require('larvitutils');
-const amsync = require('larvitamsync');
-const async = require('async');
+const { DbMigration } = require('larvitdbmigration');
+const { slugify } = require('larvitslugify');
+const { Utils, Log } = require('larvitutils');
 
-let isReady = false;
-let readyInProgress = false;
-let emitter = new EventEmitter();
+const topLogPrefix = 'larvitcms: dataWriter.js: ';
 
 class DataWriter {
-	static get emitter() { return emitter; }
-
 	constructor(options) {
 		if (!options.log) {
-			const tmpLUtils = new LUtils();
-
-			options.log = new tmpLUtils.Log();
+			options.log = new Log();
 		}
 
 		this.options = options;
@@ -28,339 +18,113 @@ class DataWriter {
 			this[key] = options[key];
 		}
 
-		this.lUtils = new LUtils({log: this.log});
-
-		this.listenToQueue();
-	}
-
-	listenToQueue(retries, cb) {
-		const logPrefix = topLogPrefix + 'listenToQueue() - ';
-		const options = {exchange: this.exchangeName};
-		const tasks = [];
-
-		let listenMethod;
-
-		if (typeof retries === 'function') {
-			cb = retries;
-			retries = 0;
-		}
-
-		if (typeof cb !== 'function') {
-			cb = function () {};
-		}
-
-		if (retries === undefined) {
-			retries = 0;
-		}
-
-		tasks.push(cb => {
-			if (this.mode === 'master') {
-				listenMethod = 'consume';
-				options.exclusive = true; // It is important no other client tries to sneak
-				// out messages from us, and we want "consume"
-				// since we want the queue to persist even if this
-				// minion goes offline.
-			} else if (this.mode === 'slave' || this.mode === 'noSync') {
-				listenMethod = 'subscribe';
-			} else {
-				const err = new Error('Invalid this.mode. Must be either "master", "slave" or "noSync"');
-
-				this.log.error(logPrefix + err.message);
-
-				return cb(err);
-			}
-
-			this.log.info(logPrefix + 'listenMethod: ' + listenMethod);
-
-			cb();
-		});
-
-		tasks.push(cb => {
-			this.ready(cb);
-		});
-
-		tasks.push(cb => {
-			this.intercom[listenMethod](options, (message, ack, deliveryTag) => {
-				ack(); // Ack first, if something goes wrong we log it and handle it manually
-
-				if (typeof message !== 'object') {
-					this.log.error(logPrefix + 'intercom.' + listenMethod + '() - Invalid message received, is not an object! deliveryTag: "' + deliveryTag + '"');
-
-					return;
-				}
-
-				if (typeof this[message.action] === 'function') {
-					this[message.action](message.params, deliveryTag, message.uuid);
-				} else {
-					this.log.warn(logPrefix + 'intercom.' + listenMethod + '() - Unknown message.action received: "' + message.action + '"');
-				}
-			}, cb);
-		});
-
-		async.series(tasks, cb);
+		this.lUtils = new Utils({log: this.log});
 	}
 
-	// This is ran before each incoming message on the queue is handeled
-	ready(retries, cb) {
-		const logPrefix = topLogPrefix + 'ready() - ';
-		const tasks = [];
-
-		if (typeof retries === 'function') {
-			cb = retries;
-			retries = 0;
-		}
-
-		if (typeof cb !== 'function') {
-			cb = function () {};
-		}
-
-		if (retries === undefined) {
-			retries = 0;
-		}
+	async runDbMigrations() {
+		const options = {};
 
-		if (isReady === true) return cb();
+		options.dbType = 'mariadb';
+		options.dbDriver = this.db;
+		options.tableName = 'cms_db_version';
+		options.migrationScriptsPath = __dirname + '/dbmigration';
+		const dbMigration = new DbMigration(options);
 
-		if (readyInProgress === true) {
-			DataWriter.emitter.on('ready', cb);
-
-			return;
-		}
-
-		readyInProgress = true;
-
-		tasks.push(cb => {
-			if (this.mode === 'slave') {
-				this.log.verbose(logPrefix + 'this.mode: "' + this.mode + '", so read');
-
-				amsync.mariadb({
-					exchange: this.exchangeName + '_dataDump',
-					intercom: this.intercom
-				}, cb);
-			} else {
-				cb();
-			}
-		});
-
-		// Migrate database
-		tasks.push(cb => {
-			const options = {};
-
-			let dbMigration;
-
-			options.dbType = 'mariadb';
-			options.dbDriver = this.db;
-			options.tableName = 'cms_db_version';
-			options.migrationScriptsPath = __dirname + '/dbmigration';
-			dbMigration = new DbMigration(options);
-
-			dbMigration.run(err => {
-				if (err) {
-					this.log.error(logPrefix + 'Database error: ' + err.message);
-				}
-
-				cb(err);
-			});
-		});
-
-		async.series(tasks, err => {
-			if (err) return;
-
-			isReady = true;
-			DataWriter.emitter.emit('ready');
-
-			if (this.mode === 'master') {
-				this.runDumpServer(cb);
-			} else {
-				cb();
-			}
-		});
+		await dbMigration.run();
 	}
 
-	runDumpServer(cb) {
-		const options = {
-			exchange: this.exchangeName + '_dataDump',
-			host: this.options.amsync ? this.options.amsync.host : null,
-			minPort: this.options.amsync ? this.options.amsync.minPort : null,
-			maxPort: this.options.amsync ? this.options.amsync.maxPort : null
-		};
-
-		const args = [];
-
-		if (this.db.conf.host) {
-			args.push('-h');
-			args.push(this.db.conf.host);
-		}
-
-		args.push('-u');
-		args.push(this.db.conf.user);
-
-		if (this.db.conf.password) {
-			args.push('-p' + this.db.conf.password);
-		}
-
-		args.push('--single-transaction');
-		args.push('--hex-blob');
-		args.push(this.db.conf.database);
-
-		// Tables
-		args.push('cms_db_version');
-		args.push('cms_pages');
-		args.push('cms_pagesData');
-		args.push('cms_snippets');
-
-		options.dataDumpCmd = {
-			command: 'mysqldump',
-			args: args
-		};
-
-		options['Content-Type'] = 'application/sql';
-		options.intercom = this.intercom;
-
-		new amsync.SyncServer(options, cb);
-	}
-
-	rmPage(params, deliveryTag, msgUuid) {
+	async rmPage(uuid) {
 		const logPrefix = topLogPrefix + 'rmPage() - ';
-		const options = params.data;
-		const uuidBuffer = this.lUtils.uuidToBuffer(options.uuid);
-		const tasks = [];
+		const uuidBuffer = this.lUtils.uuidToBuffer(uuid);
 
-		if (options.uuid === undefined) {
+		if (uuid === undefined) {
 			const err = new Error('pageUuid not provided');
-
 			this.log.warn(logPrefix + err.message);
-
-			return DataWriter.emitter.emit(msgUuid, err);
+			throw err;
 		}
 
 		if (uuidBuffer === false) {
 			const err = new Error('Inavlid pageUuid provided');
-
 			this.log.warn(logPrefix + err.message);
-
-			return DataWriter.emitter.emit(msgUuid, err);
+			throw err;
 		}
 
-		tasks.push(cb => this.ready(cb));
-
-		tasks.push(cb => {
-			this.db.query('DELETE FROM cms_pagesData WHERE pageUuid = ?', [uuidBuffer], cb);
-		});
-
-		tasks.push(cb => {
-			this.db.query('DELETE FROM cms_pages WHERE uuid = ?', [uuidBuffer], cb);
-		});
-
-		async.series(tasks, err => {
-			DataWriter.emitter.emit(msgUuid, err);
-		});
+		await this.db.query('DELETE FROM cms_pagesData WHERE pageUuid = ?', [uuidBuffer]);
+		await this.db.query('DELETE FROM cms_pages WHERE uuid = ?', [uuidBuffer]);
 	}
 
-	rmSnippet(params, deliveryTag, msgUuid) {
+	async rmSnippet(name) {
 		const logPrefix = topLogPrefix + 'rmSnippet() - ';
-		const options = params.data;
-		const tasks = [];
 
-		if (!options.name) {
+		if (!name) {
 			const err = new Error('snippet name not provided');
-
 			this.log.warn(logPrefix + err.message);
-
-			return DataWriter.emitter.emit(msgUuid, err);
+			throw err;
 		}
 
-		tasks.push(cb => this.ready(cb));
-
-		tasks.push(cb => {
-			this.db.query('DELETE FROM cms_snippets WHERE name = ?', [options.name], cb);
-		});
-
-		async.series(tasks, err => {
-			DataWriter.emitter.emit(msgUuid, err);
-		});
+		await this.db.query('DELETE FROM cms_snippets WHERE name = ?', [name]);
 	}
 
-	savePage(params, deliveryTag, msgUuid) {
+	async savePage(options) {
 		const logPrefix = topLogPrefix + 'savePage() - ';
-		const options = params.data;
 		const uuidBuffer = this.lUtils.uuidToBuffer(options.uuid);
-		const tasks = [];
-
-		let lang;
 
 		if (options.uuid === undefined) {
 			const err = new Error('pageUuid not provided');
-
 			this.log.warn(logPrefix + err.message);
-
-			return DataWriter.emitter.emit(msgUuid, err);
+			throw err;
 		}
 
 		if (uuidBuffer === false) {
 			const err = new Error('Inavlid pageUuid provided');
-
 			this.log.warn(logPrefix + err.message);
-
-			return DataWriter.emitter.emit(msgUuid, err);
+			throw err;
 		}
 
-		this.log.debug(logPrefix + 'Running with data. "' + JSON.stringify(params.data) + '"');
+		this.log.debug(logPrefix + 'Running with data. "' + JSON.stringify(options) + '"');
 
-		tasks.push(cb => this.ready(cb));
+		await this.db.query('DELETE FROM cms_pagesData WHERE pageUuid = ?', [uuidBuffer]);
+		await this.db.query('DELETE FROM cms_pages WHERE uuid = ?', [uuidBuffer]);
 
-		tasks.push(cb => {
-			this.db.query('DELETE FROM cms_pagesData WHERE pageUuid = ?', [uuidBuffer], cb);
-		});
+		// Insert page
+		const dbFields = [uuidBuffer, options.name];
 
-		tasks.push(cb => {
-			this.db.query('DELETE FROM cms_pages WHERE uuid = ?', [uuidBuffer], cb);
-		});
+		let sql = 'INSERT INTO cms_pages (uuid,name';
 
-		tasks.push(cb => {
-			const dbFields = [uuidBuffer, options.name];
-
-			let sql = 'INSERT INTO cms_pages (uuid,name';
-
-			if (options.published) {
-				sql += ', published';
-			}
+		if (options.published) {
+			sql += ', published';
+		}
 
-			if (options.template) {
-				sql += ', template';
-			}
+		if (options.template) {
+			sql += ', template';
+		}
 
-			sql += ') VALUES(?,?';
+		sql += ') VALUES(?,?';
 
-			if (options.published) {
-				sql += ',?';
-				dbFields.push(options.published);
-			}
+		if (options.published) {
+			sql += ',?';
+			dbFields.push(options.published);
+		}
 
-			if (options.template) {
-				sql += ',?';
-				dbFields.push(options.template);
-			}
+		if (options.template) {
+			sql += ',?';
+			dbFields.push(options.template);
+		}
 
-			sql += ');';
+		sql += ');';
 
-			this.db.query(sql, dbFields, cb);
-		});
+		await this.db.query(sql, dbFields);
 
 		// We need to declare this outside the loop because of async operations
-		const addEntryData = (lang, htmlTitle, body1, body2, body3, body4, body5, body6, slug) => {
-			tasks.push(cb => {
-				const dbFields = [uuidBuffer, lang, htmlTitle, body1, body2, body3, body4, body5, body6, slug];
-
-
-				const sql = 'INSERT INTO cms_pagesData (pageUuid, lang, htmlTitle, body1, body2, body3, body4, body5, body6, slug) VALUES(?,?,?,?,?,?,?,?,?,?);';
-
-				this.db.query(sql, dbFields, cb);
-			});
+		const addEntryData = async (lang, htmlTitle, body1, body2, body3, body4, body5, body6, slug) => {
+			const dbFields = [uuidBuffer, lang, htmlTitle, body1, body2, body3, body4, body5, body6, slug];
+			const sql = 'INSERT INTO cms_pagesData (pageUuid, lang, htmlTitle, body1, body2, body3, body4, body5, body6, slug) VALUES(?,?,?,?,?,?,?,?,?,?);';
+			await this.db.query(sql, dbFields);
 		};
 
 		// Add content data
 		if (options.langs) {
-			for (lang in options.langs) {
+			for (const lang in options.langs) {
 				if (options.langs[lang].slug) {
 					options.langs[lang].slug = slugify(options.langs[lang].slug, {save: ['_', '-', '/']});
 				}
@@ -377,39 +141,23 @@ class DataWriter {
 				if (!options.langs[lang].body5) options.langs[lang].body5 = '';
 				if (!options.langs[lang].body6) options.langs[lang].body6 = '';
 
-				addEntryData(lang, options.langs[lang].htmlTitle, options.langs[lang].body1, options.langs[lang].body2, options.langs[lang].body3, options.langs[lang].body4, options.langs[lang].body5, options.langs[lang].body6, options.langs[lang].slug);
+				await addEntryData(lang, options.langs[lang].htmlTitle, options.langs[lang].body1, options.langs[lang].body2, options.langs[lang].body3, options.langs[lang].body4, options.langs[lang].body5, options.langs[lang].body6, options.langs[lang].slug);
 			}
 		}
-
-		async.series(tasks, err => {
-			DataWriter.emitter.emit(msgUuid, err);
-		});
 	}
 
-	saveSnippet(params, deliveryTag, msgUuid) {
+	async saveSnippet(options) {
 		const logPrefix = topLogPrefix + 'saveSnippet() - ';
-		const options = params.data;
 		const sql = 'REPLACE INTO cms_snippets (body, name, lang) VALUES(?,?,?);';
 		const dbFields = [options.body, options.name, options.lang];
-		const tasks = [];
 
 		if (options.name === undefined) {
 			const err = new Error('Name not provided');
-
 			this.log.warn(logPrefix + err.message);
-
-			return DataWriter.emitter.emit(msgUuid, err);
+			throw err;
 		}
 
-		tasks.push(cb => this.ready(cb));
-
-		tasks.push(cb => {
-			this.db.query(sql, dbFields, cb);
-		});
-
-		async.series(tasks, err => {
-			DataWriter.emitter.emit(msgUuid, err);
-		});
+		await this.db.query(sql, dbFields);
 	}
 }
 

package/dbmigration/5.js

@@ -1,30 +1,20 @@
 'use strict';
 
 const uuidLib = require('uuid');
-const lUtils = require('larvitutils');
-const async = require('async');
-const db = require('larvitdb');
+const { Utils } = require('larvitutils');
 
-exports = module.exports = function (cb) {
-	const tasks = [];
+exports = module.exports = async context => {
+	const { db } = context;
 
-	db.query('SELECT id FROM cms_pages WHERE uuid IS NULL', function (err, rows) {
-		if (err) return cb(err);
+	const { rows } = await db.query('SELECT id FROM cms_pages WHERE uuid IS NULL');
+	if (rows.length === 0) return;
 
-		if (rows.length === 0) return cb();
+	const lUtils = new Utils();
 
-		for (const r of rows) {
-			const uuid = lUtils.uuidToBuffer(uuidLib.v1());
+	for (const r of rows) {
+		const uuid = lUtils.uuidToBuffer(uuidLib.v1());
 
-			tasks.push(function (cb) {
-				db.query('UPDATE cms_pages SET uuid = ? WHERE id = ?', [uuid, r.id], cb);
-			});
-
-			tasks.push(function (cb) {
-				db.query('UPDATE cms_pagesData SET pageUuid = ? WHERE pageId = ?', [uuid, r.id], cb);
-			});
-		}
-
-		async.series(tasks, cb);
-	});
+		await db.query('UPDATE cms_pages SET uuid = ? WHERE id = ?', [uuid, r.id]);
+		await db.query('UPDATE cms_pagesData SET pageUuid = ? WHERE pageId = ?', [uuid, r.id]);
+	}
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "larvitcms",
-  "version": "2.0.0",
+  "version": "3.0.0",
   "description": "Simple blog module with admin GUI for larvitadmingui",
   "author": {
     "name": "Mikael 'Lilleman' Göransson",
@@ -9,25 +9,17 @@
   },
   "private": false,
   "dependencies": {
-    "async": "^3.0.1",
-    "larvitamintercom": "^0.3.4",
-    "larvitamsync": "^0.7.3",
-    "larvitdb": "^2.1.1",
-    "larvitdbmigration": "^4.0.2",
-    "larvitfs": "^2.3.1",
-    "larvitslugify": "^1.0.0",
-    "larvitutils": "^2.1.0",
-    "lodash": "^4.17.4",
-    "randomstring": "^1.1.5",
-    "uuid": "^3.1.0"
+    "larvitdb": "3.2.0",
+    "larvitdbmigration": "6.1.0",
+    "larvitslugify": "2.0.1",
+    "larvitutils": "5.0.0",
+    "lodash": "4.17.21",
+    "uuid": "8.3.2"
   },
   "devDependencies": {
-    "larvitruncmd": "github:larvit/larvitruncmd",
-    "mocha": "6.1.4",
-    "mocha-eslint": "5.0.0",
-    "request": "2.88.0",
-    "validator": "11.0.0",
-    "wait-for-port": "0.0.2"
+    "eslint": "8.10.0",
+    "mocha": "9.2.1",
+    "nyc": "15.1.0"
   },
   "keywords": [
     "cms"
@@ -43,7 +35,10 @@
   },
   "homepage": "https://github.com/larvit/larvitcms",
   "scripts": {
-    "test": "mocha"
+    "lint": "eslint *.js test/*.js dbmigration/*.js",
+    "test:unit": "mocha --exit --bail './test/*.js'",
+    "coverage": "nyc --reporter lcov npm run test:unit",
+    "test": "npm run lint && npm run coverage"
   },
   "license": "MIT",
   "maintainers": [