homebridge-melcloud-control 4.0.0-beta.293 → 4.0.0-beta.295

package/package.json

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

package/src/melcloud.js

@@ -301,43 +301,12 @@ class MelCloud extends EventEmitter {
             await page.type('input[name="password"]', this.passwd, { delay: 50 });
             const button1 = await page.$('input[type="submit"]');
             await Promise.all([button1.click(), page.waitForNavigation({ waitUntil: 'networkidle2', timeout: 10000 })]);
-            const html = await page.content(html);
-            const code = await melCloudHomeToken.extractCodeFromHtml();
+            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'));
-
             // 5. Wymień code na access_token
             const tokenResponse = await axios.post(TOKEN_ENDPOINT, new URLSearchParams({
                 client_id: 'homemobile',

package/src/melcloudhometoken.js

@@ -1,8 +1,4 @@
-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';
@@ -15,9 +11,6 @@ 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() {
@@ -49,35 +42,39 @@ class MelCloudHomeToken {
     }
 
     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];
+        // 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;
     }
-
-
-
-
 }
 
 export default MelCloudHomeToken;