homebridge-melcloud-control 4.0.0-beta.543 → 4.0.0-beta.545

package/package.json

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

package/src/melcloud.js

@@ -350,12 +350,12 @@ class MelCloud extends EventEmitter {
             try {
                 const client = await page.createCDPSession();
                 await client.send('Network.clearBrowserCookies');
-            } catch (err) {
-                this.emit('warn', `Warning: could not clear cookies: ${err.message}`);
+            } catch (error) {
+                this.emit('warn', `Warning: could not clear cookies: ${error.message}`);
             }
 
-            page.on('error', err => this.emit('error', `Page crashed: ${err.message}`));
-            page.on('pageerror', err => this.emit('error', `Browser error: ${err.message}`));
+            page.on('error', error => this.emit('error', `Page crashed: ${error.message}`));
+            page.on('pageerror', error => this.emit('error', `Browser error: ${error.message}`));
             browser.on('disconnected', () => this.emit('debug', 'Browser disconnected'));
 
             this.emit('warn', `Navigating to MELCloud...`);
@@ -370,19 +370,16 @@ class MelCloud extends EventEmitter {
             await new Promise(r => setTimeout(r, 3000));
 
             this.emit('warn', `Looking for login button...`);
-            let loginBtn;
-            try {
-                loginBtn = await page.waitForFunction(() => {
-                    const btns = Array.from(document.querySelectorAll('button.btn--blue'));
-                    return btns.find(b => ['Zaloguj', 'Sign In', 'Login'].includes(b.textContent.trim()));
-                }, { timeout: GLOBAL_TIMEOUT / 6 });
-            } catch {
-                accountInfo.Info = 'Login button not found';
+            const loginBtn = await page.waitForSelector('button.btn--blue', { timeout: GLOBAL_TIMEOUT / 6 });
+            const loginText = await page.evaluate(el => el.textContent.trim(), loginBtn);
+
+            if (!['Zaloguj', 'Sign In', 'Login'].includes(loginText)) {
+                accountInfo.Info = 'Login button not found or has unexpected label';
                 return accountInfo;
             }
 
-            this.emit('warn', `Found login button ${loginBtn}`);
-            await Promise.race([Promise.all([loginBtn.click(), page.waitForNavigation({ waitUntil: ['domcontentloaded', 'networkidle2'], timeout: GLOBAL_TIMEOUT / 4 })]), new Promise(r => setTimeout(r, GLOBAL_TIMEOUT / 3))]);
+            await loginBtn.click();
+            await page.waitForNavigation({ waitUntil: 'networkidle2', timeout: GLOBAL_TIMEOUT / 3 });
 
             this.emit('warn', `Looking for credentials form...`);
             const usernameInput = await page.$('input[name="username"]');