homebridge-melcloud-control 4.0.0-beta.374 → 4.0.0-beta.376

package/package.json

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

package/src/melcloudhometoken.js

@@ -1,5 +1,7 @@
 import axios from 'axios';
 import crypto from 'crypto';
+import { wrapper } from 'axios-cookiejar-support';
+import { CookieJar } from 'tough-cookie';
 import { JSDOM } from 'jsdom';
 import EventEmitter from 'events';
 
@@ -17,7 +19,10 @@ class MelCloudHomeToken extends EventEmitter {
         this.passwd = config.passwd;
         this.logWarn = config.logWarn;
         this.logError = config.logError;
-        this.axiosInstance = axios.create({ headers: { 'User-Agent': MOBILE_USER_AGENT } });
+
+        const jar = new CookieJar();
+        this.axiosInstance = wrapper(axios.create({ jar, withCredentials: true }));
+        this.client.defaults.headers['User-Agent'] = MOBILE_USER_AGENT;
     }
 
     generatePKCE() {
@@ -31,97 +36,50 @@ class MelCloudHomeToken extends EventEmitter {
     }
 
     async getLoginPage(authUrl) {
-        const res = await this.axiosInstance.get(authUrl, { maxRedirects: 10 });
+        const res = await this.client.get(authUrl, { maxRedirects: 10 });
         return { url: res.request.res.responseUrl };
     }
 
-    async extractCodeFromHtml(html, cookies = '') {
-        try {
-            // Code w URL
-            const urlMatch = html.match(/[?&]code=([^&]+)/);
-            if (urlMatch) {
-                return urlMatch[1];
-            }
-
-            // Hidden form (form_post)
-            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) {
-                const code = await this.submitFormPost(
-                    formActionMatch[1],
-                    formCodeMatch[1],
-                    formStateMatch[1],
-                    cookies
-                );
-                return code;
-            }
-
-            // melcloudhome:// w body
-            const bodyCodeMatch = html.match(/melcloudhome:\/\/[^"'\s]*[?&]code=([^&"'\s]+)/);
-            if (bodyCodeMatch) {
-                return bodyCodeMatch[1];
-            }
-
-            // data-url (np. z błędnej strony 500)
-            const dataUrlMatch = html.match(/data-url="[^"]*code=([^&"']+)/);
-            if (dataUrlMatch) {
-                return dataUrlMatch[1];
-            }
-
-            console.warn('Authorization code not found in HTML response');
-            return null;
-        } catch (err) {
-            console.error('extractCodeFromHtml error:', err);
-            return null;
-        }
-    }
-
     async getTokens(code, codeVerifier) {
         try {
             const tokenData = new URLSearchParams({
                 grant_type: 'authorization_code',
-                code,
+                code: code,
                 redirect_uri: REDIRECT_URI,
                 client_id: CLIENT_ID,
                 code_verifier: codeVerifier,
             });
 
-            const response = await this.axiosInstance.post(
-                TOKEN_ENDPOINT,
-                tokenData.toString(),
-                {
-                    headers: {
-                        'Content-Type': 'application/x-www-form-urlencoded',
-                        'Authorization': 'Basic aG9tZW1vYmlsZTo=', // optional, Cognito may ignore
-                    },
-                }
-            );
-
-            this.emit('warn', `Token response: ${JSON.stringify(response.data)}`);
-            return response.data;
+            const tokenResponse = await this.client.post(TOKEN_ENDPOINT, tokenData.toString(), {
+                headers: {
+                    'Content-Type': 'application/x-www-form-urlencoded',
+                    'Authorization': 'Basic aG9tZW1vYmlsZTo=',
+                },
+            });
 
+            const tokens = tokenResponse.data;
+            this.emit('warn', `Token ${JSON.stringify(tokens)}`);
+            return tokens;
         } catch (error) {
-            throw new Error(`Failed to obtain OAuth token: ${error.response?.data || error.message}`);
+            throw new Error(`Failed to obtain OAuth token: ${error}`);
         }
     }
 
-
     async loginToMelCloudHome(url) {
         try {
-            // Step 1: Pobierz stronę logowania
-            const getResp = await this.axiosInstance.get(url, {
-                headers: { 'Accept': 'text/html' },
-                withCredentials: true,
+            // Step 1: Pobierz stronę logowania, żeby uzyskać sesję + token _csrf
+            const getResp = await this.client.get(url, {
+                headers: {
+                    'User-Agent': MOBILE_USER_AGENT,
+                    'Accept': 'text/html',
+                }
             });
 
-            const cookies = (getResp.headers['set-cookie'] || []).map(c => c.split(';')[0]).join('; ');
+            const cookies = getResp.headers['set-cookie'] || [];
             const dom = new JSDOM(getResp.data);
             const csrf = dom.window.document.querySelector('input[name="_csrf"]')?.value;
-
             if (!csrf) {
-                this.emit('warn', `CSRF token not found`);
+                if (this.logWarn) this.emit('warn', `CSRF token not found`);
                 return null;
             }
 
@@ -132,66 +90,47 @@ class MelCloudHomeToken extends EventEmitter {
                 password: this.passwd,
             });
 
-            // Step 3: Wyślij login POST
-            const postResp = await this.axiosInstance.post(
-                url,
-                formData.toString(),
-                {
-                    headers: {
-                        'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
-                        'Content-Type': 'application/x-www-form-urlencoded',
-                        'Cookie': cookies,
-                        'Origin': 'https://live-melcloudhome.auth.eu-west-1.amazoncognito.com',
-                        'Referer': url,
-                    },
-                    maxRedirects: 0, // kontrolujmy redirecty ręcznie
-                    validateStatus: s => [200, 302, 400].includes(s),
-                }
-            );
-
-            if (postResp.status === 400) {
-                this.emit('warn', `Login failed: ${postResp.data}`);
-                return null;
-            }
-
-            let redirectUrl = postResp.headers.location;
-            let cookieChain = cookies;
-
-            // Step 4: Podążaj za przekierowaniami
-            for (let i = 0; i < 5 && redirectUrl; i++) {
-                const redirectResp = await this.axiosInstance.get(redirectUrl, {
-                    headers: { 'Cookie': cookieChain },
-                    maxRedirects: 0,
-                    validateStatus: s => [200, 302].includes(s),
-                });
-
-                // aktualizuj cookies
-                const newCookies = redirectResp.headers['set-cookie'] || [];
-                if (newCookies.length) {
-                    cookieChain += '; ' + newCookies.map(c => c.split(';')[0]).join('; ');
-                }
-
-                redirectUrl = redirectResp.headers.location;
+            if (this.logWarn) this.emit('warn', `Redirect URL: ${url}`);
+
+            // Step 3: Wyślij POST z danymi logowania
+            const response = await this.client.post(url, formData.toString(), {
+                headers: {
+                    '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',
+                    'Content-Length': formData.toString().length,
+                    'Cookie': cookies,
+                    'Origin': 'https://live-melcloudhome.auth.eu-west-1.amazoncognito.com',
+                    'Referer': url,
+                },
+                maxRedirects: 0,
+                validateStatus: status => [200, 302, 400].includes(status),
+            });
 
-                if (redirectUrl && redirectUrl.includes('code=')) {
-                    const match = redirectUrl.match(/[?&]code=([^&]+)/);
-                    if (match) {
-                        const code = match[1];
-                        this.emit('warn', `Authorization code obtained: ${code}`);
-                        return code;
-                    }
+            if (response.status === 400) if (this.logWarn) this.emit('warn', `Login failed (bad request or invalid credentials: ${response.data}`);
+            if (response.status === 302 && response.headers.location) {
+                // Login success — mamy redirect z "code="
+                const redirectUrl = response.headers.location;
+                if (this.logWarn) this.emit('warn', `Redirect URL: ${redirectUrl}`);
+                if (this.logWarn) this.emit('warn', `Response headers: ${response.headers}`);
+
+                const match = redirectUrl.match(/[?&]code=([^&]+)/);
+                if (match) {
+                    const code = match[1];
+                    if (this.logWarn) this.emit('warn', `Redirect URL found code: ${code}`);
+                    return code;
+                } else {
+                    if (this.logWarn) this.emit('warn', `Redirect URL found, but no "code=" param: ${redirectUrl}`);
+                    return null;
                 }
             }
 
-            this.emit('warn', 'Login flow finished, but no code found');
             return null;
-
         } catch (error) {
-            throw new Error(`Login to MELCloud Home error: ${error.message}`);
+            throw new Error(`Login to MELCloud Home error: ${error}`);
         }
     }
 
-
     async buildAuthorizeUrl() {
         try {
             const pkce = this.generatePKCE();