homebridge-melcloud-control 4.0.0-beta.332 → 4.0.0-beta.334

package/package.json

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

package/src/melcloud.js

@@ -294,9 +294,13 @@ class MelCloud extends EventEmitter {
                 .on('error', error => this.emit('error', error));
 
             const data = await melCloudHomeToken.buildAuthorizeUrl();
-            const cookies = await melCloudHomeToken.loginToMelCloudHome(data.url);
 
-            const accountInfo = { ContextKey: cookies, UseFahrenheit: false };
+            const url = data.url;
+            const codeVerifier = data.codeVerifier;
+            const code = await melCloudHomeToken.loginToMelCloudHome(url);
+            const token = await melCloudHomeToken.getTokens(code, codeVerifier);
+
+            const accountInfo = { ContextKey: token, UseFahrenheit: false };
             this.contextKey = cookies;
 
             return accountInfo

package/src/melcloudhometoken.js

@@ -3,6 +3,7 @@ import crypto from 'crypto';
 import { wrapper } from 'axios-cookiejar-support';
 import { CookieJar } from 'tough-cookie';
 import { JSDOM } from 'jsdom';
+import QueryString from 'querystring';
 import EventEmitter from 'events';
 
 const MOBILE_USER_AGENT = 'MonitorAndControl.App.Mobile/35 CFNetwork/3860.100.1 Darwin/25.0.0';
@@ -84,6 +85,33 @@ class MelCloudHomeToken extends EventEmitter {
     }
 
     async getTokens(code, codeVerifier) {
+        try {
+            const payload = {
+                "client_id": CLIENT_ID,
+                "grant_type": 'authorization_code',
+                "scope": SCOPE,
+                "code": code,
+                "redirect_uri": REDIRECT_URI,
+                "code_verifier": codeVerifier
+            }
+
+            const postData = QueryString.stringify(payload);
+            const headers = { 'Content-Type': 'application/x-www-form-urlencoded' };
+            const response = await axios.post(TOKEN_ENDPOINT, postData, headers);
+            const accessToken = response.data;
+            this.emit('warn', `Token ${tokenResponse.data}`);
+
+
+            //accessToken.issued = new Date().toISOString();
+            //this.tokens.oauth = accessToken;
+            //await this.functions.saveData(this.tokensFile, this.tokens);
+            return accessToken;
+        } catch (error) {
+            throw new Error(`Access token error: ${error}`);
+        }
+    }
+
+    async getTokens1(code, codeVerifier) {
         try {
             const tokenResponse = await axios.post(TOKEN_ENDPOINT, new URLSearchParams({
                 grant_type: 'authorization_code',
@@ -132,7 +160,7 @@ class MelCloudHomeToken extends EventEmitter {
             form.append('cognitoAsfData', '');
             form.append('_csrf', csrf);
 
-             if (this.logWarn) this.emit('warn', `Redirect URL: ${url}`);
+            if (this.logWarn) this.emit('warn', `Redirect URL: ${url}`);
 
             // Step 3: Wyślij POST z danymi logowania
             const response = await axios.post(url, form.toString(), {
@@ -152,34 +180,12 @@ class MelCloudHomeToken extends EventEmitter {
                 const redirectUrl = response.headers.location;
                 if (this.logWarn) this.emit('warn', `Redirect URL: ${redirectUrl}`);
 
-                // 🔹 wykonaj GET na redirect URL (tam ustawiane są C1/C2)
-                const finalResp = await axios.get(redirectUrl, {
-                    headers: {
-                        'User-Agent': MOBILE_USER_AGENT,
-                    },
-                    maxRedirects: 0,
-                    validateStatus: s => [200, 302].includes(s),
-                });
-
-                if (this.logWarn) this.emit('warn', `Redirect URL: ${finalResp}`);
-
-                const finalCookies = finalResp.headers['set-cookie'] || [];
-                const c1 = finalCookies.find(c => c.startsWith('__Secure-monitorandcontrolC1='))?.split(';')[0];
-                const c2 = finalCookies.find(c => c.startsWith('__Secure-monitorandcontrolC2='))?.split(';')[0];
-
-                if (c1 && c2) {
-                    const cookieHeader = ['__Secure-monitorandcontrol=chunks-2', c1, c2].join('; ');
-                    if (this.logWarn) this.emit('warn', `Cookie returned: ${cookieHeader}`);
-
-                    return 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 {
-                    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;
                 }