alchemymvc 1.4.0-alpha.9 → 1.4.1

package/lib/app/element/al_time.js

@@ -0,0 +1,126 @@
+const DATETIME = Symbol('datetime');
+
+/**
+ * The custom al-time element
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.4.0
+ * @version  1.4.0
+ */
+const AlTime = Function.inherits('Alchemy.Element', 'AlTime');
+
+/**
+ * The preferred format
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    0.3.0
+ * @version  0.3.0
+ */
+AlTime.setAttribute('format', null, function setFormat(format) {
+	this._populate({value: this.datetime, format: format});
+	return format;
+});
+
+/**
+ * Get/set the datetime value
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    0.3.0
+ * @version  0.3.0
+ */
+AlTime.setAttribute('datetime', null, function setDatetime(value) {
+	this._populate({value: value});
+	return this[DATETIME];
+});
+
+/**
+ * Set the value with a function call
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    0.3.0
+ * @version  0.3.0
+ */
+AlTime.setMethod(function setDatetime(value) {
+	this.datetime = value;
+});
+
+/**
+ * Populate the element
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    0.3.0
+ * @version  0.3.0
+ *
+ * @return   {Object[]}
+ */
+AlTime.setMethod(function populate() {
+	let iso_string = this._populate({value: this.value, format: this.format});
+	this[DATETIME] = iso_string;
+	return iso_string;
+});
+
+/**
+ * Populate the element
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    0.3.0
+ * @version  0.3.0
+ */
+AlTime.setMethod(function _populate(input) {
+
+	if (!input) {
+		input = {};
+	}
+
+	let {value, format} = input;
+
+	if (value == null) {
+		value = this[DATETIME];
+	}
+
+	if (format == null) {
+		format = this.format;
+	}
+
+	let iso_date,
+	    date;
+
+	if (value) {
+		date = Date.create(value);
+		iso_date = date.toISOString();
+	} else {
+		iso_date = '';
+	}
+
+	value = iso_date;
+
+	if (Blast.isServer) {
+		return value;
+	}
+
+	let target_element = this.children?.[0];
+
+	if (!target_element) {
+		target_element = this.createElement('time');
+		this.append(target_element);
+	}
+
+	let tag_name = target_element.tagName;
+	let formatted;
+
+	if (format) {
+		formatted = date.format(format);
+	} else {
+		formatted = date + '';
+	}
+
+	if (tag_name == 'INPUT') {
+		target_element.value = formatted;
+	} else {
+		if (tag_name == 'TIME') {
+			target_element.setAttribute('datetime', iso_date);
+		}
+
+		target_element.textContent = formatted;
+	}
+});

package/lib/app/helper/cron.js

