homebridge-melcloud-control 4.0.0-beta.249 → 4.0.0-beta.250

package/package.json

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

package/src/melcloudhometoken.js

@@ -43,7 +43,6 @@ class MelCloudHomeToken {
             if (cookies.length > 0) reqOptions.headers['Cookie'] = cookies.join('; ');
 
             const req = https.request(reqOptions, (res) => {
-                // Collect Set-Cookie
                 const setCookie = res.headers['set-cookie'];
                 if (setCookie) {
                     setCookie.forEach(c => {
@@ -54,7 +53,6 @@ class MelCloudHomeToken {
                     });
                 }
 
-                // Follow redirects
                 if ([301, 302, 303].includes(res.statusCode) && res.headers.location) {
                     const redirectUrl = res.headers.location.startsWith('http')
                         ? res.headers.location
@@ -91,11 +89,11 @@ class MelCloudHomeToken {
         return { form, cookies: resp.cookies, loginPageUrl: resp.finalUrl };
     }
 
-    // --- Submit login and handle form_post ---
+    // --- Submit login with debug ---
     async submitLogin(form, email, password, cookies, loginPageUrl) {
         console.log('Submitting login credentials...');
 
-        // Step 1: Collect all hidden inputs
+        // 1️⃣ Zbieramy wszystkie hidden inputy
         const formData = new URLSearchParams();
         form.querySelectorAll('input').forEach(input => {
             const name = input.getAttribute('name');
@@ -106,61 +104,75 @@ class MelCloudHomeToken {
         formData.set('username', email);
         formData.set('password', password);
 
+        console.log('Login form data (hidden + credentials):');
+        for (const [key, value] of formData.entries()) {
+            console.log(`  ${key} = ${value}`);
+        }
+
         const actionUrl = new URL(form.getAttribute('action'), loginPageUrl).toString();
         const resp = await this.httpsRequest(actionUrl, {
             method: 'POST',
             headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
         }, formData.toString(), cookies);
 
-        // Step 2: Check if body contains hidden form_post
-        const dom = new JSDOM(resp.html);
-        const postForm = dom.window.document.querySelector('form');
+        // 2️⃣ Obsługa form_post (Cognito auto-submit)
+        const domPost = new JSDOM(resp.html);
+        const postForm = domPost.window.document.querySelector('form');
         if (postForm) {
-            // Collect all hidden inputs from form_post
             const postData = new URLSearchParams();
             postForm.querySelectorAll('input').forEach(input => {
                 const name = input.getAttribute('name');
                 if (name) postData.append(name, input.getAttribute('value') || '');
             });
 
+            console.log('Form_post hidden inputs:');
+            for (const [key, value] of postData.entries()) {
+                console.log(`  ${key} = ${value}`);
+            }
+
             const postAction = new URL(postForm.getAttribute('action'), resp.finalUrl).toString();
             const postResp = await this.httpsRequest(postAction, {
                 method: 'POST',
                 headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
             }, postData.toString(), cookies);
 
-            // Try to extract code from redirect URL
-            const codeMatch = postResp.finalUrl.match(/[?&]code=([^&]+)/);
-            if (codeMatch) return codeMatch[1];
+            // 3️⃣ Wyciągamy authorization code
+            let codeMatch = postResp.finalUrl.match(/[?&]code=([^&]+)/);
+            if (!codeMatch) codeMatch = postResp.html.match(/melcloudhome:\/\/[^"'\s]*[?&]code=([^&"'\s]+)/);
 
-            // Or from body (JS redirect)
-            const codeFromBody = postResp.html.match(/melcloudhome:\/\/[^"'\s]*[?&]code=([^&"'\s]+)/);
-            if (codeFromBody) return codeFromBody[1];
+            if (codeMatch) {
+                const code = codeMatch[1];
+                console.log(`Authorization code obtained: ${code}`);
+                return code;
+            }
         }
 
-        // Fallback: check resp finalUrl or body
-        const codeMatch = resp.finalUrl.match(/[?&]code=([^&]+)/);
-        if (codeMatch) return codeMatch[1];
-        const codeFromBody = resp.html.match(/melcloudhome:\/\/[^"'\s]*[?&]code=([^&"'\s]+)/);
-        if (codeFromBody) return codeFromBody[1];
+        // Fallback: sprawdzamy resp finalUrl i body
+        let codeMatch = resp.finalUrl.match(/[?&]code=([^&]+)/);
+        if (!codeMatch) codeMatch = resp.html.match(/melcloudhome:\/\/[^"'\s]*[?&]code=([^&"'\s]+)/);
+        if (codeMatch) {
+            const code = codeMatch[1];
+            console.log(`Authorization code obtained: ${code}`);
+            return code;
+        }
 
         throw new Error('No authorization code found after login');
     }
 
-    // --- Exchange code for tokens ---
+    // --- Exchange code for tokens (debug) ---
     async exchangeCodeForTokens(code, codeVerifier) {
-         console.log('Exchanging authorization code for tokens...');
+        console.log('Exchanging authorization code for tokens...');
+        console.log(`Authorization code: ${code}`);
+        console.log(`Code verifier: ${codeVerifier}`);
 
-        // Dane POST do token endpoint
         const tokenData = new URLSearchParams({
             grant_type: 'authorization_code',
             code,
-            redirect_uri: REDIRECT_URI,   // musi być dokładnie ten sam co w authorize URL
+            redirect_uri: REDIRECT_URI,
             client_id: CLIENT_ID,
             code_verifier: codeVerifier,
         });
 
-        // Wysyłamy POST bez Basic Auth (PKCE wystarczy)
         const resp = await this.httpsRequest(TOKEN_ENDPOINT, {
             method: 'POST',
             headers: {
@@ -169,33 +181,23 @@ class MelCloudHomeToken {
             }
         }, tokenData.toString());
 
-        // Parsujemy odpowiedź
+        console.log('Token endpoint response:', resp.html);
+
         let tokens;
-        try {
-            tokens = JSON.parse(resp.html);
-        } catch (err) {
-             console.log('Failed to parse token response:', resp.html);
-            throw err;
-        }
+        try { tokens = JSON.parse(resp.html); }
+        catch (err) { console.log('Failed to parse token response'); throw err; }
 
         if (tokens.error) {
-             console.log('Token response error:', tokens);
+           console.log('Token response error:', tokens);
             throw new Error(`Token exchange failed: ${tokens.error_description || tokens.error}`);
         }
 
-        return {
-            accessToken: tokens.access_token,
-            refreshToken: tokens.refresh_token,
-            expiresIn: tokens.expires_in,
-            idToken: tokens.id_token,
-        };
+        return tokens;
     }
 
-
     // --- Main flow ---
     async getTokensWithCredentials(email, password) {
         console.log('Obtaining OAuth tokens automatically...');
-
         const pkce = this.generatePKCE();
         const state = this.generateState();
 
@@ -208,17 +210,14 @@ class MelCloudHomeToken {
         authUrl.searchParams.set('code_challenge_method', 'S256');
         authUrl.searchParams.set('state', state);
 
-        // 1️⃣ Get login page
         const { form, cookies, loginPageUrl } = await this.getLoginPage(authUrl.toString());
-
-        // 2️⃣ Submit login + handle form_post
         const authCode = await this.submitLogin(form, email, password, cookies, loginPageUrl);
-
-        // 3️⃣ Exchange code for tokens
         const tokens = await this.exchangeCodeForTokens(authCode, pkce.verifier);
+
         console.log('✓ Successfully obtained OAuth tokens');
         return tokens;
     }
+
 }
 
 export default MelCloudHomeToken;