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

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: 16px;"></label>
+          <label id="info1" class="d-block" style="font-size: 14px;"></label>
+          <label id="info2" class="d-block" style="font-size: 14px;"></label>
         </div>
 
         <div class="mb-3">
@@ -83,9 +83,7 @@
 
   <script>
     (async () => {
-      //get the plugin config array
       const pluginConfig = await homebridge.getPluginConfig();
-
       if (!pluginConfig.length) {
         pluginConfig.push({});
         await homebridge.updatePluginConfig(pluginConfig);
@@ -94,11 +92,9 @@
       }
       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}`);
@@ -107,10 +103,11 @@
         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++) {
-            const setRemoveAtribute = j === i ? document.getElementById(`button${j}`).setAttribute("class", "btn btn-secondary") : document.getElementById(`button${j}`).setAttribute("class", "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 || '';
@@ -120,20 +117,19 @@
           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 button = document.getElementById('logIn');
-          const setButtonState = accountConfigured ? button.disabled = false : button.disabled = true;
+          document.getElementById('logIn').disabled = !accountConfigured;
 
           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;
@@ -141,58 +137,55 @@
         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 button = document.getElementById('logIn');
-        const setButtonState = accountConfigured ? button.disabled = false : button.disabled = true;
+        document.getElementById('logIn').disabled = !accountConfigured;
 
         await homebridge.updatePluginConfig(pluginConfig);
         await homebridge.savePluginConfig(pluginConfig);
       });
 
-      //watch for changes to the config button
       document.getElementById('configButton').addEventListener('click', async () => {
-        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 ? homebridge.hideSchemaForm() : homebridge.showSchemaForm();
+        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);
+        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;
+        }
       }
 
-      //watch for click on the login button
       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 newDevices = { ata: [], ataPresets: [], atw: [], atwPresets: [], erv: [], ervPresets: [] };
           const devicesByTypeInMelCloud = { ata: [], atw: [], erv: [] };
 
-          // Categorize devices by type
           for (const deviceInMelcloud of devicesInMelCloud) {
             switch (deviceInMelcloud.Type) {
               case 0: devicesByTypeInMelCloud.ata.push(deviceInMelcloud); break;
@@ -201,27 +194,16 @@
             }
           }
 
-          // 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) {
-              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) => {
+          // === Handle ATA devices ===
+          devicesByTypeInMelCloud.ata.forEach(device => {
             const { DeviceID: deviceId, Type: deviceType, DeviceName: deviceName, Presets: devicePresets = [] } = device;
             const deviceAta = {
               id: deviceId,
@@ -237,29 +219,26 @@
               presets: [],
               buttonsSensors: []
             };
-
-            if (!ataDevicesInConfig.some(device => device.id === deviceId)) {
+            if (!ataDevicesInConfig.some(d => d.id === deviceId)) {
               ataDevicesInConfig.push(deviceAta);
               newDevices.ata.push(deviceAta);
             }
-
-            devicePresets.forEach((preset) => {
+            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)) {
+              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) => {
+          // === Handle ATW devices ===
+          devicesByTypeInMelCloud.atw.forEach(device => {
             const { DeviceID: deviceId, Type: deviceType, DeviceName: deviceName, Presets: devicePresets = [] } = device;
             const deviceAtw = {
               id: deviceId,
@@ -269,107 +248,89 @@
               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)) {
+            if (!atwDevicesInConfig.some(d => d.id === deviceId)) {
               atwDevicesInConfig.push(deviceAtw);
               newDevices.atw.push(deviceAtw);
             }
-
-            devicePresets.forEach((preset) => {
+            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)) {
+              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);
               }
             });
           });
 
-          // Handle ERV devices
-          devicesByTypeInMelCloud.erv.forEach((device) => {
+          // === 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",
+              typeString: "ERV",
               name: deviceName,
               displayMode: 1,
               temperatureSensor: false,
-              temperatureSensorOutdoor: false,
-              temperatureSensorSupply: false,
               presets: [],
               buttonsSensors: []
             };
-
-            if (!ervDevicesInConfig.some(device => device.id === deviceId)) {
+            if (!ervDevicesInConfig.some(d => d.id === deviceId)) {
               ervDevicesInConfig.push(deviceErv);
               newDevices.erv.push(deviceErv);
             }
-
-            devicePresets.forEach((preset) => {
+            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)) {
+              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
+          // --- 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 newDevicesCount = newDevices.ata.length + newDevices.atw.length + newDevices.erv.length;
           const newPresetsCount = newDevices.ataPresets.length + newDevices.atwPresets.length + newDevices.ervPresets.length;
+          const removedCount = removedAta.length + removedAtw.length + removedErv.length;
 
-          if (newDevicesCount === 0 && newPresetsCount === 0) {
-            updateInfo('info', 'No new devices found.', 'white');
+          if (newDevicesCount === 0 && newPresetsCount === 0 && removedCount === 0) {
+            updateInfo('info', 'No changes detected.', 'white');
           } else {
             if (newDevicesCount > 0) {
-              updateInfo('info', `Found, ${textAta}, ${textAtw}, ${textErv}.`, 'green');
-              updateInfo('info2', 'Now You can configure it.', 'green');
+              updateInfo('info', `Found new devices: ${textAta}, ${textAtw}, ${textErv}.`, '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');
-              }
+              updateInfo('info1', `Found new presets: ${textAtaPresets}, ${textAtwPresets}, ${textErvPresets}.`, 'green');
+            }
+            if (removedCount > 0) {
+              updateInfo('info2', `Removed devices: ${textRemovedAta}, ${textRemovedAtw}, ${textRemovedErv}.`, 'orange');
             }
           }
 
-          // Save updated config
           await homebridge.updatePluginConfig(pluginConfig);
           await homebridge.savePluginConfig(pluginConfig);
-
-          // Update button
           document.getElementById('logIn').setAttribute('class', 'btn btn-secondary');
           homebridge.hideSpinner();
 
@@ -380,7 +341,6 @@
         } finally {
           homebridge.hideSpinner();
         }
-
       });
     })();
   </script>

package/package.json

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