homebridge-melcloud-control 4.0.0-beta.246 → 4.0.0-beta.247

package/package.json

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

package/src/melcloudhometoken.js

@@ -12,8 +12,8 @@ const TOKEN_ENDPOINT = 'https://auth.melcloudhome.com/connect/token';
 const AUTHORIZE_ENDPOINT = 'https://auth.melcloudhome.com/connect/authorize';
 
 class MelCloudHomeToken {
-    constructor() {
-
+    constructor(log) {
+        this.log = log;
     }
 
     // --- PKCE ---
@@ -43,7 +43,7 @@ class MelCloudHomeToken {
             if (cookies.length > 0) reqOptions.headers['Cookie'] = cookies.join('; ');
 
             const req = https.request(reqOptions, (res) => {
-                // collect Set-Cookie
+                // Collect Set-Cookie
                 const setCookie = res.headers['set-cookie'];
                 if (setCookie) {
                     setCookie.forEach(c => {
@@ -54,7 +54,7 @@ class MelCloudHomeToken {
                     });
                 }
 
-                // follow redirect
+                // Follow redirects
                 if ([301, 302, 303].includes(res.statusCode) && res.headers.location) {
                     const redirectUrl = res.headers.location.startsWith('http')
                         ? res.headers.location
@@ -75,7 +75,7 @@ class MelCloudHomeToken {
 
     // --- Get login page ---
     async getLoginPage(authUrl) {
-        console.log('Getting login page...');
+        this.log.info('Getting login page...');
         const resp = await this.httpsRequest(authUrl, {
             method: 'GET',
             headers: {
@@ -88,14 +88,14 @@ class MelCloudHomeToken {
         const form = dom.window.document.querySelector('form');
         if (!form) throw new Error('Login form not found');
 
-        return { formHtml: resp.html, cookies: resp.cookies, form };
+        return { form, cookies: resp.cookies, loginPageUrl: resp.finalUrl };
     }
 
-    // --- Submit login ---
+    // --- Submit login and handle form_post ---
     async submitLogin(form, email, password, cookies, loginPageUrl) {
-        console.log('Submitting login credentials...');
+        this.log.info('Submitting login credentials...');
 
-        // Collect all hidden inputs
+        // Step 1: Collect all hidden inputs
         const formData = new URLSearchParams();
         form.querySelectorAll('input').forEach(input => {
             const name = input.getAttribute('name');
@@ -112,11 +112,35 @@ class MelCloudHomeToken {
             headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
         }, formData.toString(), cookies);
 
-        // Try to extract code from redirect
-        const codeFromLocation = resp.finalUrl.match(/[?&]code=([^&]+)/);
-        if (codeFromLocation) return codeFromLocation[1];
+        // Step 2: Check if body contains hidden form_post
+        const dom = new JSDOM(resp.html);
+        const postForm = dom.window.document.querySelector('form');
+        if (postForm) {
+            // Collect all hidden inputs from form_post
+            const postData = new URLSearchParams();
+            postForm.querySelectorAll('input').forEach(input => {
+                const name = input.getAttribute('name');
+                if (name) postData.append(name, input.getAttribute('value') || '');
+            });
+
+            const postAction = new URL(postForm.getAttribute('action'), resp.finalUrl).toString();
+            const postResp = await this.httpsRequest(postAction, {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
+            }, postData.toString(), cookies);
+
+            // Try to extract code from redirect URL
+            const codeMatch = postResp.finalUrl.match(/[?&]code=([^&]+)/);
+            if (codeMatch) return codeMatch[1];
+
+            // Or from body (JS redirect)
+            const codeFromBody = postResp.html.match(/melcloudhome:\/\/[^"'\s]*[?&]code=([^&"'\s]+)/);
+            if (codeFromBody) return codeFromBody[1];
+        }
 
-        // Or from body (JS redirect or hidden form_post)
+        // Fallback: check resp finalUrl or body
+        const codeMatch = resp.finalUrl.match(/[?&]code=([^&]+)/);
+        if (codeMatch) return codeMatch[1];
         const codeFromBody = resp.html.match(/melcloudhome:\/\/[^"'\s]*[?&]code=([^&"'\s]+)/);
         if (codeFromBody) return codeFromBody[1];
 
@@ -125,7 +149,7 @@ class MelCloudHomeToken {
 
     // --- Exchange code for tokens ---
     async exchangeCodeForTokens(code, codeVerifier) {
-        console.log('Exchanging authorization code for tokens...');
+        this.log.info('Exchanging authorization code for tokens...');
 
         const tokenData = new URLSearchParams({
             grant_type: 'authorization_code',
@@ -151,7 +175,7 @@ class MelCloudHomeToken {
 
     // --- Main flow ---
     async getTokensWithCredentials(email, password) {
-        console.log('Obtaining OAuth tokens automatically...');
+        this.log.info('Obtaining OAuth tokens automatically...');
 
         const pkce = this.generatePKCE();
         const state = this.generateState();
@@ -165,15 +189,15 @@ class MelCloudHomeToken {
         authUrl.searchParams.set('code_challenge_method', 'S256');
         authUrl.searchParams.set('state', state);
 
-        // 1️⃣ get login page
-        const { form, cookies } = await this.getLoginPage(authUrl.toString());
+        // 1️⃣ Get login page
+        const { form, cookies, loginPageUrl } = await this.getLoginPage(authUrl.toString());
 
-        // 2️⃣ submit login
-        const authCode = await this.submitLogin(form, email, password, cookies, authUrl.toString());
+        // 2️⃣ Submit login + handle form_post
+        const authCode = await this.submitLogin(form, email, password, cookies, loginPageUrl);
 
-        // 3️⃣ exchange code for tokens
+        // 3️⃣ Exchange code for tokens
         const tokens = await this.exchangeCodeForTokens(authCode, pkce.verifier);
-        console.log('✓ Successfully obtained OAuth tokens');
+        this.log.info('✓ Successfully obtained OAuth tokens');
         return tokens;
     }
 }