total5 0.0.7-3 → 0.0.8-1

package/api.js

@@ -36,9 +36,18 @@ exports.newapi = function(type, callback) {
 
 };
 
+function APIOptions(api) {
+	this.api = api;
+	this.retries = 0;
+}
+
+APIOptions.prototype.retry = function() {
+	this.retries++;
+	setImmediate(execapi, this.api);
+};
+
 function APICall() {
-	var t = this;
-	t.options = {};
+	this.options = new APIOptions(this);
 }
 
 const APICallProto = APICall.prototype;

package/changelog.txt

@@ -1,3 +1,16 @@
+========================
+0.0.8
+========================
+
+- added `opt.retry()` method in to the `API` evaluation
+- improved HTTP cache in debug mode
+- added `Total.edit('socket_url')` for remote editing of source code
+- added support for `scripts` folder
+- added Total.remote('wss_totaljs_code_url') method for remote editing of the source-code
+- added a better support for `*:tagname` prefixes in HTMLParser
+- fixed context in the components
+- fixed URL downloading templates in `TEMPLATE()` method
+
 ========================
 0.0.7
 ========================
@@ -11,8 +24,14 @@
 - added `CONF.mail_from_name {String}` option
 - improved `$.query` parser
 - improved `Total.run()` method
-- added a new method `NEWCOMPONENT(html, [callback])`
+- added a new method `NEWCOMPONENT(html_or_URL_or_name, [callback])`
 	- it compiles a FlowStream component to a method
+- extended FlowStream by adding support for `input` and `output` Total.js inline schemas
+- fixed memory usage in the Flow in non-worker mode
+- improved Flow error handling
+- improved HTML parser
+- improved `controller.view()` supports calling without arguments
+- extended ViewEngine by adding `view.renderlayout(name, content)` method
 
 ========================
 0.0.6

package/components.js

