homebridge-melcloud-control 4.0.0-beta.430 → 4.0.0-beta.431

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "MELCloud Control",
   "name": "homebridge-melcloud-control",
-  "version": "4.0.0-beta.430",
+  "version": "4.0.0-beta.431",
   "description": "Homebridge plugin to control Mitsubishi Air Conditioner, Heat Pump and Energy Recovery Ventilation.",
   "license": "MIT",
   "author": "grzegorz914",

package/src/functions.js

@@ -51,89 +51,84 @@ class Functions {
 
 
     async ensureChromiumInstalled(logInfo, logWarn, logError) {
-        let chromiumPath = '/usr/bin/chromium-browser'; // default fallback Linux
+        let chromiumPath = '/usr/bin/chromium-browser';
 
         try {
             // --- Detect platform ---
-            const { stdout: archStdout } = await execAsync('uname -m');
-            const arch = archStdout.trim();
-            logInfo(`Detected architecture: ${arch}`);
+            const arch = (await new Promise((res, rej) => require('child_process').exec('uname -m', (e, stdout) => e ? rej(e) : res(stdout)))).trim();
+            logInfo && logInfo(`Detected architecture: ${arch}`);
 
-            const { stdout: osNameStdout } = await execAsync('uname -s');
-            const osName = osNameStdout.trim();
-            logInfo(`Detected OS: ${osName}`);
+            const osName = (await new Promise((res, rej) => require('child_process').exec('uname -s', (e, stdout) => e ? rej(e) : res(stdout)))).trim();
+            logInfo && logInfo(`Detected OS: ${osName}`);
 
             // --- macOS handling ---
             if (osName === 'Darwin') {
-                logInfo('Running on macOS — using Puppeteer bundled Chromium');
-                chromiumPath = puppeteer.executablePath();
-                logInfo(`Chromium path: ${chromiumPath}`);
+                logInfo && logInfo('Running on macOS — using Puppeteer bundled Chromium');
+                chromiumPath = require('puppeteer-core').executablePath();
+                logInfo && logInfo(`Chromium path: ${chromiumPath}`);
                 return chromiumPath;
             }
 
             // --- Linux handling ---
-            // Detect OS release if available
             let linuxDistro = 'unknown';
             try {
-                const { stdout: osRelease } = await execAsync('cat /etc/os-release');
-                linuxDistro = osRelease.split('\n')[0] || 'unknown';
+                linuxDistro = (await new Promise((res, rej) => require('child_process').exec('cat /etc/os-release', (e, stdout) => e ? rej(e) : res(stdout)))).split('\n')[0] || 'unknown';
             } catch {
-                logWarn('/etc/os-release not found, skipping OS detection.');
+                logWarn && logWarn('/etc/os-release not found, skipping OS detection.');
             }
-            logInfo(`Linux distro: ${linuxDistro}`);
+            logInfo && logInfo(`Linux distro: ${linuxDistro}`);
 
             // --- Check existing Chromium ---
-            const { stdout: chromiumCheck } = await execAsync('which chromium || which chromium-browser || true');
-            if (chromiumCheck.trim()) {
-                chromiumPath = chromiumCheck.trim();
-                logInfo(`Found system Chromium: ${chromiumPath}`);
+            const chromiumCheck = (await new Promise((res) => require('child_process').exec('which chromium || which chromium-browser || true', (e, stdout) => res(stdout)))).trim();
+            if (chromiumCheck) {
+                chromiumPath = chromiumCheck;
+                logInfo && logInfo(`Found system Chromium: ${chromiumPath}`);
                 return chromiumPath;
             }
 
-            logWarn('Chromium not found. Attempting installation...');
+            logWarn && logWarn('Chromium not found. Attempting installation...');
 
-            // --- Try apt-get first ---
+            // --- Try apt-get ---
             try {
-                await execAsync('sudo apt-get update -y && sudo apt-get install -y chromium-browser chromium-codecs-ffmpeg');
+                await new Promise((res, rej) => require('child_process').exec('sudo apt-get update -y && sudo apt-get install -y chromium-browser chromium-codecs-ffmpeg', (e) => e ? rej(e) : res()));
                 chromiumPath = '/usr/bin/chromium-browser';
-                logInfo('Chromium installed successfully via apt-get.');
+                logInfo && logInfo('Chromium installed successfully via apt-get.');
                 return chromiumPath;
-            } catch (aptErr) {
-                logWarn('apt-get install failed. Trying apk (Alpine) or yum (RHEL/CentOS)...');
+            } catch {
+                logWarn && logWarn('apt-get install failed. Trying apk or yum...');
             }
 
             // --- Try Alpine APK ---
             try {
-                await execAsync('sudo apk add --no-cache chromium ffmpeg');
+                await new Promise((res, rej) => require('child_process').exec('sudo apk add --no-cache chromium ffmpeg', (e) => e ? rej(e) : res()));
                 chromiumPath = '/usr/bin/chromium-browser';
-                logInfo('Chromium installed successfully via apk.');
+                logInfo && logInfo('Chromium installed successfully via apk.');
                 return chromiumPath;
-            } catch (apkErr) {
-                logWarn('apk install failed. Trying yum (RHEL/CentOS)...');
+            } catch {
+                logWarn && logWarn('apk install failed. Trying yum...');
             }
 
             // --- Try YUM ---
             try {
-                await execAsync('sudo yum install -y chromium chromium-codecs-ffmpeg');
+                await new Promise((res, rej) => require('child_process').exec('sudo yum install -y chromium chromium-codecs-ffmpeg', (e) => e ? rej(e) : res()));
                 chromiumPath = '/usr/bin/chromium-browser';
-                logInfo('Chromium installed successfully via yum.');
+                logInfo && logInfo('Chromium installed successfully via yum.');
                 return chromiumPath;
-            } catch (yumErr) {
-                logWarn('yum install failed. Falling back to Puppeteer bundled Chromium.');
+            } catch {
+                logWarn && logWarn('yum install failed. Falling back to Puppeteer bundled Chromium.');
             }
 
             // --- Fallback: Puppeteer Chromium ---
-            chromiumPath = puppeteer.executablePath();
-            logWarn(`Using bundled Puppeteer Chromium at ${chromiumPath}`);
+            chromiumPath = require('puppeteer-core').executablePath();
+            logWarn && logWarn(`Using bundled Puppeteer Chromium at ${chromiumPath}`);
             return chromiumPath;
 
         } catch (err) {
-            logError(`Chromium detection/install error: ${err.message}`);
+            logError && logError(`Chromium detection/install error: ${err.message}`);
             throw err;
         }
     }
 
-
     async isRunningInDocker() {
         try {
             if (fs.existsSync('/.dockerenv')) return true;

package/src/melcloud.js

@@ -322,19 +322,18 @@ class MelCloud extends EventEmitter {
         }
     }
 
-    async connectToMelCloudHome(refresh = false) {
-        if (this.logDebug) this.emit('debug', `Connecting to MELCloud Home`);
+    async connectToMelCloudHome(user, passwd, functions, ApiUrlsHome, accountFile, logDebug, logWarn, logError, logSuccess, refresh = false) {
+        if (logDebug) logDebug('Connecting to MELCloud Home');
         let browser;
 
         try {
-            // --- 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 chromiumPath = await ensureChromiumInstalled(
+                msg => logDebug && logDebug(msg),
+                msg => logWarn && logWarn(msg),
+                msg => logError && logError(msg)
             );
 
-            const launchOptions = {
+            browser = await require('puppeteer-core').launch({
                 headless: true,
                 executablePath: chromiumPath,
                 args: [
@@ -344,24 +343,20 @@ 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'));
-            browser.on('disconnected', () => this.emit('debug', 'Browser disconnected unexpectedly'));
+            page.on('error', err => logError && logError(`Page crashed: ${err.message}`));
+            page.on('pageerror', err => logError && logError(`Browser error: ${err.message}`));
+            page.on('close', () => logDebug && logDebug('Page was closed unexpectedly'));
+            browser.on('disconnected', () => logDebug && logDebug('Browser disconnected unexpectedly'));
 
             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) {
@@ -372,7 +367,7 @@ class MelCloud extends EventEmitter {
                 }
             }
             if (!loginBtn) {
-                this.emit('warn', 'Login button not found');
+                logWarn && logWarn('Login button not found');
                 return null;
             }
 
@@ -384,20 +379,19 @@ 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) {
-                this.emit('warn', 'Username or password input not found');
+                logWarn && logWarn('Username or password input not found');
                 return null;
             }
 
-            await page.type('input[name="username"]', this.user, { delay: 50 });
-            await page.type('input[name="password"]', this.passwd, { delay: 50 });
+            await page.type('input[name="username"]', user, { delay: 50 });
+            await page.type('input[name="password"]', passwd, { delay: 50 });
 
             const submitButton = await page.$('input[type="submit"], button[type="submit"]');
             if (!submitButton) {
-                this.emit('warn', 'Submit button not found on login form');
+                logWarn && logWarn('Submit button not found on login form');
                 return null;
             }
 
@@ -409,7 +403,6 @@ class MelCloud extends EventEmitter {
                 new Promise(r => setTimeout(r, 15000))
             ]);
 
-            // --- Cookie extraction ---
             let c1 = null, c2 = null;
             const start = Date.now();
             while ((!c1 || !c2) && Date.now() - start < 20000) {
@@ -420,7 +413,7 @@ class MelCloud extends EventEmitter {
             }
 
             if (!c1 || !c2) {
-                this.emit('warn', 'Cookies C1/C2 missing after login');
+                logWarn && logWarn('Cookies C1/C2 missing after login');
                 return null;
             }
 
@@ -431,21 +424,17 @@ class MelCloud extends EventEmitter {
             ].join('; ');
 
             const accountInfo = { ContextKey: contextKey, UseFahrenheit: false };
-            this.contextKey = contextKey;
-            await this.functions.saveData(this.accountFile, accountInfo);
+            await functions.saveData(accountFile, accountInfo);
 
-            if (!refresh) this.emit('success', `Connect to MELCloud Home Success`);
+            if (!refresh && logSuccess) logSuccess('Connect to MELCloud Home Success');
             return accountInfo;
 
         } catch (error) {
             throw new Error(`Connect error: ${error.message}`);
         } finally {
             if (browser) {
-                try {
-                    await browser.close();
-                } catch (closeErr) {
-                    this.emit('error', `Failed to close Puppeteer browser: ${closeErr.message}`);
-                }
+                try { await browser.close(); }
+                catch (closeErr) { logError && logError(`Failed to close Puppeteer browser: ${closeErr.message}`); }
             }
         }
     }