homebridge-melcloud-control 4.0.0-beta.27 → 4.0.0-beta.29

package/package.json

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

package/src/melcloud.js

@@ -267,49 +267,50 @@ class MelCloud extends EventEmitter {
                 }
             }
 
-            if (!loginBtn) {
-                await browser.close();
-                return;
-            }
+            if (!loginBtn) throw new Error('Login button not found on homepage');
 
-            // Kliknij i czekaj na zmianę adresu
-            const [resp] = await Promise.all([
-                page.waitForNavigation({ waitUntil: 'domcontentloaded', timeout: 20000 }),
+            await Promise.all([
                 loginBtn.click(),
+                page.waitForNavigation({ waitUntil: 'networkidle2', timeout: 20000 })
             ]);
 
-            // Wypisz adres po przekierowaniu
-            const currentUrl = page.url();
+            // Poczekaj, aż strona przekieruje do Cognito login
+            await page.waitForSelector('input[name="username"]', { timeout: 15000 });
 
-            // Zamknij przeglądarkę
-            await browser.close();
+            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 });
 
-            // Utwórz dane logowania
-            const form = new URLSearchParams();
-            form.append('input[username]', this.user);
-            form.append('input[password]', this.passwd);
+            // Kliknij przycisk logowania
+            const button1 = await page.$('input[type="submit"]');
+            await Promise.all([
+                button1.click(),
+                page.waitForNavigation({ waitUntil: 'networkidle2', timeout: 20000 })
+            ]);
 
-            // Wyślij POST za pomocą axios
-            this.emit('warn', 'Sending login request via axios...');
-            const response = await axios.post(currentUrl, {
-                data: form,
-                timeout: 10000
-            });
-            this.emit('warn', `Login response: ${JSON.stringify(response)}`);
+            let c1 = null, c2 = null;
+            const start = Date.now();
 
-            this.emit('warn', `Login request status: ${response}`);
-            if (response.status !== 200) {
-                this.emit('error', `Login failed with status code: ${response.status}`);
-                return null;
+            // 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));
             }
 
-            const cookie = response.headers['set-cookie'];
-            if (!cookie) {
-                this.emit('warn', `No cookie returned from login. Response headers: ${JSON.stringify(response.headers)}`);
-                return null;
+            if (!c1 || !c2) {
+                await browser.close();
+                throw new Error('❌ Cookies C1/C2 not found after login');
             }
 
-            return cookie;
+            // Zapis do pliku
+            const data = { C1: c1, C2: c2, date: new Date().toISOString() };
+            await this.functions.saveData(this.cookiesFile, data);
+
+            this.emit('warn', 'Login successful.');
+            return data;
+
         } catch (err) {
             this.emit('error', `Login failed: ${err.message}`);
             return null;