alchemymvc 1.3.8 → 1.3.10

package/lib/app/helper_model/document.js

@@ -732,16 +732,16 @@ Document.setMethod(function setDataRecord(record, options) {
 });
 
 /**
- * Get the translated value of a certain field.
- * If this document has already been translated, a new instance will be queried
+ * Get the translated document for the given prefix with only the given field
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
- * @since    1.3.0
- * @version  1.3.0
+ * @since    1.3.10
+ * @version  1.3.10
  *
+ * @param    {String}   field_name
  * @param    {String}   prefix
  */
-Document.setMethod(async function getTranslatedValueOfField(field_name, prefix) {
+Document.setMethod(async function getTranslatedDocumentOfPrefix(field_name, prefix) {
 
 	const model = this.$model;
 
@@ -752,6 +752,36 @@ Document.setMethod(async function getTranslatedValueOfField(field_name, prefix)
 
 	let doc = await model.find('first', crit);
 
+	return doc;
+});
+
+/**
+ * Get the translated value of a certain field.
+ * If this document has already been translated, a new instance will be queried
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.0
+ * @version  1.3.10
+ *
+ * @param    {String}   prefix
+ */
+Document.setMethod(async function getTranslatedValueOfField(field_name, prefix) {
+	let doc = await this.getTranslatedDocumentOfPrefix(field_name, prefix);
+	return doc?.[field_name];
+});
+
+/**
+ * Get the translated value of a certain field.
+ * If this document has already been translated, a new instance will be queried
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.10
+ * @version  1.3.10
+ *
+ * @param    {String}   prefix
+ */
+Document.setMethod(async function getTranslatedValueOfFieldForRoute(field_name, prefix) {
+	let doc = await this.getTranslatedDocumentOfPrefix(field_name, prefix);
 	return doc?.[field_name];
 });
 

package/lib/app/routes.js

@@ -6,4 +6,6 @@ Router.POSTPONED_ROUTE = Router.add({
 	paths            : '/alchemy/postponed/{id}',
 	methods          : ['get'],
 	can_be_postponed : false,
-});
+});
+
+Router.linkup('Syncable#linkup', 'syncablelink', 'AlchemyInfo#syncable');

package/lib/class/conduit.js

@@ -114,55 +114,60 @@ Conduit.prepareProperty(function renderer() {
 	return result;
 });
 
+/**
+ * Get the SessionScene instance
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.10
+ * @version  1.3.10
+ */
+Conduit.setProperty(function scene() {
+	return this.getSession().getScene(this.scene_id);
+});
+
 /**
  * Enforce the scene_id
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.1.0
- * @version  1.1.7
+ * @version  1.3.10
  */
 Conduit.enforceProperty(function scene_id(new_value, old_value) {
 
-	if (new_value) {
-		return new_value;
-	}
-
-	if (this.headers['x-scene-id']) {
-		return this.headers['x-scene-id'];
-	}
+	if (!new_value) {
+		new_value = this.headers['x-scene-id'] || this.expose('scene_id');
 
-	// If there also was no old value, create a new scene
-	if (old_value == null) {
-		// Generate the scene_id
-		new_value = Crypto.randomHex(8) || Crypto.pseudoHex(8);
+		// If there also was no old value, create a new scene
+		if (!new_value && old_value == null) {
+			// Generate the scene_id
+			new_value = Crypto.randomHex(8) || Crypto.pseudoHex(8);
 
-		// Tell the session this scene can be expected
-		this.getSession().expectScene(new_value);
+			// Tell the session this scene can be expected
+			this.getSession().expectScene(new_value, this);
 
-		let path;
+			let path = this.request?.url;
 
-		if (this.url) {
-			path = this.url.path;
-		}
+			// Set the sceneid cookie
+			this.cookie('scene_start_' + ~~(Math.random()*1000), {
 
-		// Set the sceneid cookie
-		this.cookie('scene_start_' + ~~(Math.random()*1000), {
+				// The time this scene has started
+				start: Date.now(),
 
-			// The time this scene has started
-			start: Date.now(),
+				// The id of the scene
+				id: new_value
+			}, {
+				// Cookie should only be visible on this path
+				path: path,
 
-			// The id of the scene
-			id: new_value
-		}, {
-			// Cookie should only be visible on this path
-			path: path,
+				// Cookie should not live for more than 15 seconds
+				maxAge: 1000 * 15
+			});
+		}
+	}
 
-			// Cookie should not live for more than 15 seconds
-			maxAge: 1000 * 15
-		});
+	this.expose('scene_id', new_value);
 
-		return new_value;
-	}
+	return new_value;
 });
 
 /**
@@ -1819,12 +1824,14 @@ Conduit.setMethod(function end(message) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.3.1
+ * @version  1.3.10
  */
 Conduit.setMethod(function _end(message, encoding = 'utf-8') {
 
 	this.ended = new Date();
 
+	this.emit('ending');
+
 	if (!this.response) {
 		let args = [];
 

package/lib/class/route.js

@@ -809,7 +809,7 @@ Route.setMethod(function getRouteTranslations(controller, conduit) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.3.0
- * @version  1.3.0
+ * @version  1.3.10
  *
  * @param    {Controller}   controller
  * @param    {Conduit}      conduit
@@ -832,8 +832,8 @@ Route.setMethod(async function _getRouteTranslations(controller, conduit, paths)
 			let current_value = conduit.param(param_def.name),
 			    new_value;
 
-			if (current_value && current_value.getTranslatedValueOfField) {
-				new_value = await current_value.getTranslatedValueOfField(param_def.name, path.prefix);
+			if (current_value && current_value.getTranslatedValueOfFieldForRoute) {
+				new_value = await current_value.getTranslatedValueOfFieldForRoute(param_def.name, path.prefix);
 			}
 
 			if (!new_value) {

package/lib/class/session.js

@@ -336,17 +336,26 @@ Session.setMethod(function whenConnected(callback) {
 	}
 });
 
+/**
+ * Get a scene by its id
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.10
+ * @version  1.3.10
+ */
+Session.setMethod(function getScene(scene_id) {
+	return this.expected[scene_id];
+});
+
 /**
  * Expect the given scene_id to make a connection later on
  *
  * @author   Jelle De Loecker <jelle@develry.be>
  * @since    0.2.0
- * @version  0.2.0
+ * @version  1.3.10
  */
-Session.setMethod(function expectScene(scene_id) {
-	this.expected[scene_id] = {
-		updates: [] // Cached updates
-	};
+Session.setMethod(function expectScene(scene_id, conduit) {
+	this.expected[scene_id] = new Classes.Alchemy.SessionScene(conduit, scene_id);
 });
 
 /**
@@ -354,7 +363,7 @@ Session.setMethod(function expectScene(scene_id) {
  *
  * @author   Jelle De Loecker <jelle@develry.be>
  * @since    0.2.0
- * @version  0.2.0
+ * @version  1.3.10
  */
 Session.setMethod(function registerConnection(conduit) {
 
@@ -377,6 +386,10 @@ Session.setMethod(function registerConnection(conduit) {
 	// See if there are any queued updates
 	expected = this.expected[scene_id];
 
+	if (expected) {
+		expected.registerConnection(conduit);
+	}
+
 	if (expected && expected.updates.length) {
 		for (i = 0; i < expected.updates.length; i++) {
 			entry = expected.updates[i];
@@ -404,8 +417,11 @@ Session.setMethod(function registerConnection(conduit) {
 			}
 		}
 
-		// Delete the scene from the connections
-		delete that.connections[scene_id];
+		let scene = that.getScene(scene_id);
+
+		if (scene && !scene.connection_count) {
+			scene.destroy();
+		}
 	});
 });
 

package/lib/class/session_scene.js

@@ -0,0 +1,95 @@
+/**
+ * The Session Scene class:
+ * represents a specific scene/tab
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.10
+ * @version  1.3.10
+ *
+ * @param    {Conduit}   conduit   The initializing conduit
+ */
+const SessionScene = Function.inherits('Alchemy.Base', function SessionScene(conduit, scene_id) {
+
+	// Register the creation date
+	this.created = new Date();
+
+	// The scene id
+	this.id = scene_id;
+
+	// The conduit that created this scene
+	this.conduit = conduit;
+
+	// All the websocket connections
+	this.connections = [];
+
+	// Old-style live binding updates.
+	this.updates = [];
+});
+
+/**
+ * The edit action
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.10
+ * @version  1.3.10
+ *
+ * @param    {Conduit}   conduit
+ */
+SessionScene.setMethod(function registerConnection(conduit) {
+
+	if (!conduit) {
+		return;
+	}
+
+	// Add the conduit to the list of connections
+	this.connections.push(conduit);
+
+	this.emit('connected');
+
+	// When the conduit is closed, remove it from the list
+	conduit.on('disconnect', () => {
+		this.removeConnection(conduit);
+	});
+});
+
+/**
+ * Remove a connection
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.10
+ * @version  1.3.10
+ *
+ * @param    {Conduit}   conduit
+ */
+SessionScene.setMethod(function removeConnection(conduit) {
+
+	if (conduit) {
+		let index = this.connections.indexOf(conduit);
+
+		if (index > -1) {
+			this.connections.splice(index, 1);
+		}
+	}
+
+	if (this.connections.length == 0) {
+		this.unsee('connected');
+	}
+});
+
+/**
+ * Destroy this scene
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.10
+ * @version  1.3.10
+ */
+SessionScene.setMethod(function destroy() {
+
+	let session = this.conduit.getSession();
+
+	if (session) {
+		delete session.expected[this.id];
+	}
+
+	this.emit('destroyed');
+});

package/lib/core/client_alchemy.js

@@ -590,6 +590,8 @@ if (Blast.isBrowser) {
  */
 Alchemy.setMethod(function connect(callback) {
 
+	this._connecting_to_server = true;
+
 	if (typeof window.io === 'undefined') {
 		hawkejs.require(['socket.io.js', 'socket.io-stream'], function() {
 			alchemy.server.connect(callback);
@@ -1009,11 +1011,16 @@ Alchemy.setMethod(function sendBindingRequests() {
  *
  * @author    Jelle De Loecker   <jelle@develry.be>
  * @since     1.0.5
- * @version   1.0.5
+ * @version   1.3.10
  */
 Alchemy.setMethod(function enableWebsockets() {
 
-	var that = this;
+	// Don't connect twice
+	if (this._connecting_to_server) {
+		return;
+	}
+
+	let that = this;
 
 	// Connect to the server
 	this.connect(function onConnect() {
@@ -1054,8 +1061,6 @@ Alchemy.setMethod(function enableWebsockets() {
 			    data,
 			    i;
 
-			console.log('Sending to server...', e);
-
 			if (this.hasAttribute('data-server-event-form')) {
 				get_form = this.getAttribute('data-server-event-form');
 

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "alchemymvc",
 	"description": "MVC framework for Node.js",
-	"version": "1.3.8",
+	"version": "1.3.10",
 	"author": "Jelle De Loecker <jelle@elevenways.be>",
 	"keywords": [
 		"alchemy",