@node-red/nodes 3.0.0-beta.3 → 3.0.1

package/core/common/20-inject.html

@@ -118,7 +118,7 @@
     .inject-time-row {
         padding-left: 110px;
     }
-    .inject-time-row select {
+    .inject-time-row:not(#inject-time-row-interval) select {
         margin: 3px 0;
     }
     .inject-time-days label {

package/core/common/21-debug.html

@@ -245,44 +245,37 @@
                     // complete parentage of the node that generated this message.
                     //    flow-id/subflow-A-instance/subflow-B-instance
 
-                    // If it has one id, that is a top level flow
+                    // If it has one id, that is a top level flow or config node/global
                     // each subsequent id is the instance id of a subflow node
                     //
                     pathParts = o.path.split("/");
                     if (pathParts.length === 1) {
-                        // The source node is on a flow - so can use its id to find
+                        // The source node is on a flow or is a global/config - so can use its id to find
                         sourceNode = RED.nodes.node(o.id);
                     } else if (pathParts.length > 1) {
                         // Highlight the subflow instance node.
                         sourceNode = RED.nodes.node(pathParts[1]);
                     }
+                    const getNodeLabel = (n) => n.name || (typeof n.label === "function" && n.label())  || (typeof n.label === "string" && n.label) || (n.type + ":" + n.id);
                     pathHierarchy = pathParts.map((id,index) => {
                         if (index === 0) {
-                            return {
-                                id: id,
-                                label: RED.nodes.workspace(id).label
-                            }
+                            if (id === "global") {
+                                return { id: sourceNode.id, label: getNodeLabel(sourceNode) }
+                            } 
+                            return { id: id, label: RED.nodes.workspace(id).label } //flow id + name
                         } else {
-                            var instanceNode = RED.nodes.node(id)
-                            return {
-                                id: id,
-                                label: (instanceNode.name || RED.nodes.subflow(instanceNode.type.substring(8)).name)
-                            }
+                            const instanceNode = RED.nodes.node(id)
+                            const pathLabel = (instanceNode.name || RED.nodes.subflow(instanceNode.type.substring(8)).name)
+                            return { id: id, label: pathLabel }
                         }
                     })
-                    if (pathParts.length === 1) {
-                        pathHierarchy.push({
-                            id: o.id,
-                            label: sourceNode.name || sourceNode.type+":"+sourceNode.id
-                        })
+                    if (pathParts.length === 1 && pathParts[0] !== "global") {
+                        pathHierarchy.push({ id: o.id, label: getNodeLabel(sourceNode) })
                     }
                     if (o._alias) {
                         let aliasNode = RED.nodes.node(o._alias)
                         if (aliasNode) {
-                            pathHierarchy.push({
-                                id: o._alias,
-                                label: aliasNode.name || aliasNode.type+":"+aliasNode.id
-                            })
+                            pathHierarchy.push({ id: o._alias, label: getNodeLabel(aliasNode) })
                         }
                     }
                 } else {
@@ -558,7 +551,7 @@
         onadd: function() {
             if (this.name === '_DEFAULT_') {
                 this.name = ''
-                RED.actions.invoke("core:generate-node-names", this)
+                RED.actions.invoke("core:generate-node-names", this, {generateHistory: false})
             }
         }
     });

package/core/common/60-link.html

@@ -221,7 +221,7 @@
     function onAdd() {
         if (this.name === '_DEFAULT_') {
             this.name = ''
-            RED.actions.invoke("core:generate-node-names", this)
+            RED.actions.invoke("core:generate-node-names", this, {generateHistory: false})
         }
         for (var i=0;i<this.links.length;i++) {
             var n = RED.nodes.node(this.links[i]);

package/core/common/60-link.js

@@ -29,23 +29,23 @@ module.exports = function(RED) {
     "use strict";
     const crypto = require("crypto");
     const targetCache = (function () {
-        const registry = { id: {}, name: {} };
-        function getIndex(/** @type {[LinkTarget]}*/ targets, id) {
+        let registry = { id: {}, name: {} }
+        function getIndex (/** @type {[LinkTarget]} */ targets, id) {
             for (let index = 0; index < (targets || []).length; index++) {
-                const element = targets[index];
+                const element = targets[index]
                 if (element.id === id) {
-                    return index;
+                    return index
                 }
             }
-            return -1;
+            return -1
         }
         /**
          * Generate a target object from a node
-         * @param {LinkInNode} node 
+         * @param {LinkInNode} node
          * @returns {LinkTarget} a link target object
          */
-        function generateTarget(node) {
-            const isSubFlow = node._flow.TYPE === "subflow";
+        function generateTarget (node) {
+            const isSubFlow = node._flow.TYPE === 'subflow'
             return {
                 id: node.id,
                 name: node.name || node.id,
@@ -58,75 +58,72 @@ module.exports = function(RED) {
             /**
              * Get a list of targets registerd to this name
              * @param {string} name Name of the target
-             * @param {boolean} [excludeSubflows] set `true` to exclude 
+             * @param {boolean} [excludeSubflows] set `true` to exclude
              * @returns {[LinkTarget]} Targets registerd to this name.
              */
-            getTargets(name, excludeSubflows) {
-                const targets = registry.name[name] || [];
+            getTargets (name, excludeSubflows) {
+                const targets = registry.name[name] || []
                 if (excludeSubflows) {
-                    return targets.filter(e => e.isSubFlow != true);
+                    return targets.filter(e => e.isSubFlow !== true)
                 }
-                return targets;
+                return targets
             },
             /**
              * Get a single target by registered name.
              * To restrict to a single flow, include the `flowId`
              * If there is no targets OR more than one target, null is returned
              * @param {string} name Name of the node
-             * @param {string} [flowId] 
+             * @param {string} [flowId]
              * @returns {LinkTarget} target
              */
-            getTarget(name, flowId) {
-                /** @type {[LinkTarget]}*/
-                let possibleTargets = this.getTargets(name);
-                /** @type {LinkTarget}*/ 
-                let target;
+            getTarget (name, flowId) {
+                /** @type {[LinkTarget]} */
+                let possibleTargets = this.getTargets(name)
+                /** @type {LinkTarget} */
+                let target
                 if (possibleTargets.length && flowId) {
-                    possibleTargets = possibleTargets.filter(e => e.flowId == flowId);
+                    possibleTargets = possibleTargets.filter(e => e.flowId === flowId)
                 }
                 if (possibleTargets.length === 1) {
-                    target = possibleTargets[0];
+                    target = possibleTargets[0]
                 }
-                return target;
+                return target
             },
             /**
              * Get a target by node ID
              * @param {string} nodeId ID of the node
              * @returns {LinkTarget} target
              */
-            getTargetById(nodeId) {
-                return registry.id[nodeId];
+            getTargetById (nodeId) {
+                return registry.id[nodeId]
             },
-            register(/** @type {LinkInNode} */ node) {
-                const target = generateTarget(node);
-                const tByName = this.getTarget(target.name, target.flowId);
+            register (/** @type {LinkInNode} */ node) {
+                const target = generateTarget(node)
+                const tByName = this.getTarget(target.name, target.flowId)
                 if (!tByName || tByName.id !== target.id) {
-                    registry.name[target.name] = registry.name[target.name] || [];
+                    registry.name[target.name] = registry.name[target.name] || []
                     registry.name[target.name].push(target)
                 }
-                registry.id[target.id] = target;
-                return target;
+                registry.id[target.id] = target
+                return target
             },
-            remove(node) {
-                const target = generateTarget(node);
-                const tn = this.getTarget(target.name, target.flowId);
-                if (tn) {
-                    const targs = this.getTargets(tn.name);
-                    const idx = getIndex(targs, tn.id);
-                    if (idx > -1) {
-                        targs.splice(idx, 1);
-                    }
-                    if (targs.length === 0) {
-                        delete registry.name[tn.name];
-                    }
+            remove (node) {
+                const target = generateTarget(node)
+                const targs = this.getTargets(target.name)
+                const idx = getIndex(targs, target.id)
+                if (idx > -1) {
+                    targs.splice(idx, 1)
+                }
+                if (targs.length === 0) {
+                    delete registry.name[target.name]
                 }
-                delete registry.id[target.id];
+                delete registry.id[target.id]
             },
-            clear() {
-                registry = { id: {}, name: {} };
+            clear () {
+                registry = { id: {}, name: {} }
             }
         }
-    })();
+    })()
 
     function LinkInNode(n) {
         RED.nodes.createNode(this,n);

package/core/common/lib/debug/debug-utils.js

@@ -459,30 +459,38 @@ RED.debug = (function() {
     function showMessageMenu(button,dbgMessage,sourceId) {
         activeMenuMessage = dbgMessage;
         if (!menuOptionMenu) {
-            menuOptionMenu = RED.menu.init({id:"red-ui-debug-msg-option-menu",
-                options: [
-                    {id:"red-ui-debug-msg-menu-item-collapse",label:RED._("node-red:debug.messageMenu.collapseAll"),onselect:function(){
-                        activeMenuMessage.collapse();
-                    }},
+            var opts = [
+                {id:"red-ui-debug-msg-menu-item-collapse",label:RED._("node-red:debug.messageMenu.collapseAll"),onselect:function(){
+                    activeMenuMessage.collapse();
+                }},
+            ];
+            if (activeMenuMessage.clearPinned) {
+                opts.push(
                     {id:"red-ui-debug-msg-menu-item-clear-pins",label:RED._("node-red:debug.messageMenu.clearPinned"),onselect:function(){
                         activeMenuMessage.clearPinned();
                     }},
-                    null,
-                    {id:"red-ui-debug-msg-menu-item-filter", label:RED._("node-red:debug.messageMenu.filterNode"),onselect:function(){
-                        var candidateNodes = RED.nodes.filterNodes({type:'debug'});
-                        candidateNodes.forEach(function(n) {
-                            filteredNodes[n.id] = true;
-                        });
-                        delete filteredNodes[sourceId];
-                        $("#red-ui-sidebar-debug-filterSelected").trigger("click");
-                        RED.settings.set('debug.filteredNodes',Object.keys(filteredNodes))
-                        refreshMessageList();
-                    }},
-                    {id:"red-ui-debug-msg-menu-item-clear-filter",label:RED._("node-red:debug.messageMenu.clearFilter"),onselect:function(){
-                        $("#red-ui-sidebar-debug-filterAll").trigger("click");
-                        refreshMessageList();
-                    }}
-                ]
+                );
+            }
+            opts.push(
+                null,
+                {id:"red-ui-debug-msg-menu-item-filter", label:RED._("node-red:debug.messageMenu.filterNode"),onselect:function(){
+                    var candidateNodes = RED.nodes.filterNodes({type:'debug'});
+                    candidateNodes.forEach(function(n) {
+                        filteredNodes[n.id] = true;
+                    });
+                    delete filteredNodes[sourceId];
+                    $("#red-ui-sidebar-debug-filterSelected").trigger("click");
+                    RED.settings.set('debug.filteredNodes',Object.keys(filteredNodes))
+                    refreshMessageList();
+                }},
+                {id:"red-ui-debug-msg-menu-item-clear-filter",label:RED._("node-red:debug.messageMenu.clearFilter"),onselect:function(){
+                    $("#red-ui-sidebar-debug-filterAll").trigger("click");
+                    refreshMessageList();
+                }}
+            );
+
+            menuOptionMenu = RED.menu.init({id:"red-ui-debug-msg-option-menu",
+                options: opts
             });
             menuOptionMenu.css({
                 position: "absolute"

package/core/function/10-function.html

@@ -639,7 +639,7 @@
         onadd: function() {
             if (this.name === '_DEFAULT_') {
                 this.name = ''
-                RED.actions.invoke("core:generate-node-names", this)
+                RED.actions.invoke("core:generate-node-names", this, {generateHistory: false})
             }
         }
     });

package/core/function/15-change.js

@@ -168,9 +168,9 @@ module.exports = function(RED) {
                         return getFromValueType(RED.util.getMessageProperty(msg,rule.from),done);
                     } else if (rule.fromt === 'flow' || rule.fromt === 'global') {
                         var contextKey = RED.util.parseContextStore(rule.from);
-                        if (/\[msg\./.test(context.key)) {
+                        if (/\[msg\./.test(contextKey.key)) {
                             // The key has a nest msg. reference to evaluate first
-                            context.key = RED.util.normalisePropertyExpression(contextKey.key,msg,true);
+                            contextKey.key = RED.util.normalisePropertyExpression(contextKey.key,msg,true);
                         }
                         node.context()[rule.fromt].get(contextKey.key, contextKey.store, (err,fromValue) => {
                             if (err) {

package/core/function/80-template.js

@@ -44,6 +44,14 @@ module.exports = function(RED) {
         return undefined;
     }
 
+    function parseEnv(key) {
+        var match = /^env\.(.+)/.exec(key);
+        if (match) {
+            return match[1];
+        }
+        return undefined;
+    }
+
     /**
      * Custom Mustache Context capable to collect message property and node
      * flow and global context
@@ -74,6 +82,11 @@ module.exports = function(RED) {
                 return value;
             }
 
+            // try env
+            if (parseEnv(name)) {
+                return this.cachedContextTokens[name];
+            }
+
             // try flow/global context:
             var context = parseContext(name);
             if (context) {
@@ -156,6 +169,17 @@ module.exports = function(RED) {
                     var tokens = extractTokens(mustache.parse(template));
                     var resolvedTokens = {};
                     tokens.forEach(function(name) {
+                        var env_name = parseEnv(name);
+                        if (env_name) {
+                            var promise = new Promise((resolve, reject) => {
+                                var val = RED.util.evaluateNodeProperty(env_name, 'env', node)
+                                resolvedTokens[name] = val;
+                                resolve();
+                            });
+                            promises.push(promise);
+                            return;
+                        }
+
                         var context = parseContext(name);
                         if (context) {
                             var type = context.type;

package/core/function/89-delay.js

@@ -275,18 +275,22 @@ module.exports = function(RED) {
                     if (msg.hasOwnProperty("flush")) {
                         var len = node.buffer.length;
                         if (typeof(msg.flush) == 'number') { len = Math.min(Math.floor(msg.flush),len); }
-                        while (len > 0) {
-                            const msgInfo = node.buffer.shift();
-                            if (Object.keys(msgInfo.msg).length > 1) {
-                                node.send(msgInfo.msg);
-                                msgInfo.done();
-                            }
-                            len = len - 1;
-                        }
-                        if (node.buffer.length === 0) {
+                        if (len === 0) {
                             clearInterval(node.intervalID);
                             node.intervalID = -1;
                         }
+                        else {
+                            while (len > 0) {
+                                const msgInfo = node.buffer.shift();
+                                if (Object.keys(msgInfo.msg).length > 1) {
+                                    node.send(msgInfo.msg);
+                                    msgInfo.done();
+                                }
+                                len = len - 1;
+                            }
+                            clearInterval(node.intervalID);
+                            node.intervalID = setInterval(sendMsgFromBuffer, node.rate);
+                        }
                         node.status({fill:"blue",shape:"dot",text:node.buffer.length});
                         done();
                     }

package/core/network/22-websocket.js

@@ -215,6 +215,7 @@ module.exports = function(RED) {
                 delete listenerNodes[node.fullPath];
                 node.server.close();
                 node._inputNodes = [];
+                done();
             }
             else {
                 node.closing = true;

package/core/parsers/70-CSV.js

@@ -89,6 +89,9 @@ module.exports = function(RED) {
                                     else if (msg.payload[s][t].toString().indexOf(node.sep) !== -1) { // add quotes if any "commas"
                                         msg.payload[s][t] = node.quo + msg.payload[s][t].toString() + node.quo;
                                     }
+                                    else if (msg.payload[s][t].toString().indexOf("\n") !== -1) { // add quotes if any "\n"
+                                        msg.payload[s][t] = node.quo + msg.payload[s][t].toString() + node.quo;
+                                    }
                                 }
                                 ou += msg.payload[s].join(node.sep) + node.ret;
                             }
@@ -112,7 +115,7 @@ module.exports = function(RED) {
                                                     q = q.replace(/"/g, '""');
                                                     ou += node.quo + q + node.quo + node.sep;
                                                 }
-                                                else if (q.indexOf(node.sep) !== -1) { // add quotes if any "commas"
+                                                else if (q.indexOf(node.sep) !== -1 || p.indexOf("\n") !== -1) { // add quotes if any "commas" or "\n"
                                                     ou += node.quo + q + node.quo + node.sep;
                                                 }
                                                 else { ou += q + node.sep; } // otherwise just add
@@ -134,7 +137,7 @@ module.exports = function(RED) {
                                                 p = p.replace(/"/g, '""');
                                                 ou += node.quo + p + node.quo + node.sep;
                                             }
-                                            else if (p.indexOf(node.sep) !== -1) { // add quotes if any "commas"
+                                            else if (p.indexOf(node.sep) !== -1 || p.indexOf("\n") !== -1) { // add quotes if any "commas" or "\n"
                                                 ou += node.quo + p + node.quo + node.sep;
                                             }
                                             else { ou += p + node.sep; } // otherwise just add

package/core/sequence/17-split.js

@@ -314,11 +314,13 @@ module.exports = function(RED) {
                         if (err) {
                             return done(err);
                         }
-                        msgInfo.send({payload: result});
+                        msgInfo.msg.payload = result;
+                        msgInfo.send(msgInfo.msg);
                         done();
                     });
                 } else {
-                    msgInfo.send({payload: result});
+                    msgInfo.msg.payload = result;
+                    msgInfo.send(msgInfo.msg);
                     done();
                 }
             } else {

package/examples/function/delay/06 - Simple Queue with release

@@ -0,0 +1,149 @@
+[
+    {
+        "id": "48d660b3a4109400",
+        "type": "inject",
+        "z": "9e5f48c16729e4f0",
+        "name": "inject",
+        "props": [
+            {
+                "p": "payload"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "",
+        "payloadType": "date",
+        "x": 185,
+        "y": 795,
+        "wires": [
+            [
+                "e0f9e206681f3504"
+            ]
+        ]
+    },
+    {
+        "id": "e0f9e206681f3504",
+        "type": "delay",
+        "z": "9e5f48c16729e4f0",
+        "name": "",
+        "pauseType": "rate",
+        "timeout": "5",
+        "timeoutUnits": "seconds",
+        "rate": "1",
+        "nbRateUnits": "30",
+        "rateUnits": "second",
+        "randomFirst": "1",
+        "randomLast": "5",
+        "randomUnits": "seconds",
+        "drop": false,
+        "allowrate": false,
+        "outputs": 1,
+        "x": 430,
+        "y": 795,
+        "wires": [
+            [
+                "e470f1d794e1bef9",
+                "af7cea1dfb797a75"
+            ]
+        ]
+    },
+    {
+        "id": "943543cf7a1958e4",
+        "type": "change",
+        "z": "9e5f48c16729e4f0",
+        "name": "set flush to 1",
+        "rules": [
+            {
+                "t": "set",
+                "p": "flush",
+                "pt": "msg",
+                "to": "1",
+                "tot": "num"
+            },
+            {
+                "t": "delete",
+                "p": "payload",
+                "pt": "msg"
+            }
+        ],
+        "action": "",
+        "property": "",
+        "from": "",
+        "to": "",
+        "reg": false,
+        "x": 510,
+        "y": 915,
+        "wires": [
+            [
+                "e0f9e206681f3504"
+            ]
+        ]
+    },
+    {
+        "id": "e470f1d794e1bef9",
+        "type": "function",
+        "z": "9e5f48c16729e4f0",
+        "name": "Do something that takes a few seconds",
+        "func": "\n//send on the message between 3 and 6 seconds later\nsetTimeout(\n    function() { \n        node.send(msg) \n    }, \n    Math.random() * 3000 + 3000\n);\nreturn null;",
+        "outputs": 1,
+        "noerr": 0,
+        "initialize": "",
+        "finalize": "",
+        "libs": [],
+        "x": 760,
+        "y": 795,
+        "wires": [
+            [
+                "943543cf7a1958e4",
+                "859258551b8389b7"
+            ]
+        ]
+    },
+    {
+        "id": "af7cea1dfb797a75",
+        "type": "debug",
+        "z": "9e5f48c16729e4f0",
+        "name": "IN",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "payload",
+        "targetType": "msg",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 710,
+        "y": 735,
+        "wires": []
+    },
+    {
+        "id": "859258551b8389b7",
+        "type": "debug",
+        "z": "9e5f48c16729e4f0",
+        "name": "OUT",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "payload",
+        "targetType": "msg",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 895,
+        "y": 735,
+        "wires": []
+    },
+    {
+        "id": "ecaaf26326da10ee",
+        "type": "comment",
+        "z": "9e5f48c16729e4f0",
+        "name": "Simple Queue with release",
+        "info": "This example shows how to use a delay node set to rate limit mode as a simple queue to feed a\nprocess that may take some time to complete. Once that process completes the feedback is then\nset to flush out the next message - thus running the \"loop\" as fast as possible with no overlaps.\n\n**Note**: only the `msg.flush` property msut be set - otherwise the other properties that are fed \nback will be added as another new message to the queue.",
+        "x": 235,
+        "y": 915,
+        "wires": []
+    }
+]

package/locales/ja/function/10-function.html

@@ -28,7 +28,7 @@
     <p>返却/sendの対象は次のとおりです:</p>
     <ul>
       <li>単一メッセージオブジェクト - 最初の出力に接続されたノードに渡されます</li>
-      <li>メッセージオブジェクトの配列 - 対応する出力に接続されたノードに渡されます</li>          
+      <li>メッセージオブジェクトの配列 - 対応する出力に接続されたノードに渡されます</li>
     </ul>
     <p>注: 初期化処理の実行はノードの初期化中に行われます。そのため、初期化処理タブにsendを記述した場合に後続ノードでメッセージを受け取れないことがあります。</p>
     <p>配列要素が配列の場合には、複数のメッセージを対応する出力に送出します。</p>

package/locales/ja/messages.json

@@ -928,6 +928,7 @@
             "write": "write file",
             "read": "read file",
             "filename": "ファイル名",
+            "path": "パス",
             "action": "動作",
             "addnewline": "メッセージの入力のたびに改行を追加",
             "createdir": "ディレクトリが存在しない場合は作成",

package/locales/ja/network/10-mqtt.html

@@ -89,7 +89,7 @@
        <dt class="optional">userProperties <span class="property-type">オブジェクト</span></dt>
        <dd><b>MQTTv5</b>: メッセージのユーザプロパティ</dd>
        <dt class="optional">messageExpiryInterval <span class="property-type">数値</span></dt>
-       <dd><b>MQTTv5</b>: 秒単位のメッセージの有効期限</dd>   
+       <dd><b>MQTTv5</b>: 秒単位のメッセージの有効期限</dd>
        <dt class="optional">topicAlias <span class="property-type">数値</span></dt>
        <dd><b>MQTTv5</b>: 使用するMQTTトピックエイリアス</dd>
     </dl>

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/nodes",
-    "version": "3.0.0-beta.3",
+    "version": "3.0.1",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",
@@ -28,7 +28,7 @@
         "denque": "2.0.1",
         "form-data": "4.0.0",
         "fs-extra": "10.1.0",
-        "got": "11.8.3",
+        "got": "11.8.5",
         "hash-sum": "2.0.0",
         "hpagent": "1.0.0",
         "https-proxy-agent": "5.0.1",