homebridge-melcloud-control 4.4.1-beta.34 → 4.4.1-beta.36

package/homebridge-ui/public/index.html

@@ -205,17 +205,17 @@
     });
 
     // Generic remove function
-    function removeStaleEntities(configList, serverList, getConfigId, getServerId) {
-      const serverIds = new Set(serverList.map(item => String(getServerId(item))));
+    function removeStaleEntities(configEntities, MelcloudEntities, getConfigId, getMelcloudId) {
+      const serverIds = new Set(MelcloudEntities.map(item => String(getMelcloudId(item))));
       const removedEntities = [];
 
-      for (let i = configList.length - 1; i >= 0; i--) {
-        const entity = configList[i];
+      for (let i = configEntities.length - 1; i >= 0; i--) {
+        const entity = configEntities[i];
         const entityId = String(getConfigId(entity));
 
         if (!serverIds.has(entityId)) {
           removedEntities.push(entity);
-          configList.splice(i, 1);
+          configEntities.splice(i, 1);
         }
       }
 
@@ -233,7 +233,6 @@
     // Login & Sync Logic
     document.getElementById('logIn').addEventListener('click', async () => {
       homebridge.showSpinner();
-
       document.getElementById('logIn').className = "btn btn-primary";
       updateInfo('info', '', 'white');
       updateInfo('info1', '', 'white');
@@ -250,13 +249,7 @@
         }
 
         // Prepare MELCloud data
-        const newInMelCloud = {
-          ata: [], ataPresets: [], ataSchedules: [],
-          atw: [], atwPresets: [], atwSchedules: [],
-          erv: [], ervPresets: [], ervSchedules: [],
-          scenes: []
-        };
-
+        const newInMelCloud = { ata: [], ataPresets: [], ataSchedules: [], ataScenes: [], atw: [], atwPresets: [], atwSchedules: [], atwScenes: [], erv: [], ervPresets: [], ervSchedules: [], ervScenes: [], scenes: [] };
         const devicesInMelCloudByType = { ata: [], atw: [], erv: [] };
         const scenesInMelCloud = response.Scenes ?? [];
 
@@ -270,209 +263,126 @@
         account.atwDevices = (account.atwDevices ?? []).filter(d => String(d.id) !== '0');
         account.ervDevices = (account.ervDevices ?? []).filter(d => String(d.id) !== '0');
 
-        // ================================
-        // Remove stale DEVICES
-        // ================================
-        const removedAta = removeStaleEntities(
-          account.ataDevices,
-          devicesInMelCloudByType.ata,
-          d => d.id,
-          d => d.DeviceID
-        );
-
-        const removedAtw = removeStaleEntities(
-          account.atwDevices,
-          devicesInMelCloudByType.atw,
-          d => d.id,
-          d => d.DeviceID
-        );
-
-        const removedErv = removeStaleEntities(
-          account.ervDevices,
-          devicesInMelCloudByType.erv,
-          d => d.id,
-          d => d.DeviceID
-        );
-
-        // Remove stale SCENES (global)
-        account.scenes = account.scenes ?? [];
-
-        const removedScenes = removeStaleEntities(
-          account.scenes,
-          scenesInMelCloud,
-          s => s.id,
-          s => s.Id
-        );
-
-        removedScenes.forEach(s =>
-          newInMelCloud.scenes.push({ ...s, removed: true })
-        );
+        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: [] };
+
 
         // Handle Devices
-        const handleDevices = (
-          devicesInMelCloud,
-          devicesInConfig,
-          deviceTypeString,
-          newDevices,
-          newPresets,
-          newSchedules
-        ) => {
-          const configDevicesMap = new Map(
-            devicesInConfig.map(dev => [String(dev.id), dev])
-          );
+        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);
+            const deviceId = String(device.DeviceID); // Make sure this matches MelCloud data
             let deviceInConfig = configDevicesMap.get(deviceId);
 
-            // === Create missing device ===
             if (!deviceInConfig) {
               deviceInConfig = {
                 id: deviceId,
                 type: device.Type,
                 deviceTypeString,
                 displayType: 0,
-                name: device.DeviceName
+                name: device.DeviceName,
+                presets: [],
+                schedules: [],
+                scenes: []
               };
               devicesInConfig.push(deviceInConfig);
               newDevices.push(deviceInConfig);
               configDevicesMap.set(deviceId, deviceInConfig);
             }
 
-            // PRESETS (melcloud)
-            if (account.type === 'melcloud') {
-              deviceInConfig.presets = deviceInConfig.presets ?? [];
-              const presetsInMelCloud = device.Presets || [];
-
-              const removedPresets = removeStaleEntities(
-                deviceInConfig.presets,
-                presetsInMelCloud,
-                p => p.id,
-                p => p.ID
-              );
-
-              removedPresets.forEach(p =>
-                newPresets.push({ ...p, removed: true })
-              );
-
-              const presetIds = new Set(
-                deviceInConfig.presets.map(p => String(p.id))
-              );
-
-              presetsInMelCloud.forEach((preset, index) => {
-                const presetId = String(preset.ID);
-                if (!presetIds.has(presetId)) {
-                  const presetObj = {
-                    id: presetId,
-                    displayType: 0,
-                    name: preset.NumberDescription || `Preset ${index}`,
-                    namePrefix: false
-                  };
-                  deviceInConfig.presets.push(presetObj);
-                  newPresets.push(presetObj);
-                }
-              });
-            }
-
-            // SCHEDULES (melcloudhome)
-            if (account.type === 'melcloudhome') {
-              deviceInConfig.schedules = deviceInConfig.schedules ?? [];
-              const schedulesInMelCloud = device.Schedule || [];
-
-              const removedSchedules = removeStaleEntities(
-                deviceInConfig.schedules,
-                schedulesInMelCloud,
-                s => s.id,
-                s => s.Id
-              );
-
-              removedSchedules.forEach(s =>
-                newSchedules.push({ ...s, removed: true })
-              );
-
-              const scheduleIds = new Set(
-                deviceInConfig.schedules.map(s => String(s.id))
-              );
-
-              schedulesInMelCloud.forEach((schedule, index) => {
-                const scheduleId = String(schedule.Id);
-                if (!scheduleIds.has(scheduleId)) {
-                  const scheduleObj = {
-                    id: scheduleId,
-                    displayType: 0,
-                    name: `Schedule ${index}`,
-                    namePrefix: false
-                  };
-                  deviceInConfig.schedules.push(scheduleObj);
-                  newSchedules.push(scheduleObj);
-                }
-              });
-            }
+            // PRESETS
+            deviceInConfig.presets = deviceInConfig.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) => {
+              const presetId = String(preset.ID);
+              if (!presetIds.has(presetId)) {
+                const presetObj = {
+                  id: presetId,
+                  displayType: 0,
+                  name: preset.NumberDescription || `Preset ${index}`,
+                  namePrefix: false
+                };
+                deviceInConfig.presets.push(presetObj);
+                newPresets.push(presetObj);
+              }
+            });
+
+            // SCHEDULES
+            deviceInConfig.schedules = deviceInConfig.schedules ?? [];
+            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) => {
+              const scheduleId = String(schedule.Id);
+              if (!scheduleIds.has(scheduleId)) {
+                const scheduleObj = {
+                  id: scheduleId,
+                  displayType: 0,
+                  name: `Schedule ${index}`,
+                  namePrefix: false
+                };
+                deviceInConfig.schedules.push(scheduleObj);
+                newSchedules.push(scheduleObj);
+              }
+            });
+
+            // 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)));
+            scenesInMelCloud.forEach((scene, index) => {
+              const sceneId = String(scene.Id);
+              if (!sceneIds.has(sceneId)) {
+                const sceneObj = {
+                  id: sceneId,
+                  displayType: 0,
+                  name: scene.Name || `Scene ${index}`,
+                  namePrefix: false
+                };
+                deviceInConfig.scenes.push(sceneObj);
+                newScenes.push(sceneObj);
+              }
+            });
           });
 
           return devicesInConfig;
         };
 
         // Execute device handlers
