homebridge-melcloud-control 4.1.2-beta.79 → 4.1.2-beta.80

package/homebridge-ui/public/index.html

@@ -159,8 +159,6 @@
           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);
         });
       });
 
@@ -208,15 +206,6 @@
         }
       });
 
-      // 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);
@@ -224,7 +213,7 @@
 
         for (let i = configDevices.length - 1; i >= 0; i--) {
           const device = configDevices[i];
-          if (!melcloudIds.includes(device.id)) {
+          if (device.id !== "0" && !melcloudIds.includes(device.id)) {
             removedDevices.push(device);
             configDevices.splice(i, 1);
           }
@@ -232,55 +221,110 @@
         return removedDevices;
       }
 
-      document.getElementById('logIn').addEventListener('click', async () => {
-        const toggleLoginButton = (loading) => {
-          const btn = document.getElementById('logIn');
-          btn.className = loading ? "btn btn-primary" : "btn btn-secondary";
-          loading ? homebridge.showSpinner() : homebridge.hideSpinner();
-        };
+      function updateInfo(id, text, color) {
+        const el = document.getElementById(id);
+        if (el) {
+          el.innerText = text;
+          el.style.color = color;
+        }
+      }
 
-        toggleLoginButton(true);
-        updateInfo('info', ''); updateInfo('info1', ''); updateInfo('info2', '');
+      document.getElementById('logIn').addEventListener('click', async () => {
+        document.getElementById(`logIn`).className = "btn btn-primary";
+        updateInfo('info', '', 'white');
+        updateInfo('info1', '', 'white');
+        updateInfo('info2', '', 'white');
+        homebridge.showSpinner();
 
         try {
-          const account = structuredClone(this.account);
+          const account = this.account;
           const response = await homebridge.request('/connect', account);
-
-          if (!response?.State) {
-            updateInfo('info', response?.Info || 'Login failed.', 'red');
+          if (!response.State) {
+            homebridge.hideSpinner();
+            updateInfo('info', response.Info);
             return;
           }
 
-          // Group devices
-          const DEVICE_TYPES = { ATA: 0, ATW: 1, ERV: 3 };
-          const melcloudDevices = { ata: [], atw: [], erv: [] };
+          // Initialize devices arrays
           const newDevices = { ata: [], ataPresets: [], atw: [], atwPresets: [], erv: [], ervPresets: [] };
+          const devicesByType = { ata: [], atw: [], erv: [] };
 
-          (response.Devices || []).forEach(d => {
-            switch (d.Type) {
-              case DEVICE_TYPES.ATA: melcloudDevices.ata.push(d); break;
-              case DEVICE_TYPES.ATW: melcloudDevices.atw.push(d); break;
-              case DEVICE_TYPES.ERV: melcloudDevices.erv.push(d); break;
-            }
+          response.Devices.forEach(d => {
+            if (d.Type === 0) devicesByType.ata.push(d);
+            if (d.Type === 1) devicesByType.atw.push(d);
+            if (d.Type === 3) devicesByType.erv.push(d);
           });
 
-          // Filter invalid devices
           account.ataDevices = (account.ataDevices || []).filter(d => String(d.id) !== '0');
           account.atwDevices = (account.atwDevices || []).filter(d => String(d.id) !== '0');
           account.ervDevices = (account.ervDevices || []).filter(d => String(d.id) !== '0');
 
-          // Remove stale devices
-          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 removedAta = removeStaleDevices(account.ataDevices, devicesByType.ata);
+          const removedAtw = removeStaleDevices(account.atwDevices, devicesByType.atw);
+          const removedErv = removeStaleDevices(account.ervDevices, devicesByType.erv);
+
+          const handleDevices = (devicesInMelCloud, devicesInConfig, typeString, newArr, newPresets) => {
+            try {
+              const configDevicesMap = new Map(devicesInConfig.map(dev => [dev.id, dev]));
+              const isMelcloud = account.type === 'melcloud';
+
+              const idKey = isMelcloud ? 'ID' : 'Id';
+              const typeKey = isMelcloud ? 'Presets' : 'Schedule';
+              const typeKey1 = isMelcloud ? 'presets' : 'schedules';
+
+              devicesInMelCloud.forEach(device => {
+                const deviceId = String(device.DeviceID);
+                let deviceInConfig = configDevicesMap.get(deviceId);
+
+                // === Create device if missing ===
+                if (!deviceInConfig) {
+                  deviceInConfig = {
+                    id: device.DeviceID,
+                    type: device.Type,
+                    typeString,
+                    displayType: 0,
+                    name: device.DeviceName,
+                    presets: [],
+                    schedules: [],
+                    buttonsSensors: []
+                  };
+                  devicesInConfig.push(deviceInConfig);
+                  newArr.push(deviceInConfig);
+                  configDevicesMap.set(deviceId, deviceInConfig);
+                }
+
+                // === Process presets/schedules ===
+                const presets = 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) => {
+                  const presetId = String(preset[idKey]);
+                  if (!presetIds.has(presetId)) {
+                    const presetObj = {
+                      id: presetId,
+                      displayType: 0,
+                      name: preset.NumberDescription || `Schedule ${index}`,
+                      namePrefix: false
+                    };
+                    presetsInConfig.push(presetObj);
+                    newPresets.push(presetObj);
+                    presetIds.add(presetId);
+                  }
+                });
+              });
+
+              // Return filtered devicesInConfig to make sure upstream code uses it
+              return devicesInConfig;
+            } catch (error) {
+              updateInfo('info', `Error while processing device: ${JSON.stringify(error)}`, 'red');
+            }
+          };
 
-          // Sync devices
-          account.ataDevices = handleDevices(account, melcloudDevices.ata, account.ataDevices, "Air Conditioner", newDevices.ata, newDevices.ataPresets);
-          account.atwDevices = handleDevices(account, melcloudDevices.atw, account.atwDevices, "Heat Pump", newDevices.atw, newDevices.atwPresets);
-          account.ervDevices = handleDevices(account, melcloudDevices.erv, account.ervDevices, "Energy Recovery Ventilation", newDevices.erv, newDevices.ervPresets);
+          account.ataDevices = handleDevices(devicesByType.ata, account.ataDevices, "Air Conditioner", newDevices.ata, newDevices.ataPresets);
+          account.atwDevices = handleDevices(devicesByType.atw, account.atwDevices, "Heat Pump", newDevices.atw, newDevices.atwPresets);
+          account.ervDevices = handleDevices(devicesByType.erv, account.ervDevices, "Energy Recovery Ventilation", newDevices.erv, newDevices.ervPresets);
 
-          // Summaries
           const newDevicesCount = newDevices.ata.length + newDevices.atw.length + newDevices.erv.length;
           const newPresetsCount = newDevices.ataPresets.length + newDevices.atwPresets.length + newDevices.ervPresets.length;
           const removedDevicesCount = removedAta.length + removedAtw.length + removedErv.length;
@@ -288,21 +332,25 @@
           if (!newDevicesCount && !newPresetsCount && !removedDevicesCount) {
             updateInfo('info', 'No changes detected.', 'white');
           } else {
-            if (newDevicesCount) updateInfo('info', `New devices — ATA: ${newDevices.ata.length}, ATW: ${newDevices.atw.length}, ERV: ${newDevices.erv.length}`, 'green');
-            if (newPresetsCount) updateInfo('info1', `New ${account.type === 'melcloud' ? 'presets' : 'schedules'} — ATA: ${newDevices.ataPresets.length}, ATW: ${newDevices.atwPresets.length}, ERV: ${newDevices.ervPresets.length}`, 'green');
-            if (removedDevicesCount) updateInfo('info2', `Removed devices — ATA: ${removedAta.length}, ATW: ${removedAtw.length}, ERV: ${removedErv.length}`, 'orange');
+            if (newDevicesCount)
+              updateInfo('info', `Found new devices: ATA: ${newDevices.ata.length}, ATW: ${newDevices.atw.length}, ERV: ${newDevices.erv.length}.`, 'green');
+            if (newPresetsCount)
+              updateInfo('info1', `Found new ${account.type === 'melcloud' ? 'presets' : 'schedules'}: ATA: ${newDevices.ataPresets.length}, ATW: ${newDevices.atwPresets.length}, ERV: ${newDevices.ervPresets.length}.`, 'green');
+            if (removedDevicesCount)
+              updateInfo('info2', `Removed devices: ATA: ${removedAta.length}, ATW: ${removedAtw.length}, ERV: ${removedErv.length}.`, 'orange');
           }
 
           await homebridge.updatePluginConfig(pluginConfig);
           await homebridge.savePluginConfig(pluginConfig);
         } catch (error) {
-          updateInfo('info', `Error connecting to MelCloud: ${error.message}`, 'red');
+          updateInfo('info', `Connect error ${JSON.stringify(error)}`, 'red');
+          document.getElementById('logIn').className = "btn btn-secondary";
         } finally {
-          toggleLoginButton(false);
+          document.getElementById('logIn').className = "btn btn-secondary";
+          homebridge.hideSpinner();
         }
       });
 
-
     })();
   </script>
 </body>

package/package.json

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