homebridge-melcloud-control 4.0.0-beta.4 → 4.0.0-beta.5

package/index.js

@@ -76,7 +76,7 @@ class MelCloudPlatform {
 				const accountFile = `${prefDir}/${accountName}_Account`;
 				const buildingsFile = `${prefDir}/${accountName}_Buildings`;
 				const devicesFile = `${prefDir}/${accountName}_Devices`;
-				const coociesFile = `${prefDir}/${accountName}_Coocies`;
+				const cookiesFile = `${prefDir}/${accountName}cookies`;
 
 
 				//set account refresh interval

package/package.json

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

package/src/melcloud.js

@@ -7,7 +7,7 @@ import Functions from './functions.js';
 import { ApiUrls, ApiUrlsHome } from './constants.js';
 
 class MelCloud extends EventEmitter {
-    constructor(user, passwd, language, accountFile, buildingsFile, devicesFile, coociesFile, logWarn, logDebug, requestConfig) {
+    constructor(user, passwd, language, accountFile, buildingsFile, devicesFile, cookiesFile, logWarn, logDebug, requestConfig) {
         super();
         this.user = user;
         this.passwd = passwd;
@@ -15,7 +15,7 @@ class MelCloud extends EventEmitter {
         this.accountFile = accountFile;
         this.buildingsFile = buildingsFile;
         this.devicesFile = devicesFile;
-        this.coociesFile = coociesFile;
+        this.cookiesFile = cookiesFile;
         this.logWarn = logWarn;
         this.logDebug = logDebug;
         this.requestConfig = requestConfig;
@@ -213,7 +213,7 @@ class MelCloud extends EventEmitter {
         }
     }
 
-    async connectHomeCoocies() {
+    async connectHomeCookies() {
         const loginUrl = new URL('https://live-melcloudhome.auth.eu-west-1.amazoncognito.com/login');
         loginUrl.searchParams.set('client_id', '3g4d5l5kivuqi7oia68gib7uso');
         loginUrl.searchParams.set('redirect_uri', 'https://auth.melcloudhome.com/signin-oidc-meu');
@@ -221,8 +221,6 @@ class MelCloud extends EventEmitter {
         loginUrl.searchParams.set('scope', 'openid profile');
         loginUrl.searchParams.set('response_mode', 'form_post');
 
-
-
         const browser = await puppeteer.launch({
             headless: true,
             args: ['--no-sandbox', '--disable-setuid-sandbox']
@@ -230,65 +228,63 @@ class MelCloud extends EventEmitter {
 
         const page = await browser.newPage();
 
-        // Otwórz stronę logowania
-        this.emit('warn', `Opening login page...`);
-        await page.goto(loginUrl, { waitUntil: 'networkidle2' });
-
-        // Wpisz login i hasło
-        this.emit('warn', `Typing credentials...`);
-        await page.type('input[name="username"]', this.user, { delay: 50 });
-        await page.type('input[name="password"]', this.passwd, { delay: 50 });
-
-        // Sprawdź kilka możliwych wariantów
-        const buttonSelectors = [
-            'button[type="submit"]',
-            'input[type="submit"]',
-            'button[name="signIn"]',
-            'button.btn-primary',
-            'button:has-text("Sign in")',
-            'button:has-text("Zaloguj")'
-        ];
-
-        // Kliknij "Sign in" (przycisk AWS Cognito)
-        let buttonFound = false;
-        for (const selector of buttonSelectors) {
-            const button = await page.$(selector);
-            if (button) {
-                console.log(`Found submit button: ${selector}`);
-                await Promise.all([
-                    button.click(),
-                    page.waitForNavigation({ waitUntil: 'networkidle2', timeout: 15000 })
-                ]);
-                buttonFound = true;
-                break;
+        try {
+            this.emit('warn', 'Opening login page...');
+            await page.goto(loginUrl.toString(), { waitUntil: 'networkidle2' });
+
+            this.emit('warn', 'Typing credentials...');
+            await page.type('input[name="username"]', this.user, { delay: 50 });
+            await page.type('input[name="password"]', this.passwd, { delay: 50 });
+
+            // Wyszukiwanie przycisku logowania
+            const buttonSelectors = [
+                'button[type="submit"]',
+                'input[type="submit"]',
+                'button[name="signIn"]',
+                'button.btn-primary'
+            ];
+
+            let buttonFound = false;
+            for (const selector of buttonSelectors) {
+                const button = await page.$(selector);
+                if (button) {
+                    this.emit('warn', `Found submit button: ${selector}`);
+                    await Promise.all([
+                        button.click(),
+                        page.waitForNavigation({ waitUntil: 'networkidle2', timeout: 20000 }) // czekamy na redirect
+                    ]);
+                    buttonFound = true;
+                    break;
+                }
             }
-        }
-
-        if (!buttonFound) {
-            throw new Error('❌ Could not find login button on the page.');
-        }
 
-        // Poczekaj aż załaduje się MELCloud Home
-        this.emit('warn', `Waiting for redirect to melcloudhome.com...`);
-        await new Promise(resolve => setTimeout(resolve, 5000));
-
-        // Pobierz cookies dla domeny melcloudhome.com
-        const cookies = await page.cookies();
-
-        // Znajdź __Secure-monitorandcontrolC1 i C2
-        const c1 = cookies.find(c => c.name === '__Secure-monitorandcontrolC1')?.value || null;
-        const c2 = cookies.find(c => c.name === '__Secure-monitorandcontrolC2')?.value || null;
-
-        // Zapisz do pliku
-        const data = { C1: c1, C2: c2, date: new Date().toISOString() };
-        await this.functions.saveData(this.coociesFile, data);
+            if (!buttonFound) {
+                throw new Error('❌ Could not find login button on the page.');
+            }
 
-        await browser.close();
+            // ✅ Poczekaj aż dashboard MELCloud Home będzie gotowy
+            this.emit('warn', 'Waiting for MELCloud Home dashboard...');
+            await page.waitForSelector('#dashboard, .dashboard-container', { timeout: 20000 });
+
+            // Pobranie cookies po zalogowaniu
+            const cookies = await page.cookies();
+            const c1 = cookies.find(c => c.name === '__Secure-monitorandcontrolC1')?.value || null;
+            const c2 = cookies.find(c => c.name === '__Secure-monitorandcontrolC2')?.value || null;
+
+            const data = { C1: c1, C2: c2, date: new Date().toISOString() };
+            await this.functions.saveData(this.cookiesFile, data);
+
+            this.emit('warn', 'Login successful.');
+            return data;
+        } catch (err) {
+            this.emit('error', `Login failed: ${err.message}`);
+            return null;
+        } finally {
+            await browser.close();
+        }
+    }
 
-        this.emit('warn', `Login successful.`);
 
-        return false;
-    }
 
     async send(accountInfo) {
         try {