homebridge-melcloud-control 4.3.8 → 4.3.9-beta.0

package/homebridge-ui/public/index.html

@@ -230,11 +230,12 @@
       }
 
       document.getElementById('logIn').addEventListener('click', async () => {
+        homebridge.showSpinner();
+
         document.getElementById(`logIn`).className = "btn btn-primary";
         updateInfo('info', '', 'white');
         updateInfo('info1', '', 'white');
         updateInfo('info2', '', 'white');
-        homebridge.showSpinner();
 
         try {
           const account = this.account;
@@ -246,32 +247,27 @@
           }
 
           // Initialize devices arrays
-          const newDevices = { ata: [], ataPresets: [], ataSchedules: [], atw: [], atwPresets: [], atwSchedules: [], erv: [], ervPresets: [], ervSchedules: [], scenes: [] };
-          const devicesByType = { ata: [], atw: [], erv: [] };
+          const newInMelCloud = { ata: [], ataPresets: [], ataSchedules: [], atw: [], atwPresets: [], atwSchedules: [], erv: [], ervPresets: [], ervSchedules: [], scenes: [] };
+          const devicesInMelCloudByType = { ata: [], atw: [], erv: [] };
+          const scenesInMelCloud = response.Scenes ?? []
 
           response.Devices.forEach(device => {
-            device.Scenes = response.Scenes ?? [];
-            if (device.Type === 0) devicesByType.ata.push(device);
-            if (device.Type === 1) devicesByType.atw.push(device);
-            if (device.Type === 3) devicesByType.erv.push(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);
           });
 
           account.ataDevices ??= [];
           account.atwDevices ??= [];
           account.ervDevices ??= [];
 
-          const removedAta = removeStaleDevices(account.ataDevices, devicesByType.ata);
-          const removedAtw = removeStaleDevices(account.atwDevices, devicesByType.atw);
-          const removedErv = removeStaleDevices(account.ervDevices, devicesByType.erv);
+          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, typeString, newArr, newPresets, newSchedules, newScenes) => {
+          const handleDevices = (devicesInMelCloud, devicesInConfig, typeString, newDevices, newPresets, newSchedules, newScenes) => {
             try {
               const configDevicesMap = new Map(devicesInConfig.map(dev => [String(dev.id), dev]));
-              const isMelcloud = account.type === 'melcloud';
-
-              const idKey = isMelcloud ? 'ID' : 'Id';
-              const typeKey = isMelcloud ? 'Presets' : 'Schedule';
-              const typeKey1 = isMelcloud ? 'presets' : 'schedules';
 
               devicesInMelCloud.forEach(device => {
                 const deviceId = String(device.DeviceID);
@@ -291,7 +287,7 @@
                     buttonsSensors: []
                   };
                   devicesInConfig.push(deviceInConfig);
-                  newArr.push(deviceInConfig);
+                  newDevices.push(deviceInConfig);
                   configDevicesMap.set(deviceId, deviceInConfig);
                 }
 
@@ -369,7 +365,6 @@
                   }
 
                   // === Process scenes ===
-                  const scenesInMelCloud = device.Scenes || [];
                   const scenesInConfig = deviceInConfig.scenes || [];
                   const sceneIds = new Set(scenesInConfig.map(s => String(s.id)));
 
@@ -411,25 +406,25 @@
             }
           };
 
-          account.ataDevices = handleDevices(devicesByType.ata, account.ataDevices, "Air Conditioner", newDevices.ata, newDevices.ataPresets, newDevices.ataSchedules, newDevices.scenes);
-          account.atwDevices = handleDevices(devicesByType.atw, account.atwDevices, "Heat Pump", newDevices.atw, newDevices.atwPresets, newDevices.atwSchedules, newDevices.scenes);
-          account.ervDevices = handleDevices(devicesByType.erv, account.ervDevices, "Energy Recovery Ventilation", newDevices.erv, newDevices.ervPresets, newDevices.ervSchedules, newDevices.scenes);
+          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 = newDevices.ata.length + newDevices.atw.length + newDevices.erv.length;
-          const newPresetsCount = newDevices.ataPresets.length + newDevices.atwPresets.length + newDevices.ervPresets.length;
-          const newSchedulesCount = newDevices.ataSchedules.length + newDevices.atwSchedules.length + newDevices.ervSchedules.length;
-          const newScenesCount = newDevices.scenes.length;
+          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) {
             updateInfo('info', 'No changes detected.', 'white');
           } else {
             if (newDevicesCount)
-              updateInfo('info', `Found new devices: ${newDevices.ata.length ? `ATA: ${newDevices.ata.length},` : ''} ${newDevices.atw.length ? `ATW: ${newDevices.atw.length},` : ''} ${newDevices.erv.length ? `ERV: ${newDevices.erv.length},` : ''}.`, '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: ${newDevices.ataPresets.length ? `ATA: ${newDevices.ataPresets.length},` : ''} ${newDevices.atwPresets.length ? `ATW: ${newDevices.atwPresets.length},` : ''} ${newDevices.ervPresets.length ? `ERV: ${newDevices.ervPresets.length}` : ''}.`, '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:` : ''} ${newDevices.ataSchedules.length ? `ATA: ${newDevices.ataSchedules.length},` : ''} ${newDevices.atwSchedules.length ? `ATW: ${newDevices.atwSchedules.length},` : ''}  ${newDevices.ervSchedules.length ? `ERV: ${newDevices.ervSchedules.length},` : ''} ${newScenesCount ? `scenes: ${newScenesCount}` : ''}.`, 'green');
+              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: ${removedAta.length ? `ATA: ${removedAta.length},` : ''} ${removedAtw.length ? `ATW: ${removedAtw.length},` : ''} ${removedErv.length ? `ERV: ${removedErv.length}` : ''}.`, 'orange');
           }

package/package.json

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

package/src/melcloudhome.js

@@ -264,7 +264,7 @@ class MelCloudHome extends EventEmitter {
             }
 
             devicesList.State = true;
-            devicesList.Info = `Found ${devicesCount} devices and ${scenes.length} scenes`;
+            devicesList.Info = `Found ${devicesCount} devices ${scenes.length > 0 ? `and ${scenes.length} scenes` : ''}`;
             devicesList.Devices = devices;
             devicesList.Scenes = scenes;
             devicesList.Headers = this.headers;