homebridge-melcloud-control 4.0.0-beta.297 → 4.0.0-beta.299

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "MELCloud Control",
   "name": "homebridge-melcloud-control",
-  "version": "4.0.0-beta.297",
+  "version": "4.0.0-beta.299",
   "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 { URLSearchParams } from 'url';
 const TOKEN_ENDPOINT = 'https://auth.melcloudhome.com/connect/token';
+const REDIRECT_URI = 'melcloudhome://';
 
 class MelCloud extends EventEmitter {
     constructor(accountType, user, passwd, language, accountFile, buildingsFile, devicesFile, logWarn, logDebug, requestConfig) {
@@ -291,8 +292,6 @@ class MelCloud extends EventEmitter {
             const melCloudHomeToken = new MelCloudHomeToken();
             const url = await melCloudHomeToken.buildAuthorizeUrl();
 
-            this.emit('warn', url);
-
             const page = await browser.newPage();
             await page.goto(url, { waitUntil: 'networkidle2' });
 
@@ -302,52 +301,12 @@ class MelCloud extends EventEmitter {
             const button1 = await page.$('input[type="submit"]');
             await Promise.all([button1.click(), page.waitForNavigation({ waitUntil: 'networkidle2', timeout: 10000 })]);
             const html = await page.content();
-            const code = await melCloudHomeToken.extractCodeFromHtml(html);
-
-            console.log(code);
-            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="([^"]+)"/);
-            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;
-            }
-
-            // 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;
-            }
-
-            // 🆕 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;
-            }
-
-            reject(new Error('Authorization code not found in URL or HTML'));
+            const authCode = await melCloudHomeToken.extractCodeFromHtml(html);
+            this.emit('warn', authCode);
 
             // 5. Wymień code na access_token
-            const tokenResponse = await axios.post(TOKEN_ENDPOINT, new URLSearchParams({
-                client_id: 'homemobile',
-                grant_type: 'authorization_code',
-                code: authCode,
-                redirect_uri: 'melcloudhome://'
-            }).toString(), {
-                headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
-            });
-
-            const tokenData = await tokenResp.json();
+            const tokenResponse = await melCloudHomeToken.getTokens(authCode);
+            const tokenData = await tokenResponse.json();
             this.emit('debug', `Token: ${JSON.stringify(tokenData, null, 2)}`);
             return {
                 accessToken: tokenData.access_token,

package/src/melcloudhometoken.js

@@ -11,8 +11,7 @@ const TOKEN_ENDPOINT = 'https://auth.melcloudhome.com/connect/token';
 const AUTHORIZE_ENDPOINT = 'https://auth.melcloudhome.com/connect/authorize';
 
 class MelCloudHomeToken {
-    constructor(log = console) {
-        this.log = log;
+    constructor() {
         const jar = new CookieJar();
         this.client = wrapper(axios.create({ jar, withCredentials: true }));
         this.client.defaults.headers['User-Agent'] = MOBILE_USER_AGENT;
@@ -33,48 +32,73 @@ class MelCloudHomeToken {
         return { url: res.request.res.responseUrl };
     }
 
-    async extractCodeFromHtml(html) {
-        let code = null;
-
-        // Sprawdzenie, czy code jest w URL
-        const urlMatch = html.match(/[?&]code=([^&]+)/);
-        if (urlMatch) {
-            console.log('Authorization code found in URL');
-            return urlMatch[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;
-        }
-
-        // 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;
+    async extractCodeFromHtml(html, cookies = '') {
+        try {
+            // Code w URL
+            const urlMatch = html.match(/[?&]code=([^&]+)/);
+            if (urlMatch) {
+                return urlMatch[1];
+            }
+
+            // Hidden form (form_post)
+            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) {
+                const code = await this.submitFormPost(
+                    formActionMatch[1],
+                    formCodeMatch[1],
+                    formStateMatch[1],
+                    cookies
+                );
+                return code;
+            }
+
+            // melcloudhome:// w body
+            const bodyCodeMatch = html.match(/melcloudhome:\/\/[^"'\s]*[?&]code=([^&"'\s]+)/);
+            if (bodyCodeMatch) {
+                return bodyCodeMatch[1];
+            }
+
+            // data-url (np. z błędnej strony 500)
+            const dataUrlMatch = html.match(/data-url="[^"]*code=([^&"']+)/);
+            if (dataUrlMatch) {
+                return dataUrlMatch[1];
+            }
+
+            console.warn('Authorization code not found in HTML response');
+            return null;
+        } catch (err) {
+            console.error('extractCodeFromHtml error:', err);
+            return null;
         }
+    }
 
-        // 🆕 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;
+    async getTokens(code) {
+        const pkce = this.generatePKCE();
+        const data = new URLSearchParams();
+        data.append('grant_type', 'authorization_code');
+        data.append('client_id', CLIENT_ID);
+        data.append('code', code);
+        data.append('redirect_uri', REDIRECT_URI);
+        data.append('code_verifier', pkce.verifier);
+
+        const res = await this.client.post(TOKEN_ENDPOINT, data.toString(), {
+            headers: {
+                'Content-Type': 'application/x-www-form-urlencoded',
+                'Authorization': 'Basic aG9tZW1vYmlsZTo='
+            },
+        });
+
+        if (res.status !== 200) {
+            throw new Error(`Token exchange failed: ${res.status} ${res.statusText}`);
         }
 
-        return code;
+        return res.data;
     }
 
+
     async buildAuthorizeUrl() {
         try {
             const pkce = this.generatePKCE();
@@ -87,7 +111,6 @@ class MelCloudHomeToken {
             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;