total5 0.0.1-9 → 0.0.2

package/builders.js

@@ -24,7 +24,11 @@ Options.prototype = {
 	},
 
 	get websocket() {
-		return this.controller.parent;
+		return this.controller && this.controller.iswebsocket ? this.controller : null;
+	},
+
+	get sessionid() {
+		return this.controller ? this.controller.sessionid : null;
 	},
 
 	get value() {
@@ -52,15 +56,15 @@ Options.prototype = {
 	},
 
 	get path() {
-		return (this.controller ? this.controller.pathname : EMPTYARRAY);
+		return this.controller ? this.controller.pathname : EMPTYARRAY;
 	},
 
 	get split() {
-		return (this.controller ? this.controller.split : EMPTYARRAY);
+		return this.controller ? this.controller.split : EMPTYARRAY;
 	},
 
 	get split2() {
-		return (this.controller ? this.controller.split2 : EMPTYARRAY);
+		return this.controller ? this.controller.split2 : EMPTYARRAY;
 	},
 
 	get language() {
@@ -92,6 +96,17 @@ Options.prototype = {
 	}
 };
 
+Options.prototype.unauthorized = function() {
+	var args = [this];
+	for (let i = 0; i < arguments.length; i++)
+		args.push(arguments[i]);
+	return F.unauthorized.apply(global, args);
+};
+
+Options.prototype.transform = function(name, value, callback) {
+	return F.transform(name, value, callback, this.controller);
+};
+
 Options.prototype.action = function(schema, payload) {
 	return F.action(schema, payload, this.controller);
 };
@@ -149,8 +164,14 @@ Options.prototype.cancel = function() {
 };
 
 Options.prototype.redirect = function(url) {
-	this.redirect(url);
-	this.cancel();
+	var self = this;
+	self.$callback = null;
+	if (self.controller) {
+		self.controller.redirect(url);
+		self.controller.destroyed = true;
+	}
+	self.cancel();
+	return self;
 };
 
 Options.prototype.audit = function(message, type) {
@@ -160,11 +181,21 @@ Options.prototype.audit = function(message, type) {
 Options.prototype.success = function(value) {
 	var self = this;
 	if (self.TYPE === 'auth')
-		self.callback(value);
+		self.callback(value || EMPTYOBJECT);
 	else
 		self.callback(DEF.onSuccess(value));
 };
 
+Options.prototype.successful = function(callback) {
+	var self = this;
+	return function(err, a, b, c) {
+		if (err)
+			self.invalid(err);
+		else
+			callback.call(self, a, b, c);
+	};
+};
+
 Options.prototype.callback = function(value) {
 
 	var self = this;
@@ -183,8 +214,8 @@ Options.prototype.done = function(arg) {
 	var self = this;
 	return function(err, response) {
 		if (err) {
-			err && self.error.push(err);
-			self.callback();
+			self.error.push(err);
+			self.callback(null);
 		} else {
 			if (self.TYPE === 'auth')
 				self.callback(arg === true ? response : arg);
@@ -194,10 +225,19 @@ Options.prototype.done = function(arg) {
 	};
 };
 
+Options.prototype.output = function(name) {
+	// @name {String} json, html, xml, text, redirect, binary, jsonstring, empty, file
+	var self = this;
+	if (self.controller)
+		self.controller.response.output = name;
+	return self;
+};
+
 Options.prototype.invalid = function(error, path, index) {
 	var self = this;
 	self.error.push(error, path, index);
 	self.$callback(true);
+	return self;
 };
 
 Options.prototype.cookie = function(name, value, expire, options) {
@@ -471,7 +511,7 @@ RESTP.promise = function($) {
 				if ($ && $.invalid)
 					$.invalid(err);
 				else
-					reject(err.reject());
+					reject(F.TUtils.toError(err));
 			} else
 				resolve(response);
 		});
@@ -718,6 +758,9 @@ RESTP.callback = function(fn) {
 
 	var self = this;
 
+	if (fn instanceof Options)
+		fn = fn.callback();
+
 	if (typeof(fn) === 'function') {
 		setImmediate(execrestbuilder, self, fn);
 		return self;
@@ -907,10 +950,13 @@ function restbuilder_callback(err, response) {
 				break;
 			case 'application/json':
 			case 'text/json':
+			case 'text/plain':
 				output.value = response.body ? response.body.parseJSON(true) : null;
 				break;
 			default:
-				output.value = response.body && response.body.isJSON() ? response.body.parseJSON(true) : null;
+				if (response.body instanceof Buffer && response.body.length)
+					response.body = response.body.toString('utf8');
+				output.value = response.body ? (response.body.isJSON() ? response.body.parseJSON(true) : response.body) : null;
 				break;
 		}
 	}
@@ -1130,10 +1176,7 @@ exports.newaction = function(name, obj) {
 	if (obj.route) {
 		if (obj.route.indexOf('-->') === -1)
 			obj.route = obj.route + '  ' + (obj.input ? '+' : '-') + obj.$url + ' --> ' + name;
-		var flags = null;
-		if (obj.encrypt)
-			flags = '@encrypt';
-		obj.route = F.route(obj.route, flags || []);
+		obj.route = F.route(obj.route + (obj.encrypt ? ' @encrypt' : ''));
 	}
 
 	if (obj.permissions && typeof(obj.permissions) === 'string')
@@ -1244,6 +1287,9 @@ ActionCaller.prototype.exec = function() {
 		} else {
 			$.response[$.id] = response;
 			meta.response && self.finish && self.finish(response);
+			var key = '@' + $.id;
+			if (F.$events[key])
+				F.emit(key, $, response);
 			self.exec();
 		}
 	};
@@ -1315,8 +1361,10 @@ ActionCaller.prototype.exec = function() {
 ActionCaller.prototype.finish = function(value) {
 	var self = this;
 	self.finish = null;
-	self.options.callback(self.error.length ? self.error : null, value === undefined ? self.$.response : value);
-	self.options.callback = null;
+	if (self.options.callback) {
+		self.options.callback(self.error.length ? self.error : null, value === undefined ? self.$.response : value);
+		self.options.callback = null;
+	}
 };
 
 ActionCaller.prototype.cancel = function() {
@@ -1387,20 +1435,18 @@ ActionCaller.prototype.promise = function($) {
 
 ActionCaller.prototype.autorespond = function() {
 	var self = this;
-	self.options.callback = function(err, response) {
+	self.options.callback = function(err, response, a, b) {
 		if (err)
 			self.controller.invalid(err);
 		else
-			self.controller.json(response);
+			self.controller.respond(response, a, b);
 	};
 	return self;
 };
 
 ActionCaller.prototype.controller = function(ctrl) {
-
 	if (ctrl instanceof Options)
 		ctrl = ctrl.controller;
-
 	this.options.controller = ctrl;
 	return this;
 };
@@ -1440,10 +1486,8 @@ exports.newschema = function(name, callback) {
 	if (name[0] === '@')
 		name = name.substring(1);
 
-	if (typeof(callback) === 'string') {
-		F.jsonschemas[name] = F.TUtils.jsonschema(callback, true);
-		return;
-	}
+	if (typeof(callback) === 'string')
+		return F.jsonschemas[name] = F.TUtils.jsonschema(callback, true);
 
 	var $ = {};
 	$.name = name;
@@ -1451,6 +1495,7 @@ exports.newschema = function(name, callback) {
 	$.action = function(aname, meta) {
 		return $.actions[aname] = F.newaction(name + '/' + aname, meta);
 	};
+
 	callback($);
 };
 
@@ -1491,16 +1536,22 @@ exports.builtinauth = function(opt) {
 		if (typeof(id) === 'object')
 			id = $.sessionid;
 
+		var ctrl = $.controller;
+
+		if (ctrl && !id)
+			id = ctrl.sessionid;
+
 		if (id) {
 			for (var key in opt.sessions) {
 				var session = opt.sessions[key];
 				if (session.sessionid === id) {
 					delete opt.sessions[key];
 					opt.onlogout && opt.onlogout(session);
-					opt.cookie && !$.controller.parent && $.controller.cookie && $.controller.cookie(opt.cookie, '', '-1 year', opt.options);
+					opt.cookie && ctrl && !ctrl.parent && ctrl.cookie && ctrl.cookie(opt.cookie, '', '-1 year', opt.options);
 					return true;
 				}
 			}
+			opt.onremove && opt.onremove(id);
 		}
 	};
 
@@ -1536,7 +1587,9 @@ exports.builtinauth = function(opt) {
 		if (!options)
 			options = opt.options;
 		var ctrl = $.controller ? $.controller : $;
-		ctrl.cookie && !ctrl.parent && $.cookie(opt.cookie, opt.sign(sessionid, userid), expiration, options);
+		var token = opt.sign(sessionid, userid);
+		ctrl.cookie && !ctrl.parent && $.cookie(opt.cookie, token, expiration, options);
+		return token;
 	};
 
 	if (!opt.expire)
@@ -1560,10 +1613,12 @@ exports.builtinauth = function(opt) {
 		if (!sessionid && opt.header)
 			sessionid = $.controller.headers[opt.header];
 
+		var localize = opt.locale || opt.localize;
+
 		if (!sessionid) {
 
-			if (opt.locale)
-				$.controller.language = opt.locale(null, $.controller);
+			if (localize)
+				$.controller.language = localize(null, $.controller);
 
 			$.invalid();
 			return;
@@ -1584,14 +1639,14 @@ exports.builtinauth = function(opt) {
 						$.controller.session = session;
 						$.controller.sessionid = session.sessionid;
 						if (!opt.onsession || !opt.onsession(session, $)) {
-							if (opt.locale)
-								$.controller.language = opt.locale(session.data, $.controller);
+							if (localize)
+								$.controller.language = localize(session.data, $.controller);
 							$.success(session.data);
 						}
 					} else {
 
-						if (opt.locale)
-							$.controller.language = opt.locale(null, $.controller);
+						if (localize)
+							$.controller.language = localize(null, $.controller);
 
 						$.invalid();
 						sessionid = null;
@@ -1639,8 +1694,8 @@ exports.builtinauth = function(opt) {
 				$.controller.session = opt.sessions[meta.sessionid] = { sessionid: meta.sessionid, userid: meta.userid, data: data, ua: $.controller.ua, expire: NOW.add(opt.expire) };
 				$.controller.sessionid = meta.sessionid;
 
-				if (opt.locale)
-					$.controller.language = opt.locale(data, $.controller);
+				if (localize)
+					$.controller.language = localize(data, $.controller);
 
 				if (!opt.onsession || !opt.onsession($.controller.session, $, true))
 					$.success(data);

package/changelog.txt

@@ -1,3 +1,5 @@
 ========================
-0.0.0
+0.0.2
 ========================
+
+- first release

package/cluster.js

@@ -120,7 +120,7 @@ function master(opt) {
 	main.version = {};
 	main.version.node = process.version;
 	main.version.total = F.version_header;
-	main.version.app = CONF.version;
+	main.version.app = F.config.version;
 
 	setInterval(function() {
 

package/cms.js

@@ -4,7 +4,7 @@
 
 'use strict';
 
-const SKIP_CLASSES = { CMS_hidden: 1, CMS_mv: 1, CMS_mh: 1, CMS_expression: 1, CMS_multiple: 1 };
+const SKIP_CLASSES = { CMS_hidden: 1, CMS_mv: 1, CMS_mh: 1, CMS_expression: 1, CMS_multiple: 1, CMS_keyword: 1, CMS_monospace: 1 };
 const VERSION = 1;
 
 function clean(html) {
@@ -22,12 +22,20 @@ function expressions_multiple(body) {
 	while (true) {
 
 		index = body.indexOf('CMS_multiple', index + 12);
-
 		if (index === -1)
 			break;
 
-		var b = body.lastIndexOf('<', index);
-		var tag = body.substring(b + 1, body.indexOf(' ', b));
+		var b = findstart(body, index);
+		if (b === -1)
+			break;
+
+		var end = body.indexOf(' ', b);
+		if (end === -1) {
+			index += 13;
+			continue;
+		}
+
+		var tag = body.substring(b + 1, end);
 
 		var e = body.indexOf('</' + tag + '>', index);
 		var size = e + 3 + tag.length;
@@ -53,6 +61,23 @@ function expressions_multiple(body) {
 	return arr;
 }
 
+function findstart(body, index) {
+
+	var notallowed = [';', '.', '>', ':', '\n', '\r', '\t'];
+
+	for (let i = index; i > -1; i--) {
+
+		let c = body[i];
+		if (c === '<')
+			return i;
+
+		if (notallowed.includes(c))
+			break;
+	}
+
+	return -1;
+}
+
 function expressions(body) {
 
 	var index = 0;
@@ -65,9 +90,17 @@ function expressions(body) {
 		if (index === -1)
 			break;
 
-		var b = body.lastIndexOf('<', index);
-		var tag = body.substring(b + 1, body.indexOf(' ', b));
+		var b = findstart(body, index);
+		if (b === -1)
+			break;
+
+		var end = body.indexOf(' ', b);
+		if (end === -1) {
+			index += 15;
+			continue;
+		}
 
+		var tag = body.substring(b + 1, end);
 		var e = body.indexOf('</' + tag + '>', index);
 		var size = e + 3 + tag.length;
 		var obj = {};
@@ -90,12 +123,27 @@ function trash(body) {
 
 			index = body.indexOf(t, index + t.length);
 
-			if (index === -1) {
+			if (index === -1)
 				break;
+
+			var b = findstart(body, index);
+			if (b === -1)
+				break;
+
+			var end = body.indexOf(' ', b);
+
+			if (end === -1) {
+				index += t.length + 1;
+				continue;
+			}
+
+			var tag = body.substring(b + 1, end);
+
+			if (tag.length > 10) {
+				index += tag.length;
+				continue;
 			}
 
-			var b = body.lastIndexOf('<', index);
-			var tag = body.substring(b + 1, body.indexOf(' ', b));
 			var e = body.indexOf('</' + tag + '>', index);
 			var size = e + 3 + tag.length;
 			body = body.replace(body.substring(b, size), '');
@@ -221,8 +269,7 @@ function tidy(body) {
 		var arr = text.substring(is ? 8 : 7, text.length - 1).split(' ');
 		var builder = '';
 
-		for (var i = 0; i < arr.length; i++) {
-			var cls = arr[i];
+		for (let cls of arr) {
 			if (cls[0] === 'C' && cls[1] === 'M' && cls[2] === 'S' && !SKIP_CLASSES[cls])
 				continue;
 			builder += (builder ? ' ' : '') + cls;
@@ -233,14 +280,101 @@ function tidy(body) {
 	}).replace(/<div\s>/g, '<div>');
 }
 
+exports.widgets = function(html) {
+
+	let arr = html.match(/data-cms=".*?"/g) || EMPTYARRAY;
+	let response = [];
+	let indexer = 0;
+	let index;
+	let beg;
+	let end;
+
+	for (let attr of arr) {
+
+		if (html.indexOf(attr) === -1)
+			continue;
+
+		let w = attr.substring(10);
+		index = w.indexOf('__');
+		let id = w.substring(0, index);
+
+		index = html.lastIndexOf('<', html.indexOf(attr));
+		beg = '<div';
+		end = '</div>';
+
+		let pos = index + 1;
+		let count = 0;
+		let counter = 0;
+
+		while (true) {
+
+			if (counter++ > 100)
+				break;
+
+			let a = html.indexOf(beg, pos);
+			let b = html.indexOf(end, pos);
+
+			if (a !== -1 && a < b) {
+				count++;
+				pos = html.indexOf('>', a);
+				continue;
+			}
+
+			if (a === -1 || b < a) {
+
+				pos = b + 6;
+
+				if (count) {
+					count--;
+					continue;
+				}
+
+				break;
+			}
+		}
+
+		let body = html.substring(index, pos);
+		html = html.replace(body, clean(body));
+		index = body.indexOf('>');
+		body = body.substring(0, index + 1) + '~BEG~' + body.substring(index + 1);
+		index = body.lastIndexOf('<');
+		body = body.substring(0, index) + '~END~' + body.substring(index);
+
+		index = w.indexOf('__');
+
+		let config = decodeURIComponent(w.substring(index + 2, w.length - 1)).parseJSON(true);
+		let opt = {};
+
+		opt.id = id;
+		opt.indexer = indexer;
+		opt.body = tidy(clean(body));
+		opt.html = body.substring(body.lastIndexOf('~BEG~') + 5, body.lastIndexOf('~END~'));
+		opt.config = config || EMPTYOBJECT;
+		opt.beg = opt.body.substring(0, opt.body.indexOf('>') + 1);
+		opt.end = opt.body.substring(opt.body.lastIndexOf('<'));
+
+		index = opt.beg.indexOf('data-cms-id="');
+
+		if (index === -1)
+			opt.uid = opt.beg.makeid();
+		else
+			opt.uid = opt.beg.substring(index + 13, opt.beg.indexOf('"', index + 14));
+
+		response.push(opt);
+		indexer++;
+	}
+
+	return response;
+};
+
 exports.compile = function(html, widgets, used) {
 
-	var arr = html.match(/data-cms=".*?"/g) || EMPTYARRAY;
-	var response = new CMSRender();
-	var indexer = 0;
-	var index;
-	var beg;
-	var end;
+	let arr = html.match(/data-cms=".*?"/g) || EMPTYARRAY;
+	let response = new CMSRender();
+	let indexer = 0;
+	let index;
+	let beg;
+	let end;
 
 	response.css = [];
 	response.js = [];
@@ -249,7 +383,7 @@ exports.compile = function(html, widgets, used) {
 	response.tangular = [];
 
 	if (!used) {
-		for (var widget of widgets) {
+		for (let widget of widgets) {
 			if (widget.css)
 				response.css.push(F.TUtils.minify_css(widget.css));
 			if (widget.js)
@@ -261,30 +395,30 @@ exports.compile = function(html, widgets, used) {
 		}
 	}
 
-	for (var attr of arr) {
+	for (let attr of arr) {
 
 		if (html.indexOf(attr) === -1)
 			continue;
 
-		var w = attr.substring(10);
-		var index = w.indexOf('__');
-		var id = w.substring(0, index);
+		let w = attr.substring(10);
+		index = w.indexOf('__');
+		let id = w.substring(0, index);
 
 		index = html.lastIndexOf('<', html.indexOf(attr));
 		beg = '<div';
 		end = '</div>';
 
-		var pos = index + 1;
-		var count = 0;
-		var counter = 0;
+		let pos = index + 1;
+		let count = 0;
+		let counter = 0;
 
 		while (true) {
 
 			if (counter++ > 100)
 				break;
 
-			var a = html.indexOf(beg, pos);
-			var b = html.indexOf(end, pos);
+			let a = html.indexOf(beg, pos);
+			let b = html.indexOf(end, pos);
 
 			if (a !== -1 && a < b) {
 				count++;
@@ -305,8 +439,8 @@ exports.compile = function(html, widgets, used) {
 			}
 		}
 
-		var widget = widgets instanceof Array ? widgets.findItem('id', id) : widgets[id];
-		var body = html.substring(index, pos);
+		let widget = widgets instanceof Array ? widgets.findItem('id', id) : widgets[id];
+		let body = html.substring(index, pos);
 
 		// Widget not found
 		if (!widget) {
@@ -341,13 +475,13 @@ exports.compile = function(html, widgets, used) {
 		body = body.substring(0, index) + '~END~' + body.substring(index);
 
 		index = w.indexOf('__');
-		var config = decodeURIComponent(w.substring(index + 2, w.length - 1)).parseJSON(true);
 
-		var opt = {};
+		let config = decodeURIComponent(w.substring(index + 2, w.length - 1)).parseJSON(true);
+		let opt = {};
 		opt.id = id;
 		opt.indexer = indexer;
 		opt.body = tidy(clean(body));
-		opt.text = body.substring(body.lastIndexOf('~BEG~') + 5, body.lastIndexOf('~END~'));
+		opt.html = body.substring(body.lastIndexOf('~BEG~') + 5, body.lastIndexOf('~END~'));
 		opt.config = config || EMPTYOBJECT;
 		opt.render = widget.render;
 		opt.beg = opt.body.substring(0, opt.body.indexOf('>') + 1);
@@ -373,17 +507,17 @@ exports.compile = function(html, widgets, used) {
 		if (index === -1)
 			break;
 
-		var beg = html.lastIndexOf('<script', index);
-		var end = html.indexOf('</script>', index);
-		var endhead = html.indexOf('>', index);
-		var head = html.substring(beg, endhead);
-		var name = head.match(/name=".*?"/i)[0];
-		var template = html.substring(html.indexOf('>', endhead) + 1, end);
+		let begindex = html.lastIndexOf('<script', index);
+		let endindex = html.indexOf('</script>', index);
+		let endhead = html.indexOf('>', index);
+		let head = html.substring(begindex, endhead);
+		let name = head.match(/name=".*?"/i)[0];
+		let template = html.substring(html.indexOf('>', endhead) + 1, endindex);
 
 		name = name.substring(6, name.length - 1);
-		html = html.replace(html.substring(beg, end + 9), '~WIDGET#' + response.tangular.length + '~');
+		html = html.replace(html.substring(begindex, endindex + 9), '~WIDGET#' + response.tangular.length + '~');
 		response.tangular.push({ id: HASH(name).toString(36), name: name, type: 'nav', template: Tangular.compile(template) });
-		index = beg;
+		index = begindex;
 
 	}
 
@@ -396,26 +530,26 @@ exports.compile = function(html, widgets, used) {
 		if (index === -1)
 			break;
 
-		var beg = html.lastIndexOf('<script', index);
-		var end = html.indexOf('</script>', index);
-		var endhead = html.indexOf('>', index);
-		var template = html.substring(html.indexOf('>', endhead) + 1, end);
-		html = html.replace(html.substring(beg, end + 9), '~WIDGET#' + response.tangular.length + '~');
+		let begindex = html.lastIndexOf('<script', index);
+		let endindex = html.indexOf('</script>', index);
+		let endhead = html.indexOf('>', index);
+		let template = html.substring(html.indexOf('>', endhead) + 1, endindex);
+		html = html.replace(html.substring(begindex, endindex + 9), '~WIDGET#' + response.tangular.length + '~');
 		response.tangular.push({ type: 'breadcrumb', template: Tangular.compile(template) });
-		index = beg;
+		index = begindex;
 	}
 
 	response.html = tidy(trash(layout(html, '~WIDGETLAYOUT~')));
 	response.multiple = expressions_multiple(response.html);
 
-	for (var item of response.multiple)
+	for (let item of response.multiple)
 		response.html = response.html.replace(item.html, item.replace);
 
 	response.expressions = expressions(response.html);
 	response.widgets.reverse();
 
-	var builder = [];
-	var text = [];
+	let builder = [];
+	let text = [];
 
 	while (true) {
 
@@ -423,8 +557,8 @@ exports.compile = function(html, widgets, used) {
 
 		if (beg !== -1) {
 			end = response.html.indexOf('~', beg + 6) + 1;
-			var h = response.html.substring(0, beg);
-			var windex = response.html.substring(beg + 7, end - 1);
+			let h = response.html.substring(0, beg);
+			let windex = response.html.substring(beg + 7, end - 1);
 			if (windex[0] === '#') {
 				response.html = response.html.substring(end);
 				builder.push('text[{0}]+tangular[{1}]'.format(text.push(h) - 1, windex.substring(1)));