total5 0.0.7 → 0.0.8-2

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/builders.js

@@ -1339,7 +1339,7 @@ ActionCaller.prototype.exec = function() {
 		}
 	}
 
-	if (action.sa) {
+	if (action.sa || action.su) {
 		if (!$.user || (!$.user.sa && !$.user.su)) {
 			$.invalid(401);
 			return;

package/changelog.txt

@@ -1,3 +1,17 @@
+========================
+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
+- fixed parsing of unpaired elements in HTMLParser
+
 ========================
 0.0.7
 ========================

package/components.js

@@ -97,27 +97,27 @@ Component.prototype.service = function(counter) {
 };
 
 Component.prototype.status = function(instance, msg) {
-	if (t.debugger)
+	if (this.debugger)
 		console.log('STATUS', this.name, msg);
 };
 
 Component.prototype.debug = function(instance, msg) {
-	if (t.debugger)
+	if (this.debugger)
 		console.log('DEBUG', this.name + ':', msg);
 };
 
 Component.prototype.dashboard = function(instance, msg) {
-	if (t.debugger)
+	if (this.debugger)
 		console.log('DASHBOARD', this.name + ':', msg);
 };
 
 Component.prototype.throw = function(instance, err) {
-	if (t.debugger)
+	if (this.debugger)
 		console.log('ERROR', this.name + ':', err);
 };
 
 Component.prototype.output = function(instance, response) {
-	if (t.debugger)
+	if (this.debugger)
 		console.log('OUTPUT', this.name + ' | ' + response.output + ':', response.data);
 };
 

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

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/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 (tagName !== rule.tagName)
+					skip = true;
 
-			if (rule.prefix && rule.prefix !== node.prefix)
-				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) {
@@ -535,7 +550,6 @@ function parseHTML(html, trim, onerror, isxml) {
 			return '';
 		}
 
-
 		if (beg > 0) {
 			tmp = str.substring(0, beg);
 
@@ -602,12 +616,6 @@ function parseHTML(html, trim, onerror, isxml) {
 				return str;
 		} else {
 			switch (dom.tagName) {
-				case 'BR':
-				case 'HR':
-				case 'IMG':
-				case 'INPUT':
-				case 'META':
-				case 'LINK':
 				case 'SOURCE':
 				case 'AREA':
 				case 'COL':
@@ -628,6 +636,26 @@ function parseHTML(html, trim, onerror, isxml) {
 				break;
 
 			beg = str.indexOf(tagBeg, pos);
+
+			if (beg !== -1) {
+
+				// another one with the same type
+				// check unpair
+
+				let posend = str.indexOf('>', beg + tagBeg.length);
+				if (posend === -1) {
+					// tag is not closed
+					return '';
+				}
+
+				if (str[posend - 1] === '/') {
+					// unpair
+					pos = posend + 1;
+					continue;
+				}
+
+			}
+
 			end = str.indexOf(tagEnd, pos);
 
 			// Fallback for the non-exists end tag
@@ -656,7 +684,8 @@ function parseHTML(html, trim, onerror, isxml) {
 		}
 
 		var inner = str.substring(0, pos - tagEnd.length);
-		if (inner.indexOf('<') === -1 || (/\<(script|style|template)/).test(tag)) {
+
+		if (inner.indexOf('<') === -1 || (!isxml && (/\<(script|style|template)/).test(tag))) {
 			if (trim)
 				inner = inner.trim();
 			if (inner)
@@ -690,4 +719,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",
+  "version": "0.0.8-2",
   "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)