homebridge-melcloud-control 4.0.0-beta.1 → 4.0.0-beta.11

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
@@ -88,14 +88,14 @@ 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()
+								await melCloud.connectHomeCookies();
 								return;
 
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "MELCloud Control",
   "name": "homebridge-melcloud-control",
-  "version": "4.0.0-beta.1",
+  "version": "4.0.0-beta.11",
   "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,43 +228,58 @@ 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 });
+        try {
+            this.emit('warn', 'Opening login page...');
+            await page.goto(loginUrl.toString(), { waitUntil: 'networkidle2' });
+
+            // Wpisz login i hasło
+            await page.type('input[name="username"]', this.user);
+            await page.type('input[name="password"]', thispasswd);
+
+            // Kliknij przycisk logowania
+            const button = await page.$('input[type="submit"]');
+            await Promise.all([
+                button.click(),
+                page.waitForNavigation({ waitUntil: 'networkidle2', timeout: 20000 })
+            ]);
+
+            // Opcjonalnie obsłuż "Stay signed in?" jeśli występuje
+            const staySignedInBtn = await page.$('input[type="submit"]');
+            if (staySignedInBtn) {
+                await Promise.all([
+                    staySignedInBtn.click(),
+                    page.waitForNavigation({ waitUntil: 'networkidle2', timeout: 20000 })
+                ]);
+            }
 
-        // Kliknij "Sign in" (przycisk AWS Cognito)
-        this.emit('warn', `Submitting form...`);
-        await Promise.all([
-            page.click('button[type="submit"]'),
-            page.waitForNavigation({ waitUntil: 'networkidle2' })
-        ]);
+            // Monitorowanie requestów i oczekiwanie na cookies C1 i C2
+            let c1 = null, c2 = null;
+            const start = Date.now();
 
-        // Poczekaj aż załaduje się MELCloud Home
-        this.emit('warn', `Waiting for redirect to melcloudhome.com...`);
-        await page.waitForTimeout(5000);
+            while ((!c1 || !c2) && Date.now() - start < 20000) { // max 20s
+                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));
+            }
 
-        // Pobierz cookies dla domeny melcloudhome.com
-        const cookies = await page.cookies();
+            if (!c1 || !c2) throw new Error('Cookies C1/C2 not found');
 
-        // 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;
+            const data = { C1: c1, C2: c2, date: new Date().toISOString() };
+            await this.functions.saveData(this.cookiesFile, data);
 
-        // Zapisz do pliku
-        const data = { C1: c1, C2: c2, date: new Date().toISOString() };
-        await this.functions.saveData(this.coociesFile, data);
+            this.emit('warn', 'Login successful.');
+            return data;
 
-        await browser.close();
+        } 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 {