homebridge-melcloud-control 4.0.0-beta.317 → 4.0.0-beta.319

package/package.json

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

package/src/melcloud.js

@@ -297,6 +297,7 @@ class MelCloud extends EventEmitter {
 
             const data = await melCloudHomeToken.buildAuthorizeUrl();
             const code = await melCloudHomeToken.loginToMelCloudHome(data.url);
+            const token = await melCloudHomeToken.getTokens(code);
 
             return false
 

package/src/melcloudhometoken.js

@@ -83,58 +83,27 @@ class MelCloudHomeToken extends EventEmitter {
         }
     }
 
-    async getTokens(code, codeVerifier) {
+    async getTokens(code) {
         try {
-            const data = new URLSearchParams({
+            const tokenResponse = await axios.post('https://auth.melcloudhome.com/oauth2/token', new URLSearchParams({
                 grant_type: 'authorization_code',
+                client_id: this.clientId,
                 code: code,
-                redirect_uri: REDIRECT_URI,
-                client_id: CLIENT_ID,
-                code_verifier: codeVerifier,
-            });
-
-            const res = await axios({
-                method: 'POST',
-                url: TOKEN_ENDPOINT,
+                redirect_uri: this.redirectUri
+            }).toString(), {
                 headers: {
-                    'Content-Type': 'application/x-www-form-urlencoded',
-                    'Content-Length': data.toString().length
-                },
-                data: data
+                    'Content-Type': 'application/x-www-form-urlencoded'
+                }
             });
-            console.log(res);
-            if (res.status !== 200) {
-                throw new Error(`Token exchange failed: ${res.status} ${res.statusText}`);
-            }
 
-            return res.data;
+            this.emit('warn', `Token ${tokenResponse.data}`);
+            return tokenResponse.data;
         } catch (error) {
             console.error('Failed to obtain OAuth tokens:', error);
             throw error;
         }
     }
 
-    async buildAuthorizeUrl() {
-        try {
-            const pkce = this.generatePKCE();
-            const state = this.generateState();
-            const authUrl = new URL(AUTHORIZE_ENDPOINT);
-            authUrl.searchParams.set('client_id', CLIENT_ID);
-            authUrl.searchParams.set('redirect_uri', REDIRECT_URI);
-            authUrl.searchParams.set('response_type', 'code');
-            authUrl.searchParams.set('scope', SCOPE);
-            authUrl.searchParams.set('code_challenge', pkce.challenge);
-            authUrl.searchParams.set('code_challenge_method', 'S256');
-            authUrl.searchParams.set('state', state);
-
-            const loginPage = await this.getLoginPage(authUrl.toString());
-            const data = { codeVerifier: pkce.verifier, url: loginPage.url }
-            return data;
-        } catch (error) {
-            console.error('Failed to obtain OAuth link:', error);
-            throw error;
-        }
-    }
 
     async loginToMelCloudHome(url) {
         try {
@@ -149,10 +118,29 @@ class MelCloudHomeToken extends EventEmitter {
 
             const cookies = getResp.headers['set-cookie'] || [];
             const dom = new JSDOM(getResp.data);
-            const csrf = dom.window.document.querySelector('input[name="_csrf"]')?.value;
+            const formAction = dom.window.document.querySelector('form[action]')?.getAttribute('action');
+            if (!formAction) {
+                if (this.logWarn) this.emit('warn', `Login form not found in HTML`);
+                return null;
+            }
+
+            const formUrl = new URL(formAction, 'https://auth.melcloudhome.com'); // absolutny URL
+            const clientId = formUrl.searchParams.get('client_id');
+            const redirectUri = formUrl.searchParams.get('redirect_uri');
+
+            if (!clientId || !redirectUri) {
+                if (this.logWarn) this.emit('warn', `client_id or redirect_uri missing in login form`);
+                return null;
+            }
+
+            // Zapisz do this.* żeby użyć później w exchangeCodeForToken()
+            this.clientId = clientId;
+            this.redirectUri = redirectUri;
 
+            const csrf = dom.window.document.querySelector('input[name="_csrf"]')?.value;
             if (!csrf) {
-                throw new Error('CSRF token not found');
+                if (this.logWarn) this.emit('warn', `CSRF token not found`);
+                return null;
             }
 
             // Step 2: Przygotuj dane logowania
@@ -171,43 +159,53 @@ class MelCloudHomeToken extends EventEmitter {
                     'Referer': url,
                     'User-Agent': 'Mozilla/5.0',
                 },
-                maxRedirects: 0, // ważne, bo Cognito robi redirect po sukcesie
+                maxRedirects: 0,
                 validateStatus: status => [200, 302, 400].includes(status),
             });
 
-            this.emit('warn', `No cookie returned from login. Response headers: ${response}`);
-            if (response.status === 302 && postResp.headers.location) {
+            if (response.status === 302 && response.headers.location) {
                 // Login success — mamy redirect z "code="
                 const redirectUrl = response.headers.location;
-                console.log('Login success, redirect URL:', redirectUrl);
-
                 const match = redirectUrl.match(/[?&]code=([^&]+)/);
                 if (match) {
                     const code = match[1];
-                    console.log('Authorization code:', code);
                     return code;
                 } else {
                     console.warn('Redirect URL found, but no "code=" param.');
+                    if (this.logWarn) this.emit('warn', `Redirect URL found, but no "code=" param: ${redirectUrl}`);
                     return null;
                 }
             }
 
-            if (response.status !== 200) {
-                if (this.logError) this.emit('error', `Login failed with status code: ${response.status}`);
-                return null;
-            }
+            if (response.status === 400) if (this.logWarn) this.emit('warn', `Login failed (bad request or invalid credentials: ${response.data}`);
 
-            const cookie = response.headers['set-cookie'];
-            if (!cookie) {
-                if (this.logWarn) this.emit('warn', `No cookie returned from login. Response headers: ${JSON.stringify(response.headers)}`);
-                return null;
-            }
-
-            return cookie;
+            return null;
         } catch (error) {
             throw new Error(`Login to MELCloud Home error: ${error}`);
         }
     }
+
+    async buildAuthorizeUrl() {
+        try {
+            const pkce = this.generatePKCE();
+            const state = this.generateState();
+            const authUrl = new URL(AUTHORIZE_ENDPOINT);
+            authUrl.searchParams.set('client_id', CLIENT_ID);
+            authUrl.searchParams.set('redirect_uri', REDIRECT_URI);
+            authUrl.searchParams.set('response_type', 'code');
+            authUrl.searchParams.set('scope', SCOPE);
+            authUrl.searchParams.set('code_challenge', pkce.challenge);
+            authUrl.searchParams.set('code_challenge_method', 'S256');
+            authUrl.searchParams.set('state', state);
+
+            const loginPage = await this.getLoginPage(authUrl.toString());
+            const data = { codeVerifier: pkce.verifier, url: loginPage.url }
+            return data;
+        } catch (error) {
+            console.error('Failed to obtain OAuth link:', error);
+            throw error;
+        }
+    }
 }
 
 export default MelCloudHomeToken;