alchemymvc 1.3.22 → 1.4.0-alpha.2

package/lib/{init → core}/alchemy.js

@@ -1,6 +1,4 @@
-'use strict';
-
-var shared_objects = {},
+let shared_objects = {},
     plugModules    = null,
     usedModules    = {},
     useErrors      = {},
@@ -17,20 +15,20 @@ var shared_objects = {},
  *
  * @constructor
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.0.1
  * @version  1.3.21
  */
-global.Alchemy = Function.inherits('Informer', 'Alchemy', function Alchemy() {
-
-	var that = this,
-	    package_json;
+global.Alchemy = Function.inherits('Alchemy.Base', function Alchemy() {
 
 	// Only allow a single instance of the Alchemy class
 	if (global.alchemy) {
 		return global.alchemy;
 	}
 
+	let that = this,
+	    package_json;
+
 	// Timestamp when alchemy started
 	this.start_time = Date.now();
 
@@ -144,16 +142,22 @@ global.Alchemy = Function.inherits('Informer', 'Alchemy', function Alchemy() {
 			console.warn('Failed to start Janeway:', err);
 		}
 	}
+
+	this.any_body = this.use('body/any');
+	this.text_body = this.use('body');
+	this.formidable = this.use('formidable');
+	this.body_parser = this.use('body-parser');
+	this.url_form_body = this.body_parser.urlencoded({extended: true});
 });
 
 /**
  * See if running janeway is allowed
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.5.0
  * @version  0.5.0
  *
- * @type    {Boolean}
+ * @type     {boolean}
  */
 Alchemy.prepareProperty(function allow_janeway() {
 
@@ -163,7 +167,7 @@ Alchemy.prepareProperty(function allow_janeway() {
 	}
 
 	// You can also disable janeway in the settings
-	if (this.settings.janeway === false) {
+	if (this.settings.debugging.enable_janeway === false) {
 		return false;
 	}
 
@@ -177,16 +181,16 @@ Alchemy.prepareProperty(function allow_janeway() {
 /**
  * Expirable object where sessions are stored
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.5.0
  * @version  1.0.4
  *
- * @type    {Develry.Cache}
+ * @type     {Develry.Cache}
  */
 Alchemy.prepareProperty(function sessions() {
 
 	var cache = this.getCache('sessions', {
-		max_idle   : alchemy.settings.session_length,
+		max_idle   : this.settings.sessions.duration,
 		max_length : Infinity
 	});
 
@@ -202,11 +206,11 @@ Alchemy.prepareProperty(function sessions() {
  * Expirable object where sessions are temporarily stored
  * based on the browser fingerprints
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.0
  * @version  1.1.0
  *
- * @type    {Develry.Cache}
+ * @type     {Develry.Cache}
  */
 Alchemy.prepareProperty(function fingerprints() {
 
@@ -221,27 +225,40 @@ Alchemy.prepareProperty(function fingerprints() {
 /**
  * Get or set the environment
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.4.0
  * @version  0.4.0
  *
- * @type    {String}
+ * @type     {string}
  */
 Alchemy.setProperty(function environment() {
-	return alchemy.settings.environment;
+	return this.settings.environment;
 }, function set_environment(value) {
-	alchemy.settings.environment = String(value);
-	return alchemy.settings.environment;
+	this.setSetting('environment', String(value));
+	return this.settings.environment;
+});
+
+/**
+ * Add a getter for the total amount of http requests
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.3.1
+ * @version  1.3.1
+ *
+ * @type     {number}
+ */
+Alchemy.setProperty(function http_request_counter() {
+	return 0;
 });
 
 /**
  * Get the current lag in ms
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.3.1
  * @version  1.3.1
  *
- * @return   {Number}
+ * @return   {number}
  */
 Alchemy.setMethod(function lagInMs() {
 	return this.toobusy.lag();
@@ -250,11 +267,11 @@ Alchemy.setMethod(function lagInMs() {
 /**
  * Get the system load as percentage points
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.3.1
  * @version  1.3.1
  *
- * @return   {Number}
+ * @return   {number}
  */
 Alchemy.setMethod(function systemLoad() {
 
@@ -269,7 +286,7 @@ Alchemy.setMethod(function systemLoad() {
  * 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>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.3.2
  * @version  1.3.2
  */
@@ -280,11 +297,11 @@ Alchemy.setMethod(function addToobusyCheck(fnc) {
 /**
  * Is the server currently too busy, overloaded in some way?
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.3.1
  * @version  1.3.2
  *
- * @return   {Boolean}
+ * @return   {boolean}
  */
 Alchemy.setMethod(function isTooBusy() {
 
@@ -293,9 +310,11 @@ Alchemy.setMethod(function isTooBusy() {
 		return true;
 	}
 
-	if (this.settings.max_system_load > 0) {
+	const max_system_load = this.settings.performance.max_system_load;
+
+	if (max_system_load > 0) {
 		// Then check the load average
-		if (this.systemLoad() > this.settings.max_system_load) {
+		if (this.systemLoad() > max_system_load) {
 			return true;
 		}
 	}
@@ -308,7 +327,7 @@ Alchemy.setMethod(function isTooBusy() {
 					return true;
 				}
 			} catch (err) {
-				alchemy.distinctProblem('error-extra-toobusy-check', 'Extra toobusy check failed', {error: err});
+				this.distinctProblem('error-extra-toobusy-check', 'Extra toobusy check failed', {error: err});
 			}
 		}
 	}
@@ -319,11 +338,11 @@ Alchemy.setMethod(function isTooBusy() {
 /**
  * Is the server too busy for requests?
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.3.1
  * @version  1.3.1
  *
- * @return   {Boolean}
+ * @return   {boolean}
  */
 Alchemy.setMethod(function isTooBusyForRequests() {
 
@@ -339,11 +358,11 @@ Alchemy.setMethod(function isTooBusyForRequests() {
 /**
  * Is the server too busy for AJAX too?
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.3.1
  * @version  1.3.18
  *
- * @return   {Boolean}
+ * @return   {boolean}
  */
 Alchemy.setMethod(function isTooBusyForAjax() {
 
@@ -351,7 +370,7 @@ Alchemy.setMethod(function isTooBusyForAjax() {
 		return false;
 	}
 
-	let max_event_loop_lag = alchemy.settings.max_event_loop_lag ?? alchemy.settings.toobusy;
+	let max_event_loop_lag = this.settings.performance.max_event_loop_lag ?? this.settings.performance.toobusy;
 
 	if (max_event_loop_lag) {
 		let lag = this.lagInMs();
@@ -367,11 +386,11 @@ Alchemy.setMethod(function isTooBusyForAjax() {
 /**
  * Set the maximum event loop lag before the server is considered overloaded
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.3.18
  * @version  1.3.18
  *
- * @param    {Number}   max_lag
+ * @param    {number}   max_lag
  */
 Alchemy.setMethod(function setMaxEventLoopLag(max_lag) {
 
@@ -383,50 +402,30 @@ Alchemy.setMethod(function setMaxEventLoopLag(max_lag) {
 		max_lag = 70;
 	}
 
-	this.settings.max_event_loop_lag = max_lag;
+	this.setSetting('performance.max_event_loop_lag', max_lag);
 });
 
 /**
  * Called after the server has started
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.3.17
- * @version  1.3.17
+ * @version  1.4.0
  */
 Alchemy.setMethod(function afterStart() {
-	this.startTaskService();
-});
-
-let task_service_has_started = false;
-
-/**
- * Start the task service
- *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
- * @since    1.3.17
- * @version  1.3.17
- */
-Alchemy.setMethod(function startTaskService() {
-
-	if (task_service_has_started) {
-		return;
-	}
-
-	task_service_has_started = true;
-
-	this.task_service = new Classes.Alchemy.Task.TaskService();
+	
 });
 
 /**
  * Is the given PID running?
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.3.17
  * @version  1.3.17
  *
- * @param    {Number}   pid
+ * @param    {number}   pid
  *
- * @return   {Boolean}
+ * @return   {boolean}
  */
 Alchemy.setMethod(function isProcessRunning(pid) {
 
@@ -444,9 +443,9 @@ Alchemy.setMethod(function isProcessRunning(pid) {
 /**
  * Start janeway
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.5.0
- * @version  1.3.1
+ * @version  1.4.0
  *
  * @param    {Object}   options
  */
@@ -506,67 +505,27 @@ Alchemy.setMethod(function startJaneway(options) {
 
 	this.Janeway.started = true;
 	this.Janeway.start(options);
-
-	if (this.settings.title) {
-		let title = this.settings.title;
-
-		if (this.settings.titleized) {
-			title = 'Alchemy: ' + title;
-		}
-
-		this.Janeway.setTitle(title);
-	}
-
-	if (this.settings.session_menu) {
-
-		let session_menu = this.Janeway.addIndicator('⌨ ');
-
-		if (!session_menu.addItem) {
-			return session_menu.remove();
-		}
-
-		session_menu.addItem({
-			title  : 'Current active browser sessions:',
-			weight : Infinity,
-		}, () => {
-			console.log('All sessions:', alchemy.sessions);
-		});
-
-		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;
-	}
-
 });
 
 /**
  * Log messages of level 5 (info)
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.0.1
  * @version  0.4.0
  */
 Alchemy.setMethod(function log(...args) {
-	return alchemy.printLog(5, args, {level: 3});
+	return this.printLog(5, args, {level: 3});
 });
 
 /**
  * Actually print a log message
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.4.0
  * @version  1.1.0
  *
- * @param    {Number}   level
+ * @param    {number}   level
  * @param    {Array}    args
  * @param    {Object}   options
  */
@@ -575,7 +534,7 @@ Alchemy.setMethod(function printLog(level, args, options) {
 	var type,
 	    line;
 
-	if (this.settings.silent) {
+	if (this.settings.debugging.silent) {
 		return;
 	}
 
@@ -609,49 +568,112 @@ Alchemy.setMethod(function printLog(level, args, options) {
 });
 
 /**
- * Load the settings
+ * Set a setting value (without triggering actions)
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.4.0
+ * @version  1.4.0
+ *
+ * @param    {string}     path       The path of the setting (without system prefix)
+ * @param    {Mixed}      value
+ */
+Alchemy.setMethod(function setSetting(path, value) {
+	this.system_settings.setPathSilently(path, value);
+
+	if (this.started) {
+		this.settings = this.system_settings.toObject();
+	}
+});
+
+/**
+ * Get a setting value
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.4.0
+ * @version  1.4.0
+ *
+ * @param    {string}     path       The path of the setting (without system prefix)
+ */
+Alchemy.setMethod(function getSetting(path) {
+	
+	let value = this.getSettingValueInstance(path);
+
+	if (value) {
+		return value.get();
+	}
+});
+
+/**
+ * Get a setting value instance
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.4.0
+ * @version  1.4.0
+ *
+ * @param    {string}     path       The path of the setting (without system prefix)
+ */
+Alchemy.setMethod(function getSettingValueInstance(path) {
+	return this.system_settings.getPath(path);
+});
+
+/**
+ * Execute the action linked to a setting
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.4.0
+ * @version  1.4.0
+ *
+ * @param    {string}     path   The path of the setting (without system prefix)
+ */
+Alchemy.setMethod(function executeSetting(path) {
+
+	let value = this.getSettingValueInstance(path);
+
+	if (value) {
+		return value.executeAction();
+	}
+});
+
+/**
+ * Load the initial hard-coded settings
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.4.0
- * @version  1.3.18
+ * @version  1.4.0
  */
 Alchemy.setMethod(function loadSettings() {
 
-	var default_path,
-	    port_error,
-	    local_path,
-	    env_config,
-	    env_path,
-	    settings,
-	    local,
-	    env;
-
 	if (this.settings) {
 		return;
 	}
 
-	// Create the settings object
-	this.settings = settings = {};
+	// Create the settings scope
+	const system = Classes.Alchemy.Setting.SYSTEM.generateValue();
+
+	this.system_settings = system;
+	let settings = this.settings = system.toProxyObject();
 
 	// Generate the path to the default settings file
-	default_path = libpath.resolve(PATH_ROOT, 'app', 'config', 'default');
+	let default_path = libpath.resolve(PATH_ROOT, 'app', 'config', 'default');
 
 	// Get default settings
 	try {
-		Object.assign(settings, require(default_path));
+		let value = require(default_path);
+		system.setDefaultValue(value);
 	} catch (err) {
-		settings.no_default_file = default_path;
+		this.setSetting('no_default_file', default_path);
 	}
 
 	// Generate the path to the local settings file
-	local_path = libpath.resolve(PATH_ROOT, 'app', 'config', 'local');
+	let local_path = libpath.resolve(PATH_ROOT, 'app', 'config', 'local'),
+	    local;
 
 	// Get the local settings
 	try {
 		local = require(local_path);
 	} catch(err) {
 		local = {};
-		settings.no_local_file = local_path;
+		this.setSetting('no_local_file', local_path);
 	}
 
 	// Default to the 'dev' environment
@@ -664,7 +686,7 @@ Alchemy.setMethod(function loadSettings() {
 		}
 	}
 
-	env = this.argv.env || this.argv.environment;
+	let env = this.argv.env || this.argv.environment;
 
 	if (env) {
 		local.environment = env;
@@ -672,30 +694,30 @@ Alchemy.setMethod(function loadSettings() {
 	}
 
 	// Generate the path to the environment settings file
-	env_path = libpath.resolve(PATH_APP, 'config', local.environment, 'config');
+	let env_path = libpath.resolve(PATH_APP, 'config', local.environment, 'config');
 
 	// Get the config
 	try {
-		env_config = require(env_path);
+		let value = require(env_path);
+		system.setValueSilently(value);
 	} catch(err) {
-		env_config = {};
-		settings.no_env_file = env_path;
+		this.setSetting('no_env_file', env_path);
 	}
 
-	// Merge all the settings in order: default - environment - local
-	Object.merge(settings, env_config, local);
+	// And now overlay the final local settings
+	system.setValueSilently(local);
 
 	if (!settings.name) {
-		settings.name = this.package.name;
+		this.setSetting('name', this.package.name);
 	}
 
-	if (settings.title == null) {
+	if (this.getSetting('frontend.title') == null) {
 		if (this.package.title) {
 			// Allow users to set the title in their package file
-			settings.title = this.package.title;
+			this.setSetting('frontend.title', this.package.title);
 		} else if (settings.name) {
-			settings.title = settings.name.replace(/-/g, ' ').titleize();
-			settings.titleized = true;
+			let title = settings.name.replace(/-/g, ' ').titleize();
+			this.setSetting('frontend.title', title);
 		}
 	}
 
@@ -704,41 +726,44 @@ Alchemy.setMethod(function loadSettings() {
 
 		if (port) {
 			this.printLog(this.INFO, ['Using port setting from argument:', port]);
-			settings.port = port;
+			this.setSetting('network.port', port);
 		} else {
-			this.argv.socket = this.argv.port;
-			this.argv.port = null;
+			this.setSetting('network.socket', this.argv.port);
+			this.setSetting('network.port', null);
 		}
 	}
 
 	if (this.argv.socket) {
-		settings.port = false;
-		settings.socket = this.argv.socket;
+		this.setSetting('network.port', false);
+		this.setSetting('network.socket', this.argv.socket);
 
 		let stat;
 
 		try {
-			stat = fs.statSync(settings.socket);
+			stat = fs.statSync(this.argv.socket);
 		} catch (err) {
 			// Ignore if it doesn't exist yet
 		}
 
 		if (stat && stat.isDirectory()) {
-			settings.socket = libpath.resolve(settings.socket, settings.name + '.alchemy.sock');
+			let socket = libpath.resolve(this.argv.socket, settings.name + '.alchemy.sock');
+			this.setSetting('network.socket', socket);
 		}
 
-		this.printLog(this.INFO, ['Using socket setting from argument:', settings.socket]);
+		this.printLog(this.INFO, ['Using socket setting from argument:', settings.network.socket]);
 	}
 
-	if (!settings.port && settings.port !== false) {
-		settings.port = 3000;
+	if (!settings.network.port && settings.network.port !== false) {
+		this.setSetting('network.port', 3000);
 	}
 
-	if (settings.port > 49151) {
+	let port = this.getSetting('network.port');
+
+	if (port > 49151) {
 		port_error = 'Could not use port number ' + String(port).bold.red + ' because ';
 
 		// Make sure the port is valid
-		if (settings.port > 65535) {
+		if (port > 65535) {
 			this.printLog(this.FATAL, [port_error + 'there is no port higher than 65535. Please use ports below 49151.']);
 		} else {
 			this.printLog(this.FATAL, [port_error + 'it\'s an ephemeral port. Please use ports below 49151.']);
@@ -748,27 +773,23 @@ Alchemy.setMethod(function loadSettings() {
 	}
 
 	if (this.argv.url) {
-		settings.url = this.argv.url;
+		this.setUrl(this.argv.url);
+	} else {
+		this.setUrl(settings.network.main_url);
 	}
 
-	this.setUrl(settings.url);
-
-	if (settings.cookie_domain) {
-		this.setCookieDomain(settings.cookie_domain);
+	if (settings.frontend.cookies.domain) {
+		this.setCookieDomain(settings.frontend.cookies.domain);
 	}
 
 	if (this.argv.preload) {
 		settings.preload = this.argv.preload;
 
-		if (Array.isArray(settings.preload)) {
+		if (Array.isArray(settings.performance.preload)) {
 			settings.preload = settings.preload.last();
 		}
 	}
 
-	if (settings.preload == 'false') {
-		settings.preload = false;
-	}
-
 	let key,
 	    val;
 
@@ -781,46 +802,39 @@ Alchemy.setMethod(function loadSettings() {
 		val = this.argv[key];
 		key = key.after('override-');
 
-		if (!settings[key] || typeof settings[key] != 'object') {
-			settings[key] = val;
-		} else {
-			Object.merge(settings[key], val);
-		}
-	}
+		this.setSetting(key, val);
 
-	if (settings.debug) {
+		// if (!settings[key] || typeof settings[key] != 'object') {
+		// 	settings[key] = val;
+		// } else {
+		// 	Object.merge(settings[key], val);
+		// }
+	}
 
-		if (settings.source_map === 'false') {
-			settings.source_map = false;
+	if (settings.debugging.debug) {
+		if (settings.debugging.create_source_map == null) {
+			this.setSetting('debugging.create_source_map', true);
 		}
-
-		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) {
+	if (settings.performance.preload) {
 		this.doPreload();
 	}
 
-	this.setMaxEventLoopLag(settings.max_event_loop_lag);
+	this.setMaxEventLoopLag(settings.performance.max_event_loop_lag);
 
 	// Set the debug value
-	global.DEBUG = settings.debug;
+	global.DEBUG = settings.debugging.debug;
 });
 
 /**
  * Set the main url
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.3.18
  * @version  1.3.18
  *
- * @param    {RURL|String}   value
+ * @param    {RURL|string}   value
  */
 Alchemy.setMethod(function setUrl(value) {
 
@@ -832,9 +846,9 @@ Alchemy.setMethod(function setUrl(value) {
 		}
 	}
 
-	this.settings.url = value;
+	this.setSetting('network.main_url', value);
 
-	if (this.settings.cookie_domain === true || this.settings.cookie_domain == null) {
+	if (this.settings.frontend.cookies.domain === true || this.settings.frontend.cookies.domain == null) {
 		this.setCookieDomain(value);
 	}
 });
@@ -842,21 +856,21 @@ Alchemy.setMethod(function setUrl(value) {
 /**
  * Set the cookie domain
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.3.18
  * @version  1.3.18
  *
- * @param    {RURL|String}   value
+ * @param    {RURL|string}   value
  */
 Alchemy.setMethod(function setCookieDomain(value) {
 
 	if (value === false) {
-		this.settings.cookie_domain = false;
+		this.setSetting('frontend.cookies.domain', false);
 		return;
 	}
 
 	if (!value) {
-		value = this.settings.url;
+		value = this.settings.network.main_url;
 	}
 
 	if (!value) {
@@ -874,13 +888,13 @@ Alchemy.setMethod(function setCookieDomain(value) {
 		value = url.hostname;
 	}
 
-	this.settings.cookie_domain = value;
+	this.setSetting('frontend.cookies.domain', value);
 });
 
 /**
  * Set status
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.4.1
  * @version  0.4.1
  */
@@ -891,9 +905,9 @@ Alchemy.setMethod(function setStatus(name, value) {
 /**
  * Execute the function when alchemy is ready
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.0.1
- * @version  1.1.2
+ * @version  1.4.0
  *
  * @param    {Function}   callback   The function to execute
  *
@@ -901,20 +915,17 @@ Alchemy.setMethod(function setStatus(name, value) {
  */
 Alchemy.setMethod(function ready(callback) {
 
-	var that = this,
-	    pledge = new Pledge();
+	let pledge = new Pledge();
 
 	pledge.done(callback);
 
-	if (!this.sputnik) {
-		Blast.loaded(function hasLoaded() {
-			pledge.resolve(that.ready());
-		});
-	} else {
-		this.sputnik.after(['start_server', 'datasources', 'listening'], function afterReady() {
-			pledge.resolve();
-		});
-	}
+	STAGES.afterStages([
+		'server.start',
+		'datasource',
+		'server.listening',
+	], function hasLoaded() {
+		pledge.resolve();
+	});
 
 	return pledge;
 });
@@ -922,7 +933,7 @@ Alchemy.setMethod(function ready(callback) {
 /**
  * Preload the client-side stuff
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.2
  * @version  1.3.22
  */
@@ -932,10 +943,10 @@ Alchemy.setMethod(async function doPreload() {
 
 	let url;
 
-	if (this.settings.url) {
-		url = this.settings.url;
-	} else if (this.settings.port) {
-		url = 'http://localhost:' + this.settings.port;
+	if (this.settings.network.main_url) {
+		url = this.settings.network.main_url;
+	} else if (this.settings.network.port) {
+		url = 'http://localhost:' + this.settings.network.port;
 	}
 
 	if (url) {
@@ -951,9 +962,9 @@ Alchemy.setMethod(async function doPreload() {
 
 		Blast.getClientPath({
 			modify_prototypes : true,
-			create_source_map : alchemy.settings.source_map,
+			create_source_map : this.settings.debugging.create_source_map,
 			enable_coverage   : !!global.__coverage__,
-			debug             : alchemy.settings.debug,
+			debug             : this.settings.debugging.debug,
 		});
 	}
 });
@@ -962,11 +973,11 @@ Alchemy.setMethod(async function doPreload() {
  * Resolve the provided arguments to a useable path string.
  * Only used strings, discards objects.
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.0.1
  * @version  0.4.0
  *
- * @param   {String}   path_to_dirs   The path containing the dirs to load
+ * @param    {string}   path_to_dirs   The path containing the dirs to load
  */
 Alchemy.setMethod(function pathResolve(...path_to_dirs) {
 
@@ -995,16 +1006,16 @@ Alchemy.setMethod(function pathResolve(...path_to_dirs) {
 /**
  * A wrapper function for requiring modules
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.0.1
  * @version  1.0.0
  *
- * @param   {String}   module_name    The name/path of the module to load
- * @param   {String}   register_as    Cache the module under this name
- * @param   {Object}   options        Extra options
- * @param   {Boolean}  options.force  Force a new requirement and do not cache
+ * @param    {string}   module_name    The name/path of the module to load
+ * @param    {string}   register_as    Cache the module under this name
+ * @param    {Object}   options        Extra options
+ * @param    {boolean}  options.force  Force a new requirement and do not cache
  *
- * @return  {Object}   The required module
+ * @return   {Object}   The required module
  */
 Alchemy.setMethod(function use(module_name, register_as, options) {
 
@@ -1088,15 +1099,15 @@ Alchemy.setMethod(function use(module_name, register_as, options) {
 /**
  * Look for a module by traversing the filesystem
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.0.1
- * @version  0.4.0
+ * @version  1.4.0
  *
- * @param    {String}   startPath    The path to originate the search from
- * @param    {String}   moduleName
- * @param    {Number}   recurse
+ * @param    {string}   startPath    The path to originate the search from
+ * @param    {string}   moduleName
+ * @param    {number}   recurse
  *
- * @return   {String}
+ * @return   {string}
  */
 Alchemy.setMethod(function searchModule(startPath, moduleName, recurse) {
 
@@ -1109,54 +1120,41 @@ Alchemy.setMethod(function searchModule(startPath, moduleName, recurse) {
 	    key,
 	    i;
 
-	// Don't do this search if it hasn't been enabled
-	// The new npm flat structure makes this an expensive thing to do
-	if (!this.settings.search_for_modules) {
+	// Set recurse to 3, so this is the first and last call
+	recurse = 3;
 
-		// Set recurse to 3, so this is the first and last call
-		recurse = 3;
+	// Only add 2 folder to look through,
+	// the alchemymvc node_modules folder
+	// and the base node_modules folder
+	moduledirs = ['..', libpath.resolve(startPath, 'node_modules', 'alchemymvc')];
 
-		// Only add 2 folder to look through,
-		// the alchemymvc node_modules folder
-		// and the base node_modules folder
-		moduledirs = ['..', libpath.resolve(startPath, 'node_modules', 'alchemymvc')];
+	// Add plugin folders
+	if (!plugModules) {
+		path = libpath.resolve(PATH_ROOT, 'node_modules');
 
-		// Add plugin folders
-		if (!plugModules) {
-			path = libpath.resolve(PATH_ROOT, 'node_modules');
+		if (fs.existsSync(path)) {
 
-			if (fs.existsSync(path)) {
+			// Get all the entries in the main modules folder
+			entries = fs.readdirSync(libpath.resolve(PATH_ROOT, 'node_modules'));
 
-				// Get all the entries in the main modules folder
-				entries = fs.readdirSync(libpath.resolve(PATH_ROOT, 'node_modules'));
+			// Initiate the plugin modules variables
+			plugModules = [];
 
-				// Initiate the plugin modules variables
-				plugModules = [];
 
+			for (i = 0; i < entries.length; i++) {
+				temp = entries[i];
 
-				for (i = 0; i < entries.length; i++) {
-					temp = entries[i];
-
-					if (temp.startsWith('alchemy-')) {
-						plugModules.push(libpath.resolve(PATH_ROOT, 'node_modules', temp));
-					}
+				if (temp.startsWith('alchemy-')) {
+					plugModules.push(libpath.resolve(PATH_ROOT, 'node_modules', temp));
 				}
-			} else {
-				plugModules = [];
 			}
+		} else {
+			plugModules = [];
 		}
-
-		for (i = 0; i < plugModules.length; i++) {
-			moduledirs.push(plugModules[i]);
-		}
-
-	} else if (!searchModule.have_warned) {
-		searchModule.have_warned = true;
-		log.warn('The "search_for_modules" config has been enabled!');
 	}
 
-	if (!recurse) {
-		recurse = 1;
+	for (i = 0; i < plugModules.length; i++) {
+		moduledirs.push(plugModules[i]);
 	}
 
 	nmPath = libpath.resolve(startPath, 'node_modules');
@@ -1209,11 +1207,11 @@ Alchemy.setMethod(function searchModule(startPath, moduleName, recurse) {
 /**
  * Find a module in our customized file structure
  * 
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.0.1
  * @version  1.3.17
  *
- * @param    {String}   moduleName
+ * @param    {string}   moduleName
  * @param    {Object}   options
  *
  * @return   {Object}
@@ -1363,7 +1361,7 @@ Alchemy.setMethod(function findModule(moduleName, options) {
 			}
 
 			if (!supports_cjs) {
-				module = doImport(module_path)
+				module = import(module_path)
 			} else {
 				module = require(module_path);
 			}
@@ -1399,14 +1397,14 @@ Alchemy.setMethod(function findModule(moduleName, options) {
 /**
  * Create a shared object
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.0.1
  * @version  0.4.0
  *
- * @param   {String}   name   The name of the object to get
- * @param   {String}   type   The type to create (array or object)
+ * @param    {string}   name   The name of the object to get
+ * @param    {string}   type   The type to create (array or object)
  *
- * @return  {Object|Array}
+ * @return   {Object|Array}
  */
 Alchemy.setMethod(function shared(name, type, value) {
 
@@ -1431,11 +1429,11 @@ Alchemy.setMethod(function shared(name, type, value) {
  * Get an object id,
  * return undefined if no valid data was given (instead of throwing an error)
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.0.1
  * @version  1.3.16
  *
- * @param    {String|ObjectId}   obj
+ * @param    {string|ObjectId}   obj
  *
  * @return   {ObjectId|undefined}
  */
@@ -1444,7 +1442,7 @@ Alchemy.setMethod(function castObjectId(obj) {
 	let type = typeof obj;
 
 	if (type === 'string' && obj.isObjectId()) {
-		return alchemy.ObjectId(obj);
+		return this.ObjectId(obj);
 	}
 
 	if (obj && type === 'object') {
@@ -1461,11 +1459,11 @@ Alchemy.setMethod(function castObjectId(obj) {
 /**
  * See if the given object is a stream
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.0.5
  *
- * @return   {Boolean}
+ * @return   {boolean}
  */
 Alchemy.setMethod(function isStream(obj) {
 	return obj && (typeof obj._read == 'function' || typeof obj._write == 'function') && typeof obj.on === 'function';
@@ -1474,12 +1472,12 @@ Alchemy.setMethod(function isStream(obj) {
 /**
  * Get or create a new cache instance
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.0
  * @version  1.3.0
  *
- * @param    {String}          name
- * @param    {Number|Object}   options
+ * @param    {string}          name
+ * @param    {number|Object}   options
  *
  * @return   {Develry.Cache}
  */
@@ -1521,15 +1519,15 @@ Alchemy.setMethod(function getCache(name, options) {
 /**
  * Get a route
  *
- * @author    Jelle De Loecker   <jelle@elevenways.be>
- * @since     1.1.3
- * @version   1.3.0
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.1.3
+ * @version  1.3.0
  *
- * @param     {String}   href         The href or route name
- * @param     {Object}   parameters   Route parameters
- * @param     {Object}   options
+ * @param    {string}   href         The href or route name
+ * @param    {Object}   parameters   Route parameters
+ * @param    {Object}   options
  *
- * @return    {String}
+ * @return   {string}
  */
 Alchemy.setMethod(function routeUrl(href, parameters, options) {
 
@@ -1549,7 +1547,7 @@ Alchemy.setMethod(function routeUrl(href, parameters, options) {
 /**
  * Get paths that should be cached by the client
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.7
  * @version  1.0.7
  *
@@ -1661,7 +1659,7 @@ Alchemy.decorateMethod(Blast.Decorators.memoize(), function getAppcachePaths() {
 /**
  * Get the appcache manifest text
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.7
  * @version  1.0.7
  *
@@ -1713,11 +1711,11 @@ Alchemy.decorateMethod(Blast.Decorators.memoize(), function getAppcacheManifest(
 /**
  * Add an appcache entry
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.7
  * @version  1.0.7
  *
- * @param    {String|Object}
+ * @param    {string|Object}
  */
 Alchemy.setMethod(function addAppcacheEntry(entry) {
 
@@ -1743,7 +1741,7 @@ Alchemy.setMethod(function addAppcacheEntry(entry) {
 /**
  * Get the body of an IncomingMessage
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.0
  * @version  1.3.18
  *
@@ -1768,14 +1766,16 @@ Alchemy.setMethod(function parseRequestBody(req, res, callback) {
 		return callback(null, req.body);
 	}
 
+	const that = this;
+
 	let content_type = req.headers['content-type'];
 
 	// Multipart data is handled by "formidable"
 	if (content_type && content_type.startsWith('multipart/form-data')) {
 
-		let form = new formidable.IncomingForm({
+		let form = new this.formidable.IncomingForm({
 			multiples     : true,
-			hashAlgorithm : alchemy.settings.file_hash_algorithm || 'sha1',
+			hashAlgorithm : this.settings.data_management.file_hash_algorithm || 'sha1',
 		});
 
 		form.parse(req, function parsedMultipart(err, form_fields, form_files) {
@@ -1827,7 +1827,7 @@ Alchemy.setMethod(function parseRequestBody(req, res, callback) {
 	// Regular form-encoded data
 	if (content_type && content_type.indexOf('form-urlencoded') > -1) {
 
-		urlFormBody(req, res, function parsedBody(err) {
+		this.url_form_body(req, res, function parsedBody(err) {
 
 			if (err && req.conduit && req.conduit.aborted) {
 				return callback(null);
@@ -1854,7 +1854,7 @@ Alchemy.setMethod(function parseRequestBody(req, res, callback) {
 	}
 
 	// Any other encoded data (like JSON)
-	anyBody(req, function parsedBody(err, body) {
+	this.any_body(req, function parsedBody(err, body) {
 
 		function handleResponse(err, body) {
 			if (err && req.conduit && req.conduit.aborted) {
@@ -1880,7 +1880,7 @@ Alchemy.setMethod(function parseRequestBody(req, res, callback) {
 
 		if (err?.type == 'invalid.content.type') {
 			if (!content_type || content_type.startsWith('text/')) {
-				textBody(req, handleResponse);
+				that.text_body(req, handleResponse);
 				return;
 			}
 		}
@@ -1892,7 +1892,7 @@ Alchemy.setMethod(function parseRequestBody(req, res, callback) {
 /**
  * Undo formidable's new array handling
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.3.16
  * @version  1.3.16
  *
@@ -1928,7 +1928,7 @@ function undoFormidableArray(data) {
 /**
  * Export all data
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.5
  * @version  1.0.5
  *
@@ -1946,7 +1946,7 @@ Alchemy.setMethod(function createExportStream(options) {
 /**
  * Export all data to stream
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.5
  * @version  1.0.5
  *
@@ -1957,7 +1957,7 @@ Alchemy.setMethod(function createExportStream(options) {
  */
 Alchemy.setMethod(function exportToStream(output, options) {
 
-	if (!alchemy.isStream(output)) {
+	if (!this.isStream(output)) {
 		if (!options) {
 			options = output;
 			output = null;
@@ -1999,7 +1999,7 @@ Alchemy.setMethod(function exportToStream(output, options) {
 /**
  * Import from a stream
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.5
  * @version  1.0.5
  *
@@ -2010,7 +2010,7 @@ Alchemy.setMethod(function exportToStream(output, options) {
  */
 Alchemy.setMethod(function importFromStream(input, options) {
 
-	if (!alchemy.isStream(input)) {
+	if (!this.isStream(input)) {
 		if (!options) {
 			options = input;
 			input = null;
@@ -2181,7 +2181,7 @@ Alchemy.setMethod(function importFromStream(input, options) {
 /**
  * Create a new schema
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.2.1
  * @version  1.2.1
  *
@@ -2195,14 +2195,14 @@ Alchemy.setMethod(function createSchema(parent) {
 /**
  * Get a client-side model
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.2.4
  * @version  1.2.4
  *
- * @param   {String}   name
- * @param   {Object}   options
+ * @param    {string}   name
+ * @param    {Object}   options
  *
- * @return  {Model}
+ * @return   {Model}
  */
 Alchemy.setMethod(function getClientModel(name, init, options) {
 	return Classes.Alchemy.Client.Base.prototype.getModel.call(this, name, init, options);
@@ -2213,12 +2213,12 @@ let error_handler_count = 0;
 /**
  * Register an error handler
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.3.11
  * @version  1.3.11
  *
- * @param   {Function}   callback
- * @param   {Number}     weight
+ * @param    {Function}   callback
+ * @param    {number}     weight
  */
 Alchemy.setMethod(function registerErrorHandler(callback, weight) {
 
@@ -2246,12 +2246,12 @@ Alchemy.setMethod(function registerErrorHandler(callback, weight) {
 /**
  * Process the given error
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.3.11
  * @version  1.3.11
  *
- * @param   {Error}     error
- * @param   {Object}    info
+ * @param    {Error}     error
+ * @param    {Object}    info
  */
 Alchemy.setMethod(async function registerError(error, info = {}) {
 
@@ -2284,88 +2284,126 @@ Alchemy.setMethod(async function registerError(error, info = {}) {
 	return handle_count;
 });
 
+let starting;
+
 /**
- * Initialize the error handler (if it's enabled)
+ * Only start the server after this function has been called
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
- * @since    1.3.11
- * @version  1.3.11
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    0.0.1
+ * @version  1.1.5
+ *
+ * @param    {Function}   callback   The optional callback after alchemy is ready
+ *
+ * @return   {Pledge}
  */
-function initializeErrorHandler() {
+Alchemy.setMethod(function start(options, callback) {
+
+	if (typeof options == 'function') {
+		callback = options;
+		options = {};
+	}
+
+	if (!options) {
+		options = {};
+	}
 
-	const config = this.settings.errors ?? {};
+	// If silent is true, don't output anything
+	if (options.silent == true) {
+		this.setSetting('debugging.silent', true);
+	}
 
-	if (config.handle_uncaught) {
-		this.registerErrorHandler((error, info) => {
+	if (starting) {
+		return this.ready(callback);
+	}
 
-			let message;
+	if (Object.size(Blast.loaded_versions) > 1) {
+		log.warn(Object.size(Blast.loaded_versions), 'versions of Protoblast have been loaded, this can cause problems!');
+	}
 
-			if (info?.promise) {
-				message = 'Unhandled promise rejection';
-			} else {
-				message = 'Uncaught exception';
-			}
+	if (options.client_mode) {
+		this.setSetting('client_mode', true);
+	} else {
+		if (alchemy.settings.no_default_file) {
+			log.warn('Could not find default settings file at "' + alchemy.settings.no_default_file + '.js"');
+		}
 
-			alchemy.printLog('error', [message, String(error), error], {err: error, level: -2});
-		}, 1);
+		if (alchemy.settings.no_local_file) {
+			log.warn('Could not find local settings file');
+		}
+
+		if (alchemy.settings.no_env_file) {
+			log.warn('Could not find environment settings file at "' + alchemy.settings.no_env_file + '.js"');
+		}
 	}
-}
 
-/**
- * The alchemy global, where everything will be stored
- *
- * @author   Jelle De Loecker   <jelle@develry.be>
- * @since    0.0.1
- * @version  0.4.0
- *
- * @type     {Alchemy}
- */
-DEFINE('alchemy', new Alchemy());
+	// Indicate the server is starting
+	starting = true;
+
+	// Start the stages
+	STAGES.launch([
+		'load_app',
+		'datasource',
+		'tasks',
+		'settings',
+		'routes',
+		'server',
+	]);
+
+	// Make sure Blast has executed everything that's still waiting
+	Blast.doLoaded();
+
+	// Call the `afterStart` method
+	this.ready(() => this.afterStart());
+
+	// Schedule the callback
+	return this.ready(callback);
+});
 
 /**
- * Define the log function
+ * Stop the server
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
- * @since    0.0.1
- * @version  0.4.0
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.0.3
+ * @version  1.0.3
  *
- * @type     {Function}
+ * @param    {Function}   callback   The optional callback after alchemy has stopped
  */
-DEFINE('log', alchemy.log);
+Alchemy.setMethod(function stop(callback) {
 
-for (let key in alchemy.Janeway.LEVELS) {
-	let name = key.toLowerCase();
-	let val = alchemy.Janeway.LEVELS[key];
+	this.server.close(function closed() {
 
-	log[name] = function(...args) {
-		return alchemy.printLog(val, args, {level: 2});
-	};
-}
+		if (callback) {
+			callback();
+		}
 
-log.warn = log.warning;
+	});
+
+});
 
 /**
- * Define the todo log function
- *
- * @author   Jelle De Loecker   <jelle@develry.be>
- * @since    0.2.0
- * @version  0.4.0
+ * Initialize the error handler (if it's enabled)
  *
- * @type     {Function}
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.3.11
+ * @version  1.4.0
  */
-log.todo = function todo(...args) {
+function initializeErrorHandler() {
 
-	var options = {
-		gutter: alchemy.Janeway.esc(91) + '\u2620 Todo:' + alchemy.Janeway.esc(39),
-		level: 2
-	};
+	if (!this.settings.errors.handle_uncaught) {
+		return;
+	}
+
+	this.registerErrorHandler((error, info) => {
+
+		let message;
 
-	return alchemy.printLog(alchemy.TODO, args, options);
-};
+		if (info?.promise) {
+			message = 'Unhandled promise rejection';
+		} else {
+			message = 'Uncaught exception';
+		}
 
-const anyBody        = alchemy.use('body/any'),
-      formBody       = alchemy.use('body/form'),
-      textBody       = alchemy.use('body'),
-      formidable     = alchemy.use('formidable'),
-      bodyParser     = alchemy.use('body-parser'),
-      urlFormBody    = bodyParser.urlencoded({extended: true});
+		this.printLog('error', [message, String(error), error], {err: error, level: -2});
+	}, 1);
+}