Merge branch 'release/1.0.5'

Author: bytespider

README.md

@@ -1 +1 @@
-1.0.2
+1.0.5

VERSION

@@ -2,7 +2,7 @@
 
 'use strict'
 
-const {version} = require('./package.json')
+const {version} = require('../package.json')
 const program = require('commander')
 
 program

bin/src/meross bin/merossbin/src/meross renamed to bin/meross

@@ -2,11 +2,11 @@
 
 'use strict'
 
-const {version} = require('./package.json')
+const {version} = require('../package.json')
 const program = require('commander')
 const util = require('util')
 
-const API = require('./api')
+const API = require('../lib/api')
 
 const collection = (value, store = []) => {
     store.push(value)
@@ -20,6 +20,7 @@ program
   .arguments('<options>')
   .option('-g, --gateway <gateway>', 'Set the gateway address')
   .option('-k, --key <shared-key>', 'Shared key for generating signatures', '')
+  .option('--include-wifi', 'Ask device for Nearby WIFI AP list')
   .option('-v, --verbose', 'Show debugging messages', '')
 
 program.parse(process.argv)
@@ -33,9 +34,14 @@ if (!program.gateway) {
 (async () => {
     const gateway = program.gateway
     const key = program.key
+    const includeWifiList = program.includeWifi
     const verbose = program.verbose
     const api = new API(gateway, key, null, verbose)
-    
+
     console.log(`Getting info about device with IP ${gateway}`)
-    api.deviceInformation()
+    await api.deviceInformation()
+
+    if (includeWifiList) {
+        await api.deviceWifiList()
+    }
 })()

bin/src/meross-info bin/meross-infobin/src/meross-info renamed to bin/meross-info

@@ -2,11 +2,11 @@
 
 'use strict'
 
-const {version} = require('./package.json')
+const {version} = require('../package.json')
 const program = require('commander')
 const util = require('util')
 
-const API = require('./api')
+const API = require('../lib/api')
 
 const collection = (value, store = []) => {
     store.push(value)

bin/src/meross-setup bin/meross-setupbin/src/meross-setup renamed to bin/meross-setup

@@ -24,6 +24,7 @@ const cleanServerUrl = (server) => {
 const serverRegex = /((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])|(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])):(?:6553[0-5]|655[0-2][0-9]|65[0-4][0-9]{2}|6[0-4][0-9]{3}|[1-5][0-9]{4}|[1-9][0-9]{1,3}|[0-9])$/
 
 const base64Encode = str => Buffer.from(str).toString('base64')
+const base64Decode = str => Buffer.from(str, 'base64').toString('utf8')
 
 const tableOptions = {
     hasBorder: true,
@@ -34,11 +35,24 @@ const tableOptions = {
     firstColumnTextAttr: { color: 'yellow' }
 }
 
+const percentToColor = percent => percent > .7 ? '^G' : (percent > .5 ? '^Y' : (percent > .30 ? '^y' : '^r'))
+
+const bar = (percent, width) => {
+    const partials = ['▏', '▎', '▍', '▌', '▋', '▊', '▉']
+    let ticks = percent * width
+    if (ticks < 0) {
+        ticks = 0
+    }
+    let filled = Math.floor(ticks)
+    let open = bar.width - filled - 1
+    return (percentToColor(percent) + '▉').repeat(filled) + partials[Math.floor((ticks - filled) * partials.length)] + ' '.repeat(open)
+}
+
 function logRequest(request) {
     let url = new URL(request.url);
     console.log(`> ${request.method.toUpperCase()} ${url.path}`)
     console.log(`> Host: ${url.host}`)
-    
+
     let headers = {}
     headers = Object.assign(headers, request.headers.common);
     headers = Object.assign(headers, request.headers[request.method]);
@@ -50,9 +64,10 @@ function logRequest(request) {
     for (let [header, value] of Object.entries(headers)) {
         console.log(`> ${header}: ${value}`)
     }
-    
+
     console.log('>')
     console.log(util.inspect(request.data, {showHidden: false, depth: null}))
+    console.log('')
 }
 
 function logResponse(response)  {
@@ -62,6 +77,7 @@ function logResponse(response)  {
     }
     console.log('<')
     console.log(util.inspect(response.data, {showHidden: false, depth: null}))
+    console.log('')
 }
 
 function handleRequestError(error, verbose)
@@ -84,14 +100,15 @@ module.exports = class API {
         this.host = host
         this.key = key
         this.userId = userId
-        
+        this.verbose = verbose
+
         axios.interceptors.request.use(request => {
             if (verbose) {
                 logRequest(request)
             }
             return request
         })
-        
+
         axios.interceptors.response.use(response => {
             if (verbose) {
                 logResponse(response)
@@ -131,33 +148,33 @@ module.exports = class API {
                     },
                 }
             )
-        
+
             const data = response.data;
-            
+
             if ('error' in data.payload) {
                 let {code, message} = data.payload.error;
-        
+
                 switch (code) {
                     case 5001:
                         console.error('Incorrect shared key provided.')
                         break;
                 }
-                
+
                 return
             }
-            
+
             const system = data.payload.all.system
             const digest = data.payload.all.digest
             const hw = system.hardware
             const fw = system.firmware
-            
+
             let rows = [
                 ['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})`],
             ];
-            
+
             if (fw.server) {
                 rows.push(
                     ['MQTT broker', `${fw.server}:${fw.port}`],
@@ -168,37 +185,81 @@ module.exports = class API {
                     ['Status', `^BConfiguration`]
                 )
             }
-            
+
             rows.push(
                 ['Credentials', `User: ^C${fw.userId}\nPassword: ^C${this.calculateDevicePassword(hw.macAddress, fw.userId)}`]
             )
-            
-            if (digest.togglex) {
-                let row = ['Switch state']
-                let col = []
-                for (let sw of digest.togglex) {
-                    let ch = [];
-                    if (digest.togglex.length > 1) {
-                        ch.push(`Channel ${sw.channel}:`);
-                    }
-                    ch.push(sw.onoff == 0 ? '^ROff' : '^GOn')
-                    
-                    const switchUpdateDate = new Date();
-                    switchUpdateDate.setTime(sw.lmTime * 1000) // put time into ms not seconds
-                    ch.push(`(${new Intl.DateTimeFormat(process.env.LC_TIME, { dateStyle: 'full', timeStyle: 'long' }).format(switchUpdateDate)})`)
-                    
-                    col.push(ch.join('^ '))
+
+            term.table(
+                rows,
+                tableOptions
+            )
+        } catch (error) {
+            handleRequestError(error, this.verbose)
+        }
+    }
+
+    async deviceWifiList() {
+        const packet = this.signPacket({
+            'header':   {
+                'method': 'GET',
+                'namespace': 'Appliance.Config.WifiList'
+            },
+            'payload': {}
+        })
+
+        try {
+            let spinner = await term.spinner({animation:'dotSpinner', rightPadding: ' '})
+            term('Getting WIFI list…\n')
+
+            const response = await axios.post(
+                `http://${this.host}/config`,
+                packet,
+                {
+                    headers: {
+                        'Content-Type': 'application/json'
+                    },
+                }
+            )
+
+
+            spinner.animate(false)
+
+            const data = response.data;
+
+            if ('error' in data.payload) {
+                let {code, message} = data.payload.error;
+
+                switch (code) {
+                    case 5001:
+                        console.error('Incorrect shared key provided.')
+                        break;
                 }
-                row.push(col.join("\n"));
-                rows.push(row)
+
+                return
             }
-            
+
+            const wifiList = data.payload.wifiList
+
+            let rows = [
+                ['SSID', 'Signal strength'],
+            ];
+
+            for (const ap of wifiList) {
+                const decodedSsid = base64Decode(ap.ssid);
+                rows.push([decodedSsid ? decodedSsid : `<hidden ${ap.bssid}>`, bar((ap.signal / 100), 20)])
+            }
+
+            let thisTableOptions = tableOptions
+            thisTableOptions.firstColumnTextAttr = { color: 'cyan' }
+            thisTableOptions.firstRowTextAttr = { color: 'yellow' }
+
             term.table(
                 rows,
                 tableOptions
             )
         } catch (error) {
-            handleRequestError(error)
+            handleRequestError(error, this.verbose)
         }
     }
 
@@ -212,12 +273,12 @@ module.exports = class API {
                 port: url.port
             }
         })
-        
+
         // make sure we set a failover server
         if (servers.length == 1) {
             servers.push(servers[0]);
         }
-        
+
         term.table(
             [
                 ['Primary MQTT broker', `${servers[0].host}:${servers[0].port}`],
@@ -260,14 +321,14 @@ module.exports = class API {
                 }
             )
         } catch (error) {
-            handleRequestError(error)
+            handleRequestError(error, this.verbose)
         }
     }
 
     async configureWifiCredentials(credentials) {
         const ssid = base64Encode(credentials.ssid)
         const password = base64Encode(credentials.password)
-        
+
         const packet = this.signPacket({
             'header':   {
                 'method': 'SET',
@@ -280,7 +341,7 @@ module.exports = class API {
                 }
             }
         })
-        
+
         term.table(
             [
                 ['Encoded WIFI SSID', `${ssid}`],
@@ -300,10 +361,10 @@ module.exports = class API {
                 }
             )
         } catch (error) {
-            handleRequestError(error)
+            handleRequestError(error, this.verbose)
         }
     }
-    
+
     calculateDevicePassword(macAddress, user = null) {
         return `${user}_${md5(macAddress + this.key)}`
     }

bin/src/README.md

@@ -1,13 +1,21 @@
 {
   "name": "meross",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "Utility to configure Meross devices for local MQTT",
-  "main": "index.js",
+  "keywords": [
+    "smarthome",
+    "mqtt",
+    "meross",
+    "cli"
+  ],
+  "bin": {
+    "meross": "./bin/meross"
+  },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "author": "Rob Griffiths <[email protected]>",
-  "repository": "https://github.com/bytespider/Meross/tree/master/bin/src",
+  "repository": "https://github.com/bytespider/Meross/tree/master",
   "license": "ISC",
   "dependencies": {
     "axios": "^0.21.1",