homebridge-melcloud-control 3.1.3-beta.9 → 3.1.4-beta.0

package/homebridge-ui/public/index.html

@@ -151,33 +151,25 @@
         const info = response.info ?? '';
         const status = response.status;
         const devices = response.data ?? [];
-        const devicesByType = {
-          ata: [],
-          atw: [],
-          erv: []
-        };
-
-        //new found devices
-        const newDevices = {
-          ata: [],
-          ataPresets: [],
-          atw: [],
-          atwPresets: [],
-          erv: [],
-          ervPresets: [],
-        };
-
-        //info text
-        let textAta = 'ATA: 0';
-        let textAtaPresets = 'ATA Presets: 0';
-        let textAtw = 'ATW: 0';
-        let textAtwPresets = 'ATW Presets: 0';
-        let textErv = 'ERV: 0';
-        let textErvPresets = 'ERV Presets: 0';
 
         //response status
         switch (status) {
           case 0:
+            //new found devices
+            const newDevices = {
+              ata: [],
+              ataPresets: [],
+              atw: [],
+              atwPresets: [],
+              erv: [],
+              ervPresets: [],
+            };
+
+            const devicesByType = {
+              ata: [],
+              atw: [],
+              erv: []
+            };
 
             //get devices by type
             for (const device of devices) {
@@ -187,9 +179,26 @@
               const pusDeviceTypeErv = deviceType === 3 ? devicesByType.erv.push(device) : false;
             };
 
+            //devices from config
+            const ataDevices = pluginConfig[0].accounts[this.deviceIndex].ataDevices ?? [];
+            const atwDevices = pluginConfig[0].accounts[this.deviceIndex].atwDevices ?? [];
+            const ervDevices = pluginConfig[0].accounts[this.deviceIndex].ervDevices ?? [];
+
+            //info text
+            let textAta = 'ATA: 0';
+            let textAtaPresets = 'ATA Presets: 0';
+            let ataPresetsCount = 0;
+            let textAtw = 'ATW: 0';
+            let textAtwPresets = 'ATW Presets: 0';
+            let atwPresetsCount = 0;
+            let textErv = 'ERV: 0';
+            let textErvPresets = 'ERV Presets: 0';
+            let ervPresetsCount = 0;
+
             //device ata
-            for (const device of devicesByType.ata) {
+            devicesByType.ata.forEach((device, index) => {
               const deviceId = device.DeviceID;
+              const deviceType = device.Type;
               const deviceName = device.DeviceName;
               const devicePresets = device.Presets ?? [];
 
@@ -208,6 +217,12 @@
                 buttonsSensors: []
               };
 
+              const deviceExistsInConfig = ataDevices.find(device => device.id === deviceId);
+              if (!deviceExistsInConfig) {
+                ataDevices.push(deviceAta);
+                newDevices.ata.push(deviceAta);
+              };
+
               //presets
               for (const preset of devicePresets) {
                 const presetId = preset.ID;
@@ -217,19 +232,29 @@
                 preset.name = presetName;
                 preset.displayType == 0;
                 preset.namePrefix = false;
-                newDevices.ataPresets.push(preset);
-              };
-              deviceAta.presets = newDevices.ataPresets;
-              textAtaPresets = `ATA Presets: ${newDevices.ataPresets.length}`
 
-              newDevices.ata.push(deviceAta);
-            };
-            pluginConfig[0].accounts[this.deviceIndex].ataDevices = newDevices.ata;
+                let presetExistsInConfig = false;
+                for (const ataDevice of ataDevices) {
+                  if (ataDevice.presets?.some(preset => preset.id === presetId)) {
+                    presetExistsInConfig = true;
+                    break;
+                  }
+                }
+
+                if (!presetExistsInConfig) {
+                  ataDevices[index].presets.push(preset);
+                  newDevices.ataPresets.push(preset);
+                };
+              };
+              ataPresetsCount = newDevices.ataPresets.length;
+              textAtaPresets = `ATA Presets: ${ataPresetsCount}`
+            });
             textAta = `ATA: ${newDevices.ata.length}`
 
             //device atw
