homebridge-melcloud-control 4.0.0-beta.396 → 4.0.0-beta.397

package/package.json

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

package/src/melcloud.js

@@ -277,7 +277,7 @@ class MelCloud extends EventEmitter {
         }
     }
 
-    async connectToMelCloudHome() {
+    async connectToMelCloudHome1() {
         try {
             const melCloudHomeToken = new MelCloudHomeToken({
                 user: this.user,
@@ -302,7 +302,7 @@ class MelCloud extends EventEmitter {
         }
     }
 
-    async connectToMelCloudHome1(refresh = false) {
+    async connectToMelCloudHome(refresh = false) {
         if (this.logDebug) this.emit('debug', `Connecting to MELCloud Home`);
 
         let browser;

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 axios from 'axios';
+import { JSDOM } from 'jsdom';
 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) {
@@ -38,6 +38,7 @@ class MelCloudHomeToken extends EventEmitter {
     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);
@@ -46,54 +47,153 @@ class MelCloudHomeToken extends EventEmitter {
         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 loginToMelCloudHome(authUrl) {
         try {
-            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);
-
-            await page.goto(authUrl, { waitUntil: 'networkidle0' });
-
-            // Wpisz login i hasło
-            await page.type('input[name="username"]', this.user);
-            await page.type('input[name="password"]', this.passwd);
-
-            // Kliknij przycisk login
-            await Promise.all([
-                page.click('input[type="submit"]'),
-                page.waitForNavigation({ waitUntil: 'networkidle0' }).catch(() => { }) // czasami redirect jest JS, więc catch
-            ]);
-
-            // Spróbuj pobrać kod z formularza form_post
-            const code = await page.evaluate(() => {
-                const form = document.querySelector('form[action^="melcloudhome://"]');
-                if (form) {
-                    const input = form.querySelector('input[name="code"]');
-                    return input ? input.value : null;
-                }
+            const getResp = await this.client.get(authUrl, { 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;
+            }
+
+            const formData = new URLSearchParams({
+                _csrf: csrf,
+                username: this.user,
+                password: this.passwd
             });
 
-            await browser.close();
+            const response = await this.client.post(authUrl, 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': authUrl
+                },
+                maxRedirects: 0,
+                validateStatus: status => [200, 302, 400].includes(status)
+            });
 
-            if (code) {
-                this.emit('warn', `Authorization code obtained from form_post: ${code}`);
-                return code;
-            } else {
-                this.emit('warn', `Authorization code not found in Puppeteer`);
+            if (response.status === 400) {
+                this.emit('warn', `Login failed: ${response.data}`);
                 return null;
             }
 
+            // Extract authorization code
+            const code = await this.extractCodeFromResponse(
+                response.data,
+                response.headers,
+                async (url) => {
+                    const r = await this.client.get(url, {
+                        maxRedirects: 0,
+                        validateStatus: status => [200, 302, 303].includes(status)
+                    });
+                    return this.extractCodeFromResponse(r.data, r.headers, async u => this.extractCodeFromResponse(r.data, r.headers, u));
+                }
+            );
+
+            if (code) this.emit('warn', `Authorization code obtained: ${code}`);
+            return code || null;
+
         } catch (err) {
             this.emit('warn', `loginToMelCloudHome error: ${err}`);
             return null;
         }
     }
 
+    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, submitting...');
+                    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;
+                    }
+                }
+
+                // 3️⃣ JS redirect in body
+                const bodyCodeMatch = data.match(/melcloudhome:\/\/[^"'\s]*[?&]code=([^&"'\s]+)/);
+                if (bodyCodeMatch) {
+                    this.emit('warn', `Found code in body: ${bodyCodeMatch[1]}`);
+                    resolve(bodyCodeMatch[1]);
+                    return;
+                }
+
+                // 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;
+                    }
+                }
+
+                this.emit('warn', 'Authorization code not found in response');
+                reject(new Error('Authorization code not found'));
+            } catch (err) {
+                this.emit('warn', `extractCodeFromResponse error: ${err}`);
+                reject(err);
+            }
+        });
+    }
+
+    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 location = res.headers['location'];
+        if (location) {
+            const match = location.match(/[?&]code=([^&]+)/);
+            if (match) return match[1];
+        }
+
+        this.emit('warn', 'Code not found after form_post submission');
+        throw new Error('Code not found after form_post submission');
+    }
 
     async getTokens(code, codeVerifier) {
         const tokenData = new URLSearchParams({
@@ -115,6 +215,7 @@ class MelCloudHomeToken extends EventEmitter {
             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}`);
         }