homebridge-melcloud-control 3.9.0-beta.2 → 3.9.0-beta.20

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: 17px;"></label>
-          <label id="info1" class="d-block" style="font-size: 15px;"></label>
-          <label id="info2" class="d-block" style="font-size: 15px;"></label>
+          <label id="info" class="d-block" style="font-size: 14px;"></label>
+          <label id="info1" class="d-block" style="font-size: 12px;"></label>
+          <label id="info2" class="d-block" style="font-size: 12px;"></label>
         </div>
 
         <div class="mb-3">
@@ -35,9 +35,14 @@
           <input id="user" type="text" class="form-control" required>
         </div>
 
-        <div class="mb-3">
+        <div class="mb-3 position-relative">
           <label for="passwd" class="form-label">Password</label>
-          <input id="passwd" type="password" class="form-control" autocomplete="off" required>
+          <div class="input-group">
+            <input id="passwd" type="password" class="form-control" autocomplete="off" required>
+            <button type="button" id="togglePasswd" class="btn btn-outline-secondary">
+              <i class="fas fa-eye"></i>
+            </button>
+          </div>
         </div>
 
         <div class="mb-3">
@@ -84,211 +89,188 @@
   <script>
     (async () => {
       const pluginConfig = await homebridge.getPluginConfig();
-
       if (!pluginConfig.length) {
         pluginConfig.push({});
         await homebridge.updatePluginConfig(pluginConfig);
         homebridge.showSchemaForm();
         return;
       }
-      this.configButtonState = false;
 
-      const accountsCount = pluginConfig[0].accounts.length;
       this.deviceIndex = 0;
 
+      const accountsCount = pluginConfig[0].accounts.length;
       for (let i = 0; i < accountsCount; i++) {
         const button = document.createElement("button");
-        button.setAttribute("type", "button");
-        button.setAttribute("id", `button${i}`);
-        button.setAttribute("class", "btn btn-primary");
+        button.type = "button";
+        button.id = `button${i}`;
+        button.className = "btn btn-primary";
         button.style.textTransform = 'none';
         button.innerText = pluginConfig[0].accounts[i].name;
         document.getElementById("accountButton").appendChild(button);
 
-        document.getElementById(`button${i}`).addEventListener('click', async () => {
+        button.addEventListener('click', async () => {
           for (let j = 0; j < accountsCount; j++) {
-            document.getElementById(`button${j}`).setAttribute(
-              "class",
-              j === i ? "btn btn-secondary" : "btn btn-primary"
-            );
+            document.getElementById(`button${j}`).className = (j === i ? 'btn btn-secondary' : 'btn btn-primary');
           }
 
-          document.getElementById('accountName').innerHTML = pluginConfig[0].accounts[i].name || '';
-          document.getElementById('name').value = pluginConfig[0].accounts[i].name || '';
-          document.getElementById('user').value = pluginConfig[0].accounts[i].user || '';
-          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 acc = pluginConfig[0].accounts[i];
+          document.getElementById('accountName').innerText = acc.name || '';
+          document.getElementById('name').value = acc.name || '';
+          document.getElementById('user').value = acc.user || '';
+          document.getElementById('passwd').value = acc.passwd || '';
+          document.getElementById('language').value = acc.language || '';
 
-          const loginBtn = document.getElementById('logIn');
-          loginBtn.disabled = !accountConfigured;
+          document.getElementById('logIn').disabled = !(acc.name && acc.user && acc.passwd && acc.language);
 
-          await homebridge.updatePluginConfig(pluginConfig);
           this.deviceIndex = i;
+          await homebridge.updatePluginConfig(pluginConfig);
         });
 
-        if (i === accountsCount - 1) {
-          document.getElementById(`button0`).click();
-          await homebridge.updatePluginConfig(pluginConfig);
-        }
+        if (i === accountsCount - 1) document.getElementById(`button0`).click();
       }
 
       document.getElementById('melCloudAccount').style.display = 'block';
 
       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;
+        const acc = pluginConfig[0].accounts[this.deviceIndex];
+        acc.name = document.querySelector('#name').value;
+        acc.user = document.querySelector('#user').value;
+        acc.passwd = document.querySelector('#passwd').value;
+        acc.language = document.querySelector('#language').value;
 
-        document.getElementById('logIn').disabled = !accountConfigured;
+        document.getElementById('logIn').disabled = !(acc.name && acc.user && acc.passwd && acc.language);
 
         await homebridge.updatePluginConfig(pluginConfig);
         await homebridge.savePluginConfig(pluginConfig);
       });
 
-      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");
-        this.configButtonState = !this.configButtonState;
+      // --- Config Button Toggle ---
+      const configButton = document.getElementById('configButton');
+      let configButtonState = false;
+      configButton.addEventListener('click', () => {
+        configButtonState = !configButtonState;
+        homebridge[configButtonState ? 'showSchemaForm' : 'hideSchemaForm']();
+        configButton.className = configButtonState ? 'btn btn-primary' : 'btn btn-secondary';
       });
 
+      // Password toggle
+      document.getElementById('togglePasswd').addEventListener('click', () => {
+        const passwdInput = document.getElementById('passwd');
+        const icon = document.querySelector('#togglePasswd i');
+        if (passwdInput.type === 'password') {
+          passwdInput.type = 'text';
+          icon.classList.replace('fa-eye', 'fa-eye-slash');
+        } else {
+          passwdInput.type = 'password';
+          icon.classList.replace('fa-eye-slash', 'fa-eye');
+        }
+      });
+
+      // --- 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 (device.id !== 0 && !melcloudIds.includes(device.id)) {
+            removedDevices.push(device);
+            configDevices.splice(i, 1);
+          }
+        }
+        return removedDevices;
+      }
+
+      function updateInfo(id, text, color) {
+        const el = document.getElementById(id);
+        if (el) {
+          el.innerText = text;
+          el.style.color = color;
+        }
+      }
+
       document.getElementById('logIn').addEventListener('click', async () => {
         homebridge.showSpinner();
-
-        document.getElementById(`logIn`).setAttribute("class", "btn btn-primary");
-        document.getElementById('info').innerHTML = 'Connecting...';
-        document.getElementById('info').style.color = 'yellow';
+        document.getElementById(`logIn`).className = "btn btn-primary";
+        updateInfo('info', 'Connecting...', 'yellow');
 
         try {
-          const account = pluginConfig[0].accounts[this.deviceIndex];
-          const { name: accountName, user, passwd, language } = account;
-
-          const payload = { accountName, user, passwd, language };
+          const acc = pluginConfig[0].accounts[this.deviceIndex];
+          const payload = { accountName: acc.name, user: acc.user, passwd: acc.passwd, language: acc.language };
           const devicesInMelCloud = await homebridge.request('/connect', payload);
 
+          // Initialize devices arrays
           const newDevices = { ata: [], ataPresets: [], atw: [], atwPresets: [], erv: [], ervPresets: [] };
-          const removedDevices = { ata: [], atw: [], erv: [] };
-          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;
-            }
-          }
-
-          const ataDevicesInConfig = account.ataDevices ?? (account.ataDevices = []);
-          const atwDevicesInConfig = account.atwDevices ?? (account.atwDevices = []);
-          const ervDevicesInConfig = account.ervDevices ?? (account.ervDevices = []);
-
-          const updateInfo = (id, text, color) => {
-            const el = document.getElementById(id);
-            if (el) {
-              el.innerHTML = text;
-              el.style.color = color;
-            }
-          };
-
-          function handleDevices(devices, configArray, newArray, newPresetsArray, removedArray, typeString, template) {
-            const melcloudIds = devices.map(d => d.DeviceID);
-
-            // remove stale devices
-            for (let i = configArray.length - 1; i >= 0; i--) {
-              if (!melcloudIds.includes(configArray[i].id)) {
-                removedArray.push(configArray[i]);
-                configArray.splice(i, 1);
-              }
-            }
-
-            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);
+          const devicesByType = { ata: [], atw: [], erv: [] };
+
+          devicesInMelCloud.forEach(d => {
+            if (d.Type === 0) devicesByType.ata.push(d);
+            if (d.Type === 1) devicesByType.atw.push(d);
+            if (d.Type === 3) devicesByType.erv.push(d);
+          });
+
+          acc.ataDevices ??= [];
+          acc.atwDevices ??= [];
+          acc.ervDevices ??= [];
+
+          const removedAta = removeStaleDevices(acc.ataDevices, devicesByType.ata);
+          const removedAtw = removeStaleDevices(acc.atwDevices, devicesByType.atw);
+          const removedErv = removeStaleDevices(acc.ervDevices, devicesByType.erv);
+
+          // Function to handle device & presets
+          const handleDevices = (devicesInCloud, devicesInConfig, typeString, newArr, newPresets) => {
+            devicesInCloud.forEach(device => {
+              const { DeviceID: id, Type: type, DeviceName: name, Presets: presets = [] } = device;
+              const devObj = { id, type, typeString, name, displayMode: 1, presets: [], buttonsSensors: [] };
+              if (!devicesInConfig.some(d => d.id === id)) {
+                devicesInConfig.push(devObj);
+                newArr.push(devObj);
               }
-
-              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);
+              presets.forEach(p => {
+                p.id = p.ID;
+                p.name = p.NumberDescription;
+                p.displayType = 0;
+                p.namePrefix = false;
+                const devConfig = devicesInConfig.find(d => d.id === id);
+                if (devConfig && !devConfig.presets.some(x => x.id === p.ID)) {
+                  devConfig.presets.push(p);
+                  newPresets.push(p);
                 }
               });
             });
-          }
-
-          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 };
+          };
 
