homebridge-melcloud-control 4.0.0-beta.285 → 4.0.0-beta.287

package/package.json

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

package/src/melcloud.js

@@ -312,44 +312,42 @@ class MelCloud extends EventEmitter {
 
             // 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="([^"]+)"/);
+            // Check for form_post response (HTML with hidden form)
+            const formCodeMatch = data.match(/name="code"\s+value="([^"]+)"/);
+            const formStateMatch = data.match(/name="state"\s+value="([^"]+)"/);
+            const formActionMatch = data.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('Found form_post response, submitting to callback endpoint...');
+                this.submitFormPost(formActionMatch[1], formCodeMatch[1], formStateMatch[1], cookies)
+                    .then(code => resolve(code))
+                    .catch(err => reject(err));
+                return;
             }
 
-            // 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];
+            // Check for melcloudhome:// redirect in JS
+            const bodyCodeMatch = data.match(/melcloudhome:\/\/[^"'\s]*[?&]code=([^&"'\s]+)/);
+            if (bodyCodeMatch) {
+                console.log('Found authorization code in response body (JS)');
+                resolve(bodyCodeMatch[1]);
+                return;
             }
 
+            // 🆕 NEW: Check for data-url with code parameter (like in 500 error pages)
+            const dataUrlMatch = data.match(/data-url="[^"]*code=([^&"']+)/);
+            if (dataUrlMatch) {
+                console.log('Found authorization code in data-url attribute');
+                resolve(dataUrlMatch[1]);
+                return;
+            }
+
+            reject(new Error('Authorization code not found in URL or HTML'));
+
             // 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);