total5 0.0.13-3 → 0.0.13-5

package/builders.js

@@ -1360,6 +1360,7 @@ ActionCaller.prototype.exec = function() {
 	$.controller = self.controller;
 	$.fields = action.fields;
 	$.user = self.options.user;
+	$.config = action.config || EMPTYOBJECT;
 
 	$.$callback = function(err, response) {
 

package/changelog.txt

@@ -6,6 +6,8 @@
 - added auto script loader for `transforms` directory
 - added support for Python scripts in the `pypelines` folder
 - added `PYPELINE(name, [options])` method starts a python process
+- added support for custom View engine helpers `DEF.helpers.myhelper`
+- fixed killing workers and pypelines
 
 ========================
 0.0.12

package/components.js

@@ -260,7 +260,7 @@ Instance.prototype.debug = function(msg) {
 };
 
 Instance.prototype.throw = function(err) {
-	this.module.throw(this, error);
+	this.module.throw(this, err);
 };
 
 Instance.prototype.dashboard = function(msg) {
@@ -344,8 +344,6 @@ exports.compile = function(html, callback) {
 		return;
 	}
 
-	var errors = [];
-
 	(com.npm || EMPTYARRAY).wait(function(name, next) {
 		NPMINSTALL(name, function(err) {
 			if (err) {
@@ -378,4 +376,4 @@ exports.compile = function(html, callback) {
 		callback(null, com);
 	});
 
-};
+};

package/debug.js

@@ -46,8 +46,7 @@ module.exports.watcher = function(callback) {
 function killapp(pid) {
 	try {
 		process.kill(pid, 'SIGINT');
-	} catch (e) {
-	}
+	} catch {}
 }
 
 function runapp() {
@@ -72,11 +71,11 @@ function runwatching() {
 
 	const FILENAME = F.TUtils.getName(process.argv[1] || 'index.js');
 	const VERSION = F.version_header;
-	const REG_FILES = /(config|bundles\.debug|\.js|\.ts|\.flow|\.resource)+$/i;
+	const REG_FILES = /(config|bundles\.debug|\.js|\.ts|\.flow|\.py|\.resource)+$/i;
 	const REG_PUBLIC = /\/public\//i;
 	const REG_INDEX = new RegExp(FILENAME.replace(/\.js$/, '') + '_.*?\\.js$');
-	const REG_EXTENSION = /\.(js|ts|resource|package|bundle|build|flow|url)$/i;
-	const REG_RELOAD = /\.(js|ts|css|html|htm|jpg|png|gif|ico|svg|webp|resource)$/i;
+	const REG_EXTENSION = /\.(js|ts|py|resource|package|bundle|build|flow|url)$/i;
+	const REG_RELOAD = /\.(js|ts|py|css|html|htm|jpg|png|gif|ico|svg|webp|resource)$/i;
 	const isRELOAD = !!options.livereload;
 	const SPEED = isRELOAD ? 1000 : 1500;
 	const ARGV = F.TUtils.clone(process.argv);
@@ -551,4 +550,4 @@ function init() {
 		setImmediate(runapp);
 }
 
-Meta.delay = setTimeout(init, 100);
+Meta.delay = setTimeout(init, 100);

package/flow-flowstream.js

@@ -1019,9 +1019,9 @@ function init_current(meta, callback, nested) {
 	flow.proxy.ping = 0;
 
 	if (meta.import) {
-		var tmp = meta.import.split(/,|;/).trim();
-		for (var m of tmp) {
-			var mod = require(F.path.root(m));
+		let tmp = meta.import.split(/,|;/).trim();
+		for (let m of tmp) {
+			let mod = require(F.path.root(m));
 			mod.install && mod.install(flow);
 			mod.init && mod.init(flow);
 		}
@@ -3382,4 +3382,4 @@ if (process.argv[1].endsWith('flow-flowstream.js')) {
 		});
 	}
 
-}
+}

package/index.js

@@ -68,6 +68,7 @@ global.DEF = {};
 	F.errors = [];
 	F.paused = [];
 	F.crons = [];
+	F.pypelines = [];
 
 	F.internal = {
 		ticks: 0,
@@ -2492,7 +2493,14 @@ F.exit = function(signal = 15) {
 		let worker = F.workers[m];
 		try {
 			worker && worker.kill && worker.kill(signal);
-		} catch (e) {}
+		} catch {}
+	}
+
+
+	for (let m of F.pypelines) {
+		try {
+			m.kill(signal);
+		} catch {}
 	}
 
 	let key = 'exit';
@@ -2502,7 +2510,7 @@ F.exit = function(signal = 15) {
 	if (!F.isWorker && process.send && process.connected) {
 		try {
 			process.send('total:stop');
-		} catch (e) {}
+		} catch {}
 	}
 
 	F.internal.interval && clearInterval(F.internal.interval);
@@ -2778,6 +2786,15 @@ function httptuningperformance(socket) {
 	socket.setKeepAlive(true, 10);
 }
 
+function forcestop() {
+	console.log('KILLUJEM');
+	F.exit();
+}
+
+process.on('SIGTERM', forcestop);
+process.on('SIGINT', forcestop);
+process.on('exit', forcestop);
+
 process.on('unhandledRejection', function(e) {
 	F.error(e.stack, '');
 });

package/mail.js

@@ -731,7 +731,7 @@ Mailer.$send = function(obj, options, autosend) {
 				isAuthorization = true;
 				if (options.token && line.indexOf('XOAUTH2') !== -1) {
 					auth.push('AUTH XOAUTH2');
-					auth.push(Buffer.from('user=' + options.user + '\1auth=Bearer ' + options.token + '\1\1').toString('base64'));
+					auth.push(Buffer.from('user=' + options.user + '\x01auth=Bearer ' + options.token + '\x01\x01').toString('base64'));
 				} else if (line.lastIndexOf('XOAUTH') === -1) {
 					auth.push('AUTH LOGIN');
 					auth.push(Buffer.from(options.user).toString('base64'));
@@ -924,4 +924,4 @@ exports.refresh = function() {
 		if (conn.TS < NOW && (!conn.messages || !conn.messages.length))
 			Mailer.destroy(F.temporary.smtp[key]);
 	}
-};
+};

package/package.json

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

package/pypeline.js

@@ -6,7 +6,6 @@ function Pypeline(filename) {
 
 	t.socket = PATH.tmp('pypeline_' + HASH(filename).toString(36) + '.socket');
 	t.filename = filename;
-	t.callbacks = {};
 	t.sockets = [];
 	t.processes = [];
 	t.current = 0;
@@ -63,21 +62,9 @@ Pypeline.prototype.init = function() {
 		});
 
 		socket.on('end', function() {
-
-			for (let key in t.callbacks) {
-				let callback = t.callbacks[key];
-				if (callback.socket === socket) {
-					try {
-						callbacks.fn('Disconnected');
-					} catch {}
-					delete t.callbacks[key];
-				}
-			}
-
 			let index = t.sockets.indexOf(socket);
 			if (index !== -1)
 				t.sockets.splice(index);
-
 		});
 
 		let pending = t.pending.splice(0);
@@ -117,14 +104,6 @@ Pypeline.prototype.close = function() {
 		t.process.kill(9);
 	} catch {}
 
-	for (let key in t.callbacks) {
-		let callback = t.callbacks[key];
-		try {
-			callbacks.fn('Disconnected');
-		} catch {}
-	}
-
-	t.callbacks = null;
 	return t;
 };
 
@@ -166,7 +145,6 @@ Pypeline.prototype.run = Pypeline.prototype.restart = function() {
 	}
 
 	let args = [];
-	let scr = t.filename.includes('\n');
 
 	if (t.inline)
 		args.push('-c');
@@ -176,15 +154,22 @@ Pypeline.prototype.run = Pypeline.prototype.restart = function() {
 	args.push(t.filename);
 	args.push(t.socket);
 
-	t.process = Total.Child.spawn('python3', args, { cwd: t.inline ? PATH.root() : Total.Path.dirname(t.filename), stdio: ['inherit', 'inherit', 'inherit'] });
+	t.process = Total.Child.spawn('python3', args, { cwd: t.inline ? PATH.root() : Total.Path.dirname(t.filename), stdio: ['inherit', 'inherit', 'inherit'], detached: false });
+	t.process.$pypelines = t;
+	F.pypelines.push(t.process);
 
 	t.process.on('close', function() {
+
+		let index = F.pypelines.indexOf(t.process);
+		F.pypelines.splice(index, 1);
+
 		if (t.autorestart) {
 			t.run();
 			t.emit('restart');
 		} else {
 			t.server.close();
 			t.emit('close');
+			F.pypelines.push(t);
 		}
 	});
 
@@ -221,4 +206,4 @@ exports.init = function(filename, options, inline) {
 	}
 
 	return pypeline;
-};
+};

package/tangular.js

@@ -96,7 +96,7 @@
 
 		self.template = template;
 
-		template = template.replace(/\|\|/g, '\1');
+		template = template.replace(/\|\|/g, '\x01');
 
 		self.variables = {};
 		self.commands = [];
@@ -221,9 +221,9 @@
 						var ishelperfirst = ishelper && !i;
 						index = helper.indexOf('(');
 						if (index === -1) {
-							helper = 'Thelpers.$execute($helpers,model,\'' + helper + '\',' + (ishelperfirst ? '' : '\7)');
+							helper = 'Thelpers.$execute($helpers,model,\'' + helper + '\',' + (ishelperfirst ? '' : '\x07)');
 						} else
-							helper = 'Thelpers.$execute($helpers,model,\'' + helper.substring(0, index) + '\',' + (ishelperfirst ? '' : '\7,') + helper.substring(index + 1);
+							helper = 'Thelpers.$execute($helpers,model,\'' + helper.substring(0, index) + '\',' + (ishelperfirst ? '' : '\x07,') + helper.substring(index + 1);
 						helpers[i] = helper;
 					}
 				} else
@@ -315,9 +315,9 @@
 					for (var j = 0; j < cmd.helpers.length; j++) {
 						var helper = cmd.helpers[j];
 						if (j === 0)
-							str = helper.replace('\7', cmd.cmd.trim()).trim();
+							str = helper.replace('\x07', cmd.cmd.trim()).trim();
 						else
-							str = helper.replace('\7', str.trim());
+							str = helper.replace('\x07', str.trim());
 					}
 					builder.push('$tmp=' + str + ';if($tmp!=null)$output+=$tmp;');
 				} else
@@ -406,4 +406,4 @@
 	Thelpers.empty=Thelpers.def=function(e,n){return e?Thelpers.encode(e):n||'---'};
 	Thelpers.currency=function(e,t){switch(typeof e){case'number':return e.currency(t);case'string':return e.parseFloat().currency(t);default:return''}};
 
-})(global);
+})(global);