-          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);
+          handleDevices(devicesByType.ata, acc.ataDevices, "Air Conditioner", newDevices.ata, newDevices.ataPresets);
+          handleDevices(devicesByType.atw, acc.atwDevices, "Heat Pump", newDevices.atw, newDevices.atwPresets);
+          handleDevices(devicesByType.erv, acc.ervDevices, "ERV", newDevices.erv, newDevices.ervPresets);
 
-          const formatDeviceNames = (arr) => arr.map(d => d.name).join(', ') || 'None';
+          // Display summary
           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;
+          const removedCount = removedAta.length + removedAtw.length + removedErv.length;
 
-          if (newDevicesCount === 0 && newPresetsCount === 0 && removedDevicesCount === 0) {
-            updateInfo('info', 'No changes (already synced).', 'white');
+          if (!newDevicesCount && !newPresetsCount && !removedCount) {
+            updateInfo('info', 'No changes detected.', 'white');
           } else {
-            if (newDevicesCount > 0) {
-              updateInfo('info', `New Devices Found: ATA: ${formatDeviceNames(newDevices.ata)}, ATW: ${formatDeviceNames(newDevices.atw)}, ERV: ${formatDeviceNames(newDevices.erv)}`, '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');
-            }
+            if (newDevicesCount) updateInfo('info', `Found new devices: ATA: ${newDevices.ata.length}, ATW: ${newDevices.atw.length}, ERV: ${newDevices.erv.length}.`, 'green');
+            if (newPresetsCount) updateInfo('info1', `Found new presets: ATA: ${newDevices.ataPresets.length}, ATW: ${newDevices.atwPresets.length}, ERV: ${newDevices.ervPresets.length}.`, 'green');
+            if (removedCount) updateInfo('info2', `Removed devices: ATA: ${removedAta.length}, ATW: ${removedAtw.length}, ERV: ${removedErv.length}.`, 'orange');
           }
 
+          await homebridge.updatePluginConfig(pluginConfig);
           await homebridge.savePluginConfig(pluginConfig);
+          document.getElementById('logIn').className = "btn btn-secondary";
 
-          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');
-          document.getElementById('logIn').setAttribute('class', 'btn btn-secondary');
+          updateInfo('info1', `Error: ${error}`, 'red');
+          document.getElementById('logIn').className = "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.2",
+  "version": "3.9.0-beta.20",
   "description": "Homebridge plugin to control Mitsubishi Air Conditioner, Heat Pump and Energy Recovery Ventilation.",
   "license": "MIT",
   "author": "grzegorz914",