alchemymvc 1.2.8 → 1.3.1

package/lib/core/middleware.js

@@ -7,7 +7,7 @@ var publicDirs = alchemy.shared('public.directories', new Deck()),
     imageDirs  = alchemy.shared('images.directories', new Deck()),
     rootDirs   = alchemy.shared('root.directories', new Deck()),
     fontDirs   = alchemy.shared('font.directories', new Deck()),
-    assetMap   = alchemy.shared('files.assetMap'),
+    asset_cache= alchemy.getCache('files.assets'),
     fileCache  = alchemy.shared('files.fileCache'),
     minifyMap  = alchemy.shared('files.minifyMap'),
     Nodent     = alchemy.use('nodent-compiler'),
@@ -128,7 +128,7 @@ function getMiddlePaths(paths, ext, new_ext) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.2.7
+ * @version  1.3.0
  */
 Alchemy.setMethod(function styleMiddleware(req, res, nextMiddleware) {
 
@@ -145,10 +145,10 @@ Alchemy.setMethod(function styleMiddleware(req, res, nextMiddleware) {
 	path = url.path;
 
 	// If this file has already been found & compiled, serve it to the user
-	if (assetMap[path]) {
-		return req.conduit.serveFile(assetMap[path].path, {onError: function onError() {
+	if (asset_cache.has(path)) {
+		return req.conduit.serveFile(asset_cache.get(path).path, {onError: function onError() {
 			// Unset asset
-			assetMap[path] = null;
+			asset_cache.remove(path);
 			alchemy.styleMiddleware(req, res, nextMiddleware);
 		}});
 	}
@@ -246,17 +246,20 @@ Alchemy.setMethod(function styleMiddleware(req, res, nextMiddleware) {
 			return nextMiddleware();
 		}
 
-		return req.conduit.serveFile(compiled.path, {onError: function onError(err) {
-			if (fileCache[compiled.path]) {
-				fileCache[compiled.path] = null;
+		return req.conduit.serveFile(compiled.path, {
+			mimetype: 'text/css',
+			onError: function onError(err) {
+				if (fileCache[compiled.path]) {
+					fileCache[compiled.path] = null;
 
-				if (o_stats && fileCache[o_stats.path]) {
-					fileCache[o_stats.path] = null;
-				}
+					if (o_stats && fileCache[o_stats.path]) {
+						fileCache[o_stats.path] = null;
+					}
 
-				alchemy.styleMiddleware(req, res, nextMiddleware);
+					alchemy.styleMiddleware(req, res, nextMiddleware);
+				}
 			}
-		}});
+		});
 	});
 });
 
@@ -266,7 +269,7 @@ Alchemy.setMethod(function styleMiddleware(req, res, nextMiddleware) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.1.0
- * @version  1.1.0
+ * @version  1.3.0
  */
 Alchemy.setMethod(function sourcemapMiddleware(req, res, nextMiddleware) {
 
@@ -297,7 +300,9 @@ Alchemy.setMethod(function sourcemapMiddleware(req, res, nextMiddleware) {
 			return nextMiddleware();
 		}
 
-		req.conduit.serveFile(stats.path);
+		req.conduit.serveFile(stats.path, {
+			mimetype: 'application/json',
+		});
 	});
 });
 
@@ -503,7 +508,7 @@ Alchemy.setMethod(function minifyScript(path, options, callback) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.0.4
+ * @version  1.3.0
  */
 Alchemy.setMethod(function scriptMiddleware(req, res, nextMiddleware) {
 
@@ -517,15 +522,15 @@ Alchemy.setMethod(function scriptMiddleware(req, res, nextMiddleware) {
 			return next();
 		}
 
-		if (assetMap[req.url]) {
-			source = assetMap[req.url];
+		if (asset_cache.has(req.url)) {
+			source = asset_cache.get(req.url);
 			return next();
 		}
 
 		alchemy.findAssetPath(req.middlePath, scriptDirs.getSorted(), function gotAssetPath(err, stats) {
 
 			// @todo: error stuff, 404
-			assetMap[req.url] = stats;
+			asset_cache.set(req.url, stats);
 			source = stats;
 
 			next();
@@ -566,22 +571,25 @@ Alchemy.setMethod(function scriptMiddleware(req, res, nextMiddleware) {
 			return nextMiddleware();
 		}
 
-		req.conduit.serveFile(source.path, {onError: function onError() {
-			// Unset asset
-			if (fileCache[req.url]) {
-				fileCache[req.url] = null;
-			}
+		req.conduit.serveFile(source.path, {
+			mimetype: 'text/javascript',
+			onError: function onError() {
+				// Unset asset
+				if (fileCache[req.url]) {
+					fileCache[req.url] = null;
+				}
 
-			if (assetMap[req.url]) {
-				assetMap[req.url] = null;
-			}
+				if (asset_cache.has(req.url)) {
+					asset_cache.remove(req.url);
+				}
 
-			if (source && minifyMap[source.path]) {
-				minifyMap[source.path] = null;
-			}
+				if (source && minifyMap[source.path]) {
+					minifyMap[source.path] = null;
+				}
 
-			alchemy.scriptMiddleware(req, res, nextMiddleware);
-		}});
+				alchemy.scriptMiddleware(req, res, nextMiddleware);
+			}
+		});
 	});
 });
 
@@ -622,15 +630,15 @@ Alchemy.setMethod(function assetInDirsMiddleware(req, res, directories, nextMidd
 
 	Function.series(function getPath(next) {
 
-		if (assetMap[req.url]) {
-			source = assetMap[req.url];
+		if (asset_cache.has(req.url)) {
+			source = asset_cache.get(req.url);
 			return next();
 		}
 
 		alchemy.findAssetPath(req.middlePath, directories, function gotAssetPath(err, stats) {
 
 			// @todo: error stuff, 404
-			assetMap[req.url] = stats;
+			asset_cache.set(req.url, stats);
 			source = stats;
 
 			next();
@@ -654,7 +662,7 @@ Alchemy.setMethod(function assetInDirsMiddleware(req, res, directories, nextMidd
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.1.0
+ * @version  1.3.0
  */
 Alchemy.setMethod(function rootMiddleware(req, res, nextMiddleware) {
 
@@ -663,8 +671,8 @@ Alchemy.setMethod(function rootMiddleware(req, res, nextMiddleware) {
 
 	Function.series(function getPath(next) {
 
-		if (assetMap[req.url]) {
-			source = assetMap[req.url];
+		if (asset_cache.has(req.url)) {
+			source = asset_cache.get(req.url);
 			cached = true;
 			return next();
 		}
@@ -672,7 +680,10 @@ Alchemy.setMethod(function rootMiddleware(req, res, nextMiddleware) {
 		alchemy.findAssetPath(req.middlePath, rootDirs.getSorted(), function gotAssetPath(err, stats) {
 
 			// @todo: error stuff, 404
-			assetMap[req.url] = stats;
+			if (stats?.path) {
+				asset_cache.set(req.url, stats);
+			}
+
 			source = stats;
 
 			next();
@@ -689,7 +700,7 @@ Alchemy.setMethod(function rootMiddleware(req, res, nextMiddleware) {
 			onError: function onError() {
 
 			if (cached) {
-				assetMap[req.url] = null;
+				asset_cache.remove(req.url);
 				alchemy.rootMiddleware(req, res, nextMiddleware);
 				return;
 			}
@@ -704,7 +715,7 @@ Alchemy.setMethod(function rootMiddleware(req, res, nextMiddleware) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.1.4
+ * @version  1.3.0
  *
  * @param    {String}     image_path
  * @param    {Function}   callback
@@ -723,8 +734,8 @@ Alchemy.setMethod(function findImagePath(image_path, callback) {
 
 		let id = 'image-' + image_path;
 
-		if (alchemy.settings.cache && assetMap[id]) {
-			pledge.resolve(assetMap[id].path);
+		if (alchemy.settings.cache && asset_cache.has(id)) {
+			pledge.resolve(asset_cache.get(id).path);
 		} else {
 
 			alchemy.findAssetPath(image_path, imageDirs.getSorted(), function gotImagePath(err, stats) {
@@ -732,7 +743,7 @@ Alchemy.setMethod(function findImagePath(image_path, callback) {
 				if (err) {
 					pledge.reject(err);
 				} else {
-					assetMap[id] = stats;
+					asset_cache.set(id, stats);
 					pledge.resolve(stats.path);
 				}
 			});
@@ -869,7 +880,7 @@ Alchemy.setMethod(function findAssetPath(assetFile, directories, callback) {
 	}, function lastly() {
 
 		// Return an empty object when nothing was found,
-		// so we'll cache that in the assetMap
+		// so we'll cache that in the asset_cache
 		// Otherwise it'll keep checking for every request
 		if (found == null) {
 			found = {};

package/lib/init/alchemy.js

@@ -9,7 +9,8 @@ var shared_objects = {},
     parseArgs      = require('minimist'),
     libpath        = require('path'),
     colors         = require('ansi-256-colors'),
-    fs             = require('fs');
+    fs             = require('fs'),
+    os             = require('os');
 
 /**
  * The Alchemy class
@@ -60,6 +61,9 @@ global.Alchemy = Function.inherits('Informer', 'Alchemy', function Alchemy() {
 	// Link to failed modules
 	this.modules_error = useErrors;
 
+	// How many CPUs are available?
+	this.cpu_core_count = os.cpus().length;
+
 	// Try getting the app package.json file
 	try {
 		package_json = require(libpath.resolve(PATH_ROOT, 'package.json'));
@@ -92,6 +96,9 @@ global.Alchemy = Function.inherits('Informer', 'Alchemy', function Alchemy() {
 	// Also store the version of the app
 	process.versions.alchemy_app = this.package.version;
 
+	// Distinct problems
+	this.distinct_problems = new Map();
+
 	// Load the settings
 	this.loadSettings();
 
@@ -211,12 +218,107 @@ Alchemy.setProperty(function environment() {
 	return alchemy.settings.environment;
 });
 
+/**
+ * Get the current lag in ms
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.1
+ * @version  1.3.1
+ *
+ * @return   {Number}
+ */
+Alchemy.setMethod(function lagInMs() {
+	return this.toobusy.lag();
+});
+
+/**
+ * Get the system load as percentage points
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.1
+ * @version  1.3.1
+ *
+ * @return   {Number}
+ */
+Alchemy.setMethod(function systemLoad() {
+
+	let load_average = os.loadavg();
+
+	const percentage = ~~((load_average[0] / this.cpu_core_count) * 100);
+
+	return percentage;
+});
+
+/**
+ * Is the server currently too busy, overloaded in some way?
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.1
+ * @version  1.3.1
+ *
+ * @return   {Boolean}
+ */
+Alchemy.setMethod(function isTooBusy() {
+
+	// First check if it's too busy because of lag
+	if (this.toobusy()) {
+		return true;
+	}
+
+	// Then check the load average
+	return this.systemLoad() > 90;
+});
+
+/**
+ * Is the server too busy for requests?
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.1
+ * @version  1.3.1
+ *
+ * @return   {Boolean}
+ */
+Alchemy.setMethod(function isTooBusyForRequests() {
+
+	// If a queue already exists, the server's lag might be quite good
+	// BECAUSE requests are being queued.
+	if (Classes.Alchemy.Conduit.Postponement.queue_length > 5) {
+		return true;
+	}
+
+	return this.isTooBusy();
+});
+
+/**
+ * Is the server too busy for AJAX too?
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.1
+ * @version  1.3.1
+ *
+ * @return   {Boolean}
+ */
+Alchemy.setMethod(function isTooBusyForAjax() {
+
+	if (!this.isTooBusyForRequests()) {
+		return false;
+	}
+
+	let lag = this.lagInMs();
+
+	if (lag > (alchemy.settings.toobusy * 3)) {
+		return true;
+	}
+
+	return false;
+});
+
 /**
  * Start janeway
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.5.0
- * @version  1.2.7
+ * @version  1.3.1
  *
  * @param    {Object}   options
  */
@@ -298,6 +400,17 @@ Alchemy.setMethod(function startJaneway(options) {
 		this.Janeway.session_menu = session_menu;
 	}
 
+	if (this.settings.lag_menu) {
+		let lag_menu = this.Janeway.addIndicator('0 ms');
+
+		setInterval(() => {
+			lag_menu.setIcon(this.lagInMs() + ' ms');
+			this.Janeway.redraw();
+		}, 900).unref();
+
+		this.Janeway.lag_menu = lag_menu;
+	}
+
 });
 
 /**
@@ -1113,7 +1226,7 @@ Alchemy.setMethod(function isStream(obj) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.0.0
- * @version  1.0.4
+ * @version  1.3.0
  *
  * @param    {String}          name
  * @param    {Number|Object}   options
@@ -1144,12 +1257,11 @@ Alchemy.setMethod(function getCache(name, options) {
 	}
 
 	config = Object.assign({
+		name,
 		max_length : 5000,
 	}, options);
 
-	// @TODO: Fixed in 0.6.1
-	instance = new Blast.Classes.Develry.Cache();
-	Object.assign(instance, config);
+	instance = new Blast.Classes.Develry.Cache(config);
 
 	this.caches[name] = instance;
 
@@ -1161,16 +1273,17 @@ Alchemy.setMethod(function getCache(name, options) {
  *
  * @author    Jelle De Loecker   <jelle@elevenways.be>
  * @since     1.1.3
- * @version   1.1.3
+ * @version   1.3.0
  *
  * @param     {String}   href         The href or route name
  * @param     {Object}   parameters   Route parameters
+ * @param     {Object}   options
  *
  * @return    {String}
  */
-Alchemy.setMethod(function routeUrl(href, parameters) {
+Alchemy.setMethod(function routeUrl(href, parameters, options) {
 
-	let temp = Router.getUrl(href, parameters);
+	let temp = Router.getUrl(href, parameters, options);
 
 	if (temp && temp.href) {
 		temp = String(temp);
@@ -1382,7 +1495,7 @@ Alchemy.setMethod(function addAppcacheEntry(entry) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.1.0
- * @version  1.2.7
+ * @version  1.3.0
  *
  * @param    {IncomingMessage}   req
  * @param    {OutgoingMessage}   res       Optional
@@ -1410,7 +1523,7 @@ Alchemy.setMethod(function parseRequestBody(req, res, callback) {
 
 		let form = new formidable.IncomingForm({
 			multiples     : true,
-			hashAlgorithm : 'md5',
+			hashAlgorithm : alchemy.settings.file_hash_algorithm || 'sha1',
 		});
 
 		form.parse(req, function parsedMultipart(err, form_fields, form_files) {

package/lib/init/constants.js

@@ -48,6 +48,17 @@ DEFINE('Blast', __Protoblast);
  */
 DEFINE('Classes', Blast.Classes);
 
+/**
+ * Available types
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.0
+ * @version  1.3.0
+ *
+ * @type     {Object}
+ */
+DEFINE('Types', Blast.Types);
+
 /**
  * Path to the directory of the server.js file
  *