homebridge-melcloud-control 4.0.0-beta.410 → 4.0.0-beta.412

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "MELCloud Control",
   "name": "homebridge-melcloud-control",
-  "version": "4.0.0-beta.410",
+  "version": "4.0.0-beta.412",
   "description": "Homebridge plugin to control Mitsubishi Air Conditioner, Heat Pump and Energy Recovery Ventilation.",
   "license": "MIT",
   "author": "grzegorz914",
@@ -39,7 +39,7 @@
     "async-mqtt": "^2.6.3",
     "axios": "^1.12.2",
     "express": "^5.1.0",
-    "puppeteer-core": "^24.26.1",
+    "puppeteer": "^24.26.1",
     "axios-cookiejar-support": "^6.0.4",
     "tough-cookie": "^6.0.0",
     "jsdom": "^27.0.1"

package/src/melcloud.js

@@ -1,6 +1,6 @@
 
 import { execSync } from 'child_process';
-import puppeteer from 'puppeteer-core';
+import puppeteer from 'puppeteer';
 import axios from 'axios';
 import EventEmitter from 'events';
 import MelCloudHomeToken from './melcloudhometoken.js';
@@ -62,20 +62,28 @@ class MelCloud extends EventEmitter {
     // MELCloud
     async checkMelcloudDevicesList(contextKey) {
         try {
-            const axiosInstanceGet = axios.create({
-                method: 'GET',
+            const axiosInstance = axios.create({
                 baseURL: ApiUrls.BaseURL,
                 timeout: 15000,
                 headers: { 'X-MitsContextKey': contextKey }
             });
 
-            if (this.logDebug) this.emit('debug', `Scanning for devices`);
-            const listDevicesData = await axiosInstanceGet(ApiUrls.ListDevices);
+            if (this.logDebug) this.emit('debug', `Scanning for devices...`);
+
+            const listDevicesData = await axiosInstance.get(ApiUrls.ListDevices);
+
+            if (!listDevicesData || !listDevicesData.data) {
+                this.emit('warn', `Invalid or empty response from MELCloud API`);
+                return null;
+            }
+
             const buildingsList = listDevicesData.data;
-            if (this.logDebug) this.emit('debug', `Buildings: ${JSON.stringify(buildingsList, null, 2)}`);
 
-            if (!buildingsList) {
-                if (this.logWarn) this.emit('warn', `No building found`);
+            if (this.logDebug)
+                this.emit('debug', `Buildings: ${JSON.stringify(buildingsList, null, 2)}`);
+
+            if (!Array.isArray(buildingsList) || buildingsList.length === 0) {
+                this.emit('warn', `No buildings found in MELCloud account`);
                 return null;
             }
 
@@ -83,42 +91,59 @@ class MelCloud extends EventEmitter {
             if (this.logDebug) this.emit('debug', `Buildings list saved`);
 
             const devices = [];
+
             for (const building of buildingsList) {
-                const buildingStructure = building.Structure;
-                const allDevices = [
-                    ...buildingStructure.Floors.flatMap(floor => [
-                        ...floor.Areas.flatMap(area => area.Devices),
-                        ...floor.Devices
-                    ]),
-                    ...buildingStructure.Areas.flatMap(area => area.Devices),
-                    ...buildingStructure.Devices
-                ];
+                if (!building.Structure) {
+                    this.emit(
+                        'warn',
+                        `Building missing structure: ${building.BuildingName || 'Unnamed'}`
+                    );
+                    continue;
+                }
+
+                const { Structure } = building;
 
-                // Zamiana DeviceID na string
+                const allDevices = [
+                    ...(Structure.Floors?.flatMap(floor => [
+                        ...(floor.Areas?.flatMap(area => area.Devices || []) || []),
+                        ...(floor.Devices || [])
+                    ]) || []),
+                    ...(Structure.Areas?.flatMap(area => area.Devices || []) || []),
+                    ...(Structure.Devices || [])
+                ].filter(d => d != null);
+
+                // Zamiana ID na string
                 allDevices.forEach(device => {
-                    if (device.DeviceID !== undefined && device.DeviceID !== null) {
-                        device.DeviceID = device.DeviceID.toString();
-                    }
+                    if (device.DeviceID != null) device.DeviceID = String(device.DeviceID);
                 });
 
+                if (this.logDebug) {
+                    const count = allDevices.length;
+                    this.emit(
+                        'debug',
+                        `Found ${count} devices in building: ${building.BuildingName || 'Unnamed'}`
+                    );
+                }
+
                 devices.push(...allDevices);
             }
 
-            const devicesCount = devices.length;
-            if (devicesCount === 0) {
-                if (this.logWarn) this.emit('warn', `No devices found`);
+            if (devices.length === 0) {
+                this.emit('warn', `No devices found in any building`);
                 return null;
             }
 
             await this.functions.saveData(this.devicesFile, devices);
-            if (this.logDebug) this.emit('debug', `${devicesCount} devices saved`);
+            if (this.logDebug) this.emit('debug', `${devices.length} devices saved`);
 
             return devices;
         } catch (error) {
-            throw new Error(`Check devices list error: ${error.message}`);
+            const msg = error.response ? `HTTP ${error.response.status}: ${error.response.statusText}` : error.message;
+            throw new Error(`Check devices list error: ${msg}`);
         }
     }
 
+
     async connectToMelCloud() {
         if (this.logDebug) this.emit('debug', `Connecting to MELCloud`);
 
@@ -166,7 +191,7 @@ class MelCloud extends EventEmitter {
 
             return accountInfo
         } catch (error) {
-            throw new Error(`Connect to MELCloud error: ${error.message}`);
+            throw new Error(`Connect error: ${error.message}`);
         }
     }
 
@@ -270,7 +295,7 @@ class MelCloud extends EventEmitter {
 
             return devices;
         } catch (error) {
-            throw new Error(`Connect to MELCloud Home error: ${error.message}`);
+            throw new Error(`Check devices list error: ${error.message}`);
         }
     }
 
@@ -310,39 +335,68 @@ class MelCloud extends EventEmitter {
             });
 
             const page = await browser.newPage();
-            await page.goto(ApiUrlsHome.BaseURL, { waitUntil: 'networkidle2' });
+
+            // Emit page errors to logs
+            page.on('error', err => this.emit('warn', `Page crashed: ${err.message}`));
+            page.on('pageerror', err => this.emit('warn', `Browser error: ${err.message}`));
+
+            await page.goto(ApiUrlsHome.BaseURL, { waitUntil: ['domcontentloaded', 'networkidle2'] });
+
+            // Ensure login button is visible
+            await page.waitForSelector('button.btn--blue', { timeout: 10000 }).catch(() => {
+                throw new Error('Login button not found on MELCloud Home');
+            });
 
             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' || text.trim() === 'Sign In') {
+                const text = await page.evaluate(el => el.textContent.trim(), btn);
+                if (['Zaloguj', 'Sign In', 'Login'].includes(text)) {
                     loginBtn = btn;
                     break;
                 }
             }
 
-            if (!loginBtn && this.logWarn) this.emit('warn', `Login button not found`);
+            if (!loginBtn) throw new Error('Login button not found (no matching text)');
+
+            if (this.logDebug) this.emit('debug', `Clicking login button...`);
 
             await Promise.all([
                 loginBtn.click(),
-                page.waitForNavigation({ waitUntil: 'networkidle2', timeout: 10000 })
+                page.waitForNavigation({ waitUntil: ['domcontentloaded', 'networkidle2'], timeout: 15000 })
             ]);
 
-            await page.waitForSelector('input[name="username"]', { timeout: 5000 });
+            await page.waitForSelector('input[name="username"]', { timeout: 10000 });
             await page.type('input[name="username"]', this.user, { delay: 50 });
             await page.type('input[name="password"]', this.passwd, { delay: 50 });
 
-            const button1 = await page.$('input[type="submit"]');
+            // Handle possible "Show password" overlays
+            const submitButton = await page.$('input[type="submit"], button[type="submit"]');
+            if (!submitButton) throw new Error('Submit button not found on login form');
+
+            if (this.logDebug) this.emit('debug', `Submitting credentials...`);
+
             await Promise.all([
-                button1.click(),
-                page.waitForNavigation({ waitUntil: 'networkidle2', timeout: 10000 })
+                submitButton.click(),
+                page.waitForNavigation({ waitUntil: ['domcontentloaded', 'networkidle2'], timeout: 20000 })
             ]);
 
+            // Check for login errors
+            const pageText = await page.content();
+            if (pageText.includes('incorrect') || pageText.includes('Invalid') || pageText.includes('nieprawidłowe')) {
+                throw new Error('Login failed: incorrect email or password');
+            }
+
+            // Check for CAPTCHA
+            const captchaPresent = await page.$('iframe[src*="captcha"], div[class*="captcha"]');
+            if (captchaPresent) {
+                throw new Error('Login blocked by CAPTCHA. Manual verification required.');
+            }
+
+            // Extract cookies with retry mechanism
             let c1 = null, c2 = null;
             const start = Date.now();
-
             while ((!c1 || !c2) && Date.now() - start < 20000) {
                 const cookies = await page.browserContext().cookies();
                 c1 = cookies.find(c => c.name === '__Secure-monitorandcontrolC1')?.value || c1;
@@ -350,11 +404,7 @@ class MelCloud extends EventEmitter {
                 if (!c1 || !c2) await new Promise(r => setTimeout(r, 500));
             }
 
-
-            if (!c1 || !c2) {
-                if (this.logWarn) this.emit('warn', `Cookies C1/C2 missing`);
-                return null;
-            }
+            if (!c1 || !c2) throw new Error('Cookies C1/C2 missing after login');
 
             const contextKey = [
                 '__Secure-monitorandcontrol=chunks-2',
@@ -370,43 +420,41 @@ class MelCloud extends EventEmitter {
 
             return accountInfo;
         } catch (error) {
+            // Handle Puppeteer system dependency errors
             if (error.message.includes('libnspr4.so') || error.message.includes('Failed to launch the browser process')) {
                 const inDocker = await this.functions.isRunningInDocker();
-                if (this.logWarn) this.emit('warn', `Missing system libraries detected.`);
+                this.emit('warn', `Missing system libraries detected.`);
+
+                const installCmd =
+                    'apt-get update && apt-get install -y ' +
+                    'libnss3 libnspr4 libatk1.0-0 libatk-bridge2.0-0 libcups2 ' +
+                    'libxcomposite1 libxrandr2 libxdamage1 libxkbcommon0 libpango-1.0-0 ' +
+                    'libgbm1 libasound2 libxshmfence1 fonts-liberation libappindicator3-1 libu2f-udev';
 
                 if (inDocker) {
                     this.emit('warn', `Running in Docker — attempting automatic fix...`);
-
-                    const installCmd =
-                        'apt-get update && apt-get install -y ' +
-                        'libnss3 libnspr4 libatk1.0-0 libatk-bridge2.0-0 libcups2 ' +
-                        'libxcomposite1 libxrandr2 libxdamage1 libxkbcommon0 libpango-1.0-0 ' +
-                        'libgbm1 libasound2 libxshmfence1 fonts-liberation libappindicator3-1 libu2f-udev';
-
                     try {
                         execSync(installCmd, { stdio: 'inherit' });
-                        if (this.logDebug) this.emit('debug', `Libraries installed. Retrying Puppeteer...`);
-
-                        const testBrowser = await puppeteer.launch({
-                            headless: true,
-                            args: ['--no-sandbox', '--disable-setuid-sandbox']
-                        });
-                        await testBrowser.close();
-
-                        this.emit('success', `Puppeteer repaired and running, try again.`);
+                        this.emit('success', `System libraries installed. Retry the connection.`);
                         return true;
                     } catch (fixError) {
                         throw new Error(`Automatic fix failed. Run manually inside container:\n${installCmd}`);
                     }
-
                 } else {
-                    throw new Error(`System libraries missing. Non-Docker environment detected — install dependencies manually.`);
+                    throw new Error(`Missing system libraries. Please install manually:\n${installCmd}`);
                 }
-            } else {
-                throw new Error(`Puppeteer failed: ${error.message}`);
             }
+
+            // Generic Puppeteer error
+            throw new Error(`Connect error: ${error.message}`);
         } finally {
-            if (browser) await browser.close().catch(() => { });
+            if (browser) {
+                try {
+                    await browser.close();
+                } catch (closeErr) {
+                    this.emit('warn', `Failed to close Puppeteer browser: ${closeErr.message}`);
+                }
+            }
         }
     }