@@ -88,6 +88,7 @@ function Component() {
 	t.variables = t.variables2 = {};
 	t.secrets = {};
 	t.instances = [];
+	t.debugger = true;
 }
 
 Component.prototype.service = function(counter) {
@@ -96,23 +97,28 @@ Component.prototype.service = function(counter) {
 };
 
 Component.prototype.status = function(instance, msg) {
-	console.log('STATUS', this.name, msg);
+	if (this.debugger)
+		console.log('STATUS', this.name, msg);
 };
 
 Component.prototype.debug = function(instance, msg) {
-	console.log('DEBUG', this.name + ':', msg);
+	if (this.debugger)
+		console.log('DEBUG', this.name + ':', msg);
 };
 
 Component.prototype.dashboard = function(instance, msg) {
-	console.log('DASHBOARD', this.name + ':', msg);
+	if (this.debugger)
+		console.log('DASHBOARD', this.name + ':', msg);
 };
 
 Component.prototype.throw = function(instance, err) {
-	console.log('ERROR', this.name + ':', err);
+	if (this.debugger)
+		console.log('ERROR', this.name + ':', err);
 };
 
 Component.prototype.output = function(instance, response) {
-	console.log('OUTPUT', this.name + ' | ' + response.output + ':', response.data);
+	if (this.debugger)
+		console.log('OUTPUT', this.name + ' | ' + response.output + ':', response.data);
 };
 
 Component.prototype.create = function(opt, status) {
@@ -129,6 +135,7 @@ Component.prototype.create = function(opt, status) {
 	}
 
 	t.instances.push(instance);
+	t.onextend && t.onextend(instance);
 	t.make.call(instance, instance, instance.config, status);
 	t.oncreate && setImmediate(() => t.oncreate(instance));
 	return instance;
@@ -166,6 +173,7 @@ Message.prototype.send = function(output, data) {
 	if (data != null)
 		t.data = data;
 	t.output = output;
+	t.callback && t.callback(t);
 	t.instance.output && t.instance.output(t);
 };
 
@@ -201,19 +209,31 @@ Instance.prototype.remove = function() {
 	t.module.instances.splice(index, 1);
 };
 
-Instance.prototype.input = function(input, data) {
+Instance.prototype.input = function(input, data, callback) {
 	let t = this;
 	if (t.message) {
+
 		let msg = t.newmessage(data);
 		msg.input = input;
+		msg.callback = callback;
+
+		var schema = t.module.inputschemas[input];
+		if (schema) {
+			let tmp = schema.transform(msg.data);
+			msg.data = tmp.response;
+			msg.error = tmp.error;
+		}
+
 		t.message(msg);
+		let fn = t['message_' + input];
+		fn && fn(msg);
 	}
 };
 
 Instance.prototype.send = function(output, data) {
 	let msg = data instanceof Message ? data : this.newmessage();
 	msg.output = output;
-	msg.data = data;
+	msg.data = data;x
 	msg.send(output);
 };
 
@@ -276,6 +296,30 @@ exports.compile = function(html, callback) {
 		})
 	}
 
+	if ((/^http(s)\:\/\//i).test(html)) {
+		let opt = {};
+		opt.url = html;
+		opt.callback = function(err, response) {
+			console.log(err, response);
+			if (err)
+				callback(err);
+			else
+				exports.compile(response.body, callback);
+		};
+		REQUEST(opt);
+		return;
+	}
+
+	if (!html.includes('<')) {
+		F.Fs.readFile(PATH.root('components/' + html + '.html'), 'utf8', function(err, response) {
+			if (err)
+				callback(err);
+			else
+				exports.compile(response, callback);
+		});
+		return;
+	}
+
 	var meta = html.parseComponent({ readme: '<readme>', settings: '<settings>', css: '<style>', be: '<script total>', be2: '<script node>', js: '<script>', html: '<body>', schema: '<schema>', template: '<template>' });
 	var node = (meta.be || meta.be2 || '').trim().replace(/\n\t/g, '\n');
 
@@ -311,7 +355,26 @@ exports.compile = function(html, callback) {
 				next();
 		});
 	}, function() {
+
+		com.inputschemas = {};
+		com.outputschemas = {};
+
+		if (com.inputs) {
+			for (let m of com.inputs) {
+				if (m.schema)
+					com.inputschemas[m.id] = m.schema.toJSONSchema();
+			}
+		}
+
+		if (com.outputs) {
+			for (let m of com.outputs) {
+				if (m.schema)
+					com.outputschemas[m.id] = m.schema.toJSONSchema();
+			}
+		}
+
 		com.install && com.install.call(com, com);
+
 		callback(null, com);
 	});
 

package/controller.js

