Merge pull request #698 from totaljs/v3.2.0

v3.2.0

Author: petersirka

builders.js

@@ -1,3 +1,40 @@
+======= 3.2.0
+
+- added: `WORKER()` alias to `F.worker()`
+- added: `WORKER2()` alias to `F.worker2()`
+- added: `F.cluster.https()`
+- added: `TaskBuilder.done2([send_value])` returns `function` with wrapped `.done()`
+- added: `TaskBuilder.success2([send_value])` returns `function` with wrapped `.success()`
+- added: `TaskBuilder.next2(name)` returns `function` with wrapped `.next()`
+- added: new `RESTBuilder` aliases `.DELETE()`, `.PUT()`, `.POST()`, `.PATCH() and `.GET()`
+- added: `schema.before(key, (value, model, index) => value)` is a simple and new alternative to `schema.setPrepare()`
+- added: `SchemaInstance.$parent` returns a parent schema (if the schema is nested schema)
+- added: `SchemaOptions.redirect(url)` can perform a redirect from the schema
+- added: `OperationOptions.redirect(url)` can perform a redirect from the operation
+- added: `.ics` extension as acceptable file for the web server
+
+- updated: `F.worker2()` returns entire `stdout` buffer in the `callback(err, buffer)`
+- updated: `$options()` by adding `disabled` key
+- updated: `String.ROOT()` by adding a support for jComponent `AJAX()` calls
+- updated: `RESTBuilder.method(method, [data])` added `data` argument
+- updated: `String.parseDate([format])` added `format` argument
+- updated: SMTP settings contain `heloid` as `heloidentifier` (manually can be defined `HELO` or `EHLO` command)
+- updated: SMTP hostname is computed from email if SMTP is not specified
+
+- fixed: critical bug with security + improved security
+- fixed: system routing
+- fixed: NoSQL sorting, solved a strange problem
+- fixed: `U.request()` with `GET` method by @khaledkhalil94 (it doesn't send JSON data if `data` is null/undefined)
+- fixed: `F.wait()` in WebSocket
+- fixed: `String.capitalize(true)`
+- fixed: `REQUEST()` uploading of additional multipart/form-data (removed encoding)
+- fixed: view engine conditions defined in `<script>`
+- fixed: auto-redirects in `U.download()`
+- fixed: image streams resizing
+- fixed: `@{'%config_key'}` a problem with rendering a value with `'`
+
+- removed: `X-Powered-By: Total.js`
+
 ======= 3.1.0
 
 - added: CSS variables support default values `border-radius: $radius || 10px`

changes.txt

@@ -158,6 +158,17 @@ exports.http = function(count, mode, options, callback) {
 		fork();
 };
 
+exports.https = function(count, mode, options, callback) {
+	// Fork will obtain options automatically via event
+	if (Cluster.isMaster) {
+		CLUSTER_REQ.id = 'master';
+		CLUSTER_RES.id = 'master';
+		CLUSTER_EMIT.id = 'master';
+		master(count, mode, options, callback, true);
+	} else
+		fork();
+};
+
 exports.restart = function(index) {
 	if (index === undefined) {
 		for (var i = 0; i < THREADS; i++)
@@ -173,7 +184,7 @@ exports.restart = function(index) {
 	}
 };
 
-function master(count, mode, options, callback) {
+function master(count, mode, options, callback, https) {
 
 	if (count == null || count === 'auto')
 		count = require('os').cpus().length;
@@ -222,7 +233,7 @@ function master(count, mode, options, callback) {
 	};
 
 	count.async(function(i, next) {
-		exec(Math.abs(i - THREADS));
+		exec(Math.abs(i - THREADS), https);
 		can(next);
 	}, function() {
 		callback && callback(FORKS);
@@ -258,7 +269,7 @@ function mastersend(m) {
 		FORKS[i] && FORKS[i].send(m);
 }
 
-function exec(index) {
+function exec(index, https) {
 	var fork = Cluster.fork();
 	fork.$id = index.toString();
 	fork.on('message', message);
@@ -272,7 +283,7 @@ function exec(index) {
 	(function(fork) {
 		setTimeout(function() {
 			OPTIONS.options.id = fork.$id;
-			fork.send({ TYPE: 'init', bundling: !CONTINUE, id: fork.$id, mode: OPTIONS.mode, options: OPTIONS.options, threads: OPTIONS.count, index: index });
+			fork.send({ TYPE: 'init', bundling: !CONTINUE, id: fork.$id, mode: OPTIONS.mode, options: OPTIONS.options, threads: OPTIONS.count, index: index, https: https });
 		}, fork.$id * 500);
 	})(fork);
 }
@@ -290,7 +301,10 @@ function on_init(msg) {
 			CLUSTER_RES.id = msg.id;
 			THREADS = msg.threads;
 			msg.options.bundling = msg.bundling;
-			F.http(msg.mode, msg.options);
+			if (msg.https)
+				F.https(msg.mode, msg.options);
+			else
+				F.http(msg.mode, msg.options);
 			F.isCluster = true;
 			F.removeListener(msg.TYPE, on_init);
 			break;

cluster.js

@@ -34,6 +34,7 @@ const Fs = require('fs');
 const REGEXP_SVG = /(width="\d+")+|(height="\d+")+/g;
 const REGEXP_PATH = /\//g;
 const REGEXP_ESCAPE = /'/g;
+const SPAWN_OPT = { shell: true };
 const D = require('os').platform().substring(0, 3).toLowerCase() === 'win' ? '"' : '\'';
 
 var CACHE = {};
@@ -280,8 +281,7 @@ Image.prototype.pipe = function(stream, type, options) {
 	!self.builder.length && self.minify();
 	!type && (type = self.outputType);
 
-	var cmd = spawn(self.isIM ? 'convert' : 'gm', self.arg(self.filename ? wrap(self.filename) : '-', (type ? type + ':' : '') + '-'));
-
+	var cmd = spawn(self.isIM ? 'convert' : 'gm', self.arg(self.filename ? wrap(self.filename) : '-', (type ? type + ':' : '') + '-'), SPAWN_OPT);
 	cmd.stderr.on('data', stream.emit.bind(stream, 'error'));
 	cmd.stdout.on('data', stream.emit.bind(stream, 'data'));
 	cmd.stdout.on('end', stream.emit.bind(stream, 'end'));
@@ -318,8 +318,7 @@ Image.prototype.stream = function(type, writer) {
 	if (!type)
 		type = self.outputType;
 
-	var cmd = spawn(self.isIM ? 'convert' : 'gm', self.arg(self.filename ? wrap(self.filename) : '-', (type ? type + ':' : '') + '-'));
-
+	var cmd = spawn(self.isIM ? 'convert' : 'gm', self.arg(self.filename ? wrap(self.filename) : '-', (type ? type + ':' : '') + '-'), SPAWN_OPT);
 	if (self.currentStream) {
 		if (self.currentStream instanceof Buffer)
 			cmd.stdin.end(self.currentStream);