homebridge-melcloud-control 3.9.0-beta.4 → 3.9.0-beta.5

package/homebridge-ui/public/index.html

@@ -20,9 +20,9 @@
       <form id="configForm">
         <div class="text-center">
           <label id="accountName" class="fw-bold" style="font-size: 23px;">Account</label><br>
-          <label id="info" class="d-block" style="font-size: 16px;"></label>
-          <label id="info1" class="d-block" style="font-size: 14px;"></label>
-          <label id="info2" class="d-block" style="font-size: 14px;"></label>
+          <label id="info" class="d-block" style="font-size: 17px;"></label>
+          <label id="info1" class="d-block" style="font-size: 15px;"></label>
+          <label id="info2" class="d-block" style="font-size: 15px;"></label>
         </div>
 
         <div class="mb-3">
@@ -83,6 +83,7 @@
 
   <script>
     (async () => {
+      //get the plugin config array
       const pluginConfig = await homebridge.getPluginConfig();
 
       if (!pluginConfig.length) {
@@ -93,10 +94,11 @@
       }
       this.configButtonState = false;
 
+      //get accounts count
       const accountsCount = pluginConfig[0].accounts.length;
       this.deviceIndex = 0;
-
       for (let i = 0; i < accountsCount; i++) {
+        //create buttons
         const button = document.createElement("button");
         button.setAttribute("type", "button");
         button.setAttribute("id", `button${i}`);
@@ -105,12 +107,10 @@
         button.innerText = pluginConfig[0].accounts[i].name;
         document.getElementById("accountButton").appendChild(button);
 
+        //get actuall value on account select
         document.getElementById(`button${i}`).addEventListener('click', async () => {
           for (let j = 0; j < accountsCount; j++) {
-            document.getElementById(`button${j}`).setAttribute(
-              "class",
-              j === i ? "btn btn-secondary" : "btn btn-primary"
-            );
+            const setRemoveAtribute = j === i ? document.getElementById(`button${j}`).setAttribute("class", "btn btn-secondary") : document.getElementById(`button${j}`).setAttribute("class", "btn btn-primary");
           }
 
           document.getElementById('accountName').innerHTML = pluginConfig[0].accounts[i].name || '';
@@ -119,53 +119,54 @@
           document.getElementById('passwd').value = pluginConfig[0].accounts[i].passwd || '';
           document.getElementById('language').value = pluginConfig[0].accounts[i].language || '';
 
-          const accountConfigured =
-            pluginConfig[0].accounts[i].name &&
-            pluginConfig[0].accounts[i].user &&
-            pluginConfig[0].accounts[i].passwd &&
-            pluginConfig[0].accounts[i].language;
-
-          const loginBtn = document.getElementById('logIn');
-          loginBtn.disabled = !accountConfigured;
+          const accountConfigured = pluginConfig[0].accounts[i].name && pluginConfig[0].accounts[i].user && pluginConfig[0].accounts[i].passwd && pluginConfig[0].accounts[i].language;
+          const button = document.getElementById('logIn');
+          const setButtonState = accountConfigured ? button.disabled = false : button.disabled = true;
 
           await homebridge.updatePluginConfig(pluginConfig);
           this.deviceIndex = i;
         });
+        const click = i === accountsCount - 1 ? document.getElementById(`button0`).click() : false;
+        const update = i === accountsCount - 1 ? await homebridge.updatePluginConfig(pluginConfig) : false;
+      };
 
-        if (i === accountsCount - 1) {
-          document.getElementById(`button0`).click();
-          await homebridge.updatePluginConfig(pluginConfig);
-        }
-      }
-
+      //load melCloudAccount form
       document.getElementById('melCloudAccount').style.display = 'block';
 
+      //watch for changes to the form
       document.getElementById('configForm').addEventListener('input', async () => {
         pluginConfig[0].accounts[this.deviceIndex].name = document.querySelector('#name').value;
         pluginConfig[0].accounts[this.deviceIndex].user = document.querySelector('#user').value;
         pluginConfig[0].accounts[this.deviceIndex].passwd = document.querySelector('#passwd').value;
         pluginConfig[0].accounts[this.deviceIndex].language = document.querySelector('#language').value;
 
-        const accountConfigured =
-          pluginConfig[0].accounts[this.deviceIndex].name &&
-          pluginConfig[0].accounts[this.deviceIndex].user &&
-          pluginConfig[0].accounts[this.deviceIndex].passwd &&
-          pluginConfig[0].accounts[this.deviceIndex].language;
-
-        document.getElementById('logIn').disabled = !accountConfigured;
+        const accountConfigured = pluginConfig[0].accounts[this.deviceIndex].name && pluginConfig[0].accounts[this.deviceIndex].user && pluginConfig[0].accounts[this.deviceIndex].passwd && pluginConfig[0].accounts[this.deviceIndex].language;
+        const button = document.getElementById('logIn');
+        const setButtonState = accountConfigured ? button.disabled = false : button.disabled = true;
 
         await homebridge.updatePluginConfig(pluginConfig);
         await homebridge.savePluginConfig(pluginConfig);
       });
 
+      //watch for changes to the config button
       document.getElementById('configButton').addEventListener('click', async () => {
-        this.configButtonState ? homebridge.hideSchemaForm() : homebridge.showSchemaForm();
-        document
-          .getElementById('configButton')
-          .setAttribute("class", this.configButtonState ? "btn btn-secondary" : "btn btn-primary");
+        const showHideSettings = this.configButtonState ? homebridge.hideSchemaForm() : homebridge.showSchemaForm();
+        const setRemoveAtribute = this.configButtonState ? document.getElementById(`configButton`).setAttribute("class", "btn btn-secondary") : document.getElementById(`configButton`).setAttribute("class", "btn btn-primary");
         this.configButtonState = !this.configButtonState;
       });
 
+      // Helper to remove stale devices by comparing with MELCloud
+      function removeStaleDevices(configDevices, melcloudDevices) {
+        const melcloudIds = melcloudDevices.map(d => d.DeviceID);
+        for (let i = configDevices.length - 1; i >= 0; i--) {
+          const device = configDevices[i];
+          if (device.id !== 0 && !melcloudIds.includes(device.id)) {
+            configDevices.splice(i, 1);
+          }
+        }
+      }
+
+      //watch for click on the login button
       document.getElementById('logIn').addEventListener('click', async () => {
         homebridge.showSpinner();
 
@@ -180,22 +181,37 @@
           const payload = { accountName, user, passwd, language };
           const devicesInMelCloud = await homebridge.request('/connect', payload);
 
-          const newDevices = { ata: [], ataPresets: [], atw: [], atwPresets: [], erv: [], ervPresets: [] };
-          const removedDevices = { ata: [], atw: [], erv: [] };
+          const newDevices = {
+            ata: [],
+            ataPresets: [],
+            atw: [],
+            atwPresets: [],
+            erv: [],
+            ervPresets: [],
+          };
+
           const devicesByTypeInMelCloud = { ata: [], atw: [], erv: [] };
 
-          for (const device of devicesInMelCloud) {
-            switch (device.Type) {
-              case 0: devicesByTypeInMelCloud.ata.push(device); break;
-              case 1: devicesByTypeInMelCloud.atw.push(device); break;
-              case 3: devicesByTypeInMelCloud.erv.push(device); break;
+          // Categorize devices by type
+          for (const deviceInMelcloud of devicesInMelCloud) {
+            switch (deviceInMelcloud.Type) {
+              case 0: devicesByTypeInMelCloud.ata.push(deviceInMelcloud); break;
+              case 1: devicesByTypeInMelCloud.atw.push(deviceInMelcloud); break;
+              case 3: devicesByTypeInMelCloud.erv.push(deviceInMelcloud); break;
             }
           }
 
+          // Ensure config arrays exist
           const ataDevicesInConfig = account.ataDevices ?? (account.ataDevices = []);
           const atwDevicesInConfig = account.atwDevices ?? (account.atwDevices = []);
           const ervDevicesInConfig = account.ervDevices ?? (account.ervDevices = []);
 
+          // Remove stale devices
+          removeStaleDevices(ataDevicesInConfig, devicesByTypeInMelCloud.ata);
+          removeStaleDevices(atwDevicesInConfig, devicesByTypeInMelCloud.atw);
+          removeStaleDevices(ervDevicesInConfig, devicesByTypeInMelCloud.erv);
+
+          // Helper for updating UI
           const updateInfo = (id, text, color) => {
             const el = document.getElementById(id);
             if (el) {
@@ -204,93 +220,170 @@
             }
           };
 
-          function handleDevices(devices, configArray, newArray, newPresetsArray, removedArray, typeString, template) {
-            const melcloudIds = devices.map(d => d.DeviceID);
+          // Handle ATA devices
+          devicesByTypeInMelCloud.ata.forEach((device) => {
+            const { DeviceID: deviceId, Type: deviceType, DeviceName: deviceName, Presets: devicePresets = [] } = device;
+            const deviceAta = {
+              id: deviceId,
+              type: deviceType,
+              typeString: "Air Conditioner",
+              name: deviceName,
+              displayMode: 1,
+              heatDryFanMode: 1,
+              coolDryFanMode: 1,
+              autoDryFanMode: 1,
+              temperatureSensor: false,
+              temperatureSensorOutdoor: false,
+              presets: [],
+              buttonsSensors: []
+            };
+
+            if (!ataDevicesInConfig.some(device => device.id === deviceId)) {
+              ataDevicesInConfig.push(deviceAta);
+              newDevices.ata.push(deviceAta);
+            }
 
-            // remove stale devices
-            for (let i = ataDevicesInConfig.length - 1; i >= 0; i--) {
-              const device = ataDevicesInConfig[i];
-              // Only remove if it's a real device (id != 0) and missing in MELCloud
-              if (device.id !== 0 && !melcloudIds.includes(device.id)) {
-                removedDevices.ata.push(device);
-                ataDevicesInConfig.splice(i, 1);
+            devicePresets.forEach((preset) => {
+              const { ID: presetId, NumberDescription: presetName } = preset;
+              preset.id = presetId;
+              preset.name = presetName;
+              preset.displayType = 0;
+              preset.namePrefix = false;
+
+              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);
               }
+            });
+          });
+
+          // Handle ATW devices
+          devicesByTypeInMelCloud.atw.forEach((device) => {
+            const { DeviceID: deviceId, Type: deviceType, DeviceName: deviceName, Presets: devicePresets = [] } = device;
+            const deviceAtw = {
+              id: deviceId,
+              type: deviceType,
+              typeString: "Heat Pump",
+              name: deviceName,
+              displayMode: 1,
+              hideZone: 0,
+              temperatureSensor: false,
+              temperatureSensorFlow: false,
+              temperatureSensorReturn: false,
+              temperatureSensorFlowZone1: false,
+              temperatureSensorReturnZone1: false,
+              temperatureSensorFlowWaterTank: false,
+              temperatureSensorReturnWaterTank: false,
+              temperatureSensorFlowZone2: false,
+              temperatureSensorReturnZone2: false,
+              temperatureSensorOutdoor: false,
+              presets: [],
+              buttonsSensors: []
+            };
+
+            if (!atwDevicesInConfig.some(device => device.id === deviceId)) {
+              atwDevicesInConfig.push(deviceAtw);
+              newDevices.atw.push(deviceAtw);
             }
 
-            devices.forEach((device) => {
-              const { DeviceID: deviceId, Type: deviceType, DeviceName: deviceName, Presets: devicePresets = [] } = device;
-
-              const deviceObj = {
-                id: deviceId,
-                type: deviceType,
-                typeString,
-                name: deviceName,
-                ...template,
-                presets: [],
-                buttonsSensors: []
-              };
-
-              if (!configArray.some(d => d.id === deviceId)) {
-                configArray.push(deviceObj);
-                newArray.push(deviceObj);
+            devicePresets.forEach((preset) => {
+              const { ID: presetId, NumberDescription: presetName } = preset;
+              preset.id = presetId;
+              preset.name = presetName;
+              preset.displayType = 0;
+              preset.namePrefix = false;
+
+              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);
               }
-
-              devicePresets.forEach((preset) => {
-                const { ID: presetId, NumberDescription: presetName } = preset;
-                Object.assign(preset, { id: presetId, name: presetName, displayType: 0, namePrefix: false });
-
-                const existingDevice = configArray.find(d => d.id === deviceId);
-                if (existingDevice && !existingDevice.presets.some(p => p.id === presetId)) {
-                  existingDevice.presets.push(preset);
-                  newPresetsArray.push(preset);
-                }
-              });
             });
-          }
+          });
+
+          // Handle ERV devices
+          devicesByTypeInMelCloud.erv.forEach((device) => {
+            const { DeviceID: deviceId, Type: deviceType, DeviceName: deviceName, Presets: devicePresets = [] } = device;
+            const deviceErv = {
+              id: deviceId,
+              type: deviceType,
+              typeString: "Energy Recovery Ventilation",
+              name: deviceName,
+              displayMode: 1,
+              temperatureSensor: false,
+              temperatureSensorOutdoor: false,
+              temperatureSensorSupply: false,
+              presets: [],
+              buttonsSensors: []
+            };
+
+            if (!ervDevicesInConfig.some(device => device.id === deviceId)) {
+              ervDevicesInConfig.push(deviceErv);
+              newDevices.erv.push(deviceErv);
+            }
 
-          const ataTemplate = { displayMode: 1, heatDryFanMode: 1, coolDryFanMode: 1, autoDryFanMode: 1, temperatureSensor: false, temperatureSensorOutdoor: false };
-          const atwTemplate = { displayMode: 1, hideZone: 0, temperatureSensor: false, temperatureSensorFlow: false, temperatureSensorReturn: false, temperatureSensorFlowZone1: false, temperatureSensorReturnZone1: false, temperatureSensorFlowWaterTank: false, temperatureSensorReturnWaterTank: false, temperatureSensorFlowZone2: false, temperatureSensorReturnZone2: false, temperatureSensorOutdoor: false };
-          const ervTemplate = { displayMode: 1, temperatureSensor: false, temperatureSensorOutdoor: false, temperatureSensorSupply: false };
+            devicePresets.forEach((preset) => {
+              const { ID: presetId, NumberDescription: presetName } = preset;
+              preset.id = presetId;
+              preset.name = presetName;
+              preset.displayType = 0;
+              preset.namePrefix = false;
+
+              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);
+              }
+            });
+          });
 
-          handleDevices(devicesByTypeInMelCloud.ata, ataDevicesInConfig, newDevices.ata, newDevices.ataPresets, removedDevices.ata, "Air Conditioner", ataTemplate);
-          handleDevices(devicesByTypeInMelCloud.atw, atwDevicesInConfig, newDevices.atw, newDevices.atwPresets, removedDevices.atw, "Heat Pump", atwTemplate);
-          handleDevices(devicesByTypeInMelCloud.erv, ervDevicesInConfig, newDevices.erv, newDevices.ervPresets, removedDevices.erv, "Energy Recovery Ventilation", ervTemplate);
+          // 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}`;
 
-          const formatDeviceNames = (arr) => arr.map(d => d.name).join(', ') || 'None';
           const newDevicesCount = newDevices.ata.length + newDevices.atw.length + newDevices.erv.length;
           const newPresetsCount = newDevices.ataPresets.length + newDevices.atwPresets.length + newDevices.ervPresets.length;
-          const removedDevicesCount = removedDevices.ata.length + removedDevices.atw.length + removedDevices.erv.length;
 
-          if (newDevicesCount === 0 && newPresetsCount === 0 && removedDevicesCount === 0) {
-            updateInfo('info', 'No changes (already synced).', 'white');
+          if (newDevicesCount === 0 && newPresetsCount === 0) {
+            updateInfo('info', 'No new devices found.', 'white');
           } else {
             if (newDevicesCount > 0) {
-              updateInfo('info', `New Devices Found: ATA: ${formatDeviceNames(newDevices.ata)}, ATW: ${formatDeviceNames(newDevices.atw)}, ERV: ${formatDeviceNames(newDevices.erv)}`, 'green');
+              updateInfo('info', `Found, ${textAta}, ${textAtw}, ${textErv}.`, 'green');
               updateInfo('info2', 'Now You can configure it.', 'green');
             }
             if (newPresetsCount > 0) {
-              updateInfo('info1', `New Presets: ATA: ${newDevices.ataPresets.length}, ATW: ${newDevices.atwPresets.length}, ERV: ${newDevices.ervPresets.length}`, 'green');
-            }
-            if (removedDevicesCount > 0) {
-              updateInfo('info', `Removed Devices: ATA: ${formatDeviceNames(removedDevices.ata)}, ATW: ${formatDeviceNames(removedDevices.atw)}, ERV: ${formatDeviceNames(removedDevices.erv)}`, 'orange');
+              updateInfo('info1', `${textAtaPresets}, ${textAtwPresets}, ${textErvPresets}.`, 'green');
+              if (newDevicesCount === 0) {
+                updateInfo('info', `Found, ${textAtaPresets}, ${textAtwPresets}, ${textErvPresets}.`, 'green');
+                updateInfo('info1', 'Now You can configure it.', 'green');
+              }
             }
           }
 
+          // Save updated config
+          await homebridge.updatePluginConfig(pluginConfig);
           await homebridge.savePluginConfig(pluginConfig);
 
+          // Update button
           document.getElementById('logIn').setAttribute('class', 'btn btn-secondary');
           homebridge.hideSpinner();
+
         } catch (error) {
           updateInfo('info', 'Check Your credentials data and try again.', 'yellow');
-          updateInfo('info1', `Error: ${error.message ?? JSON.stringify(error)}`, 'red');
+          updateInfo('info1', `Error: ${error}`, 'red');
           document.getElementById('logIn').setAttribute('class', 'btn btn-secondary');
         } finally {
           homebridge.hideSpinner();
         }
+
       });
     })();
   </script>
-
 </body>
 
 </html>

package/package.json

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