@@ -284,7 +284,7 @@ function splitAndCleanup(input, separator) {
  * @author   Santhosh Kumar <brsanthu@gmail.com>
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.3.17
- * @version  1.3.17
+ * @version  1.4.1
  */
 CronExpression.setMethod(function parse() {
 	
@@ -296,7 +296,7 @@ CronExpression.setMethod(function parse() {
 	let has_seconds = this.has_seconds;
 
 	if (Cron.PREDEFINED_EXPRESSIONS[internal_expression]) {
-		internal_expression = Cron.PREDEFINED_EXPRESSIONS[expression];
+		internal_expression = Cron.PREDEFINED_EXPRESSIONS[internal_expression];
 		has_seconds = false;
 	}
 

package/lib/app/helper/enum_values.js

@@ -70,17 +70,23 @@ EnumMap.setMethod(function set(name, value) {
 			result = {
 				name  : value.name,
 				title : value.title,
+				short_title : value.short_title,
 			};
 		} else {
 			result = {
 				name  : value.name,
 				title : value.title || value.name,
+				short_title : value.short_title,
 			};
 
 			if (value.icon) {
 				result.icon = value.icon;
 			}
 
+			if (value.icon_style) {
+				result.icon_style = value.icon_style;
+			}
+
 			if (value.color) {
 				result.color = value.color;
 			}
@@ -96,6 +102,9 @@ EnumMap.setMethod(function set(name, value) {
 	}
 
 	result.number = this.local.size + 1;
+	
+	// "value" does not mean the value that is stored in the database
+	// it can be the function that houses info
 	result.value = value;
 	result.is_enumified = true;
 

package/lib/app/helper/router_helper.js

@@ -29,14 +29,26 @@ var Route = Function.inherits('Alchemy.Helper.Router', function Route(renderer)
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.0
- * @version  1.2.5
+ * @version  1.4.0
  *
  * @type     {RURL}
  */
 Router.setProperty(function current_url() {
-	if (this.view_render?.variables?.__url) {
-		return this.view_render.variables.__url.clone();
-	} else if (Blast.isBrowser) {
+
+	let renderer = this.view_render;
+
+	if (renderer?.variables) {
+		try {
+			let url = renderer.variables.get('__url');
+			if (url) {
+				return url.clone();
+			}
+		} catch (err) {
+			// Ignore
+		}
+	}
+	
+	if (Blast.isBrowser) {
 
 		if (hawkejs?.scene?.opening_url?.url) {
 			return Blast.Classes.RURL.parse(hawkejs.scene.opening_url.url);
@@ -270,7 +282,27 @@ Router.setMethod(function applyDirective(element, name, options) {
 	}
 
 	if (method_attribute && config.methods?.[0]) {
-		element.setAttribute(method_attribute, config.methods[0]);
+		let existing_method = element.getAttribute(method_attribute);
+
+		// Assume the user knows what they're doing when there is an existing method
+		if (!existing_method) {
+			let found_method = false;
+
+			// There is no method, look for the best one (we prefer a post)
+			for (let method of config.methods) {
+				method = method.toLowerCase();
+
+				if (method == 'post' || method == 'put') {
+					element.setAttribute(method_attribute, method);
+					found_method = true;
+					break;
+				}
+			}
+
+			if (!found_method) {
+				element.setAttribute(method_attribute, config.methods[0]);
+			}
+		}
 	}
 
 	if (disable_ajax) {

package/lib/app/helper/socket_helper.js

@@ -16,7 +16,7 @@ function isStream(obj) {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.3.10
+ * @version  1.4.0
  *
  * @param    {string}   type
  */
@@ -43,12 +43,21 @@ var Linkup = Blast.Collection.Function.inherits('Informer', function ClientLinku
 	// The initial submitted data
 	this.initialData = data;
 
+	// Has this linkup been destroyed?
+	this.destroyed = false;
+
 	// Make the linkup store itself
 	client.linkups[this.id] = this;
 
 	// The parent server
 	this.client = client;
 
+	// Listen for socket disconnection
+	this._onClientClose = () => {
+		this._markDisconnected();
+	};
+	client.on('close', this._onClientClose);
+
 	if (server_object) {
 		this.submit('ready');
 	} else {
@@ -146,23 +155,51 @@ Linkup.setMethod(function createStream() {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.3.10
+ * @version  1.4.0
  */
 Linkup.setMethod(function destroy() {
+	if (this.destroyed) {
+		return;
+	}
+
 	this.submit('__destroy__');
 	this._destroy();
 	this.removeAllListeners();
 });
 
+/**
+ * Mark the linkup as disconnected due to socket close
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.4.0
+ * @version  1.4.0
+ */
+Linkup.setMethod(function _markDisconnected() {
+	if (this.destroyed) {
+		return;
+	}
+
+	// Emit the close event so listeners can handle disconnect
+	this.emit('close');
+});
+
 /**
  * Make sure the linkup is removed
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.3.10
- * @version  1.3.10
+ * @version  1.4.0
  */
 Linkup.setMethod(function _destroy() {
+	this.destroyed = true;
 	delete this.client.linkups[this.id];
+
+	// Remove the close listener from the client
+	if (this._onClientClose) {
+		this.client.removeListener('close', this._onClientClose);
+		this._onClientClose = null;
+	}
+
 	this.emit('destroyed');
 });
 
@@ -352,7 +389,7 @@ Client.setMethod(function createStream() {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.3.12
+ * @version  1.4.0
  *
  * @param    {Function} callback
  */
@@ -487,7 +524,8 @@ Client.setMethod(function connect(address, data, callback) {
 	});
 
 	server.on('error', function(err) {
-		console.log('Socket error:', err);
+		log.error('Socket error:', err);
+		that.emit('error', err);
 	});
 
 	// Listen for cookies
@@ -547,16 +585,22 @@ Client.setMethod(function connect(address, data, callback) {
 				}
 			}
 
-			try {
-				if (packet.data && typeof packet.data == 'object') {
-					packet.data = JSON.undry(packet.data);
-				}
-			} catch (err) {
-				console.log('ERROR UNDRYING PACKET:', err, packet);
-				return;
+		try {
+			if (packet.data && typeof packet.data == 'object') {
+				packet.data = JSON.undry(packet.data);
 			}
+		} catch (err) {
+			log.error('Error undrying response data:', err);
 
-			if (packet.noData) {
+			// Still call the callback with an error instead of silently dropping
+			let undry_error = new Error('Failed to deserialize response data: ' + err.message);
+			undry_error.cause = err;
+			that.callbacks[packet.respond_to](undry_error, null);
+			delete that.callbacks[packet.respond_to];
+			return;
+		}
+
+		if (packet.noData) {
 				that.callbacks[packet.respond_to](packet.err, packet.stream);
 			} else if (packet.stream) {
 				that.callbacks[packet.respond_to](packet.err, packet.data, packet.stream);
@@ -578,7 +622,20 @@ Client.setMethod(function connect(address, data, callback) {
 				packet.data = JSON.undry(packet.data);
 			}
 		} catch (err) {
-			console.log('ERROR UNDRYING PACKET:', err, packet);
+			log.error('Error undrying packet data:', err);
+
+			// If the sender expects a response, send back an error
+			if (packet.respond) {
+				let response_packet = {
+					err: new Error('Failed to deserialize packet data: ' + err.message),
+					respond_to: packet.id,
+					data: null
+				};
+				server.emit('response', response_packet);
+			}
+
+			// Emit error event so callers can be aware
+			that.emit('packet_error', err, packet);
 			return;
 		}