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

package/homebridge-ui/public/index.html

@@ -205,12 +205,13 @@
     });
 
     // Generic remove function
-    function removeStaleEntities(configEntities, MelcloudEntities, getConfigId, getMelcloudId) {
-      const serverIds = new Set(MelcloudEntities.map(item => String(getMelcloudId(item))));
+    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)) {
@@ -222,6 +223,8 @@
       return removedEntities;
     }
 
+
+    // Update info on page
     function updateInfo(id, text, color) {
       const el = document.getElementById(id);
       if (el) {
@@ -230,6 +233,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();
@@ -253,12 +272,14 @@
         const devicesInMelCloudByType = { ata: [], atw: [], erv: [] };
         const scenesInMelCloud = response.Scenes ?? [];
 
-        response.Devices.forEach(device => {
+        // Split devices by type
+        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);
         });
 
+        // Clean up local config
         account.ataDevices = (account.ataDevices ?? []).filter(d => String(d.id) !== '0');
         account.atwDevices = (account.atwDevices ?? []).filter(d => String(d.id) !== '0');
         account.ervDevices = (account.ervDevices ?? []).filter(d => String(d.id) !== '0');
@@ -268,32 +289,28 @@
         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);
 
-        // Handle Devices
+        // 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 => {
-            const deviceId = String(device.DeviceID); // Make sure this matches MelCloud data
+            const deviceId = String(device.DeviceID);
             let deviceInConfig = configDevicesMap.get(deviceId);
 
             if (!deviceInConfig) {
-              deviceInConfig = {
-                id: deviceId,
-                type: device.Type,
-                deviceTypeString,
-                displayType: 0,
-                name: device.DeviceName,
-              };
+              deviceInConfig = { id: deviceId, type: device.Type, deviceTypeString, displayType: 0, name: device.DeviceName };
               devicesInConfig.push(deviceInConfig);
               newDevices.push(deviceInConfig);
               configDevicesMap.set(deviceId, deviceInConfig);
             }
 
-            //ONLY MELCLOUD - PRESETS
+            // PRESETS (melcloud)
             if (account.type === 'melcloud') {
               deviceInConfig.presets = deviceInConfig.presets ?? [];
-              const presetsInMelCloud = device.Presets || [];
+              const presetsInMelCloud = device.Presets ?? [];
               removedFromConfig.ataPresets.push(...removeStaleEntities(deviceInConfig.presets, presetsInMelCloud, p => p.id, p => p.ID));
               const presetIds = new Set(deviceInConfig.presets.map(p => String(p.id)));
               presetsInMelCloud.forEach((preset, index) => {
@@ -311,11 +328,11 @@
               });
             }
 
