homebridge-melcloud-control 4.0.0-beta.235 → 4.0.0-beta.237

package/homebridge-ui/public/index.html

@@ -151,7 +151,6 @@
           formElements.passwd.value = account.passwd || '';
           formElements.language.value = account.language || '0';
           formElements.accountType.value = account.type || 'disabled';
-
           formElements.logIn.disabled = !(account.name && account.user && account.passwd && account.language && account.type);
         });
       });
@@ -178,9 +177,7 @@
 
       document.getElementById('melCloudAccount').style.display = 'block';
 
-
-
-      // --- Config Button Toggle ---
+      // Config Button Toggle
       const configButton = document.getElementById('configButton');
       let configButtonState = false;
       configButton.addEventListener('click', () => {
@@ -202,7 +199,7 @@
         }
       });
 
-      // --- Device Handling & Login Logic ---
+      // Device Handling & Login Logic
       function removeStaleDevices(configDevices, melcloudDevices) {
         const melcloudIds = melcloudDevices.map(d => d.DeviceID);
         const removedDevices = [];

package/package.json

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

package/src/melcloud.js

@@ -3,6 +3,7 @@ import { execSync } from 'child_process';
 import puppeteer from 'puppeteer';
 import axios from 'axios';
 import EventEmitter from 'events';
+import MelCloudHomeToken from './melcloudhometoken.js';
 import ImpulseGenerator from './impulsegenerator.js';
 import Functions from './functions.js';
 import { ApiUrls, ApiUrlsHome } from './constants.js';
@@ -24,6 +25,12 @@ class MelCloud extends EventEmitter {
         this.contextKey = '';
         this.functions = new Functions();
 
+        this.axiosInstance = axios.create({
+            baseURL: 'https://app.melcloud.com/Mitsubishi.Wifi.Client',
+            headers: { 'User-Agent': 'MonitorAndControl.App.Mobile/35 CFNetwork/3860.100.1 Darwin/25.0.0' }
+        });
+        this.tokens = null;
+
         this.loginData = {
             Email: user,
             Password: passwd,
@@ -167,6 +174,15 @@ class MelCloud extends EventEmitter {
         }
     }
 
+    // MELCloud Home
+    async connectToMelCloudHome() {
+        const oauth = new MelCloudHomeToken(this.log);
+        this.tokens = await oauth.getTokensWithCredentials(this.user, this.passwd);
+        this.emit('warn', `Token${JSON.stringify(this.tokens, null, 2)}`);
+        //this.axiosInstance.defaults.headers['Authorization'] = `Bearer ${this.tokens.accessToken}`;
+        return false;
+    }
+
     async checkMelcloudHomeDevicesList(contextKey) {
         try {
             const axiosInstance = axios.create({
@@ -270,8 +286,7 @@ class MelCloud extends EventEmitter {
         }
     }
 
-    // MELCloud Home
-    async connectToMelCloudHome(refresh = false) {
+    async connectToMelCloudHome1(refresh = false) {
         if (this.logDebug) this.emit('debug', `Connecting to MELCloud Home`);
 
         let browser;

package/src/melcloudhometoken.js

@@ -0,0 +1,178 @@
+// oauth-helper-axios.js
+import axios from 'axios';
+import { CookieJar } from 'tough-cookie';
+import { wrapper } from 'axios-cookiejar-support';
+import crypto from 'crypto';
+
+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';
+
+export class MelCloudHomeToken {
+    constructor(log) {
+        this.log = log;
+        this.jar = new CookieJar();
+        this.axiosInstance = wrapper(axios.create({
+            jar: this.jar,
+            withCredentials: true,
+            headers: { 'User-Agent': MOBILE_USER_AGENT },
+            maxRedirects: 10
+        }));
+    }
+
+    generatePKCE() {
+        const verifier = crypto.randomBytes(32).toString('base64url');
+        const challenge = crypto.createHash('sha256').update(verifier).digest('base64url');
+        return { verifier, challenge };
+    }
+
+    generateState() {
+        return crypto.randomBytes(32).toString('hex');
+    }
+
+    async getLoginPage(authUrl) {
+        console.log('Getting login page...');
+        const resp = await this.axiosInstance.get(authUrl, {
+            headers: {
+                'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
+                'Accept-Language': 'en-US,en;q=0.9',
+            },
+            validateStatus: () => true
+        });
+
+        const html = resp.data;
+        const formSnippet = html.match(/<form[^>]*>[\s\S]{0,800}/);
+        if (formSnippet) console.log(`Form HTML preview: ${formSnippet[0].replace(/\s+/g, ' ').substring(0, 500)}`);
+
+        const csrfMatch = html.match(/name="_csrf"\s+value="([^"]+)"/);
+        if (!csrfMatch) throw new Error('Could not extract CSRF token from login page');
+
+        const cookies = await this.jar.getCookieString(authUrl) || '';
+        return { html, loginUrl: resp.request.res.responseUrl, csrf: csrfMatch[1], cookies };
+    }
+
+    async submitLogin(loginUrl, csrf, email, password, cookies) {
+        console.log('Submitting login credentials...');
+
+        const formData = new URLSearchParams({ _csrf: csrf, username: email, password: password });
+
+        const resp = await this.axiosInstance.post(loginUrl, formData.toString(), {
+            headers: {
+                'Content-Type': 'application/x-www-form-urlencoded',
+                'Cookie': cookies,
+                'Origin': 'https://live-melcloudhome.auth.eu-west-1.amazoncognito.com',
+                'Referer': loginUrl
+            },
+            maxRedirects: 0,
+            validateStatus: status => status >= 200 && status < 400
+        }).catch(err => {
+            if (err.response && err.response.status >= 300 && err.response.status < 400) return err.response;
+            throw err;
+        });
+
+        const locationHeader = resp.headers.location;
+        if (locationHeader && locationHeader.startsWith('melcloudhome://')) {
+            const codeMatch = locationHeader.match(/[?&]code=([^&]+)/);
+            if (codeMatch) return codeMatch[1];
+        }
+
+        const formCodeMatch = resp.data.match(/name="code"\s+value="([^"]+)"/);
+        const formStateMatch = resp.data.match(/name="state"\s+value="([^"]+)"/);
+        const formActionMatch = resp.data.match(/action="([^"]+)"/);
+
+        if (formCodeMatch && formStateMatch && formActionMatch) {
+            return this.submitFormPost(formActionMatch[1], formCodeMatch[1], formStateMatch[1]);
+        }
+
+        const bodyCodeMatch = resp.data.match(/melcloudhome:\/\/[^"'\s]*[?&]code=([^&"'\s]+)/);
+        if (bodyCodeMatch) return bodyCodeMatch[1];
+
+        throw new Error('No authorization code found after login');
+    }
+
+    async submitFormPost(actionUrl, code, state) {
+        const formData = new URLSearchParams({ code, state });
+
+        const resp = await this.axiosInstance.post(actionUrl, formData.toString(), {
+            headers: {
+                'Content-Type': 'application/x-www-form-urlencoded',
+                'Origin': 'https://live-melcloudhome.auth.eu-west-1.amazoncognito.com',
+                'Referer': actionUrl
+            },
+            maxRedirects: 0,
+            validateStatus: status => status >= 200 && status < 400
+        }).catch(err => {
+            if (err.response && err.response.status >= 300 && err.response.status < 400) return err.response;
+            throw err;
+        });
+
+        const locationHeader = resp.headers.location;
+        if (locationHeader && locationHeader.startsWith('melcloudhome://')) {
+            const codeMatch = locationHeader.match(/[?&]code=([^&]+)/);
+            if (codeMatch) return codeMatch[1];
+        }
+
+        const bodyCodeMatch = resp.data.match(/melcloudhome:\/\/[^"'\s]*[?&]code=([^&"'\s]+)/);
+        if (bodyCodeMatch) return bodyCodeMatch[1];
+
+        throw new Error('No authorization code found in form_post callback');
+    }
+
+    async exchangeCodeForTokens(code, codeVerifier) {
+        console.log('Exchanging authorization code for tokens...');
+
+        const tokenData = new URLSearchParams({
+            grant_type: 'authorization_code',
+            code,
+            redirect_uri: REDIRECT_URI,
+            client_id: CLIENT_ID,
+            code_verifier: codeVerifier
+        });
+
+        const resp = await this.axiosInstance.post(TOKEN_ENDPOINT, tokenData.toString(), {
+            headers: {
+                'Content-Type': 'application/x-www-form-urlencoded',
+                'Authorization': 'Basic aG9tZW1vYmlsZTo='
+            }
+        });
+
+        if (resp.data.error) throw new Error(`Token exchange failed: ${resp.data.error_description || resp.data.error}`);
+
+        return {
+            accessToken: resp.data.access_token,
+            refreshToken: resp.data.refresh_token,
+            expiresIn: resp.data.expires_in,
+            idToken: resp.data.id_token
+        };
+    }
+
+    async getTokensWithCredentials(email, password) {
+        this.log.info('Obtaining OAuth tokens automatically...');
+        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 authCode = await this.submitLogin(loginPage.loginUrl, loginPage.csrf, email, password, loginPage.cookies);
+        const tokens = await this.exchangeCodeForTokens(authCode, pkce.verifier);
+
+        this.log.info('✓ Successfully obtained OAuth tokens');
+        return tokens;
+    }
+}
+
+module.exports = MelCloudHomeToken;
+
+
+