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

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">
@@ -43,31 +43,7 @@
         <div class="mb-3">
           <label for="language" class="form-label">Language</label>
           <select id="language" name="language" class="form-control">
-            <option value="0">English</option>
-            <option value="1">Български</option>
-            <option value="2">Čeština</option>
-            <option value="3">Dansk</option>
-            <option value="4">Deutsch</option>
-            <option value="5">Eesti</option>
-            <option value="6">Español</option>
-            <option value="7">Français</option>
-            <option value="8">Հայերեն</option>
-            <option value="9">Latviešu</option>
-            <option value="10">Lietuvių</option>
-            <option value="11">Magyar</option>
-            <option value="12">Nederlands</option>
-            <option value="13">Norwegian</option>
-            <option value="14">Polski</option>
-            <option value="15">Português</option>
-            <option value="16">Русский</option>
-            <option value="17">Suomi</option>
-            <option value="18">Svenska</option>
-            <option value="19">Українська</option>
-            <option value="20">Türkçe</option>
-            <option value="21">Ελληνικά</option>
-            <option value="22">Hrvatski</option>
-            <option value="23">Română</option>
-            <option value="24">Slovenščina</option>
+            <!-- languages options omitted for brevity -->
           </select>
         </div>
 
@@ -84,7 +60,6 @@
   <script>
     (async () => {
       const pluginConfig = await homebridge.getPluginConfig();
-
       if (!pluginConfig.length) {
         pluginConfig.push({});
         await homebridge.updatePluginConfig(pluginConfig);
@@ -95,7 +70,6 @@
 
       const accountsCount = pluginConfig[0].accounts.length;
       this.deviceIndex = 0;
-
       for (let i = 0; i < accountsCount; i++) {
         const button = document.createElement("button");
         button.setAttribute("type", "button");
@@ -107,10 +81,9 @@
 
         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"
-            );
+            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,19 +92,12 @@
           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;
+          document.getElementById('logIn').disabled = !accountConfigured;
 
           await homebridge.updatePluginConfig(pluginConfig);
           this.deviceIndex = i;
         });
-
         if (i === accountsCount - 1) {
           document.getElementById(`button0`).click();
           await homebridge.updatePluginConfig(pluginConfig);
@@ -146,12 +112,7 @@
         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 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;
 
         await homebridge.updatePluginConfig(pluginConfig);
@@ -160,35 +121,52 @@
 
       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
+          ? document.getElementById(`configButton`).setAttribute("class", "btn btn-secondary")
+          : document.getElementById(`configButton`).setAttribute("class", "btn btn-primary");
         this.configButtonState = !this.configButtonState;
       });
 
+      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.innerHTML = 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';
+        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 devicesInMelCloud = await homebridge.request('/connect', payload);
 
           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;
+          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;
             }
           }
 
@@ -196,93 +174,145 @@
           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;
+          const removedAta = removeStaleDevices(ataDevicesInConfig, devicesByTypeInMelCloud.ata);
+          const removedAtw = removeStaleDevices(atwDevicesInConfig, devicesByTypeInMelCloud.atw);
+          const removedErv = removeStaleDevices(ervDevicesInConfig, devicesByTypeInMelCloud.erv);
+
+          // === 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(d => d.id === deviceId)) {
+              ataDevicesInConfig.push(deviceAta);
+              newDevices.ata.push(deviceAta);
             }
-          };
-
-          function handleDevices(devices, configArray, newArray, newPresetsArray, removedArray, typeString, template) {
-            const melcloudIds = devices.map(d => d.DeviceID);
-
-            // 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(d => d.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,
+              presets: [],
+              buttonsSensors: []
+            };
+            if (!atwDevicesInConfig.some(d => d.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(d => d.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);
-                }
-              });
             });
-          }
-
-          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);
+          });
+
+          // === Handle ERV devices ===
+          devicesByTypeInMelCloud.erv.forEach(device => {
+            const { DeviceID: deviceId, Type: deviceType, DeviceName: deviceName, Presets: devicePresets = [] } = device;
+            const deviceErv = {
+              id: deviceId,
+              type: deviceType,
+              typeString: "ERV",
+              name: deviceName,
+              displayMode: 1,
+              temperatureSensor: false,
+              presets: [],
+              buttonsSensors: []
+            };
+            if (!ervDevicesInConfig.some(d => d.id === deviceId)) {
+              ervDevicesInConfig.push(deviceErv);
+              newDevices.erv.push(deviceErv);
+            }
+            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(d => d.id === deviceId);
+              if (ervDevice && !ervDevice.presets.some(p => p.id === presetId)) {
+                ervDevice.presets.push(preset);
+                newDevices.ervPresets.push(preset);
+              }
+            });
+          });
+
+          // --- Display Info Section ---
+          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 textRemovedAta = `ATA: ${removedAta.length}`;
+          const textRemovedAtw = `ATW: ${removedAtw.length}`;
+          const textRemovedErv = `ERV: ${removedErv.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;
+          const removedCount = removedAta.length + removedAtw.length + removedErv.length;
 
-          if (newDevicesCount === 0 && newPresetsCount === 0 && removedDevicesCount === 0) {
-            updateInfo('info', 'No changes (already synced).', 'white');
+          if (newDevicesCount === 0 && newPresetsCount === 0 && removedCount === 0) {
+            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');
+              updateInfo('info', `Found new devices: ${textAta}, ${textAtw}, ${textErv}.`, 'green');
             }
             if (newPresetsCount > 0) {
-              updateInfo('info1', `New Presets: ATA: ${newDevices.ataPresets.length}, ATW: ${newDevices.atwPresets.length}, ERV: ${newDevices.ervPresets.length}`, 'green');
+              updateInfo('info1', `Found new presets: ${textAtaPresets}, ${textAtwPresets}, ${textErvPresets}.`, 'green');
             }
-            if (removedDevicesCount > 0) {
-              updateInfo('info', `Removed Devices: ATA: ${formatDeviceNames(removedDevices.ata)}, ATW: ${formatDeviceNames(removedDevices.atw)}, ERV: ${formatDeviceNames(removedDevices.erv)}`, 'orange');
+            if (removedCount > 0) {
+              updateInfo('info2', `Removed devices: ${textRemovedAta}, ${textRemovedAtw}, ${textRemovedErv}.`, 'orange');
             }
           }
 
+          await homebridge.updatePluginConfig(pluginConfig);
           await homebridge.savePluginConfig(pluginConfig);
-
           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();
@@ -290,7 +320,6 @@
       });
     })();
   </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.6",
   "description": "Homebridge plugin to control Mitsubishi Air Conditioner, Heat Pump and Energy Recovery Ventilation.",
   "license": "MIT",
   "author": "grzegorz914",