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

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/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) {

package/core/network/10-mqtt.js

@@ -219,8 +219,10 @@ module.exports = function(RED) {
      * Handle the payload / packet recieved in MQTT In and MQTT Sub nodes
      */
     function subscriptionHandler(node, datatype ,topic, payload, packet) {
-        const v5 = node.brokerConn.options && node.brokerConn.options.protocolVersion == 5;
-        var msg = {topic:topic, payload:null, qos:packet.qos, retain:packet.retain};
+        const msg = {topic:topic, payload:null, qos:packet.qos, retain:packet.retain};
+        const v5 = (node && node.brokerConn) 
+            ? node.brokerConn.v5() 
+            : Object.prototype.hasOwnProperty.call(packet, "properties");
         if(v5 && packet.properties) {
             setStrProp(packet.properties, msg, "responseTopic");
             setBufferProp(packet.properties, msg, "correlationData");
@@ -300,7 +302,7 @@ module.exports = function(RED) {
             //}
         }
         msg.payload = payload;
-        if ((node.brokerConn.broker === "localhost")||(node.brokerConn.broker === "127.0.0.1")) {
+        if (node.brokerConn && (node.brokerConn.broker === "localhost" || node.brokerConn.broker === "127.0.0.1")) {
             msg._topic = topic;
         }
         node.send(msg);
@@ -412,6 +414,12 @@ module.exports = function(RED) {
         }
     }
 
+    /**
+     * Perform the connect action
+     * @param {MQTTInNode|MQTTOutNode} node
+     * @param {Object} msg
+     * @param {Function} done
+     */
     function handleConnectAction(node, msg, done) {
         let actionData = typeof msg.broker === 'object' ? msg.broker : null;
         if (node.brokerConn.canConnect()) {
@@ -442,12 +450,17 @@ module.exports = function(RED) {
         }
     }
 
+    /**
+     * Perform the disconnect action
+     * @param {MQTTInNode|MQTTOutNode} node 
+     * @param {Function} done
+     */
     function handleDisconnectAction(node, done) {
         node.brokerConn.disconnect(function () {
             done();
         });
     }
-
+    const unsubscribeCandidates = {}
     //#endregion  "Supporting functions"
 
     //#region  "Broker node"
@@ -482,6 +495,7 @@ module.exports = function(RED) {
             setIfHasProperty(opts, node, "protocolVersion", init);
             setIfHasProperty(opts, node, "keepalive", init);
             setIfHasProperty(opts, node, "cleansession", init);
+            setIfHasProperty(opts, node, "autoUnsubscribe", init);
             setIfHasProperty(opts, node, "topicAliasMaximum", init);
             setIfHasProperty(opts, node, "maximumPacketSize", init);
             setIfHasProperty(opts, node, "receiveMaximum", init);
@@ -590,7 +604,9 @@ module.exports = function(RED) {
             if (typeof node.cleansession === 'undefined') {
                 node.cleansession = true;
             }
-
+            if (typeof node.autoUnsubscribe !== 'boolean') {
+                node.autoUnsubscribe = true;
+            }
             //use url or build a url from usetls://broker:port
             if (node.url && node.brokerurl !== node.url) {
                 node.brokerurl = node.url;
@@ -697,7 +713,8 @@ module.exports = function(RED) {
                 node.options.rejectUnauthorized = (node.verifyservercert == "true" || node.verifyservercert === true);
             }
         }
-
+        node.v5 = () => node.options && node.options.protocolVersion == 5
+        node.subscriptionIdentifiersAvailable = () => node.v5() && node.serverProperties && node.serverProperties.subscriptionIdentifiersAvailable
         n.autoConnect = n.autoConnect === "false" || n.autoConnect === false ? false : true;
         node.setOptions(n, true);
 
@@ -779,18 +796,11 @@ module.exports = function(RED) {
                         // Re-subscribe to stored topics
                         for (var s in node.subscriptions) {
                             if (node.subscriptions.hasOwnProperty(s)) {
-                                let topic = s;
-                                let qos = 0;
-                                let _options = {};
                                 for (var r in node.subscriptions[s]) {
                                     if (node.subscriptions[s].hasOwnProperty(r)) {
-                                        qos = Math.max(qos,node.subscriptions[s][r].qos);
-                                        _options = node.subscriptions[s][r].options;
-                                        node._clientOn('message',node.subscriptions[s][r].handler);
+                                        node.subscribe(node.subscriptions[s][r])
                                     }
                                 }
-                                _options.qos = _options.qos || qos;
-                                node.client.subscribe(topic, _options);
                             }
                         }
 
@@ -852,22 +862,28 @@ module.exports = function(RED) {
             if(!node.client) { return _callback(); }
             if(node.closing) { return _callback(); }
 
+            /**
+             * Call end and wait for the client to end (or timeout)
+             * @param {mqtt.MqttClient} client The broker client
+             * @param {number} ms The time to wait for the client to end
+             * @returns 
+             */
             let waitEnd = (client, ms) => {
                 return new Promise( (resolve, reject) => {
                     node.closing = true;
-                    if(!client) {
+                    if (!client) {
                         resolve();
-                     } else {
+                    } else {
                         const t = setTimeout(() => {
                             //clean end() has exceeded WAIT_END, lets force end!
                             client && client.end(true);
-                            reject();
+                            resolve();
                         }, ms);
                         client.end(() => {
-                             clearTimeout(t);
-                             resolve()
-                         });
-                     }
+                            clearTimeout(t);
+                            resolve()
+                        });
+                    }
                 });
             };
             if(node.connected && node.closeMessage) {
@@ -888,64 +904,222 @@ module.exports = function(RED) {
         }
         node.subscriptionIds = {};
         node.subid = 1;
-        node.subscribe = function (topic,options,callback,ref) {
-            ref = ref||0;
-            var qos;
-            if(typeof options == "object") {
-                qos = options.qos;
-            } else {
-                qos = options;
-                options = {};
+
+        //typedef for subscription object:
+        /** 
+         * @typedef {Object} Subscription
+         * @property {String} topic - topic to subscribe to
+         * @property {Object} [options] - options object
+         * @property {Number} [options.qos] - quality of service
+         * @property {Number} [options.nl] - no local
+         * @property {Number} [options.rap] - retain as published
+         * @property {Number} [options.rh] - retain handling
+         * @property {Number} [options.properties] - MQTT 5.0 properties
+         * @property {Number} [options.properties.subscriptionIdentifier] - MQTT 5.0 subscription identifier
+         * @property {Number} [options.properties.userProperties] - MQTT 5.0 user properties
+         * @property {Function} callback
+         * @property {String} ref - reference to the node that created the subscription
+         */
+
+        /**
+         * Create a subscription object
+         * @param {String} _topic - topic to subscribe to
+         * @param {Object} _options - options object
+         * @param {String} _ref - reference to the node that created the subscription
+         * @returns {Subscription}
+         */
+        function createSubscriptionObject(_topic, _options, _ref, _brokerId) {
+            /** @type {Subscription} */
+            const subscription = {};
+            const ref = _ref || 0;
+            let options
+            let qos = 1 // default to QoS 1 (AWS and several other brokers don't support QoS 2)
+            
+            // if options is an object, then clone it
+            if (typeof _options == "object") {
+                options = RED.util.cloneMessage(_options || {})
+                qos = _options.qos;
+            } else if (typeof _options == "number") {
+                qos = _options;
+            }
+            options = options || {};
+
+            // sanitise qos
+            if (typeof qos === "number" && qos >= 0 && qos <= 2) {
+                options.qos = qos;
+            }
+            
+            subscription.topic = _topic;
+            subscription.qos = qos;
+            subscription.options = RED.util.cloneMessage(options);
+            subscription.ref = ref;
+            subscription.brokerId = _brokerId;
+            return subscription;
+        }
+
+        /**
+         * If topic is a subscription object, then use that, otherwise look up the topic in 
+         * the  subscriptions object.  If the topic is not found, then create a new subscription
+         * object and add it to the subscriptions object.
+         * @param {Subscription|String} topic 
+         * @param {*} options 
+         * @param {*} callback 
+         * @param {*} ref 
+         */
+        node.subscribe = function (topic, options, callback, ref) {
+            /** @type {Subscription} */ 
+            let subscription
+            let doCompare = false
+            let changesFound = false
+
+            // function signature 1: subscribe(subscription: Subscription)
+            if (typeof topic === "object" && topic !== null) {
+                subscription = topic
+                topic = subscription.topic
+                options = subscription.options
+                ref = subscription.ref
+                callback = subscription.callback
+            }
+
+            // function signature 2: subscribe(topic: String, options: Object, callback: Function, ref: String)
+            else if (typeof topic === "string") {
+                // since this is a call where all params are provided, it might be
+                // a node change (modification) so we need to check for changes
+                doCompare = true
+                subscription = node.subscriptions[topic] && node.subscriptions[topic][ref]
+            }
+
+            // bad function call
+            else {
+                console.warn('Invalid call to node.subscribe')
+                return
             }
-            options.qos = qos;
+            const thisBrokerId = node.type === 'mqtt-broker' ? node.id : node.broker
+
+            // unsubscribe topics where the broker has changed
+            const oldBrokerSubs = (unsubscribeCandidates[ref] || []).filter(sub => sub.brokerId !== thisBrokerId)
+            oldBrokerSubs.forEach(sub => {
+                /** @type {MQTTBrokerNode} */
+                const _brokerConn = RED.nodes.getNode(sub.brokerId)
+                if (_brokerConn) {
+                    _brokerConn.unsubscribe(sub.topic, sub.ref, true)
+                }
+            })
+            
+            // if subscription is found (or sent in as a parameter), then check for changes.
+            // if there are any changes requested, tidy up the old subscription
+            if (subscription) {
+                if (doCompare) {
+                    // compare the current sub to the passed in parameters. Use RED.util.compareObjects against
+                    // only the minimal set of properties to identify if the subscription has changed
+                    const currentSubscription = createSubscriptionObject(subscription.topic, subscription.options, subscription.ref)
+                    const newSubscription = createSubscriptionObject(topic, options, ref)
+                    changesFound = RED.util.compareObjects(currentSubscription, newSubscription) === false
+                }
+            }
+
+            if (changesFound) {
+                if (subscription.handler) {
+                    node._clientRemoveListeners('message', subscription.handler)
+                    subscription.handler = null
+                }
+                const _brokerConn = RED.nodes.getNode(subscription.brokerId)
+                if (_brokerConn) {
+                    _brokerConn.unsubscribe(subscription.topic, subscription.ref, true)
+                }
+            }
+
+            // clean up the unsubscribe candidate list
+            delete unsubscribeCandidates[ref]
+
+            // determine if this is an existing subscription
+            const existingSubscription = typeof subscription === "object" && subscription !== null
+
+            // if existing subscription is not found or has changed, create a new subscription object
+            if (existingSubscription === false || changesFound) {
+                subscription = createSubscriptionObject(topic, options, ref, node.id)
+            }
+
+            // setup remainder of subscription properties and event handling
+            node.subscriptions[topic] = node.subscriptions[topic] || {};
+            node.subscriptions[topic][ref] = subscription
             if (!node.subscriptionIds[topic]) {
                 node.subscriptionIds[topic] = node.subid++;
             }
-            options.properties = options.properties || {};
-            options.properties.subscriptionIdentifier = node.subscriptionIds[topic];
-
-            node.subscriptions[topic] = node.subscriptions[topic]||{};
-            var sub = {
-                topic:topic,
-                qos:qos,
-                options:options,
-                handler:function(mtopic,mpayload, mpacket) {
-                    if(mpacket.properties && options.properties && mpacket.properties.subscriptionIdentifier && options.properties.subscriptionIdentifier && (mpacket.properties.subscriptionIdentifier !== options.properties.subscriptionIdentifier) ) {
-                        //do nothing as subscriptionIdentifier does not match
-                    } else if (matchTopic(topic,mtopic)) {
-                        callback(mtopic,mpayload, mpacket);
-                    }
-                },
-                ref: ref
-            };
-            node.subscriptions[topic][ref] = sub;
+            subscription.options = subscription.options || {};
+            subscription.options.properties = options.properties || {};
+            subscription.options.properties.subscriptionIdentifier = node.subscriptionIds[topic];
+            subscription.callback = callback;
+
+            // if the client is connected, then setup the handler and subscribe
             if (node.connected) {
-                node._clientOn('message',sub.handler);
-                node.client.subscribe(topic, options);
+                const subIdsAvailable = node.subscriptionIdentifiersAvailable()
+
+                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)
+                        }
+                    }
+                }
+                node._clientOn('message', subscription.handler)
+                // if the broker doesn't support subscription identifiers, then don't send them (AWS support)
+                if (subscription.options.properties && subscription.options.properties.subscriptionIdentifier && subIdsAvailable !== true) {
+                    delete subscription.options.properties.subscriptionIdentifier
+                }
+                node.client.subscribe(topic, subscription.options)
             }
-        };
 
-        node.unsubscribe = function (topic, ref, removed) {
+        }
+
+        node.unsubscribe = function (topic, ref, removeClientSubscription) {
             ref = ref||0;
-            var sub = node.subscriptions[topic];
+            const unsub = removeClientSubscription || node.autoUnsubscribe !== false
+            const sub = node.subscriptions[topic];
+            let brokerId = node.id
             if (sub) {
                 if (sub[ref]) {
-                    if(node.client) {
-                        node._clientRemoveListeners('message',sub[ref].handler);
+                    brokerId = sub[ref].brokerId || brokerId
+                    if(node.client && sub[ref].handler) {
+                        node._clientRemoveListeners('message', sub[ref].handler);
+                        sub[ref].handler = null
+                    }
+                    if (unsub) {
+                        delete sub[ref]
                     }
-                    delete sub[ref];
                 }
-                //TODO: Review. The `if(removed)` was commented out to always delete and remove subscriptions.
-                // if we dont then property changes dont get applied and old subs still trigger
-                //if (removed) {
+                // if instructed to remove the actual MQTT client subscription 
+                if (unsub) {
+                    // if there are no more subscriptions for the topic, then remove the topic
                     if (Object.keys(sub).length === 0) {
-                        delete node.subscriptions[topic];
-                        delete node.subscriptionIds[topic];
-                        if (node.connected) {
-                            node.client.unsubscribe(topic);
+                        try {
+                            node.client.unsubscribe(topic)
+                        } catch (_err) {
+                            // do nothing
+                        } finally {
+                            // remove unsubscribe candidate as it is now REALLY unsubscribed
+                            delete node.subscriptions[topic];
+                            delete node.subscriptionIds[topic];
+                            if (unsubscribeCandidates[ref]) {
+                                unsubscribeCandidates[ref] = unsubscribeCandidates[ref].filter(sub => sub.topic !== topic)
+                            }
                         }
                     }
-                //}
+                } else {
+                    // if instructed to not remove the client subscription, then add it to the candidate list
+                    // of subscriptions to be removed when the the same ref is used in a subsequent subscribe
+                    // and the topic has changed
+                    unsubscribeCandidates[ref] = unsubscribeCandidates[ref] || [];
+                    unsubscribeCandidates[ref].push({
+                        topic: topic,
+                        ref: ref,
+                        brokerId: brokerId
+                    })
+                }
             }
         };
         node.topicAliases = {};
@@ -983,7 +1157,7 @@ module.exports = function(RED) {
                     setStrProp(msg, options.properties, "contentType");
                     setIntProp(msg, options.properties, "messageExpiryInterval", 0);
                     setUserProperties(msg.userProperties, options.properties);
-                    setIntProp(msg, options.properties, "topicAlias", 1, node.serverProperties.topicAliasMaximum || 0);
+                    setIntProp(msg, options.properties, "topicAlias", 1, bsp.topicAliasMaximum || 0);
                     setBoolProp(msg, options.properties, "payloadFormatIndicator");
                     //FUTURE setIntProp(msg, options.properties, "subscriptionIdentifier", 1, 268435455);
 
@@ -1119,7 +1293,7 @@ module.exports = function(RED) {
                         if(node.rap === "true" || node.rap === true) options.rap = true;
                         else if(node.rap === "false" || node.rap === false) options.rap = false;
                     }
-
+                    node._topic = node.topic; // store the original topic incase node is later changed
                     node.brokerConn.subscribe(node.topic,options,function(topic, payload, packet) {
                         subscriptionHandler(node, node.datatype, topic, payload, packet);
                     },node.id);
@@ -1172,7 +1346,7 @@ module.exports = function(RED) {
                     }
                     if (action === Actions.UNSUBSCRIBE) {
                         subscriptions.forEach(function (sub) {
-                            node.brokerConn.unsubscribe(sub.topic, node.id);
+                            node.brokerConn.unsubscribe(sub.topic, node.id, true);
                             delete node.dynamicSubs[sub.topic];
                         })
                         //user can access current subscriptions through the complete node is so desired
@@ -1182,7 +1356,7 @@ module.exports = function(RED) {
                         subscriptions.forEach(function (sub) {
                             //always unsubscribe before subscribe to prevent multiple subs to same topic
                             if (node.dynamicSubs[sub.topic]) {
-                                node.brokerConn.unsubscribe(sub.topic, node.id);
+                                node.brokerConn.unsubscribe(sub.topic, node.id, true);
                                 delete node.dynamicSubs[sub.topic];
                             }
 
@@ -1233,7 +1407,7 @@ module.exports = function(RED) {
                         });
                         node.dynamicSubs = {};
                     } else {
-                        node.brokerConn.unsubscribe(node.topic,node.id, removed);
+                        node.brokerConn.unsubscribe(node.topic, node.id, removed);
                     }
                     node.brokerConn.deregister(node, done, removed);
                     node.brokerConn = null;

package/core/network/21-httprequest.js

@@ -14,9 +14,9 @@
  * limitations under the License.
  **/
 
-module.exports = function(RED) {
+module.exports = async function(RED) {
     "use strict";
-    const got = require("got");
+    const { got } = await import('got')
     const {CookieJar} = require("tough-cookie");
     const { HttpProxyAgent, HttpsProxyAgent } = require('hpagent');
     const FormData = require('form-data');
@@ -210,24 +210,24 @@ in your Node-RED user directory (${RED.settings.userDir}).
             // set defaultport, else when using HttpsProxyAgent, it's defaultPort of 443 will be used :(.
             // Had to remove this to get http->https redirect to work
             // opts.defaultPort = isHttps?443:80;
-            opts.timeout = node.reqTimeout;
+            opts.timeout = { request: node.reqTimeout || 5000 };
             opts.throwHttpErrors = false;
             // TODO: add UI option to auto decompress. Setting to false for 1.x compatibility
             opts.decompress = false;
             opts.method = method;
-            opts.retry = 0;
+            opts.retry = { limit: 0 };
             opts.responseType = 'buffer';
             opts.maxRedirects = 21;
             opts.cookieJar = new CookieJar();
             opts.ignoreInvalidCookies = true;
-            opts.forever = nodeHTTPPersistent;
+            // opts.forever = nodeHTTPPersistent;
             if (msg.requestTimeout !== undefined) {
                 if (isNaN(msg.requestTimeout)) {
                     node.warn(RED._("httpin.errors.timeout-isnan"));
                 } else if (msg.requestTimeout < 1) {
                     node.warn(RED._("httpin.errors.timeout-isnegative"));
                 } else {
-                    opts.timeout = msg.requestTimeout;
+                    opts.timeout = { request: msg.requestTimeout };
                 }
             }
             const originalHeaderMap = {};
@@ -245,9 +245,12 @@ in your Node-RED user directory (${RED.settings.userDir}).
                                 delete options.headers[h];
                             }
                         })
-
                         if (node.insecureHTTPParser) {
-                            options.insecureHTTPParser = true
+                            // Setting the property under _unixOptions as pretty
+                            // much the only hack available to get got to apply
+                            // a core http option it doesn't think we should be
+                            // allowed to set
+                            options._unixOptions = { ...options.unixOptions, insecureHTTPParser: true }
                         }
                     }
                 ],
@@ -403,15 +406,16 @@ in your Node-RED user directory (${RED.settings.userDir}).
                                 return response
                             }
                             const requestUrl = new URL(response.request.requestUrl);
-                            const options = response.request.options;
+                            const options = { headers: {} }
                             const normalisedHeaders = {};
                             Object.keys(response.headers).forEach(k => {
                                 normalisedHeaders[k.toLowerCase()] = response.headers[k]
                             })
                             if (normalisedHeaders['www-authenticate']) {
-                                let authHeader = buildDigestHeader(digestCreds.user,digestCreds.password, options.method, requestUrl.pathname, normalisedHeaders['www-authenticate'])
+                                let authHeader = buildDigestHeader(digestCreds.user,digestCreds.password, response.request.options.method, requestUrl.pathname, normalisedHeaders['www-authenticate'])
                                 options.headers.Authorization = authHeader;
                             }
+                            // response.request.options.merge(options)
                             sentCreds = true;
                             return retry(options);
                         }
@@ -699,25 +703,43 @@ in your Node-RED user directory (${RED.settings.userDir}).
     });
 
     const md5 = (value) => { return crypto.createHash('md5').update(value).digest('hex') }
+    const sha256 = (value) => { return crypto.createHash('sha256').update(value).digest('hex') }
+    const sha512 = (value) => { return crypto.createHash('sha512').update(value).digest('hex') }
+
+    function digestCompute(algorithm, value) {
+        var lowercaseAlgorithm = ""
+        if (algorithm) {
+            lowercaseAlgorithm = algorithm.toLowerCase().replace(/-sess$/, '')
+        }
+
+        if (lowercaseAlgorithm === "sha-256") {
+            return sha256(value)
+        } else if (lowercaseAlgorithm === "sha-512-256") {
+            var hash = sha512(value)
+            return hash.slice(0, 64) // Only use the first 256 bits
+        } else {
+            return md5(value)
+        }
+    }
 
     function ha1Compute(algorithm, user, realm, pass, nonce, cnonce) {
         /**
-        * RFC 2617: handle both MD5 and MD5-sess algorithms.
+        * RFC 2617: handle both standard and -sess algorithms.
         *
-        * If the algorithm directive's value is "MD5" or unspecified, then HA1 is
-        *   HA1=MD5(username:realm:password)
-        * If the algorithm directive's value is "MD5-sess", then HA1 is
-        *   HA1=MD5(MD5(username:realm:password):nonce:cnonce)
+        * If the algorithm directive's value ends with "-sess", then HA1 is
+        *   HA1=digestCompute(digestCompute(username:realm:password):nonce:cnonce)
+        * 
+        * If the algorithm directive's value does not end with "-sess", then HA1 is
+        *   HA1=digestCompute(username:realm:password)
         */
-        var ha1 = md5(user + ':' + realm + ':' + pass)
-        if (algorithm && algorithm.toLowerCase() === 'md5-sess') {
-            return md5(ha1 + ':' + nonce + ':' + cnonce)
+        var ha1 = digestCompute(algorithm, user + ':' + realm + ':' + pass)
+        if (algorithm && /-sess$/i.test(algorithm)) {
+            return digestCompute(algorithm, ha1 + ':' + nonce + ':' + cnonce)
         } else {
             return ha1
         }
     }
 
-
     function buildDigestHeader(user, pass, method, path, authHeader) {
         var challenge = {}
         var re = /([a-z0-9_-]+)=(?:"([^"]+)"|([a-z0-9_-]+))/gi
@@ -732,10 +754,10 @@ in your Node-RED user directory (${RED.settings.userDir}).
         var nc = qop && '00000001'
         var cnonce = qop && uuid().replace(/-/g, '')
         var ha1 = ha1Compute(challenge.algorithm, user, challenge.realm, pass, challenge.nonce, cnonce)
-        var ha2 = md5(method + ':' + path)
+        var ha2 = digestCompute(challenge.algorithm, method + ':' + path)
         var digestResponse = qop
-        ? md5(ha1 + ':' + challenge.nonce + ':' + nc + ':' + cnonce + ':' + qop + ':' + ha2)
-        : md5(ha1 + ':' + challenge.nonce + ':' + ha2)
+        ? digestCompute(challenge.algorithm, ha1 + ':' + challenge.nonce + ':' + nc + ':' + cnonce + ':' + qop + ':' + ha2)
+        : digestCompute(challenge.algorithm, ha1 + ':' + challenge.nonce + ':' + ha2)
         var authValues = {
             username: user,
             realm: challenge.realm,

package/core/parsers/70-XML.js

@@ -33,8 +33,7 @@ module.exports = function(RED) {
                     parseString(value, options, function (err, result) {
                         if (err) { done(err); }
                         else {
-                            value = result;
-                            RED.util.setMessageProperty(msg,node.property,value);
+                            RED.util.setMessageProperty(msg,node.property,result);
                             send(msg);
                             done();
                         }

package/locales/de/messages.json

@@ -98,6 +98,7 @@
         },
         "scope": {
             "all": "allen Nodes",
+            "group": "in gleicher Gruppe",
             "selected": "ausgewählten Nodes"
         }
     },
@@ -110,6 +111,7 @@
         },
         "scope": {
             "all": "allen Nodes",
+            "group": "in gleicher Gruppe",
             "selected": "ausgewählten Nodes"
         }
     },
@@ -362,6 +364,7 @@
             "port": "Port",
             "keepalive": "Keep-Alive",
             "cleansession": "Bereinigte Sitzung (clean session) verwenden",
+            "autoUnsubscribe": "Abonnement bei Verbindungsende automatisch beenden",
             "cleanstart": "Verwende bereinigten Start",
             "use-tls": "TLS",
             "tls-config": "TLS-Konfiguration",

package/locales/en-US/messages.json

@@ -103,6 +103,7 @@
         },
         "scope": {
             "all": "all nodes",
+            "group": "in same group",
             "selected": "selected nodes"
         }
     },
@@ -115,6 +116,7 @@
         },
         "scope": {
             "all": "all nodes",
+            "group": "in same group",
             "selected": "selected nodes"
         }
     },
@@ -414,6 +416,7 @@
             "port": "Port",
             "keepalive": "Keep Alive",
             "cleansession": "Use clean session",
+            "autoUnsubscribe": "Automatically unsubscribe when disconnecting",
             "cleanstart": "Use clean start",
             "use-tls": "Use TLS",
             "tls-config": "TLS Configuration",

package/locales/ja/messages.json

@@ -414,6 +414,7 @@
             "port": "ポート",
             "keepalive": "キープアライブ時間",
             "cleansession": "セッションの初期化",
+            "autoUnsubscribe": "切断時に購読を自動解除",
             "cleanstart": "クリーンスタート",
             "use-tls": "TLSを使用",
             "tls-config": "TLS設定",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/nodes",
-    "version": "3.1.0-beta.2",
+    "version": "3.1.0-beta.3",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",
@@ -27,8 +27,8 @@
         "cronosjs": "1.7.1",
         "denque": "2.1.0",
         "form-data": "4.0.0",
-        "fs-extra": "10.1.0",
-        "got": "11.8.6",
+        "fs-extra": "11.1.1",
+        "got": "12.6.0",
         "hash-sum": "2.0.0",
         "hpagent": "1.2.0",
         "https-proxy-agent": "5.0.1",
@@ -44,7 +44,7 @@
         "tough-cookie": "4.1.2",
         "uuid": "9.0.0",
         "ws": "7.5.6",
-        "xml2js": "0.4.23",
+        "xml2js": "0.6.0",
         "iconv-lite": "0.6.3"
     }
 }