homebridge-melcloud-control 4.2.5-beta.8 → 4.2.5

package/src/melcloudhome.js

@@ -9,7 +9,7 @@ import Functions from './functions.js';
 import { ApiUrlsHome, LanguageLocaleMap } from './constants.js';
 const execPromise = promisify(exec);
 
-class MelCloud extends EventEmitter {
+class MelCloudHome extends EventEmitter {
     constructor(account, accountFile, buildingsFile, devicesFile, pluginStart = false) {
         super();
         this.accountType = account.type;
@@ -61,7 +61,6 @@ class MelCloud extends EventEmitter {
         }
     }
 
-    // MELCloud Home
     async checkScenesList() {
         try {
             if (this.logDebug) this.emit('debug', `Scanning for scenes`);
@@ -195,10 +194,17 @@ class MelCloud extends EventEmitter {
                 return devicesList;
             }
 
-            const scenes = await this.checkScenesList();
+            // Get scenes
+            let scenes = [];
+            try {
+                scenes = await this.checkScenesList();
+                if (this.logDebug) this.emit('debug', `Found ${scenes.length} svenes`);
+            } catch (error) {
+                if (this.logDebug) this.emit('debug', `Get scenes error: ${error} `);
+            }
 
             devicesList.State = true;
-            devicesList.Info = `Found ${devicesCount} devices`;
+            devicesList.Info = `Found ${devicesCount} devices and ${scenes.length} scenes`;
             devicesList.Devices = devices;
             devicesList.Scenes = scenes;
             devicesList.Headers = this.headers;
@@ -208,12 +214,6 @@ class MelCloud extends EventEmitter {
 
             return devicesList;
         } catch (error) {
-            if (error.response?.status === 401) {
-                if (this.logWarn) this.emit('warn', 'Check devices list not possible, cookies expired, trying to get new.');
-                await this.connect();
-                return;
-            }
-
             throw new Error(`Check devices list error: ${error.message}`);
         }
     }
@@ -224,7 +224,7 @@ class MelCloud extends EventEmitter {
 
         let browser;
         try {
-            const accountInfo = { State: false, Info: '', Headers: {}, UseFahrenheit: false };
+            const accountInfo = { State: false, Info: '', Account: {}, UseFahrenheit: false };
             let chromiumPath = await this.functions.ensureChromiumInstalled();
 
             // === Fallback to Puppeteer's built-in Chromium ===
@@ -276,14 +276,6 @@ class MelCloud extends EventEmitter {
             page.setDefaultTimeout(GLOBAL_TIMEOUT);
             page.setDefaultNavigationTimeout(GLOBAL_TIMEOUT);
 
-            // Clear cookies before navigation
-            try {
-                const client = await page.createCDPSession();
-                await client.send('Network.clearBrowserCookies');
-            } catch (error) {
-                if (this.logError) this.emit('error', `Clear cookies error: ${error.message}`);
-            }
-
             try {
                 await page.goto(ApiUrlsHome.BaseURL, { waitUntil: ['domcontentloaded', 'networkidle2'], timeout: GLOBAL_TIMEOUT });
             } catch (error) {
@@ -293,7 +285,7 @@ class MelCloud extends EventEmitter {
 
             // Wait extra to ensure UI is rendered
             await new Promise(r => setTimeout(r, 3000));
-            const loginBtn = await page.waitForSelector('button.btn--blue', { timeout: GLOBAL_TIMEOUT / 4 });
+            const loginBtn = await page.waitForSelector('button.btn--blue', { timeout: GLOBAL_TIMEOUT / 3 });
             const loginText = await page.evaluate(el => el.textContent.trim(), loginBtn);
 
             if (!['Zaloguj', 'Sign In', 'Login'].includes(loginText)) {
@@ -319,13 +311,13 @@ class MelCloud extends EventEmitter {
                 accountInfo.Info = 'Submit button not found';
                 return accountInfo;
             }
-            await Promise.race([Promise.all([submitButton.click(), page.waitForNavigation({ waitUntil: ['domcontentloaded', 'networkidle2'], timeout: GLOBAL_TIMEOUT / 4 })]), new Promise(r => setTimeout(r, GLOBAL_TIMEOUT / 3))]);
+            await Promise.race([Promise.all([submitButton.click(), page.waitForNavigation({ waitUntil: ['domcontentloaded', 'networkidle2'], timeout: GLOBAL_TIMEOUT / 3 })]), new Promise(r => setTimeout(r, GLOBAL_TIMEOUT / 3))]);
 
             // Extract cookies
             let c1 = null, c2 = null;
             const start = Date.now();
             while ((!c1 || !c2) && Date.now() - start < GLOBAL_TIMEOUT / 2) {
-                const cookies = await page.browserContext().cookies();
+                const cookies = await browser.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));
@@ -342,6 +334,8 @@ class MelCloud extends EventEmitter {
                 `__Secure-monitorandcontrolC2=${c2}`
             ].join('; ');
 
+
+            const userAgent = await page.evaluate(() => navigator.userAgent);
             const headers = {
                 'Accept': '*/*',
                 'Accept-Encoding': 'gzip, deflate, br',
@@ -352,6 +346,7 @@ class MelCloud extends EventEmitter {
                 'Sec-Fetch-Dest': 'empty',
                 'Sec-Fetch-Mode': 'cors',
                 'Sec-Fetch-Site': 'same-origin',
+                'User-Agent': userAgent,
                 'x-csrf': '1'
             };
             this.headers = headers;
@@ -377,17 +372,7 @@ class MelCloud extends EventEmitter {
             }
         }
     }
-
-    async send(accountInfo) {
-        try {
-            //await this.axiosInstance(ApiUrlsHome.UpdateApplicationOptions, { method: 'POST' });
-            //await this.functions.saveData(this.accountFile, accountInfo);
-            return true;
-        } catch (error) {
-            throw new Error(`Send data error: ${error.message}`);
-        }
-    }
 }
 
-export default MelCloud;
+export default MelCloudHome;