-            for (const device of devicesByType.atw) {
+            devicesByType.atw.forEach((device, index) => {
               const deviceId = device.DeviceID;
+              const deviceType = device.Type;
               const deviceName = device.DeviceName;
               const devicePresets = device.Presets ?? [];
 
@@ -254,6 +279,12 @@
                 buttonsSensors: []
               };
 
+              const deviceExistsInConfig = atwDevices.find(device => device.id === deviceId);
+              if (!deviceExistsInConfig) {
+                atwDevices.push(deviceAtw);
+                newDevices.atw.push(deviceAtw);
+              };
+
               //presets
               for (const preset of devicePresets) {
                 const presetId = preset.ID;
@@ -263,19 +294,29 @@
                 preset.name = presetName;
                 preset.displayType == 0;
                 preset.namePrefix = false;
-                newDevices.atwPresets.push(preset);
-              };
-              textAtwPresets = `ATW Presets: ${newDevices.atwPresets.length}`
 
-              deviceAtw.presets = deviceAtw.atwPresets;
-              newDevices.ata.push(deviceAtw);
-            };
-            pluginConfig[0].accounts[this.deviceIndex].atwDevices = newDevices.atw;
+                let presetExistsInConfig = false;
+                for (const atwDevice of atwDevices) {
+                  if (atwDevice.presets?.some(preset => preset.id === presetId)) {
+                    presetExistsInConfig = true;
+                    break;
+                  }
+                }
+
+                if (!presetExistsInConfig) {
+                  atwDevices[index].presets.push(preset);
+                  newDevices.atwPresets.push(preset);
+                };
+              };
+              atwPresetsCount = newDevices.atwPresets.length;
+              textAtwPresets = `ATW Presets: ${atwPresetsCount}`
+            });
             textAtw = `ATW: ${newDevices.atw.length}`
 
             //device erv
-            for (const device of devicesByType.erv) {
+            devicesByType.erv.forEach((device, index) => {
               const deviceId = device.DeviceID;
+              const deviceType = device.Type;
               const deviceName = device.DeviceName;
               const devicePresets = device.Presets ?? [];
 
@@ -294,6 +335,12 @@
                 buttonsSensors: []
               };
 
+              const deviceExistsInConfig = ervDevices.find(device => device.id === deviceId);
+              if (!deviceExistsInConfig) {
+                ervDevices.push(deviceErv);
+                newDevices.erv.push(deviceErv);
+              };
+
               //presets
               for (const preset of devicePresets) {
                 const presetId = preset.ID;
@@ -303,18 +350,27 @@
                 preset.name = presetName;
                 preset.displayType == 0;
                 preset.namePrefix = false;
-                newDevices.atwPresets.push(preset);
-              };
-              textErvPresets = `ERV Presets: ${newDevices.ErvPresets.length}`
 
-              deviceErv.presets = deviceErv.ervPresets;
-              newDevices.erv.push(deviceErv);
-            };
-            pluginConfig[0].accounts[this.deviceIndex].ervDevices = newDevices.erv;
+                let presetExistsInConfig = false;
+                for (const ervDevice of ervDevices) {
+                  if (ervDevice.presets?.some(preset => preset.id === presetId)) {
+                    presetExistsInConfig = true;
+                    break;
+                  }
+                }
+
+                if (!presetExistsInConfig) {
+                  ervDevices[index].presets.push(preset);
+                  newDevices.ervPresets.push(preset);
+                };
+              };
+              ervPresetsCount = newDevices.ervPresets.length;
+              textErvPresets = `ERV Presets: ${ervPresetsCount}`
+            });
             textErv = `ERV: ${newDevices.erv.length}`
 
             const newDevicesCount = newDevices.ata.length + newDevices.atw.length + newDevices.erv.length ?? 0;
