homebridge-melcloud-control 4.0.0-beta.259 → 4.0.0-beta.260

package/package.json

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

package/src/melcloudhometoken.js

@@ -39,30 +39,11 @@ class MelCloudHomeToken {
         return { csrf, url: res.request.res.responseUrl };
     }
 
-    async submitFormPost(actionUrl, code, state) {
-        console.log('Submitting form_post to callback URL:', actionUrl);
-        const form = new URLSearchParams({ code, state });
-        const res = await this.client.post(actionUrl, form.toString(), {
-            headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-            maxRedirects: 0,
-            validateStatus: (status) => status >= 200 && status < 400,
-        });
-
-        const location = res.headers.location;
-        if (location?.startsWith('melcloudhome://')) {
-            const codeMatch = location.match(/[?&]code=([^&]+)/);
-            if (codeMatch) {
-                console.log('Authorization code obtained from form_post redirect:', codeMatch[1]);
-                return codeMatch[1];
-            }
-        }
-        throw new Error('No authorization code found in form_post response');
-    }
-
     async submitLogin(loginUrl, csrf, email, password) {
         console.log('Submitting login credentials to:', loginUrl);
+
         const form = new URLSearchParams({ _csrf: csrf, username: email, password });
-        const res = await this.client.post(loginUrl, form.toString(), {
+        let res = await this.client.post(loginUrl, form.toString(), {
             headers: {
                 'Content-Type': 'application/x-www-form-urlencoded',
                 Referer: loginUrl,
@@ -73,19 +54,19 @@ class MelCloudHomeToken {
 
         console.log('Login POST status:', res.status);
 
-        // Spróbuj pobrać kod z nagłówka Location
-        const location = res.headers.location;
-        if (location?.startsWith('melcloudhome://')) {
-            const codeMatch = location.match(/[?&]code=([^&]+)/);
-            if (codeMatch) {
-                console.log('Authorization code obtained from Location header:', codeMatch[1]);
-                return codeMatch[1];
-            }
+        // Obsługa 302 redirect
+        while (res.status === 302 && res.headers.location) {
+            const location = res.headers.location;
+            console.log('Following redirect:', location);
+            res = await this.client.get(location, {
+                maxRedirects: 0,
+                validateStatus: (status) => status >= 200 && status < 400,
+            });
         }
 
-        // Spróbuj parsować HTML w poszukiwaniu form_post
-        const $ = cheerio.load(res.data);
-        const formElement = $('form');
+        // Sprawdź HTML na form_post
+        let $ = cheerio.load(res.data);
+        let formElement = $('form');
         if (formElement.length) {
             const action = formElement.attr('action');
             const code = $('input[name="code"]').attr('value');
@@ -96,7 +77,7 @@ class MelCloudHomeToken {
             }
         }
 
-        // Spróbuj wyciągnąć kod z JS w ciele strony
+        // Spróbuj pobrać kod bezpośrednio z JS w body
         const bodyCodeMatch = res.data.match(/melcloudhome:\/\/[^"'\s]*[?&]code=([^&"'\s]+)/);
         if (bodyCodeMatch) {
             console.log('Authorization code obtained from HTML/JS body:', bodyCodeMatch[1]);
@@ -106,6 +87,30 @@ class MelCloudHomeToken {
         throw new Error('Authorization code not found in login response');
     }
 
+    async submitFormPost(actionUrl, code, state) {
+        console.log('Submitting form_post to callback URL:', actionUrl);
+
+        const form = new URLSearchParams({ code, state });
+        const res = await this.client.post(actionUrl, form.toString(), {
+            headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+            maxRedirects: 0,
+            validateStatus: (status) => status >= 200 && status < 400,
+        });
+
+        // Sprawdź redirect z finalnym code
+        const location = res.headers.location;
+        if (location?.startsWith('melcloudhome://')) {
+            const codeMatch = location.match(/[?&]code=([^&]+)/);
+            if (codeMatch) {
+                console.log('Authorization code obtained from form_post redirect:', codeMatch[1]);
+                return codeMatch[1];
+            }
+        }
+
+        throw new Error('No authorization code found in form_post response');
+    }
+
+
     async exchangeCodeForTokens(code, codeVerifier) {
         console.log('Exchanging authorization code for tokens...');
         const form = new URLSearchParams({