homebridge-melcloud-control 4.0.0-beta.360 → 4.0.0-beta.361

package/package.json

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

package/src/melcloud.js

@@ -298,7 +298,7 @@ class MelCloud extends EventEmitter {
             const url = data.url;
             const codeVerifier = data.codeVerifier;
             const code = await melCloudHomeToken.loginToMelCloudHome(url);
-            //const token = await melCloudHomeToken.getTokens(code, codeVerifier);
+            const token = await melCloudHomeToken.getTokens(code, codeVerifier);
 
             const accountInfo = { ContextKey: code, UseFahrenheit: false };
             this.contextKey = code;

package/src/melcloudhometoken.js

@@ -94,7 +94,7 @@ class MelCloudHomeToken extends EventEmitter {
                 code_verifier: codeVerifier,
             });
 
-            const tokenResponse = await axios.post(TOKEN_ENDPOINT, tokenData.toString(), {
+            const tokenResponse = await this.client.post(TOKEN_ENDPOINT, tokenData.toString(), {
                 headers: {
                     'Content-Type': 'application/x-www-form-urlencoded',
                     'Authorization': 'Basic aG9tZW1vYmlsZTo=',
@@ -111,58 +111,70 @@ class MelCloudHomeToken extends EventEmitter {
 
     async loginToMelCloudHome(url) {
         try {
-
-            const jar = new CookieJar();
-            const client = wrapper(axios.create({ jar, withCredentials: true }));
-            client.defaults.headers['User-Agent'] = MOBILE_USER_AGENT;
-
-            // --- Krok 1: GET strony logowania ---
-            const getResp = await client.get(url, {
-                headers: { 'User-Agent': MOBILE_USER_AGENT }
+            // Step 1: Pobierz stronę logowania, żeby uzyskać sesję + token _csrf
+            const getResp = await this.client.get(url, {
+                headers: {
+                    'User-Agent': MOBILE_USER_AGENT,
+                    'Accept': 'text/html',
+                },
+                withCredentials: true,
             });
 
+            const cookies = getResp.headers['set-cookie'] || [];
             const dom = new JSDOM(getResp.data);
-            const csrf = dom.window.document.querySelector('input[name="_csrf"]')?.getAttribute('value');
-            if (!csrf) throw new Error('CSRF token not found');
+            const csrf = dom.window.document.querySelector('input[name="_csrf"]')?.value;
+            if (!csrf) {
+                if (this.logWarn) this.emit('warn', `CSRF token not found`);
+                return null;
+            }
 
-            // --- Krok 2: POST login ---
+            // Step 2: Przygotuj dane logowania
             const formData = new URLSearchParams({
                 _csrf: csrf,
                 username: this.user,
-                password: this.passwd
-            }).toString();
+                password: this.passwd,
+            });
+
+            if (this.logWarn) this.emit('warn', `Redirect URL: ${url}`);
 
-            const postResp = await client.post(url, formData, {
+            // Step 3: Wyślij POST z danymi logowania
+            const response = await this.client.post(url, formData.toString(), {
                 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',
+                    'Content-Length': formData.toString().length,
+                    'Cookie': cookies,
                     'Origin': 'https://live-melcloudhome.auth.eu-west-1.amazoncognito.com',
                     'Referer': url,
                 },
                 maxRedirects: 0,
-                validateStatus: status => [200, 302, 400].includes(status)
+                validateStatus: status => [200, 302, 400].includes(status),
             });
 
-            if (postResp.status === 400) throw new Error('Login failed');
-
-            // --- Krok 3: GET dashboard po zalogowaniu ---
-            const dashboardResp = await client.get('https://melcloudhome.com/dashboard', {
-                headers: { 'User-Agent': MOBILE_USER_AGENT }
-            });
 
-             this.emit('warn', `1 ${dashboardResp.data}, ${dashboardResp.headers}`);
+            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}`);
 
-            // --- Krok 4: Pobierz cookies z dashboard ---
-            const dashboardCookies = await jar.getCookies('https://melcloudhome.com/dashboard');
-             this.emit('warn', `2 ${dashboardCookies}`);
 
-            // Możemy zwrócić jako string do użycia w nagłówku:
-            const cookieHeader = dashboardCookies.map(c => `${c.key}=${c.value}`).join('; ');
 
-            this.emit('warn', `Cookies ${cookieHeader}`);
+                const match = redirectUrl.match(/[?&]code=([^&]+)/);
+                if (match) {
+                    const code = match[1];
+                    if (this.logWarn) this.emit('warn', `Redirect URL found code: ${code}`);
+                    return code;
+                } else {
+                    if (this.logWarn) this.emit('warn', `Redirect URL found, but no "code=" param: ${redirectUrl}`);
+                    return null;
+                }
+            }
 
-            return dashboardCookies.map(c => `${c.key}=${c.value}`);
+            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}`);
         }