From 33bb86cbcffc9ce1e2f8534a0b97e93b95fe1966 Mon Sep 17 00:00:00 2001
From: Steve-Mcl <sdmclaughlin@gmail.com>
Date: Thu, 8 Oct 2020 20:24:35 +0100
Subject: [PATCH 01/15] mqtt5 1st draft

---
 .../@node-red/nodes/core/network/10-mqtt.html | 210 +++++++++++++-
 .../@node-red/nodes/core/network/10-mqtt.js   | 256 ++++++++++++++++--
 .../nodes/locales/en-US/messages.json         |   6 +-
 3 files changed, 444 insertions(+), 28 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
index c1b02e836..d67c6b2c6 100644
--- a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
+++ b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
@@ -10,6 +10,55 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
+<style>
+    .form-row label:first-child {
+        width: 125px;
+    }
+
+    .mqtt-form-row-cols2 > input.mqtt-form-row-col1 {
+        width: calc(35% - 75px);
+    }
+    .mqtt-form-row-cols2 > select.mqtt-form-row-col1 {
+        width: calc(35% - 75px);
+    }
+
+    .mqtt-form-row-cols2 > label.mqtt-form-row-col2 {
+        width: 100px;
+        margin-left: 42px;
+        display: inline-block;
+    }
+    .mqtt-form-row-cols2 > input.mqtt-form-row-col2 {
+        width: calc(35% - 75px);
+        display: inline-block;
+    }
+    .mqtt-form-row-cols2 > select.mqtt-form-row-col2 {
+        width: calc(35% - 75px);
+        display: inline-block;
+    }
+    
+    .form-row.mqtt-flags-row > label {
+        vertical-align: top;
+    }
+    .form-row.mqtt-flags-row > .mqtt-flags {
+        display: inline-block; 
+        width: 70%
+    }
+
+    .form-row.mqtt-flags-row > .mqtt-flags > .mqtt-flag > label {
+        display: block;
+        padding-left: 15px;
+        text-indent: -15px;
+        width: 70%;
+    }
+    .form-row.mqtt-flags-row > .mqtt-flags > .mqtt-flag > label > input {
+        position: relative;
+        vertical-align: bottom;
+        top: -2px;
+        width: 15px;
+        height: 15px;
+    }
+
+</style>
 
 <script type="text/html" data-template-name="mqtt in">
     <div class="form-row">
@@ -28,6 +77,38 @@
             <option value="2">2</option>
         </select>
     </div>
+    <div class="form-row">
+        <label for="node-input-userProperties"><i class="fa fa-tasks"></i> <span data-i18n="common.label.userProperties">User Properties</span></label>
+        <input id="node-input-userPropertiesType" type="hidden">
+        <input type="text" id="node-input-userProperties" style="width: 70%;" data-i18n="[placeholder]common.label.userProperties" placeholder="User Properties">
+    </div>
+    <div class="form-row">
+        <label for="node-input-subscriptionIdentifier" class="mqtt-form-row-col1"><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.subscriptionIdentifier">Subscription ID</span></label>
+        <input type="number" min="0" max="268435455" id="node-input-subscriptionIdentifier" class="mqtt-form-row-col1" >
+    </div> 
+    <div class="form-row mqtt-flags-row"> 
+        <label for="node-input-nl" ><i class="fa fa-flag"></i> <span data-i18n="mqtt.label.flags">Flags</span></label>
+        <div class="mqtt-flags">
+            <div class="mqtt-flag">
+                <label for="node-input-nl">
+                    <input type="checkbox" id="node-input-nl">
+                    <span data-i18n="mqtt.label.nl">No local</span>
+                </label>                
+            </div>
+            <div class="mqtt-flag">
+                <label for="node-input-rap">
+                    <input type="checkbox" id="node-input-rap">
+                    <span data-i18n="mqtt.label.rap">Retain as Published</span>
+                </label>                
+            </div>
+            <div class="mqtt-flag">
+                <label for="node-input-rh">
+                    <input type="checkbox" id="node-input-rh">
+                    <span data-i18n="mqtt.label.rh">Retain Handling</span>
+                </label>                
+            </div>
+        </div>
+    </div> 
     <div class="form-row">
         <label for="node-input-datatype"><i class="fa fa-sign-out"></i> <span data-i18n="mqtt.label.output"></span></label>
         <select id="node-input-datatype" style="width:70%;">
@@ -52,6 +133,12 @@
             topic: {value:"",required:true,validate: RED.validators.regex(/^(#$|(\+|[^+#]*)(\/(\+|[^+#]*))*(\/(\+|#|[^+#]*))?$)/)},
             qos: {value: "2"},
             datatype: {value:"auto",required:true},
+            userPropertiesType: {value:"none"},
+            userProperties: {value:"userProperties"},
+            subscriptionIdentifier: {value:0},
+            nl: {value:false},
+            rap: {value:false},
+            rh: {value:false},
             broker: {type:"mqtt-broker", required:true}
         },
         color:"#d8bfd8",
@@ -71,6 +158,11 @@
             if (this.datatype === undefined) {
                 $("#node-input-datatype").val("auto");
             }
+            $("#node-input-userProperties").typedInput({
+                default: "none",
+                types:[{ value:"none", label: "None",  hasValue:false },'flow','global','json'],
+                typeField: $("#node-input-userPropertiesType")
+            });
         }
     });
 </script>
@@ -84,20 +176,66 @@
         <label for="node-input-topic"><i class="fa fa-tasks"></i> <span data-i18n="common.label.topic"></span></label>
         <input type="text" id="node-input-topic" data-i18n="[placeholder]common.label.topic">
     </div>
-    <div class="form-row">
-        <label for="node-input-qos"><i class="fa fa-empire"></i> <span data-i18n="mqtt.label.qos"></span></label>
-        <select id="node-input-qos" style="width:125px !important">
+
+    <div class="form-row mqtt-form-row-cols2">
+        <label for="node-input-qos" class="mqtt-form-row-col1"><i class="fa fa-empire"></i> <span data-i18n="mqtt.label.qos"></span></label>
+        <select id="node-input-qos" class="mqtt-form-row-col1">
             <option value=""></option>
             <option value="0">0</option>
             <option value="1">1</option>
             <option value="2">2</option>
         </select>
-        &nbsp;&nbsp;<i class="fa fa-history"></i>&nbsp;<span data-i18n="mqtt.retain"></span> &nbsp;<select id="node-input-retain" style="width:125px !important">
+        
+        <label for="node-input-retain" class="mqtt-form-row-col2"><i class="fa fa-history"></i> <span data-i18n="mqtt.retain"></span></label>
+        <select id="node-input-retain" class="mqtt-form-row-col2" >
             <option value=""></option>
             <option value="false" data-i18n="mqtt.false"></option>
             <option value="true" data-i18n="mqtt.true"></option>
         </select>
     </div>
+    <hr>
+    <div class="form-row">
+        <label for="node-input-userProperties"><i class="fa fa-tasks"></i> <span data-i18n="common.label.userProperties">User Properties</span></label>
+        <input id="node-input-userPropertiesType" type="hidden">
+        <input type="text" id="node-input-userProperties" style="width: 70%;" data-i18n="[placeholder]common.label.userProperties" placeholder="User Properties">
+    </div>
+
+    <div class="form-row">
+        <label for="node-input-responseTopic"><i class="fa fa-tag"></i> <span data-i18n="common.label.responseTopic">Response topic</span></label>
+        <input type="text" id="node-input-responseTopic" data-i18n="[placeholder]common.label.responseTopic" placeholder="Response Topic">
+    </div>
+
+    <div class="form-row">
+        <label for="node-input-correlationData"><i class="fa fa-tag"></i> <span data-i18n="common.label.correlationData">correlation Data</span></label>
+        <input id="node-input-correlationDataType" type="hidden">
+        <input type="text" id="node-input-correlationData" style="width: 70%;" data-i18n="[placeholder]common.label.correlationData" placeholder="correlation Data">
+    </div>
+
+    <div class="form-row">
+        <label for="node-input-contentType"><i class="fa fa-tag"></i> <span data-i18n="common.label.contentType">Content Type</span></label>
+        <input type="text" id="node-input-contentType" data-i18n="[placeholder]common.label.contentType" placeholder="Content Type">
+    </div>
+
+    <div class="form-row mqtt-form-row-cols2">
+        <label for="node-input-messageExpiryInterval" class="mqtt-form-row-col1"><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.messageExpiryInterval">Expiry (secs)</span></label>
+        <input type="number" min="0" id="node-input-messageExpiryInterval" class="mqtt-form-row-col1" >
+        
+        <label for="node-input-topicAlias" class="mqtt-form-row-col2"><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.topicAlias">Alias</span></label>
+        <input type="number" min="0" id="node-input-topicAlias" class="mqtt-form-row-col2" >
+    </div> 
+
+    <div class="form-row mqtt-form-row-cols2">
+        <label for="node-input-subscriptionIdentifier" class="mqtt-form-row-col1"><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.subscriptionIdentifier">Subscription ID</span></label>
+        <input type="number" min="0" max="268435455" id="node-input-subscriptionIdentifier" class="mqtt-form-row-col1" >
+        
+        <label for="node-input-payloadFormatIndicator" class="mqtt-form-row-col2"><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.payloadFormatIndicator">Format</span></label>
+        <select id="node-input-payloadFormatIndicator" class="mqtt-form-row-col2" >
+            <option value=""></option>
+            <option value="false" data-i18n="mqtt.payloadFormatIndicatorFalse">unspecified bytes (Default)</option>
+            <option value="true" data-i18n="mqtt.payloadFormatIndicatorTrue">UTF-8 encoded payload</option>
+        </select>
+    </div> 
+
     <div class="form-row">
         <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
         <input type="text" id="node-input-name" data-i18n="[placeholder]common.label.name">
@@ -113,6 +251,16 @@
             topic: {value:""},
             qos: {value:""},
             retain: {value:""},
+            responseTopic: {value:""},
+            contentType: {value:""},
+            userProperties: {value:'userProperties'},
+            userPropertiesType: {value:'none'},
+            correlationData: {value:'correlationData'},
+            correlationDataType: {value:'none'},
+            topicAlias: {value:0},
+            messageExpiryInterval: {value:0},
+            payloadFormatIndicator: {value:false},
+            subscriptionIdentifier: {value:0},
             broker: {type:"mqtt-broker", required:true}
         },
         color:"#d8bfd8",
@@ -123,6 +271,18 @@
         label: function() {
             return this.name||this.topic||"mqtt";
         },
+        oneditprepare: function() {
+            $("#node-input-correlationData").typedInput({
+                default: "none",
+                types:[{ value:"none", label: "None",  hasValue:false },'msg','flow','global','bin'],
+                typeField: $("#node-input-correlationDataType")
+            });
+            $("#node-input-userProperties").typedInput({
+                default: "none",
+                types:[{ value:"none", label: "None",  hasValue:false },'msg','flow','global','json'],
+                typeField: $("#node-input-userPropertiesType")
+            });
+        },
         labelStyle: function() {
             return this.name?"node_label_italic":"";
         }
@@ -163,9 +323,27 @@
                 <label for="node-config-input-cleansession" style="width: auto;" data-i18n="mqtt.label.cleansession"></label>
             </div>
             <div class="form-row">
-                <input type="checkbox" id="node-config-input-compatmode" style="display: inline-block; width: auto; vertical-align: top;">
-                <label for="node-config-input-compatmode" style="width: auto;" data-i18n="mqtt.label.compatmode"></label>
+                <label for="node-config-input-protocolVersion"><i class="fa fa-cog"></i> <span data-i18n="mqtt.label.protocolVersion"></span></label>
+                <select id="node-config-input-protocolVersion" style="width:70%;">
+                    <option value="3" data-i18n="mqtt.label.protocolVersion3"></option>
+                    <option value="4" data-i18n="mqtt.label.protocolVersion4"></option>
+                    <option value="5" data-i18n="mqtt.label.protocolVersion5"></option>
+                </select>
             </div>
+            <div class="form-row mqtt-form-row-cols2">
+                <label for="node-config-input-sessionExpiryInterval" class="mqtt-form-row-col1"><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.sessionExpiryInterval">Session Exp</span></label>
+                <input type="number" min="0" id="node-config-input-sessionExpiryInterval" class="mqtt-form-row-col1" >
+                
+                <label for="node-config-input-topicAliasMaximum" class="mqtt-form-row-col2"><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.topicAliasMaximum">Alias Max</span></label>
+                <input type="number" min="0" id="node-config-input-topicAliasMaximum" class="mqtt-form-row-col2" >
+            </div> 
+            <div class="form-row mqtt-form-row-cols2">
+                <label for="node-config-input-maximumPacketSize" class="mqtt-form-row-col1"><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.maximumPacketSize">Max Packet Size</span></label>
+                <input type="number" min="0" id="node-config-input-maximumPacketSize" class="mqtt-form-row-col1" >
+                
+                <label for="node-config-input-receiveMaximum" class="mqtt-form-row-col2"><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.receiveMaximum">Receive Max</span></label>
+                <input type="number" min="0" id="node-config-input-receiveMaximum" class="mqtt-form-row-col2" >
+            </div> 
         </div>
         <div id="mqtt-broker-tab-security" style="display:none">
             <div class="form-row">
@@ -279,6 +457,7 @@
             usetls: {value: false},
             verifyservercert: { value: false},
             compatmode: { value: false},
+            protocolVersion: { value: 4},
             keepalive: {value:60,validate:RED.validators.number()},
             cleansession: {value: true},
             birthTopic: {value:""},
@@ -292,7 +471,11 @@
             willTopic: {value:""},
             willQos: {value:"0"},
             willRetain: {value:false},
-            willPayload: {value:""}
+            willPayload: {value:""},
+            sessionExpiryInterval: {value:0},
+            topicAliasMaximum: {value:0},
+            maximumPacketSize: {value:0},
+            receiveMaximum: {value:0}
         },
         credentials: {
             user: {type:"text"},
@@ -370,10 +553,15 @@
                 this.usetls = false;
                 $("#node-config-input-usetls").prop("checked",false);
             }
-            if (typeof this.compatmode === 'undefined') {
-                this.compatmode = false;
-                $("#node-config-input-compatmode").prop('checked', false);
+            if (this.compatmode === 'true' || this.compatmode === true) {
+                delete this.compatmode;
+                this.protocolVersion = 4;
             }
+            if (typeof this.protocolVersion === 'undefined') {
+                this.protocolVersion = 4;
+            }
+            console.log("setting protocolVersion", this.protocolVersion)
+            $("#node-config-input-protocolVersion").val(this.protocolVersion);
             if (typeof this.keepalive === 'undefined') {
                 this.keepalive = 15;
                 $("#node-config-input-keepalive").val(this.keepalive);
@@ -444,4 +632,4 @@
             }
         }
     });
-</script>
+</script>
\ No newline at end of file
diff --git a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js
index 7ab624222..4462f20cc 100644
--- a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js
+++ b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js
@@ -14,6 +14,8 @@
  * limitations under the License.
  **/
 
