homebridge-melcloud-control 3.8.10 → 3.8.11-beta.0

package/homebridge-ui/public/index.html

@@ -164,20 +164,12 @@
         document.getElementById('info').style.color = 'yellow';
 
         try {
-          const accountName = pluginConfig[0].accounts[this.deviceIndex].name;
-          const user = pluginConfig[0].accounts[this.deviceIndex].user;
-          const passwd = pluginConfig[0].accounts[this.deviceIndex].passwd;
-          const language = pluginConfig[0].accounts[this.deviceIndex].language;
-
-          const payload = {
-            accountName: accountName,
-            user: user,
-            passwd: passwd,
-            language: language
-          };
+          const account = pluginConfig[0].accounts[this.deviceIndex];
+          const { name: accountName, user, passwd, language } = account;
+
+          const payload = { accountName, user, passwd, language };
           const devicesInMelCloud = await homebridge.request('/connect', payload);
 
-          //new found devices
           const newDevices = {
             ata: [],
             ataPresets: [],
@@ -187,36 +179,38 @@
             ervPresets: [],
           };
 
-          //get devices from melcloud by type
           const devicesByTypeInMelCloud = {
             ata: [],
             atw: [],
             erv: []
           };
 
+          // Categorize devices by type
           for (const deviceInMelcloud of devicesInMelCloud) {
-            const deviceType = deviceInMelcloud.Type;
-            const pusDeviceTypeAta = deviceType === 0 ? devicesByTypeInMelCloud.ata.push(deviceInMelcloud) : false;
-            const pusDeviceTypeAtw = deviceType === 1 ? devicesByTypeInMelCloud.atw.push(deviceInMelcloud) : false;
-            const pusDeviceTypeErv = deviceType === 3 ? devicesByTypeInMelCloud.erv.push(deviceInMelcloud) : false;
-          };
-
-          //devices in config
-          const ataDevicesInConfigExist = pluginConfig[0].accounts[this.deviceIndex].ataDevices ?? false;
-          const atwDevicesInConfigExist = pluginConfig[0].accounts[this.deviceIndex].atwDevices ?? false;
-          const ervDevicesInConfigExist = pluginConfig[0].accounts[this.deviceIndex].ervDevices ?? false;
+            switch (deviceInMelcloud.Type) {
+              case 0: devicesByTypeInMelCloud.ata.push(deviceInMelcloud); break;
+              case 1: devicesByTypeInMelCloud.atw.push(deviceInMelcloud); break;
+              case 3: devicesByTypeInMelCloud.erv.push(deviceInMelcloud); break;
+            }
+          }
 
-          //check key of devices in config exist
-          const ataDevicesInConfig = !ataDevicesInConfigExist ? pluginConfig[0].accounts[this.deviceIndex].ataDevices = [] : ataDevicesInConfigExist;
-          const atwDevicesInConfig = !atwDevicesInConfigExist ? pluginConfig[0].accounts[this.deviceIndex].atwDevices = [] : atwDevicesInConfigExist;
-          const ervDevicesInConfig = !ervDevicesInConfigExist ? pluginConfig[0].accounts[this.deviceIndex].ervDevices = [] : ervDevicesInConfigExist;
+          // Ensure config arrays exist
+          const ataDevicesInConfig = account.ataDevices ?? (account.ataDevices = []);
+          const atwDevicesInConfig = account.atwDevices ?? (account.atwDevices = []);
+          const ervDevicesInConfig = account.ervDevices ?? (account.ervDevices = []);
+
+          // Helper for updating UI
+          const updateInfo = (id, text, color) => {
+            const el = document.getElementById(id);
+            if (el) {
+              el.innerHTML = text;
+              el.style.color = color;
+            }
+          };
 
