homebridge-melcloud-control 4.0.0-beta.269 → 4.0.0-beta.270

package/package.json

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

package/src/melcloud.js

@@ -9,6 +9,7 @@ import Functions from './functions.js';
 import { ApiUrls, ApiUrlsHome } from './constants.js';
 import fetch from 'node-fetch';
 import { URLSearchParams } from 'url';
+const TOKEN_ENDPOINT = 'https://auth.melcloudhome.com/connect/token';
 
 class MelCloud extends EventEmitter {
     constructor(accountType, user, passwd, language, accountFile, buildingsFile, devicesFile, logWarn, logDebug, requestConfig) {
@@ -288,10 +289,12 @@ class MelCloud extends EventEmitter {
                 args: ['--no-sandbox', '--disable-setuid-sandbox']
             });
 
+            const melCloudHomeToken = new MelCloudHomeToken();
+            const url = await melCloudHomeToken.getUrl();
+
             const page = await browser.newPage();
-            await page.goto(ApiUrlsHome.BaseURL, { waitUntil: 'networkidle2' });
+            await page.goto(url, { waitUntil: 'networkidle2' });
 
-            // 2. Kliknij login (jeżeli strona główna ma przycisk)
             const buttons = await page.$$('button.btn--blue');
             let loginBtn = null;
 
@@ -310,7 +313,6 @@ class MelCloud extends EventEmitter {
                 page.waitForNavigation({ waitUntil: 'networkidle2', timeout: 10000 })
             ]);
 
-            // 3. Wypełnij login i hasło
             await page.waitForSelector('input[name="username"]', { timeout: 5000 });
             await page.type('input[name="username"]', this.user, { delay: 50 });
             await page.type('input[name="password"]', this.passwd, { delay: 50 });
@@ -329,7 +331,7 @@ class MelCloud extends EventEmitter {
             if (!authCode) throw new Error('Authorization code not found in URL');
 
             // 5. Wymień code na access_token
-            const tokenResponse = await axios.post('https://app.melcloud.com/Mitsubishi.Wifi.Client/OAuth/Token', new URLSearchParams({
+            const tokenResponse = await axios.post(TOKEN_ENDPOINT, new URLSearchParams({
                 client_id: clientId,
                 grant_type: 'authorization_code',
                 code: authCode,

package/src/melcloudhometoken.js

@@ -39,107 +39,7 @@ class MelCloudHomeToken {
         return { csrf, url: res.request.res.responseUrl };
     }
 
-    async submitLogin(loginUrl, csrf, email, password) {
-        console.log('Submitting login credentials to:', loginUrl);
-
-        const form = new URLSearchParams({ _csrf: csrf, username: email, password });
-        let res = await this.client.post(loginUrl, form.toString(), {
-            headers: {
-                'Content-Type': 'application/x-www-form-urlencoded',
-                Referer: loginUrl,
-            },
-            maxRedirects: 0,
-            validateStatus: (status) => status >= 200 && status < 400,
-        });
-
-        console.log('Login POST status:', res.status);
-
-        // Obsługa 302 redirect
-        while (res.status === 302 && res.headers.location) {
-            const location = res.headers.location;
-            console.log('Following redirect:', location);
-            res = await this.client.get(location, {
-                maxRedirects: 0,
-                validateStatus: (status) => status >= 200 && status < 400,
-            });
-        }
-
-        // Sprawdź HTML na form_post
-        let $ = cheerio.load(res.data);
-        let formElement = $('form');
-        if (formElement.length) {
-            const action = formElement.attr('action');
-            const code = $('input[name="code"]').attr('value');
-            const state = $('input[name="state"]').attr('value');
-            if (action && code && state) {
-                console.log('Found form_post. Action:', action, 'Code:', code, 'State:', state);
-                return this.submitFormPost(action, code, state);
-            }
-        }
-
-        // Spróbuj pobrać kod bezpośrednio z JS w body
-        const bodyCodeMatch = res.data.match(/melcloudhome:\/\/[^"'\s]*[?&]code=([^&"'\s]+)/);
-        if (bodyCodeMatch) {
-            console.log('Authorization code obtained from HTML/JS body:', bodyCodeMatch[1]);
-            return bodyCodeMatch[1];
-        }
-
-        throw new Error('Authorization code not found in login response');
-    }
-
-    async submitFormPost(actionUrl, code, state) {
-        console.log('Submitting form_post to callback URL:', actionUrl);
-
-        const form = new URLSearchParams({ code, state });
-        const res = await this.client.post(actionUrl, form.toString(), {
-            headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-            maxRedirects: 0,
-            validateStatus: (status) => status >= 200 && status < 400,
-        });
-
-        // Sprawdź redirect z finalnym code
-        const location = res.headers.location;
-        if (location?.startsWith('melcloudhome://')) {
-            const codeMatch = location.match(/[?&]code=([^&]+)/);
-            if (codeMatch) {
-                console.log('Authorization code obtained from form_post redirect:', codeMatch[1]);
-                return codeMatch[1];
-            }
-        }
-
-        throw new Error('No authorization code found in form_post response');
-    }
-
-
-    async exchangeCodeForTokens(code, codeVerifier) {
-        console.log('Exchanging authorization code for tokens...');
-        const form = new URLSearchParams({
-            grant_type: 'authorization_code',
-            code,
-            redirect_uri: REDIRECT_URI,
-            client_id: CLIENT_ID,
-            code_verifier: codeVerifier,
-        });
-
-        const res = await this.client.post(TOKEN_ENDPOINT, form.toString(), {
-            headers: {
-                'Content-Type': 'application/x-www-form-urlencoded',
-                Authorization: 'Basic aG9tZW1vYmlsZTo=',
-            },
-        });
-
-        if (res.data.error) throw new Error(`Token exchange failed: ${res.data.error_description || res.data.error}`);
-
-        console.log('Tokens obtained:', res.data);
-        return {
-            accessToken: res.data.access_token,
-            refreshToken: res.data.refresh_token,
-            expiresIn: res.data.expires_in,
-            idToken: res.data.id_token,
-        };
-    }
-
-    async getTokensWithCredentials(email, password) {
+    async getUrl() {
         try {
             console.log('Starting OAuth flow...');
             const pkce = this.generatePKCE();
@@ -155,11 +55,8 @@ class MelCloudHomeToken {
             authUrl.searchParams.set('state', state);
 
             const loginPage = await this.getLoginPage(authUrl.toString());
-            const authCode = await this.submitLogin(loginPage.url, loginPage.csrf, email, password);
-            const tokens = await this.exchangeCodeForTokens(authCode, pkce.verifier);
 
-            console.log('✓ Successfully obtained OAuth tokens');
-            return tokens;
+            return loginPage;
         } catch (error) {
             console.error('Failed to obtain OAuth tokens:', error);
             throw error;