+const { debug } = require("console");
+
 module.exports = function(RED) {
     "use strict";
     var mqtt = require("mqtt");
@@ -43,6 +45,101 @@ module.exports = function(RED) {
         return re.test(t);
     }
 
+    /**
+     * Helper function for setting integer property values in the MQTT V5 properties object
+     * @param {object} src Source object containing properties
+     * @param {object} dst Destination object to set/add properties
+     * @param {string} propName The property name to set in the Destination object
+     * @param {integer} [minVal] The minimum value. If the src value is less than minVal, it will NOT be set in the destination
+     * @param {integer} [maxVal] The maximum value. If the src value is greater than maxVal, it will NOT be set in the destination
+     * @param {integer} [def] An optional default to set in the destination object if prop is NOT present in the soruce object
+     */
+    function setIntProp(src, dst, propName, minVal, maxVal, def) {
+        if (src.hasOwnProperty(propName)) { 
+            var v = parseInt(src[propName]); 
+            if(isNaN(v)) return;
+            if(minVal != null) {
+                if(v < minVal) return;
+            }
+            if(maxVal != null) {
+                if(v > maxVal) return;
+            }
+            dst[propName] = v;
+        } else {
+            if(def != undefined) dst[propName] = def;
+        }
+    }
+    
+    /**
+     * Helper function for setting string property values in the MQTT V5 properties object
+     * @param {object} src Source object containing properties
+     * @param {object} dst Destination object to set/add properties
+     * @param {string} propName The property name to set in the Destination object
+     * @param {string} [def] An optional default to set in the destination object if prop is NOT present in the soruce object
+     */
+    function setStrProp(src, dst, propName, def) {
+        if (src[propName] && typeof src[propName] == "string") { 
+            dst[propName] = src[propName];
+        } else {
+            if(def != undefined) dst[propName] = def;
+        }
+    }
+
+    /**
+     * Helper function for setting boolean property values in the MQTT V5 properties object
+     * @param {object} src Source object containing properties
+     * @param {object} dst Destination object to set/add properties
+     * @param {string} propName The property name to set in the Destination object
+     * @param {boolean} [def] An optional default to set in the destination object if prop is NOT present in the soruce object
+     */
+    function setBoolProp(src, dst, propName, def) {
+        if (src[propName] != null) { 
+            if(src[propName] === "true" || src[propName] === true) {
+                dst[propName] = true;
+            } else if(src[propName] === "false" || src[propName] === false) {
+                dst[propName] = true;
+            }
+        } else {
+            if(def != undefined) dst[propName] = def;
+        }
+    }
+
+    /**
+     * Helper function for copying the MQTT v5 srcUserProperties object (parameter1) to the properties object (parameter2). 
+     * Any property in srcUserProperties that is NOT a key/string pair will be silently discarded.
+     * NOTE: if no sutable properties are present, the userProperties object will NOT be added to the properties object
+     * @param {object} srcUserProperties An object with key/value string pairs
+     * @param {object} properties A properties object in which userProperties will be copied to
+     */
+    function setUserProperties(srcUserProperties, properties) {
+        if (srcUserProperties && typeof srcUserProperties == "object") { 
+            let _clone = {};
+            let count = 0;
+            let keys = Object.keys(srcUserProperties);
+            if(!keys || !keys.length) return null;
+            keys.forEach(key => {
+                let val = srcUserProperties[key];
+                if(typeof val == "string") {
+                    count++;
+                    _clone[key] = val;
+                }
+            });
+            if(count) properties.userProperties = _clone;
+        }
+    }
+
+    /**
+     * Helper function for copying the MQTT v5 correlationData object (parameter1) to the properties object (parameter2). 
+     * NOTE: if srcCorrelationData is not a buffer, correlationData will NOT be added to the properties object
+     * @param {object} srcCorrelationData An buffer containing correlationData
+     * @param {object} properties A properties object in which correlationData will be copied to
+     */
+    function setCorrelationData(srcCorrelationData, properties) {
+        if (srcCorrelationData && typeof  Buffer.isBuffer(srcCorrelationData)) { 
+            properties.correlationData = Buffer.from(srcCorrelationData);
+        }
+    }
+
     function MQTTBrokerNode(n) {
         RED.nodes.createNode(this,n);
 
@@ -54,9 +151,13 @@ module.exports = function(RED) {
         this.usews = n.usews;
         this.verifyservercert = n.verifyservercert;
         this.compatmode = n.compatmode;
+        this.protocolVersion = n.protocolVersion;
         this.keepalive = n.keepalive;
         this.cleansession = n.cleansession;
-
+        this.sessionExpiryInterval = n.sessionExpiryInterval;
+        this.topicAliasMaximum = n.topicAliasMaximum;
+        this.maximumPacketSize = n.maximumPacketSize;
+        this.receiveMaximum = n.receiveMaximum;   
         // Config node state
         this.brokerurl = "";
         this.connected = false;
@@ -183,9 +284,19 @@ module.exports = function(RED) {
         this.options.keepalive = this.keepalive;
         this.options.clean = this.cleansession;
         this.options.reconnectPeriod = RED.settings.mqttReconnectTime||5000;
-        if (this.compatmode == "true" || this.compatmode === true) {
+        if (this.compatmode == "true" || this.compatmode === true || this.protocolVersion == 3) {
             this.options.protocolId = 'MQIsdp';
             this.options.protocolVersion = 3;
+        } else if ( this.protocolVersion == 5 ) {
+            this.options.protocolVersion = 5;
+            this.options.properties = {};
+            this.options.properties.requestResponseInformation = true;
+            this.options.properties.requestProblemInformation = true;
+            setIntProp(this,this.options.properties,"sessionExpiryInterval", 0);
+            setIntProp(this,this.options.properties,"topicAliasMaximum", 0);
+            setIntProp(this,this.options.properties,"maximumPacketSize", 0);
+            setIntProp(this,this.options.properties,"receiveMaximum", 0);      
+            this.options.properties.userProperties = {"node-red":"v1.3"};//test
         }
         if (this.usetls && n.tls) {
             var tlsNode = RED.nodes.getNode(n.tls);
@@ -242,6 +353,8 @@ module.exports = function(RED) {
             if (!node.connected && !node.connecting) {
                 node.connecting = true;
                 try {
+                    node.serverProperties = {};
+                    debug("MQTT: ⬆️ mqtt.connect(node.brokerurl ,node.options)", node.brokerurl, node.options);
                     node.client = mqtt.connect(node.brokerurl ,node.options);
                     node.client.setMaxListeners(0);
                     // Register successful connect or reconnect handler
@@ -249,6 +362,19 @@ module.exports = function(RED) {
                         node.connecting = false;
                         node.connected = true;
                         node.log(RED._("mqtt.state.connected",{broker:(node.clientid?node.clientid+"@":"")+node.brokerurl}));
+                        if(node.options.protocolVersion == 5 && arguments && arguments.length && arguments[0].hasOwnProperty("properties")) {
+                            let mqttServerV5Properties = arguments[0].properties;
+                            if(mqttServerV5Properties) {
+                                setIntProp(mqttServerV5Properties, node.serverProperties, "topicAliasMaximum", 1);
+                                setIntProp(mqttServerV5Properties, node.serverProperties, "receiveMaximum", 0);
+                                setIntProp(mqttServerV5Properties, node.serverProperties, "sessionExpiryInterval", 0, 0xFFFFFFFF);
+                                setIntProp(mqttServerV5Properties, node.serverProperties, "maximumPacketSize", 22);
+                                setUserProperties(mqttServerV5Properties, node.serverProperties);
+                                node.serverProperties.requestResponseInformation = mqttServerV5Properties.requestResponseInformation;
+                                node.serverProperties.requestProblemInformation = mqttServerV5Properties.requestProblemInformation;
+                                debug("MQTT: ⬆️ node.client.on('connect', cb) --> node.serverProperties", node.serverProperties );
+                            }
+                        }
                         for (var id in node.users) {
                             if (node.users.hasOwnProperty(id)) {
                                 node.users[id].status({fill:"green",shape:"dot",text:"node-red:common.status.connected"});
@@ -260,16 +386,18 @@ module.exports = function(RED) {
                         // Re-subscribe to stored topics
                         for (var s in node.subscriptions) {
                             if (node.subscriptions.hasOwnProperty(s)) {
-                                var topic = s;
-                                var qos = 0;
+                                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.client.on('message',node.subscriptions[s][r].handler);
                                     }
                                 }
-                                var options = {qos: qos};
-                                node.client.subscribe(topic, options);
+                                _options.qos = _options.qos || qos;
+                                node.client.subscribe(topic, _options);
                             }
                         }
 
@@ -309,12 +437,21 @@ module.exports = function(RED) {
             }
         };
 
-        this.subscribe = function (topic,qos,callback,ref) {
+        this.subscribe = function (topic,options,callback,ref) {
             ref = ref||0;
+            var qos;
+            if(typeof options == "object") {
+                qos = options.qos;
+            } else {
+                qos = options;
+                options = {};
+            }
+            options.qos = qos;
             node.subscriptions[topic] = node.subscriptions[topic]||{};
             var sub = {
                 topic:topic,
                 qos:qos,
+                options:options,
                 handler:function(mtopic,mpayload, mpacket) {
                     if (matchTopic(topic,mtopic)) {
                         callback(mtopic,mpayload, mpacket);
@@ -325,8 +462,8 @@ module.exports = function(RED) {
             node.subscriptions[topic][ref] = sub;
             if (node.connected) {
                 node.client.on('message',sub.handler);
-                var options = {};
-                options.qos = qos;
+                // var options = {};
+                // options.qos = qos;
                 node.client.subscribe(topic, options);
             }
         };
@@ -361,11 +498,23 @@ module.exports = function(RED) {
                         msg.payload = "" + msg.payload;
                     }
                 }
-
                 var options = {
                     qos: msg.qos || 0,
                     retain: msg.retain || false
                 };
+                //https://github.com/mqttjs/MQTT.js/blob/master/README.md#mqttclientpublishtopic-message-options-callback
+                if(node.options.protocolVersion == 5) {
+                    options.properties = options.properties || {};
+                    setStrProp(msg, options.properties, "responseTopic");
+                    setStrProp(msg, options.properties, "contentType");                    
+                    setIntProp(msg, options.properties, "topicAlias", 1, node.serverProperties.topicAliasMaximum || 0);
+                    setIntProp(msg, options.properties, "subscriptionIdentifier", 1, 268435455);
+                    setIntProp(msg, options.properties, "messageExpiryInterval", 0); 
+                    setBoolProp(msg, options.properties, "payloadFormatIndicator"); 
+                    setUserProperties(msg.userProperties, options.properties);
+                    setCorrelationData(msg.correlationData, options.properties);
+                }
+                debug("MQTT: ➡️➡️ node.client.publish",msg,options);
                 node.client.publish(msg.topic, msg.payload, options, function(err) {
                     done && done();
                     return
@@ -405,6 +554,14 @@ module.exports = function(RED) {
         RED.nodes.createNode(this,n);
         this.topic = n.topic;
         this.qos = parseInt(n.qos);
+        this.subscriptionIdentifier = n.subscriptionIdentifier;//https://docs.oasis-open.org/mqtt/mqtt/v5.0/os/mqtt-v5.0-os.html#_Toc3901117
+        this.userProperties = n.userProperties;//https://docs.oasis-open.org/mqtt/mqtt/v5.0/os/mqtt-v5.0-os.html#_Toc3901116
+        this.userPropertiesType = n.userPropertiesType;
+        this.nl = n.nl;
+        this.rap = n.rap;
+        this.rh = n.rh;
+
+
         if (isNaN(this.qos) || this.qos < 0 || this.qos > 2) {
             this.qos = 2;
         }
@@ -416,10 +573,33 @@ module.exports = function(RED) {
         this.datatype = n.datatype || "utf8";
         var node = this;
         if (this.brokerConn) {
+            let v5 = this.brokerConn.options && this.brokerConn.options.protocolVersion == 5;
             this.status({fill:"red",shape:"ring",text:"node-red:common.status.disconnected"});
             if (this.topic) {
                 node.brokerConn.register(this);
-                this.brokerConn.subscribe(this.topic,this.qos,function(topic,payload,packet) {
+                let options = {
+                    qos: this.qos
+                }
+                if(v5) {
+                    options.properties = {};
+                    if(node.userProperties && node.userPropertiesType !== "none") {
+                        let userProperties = RED.util.evaluateNodeProperty(node.userProperties, node.userPropertiesType, node, {});
+                        if(userProperties) options.properties.userProperties = userProperties;
+                    }
+                    if(node.subscriptionIdentifier) {
+                        let sid = parseInt(node.subscriptionIdentifier);
+                        if(sid >= 0 && !isNaN(sid) ) options.properties.subscriptionIdentifier = sid;//must not be sent if zero
+                    }
+                    if(node.nl === "true" || node.nl === true) options.nl = true;
+                    if(node.nl === "false" || node.nl === false) options.nl = false;
+                    if(node.rap === "true" || node.rap === true) options.rap = true;
+                    if(node.rap === "false" || node.rap === false) options.rap = false;
+                    if(node.rh === "true" || node.rh === true || node.rh == 1) options.rh = 1;
+                    if(node.rh === "false" || node.rh === false || node.rh == 0) options.rh = 0;
+                }
+                debug("MQTT: ⬅️⬅️ this.brokerConn.subscribe",this.topic,options);
+                this.brokerConn.subscribe(this.topic,options,function(topic,payload,packet) {
+                    debug("MQTT: ⬅️⬅️ ON this.brokerConn.subscribe",topic,payload,packet);
                     if (node.datatype === "buffer") {
                         // payload = payload;
                     } else if (node.datatype === "base64") {
@@ -437,9 +617,21 @@ module.exports = function(RED) {
                         if (isUtf8(payload)) { payload = payload.toString(); }
                     }
                     var msg = {topic:topic, payload:payload, qos:packet.qos, retain:packet.retain};
+                    if(v5 && packet.properties) {
+                        //msg.properties = packet.properties;
+                        setStrProp(packet.properties, msg, "responseTopic");
+                        setStrProp(packet.properties, msg, "contentType");                    
+                        setIntProp(packet.properties, msg, "topicAlias", 1, node.serverProperties.topicAliasMaximum || 0);
+                        setIntProp(packet.properties, msg, "subscriptionIdentifier", 1, 268435455);
+                        setIntProp(packet.properties, msg, "messageExpiryInterval", 0); 
+                        setBoolProp(packet.properties, msg, "payloadFormatIndicator"); 
+                        setUserProperties(packet.properties.userProperties, options.properties);
+                        setCorrelationData(packet.properties.correlationData, options.properties);                   
+                    }
                     if ((node.brokerConn.broker === "localhost")||(node.brokerConn.broker === "127.0.0.1")) {
                         msg._topic = topic;
                     }
+                    debug("MQTT: ⬅️⬅️ node.send",msg);
                     node.send(msg);
                 }, this.id);
                 if (this.brokerConn.connected) {
@@ -467,11 +659,23 @@ module.exports = function(RED) {
         this.qos = n.qos || null;
         this.retain = n.retain;
         this.broker = n.broker;
+        this.responseTopic = n.responseTopic;//https://docs.oasis-open.org/mqtt/mqtt/v5.0/os/mqtt-v5.0-os.html#_Toc3901114
+        this.correlationData = n.correlationData;//https://docs.oasis-open.org/mqtt/mqtt/v5.0/os/mqtt-v5.0-os.html#_Toc3901115
+        this.correlationDataType = n.correlationDataType; 
+        this.contentType = n.contentType;//https://docs.oasis-open.org/mqtt/mqtt/v5.0/os/mqtt-v5.0-os.html#_Toc3901118
+        this.topicAlias = n.topicAlias; //https://docs.oasis-open.org/mqtt/mqtt/v5.0/os/mqtt-v5.0-os.html#_Toc3901113
+        this.messageExpiryInterval = n.messageExpiryInterval; //https://docs.oasis-open.org/mqtt/mqtt/v5.0/os/mqtt-v5.0-os.html#_Toc3901112
+        this.payloadFormatIndicator = n.payloadFormatIndicator; //https://docs.oasis-open.org/mqtt/mqtt/v5.0/os/mqtt-v5.0-os.html#_Toc3901111
+        this.subscriptionIdentifier = n.subscriptionIdentifier;//https://docs.oasis-open.org/mqtt/mqtt/v5.0/os/mqtt-v5.0-os.html#_Toc3901117
+        this.userProperties = n.userProperties;//https://docs.oasis-open.org/mqtt/mqtt/v5.0/os/mqtt-v5.0-os.html#_Toc3901116
+        this.userPropertiesType = n.userPropertiesType;
+        
         this.brokerConn = RED.nodes.getNode(this.broker);
         var node = this;
         var chk = /[\+#]/;
 
         if (this.brokerConn) {
+            let v5 = this.brokerConn.options && this.brokerConn.options.protocolVersion == 5;
             this.status({fill:"red",shape:"ring",text:"node-red:common.status.disconnected"});
             this.on("input",function(msg,send,done) {
                 if (msg.qos) {
@@ -483,12 +687,32 @@ module.exports = function(RED) {
                 msg.qos = Number(node.qos || msg.qos || 0);
                 msg.retain = node.retain || msg.retain || false;
                 msg.retain = ((msg.retain === true) || (msg.retain === "true")) || false;
-                if (node.topic) {
-                    msg.topic = node.topic;
+                if(v5) {
+                    //TODO: contain all v5 props in an object?
+                    if(node.userProperties && node.userPropertiesType !== "none") {
+                        let userProperties = RED.util.evaluateNodeProperty(node.userProperties, node.userPropertiesType, node, msg);
+                        if(userProperties) msg.userProperties = userProperties;
+                    }
+                    if(node.correlationData && node.correlationDataType !== "none") {
+                        let correlationData = RED.util.evaluateNodeProperty(node.correlationData, node.correlationDataType, node, msg);
+                        if(correlationData) msg.correlationData = correlationData;
+                    }
+                    var msgPropOverride = function(propName) { if(node[propName]) { msg[propName] = node[propName]; } }
+                    msgPropOverride("responseTopic");
+                    msgPropOverride("contentType");
+                    msgPropOverride("topicAlias");
+                    msgPropOverride("messageExpiryInterval");
+                    msgPropOverride("payloadFormatIndicator");
+                    msgPropOverride("subscriptionIdentifier");
+                    msgPropOverride("topic");
                 }
                 if ( msg.hasOwnProperty("payload")) {
-                    if (msg.hasOwnProperty("topic") && (typeof msg.topic === "string") && (msg.topic !== "")) { // topic must exist
-                        if (chk.test(msg.topic)) { node.warn(RED._("mqtt.errors.invalid-topic")); }
+                    let topicOK = msg.hasOwnProperty("topic") && (typeof msg.topic === "string") && (msg.topic !== "");
+                    if(!topicOK && v5 && msg.topicAlias && node.brokerConn.serverProperties.topicAliasMaximum) { 
+                        topicOK =  typeof msg.topicAlias === "number" && msg.topicAlias >= 0 && node.brokerConn.serverProperties.topicAliasMaximum >= msg.topicAlias
+                        msg.topic = "";//must be empty string?
+                    }
+                    if (topicOK) { // topic must exist
                         this.brokerConn.publish(msg, done);  // send the message
                     } else {
                         node.warn(RED._("mqtt.errors.invalid-topic"));
@@ -510,4 +734,4 @@ module.exports = function(RED) {
         }
     }
     RED.nodes.registerType("mqtt out",MQTTOutNode);
-};
+};
\ No newline at end of file
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
index eb623ce20..794d424b7 100755
--- a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
@@ -355,7 +355,11 @@
             "use-tls": "Enable secure (SSL/TLS) connection",
             "tls-config":"TLS Configuration",
             "verify-server-cert":"Verify server certificate",
-            "compatmode": "Use legacy MQTT 3.1 support"
+            "compatmode": "Use legacy MQTT 3.1 support",
+            "protocolVersion": "Version",
+            "protocolVersion3": "MQTT Protocol v3.1 (legacy)",
+            "protocolVersion4": "MQTT Protocol v3.1.1",
+            "protocolVersion5": "MQTT Protocol v5"
         },
         "sections-label":{
             "birth-message": "Message sent on connection (birth message)",

From 38649de85f261943bb333e355c1a8f053ca5bae4 Mon Sep 17 00:00:00 2001
From: Steve-Mcl <sdmclaughlin@gmail.com>
Date: Sat, 10 Oct 2020 10:56:10 +0100
Subject: [PATCH 02/15] debugging

---
 packages/node_modules/@node-red/nodes/core/network/10-mqtt.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js
index 4462f20cc..37841770a 100644
--- a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js
+++ b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js
@@ -393,6 +393,7 @@ module.exports = function(RED) {
                                     if (node.subscriptions[s].hasOwnProperty(r)) {
                                         qos = Math.max(qos,node.subscriptions[s][r].qos);
                                         _options = node.subscriptions[s][r].options;
+                                        debug(`MQTT: Adding handler for ${r} to ${s}`);
                                         node.client.on('message',node.subscriptions[s][r].handler);
                                     }
                                 }

From 195aeb5caf874b4d2d3f7c637d4ccdbd6c250227 Mon Sep 17 00:00:00 2001
From: Steve-Mcl <sdmclaughlin@gmail.com>
Date: Wed, 14 Oct 2020 23:30:03 +0100
Subject: [PATCH 03/15] mqttv5 progress

---
 .../@node-red/nodes/core/network/10-mqtt.html | 189 +++++++++++-------
 .../@node-red/nodes/core/network/10-mqtt.js   | 170 ++++++++++------
 .../nodes/locales/en-US/messages.json         |  33 ++-
 3 files changed, 259 insertions(+), 133 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
index d67c6b2c6..20a873309 100644
--- a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
+++ b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
@@ -57,7 +57,6 @@
         width: 15px;
         height: 15px;
     }
-
 </style>
 
 <script type="text/html" data-template-name="mqtt in">
@@ -77,38 +76,40 @@
             <option value="2">2</option>
         </select>
     </div>
-    <div class="form-row">
-        <label for="node-input-userProperties"><i class="fa fa-tasks"></i> <span data-i18n="common.label.userProperties">User Properties</span></label>
+    <div class="form-row mqtt5">
+        <label for="node-input-userProperties"><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.userProperties"></span></label>
         <input id="node-input-userPropertiesType" type="hidden">
-        <input type="text" id="node-input-userProperties" style="width: 70%;" data-i18n="[placeholder]common.label.userProperties" placeholder="User Properties">
+        <input type="text" id="node-input-userProperties" style="width: 70%;" data-i18n="[placeholder]mqtt.label.userProperties" placeholder="">
     </div>
-    <div class="form-row">
-        <label for="node-input-subscriptionIdentifier" class="mqtt-form-row-col1"><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.subscriptionIdentifier">Subscription ID</span></label>
+    <div class="form-row mqtt5">
+        <label for="node-input-subscriptionIdentifier" class="mqtt-form-row-col1"><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.subscriptionIdentifier"></span></label>
         <input type="number" min="0" max="268435455" id="node-input-subscriptionIdentifier" class="mqtt-form-row-col1" >
     </div> 
-    <div class="form-row mqtt-flags-row"> 
+    <div class="form-row mqtt-flags-row mqtt5"> 
         <label for="node-input-nl" ><i class="fa fa-flag"></i> <span data-i18n="mqtt.label.flags">Flags</span></label>
         <div class="mqtt-flags">
             <div class="mqtt-flag">
                 <label for="node-input-nl">
                     <input type="checkbox" id="node-input-nl">
-                    <span data-i18n="mqtt.label.nl">No local</span>
+                    <span data-i18n="mqtt.label.nl"></span>
                 </label>                
             </div>
             <div class="mqtt-flag">
                 <label for="node-input-rap">
                     <input type="checkbox" id="node-input-rap">
-                    <span data-i18n="mqtt.label.rap">Retain as Published</span>
-                </label>                
-            </div>
-            <div class="mqtt-flag">
-                <label for="node-input-rh">
-                    <input type="checkbox" id="node-input-rh">
-                    <span data-i18n="mqtt.label.rh">Retain Handling</span>
+                    <span data-i18n="mqtt.label.rap"></span>
                 </label>                
             </div>
         </div>
     </div> 
+    <div class="form-row mqtt5"> 
+        <label for="node-input-rh" ><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.rh"></span></label>
+        <select id="node-input-rh" style="width:70%;">
+            <option value="0" data-i18n="mqtt.label.rh0"></option>
+            <option value="1" data-i18n="mqtt.label.rh1"></option>
+            <option value="2" data-i18n="mqtt.label.rh2"></option>
+        </select>
+    </div> 
     <div class="form-row">
         <label for="node-input-datatype"><i class="fa fa-sign-out"></i> <span data-i18n="mqtt.label.output"></span></label>
         <select id="node-input-datatype" style="width:70%;">
@@ -133,13 +134,13 @@
             topic: {value:"",required:true,validate: RED.validators.regex(/^(#$|(\+|[^+#]*)(\/(\+|[^+#]*))*(\/(\+|#|[^+#]*))?$)/)},
             qos: {value: "2"},
             datatype: {value:"auto",required:true},
-            userPropertiesType: {value:"none"},
-            userProperties: {value:"userProperties"},
+            broker: {type:"mqtt-broker", required:true},
+            userPropertiesType: {value:"json"},
+            userProperties: {value:"{}"},
             subscriptionIdentifier: {value:0},
             nl: {value:false},
-            rap: {value:false},
+            rap: {value:true},
             rh: {value:false},
-            broker: {type:"mqtt-broker", required:true}
         },
         color:"#d8bfd8",
         inputs:0,
@@ -152,6 +153,15 @@
             return this.name?"node_label_italic":"";
         },
         oneditprepare: function() {
+            $("#node-input-broker").change(function(d){
+                var confNode = RED.nodes.node($("#node-input-broker").val());
+                var v5 = confNode && confNode.protocolVersion == "5";
+                if(v5) {
+                    $(".mqtt5").show();
+                } else {
+                    $(".mqtt5").hide();
+                }
+            });
             if (this.qos === undefined) {
                 $("#node-input-qos").val("2");
             }
@@ -159,8 +169,8 @@
                 $("#node-input-datatype").val("auto");
             }
             $("#node-input-userProperties").typedInput({
-                default: "none",
-                types:[{ value:"none", label: "None",  hasValue:false },'flow','global','json'],
+                default: "json",
+                types:['json','flow','global'],
                 typeField: $("#node-input-userPropertiesType")
             });
         }
@@ -193,46 +203,42 @@
             <option value="true" data-i18n="mqtt.true"></option>
         </select>
     </div>
-    <hr>
-    <div class="form-row">
-        <label for="node-input-userProperties"><i class="fa fa-tasks"></i> <span data-i18n="common.label.userProperties">User Properties</span></label>
-        <input id="node-input-userPropertiesType" type="hidden">
-        <input type="text" id="node-input-userProperties" style="width: 70%;" data-i18n="[placeholder]common.label.userProperties" placeholder="User Properties">
+    <div class="form-row mqtt5">
+        <label for="node-input-responseTopic"><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.responseTopic"></span></label>
+        <input type="text" id="node-input-responseTopic" data-i18n="[placeholder]mqtt.label.responseTopic" placeholder="">
     </div>
-
-    <div class="form-row">
-        <label for="node-input-responseTopic"><i class="fa fa-tag"></i> <span data-i18n="common.label.responseTopic">Response topic</span></label>
-        <input type="text" id="node-input-responseTopic" data-i18n="[placeholder]common.label.responseTopic" placeholder="Response Topic">
-    </div>
-
-    <div class="form-row">
-        <label for="node-input-correlationData"><i class="fa fa-tag"></i> <span data-i18n="common.label.correlationData">correlation Data</span></label>
+    <div class="form-row mqtt5">
+        <label for="node-input-correlationData"><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.correlationData"></span></label>
         <input id="node-input-correlationDataType" type="hidden">
-        <input type="text" id="node-input-correlationData" style="width: 70%;" data-i18n="[placeholder]common.label.correlationData" placeholder="correlation Data">
+        <input type="text" id="node-input-correlationData" style="width: 70%;" data-i18n="[placeholder]mqtt.label.correlationData" placeholder="">
+    </div>
+    <div class="form-row mqtt5">
+        <label for="node-input-userProperties"><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.userProperties"></span></label>
+        <input id="node-input-userPropertiesType" type="hidden">
+        <input type="text" id="node-input-userProperties" style="width: 70%;" data-i18n="[placeholder]mqtt.label.userProperties" placeholder="">
+    </div>
+    <div class="form-row mqtt5">
+        <label for="node-input-contentType"><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.contentType"></span></label>
+        <input type="text" id="node-input-contentType" data-i18n="[placeholder]mqtt.label.contentType" placeholder="">
     </div>
 
-    <div class="form-row">
-        <label for="node-input-contentType"><i class="fa fa-tag"></i> <span data-i18n="common.label.contentType">Content Type</span></label>
-        <input type="text" id="node-input-contentType" data-i18n="[placeholder]common.label.contentType" placeholder="Content Type">
-    </div>
-
-    <div class="form-row mqtt-form-row-cols2">
-        <label for="node-input-messageExpiryInterval" class="mqtt-form-row-col1"><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.messageExpiryInterval">Expiry (secs)</span></label>
+    <div class="form-row mqtt-form-row-cols2 mqtt5">
+        <label for="node-input-messageExpiryInterval" class="mqtt-form-row-col1"><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.messageExpiryInterval"></span></label>
         <input type="number" min="0" id="node-input-messageExpiryInterval" class="mqtt-form-row-col1" >
         
         <label for="node-input-topicAlias" class="mqtt-form-row-col2"><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.topicAlias">Alias</span></label>
         <input type="number" min="0" id="node-input-topicAlias" class="mqtt-form-row-col2" >
     </div> 
 
-    <div class="form-row mqtt-form-row-cols2">
-        <label for="node-input-subscriptionIdentifier" class="mqtt-form-row-col1"><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.subscriptionIdentifier">Subscription ID</span></label>
+    <div class="form-row mqtt-form-row-cols2 mqtt5">
+        <label for="node-input-subscriptionIdentifier" class="mqtt-form-row-col1"><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.subscriptionIdentifier"></span></label>
         <input type="number" min="0" max="268435455" id="node-input-subscriptionIdentifier" class="mqtt-form-row-col1" >
         
-        <label for="node-input-payloadFormatIndicator" class="mqtt-form-row-col2"><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.payloadFormatIndicator">Format</span></label>
+        <label for="node-input-payloadFormatIndicator" class="mqtt-form-row-col2"><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.payloadFormatIndicator"></span></label>
         <select id="node-input-payloadFormatIndicator" class="mqtt-form-row-col2" >
             <option value=""></option>
-            <option value="false" data-i18n="mqtt.payloadFormatIndicatorFalse">unspecified bytes (Default)</option>
-            <option value="true" data-i18n="mqtt.payloadFormatIndicatorTrue">UTF-8 encoded payload</option>
+            <option value="false" data-i18n="mqtt.label.payloadFormatIndicatorFalse"></option>
+            <option value="true" data-i18n="mqtt.label.payloadFormatIndicatorTrue"></option>
         </select>
     </div> 
 
@@ -254,9 +260,9 @@
             responseTopic: {value:""},
             contentType: {value:""},
             userProperties: {value:'userProperties'},
-            userPropertiesType: {value:'none'},
+            userPropertiesType: {value:'msg'},
             correlationData: {value:'correlationData'},
-            correlationDataType: {value:'none'},
+            correlationDataType: {value:'msg'},
             topicAlias: {value:0},
             messageExpiryInterval: {value:0},
             payloadFormatIndicator: {value:false},
@@ -272,14 +278,23 @@
             return this.name||this.topic||"mqtt";
         },
         oneditprepare: function() {
+            $("#node-input-broker").change(function(d){
+                var confNode = RED.nodes.node($("#node-input-broker").val());
+                var v5 = confNode && confNode.protocolVersion == "5";
+                if(v5) {
+                    $(".mqtt5").show();
+                } else {
+                    $(".mqtt5").hide();
+                }
+            });            
             $("#node-input-correlationData").typedInput({
                 default: "none",
-                types:[{ value:"none", label: "None",  hasValue:false },'msg','flow','global','bin'],
+                types:[{ value:"none", label: "None",  hasValue:false },'bin','msg','flow','global'],
                 typeField: $("#node-input-correlationDataType")
             });
             $("#node-input-userProperties").typedInput({
-                default: "none",
-                types:[{ value:"none", label: "None",  hasValue:false },'msg','flow','global','json'],
+                default: "msg",
+                types:['msg','flow','global','json'],
                 typeField: $("#node-input-userPropertiesType")
             });
         },
@@ -319,8 +334,17 @@
             <div class="form-row">
                 <label for="node-config-input-keepalive" style="width: auto"><i class="fa fa-clock-o"></i> <span data-i18n="mqtt.label.keepalive"></span></label>
                 <input type="text" id="node-config-input-keepalive" style="width: 50px">
-                <input type="checkbox" id="node-config-input-cleansession" style="margin-left: 30px; height: 1em;display: inline-block; width: auto; vertical-align: middle;">
-                <label for="node-config-input-cleansession" style="width: auto;" data-i18n="mqtt.label.cleansession"></label>
+            </div>
+            <div class="form-row mqtt-form-row-cols2">
+                <label for="node-config-input-cleansession" class="mqtt-form-row-col1"><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.session"></span>Session</label>
+                <div class="mqtt-flag mqtt-form-row-col1" style="display: inline-block;width: calc(35% - 75px);">
+                    <label for="node-config-input-cleansession" style="display: block; padding-left: 15px; text-indent: -15px;">
+                        <input type="checkbox" id="node-config-input-cleansession" style="position: relative;vertical-align: bottom; top: -2px; width: 15px;height: 15px;">
+                        <span data-i18n="mqtt.label.cleansession"></span>
+                    </label>
+                </div>
+                <label for="node-config-input-sessionExpiryInterval" class="mqtt-form-row-col2 mqtt5 sessionExpiryInterval"><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.sessionExpiryInterval"></span></label>
+                <input type="number" min="0" id="node-config-input-sessionExpiryInterval" class="mqtt-form-row-col2 mqtt5 sessionExpiryInterval" >
             </div>
             <div class="form-row">
                 <label for="node-config-input-protocolVersion"><i class="fa fa-cog"></i> <span data-i18n="mqtt.label.protocolVersion"></span></label>
@@ -329,20 +353,23 @@
                     <option value="4" data-i18n="mqtt.label.protocolVersion4"></option>
                     <option value="5" data-i18n="mqtt.label.protocolVersion5"></option>
                 </select>
-            </div>
-            <div class="form-row mqtt-form-row-cols2">
-                <label for="node-config-input-sessionExpiryInterval" class="mqtt-form-row-col1"><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.sessionExpiryInterval">Session Exp</span></label>
-                <input type="number" min="0" id="node-config-input-sessionExpiryInterval" class="mqtt-form-row-col1" >
-                
-                <label for="node-config-input-topicAliasMaximum" class="mqtt-form-row-col2"><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.topicAliasMaximum">Alias Max</span></label>
-                <input type="number" min="0" id="node-config-input-topicAliasMaximum" class="mqtt-form-row-col2" >
+            </div>            
+            <div class="form-row mqtt5">
+                <label for="node-config-input-userProperties"><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.userProperties"></span></label>
+                <input id="node-config-input-userPropertiesType" type="hidden">
+                <input type="number" id="node-config-input-userProperties" style="width: 70%;" data-i18n="[placeholder]mqtt.label.userProperties" placeholder="">
+            </div>            
+            <div class="form-row mqtt5">
+                <label for="node-config-input-topicAliasMaximum"><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.topicAliasMaximum"></span></label>
+                <input type="number" min="0" id="node-config-input-topicAliasMaximum">
             </div> 
-            <div class="form-row mqtt-form-row-cols2">
-                <label for="node-config-input-maximumPacketSize" class="mqtt-form-row-col1"><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.maximumPacketSize">Max Packet Size</span></label>
-                <input type="number" min="0" id="node-config-input-maximumPacketSize" class="mqtt-form-row-col1" >
-                
-                <label for="node-config-input-receiveMaximum" class="mqtt-form-row-col2"><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.receiveMaximum">Receive Max</span></label>
-                <input type="number" min="0" id="node-config-input-receiveMaximum" class="mqtt-form-row-col2" >
+            <div class="form-row mqtt5">
+                <label for="node-config-input-maximumPacketSize" ><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.maximumPacketSize"></span></label>
+                <input type="number" min="0" id="node-config-input-maximumPacketSize">
+            </div> 
+            <div class="form-row mqtt5">
+                <label for="node-config-input-receiveMaximum" ><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.receiveMaximum"></span></label>
+                <input type="number" min="0" id="node-config-input-receiveMaximum">
             </div> 
         </div>
         <div id="mqtt-broker-tab-security" style="display:none">
@@ -475,7 +502,9 @@
             sessionExpiryInterval: {value:0},
             topicAliasMaximum: {value:0},
             maximumPacketSize: {value:0},
-            receiveMaximum: {value:0}
+            receiveMaximum: {value:0},
+            userPropertiesType: {value:"json"},
+            userProperties: {value:"{}"},
         },
         credentials: {
             user: {type:"text"},
@@ -560,8 +589,29 @@
             if (typeof this.protocolVersion === 'undefined') {
                 this.protocolVersion = 4;
             }
-            console.log("setting protocolVersion", this.protocolVersion)
+            function updateSessionExpiryIntervalVisibility() {
+                var hide = ($("#node-config-input-cleansession").is(":checked") || $("#node-config-input-protocolVersion").val() != "5");
+                if(hide) {
+                    $(".sessionExpiryInterval").hide();
+                } else {
+                    $(".sessionExpiryInterval").show();
+                }
+            }            
+            $("#node-config-input-protocolVersion").change(function(){
+                var v5 = $("#node-config-input-protocolVersion").val() == "5";
+                if(v5) {
+                    $(".mqtt5").show();
+                } else {
+                    $(".mqtt5").hide();
+                }
+                updateSessionExpiryIntervalVisibility();
+            });
             $("#node-config-input-protocolVersion").val(this.protocolVersion);
+            $("#node-config-input-userProperties").typedInput({
+                default: "json",
+                types:['json','flow','global'],
+                typeField: $("#node-config-input-userPropertiesType")
+            });            
             if (typeof this.keepalive === 'undefined') {
                 this.keepalive = 15;
                 $("#node-config-input-keepalive").val(this.keepalive);
@@ -597,6 +647,7 @@
                 } else {
                     $("#node-config-input-clientid").attr("placeholder",node._("mqtt.placeholder.clientid-nonclean"));
                 }
+                updateSessionExpiryIntervalVisibility();
                 $("#node-config-input-clientid").change();
             }
             setTimeout(updateClientId,0);
diff --git a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js
index 37841770a..bcc458d52 100644
--- a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js
+++ b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js
@@ -129,14 +129,22 @@ module.exports = function(RED) {
     }
 
     /**
-     * Helper function for copying the MQTT v5 correlationData object (parameter1) to the properties object (parameter2). 
-     * NOTE: if srcCorrelationData is not a buffer, correlationData will NOT be added to the properties object
-     * @param {object} srcCorrelationData An buffer containing correlationData
-     * @param {object} properties A properties object in which correlationData will be copied to
+     * Helper function for copying the MQTT v5 buffer type properties 
+     * NOTE: if src[propName] is not a buffer, dst[propName] will NOT be assigned a value (unless def is set)
+     * @param {object} src Source object containing properties
+     * @param {object} dst Destination object to set/add properties
+     * @param {string} propName The property name to set in the Destination object
+     * @param {boolean} [def] An optional default to set in the destination object if prop is NOT present in the Source object
      */
-    function setCorrelationData(srcCorrelationData, properties) {
-        if (srcCorrelationData && typeof  Buffer.isBuffer(srcCorrelationData)) { 
-            properties.correlationData = Buffer.from(srcCorrelationData);
+    function setBufferProp(src, dst, propName, def) {
+        if(!dst) return;
+        if (src && dst) {
+            var buf = src[propName];
+            if (buf && typeof  Buffer.isBuffer(buf)) { 
+                dst[propName] = Buffer.from(buf);
+            }
+        } else {
+            if(def != undefined) dst[propName] = def;
         }
     }
 
@@ -157,7 +165,10 @@ module.exports = function(RED) {
         this.sessionExpiryInterval = n.sessionExpiryInterval;
         this.topicAliasMaximum = n.topicAliasMaximum;
         this.maximumPacketSize = n.maximumPacketSize;
-        this.receiveMaximum = n.receiveMaximum;   
+        this.receiveMaximum = n.receiveMaximum;
+        this.userProperties = n.userProperties;//https://docs.oasis-open.org/mqtt/mqtt/v5.0/os/mqtt-v5.0-os.html#_Toc3901116
+        this.userPropertiesType = n.userPropertiesType;
+
         // Config node state
         this.brokerurl = "";
         this.connected = false;
@@ -172,7 +183,8 @@ module.exports = function(RED) {
                 topic: n.birthTopic,
                 payload: n.birthPayload || "",
                 qos: Number(n.birthQos||0),
-                retain: n.birthRetain=="true"|| n.birthRetain===true
+                retain: n.birthRetain=="true"|| n.birthRetain===true,
+                //TODO: add payloadFormatIndicator, messageExpiryInterval, contentType, responseTopic, correlationData, userProperties
             };
         }
 
@@ -181,7 +193,8 @@ module.exports = function(RED) {
                 topic: n.closeTopic,
                 payload: n.closePayload || "",
                 qos: Number(n.closeQos||0),
-                retain: n.closeRetain=="true"|| n.closeRetain===true
+                retain: n.closeRetain=="true"|| n.closeRetain===true,
+                //TODO: add payloadFormatIndicator, messageExpiryInterval, contentType, responseTopic, correlationData, userProperties
             };
         }
 
@@ -198,9 +211,6 @@ module.exports = function(RED) {
         if (typeof this.usews === 'undefined') {
             this.usews = false;
         }
-        if (typeof this.compatmode === 'undefined') {
-            this.compatmode = false;
-        }
         if (typeof this.verifyservercert === 'undefined') {
             this.verifyservercert = false;
         }
@@ -292,11 +302,16 @@ module.exports = function(RED) {
             this.options.properties = {};
             this.options.properties.requestResponseInformation = true;
             this.options.properties.requestProblemInformation = true;
+            if(this.userProperties) {
+                let userProperties = RED.util.evaluateNodeProperty(this.userProperties, this.userPropertiesType, this, {});
+                setUserProperties(userProperties, this.options.properties);
+            }
             setIntProp(this,this.options.properties,"sessionExpiryInterval", 0);
             setIntProp(this,this.options.properties,"topicAliasMaximum", 0);
             setIntProp(this,this.options.properties,"maximumPacketSize", 0);
-            setIntProp(this,this.options.properties,"receiveMaximum", 0);      
-            this.options.properties.userProperties = {"node-red":"v1.3"};//test
+            setIntProp(this,this.options.properties,"receiveMaximum", 0);
+            setStrProp(this,this.options.properties,"authenticationMethod"); //TODO: authenticationMethod: the name of the authentication method used for extended authentication string,
+            setBufferProp(this,this.options.properties,"authenticationData"); //TODO: authenticationData: Binary Data containing authentication data
         }
         if (this.usetls && n.tls) {
             var tlsNode = RED.nodes.getNode(n.tls);
@@ -318,7 +333,8 @@ module.exports = function(RED) {
                 topic: n.willTopic,
                 payload: n.willPayload || "",
                 qos: Number(n.willQos||0),
-                retain: n.willRetain=="true"|| n.willRetain===true
+                retain: n.willRetain=="true"|| n.willRetain===true,
+                //TODO: add willDelayInterval, payloadFormatIndicator, messageExpiryInterval, contentType, responseTopic, correlationData, userProperties
             };
         }
 
@@ -354,25 +370,34 @@ module.exports = function(RED) {
                 node.connecting = true;
                 try {
                     node.serverProperties = {};
-                    debug("MQTT: ⬆️ mqtt.connect(node.brokerurl ,node.options)", node.brokerurl, node.options);
+                    // debug("MQTT: ⬆️ mqtt.connect(node.brokerurl ,node.options)", node.brokerurl, node.options);
                     node.client = mqtt.connect(node.brokerurl ,node.options);
                     node.client.setMaxListeners(0);
                     // Register successful connect or reconnect handler
-                    node.client.on('connect', function () {
+                    node.client.on('connect', function (connack) {
                         node.connecting = false;
                         node.connected = true;
                         node.log(RED._("mqtt.state.connected",{broker:(node.clientid?node.clientid+"@":"")+node.brokerurl}));
-                        if(node.options.protocolVersion == 5 && arguments && arguments.length && arguments[0].hasOwnProperty("properties")) {
+                        if(node.options.protocolVersion == 5 && connack && connack.hasOwnProperty("properties")) {
                             let mqttServerV5Properties = arguments[0].properties;
                             if(mqttServerV5Properties) {
+                                //node.serverProperties = mqttServerV5Properties; //assign all props, below, square them up.
                                 setIntProp(mqttServerV5Properties, node.serverProperties, "topicAliasMaximum", 1);
                                 setIntProp(mqttServerV5Properties, node.serverProperties, "receiveMaximum", 0);
                                 setIntProp(mqttServerV5Properties, node.serverProperties, "sessionExpiryInterval", 0, 0xFFFFFFFF);
-                                setIntProp(mqttServerV5Properties, node.serverProperties, "maximumPacketSize", 22);
+                                setIntProp(mqttServerV5Properties, node.serverProperties, "maximumQoS", 0, 2);
+                                setBoolProp(mqttServerV5Properties, node.serverProperties, "retainAvailable");
+                                setBoolProp(mqttServerV5Properties, node.serverProperties, "wildcardSubscriptionAvailable");
+                                setBoolProp(mqttServerV5Properties, node.serverProperties, "subscriptionIdentifiersAvailable");
+                                setBoolProp(mqttServerV5Properties, node.serverProperties, "sharedSubscriptionAvailable");
+                                setIntProp(mqttServerV5Properties, node.serverProperties, "maximumPacketSize", 0); 
+                                setIntProp(mqttServerV5Properties, node.serverProperties, "serverKeepAlive"); 
+                                setStrProp(mqttServerV5Properties, node.serverProperties, "responseInformation"); 
+                                setStrProp(mqttServerV5Properties, node.serverProperties, "serverReference"); 
+                                setStrProp(mqttServerV5Properties, node.serverProperties, "assignedClientIdentifier"); 
+                                setStrProp(mqttServerV5Properties, node.serverProperties, "reasonString"); 
                                 setUserProperties(mqttServerV5Properties, node.serverProperties);
-                                node.serverProperties.requestResponseInformation = mqttServerV5Properties.requestResponseInformation;
-                                node.serverProperties.requestProblemInformation = mqttServerV5Properties.requestProblemInformation;
-                                debug("MQTT: ⬆️ node.client.on('connect', cb) --> node.serverProperties", node.serverProperties );
+                                debug("MQTTBrokerNode: ⬆ CONNECTED. node.serverProperties ==> ", node.serverProperties );
                             }
                         }
                         for (var id in node.users) {
@@ -393,11 +418,12 @@ module.exports = function(RED) {
                                     if (node.subscriptions[s].hasOwnProperty(r)) {
                                         qos = Math.max(qos,node.subscriptions[s][r].qos);
                                         _options = node.subscriptions[s][r].options;
-                                        debug(`MQTT: Adding handler for ${r} to ${s}`);
+                                        debug(`MQTTBrokerNode:${node.id}: Re-subscribe - registering handler ref ${r} for ${s} `);
                                         node.client.on('message',node.subscriptions[s][r].handler);
                                     }
                                 }
                                 _options.qos = _options.qos || qos;
+                                debug(`MQTTBrokerNode:${node.id}: Re-subscribe - subscribing to topic '${topic}'`, _options);
                                 node.client.subscribe(topic, _options);
                             }
                         }
@@ -413,9 +439,17 @@ module.exports = function(RED) {
                                 node.users[id].status({fill:"yellow",shape:"ring",text:"node-red:common.status.connecting"});
                             }
                         }
-                    })
+                    });
+                    node.client.on("disconnect", function(packet) {
+                        //Emitted after receiving disconnect packet from broker. MQTT 5.0 feature.
+                        console.log('MQTTBrokerNode disconnect', packet)
+                        var rc = packet && packet.properties && packet.properties.reasonString;
+                        var rc = packet && packet.properties && packet.reasonCode;
+                        //TODO: what to do with this event? Anything necessary?
+                    });
                     // Register disconnect handlers
                     node.client.on('close', function () {
+                        console.log('MQTTBrokerNode closed', arguments)
                         if (node.connected) {
                             node.connected = false;
                             node.log(RED._("mqtt.state.disconnected",{broker:(node.clientid?node.clientid+"@":"")+node.brokerurl}));
@@ -431,7 +465,9 @@ module.exports = function(RED) {
 
                     // Register connect error handler
                     // The client's own reconnect logic will take care of errors
-                    node.client.on('error', function (error) {});
+                    node.client.on('error', function (error) {
+                        console.log('MQTTBrokerNode errored', error)
+                    });
                 }catch(err) {
                     console.log(err);
                 }
@@ -454,17 +490,22 @@ module.exports = function(RED) {
                 qos:qos,
                 options:options,
                 handler:function(mtopic,mpayload, mpacket) {
-                    if (matchTopic(topic,mtopic)) {
+                    debug(`MQTTBrokerNode:${node.id}: this.subscribe.handler - attempting to match '${topic}' to '${mtopic}' `, 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
+                        debug(`MQTTBrokerNode:${node.id}: > no match - this nodes subID (${options.properties.subscriptionIdentifier}) !== packet subID (${mpacket.properties.subscriptionIdentifier})`);
+                    } else if (matchTopic(topic,mtopic)) {
+                        debug(`MQTTBrokerNode:${node.id}: >  MATCHED '${topic}' to '${mtopic}' - performing callback`);
                         callback(mtopic,mpayload, mpacket);
-                    }
+                    } else 
+                        debug(`MQTTBrokerNode:${node.id}: > no match / no callback`);
                 },
                 ref: ref
             };
             node.subscriptions[topic][ref] = sub;
             if (node.connected) {
+                debug(`MQTTBrokerNode:${node.id}: this.subscribe - registering handler ref ${ref} for ${topic} and subscribing`, options);
                 node.client.on('message',sub.handler);
-                // var options = {};
-                // options.qos = qos;
                 node.client.subscribe(topic, options);
             }
         };
@@ -472,20 +513,30 @@ module.exports = function(RED) {
         this.unsubscribe = function (topic, ref, removed) {
             ref = ref||0;
             var sub = node.subscriptions[topic];
+            var _debug = `MQTTBrokerNode ${node.id}: unsubscribe for topic ${topic} called... ` ;
             if (sub) {
+                _debug += "sub found. "
                 if (sub[ref]) {
+                    // debug(`MQTTBrokerNode:${node.id}: this.unsubscribe - removing handler ref ${ref} for ${topic} `);
+                    _debug += `removing handler ref ${ref} for ${topic}. `
                     node.client.removeListener('message',sub[ref].handler);
                     delete sub[ref];
                 }
-                if (removed) {
+                //if (removed) {
                     if (Object.keys(sub).length === 0) {
                         delete node.subscriptions[topic];
                         if (node.connected) {
+                            _debug += `calling client.unsubscribe to remove topic ${topic}`
+                            // debug(`MQTTBrokerNode:${node.id}: this.unsubscribe - calling client.unsubscribe to remove topic ${topic} `);
                             node.client.unsubscribe(topic);
                         }
                     }
-                }
+                //}
+            } else {
+                _debug += "sub not found! "
             }
+            debug(_debug);
+
         };
 
         this.publish = function (msg,done) {
@@ -513,10 +564,11 @@ module.exports = function(RED) {
                     setIntProp(msg, options.properties, "messageExpiryInterval", 0); 
                     setBoolProp(msg, options.properties, "payloadFormatIndicator"); 
                     setUserProperties(msg.userProperties, options.properties);
-                    setCorrelationData(msg.correlationData, options.properties);
+                    setBufferProp(msg, options.properties, "correlationData");
                 }
-                debug("MQTT: ➡️➡️ node.client.publish",msg,options);
+                debug(`MQTTBrokerNode:${node.id}: publish - sending payload to ${msg.topic ? msg.topic : (msg.topicAlias ? 'topicAlias-'+msg.topicAlias : '???') } `, options);
                 node.client.publish(msg.topic, msg.payload, options, function(err) {
+                    if(err) node.error(err,msg);//catch errors
                     done && done();
                     return
                 });
@@ -578,29 +630,23 @@ module.exports = function(RED) {
             this.status({fill:"red",shape:"ring",text:"node-red:common.status.disconnected"});
             if (this.topic) {
                 node.brokerConn.register(this);
-                let options = {
-                    qos: this.qos
-                }
+                let options = { qos: this.qos };
                 if(v5) {
                     options.properties = {};
-                    if(node.userProperties && node.userPropertiesType !== "none") {
+                    if(node.userProperties) {
                         let userProperties = RED.util.evaluateNodeProperty(node.userProperties, node.userPropertiesType, node, {});
-                        if(userProperties) options.properties.userProperties = userProperties;
-                    }
-                    if(node.subscriptionIdentifier) {
-                        let sid = parseInt(node.subscriptionIdentifier);
-                        if(sid >= 0 && !isNaN(sid) ) options.properties.subscriptionIdentifier = sid;//must not be sent if zero
+                        setUserProperties(userProperties, options.properties);
                     }
+                    setIntProp(node,options.properties,"subscriptionIdentifier", 1);
+                    setIntProp(node, options, "rh");
                     if(node.nl === "true" || node.nl === true) options.nl = true;
-                    if(node.nl === "false" || node.nl === false) options.nl = false;
+                    else if(node.nl === "false" || node.nl === false) options.nl = false;
                     if(node.rap === "true" || node.rap === true) options.rap = true;
-                    if(node.rap === "false" || node.rap === false) options.rap = false;
-                    if(node.rh === "true" || node.rh === true || node.rh == 1) options.rh = 1;
-                    if(node.rh === "false" || node.rh === false || node.rh == 0) options.rh = 0;
+                    else if(node.rap === "false" || node.rap === false) options.rap = false;
                 }
-                debug("MQTT: ⬅️⬅️ this.brokerConn.subscribe",this.topic,options);
+                // debug("MQTT: ⬅️⬅️ this.brokerConn.subscribe",this.topic,options);
                 this.brokerConn.subscribe(this.topic,options,function(topic,payload,packet) {
-                    debug("MQTT: ⬅️⬅️ ON this.brokerConn.subscribe",topic,payload,packet);
+                    debug(`MQTTInNode:${node.id}: Broker sent ${topic}, datatype ${node.datatype}`, packet);
                     if (node.datatype === "buffer") {
                         // payload = payload;
                     } else if (node.datatype === "base64") {
@@ -622,17 +668,17 @@ module.exports = function(RED) {
                         //msg.properties = packet.properties;
                         setStrProp(packet.properties, msg, "responseTopic");
                         setStrProp(packet.properties, msg, "contentType");                    
-                        setIntProp(packet.properties, msg, "topicAlias", 1, node.serverProperties.topicAliasMaximum || 0);
+                        setIntProp(packet.properties, msg, "topicAlias", 1, node.brokerConn.serverProperties.topicAliasMaximum || 0);
                         setIntProp(packet.properties, msg, "subscriptionIdentifier", 1, 268435455);
                         setIntProp(packet.properties, msg, "messageExpiryInterval", 0); 
                         setBoolProp(packet.properties, msg, "payloadFormatIndicator"); 
-                        setUserProperties(packet.properties.userProperties, options.properties);
-                        setCorrelationData(packet.properties.correlationData, options.properties);                   
+                        setStrProp(packet.properties, msg, "reasonString"); 
+                        setUserProperties(packet.properties.userProperties, msg);
+                        setBufferProp(packet.properties, msg, "correlationData");
                     }
                     if ((node.brokerConn.broker === "localhost")||(node.brokerConn.broker === "127.0.0.1")) {
                         msg._topic = topic;
                     }
-                    debug("MQTT: ⬅️⬅️ node.send",msg);
                     node.send(msg);
                 }, this.id);
                 if (this.brokerConn.connected) {
@@ -688,9 +734,10 @@ module.exports = function(RED) {
                 msg.qos = Number(node.qos || msg.qos || 0);
                 msg.retain = node.retain || msg.retain || false;
                 msg.retain = ((msg.retain === true) || (msg.retain === "true")) || false;
+                let msgPropOverride = function(propName) { if(node[propName]) { msg[propName] = node[propName]; } }
+                msgPropOverride("topic");
                 if(v5) {
-                    //TODO: contain all v5 props in an object?
-                    if(node.userProperties && node.userPropertiesType !== "none") {
+                    if(node.userProperties) {
                         let userProperties = RED.util.evaluateNodeProperty(node.userProperties, node.userPropertiesType, node, msg);
                         if(userProperties) msg.userProperties = userProperties;
                     }
@@ -698,14 +745,16 @@ module.exports = function(RED) {
                         let correlationData = RED.util.evaluateNodeProperty(node.correlationData, node.correlationDataType, node, msg);
                         if(correlationData) msg.correlationData = correlationData;
                     }
-                    var msgPropOverride = function(propName) { if(node[propName]) { msg[propName] = node[propName]; } }
                     msgPropOverride("responseTopic");
                     msgPropOverride("contentType");
                     msgPropOverride("topicAlias");
                     msgPropOverride("messageExpiryInterval");
                     msgPropOverride("payloadFormatIndicator");
                     msgPropOverride("subscriptionIdentifier");
-                    msgPropOverride("topic");
+                    setIntProp(msg,msg,"topicAlias");
+                    setIntProp(msg,msg,"messageExpiryInterval");
+                    setBoolProp(msg,msg,"payloadFormatIndicator");
+                    setIntProp(msg,msg,"subscriptionIdentifier");
                 }
                 if ( msg.hasOwnProperty("payload")) {
                     let topicOK = msg.hasOwnProperty("topic") && (typeof msg.topic === "string") && (msg.topic !== "");
@@ -714,7 +763,12 @@ module.exports = function(RED) {
                         msg.topic = "";//must be empty string?
                     }
                     if (topicOK) { // topic must exist
-                        this.brokerConn.publish(msg, done);  // send the message
+                        debug(`MQTTOutNode:${node.id}: sending msg to ${msg.topic}`, msg);
+                        this.brokerConn.publish(msg, function(){
+                            let args = arguments;
+                            let l = args.length;
+                            done();
+                        });  // send the message
                     } else {
                         node.warn(RED._("mqtt.errors.invalid-topic"));
                         done();
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
index 794d424b7..dd23eb133 100755
--- a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
@@ -350,16 +350,37 @@
             "retain": "Retain",
             "clientid": "Client ID",
             "port": "Port",
-            "keepalive": "Keep alive time (s)",
+            "keepalive": "Keepalive time(s)",
             "cleansession": "Use clean session",
             "use-tls": "Enable secure (SSL/TLS) connection",
             "tls-config":"TLS Configuration",
             "verify-server-cert":"Verify server certificate",
             "compatmode": "Use legacy MQTT 3.1 support",
-            "protocolVersion": "Version",
-            "protocolVersion3": "MQTT Protocol v3.1 (legacy)",
-            "protocolVersion4": "MQTT Protocol v3.1.1",
-            "protocolVersion5": "MQTT Protocol v5"
+            "userProperties": "User Properties",
+            "subscriptionIdentifier": "Subscription ID",
+            "flags": "Flags",
+            "nl": "No Local",
+            "rap": "Retain as Published",
+            "rh": "Retain Handling",
+            "rh0": "0, Always send retained messages",
+            "rh1": "1, Send retained messages for new subscription",
+            "rh2": "2, Never send retained messages",
+            "responseTopic": "Response topic",
+            "contentType": "Content Type",
+            "correlationData": "Correlation Data",
+            "messageExpiryInterval": "Expiry (secs)",
+            "topicAlias": "Alias",
+            "payloadFormatIndicator": "Format",
+            "payloadFormatIndicatorFalse": "unspecified bytes (Default)",
+            "payloadFormatIndicatorTrue": "UTF-8 encoded payload",
+            "protocolVersion": "Protocol Version",
+            "protocolVersion3": "MQTT V3.1 (legacy)",
+            "protocolVersion4": "MQTT V3.1.1",
+            "protocolVersion5": "MQTT V5",
+            "sessionExpiryInterval": "Expiry(s)",
+            "topicAliasMaximum": "Alias Max",
+            "maximumPacketSize": "Max Packet Size",
+            "receiveMaximum": "Receive Max"
         },
         "sections-label":{
             "birth-message": "Message sent on connection (birth message)",
@@ -967,4 +988,4 @@
         "unexpected" : "unexpected mode",
         "no-parts" : "no parts property in message"
     }
-}
+} 
\ No newline at end of file

From a776ba248e156ecde76affbc54b41bb7f48e3e15 Mon Sep 17 00:00:00 2001
From: Steve-Mcl <sdmclaughlin@gmail.com>
Date: Sun, 25 Oct 2020 09:50:57 +0000
Subject: [PATCH 04/15] correction to retain handling def value

---
 packages/node_modules/@node-red/nodes/core/network/10-mqtt.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
index 20a873309..d9961e42a 100644
--- a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
+++ b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
@@ -140,7 +140,7 @@
             subscriptionIdentifier: {value:0},
             nl: {value:false},
             rap: {value:true},
-            rh: {value:false},
+            rh: {value:0},
         },
         color:"#d8bfd8",
         inputs:0,

From 6917919f35b9fa1a369710ebbb580439dabead20 Mon Sep 17 00:00:00 2001
From: Steve-Mcl <sdmclaughlin@gmail.com>
Date: Mon, 7 Dec 2020 09:41:43 +0000
Subject: [PATCH 05/15] show name as @x if alias is set but topic is not - e.g.
 @1 denotes alias 1 is set but topic is empty

---
 packages/node_modules/@node-red/nodes/core/network/10-mqtt.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
index d9961e42a..4db2f8fc0 100644
--- a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
+++ b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
@@ -275,7 +275,7 @@
         icon: "bridge.svg",
         align: "right",
         label: function() {
-            return this.name||this.topic||"mqtt";
+            return this.name||this.topic||(this.topicAlias ? "@"+this.topicAlias : "mqtt");
         },
         oneditprepare: function() {
             $("#node-input-broker").change(function(d){

From 27550f2d4bf3090d3b160a446d82cc0cba339f54 Mon Sep 17 00:00:00 2001
From: Steve-Mcl <sdmclaughlin@gmail.com>
Date: Mon, 7 Dec 2020 09:43:52 +0000
Subject: [PATCH 06/15] automatically use resposeTopic if topic is empty

---
 .../@node-red/nodes/core/network/10-mqtt.js           | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js
index bcc458d52..4f5655666 100644
--- a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js
+++ b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js
@@ -758,9 +758,14 @@ module.exports = function(RED) {
                 }
                 if ( msg.hasOwnProperty("payload")) {
                     let topicOK = msg.hasOwnProperty("topic") && (typeof msg.topic === "string") && (msg.topic !== "");
-                    if(!topicOK && v5 && msg.topicAlias && node.brokerConn.serverProperties.topicAliasMaximum) { 
-                        topicOK =  typeof msg.topicAlias === "number" && msg.topicAlias >= 0 && node.brokerConn.serverProperties.topicAliasMaximum >= msg.topicAlias
-                        msg.topic = "";//must be empty string?
+                    if (!topicOK && v5) {
+                        if (msg.hasOwnProperty("topicAlias") && typeof msg.topicAlias === "number" && msg.topicAlias >= 0 && node.brokerConn.serverProperties.topicAliasMaximum && node.brokerConn.serverProperties.topicAliasMaximum >= msg.topicAlias) {
+                            topicOK = true;
+                            msg.topic = ""; //must be empty string
+                        } else if (msg.hasOwnProperty("responseTopic") && (typeof msg.responseTopic === "string") && (msg.responseTopic !== "")) {
+                            topicOK = true;
+                            msg.topic = msg.responseTopic;
+                        }
                     }
                     if (topicOK) { // topic must exist
                         debug(`MQTTOutNode:${node.id}: sending msg to ${msg.topic}`, msg);

From b72ea63100241859bf082d65bab10a784560ad77 Mon Sep 17 00:00:00 2001
From: Steve-Mcl <sdmclaughlin@gmail.com>
Date: Mon, 7 Dec 2020 11:45:02 +0000
Subject: [PATCH 07/15] config node userProperties should only permit json

---
 packages/node_modules/@node-red/nodes/core/network/10-mqtt.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
index 4db2f8fc0..acd2dc0c2 100644
--- a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
+++ b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
@@ -609,7 +609,7 @@
             $("#node-config-input-protocolVersion").val(this.protocolVersion);
             $("#node-config-input-userProperties").typedInput({
                 default: "json",
-                types:['json','flow','global'],
+                types:['json'],
                 typeField: $("#node-config-input-userPropertiesType")
             });            
             if (typeof this.keepalive === 'undefined') {

From 6150ae787d64ae4dd446975f4de22f851f29a4e4 Mon Sep 17 00:00:00 2001
From: Steve-Mcl <sdmclaughlin@gmail.com>
Date: Mon, 7 Dec 2020 11:50:33 +0000
Subject: [PATCH 08/15] userProperties input type correction

---
 packages/node_modules/@node-red/nodes/core/network/10-mqtt.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
index acd2dc0c2..d554d9c49 100644
--- a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
+++ b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
@@ -357,7 +357,7 @@
             <div class="form-row mqtt5">
                 <label for="node-config-input-userProperties"><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.userProperties"></span></label>
                 <input id="node-config-input-userPropertiesType" type="hidden">
-                <input type="number" id="node-config-input-userProperties" style="width: 70%;" data-i18n="[placeholder]mqtt.label.userProperties" placeholder="">
+                <input type="text" id="node-config-input-userProperties" style="width: 70%;" data-i18n="[placeholder]mqtt.label.userProperties" placeholder="">
             </div>            
             <div class="form-row mqtt5">
                 <label for="node-config-input-topicAliasMaximum"><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.topicAliasMaximum"></span></label>

From 6bac207611ab16438a47b97efd2f40f4efe3cfda Mon Sep 17 00:00:00 2001
From: Steve-Mcl <sdmclaughlin@gmail.com>
Date: Mon, 7 Dec 2020 12:25:51 +0000
Subject: [PATCH 09/15] better handling of server properties

---
 .../@node-red/nodes/core/network/10-mqtt.js   | 35 +++++++++----------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js
index 4f5655666..923cce6b2 100644
--- a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js
+++ b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js
@@ -379,24 +379,23 @@ module.exports = function(RED) {
                         node.connected = true;
                         node.log(RED._("mqtt.state.connected",{broker:(node.clientid?node.clientid+"@":"")+node.brokerurl}));
                         if(node.options.protocolVersion == 5 && connack && connack.hasOwnProperty("properties")) {
-                            let mqttServerV5Properties = arguments[0].properties;
-                            if(mqttServerV5Properties) {
-                                //node.serverProperties = mqttServerV5Properties; //assign all props, below, square them up.
-                                setIntProp(mqttServerV5Properties, node.serverProperties, "topicAliasMaximum", 1);
-                                setIntProp(mqttServerV5Properties, node.serverProperties, "receiveMaximum", 0);
-                                setIntProp(mqttServerV5Properties, node.serverProperties, "sessionExpiryInterval", 0, 0xFFFFFFFF);
-                                setIntProp(mqttServerV5Properties, node.serverProperties, "maximumQoS", 0, 2);
-                                setBoolProp(mqttServerV5Properties, node.serverProperties, "retainAvailable");
-                                setBoolProp(mqttServerV5Properties, node.serverProperties, "wildcardSubscriptionAvailable");
-                                setBoolProp(mqttServerV5Properties, node.serverProperties, "subscriptionIdentifiersAvailable");
-                                setBoolProp(mqttServerV5Properties, node.serverProperties, "sharedSubscriptionAvailable");
-                                setIntProp(mqttServerV5Properties, node.serverProperties, "maximumPacketSize", 0); 
-                                setIntProp(mqttServerV5Properties, node.serverProperties, "serverKeepAlive"); 
-                                setStrProp(mqttServerV5Properties, node.serverProperties, "responseInformation"); 
-                                setStrProp(mqttServerV5Properties, node.serverProperties, "serverReference"); 
-                                setStrProp(mqttServerV5Properties, node.serverProperties, "assignedClientIdentifier"); 
-                                setStrProp(mqttServerV5Properties, node.serverProperties, "reasonString"); 
-                                setUserProperties(mqttServerV5Properties, node.serverProperties);
+                            if(typeof connack.properties == "object") {
+                                //clean & assign all props sent from server.
+                                setIntProp(connack.properties, node.serverProperties, "topicAliasMaximum", 1);
+                                setIntProp(connack.properties, node.serverProperties, "receiveMaximum", 0);
+                                setIntProp(connack.properties, node.serverProperties, "sessionExpiryInterval", 0, 0xFFFFFFFF);
+                                setIntProp(connack.properties, node.serverProperties, "maximumQoS", 0, 2);
+                                setBoolProp(connack.properties, node.serverProperties, "retainAvailable");
+                                setBoolProp(connack.properties, node.serverProperties, "wildcardSubscriptionAvailable");
+                                setBoolProp(connack.properties, node.serverProperties, "subscriptionIdentifiersAvailable");
+                                setBoolProp(connack.properties, node.serverProperties, "sharedSubscriptionAvailable");
+                                setIntProp(connack.properties, node.serverProperties, "maximumPacketSize", 0); 
+                                setIntProp(connack.properties, node.serverProperties, "serverKeepAlive"); 
+                                setStrProp(connack.properties, node.serverProperties, "responseInformation"); 
+                                setStrProp(connack.properties, node.serverProperties, "serverReference"); 
+                                setStrProp(connack.properties, node.serverProperties, "assignedClientIdentifier"); 
+                                setStrProp(connack.properties, node.serverProperties, "reasonString"); 
+                                setUserProperties(connack.properties, node.serverProperties);
                                 debug("MQTTBrokerNode: ⬆ CONNECTED. node.serverProperties ==> ", node.serverProperties );
                             }
                         }

From 00db43198d87d053e597938321580901e8a6bc0b Mon Sep 17 00:00:00 2001
From: Steve-Mcl <sdmclaughlin@gmail.com>
Date: Mon, 7 Dec 2020 12:26:27 +0000
Subject: [PATCH 10/15] design/TODO comments

---
 .../node_modules/@node-red/nodes/core/network/10-mqtt.js  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js
index 923cce6b2..b5369a470 100644
--- a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js
+++ b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js
@@ -439,12 +439,12 @@ module.exports = function(RED) {
                             }
                         }
                     });
+                    //TODO: what to do with this event? Anything? Necessary?
                     node.client.on("disconnect", function(packet) {
                         //Emitted after receiving disconnect packet from broker. MQTT 5.0 feature.
                         console.log('MQTTBrokerNode disconnect', packet)
                         var rc = packet && packet.properties && packet.properties.reasonString;
                         var rc = packet && packet.properties && packet.reasonCode;
-                        //TODO: what to do with this event? Anything necessary?
                     });
                     // Register disconnect handlers
                     node.client.on('close', function () {
@@ -733,6 +733,7 @@ module.exports = function(RED) {
                 msg.qos = Number(node.qos || msg.qos || 0);
                 msg.retain = node.retain || msg.retain || false;
                 msg.retain = ((msg.retain === true) || (msg.retain === "true")) || false;
+                /** If node property exists, override/set that to property in msg  */
                 let msgPropOverride = function(propName) { if(node[propName]) { msg[propName] = node[propName]; } }
                 msgPropOverride("topic");
                 if(v5) {
@@ -744,6 +745,8 @@ module.exports = function(RED) {
                         let correlationData = RED.util.evaluateNodeProperty(node.correlationData, node.correlationDataType, node, msg);
                         if(correlationData) msg.correlationData = correlationData;
                     }
+                    //Next, update/override the msg.xxxx properties from config
+                    //TODO: Should we be expecting msg.properties.xxxx instead of msg.xxxx?
                     msgPropOverride("responseTopic");
                     msgPropOverride("contentType");
                     msgPropOverride("topicAlias");
@@ -758,12 +761,15 @@ module.exports = function(RED) {
                 if ( msg.hasOwnProperty("payload")) {
                     let topicOK = msg.hasOwnProperty("topic") && (typeof msg.topic === "string") && (msg.topic !== "");
                     if (!topicOK && v5) {
+                        //NOTE: A value of 0 (in server props topicAliasMaximum) indicates that the Server does not accept any Topic Aliases on this connection
                         if (msg.hasOwnProperty("topicAlias") && typeof msg.topicAlias === "number" && msg.topicAlias >= 0 && node.brokerConn.serverProperties.topicAliasMaximum && node.brokerConn.serverProperties.topicAliasMaximum >= msg.topicAlias) {
                             topicOK = true;
                             msg.topic = ""; //must be empty string
                         } else if (msg.hasOwnProperty("responseTopic") && (typeof msg.responseTopic === "string") && (msg.responseTopic !== "")) {
+                            //TODO: if topic is empty but responseTopic has a string value, use that instead. Is this desirable?
                             topicOK = true;
                             msg.topic = msg.responseTopic;
+                            //TODO: delete msg.responseTopic - to prevent it being resent?
                         }
                     }
                     if (topicOK) { // topic must exist

From be52ec139031bad0ec6a229d39d1f9587d8f7bb7 Mon Sep 17 00:00:00 2001
From: Steve-Mcl <sdmclaughlin@gmail.com>
Date: Mon, 7 Dec 2020 12:48:33 +0000
Subject: [PATCH 11/15] mark more TODO areas (mostly debugging)

---
 .../@node-red/nodes/core/network/10-mqtt.js   | 49 ++++++++++---------
 1 file changed, 26 insertions(+), 23 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js
index b5369a470..5c9194b1a 100644
--- a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js
+++ b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js
@@ -370,7 +370,6 @@ module.exports = function(RED) {
                 node.connecting = true;
                 try {
                     node.serverProperties = {};
-                    // debug("MQTT: ⬆️ mqtt.connect(node.brokerurl ,node.options)", node.brokerurl, node.options);
                     node.client = mqtt.connect(node.brokerurl ,node.options);
                     node.client.setMaxListeners(0);
                     // Register successful connect or reconnect handler
@@ -396,7 +395,7 @@ module.exports = function(RED) {
                                 setStrProp(connack.properties, node.serverProperties, "assignedClientIdentifier"); 
                                 setStrProp(connack.properties, node.serverProperties, "reasonString"); 
                                 setUserProperties(connack.properties, node.serverProperties);
-                                debug("MQTTBrokerNode: ⬆ CONNECTED. node.serverProperties ==> ", node.serverProperties );
+                                debug("MQTTBrokerNode: ⬆ CONNECTED. node.serverProperties ==> ", node.serverProperties );//TODO: remove
                             }
                         }
                         for (var id in node.users) {
@@ -417,12 +416,12 @@ module.exports = function(RED) {
                                     if (node.subscriptions[s].hasOwnProperty(r)) {
                                         qos = Math.max(qos,node.subscriptions[s][r].qos);
                                         _options = node.subscriptions[s][r].options;
-                                        debug(`MQTTBrokerNode:${node.id}: Re-subscribe - registering handler ref ${r} for ${s} `);
+                                        debug(`MQTTBrokerNode:${node.id}: Re-subscribe - registering handler ref ${r} for ${s} `);//TODO: remove
                                         node.client.on('message',node.subscriptions[s][r].handler);
                                     }
                                 }
                                 _options.qos = _options.qos || qos;
-                                debug(`MQTTBrokerNode:${node.id}: Re-subscribe - subscribing to topic '${topic}'`, _options);
+                                debug(`MQTTBrokerNode:${node.id}: Re-subscribe - subscribing to topic '${topic}'`, _options);//TODO: remove
                                 node.client.subscribe(topic, _options);
                             }
                         }
@@ -433,6 +432,7 @@ module.exports = function(RED) {
                         }
                     });
                     node.client.on("reconnect", function() {
+                        debug('MQTTBrokerNode reconnect event', packet); //TODO: remove
                         for (var id in node.users) {
                             if (node.users.hasOwnProperty(id)) {
                                 node.users[id].status({fill:"yellow",shape:"ring",text:"node-red:common.status.connecting"});
@@ -442,13 +442,14 @@ module.exports = function(RED) {
                     //TODO: what to do with this event? Anything? Necessary?
                     node.client.on("disconnect", function(packet) {
                         //Emitted after receiving disconnect packet from broker. MQTT 5.0 feature.
-                        console.log('MQTTBrokerNode disconnect', packet)
+                        debug('MQTTBrokerNode disconnect event', packet); //TODO: remove //TODO: remove
                         var rc = packet && packet.properties && packet.properties.reasonString;
                         var rc = packet && packet.properties && packet.reasonCode;
+                        //TODO: If keeping this event, do we use these? log these?
                     });
                     // Register disconnect handlers
                     node.client.on('close', function () {
-                        console.log('MQTTBrokerNode closed', arguments)
+                        debug('MQTTBrokerNode close event', arguments); //TODO: remove 
                         if (node.connected) {
                             node.connected = false;
                             node.log(RED._("mqtt.state.disconnected",{broker:(node.clientid?node.clientid+"@":"")+node.brokerurl}));
@@ -465,7 +466,7 @@ module.exports = function(RED) {
                     // Register connect error handler
                     // The client's own reconnect logic will take care of errors
                     node.client.on('error', function (error) {
-                        console.log('MQTTBrokerNode errored', error)
+                        debug('MQTTBrokerNode error event', error); //TODO: remove 
                     });
                 }catch(err) {
                     console.log(err);
@@ -489,21 +490,21 @@ module.exports = function(RED) {
                 qos:qos,
                 options:options,
                 handler:function(mtopic,mpayload, mpacket) {
-                    debug(`MQTTBrokerNode:${node.id}: this.subscribe.handler - attempting to match '${topic}' to '${mtopic}' `, mpacket);
+                    debug(`MQTTBrokerNode:${node.id}: this.subscribe.handler - attempting to match '${topic}' to '${mtopic}' `, mpacket); //TODO: remove
                     if(mpacket.properties && options.properties && mpacket.properties.subscriptionIdentifier && options.properties.subscriptionIdentifier && (mpacket.properties.subscriptionIdentifier !== options.properties.subscriptionIdentifier) ) {
                         //do nothing as subscriptionIdentifier does not match
-                        debug(`MQTTBrokerNode:${node.id}: > no match - this nodes subID (${options.properties.subscriptionIdentifier}) !== packet subID (${mpacket.properties.subscriptionIdentifier})`);
+                        debug(`MQTTBrokerNode:${node.id}: > no match - this nodes subID (${options.properties.subscriptionIdentifier}) !== packet subID (${mpacket.properties.subscriptionIdentifier})`); //TODO: remove
                     } else if (matchTopic(topic,mtopic)) {
-                        debug(`MQTTBrokerNode:${node.id}: >  MATCHED '${topic}' to '${mtopic}' - performing callback`);
+                        debug(`MQTTBrokerNode:${node.id}: >  MATCHED '${topic}' to '${mtopic}' - performing callback`); //TODO: remove
                         callback(mtopic,mpayload, mpacket);
                     } else 
-                        debug(`MQTTBrokerNode:${node.id}: > no match / no callback`);
+                        debug(`MQTTBrokerNode:${node.id}: > no match / no callback`); //TODO: remove
                 },
                 ref: ref
             };
             node.subscriptions[topic][ref] = sub;
             if (node.connected) {
-                debug(`MQTTBrokerNode:${node.id}: this.subscribe - registering handler ref ${ref} for ${topic} and subscribing`, options);
+                debug(`MQTTBrokerNode:${node.id}: this.subscribe - registering handler ref ${ref} for ${topic} and subscribing`, options); //TODO: remove
                 node.client.on('message',sub.handler);
                 node.client.subscribe(topic, options);
             }
@@ -512,29 +513,31 @@ module.exports = function(RED) {
         this.unsubscribe = function (topic, ref, removed) {
             ref = ref||0;
             var sub = node.subscriptions[topic];
-            var _debug = `MQTTBrokerNode ${node.id}: unsubscribe for topic ${topic} called... ` ;
+            var _debug = `MQTTBrokerNode ${node.id}: unsubscribe for topic ${topic} called... ` ; //TODO: remove
             if (sub) {
-                _debug += "sub found. "
+                _debug += "sub found. " //TODO: remove
                 if (sub[ref]) {
-                    // debug(`MQTTBrokerNode:${node.id}: this.unsubscribe - removing handler ref ${ref} for ${topic} `);
+                    // debug(`MQTTBrokerNode:${node.id}: this.unsubscribe - removing handler ref ${ref} for ${topic} `); //TODO: remove
                     _debug += `removing handler ref ${ref} for ${topic}. `
                     node.client.removeListener('message',sub[ref].handler);
                     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 (Object.keys(sub).length === 0) {
                         delete node.subscriptions[topic];
                         if (node.connected) {
-                            _debug += `calling client.unsubscribe to remove topic ${topic}`
-                            // debug(`MQTTBrokerNode:${node.id}: this.unsubscribe - calling client.unsubscribe to remove topic ${topic} `);
+                            _debug += `calling client.unsubscribe to remove topic ${topic}` //TODO: remove
                             node.client.unsubscribe(topic);
                         }
                     }
                 //}
             } else {
-                _debug += "sub not found! "
+                _debug += "sub not found! "; //TODO: remove
             }
-            debug(_debug);
+            debug(_debug); //TODO: remove
 
         };
 
@@ -565,7 +568,7 @@ module.exports = function(RED) {
                     setUserProperties(msg.userProperties, options.properties);
                     setBufferProp(msg, options.properties, "correlationData");
                 }
-                debug(`MQTTBrokerNode:${node.id}: publish - sending payload to ${msg.topic ? msg.topic : (msg.topicAlias ? 'topicAlias-'+msg.topicAlias : '???') } `, options);
+                debug(`MQTTBrokerNode:${node.id}: publish - sending payload to ${msg.topic ? msg.topic : (msg.topicAlias ? 'topicAlias-'+msg.topicAlias : '???') } `, options);//TODO: remove
                 node.client.publish(msg.topic, msg.payload, options, function(err) {
                     if(err) node.error(err,msg);//catch errors
                     done && done();
@@ -643,9 +646,9 @@ 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;
                 }
-                // debug("MQTT: ⬅️⬅️ this.brokerConn.subscribe",this.topic,options);
+                
                 this.brokerConn.subscribe(this.topic,options,function(topic,payload,packet) {
-                    debug(`MQTTInNode:${node.id}: Broker sent ${topic}, datatype ${node.datatype}`, packet);
+                    debug(`MQTTInNode:${node.id}: Broker sent ${topic}, datatype ${node.datatype}`, packet);//TODO: remove
                     if (node.datatype === "buffer") {
                         // payload = payload;
                     } else if (node.datatype === "base64") {
@@ -773,7 +776,7 @@ module.exports = function(RED) {
                         }
                     }
                     if (topicOK) { // topic must exist
-                        debug(`MQTTOutNode:${node.id}: sending msg to ${msg.topic}`, msg);
+                        debug(`MQTTOutNode:${node.id}: sending msg to ${msg.topic}`, msg);//TODO: remove
                         this.brokerConn.publish(msg, function(){
                             let args = arguments;
                             let l = args.length;

From c20bab2436743cc2c5487641f73feed8b4683345 Mon Sep 17 00:00:00 2001
From: Steve-Mcl <sdmclaughlin@gmail.com>
Date: Sat, 20 Feb 2021 15:52:14 +0000
Subject: [PATCH 12/15] more specific class selectors for show/hide items

---
 .../@node-red/nodes/core/network/10-mqtt.html        | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
index d554d9c49..d1a783ee0 100644
--- a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
+++ b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
@@ -157,9 +157,9 @@
                 var confNode = RED.nodes.node($("#node-input-broker").val());
                 var v5 = confNode && confNode.protocolVersion == "5";
                 if(v5) {
-                    $(".mqtt5").show();
+                    $("div.form-row.mqtt5").show();
                 } else {
-                    $(".mqtt5").hide();
+                    $("div.form-row.mqtt5").hide();
                 }
             });
             if (this.qos === undefined) {
@@ -282,9 +282,9 @@
                 var confNode = RED.nodes.node($("#node-input-broker").val());
                 var v5 = confNode && confNode.protocolVersion == "5";
                 if(v5) {
-                    $(".mqtt5").show();
+                    $("div.form-row.mqtt5").show();
                 } else {
-                    $(".mqtt5").hide();
+                    $("div.form-row.mqtt5").hide();
                 }
             });            
             $("#node-input-correlationData").typedInput({
@@ -600,9 +600,9 @@
             $("#node-config-input-protocolVersion").change(function(){
                 var v5 = $("#node-config-input-protocolVersion").val() == "5";
                 if(v5) {
-                    $(".mqtt5").show();
+                    $("div.form-row.mqtt5").show();
                 } else {
-                    $(".mqtt5").hide();
+                    $("div.form-row.mqtt5").hide();
                 }
                 updateSessionExpiryIntervalVisibility();
             });

From 833ecfb1af2533b644c0211f9869949aa6cb1f32 Mon Sep 17 00:00:00 2001
From: Steve-Mcl <sdmclaughlin@gmail.com>
Date: Sat, 20 Feb 2021 19:58:13 +0000
Subject: [PATCH 13/15] MQTT V5 - prep for 1.3.0 beta... * MQTT IN node tidy up
   * remove userProperties   * remove subscriptionIdentifier * MQTT OUT node
 tidy up   * remove topicAlias   * remove payloadFormatIndicator   * remove
 subscriptionIdentifier * MQTT BROKER node tidy up   * remove
 topicAliasMaximum   * remove maximumPacketSize   * remove receiveMaximum   *
 remove userProperties

---
 .../@node-red/nodes/core/network/10-mqtt.html | 214 +++++++++++++-----
 .../@node-red/nodes/core/network/10-mqtt.js   |  67 +++---
 2 files changed, 196 insertions(+), 85 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
index d1a783ee0..45d6a2707 100644
--- a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
+++ b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
@@ -76,15 +76,27 @@
             <option value="2">2</option>
         </select>
     </div>
+    <div class="form-row">
+        <label for="node-input-datatype"><i class="fa fa-sign-out"></i> <span data-i18n="mqtt.label.output"></span></label>
+        <select id="node-input-datatype" style="width:70%;">
+            <option value="auto" data-i18n="mqtt.output.auto"></option>
+            <option value="buffer" data-i18n="mqtt.output.buffer"></option>
+            <option value="utf8" data-i18n="mqtt.output.string"></option>
+            <option value="json" data-i18n="mqtt.output.json"></option>
+            <option value="base64" data-i18n="mqtt.output.base64"></option>
+        </select>
+    </div>    
+    <!-- FUTURE
     <div class="form-row mqtt5">
         <label for="node-input-userProperties"><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.userProperties"></span></label>
         <input id="node-input-userPropertiesType" type="hidden">
         <input type="text" id="node-input-userProperties" style="width: 70%;" data-i18n="[placeholder]mqtt.label.userProperties" placeholder="">
-    </div>
+    </div> -->
+    <!-- FUTURE
     <div class="form-row mqtt5">
         <label for="node-input-subscriptionIdentifier" class="mqtt-form-row-col1"><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.subscriptionIdentifier"></span></label>
         <input type="number" min="0" max="268435455" id="node-input-subscriptionIdentifier" class="mqtt-form-row-col1" >
-    </div> 
+    </div>  -->
     <div class="form-row mqtt-flags-row mqtt5"> 
         <label for="node-input-nl" ><i class="fa fa-flag"></i> <span data-i18n="mqtt.label.flags">Flags</span></label>
         <div class="mqtt-flags">
@@ -110,16 +122,6 @@
             <option value="2" data-i18n="mqtt.label.rh2"></option>
         </select>
     </div> 
-    <div class="form-row">
-        <label for="node-input-datatype"><i class="fa fa-sign-out"></i> <span data-i18n="mqtt.label.output"></span></label>
-        <select id="node-input-datatype" style="width:70%;">
-            <option value="auto" data-i18n="mqtt.output.auto"></option>
-            <option value="buffer" data-i18n="mqtt.output.buffer"></option>
-            <option value="utf8" data-i18n="mqtt.output.string"></option>
-            <option value="json" data-i18n="mqtt.output.json"></option>
-            <option value="base64" data-i18n="mqtt.output.base64"></option>
-        </select>
-    </div>
     <div class="form-row">
         <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
         <input type="text" id="node-input-name" data-i18n="[placeholder]common.label.name">
@@ -135,9 +137,9 @@
             qos: {value: "2"},
             datatype: {value:"auto",required:true},
             broker: {type:"mqtt-broker", required:true},
-            userPropertiesType: {value:"json"},
-            userProperties: {value:"{}"},
-            subscriptionIdentifier: {value:0},
+            // userProperties: {value:"userProperties"},
+            // userPropertiesType: {value:"none"},
+            // subscriptionIdentifier: {value:0},
             nl: {value:false},
             rap: {value:true},
             rh: {value:0},
@@ -168,11 +170,12 @@
             if (this.datatype === undefined) {
                 $("#node-input-datatype").val("auto");
             }
-            $("#node-input-userProperties").typedInput({
-                default: "json",
-                types:['json','flow','global'],
-                typeField: $("#node-input-userPropertiesType")
-            });
+            // FUTURE
+            // $("#node-input-userProperties").typedInput({
+            //     default: "none",
+            //     types:[{ value: 'none', label: 'None', hasValue: false },'flow','global','json'],
+            //     typeField: $("#node-input-userPropertiesType")
+            // });
         }
     });
 </script>
@@ -203,33 +206,38 @@
             <option value="true" data-i18n="mqtt.true"></option>
         </select>
     </div>
+    <div class="form-row mqtt5">
+        <label for="node-input-userProperties"><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.userProperties"></span></label>
+        <input id="node-input-userPropertiesType" type="hidden">
+        <input type="text" id="node-input-userProperties" style="width: 70%;" data-i18n="[placeholder]mqtt.label.userProperties" placeholder="">
+    </div>
     <div class="form-row mqtt5">
         <label for="node-input-responseTopic"><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.responseTopic"></span></label>
-        <input type="text" id="node-input-responseTopic" data-i18n="[placeholder]mqtt.label.responseTopic" placeholder="">
+        <input id="node-input-responseTopicType" type="hidden">
+        <input type="text" id="node-input-responseTopic" style="width: 70%;" data-i18n="[placeholder]mqtt.label.responseTopic" placeholder="">
     </div>
     <div class="form-row mqtt5">
         <label for="node-input-correlationData"><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.correlationData"></span></label>
         <input id="node-input-correlationDataType" type="hidden">
         <input type="text" id="node-input-correlationData" style="width: 70%;" data-i18n="[placeholder]mqtt.label.correlationData" placeholder="">
     </div>
-    <div class="form-row mqtt5">
-        <label for="node-input-userProperties"><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.userProperties"></span></label>
-        <input id="node-input-userPropertiesType" type="hidden">
-        <input type="text" id="node-input-userProperties" style="width: 70%;" data-i18n="[placeholder]mqtt.label.userProperties" placeholder="">
-    </div>
     <div class="form-row mqtt5">
         <label for="node-input-contentType"><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.contentType"></span></label>
-        <input type="text" id="node-input-contentType" data-i18n="[placeholder]mqtt.label.contentType" placeholder="">
+        <input id="node-input-contentTypeType" type="hidden">
+        <input type="text" id="node-input-contentType" style="width: 70%;" data-i18n="[placeholder]mqtt.label.contentType" placeholder="">
     </div>
 
     <div class="form-row mqtt-form-row-cols2 mqtt5">
         <label for="node-input-messageExpiryInterval" class="mqtt-form-row-col1"><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.messageExpiryInterval"></span></label>
-        <input type="number" min="0" id="node-input-messageExpiryInterval" class="mqtt-form-row-col1" >
+        <input id="node-input-messageExpiryIntervalType" type="hidden">
+        <input id="node-input-messageExpiryInterval"  style="width: 70%;" class="mqtt-form-row-col1" >
         
+        <!-- FUTURE
         <label for="node-input-topicAlias" class="mqtt-form-row-col2"><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.topicAlias">Alias</span></label>
-        <input type="number" min="0" id="node-input-topicAlias" class="mqtt-form-row-col2" >
+        <input type="number" min="0" id="node-input-topicAlias" class="mqtt-form-row-col2" > -->
     </div> 
 
+    <!-- FUTURE
     <div class="form-row mqtt-form-row-cols2 mqtt5">
         <label for="node-input-subscriptionIdentifier" class="mqtt-form-row-col1"><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.subscriptionIdentifier"></span></label>
         <input type="number" min="0" max="268435455" id="node-input-subscriptionIdentifier" class="mqtt-form-row-col1" >
@@ -240,7 +248,7 @@
             <option value="false" data-i18n="mqtt.label.payloadFormatIndicatorFalse"></option>
             <option value="true" data-i18n="mqtt.label.payloadFormatIndicatorTrue"></option>
         </select>
-    </div> 
+    </div>  -->
 
     <div class="form-row">
         <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
@@ -257,16 +265,19 @@
             topic: {value:""},
             qos: {value:""},
             retain: {value:""},
-            responseTopic: {value:""},
-            contentType: {value:""},
+            responseTopic: {value:"responseTopic"},
+            responseTopicType: {value:'none'},
+            contentType: {value:"contentType"},
+            contentTypeType: {value:'none'},
             userProperties: {value:'userProperties'},
-            userPropertiesType: {value:'msg'},
+            userPropertiesType: {value:'none'},
             correlationData: {value:'correlationData'},
-            correlationDataType: {value:'msg'},
-            topicAlias: {value:0},
-            messageExpiryInterval: {value:0},
-            payloadFormatIndicator: {value:false},
-            subscriptionIdentifier: {value:0},
+            correlationDataType: {value:'none'},
+            messageExpiryInterval: {value:"messageExpiryInterval"},
+            messageExpiryIntervalType: {value:'none'},
+            // FUTURE topicAlias: {value:0},
+            // FUTURE payloadFormatIndicator: {value:false},
+            // FUTURE subscriptionIdentifier: {value:0},
             broker: {type:"mqtt-broker", required:true}
         },
         color:"#d8bfd8",
@@ -275,10 +286,13 @@
         icon: "bridge.svg",
         align: "right",
         label: function() {
-            return this.name||this.topic||(this.topicAlias ? "@"+this.topicAlias : "mqtt");
+            return this.name||this.topic||"mqtt";
+            // FUTURE return this.name||this.topic||(this.topicAlias ? "@"+this.topicAlias : "mqtt");
         },
         oneditprepare: function() {
-            $("#node-input-broker").change(function(d){
+            var typedInputNoneOpt = { value: 'none', label: 'None', hasValue: false };
+
+            function showHideDynamicFields() {
                 var confNode = RED.nodes.node($("#node-input-broker").val());
                 var v5 = confNode && confNode.protocolVersion == "5";
                 if(v5) {
@@ -286,17 +300,99 @@
                 } else {
                     $("div.form-row.mqtt5").hide();
                 }
-            });            
-            $("#node-input-correlationData").typedInput({
-                default: "none",
-                types:[{ value:"none", label: "None",  hasValue:false },'bin','msg','flow','global'],
+                var t = $("#node-input-responseTopic").typedInput("type");
+                if (t == 'none') {
+                    $("#node-input-correlationData").parent().hide();
+                } else {
+                    $("#node-input-correlationData").parent().show();
+                }
+            }
+
+            $("#node-input-broker").change(function(d){
+                showHideDynamicFields();
+            });
+            
+            var responseTopicTI = $("#node-input-responseTopic").typedInput({
+                default: 'none',
+                types: [typedInputNoneOpt, 'msg', 'flow', 'global', 'str'],
+                typeField: $("#node-input-responseTopicType")
+            });
+
+            var correlationDataTI = $("#node-input-correlationData").typedInput({
+                default: 'none',
+                types: [typedInputNoneOpt, 'msg', 'flow', 'global', 'bin'],
                 typeField: $("#node-input-correlationDataType")
             });
+            //show / hide correlation data depending on responseTopic
+            responseTopicTI.on("change", function() {
+                showHideDynamicFields();
+            });
+            responseTopicTI.triggerHandler("change");
+
             $("#node-input-userProperties").typedInput({
-                default: "msg",
-                types:['msg','flow','global','json'],
+                default: 'none',
+                types: [typedInputNoneOpt, 'msg', 'flow', 'global', 'json'],
                 typeField: $("#node-input-userPropertiesType")
             });
+
+            $("#node-input-messageExpiryInterval").typedInput({
+                default: 'none',
+                types: [typedInputNoneOpt, 'msg', 'flow', 'global', 'num'],
+                typeField: $("#node-input-messageExpiryIntervalType")
+            });
+
+            var makeTypedInputOpt = function(value, label, tooltip){
+                return { 
+                    label: label, 
+                    value: value || label, 
+                    title: tooltip,
+                    multiple: true
+                }
+            }
+            //TODO: i18n
+            var commonOpts = [
+                makeTypedInputOpt("application/gzip", "application/gzip", "GZip Compressed Archive"),
+                makeTypedInputOpt("application/json", "application/json", "JSON format"),
+                makeTypedInputOpt("application/octet-stream", "application/octet-stream", "Any kind of binary data"),
+                makeTypedInputOpt("application/ogg", "application/ogg", "OGG"),
+                makeTypedInputOpt("application/pdf", "application/pdf", "Adobe Portable Document Format (PDF)"),
+                makeTypedInputOpt("application/zip", "application/zip", "ZIP archive"),
+                makeTypedInputOpt("audio/aac", "audio/aac", "AAC audio"),
+                makeTypedInputOpt("audio/midi", "audio/midi", "Musical Instrument Digital Interface (MIDI)"),
+                makeTypedInputOpt("audio/x-midi", "audio/x-midi", "Musical Instrument Digital Interface (MIDI)"),
+                makeTypedInputOpt("audio/mpeg", "audio/mpeg", "MP3 audio"),
+                makeTypedInputOpt("audio/ogg", "audio/ogg", "OGG audio"),
+                makeTypedInputOpt("audio/wav", "audio/wav", "Waveform Audio Format"),
+                makeTypedInputOpt("audio/webm", "audio/webm", "WEBM audio"),
+                makeTypedInputOpt("image/bmp", "image/bmp", "Windows OS/2 Bitmap Graphics"),
+                makeTypedInputOpt("image/gif", "image/gif", "Graphics Interchange Format (GIF)"),
+                makeTypedInputOpt("image/jpeg", "image/jpeg", "JPEG images"),
+                makeTypedInputOpt("image/png", "image/png", "Portable Network Graphics"),
+                makeTypedInputOpt("image/tiff", "image/tiff", "Tagged Image File Format (TIFF)"),
+                makeTypedInputOpt("image/webp", "image/webp", "WEBP image"),
+                makeTypedInputOpt("text/csv", "text/csv", "Comma-separated values (CSV)"),
+                makeTypedInputOpt("text/html", "text/html", "HyperText Markup Language (HTML)"),
+                makeTypedInputOpt("text/plain", "text/plain", "Text, (generally ASCII or ISO 8859-n)"),
+                makeTypedInputOpt("video/mpeg", "video/mpeg", "MPEG Video"),
+                makeTypedInputOpt("video/ogg", "video/ogg", "OGG video"),
+                makeTypedInputOpt("video/webm", "video/webm", "WEBM video"),
+            ];
+            $("#node-input-contentType").typedInput({
+                default: 'none',
+                types: [
+                    typedInputNoneOpt,
+                    {
+                        value: "preset",
+                        label: "Preset",
+                        title: "Preset Content-Types",
+                        icon: "fa fa-list",
+                        showLabel: false,
+                        multiple: false,
+                        options: commonOpts,
+                        default: "application/json"
+                    }, 'msg', 'flow', 'global', 'str'],
+                typeField: $("#node-input-contentTypeType")
+            });
         },
         labelStyle: function() {
             return this.name?"node_label_italic":"";
@@ -353,7 +449,8 @@
                     <option value="4" data-i18n="mqtt.label.protocolVersion4"></option>
                     <option value="5" data-i18n="mqtt.label.protocolVersion5"></option>
                 </select>
-            </div>            
+            </div>
+            <!-- FUTURE
             <div class="form-row mqtt5">
                 <label for="node-config-input-userProperties"><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.userProperties"></span></label>
                 <input id="node-config-input-userPropertiesType" type="hidden">
@@ -370,7 +467,7 @@
             <div class="form-row mqtt5">
                 <label for="node-config-input-receiveMaximum" ><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.receiveMaximum"></span></label>
                 <input type="number" min="0" id="node-config-input-receiveMaximum">
-            </div> 
+            </div>  -->
         </div>
         <div id="mqtt-broker-tab-security" style="display:none">
             <div class="form-row">
@@ -500,11 +597,11 @@
             willRetain: {value:false},
             willPayload: {value:""},
             sessionExpiryInterval: {value:0},
-            topicAliasMaximum: {value:0},
-            maximumPacketSize: {value:0},
-            receiveMaximum: {value:0},
-            userPropertiesType: {value:"json"},
-            userProperties: {value:"{}"},
+            // FUTURE topicAliasMaximum: {value:0},
+            // FUTURE maximumPacketSize: {value:0},
+            // FUTURE receiveMaximum: {value:0},
+            // FUTURE userPropertiesType: {value:"json"},
+            // FUTURE userProperties: {value:"{}"},
         },
         credentials: {
             user: {type:"text"},
@@ -607,11 +704,12 @@
                 updateSessionExpiryIntervalVisibility();
             });
             $("#node-config-input-protocolVersion").val(this.protocolVersion);
-            $("#node-config-input-userProperties").typedInput({
-                default: "json",
-                types:['json'],
-                typeField: $("#node-config-input-userPropertiesType")
-            });            
+            // FUTURE
+            // $("#node-config-input-userProperties").typedInput({
+            //     default: "json",
+            //     types:['json'],
+            //     typeField: $("#node-config-input-userPropertiesType")
+            // });            
             if (typeof this.keepalive === 'undefined') {
                 this.keepalive = 15;
                 $("#node-config-input-keepalive").val(this.keepalive);
diff --git a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js
index 5c9194b1a..103e161c5 100644
--- a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js
+++ b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js
@@ -140,7 +140,7 @@ module.exports = function(RED) {
         if(!dst) return;
         if (src && dst) {
             var buf = src[propName];
-            if (buf && typeof  Buffer.isBuffer(buf)) { 
+            if (buf && typeof Buffer.isBuffer(buf)) { 
                 dst[propName] = Buffer.from(buf);
             }
         } else {
@@ -432,7 +432,7 @@ module.exports = function(RED) {
                         }
                     });
                     node.client.on("reconnect", function() {
-                        debug('MQTTBrokerNode reconnect event', packet); //TODO: remove
+                        debug('MQTTBrokerNode reconnect event'); //TODO: remove
                         for (var id in node.users) {
                             if (node.users.hasOwnProperty(id)) {
                                 node.users[id].status({fill:"yellow",shape:"ring",text:"node-red:common.status.connecting"});
@@ -560,15 +560,16 @@ module.exports = function(RED) {
                 if(node.options.protocolVersion == 5) {
                     options.properties = options.properties || {};
                     setStrProp(msg, options.properties, "responseTopic");
-                    setStrProp(msg, options.properties, "contentType");                    
-                    setIntProp(msg, options.properties, "topicAlias", 1, node.serverProperties.topicAliasMaximum || 0);
-                    setIntProp(msg, options.properties, "subscriptionIdentifier", 1, 268435455);
-                    setIntProp(msg, options.properties, "messageExpiryInterval", 0); 
-                    setBoolProp(msg, options.properties, "payloadFormatIndicator"); 
-                    setUserProperties(msg.userProperties, options.properties);
                     setBufferProp(msg, options.properties, "correlationData");
+                    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);
+                    setBoolProp(msg, options.properties, "payloadFormatIndicator"); 
+                    //FUTURE setIntProp(msg, options.properties, "subscriptionIdentifier", 1, 268435455);
                 }
-                debug(`MQTTBrokerNode:${node.id}: publish - sending payload to ${msg.topic ? msg.topic : (msg.topicAlias ? 'topicAlias-'+msg.topicAlias : '???') } `, options);//TODO: remove
+                // debug(`MQTTBrokerNode:${node.id}: publish - sending payload to ${msg.topic ? msg.topic : (msg.topicAlias ? 'topicAlias-'+msg.topicAlias : '???') } `, options);//TODO: remove
+                debug(`MQTTBrokerNode:${node.id}: publish - sending payload to ${msg.topic} `, options);//TODO: remove
                 node.client.publish(msg.topic, msg.payload, options, function(err) {
                     if(err) node.error(err,msg);//catch errors
                     done && done();
@@ -669,14 +670,14 @@ module.exports = function(RED) {
                     if(v5 && packet.properties) {
                         //msg.properties = packet.properties;
                         setStrProp(packet.properties, msg, "responseTopic");
+                        setBufferProp(packet.properties, msg, "correlationData");
                         setStrProp(packet.properties, msg, "contentType");                    
-                        setIntProp(packet.properties, msg, "topicAlias", 1, node.brokerConn.serverProperties.topicAliasMaximum || 0);
-                        setIntProp(packet.properties, msg, "subscriptionIdentifier", 1, 268435455);
+                        // setIntProp(packet.properties, msg, "topicAlias", 1, node.brokerConn.serverProperties.topicAliasMaximum || 0);
+                        // setIntProp(packet.properties, msg, "subscriptionIdentifier", 1, 268435455);
                         setIntProp(packet.properties, msg, "messageExpiryInterval", 0); 
                         setBoolProp(packet.properties, msg, "payloadFormatIndicator"); 
                         setStrProp(packet.properties, msg, "reasonString"); 
                         setUserProperties(packet.properties.userProperties, msg);
-                        setBufferProp(packet.properties, msg, "correlationData");
                     }
                     if ((node.brokerConn.broker === "localhost")||(node.brokerConn.broker === "127.0.0.1")) {
                         msg._topic = topic;
@@ -709,15 +710,18 @@ module.exports = function(RED) {
         this.retain = n.retain;
         this.broker = n.broker;
         this.responseTopic = n.responseTopic;//https://docs.oasis-open.org/mqtt/mqtt/v5.0/os/mqtt-v5.0-os.html#_Toc3901114
+        this.responseTopicType = n.responseTopicType;
         this.correlationData = n.correlationData;//https://docs.oasis-open.org/mqtt/mqtt/v5.0/os/mqtt-v5.0-os.html#_Toc3901115
         this.correlationDataType = n.correlationDataType; 
         this.contentType = n.contentType;//https://docs.oasis-open.org/mqtt/mqtt/v5.0/os/mqtt-v5.0-os.html#_Toc3901118
-        this.topicAlias = n.topicAlias; //https://docs.oasis-open.org/mqtt/mqtt/v5.0/os/mqtt-v5.0-os.html#_Toc3901113
+        this.contentTypeType = n.contentTypeType;
         this.messageExpiryInterval = n.messageExpiryInterval; //https://docs.oasis-open.org/mqtt/mqtt/v5.0/os/mqtt-v5.0-os.html#_Toc3901112
-        this.payloadFormatIndicator = n.payloadFormatIndicator; //https://docs.oasis-open.org/mqtt/mqtt/v5.0/os/mqtt-v5.0-os.html#_Toc3901111
-        this.subscriptionIdentifier = n.subscriptionIdentifier;//https://docs.oasis-open.org/mqtt/mqtt/v5.0/os/mqtt-v5.0-os.html#_Toc3901117
+        this.messageExpiryIntervalType = n.messageExpiryIntervalType;
         this.userProperties = n.userProperties;//https://docs.oasis-open.org/mqtt/mqtt/v5.0/os/mqtt-v5.0-os.html#_Toc3901116
         this.userPropertiesType = n.userPropertiesType;
+        // this.topicAlias = n.topicAlias; //https://docs.oasis-open.org/mqtt/mqtt/v5.0/os/mqtt-v5.0-os.html#_Toc3901113
+        // this.payloadFormatIndicator = n.payloadFormatIndicator; //https://docs.oasis-open.org/mqtt/mqtt/v5.0/os/mqtt-v5.0-os.html#_Toc3901111
+        // this.subscriptionIdentifier = n.subscriptionIdentifier;//https://docs.oasis-open.org/mqtt/mqtt/v5.0/os/mqtt-v5.0-os.html#_Toc3901117
         
         this.brokerConn = RED.nodes.getNode(this.broker);
         var node = this;
@@ -740,26 +744,35 @@ module.exports = function(RED) {
                 let msgPropOverride = function(propName) { if(node[propName]) { msg[propName] = node[propName]; } }
                 msgPropOverride("topic");
                 if(v5) {
-                    if(node.userProperties) {
+                    if(node.userProperties && node.userPropertiesType !== "none") {
                         let userProperties = RED.util.evaluateNodeProperty(node.userProperties, node.userPropertiesType, node, msg);
                         if(userProperties) msg.userProperties = userProperties;
                     }
+                    if(node.responseTopic && node.responseTopicType !== "none") {
+                        let responseTopic = RED.util.evaluateNodeProperty(node.responseTopic, node.responseTopicType, node, msg);
+                        if(responseTopic) msg.responseTopic = responseTopic;
+                    }
                     if(node.correlationData && node.correlationDataType !== "none") {
                         let correlationData = RED.util.evaluateNodeProperty(node.correlationData, node.correlationDataType, node, msg);
                         if(correlationData) msg.correlationData = correlationData;
                     }
-                    //Next, update/override the msg.xxxx properties from config
+                    if(node.contentType && node.contentTypeType !== "none") {
+                        let contentType = RED.util.evaluateNodeProperty(node.contentType, node.contentTypeType, node, msg);
+                        if(contentType) msg.contentType = contentType;
+                    }
+                    if(node.messageExpiryInterval && node.messageExpiryIntervalType !== "none") {
+                        let messageExpiryInterval = RED.util.evaluateNodeProperty(node.messageExpiryInterval, node.messageExpiryIntervalType, node, msg);
+                        if(messageExpiryInterval) msg.messageExpiryInterval = messageExpiryInterval;
+                    }
+                    //Next, update/override the msg.xxxx properties from node config
                     //TODO: Should we be expecting msg.properties.xxxx instead of msg.xxxx?
-                    msgPropOverride("responseTopic");
-                    msgPropOverride("contentType");
-                    msgPropOverride("topicAlias");
-                    msgPropOverride("messageExpiryInterval");
-                    msgPropOverride("payloadFormatIndicator");
-                    msgPropOverride("subscriptionIdentifier");
-                    setIntProp(msg,msg,"topicAlias");
-                    setIntProp(msg,msg,"messageExpiryInterval");
-                    setBoolProp(msg,msg,"payloadFormatIndicator");
-                    setIntProp(msg,msg,"subscriptionIdentifier");
+                    // setStrProp(node,msg,"responseTopic");
+                    // setBufferProp(node,msg,"correlationData");
+                    // setStrProp(node,msg,"contentType");
+                    // setIntProp(node,msg,"messageExpiryInterval");
+                    //FUTURE setStrProp(node,msg,"topicAlias");
+                    //FUTURE setBoolProp(node,msg,"payloadFormatIndicator");
+                    //FUTURE setIntProp(node,msg,"subscriptionIdentifier");
                 }
                 if ( msg.hasOwnProperty("payload")) {
                     let topicOK = msg.hasOwnProperty("topic") && (typeof msg.topic === "string") && (msg.topic !== "");

From 16088b8a087d832f3e8b14a0613a4d03353bca96 Mon Sep 17 00:00:00 2001
From: Stephen McLaughlin <44235289+Steve-Mcl@users.noreply.github.com>
Date: Mon, 22 Feb 2021 12:45:32 +0000
Subject: [PATCH 14/15] improve description of mqtt options

Co-authored-by: Nick O'Leary <nick.oleary@gmail.com>
---
 .../@node-red/nodes/locales/en-US/messages.json             | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
index dd23eb133..4df254efa 100755
--- a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
@@ -359,8 +359,8 @@
             "userProperties": "User Properties",
             "subscriptionIdentifier": "Subscription ID",
             "flags": "Flags",
-            "nl": "No Local",
-            "rap": "Retain as Published",
+            "nl": "Do not receive messages published by this client",
+            "rap": "Keep retain flag of original publish",
             "rh": "Retain Handling",
             "rh0": "0, Always send retained messages",
             "rh1": "1, Send retained messages for new subscription",
@@ -988,4 +988,4 @@
         "unexpected" : "unexpected mode",
         "no-parts" : "no parts property in message"
     }
-} 
\ No newline at end of file
+} 

From 255b8f2005974afeadc4595c55726488f7a3e42c Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Thu, 25 Feb 2021 15:49:56 +0000
Subject: [PATCH 15/15] Update mqtt nodes for v5

---
 .../@node-red/nodes/core/network/10-mqtt.html | 724 ++++++++++--------
 .../@node-red/nodes/core/network/10-mqtt.js   | 266 ++++---
 .../nodes/locales/en-US/messages.json         |  19 +-
 .../nodes/locales/en-US/network/10-mqtt.html  |  26 +-
 4 files changed, 586 insertions(+), 449 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
index 45d6a2707..6a2b324fe 100644
--- a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
+++ b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
@@ -11,9 +11,6 @@
   limitations under the License.
 -->
 <style>
-    .form-row label:first-child {
-        width: 125px;
-    }
 
     .mqtt-form-row-cols2 > input.mqtt-form-row-col1 {
         width: calc(35% - 75px);
@@ -35,20 +32,20 @@
         width: calc(35% - 75px);
         display: inline-block;
     }
-    
+    .form-row.mqtt5-out > label {
+        width: 130px;
+    }
     .form-row.mqtt-flags-row > label {
         vertical-align: top;
     }
     .form-row.mqtt-flags-row > .mqtt-flags {
-        display: inline-block; 
+        display: inline-block;
         width: 70%
     }
 
     .form-row.mqtt-flags-row > .mqtt-flags > .mqtt-flag > label {
         display: block;
-        padding-left: 15px;
-        text-indent: -15px;
-        width: 70%;
+        width: 100%;
     }
     .form-row.mqtt-flags-row > .mqtt-flags > .mqtt-flag > label > input {
         position: relative;
@@ -85,101 +82,38 @@
             <option value="json" data-i18n="mqtt.output.json"></option>
             <option value="base64" data-i18n="mqtt.output.base64"></option>
         </select>
-    </div>    
-    <!-- FUTURE
-    <div class="form-row mqtt5">
-        <label for="node-input-userProperties"><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.userProperties"></span></label>
-        <input id="node-input-userPropertiesType" type="hidden">
-        <input type="text" id="node-input-userProperties" style="width: 70%;" data-i18n="[placeholder]mqtt.label.userProperties" placeholder="">
-    </div> -->
-    <!-- FUTURE
-    <div class="form-row mqtt5">
-        <label for="node-input-subscriptionIdentifier" class="mqtt-form-row-col1"><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.subscriptionIdentifier"></span></label>
-        <input type="number" min="0" max="268435455" id="node-input-subscriptionIdentifier" class="mqtt-form-row-col1" >
-    </div>  -->
-    <div class="form-row mqtt-flags-row mqtt5"> 
+    </div>
+    <div class="form-row mqtt-flags-row mqtt5">
         <label for="node-input-nl" ><i class="fa fa-flag"></i> <span data-i18n="mqtt.label.flags">Flags</span></label>
         <div class="mqtt-flags">
             <div class="mqtt-flag">
                 <label for="node-input-nl">
                     <input type="checkbox" id="node-input-nl">
                     <span data-i18n="mqtt.label.nl"></span>
-                </label>                
+                </label>
             </div>
             <div class="mqtt-flag">
                 <label for="node-input-rap">
                     <input type="checkbox" id="node-input-rap">
                     <span data-i18n="mqtt.label.rap"></span>
-                </label>                
+                </label>
             </div>
         </div>
-    </div> 
-    <div class="form-row mqtt5"> 
-        <label for="node-input-rh" ><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.rh"></span></label>
-        <select id="node-input-rh" style="width:70%;">
+    </div>
+    <div class="form-row mqtt5">
+        <label for="node-input-rh" style="width:100%"><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.rh"></span></label>
+        <select id="node-input-rh" style="margin-left: 104px; width: 70%">
             <option value="0" data-i18n="mqtt.label.rh0"></option>
             <option value="1" data-i18n="mqtt.label.rh1"></option>
             <option value="2" data-i18n="mqtt.label.rh2"></option>
         </select>
-    </div> 
+    </div>
     <div class="form-row">
         <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
         <input type="text" id="node-input-name" data-i18n="[placeholder]common.label.name">
     </div>
 </script>
 
-<script type="text/javascript">
-    RED.nodes.registerType('mqtt in',{
-        category: 'network',
-        defaults: {
-            name: {value:""},
-            topic: {value:"",required:true,validate: RED.validators.regex(/^(#$|(\+|[^+#]*)(\/(\+|[^+#]*))*(\/(\+|#|[^+#]*))?$)/)},
-            qos: {value: "2"},
-            datatype: {value:"auto",required:true},
-            broker: {type:"mqtt-broker", required:true},
-            // userProperties: {value:"userProperties"},
-            // userPropertiesType: {value:"none"},
-            // subscriptionIdentifier: {value:0},
-            nl: {value:false},
-            rap: {value:true},
-            rh: {value:0},
-        },
-        color:"#d8bfd8",
-        inputs:0,
-        outputs:1,
-        icon: "bridge.svg",
-        label: function() {
-            return this.name||this.topic||"mqtt";
-        },
-        labelStyle: function() {
-            return this.name?"node_label_italic":"";
-        },
-        oneditprepare: function() {
-            $("#node-input-broker").change(function(d){
-                var confNode = RED.nodes.node($("#node-input-broker").val());
-                var v5 = confNode && confNode.protocolVersion == "5";
-                if(v5) {
-                    $("div.form-row.mqtt5").show();
-                } else {
-                    $("div.form-row.mqtt5").hide();
-                }
-            });
-            if (this.qos === undefined) {
-                $("#node-input-qos").val("2");
-            }
-            if (this.datatype === undefined) {
-                $("#node-input-datatype").val("auto");
-            }
-            // FUTURE
-            // $("#node-input-userProperties").typedInput({
-            //     default: "none",
-            //     types:[{ value: 'none', label: 'None', hasValue: false },'flow','global','json'],
-            //     typeField: $("#node-input-userPropertiesType")
-            // });
-        }
-    });
-</script>
-
 <script type="text/html" data-template-name="mqtt out">
     <div class="form-row">
         <label for="node-input-broker"><i class="fa fa-globe"></i> <span data-i18n="mqtt.label.broker"></span></label>
@@ -198,7 +132,7 @@
             <option value="1">1</option>
             <option value="2">2</option>
         </select>
-        
+
         <label for="node-input-retain" class="mqtt-form-row-col2"><i class="fa fa-history"></i> <span data-i18n="mqtt.retain"></span></label>
         <select id="node-input-retain" class="mqtt-form-row-col2" >
             <option value=""></option>
@@ -206,49 +140,27 @@
             <option value="true" data-i18n="mqtt.true"></option>
         </select>
     </div>
-    <div class="form-row mqtt5">
-        <label for="node-input-userProperties"><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.userProperties"></span></label>
-        <input id="node-input-userPropertiesType" type="hidden">
-        <input type="text" id="node-input-userProperties" style="width: 70%;" data-i18n="[placeholder]mqtt.label.userProperties" placeholder="">
+    <div class="form-row mqtt5 mqtt5-out">
+        <label for="node-input-userProps"><span data-i18n="mqtt.label.userProperties"></span></label>
+        <input type="text" id="node-input-userProps" style="width: calc(100% - 166px);">
     </div>
-    <div class="form-row mqtt5">
-        <label for="node-input-responseTopic"><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.responseTopic"></span></label>
-        <input id="node-input-responseTopicType" type="hidden">
-        <input type="text" id="node-input-responseTopic" style="width: 70%;" data-i18n="[placeholder]mqtt.label.responseTopic" placeholder="">
+    <div class="form-row mqtt5 mqtt5-out">
+        <label for="node-input-respTopic"><span data-i18n="mqtt.label.responseTopic"></span></label>
+        <input type="text" id="node-input-respTopic" style="width: calc(100% - 166px);">
     </div>
-    <div class="form-row mqtt5">
-        <label for="node-input-correlationData"><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.correlationData"></span></label>
-        <input id="node-input-correlationDataType" type="hidden">
-        <input type="text" id="node-input-correlationData" style="width: 70%;" data-i18n="[placeholder]mqtt.label.correlationData" placeholder="">
+    <div class="form-row mqtt5 mqtt5-out">
+        <label for="node-input-correl"><span data-i18n="mqtt.label.correlationData"></span></label>
+        <input type="text" id="node-input-correl" style="width: calc(100% - 166px);">
     </div>
-    <div class="form-row mqtt5">
-        <label for="node-input-contentType"><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.contentType"></span></label>
-        <input id="node-input-contentTypeType" type="hidden">
-        <input type="text" id="node-input-contentType" style="width: 70%;" data-i18n="[placeholder]mqtt.label.contentType" placeholder="">
+    <div class="form-row mqtt5 mqtt5-out">
+        <label for="node-input-contentType"><span data-i18n="mqtt.label.contentType"></span></label>
+        <input type="text" id="node-input-contentType" style="width: calc(100% - 166px);">
     </div>
 
-    <div class="form-row mqtt-form-row-cols2 mqtt5">
-        <label for="node-input-messageExpiryInterval" class="mqtt-form-row-col1"><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.messageExpiryInterval"></span></label>
-        <input id="node-input-messageExpiryIntervalType" type="hidden">
-        <input id="node-input-messageExpiryInterval"  style="width: 70%;" class="mqtt-form-row-col1" >
-        
-        <!-- FUTURE
-        <label for="node-input-topicAlias" class="mqtt-form-row-col2"><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.topicAlias">Alias</span></label>
-        <input type="number" min="0" id="node-input-topicAlias" class="mqtt-form-row-col2" > -->
-    </div> 
-
-    <!-- FUTURE
-    <div class="form-row mqtt-form-row-cols2 mqtt5">
-        <label for="node-input-subscriptionIdentifier" class="mqtt-form-row-col1"><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.subscriptionIdentifier"></span></label>
-        <input type="number" min="0" max="268435455" id="node-input-subscriptionIdentifier" class="mqtt-form-row-col1" >
-        
-        <label for="node-input-payloadFormatIndicator" class="mqtt-form-row-col2"><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.payloadFormatIndicator"></span></label>
-        <select id="node-input-payloadFormatIndicator" class="mqtt-form-row-col2" >
-            <option value=""></option>
-            <option value="false" data-i18n="mqtt.label.payloadFormatIndicatorFalse"></option>
-            <option value="true" data-i18n="mqtt.label.payloadFormatIndicatorTrue"></option>
-        </select>
-    </div>  -->
+    <div class="form-row mqtt-form-row-cols2 mqtt5 mqtt5-out">
+        <label for="node-input-expiry" class="mqtt-form-row-col1"><span data-i18n="mqtt.label.expiry"></span></label>
+        <input id="node-input-expiry"  style="width: calc(100% - 166px);" class="mqtt-form-row-col1" >
+    </div>
 
     <div class="form-row">
         <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
@@ -257,149 +169,6 @@
     <div class="form-tips"><span data-i18n="mqtt.tip"></span></div>
 </script>
 
-<script type="text/javascript">
-    RED.nodes.registerType('mqtt out',{
-        category: 'network',
-        defaults: {
-            name: {value:""},
-            topic: {value:""},
-            qos: {value:""},
-            retain: {value:""},
-            responseTopic: {value:"responseTopic"},
-            responseTopicType: {value:'none'},
-            contentType: {value:"contentType"},
-            contentTypeType: {value:'none'},
-            userProperties: {value:'userProperties'},
-            userPropertiesType: {value:'none'},
-            correlationData: {value:'correlationData'},
-            correlationDataType: {value:'none'},
-            messageExpiryInterval: {value:"messageExpiryInterval"},
-            messageExpiryIntervalType: {value:'none'},
-            // FUTURE topicAlias: {value:0},
-            // FUTURE payloadFormatIndicator: {value:false},
-            // FUTURE subscriptionIdentifier: {value:0},
-            broker: {type:"mqtt-broker", required:true}
-        },
-        color:"#d8bfd8",
-        inputs:1,
-        outputs:0,
-        icon: "bridge.svg",
-        align: "right",
-        label: function() {
-            return this.name||this.topic||"mqtt";
-            // FUTURE return this.name||this.topic||(this.topicAlias ? "@"+this.topicAlias : "mqtt");
-        },
-        oneditprepare: function() {
-            var typedInputNoneOpt = { value: 'none', label: 'None', hasValue: false };
-
-            function showHideDynamicFields() {
-                var confNode = RED.nodes.node($("#node-input-broker").val());
-                var v5 = confNode && confNode.protocolVersion == "5";
-                if(v5) {
-                    $("div.form-row.mqtt5").show();
-                } else {
-                    $("div.form-row.mqtt5").hide();
-                }
-                var t = $("#node-input-responseTopic").typedInput("type");
-                if (t == 'none') {
-                    $("#node-input-correlationData").parent().hide();
-                } else {
-                    $("#node-input-correlationData").parent().show();
-                }
-            }
-
-            $("#node-input-broker").change(function(d){
-                showHideDynamicFields();
-            });
-            
-            var responseTopicTI = $("#node-input-responseTopic").typedInput({
-                default: 'none',
-                types: [typedInputNoneOpt, 'msg', 'flow', 'global', 'str'],
-                typeField: $("#node-input-responseTopicType")
-            });
-
-            var correlationDataTI = $("#node-input-correlationData").typedInput({
-                default: 'none',
-                types: [typedInputNoneOpt, 'msg', 'flow', 'global', 'bin'],
-                typeField: $("#node-input-correlationDataType")
-            });
-            //show / hide correlation data depending on responseTopic
-            responseTopicTI.on("change", function() {
-                showHideDynamicFields();
-            });
-            responseTopicTI.triggerHandler("change");
-
-            $("#node-input-userProperties").typedInput({
-                default: 'none',
-                types: [typedInputNoneOpt, 'msg', 'flow', 'global', 'json'],
-                typeField: $("#node-input-userPropertiesType")
-            });
-
-            $("#node-input-messageExpiryInterval").typedInput({
-                default: 'none',
-                types: [typedInputNoneOpt, 'msg', 'flow', 'global', 'num'],
-                typeField: $("#node-input-messageExpiryIntervalType")
-            });
-
-            var makeTypedInputOpt = function(value, label, tooltip){
-                return { 
-                    label: label, 
-                    value: value || label, 
-                    title: tooltip,
-                    multiple: true
-                }
-            }
-            //TODO: i18n
-            var commonOpts = [
-                makeTypedInputOpt("application/gzip", "application/gzip", "GZip Compressed Archive"),
-                makeTypedInputOpt("application/json", "application/json", "JSON format"),
-                makeTypedInputOpt("application/octet-stream", "application/octet-stream", "Any kind of binary data"),
-                makeTypedInputOpt("application/ogg", "application/ogg", "OGG"),
-                makeTypedInputOpt("application/pdf", "application/pdf", "Adobe Portable Document Format (PDF)"),
-                makeTypedInputOpt("application/zip", "application/zip", "ZIP archive"),
-                makeTypedInputOpt("audio/aac", "audio/aac", "AAC audio"),
-                makeTypedInputOpt("audio/midi", "audio/midi", "Musical Instrument Digital Interface (MIDI)"),
-                makeTypedInputOpt("audio/x-midi", "audio/x-midi", "Musical Instrument Digital Interface (MIDI)"),
-                makeTypedInputOpt("audio/mpeg", "audio/mpeg", "MP3 audio"),
-                makeTypedInputOpt("audio/ogg", "audio/ogg", "OGG audio"),
-                makeTypedInputOpt("audio/wav", "audio/wav", "Waveform Audio Format"),
-                makeTypedInputOpt("audio/webm", "audio/webm", "WEBM audio"),
-                makeTypedInputOpt("image/bmp", "image/bmp", "Windows OS/2 Bitmap Graphics"),
-                makeTypedInputOpt("image/gif", "image/gif", "Graphics Interchange Format (GIF)"),
-                makeTypedInputOpt("image/jpeg", "image/jpeg", "JPEG images"),
-                makeTypedInputOpt("image/png", "image/png", "Portable Network Graphics"),
-                makeTypedInputOpt("image/tiff", "image/tiff", "Tagged Image File Format (TIFF)"),
-                makeTypedInputOpt("image/webp", "image/webp", "WEBP image"),
-                makeTypedInputOpt("text/csv", "text/csv", "Comma-separated values (CSV)"),
-                makeTypedInputOpt("text/html", "text/html", "HyperText Markup Language (HTML)"),
-                makeTypedInputOpt("text/plain", "text/plain", "Text, (generally ASCII or ISO 8859-n)"),
-                makeTypedInputOpt("video/mpeg", "video/mpeg", "MPEG Video"),
-                makeTypedInputOpt("video/ogg", "video/ogg", "OGG video"),
-                makeTypedInputOpt("video/webm", "video/webm", "WEBM video"),
-            ];
-            $("#node-input-contentType").typedInput({
-                default: 'none',
-                types: [
-                    typedInputNoneOpt,
-                    {
-                        value: "preset",
-                        label: "Preset",
-                        title: "Preset Content-Types",
-                        icon: "fa fa-list",
-                        showLabel: false,
-                        multiple: false,
-                        options: commonOpts,
-                        default: "application/json"
-                    }, 'msg', 'flow', 'global', 'str'],
-                typeField: $("#node-input-contentTypeType")
-            });
-        },
-        labelStyle: function() {
-            return this.name?"node_label_italic":"";
-        }
-    });
-</script>
-
 <script type="text/html" data-template-name="mqtt-broker">
     <div class="form-row">
         <label for="node-config-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
@@ -412,35 +181,14 @@
         <div id="mqtt-broker-tab-connection" style="display:none">
             <div class="form-row node-input-broker">
                 <label for="node-config-input-broker"><i class="fa fa-globe"></i> <span data-i18n="mqtt.label.broker"></span></label>
-                <input type="text" id="node-config-input-broker" style="width:40%;" data-i18n="[placeholder]mqtt.label.example">
+                <input type="text" id="node-config-input-broker" style="width: calc(100% - 300px);" data-i18n="[placeholder]mqtt.label.example">
                 <label for="node-config-input-port" style="margin-left:20px; width:43px; "> <span data-i18n="mqtt.label.port"></span></label>
                 <input type="text" id="node-config-input-port" data-i18n="[placeholder]mqtt.label.port" style="width:55px">
             </div>
-            <div class="form-row">
-                <input type="checkbox" id="node-config-input-usetls" style="display: inline-block; width: auto; vertical-align: top;">
-                <label for="node-config-input-usetls" style="width: auto" data-i18n="mqtt.label.use-tls"></label>
-                <div id="node-config-row-tls" class="hide">
-                    <label style="width: auto; margin-left: 20px; margin-right: 10px;" for="node-config-input-tls"><span data-i18n="mqtt.label.tls-config"></span></label><input style="width: 300px;" type="text" id="node-config-input-tls">
-                </div>
-            </div>
-            <div class="form-row">
-                <label for="node-config-input-clientid"><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.clientid"></span></label>
-                <input type="text" id="node-config-input-clientid" data-i18n="[placeholder]mqtt.placeholder.clientid">
-            </div>
-            <div class="form-row">
-                <label for="node-config-input-keepalive" style="width: auto"><i class="fa fa-clock-o"></i> <span data-i18n="mqtt.label.keepalive"></span></label>
-                <input type="text" id="node-config-input-keepalive" style="width: 50px">
-            </div>
-            <div class="form-row mqtt-form-row-cols2">
-                <label for="node-config-input-cleansession" class="mqtt-form-row-col1"><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.session"></span>Session</label>
-                <div class="mqtt-flag mqtt-form-row-col1" style="display: inline-block;width: calc(35% - 75px);">
-                    <label for="node-config-input-cleansession" style="display: block; padding-left: 15px; text-indent: -15px;">
-                        <input type="checkbox" id="node-config-input-cleansession" style="position: relative;vertical-align: bottom; top: -2px; width: 15px;height: 15px;">
-                        <span data-i18n="mqtt.label.cleansession"></span>
-                    </label>
-                </div>
-                <label for="node-config-input-sessionExpiryInterval" class="mqtt-form-row-col2 mqtt5 sessionExpiryInterval"><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.sessionExpiryInterval"></span></label>
-                <input type="number" min="0" id="node-config-input-sessionExpiryInterval" class="mqtt-form-row-col2 mqtt5 sessionExpiryInterval" >
+            <div class="form-row" style="height: 34px;">
+                <input type="checkbox" id="node-config-input-usetls" style="height: 34px; margin: 0 0 0 104px; display: inline-block; width: auto; vertical-align: top;">
+                <label for="node-config-input-usetls" style="width: 80px; line-height: 34px;" data-ai18n="mqtt.label.use-tls">Use TLS</label>
+                <span id="node-config-row-tls" class="hide"><input style="width: 320px;" type="text" id="node-config-input-tls"></span>
             </div>
             <div class="form-row">
                 <label for="node-config-input-protocolVersion"><i class="fa fa-cog"></i> <span data-i18n="mqtt.label.protocolVersion"></span></label>
@@ -450,24 +198,34 @@
                     <option value="5" data-i18n="mqtt.label.protocolVersion5"></option>
                 </select>
             </div>
-            <!-- FUTURE
+            <div class="form-row">
+                <label for="node-config-input-clientid"><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.clientid"></span></label>
+                <input type="text" id="node-config-input-clientid" data-i18n="[placeholder]mqtt.placeholder.clientid">
+            </div>
+            <div class="form-row">
+                <label for="node-config-input-keepalive"><i class="fa fa-heartbeat"></i> <span data-i18n="mqtt.label.keepalive"></span></label>
+                <input type="number" min="0" id="node-config-input-keepalive" style="width: 100px">
+            </div>
+            <div class="form-row" style="margin-bottom:0">
+                <label style="vertical-align:top;"><i class="fa fa-info"></i> Session</label>
+                <div style="display: inline-block; width:calc(100% - 110px)">
+                    <div class="form-row">
+                        <label for="node-config-input-cleansession" style="width: auto;">
+                            <input type="checkbox" id="node-config-input-cleansession" style="position: relative;vertical-align: bottom; top: -2px; width: 15px;height: 15px;">
+                            <span id="node-config-input-cleansession-label" data-i18n="mqtt.label.cleansession"></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" >
+                    </div>
+                </div>
+            </div>
             <div class="form-row mqtt5">
-                <label for="node-config-input-userProperties"><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.userProperties"></span></label>
-                <input id="node-config-input-userPropertiesType" type="hidden">
-                <input type="text" id="node-config-input-userProperties" style="width: 70%;" data-i18n="[placeholder]mqtt.label.userProperties" placeholder="">
-            </div>            
-            <div class="form-row mqtt5">
-                <label for="node-config-input-topicAliasMaximum"><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.topicAliasMaximum"></span></label>
-                <input type="number" min="0" id="node-config-input-topicAliasMaximum">
-            </div> 
-            <div class="form-row mqtt5">
-                <label for="node-config-input-maximumPacketSize" ><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.maximumPacketSize"></span></label>
-                <input type="number" min="0" id="node-config-input-maximumPacketSize">
-            </div> 
-            <div class="form-row mqtt5">
-                <label for="node-config-input-receiveMaximum" ><i class="fa fa-tag"></i> <span data-i18n="mqtt.label.receiveMaximum"></span></label>
-                <input type="number" min="0" id="node-config-input-receiveMaximum">
-            </div>  -->
+                <label style="width: 125px;" for="node-config-input-userProps"><span data-i18n="mqtt.label.userProperties"></span></label>
+                <input type="text" id="node-config-input-userProps" style="width: calc(100% - 166px);">
+            </div>
+            <br>
         </div>
         <div id="mqtt-broker-tab-security" style="display:none">
             <div class="form-row">
@@ -504,6 +262,26 @@
                             <option value="2">2</option>
                         </select>
                     </div>
+                    <div class="form-row mqtt5 mqtt5-out">
+                        <label for="node-config-input-birth-contentType" data-i18n="mqtt.label.contentType"></label>
+                        <input type="text" style="width:calc(100% - 200px);" id="node-config-input-birth-contentType">
+                    </div>
+                    <div class="form-row mqtt5 mqtt5-out">
+                        <label for="node-config-input-birth-props" data-i18n="mqtt.label.userProperties"></label>
+                        <input type="text" style="width:calc(100% - 200px);" id="node-config-input-birth-props">
+                    </div>
+                    <div class="form-row mqtt5 mqtt5-out">
+                        <label for="node-config-input-birth-respTopic"><span data-i18n="mqtt.label.responseTopic"></span></label>
+                        <input type="text" id="node-config-input-birth-respTopic" style="width: calc(100% - 200px);">
+                    </div>
+                    <div class="form-row mqtt5 mqtt5-out">
+                        <label for="node-config-input-birth-correl"><span data-i18n="mqtt.label.correlationData"></span></label>
+                        <input type="text" id="node-config-input-birth-correl" style="width: calc(100% - 200px);">
+                    </div>
+                    <div class="form-row mqtt5 mqtt5-out">
+                        <label for="node-config-input-birth-expiry"><span data-i18n="mqtt.label.expiry"></span></label>
+                        <input id="node-config-input-birth-expiry"  style="width: calc(100% - 200px);">
+                    </div>
                 </div>
             </div>
             <div id="mqtt-broker-section-close">
@@ -530,6 +308,26 @@
                             <option value="2">2</option>
                         </select>
                     </div>
+                    <div class="form-row mqtt5 mqtt5-out">
+                        <label for="node-config-input-close-contentType" data-i18n="mqtt.label.contentType"></label>
+                        <input type="text" style="width:calc(100% - 200px);" id="node-config-input-close-contentType">
+                    </div>
+                    <div class="form-row mqtt5 mqtt5-out">
+                        <label for="node-config-input-close-props" data-i18n="mqtt.label.userProperties"></label>
+                        <input type="text" style="width:calc(100% - 200px);" id="node-config-input-close-props">
+                    </div>
+                    <div class="form-row mqtt5 mqtt5-out">
+                        <label for="node-config-input-close-respTopic"><span data-i18n="mqtt.label.responseTopic"></span></label>
+                        <input type="text" id="node-config-input-close-respTopic" style="width: calc(100% - 200px);">
+                    </div>
+                    <div class="form-row mqtt5 mqtt5-out">
+                        <label for="node-config-input-close-correl"><span data-i18n="mqtt.label.correlationData"></span></label>
+                        <input type="text" id="node-config-input-close-correl" style="width: calc(100% - 200px);">
+                    </div>
+                    <div class="form-row mqtt5 mqtt5-out">
+                        <label for="node-config-input-close-expiry"><span data-i18n="mqtt.label.expiry"></span></label>
+                        <input id="node-config-input-close-expiry"  style="width: calc(100% - 200px);">
+                    </div>
                 </div>
             </div>
             <div id="mqtt-broker-section-will">
@@ -556,6 +354,30 @@
                             <option value="2">2</option>
                         </select>
                     </div>
+                    <div class="form-row mqtt5">
+                        <label>Delay</label>
+                        <input type="number" min="0" id="node-config-input-will-delay" style="width: 100px" >
+                    </div>
+                    <div class="form-row mqtt5 mqtt5-out">
+                        <label for="node-config-input-will-contentType" data-i18n="mqtt.label.contentType"></label>
+                        <input type="text" style="width:calc(100% - 200px);" id="node-config-input-will-contentType">
+                    </div>
+                    <div class="form-row mqtt5 mqtt5-out">
+                        <label for="node-config-input-will-props" data-i18n="mqtt.label.userProperties"></label>
+                        <input type="text" style="width:calc(100% - 200px);" id="node-config-input-will-props">
+                    </div>
+                    <div class="form-row mqtt5 mqtt5-out">
+                        <label for="node-config-input-will-respTopic"><span data-i18n="mqtt.label.responseTopic"></span></label>
+                        <input type="text" id="node-config-input-will-respTopic" style="width: calc(100% - 200px);">
+                    </div>
+                    <div class="form-row mqtt5 mqtt5-out">
+                        <label for="node-config-input-will-correl"><span data-i18n="mqtt.label.correlationData"></span></label>
+                        <input type="text" id="node-config-input-will-correl" style="width: calc(100% - 200px);">
+                    </div>
+                    <div class="form-row mqtt5 mqtt5-out">
+                        <label for="node-config-input-will-expiry"><span data-i18n="mqtt.label.expiry"></span></label>
+                        <input id="node-config-input-will-expiry"  style="width: calc(100% - 200px);">
+                    </div>
                 </div>
             </div>
         </div>
@@ -563,6 +385,40 @@
 </script>
 
 <script type="text/javascript">
+(function() {
+
+    var typedInputNoneOpt = { value: 'none', label: '', hasValue: false };
+    var makeTypedInputOpt = function(value){
+        return {
+            value: value,
+            label:value,
+            hasValue: false
+        }
+    }
+    var contentTypeOpts = [
+        typedInputNoneOpt,
+        makeTypedInputOpt("application/json"),
+        makeTypedInputOpt("application/octet-stream"),
+        makeTypedInputOpt("text/csv"),
+        makeTypedInputOpt("text/html"),
+        makeTypedInputOpt("text/plain"),
+        {value:"other", label:""}
+    ];
+
+    function getDefaultContentType(value) {
+        var defaultContentType;
+        var matchedContentType = contentTypeOpts.filter(function(v) {
+            return v.value === value;
+        })
+        if (matchedContentType.length > 0) {
+            defaultContentType = matchedContentType[0].value;
+        }
+        if (value && !defaultContentType) {
+            defaultContentType = 'other';
+        }
+        return defaultContentType || 'none'
+    }
+
     RED.nodes.registerType('mqtt-broker',{
         category: 'config',
         defaults: {
@@ -588,20 +444,18 @@
             birthQos: {value:"0"},
             birthRetain: {value:false},
             birthPayload: {value:""},
+            birthMsg: { value: {}},
             closeTopic: {value:""},
             closeQos: {value:"0"},
             closeRetain: {value:false},
             closePayload: {value:""},
+            closeMsg: { value: {}},
             willTopic: {value:""},
             willQos: {value:"0"},
             willRetain: {value:false},
             willPayload: {value:""},
-            sessionExpiryInterval: {value:0},
-            // FUTURE topicAliasMaximum: {value:0},
-            // FUTURE maximumPacketSize: {value:0},
-            // FUTURE receiveMaximum: {value:0},
-            // FUTURE userPropertiesType: {value:"json"},
-            // FUTURE userProperties: {value:"{}"},
+            willMsg: { value: {}},
+            sessionExpiry: {value:0}
         },
         credentials: {
             user: {type:"text"},
@@ -643,8 +497,8 @@
                 label: this._("mqtt.tabs-label.messages")
             });
 
-            function setUpSection(sectionId, isExpanded) {
-                var birthMessageSection = $(sectionId);
+            function setUpSection(sectionId, v5Opts, isExpanded) {
+                var birthMessageSection = $("#mqtt-broker-section-"+sectionId);
                 var paletteHeader = birthMessageSection.find('.red-ui-palette-header');
                 var twistie = paletteHeader.find('i');
                 var sectionContent = birthMessageSection.find('.section-content');
@@ -659,6 +513,27 @@
                     toggleSection(!isExpanded);
                 });
                 toggleSection(isExpanded);
+                $("#node-config-input-"+sectionId+"-contentType").val(v5Opts?v5Opts.contentType:"").typedInput({
+                    default: getDefaultContentType(v5Opts?v5Opts.contentType:""),
+                    types: contentTypeOpts,
+                });
+
+                $("#node-config-input-"+sectionId+"-props").val(v5Opts?v5Opts.userProps:"").typedInput({
+                    default:  !(v5Opts?v5Opts.userProps:null)? 'none':'json',
+                    types: [typedInputNoneOpt, 'json'],
+                });
+                $("#node-config-input-"+sectionId+"-respTopic").val(v5Opts?v5Opts.respTopic:"").typedInput({
+                    default:  !(v5Opts?v5Opts.respTopic:null)? 'none':'str',
+                    types: [typedInputNoneOpt, 'str'],
+                });
+                $("#node-config-input-"+sectionId+"-correl").val(v5Opts?v5Opts.correl:"").typedInput({
+                    default:  !(v5Opts?v5Opts.correl:null)? 'none':'str',
+                    types: [typedInputNoneOpt, 'str'],
+                });
+                $("#node-config-input-"+sectionId+"-expiry").val(v5Opts?v5Opts.expiry:"").typedInput({
+                    default:  !(v5Opts?v5Opts.expiry:null)? 'none':'num',
+                    types: [typedInputNoneOpt, 'num'],
+                });
             }
 
             // show first section if none are set so the user gets the idea
@@ -666,9 +541,13 @@
                 || this.willTopic === ""
                 && this.birthTopic === ""
                 && this.closeTopic == "";
-            setUpSection('#mqtt-broker-section-birth', showBirthSection);
-            setUpSection('#mqtt-broker-section-close', this.closeTopic !== "");
-            setUpSection('#mqtt-broker-section-will', this.willTopic !== "");
+            setUpSection('birth', this.birthMsg, showBirthSection);
+            setUpSection('close', this.closeMsg, this.closeTopic !== "");
+            setUpSection('will', this.willMsg, this.willTopic !== "");
+
+            if (this.willMsg) {
+                $("#node-config-input-will-delay").val(this.willMsg.delay);
+            }
 
             setTimeout(function() { tabs.resize(); },0);
             if (typeof this.cleansession === 'undefined') {
@@ -686,30 +565,21 @@
             if (typeof this.protocolVersion === 'undefined') {
                 this.protocolVersion = 4;
             }
-            function updateSessionExpiryIntervalVisibility() {
-                var hide = ($("#node-config-input-cleansession").is(":checked") || $("#node-config-input-protocolVersion").val() != "5");
-                if(hide) {
-                    $(".sessionExpiryInterval").hide();
-                } else {
-                    $(".sessionExpiryInterval").show();
-                }
-            }            
-            $("#node-config-input-protocolVersion").change(function(){
+            $("#node-config-input-protocolVersion").on("change", function() {
                 var v5 = $("#node-config-input-protocolVersion").val() == "5";
                 if(v5) {
+                    $("#node-config-input-cleansession-label").text(RED._("node-red:mqtt.label.cleanstart"))
                     $("div.form-row.mqtt5").show();
                 } else {
+                    $("#node-config-input-cleansession-label").text(RED._("node-red:mqtt.label.cleansession"))
                     $("div.form-row.mqtt5").hide();
                 }
-                updateSessionExpiryIntervalVisibility();
             });
             $("#node-config-input-protocolVersion").val(this.protocolVersion);
-            // FUTURE
-            // $("#node-config-input-userProperties").typedInput({
-            //     default: "json",
-            //     types:['json'],
-            //     typeField: $("#node-config-input-userPropertiesType")
-            // });            
+            $("#node-config-input-userProps").typedInput({
+                default:  !this.userProps ? 'none':'json',
+                types: [typedInputNoneOpt, 'json']
+            });
             if (typeof this.keepalive === 'undefined') {
                 this.keepalive = 15;
                 $("#node-config-input-keepalive").val(this.keepalive);
@@ -727,6 +597,7 @@
                 $("#node-config-input-willQos").val("0");
             }
 
+
             function updateTLSOptions() {
                 if ($("#node-config-input-usetls").is(':checked')) {
                     $("#node-config-row-tls").show();
@@ -745,8 +616,7 @@
                 } else {
                     $("#node-config-input-clientid").attr("placeholder",node._("mqtt.placeholder.clientid-nonclean"));
                 }
-                updateSessionExpiryIntervalVisibility();
-                $("#node-config-input-clientid").change();
+                $("#node-config-input-clientid").trigger("change");
             }
             setTimeout(updateClientId,0);
             $("#node-config-input-cleansession").on("click",function() {
@@ -773,12 +643,198 @@
                 updatePortEntry();
             });
             setTimeout(updatePortEntry,50);
+            setTimeout(function() {
+                $("#node-config-input-protocolVersion").trigger("change");
+            },50);
 
         },
         oneditsave: function() {
             if (!$("#node-config-input-usetls").is(':checked')) {
                 $("#node-config-input-tls").val("");
             }
+
+            var v5 = $("#node-config-input-protocolVersion").val() == "5";
+
+            function saveV5Message(section) {
+                var msg = {};
+                if ($("#node-config-input-"+section+"Topic").val().trim().length > 0) {
+                    var contentType = $("#node-config-input-"+section+"-contentType").val().trim();
+                    if (contentType === '') {
+                        contentType = $("#node-config-input-"+section+"-contentType").typedInput('type');
+                        if (contentType === 'none' || contentType === 'other') {
+                            contentType = "";
+                        }
+                    }
+                    if (contentType) {
+                        msg.contentType = contentType;
+                    }
+                    var props = $("#node-config-input-"+section+"-props").val().trim();
+                    if (props) {
+                        msg.userProps = props;
+                    }
+                    var resp = $("#node-config-input-"+section+"-respTopic").val().trim();
+                    if (props) {
+                        msg.respTopic = resp;
+                    }
+                    var correl = $("#node-config-input-"+section+"-correl").val().trim();
+                    if (correl) {
+                        msg.correl = correl;
+                    }
+                    var expiry = $("#node-config-input-"+section+"-expiry").val().trim();
+                    if (expiry) {
+                        msg.expiry = expiry;
+                    }
+                }
+                return msg;
+            }
+
+            if (v5) {
+                this.birthMsg = saveV5Message("birth");
+                this.closeMsg = saveV5Message("close");
+                this.willMsg = saveV5Message("will");
+                var willDelay = $("#node-config-input-will-delay").val();
+                if (willDelay) {
+                    this.willMsg.delay = willDelay;
+                }
+            } else {
+                this.willMsg = {};
+                this.birthMsg = {};
+                this.closeMsg = {};
+            }
+
         }
     });
+    RED.nodes.registerType('mqtt in',{
+        category: 'network',
+        defaults: {
+            name: {value:""},
+            topic: {value:"",required:true,validate: RED.validators.regex(/^(#$|(\+|[^+#]*)(\/(\+|[^+#]*))*(\/(\+|#|[^+#]*))?$)/)},
+            qos: {value: "2"},
+            datatype: {value:"auto",required:true},
+            broker: {type:"mqtt-broker", required:true},
+            // subscriptionIdentifier: {value:0},
+            nl: {value:false},
+            rap: {value:true},
+            rh: {value:0},
+        },
+        color:"#d8bfd8",
+        inputs:0,
+        outputs:1,
+        icon: "bridge.svg",
+        label: function() {
+            return this.name||this.topic||"mqtt";
+        },
+        labelStyle: function() {
+            return this.name?"node_label_italic":"";
+        },
+        oneditprepare: function() {
+            $("#node-input-broker").on("change",function(d){
+                var confNode = RED.nodes.node($("#node-input-broker").val());
+                var v5 = confNode && confNode.protocolVersion == "5";
+                if(v5) {
+                    $("div.form-row.mqtt5").show();
+                } else {
+                    $("div.form-row.mqtt5").hide();
+                }
+            });
+            if (this.qos === undefined) {
+                $("#node-input-qos").val("2");
+            }
+            if (this.datatype === undefined) {
+                $("#node-input-datatype").val("auto");
+            }
+        }
+    });
+
+    RED.nodes.registerType('mqtt out',{
+        category: 'network',
+        defaults: {
+            name: {value:""},
+            topic: {value:""},
+            qos: {value:""},
+            retain: {value:""},
+            respTopic: {value:""},
+            contentType: {value:""},
+            userProps: {value:''},
+            correl: {value:''},
+            expiry: {value:''},
+            broker: {type:"mqtt-broker", required:true}
+        },
+        color:"#d8bfd8",
+        inputs:1,
+        outputs:0,
+        icon: "bridge.svg",
+        align: "right",
+        label: function() {
+            return this.name||this.topic||"mqtt";
+        },
+        oneditprepare: function() {
+            var that = this;
+
+            function showHideDynamicFields() {
+                var confNode = RED.nodes.node($("#node-input-broker").val());
+                var v5 = confNode && confNode.protocolVersion == "5";
+                if(v5) {
+                    $("div.form-row.mqtt5").show();
+                    var t = $("#node-input-respTopic").typedInput("type");
+                    if (t == 'none') {
+                        $("#node-input-correl").parent().hide();
+                    } else {
+                        $("#node-input-correl").parent().show();
+                    }
+                } else {
+                    $("div.form-row.mqtt5").hide();
+                }
+            }
+
+            $("#node-input-broker").on("change",function(d){
+                showHideDynamicFields();
+            });
+
+            var respTopicTI = $("#node-input-respTopic").typedInput({
+                default: !this.respTopic ? 'none':'str',
+                types: [typedInputNoneOpt,  'str'],
+            });
+
+            var correlTI = $("#node-input-correl").typedInput({
+                default: !this.correl ? 'none':'str',
+                types: [typedInputNoneOpt,  'str']
+            });
+            //show / hide correlation data depending on respTopic
+            respTopicTI.on("change", showHideDynamicFields);
+            respTopicTI.triggerHandler("change");
+
+            $("#node-input-userProps").typedInput({
+                default:  !this.userProps ? 'none':'json',
+                types: [typedInputNoneOpt, 'json'],
+            });
+            $("#node-input-expiry").typedInput({
+                default: !this.expiry ? 'none':'num',
+                types: [typedInputNoneOpt,  'num']
+            });
+            $("#node-input-contentType").on('change', function (event, type, value, urg) {
+                console.log(event);
+                console.log("ct change",type,value, urg);
+            }).typedInput({
+                default: getDefaultContentType(this.contentType),
+                types: contentTypeOpts
+            })
+        },
+        oneditsave: function() {
+
+            var contentType = $("#node-input-contentType").val().trim();
+            if (contentType === '') {
+                contentType = $("#node-input-contentType").typedInput('type');
+                if (contentType === 'none' || contentType === 'other') {
+                    contentType = "";
+                }
+            }
+            $("#node-input-contentType").val(contentType)
+
+        },
+        labelStyle: function() {
+            return this.name?"node_label_italic":"";
+        }
+    });
+})();
 </script>
\ No newline at end of file
diff --git a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js
index 103e161c5..c9d0c8246 100644
--- a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js
+++ b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js
@@ -14,8 +14,6 @@
  * limitations under the License.
  **/
 
-const { debug } = require("console");
-
 module.exports = function(RED) {
     "use strict";
     var mqtt = require("mqtt");
@@ -55,8 +53,8 @@ module.exports = function(RED) {
      * @param {integer} [def] An optional default to set in the destination object if prop is NOT present in the soruce object
      */
     function setIntProp(src, dst, propName, minVal, maxVal, def) {
-        if (src.hasOwnProperty(propName)) { 
-            var v = parseInt(src[propName]); 
+        if (src.hasOwnProperty(propName)) {
+            var v = parseInt(src[propName]);
             if(isNaN(v)) return;
             if(minVal != null) {
                 if(v < minVal) return;
@@ -69,7 +67,7 @@ module.exports = function(RED) {
             if(def != undefined) dst[propName] = def;
         }
     }
-    
+
     /**
      * Helper function for setting string property values in the MQTT V5 properties object
      * @param {object} src Source object containing properties
@@ -78,7 +76,7 @@ module.exports = function(RED) {
      * @param {string} [def] An optional default to set in the destination object if prop is NOT present in the soruce object
      */
     function setStrProp(src, dst, propName, def) {
-        if (src[propName] && typeof src[propName] == "string") { 
+        if (src[propName] && typeof src[propName] == "string") {
             dst[propName] = src[propName];
         } else {
             if(def != undefined) dst[propName] = def;
@@ -93,7 +91,7 @@ module.exports = function(RED) {
      * @param {boolean} [def] An optional default to set in the destination object if prop is NOT present in the soruce object
      */
     function setBoolProp(src, dst, propName, def) {
-        if (src[propName] != null) { 
+        if (src[propName] != null) {
             if(src[propName] === "true" || src[propName] === true) {
                 dst[propName] = true;
             } else if(src[propName] === "false" || src[propName] === false) {
@@ -105,14 +103,14 @@ module.exports = function(RED) {
     }
 
     /**
-     * Helper function for copying the MQTT v5 srcUserProperties object (parameter1) to the properties object (parameter2). 
+     * Helper function for copying the MQTT v5 srcUserProperties object (parameter1) to the properties object (parameter2).
      * Any property in srcUserProperties that is NOT a key/string pair will be silently discarded.
      * NOTE: if no sutable properties are present, the userProperties object will NOT be added to the properties object
      * @param {object} srcUserProperties An object with key/value string pairs
      * @param {object} properties A properties object in which userProperties will be copied to
      */
     function setUserProperties(srcUserProperties, properties) {
-        if (srcUserProperties && typeof srcUserProperties == "object") { 
+        if (srcUserProperties && typeof srcUserProperties == "object") {
             let _clone = {};
             let count = 0;
             let keys = Object.keys(srcUserProperties);
@@ -129,7 +127,7 @@ module.exports = function(RED) {
     }
 
     /**
-     * Helper function for copying the MQTT v5 buffer type properties 
+     * Helper function for copying the MQTT v5 buffer type properties
      * NOTE: if src[propName] is not a buffer, dst[propName] will NOT be assigned a value (unless def is set)
      * @param {object} src Source object containing properties
      * @param {object} dst Destination object to set/add properties
@@ -140,7 +138,7 @@ module.exports = function(RED) {
         if(!dst) return;
         if (src && dst) {
             var buf = src[propName];
-            if (buf && typeof Buffer.isBuffer(buf)) { 
+            if (buf && typeof Buffer.isBuffer(buf)) {
                 dst[propName] = Buffer.from(buf);
             }
         } else {
@@ -162,7 +160,7 @@ module.exports = function(RED) {
         this.protocolVersion = n.protocolVersion;
         this.keepalive = n.keepalive;
         this.cleansession = n.cleansession;
-        this.sessionExpiryInterval = n.sessionExpiryInterval;
+        this.sessionExpiryInterval = n.sessionExpiry;
         this.topicAliasMaximum = n.topicAliasMaximum;
         this.maximumPacketSize = n.maximumPacketSize;
         this.receiveMaximum = n.receiveMaximum;
@@ -186,6 +184,20 @@ module.exports = function(RED) {
                 retain: n.birthRetain=="true"|| n.birthRetain===true,
                 //TODO: add payloadFormatIndicator, messageExpiryInterval, contentType, responseTopic, correlationData, userProperties
             };
+            if (n.birthMsg) {
+                setStrProp(n.birthMsg, this.birthMessage, "contentType");
+                if(n.birthMsg.userProps && /^ *{/.test(n.birthMsg.userProps)) {
+                    try {
+                        this.birthMessage.userProperties = JSON.parse(n.birthMsg.userProps)
+                    } catch(err) {}
+                }
+                n.birthMsg.responseTopic = n.birthMsg.respTopic;
+                setStrProp(n.birthMsg, this.birthMessage, "responseTopic");
+                n.birthMsg.correlationData = n.birthMsg.correl;
+                setBufferProp(n.birthMsg, this.birthMessage, "correlationData");
+                n.birthMsg.messageExpiryInterval = n.birthMsg.expiry
+                setIntProp(n.willMsg,this.birthMessage, "messageExpiryInterval")
+            }
         }
 
         if (n.closeTopic) {
@@ -196,6 +208,20 @@ module.exports = function(RED) {
                 retain: n.closeRetain=="true"|| n.closeRetain===true,
                 //TODO: add payloadFormatIndicator, messageExpiryInterval, contentType, responseTopic, correlationData, userProperties
             };
+            if (n.closeMsg) {
+                setStrProp(n.closeMsg, this.closeMessage, "contentType");
+                if(n.closeMsg.userProps && /^ *{/.test(n.closeMsg.userProps)) {
+                    try {
+                        this.closeMessage.userProperties = JSON.parse(n.closeMsg.userProps)
+                    } catch(err) {}
+                }
+                n.closeMsg.responseTopic = n.closeMsg.respTopic;
+                setStrProp(n.closeMsg, this.closeMessage, "responseTopic");
+                n.closeMsg.correlationData = n.closeMsg.correl;
+                setBufferProp(n.closeMsg, this.closeMessage, "correlationData");
+                n.closeMsg.messageExpiryInterval = n.closeMsg.expiry
+                setIntProp(n.willMsg,this.closeMessage, "messageExpiryInterval")
+            }
         }
 
         if (this.credentials) {
@@ -302,16 +328,14 @@ module.exports = function(RED) {
             this.options.properties = {};
             this.options.properties.requestResponseInformation = true;
             this.options.properties.requestProblemInformation = true;
-            if(this.userProperties) {
-                let userProperties = RED.util.evaluateNodeProperty(this.userProperties, this.userPropertiesType, this, {});
-                setUserProperties(userProperties, this.options.properties);
+            if(this.userProperties && /^ *{/.test(this.userProperties)) {
+                try {
+                    setUserProperties(JSON.parse(this.userProperties), this.options.properties);
+                } catch(err) {}
+            }
+            if (this.sessionExpiryInterval && this.sessionExpiryInterval !== "0") {
+                setIntProp(this,this.options.properties,"sessionExpiryInterval");
             }
-            setIntProp(this,this.options.properties,"sessionExpiryInterval", 0);
-            setIntProp(this,this.options.properties,"topicAliasMaximum", 0);
-            setIntProp(this,this.options.properties,"maximumPacketSize", 0);
-            setIntProp(this,this.options.properties,"receiveMaximum", 0);
-            setStrProp(this,this.options.properties,"authenticationMethod"); //TODO: authenticationMethod: the name of the authentication method used for extended authentication string,
-            setBufferProp(this,this.options.properties,"authenticationData"); //TODO: authenticationData: Binary Data containing authentication data
         }
         if (this.usetls && n.tls) {
             var tlsNode = RED.nodes.getNode(n.tls);
@@ -319,7 +343,6 @@ module.exports = function(RED) {
                 tlsNode.addTLSOptions(this.options);
             }
         }
-        // console.log(this.brokerurl,this.options);
 
         // If there's no rejectUnauthorized already, then this could be an
         // old config where this option was provided on the broker node and
@@ -336,8 +359,29 @@ module.exports = function(RED) {
                 retain: n.willRetain=="true"|| n.willRetain===true,
                 //TODO: add willDelayInterval, payloadFormatIndicator, messageExpiryInterval, contentType, responseTopic, correlationData, userProperties
             };
+            if (n.willMsg) {
+                this.options.will.properties = {};
+
+                setStrProp(n.willMsg, this.options.will.properties, "contentType");
+                if(n.willMsg.userProps && /^ *{/.test(n.willMsg.userProps)) {
+                    try {
+                        this.options.will.properties.userProperties = JSON.parse(n.willMsg.userProps)
+                    } catch(err) {}
+                }
+                n.willMsg.responseTopic = n.willMsg.respTopic;
+                setStrProp(n.willMsg, this.options.will.properties, "responseTopic");
+                n.willMsg.correlationData = n.willMsg.correl;
+                setBufferProp(n.willMsg, this.options.will.properties, "correlationData");
+                n.willMsg.willDelayInterval = n.willMsg.delay
+                setIntProp(n.willMsg,this.options.will.properties, "willDelayInterval")
+                n.willMsg.messageExpiryInterval = n.willMsg.expiry
+                setIntProp(n.willMsg,this.options.will.properties, "messageExpiryInterval")
+                this.options.will.payloadFormatIndicator = true;
+            }
         }
 
+        // console.log(this.brokerurl,this.options);
+
         // Define functions called by MQTT in and out nodes
         var node = this;
         this.users = {};
@@ -376,26 +420,27 @@ module.exports = function(RED) {
                     node.client.on('connect', function (connack) {
                         node.connecting = false;
                         node.connected = true;
+                        node.topicAliases = {};
                         node.log(RED._("mqtt.state.connected",{broker:(node.clientid?node.clientid+"@":"")+node.brokerurl}));
                         if(node.options.protocolVersion == 5 && connack && connack.hasOwnProperty("properties")) {
                             if(typeof connack.properties == "object") {
                                 //clean & assign all props sent from server.
-                                setIntProp(connack.properties, node.serverProperties, "topicAliasMaximum", 1);
+                                setIntProp(connack.properties, node.serverProperties, "topicAliasMaximum", 0);
                                 setIntProp(connack.properties, node.serverProperties, "receiveMaximum", 0);
                                 setIntProp(connack.properties, node.serverProperties, "sessionExpiryInterval", 0, 0xFFFFFFFF);
                                 setIntProp(connack.properties, node.serverProperties, "maximumQoS", 0, 2);
-                                setBoolProp(connack.properties, node.serverProperties, "retainAvailable");
-                                setBoolProp(connack.properties, node.serverProperties, "wildcardSubscriptionAvailable");
-                                setBoolProp(connack.properties, node.serverProperties, "subscriptionIdentifiersAvailable");
+                                setBoolProp(connack.properties, node.serverProperties, "retainAvailable",true);
+                                setBoolProp(connack.properties, node.serverProperties, "wildcardSubscriptionAvailable", true);
+                                setBoolProp(connack.properties, node.serverProperties, "subscriptionIdentifiersAvailable", true);
                                 setBoolProp(connack.properties, node.serverProperties, "sharedSubscriptionAvailable");
-                                setIntProp(connack.properties, node.serverProperties, "maximumPacketSize", 0); 
-                                setIntProp(connack.properties, node.serverProperties, "serverKeepAlive"); 
-                                setStrProp(connack.properties, node.serverProperties, "responseInformation"); 
-                                setStrProp(connack.properties, node.serverProperties, "serverReference"); 
-                                setStrProp(connack.properties, node.serverProperties, "assignedClientIdentifier"); 
-                                setStrProp(connack.properties, node.serverProperties, "reasonString"); 
+                                setIntProp(connack.properties, node.serverProperties, "maximumPacketSize", 0);
+                                setIntProp(connack.properties, node.serverProperties, "serverKeepAlive");
+                                setStrProp(connack.properties, node.serverProperties, "responseInformation");
+                                setStrProp(connack.properties, node.serverProperties, "serverReference");
+                                setStrProp(connack.properties, node.serverProperties, "assignedClientIdentifier");
+                                setStrProp(connack.properties, node.serverProperties, "reasonString");
                                 setUserProperties(connack.properties, node.serverProperties);
-                                debug("MQTTBrokerNode: ⬆ CONNECTED. node.serverProperties ==> ", node.serverProperties );//TODO: remove
+                                // node.debug("CONNECTED. node.serverProperties ==> "+JSON.stringify(node.serverProperties));//TODO: remove
                             }
                         }
                         for (var id in node.users) {
@@ -416,12 +461,10 @@ module.exports = function(RED) {
                                     if (node.subscriptions[s].hasOwnProperty(r)) {
                                         qos = Math.max(qos,node.subscriptions[s][r].qos);
                                         _options = node.subscriptions[s][r].options;
-                                        debug(`MQTTBrokerNode:${node.id}: Re-subscribe - registering handler ref ${r} for ${s} `);//TODO: remove
                                         node.client.on('message',node.subscriptions[s][r].handler);
                                     }
                                 }
                                 _options.qos = _options.qos || qos;
-                                debug(`MQTTBrokerNode:${node.id}: Re-subscribe - subscribing to topic '${topic}'`, _options);//TODO: remove
                                 node.client.subscribe(topic, _options);
                             }
                         }
@@ -432,7 +475,6 @@ module.exports = function(RED) {
                         }
                     });
                     node.client.on("reconnect", function() {
-                        debug('MQTTBrokerNode reconnect event'); //TODO: remove
                         for (var id in node.users) {
                             if (node.users.hasOwnProperty(id)) {
                                 node.users[id].status({fill:"yellow",shape:"ring",text:"node-red:common.status.connecting"});
@@ -442,14 +484,12 @@ module.exports = function(RED) {
                     //TODO: what to do with this event? Anything? Necessary?
                     node.client.on("disconnect", function(packet) {
                         //Emitted after receiving disconnect packet from broker. MQTT 5.0 feature.
-                        debug('MQTTBrokerNode disconnect event', packet); //TODO: remove //TODO: remove
                         var rc = packet && packet.properties && packet.properties.reasonString;
                         var rc = packet && packet.properties && packet.reasonCode;
                         //TODO: If keeping this event, do we use these? log these?
                     });
                     // Register disconnect handlers
                     node.client.on('close', function () {
-                        debug('MQTTBrokerNode close event', arguments); //TODO: remove 
                         if (node.connected) {
                             node.connected = false;
                             node.log(RED._("mqtt.state.disconnected",{broker:(node.clientid?node.clientid+"@":"")+node.brokerurl}));
@@ -466,7 +506,6 @@ module.exports = function(RED) {
                     // Register connect error handler
                     // The client's own reconnect logic will take care of errors
                     node.client.on('error', function (error) {
-                        debug('MQTTBrokerNode error event', error); //TODO: remove 
                     });
                 }catch(err) {
                     console.log(err);
@@ -474,6 +513,8 @@ module.exports = function(RED) {
             }
         };
 
+        this.subscriptionIds = {};
+        this.subid = 1;
         this.subscribe = function (topic,options,callback,ref) {
             ref = ref||0;
             var qos;
@@ -484,27 +525,33 @@ module.exports = function(RED) {
                 options = {};
             }
             options.qos = qos;
+            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) {
-                    debug(`MQTTBrokerNode:${node.id}: this.subscribe.handler - attempting to match '${topic}' to '${mtopic}' `, mpacket); //TODO: remove
                     if(mpacket.properties && options.properties && mpacket.properties.subscriptionIdentifier && options.properties.subscriptionIdentifier && (mpacket.properties.subscriptionIdentifier !== options.properties.subscriptionIdentifier) ) {
                         //do nothing as subscriptionIdentifier does not match
-                        debug(`MQTTBrokerNode:${node.id}: > no match - this nodes subID (${options.properties.subscriptionIdentifier}) !== packet subID (${mpacket.properties.subscriptionIdentifier})`); //TODO: remove
+                        // node.debug(`> no match - this nodes subID (${options.properties.subscriptionIdentifier}) !== packet subID (${mpacket.properties.subscriptionIdentifier})`); //TODO: remove
                     } else if (matchTopic(topic,mtopic)) {
-                        debug(`MQTTBrokerNode:${node.id}: >  MATCHED '${topic}' to '${mtopic}' - performing callback`); //TODO: remove
+                        // node.debug(`>  MATCHED '${topic}' to '${mtopic}' - performing callback`); //TODO: remove
                         callback(mtopic,mpayload, mpacket);
-                    } else 
-                        debug(`MQTTBrokerNode:${node.id}: > no match / no callback`); //TODO: remove
+                    } else {
+                        // node.debug(`> no match / no callback`); //TODO: remove
+                    }
                 },
                 ref: ref
             };
             node.subscriptions[topic][ref] = sub;
             if (node.connected) {
-                debug(`MQTTBrokerNode:${node.id}: this.subscribe - registering handler ref ${ref} for ${topic} and subscribing`, options); //TODO: remove
+                // node.debug(`this.subscribe - registering handler ref ${ref} for ${topic} and subscribing `+JSON.stringify(options)); //TODO: remove
                 node.client.on('message',sub.handler);
                 node.client.subscribe(topic, options);
             }
@@ -513,33 +560,35 @@ module.exports = function(RED) {
         this.unsubscribe = function (topic, ref, removed) {
             ref = ref||0;
             var sub = node.subscriptions[topic];
-            var _debug = `MQTTBrokerNode ${node.id}: unsubscribe for topic ${topic} called... ` ; //TODO: remove
+            // var _debug = `unsubscribe for topic ${topic} called... ` ; //TODO: remove
             if (sub) {
-                _debug += "sub found. " //TODO: remove
+                // _debug += "sub found. " //TODO: remove
                 if (sub[ref]) {
-                    // debug(`MQTTBrokerNode:${node.id}: this.unsubscribe - removing handler ref ${ref} for ${topic} `); //TODO: remove
-                    _debug += `removing handler ref ${ref} for ${topic}. `
+                    // debug(`this.unsubscribe - removing handler ref ${ref} for ${topic} `); //TODO: remove
+                    // _debug += `removing handler ref ${ref} for ${topic}. `
                     node.client.removeListener('message',sub[ref].handler);
                     delete sub[ref];
                 }
-                //TODO: Review. The `if(removed)` was commented out to always delete and remove subscriptions. 
+                //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 (Object.keys(sub).length === 0) {
                         delete node.subscriptions[topic];
+                        delete node.subscriptionIds[topic];
                         if (node.connected) {
-                            _debug += `calling client.unsubscribe to remove topic ${topic}` //TODO: remove
+                            // _debug += `calling client.unsubscribe to remove topic ${topic}` //TODO: remove
                             node.client.unsubscribe(topic);
                         }
                     }
                 //}
             } else {
-                _debug += "sub not found! "; //TODO: remove
+                // _debug += "sub not found! "; //TODO: remove
             }
-            debug(_debug); //TODO: remove
+            // node.debug(_debug); //TODO: remove
 
         };
+        this.topicAliases = {};
 
         this.publish = function (msg,done) {
             if (node.connected) {
@@ -562,17 +611,29 @@ module.exports = function(RED) {
                     setStrProp(msg, options.properties, "responseTopic");
                     setBufferProp(msg, options.properties, "correlationData");
                     setStrProp(msg, options.properties, "contentType");
-                    setIntProp(msg, options.properties, "messageExpiryInterval", 0); 
+                    setIntProp(msg, options.properties, "messageExpiryInterval", 0);
+                    if (msg.userProperties) {
+                        options.properties.userProperties = msg.userProperties;
+                    }
                     setUserProperties(msg.userProperties, options.properties);
                     setIntProp(msg, options.properties, "topicAlias", 1, node.serverProperties.topicAliasMaximum || 0);
-                    setBoolProp(msg, options.properties, "payloadFormatIndicator"); 
+                    setBoolProp(msg, options.properties, "payloadFormatIndicator");
                     //FUTURE setIntProp(msg, options.properties, "subscriptionIdentifier", 1, 268435455);
+                    if (options.properties.topicAlias) {
+                        if (!node.topicAliases.hasOwnProperty(options.properties.topicAlias) && msg.topic == "") {
+                            done("Invalid topicAlias");
+                            return
+                        }
+                        if (node.topicAliases[options.properties.topicAlias] === msg.topic) {
+                            msg.topic = ""
+                        } else {
+                            node.topicAliases[options.properties.topicAlias] = msg.topic
+                        }
+                    }
                 }
-                // debug(`MQTTBrokerNode:${node.id}: publish - sending payload to ${msg.topic ? msg.topic : (msg.topicAlias ? 'topicAlias-'+msg.topicAlias : '???') } `, options);//TODO: remove
-                debug(`MQTTBrokerNode:${node.id}: publish - sending payload to ${msg.topic} `, options);//TODO: remove
+
                 node.client.publish(msg.topic, msg.payload, options, function(err) {
-                    if(err) node.error(err,msg);//catch errors
-                    done && done();
+                    done && done(err);
                     return
                 });
             }
@@ -611,8 +672,6 @@ module.exports = function(RED) {
         this.topic = n.topic;
         this.qos = parseInt(n.qos);
         this.subscriptionIdentifier = n.subscriptionIdentifier;//https://docs.oasis-open.org/mqtt/mqtt/v5.0/os/mqtt-v5.0-os.html#_Toc3901117
-        this.userProperties = n.userProperties;//https://docs.oasis-open.org/mqtt/mqtt/v5.0/os/mqtt-v5.0-os.html#_Toc3901116
-        this.userPropertiesType = n.userPropertiesType;
         this.nl = n.nl;
         this.rap = n.rap;
         this.rh = n.rh;
@@ -635,21 +694,21 @@ module.exports = function(RED) {
                 node.brokerConn.register(this);
                 let options = { qos: this.qos };
                 if(v5) {
-                    options.properties = {};
-                    if(node.userProperties) {
-                        let userProperties = RED.util.evaluateNodeProperty(node.userProperties, node.userPropertiesType, node, {});
-                        setUserProperties(userProperties, options.properties);
-                    }
-                    setIntProp(node,options.properties,"subscriptionIdentifier", 1);
+                    // options.properties = {};
+                    // if(node.userProperties) {
+                    //     let userProperties = RED.util.evaluateNodeProperty(node.userProperties, node.userPropertiesType, node, {});
+                    //     setUserProperties(userProperties, options.properties);
+                    // }
+                    // setIntProp(node,options.properties,"subscriptionIdentifier", 1);
                     setIntProp(node, options, "rh");
                     if(node.nl === "true" || node.nl === true) options.nl = true;
                     else if(node.nl === "false" || node.nl === false) options.nl = false;
                     if(node.rap === "true" || node.rap === true) options.rap = true;
                     else if(node.rap === "false" || node.rap === false) options.rap = false;
                 }
-                
+
                 this.brokerConn.subscribe(this.topic,options,function(topic,payload,packet) {
-                    debug(`MQTTInNode:${node.id}: Broker sent ${topic}, datatype ${node.datatype}`, packet);//TODO: remove
+                    // node.debug(`Sent ${topic}, datatype ${node.datatype} `+JSON.stringify(packet));//TODO: remove
                     if (node.datatype === "buffer") {
                         // payload = payload;
                     } else if (node.datatype === "base64") {
@@ -671,12 +730,12 @@ module.exports = function(RED) {
                         //msg.properties = packet.properties;
                         setStrProp(packet.properties, msg, "responseTopic");
                         setBufferProp(packet.properties, msg, "correlationData");
-                        setStrProp(packet.properties, msg, "contentType");                    
+                        setStrProp(packet.properties, msg, "contentType");
                         // setIntProp(packet.properties, msg, "topicAlias", 1, node.brokerConn.serverProperties.topicAliasMaximum || 0);
                         // setIntProp(packet.properties, msg, "subscriptionIdentifier", 1, 268435455);
-                        setIntProp(packet.properties, msg, "messageExpiryInterval", 0); 
-                        setBoolProp(packet.properties, msg, "payloadFormatIndicator"); 
-                        setStrProp(packet.properties, msg, "reasonString"); 
+                        setIntProp(packet.properties, msg, "messageExpiryInterval", 0);
+                        setBoolProp(packet.properties, msg, "payloadFormatIndicator");
+                        setStrProp(packet.properties, msg, "reasonString");
                         setUserProperties(packet.properties.userProperties, msg);
                     }
                     if ((node.brokerConn.broker === "localhost")||(node.brokerConn.broker === "127.0.0.1")) {
@@ -709,20 +768,19 @@ module.exports = function(RED) {
         this.qos = n.qos || null;
         this.retain = n.retain;
         this.broker = n.broker;
-        this.responseTopic = n.responseTopic;//https://docs.oasis-open.org/mqtt/mqtt/v5.0/os/mqtt-v5.0-os.html#_Toc3901114
-        this.responseTopicType = n.responseTopicType;
-        this.correlationData = n.correlationData;//https://docs.oasis-open.org/mqtt/mqtt/v5.0/os/mqtt-v5.0-os.html#_Toc3901115
-        this.correlationDataType = n.correlationDataType; 
+        this.responseTopic = n.respTopic;//https://docs.oasis-open.org/mqtt/mqtt/v5.0/os/mqtt-v5.0-os.html#_Toc3901114
+        this.correlationData = n.correl;//https://docs.oasis-open.org/mqtt/mqtt/v5.0/os/mqtt-v5.0-os.html#_Toc3901115
         this.contentType = n.contentType;//https://docs.oasis-open.org/mqtt/mqtt/v5.0/os/mqtt-v5.0-os.html#_Toc3901118
-        this.contentTypeType = n.contentTypeType;
-        this.messageExpiryInterval = n.messageExpiryInterval; //https://docs.oasis-open.org/mqtt/mqtt/v5.0/os/mqtt-v5.0-os.html#_Toc3901112
-        this.messageExpiryIntervalType = n.messageExpiryIntervalType;
-        this.userProperties = n.userProperties;//https://docs.oasis-open.org/mqtt/mqtt/v5.0/os/mqtt-v5.0-os.html#_Toc3901116
-        this.userPropertiesType = n.userPropertiesType;
+        this.messageExpiryInterval = n.expiry; //https://docs.oasis-open.org/mqtt/mqtt/v5.0/os/mqtt-v5.0-os.html#_Toc3901112
+        try {
+            if (/^ *{/.test(n.userProps)) {
+                this.userProperties = JSON.parse(n.userProps);//https://docs.oasis-open.org/mqtt/mqtt/v5.0/os/mqtt-v5.0-os.html#_Toc3901116
+            }
+        } catch(err) {}
         // this.topicAlias = n.topicAlias; //https://docs.oasis-open.org/mqtt/mqtt/v5.0/os/mqtt-v5.0-os.html#_Toc3901113
         // this.payloadFormatIndicator = n.payloadFormatIndicator; //https://docs.oasis-open.org/mqtt/mqtt/v5.0/os/mqtt-v5.0-os.html#_Toc3901111
         // this.subscriptionIdentifier = n.subscriptionIdentifier;//https://docs.oasis-open.org/mqtt/mqtt/v5.0/os/mqtt-v5.0-os.html#_Toc3901117
-        
+
         this.brokerConn = RED.nodes.getNode(this.broker);
         var node = this;
         var chk = /[\+#]/;
@@ -744,25 +802,20 @@ module.exports = function(RED) {
                 let msgPropOverride = function(propName) { if(node[propName]) { msg[propName] = node[propName]; } }
                 msgPropOverride("topic");
                 if(v5) {
-                    if(node.userProperties && node.userPropertiesType !== "none") {
-                        let userProperties = RED.util.evaluateNodeProperty(node.userProperties, node.userPropertiesType, node, msg);
-                        if(userProperties) msg.userProperties = userProperties;
+                    if(node.userProperties) {
+                        msg.userProperties = node.userProperties;
                     }
-                    if(node.responseTopic && node.responseTopicType !== "none") {
-                        let responseTopic = RED.util.evaluateNodeProperty(node.responseTopic, node.responseTopicType, node, msg);
-                        if(responseTopic) msg.responseTopic = responseTopic;
+                    if(node.responseTopic) {
+                        msg.responseTopic = node.responseTopic;
                     }
-                    if(node.correlationData && node.correlationDataType !== "none") {
-                        let correlationData = RED.util.evaluateNodeProperty(node.correlationData, node.correlationDataType, node, msg);
-                        if(correlationData) msg.correlationData = correlationData;
+                    if(node.correlationData) {
+                        msg.correlationData = node.correlationData;
                     }
-                    if(node.contentType && node.contentTypeType !== "none") {
-                        let contentType = RED.util.evaluateNodeProperty(node.contentType, node.contentTypeType, node, msg);
-                        if(contentType) msg.contentType = contentType;
+                    if(node.contentType) {
+                        msg.contentType = node.contentType;
                     }
-                    if(node.messageExpiryInterval && node.messageExpiryIntervalType !== "none") {
-                        let messageExpiryInterval = RED.util.evaluateNodeProperty(node.messageExpiryInterval, node.messageExpiryIntervalType, node, msg);
-                        if(messageExpiryInterval) msg.messageExpiryInterval = messageExpiryInterval;
+                    if(node.messageExpiryInterval) {
+                        msg.messageExpiryInterval = node.messageExpiryInterval;
                     }
                     //Next, update/override the msg.xxxx properties from node config
                     //TODO: Should we be expecting msg.properties.xxxx instead of msg.xxxx?
@@ -774,11 +827,18 @@ module.exports = function(RED) {
                     //FUTURE setBoolProp(node,msg,"payloadFormatIndicator");
                     //FUTURE setIntProp(node,msg,"subscriptionIdentifier");
                 }
+                if (msg.userProperties && typeof msg.userProperties !== "object") {
+                    delete msg.userProperties;
+                }
+                if (msg.hasOwnProperty("topicAlias") && !isNaN(msg.topicAlias) && (msg.topicAlias === 0 || node.brokerConn.serverProperties.topicAliasMaximum === 0 || msg.topicAlias > node.brokerConn.serverProperties.topicAliasMaximum)) {
+                    delete msg.topicAlias;
+                }
+
                 if ( msg.hasOwnProperty("payload")) {
                     let topicOK = msg.hasOwnProperty("topic") && (typeof msg.topic === "string") && (msg.topic !== "");
                     if (!topicOK && v5) {
                         //NOTE: A value of 0 (in server props topicAliasMaximum) indicates that the Server does not accept any Topic Aliases on this connection
-                        if (msg.hasOwnProperty("topicAlias") && typeof msg.topicAlias === "number" && msg.topicAlias >= 0 && node.brokerConn.serverProperties.topicAliasMaximum && node.brokerConn.serverProperties.topicAliasMaximum >= msg.topicAlias) {
+                        if (msg.hasOwnProperty("topicAlias") && !isNaN(msg.topicAlias) && msg.topicAlias >= 0 && node.brokerConn.serverProperties.topicAliasMaximum && node.brokerConn.serverProperties.topicAliasMaximum >= msg.topicAlias) {
                             topicOK = true;
                             msg.topic = ""; //must be empty string
                         } else if (msg.hasOwnProperty("responseTopic") && (typeof msg.responseTopic === "string") && (msg.responseTopic !== "")) {
@@ -789,11 +849,11 @@ module.exports = function(RED) {
                         }
                     }
                     if (topicOK) { // topic must exist
-                        debug(`MQTTOutNode:${node.id}: sending msg to ${msg.topic}`, msg);//TODO: remove
-                        this.brokerConn.publish(msg, function(){
+                        // node.debug(`sending msg to ${msg.topic} `+JSON.stringify(msg));//TODO: remove
+                        this.brokerConn.publish(msg, function(err) {
                             let args = arguments;
                             let l = args.length;
-                            done();
+                            done(err);
                         });  // send the message
                     } else {
                         node.warn(RED._("mqtt.errors.invalid-topic"));
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
index 4df254efa..b6c8e77ae 100755
--- a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
@@ -350,8 +350,9 @@
             "retain": "Retain",
             "clientid": "Client ID",
             "port": "Port",
-            "keepalive": "Keepalive time(s)",
+            "keepalive": "Keep Alive",
             "cleansession": "Use clean session",
+            "cleanstart": "Use clean start",
             "use-tls": "Enable secure (SSL/TLS) connection",
             "tls-config":"TLS Configuration",
             "verify-server-cert":"Verify server certificate",
@@ -361,23 +362,23 @@
             "flags": "Flags",
             "nl": "Do not receive messages published by this client",
             "rap": "Keep retain flag of original publish",
-            "rh": "Retain Handling",
-            "rh0": "0, Always send retained messages",
-            "rh1": "1, Send retained messages for new subscription",
-            "rh2": "2, Never send retained messages",
+            "rh": "Retained message handling ",
+            "rh0": "Send retained messages",
+            "rh1": "Only send for new subscriptions",
+            "rh2": "Do not send",
             "responseTopic": "Response topic",
             "contentType": "Content Type",
             "correlationData": "Correlation Data",
-            "messageExpiryInterval": "Expiry (secs)",
+            "expiry": "Expiry (secs)",
+            "sessionExpiry": "Session Expiry (secs)",
             "topicAlias": "Alias",
             "payloadFormatIndicator": "Format",
             "payloadFormatIndicatorFalse": "unspecified bytes (Default)",
             "payloadFormatIndicatorTrue": "UTF-8 encoded payload",
-            "protocolVersion": "Protocol Version",
+            "protocolVersion": "Protocol",
             "protocolVersion3": "MQTT V3.1 (legacy)",
             "protocolVersion4": "MQTT V3.1.1",
             "protocolVersion5": "MQTT V5",
-            "sessionExpiryInterval": "Expiry(s)",
             "topicAliasMaximum": "Alias Max",
             "maximumPacketSize": "Max Packet Size",
             "receiveMaximum": "Receive Max"
@@ -988,4 +989,4 @@
         "unexpected" : "unexpected mode",
         "no-parts" : "no parts property in message"
     }
-} 
+}
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/network/10-mqtt.html b/packages/node_modules/@node-red/nodes/locales/en-US/network/10-mqtt.html
index 1c6d1a081..558635ec7 100644
--- a/packages/node_modules/@node-red/nodes/locales/en-US/network/10-mqtt.html
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/network/10-mqtt.html
@@ -23,6 +23,17 @@
        <dd>0, fire and forget - 1, at least once - 2, once and once only.</dd>
        <dt>retain <span class="property-type">boolean</span></dt>
        <dd>true indicates the message was retained and may be old.</dd>
+
+       <dt class="optional">responseTopic <span class="property-type">string</span></dt>
+       <dd><b>MQTTv5</b>: the MQTT response topic for the message</dd>
+       <dt class="optional">correlationData <span class="property-type">Buffer</span></dt>
+       <dd><b>MQTTv5</b>: the correlation data for the message</dd>
+       <dt class="optional">contentType <span class="property-type">string</span></dt>
+       <dd><b>MQTTv5</b>: the content-type of the payload</dd>
+       <dt class="optional">userProperties <span class="property-type">object</span></dt>
+       <dd><b>MQTTv5</b>: any user properties of the message</dd>
+       <dt class="optional">messageExpiryInterval <span class="property-type">number</span></dt>
+       <dd><b>MQTTv5</b>: the expiry time, in seconds, of the message</dd>
     </dl>
     <h3>Details</h3>
     The subscription topic can include MQTT wildcards, + for one level, # for multiple levels.</p>
@@ -37,15 +48,24 @@
     <dl class="message-properties">
        <dt>payload <span class="property-type">string | buffer</span></dt>
        <dd> the payload to publish. If this property is not set, no message will be sent. To send a blank message, set this property to an empty String.</dd>
-
        <dt class="optional">topic <span class="property-type">string</span></dt>
        <dd> the MQTT topic to publish to.</dd>
-
        <dt class="optional">qos <span class="property-type">number</span></dt>
        <dd>0, fire and forget - 1, at least once - 2, once and once only. Default 0.</dd>
-
        <dt class="optional">retain <span class="property-type">boolean</span></dt>
        <dd>set to true to retain the message on the broker. Default false.</dd>
+       <dt class="optional">responseTopic <span class="property-type">string</span></dt>
+       <dd><b>MQTTv5</b>: the MQTT response topic for the message</dd>
+       <dt class="optional">correlationData <span class="property-type">Buffer</span></dt>
+       <dd><b>MQTTv5</b>: the correlation data for the message</dd>
+       <dt class="optional">contentType <span class="property-type">string</span></dt>
+       <dd><b>MQTTv5</b>: the content-type of the payload</dd>
+       <dt class="optional">userProperties <span class="property-type">object</span></dt>
+       <dd><b>MQTTv5</b>: any user properties of the message</dd>
+       <dt class="optional">messageExpiryInterval <span class="property-type">number</span></dt>
+       <dd><b>MQTTv5</b>: the expiry time, in seconds, of the message</dd>
+       <dt class="optional">topicAlias <span class="property-type">number</span></dt>
+       <dd><b>MQTTv5</b>: the MQTT topic alias to use</dd>
     </dl>
     <h3>Details</h3>
     <code>msg.payload</code> is used as the payload of the published message.