homebridge-melcloud-control 4.0.0-beta.29 → 4.0.0-beta.3

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 cookiesFile = `${prefDir}/${accountName}_Cookies`;
+				const coociesFile = `${prefDir}/${accountName}_Coocies`;
 
 
 				//set account refresh interval
@@ -88,14 +88,14 @@ class MelCloudPlatform {
 						.on('start', async () => {
 							try {
 								//melcloud account
-								const melCloud = new MelCloud(user, passwd, language, accountFile, buildingsFile, devicesFile, cookiesFile, logLevel.warn, logLevel.debug, false)
+								const melCloud = new MelCloud(user, passwd, language, accountFile, buildingsFile, devicesFile, coociesFile, logLevel.warn, logLevel.debug, false)
 									.on('success', (msg) => logLevel.success && log.success(`${accountName}, ${msg}`))
 									.on('info', (msg) => logLevel.info && log.info(`${accountName}, ${msg}`))
 									.on('debug', (msg) => logLevel.debug && log.info(`${accountName}, debug: ${msg}`))
 									.on('warn', (msg) => logLevel.warn && log.warn(`${accountName}, ${msg}`))
 									.on('error', (msg) => logLevel.error && log.error(`${accountName}, ${msg}`));
 
-								await melCloud.connectHomeCookies();
+								await melCloud.connectHomeCoocies()
 								return;
 
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "MELCloud Control",
   "name": "homebridge-melcloud-control",
-  "version": "4.0.0-beta.29",
+  "version": "4.0.0-beta.3",
   "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, cookiesFile, logWarn, logDebug, requestConfig) {
+    constructor(user, passwd, language, accountFile, buildingsFile, devicesFile, coociesFile, 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.cookiesFile = cookiesFile;
+        this.coociesFile = coociesFile;
         this.logWarn = logWarn;
         this.logDebug = logDebug;
         this.requestConfig = requestConfig;
@@ -213,114 +213,83 @@ class MelCloud extends EventEmitter {
         }
     }
 
-    async loginToMelcloudHome() {
-        try {
-            const form = new URLSearchParams();
-            form.append('user[email]', this.user);
-            form.append('user[password]', this.passwd);
+    async connectHomeCoocies() {
+        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');
+        loginUrl.searchParams.set('response_type', 'code');
+        loginUrl.searchParams.set('scope', 'openid profile');
+        loginUrl.searchParams.set('response_mode', 'form_post');
 
-            const response = await axios({
-                method: 'POST',
-                baseURL: EnphaseUrls.BaseUrl,
-                url: EnphaseUrls.Login,
-                headers: {
-                    'Content-Type': 'application/x-www-form-urlencoded'
-                },
-                data: form,
-                timeout: 10000
-            });
 
-            if (response.status !== 200) {
-                if (this.logError) this.emit('error', `Login failed with status code: ${response.status}`);
-                return null;
-            }
 
-            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;
-        } catch (error) {
-            throw new Error(`Login to Enlighten error: ${error}`);
-        }
-    }
+        const browser = await puppeteer.launch({
+            headless: true,
+            args: ['--no-sandbox', '--disable-setuid-sandbox']
+        });
 
-    async connectHomeCookies() {
-        const loginUrl = 'https://melcloudhome.com';
-        const browser = await puppeteer.launch({ headless: true, args: ['--no-sandbox', '--disable-setuid-sandbox'] });
         const page = await browser.newPage();
 
-        try {
-            this.emit('warn', 'Opening login page...');
-            await page.goto(loginUrl, { waitUntil: 'networkidle2' });
-
-            // Kliknij przycisk logowania
-            const buttons = await page.$$('button.btn--blue');
-            let loginBtn = null;
-            for (const btn of buttons) {
-                const text = await page.evaluate(el => el.textContent, btn);
-                if (text.trim() === 'Zaloguj') {
-                    loginBtn = btn;
-                    break;
-                }
+        // 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;
             }
+        }
 
-            if (!loginBtn) throw new Error('Login button not found on homepage');
-
-            await Promise.all([
-                loginBtn.click(),
-                page.waitForNavigation({ waitUntil: 'networkidle2', timeout: 20000 })
-            ]);
-
-            // Poczekaj, aż strona przekieruje do Cognito login
-            await page.waitForSelector('input[name="username"]', { timeout: 15000 });
-
-            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 });
+        if (!buttonFound) {
+            throw new Error('❌ Could not find login button on the page.');
+        }
 
-            // Kliknij przycisk logowania
-            const button1 = await page.$('input[type="submit"]');
-            await Promise.all([
-                button1.click(),
-                page.waitForNavigation({ waitUntil: 'networkidle2', timeout: 20000 })
-            ]);
+        // Poczekaj aż załaduje się MELCloud Home
+        this.emit('warn', `Waiting for redirect to melcloudhome.com...`);
+        await page.waitForTimeout(5000);
 
-            let c1 = null, c2 = null;
-            const start = Date.now();
+        // Pobierz cookies dla domeny melcloudhome.com
+        const cookies = await page.cookies();
 
-            // Loop max 20s, czekamy aż pojawią się cookies
-            while ((!c1 || !c2) && Date.now() - start < 20000) {
-                const cookies = await page.cookies();
-                c1 = cookies.find(c => c.name === '__Secure-monitorandcontrolC1')?.value || c1;
-                c2 = cookies.find(c => c.name === '__Secure-monitorandcontrolC2')?.value || c2;
-                if (!c1 || !c2) await new Promise(r => setTimeout(r, 500));
-            }
+        // 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;
 
-            if (!c1 || !c2) {
-                await browser.close();
-                throw new Error('❌ Cookies C1/C2 not found after login');
-            }
+        // Zapisz do pliku
+        const data = { C1: c1, C2: c2, date: new Date().toISOString() };
+        await this.functions.saveData(this.coociesFile, data);
 
-            // Zapis do pliku
-            const data = { C1: c1, C2: c2, date: new Date().toISOString() };
-            await this.functions.saveData(this.cookiesFile, data);
+        await browser.close();
 
-            this.emit('warn', 'Login successful.');
-            return data;
+        this.emit('warn', `Login successful.`);
 
-        } catch (err) {
-            this.emit('error', `Login failed: ${err.message}`);
-            return null;
-        } finally {
-            await browser.close();
-        }
+        return false;
     }
 
-
-
     async send(accountInfo) {
         try {
             const options = { data: accountInfo };