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

package/core/common/25-status.js

@@ -20,13 +20,15 @@ module.exports = function(RED) {
     function StatusNode(n) {
         RED.nodes.createNode(this,n);
         var node = this;
-        this.scope = n.scope || [];
+        this.scope = n.scope;
 
         // auto-filter out any directly connected nodes to avoid simple loopback
-        const w = this.wires.flat();
-        for (let i=0; i < this.scope.length; i++) {
-            if (w.includes(this.scope[i])) {
-                this.scope.splice(i, 1);
+        if (Array.isArray(this.scope)) {
+            const w = this.wires.flat();
+            for (let i = 0; i < this.scope.length; i++) {
+                if (w.includes(this.scope[i])) {
+                    this.scope.splice(i, 1);
+                }
             }
         }
 

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

@@ -32,6 +32,9 @@ RED.debug = (function() {
     var numMessages = 100;  // Hardcoded number of message to show in debug window scrollback
 
     var debugNodeTreeList;
+    var debugPaused = false;
+    let debugPausedMessage
+    let debugPausedMessageCount = 0
 
     function init(_config) {
         config = _config;
@@ -39,14 +42,18 @@ RED.debug = (function() {
         var content = $("<div>").css({"position":"relative","height":"100%"});
         var toolbar = $('<div class="red-ui-sidebar-header">'+
             '<span class="button-group">'+
-                '<a id="red-ui-sidebar-debug-filter" style="padding-right: 5px" class="red-ui-sidebar-header-button" href="#"><i class="fa fa-filter"></i> <span></span> <i style="padding-left: 5px;" class="fa fa-caret-down"></i></a>'+
+                '<a id="red-ui-sidebar-debug-pause" class="red-ui-sidebar-header-button" href="#"><i class="fa fa-pause"></i></a>'+
             '</span>'+
             '<span class="button-group">'+
-                '<a id="red-ui-sidebar-debug-clear" style="border-right: none; padding-right: 6px" class="red-ui-sidebar-header-button" href="#" data-clear-type="all"><i class="fa fa-trash"></i> <span>all</span></a>' +
-                '<a id="red-ui-sidebar-debug-clear-opts" style="padding: 5px; border-left: none;" class="red-ui-sidebar-header-button" href="#"><i class="fa fa-caret-down"></i></a>'+
+                '<a id="red-ui-sidebar-debug-filter" style="padding-right: 3px" class="red-ui-sidebar-header-button" href="#"><i class="fa fa-filter"></i> <span></span> <i style="padding-left: 5px;" class="fa fa-caret-down"></i></a>'+
+            '</span>'+
+            '<span class="button-group">'+
+                '<a id="red-ui-sidebar-debug-clear" style="border-right: none; padding-right: 2px" class="red-ui-sidebar-header-button" href="#" data-clear-type="all"><i class="fa fa-trash"></i> <span>all</span></a>' +
+                '<a id="red-ui-sidebar-debug-clear-opts" style="padding: 3px; border-left: none;" class="red-ui-sidebar-header-button" href="#"><i class="fa fa-caret-down"></i></a>'+
             '</span></div>').appendTo(content);
 
         var footerToolbar = $('<div>'+
+            '<span id="red-ui-sidebar-debug-info" style="float: left;"></span>' +
             '<span class="button-group"><a id="red-ui-sidebar-debug-open" class="red-ui-footer-button" href="#"><i class="fa fa-desktop"></i></a></span> ' +
             '</div>');
 
@@ -185,6 +192,39 @@ RED.debug = (function() {
         });
         RED.popover.tooltip(toolbar.find('#red-ui-sidebar-debug-filter'),RED._('node-red:debug.sidebar.filterLog'));
 
+        toolbar.find("#red-ui-sidebar-debug-pause").on("click", function(e) {
+            e.preventDefault();
+            toggleDebugflow();
+        });
+        var pauseTooltip = RED.popover.tooltip(toolbar.find("#red-ui-sidebar-debug-pause"),RED._('node-red:debug.sidebar.pause'),"core:pause-debug-messages");
+        function toggleDebugflow() {
+            debugPaused = !debugPaused;
+            if (debugPaused) {
+                debugPausedMessageCount = 0
+                debugPausedMessage = $('<div class="red-ui-debug-msg red-ui-debug-msg-paused">')
+                $(`<div class="red-ui-debug-msg-meta">
+                    <span class="red-ui-debug-msg-date">${getTimestamp()}</span>
+                    <span class="red-ui-debug-msg-name">${RED._('node-red:debug.sidebar.paused')}</span>
+                    </div>`).appendTo(debugPausedMessage);
+                $('<div class="red-ui-debug-msg-meta"><span class="red-ui-debug-msg-name">&nbsp;</span></div>').appendTo(debugPausedMessage);
+                const atBottom = (sbc.scrollHeight-messageList.height()-sbc.scrollTop) < 5;
+                messageList.append(debugPausedMessage);
+                if (atBottom) {
+                    messageList.scrollTop(sbc.scrollHeight);
+                }
+
+                $("#red-ui-sidebar-debug-pause i").removeClass("fa-pause").addClass("fa-play");
+                pauseTooltip.setAction("core:resume-debug-messages");
+                pauseTooltip.setContent(RED._('node-red:debug.sidebar.resume'))
+                $("#red-ui-sidebar-debug-info").text(RED._('node-red:debug.sidebar.paused'));
+            } else {
+                $("#red-ui-sidebar-debug-pause i").removeClass("fa-play").addClass("fa-pause");
+                pauseTooltip.setAction("core:pause-debug-messages");
+                pauseTooltip.setContent(RED._('node-red:debug.sidebar.pause'))
+                $("#red-ui-sidebar-debug-info").text("");
+            }
+        }
+
         toolbar.find("#red-ui-sidebar-debug-clear").on("click", function(e) {
             e.preventDefault();
             var action = RED.settings.get("debug.clearType","all")
@@ -389,15 +429,36 @@ RED.debug = (function() {
     var stack = [];
     var busy = false;
     function handleDebugMessage(o) {
-        if (o) { stack.push(o); }
-        if (!busy && (stack.length > 0)) {
-            busy = true;
-            processDebugMessage(stack.shift());
-            setTimeout(function() {
-                busy = false;
-                handleDebugMessage();
-            }, 15);  // every 15mS = 66 times a second
-            if (stack.length > numMessages) { stack = stack.splice(-numMessages); }
+        if (!debugPaused) {
+            if (o) { stack.push(o); }
+            if (!busy && (stack.length > 0)) {
+                busy = true;
+                const message = stack.shift()
+                // call any preDebugLog hooks, allowing them to modify the message or block it from being displayed
+                RED.hooks.trigger('debugPreProcessMessage', { message }).then(result => {
+                    if (result === false) {
+                        return false; // A hook returned false - halt processing of this message
+                    }
+                    return processDebugMessage(message);
+                }).then(processArtifacts => {
+                    if (processArtifacts === false) {
+                        return false; // A hook returned false - halt processing of this message
+                    }
+                    const { message, element, payload } = processArtifacts || {};
+                    return RED.hooks.trigger('debugPostProcessMessage', { message, element, payload });
+                }).catch(err => {
+                    console.error("Error in debug process message hooks", err);
+                }).finally(() => {
+                    setTimeout(function() {
+                        busy = false;
+                        handleDebugMessage();
+                    }, 15);  // every 15mS = 66 times a second
+                    if (stack.length > numMessages) { stack = stack.splice(-numMessages); }
+                })
+            }
+        } else {
+            debugPausedMessageCount++
+            debugPausedMessage.find('.red-ui-debug-msg-name').last().text(RED._("node-red:debug.sidebar.messagesDropped",{count:debugPausedMessageCount}));
         }
     }
 
@@ -519,10 +580,13 @@ RED.debug = (function() {
             sourceId: sourceNode && sourceNode.id,
             rootPath: path,
             nodeSelector: config.messageSourceClick,
-            enablePinning: true
+            enablePinning: true,
+            tools: o.tools // permit preDebugLog hooks to add extra tools to the <debugMessage> element
         });
         // Do this in a separate step so the element functions aren't stripped
         debugMessage.appendTo(el);
+        // add the meta row tools container, even if there are no tools, so that the postProcessDebugMessage hook can add tools
+        const tools = $('<span class="red-ui-debug-msg-tools button-group"></span>').appendTo(metaRow)
         // NOTE: relying on function error to have a "type" that all other msgs don't
         if (o.hasOwnProperty("type") && (o.type === "function")) {
             var errorLvlType = 'error';
@@ -534,7 +598,6 @@ RED.debug = (function() {
             msg.addClass('red-ui-debug-msg-level-' + errorLvl);
             $('<span class="red-ui-debug-msg-topic">function : (' + errorLvlType + ')</span>').appendTo(metaRow);
         } else {
-            var tools = $('<span class="red-ui-debug-msg-tools button-group"></span>').appendTo(metaRow);
             var filterMessage = $('<button class="red-ui-button red-ui-button-small"><i class="fa fa-caret-down"></i></button>').appendTo(tools);
             filterMessage.on("click", function(e) {
                 e.preventDefault();
@@ -590,6 +653,14 @@ RED.debug = (function() {
         if (atBottom) {
             messageList.scrollTop(sbc.scrollHeight);
         }
+
+        // return artifacts to permit postProcessDebugMessage hooks to modify the message element, access the
+        // processed payload or otherwise modify the message after it has been generated.
+        return {
+            message: o, // original debug message object, useful for any hook that might have tagged additional info onto it
+            element: msg, // the top-level element for this debug message
+            payload // the reconstructed debug message
+        }
     }
 
     function clearMessageList(clearFilter, filteredOnly) {
@@ -598,6 +669,9 @@ RED.debug = (function() {
         } else {
             $(".red-ui-debug-msg:not(.hide)").remove();
         }
+        if (debugPaused) {
+            messageList.append(debugPausedMessage);
+        }
         config.clear();
         if (!!clearFilter) {
             clearFilterSettings();

package/core/function/89-delay.html

@@ -63,6 +63,7 @@
             <label></label>
             <select id="node-input-rate-type" style="width:270px !important">
                 <option value="all" data-i18n="delay.limitall"></option>
+                <option value="burst" data-i18n="delay.limitburst"></option>
                 <option value="topic" data-i18n="delay.limittopic"></option>
             </select>
         </div>
@@ -185,6 +186,8 @@
                     return this._("delay.label.limit")+" "+rate;
                 } else if (this.pauseType == "timed") {
                     return this._("delay.label.limitTopic")+" "+rate;
+                } else if (this.pauseType == "burst") {
+                    return this._("delay.label.burst")+" "+rate;
                 } else {
                     return this._("delay.label.limitTopic")+" "+rate;
                 }
@@ -245,6 +248,9 @@
                 $("#node-input-delay-action").val('rate');
                 $("#node-input-rate-type").val('topic');
                 $("#node-input-rate-topic-type").val('timed');
+            } else if (this.pauseType == "burst") {
+                $("#node-input-delay-action").val('rate');
+                $("#node-input-rate-type").val('burst');
             }
 
             if (!this.timeoutUnits) {
@@ -294,12 +300,17 @@
                 if (this.value === "all") {
                     $("#rate-details-per-topic").hide();
                     $("#node-input-drop-select-queue").attr('disabled', false);
+                    $("#rate-override").show();
+                } else if (this.value === "burst") {
+                    $("#rate-details-per-topic").hide();
+                    $("#node-input-drop-select-queue").attr('disabled', true);
+                    $("#rate-override").hide();
                 } else if (this.value === "topic") {
                     if ($("#node-input-drop-select").val() === "queue") {
-                        $("#node-input-drop-select").val("drop");
                     }
                     $("#node-input-drop-select-queue").attr('disabled', true);
                     $("#rate-details-per-topic").show();
+                    $("#rate-override").show();
                 }
             }).trigger("change");
         },
@@ -312,6 +323,8 @@
                 action = $("#node-input-rate-type").val();
                 if (action === "all") {
                     this.pauseType = "rate";
+                } else if (action === "burst") {
+                    this.pauseType = "burst";
                 } else {
                     this.pauseType = $("#node-input-rate-topic-type").val();
                 }

package/core/function/89-delay.js

@@ -42,6 +42,7 @@ module.exports = function(RED) {
         this.timeoutUnits = n.timeoutUnits;
         this.randomUnits = n.randomUnits;
         this.rateUnits = n.rateUnits;
+        this.burst = n.rate;
 
         if (n.timeoutUnits === "milliseconds") {
             this.timeout = n.timeout;
@@ -57,12 +58,16 @@ module.exports = function(RED) {
 
         if (n.rateUnits === "minute") {
             this.rate = (60 * 1000)/n.rate;
+            this.timer = n.nbRateUnits * (60 * 1000);
         } else if (n.rateUnits === "hour") {
             this.rate = (60 * 60 * 1000)/n.rate;
+            this.timer = n.nbRateUnits * (60 * 60 * 1000);
         } else if (n.rateUnits === "day") {
             this.rate = (24 * 60 * 60 * 1000)/n.rate;
+            this.timer = n.nbRateUnits * (24 * 60 * 60 * 1000);
         } else {  // Default to seconds
             this.rate = 1000/n.rate;
+            this.timer = n.nbRateUnits * 1000;
         }
 
         this.rate *= (n.nbRateUnits > 0 ? n.nbRateUnits : 1);
@@ -159,7 +164,8 @@ module.exports = function(RED) {
         if (node.pauseType === "delay") {
             node.on("input", function(msg, send, done) {
                 var id = ourTimeout(function() {
-                    node.idList.splice(node.idList.indexOf(id),1);
+                    var idx = node.idList.indexOf(id);
+                    if (idx !== -1) { node.idList.splice(idx, 1); }
                     if (node.timeout > 1000) {
                         node.status({fill:"blue",shape:"dot",text:node.idList.length});
                     }
@@ -184,7 +190,8 @@ module.exports = function(RED) {
                 }
                 if (delayvar < 0) { delayvar = 0; }
                 var id = ourTimeout(function() {
-                    node.idList.splice(node.idList.indexOf(id),1);
+                    var idx = node.idList.indexOf(id);
+                    if (idx !== -1) { node.idList.splice(idx, 1); }
                     if (node.idList.length === 0) { node.status({}); }
                     send(msg);
                     if (delayvar >= 0) {
@@ -192,7 +199,8 @@ module.exports = function(RED) {
                     }
                     done();
                 }, delayvar, () => done());
-                node.idList.push(id);
+                if (Object.keys(msg).length === 2 && msg.hasOwnProperty("flush")) { id.clear(); }
+                else { node.idList.push(id); }
                 if (msg.hasOwnProperty("reset")) { clearDelayList(true); }
                 if (msg.hasOwnProperty("flush")) { flushDelayList(msg.flush); done(); }
                 if (delayvar >= 0) {
@@ -206,7 +214,8 @@ module.exports = function(RED) {
             node.on("input", function(msg, send, done) {
                 var wait = node.randomFirst + (node.diff * Math.random());
                 var id = ourTimeout(function() {
-                    node.idList.splice(node.idList.indexOf(id),1);
+                    var idx = node.idList.indexOf(id);
+                    if (idx !== -1) { node.idList.splice(idx, 1); }
                     send(msg);
                     if (node.timeout >= 1000) {
                         node.status({fill:"blue",shape:"dot",text:node.idList.length});
@@ -336,6 +345,42 @@ module.exports = function(RED) {
             });
         }
 
+        // Handle the burst mode
+        else if (node.pauseType === "burst") {
+            node.timers = [];
+            node.inflight = 0;
+            node.status({ fill: "green", shape: "ring", text: "" })
+            node.on("input", function(msg, send, done) {
+                if (msg.hasOwnProperty("reset")) {
+                    node.timers.forEach((t) => clearTimeout(t));
+                    node.timers = [];
+                    node.inflight = 0;
+                    node.status({ fill: "green", shape: "ring", text: "" });
+                    done();
+                    return;
+                }
+                if (node.inflight < node.burst) {
+                    node.inflight += 1;
+                    send(msg);
+                    node.timers[node.inflight-1] = setTimeout(() => {
+                        if (node.inflight == node.burst) {
+                            node.status({ fill: "green", shape: "ring", text: "" });
+                        }
+                        node.inflight -= 1;
+                    }, node.timer);
+                }
+                else {
+                    if (node.outputs === 2) { send([null,msg]); }
+                    node.status({ fill: "red", shape: "dot", text: "" });
+                }
+                done();
+            });
+            node.on("close", function() {
+                node.timers.forEach((t) => clearTimeout(t));
+                node.status({});
+            });
+        }
+
         // The topic based fair queue and last arrived on all topics queue
         else if ((node.pauseType === "queue") || (node.pauseType === "timed")) {
             node.intervalID = setInterval(function() {

package/core/function/90-exec.js

@@ -105,18 +105,26 @@ module.exports = function(RED) {
                     }
                     node.activeProcesses[child.pid] = child;
                     child.stdout.on('data', function (data) {
-                        if (node.activeProcesses.hasOwnProperty(child.pid) && node.activeProcesses[child.pid] !== null) {
-                            // console.log('[exec] stdout: ' + data,child.pid);
-                            if (isUtf8(data)) { msg.payload = data.toString(); }
-                            else { msg.payload = data; }
-                            nodeSend([RED.util.cloneMessage(msg),null,null]);
+                        try {
+                            if (node.activeProcesses.hasOwnProperty(child.pid) && node.activeProcesses[child.pid] !== null) {
+                                // console.log('[exec] stdout: ' + data,child.pid);
+                                if (isUtf8(data)) { msg.payload = data.toString(); }
+                                else { msg.payload = data; }
+                                nodeSend([RED.util.cloneMessage(msg),null,null]);
+                            }
+                        } catch (err) {
+                            node.error(err.toString());
                         }
                     });
                     child.stderr.on('data', function (data) {
-                        if (node.activeProcesses.hasOwnProperty(child.pid) && node.activeProcesses[child.pid] !== null) {
-                            if (isUtf8(data)) { msg.payload = data.toString(); }
-                            else { msg.payload = data; }
-                            nodeSend([null,RED.util.cloneMessage(msg),null]);
+                        try {
+                            if (node.activeProcesses.hasOwnProperty(child.pid) && node.activeProcesses[child.pid] !== null) {
+                                if (isUtf8(data)) { msg.payload = data.toString(); }
+                                else { msg.payload = data; }
+                                nodeSend([null,RED.util.cloneMessage(msg),null]);
+                            }
+                        } catch (err) {
+                            node.error(err.toString());
                         }
                     });
                     child.on('close', function (code,signal) {

package/core/network/05-tls.html

@@ -15,17 +15,18 @@
 -->
 
 <script type="text/html" data-template-name="tls-config">
-    <div class="form-row" class="hide" id="node-config-row-uselocalfiles">
-        <input type="checkbox" id="node-config-input-uselocalfiles" style="display: inline-block; width: auto; vertical-align: top;">
-        <label for="node-config-input-uselocalfiles" style="width: 70%;"><span data-i18n="tls.label.use-local-files"></label>
-    </div>
     <div class="form-row">
         <label style="width: 120px;" for="node-config-input-certType"><i class="fa fa-bars"></i> <span data-i18n="tls.label.certtype"></label>
         <select id="node-config-input-certType">
             <option value="files" data-i18n="tls.label.files"></option>
             <option value="pfx" data-i18n="tls.label.pfx"></option>
+            <option value="env" data-i18n="tls.label.env"></option>
         </select>
     </div>
+    <div class="form-row" class="hide" id="node-config-row-uselocalfiles">
+        <input type="checkbox" id="node-config-input-uselocalfiles" style="display: inline-block; width: auto; vertical-align: top;">
+        <label for="node-config-input-uselocalfiles" style="width: 70%;"><span data-i18n="tls.label.use-local-files"></label>
+    </div>
     <div class="form-row" id="node-tls-conf-cer">
         <label style="width: 120px;"><i class="fa fa-file-text-o"></i> <span data-i18n="tls.label.cert"></span></label>
         <span class="tls-config-input-data">
@@ -38,6 +39,10 @@
         <input type="hidden" id="node-config-input-certdata">
         <input class="hide tls-config-input-path" style="width: calc(100% - 170px);" type="text" id="node-config-input-cert" data-i18n="[placeholder]tls.placeholder.cert">
     </div>
+    <div class="form-row" id="node-tls-conf-cer-env">
+        <label style="width: 120px;"><i class="fa fa-file-text-o"></i> <span data-i18n="tls.label.cert"></span></label>
+        <input type="text" id="node-config-input-certEnv">
+    </div>
     <div class="form-row" id="node-tls-conf-key">
         <label style="width: 120px;" for="node-config-input-key"><i class="fa fa-file-text-o"></i> <span data-i18n="tls.label.key"></span></label>
         <span class="tls-config-input-data">
@@ -50,6 +55,10 @@
         <input type="hidden" id="node-config-input-keydata">
         <input class="hide tls-config-input-path" style="width: calc(100% - 170px);" type="text" id="node-config-input-key" data-i18n="[placeholder]tls.placeholder.key">
     </div>
+    <div class="form-row" id="node-tls-conf-key-env">
+        <label style="width: 120px;"><i class="fa fa-file-text-o"></i> <span data-i18n="tls.label.key"></span></label>
+        <input type="text" id="node-config-input-keyEnv">
+    </div>
     <div class="form-row" id="node-tls-conf-p12">
         <label style="width: 120px;" for="node-config-input-p12"><i class="fa fa-file-text-o"></i> <span data-i18n="tls.label.p12"></span></label>
         <span class="tls-config-input-data">
@@ -78,6 +87,10 @@
         <input type="hidden" id="node-config-input-cadata">
         <input class="hide tls-config-input-path" style="width: calc(100% - 170px);" type="text" id="node-config-input-ca" data-i18n="[placeholder]tls.placeholder.ca">
     </div>
+    <div class="form-row" id="node-tls-conf-ca-env">
+        <label style="width: 120px;"><i class="fa fa-file-text-o"></i> <span data-i18n="tls.label.ca"></span></label>
+        <input type="text" id="node-config-input-caEnv">
+    </div>
     <div class="form-row">
         <input type="checkbox" id="node-config-input-verifyservercert" style="display: inline-block; width: auto; vertical-align: top;">
         <label for="node-config-input-verifyservercert" style="width: calc(100% - 170px);" data-i18n="tls.label.verify-server-cert"></label>
@@ -131,7 +144,10 @@
             caname: {value:""},
             servername: {value:""},
             verifyservercert: {value: true},
-            alpnprotocol: {value: ""}
+            alpnprotocol: {value: ""},
+            certEnv: {value: ""},
+            keyEnv: {value: ""},
+            caEnv: {value: ""}
         },
         credentials: {
             certdata: {type:"text"},
@@ -152,15 +168,45 @@
                     $("#node-tls-conf-cer").hide();
                     $("#node-tls-conf-key").hide();
                     $("#node-tls-conf-ca").hide();
+                    $("#node-tls-conf-cer-env").hide();
+                    $("#node-tls-conf-key-env").hide();
+                    $("#node-tls-conf-ca-env").hide();
                     $("#node-tls-conf-p12").show();
+                    $("#node-config-row-uselocalfiles").show();
                 }
-                else {
+                else if ($("#node-config-input-certType").val() === "env") {
+                    $("#node-tls-conf-cer").hide();
+                    $("#node-tls-conf-key").hide();
+                    $("#node-tls-conf-ca").hide();
+                    $("#node-tls-conf-cer-env").show();
+                    $("#node-tls-conf-key-env").show();
+                    $("#node-tls-conf-ca-env").show();
+                    $("#node-tls-conf-p12").hide();
+                    $("#node-config-row-uselocalfiles").hide();
+                } else {
                     $("#node-tls-conf-cer").show();
                     $("#node-tls-conf-key").show();
                     $("#node-tls-conf-ca").show();
+                    $("#node-tls-conf-cer-env").hide();
+                    $("#node-tls-conf-key-env").hide();
+                    $("#node-tls-conf-ca-env").hide();
                     $("#node-tls-conf-p12").hide();
+                    $("#node-config-row-uselocalfiles").show();
                 }
             });
+            
+            $("#node-config-input-certEnv").typedInput({
+                type:"env",
+                types:["env"]
+            });
+            $("#node-config-input-keyEnv").typedInput({
+                type:"env",
+                types:["env"]
+            });
+            $("#node-config-input-caEnv").typedInput({
+                type:"env",
+                types:["env"]
+            });
 
             function updateFileUpload() {
                 if ($("#node-config-input-uselocalfiles").is(':checked')) {
@@ -218,15 +264,19 @@
             $("#tls-config-button-cert-clear").on("click", function() {
                 clearNameData("cert");
             });
+            RED.popover.tooltip($("#tls-config-button-cert-clear"), RED._("common.label.delete"));
             $("#tls-config-button-key-clear").on("click", function() {
                 clearNameData("key");
             });
+            RED.popover.tooltip($("#tls-config-button-key-clear"), RED._("common.label.delete"));
             $("#tls-config-button-ca-clear").on("click", function() {
                 clearNameData("ca");
             });
+            RED.popover.tooltip($("#tls-config-button-ca-clear"), RED._("common.label.delete"));
             $("#tls-config-button-p12-clear").on("click", function() {
                 clearNameData("p12");
             });
+            RED.popover.tooltip($("#tls-config-button-p12-clear"), RED._("common.label.delete"));
 
             if (RED.settings.tlsConfigDisableLocalFiles) {
                 $("#node-config-row-uselocalfiles").hide();

package/core/network/05-tls.js

@@ -23,10 +23,14 @@ module.exports = function(RED) {
         this.valid = true;
         this.verifyservercert = n.verifyservercert;
         var certPath, keyPath, caPath, p12Path;
+        var certEnv, keyEnv, caEnv;
         if (n.cert) { certPath = n.cert.trim(); }
         if (n.key) { keyPath = n.key.trim(); }
         if (n.ca) { caPath = n.ca.trim(); }
         if (n.p12) { p12Path = n.p12.trim(); }
+        if (n.certEnv) { certEnv = n.certEnv }
+        if (n.keyEnv) { keyEnv = n.keyEnv }
+        if (n.caEnv) { caEnv = n.caEnv }
         this.certType = n.certType || "files";
         this.servername = (n.servername||"").trim();
         this.alpnprotocol = (n.alpnprotocol||"").trim();
@@ -41,13 +45,23 @@ module.exports = function(RED) {
                 return;
             }
         }
+        else if (this.certType === "env") {
+            if (certEnv) {
+                this.certEnv = Buffer.from(RED.util.evaluateNodeProperty(certEnv, 'env', this))
+            }
+            if (keyEnv) {
+                this.keyEnv = Buffer.from(RED.util.evaluateNodeProperty(keyEnv, 'env', this))
+            }
+            if (caEnv) {
+                this.caEnv = Buffer.from(RED.util.evaluateNodeProperty(caEnv, 'env', this))
+            }
+        }
         else if ((certPath && certPath.length > 0) || (keyPath && keyPath.length > 0) || (caPath && caPath.length > 0)) {
             if ( (certPath && certPath.length > 0) !== (keyPath && keyPath.length > 0)) {
                 this.valid = false;
                 this.error(RED._("tls.error.missing-file"));
                 return;
             }
-
             try {
                 if (certPath) {
                     this.cert = fs.readFileSync(certPath);
@@ -122,6 +136,17 @@ module.exports = function(RED) {
                     opts.ca = this.ca;
                 }
             }
+            else if (this.certType === "env") {
+                if (this.keyEnv) {
+                    opts.key = this.keyEnv
+                }
+                if (this.certEnv) {
+                    opts.cert= this.certEnv
+                }
+                if (this.caEnv) {
+                    opts.ca = this.caEnv
+                }
+            }
             else {
                 if (this.pfx) {
                     opts.pfx = this.pfx;

package/core/network/10-mqtt.js

@@ -227,6 +227,7 @@ module.exports = function(RED) {
      * Handle the payload / packet recieved in MQTT In and MQTT Sub nodes
      */
     function subscriptionHandler(node, datatype ,topic, payload, packet) {
+        if (!packet) { packet = {}; }
         const msg = {topic:topic, payload:null, qos:packet.qos, retain:packet.retain};
         const v5 = (node && node.brokerConn)
             ? node.brokerConn.v5()
@@ -1074,12 +1075,16 @@ module.exports = function(RED) {
 
                 if (!subscription.handler) {
                     subscription.handler = function (mtopic, mpayload, mpacket) {
-                        const sops = subscription.options ? subscription.options.properties : {}
-                        const pops = mpacket.properties || {}
-                        if (subIdsAvailable && pops.subscriptionIdentifier && sops.subscriptionIdentifier && (pops.subscriptionIdentifier !== sops.subscriptionIdentifier)) {
-                            //do nothing as subscriptionIdentifier does not match
-                        } else if (matchTopic(topic, mtopic)) {
-                            subscription.callback && subscription.callback(mtopic, mpayload, mpacket)
+                        try {
+                            const sops = subscription.options ? subscription.options.properties : {}
+                            const pops = (mpacket && mpacket.properties) || {}
+                            if (subIdsAvailable && pops.subscriptionIdentifier && sops.subscriptionIdentifier && (pops.subscriptionIdentifier !== sops.subscriptionIdentifier)) {
+                                //do nothing as subscriptionIdentifier does not match
+                            } else if (matchTopic(topic, mtopic)) {
+                                subscription.callback && subscription.callback(mtopic, mpayload, mpacket)
+                            }
+                        } catch (err) {
+                            node.error("MQTT subscription handler error: " + err.toString());
                         }
                     }
                 }