homebridge-melcloud-control 3.8.16 → 3.9.0-beta.0

package/homebridge-ui/public/index.html

@@ -83,7 +83,6 @@
 
   <script>
     (async () => {
-      //get the plugin config array
       const pluginConfig = await homebridge.getPluginConfig();
 
       if (!pluginConfig.length) {
@@ -94,11 +93,10 @@
       }
       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 +105,12 @@
         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");
+            document.getElementById(`button${j}`).setAttribute(
+              "class",
+              j === i ? "btn btn-secondary" : "btn btn-primary"
+            );
           }
 
           document.getElementById('accountName').innerHTML = pluginConfig[0].accounts[i].name || '';
@@ -119,43 +119,53 @@
           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 button = document.getElementById('logIn');
-          const setButtonState = accountConfigured ? button.disabled = false : button.disabled = true;
+          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;
 
           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;
-      };
 
-      //load melCloudAccount form
+        if (i === accountsCount - 1) {
+          document.getElementById(`button0`).click();
+          await homebridge.updatePluginConfig(pluginConfig);
+        }
+      }
+
       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;
-        const button = document.getElementById('logIn');
-        const setButtonState = accountConfigured ? button.disabled = false : button.disabled = true;
+        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);
         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();
+        document
+          .getElementById('configButton')
+          .setAttribute("class", this.configButtonState ? "btn btn-secondary" : "btn btn-primary");
         this.configButtonState = !this.configButtonState;
       });
 
-      //watch for click on the login button
       document.getElementById('logIn').addEventListener('click', async () => {
         homebridge.showSpinner();
 
@@ -170,36 +180,22 @@
           const payload = { accountName, user, passwd, language };
           const devicesInMelCloud = await homebridge.request('/connect', payload);
 
-          const newDevices = {
-            ata: [],
-            ataPresets: [],
-            atw: [],
-            atwPresets: [],
-            erv: [],
-            ervPresets: [],
-          };
-
-          const devicesByTypeInMelCloud = {
-            ata: [],
-            atw: [],
-            erv: []
-          };
+          const newDevices = { ata: [], ataPresets: [], atw: [], atwPresets: [], erv: [], ervPresets: [] };
+          const removedDevices = { ata: [], atw: [], erv: [] };
+          const devicesByTypeInMelCloud = { ata: [], atw: [], erv: [] };
 
-          // 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;
+          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;
             }
           }
 
-          // 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) {
@@ -208,140 +204,99 @@
             }
           };
 
-          // 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);
-            }
+          function handleDevices(devices, configArray, newArray, newPresetsArray, removedArray, typeString, template) {
+            const melcloudIds = devices.map(d => d.DeviceID);
 
-            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);
+            // 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);
               }
-            });
-          });
-
-          // 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);
             }
 
-            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);
+            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);
               }
-            });
-          });
-
-          // 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);
-            }
 
-            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);
-              }
+              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);
 
-          // Display info
           const textAta = `ATA: ${newDevices.ata.length}`;
           const textAtw = `ATW: ${newDevices.atw.length}`;
           const textErv = `ERV: ${newDevices.erv.length}`;
+          const textRemovedAta = `ATA: ${removedDevices.ata.length}`;
+          const textRemovedAtw = `ATW: ${removedDevices.atw.length}`;
+          const textRemovedErv = `ERV: ${removedDevices.erv.length}`;
           const textAtaPresets = `ATA Presets: ${newDevices.ataPresets.length}`;
           const textAtwPresets = `ATW Presets: ${newDevices.atwPresets.length}`;
           const textErvPresets = `ERV Presets: ${newDevices.ervPresets.length}`;
 
           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) {
-            updateInfo('info', 'No new devices found.', 'white');
+          if (newDevicesCount === 0 && newPresetsCount === 0 && removedDevicesCount === 0) {
+            updateInfo('info', 'No changes (already synced).', 'white');
           } else {
             if (newDevicesCount > 0) {
               updateInfo('info', `Found, ${textAta}, ${textAtw}, ${textErv}.`, 'green');
@@ -354,24 +309,22 @@
                 updateInfo('info1', 'Now You can configure it.', 'green');
               }
             }
+            if (removedDevicesCount > 0) {
+              updateInfo('info', `Removed, ${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();
-
         } catch (error) {
           updateInfo('info', 'Check Your credentials data and try again.', 'yellow');
-          updateInfo('info1', `Error: ${error}`, 'red');
+          updateInfo('info1', `Error: ${error.message ?? JSON.stringify(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.16",
+  "version": "3.9.0-beta.0",
   "description": "Homebridge plugin to control Mitsubishi Air Conditioner, Heat Pump and Energy Recovery Ventilation.",
   "license": "MIT",
   "author": "grzegorz914",