homebridge-melcloud-control 2.5.0-beta.78 → 2.5.0-beta.79

package/package.json

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

package/src/melcloud.js

@@ -8,15 +8,15 @@ 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, requestConfig) {
         super();
         this.accountInfoFile = accountInfoFile;
         this.buildingsFile = buildingsFile;
         this.deviceInfoFile = deviceInfoFile;
         this.enableDebugMode = enableDebugMode;
         this.refreshInterval = refreshInterval;
-        this.connectForConfig = connectForConfig;
-        this.emitReady = true;
+        this.requestConfig = requestConfig;
+        this.emitData = true;
         this.contextKey = '';
         this.devicesId = [];
 
@@ -32,7 +32,7 @@ class MelCloud extends EventEmitter {
             }
         };
 
-        if (!connectForConfig) {
+        if (!requestConfig) {
             this.impulseGenerator = new ImpulseGenerator();
             this.impulseGenerator.on('checkDevicesList', async () => {
                 try {
@@ -86,14 +86,14 @@ class MelCloud extends EventEmitter {
             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) {
+            if (this.requestConfig) {
                 return contextKey;
             };
 
-            //save melcloud info to the file
-            await this.saveData(this.accountInfoFile, accountInfo);
-
             //check devices list
             await this.chackDevicesList(contextKey);
 
@@ -166,11 +166,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
@@ -182,9 +177,16 @@ class MelCloud extends EventEmitter {
                 const debug = this.enableDebugMode ? this.emit('debug', `Device: ${deviceName} info saved.`) : false;
             };
 
+            //return devices list for config
+            if (this.requestConfig) {
+                return devices;
+            };
+
             //emit check devices list complete
-            const emit = this.emitReady ? this.emit('checkDevicesListComplete', this.accountInfo, contextKey) : false;
-            this.emitReady = false;
+            if (!this.requestConfig && this.emitData) {
+                this.emit('checkDevicesListComplete', this.accountInfo, contextKey)
+                this.emitData = false;
+            };
 
             return true;
         } catch (error) {