homebridge-melcloud-control 4.0.0-beta.367 → 4.0.0-beta.369

package/package.json

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

package/src/melcloudhometoken.js

@@ -4,7 +4,6 @@ import { wrapper } from 'axios-cookiejar-support';
 import { CookieJar } from 'tough-cookie';
 import { JSDOM } from 'jsdom';
 import EventEmitter from 'events';
-import { ApiUrls, ApiUrlsHome } from './constants.js';
 
 const MOBILE_USER_AGENT = 'MonitorAndControl.App.Mobile/35 CFNetwork/3860.100.1 Darwin/25.0.0';
 const CLIENT_ID = 'homemobile';
@@ -22,8 +21,7 @@ class MelCloudHomeToken extends EventEmitter {
         this.logError = config.logError;
 
         const jar = new CookieJar();
-        this.client = wrapper(axios.create({ jar, withCredentials: true }));
-        this.client.defaults.headers['User-Agent'] = MOBILE_USER_AGENT;
+        this.axiosInstance = wrapper(axios.create({ jar, withCredentials: true }));
     }
 
     generatePKCE() {
@@ -37,7 +35,11 @@ class MelCloudHomeToken extends EventEmitter {
     }
 
     async getLoginPage(authUrl) {
-        const res = await this.client.get(authUrl, { maxRedirects: 10 });
+        const res = await this.axiosInstance({
+            method: 'GET',
+            baseURL: authUrl,
+            maxRedirects: 10
+        });
         return { url: res.request.res.responseUrl };
     }
 
@@ -94,11 +96,15 @@ class MelCloudHomeToken extends EventEmitter {
                 code_verifier: codeVerifier,
             });
 
-            const tokenResponse = await this.client.post(TOKEN_ENDPOINT, tokenData.toString(), {
+            const tokenResponse = await this.axiosInstance({
+                method: 'POST',
+                baseURL: TOKEN_ENDPOINT,
                 headers: {
                     'Content-Type': 'application/x-www-form-urlencoded',
+                    'Content-Length': tokenData.toString().length,
                     'Authorization': 'Basic aG9tZW1vYmlsZTo=',
                 },
+                data: tokenData.toString()
             });
 
             const tokens = tokenResponse.data;
@@ -112,8 +118,11 @@ class MelCloudHomeToken extends EventEmitter {
     async loginToMelCloudHome(url) {
         try {
             // Step 1: Pobierz stronę logowania, żeby uzyskać sesję + token _csrf
-            const getResp = await this.client.get(url, {
+            const getResp = await this.axiosInstance({
+                method: 'GET',
+                baseURL: url,
                 headers: {
+                    'User-Agent': MOBILE_USER_AGENT,
                     'Accept': 'text/html',
                 },
                 withCredentials: true,
@@ -137,8 +146,11 @@ class MelCloudHomeToken extends EventEmitter {
             if (this.logWarn) this.emit('warn', `Redirect URL: ${url}`);
 
             // Step 3: Wyślij POST z danymi logowania
-            const response = await this.client.post(url, formData.toString(), {
+            const response = await this.axiosInstance({
+                method: 'POST',
+                baseURL: url,
                 headers: {
+                    'User-Agent': MOBILE_USER_AGENT,
                     'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
                     'Accept-Language': 'en-US,en;q=0.9',
                     'Content-Type': 'application/x-www-form-urlencoded',
@@ -147,34 +159,17 @@ class MelCloudHomeToken extends EventEmitter {
                     'Origin': 'https://live-melcloudhome.auth.eu-west-1.amazoncognito.com',
                     'Referer': url,
                 },
+                data: formData.toString(),
                 maxRedirects: 0,
                 validateStatus: status => [200, 302, 400].includes(status),
             });
 
-
+            if (response.status === 400) if (this.logWarn) this.emit('warn', `Login failed (bad request or invalid credentials: ${response.data}`);
             if (response.status === 302 && response.headers.location) {
                 // Login success — mamy redirect z "code="
                 const redirectUrl = response.headers.location;
                 if (this.logWarn) this.emit('warn', `Redirect URL: ${redirectUrl}`);
-
-                const listDevicesData = await this.client.get(ApiUrlsHome.GetUserContext, {
-                    baseURL: ApiUrlsHome.BaseURL,
-                    timeout: 25000,
-                    headers: {
-                        'Accept': '*/*',
-                        'Accept-Language': 'en-US,en;q=0.9',
-                        'User-Agent': 'homebridge-melcloud-control/4.0.0',
-                        'DNT': '1',
-                        'Origin': 'https://melcloudhome.com',
-                        'Referer': 'https://melcloudhome.com/dashboard',
-                        'Sec-Fetch-Dest': 'empty',
-                        'Sec-Fetch-Mode': 'cors',
-                        'Sec-Fetch-Site': 'same-origin',
-                        'X-CSRF': '1'
-                    }
-                });
-                const buildingsList = listDevicesData.data.buildings;
-                if (this.logDebug) this.emit('debug', `Buildings: ${JSON.stringify(buildingsList, null, 2)}`);
+                if (this.logWarn) this.emit('warn', `Response headers: ${response.headers}`);
 
                 const match = redirectUrl.match(/[?&]code=([^&]+)/);
                 if (match) {
@@ -187,8 +182,6 @@ class MelCloudHomeToken extends EventEmitter {
                 }
             }
 
-            if (response.status === 400) if (this.logWarn) this.emit('warn', `Login failed (bad request or invalid credentials: ${response.data}`);
-
             return null;
         } catch (error) {
             throw new Error(`Login to MELCloud Home error: ${error}`);