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

package/homebridge-ui/public/index.html

@@ -186,19 +186,17 @@
               const pusDeviceTypeErv = deviceType === 3 ? devicesByType.erv.push(device) : false;
             };
 
-            //get device info fom devices ata
-            devicesByType.ata.forEach(async (device, index) => {
+            //device ata
+            for (const device of devicesByType.ata) {
               const deviceId = device.DeviceID;
               const deviceType = device.Type;
-              const deviceTypeText = "Air Conditioner";
               const deviceName = device.DeviceName;
               const devicePresets = device.Presets ?? [];
 
-              //device ata
               const deviceAta = {
                 id: deviceId,
                 type: deviceType,
-                typeString: deviceTypeText,
+                typeString: "Air Conditioner",
                 name: deviceName,
                 displayMode: 1,
                 heatDryFanMode: 1,
@@ -210,15 +208,6 @@
                 buttonsSensors: []
               };
 
-              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);
-              const devicesCount = newDevices.ata.length;
-              textAta = `ATA: ${devicesCount}`
-
               //presets
               for (const preset of devicePresets) {
                 const presetId = preset.ID;
@@ -228,35 +217,27 @@
                 preset.name = presetName;
                 preset.displayType == 0;
                 preset.namePrefix = false;
-
-                const ataPresetsExist = pluginConfig[0].accounts[this.deviceIndex].ataDevices[index].presets ?? false;
-                const ataPresets = ataPresetsExist ? pluginConfig[0].accounts[this.deviceIndex].ataDevices[index].presets : pluginConfig[0].accounts[this.deviceIndex].ataDevices[index].presets = [];
-                const ataPresetIdExist = ataPresets.some(preset => preset.id === presetId);
-                const pushPresetAta = ataPresetIdExist ? false : ataPresets.push(preset);
-                const pushNewPreset = ataPresetIdExist ? false : newDevices.ataPresets.push(preset);
-                const presetsCount = newDevices.ataPresets.length;
-                textAtaPresets = `ATA Presets: ${presetsCount}`
+                newDevices.ataPresets.push(preset);
               };
+              deviceAta.presets = newDevices.ataPresets;
+              textAtaPresets = `ATA Presets: ${newDevices.ataPresets.length}`
 
-              //compare presets
-              const presetsOnMelCloud = devicePresets;
-              const presetsAtaInConfig = pluginConfig[0].accounts[this.deviceIndex].ataDevices[index].presets;
-              presetsAtaInConfig = syncArrays(presetsOnMelCloud, presetsAtaInConfig);
-            });
+              newDevices.ata.push(deviceAta);
+            };
+            pluginConfig[0].accounts[this.deviceIndex].ataDevices = newDevices.ata;
+            textAta = `ATA: ${newDevices.ata.length}`
 
-            //get device info fom devices atw
-            devicesByType.atw.forEach(async (device, index) => {
+            //device atw
+            for (const device of devicesByType.atw) {
               const deviceId = device.DeviceID;
               const deviceType = device.Type;
-              const deviceTypeText = "Heat Pump";
               const deviceName = device.DeviceName;
               const devicePresets = device.Presets ?? [];
 
-              //device atw
               const deviceAtw = {
                 id: deviceId,
                 type: deviceType,
-                typeString: deviceTypeText,
+                typeString: "Heat Pump",
                 name: deviceName,
                 displayMode: 1,
                 temperatureSensor: false,
@@ -273,15 +254,8 @@
                 presets: [],
                 buttonsSensors: []
               };
-              const atwDevicesExist = pluginConfig[0].accounts[this.deviceIndex].atwDevices ?? false;
-              const atwDevices = atwDevicesExist ? pluginConfig[0].accounts[this.deviceIndex].atwDevices : pluginConfig[0].accounts[this.deviceIndex].atwDevices = [];
-              const atwDeviceIdExist = atwDevices.some(device => device.id === deviceId);
-              const pushTypeAtw = atwDeviceIdExist ? false : atwDevices.push(deviceAtw);
-              const pushNewDevice = atwDeviceIdExist ? false : newDevices.atw.push(device);
-              const devicesCount = newDevices.atw.length;
-              textAtw = `ATW: ${devicesCount}`
-
-              //presetzs
+
+              //presets
               for (const preset of devicePresets) {
                 const presetId = preset.ID;
                 const presetName = preset.NumberDescription;
@@ -290,34 +264,27 @@
                 preset.name = presetName;
                 preset.displayType == 0;
                 preset.namePrefix = false;
-
-                const atwPresetsExist = pluginConfig[0].accounts[this.deviceIndex].atwDevices[index].presets ?? false;
-                const atwPresets = atwPresetsExist ? pluginConfig[0].accounts[this.deviceIndex].atwDevices[index].presets : pluginConfig[0].accounts[this.deviceIndex].atwDevices[index].presets = [];
-                const atwPresetIdExist = atwPresets.some(preset => preset.id === presetId);
-                const pushPresetAtw = atwPresetIdExist ? false : atwPresets.push(preset);
-                const pushNewPreset = atwPresetIdExist ? false : newDevices.atwPresets.push(preset);
-                const presetsCount = newDevices.atwPresets.length;
-                textAtwPresets = `ATW Presets: ${presetsCount}`
+                newDevices.atwPresets.push(preset);
               };
+              textAtwPresets = `ATW Presets: ${newDevices.atwPresets.length}`
 
-              const presetsOnMelCloud = devicePresets;
-              const presetsAtwInConfig = pluginConfig[0].accounts[this.deviceIndex].atwDevices[index].presets;
-              presetsAtwInConfig = syncArrays(presetsOnMelCloud, presetsAtwInConfig);
-            });
+              deviceAtw.presets = deviceAtw.atwPresets;
+              newDevices.ata.push(deviceAtw);
+            };
+            pluginConfig[0].accounts[this.deviceIndex].atwDevices = newDevices.atw;
+            textAtw = `ATW: ${newDevices.atw.length}`
 
