homebridge-melcloud-control 4.3.5-beta.28 → 4.3.5-beta.29

package/index.js

@@ -120,18 +120,18 @@ class MelCloudPlatform {
 								if (logLevel.success) log.success(`${accountName}, ${accountInfo.Info}`);
 
 								//check devices list
-								let devicesList;
+								let melcloudDevicesList;
 								try {
-									devicesList = await melcloud.checkDevicesList();
-									if (!devicesList.State) {
-										if (logLevel.warn) log.warn(`${accountName}, ${devicesList.Info}`);
+									melcloudDevicesList = await melcloud.checkDevicesList();
+									if (!melcloudDevicesList.State) {
+										if (logLevel.warn) log.warn(`${accountName}, ${melcloudDevicesList.Info}`);
 										return;
 									}
 								} catch (error) {
 									if (logLevel.error) log.error(`${accountName}, Check devices list error: ${error.message ?? error}`);
 									return;
 								}
-								if (logLevel.debug) log.info(devicesList.Info);
+								if (logLevel.debug) log.info(melcloudDevicesList.Info);
 
 								//start account impulse generator
 								await melcloud.impulseGenerator.state(true, timmers, false);
@@ -146,7 +146,7 @@ class MelCloudPlatform {
 								for (const [index, device] of devices.entries()) {
 									//chack device from config exist on melcloud
 									const displayType = device.displayType > 0;
-									const deviceExistInMelCloud = devicesList.Devices.some(dev => dev.DeviceID === device.id);
+									const deviceExistInMelCloud = melcloudDevicesList.Devices.some(dev => dev.DeviceID === device.id);
 									if (!deviceExistInMelCloud || !displayType) continue;
 
 									device.id = String(device.id);
@@ -180,15 +180,15 @@ class MelCloudPlatform {
 									let configuredDevice;
 									switch (deviceType) {
 										case 0: //ATA
-											configuredDevice = new DeviceAta(api, account, device, defaultTempsFile, accountInfo, accountFile, melcloud, devicesList);
+											configuredDevice = new DeviceAta(api, account, device, defaultTempsFile, accountInfo, accountFile, melcloud, melcloudDevicesList);
 											break;
 										case 1: //ATW
-											configuredDevice = new DeviceAtw(api, account, device, defaultTempsFile, accountInfo, accountFile, melcloud);
+											configuredDevice = new DeviceAtw(api, account, device, defaultTempsFile, accountInfo, accountFile, melcloud, melcloudDevicesList);
 											break;
 										case 2:
 											break;
 										case 3: //ERV
-											configuredDevice = new DeviceErv(api, account, device, defaultTempsFile, accountInfo, accountFile, melcloud);
+											configuredDevice = new DeviceErv(api, account, device, defaultTempsFile, accountInfo, accountFile, melcloud, melcloudDevicesList);
 											break;
 										default:
 											if (logLevel.warn) log.warn(`${accountName}, ${deviceTypeString}, ${deviceName}, unknown device: ${deviceType}.`);

package/package.json

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

package/src/deviceata.js

@@ -1321,7 +1321,7 @@ class DeviceAta extends EventEmitter {
     async start() {
         try {
             //melcloud device
-            this.melCloudAta = new MelCloudAta(this.account, this.device, this.defaultTempsFile, this.accountFile, this.melcloud, this.melcloudDevicesList)
+            this.melCloudAta = new MelCloudAta(this.account, this.device, this.defaultTempsFile, this.accountFile, this.melcloud)
                 .on('deviceInfo', (modelIndoor, modelOutdoor, serialNumber, firmwareAppVersion) => {
                     if (this.logDeviceInfo && this.displayDeviceInfo) {
                         this.emit('devInfo', `---- ${this.deviceTypeString}: ${this.deviceName} ----`);
@@ -1878,7 +1878,7 @@ class DeviceAta extends EventEmitter {
             if (this.restFul.enable || this.mqtt.enable) await this.externalIntegrations();
 
             //check state
-            await this.melCloudAta.checkState();
+            await this.melCloudAta.checkState(this.melcloudDevicesList);
 
             //prepare accessory
             await new Promise(r => setTimeout(r, 5000));

package/src/deviceatw.js

@@ -7,7 +7,7 @@ import { TemperatureDisplayUnits, HeatPump } from './constants.js';
 let Accessory, Characteristic, Service, Categories, AccessoryUUID;
 
 class DeviceAtw extends EventEmitter {
-    constructor(api, account, device, defaultTempsFile, accountInfo, accountFile, melcloud) {
+    constructor(api, account, device, defaultTempsFile, accountInfo, accountFile, melcloud, melcloudDevicesList) {
         super();
 
         Accessory = api.platformAccessory;
@@ -18,6 +18,7 @@ class DeviceAtw extends EventEmitter {
 
         //account config
         this.melcloud = melcloud;
+        this.melcloudDevicesList = melcloudDevicesList;
         this.account = account;
         this.accountType = account.type;
         this.accountName = account.name;
@@ -1566,7 +1567,7 @@ class DeviceAtw extends EventEmitter {
     async start() {
         try {
             //melcloud device
-            this.melCloudAtw = new MelCloudAtw(this.account, this.device, this.defaultTempsFile, this.accountFile, this.melcloud, this.melcloudDevices)
+            this.melCloudAtw = new MelCloudAtw(this.account, this.device, this.defaultTempsFile, this.accountFile, this.melcloud)
                 .on('deviceInfo', (modelIndoor, modelOutdoor, serialNumber, firmwareAppVersion, supportsHotWaterTank, supportsZone2) => {
                     if (this.logDeviceInfo && this.displayDeviceInfo) {
                         this.emit('devInfo', `---- ${this.deviceTypeString}: ${this.deviceName} ----`);
@@ -2305,8 +2306,11 @@ class DeviceAtw extends EventEmitter {
             //start external integrations
             if (this.restFul.enable || this.mqtt.enable) await this.externalIntegrations();
 
+            //check state
+            await this.melCloudAta.checkState(this.melcloudDevicesList);
+
             //prepare accessory
-             await new Promise(r => setTimeout(r, 1000));
+            await new Promise(r => setTimeout(r, 1000));
             const accessory = await this.prepareAccessory();
             return accessory;
         } catch (error) {

package/src/deviceerv.js

@@ -7,7 +7,7 @@ import { TemperatureDisplayUnits, Ventilation } from './constants.js';
 let Accessory, Characteristic, Service, Categories, AccessoryUUID;
 
 class DeviceErv extends EventEmitter {
-    constructor(api, account, device, defaultTempsFile, accountInfo, accountFile, melcloud) {
+    constructor(api, account, device, defaultTempsFile, accountInfo, accountFile, melcloud, melcloudDevicesList) {
         super();
 
         Accessory = api.platformAccessory;
@@ -18,6 +18,7 @@ class DeviceErv extends EventEmitter {
 
         //account config
         this.melcloud = melcloud;
+        this.melcloudDevicesList = melcloudDevicesList;
         this.account = account;
         this.accountType = account.type;
         this.accountName = account.name;
@@ -1579,6 +1580,9 @@ class DeviceErv extends EventEmitter {
             //start external integrations
             if (this.restFul.enable || this.mqtt.enable) await this.externalIntegrations();
 
+            //check state
+            await this.melCloudAta.checkState(this.melcloudDevicesList);
+
             //prepare accessory
             await new Promise(r => setTimeout(r, 1000));
             const accessory = await this.prepareAccessory();

package/src/melcloudata.js

@@ -4,7 +4,7 @@ import Functions from './functions.js';
 import { ApiUrls, ApiUrlsHome, AirConditioner } from './constants.js';
 
 class MelCloudAta extends EventEmitter {
-    constructor(account, device, defaultTempsFile, accountFile, melcloud, melcloudDevicesList) {
+    constructor(account, device, defaultTempsFile, accountFile, melcloud) {
         super();
         this.accountType = account.type;
         this.logSuccess = account.log?.success;
@@ -167,13 +167,12 @@ class MelCloudAta extends EventEmitter {
         };
     };
 
-    async checkState() {
+    async checkState(devicesData) {
         try {
-            const devicesList = this.melcloudDevicesList;
-            const deviceInMelcloud = devicesList.Devices.find(device => device.DeviceID === this.deviceId);
-            deviceInMelcloud.Scenes = devicesList.Scenes ?? [];
-            this.headers = devicesList.Headers;
-            this.updateState(deviceInMelcloud);
+            this.headers = devicesData.Headers;
+            const deviceData = devicesData.Devices.find(device => device.DeviceID === this.deviceId);
+            deviceData.Scenes = devicesData.Scenes ?? [];
+            await this.updateState(deviceData);
 
             return true;
         } catch (error) {

package/src/melcloudatw.js

@@ -16,6 +16,7 @@ class MelCloudAtw extends EventEmitter {
         this.deviceId = device.id;
         this.defaultTempsFile = defaultTempsFile;
         this.accountFile = accountFile;
+        this.melcloudDevicesList = melcloudDevicesList;
         this.functions = new Functions(this.logWarn, this.logError, this.logDebug)
             .on('warn', warn => this.emit('warn', warn))
             .on('error', error => this.emit('error', error))
@@ -156,6 +157,19 @@ class MelCloudAtw extends EventEmitter {
         };
     };
 
+    async checkState(devicesData) {
+        try {
+            this.headers = devicesData.Headers;
+            const deviceData = devicesData.Devices.find(device => device.DeviceID === this.deviceId);
+            deviceData.Scenes = devicesData.Scenes ?? [];
+            await this.updateState(deviceData);
+
+            return true;
+        } catch (error) {
+            throw new Error(`Chaeck state error: ${error.message}`);
+        };
+    }
+
     async send(accountType, displayType, deviceData, flag, flagData) {
         try {
 

package/src/melclouderv.js

@@ -16,6 +16,7 @@ class MelCloudErv extends EventEmitter {
         this.deviceId = device.id;
         this.defaultTempsFile = defaultTempsFile;
         this.accountFile = accountFile;
+        this.melcloudDevicesList = melcloudDevicesList;
         this.functions = new Functions(this.logWarn, this.logError, this.logDebug)
             .on('warn', warn => this.emit('warn', warn))
             .on('error', error => this.emit('error', error))
@@ -159,6 +160,19 @@ class MelCloudErv extends EventEmitter {
         };
     };
 
+    async checkState(devicesData) {
+        try {
+            this.headers = devicesData.Headers;
+            const deviceData = devicesData.Devices.find(device => device.DeviceID === this.deviceId);
+            deviceData.Scenes = devicesData.Scenes ?? [];
+            await this.updateState(deviceData);
+
+            return true;
+        } catch (error) {
+            throw new Error(`Chaeck state error: ${error.message}`);
+        };
+    }
+
     async send(accountType, displayType, deviceData, flag, flagData) {
         try {
             let method = null