homebridge-melcloud-control 3.9.0-beta.11 → 3.9.0-beta.13

package/homebridge-ui/public/index.html

@@ -43,6 +43,14 @@
       const tabs = document.getElementById("accountTabs");
       const content = document.getElementById("accountTabsContent");
 
+      function updateConfigButtonState(account, configButton) {
+        const hasMultipleDevices =
+          (account.ataDevices?.length || 0) > 1 ||
+          (account.atwDevices?.length || 0) > 1 ||
+          (account.ervDevices?.length || 0) > 1;
+        configButton.disabled = !hasMultipleDevices;
+      }
+
       function createAccountForm(account, i) {
         // Tab header
         const li = document.createElement("li");
@@ -101,12 +109,19 @@
                 <option value="19" ${account.language == 19 ? 'selected' : ''}>Türkçe</option>
               </select>
             </div>
-            <button type="button" class="btn btn-secondary" id="logIn-${i}">Connect</button>
-            <button type="button" class="btn btn-danger ms-2" id="remove-${i}">❌ Remove Account</button>
-            <button type="button" class="btn btn-primary" id="configButton">⚙️ Config</button>
+            <div class="mb-3">
+              <button type="button" class="btn btn-secondary" id="logIn-${i}">Connect</button>
+              <button type="button" class="btn btn-danger ms-2" id="remove-${i}">❌ Remove Account</button>
+              <button type="button" class="btn btn-primary ms-2" id="config-${i}" disabled>⚙️ Config</button>
+            </div>
           </form>`;
         content.appendChild(pane);
 
+        const configButton = document.getElementById(`config-${i}`);
+
+        // Enable config button if devices > 1
+        updateConfigButtonState(account, configButton);
+
         // Handle input updates
         pane.querySelector("form").addEventListener("input", async () => {
           account.name = document.getElementById(`name-${i}`).value;
@@ -124,45 +139,11 @@
           accounts.splice(i, 1);
           document.getElementById(`tab-li-${i}`).remove();
           document.getElementById(`pane-${i}`).remove();
-
-          // Rebuild IDs
-          const panes = document.querySelectorAll(".tab-pane");
-          panes.forEach((p, index) => {
-            p.id = `pane-${index}`;
-            p.querySelector("form").id = `configForm-${index}`;
-            p.querySelector(`[id^="name-"]`).id = `name-${index}`;
-            p.querySelector(`[id^="user-"]`).id = `user-${index}`;
-            p.querySelector(`[id^="passwd-"]`).id = `passwd-${index}`;
-            p.querySelector(`[id^="language-"]`).id = `language-${index}`;
-            p.querySelector(`[id^="logIn-"]`).id = `logIn-${index}`;
-            p.querySelector(`[id^="remove-"]`).id = `remove-${index}`;
-          });
-          const tabButtons = document.querySelectorAll(".nav-link");
-          tabButtons.forEach((btn, idx) => {
-            btn.id = `tab-${idx}`;
-            btn.dataset.bsTarget = `#pane-${idx}`;
-          });
-
           await homebridge.updatePluginConfig(pluginConfig);
           await homebridge.savePluginConfig(pluginConfig);
-
           if (accounts.length > 0) new bootstrap.Tab(document.getElementById("tab-0")).show();
         });
 
-        document.getElementById('configButton').addEventListener('click', async () => {
-          if (this.configButtonState) {
-            homebridge.hideSchemaForm();
-            document.getElementById('configButton').className = "btn btn-secondary";
-          } else {
-            homebridge.showSchemaForm();
-            document.getElementById('configButton').className = "btn btn-primary";
-          }
-          this.configButtonState = !this.configButtonState;
-        });
-
-        // Initialize state
-        this.configButtonState = false;
-
         // Login button
         document.getElementById(`logIn-${i}`).addEventListener("click", async () => {
           homebridge.showSpinner();
@@ -175,7 +156,6 @@
               language: account.language
             });
 
-            const newDevices = { ata: [], ataPresets: [], atw: [], atwPresets: [], erv: [], ervPresets: [] };
             const devicesByType = { ata: [], atw: [], erv: [] };
             for (const d of devicesInMelCloud) {
               if (d.Type === 0) devicesByType.ata.push(d);
@@ -183,72 +163,39 @@
               if (d.Type === 3) devicesByType.erv.push(d);
             }
 
-            // Remove stale function
+            // Initialize device arrays if missing
+            account.ataDevices = account.ataDevices ?? [{}];
+            account.atwDevices = account.atwDevices ?? [{}];
+            account.ervDevices = account.ervDevices ?? [{}];
+
+            // Remove stale devices
             function removeStaleDevices(configDevices, melcloudDevices) {
               const melcloudIds = melcloudDevices.map(d => d.DeviceID);
-              const removed = [];
               for (let j = configDevices.length - 1; j >= 0; j--) {
                 const dev = configDevices[j];
-                if (dev.id !== 0 && !melcloudIds.includes(dev.id)) {
-                  removed.push(dev);
-                  configDevices.splice(j, 1);
-                }
+                if (dev.id !== 0 && !melcloudIds.includes(dev.id)) configDevices.splice(j, 1);
               }
-              return removed;
             }
 
