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

package/core/common/20-inject.html

@@ -320,7 +320,7 @@
             }
             // but replace with repeat one if set to repeat
             if ((this.repeat && this.repeat != 0) || this.crontab) {
-                suffix = " ↻";
+                suffix = "\t↻";
             }
             if (this.name) {
                 return this.name+suffix;

package/core/common/20-inject.js

@@ -109,9 +109,8 @@ module.exports = function(RED) {
                 }
                 const p = props.shift()
                 const property = p.p;
-                const value = p.v ? p.v : '';
-                const valueType = p.vt ? p.vt : 'str';
-
+                const value = p.v !== undefined ? p.v : '';
+                const valueType = p.vt !== undefined ? p.vt : 'str';
                 if (property) {
                     if (valueType === "jsonata") {
                         if (p.v) {

package/core/common/21-debug.html

@@ -86,7 +86,7 @@
         },
         label: function() {
             var suffix = "";
-            if (this.console === true || this.console === "true") { suffix = " ⇲"; }
+            if (this.console === true || this.console === "true") { suffix = "\t⇲"; }
             if (this.targetType === "jsonata") {
                 return (this.name || "JSONata") + suffix;
             }
@@ -195,6 +195,119 @@
                         node.dirty = true;
                     });
                     RED.view.redraw();
+                },
+                requestDebugNodeList: function(filteredNodes) {
+                    var workspaceOrder = RED.nodes.getWorkspaceOrder();
+                    var workspaceOrderMap = {};
+                    workspaceOrder.forEach(function(ws,i) {
+                        workspaceOrderMap[ws] = i;
+                    });
+
+                    var candidateNodes = [];
+                    var candidateSFs = [];
+                    var subflows = {};
+                    RED.nodes.eachNode(function (n) {
+                        var nt = n.type;
+                        if (nt === "debug") {
+                            if (n.z in workspaceOrderMap) {
+                                candidateNodes.push(n);
+                            }
+                            else {
+                                var sf = RED.nodes.subflow(n.z);
+                                if (sf) {
+                                    subflows[sf.id] = {
+                                        debug: true,
+                                        subflows: {}
+                                    };
+                                }
+                            }
+                        }
+                        else if(nt.substring(0, 8) === "subflow:") {
+                            if (n.z in workspaceOrderMap) {
+                                candidateSFs.push(n);
+                            }
+                            else {
+                                var psf = RED.nodes.subflow(n.z);
+                                if (psf) {
+                                    var sid = nt.substring(8);
+                                    var item = subflows[psf.id];
+                                    if (!item) {
+                                        item = {
+                                            debug: undefined,
+                                            subflows: {}
+                                        };
+                                        subflows[psf.id] = item;
+                                    }
+                                    item.subflows[sid] = true;
+                                }
+                            }
+                        }
+                    });
+                    candidateSFs.forEach(function (sf) {
+                        var sid = sf.type.substring(8);
+                        if (containsDebug(sid, subflows)) {
+                            candidateNodes.push(sf);
+                        }
+                    });
+
+                    candidateNodes.sort(function(A,B) {
+                        var wsA = workspaceOrderMap[A.z];
+                        var wsB = workspaceOrderMap[B.z];
+                        if (wsA !== wsB) {
+                            return wsA-wsB;
+                        }
+                        var labelA = RED.utils.getNodeLabel(A,A.id);
+                        var labelB = RED.utils.getNodeLabel(B,B.id);
+                        return labelA.localeCompare(labelB);
+                    });
+                    var currentWs = null;
+                    var data = [];
+                    var currentFlow;
+                    var currentSelectedCount = 0;
+                    candidateNodes.forEach(function(node) {
+                        if (currentWs !== node.z) {
+                            if (currentFlow && currentFlow.checkbox) {
+                                currentFlow.selected = currentSelectedCount === currentFlow.children.length
+                            }
+                            currentSelectedCount = 0;
+                            currentWs = node.z;
+                            var parent = RED.nodes.workspace(currentWs) || RED.nodes.subflow(currentWs);
+                            currentFlow = {
+                                label: RED.utils.getNodeLabel(parent, currentWs),
+                            }
+                            if (!parent.disabled) {
+                                currentFlow.children = [];
+                                currentFlow.checkbox = true;
+                            } else {
+                                currentFlow.class = "disabled"
+                            }
+                            data.push(currentFlow);
+                        }
+                        if (currentFlow.children) {
+                            if (!filteredNodes[node.id]) {
+                                currentSelectedCount++;
+                            }
+                            currentFlow.children.push({
+                                label: RED.utils.getNodeLabel(node,node.id),
+                                node: {
+                                    id: node.id
+                                },
+                                checkbox: true,
+                                selected: !filteredNodes[node.id]
+                            });
+                        }
+                    });
+                    if (currentFlow && currentFlow.checkbox) {
+                        currentFlow.selected = currentSelectedCount === currentFlow.children.length
+                    }
+                    if (subWindow) {
+                        try {
+                            subWindow.postMessage({event:"refreshDebugNodeList", nodes:data},"*");
+                        } catch(err) {
+                            console.log(err);
+                        }
+                    }
+                    RED.debug.refreshDebugNodeList(data)
                 }
             };
 
