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

package/index.js

@@ -64,7 +64,7 @@ class MelCloudPlatform {
 						passwd: 'removed',
 						mqtt: {
 							auth: {
-								...device.mqtt?.auth,
+								...account.mqtt?.auth,
 								passwd: 'removed',
 							}
 						},
@@ -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
@@ -88,21 +88,18 @@ class MelCloudPlatform {
 						.on('start', async () => {
 							try {
 								//melcloud account
-								const melCloud = new MelCloud(user, passwd, language, accountFile, buildingsFile, devicesFile, coociesFile, logLevel.warn, logLevel.debug, false)
+								const melCloud = new MelCloud(user, passwd, language, accountFile, buildingsFile, devicesFile, cookiesFile, 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.connectHomeCoocies()
-								return;
-
-
 								//connect
 								let response;
 								try {
-									response = await melCloud.connect();
+									response = await melCloud.connect('home');
+									return;
 								} catch (error) {
 									if (logLevel.error) log.error(`${accountName}, Connect error: ${error.message ?? error}`);
 									return;

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "MELCloud Control",
   "name": "homebridge-melcloud-control",
-  "version": "4.0.0-beta.3",
+  "version": "4.0.0-beta.31",
   "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;
@@ -109,7 +109,7 @@ class MelCloud extends EventEmitter {
         }
     }
 
-    async connect() {
+    async connectMelCloud() {
         if (this.logDebug) this.emit('debug', `Connecting to MELCloud`);
 
         try {
@@ -166,14 +166,15 @@ class MelCloud extends EventEmitter {
         }
     }
 
-    async connectHome(cookieC1, cookieC2) {
+    async connectMelCloudHome() {
         if (this.logDebug) this.emit('debug', `Connecting to MELCloud Home`);
 
         try {
-            const c1 = cookieC1.trim();
-            const c2 = cookieC2.trim();
+            const coocies = await this.getCookies();
+            const c1 = coocies.C1.trim();
+            const c2 = coocies.C2.trim();
 
-            const cookieString = [
+            const cookies = [
                 '__Secure-monitorandcontrol=chunks-2',
                 `__Secure-monitorandcontrolC1=${c1}`,
                 `__Secure-monitorandcontrolC2=${c2}`,
@@ -189,8 +190,8 @@ class MelCloud extends EventEmitter {
                 headers: {
                     'Accept': '*/*',
                     'Accept-Language': 'en-US,en;q=0.9',
-                    'Cookie': cookieString,
-                    'User-Agent': 'homebridge-melcloud-home/0.2.0',
+                    'Cookie': cookies,
+                    'User-Agent': 'homebridge-melcloud-control/4.0.0',
                     'DNT': '1',
                     'Origin': 'https://melcloudhome.com',
                     'Referer': 'https://melcloudhome.com/dashboard',
@@ -203,7 +204,7 @@ class MelCloud extends EventEmitter {
 
             const response = await axiosInstance.get(ApiUrlsHome.GetUserContext);
             const homeData = response.data;
-            if (this.logDebug) this.emit('debug', `[MELCloudHome] Response data: ${JSON.stringify(homeData, null, 2)}`);
+            if (this.logDebug) this.emit('debug', `MELCloud Home data: ${JSON.stringify(homeData, null, 2)}`);
 
             this.emit('success', `Connect to MELCloud Home Success`);
 
@@ -213,81 +214,83 @@ class MelCloud extends EventEmitter {
         }
     }
 
-    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 browser = await puppeteer.launch({
-            headless: true,
-            args: ['--no-sandbox', '--disable-setuid-sandbox']
-        });
-
+    async getCookies() {
+        const browser = await puppeteer.launch({ headless: true, args: ['--no-sandbox', '--disable-setuid-sandbox'] });
         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(ApiUrlsHome.BaseURL, { 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;
+                }
             }
-        }
 
-        if (!buttonFound) {
-            throw new Error('❌ Could not find login button on the page.');
-        }
+            if (!loginBtn) throw new Error('Login button not found on homepage');
 
-        // Poczekaj aż załaduje się MELCloud Home
-        this.emit('warn', `Waiting for redirect to melcloudhome.com...`);
-        await page.waitForTimeout(5000);
+            await Promise.all([
+                loginBtn.click(),
+                page.waitForNavigation({ waitUntil: 'networkidle2', timeout: 20000 })
+            ]);
 
-        // Pobierz cookies dla domeny melcloudhome.com
-        const cookies = await page.cookies();
+            // Poczekaj, aż strona przekieruje do Cognito login
+            await page.waitForSelector('input[name="username"]', { timeout: 15000 });
 
-        // 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;
+            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 });
 
-        // Zapisz do pliku
-        const data = { C1: c1, C2: c2, date: new Date().toISOString() };
-        await this.functions.saveData(this.coociesFile, data);
+            // Kliknij przycisk logowania
+            const button1 = await page.$('input[type="submit"]');
+            await Promise.all([
+                button1.click(),
+                page.waitForNavigation({ waitUntil: 'networkidle2', timeout: 20000 })
+            ]);
 
-        await browser.close();
+            let c1 = null, c2 = null;
+            const start = Date.now();
 
-        this.emit('warn', `Login successful.`);
+            // 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));
+            }
+
+            if (!c1 || !c2) {
+                await browser.close();
+                throw new Error('Cookies C1/C2 not found after login');
+            }
 
-        return false;
+            // Zapis do pliku
+            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();
+        }
+    }
+
+    async connect(mode) {
+        switch (mode) {
+            case 'home':
+                return await this.connectMelCloudHome();
+            default:
+                return await this.connectMelCloud();
+        }
     }
 
     async send(accountInfo) {