alchemymvc 1.3.1 → 1.3.3-alpha

package/lib/app/helper_model/criteria.js

@@ -1503,7 +1503,7 @@ Select.setMethod(function addAssociation(name) {
 			this.requireFieldForQuery(info.options.localKey);
 		}
 	} catch (err) {
-		console.warn('Failed to find "' + name + '" association for ' + this.criteria.model.modelName);
+		console.warn('Failed to find "' + name + '" association for ' + this.criteria.model.model_name);
 	}
 
 	return this.associations[name];

package/lib/app/helper_validator/00_validator.js

@@ -218,6 +218,10 @@ Validator.setMethod(async function validateDocument(root, context, schema) {
 
 		fields_with_value = field.getDocumentValues(root);
 
+		if (!fields_with_value?.length) {
+			continue;
+		}
+
 		violation = await this.validateFieldValue(fields_with_value);
 
 		if (violation) {

package/lib/class/document.js

@@ -645,31 +645,26 @@ Document.setMethod(['populate', 'addAssociatedData'], function addAssociatedData
 /**
  * Get the display field value
  *
- * @author   Jelle De Loecker <jelle@develry.be>
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.3.0
- * @version  1.3.0
+ * @version  1.3.3
  *
  * @param    {Object}   options
  *
- * @return   {String}
+ * @return   {String|undefined}
  */
-Document.setMethod(function getDisplayFieldValue(options) {
-
-	var display_field,
-	    result,
-	    i;
-
-	if (!options) {
-		options = {};
-	}
+Document.setMethod(function getDisplayFieldValue(options = {}) {
 
-	display_field = Array.cast(this.$model.display_field);
+	let display_field = Array.cast(this.$model.display_field);
 
 	// If there are fields we prefer, check those first
 	if (options.prefer) {
 		display_field = Array.cast(options.prefer).concat(display_field);
 	}
 
+	let result,
+	    i;
+
 	for (i = 0; i < display_field.length; i++) {
 		result = this[display_field[i]];
 
@@ -682,8 +677,14 @@ Document.setMethod(function getDisplayFieldValue(options) {
 		}
 	}
 
+	let fallback_property = options.fallback ?? '_id';
+
+	if (!fallback_property) {
+		return;
+	}
+
 	// If nothing was found, return the _id value
-	return String(this._id);
+	return String(this[fallback_property]);
 });
 
 /**

package/lib/class/postponement.js

@@ -7,7 +7,7 @@ let queue_check_id,
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.3.1
- * @version  1.3.1
+ * @version  1.3.2
  *
  * @param    {Conduit}   conduit   The original conduit
  */
@@ -43,6 +43,9 @@ const Postponement = Function.inherits('Alchemy.Base', 'Alchemy.Conduit', functi
 	// When did this postponement end?
 	this.ended = null;
 
+	// Has this postponement expired?
+	this.expired = false;
+
 	// Has this postponement been released yet?
 	this.released = false;
 
@@ -127,13 +130,15 @@ Postponement.setProperty(function time_unchecked() {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.3.1
- * @version  1.3.1
+ * @version  1.3.2
  *
  * @return   {Number}
  */
 Postponement.setProperty(function has_been_abandoned() {
 
-	if (this.time_unchecked > 30 * 1000) {
+	// Postponements that haven't been checked in 3 minutes
+	// are considered abandoned
+	if (this.time_unchecked > 180_000) {
 		return true;
 	}
 
@@ -236,7 +241,7 @@ Postponement.setStatic(function checkQueue() {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.3.1
- * @version  1.3.1
+ * @version  1.3.2
  *
  * @param    {Conduit}   conduit   The new conduit
  */
@@ -253,7 +258,19 @@ Postponement.setMethod(function handleRequest(conduit) {
 				location : null,
 			};
 
-			if (this.attemptUnlock()) {
+			if (this.released) {
+				data.allowed = true;
+				data.location = this.url;
+			} else if (this.expired) {
+				// If the request has expired, send them to the original url again
+				data.allowed = true;
+				data.location = this.original_path;
+			} else if (this.attemptUnlock()) {
+				data.allowed = true;
+				data.location = this.url;
+			}  else if (data.position == null) {
+				// Something else has gone wrong?
+				// Send them to the url anyway
 				data.allowed = true;
 				data.location = this.url;
 			}
@@ -276,7 +293,7 @@ Postponement.setMethod(function handleRequest(conduit) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.3.1
- * @version  1.3.1
+ * @version  1.3.2
  *
  * @return   {Boolean}   True if the request is being resumed
  */
@@ -286,6 +303,8 @@ Postponement.setMethod(function attemptUnlock() {
 		return true;
 	}
 
+	this.last_check = Date.now();
+
 	Postponement.scheduleQueueCheck();
 
 	if (this.position_in_queue > 5) {
@@ -431,6 +450,7 @@ Postponement.setMethod(function remove(expired) {
  */
 Postponement.setMethod(function expire() {
 	this.remove(true);
+	this.expired = true;
 });
 
 /**

package/lib/class/sitemap.js

@@ -281,7 +281,12 @@ Sitemap.setTypedMethod([Types.Alchemy.Route, Types.Object, Types.Alchemy.Criteri
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.3.0
- * @version  1.3.0
+ * @version  1.3.3
+ *
+ * @param    {Route}   route           The route of which to add something to the map
+ * @param    {Object}  config          Sitemap configuration for this route
+ * @param    {Object}  parameters      The parameter object to use for generating the url
+ * @param    {String}  forced_prefix   The optional prefix to use
  *
  * @return   {Promise}
  */
@@ -290,6 +295,7 @@ Sitemap.setMethod(function addRouteWithParameters(route, config, parameters, for
 	if (!parameters) {
 		parameters = {};
 	} else {
+		// Make an overlay object
 		parameters = Object.create(parameters);
 	}
 
@@ -319,7 +325,7 @@ Sitemap.setMethod(function addRouteWithParameters(route, config, parameters, for
 		let route_config = Object.assign({}, config);
 
 		if (parameters && parameters.getDisplayFieldValue) {
-			route_config.title = parameters.getDisplayFieldValue({prefix});
+			route_config.title = parameters.getDisplayFieldValue({prefix, fallback: false});
 		}
 
 		if (!route_config.title) {
@@ -333,7 +339,9 @@ Sitemap.setMethod(function addRouteWithParameters(route, config, parameters, for
 		}
 
 		if (!route_config.title) {
-			route_config.title = route.name;
+			// Skip this if no title was found.
+			// It's better to show nothing
+			continue;
 		}
 
 		this.addUrl(config.category, url, route_config, prefix);

package/lib/core/client_base.js

@@ -294,7 +294,7 @@ ClientBase.setMethod(function getModel(name, init, options) {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.1
- * @version  1.3.0
+ * @version  1.3.2
  *
  * @param    {String}   name   The name of the event to emit
  * @param    {Array}    args   The parameters to pass to the event
@@ -330,7 +330,12 @@ ClientBase.setMethod(function issueEvent(name, args, next) {
 
 		if (err) {
 			pledge.reject(err);
-			return next(err);
+
+			if (next) {
+				next(err);
+			}
+
+			return;
 		}
 
 		if (result !== false) {

package/lib/core/middleware.js

@@ -311,7 +311,7 @@ Alchemy.setMethod(function sourcemapMiddleware(req, res, nextMiddleware) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.2.7
+ * @version  1.3.3
  *
  * @param    {String}   path
  * @param    {Object}   options
@@ -434,7 +434,7 @@ Alchemy.setMethod(function minifyScript(path, options, callback) {
 				}
 			};
 
-			if (alchemy.settings.debug && alchemy.settings.source_map !== false) {
+			if (alchemy.settings.debug && alchemy.settings.source_map) {
 				minify_options.sourceMap = {
 					url: 'inline'
 				};

package/lib/init/alchemy.js

@@ -90,6 +90,9 @@ global.Alchemy = Function.inherits('Informer', 'Alchemy', function Alchemy() {
 	// All caches
 	this.caches = {};
 
+	// Extra toobusy checks
+	this.extra_toobusy_checks = [];
+
 	// Also store the version in the process versions object
 	process.versions.alchemy = this.version;
 
@@ -249,24 +252,55 @@ Alchemy.setMethod(function systemLoad() {
 	return percentage;
 });
 
+/**
+ * Register an extra toobusy check method.
+ * These will be checked after event loop lag & system load are deemed OK.
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.2
+ * @version  1.3.2
+ */
+Alchemy.setMethod(function addToobusyCheck(fnc) {
+	this.extra_toobusy_checks.push(fnc);
+});
+
 /**
  * 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
+ * @version  1.3.2
  *
  * @return   {Boolean}
  */
 Alchemy.setMethod(function isTooBusy() {
 
-	// First check if it's too busy because of lag
+	// First check if it's too busy because of event loop lag
 	if (this.toobusy()) {
 		return true;
 	}
 
-	// Then check the load average
-	return this.systemLoad() > 90;
+	if (this.settings.max_system_load > 0) {
+		// Then check the load average
+		if (this.systemLoad() > this.settings.max_system_load) {
+			return true;
+		}
+	}
+
+	if (this.extra_toobusy_checks.length > 0) {
+
+		for (let fnc of this.extra_toobusy_checks) {
+			try {
+				if (fnc()) {
+					return true;
+				}
+			} catch (err) {
+				alchemy.distinctProblem('error-extra-toobusy-check', 'Extra toobusy check failed', {error: err});
+			}
+		}
+	}
+
+	return false;
 });
 
 /**
@@ -294,7 +328,7 @@ Alchemy.setMethod(function isTooBusyForRequests() {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.3.1
- * @version  1.3.1
+ * @version  1.3.2
  *
  * @return   {Boolean}
  */
@@ -306,8 +340,12 @@ Alchemy.setMethod(function isTooBusyForAjax() {
 
 	let lag = this.lagInMs();
 
-	if (lag > (alchemy.settings.toobusy * 3)) {
-		return true;
+	let max_event_loop_lag = alchemy.settings.max_event_loop_lag || alchemy.settings.toobusy;
+
+	if (max_event_loop_lag) {
+		if (lag > (max_event_loop_lag * 3)) {
+			return true;
+		}
 	}
 
 	return false;
@@ -478,7 +516,7 @@ Alchemy.setMethod(function printLog(level, args, options) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.4.0
- * @version  1.1.6
+ * @version  1.3.3
  */
 Alchemy.setMethod(function loadSettings() {
 
@@ -651,6 +689,21 @@ Alchemy.setMethod(function loadSettings() {
 		}
 	}
 
+	if (settings.debug) {
+
+		if (settings.source_map === 'false') {
+			settings.source_map = false;
+		}
+
+		if (settings.source_map == null || settings.source_map) {
+			settings.source_map = true;
+		} else {
+			settings.source_map = false;
+		}
+	} else {
+		settings.source_map = false;
+	}
+
 	if (settings.preload) {
 		this.doPreload();
 	}
@@ -706,7 +759,7 @@ Alchemy.setMethod(function ready(callback) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.1.2
- * @version  1.1.2
+ * @version  1.3.3
  */
 Alchemy.setMethod(async function doPreload() {
 
@@ -733,7 +786,7 @@ Alchemy.setMethod(async function doPreload() {
 
 		Blast.getClientPath({
 			modify_prototypes : true,
-			create_source_map : alchemy.settings.debug,
+			create_source_map : alchemy.settings.source_map,
 			enable_coverage   : !!global.__coverage__
 		});
 	}

package/lib/init/requirements.js

@@ -57,9 +57,11 @@ alchemy.hawkejs = Classes.Hawkejs.Hawkejs.getInstance();
  */
 alchemy.toobusy = alchemy.use('toobusy-js', 'toobusy');
 
+let max_event_loop_lag = alchemy.settings.max_event_loop_lag || alchemy.settings.toobusy;
+
 // If the config is a number, use that as the lag threshold
-if (typeof alchemy.settings.toobusy === 'number') {
-	alchemy.toobusy.maxLag(alchemy.settings.toobusy);
+if (typeof max_event_loop_lag === 'number') {
+	alchemy.toobusy.maxLag(max_event_loop_lag);
 }
 
 /**

package/lib/stages.js

@@ -183,9 +183,9 @@ alchemy.sputnik.add(function define_debug() {
  * The "hawkejsSetup" stage:
  * Initialize Hawkejs
  *
- * @author        Jelle De Loecker   <jelle@develry.be>
+ * @author        Jelle De Loecker   <jelle@elevenways.be>
  * @since         0.0.1
- * @version       1.1.0
+ * @version       1.3.3
  */
 alchemy.sputnik.add(function hawkejs_setup() {
 
@@ -201,7 +201,7 @@ alchemy.sputnik.add(function hawkejs_setup() {
 		Blast.getClientPath({
 			modify_prototypes : true,
 			ua                : req.conduit.headers.useragent,
-			create_source_map : alchemy.settings.debug,
+			create_source_map : alchemy.settings.source_map,
 			enable_coverage   : !!global.__coverage__
 		}).done(gotClientFile);
 
@@ -243,7 +243,7 @@ alchemy.sputnik.add(function hawkejs_setup() {
 				refresh           : true,
 				modify_prototypes : true,
 				ua                : req.conduit.headers.useragent,
-				create_source_map : alchemy.settings.debug,
+				create_source_map : alchemy.settings.source_map,
 			}).done(gotClientFile);
 		}
 	});

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "alchemymvc",
 	"description": "MVC framework for Node.js",
-	"version": "1.3.1",
+	"version": "1.3.3-alpha",
 	"author": "Jelle De Loecker <jelle@elevenways.be>",
 	"keywords": [
 		"alchemy",
@@ -22,7 +22,7 @@
 		"chokidar"         : "~3.5.3",
 		"formidable"       : "~2.0.1",
 		"graceful-fs"      : "~4.2.9",
-		"hawkejs"          : "~2.3.1",
+		"hawkejs"          : "~2.3.3",
 		"jsondiffpatch"    : "~0.4.1",
 		"mime"             : "~3.0.0",
 		"minimist"         : "~1.2.5",
@@ -31,7 +31,7 @@
 		"mongodb"          : "~3.6.6",
 		"ncp"              : "~2.0.0",
 		"postcss"          : "~8.4.6",
-		"protoblast"       : "~0.8.0",
+		"protoblast"       : "~0.8.3",
 		"semver"           : "~7.3.5",
 		"socket.io"        : "~2.4.0",
 		"@11ways/socket.io-stream" : "~0.9.2",