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

package/homebridge-ui/public/index.html

@@ -204,19 +204,22 @@
       }
     });
 
-    // Device Handling & Login Logic
-    function removeStaleDevices(configDevices, melcloudDevices) {
-      const melcloudIds = melcloudDevices.map(d => d.DeviceID);
-      const removedDevices = [];
-
-      for (let i = configDevices.length - 1; i >= 0; i--) {
-        const device = configDevices[i];
-        if (!melcloudIds.includes(device.id)) {
-          removedDevices.push(device);
-          configDevices.splice(i, 1);
+    // Generic remove function
+    function removeStaleEntities(configList, serverList, getConfigId, getServerId) {
+      const serverIds = new Set(serverList.map(item => String(getServerId(item))));
+      const removedEntities = [];
+
+      for (let i = configList.length - 1; i >= 0; i--) {
+        const entity = configList[i];
+        const entityId = String(getConfigId(entity));
+
+        if (!serverIds.has(entityId)) {
+          removedEntities.push(entity);
+          configList.splice(i, 1);
         }
       }
-      return removedDevices;
+
+      return removedEntities;
     }
 
     function updateInfo(id, text, color) {
@@ -227,10 +230,11 @@
       }
     }
 
+    // Login & Sync Logic
     document.getElementById('logIn').addEventListener('click', async () => {
       homebridge.showSpinner();
 
-      document.getElementById(`logIn`).className = "btn btn-primary";
+      document.getElementById('logIn').className = "btn btn-primary";
       updateInfo('info', '', 'white');
       updateInfo('info1', '', 'white');
       updateInfo('info2', '', 'white');
@@ -238,16 +242,23 @@
       try {
         const account = this.account;
         const response = await homebridge.request('/connect', account);
+
         if (!response.State) {
           homebridge.hideSpinner();
-          updateInfo('info', response.Info);
+          updateInfo('info', response.Info, 'red');
           return;
         }
 
-        // Initialize devices arrays
-        const newInMelCloud = { ata: [], ataPresets: [], ataSchedules: [], atw: [], atwPresets: [], atwSchedules: [], erv: [], ervPresets: [], ervSchedules: [], scenes: [] };
+        // Prepare MELCloud data
+        const newInMelCloud = {
+          ata: [], ataPresets: [], ataSchedules: [],
+          atw: [], atwPresets: [], atwSchedules: [],
+          erv: [], ervPresets: [], ervSchedules: [],
+          scenes: []
+        };
+
         const devicesInMelCloudByType = { ata: [], atw: [], erv: [] };
-        const scenesInMelCloud = response.Scenes ?? []
+        const scenesInMelCloud = response.Scenes ?? [];
 
         response.Devices.forEach(device => {
           if (device.Type === 0) devicesInMelCloudByType.ata.push(device);
@@ -259,140 +270,222 @@
         account.atwDevices = (account.atwDevices ?? []).filter(d => String(d.id) !== '0');
         account.ervDevices = (account.ervDevices ?? []).filter(d => String(d.id) !== '0');
 
-        const removedAta = removeStaleDevices(account.ataDevices, devicesInMelCloudByType.ata);
-        const removedAtw = removeStaleDevices(account.atwDevices, devicesInMelCloudByType.atw);
-        const removedErv = removeStaleDevices(account.ervDevices, devicesInMelCloudByType.erv);
-
-        const handleDevices = (devicesInMelCloud, devicesInConfig, deviceTypeString, newDevices, newPresets, newSchedules, newScenes) => {
-          try {
-            const configDevicesMap = new Map(devicesInConfig.map(dev => [String(dev.id), dev]));
-
-            devicesInMelCloud.forEach(device => {
-              const deviceId = String(device.DeviceID);
-              let deviceInConfig = configDevicesMap.get(deviceId);
-
-              // === Create device if missing ===
-              if (!deviceInConfig) {
-                deviceInConfig = {
-                  id: deviceId,
-                  type: device.Type,
-                  deviceTypeString,
-                  displayType: 0,
-                  name: device.DeviceName
-                };
-                devicesInConfig.push(deviceInConfig);
-                newDevices.push(deviceInConfig);
-                configDevicesMap.set(deviceId, deviceInConfig);
-              }
-
-              //only for melcloud
-              if (account.type === 'melcloud') {
-
-                // === Process presets ===
-                const presetsInMelCloud = device.Presets || [];
-                const presetsInConfig = (deviceInConfig.presets ?? []).filter(p => String(p.id) !== '0');
-                const presetIds = new Set(presetsInConfig.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
-                    };
-                    presetsInConfig.push(presetObj);
-                    newPresets.push(presetObj);
-                    presetIds.add(presetId);
-                  }
-                });
-              }
-
-              //only for melcloudhome
-              if (account.type === 'melcloudhome') {
-
-                // === Process schedules ===
-                const schedulesInMelCloud = device.Schedule || [];
-                const schedulesInConfig = (deviceInConfig.schedules ?? []).filter(s => String(s.id) !== '0');
-                const scheduleIds = new Set(schedulesInConfig.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
-                    };
-                    schedulesInConfig.push(scheduleObj);
-                    newSchedules.push(scheduleObj);
-                    scheduleIds.add(scheduleId);
-                  }
-                });
-
-                // === Process scenes ===
-                const scenesInConfig = (deviceInConfig.scenes ?? []).filter(s => String(s.id) !== '0');
-                const sceneIds = new Set(scenesInConfig.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
-                    };
-                    scenesInConfig.push(sceneObj);
-                    newScenes.push(sceneObj);
-                    sceneIds.add(sceneId);
-                  }
-                });
-              }
-            });
-
-            // Return filtered devicesInConfig to make sure upstream code uses it
-            return devicesInConfig;
-          } catch (error) {
-            updateInfo('info', `Error while processing device: ${JSON.stringify(error)}`, 'red');
-          }
+        // ================================
+        // 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 })
+        );
+
+        // Handle Devices
+        const handleDevices = (
+          devicesInMelCloud,
+          devicesInConfig,
+          deviceTypeString,
+          newDevices,
+          newPresets,
+          newSchedules
+        ) => {
+          const configDevicesMap = new Map(
+            devicesInConfig.map(dev => [String(dev.id), dev])
+          );
+
+          devicesInMelCloud.forEach(device => {
+            const deviceId = String(device.DeviceID);
+            let deviceInConfig = configDevicesMap.get(deviceId);
+
+            // === Create missing device ===
+            if (!deviceInConfig) {
+              deviceInConfig = {
+                id: deviceId,
+                type: device.Type,
+                deviceTypeString,
+                displayType: 0,
+                name: device.DeviceName
+              };
+              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);
+                }
+              });
+            }
+          });
+
+          return devicesInConfig;
         };
 
