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

package/core/common/20-inject.js

@@ -117,14 +117,21 @@ module.exports = function(RED) {
                         if (p.v) {
                             try {
                                 var exp = RED.util.prepareJSONataExpression(p.v, node);
-                                var val = RED.util.evaluateJSONataExpression(exp, msg);
-                                RED.util.setMessageProperty(msg, property, val, true);
-                            }
-                            catch  (err) {
+                                RED.util.evaluateJSONataExpression(exp, msg, (err, newValue) => {
+                                    if (err) {
+                                        errors.push(err.toString())
+                                    } else {
+                                        RED.util.setMessageProperty(msg,property,newValue,true);
+                                    }
+                                    evaluateProperty(doneEvaluating)
+                                });
+                            } catch (err) {
                                 errors.push(err.message);
+                                evaluateProperty(doneEvaluating)
                             }
+                        } else {
+                            evaluateProperty(doneEvaluating)
                         }
-                        evaluateProperty(doneEvaluating)
                     } else {
                         try {
                             RED.util.evaluateNodeProperty(value, valueType, node, msg, (err, newValue) => {

package/core/common/24-complete.html

@@ -18,7 +18,16 @@
         color:"#c0edc0",
         defaults: {
             name: {value:""},
-            scope: {value:[], type:"*[]"},
+            scope: {
+                value: [],
+                type: "*[]",
+                validate: function (v, opt) {
+                    if (v.length > 0) {
+                        return true;
+                    }
+                    return RED._("node-red:complete.errors.scopeUndefined");
+                }
+            },
             uncaught: {value:false}
         },
         inputs:0,

package/core/common/25-catch.html

@@ -4,6 +4,7 @@
         <label style="width: auto" for="node-input-scope" data-i18n="catch.label.source"></label>
         <select id="node-input-scope-select">
             <option value="all" data-i18n="catch.scope.all"></option>
+            <option value="group" data-i18n="catch.scope.group"></option>
             <option value="target" data-i18n="catch.scope.selected"></option>
         </select>
     </div>
@@ -170,6 +171,8 @@
             });
             if (this.scope === null) {
                 $("#node-input-scope-select").val("all");
+            } else if(this.scope === "group"){
+                $("#node-input-scope-select").val("group");
             } else {
                 $("#node-input-scope-select").val("target");
             }
@@ -179,6 +182,8 @@
             var scope = $("#node-input-scope-select").val();
             if (scope === 'all') {
                 this.scope = null;
+            } else if(scope === 'group') {
+                this.scope = "group";
             } else {
                 $("#node-input-uncaught").prop("checked",false);
                 this.scope = $("#node-input-catch-target-container-div").treeList('selected').map(function(i) { return i.node.id})

package/core/common/25-status.html

@@ -4,6 +4,7 @@
         <label style="width: auto" for="node-input-scope" data-i18n="status.label.source"></label>
         <select id="node-input-scope-select">
             <option value="all" data-i18n="status.scope.all"></option>
+            <option value="group" data-i18n="status.scope.group"></option>
             <option value="target" data-i18n="status.scope.selected"></option>
         </select>
     </div>
@@ -157,6 +158,8 @@
             });
             if (this.scope === null) {
                 $("#node-input-scope-select").val("all");
+            } else if(this.scope === "group"){
+                $("#node-input-scope-select").val("group");
             } else {
                 $("#node-input-scope-select").val("target");
             }
@@ -166,6 +169,8 @@
             var scope = $("#node-input-scope-select").val();
             if (scope === 'all') {
                 this.scope = null;
+            } else if(scope === 'group') {
+                this.scope = "group";
             } else {
                 this.scope = $("#node-input-status-target-container-div").treeList('selected').map(function(i) { return i.node.id})
             }

package/core/common/60-link.html

@@ -1,4 +1,3 @@
-
 <script type="text/html" data-template-name="link in">
     <div class="form-row">
         <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
@@ -272,7 +271,17 @@
         color:"#ddd",//"#87D8CF",
         defaults: {
             name: { value: "" },
-            links: { value: [], type:"link in[]" },
+            links: {
+                value: [],
+                type: "link in[]",
+                validate: function (v, opt) {
+                    if ((this.linkType === "static" && v.length > 0)
+                      || this.linkType === "dynamic") {
+                        return true;
+                    }
+                    return RED._("node-red:link.errors.linkUndefined");
+                }
+            },
             linkType: { value:"static" },
             timeout: {
                 value: "30",

package/core/common/60-link.js

@@ -164,10 +164,10 @@ module.exports = function(RED) {
                     if (returnNode && returnNode.returnLinkMessage) {
                         returnNode.returnLinkMessage(messageEvent.id, msg);
                     } else {
-                        node.warn(RED._("link.error.missingReturn"))
+                        node.warn(RED._("link.errors.missingReturn"));
                     }
                 } else {
-                    node.warn(RED._("link.error.missingReturn"))
+                    node.warn(RED._("link.errors.missingReturn"));
                 }
                 done();
             } else if (mode === "link") {
@@ -248,6 +248,14 @@ module.exports = function(RED) {
             }
         });
 
+        this.on("close", function () {
+            for (const event of Object.values(messageEvents)) {
+                if (event.ts) {
+                    clearTimeout(event.ts)
+                }
+            }
+        })
+
         this.returnLinkMessage = function(eventId, msg) {
             if (Array.isArray(msg._linkSource) && msg._linkSource.length === 0) {
                 delete msg._linkSource;

package/core/function/rbe.js

@@ -35,7 +35,11 @@ module.exports = function(RED) {
                 }
                 else { node.previous = {}; }
             }
-            var value = RED.util.getMessageProperty(msg,node.property);
+            var value;
+            try {
+                value = RED.util.getMessageProperty(msg,node.property);
+            }
+            catch(e) { }
             if (value !== undefined) {
                 var t = "_no_topic";
                 if (node.septopics) { t = topic || t; }

package/core/network/10-mqtt.html

@@ -249,6 +249,12 @@
                             <span id="node-config-input-cleansession-label" data-i18n="mqtt.label.cleansession"></span>
                         </label>
                     </div>
+                    <div class="form-row mqtt-persistence">
+                        <label for="node-config-input-autoUnsubscribe" style="width: auto;">
+                            <input type="checkbox" id="node-config-input-autoUnsubscribe" style="position: relative;vertical-align: bottom; top: -2px; width: 15px;height: 15px;">
+                            <span id="node-config-input-autoUnsubscribe-label" data-i18n="mqtt.label.autoUnsubscribe"></span>
+                        </label>
+                    </div>
                     <div class="form-row mqtt5">
                         <label style="width:auto" for="node-config-input-sessionExpiry"><span data-i18n="mqtt.label.sessionExpiry"></span></label>
                         <input type="number" min="0" id="node-config-input-sessionExpiry" style="width: 100px" >
@@ -483,17 +489,23 @@
             tls: {type:"tls-config",required: false,
                   label:RED._("node-red:mqtt.label.use-tls") },
             clientid: {value:"", validate: function(v, opt) {
-                var ok = false;
+                let ok = true;
                 if ($("#node-config-input-clientid").length) {
                     // Currently editing the node
-                    ok = $("#node-config-input-cleansession").is(":checked") || (v||"").length > 0;
+                    let needClientId = !$("#node-config-input-cleansession").is(":checked") || !$("#node-config-input-autoUnsubscribe").is(":checked")
+                    if (needClientId) {
+                        ok = (v||"").length > 0;
+                    }
                 } else {
-                    ok = (this.cleansession===undefined || this.cleansession) || (v||"").length > 0;
+                    let needClientId = !(this.cleansession===undefined || this.cleansession) || this.autoUnsubscribe;
+                    if (needClientId) {
+                        ok = (v||"").length > 0;
+                    }
                 }
-                if (ok) {
-                    return ok;
+                if (!ok) {
+                    return RED._("node-red:mqtt.errors.invalid-client-id");
                 }
-                return RED._("node-red:mqtt.errors.invalid-client-id");
+                return true;
             }},
             autoConnect: {value: true},
             usetls: {value: false},
@@ -505,6 +517,7 @@
                 label: RED._("node-red:mqtt.label.keepalive"),
                 validate:RED.validators.number(false)},
             cleansession: {value: true},
+            autoUnsubscribe: {value: true},
             birthTopic: {value:"", validate:validateMQTTPublishTopic},
             birthQos: {value:"0"},
             birthRetain: {value:"false"},
@@ -620,6 +633,10 @@
                 this.cleansession = true;
                 $("#node-config-input-cleansession").prop("checked",true);
             }
+            if (typeof this.autoUnsubscribe === 'undefined') {
+                this.autoUnsubscribe = true;
+                $("#node-config-input-autoUnsubscribe").prop("checked",true);
+            }
             if (typeof this.usetls === 'undefined') {
                 this.usetls = false;
                 $("#node-config-input-usetls").prop("checked",false);
@@ -635,6 +652,14 @@
             if (typeof this.protocolVersion === 'undefined') {
                 this.protocolVersion = 4;
             }
+            $("#node-config-input-cleansession").on("change", function() {
+                const useCleanSession = $("#node-config-input-cleansession").is(':checked');
+                if(useCleanSession) {
+                    $("div.form-row.mqtt-persistence").hide();
+                } else {
+                    $("div.form-row.mqtt-persistence").show();
+                }
+            });
             $("#node-config-input-protocolVersion").on("change", function() {
                 var v5 = $("#node-config-input-protocolVersion").val() == "5";
                 if(v5) {