homebridge-melcloud-control 4.0.0-beta.425 → 4.0.0-beta.426

package/package.json

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

package/src/functions.js

@@ -1,5 +1,7 @@
 import fs from 'fs';
 import { promises as fsPromises } from 'fs';
+import { promisify } from 'util';
+const execAsync = promisify(exec);
 
 class Functions {
     constructor() {
@@ -18,13 +20,65 @@ class Functions {
     async readData(path, parseJson = false) {
         try {
             const data = await fsPromises.readFile(path, 'utf8');
-            return parseJson ? JSON.parse(data) : data;
+
+            if (parseJson) {
+                if (!data.trim()) {
+                    // Empty file when expecting JSON
+                    return null;
+                }
+                try {
+                    return JSON.parse(data);
+                } catch (jsonError) {
+                    throw new Error(`JSON parse error in file "${path}": ${jsonError.message}`);
+                }
+            }
+
+            // For non-JSON, just return file content (can be empty string)
+            return data;
         } catch (error) {
             if (error.code === 'ENOENT') {
                 // File does not exist
                 return null;
             }
-            throw new Error(`Read data error: ${error}`);
+            // Preserve original error details
+            const wrappedError = new Error(`Read data error for "${path}": ${error.message}`);
+            wrappedError.original = error;
+            throw wrappedError;
+        }
+    }
+
+    async ensureChromiumInstalled(logInfo, logWarn, logError) {
+        try {
+            const { stdout: arch } = await execAsync('uname -m');
+            const { stdout: osRelease } = await execAsync('cat /etc/os-release');
+            logInfo(`Detected architecture: ${arch.trim()}`);
+            logInfo(`Detected OS: ${osRelease.split('\n')[0]}`);
+
+            let chromiumPath = '/usr/bin/chromium-browser';
+            const { stdout: chromiumCheck } = await execAsync('which chromium || which chromium-browser || true');
+
+            if (chromiumCheck.trim()) {
+                chromiumPath = chromiumCheck.trim();
+                logInfo(`Found system Chromium: ${chromiumPath}`);
+            } else {
+                logWarn('Chromium not found. Installing...');
+                try {
+                    await execAsync('sudo apt-get update -y && sudo apt-get install -y chromium-browser chromium-codecs-ffmpeg');
+                    logInfo('Chromium installed successfully.');
+                } catch (aptErr) {
+                    logWarn('apt-get failed, trying apk/yum fallback...');
+                    try {
+                        await execAsync('sudo apk add chromium ffmpeg');
+                    } catch {
+                        await execAsync('sudo yum install -y chromium chromium-codecs-ffmpeg');
+                    }
+                }
+            }
+
+            return chromiumPath;
+        } catch (err) {
+            logError(`Chromium detection error: ${err.message}`);
+            throw err;
         }
     }
 

package/src/melcloud.js

@@ -1,8 +1,6 @@
-
-import { execSync } from 'child_process';
-import puppeteer from 'puppeteer';
 import axios from 'axios';
 import EventEmitter from 'events';
+import puppeteer from 'puppeteer-core';
 import MelCloudHomeToken from './melcloudhometoken.js';
 import ImpulseGenerator from './impulsegenerator.js';
 import Functions from './functions.js';
@@ -326,11 +324,19 @@ class MelCloud extends EventEmitter {
 
     async connectToMelCloudHome(refresh = false) {
         if (this.logDebug) this.emit('debug', `Connecting to MELCloud Home`);
-
         let browser;
+
         try {
-            browser = await puppeteer.launch({
+            // --- System Detection & Chromium install ---
+            const chromiumPath = await this.functions.ensureChromiumInstalled(
+                msg => this.emit('debug', msg),
+                msg => this.emit('warn', msg),
+                msg => this.emit('error', msg)
+            );
+
+            const launchOptions = {
                 headless: true,
+                executablePath: chromiumPath,
                 args: [
                     '--no-sandbox',
                     '--disable-setuid-sandbox',
@@ -338,9 +344,12 @@ class MelCloud extends EventEmitter {
                     '--single-process',
                     '--no-zygote'
                 ]
-            });
+            };
 
+            browser = await puppeteer.launch(launchOptions);
             const page = await browser.newPage();
+
+            // --- Event handlers ---
             page.on('error', err => this.emit('error', `Page crashed: ${err.message}`));
             page.on('pageerror', err => this.emit('error', `Browser error: ${err.message}`));
             page.on('close', () => this.emit('debug', 'Page was closed unexpectedly'));
@@ -349,8 +358,10 @@ class MelCloud extends EventEmitter {
             page.setDefaultTimeout(30000);
             page.setDefaultNavigationTimeout(30000);
 
+            // --- Go to login page ---
             await page.goto(ApiUrlsHome.BaseURL, { waitUntil: ['domcontentloaded', 'networkidle2'] });
 
+            // --- Login flow ---
             const buttons = await page.$$('button.btn--blue');
             let loginBtn = null;
             for (const btn of buttons) {
@@ -361,12 +372,7 @@ class MelCloud extends EventEmitter {
                 }
             }
             if (!loginBtn) {
-                if (this.logWarn) this.emit('warn', 'Login button not found');
-                return null;
-            }
-
-            if (page.isClosed()) {
-                if (this.logWarn) this.emit('warn', 'Page closed before login click');
+                this.emit('warn', 'Login button not found');
                 return null;
             }
 
@@ -378,15 +384,11 @@ class MelCloud extends EventEmitter {
                 new Promise(r => setTimeout(r, 12000))
             ]);
 
+            // --- Credentials ---
             const usernameInput = await page.$('input[name="username"]');
             const passwordInput = await page.$('input[name="password"]');
             if (!usernameInput || !passwordInput) {
-                if (this.logWarn) this.emit('warn', 'Username or password input not found');
-                return null;
-            }
-
-            if (page.isClosed()) {
-                if (this.logWarn) this.emit('warn', 'Page closed before typing credentials');
+                this.emit('warn', 'Username or password input not found');
                 return null;
             }
 
@@ -395,12 +397,7 @@ class MelCloud extends EventEmitter {
 
             const submitButton = await page.$('input[type="submit"], button[type="submit"]');
             if (!submitButton) {
-                if (this.logWarn) this.emit('warn', 'Submit button not found on login form');
-                return null;
-            }
-
-            if (page.isClosed()) {
-                if (this.logWarn) this.emit('warn', 'Page closed before submitting form');
+                this.emit('warn', 'Submit button not found on login form');
                 return null;
             }
 
@@ -412,18 +409,7 @@ class MelCloud extends EventEmitter {
                 new Promise(r => setTimeout(r, 15000))
             ]);
 
-            const pageText = await page.content();
-            if (pageText.includes('incorrect') || pageText.includes('Invalid') || pageText.includes('nieprawidłowe')) {
-                if (this.logWarn) this.emit('warn', 'Login failed: incorrect email or password');
-                return null;
-            }
-
-            const captchaPresent = await page.$('iframe[src*="captcha"], div[class*="captcha"]');
-            if (captchaPresent) {
-                if (this.logWarn) this.emit('warn', 'Login blocked by CAPTCHA. Manual verification required.');
-                return null;
-            }
-
+            // --- Cookie extraction ---
             let c1 = null, c2 = null;
             const start = Date.now();
             while ((!c1 || !c2) && Date.now() - start < 20000) {
@@ -434,7 +420,7 @@ class MelCloud extends EventEmitter {
             }
 
             if (!c1 || !c2) {
-                if (this.logWarn) this.emit('warn', 'Cookies C1/C2 missing after login');
+                this.emit('warn', 'Cookies C1/C2 missing after login');
                 return null;
             }
 
@@ -446,46 +432,19 @@ class MelCloud extends EventEmitter {
 
             const accountInfo = { ContextKey: contextKey, UseFahrenheit: false };
             this.contextKey = contextKey;
-
             await this.functions.saveData(this.accountFile, accountInfo);
-            if (!refresh) this.emit('success', `Connect to MELCloud Home Success`);
 
+            if (!refresh) this.emit('success', `Connect to MELCloud Home Success`);
             return accountInfo;
-        } catch (error) {
-            // Puppeteer / system error handling
-            if (error.message.includes('libnspr4.so') || error.message.includes('Failed to launch the browser process')) {
-                const inDocker = await this.functions.isRunningInDocker();
-                if (this.logError) this.emit('error', `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) {
-                    if (this.logWarn) this.emit('warn', `Running in Docker — attempting automatic fix...`);
-                    try {
-                        const { execSync } = require('child_process');
-                        execSync(installCmd, { stdio: 'inherit' });
-                        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(`Missing system libraries. Please install manually:\n${installCmd}`);
-                }
-            }
 
-            // Only throw for real technical errors
+        } catch (error) {
             throw new Error(`Connect error: ${error.message}`);
         } finally {
             if (browser) {
                 try {
                     await browser.close();
                 } catch (closeErr) {
-                    if (this.logError) this.emit('error', `Failed to close Puppeteer browser: ${closeErr.message}`);
+                    this.emit('error', `Failed to close Puppeteer browser: ${closeErr.message}`);
                 }
             }
         }