-        account.ataDevices = handleDevices(devicesInMelCloudByType.ata, account.ataDevices, "Air Conditioner", newInMelCloud.ata, newInMelCloud.ataPresets, newInMelCloud.ataSchedules, newInMelCloud.scenes);
-        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);
-
-        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 = removedAta.length + removedAtw.length + removedErv.length;
-
-        if (!newDevicesCount && !newPresetsCount && !newSchedulesCount && !newScenesCount && !removedDevicesCount) {
+        // 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
+        );
+
+        // 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) {
           updateInfo('info', 'No changes detected.', 'white');
         } else {
           if (newDevicesCount)
-            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');
+            updateInfo('info', `Found new devices: ${newDevicesCount}`, 'green');
           if (newPresetsCount)
-            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');
+            updateInfo('info1', `Found new presets: ${newPresetsCount}`, 'green');
+          if (newSchedulesCount)
+            updateInfo('info1', `Found new schedules: ${newSchedulesCount}`, 'green');
           if (removedDevicesCount)
-            updateInfo('info2', `Removed devices: ${removedAta.length ? `ATA: ${removedAta.length},` : ''} ${removedAtw.length ? `ATW: ${removedAtw.length},` : ''} ${removedErv.length ? `ERV: ${removedErv.length}` : ''}.`, 'orange');
+            updateInfo('info2', `Removed devices: ${removedDevicesCount}`, 'orange');
         }
 
         await homebridge.updatePluginConfig(pluginConfig);
         await homebridge.savePluginConfig(pluginConfig);
+
       } catch (error) {
         updateInfo('info', `Prepare config error ${JSON.stringify(error)}`, 'red');
-        document.getElementById('logIn').className = "btn btn-secondary";
       } finally {
         document.getElementById('logIn').className = "btn btn-secondary";
         homebridge.hideSpinner();
       }
     });
 
+
   })();
 </script>

package/package.json

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