Merge branch 'release/0.2.0'

Author: Rob Griffiths

bin/src/api.js

@@ -1,5 +1,13 @@
 'use strict'
 
+if (typeof(URL) === 'undefined') {
+    var URL = class URL {
+        constructor(url) {
+            return require('url').parse(url)
+        }
+    }
+}
+
 const request = require('request-promise-native')
 
 const cleanServerUrl = (server) => {

bin/src/meross

@@ -4,72 +4,10 @@
 
 var program = require('commander');
 program
-  .version('0.1.0');
+  .version('0.2.0');
 
 program
-    .command('info <interface> [options]', 'get information about compatable Meross smart device')
-  .command('setup <interface> [options]', 'setup compatable Meross smart device')
+  .command('info [options]', 'get information about compatable Meross smart device')
+  .command('setup [options]', 'setup compatable Meross smart device')
 
 program.parse(process.argv);
-
-// request.post({
-//     url: `http://${gateway}/config`,
-//     json: {
-//         "header":   {
-//             "from": "",
-//             "messageId": "",
-//             "method": "SET",
-//             "namespace": "Appliance.Config.Key",
-//             "payloadVersion": 1,
-//             "sign": "",
-//             "timestamp": 0
-//         },
-//         "payload": {
-//             "key": {
-//                 "gateway": {
-//                     "host": "192.168.0.17",
-//                     "port": 1883,
-//                     "secondHost": "192.168.0.17",
-//                     "secondPort": 1883,
-//                 },
-//                 "key": "1234567890",
-//                 "userId": "rob@bytespider.eu"
-//             }
-//         }
-//     },
-//     headers: {
-//         'Content-Type': 'application/json'
-//     }
-// }, (error, response, body) => {
-//     console.log(util.inspect(body, {showHidden: false, depth: 6}))
-// })
-
-// request.post({
-//     url: `http://${gateway}/config`,
-//     json: {
-//         "header":   {
-//             "from": "",
-//             "messageId": "",
-//             "method": "SET",
-//             "namespace": "Appliance.Config.Wifi",
-//             "payloadVersion": 0,
-//             "sign": "",
-//             "timestamp": 0
-//         },
-//         "payload": {
-//             "wifi": {
-//                 "bssid": "48:d3:43:93:9d::e1",
-//                 "channel": 1,
-//                 "cipher": 3,
-//                 "encryption": 6,
-//                 "password": Buffer.from("qt5fdFgxQhh3").toString('base64'),
-//                 "ssid": Buffer.from("VM7877756").toString('base64')
-//             }
-//         }
-//     },
-//     headers: {
-//         'Content-Type': 'application/json'
-//     }
-// }, (error, response, body) => {
-//     console.log(util.inspect(body, {showHidden: false, depth: 6}))
-// })

bin/src/meross-info

@@ -3,7 +3,6 @@
 'use strict'
 
 const program = require('commander')
-const netroute = require('netroute')
 
 const API = require('./api')
 
@@ -15,22 +14,21 @@ const collection = (value, store = []) => {
 const unique = (array) => [...new Set(array)]
 
 program
-  .version('0.1.0')
-  .arguments('<interface> [options]')
+  .version('0.2.0')
+  .arguments('<options>')
+  .option('-g, --gateway <gateway>', 'Set the gateway address')
 
 program.parse(process.argv);
 
 
-if (!program.args.length) {
-    console.error('interface must be specified');
+if (!program.gateway) {
+    console.error('Gateway must be specified');
     process.exit(1);
 }
 
 (async () => {
-    const iface = program.args[0]
-    const gateway = netroute.getGateway(iface)
-
-    console.log(`Getting info about device with IP ${gateway} on ${iface}`)
+    const gateway = program.gateway
+    console.log(`Getting info about device with IP ${gateway}`)
 
 
     const api = new API(gateway)

bin/src/meross-setup

@@ -3,7 +3,6 @@
 'use strict'
 
 const program = require('commander')
-const netroute = require('netroute')
 
 const API = require('./api')
 
@@ -15,31 +14,40 @@ const collection = (value, store = []) => {
 const unique = (array) => [...new Set(array)]
 
 program
-  .version('0.1.0')
-  .arguments('<interface> [options]')
+  .version('0.2.0')
+  .arguments('[options]')
+  .option('-g, --gateway <gateway>', 'Set the gateway address')
   .option('--wifi-ssid <wifi-ssid>', 'WIFI AP name')
   .option('--wifi-pass <wifi-pass>', 'WIFI AP password')
   .option('--mqtt <mqtt-server>', 'MQTT server address', collection)
 
 program.parse(process.argv);
 
 
-if (!program.args.length) {
-    console.error('interface must be specified');
+if (!program.gateway) {
+    console.error('Gateway must be specified');
     process.exit(1);
 }
 
-(async () => {
-    const iface = program.args[0]
-    const gateway = netroute.getGateway(iface)
+if (!program.wifiSsid) {
+    console.error('WIFI ssid must be specified');
+    process.exit(1);
+}
 
-    console.log(`Setting up device with IP ${gateway} on ${iface}`)
+if (!program.wifiPass) {
+    console.error('WIFI password must be specified');
+    process.exit(1);
+}
+
+(async () => {
+    const gateway = program.gateway
+    console.log(`Setting up device with IP ${gateway}`)
 
 
     const api = new API(gateway)
     var response;
 
-    if (program.mqtt.length) {
+    if (program.mqtt && program.mqtt.length) {
         response = await api.configureMqttServers(unique(program.mqtt))
     }
 

bin/src/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meross",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -10,7 +10,6 @@
   "license": "ISC",
   "dependencies": {
     "commander": "^2.19.0",
-    "netroute": "^1.0.2",
     "request": "^2.88.0",
     "request-promise-native": "^1.0.7"
   }