homebridge-melcloud-control 4.0.0-beta.284 → 4.0.0-beta.286

package/package.json

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

package/src/melcloud.js

@@ -299,31 +299,58 @@ class MelCloud extends EventEmitter {
             await page.waitForSelector('input[name="username"]', { timeout: 5000 });
             await page.type('input[name="username"]', this.user, { delay: 50 });
             await page.type('input[name="password"]', this.passwd, { delay: 50 });
-            const button1 = await page.$('input[type="Submit"]');
+            const button1 = await page.$('input[type="submit"]');
             await Promise.all([button1.click(), page.waitForNavigation({ waitUntil: 'networkidle2', timeout: 10000 })]);
 
-            let authCode = null;
-            const start = Date.now();
-            const timeout = 30000; // 30s
-
-            while (!authCode && Date.now() - start < timeout) {
-                authCode = await page.evaluate(() => {
-                    const m = window.location.href.match(/[?&]code=([^&]+)/);
-                    return m ? m[1] : null;
-                });
-                if (!authCode) await new Promise(r => setTimeout(r, 200));
+            // 1️⃣ Sprawdzenie, czy code jest w URL
+            const url1 = page.url();
+            const urlMatch = url1.match(/[?&]code=([^&]+)/);
+            if (urlMatch) {
+                console.log('Authorization code found in URL');
+                return urlMatch[1];
             }
-            console.log('Authorization code:', page);
-            console.log('Authorization code1:', window.location.href);
-            if (!authCode) {
-                throw new Error('Authorization code not found in URL');
+
+            // 2️⃣ Jeśli nie w URL, sprawdź body HTML (form_post)
+            const html = await page.content();
+             console.log(html);
+
+            // Form_post pattern
+            const formCodeMatch = html.match(/name="code"\s+value="([^"]+)"/);
+            const formStateMatch = html.match(/name="state"\s+value="([^"]+)"/);
+            const formActionMatch = html.match(/action="([^"]+)"/);
+
+            if (formCodeMatch && formStateMatch && formActionMatch) {
+                console.log('Authorization code found in form_post HTML');
+                // Wyślij POST do action
+                const actionUrl = formActionMatch[1];
+                const formData = new URLSearchParams();
+                formData.append('code', formCodeMatch[1]);
+                formData.append('state', formStateMatch[1]);
+
+                const response = await page.evaluate(async (url, body) => {
+                    const res = await fetch(url, {
+                        method: 'POST',
+                        body,
+                        credentials: 'include'
+                    });
+                    return res.text();
+                }, actionUrl, formData);
+
+                // Spróbuj znaleźć code w odpowiedzi POST
+                const postCodeMatch = response.match(/code=([^&"']+)/);
+                if (postCodeMatch) return postCodeMatch[1];
             }
 
-            console.log('Authorization code:', authCode);
+            // 3️⃣ Jeśli nie w form_post, sprawdź JS melcloudhome://
+            const jsCodeMatch = html.match(/melcloudhome:\/\/[^"'\s]*[?&]code=([^&"'\s]+)/);
+            if (jsCodeMatch) {
+                console.log('Authorization code found in JS redirect');
+                return jsCodeMatch[1];
+            }
 
             // 5. Wymień code na access_token
             const tokenResponse = await axios.post(TOKEN_ENDPOINT, new URLSearchParams({
-                client_id: clientId,
+                client_id: 'homemobile',
                 grant_type: 'authorization_code',
                 code: authCode,
                 redirect_uri: 'melcloudhome://'

package/src/melcloudhometoken.js

@@ -30,17 +30,14 @@ class MelCloudHomeToken {
     }
 
     async getLoginPage(authUrl) {
-        console.log('Getting login page...');
         const res = await this.client.get(authUrl, { maxRedirects: 10 });
         return { url: res.request.res.responseUrl };
     }
 
     async getUrl() {
         try {
-            console.log('Starting OAuth flow...');
             const pkce = this.generatePKCE();
             const state = this.generateState();
-
             const authUrl = new URL(AUTHORIZE_ENDPOINT);
             authUrl.searchParams.set('client_id', CLIENT_ID);
             authUrl.searchParams.set('redirect_uri', REDIRECT_URI);