From 834e894b1da58b4462f23529449e020bf3f948b8 Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <conway@uk.ibm.com>
Date: Fri, 10 Mar 2017 20:12:52 +0000
Subject: [PATCH] make sure MQTT client closes if redeploy during reconnect

to close #1193
Thanks @tedhuang for the excellent problem determination
---
 nodes/core/io/10-mqtt.html | 11 ++++++-----
 nodes/core/io/10-mqtt.js   | 20 ++++++++++----------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/nodes/core/io/10-mqtt.html b/nodes/core/io/10-mqtt.html
index 55e29b12a..f548a2dc1 100644
--- a/nodes/core/io/10-mqtt.html
+++ b/nodes/core/io/10-mqtt.html
@@ -35,7 +35,7 @@
 </script>
 
 <script type="text/x-red" data-help-name="mqtt in">
-    <p>Connects to a broker and subscribes to the specified topic.</p>
+    <p>Connects to a MQTT broker and subscribes to the specified topic.</p>
     <p>Outputs a message with the properties:</p>
     <ul>
        <li><code>msg.topic</code></li>
@@ -107,6 +107,7 @@
     <p>Connects to a MQTT broker and publishes messages.</p>
     <p><code>msg.payload</code> is used as the payload of the published message.
     If it contains an Object it will be converted to JSON before being sent.
+    If it contains a binary Buffer the message will be published as-is.
     </p>
     <p>The topic used can be configured in the node or, if left blank, can be set
        by <code>msg.topic</code>.</p>
@@ -147,9 +148,9 @@
         <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 class="input-append-left" type="text" id="node-config-input-broker" placeholder="e.g. localhost" style="width: 40%;" >
-                <label for="node-config-input-port" style="margin-left: 10px; width: 35px; "> <span data-i18n="mqtt.label.port"></span></label>
-                <input type="text" id="node-config-input-port" data-i18n="[placeholder]mqtt.label.port" style="width:45px">
+                <input class="input-append-left" type="text" id="node-config-input-broker" placeholder="e.g. localhost" style="width:40%;" >
+                <label for="node-config-input-port" style="margin-left:20px; width:35px; "> <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;">
@@ -299,7 +300,7 @@
                 id: "mqtt-broker-tab-will",
                 label: this._("mqtt.tabs-label.will")
             });
-            setTimeout(function() { tabs.resize()},0);
+            setTimeout(function() { tabs.resize(); },0);
             if (typeof this.cleansession === 'undefined') {
                 this.cleansession = true;
                 $("#node-config-input-cleansession").prop("checked",true);
diff --git a/nodes/core/io/10-mqtt.js b/nodes/core/io/10-mqtt.js
index a16165306..b01df652b 100644
--- a/nodes/core/io/10-mqtt.js
+++ b/nodes/core/io/10-mqtt.js
@@ -66,16 +66,16 @@ module.exports = function(RED) {
 
         // If the config node is missing certain options (it was probably deployed prior to an update to the node code),
         // select/generate sensible options for the new fields
-        if (typeof this.usetls === 'undefined'){
+        if (typeof this.usetls === 'undefined') {
             this.usetls = false;
         }
-        if (typeof this.compatmode === 'undefined'){
+        if (typeof this.compatmode === 'undefined') {
             this.compatmode = true;
         }
-        if (typeof this.verifyservercert === 'undefined'){
+        if (typeof this.verifyservercert === 'undefined') {
             this.verifyservercert = false;
         }
-        if (typeof this.keepalive === 'undefined'){
+        if (typeof this.keepalive === 'undefined') {
             this.keepalive = 60;
         } else if (typeof this.keepalive === 'string') {
             this.keepalive = Number(this.keepalive);
@@ -110,7 +110,7 @@ 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.options.protocolId = 'MQIsdp';
             this.options.protocolVersion = 3;
         }
@@ -140,14 +140,14 @@ module.exports = function(RED) {
         var node = this;
         this.users = {};
 
-        this.register = function(mqttNode){
+        this.register = function(mqttNode) {
             node.users[mqttNode.id] = mqttNode;
             if (Object.keys(node.users).length === 1) {
                 node.connect();
             }
         };
 
-        this.deregister = function(mqttNode,done){
+        this.deregister = function(mqttNode,done) {
             delete node.users[mqttNode.id];
             if (node.closing) {
                 return done();
@@ -266,7 +266,7 @@ module.exports = function(RED) {
                 }
                 if (Object.keys(sub).length === 0) {
                     delete node.subscriptions[topic];
-                    if (node.connected){
+                    if (node.connected) {
                         node.client.unsubscribe(topic);
                     }
                 }
@@ -287,7 +287,7 @@ module.exports = function(RED) {
                     qos: msg.qos || 0,
                     retain: msg.retain || false
                 };
-                node.client.publish(msg.topic, msg.payload, options, function (err){return});
+                node.client.publish(msg.topic, msg.payload, options, function(err) {return});
             }
         };
 
@@ -298,7 +298,7 @@ module.exports = function(RED) {
                     done();
                 });
                 this.client.end();
-            } else if (this.connecting) {
+            } else if (this.connecting || node.client.reconnecting) {
                 node.client.end();
                 done();
             } else {