@@ -396,6 +509,26 @@
                 }
             }
 
+            function containsDebug(sid, map) {
+                var item = map[sid];
+                if (item) {
+                    if (item.debug === undefined) {
+                        var sfs = Object.keys(item.subflows);
+                        var contain = false;
+                        for (var i = 0; i < sfs.length; i++) {
+                            var sf = sfs[i];
+                            if (containsDebug(sf, map)) {
+                                contain = true;
+                                break;
+                            }
+                        }
+                        item.debug = contain;
+                    }
+                    return item.debug;
+                }
+                return false;
+            }
+
             $("#red-ui-sidebar-debug-open").on("click", function(e) {
                 e.preventDefault();
                 subWindow = window.open(document.location.toString().replace(/[?#].*$/,"")+"debug/view/view.html"+document.location.search,"nodeREDDebugView","menubar=no,location=no,toolbar=no,chrome,height=500,width=600");
@@ -427,6 +560,8 @@
                     options.messageSourceClick(msg.id,msg._alias,msg.path);
                 } else if (msg.event === "clear") {
                     options.clear();
+                } else if (msg.event === "requestDebugNodeList") {
+                    options.requestDebugNodeList(msg.filteredNodes)
                 }
             };
             window.addEventListener('message',this.handleWindowMessage);

package/core/common/60-link.html

@@ -275,7 +275,7 @@
                 value: [],
                 type: "link in[]",
                 validate: function (v, opt) {
-                    if ((this.linkType === "static" && v.length > 0)
+                    if (((this.linkType || "static") === "static" && v.length > 0)
                       || this.linkType === "dynamic") {
                         return true;
                     }

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

@@ -167,19 +167,13 @@ RED.debug = (function() {
             var menu = RED.popover.menu({
                 options: options,
                 onselect: function(item) {
-                    if (item.value !== filterType) {
-                        filterType = item.value;
-                        $('#red-ui-sidebar-debug-filter span').text(RED._('node-red:debug.sidebar.'+filterType));
-                        refreshMessageList();
-                        RED.settings.set("debug.filter",filterType)
-                    }
+                    setFilterType(item.value)
                     if (filterType === 'filterSelected') {
-                        refreshDebugNodeList();
+                        config.requestDebugNodeList(filteredNodes);
                         filterDialog.slideDown(200);
                         filterDialogShown = true;
                         debugNodeTreeList.focus();
                     }
-
                 }
             });
             menu.show({
@@ -254,131 +248,7 @@ RED.debug = (function() {
 
     }
 
-
-    function containsDebug(sid, map) {
-        var item = map[sid];
-        if (item) {
-            if (item.debug === undefined) {
-                var sfs = Object.keys(item.subflows);
-                var contain = false;
-                for (var i = 0; i < sfs.length; i++) {
-                    var sf = sfs[i];
-                    if (containsDebug(sf, map)) {
-                        contain = true;
-                        break;
-                    }
-                }
-                item.debug = contain;
-            }
-            return item.debug;
-        }
-        return false;
-    }
-
-
-    function refreshDebugNodeList() {
-        var workspaceOrder = RED.nodes.getWorkspaceOrder();
-        var workspaceOrderMap = {};
-        workspaceOrder.forEach(function(ws,i) {
-            workspaceOrderMap[ws] = i;
-        });
-
-        var candidateNodes = [];
-        var candidateSFs = [];
-        var subflows = {};
-        RED.nodes.eachNode(function (n) {
-            var nt = n.type;
-            if (nt === "debug") {
-                if (n.z in workspaceOrderMap) {
-                    candidateNodes.push(n);
-                }
-                else {
-                    var sf = RED.nodes.subflow(n.z);
-                    if (sf) {
-                        subflows[sf.id] = {
-                            debug: true,
-                            subflows: {}
-                        };
-                    }
-                }
-            }
-            else if(nt.substring(0, 8) === "subflow:") {
-                if (n.z in workspaceOrderMap) {
-                    candidateSFs.push(n);
-                }
-                else {
-                    var psf = RED.nodes.subflow(n.z);
-                    if (psf) {
-                        var sid = nt.substring(8);
-                        var item = subflows[psf.id];
-                        if (!item) {
-                            item = {
-                                debug: undefined,
-                                subflows: {}
-                            };
-                            subflows[psf.id] = item;
-                        }
-                        item.subflows[sid] = true;
-                    }
-                }
-            }
-        });
-        candidateSFs.forEach(function (sf) {
-            var sid = sf.type.substring(8);
-            if (containsDebug(sid, subflows)) {
-                candidateNodes.push(sf);
-            }
-        });
-
-        candidateNodes.sort(function(A,B) {
-            var wsA = workspaceOrderMap[A.z];
-            var wsB = workspaceOrderMap[B.z];
-            if (wsA !== wsB) {
-                return wsA-wsB;
-            }
-            var labelA = RED.utils.getNodeLabel(A,A.id);
-            var labelB = RED.utils.getNodeLabel(B,B.id);
-            return labelA.localeCompare(labelB);
-        });
-        var currentWs = null;
-        var data = [];
-        var currentFlow;
-        var currentSelectedCount = 0;
-        candidateNodes.forEach(function(node) {
-            if (currentWs !== node.z) {
-                if (currentFlow && currentFlow.checkbox) {
-                    currentFlow.selected = currentSelectedCount === currentFlow.children.length
-                }
-                currentSelectedCount = 0;
-                currentWs = node.z;
-                var parent = RED.nodes.workspace(currentWs) || RED.nodes.subflow(currentWs);
-                currentFlow = {
-                    label: RED.utils.getNodeLabel(parent, currentWs),
-                }
-                if (!parent.disabled) {
-                    currentFlow.children = [];
-                    currentFlow.checkbox = true;
-                } else {
-                    currentFlow.class = "disabled"
-                }
-                data.push(currentFlow);
-            }
-            if (currentFlow.children) {
-                if (!filteredNodes[node.id]) {
-                    currentSelectedCount++;
-                }
-                currentFlow.children.push({
-                    label: RED.utils.getNodeLabel(node,node.id),
-                    node: node,
-                    checkbox: true,
-                    selected: !filteredNodes[node.id]
-                });
-            }
-        });
-        if (currentFlow && currentFlow.checkbox) {
-            currentFlow.selected = currentSelectedCount === currentFlow.children.length
-        }
-
+    function refreshDebugNodeList(data) {
         debugNodeTreeList.treeList("data", data);
     }
 
@@ -401,7 +271,7 @@ RED.debug = (function() {
         },200);
     }
     function _refreshMessageList(_activeWorkspace) {
-        if (_activeWorkspace) {
+        if (typeof _activeWorkspace === 'string') {
             activeWorkspace = _activeWorkspace.replace(/\./g,"_");
         }
         if (filterType === "filterAll") {
@@ -479,12 +349,12 @@ RED.debug = (function() {
                         filteredNodes[n.id] = true;
                     });
                     delete filteredNodes[sourceId];
-                    $("#red-ui-sidebar-debug-filterSelected").trigger("click");
                     RED.settings.set('debug.filteredNodes',Object.keys(filteredNodes))
+                    setFilterType('filterSelected')
                     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");
+                    clearFilterSettings()
                     refreshMessageList();
                 }}
             );
@@ -713,9 +583,17 @@ RED.debug = (function() {
         if (!!clearFilter) {
             clearFilterSettings();
         }
-        refreshDebugNodeList();
+        config.requestDebugNodeList(filteredNodes);
     }
 
+    function setFilterType(type) {
+        if (type !== filterType) {
+            filterType = type;
+            $('#red-ui-sidebar-debug-filter span').text(RED._('node-red:debug.sidebar.'+filterType));
+            refreshMessageList();
+            RED.settings.set("debug.filter",filterType)
+        }
+    }
     function clearFilterSettings() {
         filteredNodes = {};
         filterType = 'filterAll';
@@ -728,6 +606,7 @@ RED.debug = (function() {
         init: init,
         refreshMessageList:refreshMessageList,
         handleDebugMessage: handleDebugMessage,
-        clearMessageList: clearMessageList
+        clearMessageList: clearMessageList,
+        refreshDebugNodeList: refreshDebugNodeList
     }
 })();

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

@@ -12,6 +12,9 @@ $(function() {
             },
             clear: function() {
                 window.opener.postMessage({event:"clear"},'*');
+            },
+            requestDebugNodeList: function(filteredNodes) {
+                window.opener.postMessage({event: 'requestDebugNodeList', filteredNodes},'*')
             }
         }
 
@@ -26,6 +29,8 @@ $(function() {
                     RED.debug.refreshMessageList(evt.data.activeWorkspace);
                 } else if (evt.data.event === "projectChange") {
                     RED.debug.clearMessageList(true);
+                } else if (evt.data.event === "refreshDebugNodeList") {
+                    RED.debug.refreshDebugNodeList(evt.data.nodes)
                 }
             },false);
         } catch(err) {

package/core/function/10-function.html

@@ -77,14 +77,15 @@
     <div id="func-tabs-content" style="min-height: calc(100% - 95px);">
 
         <div id="func-tab-config" style="display:none">
-            <div class="form-row">
-                <label for="node-input-outputs"><i class="fa fa-random"></i> <span data-i18n="function.label.outputs"></span></label>
-                <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" style="display: inline-block; margin-right: 50px;">
+                    <label for="node-input-outputs"><i class="fa fa-random"></i> <span data-i18n="function.label.outputs"></span></label>
+                    <input id="node-input-outputs" style="width: 60px;" value="1">
+                </div>
+                <div class="form-row" style="display: inline-block;">
+                    <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>
 
             <div class="form-row node-input-libs-row hide" style="margin-bottom: 0px;">
@@ -365,7 +366,7 @@
             name: {value:"_DEFAULT_"},
             func: {value:"\nreturn msg;"},
             outputs: {value:1},
-            timeout:{value:0},
+            timeout:{value:RED.settings.functionTimeout || 0},
             noerr: {value:0,required:true,
                     validate: function(v, opt) {
                         if (!v) {

package/core/function/10-function.js

@@ -521,7 +521,8 @@ module.exports = function(RED) {
     RED.nodes.registerType("function",FunctionNode, {
         dynamicModuleList: "libs",
         settings: {
-            functionExternalModules: { value: true, exportable: true }
+            functionExternalModules: { value: true, exportable: true },
+            functionTimeout: { value:0, exportable: true }
         }
     });
     RED.library.register("functions");

package/core/function/10-switch.html

@@ -103,7 +103,6 @@
             } 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');
@@ -168,7 +167,33 @@
                        label:RED._("node-red:common.label.payload"),
                        validate: RED.validators.typedInput("propertyType", false)},
             propertyType: { value:"msg" },
-            rules: {value:[{t:"eq", v:"", vt:"str"}]},
+            rules: {
+                value:[{t:"eq", v:"", vt:"str"}],
+                validate: function (rules, opt) {
+                    let msg;
+                    const errors = []
+                    if (!rules || rules.length === 0) { return true }
+                    for (var i=0;i<rules.length;i++) {
+                        const opt = { label: RED._('node-red:switch.label.rule')+' '+(i+1) }
+                        const r = rules[i];
+                        if (r.hasOwnProperty('v')) {
+                            if ((msg = RED.utils.validateTypedProperty(r.v,r.vt,opt)) !== true) {
+                                errors.push(msg)
+                            }
+                        }
+                        if (r.hasOwnProperty('v2')) {
+                            if ((msg = RED.utils.validateTypedProperty(r.v2,r.v2t,opt)) !== true) {
+                                errors.push(msg)
+                            }
+                        }
+                    }
+                    if (errors.length) {
+                        console.log(errors)
+                        return errors
+                    }
+                    return true;
+                }
+            },
             checkall: {value:"true", required:true},
             repair: {value:false},
             outputs: {value:1}
@@ -218,7 +243,11 @@
                         if (i > 0) {
                             var lastRule = $("#node-input-rule-container").editableList('getItemAt',i-1);
                             var exportedRule = exportRule(lastRule.element);
-                            opt.r.vt = exportedRule.vt;
+                            if (exportedRule.t === "istype") {
+                                opt.r.vt = (exportedRule.vt === "number") ? "num" : "str";
+                            } else {
+                                opt.r.vt = exportedRule.vt;
+                            }
                             opt.r.v = "";
                             // We could copy the value over as well and preselect it (see the 'activeElement' code below)
                             // But not sure that feels right. Is copying over the last value 'expected' behaviour?

package/core/function/15-change.html

@@ -19,71 +19,42 @@
 
 <script type="text/javascript">
 (function() {
-    function isInvalidProperty(v,vt) {
-        if (/msg|flow|global/.test(vt)) {
-            if (!RED.utils.validatePropertyExpression(v)) {
-                return RED._("node-red:change.errors.invalid-prop", {
-                    property: v
-                });
-            }
-        } else if (vt === "jsonata") {
-            try{ jsonata(v); } catch(e) {
-                return RED._("node-red:change.errors.invalid-expr", {
-                    error: e.message
-                });
-            }
-        } else if (vt === "json") {
-            try{ JSON.parse(v); } catch(e) {
-                return RED._("node-red:change.errors.invalid-json-data", {
-                    error: e.message
-                });
-            }
-        }
-        return false;
-    }
-
     RED.nodes.registerType('change', {
         color: "#E2D96E",
         category: 'function',
         defaults: {
             name: {value:""},
-            rules:{value:[{t:"set",p:"payload",pt:"msg",to:"",tot:"str"}],validate: function(rules, opt) {
-                var msg;
-                if (!rules || rules.length === 0) { return true }
-                for (var i=0;i<rules.length;i++) {
-                    var r = rules[i];
-                    if (r.t === 'set') {
-                        if (msg = isInvalidProperty(r.p,r.pt)) {
-                            return msg;
-                        }
-                        if (msg = isInvalidProperty(r.to,r.tot)) {
-                            return msg;
-                        }
-                    } else if (r.t === 'change') {
-                        if (msg = isInvalidProperty(r.p,r.pt)) {
-                            return msg;
-                        }
-                        if(msg = isInvalidProperty(r.from,r.fromt)) {
-                            return msg;
-                        }
-                        if(msg = isInvalidProperty(r.to,r.tot)) {
-                            return msg;
-                        }
-                    } else if (r.t === 'delete') {
-                        if (msg = isInvalidProperty(r.p,r.pt)) {
-                            return msg;
+            rules:{
+                value:[{t:"set",p:"payload",pt:"msg",to:"",tot:"str"}],
+                validate: function(rules, opt) {
+                    let msg;
+                    const errors = []
+                    if (!rules || rules.length === 0) { return true }
+                    for (var i=0;i<rules.length;i++) {
+                        const opt = { label: RED._('node-red:change.label.rule')+' '+(i+1) }
+                        const r = rules[i];
+                        if (r.t === 'set' || r.t === 'change' || r.t === 'delete' || r.t === 'move') {
+                            if ((msg = RED.utils.validateTypedProperty(r.p,r.pt,opt)) !== true) {
+                                errors.push(msg)
+                            }
                         }
-                    } else if (r.t === 'move') {
-                        if (msg = isInvalidProperty(r.p,r.pt)) {
-                            return msg;
+                        if (r.t === 'set' || r.t === 'change' || r.t === 'move') {
+                            if ((msg = RED.utils.validateTypedProperty(r.to,r.tot,opt)) !== true) {
+                                errors.push(msg)
+                            }
                         }
-                        if (msg = isInvalidProperty(r.to,r.tot)) {
-                            return msg;
+                        if (r.t === 'change') {
+                            if ((msg = RED.utils.validateTypedProperty(r.from,r.fromt,opt)) !== true) {
+                                errors.push(msg)
+                            }
                         }
                     }
+                    if (errors.length) {
+                        return errors
+                    }
+                    return true;
                 }
-                return true;
-            }},
+            },
             // legacy
             action: {value:""},
             property: {value:""},

package/core/function/16-range.html

@@ -57,7 +57,12 @@
             action: {value:"scale"},
             round: {value:false},
             property: {value:"payload",required:true,
-                       label:RED._("node-red:common.label.property")},
+                       label:RED._("node-red:common.label.property"),
+                       validate: RED.validators.typedInput({ type: 'msg' })
+                    },
+            
+            
+            // RED.validators.typedInput("propertyType", false)},
             name: {value:""}
         },
         inputs: 1,

package/core/function/80-template.html

@@ -153,7 +153,7 @@
             }
             var editorRow = $("#dialog-form>div.node-text-editor-row");
             height -= (parseInt(editorRow.css("marginTop"))+parseInt(editorRow.css("marginBottom")));
-            $(".node-text-editor").css("height",height+"px");
+            $("#dialog-form .node-text-editor").css("height",height+"px");
             this.editor.resize();
         }
     });

package/core/function/89-delay.js

@@ -284,7 +284,7 @@ module.exports = function(RED) {
                         done();
                     }
                 }
-                else {
+                else if (!msg.hasOwnProperty("reset")) {
                     if (maxKeptMsgsCount(node) > 0) {
                         if (node.intervalID === -1) {
                             node.send(msg);

package/core/function/90-exec.html

@@ -56,7 +56,7 @@
         color:"darksalmon",
         defaults: {
             command: {value:""},
-            addpay: {value:""},
+            addpay: {value:"", validate: RED.validators.typedInput({ type: 'msg', allowBlank: true })},
             append: {value:""},
             useSpawn: {value:"false"},
             timer: {value:""},