homebridge-melcloud-control 4.0.0-beta.345 → 4.0.0-beta.346

package/package.json

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

package/src/melcloud.js

@@ -293,12 +293,12 @@ class MelCloud extends EventEmitter {
                 .on('warn', warn => this.emit('warn', warn))
                 .on('error', error => this.emit('error', error));
 
-            const token = await melCloudHomeToken.buildAuthorizeUrl();
+            const data = await melCloudHomeToken.buildAuthorizeUrl();
 
-            //const url = data.url;
-            //const codeVerifier = data.codeVerifier;
-            //const code = await melCloudHomeToken.loginToMelCloudHome(url);
-            //const token = await melCloudHomeToken.getTokens(code, codeVerifier);
+            const url = data.url;
+            const codeVerifier = data.codeVerifier;
+            const code = await melCloudHomeToken.loginToMelCloudHome(url);
+            const token = await melCloudHomeToken.getTokens(code, codeVerifier);
 
             const accountInfo = { ContextKey: token, UseFahrenheit: false };
             this.contextKey = cookies;

package/src/melcloudhometoken.js

@@ -84,72 +84,28 @@ class MelCloudHomeToken extends EventEmitter {
         }
     }
 
-    async axiosRequestWithRedirects(url, options = {}, body, redirectCount = 0) {
-        if (redirectCount > 10) {
-            throw new Error('Too many redirects');
-        }
-
-        try {
-            const method = (options.method || 'GET').toUpperCase();
-            const headers = options.headers || {};
-
-            const response = await axios({
-                url,
-                method,
-                headers,
-                data: body,
-                maxRedirects: 0, // wyłączamy automatyczne redirecty
-                validateStatus: status => status >= 200 && status < 400,
-            });
-
-            // Ręczne follow dla 301/302
-            if ([301, 302].includes(response.status)) {
-                const location = response.headers.location;
-                if (!location) throw new Error('Redirect status without Location header');
-
-                const redirectUrl = location.startsWith('http') ? location : new URL(location, url).toString();
-
-                // Przy POST zachowujemy body i headers
-                return this.axiosRequestWithRedirects(redirectUrl, options, body, redirectCount + 1);
-            }
-
-            // Zwracamy odpowiedź jako string
-            if (typeof response.data === 'string') {
-                return response.data;
-            } else {
-                return JSON.stringify(response.data);
-            }
-        } catch (err) {
-            throw new Error(`Axios request failed: ${err.message || err}`);
-        }
-    }
-
-
     async getTokens(code, codeVerifier) {
         try {
-
             const tokenData = new URLSearchParams({
                 grant_type: 'authorization_code',
                 code: code,
                 redirect_uri: REDIRECT_URI,
                 client_id: CLIENT_ID,
                 code_verifier: codeVerifier,
-            }).toString();
+            });
 
-            const response = await this.axiosRequestWithRedirects(TOKEN_ENDPOINT, {
-                method: 'POST',
+            const tokenResponse = await axios.post(TOKEN_ENDPOINT, tokenData.toString(), {
                 headers: {
                     'Content-Type': 'application/x-www-form-urlencoded',
                     'Authorization': 'Basic aG9tZW1vYmlsZTo=',
                 },
-            }, tokenData);
-
+            });
 
-            const tokens = response;
-            this.emit('warn', `Token ${JSON.stringify(response)}`);
+            const tokens = tokenResponse.data;
+            this.emit('warn', `Token ${JSON.stringify(tokens)}`);
             return tokens;
         } catch (error) {
-            throw new Error(`Failed to obtain OAuth token: ${error}`);
+            throw new Error(`Failed to obtain OAuth token: ${error.response?.data || error}`);
         }
     }
 
@@ -173,22 +129,25 @@ class MelCloudHomeToken extends EventEmitter {
             }
 
             // Step 2: Przygotuj dane logowania
-            const form = new URLSearchParams();
-            form.append('username', this.user);
-            form.append('password', this.passwd);
-            form.append('cognitoAsfData', '');
-            form.append('_csrf', csrf);
+            const formData = new URLSearchParams({
+                _csrf: csrf,
+                username: this.user,
+                password: this.passwd,
+            });
 
             if (this.logWarn) this.emit('warn', `Redirect URL: ${url}`);
 
             // Step 3: Wyślij POST z danymi logowania
             const response = await axios.post(url, form.toString(), {
                 headers: {
+                    'User-Agent': MOBILE_USER_AGENT,
+                    'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
+                    'Accept-Language': 'en-US,en;q=0.9',
                     'Content-Type': 'application/x-www-form-urlencoded',
-                    'Cookie': cookies.join('; '),
-                    'Origin': 'https://auth.melcloudhome.com',
+                    'Content-Length': formData.toString().length,
+                    'Cookie': cookies,
+                    'Origin': 'https://live-melcloudhome.auth.eu-west-1.amazoncognito.com',
                     'Referer': url,
-                    'User-Agent': MOBILE_USER_AGENT
                 },
                 maxRedirects: 0,
                 validateStatus: status => [200, 302, 400].includes(status),
@@ -232,9 +191,8 @@ class MelCloudHomeToken extends EventEmitter {
             authUrl.searchParams.set('state', state);
 
             const loginPage = await this.getLoginPage(authUrl.toString());
-            const code = await this.loginToMelCloudHome(loginPage.url);
-            const token = await this.getTokens(code, pkce.verifier);
-            return token;
+            const data = { codeVerifier: pkce.verifier, url: loginPage.url }
+            return data;
         } catch (error) {
             throw new Error(`Failed to obtain OAuth link: ${error}`);
         }