wrtcoder
diff --git a/‎lib/client.js
Lines changed: 13 additions & 3 deletions b/‎lib/client.js
Lines changed: 13 additions & 3 deletions
diff --git a/‎package.json
Lines changed: 2 additions & 2 deletions b/‎package.json
Lines changed: 2 additions & 2 deletions
@@ -117,6 +117,10 @@ function MqttClient (streamBuilder, options) {
 
   // Mark connected on connect
   this.on('connect', function () {
+    if (this.disconnected) {
+      return;
+    }
+
     this.connected = true;
     var outStore = null;
     outStore = this.outgoingStore.createStream();
@@ -512,19 +516,25 @@ MqttClient.prototype.end = function (force, cb) {
   }
 
   function closeStores () {
+    that.disconnected = true;
     that.incomingStore.close(function () {
       that.outgoingStore.close(cb);
     });
   }
 
   function finish () {
-    that._cleanUp(force, closeStores);
+    // defer closesStores of an I/O cycle,
+    // just to make sure things are
+    // ok for websockets
+    that._cleanUp(force, setImmediate.bind(null, closeStores));
   }
 
   if (this.disconnecting) {
     return true;
   }
 
+  this._clearReconnect();
+
   this.disconnecting = true;
 
   if (!force && 0 < Object.keys(this.outgoing).length) {
@@ -569,7 +579,7 @@ MqttClient.prototype._setupReconnect = function () {
 MqttClient.prototype._clearReconnect = function () {
   if (this.reconnectTimer) {
     clearInterval(this.reconnectTimer);
-    this.reconnectTimer = false;
+    this.reconnectTimer = null;
   }
 };
 
@@ -596,7 +606,7 @@ MqttClient.prototype._cleanUp = function (forced, done) {
     );
   }
 
-  if (this.reconnectTimer) {
+  if (!this.disconnecting) {
     this._clearReconnect();
     this._setupReconnect();
   }
 
@@ -1,7 +1,7 @@
 {
   "name": "mqtt",
   "description": "A library for the MQTT protocol",
-  "version": "1.13.0",
+  "version": "1.14.0",
   "contributors": [
     "Adam Rudd <adamvrr@gmail.com>",
     "Matteo Collina <matteo.collina@gmail.com> (https://github.com/mcollina)"
@@ -19,7 +19,7 @@
   },
   "main": "mqtt.js",
   "scripts": {
-    "test": "mocha",
+    "test": "mocha --bail",
     "pretest": "npm run check-style",
     "check-style:eslint": "eslint mqtt.js lib test test/browser test/helpers",
     "check-style:jshint": "jshint mqtt.js lib test test/browser test/helpers",