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

package/homebridge-ui/public/index.html

@@ -205,13 +205,13 @@
     });
 
     // Generic remove function
-    // Generic remove function
-    function removeStaleEntities(configEntities, MelcloudEntities, getConfigId, getMelcloudId) {
+    function removeStaleEntities(configEntities, MelcloudEntities, getConfigId, getMelcloudId, filterFn) {
       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 +223,7 @@
       return removedEntities;
     }
 
+
     // Update info on page
     function updateInfo(id, text, color) {
       const el = document.getElementById(id);
@@ -272,7 +273,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);
@@ -286,7 +287,6 @@
         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
@@ -296,7 +296,7 @@
         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);
 
@@ -351,13 +351,16 @@
 
               // SCENES
               deviceInConfig.scenes = deviceInConfig.scenes ?? [];
-              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) ?? [];
 
+              // Usuń stare sceny tylko dla tego urządzenia
+              removedFromConfig.scenes.push(...removeStaleEntities(deviceInConfig.scenes, scenesForDevice, s => s.id, s => s.Id));
+
+              // Dodaj nowe sceny dla tego urządzenia
+              const existingSceneIds = new Set(deviceInConfig.scenes.map(s => String(s.id)));
               scenesForDevice.forEach((scene, index) => {
                 const sceneId = String(scene.Id);
-                if (!sceneIds.has(sceneId)) {
+                if (!existingSceneIds.has(sceneId)) {
                   const sceneObj = {
                     id: sceneId,
                     displayType: 0,
@@ -368,6 +371,7 @@
                   newScenes.push(sceneObj);
                 }
               });
+
             }
           });
 

package/package.json

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