@@ -15,6 +15,7 @@ const CHECK_COMPRESSION = { 'text/plain': true, 'text/javascript': true, 'text/c
 const CHECK_CHARSET =  { 'text/plain': true, 'text/javascript': true, 'text/css': true, 'text/jsx': true, 'application/javascript': true, 'application/x-javascript': true, 'application/json': true, 'text/xml': true, 'text/x-markdown': true, 'text/html': true, 'application/x-ijsnb+json': true, 'application/x-ipynb+json': true };
 const CHECK_NOCACHE = { zip: 1, rar: 1 };
 const CHECK_MIN = /(\.|-|@)min/i;
+const CHECK_CACHEDEBUG = { html: 1, js: 1, css: 1 };
 
 const GZIP_FILE = { memLevel: 9 };
 const GZIP_STREAM = { memLevel: 1 };
@@ -64,7 +65,7 @@ function Controller(req, res) {
 
 	ctrl.response = {
 		status: 200,
-		cache: global.DEBUG != true,
+		cache: !global.DEBUG || !CHECK_CACHEDEBUG[ctrl.ext],
 		minify: true,
 		// minifyjson: false
 		// encrypt: false
@@ -466,13 +467,17 @@ Controller.prototype.layout = function(name) {
 Controller.prototype.view = function(name, model) {
 
 	var ctrl = this;
+	var view = new F.TViewEngine.View(ctrl);
+
+	if (!name)
+		return view;
 
 	if (ctrl.destroyed)
 		return;
 
-	var view = new F.TViewEngine.View(ctrl);
 	ctrl.response.layout && view.layout(ctrl.response.layout);
 	setImmediate(renderview, view, name, model);
+
 	return view;
 };
 

package/edit.js

@@ -9,7 +9,15 @@ const VERSION = 1;
 const HEADER = '> Total.js Code Editor';
 const DIVIDER = '----------------------------------------------------';
 
-exports.init = function(url) {
+var DIRECTORY = '';
+
+function makepath(path) {
+	return path ? F.path.$join(DIRECTORY, path) : DIRECTORY;
+}
+
+exports.init = function(url, dir) {
+
+	DIRECTORY = dir || F.directory;
 
 	var client = F.websocketclient();
 
@@ -188,7 +196,7 @@ function mkdir(path, callback) {
 }
 
 function browse($, model) {
-	var path = F.path.root();
+	var path = makepath();
 	var m = (model.data || '{}').parseJSON() || EMPTYARRAY;
 	var skip = m.skip ? new RegExp(m.skip) : null;
 	var validator;
@@ -217,7 +225,7 @@ function browse($, model) {
 }
 
 function log($, model) {
-	var filename = F.Path.normalize(F.path.root(model.path));
+	var filename = F.Path.normalize(makepath(model.path));
 	F.Fs.stat(filename, function(err, stats) {
 		if (stats) {
 			var start = stats.size - (1024 * 4); // Max. 4 kB
@@ -234,13 +242,13 @@ function log($, model) {
 }
 
 function clearlog($, model) {
-	var filename = F.path.root(model.path);
+	var filename = makepath(model.path);
 	F.Fs.truncate(filename, NOOP);
 	$.success();
 }
 
 function load($, model) {
-	var filename = F.Path.normalize(F.path.root(model.path));
+	var filename = F.Path.normalize(makepath(model.path));
 	F.Fs.readFile(filename, function(err, data) {
 
 		if (err) {
@@ -276,7 +284,7 @@ function restart($) {
 function save($, model) {
 
 	// Tries to create a folder
-	var filename = F.path.root(model.path);
+	var filename = makepath(model.path);
 	var name = F.TUtils.getName(model.path);
 	var directory = F.Path.normalize(filename.substring(0, filename.length - name.length));
 
@@ -291,7 +299,7 @@ function save($, model) {
 }
 
 function remove($, model) {
-	var filename = F.Path.normalize(F.path.root(model.path));
+	var filename = F.Path.normalize(makepath(model.path));
 	try {
 		var stats = F.Fs.lstatSync(filename);
 		if (stats.isFile()) {
@@ -308,12 +316,12 @@ function remove($, model) {
 }
 
 function info($, model) {
-	var filename = F.Path.normalize(F.path.root(model.path));
+	var filename = F.Path.normalize(makepath(model.path));
 	F.Fs.lstat(filename, $.callback);
 }
 
 function download($, model) {
-	var filename = F.Path.normalize(F.path.root(model.path));
+	var filename = F.Path.normalize(makepath(model.path));
 	var ext = F.TUtils.getExtension(model.path);
 	F.Fs.lstat(filename, function(err, stats) {
 		if (err || stats.isDirectory() || stats.isSocket()) {
@@ -342,7 +350,7 @@ function download($, model) {
 }
 
 function send($, model) {
-	var filename = F.Path.normalize(F.path.root(model.path));
+	var filename = F.Path.normalize(makepath(model.path));
 	F.Fs.fstat(filename, function() {
 		var opt = {};
 		opt.method = 'GET';
@@ -354,7 +362,7 @@ function send($, model) {
 }
 
 function customimport($, model) {
-	var filename = F.Path.normalize(F.path.root(model.path));
+	var filename = F.Path.normalize(makepath(model.path));
 	DOWNLOAD(model.data, filename, $.done());
 }
 
@@ -370,8 +378,8 @@ function rename($, model) {
 
 	data = data.response;
 
-	data.newpath = F.Path.normalize(F.path.root(data.newpath));
-	data.oldpath = F.Path.normalize(F.path.root(data.oldpath));
+	data.newpath = F.Path.normalize(makepath(data.newpath));
+	data.oldpath = F.Path.normalize(makepath(data.oldpath));
 
 	mkdir(F.Path.dirname(data.newpath), function() {
 		F.Fs.rename(data.oldpath, data.newpath, $.done());
@@ -385,7 +393,7 @@ function create($, model) {
 	// model.data.clone {String}
 	// model.data.folder {Boolean}
 
-	var filename = F.Path.normalize(F.path.root(model.path));
+	var filename = F.Path.normalize(makepath(model.path));
 	var data = (model.data || '{}').parseJSON();
 
 	F.Fs.lstat(filename, function(err) {
@@ -395,14 +403,14 @@ function create($, model) {
 			// we can continue
 			if (data.folder) {
 				if (model.clone)
-					F.Fs.cp(F.Path.normalize(F.path.root(data.clone)), filename, { recursive: true, force: true }, $.done());
+					F.Fs.cp(F.Path.normalize(makepath(data.clone)), filename, { recursive: true, force: true }, $.done());
 				else
 					mkdir(filename, $.done());
 			} else {
 				var name = F.TUtils.getName(filename);
 				mkdir(filename.substring(0, filename.length - name.length), function() {
 					if (data.clone)
-						F.Fs.copyFile(F.Path.normalize(F.path.root(data.clone)), filename, $.done());
+						F.Fs.copyFile(F.Path.normalize(makepath(data.clone)), filename, $.done());
 					else
 						F.Fs.writeFile(filename, '', $.done());
 				});
@@ -414,8 +422,8 @@ function create($, model) {
 
 function upload($, model) {
 	var name = F.TUtils.getName(model.path);
-	var filename = F.Path.normalize(F.path.root(model.path));
-	var directory = F.Path.normalize(F.path.root(model.path.substring(0, model.length - name.length)));
+	var filename = F.Path.normalize(makepath(model.path));
+	var directory = F.Path.normalize(makepath(model.path.substring(0, model.length - name.length)));
 	mkdir(directory, function() {
 		decodedata(model, function(err, buffer) {
 			if (err)
@@ -427,7 +435,7 @@ function upload($, model) {
 }
 
 function modify($, model) {
-	var filename = F.path.root(model.path);
+	var filename = makepath(model.path);
 	var dt = new Date();
 	F.Fs.utimes(filename, dt, dt, NOOP);
 	$.success();

package/flow-flowstream.js

@@ -1320,7 +1320,7 @@ function init_current(meta, callback, nested) {
 
 			if (instance) {
 				if (typeof(instance) === 'string') {
-					if (source === 'add') {
+					if (source === 'add' || source === 'register') {
 						componentid = instance;
 						F.error(err, 'FlowStream | register component | ' + instance);
 					} else if (meta.design[instance]) {
@@ -1339,9 +1339,6 @@ function init_current(meta, callback, nested) {
 				} else if (source === 'instance_make') {
 					instanceid = instance.id;
 					componentid = instance.component;
-				} else if (source === 'register') {
-					instanceid = '';
-					componentid = instance;
 				} else {
 					instanceid = instance.id;
 					componentid = instance.module.id;
@@ -1449,9 +1446,11 @@ function init_current(meta, callback, nested) {
 				} else if (source === 'register') {
 					instanceid = '';
 					componentid = instance;
+				} else if (source === 'add') {
+					componentid = instance;
 				} else {
 					instanceid = instance.id;
-					componentid = instance.module.id;
+					componentid = instance.module ? instance.module.id : null;
 				}
 			}
 
@@ -2461,6 +2460,8 @@ function MAKEFLOWSTREAM(meta) {
 			minutes = stats.minutes;
 			if (isFLOWSTREAMWORKER)
 				memory = process.memoryUsage().heapUsed;
+			else if (F.consumption.memory)
+				memory = F.consumption.memory * 1024 * 1024;
 		}
 
 		flow.stats.memory = memory;

package/flow.js

@@ -16,7 +16,6 @@ FS.worker = false;
 FS.instances = {};
 FS.onerror = function(err, source, id, componentid, stack) {
 
-throw new Error('FET');
 	var flow = FS.db[this.id];
 	var empty = '---';
 	var output = '';

package/flowstream.js

@@ -305,10 +305,8 @@ function variables(str, data, encoding) {
 
 		var customencoding = typeof(encoding) === 'function';
 
-		if (!val && data != null && typeof(data) === 'object') {
-			var nested = key.indexOf('.') !== -1;
-			val = nested ? F.TUtils.get(data, key) : data[key];
-		}
+		if (!val && data != null && typeof(data) === 'object')
+			val = key.includes('.') ? F.TUtils.get(data, key) : data[key];
 
 		if (customencoding) {
 
@@ -353,7 +351,7 @@ function timeouthandler(msg) {
 
 MP.send = function(outputindex, data, clonedata) {
 
-	var self = this;
+	let self = this;
 
 	if (clonedata == null)
 		clonedata = self.main.cloning;
@@ -364,13 +362,13 @@ MP.send = function(outputindex, data, clonedata) {
 		return 0;
 	}
 
-	var outputs;
-	var count = 0;
+	let outputs;
+	let count = 0;
 
 	if (outputindex == null) {
 
 		if (self.instance.connections) {
-			for (var key in self.instance.connections)
+			for (let key in self.instance.connections)
 				count += self.send(key);
 		}
 
@@ -381,8 +379,8 @@ MP.send = function(outputindex, data, clonedata) {
 	}
 
 
-	var meta = self.main.meta;
-	var now = Date.now();
+	let meta = self.main.meta;
+	let now = Date.now();
 
 	outputs = self.instance.connections ? (self.instance.connections[outputindex] || F.EMPTYARRAY) : F.EMPTYARRAY;
 
@@ -407,7 +405,7 @@ MP.send = function(outputindex, data, clonedata) {
 		return count;
 	}
 
-	var tid = self.toid + D + outputindex + (self.color || '');
+	let tid = self.toid + D + outputindex + (self.color || '');
 
 	if (self.main.stats.traffic[tid]) {
 		self.main.stats.traffic[tid]++;
@@ -419,29 +417,30 @@ MP.send = function(outputindex, data, clonedata) {
 	if (self.transformation === '1')
 		self.transformation = '_' + tid;
 
-	for (var i = 0; i < outputs.length; i++) {
-		var output = outputs[i];
+	for (let i = 0; i < outputs.length; i++) {
+
+		let output = outputs[i];
 
 		if (output.disabled || output.paused)
 			continue;
 
-		var schema = meta.flow[output.id];
+		let schema = meta.flow[output.id];
 		if (schema && (schema.message || schema['message_' + output.index]) && schema.component && schema.ready && self.main.$can(true, output.id, output.index)) {
-			var next = meta.components[schema.component];
+			let next = meta.components[schema.component];
 			if (next && next.connected && !next.isdestroyed && !next.disabled) {
 
 				if (output.color && self.color && self.color !== output.color)
 					continue;
 
-				var inputindex = output.index;
-				var message = self.clone();
+				let inputindex = output.index;
+				let message = self.clone();
 
 				if (data != undefined)
 					message.data = data;
 
 				if (clonedata && message.data && typeof(message.data) === 'object') {
 					if (message.data instanceof Buffer) {
-						var buf = Buffer.alloc(message.data.length);
+						let buf = Buffer.alloc(message.data.length);
 						buf.copy(message.data);
 						message.data = buf;
 					} else
@@ -462,6 +461,13 @@ MP.send = function(outputindex, data, clonedata) {
 				message.ts = now;
 				message.color = output.color;
 
+				let ti = schema.inputschemas[message.input];
+				if (ti && ti.schema) {
+					let tmp = ti.schema.transform(typeof(message.data) === 'object' ? message.data : {});
+					message.data = tmp.response;
+					message.error = tmp.error;
+				}
+
 				if (self.$timeout)
 					message.$timeoutid = setTimeout(timeouthandler, self.$timeout, message);
 
@@ -1140,6 +1146,13 @@ FP.ontrigger = function(outputindex, data, controller, events) {
 					message.cache = target.cache;
 					message.processed = 0;
 
+					let ti = target.inputschemas[message.input];
+					if (ti && ti.schema) {
+						let tmp = ti.schema.transform(message.data);
+						message.data = tmp.response;
+						message.error = tmp.error;
+					}
+
 					target.stats.pending++;
 					target.stats.input++;
 					schema.stats.output++;
@@ -1193,6 +1206,7 @@ FP.reconfigure = function(id, config, rewrite) {
 		self.onreconfigure && self.onreconfigure(instance);
 		self.$events.configure && self.emit('configure', instance);
 	}
+
 	return !!instance;
 };
 
@@ -1605,6 +1619,28 @@ FP.initcomponent = function(key, component) {
 	instance.replace = variables;
 	instance.instances = self.meta.flow;
 	instance.components = self.meta.components;
+	instance.inputschemas = {};
+	instance.outputschemas = {};
+
+	// Due to inline data schemas
+	if (component.inputs) {
+		for (let m of component.inputs) {
+			let tmp = CLONE(m);
+			instance.inputschemas[m.id] = tmp;
+			if (tmp.schema)
+				tmp.schema = tmp.schema.toJSONSchema();
+		}
+	}
+
+	// Due to inline data schemas
+	if (component.outputs) {
+		for (let m in component.outputs) {
+			let tmp = CLONE(m);
+			instance.outputschemas[m.id] = tmp;
+			if (tmp.schema)
+				tmp.schema = tmp.schema.toJSONSchema();
+		}
+	}
 
 	self.onconnect && self.onconnect(instance);
 	self.$events.connect && self.emit('connect', instance);

package/htmlparser.js

@@ -71,8 +71,13 @@ function parseRule(selector, output) {
 	if (selector[selector.length - 1] === ':') {
 		rule.prefix = selector.toUpperCase();
 		rule.tagName = '';
-	} else
+	} else {
+		if (selector.substring(0, 2) === '*:') {
+			rule.prefix = '*';
+			selector = selector.substring(2);
+		}
 		rule.tagName = selector[0] === '*' ? '' : selector.toUpperCase();
+	}
 
 	return rule;
 }
@@ -170,11 +175,21 @@ HTMLElement.prototype.find = function(selector, reverse) {
 
 			var skip = false;
 
-			if (rule.tagName && rule.tagName !== node.tagName)
-				skip = true;
+			if (rule.prefix === '*') {
+
+				var tagName = node.tagName;
+				if (node.prefix)
+					tagName = tagName.substring(node.prefix.length);
 
-			if (rule.prefix && rule.prefix !== node.prefix)
-				skip = true;
+				if (tagName !== rule.tagName)
+					skip = true;
+
+			} else {
+				if (rule.tagName && rule.tagName !== node.tagName)
+					skip = true;
+				if (rule.prefix && rule.prefix !== node.prefix)
+					skip = true;
+			}
 
 			if (rule.attrs.length && !skip) {
 				for (var attr of rule.attrs) {
@@ -561,7 +576,15 @@ function parseHTML(html, trim, onerror, isxml) {
 		}
 
 		var tag = node;
-		var index = tag.indexOf(' ');
+		var index = -1;
+
+		for (let i = 0; i < tag.length; i++) {
+			let c = tag[i];
+			if (c === '\n' || c === ' ' || c === '/' || c === '>') {
+				index = i;
+				break;
+			}
+		}
 
 		if (index > 0) {
 			tag = tag.substring(0, index);
@@ -597,9 +620,14 @@ function parseHTML(html, trim, onerror, isxml) {
 				case 'BR':
 				case 'HR':
 				case 'IMG':
+				case 'INPUT':
 				case 'META':
 				case 'LINK':
-				case 'INPUT':
+				case 'SOURCE':
+				case 'AREA':
+				case 'COL':
+				case 'EMBED':
+				case 'TRACK':
 					dom.unpair = true;
 					return str;
 			}
@@ -677,4 +705,4 @@ function parseHTML(html, trim, onerror, isxml) {
 	return dom;
 }
 
-exports.parseHTML = parseHTML;
+exports.parseHTML = parseHTML;

package/index.js

@@ -36,7 +36,7 @@ global.DEF = {};
 
 	F.id = '';
 	F.clusterid = '';
-	F.is5 = F.version = 5007;
+	F.is5 = F.version = 5008;
 	F.isBundle = false;
 	F.isLoaded = false;
 	F.version_header = '5';
@@ -221,6 +221,7 @@ global.DEF = {};
 	F.path = {};
 	F.path.root = path => path ? F.path.$join(F.directory, path) : F.directory;
 	F.path.logs = path => path ? F.path.$join(F.temporary.directories.logs, path) : F.temporary.directories.logs;
+	F.path.scripts = path => path ? F.path.$join(F.temporary.directories.scripts, path) : F.temporary.directories.scripts;
 	F.path.public = path => path ? F.path.$join(F.temporary.directories.public, path) : F.temporary.directories.public;
 	F.path.private = path => path ? F.path.$join(F.temporary.directories.private, path) : F.temporary.directories.private;
 	F.path.databases = path => path ? F.path.$join(F.temporary.directories.databases, path) : F.temporary.directories.databases;
@@ -791,7 +792,7 @@ F.load = async function(types, callback) {
 		}
 	}
 
-	let loader = ['modules', 'actions', 'schemas', 'models', 'definitions', 'controllers', 'middleware', 'sources'];
+	let loader = ['modules', 'actions', 'schemas', 'models', 'definitions', 'controllers', 'middleware', 'sources', 'scripts'];
 	var files = [];
 	var tmp;
 
@@ -2567,7 +2568,7 @@ F.dir = function(val) {
 	if (val)
 		F.directory = val;
 
-	var dirs = ['public', 'tmp', 'logs', 'databases', 'controllers', 'resources', 'plugins', 'modules', 'views', 'definitions', 'schemas', 'models', 'flowstreams', 'bundles', 'actions', 'extensions', 'source', 'services', 'updates', 'templates', 'private'];
+	var dirs = ['public', 'tmp', 'logs', 'databases', 'controllers', 'resources', 'plugins', 'modules', 'views', 'definitions', 'schemas', 'models', 'flowstreams', 'bundles', 'actions', 'extensions', 'source', 'services', 'updates', 'templates', 'private', 'scripts'];
 
 	for (let dir of dirs) {
 		let cfg = F.config['$dir' + dir];
@@ -2640,6 +2641,10 @@ F.htmlmail = function(email, subject, body, language, callback) {
 	return F.def.onMail(email, subject, body, callback);
 };
 
+F.remote = function(url, dir) {
+	require('./edit').init(url, dir);
+};
+
 F.readfile = function(path, type = null) {
 	return new Promise(resolve => F.Fs.readFile(path, type, (err, response) => err ? resolve(null) : resolve(response)));
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "total5",
-  "version": "0.0.7-3",
+  "version": "0.0.8-1",
   "description": "Total.js framework v5",
   "main": "index.js",
   "directories": {

package/templates.js

@@ -35,7 +35,7 @@ exports.render = function(body, model, $) {
 				var opt = {};
 				opt.url = body;
 				opt.method = 'GET';
-				opt.$ = function(err, response) {
+				opt.callback = function(err, response) {
 
 					if (err) {
 						if ($ && $.invalid)

package/viewengine.js

@@ -873,12 +873,21 @@ View.prototype.set = function() {
 	return '';
 };
 
+View.prototype.renderlayout = function(name, content) {
+	let self = this;
+	self.output = content;
+	self.islayout = true;
+	content = self.render(self.repository.layout);
+	self.islayout = false;
+	return content;
+};
+
 View.prototype.render = function(name, model, ispartial = false) {
 
-	var self = this;
-	var key = name + '_' + self.language;
-	var fn = F.temporary.views[key];
-	var content;
+	let self = this;
+	let key = name + '_' + self.language;
+	let fn = F.temporary.views[key];
+	let content;
 
 	self.model = model;
 
@@ -897,6 +906,7 @@ View.prototype.render = function(name, model, ispartial = false) {
 		self.output = content;
 		self.islayout = true;
 		content = self.render(self.repository.layout);
+		self.islayout = false;
 	}
 
 	return content;