homebridge-melcloud-control 4.0.0-beta.294 → 4.0.0-beta.296

package/package.json

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

package/src/melcloud.js

@@ -305,8 +305,7 @@ class MelCloud extends EventEmitter {
             const code = await melCloudHomeToken.extractCodeFromHtml(html);
 
             console.log(code);
-            return
-
+return
             // Check for form_post response (HTML with hidden form)
             const formCodeMatch = html.match(/name="code"\s+value="([^"]+)"/);
             const formStateMatch = html.match(/name="state"\s+value="([^"]+)"/);

package/src/melcloudhometoken.js

@@ -1,5 +1,7 @@
+import axios from 'axios';
+import { wrapper } from 'axios-cookiejar-support';
+import { CookieJar } from 'tough-cookie';
 import crypto from 'crypto';
-import * as cheerio from 'cheerio';
 
 const MOBILE_USER_AGENT = 'MonitorAndControl.App.Mobile/35 CFNetwork/3860.100.1 Darwin/25.0.0';
 const CLIENT_ID = 'homemobile';
@@ -7,11 +9,13 @@ 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) {
         this.log = log;
+        const jar = new CookieJar();
+        this.client = wrapper(axios.create({ jar, withCredentials: true }));
+        this.client.defaults.headers['User-Agent'] = MOBILE_USER_AGENT;
     }
 
     generatePKCE() {
@@ -24,54 +28,75 @@ class MelCloudHomeToken {
         return crypto.randomBytes(32).toString('hex');
     }
 
-    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 getLoginPage(authUrl) {
+        const res = await this.client.get(authUrl, { maxRedirects: 10 });
+        return { url: res.request.res.responseUrl };
     }
 
     async extractCodeFromHtml(html) {
-        const $ = cheerio.load(html);
         let code = null;
 
-        const formCode = html.match(/name="code"\s+value="([^"]+)"/);
-        if (formCode) return formCode[1];
+        // 1️⃣ Sprawdzenie, czy code jest w URL
+        const url1 = page.url();
+        const urlMatch = url1.match(/[?&]code=([^&]+)/);
+        if (urlMatch) {
+            console.log('Authorization code found in URL');
+            return urlMatch[1];
+        }
 
-        const deepLink = html.match(/melcloudhome:\/\/[^"'\s]*[?&]code=([^&"'\s]+)/);
-        if (deepLink) return deepLink[1];
+        // Check for form_post response (HTML with hidden form)
+        const formCodeMatch = html.match(/name="code"\s+value="([^"]+)"/);
+        const formStateMatch = html.match(/name="state"\s+value="([^"]+)"/);
+        const formActionMatch = html.match(/action="([^"]+)"/);
+
+        if (formCodeMatch && formStateMatch && formActionMatch) {
+            console.log('Found form_post response, submitting to callback endpoint...');
+            this.submitFormPost(formActionMatch[1], formCodeMatch[1], formStateMatch[1], cookies)
+                .then(code => resolve(code))
+                .catch(err => reject(err));
+            return;
+        }
 
-        const dataUrl = $('[data-url]').attr('data-url');
-        if (dataUrl && dataUrl.includes('code=')) {
-            const parsedUrl = new URL(dataUrl);
-            return parsedUrl.searchParams.get('code');
+        // Check for melcloudhome:// redirect in JS
+        const bodyCodeMatch = html.match(/melcloudhome:\/\/[^"'\s]*[?&]code=([^&"'\s]+)/);
+        if (bodyCodeMatch) {
+            console.log('Found authorization code in response body (JS)');
+            resolve(bodyCodeMatch[1]);
+            return;
         }
 
-        $('a[href]').each((_, el) => {
-            const href = $(el).attr('href');
-            if (href && href.includes('code=')) {
-                const parsedUrl = new URL(href);
-                code = parsedUrl.searchParams.get('code');
-            }
-        });
+        // 🆕 NEW: Check for data-url with code parameter (like in 500 error pages)
+        const dataUrlMatch = html.match(/data-url="[^"]*code=([^&"']+)/);
+        if (dataUrlMatch) {
+            console.log('Found authorization code in data-url attribute');
+            resolve(dataUrlMatch[1]);
+            return;
+        }
 
         return code;
     }
 
-
-
-
+    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 loginPage = await this.getLoginPage(authUrl.toString());
+
+            return loginPage.url;
+        } catch (error) {
+            console.error('Failed to obtain OAuth tokens:', error);
+            throw error;
+        }
+    }
 }
 
 export default MelCloudHomeToken;