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

package/99-sample.html.demo

@@ -69,7 +69,7 @@
         outputs:1,              // set the number of outputs - 0 to n
         color: "#ddd",          // set icon color
         // set the icon (held in icons dir below where you save the node)
-        icon: "myicon.png",     // saved in  icons/myicon.png
+        icon: "myicon.svg",     // saved in  icons/myicon.svg
         label: function() {     // sets the default label contents
             return this.name||this.topic||"sample";
         },

package/core/common/05-junction.html

@@ -0,0 +1,5 @@
+<!--
+  05-junction.html
+  This file exists so that the runtime loads the Junction node into the registry,
+  but it is empty so it doesn't appear in the editor palette
+-->

package/core/common/05-junction.js

@@ -0,0 +1,12 @@
+module.exports = function(RED) {
+    "use strict";
+    function JunctionNode(n) {
+        RED.nodes.createNode(this,n);
+        this.on("input",function(msg, send, done) {
+            send(msg);
+            done();
+        });
+    }
+
+    RED.nodes.registerType("junction",JunctionNode);
+}

package/core/common/20-inject.html

@@ -225,28 +225,47 @@
         color:"#a6bbcf",
         defaults: {
             name: {value:""},
-            props:{value:[{p:"payload"},{p:"topic",vt:"str"}], validate:function(v) {
+            props:{value:[{p:"payload"},{p:"topic",vt:"str"}], validate:function(v, opt) {
                     if (!v || v.length === 0) { return true }
                     for (var i=0;i<v.length;i++) {
                         if (/msg|flow|global/.test(v[i].vt)) {
                             if (!RED.utils.validatePropertyExpression(v[i].v)) {
-                                return false;
+                                return RED._("node-red:inject.errors.invalid-prop", { prop: 'msg.'+v[i].p, error: v[i].v });
                             }
                         } else if (v[i].vt === "jsonata") {
-                            try{jsonata(v[i].v);}catch(e){return false;}
+                            try{ jsonata(v[i].v); }
+                            catch(e){
+                                return RED._("node-red:inject.errors.invalid-jsonata", { prop: 'msg.'+v[i].p, error: e.message });
+                            }
                         } else if (v[i].vt === "json") {
-                            try{JSON.parse(v[i].v);}catch(e){return false;}
+                            try{ JSON.parse(v[i].v); }
+                            catch(e){
+                                return RED._("node-red:inject.errors.invalid-json", { prop: 'msg.'+v[i].p, error: e.message });
+                            }
+                        } else if (v[i].vt === "num"){
+                            if (!/^[+-]?[0-9]*\.?[0-9]*([eE][-+]?[0-9]+)?$/.test(v[i].v)) {
+                                return RED._("node-red:inject.errors.invalid-prop", { prop: 'msg.'+v[i].p, error: v[i].v });
+                            }
                         }
                     }
                     return true;
                 }
             },
-            repeat: {value:"", validate:function(v) { return ((v === "") || (RED.validators.number(v) && (v >= 0) && (v <= 2147483))) }},
+            repeat: {
+                value:"", validate: function(v, opt) {
+                    if ((v === "") ||
+                        (RED.validators.number(v) &&
+                         (v >= 0) && (v <= 2147483))) {
+                        return true;
+                    }
+                    return RED._("node-red:inject.errors.invalid-repeat");
+                }
+            },
             crontab: {value:""},
             once: {value:false},
             onceDelay: {value:0.1},
             topic: {value:""},
-            payload: {value:"", validate: RED.validators.typedInput("payloadType")},
+            payload: {value:"", validate: RED.validators.typedInput("payloadType", false) },
             payloadType: {value:"date"},
         },
         icon: "inject.svg",
@@ -370,13 +389,6 @@
                 var id = $("#inject-time-type-select").val();
                 $(".inject-time-row").hide();
                 $("#inject-time-row-"+id).show();
-                if ((id == "none") || (id == "interval") || (id == "interval-time")) {
-                    $("#node-once").show();
-                }
-                else {
-                    $("#node-once").hide();
-                    $("#node-input-once").prop('checked', false);
-                }
 
                 // Scroll down
                 var scrollDiv = $("#dialog-form").parent();

package/core/common/20-inject.js

@@ -109,9 +109,10 @@ module.exports = function(RED) {
                 if (!property) return;
 
                 if (valueType === "jsonata") {
-                    if (p.exp) {
+                    if (p.v) {
                         try {
-                            var val = RED.util.evaluateJSONataExpression(p.exp, msg);
+                            var exp = RED.util.prepareJSONataExpression(p.v, node);
+                            var val = RED.util.evaluateJSONataExpression(exp, msg);
                             RED.util.setMessageProperty(msg, property, val, true);
                         }
                         catch  (err) {

package/core/common/21-debug.html

@@ -74,7 +74,7 @@
     RED.nodes.registerType('debug',{
         category: 'common',
         defaults: {
-            name: {value:""},
+            name: {value:"_DEFAULT_"},
             active: {value:true},
             tosidebar: {value:true},
             console: {value:false},
@@ -160,6 +160,10 @@
                 },
                 messageSourceClick: function(sourceId, aliasId, path) {
                     // Get all of the nodes that could have logged this message
+                    if (RED.nodes.workspace(sourceId)) {
+                        RED.view.reveal(sourceId);
+                        return
+                    }
                     var candidateNodes = [RED.nodes.node(sourceId)]
                     if (path) {
                         for (var i=2;i<path.length;i++) {
@@ -235,10 +239,11 @@
                 // sourceNode should be the top-level node - one that is on a flow.
                 var sourceNode;
                 var pathParts;
+                var pathHierarchy;
                 if (o.path) {
                     // Path is a `/`-separated list of ids that identifies the
                     // complete parentage of the node that generated this message.
-                    //    flow-id/subflow-A-instance/subflow-A-type/subflow-B-instance/subflow-B-type/node-id
+                    //    flow-id/subflow-A-instance/subflow-B-instance
 
                     // If it has one id, that is a top level flow
                     // each subsequent id is the instance id of a subflow node
@@ -251,11 +256,41 @@
                         // Highlight the subflow instance node.
                         sourceNode = RED.nodes.node(pathParts[1]);
                     }
+                    pathHierarchy = pathParts.map((id,index) => {
+                        if (index === 0) {
+                            return {
+                                id: id,
+                                label: RED.nodes.workspace(id).label
+                            }
+                        } else {
+                            var instanceNode = RED.nodes.node(id)
+                            return {
+                                id: id,
+                                label: (instanceNode.name || RED.nodes.subflow(instanceNode.type.substring(8)).name)
+                            }
+                        }
+                    })
+                    if (pathParts.length === 1) {
+                        pathHierarchy.push({
+                            id: o.id,
+                            label: sourceNode.name || sourceNode.type+":"+sourceNode.id
+                        })
+                    }
+                    if (o._alias) {
+                        let aliasNode = RED.nodes.node(o._alias)
+                        if (aliasNode) {
+                            pathHierarchy.push({
+                                id: o._alias,
+                                label: aliasNode.name || aliasNode.type+":"+aliasNode.id
+                            })
+                        }
+                    }
                 } else {
                     // This is probably redundant...
                     sourceNode = RED.nodes.node(o.id) || RED.nodes.node(o.z);
                 }
                 if (sourceNode) {
+                    var sourceFlow = RED.nodes.workspace(sourceNode.z)
                     o._source = {
                         id:sourceNode.id,
                         z:sourceNode.z,
@@ -266,7 +301,9 @@
                         // the top-level subflow instance node.
                         // This means the node's name is displayed in the sidebar.
                         _alias:o._alias,
-                        path: pathParts
+                        flowName: sourceFlow?(sourceFlow.label||sourceNode.z):sourceNode.z,
+                        path: pathParts,
+                        pathHierarchy: pathHierarchy
                     };
                 }
                 RED.debug.handleDebugMessage(o);
@@ -416,9 +453,16 @@
                 label: RED._("node-red:debug.autostatus"),
                 hasValue: false
             };
+
+            var counter = {
+                value: "counter",
+                label: RED._("node-red:debug.messageCount"),
+                hasValue: false
+            };
+
             $("#node-input-typed-status").typedInput({
                 default: "auto",
-                types:[autoType, "msg", "jsonata"],
+                types:[autoType, "msg", "jsonata", counter],
                 typeField: $("#node-input-statusType")
             });
             var that = this;
@@ -477,7 +521,10 @@
 
             $("#node-input-tostatus").on('change',function() {
                 if ($(this).is(":checked")) {
-                    if (!that.hasOwnProperty("statusVal") || that.statusVal === "") {
+                    if (that.statusType === "counter") {
+                        that.statusVal = "";
+                    }
+                    else if (!that.hasOwnProperty("statusVal") || that.statusVal === "") {
                         var type = $("#node-input-typed-complete").typedInput('type');
                         var comp = "payload";
                         if (type !== 'full') {
@@ -507,6 +554,12 @@
                 $("#node-input-complete").val($("#node-input-typed-complete").typedInput('value'));
             }
             $("#node-input-statusVal").val($("#node-input-typed-status").typedInput('value'));
+        },
+        onadd: function() {
+            if (this.name === '_DEFAULT_') {
+                this.name = ''
+                RED.actions.invoke("core:generate-node-names", this)
+            }
         }
     });
 })();

package/core/common/21-debug.js

@@ -21,6 +21,9 @@ module.exports = function(RED) {
         this.statusType = n.statusType || "auto";
         this.statusVal = n.statusVal || this.complete;
         this.tosidebar = n.tosidebar;
+        this.counter = 0;
+        this.lastTime = new Date().getTime();
+        this.timeout = null;
         if (this.tosidebar === undefined) { this.tosidebar = true; }
         this.active = (n.active === null || typeof n.active === "undefined") || n.active;
         if (this.tostatus) {
@@ -32,6 +35,12 @@ module.exports = function(RED) {
         var statExpression = hasStatExpression ? n.statusVal : null;
 
         var node = this;
+        if ( node.statusType === "counter" ){
+            node.status({fill:"blue", shape:"ring", text: node.counter});
+        }
+        else {
+            node.status({fill:"", shape:"", text: ""});
+        }
         var preparedEditExpression = null;
         var preparedStatExpression = null;
         if (editExpression) {
@@ -106,6 +115,9 @@ module.exports = function(RED) {
             if (this.oldState) {
                 this.status({});
             }
+            if (this.timeout) {
+                clearTimeout(this.timeout)
+            }
         })
         this.on("input", function(msg, send, done) {
             if (hasOwnProperty.call(msg, "status") && hasOwnProperty.call(msg.status, "source") && hasOwnProperty.call(msg.status.source, "id") && (msg.status.source.id === node.id)) {
@@ -113,36 +125,54 @@ module.exports = function(RED) {
                 return;
             }
             if (node.tostatus === true) {
-                prepareStatus(msg, function(err,debugMsg) {
-                    if (err) { node.error(err); return; }
-                    var output = debugMsg.msg;
-                    var st = (typeof output === 'string') ? output : util.inspect(output);
-                    var fill = "grey";
-                    var shape = "dot";
-                    if (typeof output === 'object' && hasOwnProperty.call(output, "fill") && hasOwnProperty.call(output, "shape") && hasOwnProperty.call(output, "text")) {
-                        fill = output.fill;
-                        shape = output.shape;
-                        st = output.text;
+                if ( node.statusType === "counter" ){
+                    const differenceOfTime  = (new Date().getTime() - node.lastTime);
+                    node.lastTime = new Date().getTime();
+                    node.counter++;
+                    if ( differenceOfTime > 100 ){
+                        node.status({fill:"blue", shape:"ring", text: node.counter});
                     }
-                    if (node.statusType === "auto") {
-                        if (hasOwnProperty.call(msg, "error")) {
-                            fill = "red";
-                            st = msg.error.message;
-                        }
-                        if (hasOwnProperty.call(msg, "status")) {
-                            fill = msg.status.fill || "grey";
-                            shape = msg.status.shape || "ring";
-                            st = msg.status.text || "";
+                    else {
+                        if (node.timeout) {
+                            clearTimeout(node.timeout)
                         }
+                        node.timeout = setTimeout(() => {
+                            node.status({fill:"blue", shape:"ring", text: node.counter})
+                        }, 200)
                     }
+                } else {
+                    prepareStatus(msg, function(err,debugMsg) {
+                        if (err) { node.error(err); return; }
+                        var output = debugMsg.msg;
+                        var st = (typeof output === 'string') ? output : util.inspect(output);
+                        var fill = "grey";
+                        var shape = "dot";
+                        if (typeof output === 'object' && hasOwnProperty.call(output, "fill") && hasOwnProperty.call(output, "shape") && hasOwnProperty.call(output, "text")) {
+                            fill = output.fill;
+                            shape = output.shape;
+                            st = output.text;
+                        }
+                        if (node.statusType === "auto") {
+                            if (hasOwnProperty.call(msg, "error")) {
+                                fill = "red";
+                                st = msg.error.message;
+                            }
+                            if (hasOwnProperty.call(msg, "status")) {
+                                fill = msg.status.fill || "grey";
+                                shape = msg.status.shape || "ring";
+                                st = msg.status.text || "";
+                            }
+                        }
 
-                    if (st.length > 32) { st = st.substr(0,32) + "..."; }
-                    var newStatus = {fill:fill, shape:shape, text:st};
-                    if (JSON.stringify(newStatus) !== node.oldState) { // only send if we have to
-                        node.status(newStatus);
-                        node.oldState = JSON.stringify(newStatus);
-                    }
-                });
+                        if (st.length > 32) { st = st.substr(0,32) + "..."; }
+
+                        var newStatus = {fill:fill, shape:shape, text:st};
+                        if (JSON.stringify(newStatus) !== node.oldState) { // only send if we have to
+                            node.status(newStatus);
+                            node.oldState = JSON.stringify(newStatus);
+                        }
+                    });
+                }
             }
 
             if (this.complete === "true") {
@@ -285,7 +315,7 @@ module.exports = function(RED) {
             res.sendFile(
                 req.params[0],
                 options,
-                 err => {
+                err => {
                     if (err) {
                         res.sendStatus(404);
                     }

package/core/common/60-link.html

@@ -32,14 +32,23 @@
         <label for="node-input-timeout"><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 style="position:relative; height: 30px; text-align: right;"><div style="display:inline-block"><input type="text" id="node-input-link-target-filter"></div></div>
-    <div class="form-row node-input-link-row"></div>
+    <div class="form-row">
+        <label for="node-input-linkType" data-i18n="link.linkCallType"></label>
+        <select id="node-input-linkType" style="width: 70%">
+            <option value="static" data-i18n="link.staticLinkCall"></option>
+            <option value="dynamic" data-i18n="link.dynamicLinkCall"></option>
+        </select>
+    </div>
+    <div class="link-call-target-tree" style="position:relative; height: 30px; text-align: right;">
+        <div style="display:inline-block"><input type="text" id="node-input-link-target-filter"></div>
+    </div>
+    <div class="form-row node-input-link-row link-call-target-tree"></div>
 </script>
 
 <script type="text/javascript">
 (function() {
 
-    var treeList;
+    let treeList;
 
     function onEditPrepare(node,targetType) {
         if (!node.links) {
@@ -47,7 +56,7 @@
         }
         node.oldLinks = [];
 
-        var activeSubflow = RED.nodes.subflow(node.z);
+        const activeSubflow = RED.nodes.subflow(node.z);
 
         treeList = $("<div>")
             .css({width: "100%", height: "100%"})
@@ -67,10 +76,10 @@
                     RED.view.redraw();
                 }
             });
-        var candidateNodes = RED.nodes.filterNodes({type:targetType});
-        var candidateNodesCount = 0;
+        const candidateNodes = RED.nodes.filterNodes({type:targetType});
+        let candidateNodesCount = 0;
 
-        var search = $("#node-input-link-target-filter").searchBox({
+        const search = $("#node-input-link-target-filter").searchBox({
             style: "compact",
             delay: 300,
             change: function() {
@@ -79,7 +88,7 @@
                     treeList.treeList("filter", null);
                     search.searchBox("count","");
                 } else {
-                    var count = treeList.treeList("filter", function(item) {
+                    const count = treeList.treeList("filter", function(item) {
                         return item.label.toLowerCase().indexOf(val) > -1 || (item.node && item.node.type.toLowerCase().indexOf(val) > -1)
                     });
                     search.searchBox("count",count+" / "+candidateNodesCount);
@@ -87,25 +96,27 @@
             }
         });
 
-
-        var flows = [];
-        var flowMap = {};
+        const flows = [];
+        const flowMap = {};
 
         if (activeSubflow) {
             flowMap[activeSubflow.id] = {
                 id: activeSubflow.id,
                 class: 'red-ui-palette-header',
-                label:  "Subflow : "+(activeSubflow.name || activeSubflow.id),
+                label: "Subflow : " + (activeSubflow.name || activeSubflow.id),
                 expanded: true,
                 children: []
             };
             flows.push(flowMap[activeSubflow.id])
-        } else {
-            RED.nodes.eachWorkspace(function(ws) {
+        }
+        if (!activeSubflow || node.type === "link call") {
+            // Only "Link Call" can look outside of its own subflow
+            // Link In and Link Out nodes outside of a subflow should be ignored
+            RED.nodes.eachWorkspace(function (ws) {
                 flowMap[ws.id] = {
                     id: ws.id,
                     class: 'red-ui-palette-header',
-                    label: (ws.label || ws.id)+(node.z===ws.id ? " *":""),
+                    label: (ws.label || ws.id) + (node.z === ws.id ? " *" : ""),
                     expanded: true,
                     children: []
                 }
@@ -113,22 +124,21 @@
             })
         }
 
-        candidateNodes.forEach(function(n) {
+        candidateNodes.forEach(function (n) {
             if (flowMap[n.z]) {
                 if (targetType === "link out" && n.mode === 'return') {
                     // Link In nodes looking for Link Out nodes should not
                     // include return-mode nodes.
-                    return
+                    return;
                 }
-                var isChecked = false;
-                isChecked = (node.links.indexOf(n.id) !== -1) || (n.links||[]).indexOf(node.id) !== -1;
+                const isChecked = (node.links.indexOf(n.id) !== -1) || (n.links || []).indexOf(node.id) !== -1;
                 if (isChecked) {
                     node.oldLinks.push(n.id);
                 }
                 flowMap[n.z].children.push({
                     id: n.id,
                     node: n,
-                    label: n.name||n.id,
+                    label: n.name || n.id,
                     selected: isChecked,
                     checkbox: node.type !== "link call",
                     radio: node.type === "link call"
@@ -136,8 +146,8 @@
                 candidateNodesCount++;
             }
         });
-        flows = flows.filter(function(f) { return f.children.length > 0 })
-        treeList.treeList('data',flows);
+        const flowsFiltered = flows.filter(function(f) { return f.children.length > 0 })
+        treeList.treeList('data',flowsFiltered);
         setTimeout(function() {
             treeList.treeList('show',node.z);
         },100);
@@ -209,6 +219,10 @@
     }
 
     function onAdd() {
+        if (this.name === '_DEFAULT_') {
+            this.name = ''
+            RED.actions.invoke("core:generate-node-names", this)
+        }
         for (var i=0;i<this.links.length;i++) {
             var n = RED.nodes.node(this.links[i]);
             if (n && n.links.indexOf(this.id) === -1) {
@@ -221,7 +235,7 @@
         category: 'common',
         color:"#ddd",//"#87D8CF",
         defaults: {
-            name: {value:""},
+            name: { value: "_DEFAULT_" },
             links: { value: [], type:"link out[]" }
         },
         inputs:0,
@@ -257,9 +271,14 @@
         category: 'common',
         color:"#ddd",//"#87D8CF",
         defaults: {
-            name: {value:""},
-            links: { value: [], type:"link in[]"},
-            timeout: { value: "30", validate:RED.validators.number(true) }
+            name: { value: "" },
+            links: { value: [], type:"link in[]" },
+            linkType: { value:"static" },
+            timeout: {
+                value: "30",
+                label: RED._("node-red:link.timeout"),
+                validate:RED.validators.number(true)
+            }
         },
         inputs: 1,
         outputs: 1,
@@ -271,7 +290,9 @@
             if (this.name) {
                 return this.name;
             }
-            if (this.links.length > 0) {
+            if (this.linkType === "dynamic") {
+                return this._("link.dynamicLinkLabel");
+            } else if (this.links.length > 0) {
                 var targetNode = RED.nodes.node(this.links[0]);
                 return targetNode && (targetNode.name || this._("link.linkCall"));
             }
@@ -281,6 +302,21 @@
             return this.name?"node_label_italic":"";
         },
         oneditprepare: function() {
+            const updateVisibility = function() {
+                const static = $('#node-input-linkType').val() !== "dynamic";
+                if(static) {
+                    $("div.link-call-target-tree").show();
+                } else {
+                    $("div.link-call-target-tree").hide();
+                }
+            }
+            $("#node-input-linkType").on("change",function(d){
+                updateVisibility();
+            });
+            if (["static","dynamic"].indexOf(this.linkType) < 0) {
+                $("#node-input-linkType").val('static');
+            }
+            updateVisibility();
             onEditPrepare(this,"link in");
         },
         oneditsave: function() {
@@ -293,9 +329,9 @@
         category: 'common',
         color:"#ddd",//"#87D8CF",
         defaults: {
-            name: {value:""},
+            name: { value:"_DEFAULT_" },
             mode: { value: "link" },// link || return
-            links: { value: [], type:"link in[]"}
+            links: { value: [], type:"link in[]" }
         },
         align:"right",
         inputs:1,