homebridge-melcloud-control 4.3.3-beta.16 → 4.3.3-beta.18

package/index.js

@@ -195,7 +195,6 @@ class MelCloudPlatform {
 										//start impulse generators\
 										await configuredDevice.startStopImpulseGenerator(true, [{ name: 'checkState', sampling: deviceRefreshInterval }]);
 										const timmers = accountType === 'melcloudhome' ? [{ name: 'connect', sampling: 3300000 }, { name: 'checkDevicesList', sampling: 3000 }] : [{ name: 'checkDevicesList', sampling: refreshInterval }];
-										await new Promise(r => setTimeout(r, 1000));
 										await melCloud.impulseGenerator.state(true, timmers, false);
 
 										//stop impulse generator

package/package.json

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

package/src/functions.js

@@ -169,11 +169,12 @@ class Functions extends EventEmitter {
     }
 
     parseArrayNameValue(data) {
-        Object.fromEntries(
+        return Object.fromEntries(
             data.map(({ name, value }) => {
-                let parsedValue = this.convertValue(value);
+                const parsedValue = this.convertValue(value);
                 return [name, parsedValue];
-            }));
+            })
+        );
     }
 }
 export default Functions

package/src/melcloudata.js

@@ -151,6 +151,7 @@ class MelCloudAta extends EventEmitter {
 
             this.headers = devicesData.Headers;
             const deviceData = devicesData.Devices.find(device => device.DeviceID === this.deviceId);
+            if (!deviceData) return;
             deviceData.Scenes = devicesData.Scenes ?? [];
 
             //web cocket connection
@@ -199,24 +200,29 @@ class MelCloudAta extends EventEmitter {
                             switch (unitId) {
                                 case this.deviceId:
                                     const messageType = parsedMessage[0].messageType;
+                                    const settings = messageData.settings ? this.functions.parseArrayNameValue(messageData.settings) : [];
                                     switch (messageType) {
                                         case 'unitStateChanged':
-                                            const deviceSettings = this.functions.parseArrayNameValue(messageData.settings);
-                                            deviceData.Device.Power = deviceSettings.Power ?? deviceData.Device.Power;
-                                            deviceData.Device.OperationMode = deviceSettings.OperationMode ?? deviceData.Device.OperationMode;
-                                            deviceData.Device.RoomTemperature = deviceSettings.RoomTemperature ?? deviceData.Device.RoomTemperature;
-                                            deviceData.Device.SetTemperature = deviceSettings.SetTemperature ?? deviceData.Device.SetTemperature;
-                                            deviceData.Device.ActualFanSpeed = deviceSettings.ActualFanSpeed ?? deviceData.Device.ActualFanSpeed;
-                                            deviceData.Device.SetFanSpeed = deviceSettings.SetFanSpeed ?? deviceData.Device.SetFanSpeed;
-                                            deviceData.Device.VaneHorizontalDirection = deviceSettings.VaneHorizontalDirection ?? deviceData.Device.VaneHorizontalDirection;
-                                            deviceData.Device.VaneVerticalDirection = deviceSettings.VaneVerticalDirection ?? deviceData.Device.VaneVerticalDirection;
-                                            deviceData.HolidayMode.Enabled = deviceSettings.HolidayMode ?? deviceData.HolidayMode.Enabled;
+
+                                            //update values
+                                            for (const { key, value } of settings) {
+                                                if (!this.functions.isValidValue(value)) continue;
+
+                                                if (key === 'HolidayMode') {
+                                                    deviceData.HolidayMode.Enabled = value;
+                                                    continue;
+                                                }
+
+                                                //skip HolidayMode, update generic device fields
+                                                if (key in deviceData.Device) {
+                                                    deviceData.Device[key] = value;
+                                                }
+                                            }
                                             updateState = true;
                                             break;
                                         case 'unitHolidayModeTriggered':
-                                            const holidayModeSettings = this.functions.parseArrayNameValue(messageData.settings);
-                                            deviceData.Device.Power = holidayModeSettings.Power;
-                                            deviceData.HolidayMode.Enabled = holidayModeSettings.HolidayMode;
+                                            deviceData.Device.Power = settings.Power;
+                                            deviceData.HolidayMode.Enabled = settings.HolidayMode;
                                             deviceData.HolidayMode.Active = messageData.active;
                                             updateState = true;
                                             break;

package/src/melcloudatw.js

@@ -145,6 +145,7 @@ class MelCloudAtw extends EventEmitter {
 
             this.headers = devicesData.Headers;
             const deviceData = devicesData.Devices.find(device => device.DeviceID === this.deviceId);
+            if (!deviceData) return;
             deviceData.Scenes = devicesData.Scenes ?? [];
 
             //web cocket connection

package/src/melclouderv.js

@@ -60,6 +60,7 @@ class MelCloudErv extends EventEmitter {
 
             this.headers = devicesData.Headers;
             const deviceData = devicesData.Devices.find(device => device.DeviceID === this.deviceId);
+            if (!deviceData) return;
             if (this.accountType === 'melcloudhome') {
                 deviceData.Scenes = devicesData.Scenes ?? [];