homebridge-melcloud-control 4.3.11-beta.21 → 4.3.11-beta.22

package/package.json

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

package/src/melcloudhomeauth.js

@@ -6,103 +6,104 @@ import qs from 'qs';
 
 const BASE_URL = 'https://melcloudhome.com'; // lub właściwe dla Home
 const USER_AGENT =
-  'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/142.0.0.0 Safari/537.36';
+    'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/142.0.0.0 Safari/537.36';
 
 export class MELCloudHomeAuth {
-  constructor() {
-    this.jar = new CookieJar();
-    this.client = wrapper(
-      axios.create({
-        jar: this.jar,
-        withCredentials: true,
-        headers: {
-          'User-Agent': USER_AGENT,
-          Accept:
-            'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8',
-          'Accept-Language': 'en-US,en;q=0.9',
-        },
-        maxRedirects: 0,
-        validateStatus: (status) => status >= 200 && status < 400,
-      })
-    );
-    this.authenticated = false;
-  }
-
-  async login(username, password) {
-    try {
-      // 1. GET login page to get CSRF token
-      let resp = await this.client.get(`${BASE_URL}/bff/login`, {
-        params: { returnUrl: '/dashboard' },
-      });
-
-      // Follow redirect to Cognito
-      let finalUrl = resp.request.res.responseUrl;
-      if (!finalUrl.includes('.amazoncognito.com')) {
-        throw new Error('Unexpected redirect URL: ' + finalUrl);
-      }
-
-      // Extract CSRF token from HTML
-      const csrfToken = this.extractCsrfToken(resp.data);
-      if (!csrfToken) throw new Error('CSRF token not found');
-
-      // 2. POST credentials to Cognito
-      const loginData = qs.stringify({
-        _csrf: csrfToken,
-        username,
-        password,
-        cognitoAsfData: '', // minimal value, może być potrzebne pełne ASF
-      });
-
-      resp = await this.client.post(finalUrl, loginData, {
-        headers: {
-          'Content-Type': 'application/x-www-form-urlencoded',
-          Origin: 'https://live-melcloudhome.auth.eu-west-1.amazoncognito.com',
-          Referer: finalUrl,
-        },
-        maxRedirects: 5,
-      });
-
-      finalUrl = resp.request.res.responseUrl;
-
-      // Sprawdzenie czy udało się zalogować
-      if (
-        finalUrl.includes('melcloudhome.com/dashboard') &&
-        resp.status < 400
-      ) {
-        console.log('Authentication successful');
-        this.authenticated = true;
-        return true;
-      }
-
-      throw new Error('Authentication failed, final URL: ' + finalUrl);
-    } catch (err) {
-      throw new Error('Login error: ' + err.message);
+    constructor() {
+        this.jar = new CookieJar();
+        this.client = wrapper(
+            axios.create({
+                jar: this.jar,
+                withCredentials: true,
+                headers: {
+                    'User-Agent': USER_AGENT,
+                    Accept:
+                        'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8',
+                    'Accept-Language': 'en-US,en;q=0.9',
+                },
+                maxRedirects: 0,
+                validateStatus: (status) => status >= 200 && status < 400,
+            })
+        );
+        this.authenticated = false;
     }
-  }
-
-  extractCsrfToken(html) {
-    const dom = new JSDOM(html);
-    const input = dom.window.document.querySelector('input[name="_csrf"]');
-    return input?.value || null;
-  }
-
-  async checkSession() {
-    if (!this.authenticated) return false;
-
-    try {
-      const resp = await this.client.get(`${BASE_URL}/api/user/context`, {
-        headers: { 'x-csrf': '1', Referer: `${BASE_URL}/dashboard` },
-      });
-      return resp.status === 200;
-    } catch {
-      this.authenticated = false;
-      return false;
+
+    async login(username, password) {
+        try {
+            // 1. GET login page to get CSRF token
+            let resp = await this.client.get(`${BASE_URL}/bff/login`, {
+                params: { returnUrl: '/dashboard' },
+                maxRedirects: 5, // pozwala axios śledzić redirecty
+            });
+
+            // finalny URL po redirectach
+            let finalUrl = resp.request?.res?.responseUrl || resp.request?.path || '';
+            if (!finalUrl.includes('.amazoncognito.com')) {
+                throw new Error('Unexpected redirect URL: ' + finalUrl);
+            }
+
+            // Extract CSRF token from HTML
+            const csrfToken = this.extractCsrfToken(resp.data);
+            if (!csrfToken) throw new Error('CSRF token not found');
+
+            // 2. POST credentials to Cognito
+            const loginData = qs.stringify({
+                _csrf: csrfToken,
+                username,
+                password,
+                cognitoAsfData: '', // minimal value, może być potrzebne pełne ASF
+            });
+
+            resp = await this.client.post(finalUrl, loginData, {
+                headers: {
+                    'Content-Type': 'application/x-www-form-urlencoded',
+                    Origin: 'https://live-melcloudhome.auth.eu-west-1.amazoncognito.com',
+                    Referer: finalUrl,
+                },
+                maxRedirects: 5,
+            });
+
+            finalUrl = resp.request.res.responseUrl;
+
+            // Sprawdzenie czy udało się zalogować
+            if (
+                finalUrl.includes('melcloudhome.com/dashboard') &&
+                resp.status < 400
+            ) {
+                console.log('Authentication successful');
+                this.authenticated = true;
+                return true;
+            }
+
+            throw new Error('Authentication failed, final URL: ' + finalUrl);
+        } catch (err) {
+            throw new Error('Login error: ' + err.message);
+        }
+    }
+
+    extractCsrfToken(html) {
+        const dom = new JSDOM(html);
+        const input = dom.window.document.querySelector('input[name="_csrf"]');
+        return input?.value || null;
     }
-  }
 
-  getCookies() {
-    return this.jar.toJSON();
-  }
+    async checkSession() {
+        if (!this.authenticated) return false;
+
+        try {
+            const resp = await this.client.get(`${BASE_URL}/api/user/context`, {
+                headers: { 'x-csrf': '1', Referer: `${BASE_URL}/dashboard` },
+            });
+            return resp.status === 200;
+        } catch {
+            this.authenticated = false;
+            return false;
+        }
+    }
+
+    getCookies() {
+        return this.jar.toJSON();
+    }
 }