homebridge-melcloud-control 4.1.2-beta.73 → 4.1.2-beta.76

package/homebridge-ui/public/index.html

@@ -107,7 +107,6 @@
 
       const accounts = pluginConfig[0].accounts || [];
       const accountsCount = accounts.length;
-      this.accountIndex = 0;
 
       const container = document.getElementById("accountButton");
       container.style.display = 'flex';
@@ -131,6 +130,8 @@
 
       // Tworzenie przycisków
       accounts.forEach((account, i) => {
+        this.account = account;
+
         const button = document.createElement("button");
         button.type = "button";
         button.id = `button${i}`;
@@ -140,7 +141,7 @@
         container.appendChild(button);
 
         button.addEventListener('click', async () => {
-          this.accountIndex = i;
+          this.account = account;
 
           // Zmieniamy klasę wszystkich przycisków
           accounts.forEach((_, j) => {
@@ -158,6 +159,8 @@
           formElements.language.value = account.language || '0';
           formElements.accountType.value = account.type || 'disabled';
           formElements.logIn.disabled = !(account.name && account.user && account.passwd && account.language && account.type);
+
+          await homebridge.updatePluginConfig(pluginConfig);
         });
       });
 
@@ -166,7 +169,7 @@
 
       // Jeden listener input dla całego formularza
       document.getElementById('configForm').addEventListener('input', async () => {
-        const account = pluginConfig[0].accounts[this.accountIndex];
+        const account = this.account;
         if (!account) return;
 
         account.name = formElements.name.value;
@@ -205,6 +208,15 @@
         }
       });
 
+      // Update info
+      function updateInfo(id, text, color) {
+        const el = document.getElementById(id);
+        if (el) {
+          el.innerText = text;
+          el.style.color = color;
+        }
+      }
+
       // Device Handling & Login Logic
       function removeStaleDevices(configDevices, melcloudDevices) {
         const melcloudIds = melcloudDevices.map(d => d.DeviceID);
@@ -212,7 +224,7 @@
 
         for (let i = configDevices.length - 1; i >= 0; i--) {
           const device = configDevices[i];
-          if (device.id !== "0" && !melcloudIds.includes(device.id)) {
+          if (!melcloudIds.includes(device.id)) {
             removedDevices.push(device);
             configDevices.splice(i, 1);
           }
@@ -220,18 +232,7 @@
         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 () => {
-        await homebridge.updatePluginConfig(pluginConfig);
-        await homebridge.savePluginConfig(pluginConfig);
-
         document.getElementById(`logIn`).className = "btn btn-primary";
         updateInfo('info', '', 'white');
         updateInfo('info1', '', 'white');
@@ -239,7 +240,7 @@
         homebridge.showSpinner();
 
         try {
-          const account = pluginConfig[0].accounts[this.accountIndex];
+          const account = this.account;
           const response = await homebridge.request('/connect', account);
           if (!response.State) {
             homebridge.hideSpinner();
@@ -264,6 +265,7 @@
           const removedAta = removeStaleDevices(account.ataDevices, melcloudDevices.ata);
           const removedAtw = removeStaleDevices(account.atwDevices, melcloudDevices.atw);
           const removedErv = removeStaleDevices(account.ervDevices, melcloudDevices.erv);
+          await homebridge.updatePluginConfig(pluginConfig);
 
           const handleDevices = (devicesInMelCloud, devicesInConfig, typeString, newArr, newPresets) => {
             try {
@@ -275,8 +277,7 @@
               const typeKey1 = isMelcloud ? 'presets' : 'schedules';
 
               devicesInMelCloud.forEach(device => {
-                const deviceId = String(device.DeviceID);
-                let deviceInConfig = configDevicesMap.get(deviceId);
+                let deviceInConfig = configDevicesMap.get(device.DeviceID);
 
                 // === Create device if missing ===
                 if (!deviceInConfig) {
@@ -292,15 +293,15 @@
                   };
                   devicesInConfig.push(deviceInConfig);
                   newArr.push(deviceInConfig);
-                  configDevicesMap.set(deviceId, deviceInConfig);
+                  configDevicesMap.set(device.DeviceID, deviceInConfig);
                 }
 
                 // === Process presets/schedules ===
-                const presets = device[typeKey] || [];
+                const presetsInMelcloud = device[typeKey] || [];
                 const presetsInConfig = (deviceInConfig[typeKey1] || []).filter(p => String(p.id) !== '0');
                 const presetIds = new Set(presetsInConfig.map(p => String(p.id)));
 
-                presets.forEach((preset, index) => {
+                presetsInMelcloud.forEach((preset, index) => {
                   const presetId = String(preset[idKey]);
                   if (!presetIds.has(presetId)) {
                     const presetObj = {
@@ -323,9 +324,9 @@
             }
           };
 
-          account.ataDevices = handleDevices(melcloudDevices.ata, account.ataDevices, "Air Conditioner", newDevices.ata, newDevices.ataPresets);
-          account.atwDevices = handleDevices(melcloudDevices.atw, account.atwDevices, "Heat Pump", newDevices.atw, newDevices.atwPresets);
-          account.ervDevices = handleDevices(melcloudDevices.erv, account.ervDevices, "Energy Recovery Ventilation", newDevices.erv, newDevices.ervPresets);
+        pluginConfig[0].account.ataDevices = handleDevices(melcloudDevices.ata, account.ataDevices, "Air Conditioner", newDevices.ata, newDevices.ataPresets);
+          pluginConfig[0].account.atwDevices = handleDevices(melcloudDevices.atw, account.atwDevices, "Heat Pump", newDevices.atw, newDevices.atwPresets);
+          pluginConfig[0].account.ervDevices = handleDevices(melcloudDevices.erv, account.ervDevices, "Energy Recovery Ventilation", newDevices.erv, newDevices.ervPresets);
 
           const newDevicesCount = newDevices.ata.length + newDevices.atw.length + newDevices.erv.length;
           const newPresetsCount = newDevices.ataPresets.length + newDevices.atwPresets.length + newDevices.ervPresets.length;

package/package.json

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