total5 0.0.1-9 → 0.0.2

package/global.js

@@ -5,11 +5,13 @@
 'use strict';
 
 global.ON = (name, fn) => F.on(name, fn);
+global.ONCE = (name, fn) => F.once(name, fn);
 global.EMIT = (name, a, b, c, d, e, f, g) => F.emit(name, a, b, c, d, e, f, g);
 global.OFF = (name, fn) => F.off(name, fn);
 global.ROUTE = F.TRouting.route;
 global.PROXY = F.TRouting.proxy;
 global.print = console.log;
+global.LOAD = F.load;
 global.LOADCONFIG = F.loadconfig;
 global.LOADRESOURCE = F.loadresource;
 global.SHELL = F.shell;
@@ -21,6 +23,7 @@ global.LOCALIZE = F.localize;
 global.AUTH = F.auth;
 global.CLEANUP = F.cleanup;
 global.NEWDB = F.newdb;
+global.IMPORT = F.import;
 global.REQUIRE = F.require;
 global.CRON = F.cron;
 global.UID = F.uid;
@@ -30,6 +33,7 @@ global.AUDIT = F.audit;
 global.TRANSLATE = F.translate;
 global.TRANSFORM = F.transform;
 global.NEWTRANSFORM = F.newtransform;
+global.MIDDLEWARE = F.middleware;
 global.DATA = new F.TQueryBuilder.Controller(true);
 global.DB = () => new F.TQueryBuilder.Controller();
 global.CACHE = F.cache;
@@ -55,6 +59,8 @@ global.Mail = F.TMail.Mailer;
 global.RESTBuilder = F.TBuilders.RESTBuilder;
 global.ErrorBuilder = F.TBuilders.ErrorBuilder;
 global.DOWNLOAD = F.download;
