alchemymvc 1.3.22 → 1.4.0-alpha.2

package/lib/class/conduit.js

@@ -14,7 +14,7 @@ var libstream  = alchemy.use('stream'),
 /**
  * The Conduit Class
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.2.0
  *
@@ -37,7 +37,7 @@ var Conduit = Function.inherits('Alchemy.Base', 'Alchemy.Conduit', function Cond
 	this._debugConduitInitialize = this._debugObject;
 
 	// Allow use of the log in the views
-	if (alchemy.settings.debug) {
+	if (alchemy.settings.debugging.debug) {
 		this.internal('debuglog', {_placeholder_: 'debuglog'});
 	}
 
@@ -61,7 +61,7 @@ var Conduit = Function.inherits('Alchemy.Base', 'Alchemy.Conduit', function Cond
 /**
  * Deprecated property names
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.0
  * @version  1.1.0
  */
@@ -75,7 +75,7 @@ Conduit.setDeprecatedProperty('sceneId',         'scene_id');
 /**
  * Return the cookies
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  0.2.0
  */
@@ -86,7 +86,7 @@ Conduit.prepareProperty(function cookies() {
 /**
  * Return the parsed useragent string
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  0.5.0
  */
@@ -97,7 +97,7 @@ Conduit.prepareProperty(function useragent() {
 /**
  * Create a Hawkejs Renderer
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.1.5
  */
@@ -117,7 +117,7 @@ Conduit.prepareProperty(function renderer() {
 /**
  * Get the SessionScene instance
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.3.10
  * @version  1.3.10
  */
@@ -128,18 +128,18 @@ Conduit.setProperty(function scene() {
 /**
  * The session cookie name to use
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.3.18
  * @version  1.3.18
  */
 Conduit.setProperty(function session_cookie_name() {
-	return alchemy.settings.session_key || 'alchemy_sid';
+	return alchemy.settings.sessions.cookie_name || 'alchemy_sid';
 });
 
 /**
  * Enforce the scene_id
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.0
  * @version  1.3.18
  */
@@ -187,7 +187,7 @@ Conduit.enforceProperty(function scene_id(new_value, old_value) {
 /**
  * Enforce the active_prefix
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.0
  * @version  1.1.5
  */
@@ -226,7 +226,7 @@ Conduit.enforceProperty(function active_prefix(new_value, old_value) {
 /**
  * Get a session object by id
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  0.2.0
  */
@@ -237,7 +237,7 @@ Conduit.setStatic(function getSessionById(id) {
 /**
  * See if this is a secure connection
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.4.2
  * @version  1.0.2
  */
@@ -245,7 +245,7 @@ Conduit.setProperty(function is_secure() {
 
 	var protocol;
 
-	if (alchemy.settings.assume_https) {
+	if (alchemy.settings.network.assume_https) {
 		return true;
 	}
 
@@ -271,11 +271,11 @@ Conduit.setProperty(function is_secure() {
 /**
  * Set the request body
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.0
  * @version  1.3.18
  *
- * @param    {Object|String}
+ * @param    {Object|string}
  */
 Conduit.setMethod(function setRequestBody(body) {
 
@@ -294,7 +294,7 @@ Conduit.setMethod(function setRequestBody(body) {
 /**
  * Has the given route been tested yet?
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.2.5
  * @version  1.2.5
  *
@@ -312,7 +312,7 @@ Conduit.setMethod(function hasRouteBeenTested(route) {
 /**
  * Mark this route as having been tested
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.2.5
  * @version  1.2.5
  *
@@ -331,11 +331,11 @@ Conduit.setMethod(function markRouteAsTested(route) {
  * Rewrite a certain URL parameter
  * (Causing some kind of redirect)
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.2.5
  * @version  1.2.5
  *
- * @param    {String}   route_param
+ * @param    {string}   route_param
  * @param    {*}        new_value
  */
 Conduit.setMethod(function rewriteRequestRouteParam(route_param, new_value) {
@@ -350,7 +350,7 @@ Conduit.setMethod(function rewriteRequestRouteParam(route_param, new_value) {
 /**
  * Set the request files
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.0
  * @version  1.1.0
  *
@@ -368,7 +368,7 @@ Conduit.setMethod(function setRequestFiles(files) {
 /**
  * Set the request files
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.2.0
  * @version  1.3.0
  *
@@ -403,7 +403,7 @@ function _setRequestFiles(conduit, files, target) {
 /**
  * Don't convert a conduit to any special json data
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  0.2.0
  */
@@ -414,7 +414,7 @@ Conduit.setMethod(function toJSON() {
 /**
  * Set the request & response objects
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.2.0
  * @version  1.2.0
  */
@@ -445,7 +445,7 @@ Conduit.setMethod(function setReqRes(req, res) {
 /**
  * Init values
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.3.3
  * @version  1.3.15
  */
@@ -498,7 +498,7 @@ Conduit.setMethod(function initValues() {
 /**
  * Get the time since the conduit was made
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.1.0
  */
@@ -509,7 +509,7 @@ Conduit.setMethod(function time() {
 /**
  * Parse the request, get information from the url
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.3.18
  *
@@ -552,7 +552,7 @@ Conduit.setMethod(async function parseRequest() {
 /**
  * Parse the complete request URL if it hasn't been done yet
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.3.18
  * @version  1.3.19
  */
@@ -565,7 +565,7 @@ Conduit.setMethod(function parseUrl() {
 
 	let protocol;
 
-	if (alchemy.settings.assume_https) {
+	if (alchemy.settings.network.assume_https) {
 		protocol = 'https://';
 	} else if (this.headers['x-forwarded-proto']) {
 		protocol = this.headers['x-forwarded-proto'];
@@ -592,7 +592,7 @@ Conduit.setMethod(function parseUrl() {
 	this.url.hostname = host;
 
 	// If no URL was set, use the first requests URL (without the path)
-	if (!alchemy.settings.url && host) {
+	if (!alchemy.settings.network.main_url && host) {
 		alchemy.setUrl(this.url);
 	}
 
@@ -605,7 +605,7 @@ Conduit.setMethod(function parseUrl() {
 /**
  * Parse the headers for shortcuts
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.3.17
  */
@@ -642,7 +642,7 @@ Conduit.setMethod(function parseShortcuts() {
 /**
  * Sort the parsed accept-language header array
  *
- * @author   Jelle De Loecker       <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.0.1
  * @version  0.0.1
  *
@@ -662,7 +662,7 @@ function qualityCmp(a, b) {
 /**
  * Parses the HTTP accept-language header
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.0.1
  * @version  0.2.0
  */
@@ -726,7 +726,7 @@ Conduit.setMethod(function parseLanguages() {
  * Parses accept-encoding strings
  *
  * @author   jshttp
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  0.2.0
  */
@@ -759,7 +759,7 @@ function parseEncoding(s, i) {
  * Parses accept-encoding strings
  *
  * @author   jshttp
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  0.2.0
  */
@@ -782,7 +782,7 @@ function specify(encoding, spec, index) {
 /**
  * Parses the HTTP accept-encoding header
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  0.2.0
  */
@@ -839,7 +839,7 @@ Conduit.setMethod(function parseAcceptEncoding() {
 /**
  * See if the wanted encoding is accepted by the client
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  0.2.0
  */
@@ -866,7 +866,7 @@ Conduit.setMethod(function accepts(encoding) {
 /**
  * Create a loopback conduit
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.1.3
  *
@@ -882,7 +882,7 @@ Conduit.setMethod(function loopback(args, callback) {
 /**
  * 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.1.0
  */
@@ -982,7 +982,7 @@ Conduit.setMethod(function parsePrefix() {
 /**
  * Get the section
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  0.2.1
  */
@@ -1006,11 +1006,11 @@ Conduit.setMethod(function parseSection() {
 /**
  * Get a route by its name
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  0.2.0
  *
- * @param    {String|Object}   name   The name of the route
+ * @param    {string|Object}   name   The name of the route
  */
 Conduit.setMethod(function getRouteByName(name) {
 
@@ -1027,13 +1027,13 @@ Conduit.setMethod(function getRouteByName(name) {
 /**
  * Get the Route instance & named parameters
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.3.0
  *
  * @param    {Route}   after_route   Only check routes after this one
  *
- * @return   {Boolean}   Continue processing this request or not?
+ * @return   {boolean}   Continue processing this request or not?
  */
 Conduit.setMethod(async function parseRoute(after_route) {
 
@@ -1109,7 +1109,7 @@ Conduit.setMethod(async function parseRoute(after_route) {
 /**
  * Run the middleware
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.1.5
  */
@@ -1224,7 +1224,7 @@ Conduit.setMethod(async function callMiddleware() {
 /**
  * Create a new Hawkejs' ViewRender instance
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.3.17
  */
@@ -1255,7 +1255,7 @@ Conduit.setMethod(function prepareViewRender() {
 /**
  * Call the handler of this route when parsing is finished
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.3.16
  */
@@ -1265,14 +1265,14 @@ Conduit.setMethod(function callHandler() {
 
 		if (this.route_mismatch) {
 
-			if (alchemy.settings.debug) {
+			if (alchemy.settings.debugging.debug) {
 				console.log('Route method not allowed:', this);
 			}
 
 			this.error(405, 'Method Not Allowed', false);
 
 		} else {
-			if (alchemy.settings.debug && this.original_path.indexOf('.js.map') == -1) {
+			if (alchemy.settings.debugging.debug && this.original_path.indexOf('.js.map') == -1) {
 				console.log('Route not found:', this);
 			}
 
@@ -1288,7 +1288,7 @@ Conduit.setMethod(function callHandler() {
 /**
  * Put this request in a queue
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.3.1
  * @version  1.3.1
  *
@@ -1312,11 +1312,11 @@ Conduit.setMethod(function postponeAndQueue(options) {
  *
  * This does not stop the current request from processing.
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.3.1
  * @version  1.3.1
  *
- * @param    {Number|Object}   options   Options or time to wait
+ * @param    {number|Object}   options   Options or time to wait
  *
  * @return   {Alchemy.Conduit.Postponement}
  */
@@ -1337,11 +1337,11 @@ Conduit.setMethod(function postponeRequest(options) {
  *
  * This does not stop the current request from processing.
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.0
  * @version  1.3.1
  *
- * @param    {Number|Object}   options   Options or time to wait
+ * @param    {number|Object}   options   Options or time to wait
  *
  * @return   {Alchemy.Conduit.Postponement}
  */
@@ -1361,7 +1361,7 @@ Conduit.setMethod(function postponeResponse(options) {
 /**
  * Handle the postponement
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.3.1
  * @version  1.3.1
  *
@@ -1411,11 +1411,11 @@ Conduit.setMethod(function _postpone(options) {
  *
  * @deprecated   Use {@link #setResponseUrl} instead
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.2.5
  * @version  1.3.0
  *
- * @param    {String|RURL}   url
+ * @param    {string|RURL}   url
  */
 Conduit.setMethod(function overrideResponseUrl(url) {
 	return this.setResponseUrl(url);
@@ -1424,11 +1424,11 @@ Conduit.setMethod(function overrideResponseUrl(url) {
 /**
  * Set the response url
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.3.0
  * @version  1.3.0
  *
- * @param    {String|RURL|Boolean}   new_url
+ * @param    {string|RURL|boolean}   new_url
  */
 Conduit.setMethod(function setResponseUrl(new_url) {
 
@@ -1454,12 +1454,12 @@ Conduit.setMethod(function setResponseUrl(new_url) {
 /**
  * Redirect to another url
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.3.17
  *
- * @param    {Number}          status    3xx redirection codes. 302 (temporary redirect) by default
- * @param    {String|Object}   options   Options or url
+ * @param    {number}          status    3xx redirection codes. 302 (temporary redirect) by default
+ * @param    {string|Object}   options   Options or url
  */
 Conduit.setMethod(function redirect(status, options) {
 
@@ -1541,12 +1541,12 @@ Conduit.setMethod(function redirect(status, options) {
 	this.status = status;
 
 	// Make sure the url is an internal one if no hard refresh is requested
-	if (!hard_refresh && alchemy.settings.url) {
+	if (!hard_refresh && alchemy.settings.network.main_url) {
 		let rurl = RURL.parse(url);
 
 		// If an explicit hostname is set, this might be an external url
 		if (rurl.hostname) {
-			let base_url = RURL.parse(alchemy.settings.url);
+			let base_url = RURL.parse(alchemy.settings.network.main_url);
 
 			if (base_url.hostname != rurl.hostname) {
 				hard_refresh = true;
@@ -1576,13 +1576,13 @@ Conduit.setMethod(function redirect(status, options) {
 /**
  * Respond with an error
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.3.21
  *
  * @param    {Nulber}  status       Response statuscode
  * @param    {Error}   message      Optional error to send
- * @param    {Boolean} print_error  Print the error, defaults to true
+ * @param    {boolean} print_error  Print the error, defaults to true
  */
 Conduit.setMethod(function error(status, message, print_error) {
 
@@ -1683,11 +1683,11 @@ Conduit.setMethod(function error(status, message, print_error) {
 /**
  * Deny access
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.1.0
  *
- * @param    {Number}  status
+ * @param    {number}  status
  * @param    {Error}   message   optional error to send
  */
 Conduit.setMethod(function deny(status, message) {
@@ -1710,11 +1710,11 @@ Conduit.setMethod(function deny(status, message) {
  * The current user is not authorized and needs to log in
  * (Default implementation, is overriden by the acl plugin)
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.7
  * @version  1.0.7
  *
- * @param    {Boolean}   tried_auth   Indicate that this was an auth attempt
+ * @param    {boolean}   tried_auth   Indicate that this was an auth attempt
  */
 Conduit.setMethod(function notAuthorized(tried_auth) {
 	return this.deny();
@@ -1724,9 +1724,9 @@ Conduit.setMethod(function notAuthorized(tried_auth) {
  * The current user is authenticated, but not allowed
  * (Default implementation, is overriden by the acl plugin)
  *
- * @author        Jelle De Loecker   <jelle@elevenways.be>
- * @since         1.0.7
- * @version       1.1.0
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.0.7
+ * @version  1.1.0
  */
 Conduit.setMethod(function forbidden() {
 
@@ -1739,7 +1739,7 @@ Conduit.setMethod(function forbidden() {
 /**
  * Respond with a not found error status
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.1.0
  *
@@ -1769,7 +1769,7 @@ Conduit.setMethod(async function notFound(message) {
 /**
  * Respond with a "Not Modified" 304 status
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  0.4.0
  */
@@ -1781,11 +1781,11 @@ Conduit.setMethod(function notModified() {
 /**
  * Respond with text. Objects get JSON-dry encoded
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.3.0
  *
- * @param    {String|Object}   message
+ * @param    {string|Object}   message
  */
 Conduit.setMethod(function end(message) {
 
@@ -1811,7 +1811,7 @@ Conduit.setMethod(function end(message) {
 		}
 
 		// Use regular JSON if DRY has been disabled in settings
-		if (alchemy.settings.json_dry_response === false || this.json_dry === false) {
+		if (alchemy.settings.network.use_json_dry_response === false || this.json_dry === false) {
 			json_type = 'json';
 			json_fnc = JSON.stringify;
 		} else {
@@ -1833,7 +1833,7 @@ Conduit.setMethod(function end(message) {
 	cache = this.headers['cache-control'] || this.headers['pragma'];
 
 	// Only generate etags when caching is enabled locally & on the browser
-	if (alchemy.settings.cache !== false && (cache == null || cache != 'no-cache')) {
+	if (alchemy.settings.performance.cache !== false && (cache == null || cache != 'no-cache')) {
 
 		// Calculate the hash as etag
 		etag = alchemy.checksum(message);
@@ -1853,7 +1853,7 @@ Conduit.setMethod(function end(message) {
 	}
 
 	// No need to replace anything if debugging is disabled or the  log is empty
-	if (alchemy.settings.debug && this.debuglog && this.debuglog.length && message.indexOf('_placeholder_') > -1) {
+	if (alchemy.settings.debugging.debug && this.debuglog && this.debuglog.length && message.indexOf('_placeholder_') > -1) {
 		temp = JSON.dry(this.debuglog);
 		message = message.replace(/{\s*"_placeholder_":\s*"debuglog"\s*}/g, temp);
 		message = message.replace(/{\s*\\"_placeholder_\\":\s*\\"debuglog\\"\s*}/g, JSON.stringify(temp).slice(1,-1));
@@ -1861,7 +1861,7 @@ Conduit.setMethod(function end(message) {
 
 	// Compress the output if the client accepts it,
 	// but only if the file is at least 150 bytes
-	if (alchemy.settings.compression !== false && message.length > 150 && this.accepts('gzip')) {
+	if (alchemy.settings.network.use_compression !== false && message.length > 150 && this.accepts('gzip')) {
 
 		// Set the decompressed content-length for use in progress bars
 		this.setHeader('x-decompressed-content-length', Buffer.byteLength(message));
@@ -1885,7 +1885,7 @@ Conduit.setMethod(function end(message) {
 /**
  * End with a stream
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.3.22
  * @version  1.3.22
  */
@@ -1902,7 +1902,7 @@ Conduit.setMethod(function _endWithStream(stream) {
 /**
  * Call the actual end method
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.3.22
  */
@@ -1945,7 +1945,7 @@ Conduit.setMethod(function _end(message, encoding = 'utf-8') {
 /**
  * Flush the headers
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.3.22
  * @version  1.3.22
  */
@@ -1985,7 +1985,7 @@ Conduit.setMethod(function flushHeaders() {
 /**
  * Send a response to the client
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  0.2.0
  */
@@ -1997,7 +1997,7 @@ Conduit.setMethod(function send(content) {
  * Create the scene id (if it doesn't exist already)
  * We do this using cookies, so the HTML response can be cached
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.1.0
  */
@@ -2008,7 +2008,7 @@ Conduit.setMethod(function createScene() {
 /**
  * Render a view and send it to the client
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.3.17
  */
@@ -2093,7 +2093,7 @@ Conduit.setMethod(function render(template_name, options, callback) {
 /**
  * Convert a buffer into a stream
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.0
  * @version  1.1.0
  *
@@ -2116,11 +2116,11 @@ function bufferToStream(buffer) {
 /**
  * Send a file to the browser
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.3.0
  *
- * @param    {String}   path      The path on the server to send to the browser
+ * @param    {string}   path      The path on the server to send to the browser
  * @param    {Object}   options   Options, including headers
  */
 Conduit.setTypedMethod([Types.String, Types.Object.optional()], function serveFile(path, options = {}) {
@@ -2137,7 +2137,7 @@ Conduit.setTypedMethod([Types.String, Types.Object.optional()], function serveFi
 /**
  * Send a file to the browser
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.3.13
  *
@@ -2152,7 +2152,7 @@ Conduit.setTypedMethod([Types.Alchemy.Inode.File, Types.Object.optional()], asyn
 
 	let stats = await file.getStats();
 
-	if (alchemy.settings.cache && (!options.cache_time && options.cache_time !== false)) {
+	if (alchemy.settings.performance.cache && (!options.cache_time && options.cache_time !== false)) {
 		options.cache_time = stats.mtime;
 	}
 
@@ -2174,7 +2174,7 @@ Conduit.setTypedMethod([Types.Alchemy.Inode.File, Types.Object.optional()], asyn
 /**
  * Send a buffer to the client
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.3.0
  * @version  1.3.0
  *
@@ -2188,7 +2188,7 @@ Conduit.setTypedMethod([Buffer, Types.Object.optional()], function serveFile(buf
 /**
  * Send a stream to the client
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.3.0
  * @version  1.3.0
  *
@@ -2204,7 +2204,7 @@ Conduit.setTypedMethod([Types.Stream, Types.Object.optional()], function serveFi
 		is_text = true;
 	}
 
-	if (alchemy.settings.cache === false) {
+	if (alchemy.settings.performance.cache === false) {
 		options.cache_time = null;
 	}
 
@@ -2212,11 +2212,11 @@ Conduit.setTypedMethod([Types.Stream, Types.Object.optional()], function serveFi
 		options.compress = is_text;
 	}
 
-	if (options.compress && (alchemy.settings.compression === false || !this.accepts('gzip'))) {
+	if (options.compress && (alchemy.settings.network.use_compression === false || !this.accepts('gzip'))) {
 		options.compress = false;
 	}
 
-	if (options.cache_time && !alchemy.settings.cache) {
+	if (options.cache_time && !alchemy.settings.performance.cache) {
 		options.cache_time = false;
 	}
 
@@ -2230,7 +2230,7 @@ Conduit.setTypedMethod([Types.Stream, Types.Object.optional()], function serveFi
 /**
  * Send a stream to the client
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.3.0
  * @version  1.3.14
  *
@@ -2357,19 +2357,19 @@ Conduit.setMethod(function _sendStream(stream, options) {
 /**
  * Create a session
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.3.18
+ * @version  1.4.0
  *
- * @param    {Boolean}   create   Create a session if none exist
+ * @param    {boolean}   create   Create a session if none exist
  *
  * @return   {UserSession}
  */
 Conduit.setMethod(function getSession(allow_create = true) {
 
 	// Only do this once per request
-	if (this.sessionData != null) {
-		return this.sessionData;
+	if (this.session_instance != null) {
+		return this.session_instance;
 	}
 
 	let cookie_name = this.session_cookie_name,
@@ -2395,7 +2395,7 @@ Conduit.setMethod(function getSession(allow_create = true) {
 	}
 
 	if (session) {
-		this.sessionData = session;
+		this.session_instance = session;
 		session.request_count++;
 	} else {
 		return false;
@@ -2407,11 +2407,11 @@ Conduit.setMethod(function getSession(allow_create = true) {
 /**
  * Create a controller of the given type and attach this conduit
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.3.16
  * @version  1.3.16
  *
- * @param    {String}   controller_name
+ * @param    {string}   controller_name
  *
  * @return   {Controller}
  */
@@ -2435,19 +2435,21 @@ Conduit.setMethod(function getController(controller_name) {
 /**
  * Register live data bindings via websockets
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
- * @version  0.4.0
+ * @version  1.4.0
  */
 Conduit.setMethod(function registerBindings(arr) {
 
-	var data_ids;
+	const websockets = alchemy.settings.network.use_websockets;
 
 	// Don't do anything is websockets aren't enabled
-	if (!alchemy.settings.websockets) {
+	if (!websockets || websockets == 'never') {
 		return;
 	}
 
+	let data_ids;
+
 	if (arr) {
 		data_ids = arr;
 	} else {
@@ -2464,42 +2466,42 @@ Conduit.setMethod(function registerBindings(arr) {
 /**
  * Get a a value from the session object
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
- * @version  0.4.0
+ * @version  1.4.0
  *
- * @param    {String}   name
+ * @param    {string}   name
  * @param    {Mixed}    value
  *
  * @return   {Mixed}
  */
 Conduit.setMethod(function session(name, value) {
 
-	this.getSession();
+	const session = this.getSession();
 
 	if (arguments.length === 0) {
-		return this.sessionData;
+		return session;
 	}
 
 	if (arguments.length === 1) {
-		return this.sessionData[name];
+		return session.get(name);
 	}
 
-	this.sessionData[name] = value;
+	session.set(name, value);
 });
 
 /**
  * Get a route URL
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.2.7
  * @version  1.2.7
  *
- * @param    {String}   name
+ * @param    {string}   name
  * @param    {Object}   parameters
  * @param    {Object}   options
  *
- * @return   {String}
+ * @return   {string}
  */
 Conduit.setMethod(function routeUrl(name, parameters, options) {
 	return this.renderer.helpers.Router.routeUrl(name, parameters, options);
@@ -2508,11 +2510,11 @@ Conduit.setMethod(function routeUrl(name, parameters, options) {
 /**
  * Get a parameter from the route
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  0.2.0
  *
- * @param    {String}   name
+ * @param    {string}   name
  */
 Conduit.setMethod(function routeParam(name) {
 	return this.params[name];
@@ -2521,7 +2523,7 @@ Conduit.setMethod(function routeParam(name) {
 /**
  * Set route parameters
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.3.0
  * @version  1.3.0
  */
@@ -2539,18 +2541,18 @@ Conduit.setMethod(function setRouteParameters(data) {
 /**
  * Get/set a cookie
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.3.18
+ * @version  1.4.0
  *
- * @param    {String}   name
+ * @param    {string}   name
  * @param    {Mixed}    value
  * @param    {Object}   options
  */
 Conduit.setMethod(function cookie(name, value, options) {
 
 	// Return if cookies are disabled
-	if (!alchemy.settings.cookies) {
+	if (!alchemy.settings.frontend.cookies.enabled) {
 		return;
 	}
 
@@ -2580,8 +2582,8 @@ Conduit.setMethod(function cookie(name, value, options) {
 	this.new_cookies[name] = value;
 
 	// If there is no domain set, see if it is required
-	if ((options.domain === true || options.domain == null) && alchemy.settings.cookie_domain && this.url) {
-		let wanted_domain = alchemy.settings.cookie_domain,
+	if ((options.domain === true || options.domain == null) && alchemy.settings.frontend.cookies.domain && this.url) {
+		let wanted_domain = alchemy.settings.frontend.cookies.domain,
 		    actual_domain = this.url.hostname;
 
 		if (wanted_domain != actual_domain) {
@@ -2615,11 +2617,11 @@ Conduit.setMethod(function cookie(name, value, options) {
 /**
  * Set a response header
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.3.0
  *
- * @param    {String}   name
+ * @param    {string}   name
  * @param    {Mixed}    value
  */
 Conduit.setMethod(function setHeader(name, value) {
@@ -2638,11 +2640,11 @@ Conduit.setMethod(function setHeader(name, value) {
 /**
  * Get a response header
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.0
  * @version  1.1.0
  *
- * @param    {String}   name
+ * @param    {string}   name
  */
 Conduit.setMethod(function getHeader(name) {
 
@@ -2658,11 +2660,11 @@ Conduit.setMethod(function getHeader(name) {
 /**
  * Update data to this scene only
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  0.4.0
  *
- * @param    {String}   name
+ * @param    {string}   name
  * @param    {Mixed}    value
  */
 Conduit.setMethod(function update(name, value) {
@@ -2677,7 +2679,7 @@ Conduit.setMethod(function update(name, value) {
 /**
  * Push a flash message to the client
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  0.2.0
  */
@@ -2706,11 +2708,11 @@ Conduit.setMethod(function flash(message, options) {
 /**
  * Set a theme to use
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  0.2.0
  *
- * @param    {String}   name
+ * @param    {string}   name
  */
 Conduit.setMethod(function setTheme(name) {
 	this.theme = name;
@@ -2720,13 +2722,13 @@ Conduit.setMethod(function setTheme(name) {
 /**
  * Does this user support a certain feature?
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.4
  * @version  1.0.4
  *
- * @param    {String}   feature
+ * @param    {string}   feature
  *
- * @return   {Boolean}
+ * @return   {boolean}
  */
 Conduit.setMethod(function supports(feature) {
 
@@ -2764,15 +2766,15 @@ Conduit.setMethod(function supports(feature) {
  * This is mainly so we can prevent Server-Side-Renders from happening
  * when the system is already overloaded.
  *
- * @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}
  */
 Conduit.setMethod(function shouldBePostponed() {
 
-	if (!alchemy.settings.postpone_requests_on_overload) {
+	if (!alchemy.settings.performance.postpone_requests_on_overload) {
 		return false;
 	}
 
@@ -2827,11 +2829,11 @@ Conduit.setMethod(function shouldBePostponed() {
 /**
  * Broadcast data to every connected user
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.3.0
  * @version  1.3.16
  *
- * @param    {String}   type
+ * @param    {string}   type
  * @param    {Object}   data
  */
 Alchemy.setMethod(function broadcast(type, data) {
@@ -2845,7 +2847,7 @@ Alchemy.setMethod(function broadcast(type, data) {
 				return;
 			}
 
-			if (alchemy.settings.debug) {
+			if (alchemy.settings.debugging.debug) {
 				log.debug('Broadcasting', type, {data, scene: socket_conduit});
 			}
 
@@ -2857,9 +2859,9 @@ Alchemy.setMethod(function broadcast(type, data) {
 /**
  * Get the magic mimetype function
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.3.0
- * @version  0.3.0
+ * @version  1.4.0
  */
 function getMagic() {
 
@@ -2870,7 +2872,7 @@ function getMagic() {
 	}
 
 	// Get mmmagic module
-	mmmagic = alchemy.use('mmmagic')
+	mmmagic = alchemy.use('@picturae/mmmagic')
 
 	if (mmmagic) {
 		magic = new mmmagic.Magic(mmmagic.MAGIC_MIME_TYPE);