alchemymvc 1.3.9 → 1.3.10

package/lib/app/conduit/loopback_conduit.js

@@ -28,6 +28,17 @@ var LoopConduit = Function.inherits('Alchemy.Conduit', function Loopback(parent_
 	}
 });
 
+/**
+ * Refer to the parent conduit for the sessionData property
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.10
+ * @version  1.3.10
+ */
+LoopConduit.setProperty(function sessionData() {
+	return this.parent.sessionData;
+});
+
 /**
  * Create a new loopback
  *
@@ -244,4 +255,19 @@ LoopConduit.setMethod(function error(status, message, print_error) {
 	} else {
 		this.end(message);
 	}
+});
+
+/**
+ * Create a session
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.10
+ * @version  1.3.10
+ *
+ * @param    {Boolean}   create   Create a session if none exist
+ *
+ * @return   {UserSession}
+ */
+LoopConduit.setMethod(function getSession(allow_create = true) {
+	return this.parent.getSession(allow_create);
 });

package/lib/app/conduit/socket_conduit.js

@@ -6,7 +6,7 @@ var iostream = alchemy.use('socket.io-stream'),
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.1.3
+ * @version  1.3.10
  *
  * @param    {Socker}   socket
  * @param    {Object}   announcement
@@ -67,12 +67,12 @@ var SocketConduit = Function.inherits('Alchemy.Conduit', function Socket(socket,
 	// Listen for disconnects
 	socket.on('disconnect', function onDisconnect() {
 
-		var key;
+		let key;
 
 		that.emit('disconnect');
 
 		for (key in that.linkups) {
-			that.linkups[key].emit('disconnect');
+			that.linkups[key].destroy();
 		}
 	});
 
@@ -231,6 +231,8 @@ SocketConduit.setMethod(function onLinkup(packet) {
 		// Create the new linkup instance
 		linkup = new Linkup(this, type, id, packet.data);
 
+		linkup.submit('connected_to_server');
+
 		if (typeof fnc === 'function') {
 			fnc.call(this, this, linkup);
 		} else if (typeof fnc === 'string') { // Strings like 'StaticController#index'
@@ -542,22 +544,55 @@ var Linkup = Function.inherits('Informer', function Linkup(conduit, type, id, da
 
 	// Tell the client it's ready
 	this.submit('ready');
+
+	this.on('__destroy__', () => {
+		this._destroy();
+	});
+});
+
+/**
+ * Add a reference to its scene_id
+ *
+ * @author    Jelle De Loecker   <jelle@elevenways.be>
+ * @since     1.3.10
+ * @version   1.3.10
+ */
+Linkup.setProperty(function scene_id() {
+	return this.conduit?.scene_id;
 });
 
 /**
  * Destroy this link
  *
- * @author    Jelle De Loecker   <jelle@develry.be>
+ * @author    Jelle De Loecker   <jelle@elevenways.be>
  * @since     0.2.0
- * @version   1.1.4
+ * @version   1.3.10
  */
 Linkup.setMethod(function destroy() {
 
+	// Tell the client
+	this.submit('__destroy__');
+
+	// Actually do the destroying
+	this._destroy();
+
 	// Remove all listeners
 	this.removeAllListeners();
+});
+
+/**
+ * Make sure the linkup is removed
+ *
+ * @author    Jelle De Loecker   <jelle@elevenways.be>
+ * @since     1.3.10
+ * @version   1.3.10
+ */
+Linkup.setMethod(function _destroy() {
 
-	// Remove if from the linkups list
+	// Remove it from the linkups list
 	delete this.conduit.linkups[this.id];
+
+	this.emit('destroyed');
 });
 
 /**

package/lib/app/controller/alchemy_info_controller.js

@@ -142,4 +142,15 @@ Info.setAction(function postponed(conduit, id) {
 	}
 
 	postponement.handleRequest(conduit);
+});
+
+/**
+ * Syncable link
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.10
+ * @version  1.3.10
+ */
+Info.setAction(function syncable(conduit, linkup, config) {
+	Classes.Alchemy.Syncable.handleLink(conduit, linkup, config);
 });

package/lib/app/helper/router_helper.js

@@ -46,6 +46,30 @@ Router.setProperty(function current_url() {
 	}
 });
 
+/**
+ * Get the current riyte we're on
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.10
+ * @version  1.3.10
+ *
+ * @type     {Object}
+ */
+Router.setProperty(function current_route() {
+
+	let route_name = this.view_render?.variables?.__route;
+
+	if (!route_name) {
+		return;
+	}
+
+	if (!this._all_routes) {
+		this._all_routes = alchemy.getRoutes();
+	}
+
+	return this._all_routes.get(route_name);
+});
+
 /**
  * Check if the given URL is a local one
  *
@@ -98,14 +122,15 @@ Router.setMethod(function isLocalUrl(url) {
  */
 Router.setMethod(function applyDirective(element, name, options) {
 
-	var config = this.routeConfig(name);
+	let config = this.routeConfig(name);
 
 	if (!config) {
 		this.markElementError(element, 'Route "' + name + '" not found');
 		return;
 	}
 
-	let attribute_name,
+	let disable_ajax = false,
+	    attribute_name,
 	    params = {},
 	    url;
 
@@ -190,6 +215,16 @@ Router.setMethod(function applyDirective(element, name, options) {
 		element.setAttribute('hreflang', url._chosen_prefix);
 	}
 
+	if (config && this.renderer.variables.__route) {
+		let route = this.current_route;
+
+		if (route && route.section != config.section) {
+			disable_ajax = true;
+		}
+	} else if (config.section != 'default') {
+		disable_ajax = true;
+	}
+
 	if (element.role == 'link') {
 		attribute_name = 'href';
 	} else {
@@ -225,6 +260,10 @@ Router.setMethod(function applyDirective(element, name, options) {
 		}
 	}
 
+	if (disable_ajax) {
+		element.setAttribute('data-he-link', 'false');
+	}
+
 	element.setAttribute(attribute_name, url);
 });
 
@@ -336,7 +375,7 @@ Router.setMethod(function routeConfig(name, socket_route) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.3.9
+ * @version  1.3.10
  *
  * @param    {String}   name
  * @param    {Object}   parameters
@@ -370,7 +409,14 @@ Router.setMethod(function routeUrl(name, parameters, options) {
 	}
 
 	if (parameters) {
-		parameters = {...parameters};
+		// Create a shallow clone of simple objects
+		if (Object.isPlainObject(parameters)) {
+			parameters = {...parameters};
+		} else {
+			// Create an overlay instead of a clone
+			// (in case it's a special parameters object, like a Document)
+			parameters = Object.create(parameters);
+		}
 	}
 
 	let chosen_prefix;

package/lib/app/helper/socket_helper.js

@@ -16,7 +16,7 @@ function isStream(obj) {
  *
  * @author    Jelle De Loecker   <jelle@develry.be>
  * @since     0.2.0
- * @version   0.2.0
+ * @version   1.3.10
  *
  * @param    {String}   type
  */
@@ -54,7 +54,32 @@ var Linkup = Blast.Collection.Function.inherits('Informer', function ClientLinku
 	} else {
 		// Establish the link
 		client._submit('linkup', {type: type, id: this.id, data: data});
+
+		// The server will send the `connected_to_server` event
+		this.on('connected_to_server', () => {
+			this.emit('ready');
+		});
 	}
+
+	this.on('__destroy__', () => {
+		this._destroy();
+	});
+});
+
+/**
+ * Add a reference to its scene_id
+ *
+ * @author    Jelle De Loecker   <jelle@elevenways.be>
+ * @since     1.3.10
+ * @version   1.3.10
+ */
+Linkup.setProperty(function scene_id() {
+
+	if (Blast.isBrowser) {
+		return hawkejs.scene?.scene_id;
+	}
+
+	return this.conduit?.scene_id;
 });
 
 /**
@@ -62,13 +87,13 @@ var Linkup = Blast.Collection.Function.inherits('Informer', function ClientLinku
  *
  * @author    Jelle De Loecker   <jelle@develry.be>
  * @since     0.2.0
- * @version   0.2.0
+ * @version   1.3.10
  *
  * @param    {String}   type
  * @param    {Object}   data
  * @param    {Function} callback
  */
-Linkup.setMethod(function submit(type, data, stream, callback) {
+Linkup.setAfterMethod('ready', function submit(type, data, stream, callback) {
 	this.client.submit([this.id, type], data, stream, callback);
 });
 
@@ -117,14 +142,28 @@ Linkup.setMethod(function createStream() {
 });
 
 /**
- * Destroy this linkup
+ * Destroy this linkup (and tell the server)
  *
  * @author    Jelle De Loecker   <jelle@develry.be>
  * @since     0.2.0
- * @version   0.2.0
+ * @version   1.3.10
  */
 Linkup.setMethod(function destroy() {
+	this.submit('__destroy__');
+	this._destroy();
+	this.removeAllListeners();
+});
+
+/**
+ * Make sure the linkup is removed
+ *
+ * @author    Jelle De Loecker   <jelle@elevenways.be>
+ * @since     1.3.10
+ * @version   1.3.10
+ */
+Linkup.setMethod(function _destroy() {
 	delete this.client.linkups[this.id];
+	this.emit('destroyed');
 });
 
 /**
@@ -313,12 +352,19 @@ Client.setMethod(function createStream() {
  *
  * @author    Jelle De Loecker   <jelle@elevenways.be>
  * @since     0.2.0
- * @version   1.3.5
+ * @version   1.3.10
  *
  * @param    {Function} callback
  */
 Client.setMethod(function connect(address, data, callback) {
 
+	// @TODO: Actual disconnects will cause problems
+	// (Though the library reconnects behind the scenes)
+	if (this.connected || this.hasBeenSeen('connecting')) {
+		this.afterOnce('connected', callback);
+		return;
+	}
+
 	let that = this,
 	    io_client,
 	    serverstream,
@@ -584,14 +630,12 @@ Client.setMethod(function connect(address, data, callback) {
  */
 Client.setMethod(function linkup(type, data, cb) {
 
-	var link;
-
 	if (typeof data == 'function') {
 		cb = data;
 		data = {};
 	}
 
-	link = new Linkup(this, type, data);
+	let link = new Linkup(this, type, data);
 
 	if (cb) {
 		link.once('ready', function whenReady() {