-        account.ataDevices = handleDevices(
-          devicesInMelCloudByType.ata,
-          account.ataDevices,
-          "Air Conditioner",
-          newInMelCloud.ata,
-          newInMelCloud.ataPresets,
-          newInMelCloud.ataSchedules
-        );
-
-        account.atwDevices = handleDevices(
-          devicesInMelCloudByType.atw,
-          account.atwDevices,
-          "Heat Pump",
-          newInMelCloud.atw,
-          newInMelCloud.atwPresets,
-          newInMelCloud.atwSchedules
-        );
-
-        account.ervDevices = handleDevices(
-          devicesInMelCloudByType.erv,
-          account.ervDevices,
-          "Energy Recovery Ventilation",
-          newInMelCloud.erv,
-          newInMelCloud.ervPresets,
-          newInMelCloud.ervSchedules
-        );
+        account.ataDevices = handleDevices(devicesInMelCloudByType.ata, account.ataDevices, "Air Conditioner", newInMelCloud.ata, newInMelCloud.ataPresets, newInMelCloud.ataSchedules, newInMelCloud.ataScenes);
+        account.atwDevices = handleDevices(devicesInMelCloudByType.atw, account.atwDevices, "Heat Pump", newInMelCloud.atw, newInMelCloud.atwPresets, newInMelCloud.atwSchedules, newInMelCloud.atwScenes);
+        account.ervDevices = handleDevices(devicesInMelCloudByType.erv, account.ervDevices, "Energy Recovery Ventilation", newInMelCloud.erv, newInMelCloud.ervPresets, newInMelCloud.ervSchedules, newInMelCloud.ervScenes);
 
         // Summary
