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

package/package.json

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

package/src/melcloud.js

@@ -291,8 +291,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,40 +300,8 @@ 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({

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,49 +32,50 @@ class MelCloudHomeToken {
         return { url: res.request.res.responseUrl };
     }
 
-    async extractCodeFromHtml(html) {
-        let code = null;
-
-        // 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];
-        }
-
-        // 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;
+    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;
         }
-
-        return code;
     }
 
+
     async buildAuthorizeUrl() {
         try {
             const pkce = this.generatePKCE();