homebridge-melcloud-control 4.0.0-beta.241 → 4.0.0-beta.243

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "MELCloud Control",
   "name": "homebridge-melcloud-control",
-  "version": "4.0.0-beta.241",
+  "version": "4.0.0-beta.243",
   "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",
     "tough-cookie": "^6.0.0",
-    "axios-cookiejar-support": "^6.0.4"
+    "axios-cookiejar-support": "^6.0.4",
+    "jsdom": "^27.0.1"
   },
   "keywords": [
     "homebridge",

package/src/melcloud.js

@@ -178,7 +178,7 @@ class MelCloud extends EventEmitter {
     async connectToMelCloudHome() {
         const oauth = new MelCloudHomeToken(this.log);
         this.tokens = await oauth.getTokensWithCredentials(this.user, this.passwd);
-        this.emit('warn', `Token${JSON.stringify(this.tokens, null, 2)}`);
+        this.emit('warn', `Token ${JSON.stringify(this.tokens, null, 2)}`);
         //this.axiosInstance.defaults.headers['Authorization'] = `Bearer ${this.tokens.accessToken}`;
         return false;
     }

package/src/melcloudhometoken.js

@@ -3,6 +3,7 @@ import axios from 'axios';
 import { CookieJar } from 'tough-cookie';
 import { wrapper } from 'axios-cookiejar-support';
 import crypto from 'crypto';
+import { JSDOM } from 'jsdom';
 
 const MOBILE_USER_AGENT = 'MonitorAndControl.App.Mobile/35 CFNetwork/3860.100.1 Darwin/25.0.0';
 const CLIENT_ID = 'homemobile';
@@ -11,7 +12,7 @@ const SCOPE = 'openid profile email offline_access IdentityServerApi';
 const TOKEN_ENDPOINT = 'https://auth.melcloudhome.com/connect/token';
 const AUTHORIZE_ENDPOINT = 'https://auth.melcloudhome.com/connect/authorize';
 
-export class MelCloudHomeToken {
+class MelCloudHomeToken {
     constructor(log) {
         this.jar = new CookieJar();
         this.axiosInstance = wrapper(axios.create({
@@ -53,71 +54,61 @@ export class MelCloudHomeToken {
         return { html, loginUrl: resp.request.res.responseUrl, csrf: csrfMatch[1], cookies };
     }
 
-    async submitLogin(loginUrl, csrf, email, password, cookies) {
+    async submitLogin(loginUrl, email, password, cookies) {
         console.log('Submitting login credentials...');
 
-        const formData = new URLSearchParams({ _csrf: csrf, username: email, password: password });
-
-        const resp = await this.axiosInstance.post(loginUrl, formData.toString(), {
-            headers: {
-                'Content-Type': 'application/x-www-form-urlencoded',
-                'Cookie': cookies,
-                'Origin': 'https://live-melcloudhome.auth.eu-west-1.amazoncognito.com',
-                'Referer': loginUrl
-            },
+        // 1. Pobieramy stronę logowania
+        const resp = await this.axiosInstance.get(loginUrl, {
+            headers: { Cookie: cookies },
             maxRedirects: 0,
-            validateStatus: status => status >= 200 && status < 400
-        }).catch(err => {
-            if (err.response && err.response.status >= 300 && err.response.status < 400) return err.response;
-            throw err;
-        });
+            validateStatus: s => s >= 200 && s < 400
+        }).catch(err => err.response || err);
 
-        const locationHeader = resp.headers.location;
-        if (locationHeader && locationHeader.startsWith('melcloudhome://')) {
-            const codeMatch = locationHeader.match(/[?&]code=([^&]+)/);
-            if (codeMatch) return codeMatch[1];
-        }
+        const html = resp.data;
 
-        const formCodeMatch = resp.data.match(/name="code"\s+value="([^"]+)"/);
-        const formStateMatch = resp.data.match(/name="state"\s+value="([^"]+)"/);
-        const formActionMatch = resp.data.match(/action="([^"]+)"/);
+        // 2. Parsujemy formę logowania i zbieramy hidden inputs
+        const dom = new JSDOM(html);
+        const form = dom.window.document.querySelector('form');
+        if (!form) throw new Error('Nie znaleziono formy logowania');
 
-        if (formCodeMatch && formStateMatch && formActionMatch) {
-            return this.submitFormPost(formActionMatch[1], formCodeMatch[1], formStateMatch[1]);
+        const formData = new URLSearchParams();
+        for (const input of form.querySelectorAll('input')) {
+            const name = input.getAttribute('name');
+            const value = input.getAttribute('value') || '';
+            formData.append(name, value);
         }
 
-        const bodyCodeMatch = resp.data.match(/melcloudhome:\/\/[^"'\s]*[?&]code=([^&"'\s]+)/);
-        if (bodyCodeMatch) return bodyCodeMatch[1];
+        // 3. Nadpisujemy username i password
+        formData.set('username', email);
+        formData.set('password', password);
 
-        throw new Error('No authorization code found after login');
-    }
+        const actionUrl = new URL(form.getAttribute('action'), loginUrl).toString();
 
-    async submitFormPost(actionUrl, code, state) {
-        const formData = new URLSearchParams({ code, state });
+        // 4. Wysyłamy POST do form action
+        return this.submitFormPost(actionUrl, formData);
+    }
 
+    async submitFormPost(actionUrl, formData) {
         const resp = await this.axiosInstance.post(actionUrl, formData.toString(), {
             headers: {
                 'Content-Type': 'application/x-www-form-urlencoded',
-                'Origin': 'https://live-melcloudhome.auth.eu-west-1.amazoncognito.com',
-                'Referer': actionUrl
             },
             maxRedirects: 0,
-            validateStatus: status => status >= 200 && status < 400
-        }).catch(err => {
-            if (err.response && err.response.status >= 300 && err.response.status < 400) return err.response;
-            throw err;
-        });
+            validateStatus: s => s >= 200 && s < 400
+        }).catch(err => err.response || err);
 
-        const locationHeader = resp.headers.location;
+        // 5. Szukamy authorization code w redirect
+        const locationHeader = resp.headers?.location;
         if (locationHeader && locationHeader.startsWith('melcloudhome://')) {
             const codeMatch = locationHeader.match(/[?&]code=([^&]+)/);
             if (codeMatch) return codeMatch[1];
         }
 
-        const bodyCodeMatch = resp.data.match(/melcloudhome:\/\/[^"'\s]*[?&]code=([^&"'\s]+)/);
+        // 6. Albo w body (czasami JS redirect)
+        const bodyCodeMatch = resp.data?.match(/melcloudhome:\/\/[^"'\s]*[?&]code=([^&"'\s]+)/);
         if (bodyCodeMatch) return bodyCodeMatch[1];
 
-        throw new Error('No authorization code found in form_post callback');
+        throw new Error('No authorization code found after login');
     }
 
     async exchangeCodeForTokens(code, codeVerifier) {