-        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;
-
-        const removedDevicesCount =
-          removedAta.length +
-          removedAtw.length +
-          removedErv.length;
-
-        if (!newDevicesCount && !newPresetsCount && !newSchedulesCount && !removedDevicesCount) {
+        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;
+        const newScenesCount = newInMelCloud.scenes.length;
+        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
+
+        if (!newDevicesCount && !newPresetsCount && !newSchedulesCount && !newScenesCount && !removedDevicesCount && !removedPresetsCount && !removedSchedulesCount && !removedScenesCount) {
           updateInfo('info', 'No changes detected.', 'white');
         } else {
           if (newDevicesCount)
-            updateInfo('info', `Found new devices: ${newDevicesCount}`, 'green');
+            updateInfo('info', `Found new devices: ${newInMelCloud.ata.length ? `ATA: ${newInMelCloud.ata.length},` : ''} ${newInMelCloud.atw.length ? `ATW: ${newInMelCloud.atw.length},` : ''} ${newInMelCloud.erv.length ? `ERV: ${newInMelCloud.erv.length},` : ''}.`, 'green');
           if (newPresetsCount)
-            updateInfo('info1', `Found new presets: ${newPresetsCount}`, 'green');
-          if (newSchedulesCount)
-            updateInfo('info1', `Found new schedules: ${newSchedulesCount}`, 'green');
+            updateInfo('info1', `Found new presets: ${newInMelCloud.ataPresets.length ? `ATA: ${newInMelCloud.ataPresets.length},` : ''} ${newInMelCloud.atwPresets.length ? `ATW: ${newInMelCloud.atwPresets.length},` : ''} ${newInMelCloud.ervPresets.length ? `ERV: ${newInMelCloud.ervPresets.length}` : ''}.`, 'green');
+          if (newScenesCount || newSchedulesCount)
+            updateInfo('info1', `Found new ${newSchedulesCount ? `schedules:` : ''} ${newInMelCloud.ataSchedules.length ? `ATA: ${newInMelCloud.ataSchedules.length},` : ''} ${newInMelCloud.atwSchedules.length ? `ATW: ${newInMelCloud.atwSchedules.length},` : ''}  ${newInMelCloud.ervSchedules.length ? `ERV: ${newInMelCloud.ervSchedules.length},` : ''} ${newScenesCount ? `scenes: ${newScenesCount}` : ''}.`, 'green');
           if (removedDevicesCount)
-            updateInfo('info2', `Removed devices: ${removedDevicesCount}`, 'orange');
+            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');
+          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');
         }
 
         await homebridge.updatePluginConfig(pluginConfig);

package/package.json

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