Merge pull request mqttjs#88 from adamvr/fix-end-with-queued

Adam Rudd · Adam Rudd · commit 17dea2619cb4 · 2013-05-26T09:56:06.000-07:00
Don't disconnect before connecting
diff --git a/lib/client.js b/lib/client.js
@@ -310,14 +310,22 @@ MqttClient.prototype.unsubscribe = function(topic, callback) {
  * @api public
  */
 MqttClient.prototype.end = function() {
+  if (!this.connected) {
+    this.once('connect', this._cleanUp.bind(this));
+  } else {
+    this._cleanUp();
+  }
+
+  return this;
+};
+
+MqttClient.prototype._cleanUp = function() {
   this.conn.disconnect();
   this.stream.end();
   if (this.pingTimer !== null) {
     clearInterval(this.pingTimer);
     this.pingTimer = null;
   }
-
-  return this;
 };
 
 MqttClient.prototype._sendPacket = function(type, packet, cb) {
diff --git a/test/client.js b/test/client.js
@@ -94,7 +94,15 @@ describe('MqttClient', function () {
         done();
       });
 
-      client.end();
+      client.on('connect', function() {
+        client.end();
+      });
+
+      this.server.once('client', function(client) {
+        client.once('connect', function(packet) {
+          client.connack({returnCode: 0});
+        });
+      });
     });
 
     it('should stop ping timer after end called', function(done) {
