Merge branch 'hotfix/1.0.12'

Author: bytespider

VERSION

@@ -1 +1 @@
-1.0.11
+1.0.12

bin/meross-setup

@@ -99,5 +99,5 @@ if (undefined !== options.wifiCipher && isNaN(options.wifiCipher)) {
         cipher: options.wifiCipher,
         bssid: options.wifiBssid,
     })
-    console.log(`Rebooting device`)
+    console.log(`Device will reboot...`)
 })()

lib/api.js

@@ -182,22 +182,18 @@ module.exports = class API {
                 ['Device', `${hw.type} ${hw.subType} ${hw.chipType} (hardware:${hw.version} firmware:${fw.version})`],
                 ['UUID', hw.uuid],
                 ['Mac address', hw.macAddress],
-                ['WIFI', `${fw.innerIp} (${fw.wifiMac})`],
+                ['IP address', fw.innerIp],
             ];
 
             if (fw.server) {
                 rows.push(
-                    ['MQTT broker', `${fw.server}:${fw.port}`],
-                    ['Status', `${system.online.status == 0 ? '^ROffline' : '^GOnline'}`]
-                )
-            } else {
-                rows.push(
-                    ['Status', `^BConfiguration`]
+                    ['Current MQTT broker', `${fw.server}:${fw.port}`]
                 )
             }
 
             rows.push(
-                ['Credentials', `User: ^C${fw.userId}\nPassword: ^C${this.calculateDevicePassword(hw.macAddress, fw.userId)}`]
+                ['Credentials', `User: ^C${hw.macAddress}\nPassword: ^C${this.calculateDevicePassword(hw.macAddress, fw.userId)}`],
+                ['MQTT topics', `Publishes to: ^C/appliance/${hw.uuid}/publish\nSubscribes to: ^C/appliance/${hw.uuid}/subscribe`]
             )
 
             term.table(
@@ -293,9 +289,10 @@ module.exports = class API {
         }
 
         let rows = [];
-        for (let server of servers) {
+        for (let s = 0; s < servers.length; s++) {
+            let server = servers[s];
             rows.push([
-                'MQTT broker',
+                `${s > 0 ? 'Failover' : 'Primary'} MQTT broker`,
                 `${server.host}:${server.port}`
             ])
         }
@@ -360,14 +357,6 @@ module.exports = class API {
             }
         })
 
-        term.table(
-            [
-                ['Encoded WIFI SSID', `${ssid}`],
-                ['Encoded WIFI password', `${password}`]
-            ],
-            tableOptions
-        )
-
         try {
             const response = await axios.post(
                 `http://${this.host}/config`,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "meross",
-  "version": "1.0.10",
+  "version": "1.0.12",
   "description": "Utility to configure Meross devices for local MQTT",
   "keywords": [
     "smarthome",