alchemymvc 1.3.15 → 1.3.17

package/lib/class/conduit.js

@@ -490,9 +490,9 @@ Conduit.setMethod(function time() {
 /**
  * Parse the request, get information from the url
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.2.5
+ * @version  1.3.17
  *
  * @param    {IncomingMessage}   req
  * @param    {ServerResponse}    res
@@ -555,6 +555,11 @@ Conduit.setMethod(async function parseRequest() {
 	// Set the host
 	this.url.hostname = this.headers.host;
 
+	// If no URL was set, use the first requests URL (without the path)
+	if (!alchemy.settings.url && this.headers.host) {
+		alchemy.settings.url = this.url+'';
+	}
+
 	let path = this.path;
 
 	if (this.prefix) {
@@ -569,9 +574,9 @@ Conduit.setMethod(async function parseRequest() {
 /**
  * Parse the headers for shortcuts
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  0.2.0
+ * @version  1.3.17
  */
 Conduit.setMethod(function parseShortcuts() {
 
@@ -597,6 +602,10 @@ Conduit.setMethod(function parseShortcuts() {
 		this.ajax = headers['x-requested-with'] === 'XMLHttpRequest';
 	}
 
+	// Is this request coming from a webview?
+	if (this.in_webview == null) {
+		this.in_webview = headers['x-protoblast-webview'] === 'true';
+	}
 });
 
 /**
@@ -1161,6 +1170,8 @@ Conduit.setMethod(async function callMiddleware() {
 			middleDebug.mark('Preparing viewrender');
 		}
 
+		// An action will be called,
+		// so we can already prepare the viewrender now.
 		that.prepareViewRender();
 
 		if (middleDebug) {
@@ -1184,10 +1195,14 @@ Conduit.setMethod(async function callMiddleware() {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.1.1
+ * @version  1.3.17
  */
 Conduit.setMethod(function prepareViewRender() {
 
+	if (this.renderer.conduit) {
+		return;
+	}
+
 	// Add a link to this conduit
 	this.renderer.conduit = this;
 	this.renderer.server_var('conduit', this);
@@ -1211,7 +1226,7 @@ Conduit.setMethod(function prepareViewRender() {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.1.7
+ * @version  1.3.16
  */
 Conduit.setMethod(function callHandler() {
 
@@ -1226,7 +1241,7 @@ Conduit.setMethod(function callHandler() {
 			this.error(405, 'Method Not Allowed', false);
 
 		} else {
-			if (alchemy.settings.debug) {
+			if (alchemy.settings.debug && this.original_path.indexOf('.js.map') == -1) {
 				console.log('Route not found:', this);
 			}
 
@@ -1410,7 +1425,7 @@ Conduit.setMethod(function setResponseUrl(new_url) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.3.6
+ * @version  1.3.17
  *
  * @param    {Number}          status    3xx redirection codes. 302 (temporary redirect) by default
  * @param    {String|Object}   options   Options or url
@@ -1508,13 +1523,18 @@ Conduit.setMethod(function redirect(status, options) {
 		}
 	}
 
-	if (hard_refresh && this.headers['x-hawkejs-request']) {
-		this.setHeader('x-hawkejs-navigate', url);
+	if (options?.popup) {
+		this.setHeader('x-hawkejs-popup', options.popup);
 
-		if (options && options.popup) {
-			this.setHeader('x-hawkejs-popup', options.popup);
+		if (options.popup_url) {
+			this.setHeader('x-hawkejs-popup-url', options.popup_url);
 		}
 
+		hard_refresh = true;
+	}
+
+	if (hard_refresh && this.headers['x-hawkejs-request']) {
+		this.setHeader('x-hawkejs-navigate', url);
 	} else {
 		this.setHeader('Location', url);
 	}
@@ -1527,7 +1547,7 @@ Conduit.setMethod(function redirect(status, options) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.3.4
+ * @version  1.3.16
  *
  * @param    {Nulber}  status       Response statuscode
  * @param    {Error}   message      Optional error to send
@@ -1561,6 +1581,11 @@ Conduit.setMethod(function error(status, message, print_error) {
 
 	if (alchemy.settings.environment == 'dev') {
 		print_dev = true;
+
+		if (is_400 && this.original_path.indexOf('.js.map') > -1) {
+			print_dev = false;
+			print_error = false;
+		}
 	}
 
 	if (print_error == null) {
@@ -1916,11 +1941,11 @@ Conduit.setMethod(function createScene() {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.1.0
+ * @version  1.3.17
  */
 Conduit.setMethod(function render(template_name, options, callback) {
 
-	var that = this,
+	let that = this,
 	    templates;
 
 	if (typeof options == 'function') {
@@ -1930,6 +1955,10 @@ Conduit.setMethod(function render(template_name, options, callback) {
 		options = {};
 	}
 
+	// Make sure the viewrender is prepared
+	// (Fallback)
+	this.prepareViewRender();
+
 	if (template_name) {
 		templates = [template_name];
 	}
@@ -2309,6 +2338,34 @@ Conduit.setMethod(function getSession(allow_create = true) {
 	return session;
 });
 
+/**
+ * Create a controller of the given type and attach this conduit
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.16
+ * @version  1.3.16
+ *
+ * @param    {String}   controller_name
+ *
+ * @return   {Controller}
+ */
+Conduit.setMethod(function getController(controller_name) {
+
+	if (!controller_name) {
+		return this.controller;
+	}
+
+	let instance = Controller.get(controller_name);
+
+	if (!instance) {
+		return false;
+	}
+
+	instance.conduit = this;
+
+	return instance;
+});
+
 /**
  * Register live data bindings via websockets
  *
@@ -2688,7 +2745,7 @@ Conduit.setMethod(function shouldBePostponed() {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.3.0
- * @version  0.4.0
+ * @version  1.3.16
  *
  * @param    {String}   type
  * @param    {Object}   data
@@ -2697,18 +2754,18 @@ Alchemy.setMethod(function broadcast(type, data) {
 
 	alchemy.sessions.forEach(function eachSession(session, key) {
 
-		// Go over every listening scene and submit the data
-		Object.each(session.connections, function eachScene(scene, scene_id) {
+		// Go over every listening socket and submit the data
+		Object.each(session.connections, function eachScene(socket_conduit, scene_id) {
 
-			if (!scene) {
+			if (!socket_conduit?.is_connected) {
 				return;
 			}
 
 			if (alchemy.settings.debug) {
-				log.debug('Broadcasting', type, {data, scene});
+				log.debug('Broadcasting', type, {data, scene: socket_conduit});
 			}
 
-			scene.submit(type, data);
+			socket_conduit.submit(type, data);
 		});
 	});
 });

package/lib/class/datasource.js

@@ -455,7 +455,7 @@ Datasource.setMethod(function _valueToApp(field, query, options, value, callback
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.1.5
+ * @version  1.3.16
  *
  * @param    {Model}      model
  * @param    {Criteria}   criteria
@@ -540,24 +540,29 @@ Datasource.setMethod(function read(model, criteria, callback) {
 				return pledge.reject(err);
 			}
 
-			let result = {
-				items     : app_results,
-				available : available
-			};
+			try {
 
-			if (hash) {
+				let result = {
+					items     : app_results,
+					available : available
+				};
 
-				// Emit the storing_cache event
-				model.emit('storing_cache', criteria, result);
+				if (hash) {
 
-				let cloned = JSON.clone(result);
+					// Emit the storing_cache event
+					model.emit('storing_cache', criteria, result);
 
-				model.emit('stored_cache', criteria, cloned);
+					let cloned = JSON.clone(result);
 
-				cache_pledge.resolve(cloned);
-			}
+					model.emit('stored_cache', criteria, cloned);
 
-			pledge.resolve(result);
+					cache_pledge.resolve(cloned);
+				}
+
+				pledge.resolve(result);
+			} catch (err) {
+				pledge.reject(err);
+			}
 		}
 	});
 

package/lib/class/inode_file.js

@@ -296,12 +296,16 @@ File.setMethod(function createReadStream(options) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.1.0
- * @version  1.1.8
+ * @version  1.3.16
  */
 File.setMethod(function read(options) {
 
 	let pledge = new Pledge();
 
+	if (typeof options == 'string') {
+		options = {encoding: options};
+	}
+
 	if (!options) {
 		options = {flag: 'r'};
 	} else if (!options.flag) {

package/lib/class/model.js

@@ -845,7 +845,7 @@ Model.setMethod(function ensureIds(list, callback) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.0.1
- * @version  1.2.0
+ * @version  1.3.16
  *
  * @param    {Document}   document
  * @param    {Object}     options
@@ -943,6 +943,11 @@ Model.setMethod(function saveRecord(document, options, callback) {
 
 		Object.each(document.$record, function eachEntry(entry, key) {
 
+			// Skip empty entries
+			if (!entry) {
+				return;
+			}
+
 			// Skip our own record
 			if (key == that.name) {
 				return;
@@ -957,7 +962,6 @@ Model.setMethod(function saveRecord(document, options, callback) {
 			}
 
 			// Add the saved _id
-			//@TODO: this throws an error sometimes.
 			entry[assoc.options.foreignKey] = saved_record[assoc.options.localKey];
 
 			// Add the task
@@ -1242,6 +1246,30 @@ Model.setMethod(function nukeCache(associated, parent) {
 	}
 });
 
+/**
+ * Perform a MongoDB pipeline
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.17
+ * @version  1.3.17
+ *
+ * @param   {Array}     pipeline
+ *
+ * @return  {Promise}
+ */
+Model.setMethod(async function executeMongoPipeline(pipeline) {
+
+	if (typeof this.datasource.collection != 'function') {
+		throw new Error('The `' + this.model_name + '` model does not seem to use MongoDB, unable to perform pipeline');
+	}
+
+	let collection = await this.datasource.collection(this.table);
+	let cursor = await collection.aggregate(pipeline);
+	let result = await cursor.toArray();
+
+	return result;
+});
+
 /**
  * Delete the given record id
  *

package/lib/class/route.js

@@ -3,7 +3,7 @@
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.3.1
+ * @version  1.3.16
  */
 const Route = Function.inherits('Alchemy.Base', function Route(router, paths, options) {
 
@@ -51,6 +51,10 @@ const Route = Function.inherits('Alchemy.Base', function Route(router, paths, op
 	// Can this route's path be used in the browser's address location?
 	this.visible_location = true;
 
+	// Is this a system route of some kind?
+	// (meaning: not for end users)
+	this.is_system_route = false;
+
 	// If no fnc is given, these will be called
 	this.controller = null;
 	this.action = null;

package/lib/class/router.js

@@ -767,7 +767,7 @@ RouterClass.setMethod(function setOption(name, value) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.3.1
+ * @version  1.3.16
  *
  * @param    {Object}   args
  * @param    {String}   args.name            Optional route name
@@ -824,6 +824,10 @@ RouterClass.setMethod(function add(args) {
 		route.visible_location = args.visible_location;
 	}
 
+	if (args.is_system_route != null) {
+		route.is_system_route = args.is_system_route;
+	}
+
 	if (args.permission) {
 		route.setPermission(args.permission);
 	}
@@ -1163,7 +1167,7 @@ RouterClass.setMethod(function getOptions(result) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.3.7
+ * @version  1.3.16
  *
  * @param    {Object}   result   Optional object to store sectioned results in
  *
@@ -1212,6 +1216,7 @@ RouterClass.setMethod(function getRoutes(result) {
 			has_permission_assignments : route.has_permission_assignments || undefined,
 			title                      : route.title,
 			visible_location           : route.visible_location,
+			is_system_route            : route.is_system_route,
 			schema                     : route.schema,
 			param_definitions          : route.param_definitions,
 		};

package/lib/class/schema_client.js

@@ -892,7 +892,7 @@ Schema.setMethod(function getFieldNames() {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.3.0
+ * @version  1.3.17
  *
  * @param    {String|FieldType}   _field
  * @param    {Object}             options
@@ -901,24 +901,19 @@ Schema.setMethod(function getFieldNames() {
  */
 Schema.setMethod(function addIndex(_field, _options) {
 
-	var that = this,
-	    datasource,
-	    options,
-	    order,
-	    field,
-	    path;
-
 	// `Schema` is the `Client.Schema` class in this scope
 	if (Blast.isNode && this.constructor == Schema) {
 		return;
 	}
 
-	field = this.getField(_field);
+	let field = this.getField(_field);
 
 	if (!field) {
 		throw new Error('Could not find field "' + _field + '"');
 	}
 
+	let options;
+
 	if (typeof _options === 'string') {
 		options = {};
 		options[_options] = true;
@@ -961,6 +956,8 @@ Schema.setMethod(function addIndex(_field, _options) {
 		this.has_alternates++;
 	}
 
+	const that = this;
+
 	that.getDatasource().done(function gotDs(err, datasource) {
 
 		if (err) {
@@ -977,7 +974,7 @@ Schema.setMethod(function addIndex(_field, _options) {
 			return alchemy.printLog('error', ['Unable to ensure index on this datasource', options.name], {err: new Error()});
 		}
 
-		path = field.path;
+		let path = field.path;
 
 		if (options.db_property) {
 			path += '.' + options.db_property;
@@ -990,7 +987,7 @@ Schema.setMethod(function addIndex(_field, _options) {
 		datasource.ensureIndex(that.model_class, that.indexes[options.name], function ensuredIndex(err, result) {
 
 			if (err) {
-				alchemy.printLog('error', ['Error ensuring index', options.name], {err: err});
+				alchemy.printLog('error', ['Error ensuring index', options.name, 'in model', that.model_name], {err: err});
 			}
 		});
 	});

package/lib/class/session.js

@@ -63,7 +63,7 @@ var Session = Function.inherits('Alchemy.Base', function ClientSession(conduit)
  *
  * @author   Jelle De Loecker <jelle@develry.be>
  * @since    1.1.0
- * @version  1.1.0
+ * @version  1.3.17
  *
  * @type     {Number}
  */
@@ -75,6 +75,10 @@ Session.enforceProperty(function request_count(amount) {
 
 	this.last_activity_date = new Date();
 
+	if (this.menu_item) {
+		this.menu_item.setWeight(this.last_activity_date.getTime());
+	}
+
 	return amount;
 });
 
@@ -167,7 +171,7 @@ Session.setMethod(function hasAlreadyQueued() {
  *
  * @author   Jelle De Loecker <jelle@develry.be>
  * @since    0.2.0
- * @version  0.4.0
+ * @version  1.3.17
  *
  * @param    {Conduit}   conduit   The conduit to postpone
  *
@@ -187,7 +191,14 @@ Session.setMethod(function createMenuItem(conduit) {
 
 	browser += ': ' + conduit.ip;
 
-	this.menu_item = alchemy.Janeway.session_menu.addItem(browser);
+	let options = {
+		title  : browser,
+		weight : this.last_activity_date.getTime(),
+	};
+
+	this.menu_item = alchemy.Janeway.session_menu.addItem(options, () => {
+		console.log('Clicked on session', this, this.id);
+	});
 });
 
 /**