homebridge-melcloud-control 2.5.0-beta.19 → 2.5.0-beta.2

package/homebridge-ui/public/index.html

@@ -20,7 +20,8 @@
       <input id="language" type="text" class="form-control"><br>
     </div>
     <div class="text-center">
-      <button id="logIn" type="button" class="btn btn-primary">Connect to MELCloud</button>
+      <button id="logIn" type="button" class="btn btn-primary">Log In</button>
+      <button id="getDevices" type="button" class="btn btn-primary">Get Devices</button>
       <button id="configButton" type="button" class="btn btn-primary"><i class="fas fa-gear"></i></button>
     </div>
   </form>
@@ -100,7 +101,7 @@
 
       try {
         await homebridge.updatePluginConfig(pluginConfig)
-        document.getElementById('info').innerHTML = 'Connecting...';
+        document.getElementById('info').innerHTML = '';
 
         const accountName = pluginConfig[0].accounts[this.deviceIndex].name;
         const user = pluginConfig[0].accounts[this.deviceIndex].user;
@@ -110,6 +111,7 @@
         const refreshInterval = pluginConfig[0].accounts[this.deviceIndex].refreshInterval;
 
         const payload = {
+          mode: 'connect',
           accountName: accountName,
           user: user,
           passwd: passwd,
@@ -118,41 +120,77 @@
           refreshInterval: refreshInterval
         };
         const response = await homebridge.request('/connect', payload);
-        homebridge.toast.info(`Response: ${JSON.stringify(response, null, 2)}`);
-        const info = response.info ?? '';
+        const info = response.info;
         const status = response.status;
-        const devices = response.data ?? [];
+        const data = response.data;
+        const error = response.error;
 
         switch (status) {
           case 0:
+            document.getElementById('info').innerHTML = info;
+            document.getElementById('getDevices').removeAttribute('disabled');
+            break;
+          case 2:
+            document.getElementById('getDevices').setAttribute('disabled');
+            document.getElementById('info').innerHTML = `MELCloud error: ${JSON.stringify(error, null, 2)}`;
+            document.getElementById('info').style.color = 'red';
+            break;
+        };
+
+        homebridge.hideSpinner();
+      } catch (e) {
+        homebridge.toast.error(`Data error: ${e.message}`);
+      } finally {
+        homebridge.hideSpinner();
+      };
+    });
+
+    //get devices
+    document.getElementById('getDevices').addEventListener('click', async () => {
+      homebridge.showSpinner();
+      try {
+        const devicesId = [];
+
+        const payload = {
+          mode: 'getdevices'
+        };
+        const response = await homebridge.request('/getDevices', payload);
+
+        const info = response.info;
+        const status = response.status;
+        const devices = response.data;
+        const error = response.error;
+
+        switch (status) {
+          case 1:
             //get device info fom devices
             for (const deviceInfo of devices) {
               const deviceId = deviceInfo.DeviceID;
               const deviceName = deviceInfo.DeviceName;
+
+              //prepare device if not in devices array
+              if (!devicesId.includes(deviceId)) {
+                devicesId.push(deviceId);
+              }
             };
 
-            document.getElementById('info').innerHTML = `${info} Found: ${devices.length} devices. Now You can start to configure it.`;
-            document.getElementById('info').style.color = 'green';
+            document.getElementById('info').innerHTML = `${info} Found: ${devicesId.length} devices. Now You can start configure it.`;
             await homebridge.updatePluginConfig(pluginConfig);
             await homebridge.savePluginConfig(pluginConfig);
             break;
-          case 1:
-            document.getElementById('info').innerHTML = info;
+          case 2:
+            document.getElementById('info').innerHTML = `MELCloud error: ${JSON.stringify(error, null, 2)}`;
             document.getElementById('info').style.color = 'red';
             break;
-          default:
-            document.getElementById('info').innerHTML = `Received unknown status: ${status}, please try again.`;
-            document.getElementById('info').style.color = 'yellow';
-            break;
         };
 
         homebridge.hideSpinner();
       } catch (e) {
-        document.getElementById('info').innerHTML = 'Please try again.';
-        homebridge.toast.error(`Data error: ${e.message}`);
+        homebridge.toast.error(`Get devices error: ${e.message}`);
       } finally {
         homebridge.hideSpinner();
-      };
+      }
     });
+
   })();
 </script>

package/homebridge-ui/server.js

