fix: mqttClient connect/close methods (#34)

lib/MqttClient.js

@@ -60,9 +60,6 @@ function init (config) {
     reconnectPeriod: config.reconnectPeriod,
     clean: config.clean,
     rejectUnauthorized: !config.allowSelfsigned,
-    protocol: protocol,
-    host: parsed.hostname || config.host,
-    port: config.port,
     will: {
       topic: this.getClientTopic(),
       payload: JSON.stringify({ value: false }),
@@ -73,8 +70,13 @@ function init (config) {
 
   if (['mqtts', 'wss', 'wxs', 'alis', 'tls'].indexOf(protocol) >= 0) {
     if (!config.allowSelfsigned) options.ca = config._ca
-    options.key = config._key
-    options.cert = config._cert
+
+    if (config._key) {
+      options.key = config._key
+    }
+    if (config._cert) {
+      options.cert = config._cert
+    }
   }
 
   if (config.store) {
@@ -93,7 +95,12 @@ function init (config) {
   }
 
   try {
-    const client = mqtt.connect(options)
+    const serverUrl = `${protocol}://${parsed.hostname || config.host}:${
+      config.port
+    }`
+    debug('Connecting to ' + serverUrl)
+
+    const client = mqtt.connect(serverUrl, options)
 
     this.client = client
 
@@ -260,19 +267,22 @@ MqttClient.prototype.cleanName = function (name) {
  * Method used to close clients connection, use this before destroy
  */
 MqttClient.prototype.close = function () {
+  const self = this
   return new Promise(resolve => {
-    this.closed = true
-
-    if (this.client) {
-      this.client.end(!this.client.connected, () => resolve())
-    } else {
+    if (self.closed) {
       resolve()
+      return
     }
+    self.closed = true
 
-    this.removeAllListeners()
-
-    if (this.client) {
-      this.client.removeAllListeners()
+    if (self.client) {
+      self.client.end(true, {}, function () {
+        self.removeAllListeners()
+        resolve()
+      })
+    } else {
+      self.removeAllListeners()
+      resolve()
     }
   })
 }