Merge branch 'pr_3026' into dev

packages/node_modules/@node-red/nodes/core/function/90-exec.html

@@ -40,6 +40,10 @@
         <input type="text" id="node-input-timer" style="width:65px;" data-i18n="[placeholder]exec.label.timeoutplace">
         <span data-i18n="exec.label.seconds"></span>
     </div>
+    <div class="form-row">
+        <label for="node-input-winHide" style="width: auto !important; padding-right:10px"><i class="fa fa-windows"></i> <span data-i18n="exec.label.winHide"></span></label>
+        <input type="checkbox" id="node-input-winHide" style="margin-top: 0; display:inline-block; width:auto;">
+    </div>
     <div class="form-row">
         <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
         <input type="text" id="node-input-name" data-i18n="[placeholder]common.label.name">
@@ -56,6 +60,7 @@
             append: {value:""},
             useSpawn: {value:"false"},
             timer: {value:""},
+            winHide: {value:false},
             oldrc: {value:false},
             name: {value:""}
         },
@@ -92,6 +97,12 @@
             });
 
             $("#node-input-addpay-cb").trigger("change")
+
+            if (this.winHide === "true" || this.winHide === true) {
+                $("#node-input-winHide").prop("checked",true);
+            } else {
+                $("#node-input-winHide").prop("checked",false);
+            }
         },
         oneditsave: function() {
             if (!$("#node-input-addpay-cb").prop("checked")) {

packages/node_modules/@node-red/nodes/core/function/90-exec.js

@@ -34,7 +34,8 @@ module.exports = function(RED) {
         this.timer = Number(n.timer || 0)*1000;
         this.activeProcesses = {};
         this.oldrc = (n.oldrc || false).toString();
-        this.execOpt = {encoding:'binary', maxBuffer:RED.settings.execMaxBufferSize||10000000};
+        this.execOpt = {encoding:'binary', maxBuffer:RED.settings.execMaxBufferSize||10000000, windowsHide: (n.winHide === true)};
+        this.spawnOpt = {windowsHide: (n.winHide === true) }
         var node = this;
 
         if (process.platform === 'linux' && fs.existsSync('/bin/bash')) { node.execOpt.shell = '/bin/bash'; }
@@ -86,7 +87,7 @@ module.exports = function(RED) {
                     var cmd = arg.shift();
                     /* istanbul ignore else  */
                     if (RED.settings.verbose) { node.log(cmd+" ["+arg+"]"); }
-                    child = spawn(cmd,arg);
+                    child = spawn(cmd,arg,node.spawnOpt);
                     node.status({fill:"blue",shape:"dot",text:"pid:"+child.pid});
                     var unknownCommand = (child.pid === undefined);
                     if (node.timer !== 0) {

packages/node_modules/@node-red/nodes/locales/en-US/function/90-exec.html

@@ -73,6 +73,7 @@
     <p>The returned <code>payload</code> is usually a <i>string</i>, unless non-UTF8 characters are detected, in which
     case it is a <i>buffer</i>.</p>
     <p>The node&apos;s status icon and PID will be visible while the node is active. Changes to this can be read by the <code>Status</code> node.</p>
+    <p>The <code>Hide console</code> option will hide the process console normally shown on Windows systems.</p>
     <h4>Killing processes</h4>
     <p>Sending <code>msg.kill</code> will kill a single active process. <code>msg.kill</code> should be a string containing
     the type of signal to be sent, for example, <code>SIGINT</code>, <code>SIGQUIT</code> or <code>SIGHUP</code>.

packages/node_modules/@node-red/nodes/locales/en-US/messages.json

@@ -198,7 +198,8 @@
             "seconds": "seconds",
             "stdout": "stdout",
             "stderr": "stderr",
-            "retcode": "return code"
+            "retcode": "return code",
+            "winHide": "Hide console"
         },
         "placeholder": {
             "extraparams": "extra input parameters"

test/nodes/core/function/90-exec_spec.js

@@ -44,6 +44,8 @@ describe('exec node', function() {
             n1.should.have.property("addpay","payload");
             n1.should.have.property("timer",0);
             n1.should.have.property("oldrc","false");
+            n1.should.have.property("execOpt", {encoding:'binary', maxBuffer:10000000, windowsHide: false});
+            n1.should.have.property("spawnOpt", {windowsHide:false});
             done();
         });
     });