homebridge-melcloud-control 4.0.0-beta.458 → 4.0.0-beta.459

package/homebridge-ui/public/index.html

@@ -230,10 +230,7 @@
 
         try {
           const account = pluginConfig[0].accounts[this.accountIndex];
-          const devicesInMelCloud = await Promise.race([
-            homebridge.request('/connect', account),
-            new Promise((_, reject) => setTimeout(() => reject(updateInfo('info1', `Connection timeout (30sec)`, 'red')), 30000))
-          ]);
+          const devicesInMelCloud = await homebridge.request('/connect', account);
 
           // Initialize devices arrays
           const newDevices = { ata: [], ataPresets: [], atw: [], atwPresets: [], erv: [], ervPresets: [] };

package/package.json

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

package/src/melcloud.js

@@ -426,30 +426,51 @@ class MelCloud extends EventEmitter {
     }
 
     async checkDevicesList() {
-        let devices = [];
-        switch (this.accountType) {
-            case "melcloud":
-                devices = await this.checkMelcloudDevicesList();
-                return devices
-            case "melcloudhome":
-                devices = await this.checkMelcloudHomeDevicesList();
-                return devices;
-            default:
-                return devices;
+        const TIMEOUT_MS = 30000; // 30 seconds timeout
+        try {
+            const devices = await Promise.race([
+                (async () => {
+                    switch (this.accountType) {
+                        case "melcloud":
+                            return await this.checkMelcloudDevicesList();
+                        case "melcloudhome":
+                            return await this.checkMelcloudHomeDevicesList();
+                        default:
+                            return [];
+                    }
+                })(),
+                new Promise((_, reject) => setTimeout(() => reject(new Error('Device list timeout (30s)')), TIMEOUT_MS))
+            ]);
+
+            return devices;
+        } catch (err) {
+            if (this.logError) this.emit('error', `Device list error: ${err.message}`);
+            throw new Error(`Device list error: ${err.message}`);
         }
     }
 
     async connect(refresh) {
-        let response = {};
-        switch (this.accountType) {
-            case "melcloud":
-                response = await this.connectToMelCloud();
-                return response
-            case "melcloudhome":
-                response = await this.connectToMelCloudHome(refresh);
-                return response
-            default:
-                return response
+        const TIMEOUT_MS = 30000;
+
+        try {
+            const result = await Promise.race([
+                (async () => {
+                    switch (this.accountType) {
+                        case "melcloud":
+                            return await this.connectToMelCloud();
+                        case "melcloudhome":
+                            return await this.connectToMelCloudHome(refresh);
+                        default:
+                            return {};
+                    }
+                })(),
+                new Promise((_, reject) => setTimeout(() => reject(new Error('Connection timeout (30s)')), TIMEOUT_MS))
+            ]);
+
+            return result;
+        } catch (err) {
+            if (this.logError) this.emit('error', `Connect error: ${err.message}`);
+            throw new Error(`Connect error: ${err.message}`);
         }
     }