-            //get device info fom devices erv
-            devicesByType.erv.forEach(async (device, index) => {
+            //device erv
+            for (const device of devicesByType.erv) {
               const deviceId = device.DeviceID;
               const deviceType = device.Type;
-              const deviceTypeText = "Energy Recovery Ventilation";
               const deviceName = device.DeviceName;
               const devicePresets = device.Presets ?? [];
 
-              //device erv
               const deviceErv = {
                 id: deviceId,
                 type: deviceType,
-                typeString: deviceTypeText,
+                typeString: "Energy Recovery Ventilation",
                 name: deviceName,
                 displayMode: 1,
                 temperatureSensor: false,
@@ -328,13 +295,6 @@
                 presets: [],
                 buttonsSensors: []
               };
-              const ervDevicesExist = pluginConfig[0].accounts[this.deviceIndex].ervDevices ?? false;
-              const ervDevices = ervDevicesExist ? pluginConfig[0].accounts[this.deviceIndex].ervDevices : pluginConfig[0].accounts[this.deviceIndex].ervDevices = [];
-              const ervDeviceIdExist = ervDevices.some(device => device.id === deviceId);
-              const pushTypeerv = ervDeviceIdExist ? false : ervDevices.push(deviceErv);
-              const pushNewDevice = ervDeviceIdExist ? false : newDevices.erv.push(device);
-              const devicesCount = newDevices.erv.length;
-              textErv = `ERV: ${devicesCount}`
 
               //presets
               for (const preset of devicePresets) {
@@ -345,31 +305,15 @@
                 preset.name = presetName;
                 preset.displayType == 0;
                 preset.namePrefix = false;
-
-                const ervPresetsExist = pluginConfig[0].accounts[this.deviceIndex].ervDevices[index].presets ?? false;
-                const ervPresets = ervPresetsExist ? pluginConfig[0].accounts[this.deviceIndex].ervDevices[index].presets : pluginConfig[0].accounts[this.deviceIndex].ervDevices[index].presets = [];
-                const ervPresetIdExist = ervPresets.some(preset => preset.id === presetId);
-                const pushPresetErv = ervPresetIdExist ? false : ervPresets.push(preset);
-                const pushNewPreset = ervPresetIdExist ? false : newDevices.ervPresets.push(preset);
-                const presetsCount = newDevices.ervPresets.length;
-                textErvPresets = `ERV Presets: ${presetsCount}`
+                newDevices.atwPresets.push(preset);
               };
+              textErvPresets = `ERV Presets: ${newDevices.ErvPresets.length}`
 
-              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);
+              deviceErv.presets = deviceErv.ervPresets;
+              newDevices.erv.push(deviceErv);
+            };
+            pluginConfig[0].accounts[this.deviceIndex].ervDevices = newDevices.erv;
+            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;
@@ -414,23 +358,6 @@
             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/package.json

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