homebridge-melcloud-control 4.0.0-beta.534 → 4.0.0-beta.535

package/package.json

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

package/src/melcloud.js

@@ -344,7 +344,8 @@ class MelCloud extends EventEmitter {
                 ]
             });
 
-            const [page] = await browser.pages();
+            const context = await browser.createIncognitoBrowserContext();
+            const page = await context.newPage();
             page.setDefaultTimeout(GLOBAL_TIMEOUT);
             page.setDefaultNavigationTimeout(GLOBAL_TIMEOUT);
 
@@ -365,20 +366,18 @@ 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 {
+            const loginBtn = await page.waitForSelector('button.btn--blue', { timeout: GLOBAL_TIMEOUT / 6 });
+            const loginText = await loginBtn.evaluate(el => el.textContent.trim());
+            if (!['Zaloguj', 'Sign In', 'Login'].includes(loginText)) {
                 accountInfo.State = false;
-                accountInfo.Info = 'Login button not found';
+                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: ['domcontentloaded', 'networkidle2'], timeout: GLOBAL_TIMEOUT / 4 });
+
 
             this.emit('warn', `Looking for credentials form...`);
             const usernameInput = await page.$('input[name="username"]');
@@ -439,8 +438,15 @@ class MelCloud extends EventEmitter {
             throw new Error(`Connect error: ${error.message}`);
         } finally {
             if (browser) {
-                try { await browser.close(); }
-                catch (closeErr) { this.emit('error', `Failed to close Puppeteer: ${closeErr.message}`); }
+                try {
+                    const contexts = browser.browserContexts();
+                    for (const ctx of contexts) {
+                        await ctx.close().catch(() => { });
+                    }
+                    await browser.close();
+                } catch (closeErr) {
+                    this.emit('error', `Failed to close Puppeteer: ${closeErr.message}`);
+                }
             }
         }
     }