Merge pull request #15 from FlowFuse/fix-ssl

Fix ssl

Author: hardillb

lib/agent.js

@@ -29,8 +29,8 @@ class Agent {
                 }
             }).json()
 
+            // console.log(`creds: ${JSON.stringify(this.creds,null, 2)}`)
             this.creds = Object.assign(this.creds, { reconnectPeriod: 0 })
-            // console.log(this.creds)
 
             if (this.creds.ssl) {
                 switch (this.creds.protocol) {
@@ -44,9 +44,6 @@ class Agent {
             }
 
             const options = {
-                protocol: this.creds.protocol,
-                host: this.creds.host,
-                port: this.creds.port,
                 clientId: this.creds.clientId,
                 protocolVersion: this.creds.protocolVersion,
                 username: this.creds.credentials.username,
@@ -57,13 +54,15 @@ class Agent {
                 options.rejectUnauthorized = false
             }
 
+            const url = `${this.creds.protocol}//${this.creds.host}:${this.creds.port}`
+            // console.log(url)
             // console.log(options)
 
             // this.client = mqtt.connect(`${this.creds.protocol}//${this.creds.hostname}:${this.creds.port}`, this.creds)
-            this.client = mqtt.connect(options)
+            this.client = mqtt.connect(url, options)
             this.client.on('connect', function () {
                 agent.connected = true
-                console.log(`connected to ${options.host}:${options.port} as ${options.clientId}`)
+                console.log(`connected to ${agent.creds.host}:${agent.creds.port} as ${options.clientId}`)
                 agent.error = null
                 agent.client.subscribe('#')
             })

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowfuse/mqtt-schema-agent",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Agent to collect MQTT topic Schema",
   "main": "index.js",
   "homepage": "https://flowfuse.com",