-            const newPresetsCount = newDevices.ataPresets.length + newDevices.atwPresets.length + newDevices.ervPresets.length ?? 0;
+            const newPresetsCount = ataPresetsCount + atwPresetsCount + ervPresetsCount ?? 0;
             if (newDevicesCount === 0 && newPresetsCount === 0) {
               document.getElementById('info').innerHTML = 'No new devices found.';
               document.getElementById('info').style.color = 'white';

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "MELCloud Control",
   "name": "homebridge-melcloud-control",
-  "version": "3.1.3-beta.9",
+  "version": "3.1.4-beta.0",
   "description": "Homebridge plugin to control Mitsubishi Air Conditioner, Heat Pump and Energy Recovery Ventilation.",
   "license": "MIT",
   "author": "grzegorz914",
@@ -28,8 +28,8 @@
     "LICENSE"
   ],
   "engines": {
-    "node": ">=18.0.0",
-    "homebridge": ">=2.0.0"
+    "homebridge": "^1.6.0 || ^2.0.0-beta.0",
+    "node": "^18.20.4 || ^20.15.1"
   },
   "dependencies": {
     "@homebridge/plugin-ui-utils": "^1.0.3",

package/src/deviceata.js

@@ -86,6 +86,11 @@ class DeviceAta extends EventEmitter {
         this.accessory.targetOperationMode = 0;
         this.accessory.fanSpeed = 0;
 
+        this.accessory.operationModeSetPropsMinValue = 0;
+        this.accessory.operationModeSetPropsMaxValue = 3;
+        this.accessory.operationModeSetPropsValidValues = [0];
+        this.accessory.fanSpeedSetPropsMaxValue = 2;
+
         //melcloud device
         this.melCloudAta = new MelCloudAta({
             contextKey: contextKey,
@@ -187,6 +192,7 @@ class DeviceAta extends EventEmitter {
             .on('deviceState', async (deviceData, deviceState, useFahrenheit) => {
                 //device info
                 const displayMode = this.displayMode;
+                const inStandbyMode = deviceData.Device.InStandbyMode;
                 const hasAutomaticFanSpeed = deviceData.Device.HasAutomaticFanSpeed ?? false;
                 const airDirectionFunction = deviceData.Device.AirDirectionFunction ?? false;
                 const hasOutdoorTemperature = deviceData.Device.HasOutdoorTemperature ?? false;
@@ -215,7 +221,6 @@ class DeviceAta extends EventEmitter {
                 const vaneVertical = deviceState.VaneVertical;
                 const hideVaneControls = deviceState.HideVaneControls;
                 const hideDryModeControl = deviceState.HideDryModeControl;
-                const inStandbyMode = deviceState.InStandbyMode;
                 const prohibitSetTemperature = deviceState.ProhibitSetTemperature;
                 const prohibitOperationMode = deviceState.ProhibitOperationMode;
                 const prohibitPower = deviceState.ProhibitPower;
@@ -244,10 +249,6 @@ class DeviceAta extends EventEmitter {
                 this.accessory.numberOfFanSpeeds = numberOfFanSpeeds;
                 this.accessory.modelSupportsFanSpeed = modelSupportsFanSpeed;
                 this.accessory.modelSupportsDry = modelSupportsDry;
-                this.accessory.operationModeSetPropsMinValue = 0;
-                this.accessory.operationModeSetPropsMaxValue = 3;
-                this.accessory.operationModeSetPropsValidValues = [0];
-                this.accessory.fanSpeedSetPropsMaxValue = 2;
 
                 //operating mode
                 switch (displayMode) {
@@ -808,32 +809,30 @@ class DeviceAta extends EventEmitter {
                             })
                             .onSet(async (value) => {
                                 try {
-                                    let fanSpeed = 0; //AUTO, 1, 2, 3, 4, 5, 6
                                     let fanSpeedModeText = 0; //AUTO, 1, 2, 3, 4, 5, 6, OFF
                                     switch (numberOfFanSpeeds) {
                                         case 2: //Fan speed mode 2
-                                            fanSpeed = hasAutomaticFanSpeed ? [0, 1, 2, 0][value] : [1, 1, 2][value];
+                                            deviceState.fanSpeed = hasAutomaticFanSpeed ? [0, 1, 2, 0][value] : [1, 1, 2][value];
                                             fanSpeedModeText = hasAutomaticFanSpeed ? [7, 1, 2, 0][value] : [7, 1, 2][value];
                                             break;
                                         case 3: //Fan speed mode 3
-                                            fanSpeed = hasAutomaticFanSpeed ? [0, 1, 2, 3, 0][value] : [1, 1, 2, 3][value];
+                                            deviceState.fanSpeed = hasAutomaticFanSpeed ? [0, 1, 2, 3, 0][value] : [1, 1, 2, 3][value];
                                             fanSpeedModeText = hasAutomaticFanSpeed ? [7, 1, 2, 3, 0][value] : [7, 1, 2, 3][value];
                                             break;
                                         case 4: //Fan speed mode 4
-                                            fanSpeed = hasAutomaticFanSpeed ? [0, 1, 2, 3, 4, 0][value] : [1, 1, 2, 3, 4][value];
+                                            deviceState.fanSpeed = hasAutomaticFanSpeed ? [0, 1, 2, 3, 4, 0][value] : [1, 1, 2, 3, 4][value];
                                             fanSpeedModeText = hasAutomaticFanSpeed ? [7, 1, 2, 3, 4, 0][value] : [7, 1, 2, 3, 4][value];
                                             break;
                                         case 5: //Fan speed mode 5
-                                            fanSpeed = hasAutomaticFanSpeed ? [0, 1, 2, 3, 4, 5, 0][value] : [1, 1, 2, 3, 4, 5][value];
+                                            deviceState.fanSpeed = hasAutomaticFanSpeed ? [0, 1, 2, 3, 4, 5, 0][value] : [1, 1, 2, 3, 4, 5][value];
                                             fanSpeedModeText = hasAutomaticFanSpeed ? [7, 1, 2, 3, 4, 5, 0][value] : [7, 1, 2, 3, 4, 5][value];
                                             break;
                                         case 6: //Fan speed mode 6
-                                            fanSpeed = hasAutomaticFanSpeed ? [0, 1, 2, 3, 4, 5, 6, 0][value] : [1, 1, 2, 3, 4, 5, 6][value];
+                                            deviceState.fanSpeed = hasAutomaticFanSpeed ? [0, 1, 2, 3, 4, 5, 6, 0][value] : [1, 1, 2, 3, 4, 5, 6][value];
                                             fanSpeedModeText = hasAutomaticFanSpeed ? [7, 1, 2, 3, 4, 5, 6, 0][value] : [7, 1, 2, 3, 4, 5, 6][value];
                                             break;
                                     };
 
-                                    deviceState.SetFanSpeed = fanSpeed;
                                     deviceState.EffectiveFlags = CONSTANTS.AirConditioner.EffectiveFlags.SetFanSpeed;
                                     await this.melCloudAta.send(deviceState);
                                     const info = this.disableLogInfo ? false : this.emit('message', `Set fan speed mode: ${CONSTANTS.AirConditioner.FanSpeed[fanSpeedModeText]}`);

package/src/deviceatw.js

@@ -42,25 +42,25 @@ class DeviceAtw extends EventEmitter {
         //function
         this.melCloud = melCloud; //function
 
-         //presets configured
-         this.presetsConfigured = [];
-         for (const preset of this.presets) {
-             const presetName = preset.name ?? false;
-             const presetDisplayType = preset.displayType ?? 0;
-             const presetNamePrefix = preset.namePrefix ?? false;
-             if (presetName && presetDisplayType > 0) {
-                 const presetyServiceType = ['', Service.Outlet, Service.Switch, Service.MotionSensor, Service.OccupancySensor, Service.ContactSensor][presetDisplayType];
-                 const presetCharacteristicType = ['', Characteristic.On, Characteristic.On, Characteristic.MotionDetected, Characteristic.OccupancyDetected, Characteristic.ContactSensorState][presetDisplayType];
-                 preset.namePrefix = presetNamePrefix;
-                 preset.serviceType = presetyServiceType;
-                 preset.characteristicType = presetCharacteristicType;
-                 preset.state = false;
-                 this.presetsConfigured.push(preset);
-             } else {
-                 const log = presetDisplayType === 0 ? false : this.emit('message', `Preset Name: ${preset ? preset : 'Missing'}.`);
-             };
-         }
-         this.presetsConfiguredCount = this.presetsConfigured.length || 0;
+        //presets configured
+        this.presetsConfigured = [];
+        for (const preset of this.presets) {
+            const presetName = preset.name ?? false;
+            const presetDisplayType = preset.displayType ?? 0;
+            const presetNamePrefix = preset.namePrefix ?? false;
+            if (presetName && presetDisplayType > 0) {
+                const presetyServiceType = ['', Service.Outlet, Service.Switch, Service.MotionSensor, Service.OccupancySensor, Service.ContactSensor][presetDisplayType];
+                const presetCharacteristicType = ['', Characteristic.On, Characteristic.On, Characteristic.MotionDetected, Characteristic.OccupancyDetected, Characteristic.ContactSensorState][presetDisplayType];
+                preset.namePrefix = presetNamePrefix;
+                preset.serviceType = presetyServiceType;
+                preset.characteristicType = presetCharacteristicType;
+                preset.state = false;
+                this.presetsConfigured.push(preset);
+            } else {
+                const log = presetDisplayType === 0 ? false : this.emit('message', `Preset Name: ${preset ? preset : 'Missing'}.`);
+            };
+        }
+        this.presetsConfiguredCount = this.presetsConfigured.length || 0;
 
         //buttons configured
         this.buttonsConfigured = [];
@@ -453,11 +453,15 @@ class DeviceAtw extends EventEmitter {
                     this.accessory.zones[i].lockPhysicalControl = lockPhysicalControl;
                     this.accessory.zones[i].flowTemperature = flowTemperature;
                     this.accessory.zones[i].returnTemperature = returnTemperature;
-                    this.accessory.zones[i].operationModesSetPropsMinValue = operationModeSetPropsMinValue;
-                    this.accessory.zones[i].operationModesSetPropsMaxValue = operationModeSetPropsMaxValue;
-                    this.accessory.zones[i].operationModesSetPropsValidValues = operationModeSetPropsValidValues;
-                    this.accessory.zones[i].temperaturesSetPropsMinValue = temperatureSetPropsMinValue;
-                    this.accessory.zones[i].temperaturesSetPropsMaxValue = temperatureSetPropsMaxValue;
+
+                    //only on first run
+                    if (this.startPrepareAccessory) {
+                        this.accessory.zones[i].operationModesSetPropsMinValue = operationModeSetPropsMinValue;
+                        this.accessory.zones[i].operationModesSetPropsMaxValue = operationModeSetPropsMaxValue;
+                        this.accessory.zones[i].operationModesSetPropsValidValues = operationModeSetPropsValidValues;
+                        this.accessory.zones[i].temperaturesSetPropsMinValue = temperatureSetPropsMinValue;
+                        this.accessory.zones[i].temperaturesSetPropsMaxValue = temperatureSetPropsMaxValue;
+                    };
 
                     //update temperature sensors
                     switch (i) {

package/src/deviceerv.js

@@ -85,6 +85,11 @@ class DeviceErv extends EventEmitter {
         this.accessory.fanSpeed = 0;
         this.accessory.lockPhysicalControl = 0;
 
+        this.accessory.operationModeSetPropsMinValue = 0;
+        this.accessory.operationModeSetPropsMaxValue = 3;
+        this.accessory.operationModeSetPropsValidValues = [0];
+        this.accessory.fanSpeedSetPropsMaxValue = 2;
+
         //melcloud device
         this.melCloudErv = new MelCloudErv({
             contextKey: contextKey,
@@ -266,10 +271,6 @@ class DeviceErv extends EventEmitter {
                 this.accessory.coreMaintenanceRequired = coreMaintenanceRequired;
                 this.accessory.filterMaintenanceRequired = filterMaintenanceRequired;
                 this.accessory.actualVentilationMode = actualVentilationMode;
-                this.accessory.operationModeSetPropsMinValue = 0;
-                this.accessory.operationModeSetPropsMaxValue = 3;
-                this.accessory.operationModeSetPropsValidValues = [0];
-                this.accessory.fanSpeedSetPropsMaxValue = 2;
 
                 //operation mode - 0, HEAT, 2, COOL, 4, 5, 6, FAN, AUTO
                 switch (displayMode) {