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

package/package.json

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

package/src/melcloud.js

@@ -283,61 +283,41 @@ class MelCloud extends EventEmitter {
     async connectToMelCloudHome() {
         let browser;
         try {
-            browser = await puppeteer.launch({
-                headless: true,
-                args: ['--no-sandbox', '--disable-setuid-sandbox']
-            });
-
+            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' })
-            ]);
+            // 1. Otwórz stronę logowania
+            await page.goto('https://app.melcloud.com/Mitsubishi.Wifi.Client/Login', { 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 });
+            // 2. Kliknij login (jeżeli strona główna ma przycisk)
+            const loginBtn = await page.$x("//button[contains(text(), 'Log In') or contains(text(), 'Zaloguj')]");
+            if (loginBtn.length) await loginBtn[0].click();
+
+            // 3. Wypełnij login i hasło
+            await page.waitForSelector('input[name="username"]', { timeout: 5000 });
+            await page.type('input[name="username"]', user, { delay: 50 });
+            await page.type('input[name="password"]', 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' })
-            ]);
+            await submitBtn?.click();
 
-            // Wyłapanie kodu z URL
+            // 4. Czekamy na przekierowanie z 'code' w URL
+            await page.waitForFunction(() => window.location.href.includes('code'), { timeout: 15000 });
             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()
+            const authCode = new URL(currentUrl).searchParams.get('code');
+
+            if (!authCode) throw new Error('Authorization code not found in URL');
+
+            // 5. Wymień code na access_token
+            const tokenResponse = await axios.post('https://app.melcloud.com/Mitsubishi.Wifi.Client/OAuth/Token', new URLSearchParams({
+                client_id: clientId,
+                grant_type: 'authorization_code',
+                code: authCode,
+                redirect_uri: 'melcloudhome://'
+            }).toString(), {
+                headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
             });
 
-            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 {