homebridge-melcloud-control 4.4.1-beta.44 → 4.4.1-beta.45

package/homebridge-ui/public/index.html

@@ -204,6 +204,7 @@
       }
     });
 
+    // Generic remove function
     // Generic remove function
     function removeStaleEntities(configEntities, MelcloudEntities, getConfigId, getMelcloudId) {
       const serverIds = new Set((MelcloudEntities ?? []).map(item => String(getMelcloudId(item))));
@@ -222,14 +223,6 @@
       return removedEntities;
     }
 
-    function getScenesForDevice(unitId, scenesInMelCloud) {
-      return (scenesInMelCloud ?? []).filter(scene => {
-        const allSettings = [...(scene.AtaSceneSettings ?? []), ...(scene.AtwSceneSettings ?? []), ...(scene.ErvSceneSettings ?? [])];
-        return allSettings.some(s => String(s.UnitId) === String(unitId));
-      });
-    }
-
-
     // Update info on page
     function updateInfo(id, text, color) {
       const el = document.getElementById(id);
@@ -239,6 +232,22 @@
       }
     }
 
+    // Map UnitId → Scenes for quick lookup
+    function mapUnitIdToScenes(scenesInMelCloud) {
+      const map = new Map();
+
+      (scenesInMelCloud ?? []).forEach(scene => {
+        const allSceneSettings = [...(scene.AtaSceneSettings ?? []), ...(scene.AtwSceneSettings ?? []), ...(scene.ErvSceneSettings ?? [])];
+        allSceneSettings.forEach(setting => {
+          const unitId = String(setting.UnitId);
+          if (!map.has(unitId)) map.set(unitId, []);
+          map.get(unitId).push(scene);
+        });
+      });
+
+      return map;
+    }
+
     // Login & Sync Logic
     document.getElementById('logIn').addEventListener('click', async () => {
       homebridge.showSpinner();
@@ -263,7 +272,7 @@
         const scenesInMelCloud = response.Scenes ?? [];
 
         // Split devices by type
-        response.Devices ?? [].forEach(device => {
+        (response.Devices ?? []).forEach(device => {
           if (device.Type === 0) devicesInMelCloudByType.ata.push(device);
           if (device.Type === 1) devicesInMelCloudByType.atw.push(device);
           if (device.Type === 3) devicesInMelCloudByType.erv.push(device);
@@ -280,11 +289,14 @@
 
         const removedFromConfig = { ataPresets: [], atwPresets: [], ervPresets: [], ataSchedules: [], atwSchedules: [], ervSchedules: [], scenes: [] };
 
+        // Map UnitId → Scenes
+        const unitIdToScenes = mapUnitIdToScenes(scenesInMelCloud);
+
         // Generic device handler (obsługuje urządzenia, presety, harmonogramy i sceny)
         const handleDevices = (devicesInMelCloud, devicesInConfig, deviceTypeString, newDevices, newPresets, newSchedules, newScenes) => {
           const configDevicesMap = new Map(devicesInConfig.map(dev => [String(dev.id), dev]));
 
-          devicesInMelCloud.forEach(device => {
+          (devicesInMelCloud ?? []).forEach(device => {
             const deviceId = String(device.DeviceID);
             let deviceInConfig = configDevicesMap.get(deviceId);
 
@@ -339,26 +351,12 @@
 
               // SCENES
               deviceInConfig.scenes = deviceInConfig.scenes ?? [];
-
-              // tylko sceny MELCloud należące do tego urządzenia
-              const scenesInMelCloudForDevice = getScenesForDevice(deviceId, scenesInMelCloud);
-
-              // USUWANIE: scena istnieje globalnie, ale nie należy już do tego urządzenia
-              removedFromConfig.scenes.push(
-                ...removeStaleEntities(
-                  deviceInConfig.scenes,
-                  scenesInMelCloudForDevice,
-                  s => s.id,
-                  s => s.Id
-                )
-              );
-
-              // DODAWANIE: brakujące sceny dla urządzenia
-              const existingSceneIds = new Set(deviceInConfig.scenes.map(s => String(s.id)));
-
-              scenesInMelCloudForDevice.forEach((scene, index) => {
+              removedFromConfig.scenes.push(...removeStaleEntities(deviceInConfig.scenes, scenesInMelCloud, s => s.id, s => s.Id));
+              const sceneIds = new Set(deviceInConfig.scenes.map(s => String(s.id)));
+              const scenesForDevice = unitIdToScenes.get(deviceId) ?? [];
+              scenesForDevice.forEach((scene, index) => {
                 const sceneId = String(scene.Id);
-                if (!existingSceneIds.has(sceneId)) {
+                if (!sceneIds.has(sceneId)) {
                   const sceneObj = {
                     id: sceneId,
                     displayType: 0,
@@ -369,7 +367,6 @@
                   newScenes.push(sceneObj);
                 }
               });
-
             }
           });
 

package/package.json

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