alchemymvc 1.3.15 → 1.3.17

package/lib/app/behaviour/sluggable_behaviour.js

@@ -6,7 +6,7 @@
  *
  * @author        Jelle De Loecker   <jelle@develry.be>
  * @since         0.1.0
- * @version       0.3.0
+ * @version       1.3.16
  */
 var Sluggable = Function.inherits('Alchemy.Behaviour', function SluggableBehaviour(model, options) {
 
@@ -19,6 +19,10 @@ var Sluggable = Function.inherits('Alchemy.Behaviour', function SluggableBehavio
 	this.target_field = options.target_field;
 	this.replacement = options.replacement;
 
+	if (!this.source_field) {
+		throw new Error('No source field found for sluggable behaviour in "' + this.model.model_name + '"');
+	}
+
 	if (!options.unique_modifier_fields) {
 		options.unique_modifier_fields = [];
 	} else if (!Array.isArray(options.unique_modifier_fields)) {

package/lib/app/conduit/socket_conduit.js

@@ -132,6 +132,19 @@ SocketConduit.setProperty(function ip() {
 	return handshake.address || null;
 });
 
+/**
+ * Is this client still connected?
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.16
+ * @version  1.3.16
+ *
+ * @type     {Boolean}
+ */
+SocketConduit.setProperty(function is_connected() {
+	return this.socket?.connected || false;
+});
+
 /**
  * Parse the request, get information from the url
  *

package/lib/app/datasource/mongo_datasource.js

@@ -5,9 +5,9 @@ var MongoClient = alchemy.use('mongodb').MongoClient;
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.1.0
+ * @version  1.3.16
  */
-var Mongo = Function.inherits('Alchemy.Datasource.Nosql', function Mongo(name, _options) {
+const Mongo = Function.inherits('Alchemy.Datasource.Nosql', function Mongo(name, _options) {
 
 	var options,
 	    uri;
@@ -50,12 +50,6 @@ var Mongo = Function.inherits('Alchemy.Datasource.Nosql', function Mongo(name, _
 
 	// Set the connection options
 	this.mongoOptions = {
-
-		// Use the new url parser, because otherwise it logs a warning
-		useNewUrlParser    : true,
-
-		// Enable the new unified topology layer
-		useUnifiedTopology : true,
 	};
 
 	// Cache collections in here
@@ -144,7 +138,7 @@ Mongo.setMethod(function normalizeFindOptions(options) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.1.0
+ * @version  1.3.16
  */
 Mongo.decorateMethod(Blast.Decorators.memoize({ignore_arguments: true}), function connect() {
 
@@ -160,7 +154,7 @@ Mongo.decorateMethod(Blast.Decorators.memoize({ignore_arguments: true}), functio
 	    pledge = new Pledge();
 
 	// Create the connection to the database
-	MongoClient.connect(that.uri, that.mongoOptions, function connected(err, client) {
+	Pledge.done(MongoClient.connect(that.uri, that.mongoOptions), function connected(err, client) {
 
 		if (err) {
 			that.connection_error = err;
@@ -186,41 +180,47 @@ Mongo.decorateMethod(Blast.Decorators.memoize({ignore_arguments: true}), functio
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  0.2.0
+ * @version  1.3.16
  *
+ * @param    {String}     name
  * @param    {Function}   callback
+ *
+ * @return   {Pledge<Collection>}
  */
 Mongo.setMethod(function collection(name, callback) {
 
-	var that = this;
+	const pledge = new Pledge();
 
-	if (this.collections[name]) {
-		setImmediate(function cachedCollection() {
-			callback(null, that.collections[name]);
-		});
+	pledge.done(callback);
 
-		return;
+	if (this.collections[name]) {
+		pledge.resolve(this.collections[name]);
+		return pledge;
 	}
 
+	const that = this;
+
 	this.connect().done(function gotConnection(err, db) {
 
 		if (err) {
-			return callback(err);
+			return pledge.reject(err);
 		}
 
-		that.connection.collection(name, function createdCollection(err, collection) {
+		Pledge.done(that.connection.collection(name), function createdCollection(err, collection) {
 
 			if (err) {
-				return callback(err);
+				return pledge.reject(err);
 			}
 
 			// Cache the collection
 			that.collections[name] = collection;
 
 			// Return it to the callback
-			callback(null, collection);
+			pledge.resolve(collection);
 		});
 	});
+
+	return pledge;
 });
 
 /**
@@ -228,7 +228,7 @@ Mongo.setMethod(function collection(name, callback) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.2.0
+ * @version  1.3.16
  */
 Mongo.setMethod(function _read(model, criteria, callback) {
 
@@ -268,11 +268,6 @@ Mongo.setMethod(function _read(model, criteria, callback) {
 
 			let aggregate_options = {};
 
-			// Limits can still be set as an option though
-			if (options.limit) {
-				aggregate_options.limit = options.limit;
-			}
-
 			Function.parallel({
 				available: function getAvailable(next) {
 
@@ -286,13 +281,13 @@ Mongo.setMethod(function _read(model, criteria, callback) {
 					pipeline.push({$count: 'available'});
 
 					// Expensive aggregate just to get the available count...
-					collection.aggregate(pipeline, cloned_options, function gotAggregate(err, cursor) {
+					Pledge.done(collection.aggregate(pipeline, cloned_options), function gotAggregate(err, cursor) {
 
 						if (err) {
 							return next(err);
 						}
 
-						cursor.toArray(function gotAvailableArray(err, items) {
+						Pledge.done(cursor.toArray(), function gotAvailableArray(err, items) {
 
 							if (err) {
 								return next(err);
@@ -313,13 +308,22 @@ Mongo.setMethod(function _read(model, criteria, callback) {
 					});
 				},
 				items: function getItems(next) {
-					collection.aggregate(compiled.pipeline, aggregate_options, function gotAggregate(err, cursor) {
+
+					let pipeline = JSON.clone(compiled.pipeline);
+
+					// Limits also have to be set in the pipeline now
+					// (We have to do it here, so the `available` count is correct)
+					if (options.limit) {
+						pipeline.push({$limit: options.limit});
+					}
+
+					Pledge.done(collection.aggregate(pipeline, aggregate_options), function gotAggregate(err, cursor) {
 
 						if (err) {
 							return next(err);
 						}
 
-						cursor.toArray(next);
+						Pledge.done(cursor.toArray(), next);
 					});
 				}
 			}, function done(err, data) {
@@ -346,10 +350,10 @@ Mongo.setMethod(function _read(model, criteria, callback) {
 					return next(null, null);
 				}
 
-				cursor.count(false, next);
+				Pledge.done(collection.countDocuments(compiled), next);
 			},
 			items: function getItems(next) {
-				cursor.toArray(next);
+				Pledge.done(cursor.toArray(), next);
 			}
 		}, function done(err, data) {
 
@@ -369,7 +373,7 @@ Mongo.setMethod(function _read(model, criteria, callback) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.3.6
+ * @version  1.3.16
  */
 Mongo.setMethod(function _create(model, data, options, callback) {
 
@@ -379,13 +383,7 @@ Mongo.setMethod(function _create(model, data, options, callback) {
 			return callback(err);
 		}
 
-		let method = 'insert';
-
-		if (typeof collection.insertOne == 'function') {
-			method = 'insertOne';
-		}
-
-		collection[method](data, {w: 1, fullResult: true}, function afterInsert(err, result) {
+		Pledge.done(collection.insertOne(data, {w: 1, fullResult: true}), function afterInsert(err, result) {
 
 			// Clear the cache
 			model.nukeCache();
@@ -394,6 +392,7 @@ Mongo.setMethod(function _create(model, data, options, callback) {
 				return callback(err, result);
 			}
 
+			// @TODO: fix because of mongodb 6
 			let write_errors = result.message?.documents?.[0]?.writeErrors;
 
 			if (write_errors) {
@@ -424,7 +423,7 @@ Mongo.setMethod(function _create(model, data, options, callback) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.1.0
+ * @version  1.3.16
  */
 Mongo.setMethod(function _update(model, data, options, callback) {
 
@@ -507,16 +506,18 @@ Mongo.setMethod(function _update(model, data, options, callback) {
 			console.log('Updating with obj', id, updateObject);
 		}
 
+		let promise;
+
 		if (collection.findOneAndUpdate) {
-			collection.findOneAndUpdate({_id: id}, updateObject, {upsert: true}, afterUpdate);
+			promise = collection.findOneAndUpdate({_id: id}, updateObject, {upsert: true});
 		} else if (collection.findAndModify) {
-			collection.findAndModify({_id: id}, [['_id', 1]], updateObject, {upsert: true}, afterUpdate);
+			promise = collection.findAndModify({_id: id}, [['_id', 1]], updateObject, {upsert: true});
 		} else {
 			// If it's not available (like nedb)
-			collection.update({_id: ''+id}, updateObject, {upsert: true}, afterUpdate);
+			promise = collection.update({_id: ''+id}, updateObject, {upsert: true});
 		}
 
-		function afterUpdate(err, result) {
+		Pledge.done(promise, function afterUpdate(err, result) {
 
 			// Clear the cache
 			model.nukeCache();
@@ -526,7 +527,7 @@ Mongo.setMethod(function _update(model, data, options, callback) {
 			}
 
 			callback(null, Object.assign({}, data));
-		}
+		});
 	});
 });
 
@@ -536,7 +537,7 @@ Mongo.setMethod(function _update(model, data, options, callback) {
  * @author   Kjell Keisse   <kjell@codedor.be>
  * @author   Jelle De Loecker <jelle@develry.be>
  * @since    0.2.0
- * @version  1.0.3
+ * @version  1.3.16
  */
 Mongo.setMethod(function _remove(model, query, options, callback) {
 
@@ -546,7 +547,7 @@ Mongo.setMethod(function _remove(model, query, options, callback) {
 			return callback(err);
 		}
 
-		collection.findOneAndDelete(query, function _deleted(err, result){
+		Pledge.done(collection.findOneAndDelete(query), function _deleted(err, result){
 
 			//clear cache
 			model.nukeCache();
@@ -565,43 +566,59 @@ Mongo.setMethod(function _remove(model, query, options, callback) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.1.0
+ * @version  1.3.17
  */
 Mongo.setMethod(function _ensureIndex(model, index, callback) {
 
-	this.collection(model.table, function gotCollection(err, collection) {
-
-		var options,
-		    obj,
-		    key;
+	this.collection(model.table, async function gotCollection(err, collection) {
 
 		if (err != null) {
 			return callback(err);
 		}
 
-		options = {
-			name: index.options.name
+		let options = {
+			name   : index.options.name,
+			unique : index.options.unique ? true : false,
+			sparse : index.options.sparse ? true : false,
 		};
 
-		if (index.options.unique) {
-			options.unique = true;
-		}
-
-		if (index.options.sparse) {
-			options.sparse = true;
-		}
+		let index_specs;
 
 		// Hack in the text indexes
 		if (options.name == 'text') {
-			obj = {};
+			let key;
+
+			index_specs = {};
 
 			for (key in index.fields) {
-				obj[key] = 'text';
+				index_specs[key] = 'text';
 			}
-
-			collection.createIndex(obj, options, callback);
 		} else {
-			collection.createIndex(index.fields, options, callback);
+			index_specs = index.fields;
 		}
+
+		try {
+			await collection.createIndex(index_specs, options);
+		} catch (err) {
+
+			// Check for IndexOptionsConflict
+			if (err.code === 85) {
+
+				try {
+
+					// Index already exists, drop it
+					await collection.dropIndex(options.name);
+
+					// Try again
+					await collection.createIndex(index_specs, options);
+				} catch (second_err) {
+					return callback(second_err);
+				}
+			} else {
+				return callback(err);
+			}
+		}
+
+		callback();
 	});
 });

package/lib/app/element/time_ago.js

@@ -1,3 +1,5 @@
+const TIMEOUT_ID = Symbol('timeout_id');
+
 /**
  * The custom al-time-ago element
  *
@@ -27,8 +29,6 @@ TimeAgo.setAttribute(function date(str) {
 	return this._date;
 }, function setValue(value) {
 
-	var date;
-
 	if (value) {
 		this._date = Date.create(value);
 	} else {
@@ -73,57 +73,40 @@ TimeAgo.setProperty(function value() {
  * @version  0.1.0
  */
 TimeAgo.setMethod(function connected() {
-	this.refresh(true);
+	this.refresh();
 });
 
 /**
  * Refresh the content
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.1.0
- * @version  0.1.7
- *
- * @param    {Boolean}   reset_timer
+ * @version  1.3.17
  */
-TimeAgo.setMethod(function refresh(reset_timer) {
+TimeAgo.setMethod(function refresh() {
 
-	let that = this,
-	    counter,
-	    timer,
-	    text = this.value,
-	    diff;
+	let text = this.value;
 
 	if (this.textContent != text) {
 		this.textContent = text;
 	}
 
-	if (!reset_timer || Blast.isNode) {
+	if (Blast.isNode || !this.isConnected || !this.date) {
 		return;
 	}
 
-	if (this._timer) {
-		clearInterval(this._timer);
-		this._timer = null;
+	let diff = Math.abs(Date.now() - this.date),
+	    timer;
+
+	if (diff < 1000 * 70) {
+		timer = 1000;
+	} else {
+		timer = 1000 * 29;
 	}
 
-	if (this.date) {
-		diff = Math.abs(Date.now() - this.date);
-		counter = 0;
-
-		if (diff < 1000 * 29) {
-			timer = 1000;
-		} else {
-			timer = 1000 * 29;
-		}
-
-		this._timer = setInterval(function doUpdate() {
-			counter++;
-
-			if (counter > 60) {
-				that.refresh(true);
-			} else {
-				that.refresh();
-			}
-		}, timer);
+	if (this[TIMEOUT_ID]) {
+		clearTimeout(this[TIMEOUT_ID]);
 	}
+
+	this[TIMEOUT_ID] = setTimeout(() => this.refresh(), timer);
 });

package/lib/app/helper/alchemy_helper.js

@@ -292,7 +292,7 @@ Alchemy.setMethod(function group(name, id, callback) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.5.0
- * @version  1.3.7
+ * @version  1.3.17
  *
  * @param    {String|Object}   options
  * @param    {Object}          data
@@ -325,7 +325,7 @@ Alchemy.setMethod(function segment(options, data) {
 			conduit = that.view.server_var('conduit');
 
 			if (!conduit) {
-				return next();
+				return next(null, '<!-- Failed to render segment ' + options.name + ': no conduit found -->');
 			}
 
 			options.params = data;