alchemymvc 1.3.17 → 1.3.18

package/lib/class/conduit.js

@@ -125,12 +125,23 @@ Conduit.setProperty(function scene() {
 	return this.getSession().getScene(this.scene_id);
 });
 
+/**
+ * The session cookie name to use
+ *
+ * @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';
+});
+
 /**
  * Enforce the scene_id
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.1.0
- * @version  1.3.10
+ * @version  1.3.18
  */
 Conduit.enforceProperty(function scene_id(new_value, old_value) {
 
@@ -160,7 +171,10 @@ Conduit.enforceProperty(function scene_id(new_value, old_value) {
 				path: path,
 
 				// Cookie should not live for more than 15 seconds
-				maxAge: 1000 * 15
+				maxAge: 1000 * 15,
+
+				// It should be restricted to the same domain
+				domain: false,
 			});
 		}
 	}
@@ -259,12 +273,17 @@ Conduit.setProperty(function is_secure() {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.1.0
- * @version  1.1.0
+ * @version  1.3.18
  *
- * @param    {Object}
+ * @param    {Object|String}
  */
 Conduit.setMethod(function setRequestBody(body) {
 
+	if (typeof body == 'string') {
+		this.body = body;
+		return;
+	}
+
 	if (!body) {
 		return;
 	}
@@ -492,20 +511,18 @@ Conduit.setMethod(function time() {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.3.17
+ * @version  1.3.18
  *
  * @param    {IncomingMessage}   req
  * @param    {ServerResponse}    res
  */
 Conduit.setMethod(async function parseRequest() {
 
-	var protocol,
-	    section;
-
 	if (this.method == null && this.request && this.request.method) {
 		this.method = this.request.method.toLowerCase();
 	}
 
+	this.parseUrl();
 	this.parseShortcuts();
 	this.parseLanguages();
 	this.parsePrefix();
@@ -529,11 +546,25 @@ Conduit.setMethod(async function parseRequest() {
 		this.overrideResponseUrl(new_url);
 	}
 
+	this.parseUrl();
+});
+
+/**
+ * Parse the url if it hasn't been done already
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.18
+ * @version  1.3.18
+ */
+Conduit.setMethod(function parseUrl() {
+
 	// If the url has already been parsed, return early
 	if (this.url) {
-		return;
+		return false;
 	}
 
+	let protocol;
+
 	if (alchemy.settings.assume_https) {
 		protocol = 'https://';
 	} else if (this.headers['x-forwarded-proto']) {
@@ -557,10 +588,10 @@ Conduit.setMethod(async function parseRequest() {
 
 	// 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+'';
+		alchemy.setUrl(this.url);
 	}
 
-	let path = this.path;
+	let path = this.original_path;
 
 	if (this.prefix) {
 		path = '/' + this.prefix + '/' + path;
@@ -2290,7 +2321,7 @@ Conduit.setMethod(function _sendStream(stream, options) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.3.6
+ * @version  1.3.18
  *
  * @param    {Boolean}   create   Create a session if none exist
  *
@@ -2303,13 +2334,10 @@ Conduit.setMethod(function getSession(allow_create = true) {
 		return this.sessionData;
 	}
 
-	let cookie_name,
+	let cookie_name = this.session_cookie_name,
 	    session_id,
 	    session;
 
-	// Set the name of the cookie (could change in the future)
-	cookie_name = alchemy.settings.session_key || 'alchemy_sid';
-
 	// Get the ID of the session
 	session_id = this.cookie(cookie_name);
 
@@ -2473,9 +2501,9 @@ Conduit.setMethod(function setRouteParameters(data) {
 /**
  * Get/set a cookie
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  0.4.2
+ * @version  1.3.18
  *
  * @param    {String}   name
  * @param    {Mixed}    value
@@ -2483,10 +2511,6 @@ Conduit.setMethod(function setRouteParameters(data) {
  */
 Conduit.setMethod(function cookie(name, value, options) {
 
-	var header,
-	    arr,
-	    key;
-
 	// Return if cookies are disabled
 	if (!alchemy.settings.cookies) {
 		return;
@@ -2517,12 +2541,34 @@ Conduit.setMethod(function cookie(name, value, options) {
 	// Store it in the new_cookies object, for quick access
 	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,
+		    actual_domain = this.url.hostname;
+
+		if (wanted_domain != actual_domain) {
+			// You can only set a cookie on the current domain,
+			// or a parent domain. But not on a child domain.
+			if (wanted_domain.length < actual_domain.length && actual_domain.endsWith(wanted_domain)) {
+				// It's allowed!
+			} else {
+				// When on a domain like "11ways.be" you
+				// can not set a cookie for "www.11ways.be"
+				wanted_domain = false;
+			}
+		}
+
+		if (wanted_domain) {
+			options.domain = wanted_domain;
+		}
+	}
+
 	if (this.websocket) {
 		return this.socket.emit('alchemy-set-cookie', {name: name, value: value, options: options});
 	}
 
 	// Create the basic header string
-	header = String.encodeCookie(name, value, options);
+	let header = String.encodeCookie(name, value, options);
 
 	// Add this to the cookieheader array
 	this.new_cookie_header.push(header);

package/lib/init/alchemy.js

@@ -338,7 +338,7 @@ Alchemy.setMethod(function isTooBusyForRequests() {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.3.1
- * @version  1.3.2
+ * @version  1.3.18
  *
  * @return   {Boolean}
  */
@@ -348,11 +348,11 @@ Alchemy.setMethod(function isTooBusyForAjax() {
 		return false;
 	}
 
-	let lag = this.lagInMs();
-
-	let max_event_loop_lag = alchemy.settings.max_event_loop_lag || alchemy.settings.toobusy;
+	let max_event_loop_lag = alchemy.settings.max_event_loop_lag ?? alchemy.settings.toobusy;
 
 	if (max_event_loop_lag) {
+		let lag = this.lagInMs();
+
 		if (lag > (max_event_loop_lag * 3)) {
 			return true;
 		}
@@ -361,6 +361,28 @@ Alchemy.setMethod(function isTooBusyForAjax() {
 	return false;
 });
 
+/**
+ * Set the maximum event loop lag before the server is considered overloaded
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.18
+ * @version  1.3.18
+ *
+ * @param    {Number}   max_lag
+ */
+Alchemy.setMethod(function setMaxEventLoopLag(max_lag) {
+
+	if (typeof max_lag != 'number' || !isFinite(max_lag)) {
+		max_lag = null;
+	}
+
+	if (max_lag == null) {
+		max_lag = 70;
+	}
+
+	this.settings.max_event_loop_lag = max_lag;
+});
+
 /**
  * Called after the server has started
  *
@@ -588,7 +610,7 @@ Alchemy.setMethod(function printLog(level, args, options) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.4.0
- * @version  1.3.3
+ * @version  1.3.18
  */
 Alchemy.setMethod(function loadSettings() {
 
@@ -726,8 +748,10 @@ Alchemy.setMethod(function loadSettings() {
 		settings.url = this.argv.url;
 	}
 
-	if (settings.url && settings.url.indexOf('{') > -1) {
-		settings.url = settings.url.assign(settings);
+	this.setUrl(settings.url);
+
+	if (settings.cookie_domain) {
+		this.setCookieDomain(settings.cookie_domain);
 	}
 
 	if (this.argv.preload) {
@@ -780,10 +804,76 @@ Alchemy.setMethod(function loadSettings() {
 		this.doPreload();
 	}
 
+	this.setMaxEventLoopLag(settings.max_event_loop_lag);
+
 	// Set the debug value
 	global.DEBUG = settings.debug;
 });
 
+/**
+ * Set the main url
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.18
+ * @version  1.3.18
+ *
+ * @param    {RURL|String}   value
+ */
+Alchemy.setMethod(function setUrl(value) {
+
+	if (value) {
+		value = ''+value;
+
+		if (value.indexOf('{') > -1) {
+			value = value.assign(this.settings);
+		}
+	}
+
+	this.settings.url = value;
+
+	if (this.settings.cookie_domain === true || this.settings.cookie_domain == null) {
+		this.setCookieDomain(value);
+	}
+});
+
+/**
+ * Set the cookie domain
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.18
+ * @version  1.3.18
+ *
+ * @param    {RURL|String}   value
+ */
+Alchemy.setMethod(function setCookieDomain(value) {
+
+	if (value === false) {
+		this.settings.cookie_domain = false;
+		return;
+	}
+
+	if (!value) {
+		value = this.settings.url;
+	}
+
+	if (!value) {
+		return;
+	}
+
+	value = ''+value;
+
+	if (value.indexOf('{') > -1) {
+		value = value.assign(this.settings);
+	}
+
+	if (value.indexOf('/') > -1) {
+		let url = RURL.parse(value);
+		value = url.hostname;
+	}
+
+	this.settings.cookie_domain = value;
+});
+
 /**
  * Set status
  *
@@ -1651,7 +1741,7 @@ Alchemy.setMethod(function addAppcacheEntry(entry) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.1.0
- * @version  1.3.0
+ * @version  1.3.18
  *
  * @param    {IncomingMessage}   req
  * @param    {OutgoingMessage}   res       Optional
@@ -1674,8 +1764,10 @@ Alchemy.setMethod(function parseRequestBody(req, res, callback) {
 		return callback(null, req.body);
 	}
 
+	let content_type = req.headers['content-type'];
+
 	// Multipart data is handled by "formidable"
-	if (req.headers['content-type'] && req.headers['content-type'].startsWith('multipart/form-data')) {
+	if (content_type && content_type.startsWith('multipart/form-data')) {
 
 		let form = new formidable.IncomingForm({
 			multiples     : true,
@@ -1729,7 +1821,7 @@ Alchemy.setMethod(function parseRequestBody(req, res, callback) {
 	}
 
 	// Regular form-encoded data
-	if (req.headers['content-type'] && req.headers['content-type'].indexOf('form-urlencoded') > -1) {
+	if (content_type && content_type.indexOf('form-urlencoded') > -1) {
 
 		urlFormBody(req, res, function parsedBody(err) {
 
@@ -1760,25 +1852,36 @@ Alchemy.setMethod(function parseRequestBody(req, res, callback) {
 	// Any other encoded data (like JSON)
 	anyBody(req, function parsedBody(err, body) {
 
-		if (err && req.conduit && req.conduit.aborted) {
-			return callback(null);
+		function handleResponse(err, body) {
+			if (err && req.conduit && req.conduit.aborted) {
+				return callback(null);
+			}
+	
+			// You can't send files using a regular post
+			req.files = {};
+	
+			if (err) {
+				log.error('Error parsing body data', {err: err});
+				req.body = {};
+			} else {
+				req.body = body;
+	
+				if (conduit) {
+					conduit.setRequestBody(body);
+				}
+			}
+	
+			callback(null, req.body);
 		}
 
-		// You can't send files using a regular post
-		req.files = {};
-
-		if (err) {
-			log.error('Error parsing body data', {err: err});
-			req.body = {};
-		} else {
-			req.body = body;
-
-			if (conduit) {
-				conduit.setRequestBody(body);
+		if (err?.type == 'invalid.content.type') {
+			if (!content_type || content_type.startsWith('text/')) {
+				textBody(req, handleResponse);
+				return;
 			}
 		}
 
-		callback(null, req.body);
+		handleResponse(err, body);
 	});
 });
 
@@ -2258,6 +2361,7 @@ log.todo = function todo(...args) {
 
 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});

package/lib/init/requirements.js

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

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "alchemymvc",
 	"description": "MVC framework for Node.js",
-	"version": "1.3.17",
+	"version": "1.3.18",
 	"author": "Jelle De Loecker <jelle@elevenways.be>",
 	"keywords": [
 		"alchemy",