homebridge-melcloud-control 4.0.0-beta.443 → 4.0.0-beta.445

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "MELCloud Control",
   "name": "homebridge-melcloud-control",
-  "version": "4.0.0-beta.443",
+  "version": "4.0.0-beta.445",
   "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.13.0",
     "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/functions.js

@@ -1,10 +1,18 @@
 import fs from 'fs';
+import util from 'util';
 import { promises as fsPromises } from 'fs';
 import { exec } from 'child_process';
-import puppeteer from 'puppeteer-core';
-
-class Functions {
-    constructor() {
+import puppeteer from 'puppeteer';
+import EventEmitter from 'events';
+const access = util.promisify(fs.access);
+const execPromise = util.promisify(exec);
+
+class Functions extends EventEmitter {
+    constructor(logWarn, logError, logDebug) {
+        super();
+        this.logWarn = logWarn;
+        this.logError = logError;
+        this.logDebug = logDebug;
     }
 
     async saveData(path, data, stringify = true) {
@@ -52,118 +60,91 @@ class Functions {
 
         try {
             // --- Detect architecture ---
-            let arch = '';
-            try {
-                const { stdout } = await new Promise((res, rej) =>
-                    exec('uname -m', (e, out) => e ? rej(e) : res({ stdout: out }))
-                );
-                arch = stdout.trim();
-                console.log(`Detected architecture: ${arch}`);
-            } catch (err) {
-                console.log(`Failed to detect architecture: ${err.message}`);
-            }
+            const { stdout: archOut } = await execPromise('uname -m');
+            const arch = archOut.trim();
+            if (this.logDebug) this.emit('debug', `Detected architecture: ${arch}`);
 
             // --- Detect OS ---
-            let osName = '';
-            try {
-                const { stdout } = await new Promise((res, rej) =>
-                    exec('uname -s', (e, out) => e ? rej(e) : res({ stdout: out }))
-                );
-                osName = stdout.trim();
-                console.log(`Detected OS: ${osName}`);
-            } catch (err) {
-                console.log(`Failed to detect OS: ${err.message}`);
-            }
+            const { stdout: osOut } = await execPromise('uname -s');
+            const osName = osOut.trim();
+            if (this.logDebug) this.emit('debug', `Detected OS: ${osName}`);
 
             // --- macOS fallback ---
             if (osName === 'Darwin') {
-                console.log('Running on macOS — using system Chromium/Chrome');
                 chromiumPath = '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome';
-                console.log(`Chromium path: ${chromiumPath}`);
+
+                try {
+                    await access(chromiumPath, fs.constants.X_OK);
+                    if (this.logDebug) this.emit('debug', `Using system Chrome at ${chromiumPath}`);
+                } catch {
+                    if (this.logError) this.emit('error', 'System Chrome not found. Falling back to Puppeteer bundled Chromium.');
+                    chromiumPath = puppeteer.executablePath();
+                }
                 return chromiumPath;
             }
 
             // --- Linux distro detection ---
             let linuxDistro = 'unknown';
             try {
-                const { stdout } = await new Promise((res, rej) =>
-                    exec('cat /etc/os-release', (e, out) => e ? rej(e) : res({ stdout: out }))
-                );
-                linuxDistro = stdout.split('\n')[0] || 'unknown';
+                const { stdout: distroOut } = await execPromise('cat /etc/os-release');
+                linuxDistro = distroOut.split('\n')[0] || 'unknown';
             } catch {
-                console.log('/etc/os-release not found, skipping OS detection.');
+                if (this.logError) this.emit('error', '/etc/os-release not found, skipping OS detection.');
             }
-            console.log(`Linux distro: ${linuxDistro}`);
+            if (this.logDebug) this.emit('debug', `Linux distro: ${linuxDistro}`);
 
             // --- Check if Chromium exists ---
             let chromiumCheck = '';
             try {
-                const { stdout } = await new Promise(res =>
-                    exec('which chromium || which chromium-browser || true', (e, out) => res({ stdout: out }))
-                );
-                chromiumCheck = stdout.trim();
+                const { stdout: checkOut } = await execPromise('which chromium || which chromium-browser || true');
+                chromiumCheck = checkOut.trim();
             } catch { }
             if (chromiumCheck) {
                 chromiumPath = chromiumCheck;
-                console.log(`Found system Chromium: ${chromiumPath}`);
+                if (this.logDebug) this.emit('debug', `Found system Chromium: ${chromiumPath}`);
                 return chromiumPath;
             }
 
-            console.log('Chromium not found. Attempting installation...');
+            if (this.logWarn) this.emit('warn', 'Chromium not found. Attempting installation...');
 
             // --- apt-get ---
             try {
-                await new Promise((res, rej) =>
-                    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';
-                console.log('Chromium installed successfully via apt-get.');
+                await execPromise('sudo apt-get update -y && sudo apt-get install -y chromium-browser chromium-codecs-ffmpeg');
+                if (this.logDebug) this.emit('debug', 'Chromium installed successfully via apt-get.');
                 return chromiumPath;
             } catch {
-                console.log('apt-get install failed. Trying apk or yum...');
+                if (this.logError) this.emit('error', 'apt-get install failed. Trying apk or yum...');
             }
 
             // --- apk (Alpine) ---
             try {
-                await new Promise((res, rej) =>
-                    exec('sudo apk add --no-cache chromium ffmpeg', e => e ? rej(e) : res())
-                );
-                chromiumPath = '/usr/bin/chromium-browser';
-                console.log('Chromium installed successfully via apk.');
+                await execPromise('sudo apk add --no-cache chromium ffmpeg');
+                if (this.logDebug) this.emit('debug', 'Chromium installed successfully via apk.');
                 return chromiumPath;
             } catch {
-                console.log('apk install failed. Trying yum...');
+                if (this.logError) this.emit('error', 'apk install failed. Trying yum...');
             }
 
             // --- yum (RHEL/CentOS) ---
             try {
-                await new Promise((res, rej) =>
-                    exec('sudo yum install -y chromium chromium-codecs-ffmpeg', e => e ? rej(e) : res())
-                );
-                chromiumPath = '/usr/bin/chromium-browser';
-                console.log('Chromium installed successfully via yum.');
+                await execPromise('sudo yum install -y chromium chromium-codecs-ffmpeg');
+                if (this.logDebug) this.emit('debug', 'Chromium installed successfully via yum.');
                 return chromiumPath;
             } catch {
-                console.log('yum install failed. Falling back to Puppeteer bundled Chromium.');
+                if (this.logError) this.emit('error', 'yum install failed. Falling back to Puppeteer bundled Chromium.');
             }
 
-            // --- Fallback Puppeteer Chromium ---
+            // --- Fallback Puppeteer ---
             chromiumPath = puppeteer.executablePath();
-            if (!chromiumPath) {
-                console.log('Puppeteer bundled Chromium not found');
-                throw new Error('Puppeteer bundled Chromium not found');
-            }
-            console.log(`Using bundled Puppeteer Chromium at ${chromiumPath}`);
+            if (this.logDebug) this.emit('debug', `Using bundled Puppeteer Chromium at ${chromiumPath || 'not found'}`);
             return chromiumPath;
 
-        } catch (err) {
-            console.log(`Chromium detection/install error: ${err.message}`);
-            throw err;
+        } catch (error) {
+            throw new Error(`Chromium detection/install error: ${error.message}`);
         }
     }
 
 
-
     async isRunningInDocker() {
         try {
             if (fs.existsSync('/.dockerenv')) return true;

package/src/melcloud.js

@@ -1,6 +1,6 @@
 import axios from 'axios';
 import EventEmitter from 'events';
-import puppeteer from 'puppeteer-core';
+import puppeteer from 'puppeteer';
 import MelCloudHomeToken from './melcloudhometoken.js';
 import ImpulseGenerator from './impulsegenerator.js';
 import Functions from './functions.js';
@@ -21,8 +21,11 @@ class MelCloud extends EventEmitter {
         this.devicesFile = devicesFile;
         this.devicesId = [];
         this.contextKey = '';
-        this.functions = new Functions();
-        this.tokens = null;
+        this.functions = new Functions({
+            logWarn: this.logWarn,
+            logError: this.logError,
+            logDebug: this.logDebug,
+        })
 
         if (pluginStart) {
             //lock flags
@@ -342,7 +345,6 @@ class MelCloud extends EventEmitter {
             });
 
             const page = await browser.newPage();
-
             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'); });