-            const ataDevices = account.ataDevices ?? (account.ataDevices = []);
-            const atwDevices = account.atwDevices ?? (account.atwDevices = []);
-            const ervDevices = account.ervDevices ?? (account.ervDevices = []);
+            removeStaleDevices(account.ataDevices, devicesByType.ata);
+            removeStaleDevices(account.atwDevices, devicesByType.atw);
+            removeStaleDevices(account.ervDevices, devicesByType.erv);
 
-            const removedAta = removeStaleDevices(ataDevices, devicesByType.ata);
-            const removedAtw = removeStaleDevices(atwDevices, devicesByType.atw);
-            const removedErv = removeStaleDevices(ervDevices, devicesByType.erv);
-
-            // Add new devices & presets
-            function handleDevices(configArray, devicesArray, typeName, newDevicesArr, newPresetsArr) {
+            // Add new devices
+            function addDevices(configArray, devicesArray) {
               devicesArray.forEach(d => {
-                const existing = configArray.find(x => x.id === d.DeviceID);
-                if (!existing) {
-                  const devObj = {
-                    id: d.DeviceID,
-                    type: d.Type,
-                    typeString: typeName,
-                    name: d.DeviceName,
-                    displayMode: 1,
-                    presets: [],
-                    buttonsSensors: []
-                  };
-                  configArray.push(devObj);
-                  newDevicesArr.push(devObj);
+                if (!configArray.find(x => x.id === d.DeviceID)) {
+                  configArray.push({ id: d.DeviceID, type: d.Type, name: d.DeviceName });
                 }
-                (d.Presets || []).forEach(p => {
-                  const preset = { ...p, id: p.ID, name: p.NumberDescription, displayType: 0, namePrefix: false };
-                  if (!existing?.presets.some(pr => pr.id === p.ID)) {
-                    existing?.presets.push(preset);
-                    newPresetsArr.push(preset);
-                  }
-                });
               });
             }
 
-            handleDevices(ataDevices, devicesByType.ata, "Air Conditioner", newDevices.ata, newDevices.ataPresets);
-            handleDevices(atwDevices, devicesByType.atw, "Heat Pump", newDevices.atw, newDevices.atwPresets);
-            handleDevices(ervDevices, devicesByType.erv, "ERV", newDevices.erv, newDevices.ervPresets);
-
-            // Info display
-            function updateInfo(id, text, color) {
-              const el = document.getElementById(id);
-              if (el) { el.innerHTML = text; el.style.color = color; }
-            }
-
-            const textInfo = `Found devices: ATA(${newDevices.ata.length}), ATW(${newDevices.atw.length}), ERV(${newDevices.erv.length})`;
-            const textPresets = `Found presets: ATA(${newDevices.ataPresets.length}), ATW(${newDevices.atwPresets.length}), ERV(${newDevices.ervPresets.length})`;
-            const textRemoved = `Removed devices: ATA(${removedAta.length}), ATW(${removedAtw.length}), ERV(${removedErv.length})`;
+            addDevices(account.ataDevices, devicesByType.ata);
+            addDevices(account.atwDevices, devicesByType.atw);
+            addDevices(account.ervDevices, devicesByType.erv);
 
-            updateInfo('info', textInfo, newDevices.ata.length + newDevices.atw.length + newDevices.erv.length > 0 ? 'green' : 'white');
-            updateInfo('info1', textPresets, newDevices.ataPresets.length + newDevices.atwPresets.length + newDevices.ervPresets.length > 0 ? 'green' : 'white');
-            updateInfo('info2', textRemoved, removedAta.length + removedAtw.length + removedErv.length > 0 ? 'orange' : 'white');
+            // Update Config button state
+            updateConfigButtonState(account, configButton);
 
             await homebridge.updatePluginConfig(pluginConfig);
             await homebridge.savePluginConfig(pluginConfig);
@@ -258,6 +205,15 @@
             homebridge.hideSpinner();
           }
         });
+
+        // Config button click
+        configButton.addEventListener('click', () => {
+          if (configButton.classList.contains('btn-primary')) {
+            homebridge.showSchemaForm();
+          } else {
+            homebridge.hideSchemaForm();
+          }
+        });
       }
 
       // Render accounts
@@ -270,7 +226,7 @@
       tabs.appendChild(addLi);
 
       document.getElementById("addTab").addEventListener("click", async () => {
-        const newAccount = { name: "", user: "", passwd: "", language: 0 };
+        const newAccount = { name: "", user: "", passwd: "", language: 0, ataDevices: [{}], atwDevices: [{}], ervDevices: [{}] };
         accounts.push(newAccount);
         const i = accounts.length - 1;
         createAccountForm(newAccount, i);

package/package.json

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