homebridge-melcloud-control 2.5.0-beta.15 → 2.5.0-beta.16

package/homebridge-ui/public/index.html

@@ -137,22 +137,6 @@
             await homebridge.savePluginConfig(pluginConfig);
             break;
           case 1:
-            document.getElementById('info').innerHTML = info;
-            document.getElementById('info').style.color = 'green';
-            break;
-          case 2:
-            document.getElementById('info').innerHTML = info;
-            document.getElementById('info').style.color = 'white';
-            break;
-          case 3:
-            document.getElementById('info').innerHTML = info;
-            document.getElementById('info').style.color = 'gray';
-            break;
-          case 4:
-            document.getElementById('info').innerHTML = info;
-            document.getElementById('info').style.color = 'yellow';
-            break;
-          case 5:
             document.getElementById('info').innerHTML = info;
             document.getElementById('info').style.color = 'red';
             break;

package/homebridge-ui/server.js

@@ -25,50 +25,21 @@ class PluginUiServer extends HomebridgePluginUiServer {
     const deviceInfoFile = `${this.homebridgeStoragePath}/melcloud/${accountName}_Device_`;
     const buildingsFile = `${this.homebridgeStoragePath}/melcloud/${accountName}_Buildings`;
 
-    let data = {};
-    const melCloud = new MelCloud(user, passwd, language, accountInfoFile, deviceInfoFile, buildingsFile, enableDebugMode, refreshInterval, true);
-    melCloud.on('devicesList', (devices) => {
-      data = {
+    try {
+      let data = {};
+      const melCloud = new MelCloud(user, passwd, language, accountInfoFile, deviceInfoFile, buildingsFile, enableDebugMode, refreshInterval, true);
+      const devices = melCloud.chackDevicesList();
+      return data = {
         info: 'Check devices list complete.',
         status: 0,
         data: devices
       };
-      return data;
-    })
-      .on('success', (message) => {
-        data = {
-          info: message,
-          status: 1
-        };
-        return data;
-      })
-      .on('message', (message) => {
-        data = {
-          info: message,
-          status: 2
-        };
-        return data;
-      })
-      .on('debug', (debug) => {
-        data = {
-          info: debug,
-          status: 3
-        };
-        return data;
-      })
-      .on('warn', (warn) => {
-        return data = {
-          info: warn,
-          status: 4
-        };
-      })
-      .on('error', async (error) => {
-        data = {
-          info: error,
-          status: 5
-        };
-        return data;
-      });
+    } catch (error) {
+      return data = {
+        info: error,
+        status: 1
+      };
+    };
   };
 };
 

package/package.json

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

package/src/melcloud.js

@@ -121,6 +121,11 @@ class MelCloud extends EventEmitter {
             //save melcloud info to the file
             await this.saveData(this.accountInfoFile, accountInfo);
 
+            //return if connect for config
+            if (this.connectForConfig) {
+                return;
+            };
+
             //check devices list
             await this.chackDevicesList();
 
@@ -129,7 +134,7 @@ class MelCloud extends EventEmitter {
 
             //start impulse generator
             const timers = [{ name: 'checkDevicesList', sampling: this.refreshInterval }];
-            const startImpulseGenerator = this.connectForConfig ? false : this.impulseGenerator.start(timers);
+            this.impulseGenerator.start(timers);
 
             return true;
         } catch (error) {
@@ -176,11 +181,10 @@ class MelCloud extends EventEmitter {
             }
             const debug3 = this.enableDebugMode ? this.emit('debug', `Found: ${devicesCount} devices.`) : false;
 
-            //emit devices list for config
-            this.emit('devicesList', devices);
+            //return devices list for config
             if (this.connectForConfig) {
-                return;
-            }
+                return devices;
+            };
 
             //get device info fom devices
             for (const deviceInfo of devices) {