alchemymvc 1.3.16 → 1.3.18

package/lib/core/base.js

@@ -35,7 +35,7 @@ __Protoblast.getGroup = function getGroup(name) {
  *
  * @author   Jelle De Loecker <jelle@develry.be>
  * @since    0.3.0
- * @version  1.2.6
+ * @version  1.3.17
  */
 Base.constitute(function setBasicBehaviour() {
 
@@ -134,6 +134,28 @@ Base.constitute(function setBasicBehaviour() {
 		this.setStatic('title', this.createClassTitle(name), false);
 	}
 
+	// And also set the type path
+	if (!this.hasOwnProperty('type_path')) {
+		let namespace = this.namespace;
+		let parent_namespace = this.super?.namespace;
+		let type_path = this.type_name;
+		
+		// Add extra identifier info if this child comes from another namespace
+		if (namespace && namespace != parent_namespace) {
+			if (parent_namespace && namespace.startsWith(parent_namespace)) {
+				namespace = namespace.after(parent_namespace);
+
+				if (namespace[0] == '.') {
+					namespace = namespace.slice(1);
+				}
+			}
+
+			type_path = Blast.Bound.String.underscore(Blast.Bound.String.slug(namespace)) + '.' + type_path;
+		}
+
+		this.setStatic('type_path', type_path, false);
+	}
+
 	// Add this class to the shared group
 	shared_group[this.type_name] = this;
 });

package/lib/core/middleware.js

@@ -311,7 +311,7 @@ Alchemy.setMethod(function sourcemapMiddleware(req, res, nextMiddleware) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.3.4
+ * @version  1.3.17
  *
  * @param    {String}   path
  * @param    {Object}   options
@@ -418,7 +418,7 @@ Alchemy.setMethod(function minifyScript(path, options, callback) {
 			}
 		}
 
-		if (should_minify) {
+		if (should_minify && typeof Terser?.minify == 'function') {
 
 			// Force Blast.isNode & Blast.isBrowser to be replaced later
 			data = data.replaceAll('Blast.isNode', '__BLAST_IS_NODE');

package/lib/init/alchemy.js

@@ -135,7 +135,11 @@ global.Alchemy = Function.inherits('Informer', 'Alchemy', function Alchemy() {
 			this.startJaneway();
 		}
 	} catch (err) {
-		log.warn('Failed to start Janeway:', err);
+		if (typeof log != 'undefined') {
+			log.warn('Failed to start Janeway:', err);
+		} else {
+			console.warn('Failed to start Janeway:', err);
+		}
 	}
 });
 
@@ -334,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}
  */
@@ -344,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;
 		}
@@ -357,6 +361,83 @@ 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
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.17
+ * @version  1.3.17
+ */
+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>
+ * @since    1.3.17
+ * @version  1.3.17
+ *
+ * @param    {Number}   pid
+ *
+ * @return   {Boolean}
+ */
+Alchemy.setMethod(function isProcessRunning(pid) {
+
+	if (!pid) {
+		return false;
+	}
+
+	try {
+		return process.kill(pid, 0);
+	} catch (e) {
+		return e.code === 'EPERM'
+	}
+});
+
 /**
  * Start janeway
  *
@@ -441,6 +522,13 @@ Alchemy.setMethod(function startJaneway(options) {
 			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;
 	}
 
@@ -522,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() {
 
@@ -660,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) {
@@ -714,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
  *
@@ -1051,7 +1207,7 @@ Alchemy.setMethod(function searchModule(startPath, moduleName, recurse) {
  * 
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.0.1
- * @version  1.3.16
+ * @version  1.3.17
  *
  * @param    {String}   moduleName
  * @param    {Object}   options
@@ -1183,10 +1339,22 @@ Alchemy.setMethod(function findModule(moduleName, options) {
 			// Make sure this does not support CJS.
 			// Some packages have the `module` type, but do have CJS exports too
 			if (!supports_cjs) {
-				let exports = package_json.exports?.['.'];
 
-				if (exports?.require) {
+				if (package_json.module && package_json.main) {
 					supports_cjs = true;
+				} else {
+
+					let exports = package_json.exports?.['.'];
+
+					if (Array.isArray(exports)) {
+						for (let entry of exports) {
+							if (entry && typeof entry == 'object' && entry.require) {
+								supports_cjs = true;
+							}
+						}
+					} else if (exports?.require) {
+						supports_cjs = true;
+					}
 				}
 			}
 
@@ -1573,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
@@ -1596,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,
@@ -1651,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) {
 
@@ -1682,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);
 	});
 });
 
@@ -2180,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.16",
+	"version": "1.3.18",
 	"author": "Jelle De Loecker <jelle@elevenways.be>",
 	"keywords": [
 		"alchemy",
@@ -45,7 +45,7 @@
 		"index.js"
 	],
 	"optionalDependencies": {
-		"janeway"          : "~0.4.0",
+		"janeway"          : "~0.4.2",
 		"less"             : "~4.2.0",
 		"sass"             : "~1.68.0",
 		"sass-embedded"    : "~1.67.0",