homebridge-melcloud-control 4.0.0-beta.257 → 4.0.0-beta.259

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "MELCloud Control",
   "name": "homebridge-melcloud-control",
-  "version": "4.0.0-beta.257",
+  "version": "4.0.0-beta.259",
   "description": "Homebridge plugin to control Mitsubishi Air Conditioner, Heat Pump and Energy Recovery Ventilation.",
   "license": "MIT",
   "author": "grzegorz914",
@@ -41,7 +41,8 @@
     "express": "^5.1.0",
     "puppeteer": "^24.26.1",
     "axios-cookiejar-support": "^6.0.4",
-    "tough-cookie": "^6.0.0"
+    "tough-cookie": "^6.0.0",
+    "cheerio": "^1.1.2"
   },
   "keywords": [
     "homebridge",

package/src/melcloudhometoken.js

@@ -2,6 +2,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';
@@ -29,40 +30,84 @@ class MelCloudHomeToken {
     }
 
     async getLoginPage(authUrl) {
-        this.log.debug('Getting login page...');
+        console.log('Getting login page...');
         const res = await this.client.get(authUrl, { maxRedirects: 10 });
-        const csrfMatch = res.data.match(/name="_csrf"\s+value="([^"]+)"/);
-        if (!csrfMatch) throw new Error('Could not extract CSRF token from login page');
-        return { html: res.data, csrf: csrfMatch[1], url: res.request.res.responseUrl };
+        const $ = cheerio.load(res.data);
+        const csrf = $('input[name="_csrf"]').attr('value');
+        if (!csrf) throw new Error('Could not extract CSRF token from login page');
+        console.log('CSRF token found:', csrf);
+        return { csrf, url: res.request.res.responseUrl };
+    }
+
+    async submitFormPost(actionUrl, code, state) {
+        console.log('Submitting form_post to callback URL:', actionUrl);
+        const form = new URLSearchParams({ code, state });
+        const res = await this.client.post(actionUrl, form.toString(), {
+            headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+            maxRedirects: 0,
+            validateStatus: (status) => status >= 200 && status < 400,
+        });
+
+        const location = res.headers.location;
+        if (location?.startsWith('melcloudhome://')) {
+            const codeMatch = location.match(/[?&]code=([^&]+)/);
+            if (codeMatch) {
+                console.log('Authorization code obtained from form_post redirect:', codeMatch[1]);
+                return codeMatch[1];
+            }
+        }
+        throw new Error('No authorization code found in form_post response');
     }
 
     async submitLogin(loginUrl, csrf, email, password) {
+        console.log('Submitting login credentials to:', loginUrl);
         const form = new URLSearchParams({ _csrf: csrf, username: email, password });
         const res = await this.client.post(loginUrl, form.toString(), {
             headers: {
                 'Content-Type': 'application/x-www-form-urlencoded',
                 Referer: loginUrl,
             },
-            maxRedirects: 0, // manual redirect handling
+            maxRedirects: 0,
             validateStatus: (status) => status >= 200 && status < 400,
         });
 
-        // Try to get code from Location header
+        console.log('Login POST status:', res.status);
+
+        // Spróbuj pobrać kod z nagłówka Location
         const location = res.headers.location;
         if (location?.startsWith('melcloudhome://')) {
             const codeMatch = location.match(/[?&]code=([^&]+)/);
-            if (codeMatch) return codeMatch[1];
+            if (codeMatch) {
+                console.log('Authorization code obtained from Location header:', codeMatch[1]);
+                return codeMatch[1];
+            }
         }
 
-        // Try to get code from HTML (form_post or JS)
-        const codeMatch = res.data.match(/name="code"\s+value="([^"]+)"/) ||
-            res.data.match(/melcloudhome:\/\/[^"'\s]*[?&]code=([^&"'\s]+)/);
-        if (codeMatch) return codeMatch[1];
+        // Spróbuj parsować HTML w poszukiwaniu form_post
+        const $ = cheerio.load(res.data);
+        const formElement = $('form');
+        if (formElement.length) {
+            const action = formElement.attr('action');
+            const code = $('input[name="code"]').attr('value');
+            const state = $('input[name="state"]').attr('value');
+            if (action && code && state) {
+                console.log('Found form_post. Action:', action, 'Code:', code, 'State:', state);
+                return this.submitFormPost(action, code, state);
+            }
+        }
+
+        // Spróbuj wyciągnąć kod z JS w ciele strony
+        const bodyCodeMatch = res.data.match(/melcloudhome:\/\/[^"'\s]*[?&]code=([^&"'\s]+)/);
+        if (bodyCodeMatch) {
+            console.log('Authorization code obtained from HTML/JS body:', bodyCodeMatch[1]);
+            return bodyCodeMatch[1];
+        }
 
         throw new Error('Authorization code not found in login response');
     }
 
     async exchangeCodeForTokens(code, codeVerifier) {
+        console.log('Exchanging authorization code for tokens...');
         const form = new URLSearchParams({
             grant_type: 'authorization_code',
             code,
@@ -79,6 +124,8 @@ class MelCloudHomeToken {
         });
 
         if (res.data.error) throw new Error(`Token exchange failed: ${res.data.error_description || res.data.error}`);
+
+        console.log('Tokens obtained:', res.data);
         return {
             accessToken: res.data.access_token,
             refreshToken: res.data.refresh_token,
@@ -89,7 +136,7 @@ class MelCloudHomeToken {
 
     async getTokensWithCredentials(email, password) {
         try {
-            this.log.info('Obtaining OAuth tokens...');
+            console.log('Starting OAuth flow...');
             const pkce = this.generatePKCE();
             const state = this.generateState();
 
@@ -106,16 +153,17 @@ class MelCloudHomeToken {
             const authCode = await this.submitLogin(loginPage.url, loginPage.csrf, email, password);
             const tokens = await this.exchangeCodeForTokens(authCode, pkce.verifier);
 
-            this.log.info('✓ Successfully obtained OAuth tokens');
+            console.log('✓ Successfully obtained OAuth tokens');
             return tokens;
         } catch (error) {
-            this.log.error('Failed to obtain OAuth tokens:', error);
+            console.error('Failed to obtain OAuth tokens:', error);
             throw error;
         }
     }
 }
 
 
+
 export default MelCloudHomeToken;