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

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.375",
   "description": "Homebridge plugin to control Mitsubishi Air Conditioner, Heat Pump and Energy Recovery Ventilation.",
   "license": "MIT",
   "author": "grzegorz914",

package/src/melcloudhometoken.js

@@ -1,6 +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 EventEmitter from 'events';
 
 const MOBILE_USER_AGENT = 'MonitorAndControl.App.Mobile/35 CFNetwork/3860.100.1 Darwin/25.0.0';
@@ -17,7 +19,14 @@ 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({
+            headers: { 'User-Agent': MOBILE_USER_AGENT },
+            jar,
+            withCredentials: true,
+            maxRedirects: 0,
+        }));
     }
 
     generatePKCE() {
@@ -27,190 +36,80 @@ class MelCloudHomeToken extends EventEmitter {
     }
 
     generateState() {
-        return crypto.randomBytes(32).toString('hex');
+        return crypto.randomBytes(16).toString('hex');
     }
 
     async getLoginPage(authUrl) {
-        const res = await this.axiosInstance.get(authUrl, { maxRedirects: 10 });
+        const res = await this.axiosInstance.get(authUrl);
         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,
-                redirect_uri: REDIRECT_URI,
-                client_id: CLIENT_ID,
-                code_verifier: codeVerifier,
-            });
+        const tokenData = new URLSearchParams({
+            grant_type: 'authorization_code',
+            code,
+            redirect_uri: REDIRECT_URI,
+            client_id: CLIENT_ID,
+            code_verifier: codeVerifier,
+        });
 
-            const response = await this.axiosInstance.post(
+        try {
+            const res = await this.axiosInstance.post(
                 TOKEN_ENDPOINT,
                 tokenData.toString(),
-                {
-                    headers: {
-                        'Content-Type': 'application/x-www-form-urlencoded',
-                        'Authorization': 'Basic aG9tZW1vYmlsZTo=', // optional, Cognito may ignore
-                    },
-                }
+                { headers: { 'Content-Type': 'application/x-www-form-urlencoded' } }
             );
 
-            this.emit('warn', `Token response: ${JSON.stringify(response.data)}`);
-            return response.data;
-
+            this.emit('warn', `Tokens: ${JSON.stringify(res.data)}`);
+            return res.data;
         } catch (error) {
-            throw new Error(`Failed to obtain OAuth token: ${error.response?.data || error.message}`);
+            throw new Error(`Token request failed: ${error.response?.data || error.message}`);
         }
     }
 
-
     async loginToMelCloudHome(url) {
-        try {
-            // Step 1: Pobierz stronę logowania
-            const getResp = await this.axiosInstance.get(url, {
-                headers: { 'Accept': 'text/html' },
-                withCredentials: true,
-            });
-
-            const cookies = (getResp.headers['set-cookie'] || []).map(c => c.split(';')[0]).join('; ');
-            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`);
-                return null;
-            }
-
-            // Step 2: Przygotuj dane logowania
-            const formData = new URLSearchParams({
-                _csrf: csrf,
-                username: this.user,
-                password: this.passwd,
+        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),
             });
 
-            // 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 (redirectUrl && redirectUrl.includes('code=')) {
-                    const match = redirectUrl.match(/[?&]code=([^&]+)/);
-                    if (match) {
-                        const code = match[1];
-                        this.emit('warn', `Authorization code obtained: ${code}`);
-                        return code;
-                    }
-                }
+            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;
             }
-
-            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('Authorization code not found');
     }
 
-
     async buildAuthorizeUrl() {
-        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}`);
-        }
+        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 };
     }
 }
 
@@ -220,3 +119,4 @@ export default MelCloudHomeToken;
 
 
 
+