homebridge-melcloud-control 4.0.0-beta.15 → 4.0.0-beta.17

package/package.json

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

package/src/melcloud.js

@@ -214,71 +214,51 @@ class MelCloud extends EventEmitter {
     }
 
     async connectHomeCookies() {
-        const loginUrl = new URL('https://live-melcloudhome.auth.eu-west-1.amazoncognito.com/login');
-        loginUrl.searchParams.set('client_id', '3g4d5l5kivuqi7oia68gib7uso');
-        loginUrl.searchParams.set('redirect_uri', 'https://auth.melcloudhome.com/signin-oidc-meu');
-        loginUrl.searchParams.set('response_type', 'code');
-        loginUrl.searchParams.set('scope', 'openid profile');
-        loginUrl.searchParams.set('response_mode', 'form_post');
-
-        const browser = await puppeteer.launch({
-            headless: true,
-            args: ['--no-sandbox', '--disable-setuid-sandbox']
-        });
-
-        const page = await browser.newPage();
-
         try {
+            const loginUrl = 'https://melcloudhome.com';
+            const browser = await puppeteer.launch({ headless: true, args: ['--no-sandbox', '--disable-setuid-sandbox'] });
+            const page = await browser.newPage();
+
             this.emit('warn', 'Opening login page...');
-            await page.goto(loginUrl.toString(), { waitUntil: 'networkidle2' });
+            await page.goto(loginUrl, { waitUntil: 'networkidle2' });
 
             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.');
+            // Kliknij przycisk logowania
+            const button = await page.$('input[type="submit"]');
+            await Promise.all([
+                button.click(),
+                page.waitForNavigation({ waitUntil: 'networkidle2', timeout: 20000 })
+            ]);
+
+            // Obsługa ewentualnego "Stay signed in?"
+            const staySignedInBtn = await page.$('input[type="submit"]');
+            if (staySignedInBtn) {
+                await Promise.all([
+                    staySignedInBtn.click(),
+                    page.waitForNavigation({ waitUntil: 'networkidle2', timeout: 20000 })
+                ]);
             }
 
-            // Monitorowanie requestów i oczekiwanie na cookies C1 i C2
             let c1 = null, c2 = null;
-            page.on('response', async response => {
-                const url = response.url();
-                if (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;
-                }
-            });
-
-            // Retry loop max 15s
             const start = Date.now();
-            while ((!c1 || !c2) && Date.now() - start < 15000) {
-                await new Promise(resolve => setTimeout(resolve, 500));
+
+            // Loop max 20s, czekamy aż pojawią się cookies
+            while ((!c1 || !c2) && Date.now() - start < 20000) {
+                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));
+            }
+
+            if (!c1 || !c2) {
+                await browser.close();
+                throw new Error('❌ Cookies C1/C2 not found after login');
             }
 
+            // Zapis do pliku
             const data = { C1: c1, C2: c2, date: new Date().toISOString() };
             await this.functions.saveData(this.cookiesFile, data);