package/viewengine.js

@@ -112,7 +112,6 @@ exports.compile = function(name, content, debug = true) {
 	var isCOMPILATION = false;
 	var builderTMP = '';
 	var sectionName = '';
-	var components = {};
 	var text;
 
 	while (command) {
@@ -258,7 +257,7 @@ exports.compile = function(name, content, debug = true) {
 	if (!debug)
 		builder = builder.replace(/(\+\$EMPTY\+)/g, '+').replace(/(\$output=\$EMPTY\+)/g, '$output=').replace(/(\$output\+=\$EMPTY\+)/g, '$output+=').replace(/(\}\$output\+=\$EMPTY)/g, '}').replace(/(\{\$output\+=\$EMPTY;)/g, '{').replace(/(\+\$EMPTY\+)/g, '+').replace(/(>'\+'<)/g, '><').replace(/'\+'/g, '');
 
-	var fn = ('(function(self){var model=self.model;var config=F.config;var ctrl=self.controller;var query=ctrl?.query || EMPTYOBJECT,repository=self.repository,controller=self.controller,files=ctrl?.files || EMPTYARRAY,user=ctrl?.user,session=ctrl?.session,body=ctrl?.body,language=ctrl?.language || \'\'' + (isCookie ? ',cookie=name=>ctrl?ctrl.cookie(name):\'\'' : '') + ';' + (nocompressHTML ? 'if(ctrl)ctrl.response.minify=false;' : '') + builder + ';return $output;})');
+	var fn = ('(function(self){var model=self.model;var config=F.config;var ctrl=self.controller;var query=ctrl?.query || EMPTYOBJECT,repository=self.repository,controller=self.controller,files=ctrl?.files || EMPTYARRAY,user=ctrl?.user,session=ctrl?.session,body=ctrl?.body,helpers=F.def.helpers;language=ctrl?.language || \'\'' + (isCookie ? ',cookie=name=>ctrl?ctrl.cookie(name):\'\'' : '') + ';' + (nocompressHTML ? 'if(ctrl)ctrl.response.minify=false;' : '') + builder + ';return $output;})');
 	try {
 		fn = eval(fn);
 	} catch (e) {
@@ -609,6 +608,18 @@ View.prototype.layout = function(value) {
 	return '';
 };
 
+View.prototype.helper = function(name) {
+	var helper = F.def.helpers[name];
+	if (!helper)
+		return '';
+
+	var params = [];
+	for (var i = 1; i < arguments.length; i++)
+		params.push(arguments[i]);
+
+	return helper.apply(this, params);
+};
+
 View.prototype.json = function(obj, id, beautify, replacer) {
 
 	if (typeof(id) === 'boolean') {
@@ -912,4 +923,4 @@ View.prototype.render = function(name, model, ispartial = false) {
 	return content;
 };
 
-exports.View = View;
+exports.View = View;