homebridge-melcloud-control 4.0.0-beta.260 → 4.0.0-beta.262

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "MELCloud Control",
   "name": "homebridge-melcloud-control",
-  "version": "4.0.0-beta.260",
+  "version": "4.0.0-beta.262",
   "description": "Homebridge plugin to control Mitsubishi Air Conditioner, Heat Pump and Energy Recovery Ventilation.",
   "license": "MIT",
   "author": "grzegorz914",
@@ -42,7 +42,8 @@
     "puppeteer": "^24.26.1",
     "axios-cookiejar-support": "^6.0.4",
     "tough-cookie": "^6.0.0",
-    "cheerio": "^1.1.2"
+    "cheerio": "^1.1.2",
+    "node-fetch": "^3.3.2"
   },
   "keywords": [
     "homebridge",

package/src/melcloud.js

@@ -7,6 +7,8 @@ import MelCloudHomeToken from './melcloudhometoken.js';
 import ImpulseGenerator from './impulsegenerator.js';
 import Functions from './functions.js';
 import { ApiUrls, ApiUrlsHome } from './constants.js';
+import fetch from 'node-fetch';
+import { URLSearchParams } from 'url';
 
 class MelCloud extends EventEmitter {
     constructor(accountType, user, passwd, language, accountFile, buildingsFile, devicesFile, logWarn, logDebug, requestConfig) {
@@ -175,14 +177,6 @@ class MelCloud extends EventEmitter {
     }
 
     // MELCloud Home
-    async connectToMelCloudHome() {
-        const oauth = new MelCloudHomeToken();
-        this.tokens = await oauth.getTokensWithCredentials(this.user, this.passwd);
-        this.emit('warn', `Token ${JSON.stringify(this.tokens, null, 2)}`);
-        //this.axiosInstance.defaults.headers['Authorization'] = `Bearer ${this.tokens.accessToken}`;
-        return false;
-    }
-
     async checkMelcloudHomeDevicesList(contextKey) {
         try {
             const axiosInstance = axios.create({
@@ -286,6 +280,79 @@ class MelCloud extends EventEmitter {
         }
     }
 
+    async connectToMelCloudHome() {
+        let browser;
+        try {
+            browser = await puppeteer.launch({
+                headless: true,
+                args: ['--no-sandbox', '--disable-setuid-sandbox']
+            });
+
+            const page = await browser.newPage();
+            await page.goto(ApiUrlsHome.BaseURL, { waitUntil: 'networkidle2' });
+
+            // Kliknięcie przycisku logowania
+            const loginBtn = await page.$x("//button[contains(text(),'Log In') or contains(text(),'Zaloguj')]");
+            if (loginBtn.length === 0) throw new Error('Login button not found');
+            await Promise.all([
+                loginBtn[0].click(),
+                page.waitForNavigation({ waitUntil: 'networkidle2' })
+            ]);
+
+            // Wpisanie loginu i hasła
+            await page.type('input[name="username"]', this.user, { delay: 50 });
+            await page.type('input[name="password"]', this.passwd, { delay: 50 });
+
+            // Kliknięcie submit
+            const submitBtn = await page.$('input[type="submit"]');
+            if (!submitBtn) throw new Error('Submit button not found');
+            await Promise.all([
+                submitBtn.click(),
+                page.waitForNavigation({ waitUntil: 'networkidle2' })
+            ]);
+
+            // Wyłapanie kodu z URL
+            const currentUrl = page.url();
+            const codeMatch = currentUrl.match(/[?&]code=([^&]+)/);
+            if (!codeMatch) throw new Error('Authorization code not found in URL');
+            const authorizationCode = codeMatch[1];
+
+            // Zamknięcie przeglądarki
+            await browser.close();
+
+            // Pobranie tokenów
+            const params = new URLSearchParams();
+            params.append('grant_type', 'authorization_code');
+            params.append('code', authorizationCode);
+            params.append('client_id', 'melCloudWeb');
+            params.append('redirect_uri', 'melcloudhome://');
+
+            const tokenResp = await fetch('https://auth.melcloudhome.com/connect/token', {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+                body: params.toString()
+            });
+
+            if (!tokenResp.ok) {
+                const errText = await tokenResp.text();
+                throw new Error(`Token request failed: ${errText}`);
+            }
+
+            const tokenData = await tokenResp.json();
+            this.emit('debug', `Token: ${JSON.stringify(tokenData, null, 2)}`);
+            return {
+                accessToken: tokenData.access_token,
+                refreshToken: tokenData.refresh_token,
+                expiresIn: tokenData.expires_in
+            };
+
+        } catch (error) {
+            if (browser) await browser.close().catch(() => { });
+            throw error;
+        }
+    }
+
+
     async connectToMelCloudHome1(refresh = false) {
         if (this.logDebug) this.emit('debug', `Connecting to MELCloud Home`);