homebridge-melcloud-control 4.1.2-beta.42 → 4.1.2-beta.44

package/homebridge-ui/public/index.html

@@ -254,44 +254,55 @@
           const removedErv = removeStaleDevices(account.ervDevices, devicesByType.erv);
 
           const handleDevices = (devicesInMelCloud, devicesInConfig, typeString, newArr, newPresets) => {
-            devicesInMelCloud.forEach(device => {
-              const deviceObj = {
-                id: device.DeviceID,
-                type: device.Type,
-                typeString,
-                displayType: 0,
-                name: device.DeviceName,
-                presets: [],
-                schedules: [],
-                buttonsSensors: []
-              };
-
-              if (!devicesInConfig.some(dev => String(dev.id) === device.DeviceID)) {
-                devicesInConfig.push(deviceObj);
-                newArr.push(deviceObj);
-              }
-
-              const deviceInConfig = devicesInConfig.find(dev => String(dev.id) === device.DeviceID);
-              if (deviceInConfig) {
-                const idKey = account.type === 'melcloud' ? 'ID' : 'Id';
-                const typeKey = account.type === 'melcloud' ? 'Presets' : 'Schedules';
-                const presets = device[typeKey] || [];
-                presets.forEach((preset, index) => {
-                  const presetObj = {
-                    id: preset[idKey],
+            try {
+              const configDevicesMap = new Map(devicesInConfig.map(dev => [String(dev.id), dev]));
+
+              devicesInMelCloud.forEach(device => {
+                const deviceId = String(device.DeviceID);
+                let deviceInConfig = configDevicesMap.get(deviceId);
+
+                if (!deviceInConfig) {
+                  deviceInConfig = {
+                    id: device.DeviceID,
+                    type: device.Type,
+                    typeString,
                     displayType: 0,
-                    name: preset.NumberDescription || `Schedule ${index}`,
-                    namePrefix: false
+                    name: device.DeviceName,
+                    presets: [],
+                    schedules: [],
+                    buttonsSensors: []
                   };
+                  devicesInConfig.push(deviceInConfig);
+                  newArr.push(deviceInConfig);
+                  configDevicesMap.set(deviceId, deviceInConfig);
+                }
+
+                const idKey = account.type === 'melcloud' ? 'ID' : 'Id';
+                const typeKey = account.type === 'melcloud' ? 'Presets' : 'Schedule';
+                const typeKey1 = account.type === 'melcloud' ? 'presets' : 'schedules';
+                const presets = device[typeKey] || [];
 
-                  const presetsInConfig = deviceInConfig.presets || [];
-                  if (!presetsInConfig.some(pres => String(pres.id) === preset[idKey])) {
+                const presetsInConfig = deviceInConfig[typeKey1] || [];
+                const presetIds = new Set(presetsInConfig.map(p => String(p.id)));
+
+                presets.forEach((preset, index) => {
+                  const presetId = String(preset[idKey]);
+                  if (!presetIds.has(presetId)) {
+                    const presetObj = {
+                      id: presetId,
+                      displayType: 0,
+                      name: preset.NumberDescription || `Schedule ${index}`,
+                      namePrefix: false
+                    };
                     presetsInConfig.push(presetObj);
                     newPresets.push(presetObj);
+                    presetIds.add(presetId);
                   }
                 });
-              }
-            });
+              });
+            } catch (error) {
+              updateInfo('info1', `Error while processing device: ${error.message || error}`, 'red');
+            }
           };
 
           handleDevices(devicesByType.ata, account.ataDevices, "Air Conditioner", newDevices.ata, newDevices.ataPresets);

package/package.json

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