homebridge-melcloud-control 4.0.0-beta.289 → 4.0.0-beta.290

package/package.json

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

package/src/melcloud.js

@@ -281,6 +281,17 @@ class MelCloud extends EventEmitter {
     }
 
     async connectToMelCloudHome() {
+        const mel = new MelCloudHomeToken(console);
+        try {
+            const tokens = await mel.loginWithCredentials(this.user, this.passwd);
+            console.log('✅ Access Token:', tokens.access_token);
+            console.log('🔁 Refresh Token:', tokens.refresh_token);
+        } catch (err) {
+            console.error('❌ Login failed:', err.message);
+        }
+    }
+
+    async connectToMelCloudHome2() {
         let browser;
         try {
             browser = await puppeteer.launch({

package/src/melcloudhometoken.js

@@ -10,6 +10,7 @@ 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 LOGIN_ENDPOINT = 'https://auth.melcloudhome.com/Account/Login';
 
 class MelCloudHomeToken {
     constructor(log = console) {
@@ -29,37 +30,115 @@ class MelCloudHomeToken {
         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();
+        this.pkce = pkce;
+        const state = this.generateState();
+        this.state = state;
+
+        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 authUrl.toString();
     }
 
-    async getUrl() {
-        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());
-
-            return loginPage.url;
-        } catch (error) {
-            console.error('Failed to obtain OAuth tokens:', error);
-            throw error;
+    async extractCodeFromHtml(html) {
+        const $ = cheerio.load(html);
+        let code = null;
+
+        const formCode = html.match(/name="code"\s+value="([^"]+)"/);
+        if (formCode) return formCode[1];
+
+        const deepLink = html.match(/melcloudhome:\/\/[^"'\s]*[?&]code=([^&"'\s]+)/);
+        if (deepLink) return deepLink[1];
+
+        const dataUrl = $('[data-url]').attr('data-url');
+        if (dataUrl && dataUrl.includes('code=')) {
+            const parsedUrl = new URL(dataUrl);
+            return parsedUrl.searchParams.get('code');
         }
+
+        $('a[href]').each((_, el) => {
+            const href = $(el).attr('href');
+            if (href && href.includes('code=')) {
+                const parsedUrl = new URL(href);
+                code = parsedUrl.searchParams.get('code');
+            }
+        });
+
+        return code;
     }
-}
 
+    async exchangeCodeForTokens(code) {
+        const body = new URLSearchParams({
+            client_id: CLIENT_ID,
+            grant_type: 'authorization_code',
+            redirect_uri: REDIRECT_URI,
+            code_verifier: this.pkce.verifier,
+            code,
+        });
+
+        const res = await this.client.post(TOKEN_ENDPOINT, body, {
+            headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+        });
+
+        return res.data;
+    }
+
+    /**
+     * Main method: performs full login flow using email and password
+     */
+    async loginWithCredentials(email, password) {
+        const authorizeUrl = await this.buildAuthorizeUrl();
+        this.log.debug('Fetching login page...');
+        const res = await this.client.get(authorizeUrl);
+
+        const $ = cheerio.load(res.data);
+        const form = $('form');
+        const action = form.attr('action') || '/Account/Login';
+        const requestVerificationToken = $('input[name="__RequestVerificationToken"]').val();
+        const returnUrl = $('input[name="ReturnUrl"]').val() || '';
+
+        this.log.debug('Submitting credentials...');
+        const loginRes = await this.client.post(
+            new URL(action, LOGIN_ENDPOINT).toString(),
+            new URLSearchParams({
+                Username: email,
+                Password: password,
+                __RequestVerificationToken: requestVerificationToken,
+                ReturnUrl: returnUrl,
+            }),
+            {
+                headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+                maxRedirects: 0,
+                validateStatus: status => status < 400 || status === 302 || status === 500,
+            }
+        );
+
+        let html = loginRes.data;
+        if (typeof html !== 'string' && loginRes.headers.location) {
+            const redirect = await this.client.get(loginRes.headers.location);
+            html = redirect.data;
+        }
+
+        const code = await this.extractCodeFromHtml(html);
+        if (!code) throw new Error('Authorization code not found in HTML');
 
+        this.log.debug(`Found authorization code: ${code}`);
+
+        return await this.exchangeCodeForTokens(code);
+    }
+}
 
 export default MelCloudHomeToken;
 
 
 
+
+