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

package/homebridge-ui/public/index.html

@@ -205,13 +205,12 @@
     });
 
     // Generic remove function
-    function removeStaleEntities(configEntities, MelcloudEntities, getConfigId, getMelcloudId, filterFn) {
+    function removeStaleEntities(configEntities, MelcloudEntities, getConfigId, getMelcloudId) {
       const serverIds = new Set((MelcloudEntities ?? []).map(item => String(getMelcloudId(item))));
       const removedEntities = [];
 
       for (let i = configEntities.length - 1; i >= 0; i--) {
         const entity = configEntities[i];
-        if (filterFn && !filterFn(entity)) continue; // jeśli nie dotyczy tego urządzenia, pomiń
         const entityId = String(getConfigId(entity));
 
         if (!serverIds.has(entityId)) {
@@ -223,6 +222,13 @@
       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) {
@@ -233,22 +239,6 @@
       }
     }
 
-    // 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();
@@ -287,10 +277,8 @@
         const removedFromConfigAta = removeStaleEntities(account.ataDevices, devicesInMelCloudByType.ata, d => d.id, d => d.DeviceID);
         const removedFromConfigAtw = removeStaleEntities(account.atwDevices, devicesInMelCloudByType.atw, d => d.id, d => d.DeviceID);
         const removedFromConfigErv = removeStaleEntities(account.ervDevices, devicesInMelCloudByType.erv, d => d.id, d => d.DeviceID);
-        const removedFromConfig = { ataPresets: [], atwPresets: [], ervPresets: [], ataSchedules: [], atwSchedules: [], ervSchedules: [], scenes: [] };
 
-        // Map UnitId → Scenes
-        const unitIdToScenes = mapUnitIdToScenes(scenesInMelCloud);
+        const removedFromConfig = { ataPresets: [], atwPresets: [], ervPresets: [], ataSchedules: [], atwSchedules: [], ervSchedules: [], scenes: [] };
 
         // Generic device handler (obsługuje urządzenia, presety, harmonogramy i sceny)
         const handleDevices = (devicesInMelCloud, devicesInConfig, deviceTypeString, newDevices, newPresets, newSchedules, newScenes) => {
@@ -351,14 +339,24 @@
 
               // SCENES
               deviceInConfig.scenes = deviceInConfig.scenes ?? [];
-              const scenesForDevice = unitIdToScenes.get(deviceId) ?? [];
 
-              // Usuń stare sceny tylko dla tego urządzenia
-              removedFromConfig.scenes.push(...removeStaleEntities(deviceInConfig.scenes, scenesForDevice, s => s.id, s => s.Id));
+              // 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
+                )
+              );
 
-              // Dodaj nowe sceny dla tego urządzenia
+              // DODAWANIE: brakujące sceny dla urządzenia
               const existingSceneIds = new Set(deviceInConfig.scenes.map(s => String(s.id)));
-              scenesForDevice.forEach((scene, index) => {
+
+              scenesInMelCloudForDevice.forEach((scene, index) => {
                 const sceneId = String(scene.Id);
                 if (!existingSceneIds.has(sceneId)) {
                   const sceneObj = {

package/package.json

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