total5 0.0.13-4 → 0.0.13-5

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

@@ -46,8 +46,7 @@ module.exports.watcher = function(callback) {
 function killapp(pid) {
 	try {
 		process.kill(pid, 'SIGINT');
-	} catch (e) {
-	}
+	} catch {}
 }
 
 function runapp() {

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/package.json

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

package/pypeline.js

@@ -154,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);
 		}
 	});
 

package/viewengine.js

@@ -257,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) {
@@ -608,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') {