-          //device ata
-          devicesByTypeInMelCloud.ata.forEach((device, index) => {
-            const deviceId = device.DeviceID;
-            const deviceType = device.Type;
-            const deviceName = device.DeviceName;
-            const devicePresets = device.Presets ?? [];
+          // Handle ATA devices
+          devicesByTypeInMelCloud.ata.forEach((device) => {
+            const { DeviceID: deviceId, Type: deviceType, DeviceName: deviceName, Presets: devicePresets = [] } = device;
 
             const deviceAta = {
               id: deviceId,
@@ -234,40 +228,29 @@
               buttonsSensors: []
             };
 
-            const deviceExistsInConfig = ataDevicesInConfig.some(device => device.id === deviceId);
-            if (!deviceExistsInConfig) {
+            if (!ataDevicesInConfig.some(device => device.id === deviceId)) {
               ataDevicesInConfig.push(deviceAta);
               newDevices.ata.push(deviceAta);
-            };
+            }
 
-            //presets of device in melcloud
             devicePresets.forEach((preset) => {
-              const presetId = preset.ID;
-              const presetName = preset.NumberDescription;
-
+              const { ID: presetId, NumberDescription: presetName } = preset;
               preset.id = presetId;
               preset.name = presetName;
-              preset.displayType == 0;
+              preset.displayType = 0;
               preset.namePrefix = false;
 
-              //find the specific ataDevice to which the preset belongs
               const ataDevice = ataDevicesInConfig.find((device) => device.id === deviceId);
               if (ataDevice && !ataDevice.presets.some((p) => p.id === presetId)) {
                 ataDevice.presets.push(preset);
                 newDevices.ataPresets.push(preset);
               }
-
             });
           });
-          const textAta = `ATA: ${newDevices.ata.length}`;
-          const textAtaPresets = `ATA Presets: ${newDevices.ataPresets.length}`;
 
-          //device atw
-          devicesByTypeInMelCloud.atw.forEach((device, index) => {
-            const deviceId = device.DeviceID;
-            const deviceType = device.Type;
-            const deviceName = device.DeviceName;
-            const devicePresets = device.Presets ?? [];
+          // Handle ATW devices
+          devicesByTypeInMelCloud.atw.forEach((device) => {
+            const { DeviceID: deviceId, Type: deviceType, DeviceName: deviceName, Presets: devicePresets = [] } = device;
 
             const deviceAtw = {
               id: deviceId,
@@ -286,46 +269,34 @@
               temperatureSensorReturnWaterTank: false,
               temperatureSensorFlowZone2: false,
               temperatureSensorReturnZone2: false,
-              temperatureSensor: false,
               temperatureSensorOutdoor: false,
               presets: [],
               buttonsSensors: []
             };
 
-            const deviceExistsInConfig = atwDevicesInConfig.some(device => device.id === deviceId);
-            if (!deviceExistsInConfig) {
+            if (!atwDevicesInConfig.some(device => device.id === deviceId)) {
               atwDevicesInConfig.push(deviceAtw);
               newDevices.atw.push(deviceAtw);
-            };
+            }
 
-            //presets of device in melcloud
             devicePresets.forEach((preset) => {
-              const presetId = preset.ID;
-              const presetName = preset.NumberDescription;
-
+              const { ID: presetId, NumberDescription: presetName } = preset;
               preset.id = presetId;
               preset.name = presetName;
-              preset.displayType == 0;
+              preset.displayType = 0;
               preset.namePrefix = false;
 
-              //find the specific ataDevice to which the preset belongs
               const atwDevice = atwDevicesInConfig.find((device) => device.id === deviceId);
               if (atwDevice && !atwDevice.presets.some((p) => p.id === presetId)) {
                 atwDevice.presets.push(preset);
                 newDevices.atwPresets.push(preset);
               }
-
             });
           });
-          const textAtw = `ATW: ${newDevices.atw.length}`;
-          const textAtwPresets = `ATW Presets: ${newDevices.atwPresets.length}`;
 
-          //device erv
-          devicesByTypeInMelCloud.erv.forEach((device, index) => {
-            const deviceId = device.DeviceID;
-            const deviceType = device.Type;
-            const deviceName = device.DeviceName;
-            const devicePresets = device.Presets ?? [];
+          // Handle ERV devices
+          devicesByTypeInMelCloud.erv.forEach((device) => {
+            const { DeviceID: deviceId, Type: deviceType, DeviceName: deviceName, Presets: devicePresets = [] } = device;
 
             const deviceErv = {
               id: deviceId,
@@ -337,88 +308,73 @@
               temperatureSensor: false,
               temperatureSensorOutdoor: false,
               temperatureSensorSupply: false,
-              temperatureSensor: false,
-              temperatureSensorOutdoor: false,
               presets: [],
               buttonsSensors: []
             };
 
-            const deviceExistsInConfig = ervDevicesInConfig.some(device => device.id === deviceId);
-            if (!deviceExistsInConfig) {
+            if (!ervDevicesInConfig.some(device => device.id === deviceId)) {
               ervDevicesInConfig.push(deviceErv);
               newDevices.erv.push(deviceErv);
-            };
+            }
 
-            //presets of device in melcloud
             devicePresets.forEach((preset) => {
-              const presetId = preset.ID;
-              const presetName = preset.NumberDescription;
-
+              const { ID: presetId, NumberDescription: presetName } = preset;
               preset.id = presetId;
               preset.name = presetName;
-              preset.displayType == 0;
+              preset.displayType = 0;
               preset.namePrefix = false;
 
-              //find the specific ataDevice to which the preset belongs
               const ervDevice = ervDevicesInConfig.find((device) => device.id === deviceId);
               if (ervDevice && !ervDevice.presets.some((p) => p.id === presetId)) {
                 ervDevice.presets.push(preset);
                 newDevices.ervPresets.push(preset);
               }
-
             });
           });
+
+          // Display info
+          const textAta = `ATA: ${newDevices.ata.length}`;
+          const textAtw = `ATW: ${newDevices.atw.length}`;
           const textErv = `ERV: ${newDevices.erv.length}`;
+          const textAtaPresets = `ATA Presets: ${newDevices.ataPresets.length}`;
+          const textAtwPresets = `ATW Presets: ${newDevices.atwPresets.length}`;
           const textErvPresets = `ERV Presets: ${newDevices.ervPresets.length}`;
 
-          //display info
-          const newDevicesCount = newDevices.ata.length + newDevices.atw.length + newDevices.erv.length ?? 0;
-          const newPresetsCount = newDevices.ataPresets.length + newDevices.atwPresets.length + newDevices.ervPresets.length ?? 0;
-          if (newDevicesCount === 0 && newPresetsCount === 0) {
-            document.getElementById('info').innerHTML = 'No new devices found.';
-            document.getElementById('info').style.color = 'white';
-          };
+          const newDevicesCount = newDevices.ata.length + newDevices.atw.length + newDevices.erv.length;
+          const newPresetsCount = newDevices.ataPresets.length + newDevices.atwPresets.length + newDevices.ervPresets.length;
 
-          if (newDevicesCount > 0 && newPresetsCount > 0) {
-            document.getElementById('info').innerHTML = `Found, ${textAta}, ${textAtw}, ${textErv}.`;
-            document.getElementById('info').style.color = 'green';
-            document.getElementById('info1').innerHTML = `${textAtaPresets}, ${textAtwPresets}, ${textErvPresets}.`;
-            document.getElementById('info1').style.color = 'green';
-            document.getElementById('info2').innerHTML = 'Now You can configure it.';
-            document.getElementById('info2').style.color = 'green';
-          };
-
-          if (newDevicesCount > 0 && newPresetsCount === 0) {
-            document.getElementById('info').innerHTML = `Found, ${textAta}, ${textAtw}, ${textErv}.`;
-            document.getElementById('info').style.color = 'green';
-            document.getElementById('info1').innerHTML = 'Now You can configure it.';
-            document.getElementById('info1').style.color = 'green';
-          };
-
-          if (newDevicesCount === 0 && newPresetsCount > 0) {
-            document.getElementById('info').innerHTML = `Found, ${textAtaPresets}, ${textAtwPresets}, ${textErvPresets}.`;
-            document.getElementById('info').style.color = 'green';
-            document.getElementById('info1').innerHTML = 'Now You can configure it.';
-            document.getElementById('info1').style.color = 'green';
+          if (newDevicesCount === 0 && newPresetsCount === 0) {
+            updateInfo('info', 'No new devices found.', 'white');
+          } else {
+            if (newDevicesCount > 0) {
+              updateInfo('info', `Found, ${textAta}, ${textAtw}, ${textErv}.`, 'green');
+              updateInfo('info2', 'Now You can configure it.', 'green');
+            }
+            if (newPresetsCount > 0) {
+              updateInfo('info1', `${textAtaPresets}, ${textAtwPresets}, ${textErvPresets}.`, 'green');
+              if (newDevicesCount === 0) {
+                updateInfo('info', `Found, ${textAtaPresets}, ${textAtwPresets}, ${textErvPresets}.`, 'green');
+                updateInfo('info1', 'Now You can configure it.', 'green');
+              }
+            }
           }
 
-          //update ans save plugin config
+          // Save updated config
           await homebridge.updatePluginConfig(pluginConfig);
           await homebridge.savePluginConfig(pluginConfig);
 
-          //update button state
-          document.getElementById(`logIn`).setAttribute("class", "btn btn-secondary");
-
+          // Update button
+          document.getElementById('logIn').setAttribute('class', 'btn btn-secondary');
           homebridge.hideSpinner();
+
         } catch (error) {
-          document.getElementById('info').innerHTML = 'Check Your credentials data and try again.';
-          document.getElementById('info').style.color = 'yellow';
-          document.getElementById('info1').innerHTML = `Error: ${error}`;
-          document.getElementById('info1').style.color = 'red';
-          document.getElementById(`logIn`).setAttribute("class", "btn btn-secondary");
+          updateInfo('info', 'Check Your credentials data and try again.', 'yellow');
+          updateInfo('info1', `Error: ${error}`, 'red');
+          document.getElementById('logIn').setAttribute('class', 'btn btn-secondary');
         } finally {
           homebridge.hideSpinner();
-        };
+        }
+
       });
     })();
   </script>

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "MELCloud Control",
   "name": "homebridge-melcloud-control",
-  "version": "3.8.10",
+  "version": "3.8.11-beta.0",
   "description": "Homebridge plugin to control Mitsubishi Air Conditioner, Heat Pump and Energy Recovery Ventilation.",
   "license": "MIT",
   "author": "grzegorz914",
@@ -32,12 +32,12 @@
   ],
   "engines": {
     "homebridge": "^1.9.0 || ^2.0.0 || ^2.0.0-beta.29",
-    "node": "^18.20.4 || ^20.15.1 || ^22.7.0 || ^23.2.0 || ^24.0.0"
+    "node": "^^20.18.0 || ^22.0.0 || ^24.0.0"
   },
   "dependencies": {
     "@homebridge/plugin-ui-utils": "^2.1.0",
     "async-mqtt": "^2.6.3",
-    "axios": "^1.9.0",
+    "axios": "^1.10.0",
     "express": "^5.1.0"
   },
   "keywords": [