homebridge-melcloud-control 4.0.0-beta.20 → 4.0.0-beta.22

package/package.json

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

package/src/melcloud.js

@@ -213,20 +213,64 @@ class MelCloud extends EventEmitter {
         }
     }
 
-    async connectHomeCookies() {
+    async loginToMelcloudHome() {
         try {
-            const loginUrl = 'https://melcloudhome.com';
-            const browser = await puppeteer.launch({ headless: true, args: ['--no-sandbox', '--disable-setuid-sandbox'] });
-            const page = await browser.newPage();
+            const form = new URLSearchParams();
+            form.append('user[email]', this.user);
+            form.append('user[password]', this.passwd);
+
+            const response = await axios({
+                method: 'POST',
+                baseURL: EnphaseUrls.BaseUrl,
+                url: EnphaseUrls.Login,
+                headers: {
+                    'Content-Type': 'application/x-www-form-urlencoded'
+                },
+                data: form,
+                timeout: 10000
+            });
+
+            if (response.status !== 200) {
+                if (this.logError) this.emit('error', `Login failed with status code: ${response.status}`);
+                return null;
+            }
 
+            const cookie = response.headers['set-cookie'];
+            if (!cookie) {
+                if (this.logWarn) this.emit('warn', `No cookie returned from login. Response headers: ${JSON.stringify(response.headers)}`);
+                return null;
+            }
+
+            return cookie;
+        } catch (error) {
+            throw new Error(`Login to Enlighten error: ${error}`);
+        }
+    }
+
+    async connectHomeCookies() {
+        const loginUrl = 'https://melcloudhome.com';
+        const browser = await puppeteer.launch({ headless: true, args: ['--no-sandbox', '--disable-setuid-sandbox'] });
+        const page = await browser.newPage();
+
+        try {
             this.emit('warn', 'Opening login page...');
             await page.goto(loginUrl, { waitUntil: 'networkidle2' });
 
             // Kliknij przycisk logowania
-            const loginBtn = await page.$x("//button[contains(text(), 'Zaloguj')]");
-            if (!loginBtn || loginBtn.length === 0) throw new Error('Login button not found on homepage');
+            const buttons = await page.$$('button.btn--blue');
+            let loginBtn = null;
+            for (const btn of buttons) {
+                const text = await page.evaluate(el => el.textContent, btn);
+                if (text.trim() === 'Zaloguj') {
+                    loginBtn = btn;
+                    break;
+                }
+            }
+
+            if (!loginBtn) throw new Error('Login button not found on homepage');
+
             await Promise.all([
-                loginBtn[0].click(),
+                loginBtn.click(),
                 page.waitForNavigation({ waitUntil: 'networkidle2', timeout: 20000 })
             ]);
 
@@ -244,25 +288,11 @@ class MelCloud extends EventEmitter {
                 page.waitForNavigation({ waitUntil: 'networkidle2', timeout: 20000 })
             ]);
 
-            let c1 = null, c2 = null;
-            const start = Date.now();
-
-            // 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');
-            }
+            const cookies = await page.cookies();
+            this.emit('warn', cookies);
 
             // Zapis do pliku
-            const data = { C1: c1, C2: c2, date: new Date().toISOString() };
-            await this.functions.saveData(this.cookiesFile, data);
+            await this.functions.saveData(this.cookiesFile, cookies);
 
             this.emit('warn', 'Login successful.');
             return data;