-            //ONLY MELCLOUD HOME - SCHEDULES & SCENES
+            // SCHEDULES & SCENES (melcloudhome)
             if (account.type === 'melcloudhome') {
               // SCHEDULES
               deviceInConfig.schedules = deviceInConfig.schedules ?? [];
-              const schedulesInMelCloud = device.Schedule || [];
+              const schedulesInMelCloud = device.Schedule ?? [];
               removedFromConfig.ataSchedules.push(...removeStaleEntities(deviceInConfig.schedules, schedulesInMelCloud, s => s.id, s => s.Id));
               const scheduleIds = new Set(deviceInConfig.schedules.map(s => String(s.id)));
               schedulesInMelCloud.forEach((schedule, index) => {
@@ -334,17 +351,16 @@
 
               // SCENES
               deviceInConfig.scenes = deviceInConfig.scenes ?? [];
+              const scenesForDevice = unitIdToScenes.get(deviceId) ?? [];
 
-              // Usuwanie nieaktualnych scen
-              removedFromConfig.scenes.push(...removeStaleEntities(deviceInConfig.scenes, scenesInMelCloud, s => s.id, s => s.Id));
-              const sceneIds = new Set(deviceInConfig.scenes.map(s => String(s.id)));
-              scenesInMelCloud.forEach((scene, index) => {
-                const sceneId = String(scene.Id);
-
-                // Sprawdzamy, czy scena dotyczy danego urządzenia w AtaSceneSettings lub AtwSceneSettings
-                const appliesToDevice = (scene.AtaSceneSettings ?? []).some(s => s.UnitId === deviceInConfig.id) || (scene.AtwSceneSettings ?? []).some(s => s.UnitId === deviceInConfig.id) || (scene.ErvSceneSettings ?? []).some(s => s.UnitId === deviceInConfig.id);
+              // Usuń stare sceny tylko dla tego urządzenia
+              removedFromConfig.scenes.push(...removeStaleEntities(deviceInConfig.scenes, scenesForDevice, s => s.id, s => s.Id));
 
-                if (appliesToDevice && !sceneIds.has(sceneId)) {
+              // 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 (!existingSceneIds.has(sceneId)) {
                   const sceneObj = {
                     id: sceneId,
                     displayType: 0,
@@ -356,7 +372,6 @@
                 }
               });
 
-
             }
           });
 
@@ -368,7 +383,7 @@
         account.atwDevices = handleDevices(devicesInMelCloudByType.atw, account.atwDevices, "Heat Pump", newInMelCloud.atw, newInMelCloud.atwPresets, newInMelCloud.atwSchedules, newInMelCloud.scenes);
         account.ervDevices = handleDevices(devicesInMelCloudByType.erv, account.ervDevices, "Energy Recovery Ventilation", newInMelCloud.erv, newInMelCloud.ervPresets, newInMelCloud.ervSchedules, newInMelCloud.scenes);
 
-        // Summary
+        // Summary counts
         const newDevicesCount = newInMelCloud.ata.length + newInMelCloud.atw.length + newInMelCloud.erv.length;
         const newPresetsCount = newInMelCloud.ataPresets.length + newInMelCloud.atwPresets.length + newInMelCloud.ervPresets.length;
         const newSchedulesCount = newInMelCloud.ataSchedules.length + newInMelCloud.atwSchedules.length + newInMelCloud.ervSchedules.length;
@@ -376,7 +391,7 @@
         const removedDevicesCount = removedFromConfigAta.length + removedFromConfigAtw.length + removedFromConfigErv.length;
         const removedPresetsCount = removedFromConfig.ataPresets.length + removedFromConfig.atwPresets.length + removedFromConfig.ervPresets.length;
         const removedSchedulesCount = removedFromConfig.ataSchedules.length + removedFromConfig.atwSchedules.length + removedFromConfig.ervSchedules.length;
-        const removedScenesCount = removedFromConfig.scenes.length
+        const removedScenesCount = removedFromConfig.scenes.length;
 
         if (!newDevicesCount && !newPresetsCount && !newSchedulesCount && !newScenesCount && !removedDevicesCount && !removedPresetsCount && !removedSchedulesCount && !removedScenesCount) {
           updateInfo('info', 'No changes detected.', 'white');
@@ -390,9 +405,9 @@
           if (removedDevicesCount)
             updateInfo('info', `Removed devices: ${removedFromConfigAta.length ? `ATA: ${removedFromConfigAta.length},` : ''} ${removedFromConfigAtw.length ? `ATW: ${removedFromConfigAtw.length},` : ''} ${removedFromConfigErv.length ? `ERV: ${removedFromConfigErv.length}` : ''}.`, 'orange');
           if (removedPresetsCount)
-            updateInfo('info1', `Rempved presets: ${removedFromConfig.ataPresets.length ? `ATA: ${removedFromConfig.ataPresets.length},` : ''} ${removedFromConfig.atwPresets.length ? `ATW: ${removedFromConfig.atwPresets.length},` : ''} ${removedFromConfig.ervPresets.length ? `ERV: ${removedFromConfig.ervPresets.length}` : ''}.`, 'orange');
+            updateInfo('info1', `Removed presets: ${removedFromConfig.ataPresets.length ? `ATA: ${removedFromConfig.ataPresets.length},` : ''} ${removedFromConfig.atwPresets.length ? `ATW: ${removedFromConfig.atwPresets.length},` : ''} ${removedFromConfig.ervPresets.length ? `ERV: ${removedFromConfig.ervPresets.length}` : ''}.`, 'orange');
           if (removedSchedulesCount || removedScenesCount)
-            updateInfo('info1', `Rempved ${removedScenesCount ? `schedules:` : ''} ${removedFromConfig.ataSchedules.length ? `ATA: ${removedFromConfig.ataSchedules.length},` : ''} ${removedFromConfig.atwSchedules.length ? `ATW: ${removedFromConfig.atwSchedules.length},` : ''}  ${removedFromConfig.ervSchedules.length ? `ERV: ${removedFromConfig.ervSchedules.length},` : ''} ${removedScenesCount ? `scenes: ${removedScenesCount}` : ''}.`, 'orange');
+            updateInfo('info1', `Removed ${removedScenesCount ? `scenes:` : ''} ${removedFromConfig.ataSchedules.length ? `ATA: ${removedFromConfig.ataSchedules.length},` : ''} ${removedFromConfig.atwSchedules.length ? `ATW: ${removedFromConfig.atwSchedules.length},` : ''}  ${removedFromConfig.ervSchedules.length ? `ERV: ${removedFromConfig.ervSchedules.length},` : ''} ${removedScenesCount ? `scenes: ${removedScenesCount}` : ''}.`, 'orange');
         }
 
         await homebridge.updatePluginConfig(pluginConfig);
@@ -407,5 +422,6 @@
     });
 
 
+
   })();
 </script>

package/package.json

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