homebridge-melcloud-control 4.0.0-beta.354 → 4.0.0-beta.356

package/package.json

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

package/src/melcloudhometoken.js

@@ -111,81 +111,54 @@ class MelCloudHomeToken extends EventEmitter {
 
     async loginToMelCloudHome(url) {
         try {
-            // Step 1: Pobierz stronę logowania, żeby uzyskać sesję + token _csrf
-            const getResp = await axios.get(url, {
-                headers: {
-                    'User-Agent': MOBILE_USER_AGENT,
-                    'Accept': 'text/html',
-                },
-                withCredentials: true,
+
+            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 }
             });
 
-            const cookies = getResp.headers['set-cookie'] || [];
             const dom = new JSDOM(getResp.data);
-            const csrf = dom.window.document.querySelector('input[name="_csrf"]')?.value;
-            if (!csrf) {
-                if (this.logWarn) this.emit('warn', `CSRF token not found`);
-                return null;
-            }
+            const csrf = dom.window.document.querySelector('input[name="_csrf"]')?.getAttribute('value');
+            if (!csrf) throw new Error('CSRF token not found');
 
-            // Step 2: Przygotuj dane logowania
+            // --- Krok 2: POST login ---
             const formData = new URLSearchParams({
                 _csrf: csrf,
                 username: this.user,
-                password: this.passwd,
-            });
+                password: this.passwd
+            }).toString();
 
-            if (this.logWarn) this.emit('warn', `Redirect URL: ${url}`);
-
-            // Step 3: Wyślij POST z danymi logowania
-            const response = await axios.post(url, formData.toString(), {
+            const postResp = await client.post(url, formData, {
                 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');
 
-            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 getResp = await axios.get('https://melcloudhome.com/dashboard', {
-                    headers: {
-                        'User-Agent': MOBILE_USER_AGENT,
-                        'Accept': 'text/html',
-                    },
-                    withCredentials: true,
-                });
-
-                // --- Krok 3: GET dashboard po zalogowaniu ---
-                const dashboardResp = await axios.get('https://melcloudhome.com/dashboard', {
-                    headers: { 'User-Agent': MOBILE_USER_AGENT }
-                });
-
-                // --- Krok 4: Pobierz cookies z dashboard ---
-                const dashboardCookies = await jar.getCookies('https://melcloudhome.com/dashboard');
-                // Możemy zwrócić jako string do użycia w nagłówku:
-                const cookieHeader = dashboardCookies.map(c => `${c.key}=${c.value}`).join('; ');
+            // --- Krok 3: GET dashboard po zalogowaniu ---
+            const dashboardResp = await client.get('https://melcloudhome.com/dashboard', {
+                headers: { 'User-Agent': MOBILE_USER_AGENT }
+            });
 
-                const cookies = dashboardCookies.map(c => `${c.key}=${c.value}`);
+            // --- Krok 4: Pobierz cookies z dashboard ---
+            const dashboardCookies = await jar.getCookies('https://melcloudhome.com/dashboard');
+            // Możemy zwrócić jako string do użycia w nagłówku:
+            const cookieHeader = dashboardCookies.map(c => `${c.key}=${c.value}`).join('; ');
 
-                if (this.logWarn) this.emit('warn', `Response: ${dashboardResp.data}, ${dashboardResp.headers}, ${cookies}`);
-                return cookies
-            }
+            this.emit('debug', `Cookies ${cookieHeader}`);
 
-            if (response.status === 400) if (this.logWarn) this.emit('warn', `Login failed (bad request or invalid credentials: ${response.data}`);
+            return dashboardCookies.map(c => `${c.key}=${c.value}`);
 
-            return null;
         } catch (error) {
             throw new Error(`Login to MELCloud Home error: ${error}`);
         }