@node-red/nodes 3.1.0-beta.3 → 3.1.0-beta.4

package/core/common/25-catch.html

@@ -41,7 +41,9 @@
             if (this.name) {
                 return this.name;
             }
-            if (this.scope) {
+            if (this.scope === "group") {
+                return this._("catch.catchGroup");
+            } else if (Array.isArray(this.scope)) {
                 return this._("catch.catchNodes",{number:this.scope.length});
             }
             return this.uncaught?this._("catch.catchUncaught"):this._("catch.catch")

package/core/common/25-status.html

@@ -33,7 +33,15 @@
         outputs:1,
         icon: "status.svg",
         label: function() {
-            return this.name||(this.scope?this._("status.statusNodes",{number:this.scope.length}):this._("status.status"));
+            if (this.name) {
+                return this.name;
+            }
+            if (this.scope === "group") {
+                return this._("status.statusGroup");
+            } else if (Array.isArray(this.scope)) {
+                return this._("status.statusNodes",{number:this.scope.length});
+            }
+            return this._("status.status")
         },
         labelStyle: function() {
             return this.name?"node_label_italic":"";

package/core/common/60-link.html

@@ -28,7 +28,7 @@
         <input type="text" id="node-input-name" data-i18n="[placeholder]common.label.name">
     </div>
     <div class="form-row">
-        <label for="node-input-timeout"><span data-i18n="exec.label.timeout"></span></label>
+        <label for="node-input-timeout"><i class="fa fa-clock-o"></i> <span data-i18n="exec.label.timeout"></span></label>
         <input type="text" id="node-input-timeout" placeholder="30" style="width: 70px; margin-right: 5px;"><span data-i18n="inject.seconds"></span>
     </div>
     <div class="form-row">

package/core/function/10-function.html

@@ -82,6 +82,11 @@
                 <input id="node-input-outputs" style="width: 60px;" value="1">
             </div>
 
+            <div class="form-row">
+                <label for="node-input-timeout"><i class="fa fa-clock-o"></i> <span data-i18n="function.label.timeout"></span></label>
+                <input id="node-input-timeout" style="width: 60px;" data-i18n="[placeholder]join.seconds">
+            </div>
+
             <div class="form-row node-input-libs-row hide" style="margin-bottom: 0px;">
                 <label><i class="fa fa-cubes"></i> <span data-i18n="function.label.modules"></span></label>
             </div>
@@ -360,6 +365,7 @@
             name: {value:"_DEFAULT_"},
             func: {value:"\nreturn msg;"},
             outputs: {value:1},
+            timeout:{value:0},
             noerr: {value:0,required:true,
                     validate: function(v, opt) {
                         if (!v) {
@@ -464,6 +470,26 @@
                 }
             });
 
+            // 4294967 is max in node.js timeout.
+            $( "#node-input-timeout" ).spinner({
+                min: 0,
+                max: 4294967,
+                change: function(event, ui) {
+                    var value = this.value;
+                    if(value == ""){
+                        value = 0;
+                    }
+                    else
+                    {
+                        value = parseInt(value);
+                    }
+                    value = isNaN(value) ? 1 : value;
+                    value = Math.max(value, parseInt($(this).attr("aria-valuemin")));
+                    value = Math.min(value, parseInt($(this).attr("aria-valuemax")));
+                    if (value !== this.value) { $(this).spinner("value", value); }
+                }
+            });
+
             var buildEditor = function(id, stateId, focus, value, defaultValue, extraLibs, offset) {
                 var editor = RED.editor.createEditor({
                     id: id,
@@ -503,7 +529,7 @@
                 editor:this.editor, // the field name the main text body goes to
                 mode:"ace/mode/nrjavascript",
                 fields:[
-                    'name', 'outputs',
+                    'name', 'outputs', 'timeout',
                     {
                         name: 'initialize',
                         get: function() {

package/core/function/10-function.js

@@ -96,6 +96,13 @@ module.exports = function(RED) {
         node.name = n.name;
         node.func = n.func;
         node.outputs = n.outputs;
+        node.timeout = n.timeout*1000;
+        if(node.timeout>0){
+            node.timeoutOptions = {
+                timeout:node.timeout,
+                breakOnSigint:true
+            }
+        }
         node.ini = n.initialize ? n.initialize.trim() : "";
         node.fin = n.finalize ? n.finalize.trim() : "";
         node.libs = n.libs || [];
@@ -362,6 +369,10 @@ module.exports = function(RED) {
                     })(__initSend__);`;
                     iniOpt = createVMOpt(node, " setup");
                     iniScript = new vm.Script(iniText, iniOpt);
+                    if(node.timeout>0){
+                        iniOpt.timeout = node.timeout;
+                        iniOpt.breakOnSigint = true;
+                    }
                 }
                 node.script = vm.createScript(functionText, createVMOpt(node, ""));
                 if (node.fin && (node.fin !== "")) {
@@ -385,6 +396,10 @@ module.exports = function(RED) {
                     })();`;
                     finOpt = createVMOpt(node, " cleanup");
                     finScript = new vm.Script(finText, finOpt);
+                    if(node.timeout>0){
+                        finOpt.timeout = node.timeout;
+                        finOpt.breakOnSigint = true;
+                    }
                 }
                 var promise = Promise.resolve();
                 if (iniScript) {
@@ -396,9 +411,12 @@ module.exports = function(RED) {
                     var start = process.hrtime();
                     context.msg = msg;
                     context.__send__ = send;
-                    context.__done__ = done;
-
-                    node.script.runInContext(context);
+                    context.__done__ = done;    
+                    var opts = {};
+                    if (node.timeout>0){
+                        opts = node.timeoutOptions;
+                    }
+                    node.script.runInContext(context,opts);
                     context.results.then(function(results) {
                         sendResults(node,send,msg._msgid,results,false);
                         if (handleNodeDoneCall) {

package/core/function/10-switch.html

@@ -103,6 +103,7 @@
             } else if (type === "istype") {
                 r.v = rule.find(".node-input-rule-type-value").typedInput('type');
                 r.vt = rule.find(".node-input-rule-type-value").typedInput('type');
+                r.vt = (r.vt === "number") ? "num" : "str";
             } else if (type === "jsonata_exp") {
                 r.v = rule.find(".node-input-rule-exp-value").typedInput('value');
                 r.vt = rule.find(".node-input-rule-exp-value").typedInput('type');

package/core/function/89-delay.js

@@ -229,6 +229,7 @@ module.exports = function(RED) {
             node.on("input", function(msg, send, done) {
                 if (!node.drop) {
                     var m = RED.util.cloneMessage(msg);
+                    delete m.flush;
                     if (Object.keys(m).length > 1) {
                         if (node.intervalID !== -1) {
                             if (node.allowrate && m.hasOwnProperty("rate") && !isNaN(parseFloat(m.rate)) && node.rate !== m.rate) {

package/core/network/21-httprequest.html

@@ -93,7 +93,7 @@
 
     <div class="form-row">
         <input type="checkbox" id="node-input-insecureHTTPParser" style="display: inline-block; width: auto; vertical-align: top;">
-        <label for="node-input-insecureHTTPParser", style="width: auto;" data-i18n="httpin.insecureHTTPParser"></label>
+        <label for="node-input-insecureHTTPParser" style="width: auto;" data-i18n="httpin.insecureHTTPParser"></label>
     </div>
 
 

package/core/network/21-httprequest.js

@@ -23,6 +23,8 @@ module.exports = async function(RED) {
     const { v4: uuid } = require('uuid');
     const crypto = require('crypto');
     const URL = require("url").URL
+    const http = require("http")
+    const https = require("https")
     var mustache = require("mustache");
     var querystring = require("querystring");
     var cookie = require("cookie");
@@ -65,16 +67,27 @@ in your Node-RED user directory (${RED.settings.userDir}).
     function HTTPRequest(n) {
         RED.nodes.createNode(this,n);
         checkNodeAgentPatch();
-        var node = this;
-        var nodeUrl = n.url;
-        var isTemplatedUrl = (nodeUrl||"").indexOf("{{") != -1;
-        var nodeMethod = n.method || "GET";
-        var paytoqs = false;
-        var paytobody = false;
-        var redirectList = [];
-        var sendErrorsToCatch = n.senderr;
+        const node = this;
+        const nodeUrl = n.url;
+        const isTemplatedUrl = (nodeUrl||"").indexOf("{{") != -1;
+        const nodeMethod = n.method || "GET";
+        let paytoqs = false;
+        let paytobody = false;
+        let redirectList = [];
+        const sendErrorsToCatch = n.senderr;
         node.headers = n.headers || [];
-        var nodeHTTPPersistent = n["persist"];
+        const useKeepAlive = n["persist"];
+        let agents = null
+        if (useKeepAlive) {
+            agents = {
+                http: new http.Agent({ keepAlive: true }),
+                https: new https.Agent({ keepAlive: true })
+            }
+            node.on('close', function () {
+                agents.http.destroy()
+                agents.https.destroy()
+            })
+        }
         if (n.tls) {
             var tlsNode = RED.nodes.getNode(n.tls);
         }
@@ -560,12 +573,14 @@ in your Node-RED user directory (${RED.settings.userDir}).
                     opts.agent = {
                         http: new HttpProxyAgent(proxyOptions),
                         https: new HttpsProxyAgent(proxyOptions)
-                    };
-
+                    }
                 } else {
                     node.warn("Bad proxy url: "+ prox);
                 }
             }
+            if (useKeepAlive && !opts.agent) {
+                opts.agent = agents
+            }
             if (tlsNode) {
                 opts.https = {};
                 tlsNode.addTLSOptions(opts.https);

package/core/sequence/17-split.js

@@ -629,6 +629,9 @@ module.exports = function(RED) {
                     joinChar = node.joiner;
                     if (n.count === "" && msg.hasOwnProperty('parts')) {
                         targetCount = msg.parts.count || 0;
+                        if (msg.parts.hasOwnProperty('id')) {
+                            partId = msg.parts.id;
+                        }
                     }
                     if (node.build === 'object') {
                         propertyKey = RED.util.getMessageProperty(msg,node.key);

package/core/storage/10-file.js

@@ -68,9 +68,12 @@ module.exports = function(RED) {
                     node.error(err,msg);
                     return done();
                 } else {
-                    filename = value;
+                    processMsg2(msg,nodeSend,value,done);
                 }
             });
+       }
+
+       function processMsg2(msg,nodeSend,filename,done) {
             filename = filename || "";
             msg.filename = filename;
             var fullFilename = filename;
@@ -311,9 +314,12 @@ module.exports = function(RED) {
                     node.error(err,msg);
                     return done();
                 } else {
-                    filename = (value || "").replace(/\t|\r|\n/g,'');
+                    processMsg2(msg, nodeSend, (value || "").replace(/\t|\r|\n/g,''), nodeDone);
                 }
             });
+        });
+
+        function processMsg2(msg, nodeSend, filename, nodeDone) {
             filename = filename || "";
             var fullFilename = filename;
             if (filename && RED.settings.fileWorkingDirectory && !path.isAbsolute(filename)) {
@@ -434,7 +440,8 @@ module.exports = function(RED) {
                         nodeDone();
                     });
             }
-        });
+        }
+
         this.on('close', function() {
             node.status({});
         });

package/locales/de/messages.json

@@ -216,7 +216,8 @@
             "initialize": "Start",
             "finalize": "Stopp",
             "outputs": "Ausgänge",
-            "modules": "Module"
+            "modules": "Module",
+            "timeout": "Timeout"
         },
         "text": {
             "initialize": "// Der Code hier wird ausgeführt,\n// wenn der Node gestartet wird\n",

package/locales/en-US/common/20-inject.html

@@ -36,5 +36,5 @@ greater than one day you should consider using a scheduler node that can cope wi
 <p><b>Note</b>: The <i>"Interval between times"</i> and <i>"at a specific time"</i> options use the standard cron system.
 This means that 20 minutes will be at the next hour, 20 minutes past and 40 minutes past - not in 20 minutes time.
 If you want every 20 minutes from now - use the <i>"interval"</i> option.</p>
-<p><b>Note</b>: To include a newline in a string you must use a Function node to create the payload.</p>
+<p><b>Note</b>: To include a newline in a string you must use the Function or Template node to create the payload.</p>
 </script>

package/locales/en-US/messages.json

@@ -94,6 +94,7 @@
     },
     "catch": {
         "catch": "catch: all",
+        "catchGroup": "catch: group",
         "catchNodes": "catch: __number__",
         "catchUncaught": "catch: uncaught",
         "label": {
@@ -109,6 +110,7 @@
     },
     "status": {
         "status": "status: all",
+        "statusGroup": "status: group",
         "statusNodes": "status: __number__",
         "label": {
             "source": "Report status from",
@@ -250,7 +252,8 @@
             "initialize": "On Start",
             "finalize": "On Stop",
             "outputs": "Outputs",
-            "modules": "Modules"
+            "modules": "Modules",
+            "timeout": "Timeout"
         },
         "text": {
             "initialize": "// Code added here will be run once\n// whenever the node is started.\n",

package/locales/fr/messages.json

@@ -103,6 +103,7 @@
         },
         "scope": {
             "all": "tous les noeuds",
+            "group": "dans le même groupe",
             "selected": "noeuds sélectionnés"
         }
     },
@@ -115,6 +116,7 @@
         },
         "scope": {
             "all": "tous les noeuds",
+            "group": "dans le même groupe",
             "selected": "noeuds sélectionnés"
         }
     },
@@ -414,6 +416,7 @@
             "port": "Port",
             "keepalive": "Rester en vie",
             "cleansession": "Utiliser une session propre",
+            "autoUnsubscribe": "Se désabonner automatiquement lors de la déconnexion",
             "cleanstart": "Utiliser un démarrage propre",
             "use-tls": "Utiliser TLS",
             "tls-config": "Configuration TLS",

package/locales/ja/common/20-inject.html

@@ -30,5 +30,5 @@
 <p>また、フロー開始の際に一度だけメッセージを送出させることもできます。</p>
 <p>「<i>時間間隔</i>」に指定可能な値の最大値は、約596時間(もしくは24日)です。一日より長い間隔を扱いたい場合は、電源停止や再起動にも対応可能なスケジューラノードの利用を検討すると良いでしょう。</p>
 <p><b>注</b>:「<i>指定した時間間隔、日時</i>」と「<i>指定した日時</i>」オプションは標準的なcronシステムを内部で利用します。したがって「20分」という指定は、その時点から20分後ではなく、毎時きっかり、20分、40分を意味します。現時刻から20分毎を指定するには「<i>指定した時間間隔</i>」オプションを用います。</p>
-<p><b>注</b>: 文字列に改行を含めたい場合は、functionノードを使ってペイロードを設定してください。</p>
+<p><b>注</b>: 文字列に改行を含めたい場合は、functionノードまたはtemplateノードを使ってペイロードを設定してください。</p>
 </script>

package/locales/ja/messages.json

@@ -94,6 +94,7 @@
     },
     "catch": {
         "catch": "catch: 全て",
+        "catchGroup": "catch: グループ",
         "catchNodes": "catch: __number__",
         "catchUncaught": "catch: 未補足",
         "label": {
@@ -103,11 +104,13 @@
         },
         "scope": {
             "all": "全てのノード",
+            "group": "同一グループ内",
             "selected": "選択したノード"
         }
     },
     "status": {
         "status": "status: 全て",
+        "statusGroup": "status: グループ",
         "statusNodes": "status: __number__",
         "label": {
             "source": "ステータス取得元",
@@ -115,6 +118,7 @@
         },
         "scope": {
             "all": "全てのノード",
+            "group": "同一グループ内",
             "selected": "選択したノード"
         }
     },
@@ -248,7 +252,8 @@
             "initialize": "初期化処理",
             "finalize": "終了処理",
             "outputs": "出力数",
-            "modules": "モジュール"
+            "modules": "モジュール",
+            "timeout": "タイムアウト"
         },
         "text": {
             "initialize": "// ここに記述したコードは、ノードをデプロイした時に\n// 一度だけ実行されます。\n",

package/locales/ru/messages.json

@@ -212,7 +212,8 @@
             "function": "Функция",
             "initialize": "Настройка",
             "finalize": "Закрытие",
-            "outputs": "Выходы"
+            "outputs": "Выходы",
+            "timeout":"Время ожидания"
         },
         "text": {
             "initialize": "// Добавленный здесь код будет исполняться\n// однократно при развертывании узла.\n",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/nodes",
-    "version": "3.1.0-beta.3",
+    "version": "3.1.0-beta.4",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",