+global.OPENCLIENT = (url, id) => require('./openclient').create(url, id);
+global.NEWMACRO = (str, nocompile, isasync) => require('./macros').compile(str, nocompile, isasync);
 
 global.BLOCKED = function($, limit, expire) {
 
@@ -97,7 +103,84 @@ global.LDAP = function(opt, callback) {
 };
 
 global.CORS = function(origin) {
-	CONF.$cors = origin || '*';
+	if (origin && origin[0] === '+') {
+		if (F.config.$cors !== '*')
+			F.config.$cors = (F.config.$cors ? ',' : '') + origin.substring(1);
+	} else
+		F.config.$cors = origin || '*';
+	F.emit('$cors');
+};
+
+global.AJAX = function(url, data, callback) {
+
+	if (typeof(data) === 'function') {
+		callback = data;
+		data = null;
+	}
+
+	if (!callback)
+		return new Promise((resolve, reject) => global.AJAX(url, data, (err, response) => err ? reject(err) : resolve(response)));
+
+	var index = url.indexOf(' ');
+	var opt = {};
+
+	if (index !== -1) {
+		opt.method = url.substring(0, index);
+		opt.url = url.substring(index + 1);
+	} else {
+		opt.method = 'GET';
+		opt.url = url;
+	}
+
+	if (data) {
+		opt.type = 'json';
+		opt.body = JSON.stringify(data);
+	}
+
+	opt.headers = { 'X-Requested-With': 'XMLHttpRequest' };
+
+	opt.callback = function(err, response) {
+
+		if (err) {
+			callback && callback(err, null, response);
+			return;
+		}
+
+		var type = err ? '' : response.headers['content-type'] || '';
+		if (type) {
+			var index = type.lastIndexOf(';');
+			if (index !== -1)
+				type = type.substring(0, index).trim();
+		}
+
+		var value = null;
+
+		switch (type.toLowerCase()) {
+			case 'text/xml':
+			case 'application/xml':
+				value = response.body ? response.body.parseXML(self.$replace ? true : false) : {};
+				break;
+			case 'application/x-www-form-urlencoded':
+				value = response.body ? DEF.parsers.urlencoded(response.body) : {};
+				break;
+			case 'application/json':
+			case 'text/json':
+				value = response.body ? response.body.parseJSON(true) : null;
+				break;
+			default:
+				value = response.body;
+				break;
+		}
+
+		if (response.status >= 400) {
+			err = value;
+			value = null;
+		}
+
+		delete response.body;
+		callback && callback(err, value, response);
+	};
+	F.TUtils.request(opt);
 };
 
 // Utils

package/htmlparser.js

@@ -46,20 +46,22 @@ function parseRule(selector, output) {
 
 	selector = selector.replace(/\[\d+\]/, text => cache[+text.substring(1, text.length - 1)]);
 
-	var match = selector.match(/[#|.][a-z-_0-9]+/i);
+	// attribute search
+	match = selector.match(/\[.*?\]/i);
 	if (match) {
 		for (var m of match) {
-			var val = m.substring(1);
-			rule.attrs.push({ id: m[0] === '#' ? 'id' : 'class', value: val });
+			var index = m.indexOf('=');
+			rule.attrs.push({ id: m.substring(1, index).trim(), value: m.substring(index + 2, m.length - 2).trim() });
 		}
 		selector = selector.replace(match, '');
 	}
 
-	match = selector.match(/\[.*?\]/i);
+	// #id or .class
+	var match = selector.match(/[#|.][a-z-_0-9]+/i);
 	if (match) {
 		for (var m of match) {
-			var index = m.indexOf('=');
-			rule.attrs.push({ id: m.substring(1, index).trim(), value: m.substring(index + 2, m.length - 2).trim() });
+			var val = m.substring(1);
+			rule.attrs.push({ id: m[0] === '#' ? 'id' : 'class', value: val });
 		}
 		selector = selector.replace(match, '');
 	}
@@ -134,6 +136,13 @@ function extendarr(output) {
 		return this;
 	};
 
+	output.toString = output.html = function(formatted) {
+		var builder = [];
+		for (var item of this)
+			builder.push(item.toString(formatted));
+		return builder.join(formatted ? '\n' : '');
+	};
+
 	return output;
 }
 
@@ -160,9 +169,7 @@ HTMLElement.prototype.find = function(selector, reverse) {
 				skip = true;
 
 			if (rule.attrs.length && !skip) {
-
 				for (var attr of rule.attrs) {
-
 					switch (attr.id) {
 
 						case 'class':
@@ -278,7 +285,7 @@ HTMLElement.prototype.stringifycache = function() {
 	var tmp = [];
 
 	for (var key in self.cache.css)
-		tmp.push(key + ':' + self.cache.css[key]);
+		self.cache.css[key] && tmp.push(key + ':' + self.cache.css[key]);
 
 	if (tmp.length)
 		self.attrs.style = tmp.join(';');
@@ -353,7 +360,7 @@ HTMLElement.prototype.css = function(key, value) {
 	var self = this;
 	self.parsecache();
 	if (typeof(key) === 'object') {
-		for (var k of key) {
+		for (var k of Object.keys(key)) {
 			value = key[k];
 			if (value)
 				self.cache.css[k] = value;
@@ -383,7 +390,7 @@ HTMLElement.prototype.remove = function() {
 HTMLElement.prototype.append = function(str) {
 
 	var self = this;
-	var dom = parseHTML(str);
+	var dom = parseHTML(str, null, null, self.xml);
 
 	for (var item of dom.children)
 		self.children.push(item);
@@ -394,7 +401,7 @@ HTMLElement.prototype.append = function(str) {
 HTMLElement.prototype.prepend = function(str) {
 
 	var self = this;
-	var dom = parseHTML(str);
+	var dom = parseHTML(str, null, null, self.xml);
 
 	for (var item of dom.children)
 		self.children.unshift(item);
@@ -462,17 +469,18 @@ function removeComments(html) {
 			break;
 
 		var comment = html.substring(beg, end + 3);
-		html = html.replacer(comment, '');
+		html = html.replaceAll(comment, '');
 		beg = html.indexOf(tagBeg, beg);
 	}
 
 	return html;
 }
 
-function parseHTML(html, trim, onerror) {
+function parseHTML(html, trim, onerror, isxml) {
 
 	var makeText = function(parent, str) {
 		var obj = new HTMLElement();
+		obj.xml = isxml;
 		obj.tagName = 'TEXT';
 		obj.children = [];
 		obj.attrs = {};
@@ -482,7 +490,7 @@ function parseHTML(html, trim, onerror) {
 	};
 
 	var parseAttrs = function(str) {
-		var attrs = str.match(/[a-z-0-9]+(=("|').*?("|'))?/g);
+		var attrs = str.match(/[a-z-0-9A-Z\:]+(=("|').*?("|'))?/g);
 		var obj = {};
 		if (attrs) {
 			for (var m of attrs) {
@@ -532,8 +540,10 @@ function parseHTML(html, trim, onerror) {
 		var node = str.substring(beg + 1, end);
 		var dom = new HTMLElement();
 
-		// Doctype?
-		if (node[0] === '!')
+		dom.xml = isxml;
+
+		// Doctype or xml?
+		if (node[0] === '!' || node[0] === '?')
 			return str.substring(end + 1);
 
 		if (node[node.length - 1] === '/') {
@@ -565,15 +575,17 @@ function parseHTML(html, trim, onerror) {
 		str = str.substring(end + 1);
 
 		// Unpair tags
-		switch (dom.tagName) {
-			case 'BR':
-			case 'HR':
-			case 'IMG':
-			case 'META':
-			case 'LINK':
-			case 'INPUT':
-				dom.unpair = true;
-				return str;
+		if (!isxml) {
+			switch (dom.tagName) {
+				case 'BR':
+				case 'HR':
+				case 'IMG':
+				case 'META':
+				case 'LINK':
+				case 'INPUT':
+					dom.unpair = true;
+					return str;
+			}
 		}
 
 		var pos = 0;
@@ -614,8 +626,7 @@ function parseHTML(html, trim, onerror) {
 		}
 
 		var inner = str.substring(0, pos - tagEnd.length);
-
-		if (inner.indexOf('<') === -1 || (/script|style|template/).test(tag)) {
+		if (inner.indexOf('<') === -1 || (/\<(script|style|template)/).test(tag)) {
 			if (trim)
 				inner = inner.trim();
 			if (inner)
@@ -640,6 +651,7 @@ function parseHTML(html, trim, onerror) {
 	html = removeComments(html);
 
 	var dom = new HTMLElement();
+	dom.xml = isxml;
 
 	while (html)
 		html = parseElements(html, dom);
@@ -647,4 +659,4 @@ function parseHTML(html, trim, onerror) {
 	return dom;
 }
 
-exports.parseHTML = parseHTML;
+exports.parseHTML = parseHTML;

package/http.js

@@ -20,6 +20,8 @@ exports.listen = function(req, res) {
 	// res.write();
 	// res.end()
 
+	F.stats.request.request++;
+
 	// Not supported
 	if (req.method === 'HEAD') {
 		F.stats.request.blocked++;
@@ -63,7 +65,7 @@ exports.listen = function(req, res) {
 	// Pending requests
 	F.temporary.pending.push(ctrl);
 
-	if (!ctrl.uri.file && (F.def.onCORS || F.config.$cors)) {
+	if (ctrl.headers.origin && (F.def.onCORS || F.config.$cors)) {
 		if (F.TRouting.lookupcors(ctrl))
 			ctrl.$route();
 	} else

package/image.js

@@ -1,3 +1,7 @@
+// Total.js Images
+// The MIT License
+// Copyright 2016-2023 (c) Peter Širka <petersirka@gmail.com>
+
 'use strict';
 
 const D = F.iswindows ? '"' : '\'';

package/images.js

@@ -196,7 +196,7 @@ ImageProto.measure = function(callback) {
 
 	F.stats.performance.open++;
 	var extension = self.filename.substring(index).toLowerCase();
-	var stream = require('fs').createReadStream(self.filename, { start: 0, end: (extension === '.jpg' || extension === '.webp') ? 40000 : 24 });
+	var stream = F.Fs.createReadStream(self.filename, { start: 0, end: (extension === '.jpg' || extension === '.webp') ? 40000 : 24 });
 
 	stream.on('data', function(buffer) {