total5 0.0.1-13 → 0.0.1-14

package/builders.js

@@ -24,7 +24,11 @@ Options.prototype = {
 	},
 
 	get websocket() {
-		return this.controller.parent;
+		return this.controller ? this.controller.parent : 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() {
@@ -149,8 +153,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) {
@@ -184,7 +194,7 @@ Options.prototype.done = function(arg) {
 	return function(err, response) {
 		if (err) {
 			err && self.error.push(err);
-			self.callback();
+			self.callback(null);
 		} else {
 			if (self.TYPE === 'auth')
 				self.callback(arg === true ? response : arg);
@@ -1559,10 +1569,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;
@@ -1583,14 +1595,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;
@@ -1638,8 +1650,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/controller.js

@@ -598,6 +598,16 @@ Controller.prototype.proxy = function(opt) {
 
 };
 
+Controller.prototype.done = function(arg) {
+	var ctrl = this;
+	return function(err, response) {
+		if (err)
+			ctrl.invalid(err);
+		else
+			ctrl.json(DEF.onSuccess(arg === true ? response : arg));
+	};
+};
+
 Controller.prototype.success = function(value) {
 	F.TUtils.success.value = value;
 	this.json(F.TUtils.success);

package/flow-flowstream.js

@@ -406,13 +406,8 @@ Instance.prototype.kill = Instance.prototype.destroy = function() {
 
 	if (self.flow.isworkerthread) {
 
-		self.flow.$socket && self.flow.$socket.destroy();
-		self.flow.$client && self.flow.$client.destroy();
-
-		if (self.flow.terminate)
-			self.flow.terminate();
-		else
-			self.flow.kill(9);
+		self.postMessage({ TYPE: 'stream/destroy' });
+		setTimeout(self => self.flow.terminate ? self.flow.terminate() : self.flow.kill(9), 1000, self);
 
 		if (PROXIES[self.id]) {
 			PROXIES[self.id].remove();
@@ -424,11 +419,12 @@ Instance.prototype.kill = Instance.prototype.destroy = function() {
 			for (var key in self.flow.sockets)
 				self.flow.sockets[key].destroy();
 		}
-		self.flow.$socket && self.flow.$socket.destroy();
-		self.flow.$client && self.flow.$client.destroy();
 		self.flow.destroy();
 	}
 
+	self.flow.$socket && self.flow.$socket.destroy();
+	self.flow.$client && self.flow.$client.destroy();
+
 	for (var key in CALLBACKS) {
 		if (CALLBACKS[key].id === self.id)
 			delete CALLBACKS[key];
@@ -1043,6 +1039,10 @@ function init_current(meta, callback, nested) {
 					flow.proxy.ping = setTimeout(killprocess, 10000);
 					break;
 
+				case 'stream/destroy':
+					flow.destroy();
+					break;
+
 				case 'stream/export':
 					msg.data = flow.export2();
 					Parent.postMessage(msg);

package/flow.js

@@ -78,7 +78,7 @@ FS.reload = function(flow, restart = false) {
 	FS.db[flow.id] = flow;
 
 	var instance = FS.instances[flow.id];
-	instance.worker = flow.worker;
+	instance.workertype = flow.worker;
 	instance.proxypath = flow.proxypath;
 
 	if (restart)

package/global.js

@@ -103,6 +103,76 @@ global.CORS = function(origin) {
 		CONF.$cors = origin || '*';
 };
 
+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.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
 global.U = F.TUtils;
 global.GUID = F.TUtils.guid;

package/index.js

@@ -483,7 +483,10 @@ function unlink(arr, callback) {
 
 		NOW = new Date();
 
-		if (!name && err.name)
+		if (err instanceof F.TBuilders.ErrorBuilder) {
+			if (!name)
+				name = err[0].name;
+		} else if (!name && err.name)
 			name = err.name;
 
 		err = err.toString();
@@ -1347,13 +1350,13 @@ F.componentator = function(name, components, removeprev = true) {
 
 };
 
-F.error = function(err, name, uri) {
+F.error = function(err, name, url) {
 
 	if (!arguments.length)
 		return F.errorcallback;
 
 	if (err)
-		F.def.onError(err, name, uri);
+		F.def.onError(err, name, url);
 };
 
 F.errorcallback = function(err) {
@@ -2413,7 +2416,7 @@ F.dir = function(val) {
 	if (val)
 		F.directory = val;
 
-	var dirs = ['public', 'tmp', 'logs', 'databases', 'controllers', 'resources', 'plugins', 'views', 'definitions', 'schemas', 'models', 'flowstreams', 'bundles', 'actions', 'extensions', 'source', 'services', 'updates', 'templates'];
+	var dirs = ['public', 'tmp', 'logs', 'databases', 'controllers', 'resources', 'plugins', 'views', 'definitions', 'schemas', 'models', 'flowstreams', 'bundles', 'actions', 'extensions', 'source', 'services', 'updates', 'templates', 'private'];
 
 	for (let dir of dirs) {
 		var cfg = F.config['$dir' + dir];

package/minificators.js

@@ -167,7 +167,7 @@ exports.js = function(value) {
 			}
 		}
 
-		if ((c === '}' && last === ';') || ((c === '}' || c === ']') && output[output.length - 1] === ' ' && alpha.test(output[output.length - 2])))
+		if (!scope && (c === '}' && last === ';') || ((c === '}' || c === ']') && output[output.length - 1] === ' ' && alpha.test(output[output.length - 2])))
 			output.pop();
 
 		output.push(c);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "total5",
-  "version": "0.0.1-13",
+  "version": "0.0.1-14",
   "description": "Total.js framework v5",
   "main": "index.js",
   "directories": {

package/routing.js

@@ -250,8 +250,12 @@ function Route(url, action, size) {
 		t.action = null;
 	}
 
+	if (!t.view && !t.action && t.method !== 'FILE' && t.method !== 'SOCKET')
+		t.view = t.url[0] && t.url[0] !== '/' ? t.url[0] : 'index';
+
 	if (t.wildcard)
 		t.priority -= 50;
+
 }
 
 Route.prototype.compare = function(ctrl) {

package/uibuilder.js

@@ -7,6 +7,11 @@ const REG_STRING = /'|"/g;
 
 exports.compile = async function(opt, callback) {
 
+	// opt.schema {String/Object}
+	// |--- opt.schema.origin {String}
+	// opt.local {Boolean}
+	// opt.download {Boolean}
+
 	if (!callback)
 		return new Promise((resolve, reject) => exports.compile(opt, (err, response) => err ? reject(err) : resolve(response)));
 
@@ -105,7 +110,7 @@ async function getComponents(schema, used, download) {
 
 	for (let com of arr) {
 
-		if (com.value.indexOf('.json') === -1 & !used[com.id])
+		if (com.value.indexOf('.json') === -1 && !used[com.id])
 			continue;
 
 		let url = com.value;
@@ -137,7 +142,7 @@ async function getComponents(schema, used, download) {
 					components[com.id] = render;
 				} else {
 					if (render[0] === '/')
-						render = schema.origin + render;
+						render = (schema.origin || '') + render;
 					let html = await Download(render);
 					if (html)
 						components[com.id] = 'base64 ' + Buffer.from(encodeURIComponent(html), 'utf8').toString('base64');

package/utils.js

@@ -2207,7 +2207,16 @@ SP.hash = function(type, salt) {
 	}
 };
 
-SP.sign = function(key) {
+SP.sign = function(key, check) {
+
+	if (check) {
+		let index = this.lastIndexOf('-');
+		if (index === -1)
+			return null;
+		var id = this.substring(0, index);
+		return id.sign(key) === this ? id : null;
+	}
+
 	return this + '-' + (string_hash(this + (key || '')) >>> 0).toString(36);
 };