homebridge-melcloud-control 4.0.0-beta.507 → 4.0.0-beta.508

package/package.json

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

package/src/melcloud.js

@@ -303,20 +303,21 @@ class MelCloud extends EventEmitter {
 
     async connectToMelCloudHome(refresh = false) {
         if (this.logDebug) this.emit('debug', 'Connecting to MELCloud Home');
+        const GLOBAL_TIMEOUT = 45000;
 
         let browser;
         try {
-            const accountInfo = { State: false, Info: '', ContextKey: null, UseFahrenheit: false }
+            const accountInfo = { State: false, Info: '', ContextKey: null, UseFahrenheit: false };
             const chromiumPath = await this.functions.ensureChromiumInstalled();
             if (!chromiumPath) {
                 accountInfo.State = false;
-                accountInfo.Info = 'Chromium not found on Your device, please install it manually and try again'
+                accountInfo.Info = 'Chromium not found on Your device, please install it manually and try again';
                 return accountInfo;
             }
 
+            // Verify executable works
             try {
                 const { stdout } = await execPromise(`"${chromiumPath}" --version`);
-                this.emit('warn', `Test 0`);
                 if (this.logDebug) this.emit('debug', `Chromium detected: ${stdout.trim()}`);
             } catch (error) {
                 accountInfo.State = false;
@@ -324,11 +325,11 @@ class MelCloud extends EventEmitter {
                 return accountInfo;
             }
 
-            this.emit('warn', `Test 1`);
+            this.emit('warn', `Launching Chromium...`);
             browser = await puppeteer.launch({
                 headless: 'shell',
                 executablePath: chromiumPath,
-                timeout: 30000,
+                timeout: GLOBAL_TIMEOUT,
                 args: [
                     '--no-sandbox',
                     '--disable-setuid-sandbox',
@@ -339,52 +340,47 @@ class MelCloud extends EventEmitter {
                 ]
             });
 
-            // Wait for Puppeteer target to be ready (browser internal page)
-            await new Promise(r => setTimeout(r, 1000));
-
-            // Defensive check for main frame availability
-            this.emit('warn', `Test 2`);
-            const pages = await browser.pages();
-            let page = pages[0];
-            if (!page) {
-                if (this.logWarn) this.emit('warn', 'No initial page found, creating a new one');
-                page = await browser.newPage();
-                await new Promise(r => setTimeout(r, 1500));
-            }
+            const [page] = await browser.pages();
+            page.setDefaultTimeout(GLOBAL_TIMEOUT);
+            page.setDefaultNavigationTimeout(GLOBAL_TIMEOUT);
 
-            this.emit('warn', `Test 3`);
-            page.on('error', err => { if (this.logError) this.emit('error', `Page crashed: ${err.message}`); });
-            page.on('pageerror', err => { if (this.logDebug) this.emit('error', `Browser error: ${err.message}`); });
-            page.on('close', () => { if (this.logDebug) this.emit('debug', 'Page was closed unexpectedly'); });
-            browser.on('disconnected', () => { if (this.logWarn) this.emit('debug', 'Browser disconnected unexpectedly'); });
+            page.on('error', err => this.emit('error', `Page crashed: ${err.message}`));
+            page.on('pageerror', err => this.emit('error', `Browser error: ${err.message}`));
+            browser.on('disconnected', () => this.emit('warn', 'Browser disconnected unexpectedly'));
 
-            // Now safe to navigate
-            this.emit('warn', `Test 4`);
+            this.emit('warn', `Navigating to MELCloud...`);
             try {
-                await page.goto(ApiUrlsHome.BaseURL, { waitUntil: ['domcontentloaded', 'networkidle2'], timeout: 45000 });
+                await page.goto(ApiUrlsHome.BaseURL, { waitUntil: ['domcontentloaded', 'networkidle2'], timeout: GLOBAL_TIMEOUT });
             } catch (error) {
                 accountInfo.State = false;
                 accountInfo.Info = `Navigation to ${ApiUrlsHome.BaseURL} failed: ${error.message}`;
                 return accountInfo;
             }
-            await new Promise(r => setTimeout(r, 4000));
 
+            // Wait extra to ensure UI is rendered
+            await new Promise(r => setTimeout(r, 3000));
+
+            this.emit('warn', `Looking for login button...`);
             let loginBtn;
             try {
-                this.emit('warn', `Test 5`);
                 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: 5000 });
+                }, { timeout: GLOBAL_TIMEOUT / 6 });
             } catch {
                 accountInfo.State = false;
-                accountInfo.Info = 'Login button not found after 5s';
+                accountInfo.Info = 'Login button not found';
                 return accountInfo;
             }
 
-            await Promise.race([Promise.all([loginBtn.click(), page.waitForNavigation({ waitUntil: ['domcontentloaded', 'networkidle2'], timeout: 10000 })]), new Promise(r => setTimeout(r, 8000))]);
+            await Promise.race([
+                Promise.all([
+                    loginBtn.click(),
+                    page.waitForNavigation({ waitUntil: ['domcontentloaded', 'networkidle2'], timeout: GLOBAL_TIMEOUT / 4 })
+                ]),
+                new Promise(r => setTimeout(r, GLOBAL_TIMEOUT / 3))
+            ]);
 
-            this.emit('warn', `Test 6`);
             const usernameInput = await page.$('input[name="username"]');
             const passwordInput = await page.$('input[name="password"]');
             if (!usernameInput || !passwordInput) {
@@ -393,31 +389,34 @@ class MelCloud extends EventEmitter {
                 return accountInfo;
             }
 
-            this.emit('warn', `Test 7`);
             await page.type('input[name="username"]', this.user, { delay: 50 });
             await page.type('input[name="password"]', this.passwd, { delay: 50 });
 
-            this.emit('warn', `Test 8`);
             const submitButton = await page.$('input[type="submit"], button[type="submit"]');
             if (!submitButton) {
                 accountInfo.State = false;
-                accountInfo.Info = 'Submit button not found on login form';
+                accountInfo.Info = 'Submit button not found';
                 return accountInfo;
             }
 
-            await Promise.race([Promise.all([submitButton.click(), page.waitForNavigation({ waitUntil: ['domcontentloaded', 'networkidle2'], timeout: 10000 })]), new Promise(r => setTimeout(r, 8000))]);
+            await Promise.race([
+                Promise.all([
+                    submitButton.click(),
+                    page.waitForNavigation({ waitUntil: ['domcontentloaded', 'networkidle2'], timeout: GLOBAL_TIMEOUT / 4 })
+                ]),
+                new Promise(r => setTimeout(r, GLOBAL_TIMEOUT / 3))
+            ]);
 
-            this.emit('warn', `Test 9`);
+            // Extract cookies
             let c1 = null, c2 = null;
             const start = Date.now();
-            while ((!c1 || !c2) && Date.now() - start < 20000) {
+            while ((!c1 || !c2) && Date.now() - start < GLOBAL_TIMEOUT / 2) {
                 const cookies = await page.browserContext().cookies();
                 c1 = cookies.find(c => c.name === '__Secure-monitorandcontrolC1')?.value || c1;
                 c2 = cookies.find(c => c.name === '__Secure-monitorandcontrolC2')?.value || c2;
                 if (!c1 || !c2) await new Promise(r => setTimeout(r, 500));
             }
 
-            this.emit('warn', `Test 10`);
             if (!c1 || !c2) {
                 accountInfo.State = false;
                 accountInfo.Info = 'Cookies C1/C2 missing';
@@ -435,21 +434,22 @@ class MelCloud extends EventEmitter {
             accountInfo.Info = 'Connect success';
             accountInfo.ContextKey = contextKey;
 
-            this.emit('warn', `Test 11`);
             await this.functions.saveData(this.accountFile, accountInfo);
 
             if (!refresh) this.emit('success', 'Connect to MELCloud Home Success');
             return accountInfo;
+
         } catch (error) {
             throw new Error(`Connect error: ${error.message}`);
         } finally {
             if (browser) {
                 try { await browser.close(); }
-                catch (closeErr) { if (this.logError) this.emit('error', `Failed to close Puppeteer browser: ${closeErr.message}`); }
+                catch (closeErr) { this.emit('error', `Failed to close Puppeteer: ${closeErr.message}`); }
             }
         }
     }
 
+
     async checkDevicesList() {
         const TIMEOUT_MS = 30000; // 30 seconds timeout
         try {