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

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "MELCloud Control",
   "name": "homebridge-melcloud-control",
-  "version": "4.0.0-beta.375",
+  "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,8 +1,8 @@
 import axios from 'axios';
 import crypto from 'crypto';
-import { JSDOM } from 'jsdom';
 import { wrapper } from 'axios-cookiejar-support';
 import { CookieJar } from 'tough-cookie';
+import { JSDOM } from 'jsdom';
 import EventEmitter from 'events';
 
 const MOBILE_USER_AGENT = 'MonitorAndControl.App.Mobile/35 CFNetwork/3860.100.1 Darwin/25.0.0';
@@ -21,12 +21,8 @@ class MelCloudHomeToken extends EventEmitter {
         this.logError = config.logError;
 
         const jar = new CookieJar();
-        this.axiosInstance = wrapper(axios.create({
-            headers: { 'User-Agent': MOBILE_USER_AGENT },
-            jar,
-            withCredentials: true,
-            maxRedirects: 0,
-        }));
+        this.axiosInstance = wrapper(axios.create({ jar, withCredentials: true }));
+        this.client.defaults.headers['User-Agent'] = MOBILE_USER_AGENT;
     }
 
     generatePKCE() {
@@ -36,80 +32,124 @@ class MelCloudHomeToken extends EventEmitter {
     }
 
     generateState() {
-        return crypto.randomBytes(16).toString('hex');
+        return crypto.randomBytes(32).toString('hex');
     }
 
     async getLoginPage(authUrl) {
-        const res = await this.axiosInstance.get(authUrl);
+        const res = await this.client.get(authUrl, { maxRedirects: 10 });
         return { url: res.request.res.responseUrl };
     }
 
     async getTokens(code, codeVerifier) {
-        const tokenData = new URLSearchParams({
-            grant_type: 'authorization_code',
-            code,
-            redirect_uri: REDIRECT_URI,
-            client_id: CLIENT_ID,
-            code_verifier: codeVerifier,
-        });
-
         try {
-            const res = await this.axiosInstance.post(
-                TOKEN_ENDPOINT,
-                tokenData.toString(),
-                { headers: { 'Content-Type': 'application/x-www-form-urlencoded' } }
-            );
-
-            this.emit('warn', `Tokens: ${JSON.stringify(res.data)}`);
-            return res.data;
+            const tokenData = new URLSearchParams({
+                grant_type: 'authorization_code',
+                code: code,
+                redirect_uri: REDIRECT_URI,
+                client_id: CLIENT_ID,
+                code_verifier: codeVerifier,
+            });
+
+            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(`Token request failed: ${error.response?.data || error.message}`);
+            throw new Error(`Failed to obtain OAuth token: ${error}`);
         }
     }
 
     async loginToMelCloudHome(url) {
-        const resp = await this.axiosInstance.get(url);
-        const dom = new JSDOM(resp.data);
-        const csrf = dom.window.document.querySelector('input[name="_csrf"]')?.value;
-        if (!csrf) throw new Error('No CSRF token found');
-
-        const formData = new URLSearchParams({
-            _csrf: csrf,
-            username: this.user,
-            password: this.passwd,
-        });
-
-        let next = url;
-        for (let i = 0; i < 10 && next; i++) {
-            const res = await this.axiosInstance.post(next, formData.toString(), {
-                headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-                validateStatus: s => [200, 302].includes(s),
+        try {
+            // 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'] || [];
+            const dom = new JSDOM(getResp.data);
+            const csrf = dom.window.document.querySelector('input[name="_csrf"]')?.value;
+            if (!csrf) {
+                if (this.logWarn) this.emit('warn', `CSRF token not found`);
+                return null;
+            }
+
+            // Step 2: Przygotuj dane logowania
+            const formData = new URLSearchParams({
+                _csrf: csrf,
+                username: this.user,
+                password: this.passwd,
             });
 
-            next = res.headers.location;
-            if (next && next.includes('code=')) {
-                const code = new URL(next).searchParams.get('code');
-                this.emit('warn', `Code found: ${code}`);
-                return code;
+            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 (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;
+                }
             }
+
+            return null;
+        } catch (error) {
+            throw new Error(`Login to MELCloud Home error: ${error}`);
         }
-        throw new Error('Authorization code not found');
     }
 
     async buildAuthorizeUrl() {
-        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);
-        authUrl.searchParams.set('response_type', 'code');
-        authUrl.searchParams.set('scope', SCOPE);
-        authUrl.searchParams.set('code_challenge', pkce.challenge);
-        authUrl.searchParams.set('code_challenge_method', 'S256');
-        authUrl.searchParams.set('state', state);
-
-        const loginPage = await this.getLoginPage(authUrl.toString());
-        return { codeVerifier: pkce.verifier, url: loginPage.url };
+        try {
+            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);
+            authUrl.searchParams.set('response_type', 'code');
+            authUrl.searchParams.set('scope', SCOPE);
+            authUrl.searchParams.set('code_challenge', pkce.challenge);
+            authUrl.searchParams.set('code_challenge_method', 'S256');
+            authUrl.searchParams.set('state', state);
+
+            const loginPage = await this.getLoginPage(authUrl.toString());
+            const data = { codeVerifier: pkce.verifier, url: loginPage.url }
+            return data;
+        } catch (error) {
+            throw new Error(`Failed to obtain OAuth link: ${error}`);
+        }
     }
 }
 
@@ -119,4 +159,3 @@ export default MelCloudHomeToken;
 
 
 
-