alchemymvc 1.4.0 → 1.4.2

package/lib/class/model.js

@@ -390,7 +390,7 @@ Model.setStatic(async function checkPathValue(value, name, field_name, conduit)
 	if (result) {
 		let found_value = result[field_name];
 
-		if (found_value != value && !Object.alike(value, found_value)) {
+		if (conduit && found_value != value && !Object.alike(value, found_value)) {
 			conduit.rewriteRequestRouteParam(name, found_value);
 		}
 	}
@@ -534,7 +534,7 @@ Model.setStatic(function getField(name) {
 	if (name.indexOf('.') > -1) {
 		split = name.split('.');
 
-		alias = name[0];
+		alias = split[0];
 
 		if (this.schema.associations[alias] == null) {
 			model = this;
@@ -1590,7 +1590,7 @@ Model.setMethod(function exportToStream(output, options) {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.5
- * @version  1.0.5
+ * @version  1.4.1
  *
  * @param    {Stream}   input
  * @param    {Object}   options
@@ -1612,150 +1612,20 @@ Model.setMethod(function importFromStream(input, options) {
 		return Pledge.reject(new Error('No source input stream has been given'));
 	}
 
-	let that = this,
-	    current_type = null,
-	    extra_stream,
-	    pledge = new Pledge(),
-	    stopped,
-	    paused,
-	    buffer,
-	    value,
-	    seen = 0,
-	    left,
-	    size,
-	    doc;
-
-	input.on('data', function onData(data) {
-
-		if (stopped) {
-			return;
-		}
+	let that = this;
+	let parser = new Classes.Alchemy.ImportStreamParser(input, options);
 
-		if (buffer) {
-			buffer = Buffer.concat([buffer, data]);
-		} else {
-			buffer = data;
+	// Model resolver for single-model import:
+	// Validates that the model name matches, returns this model instance
+	parser.setModelResolver(function resolveModel(model_name, current_model) {
+		if (model_name == that.model_name) {
+			return that;
 		}
 
-		handleBuffer();
+		throw new Error('Model names do not match: expected "' + that.model_name + '", got "' + model_name + '"');
 	});
 
-	function handleBuffer() {
-
-		if (paused) {
-			return;
-		}
-
-		if (!current_type && buffer.length < 2) {
-			return;
-		}
-
-		if (!current_type) {
-			current_type = buffer.readUInt8(0);
-
-			if (current_type == 0x01) {
-				size = buffer.readUInt8(1);
-				buffer = buffer.slice(2);
-			} else if (current_type == 0x02 && buffer.length >= 5) {
-				size = buffer.readUInt32BE(1);
-				buffer = buffer.slice(5);
-			} else if (current_type == 0xFF) {
-				size = buffer.readUInt32BE(1);
-				buffer = buffer.slice(5);
-				seen = 0;
-
-				if (!doc) {
-					stopped = true;
-					pledge.reject(new Error('Found extra import data, but no active document'));
-				} else {
-					extra_stream = new require('stream').PassThrough();
-					doc.extraImportFromStream(extra_stream);
-				}
-			} else {
-				// Not enough data? Wait
-				current_type = null;
-				return;
-			}
-		}
-
-		handleRest();
-	}
-
-	function handleRest() {
-
-		if (current_type == 0xFF) {
-			left = size - seen;
-			value = buffer.slice(0, left);
-
-			seen += value.length;
-
-			if (value.length == buffer.length) {
-				buffer = null;
-			} else if (value.length < buffer.length) {
-				buffer = buffer.slice(left);
-			}
-
-			extra_stream.write(value);
-
-			if (value.length == left) {
-				extra_stream.end();
-				current_type = null;
-
-				if (buffer) {
-					handleBuffer();
-				}
-			}
-
-			return;
-		}
-
-		if (buffer.length >= size) {
-			value = buffer.slice(0, size);
-			buffer = buffer.slice(size);
-		} else {
-			// Wait for next call
-			return;
-		}
-
-		if (current_type == 0x01) {
-			value = value.toString();
-
-			if (value == that.model_name) {
-				// Found name!
-				current_type = null;
-				size = 0;
-			} else {
-				stopped = true;
-				return pledge.reject(new Error('Model names do not match'));
-			}
-		} else if (current_type == 0x02) {
-			doc = that.createDocument();
-			input.pause();
-			paused = true;
-
-			doc.importFromBuffer(value).done(function done(err, result) {
-
-				if (err) {
-					stopped = true;
-					return pledge.reject(err);
-				}
-
-				current_type = null;
-				paused = false;
-				input.resume();
-
-				handleBuffer();
-			});
-
-			return;
-		}
-
-		if (buffer && buffer.length) {
-			handleBuffer();
-		}
-	}
-
-	return pledge;
+	return parser.parse();
 });
 
 /**

package/lib/class/plugin.js

@@ -41,7 +41,7 @@ const Plugin = Function.inherits('Alchemy.Base', function Plugin(name, path, def
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.4.0
- * @version  1.4.0
+ * @version  1.4.1
  *
  * @return   {boolean}
  */
@@ -52,16 +52,45 @@ Plugin.setMethod(function doPreload() {
 	}
 
 	// Create settings from the `config/settings.js` file
-	this.loadSettingDefinitions();
+	// This can fail if the config is invalid
+	try {
+		this.loadSettingDefinitions();
+	} catch (err) {
+		this._handleLoadError('settings', err);
+		return false;
+	}
 
 	// Load the bootstrap file
-	this.loadBootstrap();
+	// This can fail due to syntax errors or runtime errors
+	try {
+		this.loadBootstrap();
+	} catch (err) {
+		this._handleLoadError('bootstrap', err);
+		return false;
+	}
+
+	this[FLAGS].preloaded = true;
 
 	PLUGINS_STAGE.addPostTask(() => {
 		return this.startPlugin();
 	});
 });
 
+/**
+ * Handle a plugin loading error
+ * Plugin errors are fatal - the server cannot start with a broken plugin
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.4.1
+ * @version  1.4.1
+ *
+ * @param    {string}   phase   Which phase failed (settings, bootstrap, start)
+ * @param    {Error}    err     The error that occurred
+ */
+Plugin.setMethod(function _handleLoadError(phase, err) {
+	alchemy.handlePluginError(this.name, phase, err);
+});
+
 /**
  * Do the rest of the plugin loading
  *

package/lib/class/postponement.js

@@ -466,7 +466,7 @@ Postponement.setMethod(function putInQueue() {
 		return;
 	}
 
-	let new_length = QUEUE.push(this) - 1;
+	let new_length = QUEUE.push(this);
 
 	this.last_queue_position = new_length - 1;
 

package/lib/class/router.js

@@ -200,7 +200,7 @@ RouterClass.setMethod(function headerBypass(prefix) {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.3.0
- * @version  0.3.0
+ * @version  1.4.1
  */
 RouterClass.setMethod(function getFullMount() {
 
@@ -215,6 +215,11 @@ RouterClass.setMethod(function getFullMount() {
 		}
 	}
 
+	// Remove trailing slash (but keep single "/" for root)
+	if (result.length > 1 && result[result.length - 1] == '/') {
+		result = result.slice(0, -1);
+	}
+
 	return result;
 });
 
@@ -228,7 +233,8 @@ RouterClass.setMethod(function getFullMount() {
 RouterClass.setMethod(function getPrefix(path) {
 
 	var prefix,
-	    begin;
+	    begin,
+	    key;
 
 	// See if the path starts with any set prefix
 	for (key in prefixes) {
@@ -1053,34 +1059,12 @@ RouterClass.setMethod('delete', function _delete(name, paths, fnc, options) {
 	return this.add(['delete'], name, paths, fnc, options);
 });
 
-/**
- * Get an object of all the routes in this router and its children
- *
- * @author   Jelle De Loecker <jelle@elevenways.be>
- * @since    0.2.0
- * @version  0.2.0
- */
-RouterClass.setMethod(function getFullMount() {
-
-	var result = this.mount;
-
-	if (this.parent != null && this.parent.mount != '/') {
-		result = this.parent.mount + result;
-	}
-
-	if (result[result.length-1] == '/') {
-		result = result.slice(0, -1);
-	}
-
-	return result;
-});
-
 /**
  * Get the full route object, for internal use
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.5.0
- * @version  0.5.0
+ * @version  1.4.1
  *
  * @param    {Object}   result   Optional object to store sectioned results in
  *
@@ -1111,7 +1095,14 @@ RouterClass.setMethod(function getFullRoutes(result) {
 		temp = {};
 
 		for (prefix in route.paths) {
-			temp[prefix] = mount + route.paths[prefix].source;
+			let source = route.paths[prefix].source;
+
+			// Avoid double slashes when mount is '/' and path starts with '/'
+			if (mount == '/' && source[0] == '/') {
+				temp[prefix] = source;
+			} else {
+				temp[prefix] = mount + source;
+			}
 		}
 
 		section[route.name] = route;
@@ -1175,7 +1166,7 @@ RouterClass.setMethod(function getOptions(result) {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.3.21
+ * @version  1.4.1
  *
  * @param    {Object}   result   Optional object to store sectioned results in
  *
@@ -1206,7 +1197,14 @@ RouterClass.setMethod(function getRoutes(result) {
 		temp = {};
 
 		for (prefix in route.paths) {
-			temp[prefix] = mount + route.paths[prefix].source;
+			let source = route.paths[prefix].source;
+
+			// Avoid double slashes when mount is '/' and path starts with '/'
+			if (mount == '/' && source[0] == '/') {
+				temp[prefix] = source;
+			} else {
+				temp[prefix] = mount + source;
+			}
 		}
 
 		section[route.name] = {

package/lib/class/schema_client.js

@@ -1079,7 +1079,7 @@ Schema.setMethod(function getFieldNames() {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.4.0
+ * @version  1.4.1
  *
  * @param    {string|FieldType}   _field_or_name   Field name, or index name when using `fields` option
  * @param    {Object}             options
@@ -1111,15 +1111,46 @@ Schema.setMethod(function addIndex(_field_or_name, _options) {
 		// When `fields` is provided, the first argument is the index name
 		options.name = _field_or_name;
 
+		// Create the index entry
+		if (this.indexes[options.name] == null) {
+			this.indexes[options.name] = {
+				fields: {},
+				options: options
+			};
+		}
+
+		// Add all fields to the index
 		for (let field_name of options.fields) {
-			this.addIndex(field_name, {
-				name: options.name,
-				unique: options.unique,
-				sparse: options.sparse,
-				order: options.order,
-			});
+			let field = this.getField(field_name);
+
+			if (!field) {
+				throw new Error('Could not find field "' + field_name + '" for compound index "' + options.name + '"');
+			}
+
+			let path = field.path;
+			this.indexes[options.name].fields[path] = options.order || 1;
+			this.index_fields[path] = options;
 		}
 
+		// Now call ensureIndex once with the complete compound index
+		const that = this;
+
+		that.getDatasource().done(function gotDs(err, datasource) {
+			if (err) {
+				throw err;
+			}
+
+			if (datasource.supports('ensure_index') === false) {
+				return;
+			}
+
+			datasource.ensureIndex(that.model_class, that.indexes[options.name], function ensuredIndex(err, result) {
+				if (err) {
+					alchemy.printLog('error', ['Error ensuring compound index', options.name, 'in model', that.model_name], {err: err});
+				}
+			});
+		});
+
 		return;
 	}
 
@@ -1153,7 +1184,7 @@ Schema.setMethod(function addIndex(_field_or_name, _options) {
 		}
 	};
 
-	if (typeof options.order == 'number') {
+	if (typeof options.order == 'string') {
 		if (options.order == 'asc') {
 			options.order = 1;
 		} else {

package/lib/class/sitemap.js

@@ -353,7 +353,7 @@ Sitemap.setMethod(function addRouteWithParameters(route, config, parameters, for
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.3.4
- * @version  1.3.6
+ * @version  1.4.1
  *
  * @param    {string}   prefix
  *
@@ -378,7 +378,7 @@ Sitemap.setMethod(function getXmlBuilder(prefix) {
 		}
 
 		for (let info of category.pages) {
-			let url = urlset.ele(url);
+			let url = urlset.ele('url');
 
 			url.ele('loc').txt(''+info.url);
 

package/lib/class/task.js

@@ -371,33 +371,51 @@ Task.setMethod(async function start(payload) {
 	let result;
 
 	try {
-		result = await this.executor();
-	} catch (err) {
-		if (err == 'stopped') {
-			this.report('stopped', 'Stopped');
-			return;
+		try {
+			result = await this.executor();
+		} catch (err) {
+			if (err == 'stopped') {
+				this.report('stopped', 'Stopped');
+				return;
+			}
+
+			// Set the error
+			this.error = err;
+
+			// Report failed
+			let report = this.report('failed');
+			report.error = err;
+
+			// Surface the failure on the history document - without
+			// this, the row is left with `is_running: true` and no
+			// error info, looking identical to a still-running task.
+			document.had_error = true;
+			document.error_message = String(err && err.message || err);
+			document.error_stack = err && err.stack || null;
+
+			throw err;
 		}
 
-		// Set the error
-		this.error = err;
-
-		// Report failed
-		let report = this.report('failed');
-		report.error = err;
-
-		throw err;
-	}
-
-	// If the command hasn't been manually stopped,
-	// report it as done
-	if (!this.manual_stop_end) {
-		this.report('done');
+		// If the command hasn't been manually stopped,
+		// report it as done
+		if (!this.manual_stop_end) {
+			this.report('done');
+		}
+	} finally {
+		// Always close out the history document so it doesn't get
+		// stuck as a zombie "running forever" row.
+		document.ended_at = new Date();
+		document.is_running = false;
+
+		try {
+			await document.save();
+		} catch (save_err) {
+			// Don't let a history-save failure swallow the original
+			// executor error on its way out of the catch above.
+			alchemy.registerError(save_err);
+		}
 	}
 
-	document.ended_at = new Date();
-	document.is_running = false;
-	await document.save();
-
 	this[RUNNING_PLEDGE].resolve(result);
 
 	return result;
@@ -567,7 +585,7 @@ async function doAsyncLoopUntilNotBusy(max_tries) {
 	}
 
 	do {
-		console.log('Waiting for system to be less busy', tries)
+		log.info('Waiting for system to be less busy, try', tries);
 		await Pledge.after(500);
 		tries++;
 	} while (tries < max_tries && alchemy.isTooBusy());