homebridge-melcloud-control 4.0.0-beta.11 → 4.0.0-beta.13

package/package.json

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

package/src/melcloud.js

@@ -232,38 +232,64 @@ class MelCloud extends EventEmitter {
             this.emit('warn', 'Opening login page...');
             await page.goto(loginUrl.toString(), { waitUntil: 'networkidle2' });
 
-            // Wpisz login i hasło
-            await page.type('input[name="username"]', this.user);
-            await page.type('input[name="password"]', thispasswd);
-
-            // Kliknij przycisk logowania
-            const button = await page.$('input[type="submit"]');
-            await Promise.all([
-                button.click(),
-                page.waitForNavigation({ waitUntil: 'networkidle2', timeout: 20000 })
-            ]);
-
-            // Opcjonalnie obsłuż "Stay signed in?" jeśli występuje
-            const staySignedInBtn = await page.$('input[type="submit"]');
-            if (staySignedInBtn) {
+            this.emit('warn', 'Typing credentials...');
+            await page.type('input[name="username"]', this.user, { delay: 50 });
+            await page.type('input[name="password"]', this.passwd, { delay: 50 });
+
+            // Wyszukiwanie przycisku logowania
+            const buttonSelectors = [
+                'button[type="submit"]',
+                'input[type="submit"]',
+                'button[name="signIn"]',
+                'button.btn-primary'
+            ];
+
+            let buttonFound = false;
+            for (const selector of buttonSelectors) {
+                const button = await page.$(selector);
+                if (button) {
+                    this.emit('warn', `Found submit button: ${selector}`);
+                    await Promise.all([
+                        button.click(),
+                        page.waitForNavigation({ waitUntil: 'networkidle2', timeout: 20000 }) // czekamy na redirect
+                    ]);
+                    buttonFound = true;
+                    break;
+                }
+            }
+
+            if (!buttonFound) {
+                throw new Error('❌ Could not find login button on the page.');
+            }
+
+            // Opcjonalnie obsługa "Stay signed in?"
+            const staySignedInSelector = 'input[name="rememberDevice"], input[type="submit"]';
+            if (await page.$(staySignedInSelector)) {
+                console.log('Handling "Stay signed in?" screen...');
                 await Promise.all([
-                    staySignedInBtn.click(),
+                    page.click(staySignedInSelector),
                     page.waitForNavigation({ waitUntil: 'networkidle2', timeout: 20000 })
                 ]);
             }
 
             // Monitorowanie requestów i oczekiwanie na cookies C1 i C2
             let c1 = null, c2 = null;
-            const start = Date.now();
+            page.on('response', async response => {
+                const url = response.url();
+                if (url.includes('GetDevices') || url.includes('Dashboard')) {
+                    const cookies = await page.cookies();
+                    c1 = cookies.find(c => c.name === '__Secure-monitorandcontrolC1')?.value || c1;
+                    c2 = cookies.find(c => c.name === '__Secure-monitorandcontrolC2')?.value || c2;
+                }
+            });
 
-            while ((!c1 || !c2) && Date.now() - start < 20000) { // max 20s
-                const cookies = await page.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));
+            // Retry loop max 15s
+            const start = Date.now();
+            while ((!c1 || !c2) && Date.now() - start < 15000) {
+                await new Promise(resolve => setTimeout(resolve, 500));
             }
 
-            if (!c1 || !c2) throw new Error('Cookies C1/C2 not found');
+            if (!c1 || !c2) throw new Error('Cookies C1/C2 not found after login');
 
             const data = { C1: c1, C2: c2, date: new Date().toISOString() };
             await this.functions.saveData(this.cookiesFile, data);