homebridge-melcloud-control 4.2.3-beta.22 → 4.2.3-beta.24

package/package.json

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

package/src/melcloud.js

@@ -29,13 +29,9 @@ class MelCloud extends EventEmitter {
         if (pluginStart) {
             //lock flags
             this.locks = {
-                connect: false,
                 checkDevicesList: false
             };
             this.impulseGenerator = new ImpulseGenerator()
-                .on('connect', () => this.handleWithLock('connect', async () => {
-                    await this.connect();
-                }))
                 .on('checkDevicesList', () => this.handleWithLock('checkDevicesList', async () => {
                     await this.checkDevicesList();
                 }))
@@ -86,6 +82,7 @@ class MelCloud extends EventEmitter {
             await this.functions.saveData(this.buildingsFile, buildingsList);
             if (this.logDebug) this.emit('debug', `Buildings list saved`);
 
+            const devices = [];
             for (const building of buildingsList) {
                 if (!building.Structure) {
                     this.emit('warn', `Building missing structure: ${building.BuildingName || 'Unnamed'}`);
@@ -110,20 +107,22 @@ class MelCloud extends EventEmitter {
                 });
 
                 if (this.logDebug) this.emit('debug', `Found ${allDevices.length} devices in building: ${building.Name || 'Unnamed'}`);
-                devicesList.Devices.push(...allDevices);
+                devices.push(...allDevices);
             }
 
-            const devicesCount = devicesList.Devices.length;
+            const devicesCount = devices.length;
             if (devicesCount === 0) {
                 devicesList.Info = 'No devices found'
                 return devicesList;
             }
 
-            await this.functions.saveData(this.devicesFile, devicesList.Devices);
-            if (this.logDebug) this.emit('debug', `${devicesCount} devices saved`);
-
             devicesList.State = true;
             devicesList.Info = `Found ${devicesCount} devices`;
+            devicesList.Devices = devices;
+
+            await this.functions.saveData(this.devicesFile, devicesList);
+            if (this.logDebug) this.emit('debug', `${devicesCount} devices saved`);
+
             return devicesList;
         } catch (error) {
             throw new Error(`Check devices list error: ${error.message}`);

package/src/melcloudata.js

@@ -52,7 +52,7 @@ class MelCloudAta extends EventEmitter {
         try {
             //read device info from file
             const devicesData = await this.functions.readData(this.devicesFile, true);
-            const deviceData = devicesData.find(device => device.DeviceID === this.deviceId);
+            const deviceData = devicesData.Devices.find(device => device.DeviceID === this.deviceId);
 
             if (this.accountType === 'melcloudhome') {
                 deviceData.Device.OperationMode = AirConditioner.OperationModeMapStringToEnum[deviceData.Device.OperationMode] ?? deviceData.Device.OperationMode;

package/src/melcloudatw.js

@@ -52,7 +52,7 @@ class MelCloudAtw extends EventEmitter {
         try {
             //read device info from file
             const devicesData = await this.functions.readData(this.devicesFile, true);
-            const deviceData = devicesData.find(device => device.DeviceID === this.deviceId);
+            const deviceData = devicesData.Devices.find(device => device.DeviceID === this.deviceId);
 
             if (this.accountType === 'melcloudhome') {
             }

package/src/melclouderv.js

@@ -52,7 +52,7 @@ class MelCloudErv extends EventEmitter {
         try {
             //read device info from file
             const devicesData = await this.functions.readData(this.devicesFile, true);
-            const deviceData = devicesData.find(device => device.DeviceID === this.deviceId);
+            const deviceData = devicesData.Devices.find(device => device.DeviceID === this.deviceId);
 
             if (this.accountType === 'melcloudhome') {
                 //read default temps

package/src/melcloudhome.js

@@ -166,16 +166,17 @@ class MelCloud extends EventEmitter {
                 return devicesList;
             }
 
-            await this.functions.saveData(this.devicesFile, devices);
-            if (this.logDebug) this.emit('debug', `${devicesCount} devices saved`);
-
             devicesList.State = true;
             devicesList.Info = `Found ${devicesCount} devices`;
             devicesList.Devices = devices;
+
+            await this.functions.saveData(this.devicesFile, devicesList);
+            if (this.logDebug) this.emit('debug', `${devicesCount} devices saved`);
+
             return devicesList;
         } catch (error) {
             if (error.response?.status === 401) {
-                await connectToMelCloudHome();
+                await connect();
                 if (this.logWarn) this.emit('warn', 'Check devices list not possible, cookies expired, trying to get new.');
                 return;
             }