alchemymvc 1.3.10 → 1.3.12

package/lib/app/helper/socket_helper.js

@@ -352,7 +352,7 @@ Client.setMethod(function createStream() {
  *
  * @author    Jelle De Loecker   <jelle@elevenways.be>
  * @since     0.2.0
- * @version   1.3.10
+ * @version   1.3.12
  *
  * @param    {Function} callback
  */
@@ -386,7 +386,7 @@ Client.setMethod(function connect(address, data, callback) {
 
 	if (typeof io != 'undefined') {
 		io_client = io;
-	} else if (typeof alchemy != 'undefined') {
+	} else if (typeof alchemy?.use == 'function') {
 		io_client = alchemy.use('socket.io-client');
 	} else {
 		return callback(new Error('Could not find socket.io client library'));

package/lib/app/helper_model/data_provider.js

@@ -9,7 +9,6 @@ const DataProvider = Function.inherits('Alchemy.Base', 'Alchemy.DataProvider', f
 	this.config = config || {};
 });
 
-
 /**
  * Undry
  *
@@ -47,6 +46,15 @@ DataProvider.setStatic(function addConfig(name, default_value) {
 	});
 });
 
+/**
+ * Extra context
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.3.12
+ * @version  1.3.12
+ */
+DataProvider.addConfig('context');
+
 /**
  * The wanted page size
  *

package/lib/app/helper_model/remote_data_provider.js

@@ -21,7 +21,7 @@ RemoteDataProvider.addConfig('source');
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.2.2
- * @version  1.2.2
+ * @version  1.3.12
  */
 RemoteDataProvider.setMethod(async function getAll() {
 
@@ -29,7 +29,15 @@ RemoteDataProvider.setMethod(async function getAll() {
 		return [];
 	}
 
-	let result = await Blast.fetch(this.source);
+	let options = {};
+
+	if (this.context) {
+		options.get = {
+			context: this.context
+		};
+	}
+
+	let result = await alchemy.fetch(this.source, options);
 
 	return result;
 });

package/lib/class/path_param_definition.js

@@ -111,7 +111,7 @@ PathParamDefinition.enforceProperty(function model_constructor(new_value) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.3.0
- * @version  1.3.6
+ * @version  1.3.12
  */
 PathParamDefinition.setMethod(function parseTypeDefinition() {
 
@@ -142,7 +142,7 @@ PathParamDefinition.setMethod(function parseTypeDefinition() {
 		    current = class_path;
 	
 		for (let piece of this.typedef) {
-			if (piece[0] != piece[0].toUpperCase()) {
+			if (piece[0] != piece[0].toUpperCase() || !String.isLetter(piece[0])) {
 				current = field_path;
 			}
 

package/lib/init/alchemy.js

@@ -17,9 +17,9 @@ var shared_objects = {},
  *
  * @constructor
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.0.1
- * @version  1.1.0
+ * @version  1.3.11
  */
 global.Alchemy = Function.inherits('Informer', 'Alchemy', function Alchemy() {
 
@@ -43,6 +43,9 @@ global.Alchemy = Function.inherits('Informer', 'Alchemy', function Alchemy() {
 	// The id of this server instance
 	this.discovery_id = Crypto.pseudoHex();
 
+	// Weighted error handlers
+	this.error_handlers = new Deck();
+
 	// Link to the colors module
 	this.colors = colors;
 
@@ -105,6 +108,9 @@ global.Alchemy = Function.inherits('Informer', 'Alchemy', function Alchemy() {
 	// Load the settings
 	this.loadSettings();
 
+	// Initialize the error handler
+	initializeErrorHandler.call(this);
+
 	// Listen to messages from parent processes
 	process.on('message', function gotMessage(message) {
 		if (typeof message == 'string') {
@@ -1956,6 +1962,109 @@ Alchemy.setMethod(function getClientModel(name, init, options) {
 	return Classes.Alchemy.Client.Base.prototype.getModel.call(this, name, init, options);
 });
 
+let error_handler_count = 0;
+
+/**
+ * Register an error handler
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.11
+ * @version  1.3.11
+ *
+ * @param   {Function}   callback
+ * @param   {Number}     weight
+ */
+Alchemy.setMethod(function registerErrorHandler(callback, weight) {
+
+	const that = this;
+
+	if (error_handler_count == 0) {
+		process.on('uncaughtException', function onException(error) {
+			that.registerError(error, {handled: false});
+		});
+
+		process.on('unhandledRejection', function onRejection(error, promise) {
+			that.registerError(error, {promise, handled: false});
+		});
+	}
+
+	error_handler_count++;
+
+	if (weight == null) {
+		weight = 10;
+	}
+
+	this.error_handlers.push(callback, weight);
+});
+
+/**
+ * Process the given error
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.11
+ * @version  1.3.11
+ *
+ * @param   {Error}     error
+ * @param   {Object}    info
+ */
+Alchemy.setMethod(async function registerError(error, info = {}) {
+
+	let handle_count = 0;
+
+	if (!this.error_handlers.insertCount) {
+		return handle_count;
+	}
+
+	let callback;
+
+	for (callback of this.error_handlers) {
+		let result = callback(error, info);
+
+		handle_count++;
+
+		if (result == null) {
+			continue;
+		}
+
+		if (Pledge.isThenable(result)) {
+			result = await result;
+		}
+
+		if (result === false) {
+			break;
+		}
+	}
+
+	return handle_count;
+});
+
+/**
+ * Initialize the error handler (if it's enabled)
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.11
+ * @version  1.3.11
+ */
+function initializeErrorHandler() {
+
+	const config = this.settings.errors ?? {};
+
+	if (config.handle_uncaught) {
+		this.registerErrorHandler((error, info) => {
+
+			let message;
+
+			if (info?.promise) {
+				message = 'Unhandled promise rejection';
+			} else {
+				message = 'Uncaught exception';
+			}
+
+			alchemy.printLog('error', [message, String(error), error], {err: error, level: -2});
+		}, 1);
+	}
+}
+
 /**
  * The alchemy global, where everything will be stored
  *

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "alchemymvc",
 	"description": "MVC framework for Node.js",
-	"version": "1.3.10",
+	"version": "1.3.12",
 	"author": "Jelle De Loecker <jelle@elevenways.be>",
 	"keywords": [
 		"alchemy",
@@ -22,7 +22,7 @@
 		"chokidar"         : "~3.5.3",
 		"formidable"       : "~2.1.1",
 		"graceful-fs"      : "~4.2.9",
-		"hawkejs"          : "~2.3.4",
+		"hawkejs"          : "~2.3.9",
 		"jsondiffpatch"    : "~0.4.1",
 		"mime"             : "~3.0.0",
 		"minimist"         : "~1.2.5",
@@ -31,7 +31,7 @@
 		"mongodb"          : "~3.6.6",
 		"ncp"              : "~2.0.0",
 		"postcss"          : "~8.4.6",
-		"protoblast"       : "~0.8.5",
+		"protoblast"       : "~0.8.9",
 		"semver"           : "~7.3.5",
 		"socket.io"        : "~4.6.0",
 		"@11ways/socket.io-stream" : "~0.9.2",