homebridge-melcloud-control 4.0.0-beta.391 → 4.0.0-beta.393

package/package.json

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

package/src/melcloudhometoken.js

@@ -1,16 +1,16 @@
-import axios from 'axios';
 import crypto from 'crypto';
 import { wrapper } from 'axios-cookiejar-support';
 import { CookieJar } from 'tough-cookie';
-import { JSDOM } from 'jsdom';
+import axios from 'axios';
 import EventEmitter from 'events';
+import puppeteer from 'puppeteer';
 
-const MOBILE_USER_AGENT = 'MonitorAndControl.App.Mobile/35 CFNetwork/3860.100.1 Darwin/25.0.0';
 const CLIENT_ID = 'homemobile';
 const REDIRECT_URI = 'melcloudhome://';
 const SCOPE = 'openid profile email offline_access IdentityServerApi';
 const TOKEN_ENDPOINT = 'https://auth.melcloudhome.com/connect/token';
 const AUTHORIZE_ENDPOINT = 'https://auth.melcloudhome.com/connect/authorize';
+const MOBILE_USER_AGENT = 'MonitorAndControl.App.Mobile/35 CFNetwork/3860.100.1 Darwin/25.0.0';
 
 class MelCloudHomeToken extends EventEmitter {
     constructor(config) {
@@ -35,228 +35,80 @@ class MelCloudHomeToken extends EventEmitter {
         return crypto.randomBytes(32).toString('hex');
     }
 
-    async getLoginPage(authUrl) {
-        const res = await this.client.get(authUrl, { maxRedirects: 10 });
-        return { url: res.request.res.responseUrl };
+    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);
+        return { url: authUrl.toString(), codeVerifier: pkce.verifier };
     }
 
-    async getTokens(code, codeVerifier) {
+    async loginToMelCloudHome(authUrl) {
         try {
-            const tokenData = new URLSearchParams({
-                grant_type: 'authorization_code',
-                code: code,
-                redirect_uri: REDIRECT_URI,
-                client_id: CLIENT_ID,
-                code_verifier: codeVerifier,
-            });
-
-            this.emit('warn', `Code used: ${code}`);
-            this.emit('warn', `Verifier: ${codeVerifier}`);
-            this.emit('warn', `Redirect URI: ${REDIRECT_URI}`);
-
-            const tokenResponse = await this.client.post(TOKEN_ENDPOINT, tokenData.toString(), {
-                headers: {
-                    'Content-Type': 'application/x-www-form-urlencoded'
-                },
-            });
-
-            const tokens = tokenResponse.data;
-            this.emit('warn', `Token ${JSON.stringify(tokens)}`);
-            return tokens;
-        } catch (error) {
-            if (error.response) {
-                this.emit('warn', `Token error response: ${JSON.stringify(error.response.data)}`);
-            }
-            throw new Error(`Failed to obtain OAuth token: ${error}`);
-        }
-    }
-
-    async extractCodeFromResponse(data, headers, followRedirect) {
-        return new Promise(async (resolve, reject) => {
-            try {
-                const locationHeader = headers['location'] || headers['Location'];
-
-                // 1️⃣ Location header
-                if (locationHeader && locationHeader.startsWith('melcloudhome://')) {
-                    const match = locationHeader.match(/[?&]code=([^&]+)/);
-                    if (match) {
-                        this.emit('warn', `Found code in Location header: ${match[1]}`);
-                        resolve(match[1]);
-                        return;
-                    }
-                }
-
-                // 2️⃣ form_post HTML
-                const formCodeMatch = data.match(/name="code"\s+value="([^"]+)"/);
-                const formStateMatch = data.match(/name="state"\s+value="([^"]+)"/);
-                const formActionMatch = data.match(/action="([^"]+)"/);
-
-                if (formCodeMatch && formStateMatch && formActionMatch) {
-                    this.emit('warn', 'Found form_post response, submitting to callback endpoint...');
-                    try {
-                        const code = await this.submitFormPost(formActionMatch[1], formCodeMatch[1], formStateMatch[1]);
-                        this.emit('warn', `submitFormPost returned code: ${code}`);
-                        resolve(code);
-                        return;
-                    } catch (err) {
-                        this.emit('warn', `submitFormPost failed: ${err}`);
-                        reject(err);
-                        return;
-                    }
-                }
+            this.emit('warn', `Opening Puppeteer for auth URL`);
+            const browser = await puppeteer.launch({ headless: true });
+            const page = await browser.newPage();
+            await page.setUserAgent(MOBILE_USER_AGENT);
 
-                // 3️⃣ JS redirect w body
-                const bodyCodeMatch = data.match(/melcloudhome:\/\/[^"'\s]*[?&]code=([^&"'\s]+)/);
-                if (bodyCodeMatch) {
-                    this.emit('warn', `Found code in response body: ${bodyCodeMatch[1]}`);
-                    resolve(bodyCodeMatch[1]);
-                    return;
-                }
+            await page.goto(authUrl, { waitUntil: 'networkidle0' });
 
-                // 4️⃣ Follow redirect
-                if (locationHeader && ['301', '302', '303'].includes(headers['status'] || '')) {
-                    this.emit('warn', `Following redirect to ${locationHeader}`);
-                    try {
-                        const code = await followRedirect(locationHeader);
-                        resolve(code);
-                        return;
-                    } catch (err) {
-                        this.emit('warn', `Follow redirect failed: ${err}`);
-                        reject(err);
-                        return;
-                    }
-                }
+            // Wpisz login i hasło
+            await page.type('input[name="username"]', this.user);
+            await page.type('input[name="password"]', this.passwd);
 
-                this.emit('warn', 'Authorization code not found in response');
-                reject(new Error('Authorization code not found'));
-            } catch (error) {
-                this.emit('warn', `extractCodeFromResponse error: ${error}`);
-                reject(error);
-            }
-        });
-    }
+            // Kliknij przycisk login
+            await Promise.all([
+                page.click('button[type="submit"]'),
+                page.waitForNavigation({ waitUntil: 'networkidle0' })
+            ]);
 
-    // submitFormPost w JS
-    async submitFormPost(actionUrl, code, state) {
-        const formData = new URLSearchParams({ code, state });
-        this.emit('warn', `Submitting form_post to ${actionUrl}`);
-        const res = await this.client.post(actionUrl, formData.toString(), {
-            headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-            maxRedirects: 0,
-            validateStatus: status => [200, 302, 303].includes(status),
-        });
+            const redirectedUrl = page.url();
+            await browser.close();
 
-        const location = res.headers['location'];
-        if (location) {
-            const match = location.match(/[?&]code=([^&]+)/);
+            const match = redirectedUrl.match(/[?&]code=([^&]+)/);
             if (match) {
-                this.emit('warn', `Form post redirect returned code: ${match[1]}`);
-                return match[1];
-            }
-        }
-
-        this.emit('warn', 'Code not found after form_post submission');
-        throw new Error('Code not found after form_post submission');
-    }
-
-
-    async loginToMelCloudHome(url) {
-        try {
-            // Step 1: Pobierz stronę logowania
-            const getResp = await this.client.get(url, {
-                headers: { '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) {
-                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,
-            });
-
-            // Step 3: Wyślij POST z danymi logowania
-            const response = await this.client.post(url, formData.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',
-                    'Content-Length': formData.toString().length,
-                    'Cookie': cookies.join('; '),
-                    '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) {
-                this.emit('warn', `Login failed (bad request or invalid credentials): ${response.data}`);
+                const code = match[1];
+                this.emit('warn', `Authorization code obtained: ${code}`);
+                return code;
+            } else {
+                this.emit('warn', `Authorization code not found in Puppeteer redirect`);
                 return null;
             }
 
-            // Step 4: Pobierz Authorization Code
-            if (response.status === 200 || response.status === 302) {
-                try {
-                    const code = await this.extractCodeFromResponse(
-                        response.data,          // HTML lub body
-                        response.headers,       // nagłówki
-                        async (url) => {        // followRedirect
-                            const r = await this.client.get(url, {
-                                maxRedirects: 0,
-                                validateStatus: status => [200, 302, 303].includes(status),
-                            });
-                            return this.extractCodeFromResponse(r.data, r.headers, followRedirect);
-                        }
-                    );
-
-                    if (code) {
-                        this.emit('warn', `Authorization code obtained: ${code}`);
-                        return code;
-                    } else {
-                        this.emit('warn', 'Authorization code not found in response');
-                        return null;
-                    }
-                } catch (err) {
-                    this.emit('warn', `extractCodeFromResponse error: ${err}`);
-                    return null;
-                }
-            }
-
+        } catch (err) {
+            this.emit('warn', `loginToMelCloudHome error: ${err}`);
             return null;
-
-        } catch (error) {
-            throw new Error(`Login to MELCloud Home error: ${error}`);
         }
     }
 
+    async getTokens(code, codeVerifier) {
+        const tokenData = new URLSearchParams({
+            grant_type: 'authorization_code',
+            code: code,
+            redirect_uri: REDIRECT_URI,
+            client_id: CLIENT_ID,
+            code_verifier: codeVerifier
+        });
 
-    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 tokenResponse = await this.client.post(TOKEN_ENDPOINT, tokenData.toString(), {
+                headers: {
+                    'Content-Type': 'application/x-www-form-urlencoded',
+                    'Authorization': 'Basic aG9tZW1vYmlsZTo='
+                }
+            });
 
-            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 tokens = tokenResponse.data;
+            this.emit('warn', `Token obtained: ${JSON.stringify(tokens)}`);
+            return tokens;
+        } catch (err) {
+            throw new Error(`Failed to obtain OAuth token: ${err}`);
         }
     }
 }
@@ -267,3 +119,4 @@ export default MelCloudHomeToken;
 
 
 
+