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

package/package.json

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

package/src/functions.js

@@ -1,9 +1,5 @@
 import fs from 'fs';
-import { exec } from 'child_process';
 import { promises as fsPromises } from 'fs';
-import { promisify } from 'util';
-import puppeteer from 'puppeteer-core';
-const execAsync = promisify(exec);
 
 class Functions {
     constructor() {
@@ -49,85 +45,111 @@ class Functions {
         }
     }
 
+async  ensureChromiumInstalled() {
+    let chromiumPath = '/usr/bin/chromium-browser';
 
-    async ensureChromiumInstalled(logInfo, logWarn, logError) {
-        let chromiumPath = '/usr/bin/chromium-browser';
-
+    try {
+        // --- Detect architecture ---
+        let arch = '';
         try {
-            // --- Detect platform ---
-            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 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 && logInfo('Running on macOS — using Puppeteer bundled Chromium');
-                chromiumPath = require('puppeteer-core').executablePath();
-                logInfo && logInfo(`Chromium path: ${chromiumPath}`);
-                return chromiumPath;
-            }
+            arch = (await new Promise((res, rej) =>
+                require('child_process').exec('uname -m', (e, stdout) => e ? rej(e) : res(stdout))
+            )).trim();
+            if (this.logDebug) this.emit('debug', `Detected architecture: ${arch}`);
+        } catch (err) {
+            if (this.logWarn) this.emit('warn', `Failed to detect architecture: ${err.message}`);
+        }
 
-            // --- Linux handling ---
-            let linuxDistro = 'unknown';
-            try {
-                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 && logWarn('/etc/os-release not found, skipping OS detection.');
-            }
-            logInfo && logInfo(`Linux distro: ${linuxDistro}`);
-
-            // --- Check existing Chromium ---
-            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;
-            }
+        // --- Detect OS ---
+        let osName = '';
+        try {
+            osName = (await new Promise((res, rej) =>
+                require('child_process').exec('uname -s', (e, stdout) => e ? rej(e) : res(stdout))
+            )).trim();
+            if (this.logDebug) this.emit('debug', `Detected OS: ${osName}`);
+        } catch (err) {
+            if (this.logWarn) this.emit('warn', `Failed to detect OS: ${err.message}`);
+        }
 
-            logWarn && logWarn('Chromium not found. Attempting installation...');
+        // --- macOS fallback ---
+        if (osName === 'Darwin') {
+            if (this.logDebug) this.emit('debug', 'Running on macOS — using Puppeteer bundled Chromium');
+            chromiumPath = require('puppeteer-core').executablePath();
+            if (this.logDebug) this.emit('debug', `Chromium path: ${chromiumPath}`);
+            return chromiumPath;
+        }
 
-            // --- Try apt-get ---
-            try {
-                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 && logInfo('Chromium installed successfully via apt-get.');
-                return chromiumPath;
-            } catch {
-                logWarn && logWarn('apt-get install failed. Trying apk or yum...');
-            }
+        // --- Linux distro detection ---
+        let linuxDistro = 'unknown';
+        try {
+            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 {
+            if (this.logWarn) this.emit('warn', '/etc/os-release not found, skipping OS detection.');
+        }
+        if (this.logDebug) this.emit('debug', `Linux distro: ${linuxDistro}`);
+
+        // --- Check if Chromium exists ---
+        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;
+            if (this.logDebug) this.emit('debug', `Found system Chromium: ${chromiumPath}`);
+            return chromiumPath;
+        }
 
-            // --- Try Alpine APK ---
-            try {
-                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 && logInfo('Chromium installed successfully via apk.');
-                return chromiumPath;
-            } catch {
-                logWarn && logWarn('apk install failed. Trying yum...');
-            }
+        if (this.logWarn) this.emit('warn', 'Chromium not found. Attempting installation...');
 
-            // --- Try YUM ---
-            try {
-                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 && logInfo('Chromium installed successfully via yum.');
-                return chromiumPath;
-            } catch {
-                logWarn && logWarn('yum install failed. Falling back to Puppeteer bundled Chromium.');
-            }
+        // --- apt-get ---
+        try {
+            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';
+            if (this.logDebug) this.emit('debug', 'Chromium installed successfully via apt-get.');
+            return chromiumPath;
+        } catch {
+            if (this.logWarn) this.emit('warn', 'apt-get install failed. Trying apk or yum...');
+        }
 
-            // --- Fallback: Puppeteer Chromium ---
-            chromiumPath = require('puppeteer-core').executablePath();
-            logWarn && logWarn(`Using bundled Puppeteer Chromium at ${chromiumPath}`);
+        // --- apk (Alpine) ---
+        try {
+            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';
+            if (this.logDebug) this.emit('debug', 'Chromium installed successfully via apk.');
             return chromiumPath;
+        } catch {
+            if (this.logWarn) this.emit('warn', 'apk install failed. Trying yum...');
+        }
 
-        } catch (err) {
-            logError && logError(`Chromium detection/install error: ${err.message}`);
-            throw err;
+        // --- yum (RHEL/CentOS) ---
+        try {
+            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';
+            if (this.logDebug) this.emit('debug', 'Chromium installed successfully via yum.');
+            return chromiumPath;
+        } catch {
+            if (this.logWarn) this.emit('warn', 'yum install failed. Falling back to Puppeteer bundled Chromium.');
         }
+
+        // --- Fallback ---
+        chromiumPath = require('puppeteer-core').executablePath();
+        if (this.logWarn) this.emit('warn', `Using bundled Puppeteer Chromium at ${chromiumPath}`);
+        return chromiumPath;
+
+    } catch (err) {
+        if (this.logError) this.emit('error', `Chromium detection/install error: ${err.message}`);
+        throw err;
     }
+}
+
+
 
     async isRunningInDocker() {
         try {

package/src/melcloud.js

@@ -322,18 +322,18 @@ class MelCloud extends EventEmitter {
         }
     }
 
-    async connectToMelCloudHome(user, passwd, functions, ApiUrlsHome, accountFile, logDebug, logWarn, logError, logSuccess, refresh = false) {
-        if (logDebug) logDebug('Connecting to MELCloud Home');
+    async connectToMelCloudHome(refresh = false) {
+        if (this.logDebug) this.emit('debug', 'Connecting to MELCloud Home');
+
         let browser;
 
         try {
-            const chromiumPath = await ensureChromiumInstalled(
-                msg => logDebug && logDebug(msg),
-                msg => logWarn && logWarn(msg),
-                msg => logError && logError(msg)
-            );
+            const chromiumPath = await this.ensureChromiumInstalled();
+
+            // dynamiczny require dopiero przy uruchomieniu
+            const puppeteer = require('puppeteer-core');
 
-            browser = await require('puppeteer-core').launch({
+            browser = await puppeteer.launch({
                 headless: true,
                 executablePath: chromiumPath,
                 args: [
@@ -347,15 +347,15 @@ class MelCloud extends EventEmitter {
 
             const page = await browser.newPage();
 
-            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.on('error', err => { if (this.logError) this.emit('error', `Page crashed: ${err.message}`); });
+            page.on('pageerror', err => { if (this.logError) this.emit('error', `Browser error: ${err.message}`); });
+            page.on('close', () => { if (this.logDebug) this.emit('debug', 'Page was closed unexpectedly'); });
+            browser.on('disconnected', () => { if (this.logDebug) this.emit('debug', 'Browser disconnected unexpectedly'); });
 
             page.setDefaultTimeout(30000);
             page.setDefaultNavigationTimeout(30000);
 
-            await page.goto(ApiUrlsHome.BaseURL, { waitUntil: ['domcontentloaded', 'networkidle2'] });
+            await page.goto(this.ApiUrlsHome.BaseURL, { waitUntil: ['domcontentloaded', 'networkidle2'] });
 
             const buttons = await page.$$('button.btn--blue');
             let loginBtn = null;
@@ -367,7 +367,7 @@ class MelCloud extends EventEmitter {
                 }
             }
             if (!loginBtn) {
-                logWarn && logWarn('Login button not found');
+                this.emit('warn', 'Login button not found');
                 return null;
             }
 
@@ -382,16 +382,16 @@ class MelCloud extends EventEmitter {
             const usernameInput = await page.$('input[name="username"]');
             const passwordInput = await page.$('input[name="password"]');
             if (!usernameInput || !passwordInput) {
-                logWarn && logWarn('Username or password input not found');
+                this.emit('warn', 'Username or password input not found');
                 return null;
             }
 
-            await page.type('input[name="username"]', user, { delay: 50 });
-            await page.type('input[name="password"]', passwd, { delay: 50 });
+            await page.type('input[name="username"]', this.user, { delay: 50 });
+            await page.type('input[name="password"]', this.passwd, { delay: 50 });
 
             const submitButton = await page.$('input[type="submit"], button[type="submit"]');
             if (!submitButton) {
-                logWarn && logWarn('Submit button not found on login form');
+                this.emit('warn', 'Submit button not found on login form');
                 return null;
             }
 
@@ -413,7 +413,7 @@ class MelCloud extends EventEmitter {
             }
 
             if (!c1 || !c2) {
-                logWarn && logWarn('Cookies C1/C2 missing after login');
+                this.emit('warn', 'Cookies C1/C2 missing after login');
                 return null;
             }
 
@@ -424,9 +424,11 @@ class MelCloud extends EventEmitter {
             ].join('; ');
 
             const accountInfo = { ContextKey: contextKey, UseFahrenheit: false };
-            await functions.saveData(accountFile, accountInfo);
+            this.contextKey = contextKey;
 
-            if (!refresh && logSuccess) logSuccess('Connect to MELCloud Home Success');
+            await this.functions.saveData(this.accountFile, accountInfo);
+
+            if (!refresh) this.emit('success', 'Connect to MELCloud Home Success');
             return accountInfo;
 
         } catch (error) {
@@ -434,11 +436,12 @@ class MelCloud extends EventEmitter {
         } finally {
             if (browser) {
                 try { await browser.close(); }
-                catch (closeErr) { logError && logError(`Failed to close Puppeteer browser: ${closeErr.message}`); }
+                catch (closeErr) { if (this.logError) this.emit('error', `Failed to close Puppeteer browser: ${closeErr.message}`); }
             }
         }
     }
 
+
     async checkDevicesList() {
         let devices = [];
         switch (this.accountType) {