homebridge-melcloud-control 4.3.5-beta.21 → 4.3.5-beta.23

package/index.js

@@ -120,18 +120,19 @@ class MelCloudPlatform {
 								if (logLevel.success) log.success(`${accountName}, ${accountInfo.Info}`);
 
 								//check devices list
-								let melcloudDevicesList;
+								let devicesList;
 								try {
-									melcloudDevicesList = await melcloud.checkDevicesList();
-									if (!melcloudDevicesList.State) {
-										if (logLevel.warn) log.warn(`${accountName}, ${melcloudDevicesList.Info}`);
+									devicesList = await melcloud.checkDevicesList();
+									if (!devicesList.State) {
+										if (logLevel.warn) log.warn(`${accountName}, ${devicesList.Info}`);
 										return;
 									}
 								} catch (error) {
 									if (logLevel.error) log.error(`${accountName}, Check devices list error: ${error.message ?? error}`);
 									return;
 								}
-								if (logLevel.debug) log.info(melcloudDevicesList.Info);
+								if (logLevel.debug) log.info(devicesList.Info);
+								const melcloudDevices = devicesList.Devices;
 
 								//start account impulse generator
 								await melcloud.impulseGenerator.state(true, timmers, false);
@@ -146,7 +147,7 @@ class MelCloudPlatform {
 								for (const [index, device] of devices.entries()) {
 									//chack device from config exist on melcloud
 									const displayType = device.displayType > 0;
-									const deviceExistInMelCloud = melcloudDevicesList.Devices.some(dev => dev.DeviceID === device.id);
+									const deviceExistInMelCloud = melcloudDevices.some(dev => dev.DeviceID === device.id);
 									if (!deviceExistInMelCloud || !displayType) continue;
 
 									device.id = String(device.id);
@@ -180,15 +181,15 @@ class MelCloudPlatform {
 									let configuredDevice;
 									switch (deviceType) {
 										case 0: //ATA
-											configuredDevice = new DeviceAta(api, account, device, defaultTempsFile, accountInfo, accountFile, melcloud, melcloudDevicesList);
+											configuredDevice = new DeviceAta(api, account, device, defaultTempsFile, accountInfo, accountFile, melcloud, melcloudDevices);
 											break;
 										case 1: //ATW
-											configuredDevice = new DeviceAtw(api, account, device, defaultTempsFile, accountInfo, accountFile, melcloud, melcloudDevicesList);
+											configuredDevice = new DeviceAtw(api, account, device, defaultTempsFile, accountInfo, accountFile, melcloud);
 											break;
 										case 2:
 											break;
 										case 3: //ERV
-											configuredDevice = new DeviceErv(api, account, device, defaultTempsFile, accountInfo, accountFile, melcloud, melcloudDevicesList);
+											configuredDevice = new DeviceErv(api, account, device, defaultTempsFile, accountInfo, accountFile, melcloud);
 											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.21",
+  "version": "4.3.5-beta.23",
   "description": "Homebridge plugin to control Mitsubishi Air Conditioner, Heat Pump and Energy Recovery Ventilation.",
   "license": "MIT",
   "author": "grzegorz914",

package/src/deviceata.js

@@ -7,7 +7,7 @@ import { TemperatureDisplayUnits, AirConditioner } from './constants.js';
 let Accessory, Characteristic, Service, Categories, AccessoryUUID;
 
 class DeviceAta extends EventEmitter {
-    constructor(api, account, device, defaultTempsFile, accountInfo, accountFile, melcloud) {
+    constructor(api, account, device, defaultTempsFile, accountInfo, accountFile, melcloud, melcloudDevices) {
         super();
 
         Accessory = api.platformAccessory;
@@ -18,6 +18,7 @@ class DeviceAta extends EventEmitter {
 
         //account config
         this.melcloud = melcloud;
+        this.melcloudDevices = melcloudDevices;
         this.account = account;
         this.accountType = account.type;
         this.accountName = account.name;
@@ -1320,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.melCloudAta = new MelCloudAta(this.account, this.device, this.defaultTempsFile, this.accountFile, this.melcloud, this.melcloudDevices)
                 .on('deviceInfo', (modelIndoor, modelOutdoor, serialNumber, firmwareAppVersion) => {
                     if (this.logDeviceInfo && this.displayDeviceInfo) {
                         this.emit('devInfo', `---- ${this.deviceTypeString}: ${this.deviceName} ----`);

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, melcloudDevices) {
         super();
         this.accountType = account.type;
         this.logSuccess = account.log?.success;
@@ -23,7 +23,7 @@ class MelCloudAta extends EventEmitter {
 
         //set default values
         this.deviceData = {};
-        this.headers = {};
+        this.headers = melcloudDevices.Headers;
 
         let deviceData = null;
         melcloud.on('devicesList', async (devicesData) => {
@@ -32,7 +32,7 @@ class MelCloudAta extends EventEmitter {
             if (!deviceData) return;
             deviceData.Scenes = devicesData.Scenes ?? [];
 
-            if (!this.logDebug) this.emit('debug', `MELCloud: ${melcloud}`);
+            if (!this.logDebug) this.emit('debug', `MELCloud: ${JSON.stringify(melcloudDevices, null, 2)}`);
 
             //update state
             await this.updateState(deviceData);
@@ -93,6 +93,11 @@ class MelCloudAta extends EventEmitter {
                 if (this.logError) this.emit('error', `Web socket process message error: ${error}`);
             }
         });
+
+        //only update state once at the beginning
+        const deviceInMelcloud = melcloudDevices.find(device => device.DeviceID === this.deviceId)
+        deviceInMelcloud.Scenes = melcloudDevices.Scenes ?? [];
+        this.updateState(deviceInMelcloud);
     }
 
     async updateState(deviceData) {