@@ -7,6 +7,9 @@ class PluginUiServer extends HomebridgePluginUiServer {
   constructor() {
     super();
 
+    //get devices
+    this.onRequest('/getdevices', this.start.bind(this));
+
     //connect
     this.onRequest('/connect', this.start.bind(this));
 
@@ -15,6 +18,8 @@ class PluginUiServer extends HomebridgePluginUiServer {
   };
 
   async start(payload) {
+
+    const mode = payload.mode;
     const accountName = payload.accountName;
     const user = payload.user;
     const passwd = payload.passwd;
@@ -24,22 +29,40 @@ class PluginUiServer extends HomebridgePluginUiServer {
     const accountInfoFile = `${this.homebridgeStoragePath}/melcloud/${accountName}_Account`;
     const deviceInfoFile = `${this.homebridgeStoragePath}/melcloud/${accountName}_Device_`;
     const buildingsFile = `${this.homebridgeStoragePath}/melcloud/${accountName}_Buildings`;
+    const melCloud = new MelCloud(user, passwd, language, accountInfoFile, deviceInfoFile, buildingsFile, enableDebugMode, refreshInterval);
 
-    try {
-      let data = {};
-      const melCloud = new MelCloud(user, passwd, language, accountInfoFile, deviceInfoFile, buildingsFile, enableDebugMode, refreshInterval, true);
-      const contextKey = await melCloud.connect();
-      const devices = await melCloud.chackDevicesList(contextKey);
-      return data = {
-        info: 'Check devices list complete.',
-        status: 0,
-        data: devices
-      };
-    } catch (error) {
-      return data = {
-        info: error,
-        status: 1
-      };
+    let data = {};
+    switch (mode) {
+      case 'connect':
+        try {
+          const response = await melCloud.connect();
+          return data = {
+            info: 'Connect to MELCloud success, now pres the button Get Devices.',
+            status: 1,
+            data: response
+          };
+        } catch (error) {
+          return data = {
+            info: 'Connect error:',
+            status: 2,
+            data: error
+          };
+        };
+      case 'getdevices':
+        try {
+          const response = await melCloud.chackDevicesList();
+          return data = {
+            info: 'Get devices success.',
+            status: 0,
+            data: response
+          };
+        } catch (error) {
+          return data = {
+            info: 'Get devices error:',
+            status: 2,
+            data: error
+          };
+        };
     };
   };
 };

package/index.js

@@ -78,7 +78,7 @@ class MelCloudPlatform {
 				const deviceRefreshInterval = account.deviceRefreshInterval * 1000 || 5000;
 
 				//melcloud account
-				const melCloud = new MelCloud(user, passwd, language, accountInfoFile, buildingsFile, deviceInfoFile, enableDebugMode, refreshInterval, false);
+				const melCloud = new MelCloud(user, passwd, language, accountInfoFile, buildingsFile, deviceInfoFile, enableDebugMode, refreshInterval);
 				melCloud.on('checkDevicesListComplete', (accountInfo, contextKey, deviceInfo) => {
 					const deviceId = deviceInfo.DeviceID.toString();
 					const deviceType = deviceInfo.Type;

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "MELCloud Control",
   "name": "homebridge-melcloud-control",
-  "version": "2.5.0-beta.19",
+  "version": "2.5.0-beta.2",
   "description": "Homebridge plugin to control Mitsubishi Air Conditioner, Heat Pump and Energy Recovery Ventilation.",
   "license": "MIT",
   "author": "grzegorz914",

package/src/melcloud.js

@@ -8,14 +8,13 @@ const ImpulseGenerator = require('./impulsegenerator.js');
 const CONSTANTS = require('./constants.json');
 
 class MelCloud extends EventEmitter {
-    constructor(user, passwd, language, accountInfoFile, deviceInfoFile, buildingsFile, enableDebugMode, refreshInterval, connectForConfig) {
+    constructor(user, passwd, language, accountInfoFile, deviceInfoFile, buildingsFile, enableDebugMode, refreshInterval) {
         super();
         this.enableDebugMode = enableDebugMode;
         this.accountInfoFile = accountInfoFile;
         this.buildingsFile = buildingsFile;
         this.deviceInfoFile = deviceInfoFile;
         this.refreshInterval = refreshInterval;
-        this.connectForConfig = connectForConfig;
         this.devicesId = [];
 
         this.options = {
@@ -39,9 +38,7 @@ class MelCloud extends EventEmitter {
             };
         }).on('state', (state) => { });
 
-        if (!connectForConfig) {
-            this.connect();
-        };
+        this.connect();
     };
 
     async connect() {
@@ -82,26 +79,56 @@ class MelCloud extends EventEmitter {
                 return;
             };
 
+            //create axios instance get
+            this.axiosInstanceGet = axios.create({
+                method: 'GET',
+                baseURL: CONSTANTS.ApiUrls.BaseURL,
+                timeout: 5000,
+                headers: {
+                    'X-MitsContextKey': contextKey
+                },
+                maxContentLength: 100000000,
+                maxBodyLength: 1000000000,
+                withCredentials: true,
+                httpsAgent: new https.Agent({
+                    keepAlive: false,
+                    rejectUnauthorized: false
+                })
+            });
+
+            //create axios instance post
+            this.axiosInstancePost = axios.create({
+                method: 'POST',
+                baseURL: CONSTANTS.ApiUrls.BaseURL,
+                timeout: 5000,
+                headers: {
+                    'X-MitsContextKey': contextKey,
+                    'content-type': 'application/json'
+                },
+                maxContentLength: 100000000,
+                maxBodyLength: 1000000000,
+                withCredentials: true,
+                httpsAgent: new https.Agent({
+                    keepAlive: false,
+                    rejectUnauthorized: false
+                })
+            });
+
             this.accountInfo = accountInfo;
             this.contextKey = contextKey;
 
             //save melcloud info to the file
             await this.saveData(this.accountInfoFile, accountInfo);
 
-            //return if connect for config
-            if (this.connectForConfig) {
-                return contextKey;
-            };
-
             //check devices list
-            await this.chackDevicesList(contextKey);
+            await this.chackDevicesList();
 
             //emit connect success
             this.emit('success', `Connect to MELCloud Success.`)
 
             //start impulse generator
             const timers = [{ name: 'checkDevicesList', sampling: this.refreshInterval }];
-            this.impulseGenerator.start(timers);
+            this.impulseGenerator.start(timers)
 
             return true;
         } catch (error) {
@@ -109,29 +136,10 @@ class MelCloud extends EventEmitter {
         };
     }
 
-    async chackDevicesList(key) {
+    async chackDevicesList() {
         try {
-            const contextKey = this.contextKey ?? key;
-
-            //create axios instance get
-            const axiosInstanceGet = axios.create({
-                method: 'GET',
-                baseURL: CONSTANTS.ApiUrls.BaseURL,
-                timeout: 5000,
-                headers: {
-                    'X-MitsContextKey': contextKey
-                },
-                maxContentLength: 100000000,
-                maxBodyLength: 1000000000,
-                withCredentials: true,
-                httpsAgent: new https.Agent({
-                    keepAlive: false,
-                    rejectUnauthorized: false
-                })
-            });
-
             const debug = this.enableDebugMode ? this.emit('debug', `Scanning for devices.`) : false;
-            const listDevicesData = await axiosInstanceGet(CONSTANTS.ApiUrls.ListDevices);
+            const listDevicesData = await this.axiosInstanceGet(CONSTANTS.ApiUrls.ListDevices);
             const buildingsList = listDevicesData.data;
             const debug1 = this.enableDebugMode ? this.emit('debug', `Buildings: ${JSON.stringify(buildingsList, null, 2)}`) : false;
 
@@ -167,11 +175,6 @@ class MelCloud extends EventEmitter {
             }
             const debug3 = this.enableDebugMode ? this.emit('debug', `Found: ${devicesCount} devices.`) : false;
 
-            //return devices list for config
-            if (this.connectForConfig) {
-                return devices;
-            };
-
             //get device info fom devices
             for (const deviceInfo of devices) {
                 const deviceId = deviceInfo.DeviceID
@@ -185,11 +188,11 @@ class MelCloud extends EventEmitter {
                 //prepare device if not in devices array
                 if (!this.devicesId.includes(deviceId)) {
                     this.devicesId.push(deviceId);
-                    this.emit('checkDevicesListComplete', this.accountInfo, contextKey, deviceInfo);
+                    this.emit('checkDevicesListComplete', this.accountInfo, this.contextKey, deviceInfo);
                 }
             };
 
-            return true;
+            return devices;
         } catch (error) {
             this.impulseGenerator.stop();
             throw new Error(`Scanning for devices error: ${error.message ?? error}.`);
@@ -208,29 +211,11 @@ class MelCloud extends EventEmitter {
 
     async send(accountInfo) {
         try {
-            //create axios instance post
-            const axiosInstancePost = axios.create({
-                method: 'POST',
-                baseURL: CONSTANTS.ApiUrls.BaseURL,
-                timeout: 5000,
-                headers: {
-                    'X-MitsContextKey': this.contextKey,
-                    'content-type': 'application/json'
-                },
-                maxContentLength: 100000000,
-                maxBodyLength: 1000000000,
-                withCredentials: true,
-                httpsAgent: new https.Agent({
-                    keepAlive: false,
-                    rejectUnauthorized: false
-                })
-            });
-
             const options = {
                 data: accountInfo
             };
 
-            await axiosInstancePost(CONSTANTS.ApiUrls.UpdateApplicationOptions, options);
+            await this.axiosInstancePost(CONSTANTS.ApiUrls.UpdateApplicationOptions, options);
             await this.saveData(this.accountInfoFile, accountInfo);
             return true;
         } catch (error) {