homebridge-melcloud-control 3.1.2 → 3.1.3-beta.0

package/homebridge-ui/public/index.html

@@ -187,7 +187,7 @@
             };
 
             //get device info fom devices ata
-            devicesByType.ata.forEach((device, index) => {
+            devicesByType.ata.forEach(async (device, index) => {
               const deviceId = device.DeviceID;
               const deviceType = device.Type;
               const deviceTypeText = "Air Conditioner";
@@ -212,6 +212,7 @@
 
               const ataDevicesExist = pluginConfig[0].accounts[this.deviceIndex].ataDevices ?? false;
               const ataDevices = ataDevicesExist ? pluginConfig[0].accounts[this.deviceIndex].ataDevices : pluginConfig[0].accounts[this.deviceIndex].ataDevices = [];
+
               const ataDeviceIdExist = ataDevices.some(device => device.id === deviceId);
               const pushTypeAta = ataDeviceIdExist ? false : ataDevices.push(deviceAta);
               const pushNewDevice = ataDeviceIdExist ? false : newDevices.ata.push(device);
@@ -236,10 +237,15 @@
                 const presetsCount = newDevices.ataPresets.length;
                 textAtaPresets = `ATA Presets: ${presetsCount}`
               };
+
+              //compare presets
+              const presetsOnMelCloud = devicePresets;
+              const presetsAtaInConfig = pluginConfig[0].accounts[this.deviceIndex].ataDevices[index].presets;
+              presetsAtaInConfig = syncArrays(presetsOnMelCloud, presetsAtaInConfig);
             });
 
             //get device info fom devices atw
-            devicesByType.atw.forEach((device, index) => {
+            devicesByType.atw.forEach(async (device, index) => {
               const deviceId = device.DeviceID;
               const deviceType = device.Type;
               const deviceTypeText = "Heat Pump";
@@ -293,10 +299,14 @@
                 const presetsCount = newDevices.atwPresets.length;
                 textAtwPresets = `ATW Presets: ${presetsCount}`
               };
+
+              const presetsOnMelCloud = devicePresets;
+              const presetsAtwInConfig = pluginConfig[0].accounts[this.deviceIndex].atwDevices[index].presets;
+              presetsAtwInConfig = syncArrays(presetsOnMelCloud, presetsAtwInConfig);
             });
 
             //get device info fom devices erv
-            devicesByType.erv.forEach((device, index) => {
+            devicesByType.erv.forEach(async (device, index) => {
               const deviceId = device.DeviceID;
               const deviceType = device.Type;
               const deviceTypeText = "Energy Recovery Ventilation";
@@ -344,8 +354,23 @@
                 const presetsCount = newDevices.ervPresets.length;
                 textErvPresets = `ERV Presets: ${presetsCount}`
               };
+
+              const presetsOnMelCloud = devicePresets;
+              const presetsErvInConfig = pluginConfig[0].accounts[this.deviceIndex].ervDevices[index].presets;
+              presetsErvInConfig = await syncArrays(presetsOnMelCloud, presetsErvInConfig);
             });
 
+            //compare arrays and update array in config
+            const devicesOnMelCloud = devices;
+            const devicesAtaInConfig = pluginConfig[0].accounts[this.deviceIndex].ataDevices;
+            devicesAtaInConfig = await syncArrays(devicesOnMelCloud, devicesAtaInConfig);
+
+            const devicesAtwInConfig = pluginConfig[0].accounts[this.deviceIndex].atwDevices;
+            devicesAtwInConfig = await syncArrays(devicesOnMelCloud, devicesAtwInConfig);
+
+            const devicesErvInConfig = pluginConfig[0].accounts[this.deviceIndex].ervDevices;
+            devicesErvInConfig = await syncArrays(devicesOnMelCloud, devicesErvInConfig);
+
             const newDevicesCount = newDevices.ata.length + newDevices.atw.length + newDevices.erv.length ?? 0;
             const newPresetsCount = newDevices.ataPresets.length + newDevices.atwPresets.length + newDevices.ervPresets.length ?? 0;
             if (newDevicesCount === 0 && newPresetsCount === 0) {
@@ -389,6 +414,23 @@
             break;
         };
 
+        async function syncArrays(devicesOnMelCloud, devicesInConfig) {
+          // Create a Set of IDs from devicesOnMelCloud for quick lookup
+          const devicesOnMelCloudId = new Set(devicesOnMelCloud.map(device => device.DeviceID));
+
+          // Filter devicesInConfig to keep only objects that exist in devicesOnMelCloud
+          devicesInConfig = devicesInConfig.filter(device => devicesOnMelCloudId.has(device.DeviceID));
+
+          // Add objects from devicesOnMelCloud to devicesInConfig that do not exist in devicesInConfig
+          devicesOnMelCloud.forEach(device => {
+            if (!devicesInConfig.some(item => item.id === device.id)) {
+              devicesInConfig.push(device);
+            }
+          });
+
+          return devicesInConfig;
+        }
+
         homebridge.hideSpinner();
       } catch (e) {
         document.getElementById('info').innerHTML = 'Please try again.';

package/index.js

@@ -105,7 +105,9 @@ class MelCloudPlatform {
 
 					//Air Conditioner
 					for (const device of account.ataDevices) {
-						if (!device.id || device.displayMode === 0) {
+						//chack device from config exist on melcloud
+						const deviceExistInMelCloud = devices.some(dev => dev.DeviceID === device.id);
+						if (!deviceExistInMelCloud || device.displayMode === 0) {
 							continue;
 						};
 
@@ -142,7 +144,9 @@ class MelCloudPlatform {
 
 					//Heat Pump
 					for (const device of account.atwDevices) {
-						if (!device.id || device.displayMode === 0) {
+						//chack device from config exist on melcloud
+						const deviceExistInMelCloud = devices.some(dev => dev.DeviceID === device.id);
+						if (!deviceExistInMelCloud || device.displayMode === 0) {
 							continue;
 						};
 
@@ -180,7 +184,9 @@ class MelCloudPlatform {
 
 					//Energy Recovery Ventilation
 					for (const device of account.ervDevices) {
-						if (!device.id || device.displayMode === 0) {
+						//chack device from config exist on melcloud
+						const deviceExistInMelCloud = devices.some(dev => dev.DeviceID === device.id);
+						if (!deviceExistInMelCloud || device.displayMode === 0) {
 							continue;
 						};
 

package/package.json

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