homebridge-melcloud-control 4.0.0-beta.460 → 4.0.0-beta.462

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "MELCloud Control",
   "name": "homebridge-melcloud-control",
-  "version": "4.0.0-beta.460",
+  "version": "4.0.0-beta.462",
   "description": "Homebridge plugin to control Mitsubishi Air Conditioner, Heat Pump and Energy Recovery Ventilation.",
   "license": "MIT",
   "author": "grzegorz914",
@@ -37,9 +37,10 @@
   "dependencies": {
     "@homebridge/plugin-ui-utils": "^2.1.0",
     "async-mqtt": "^2.6.3",
-    "axios": "^1.13.0",
+    "axios": "^1.13.1",
     "express": "^5.1.0",
-    "puppeteer": "^24.26.1"
+    "puppeteer": "^24.26.1",
+    "util": "^0.12.5"
   },
   "keywords": [
     "homebridge",

package/src/functions.js

@@ -1,10 +1,9 @@
 import fs from 'fs';
-import util from 'util';
+import { promisify } from 'util';
 import { exec } from 'child_process';
-import { promises as fsPromises } from 'fs';
 import EventEmitter from 'events';
-const access = util.promisify(fs.access);
-const execPromise = util.promisify(exec);
+const execPromise = promisify(exec);
+const access = fs.promises.access;
 
 class Functions extends EventEmitter {
     constructor(logWarn, logError, logDebug) {
@@ -68,6 +67,21 @@ class Functions extends EventEmitter {
             const arch = archOut.trim();
             if (this.logDebug) this.emit('debug', `Detected architecture: ${arch}`);
 
+            // --- Detect Docker environment ---
+            let isDocker = false;
+            try {
+                await access('/.dockerenv', fs.constants.F_OK);
+                isDocker = true;
+            } catch {
+                try {
+                    const { stdout } = await execPromise('cat /proc/1/cgroup || true');
+                    if (stdout.includes('docker') || stdout.includes('containerd'))
+                        isDocker = true;
+                } catch { }
+            }
+
+            if (isDocker && this.logDebug) this.emit('debug', 'Running inside Docker container.');
+
             // === macOS ===
             if (osName === 'Darwin') {
                 chromiumPath = '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome';
@@ -95,15 +109,15 @@ class Functions extends EventEmitter {
                         return '/usr/bin/chromium-browser';
                     } catch {
                         if (this.logError) this.emit('error', 'Failed to install Chromium on ARM. Bundled Chromium will likely not work.');
-                        if (this.logDebug) this.emit('debug', 'Falling back to Puppeteer bundled Chromium.');
                         return null;
                     }
                 }
             }
 
-            // === Linux (x64 etc.) ===
+            // === Linux (x64, Docker, etc.) ===
             if (osName === 'Linux') {
                 try {
+                    // --- Try detect common Chromium binaries ---
                     const { stdout: checkOut } = await execPromise('which chromium || which chromium-browser || true');
                     chromiumPath = checkOut.trim();
                     if (chromiumPath) {
@@ -114,25 +128,40 @@ class Functions extends EventEmitter {
 
                 if (this.logWarn) this.emit('warn', 'Chromium not found. Attempting installation...');
 
-                try {
-                    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 '/usr/bin/chromium-browser';
-                } catch {
-                    if (this.logError) this.emit('error', 'apt-get failed. Trying apk or yum...');
-                }
+                // --- Try install (Docker-optimized first) ---
+                const installCommands = [
+                    'apt-get update -y && apt-get install -y chromium chromium-browser chromium-codecs-ffmpeg',
+                    'apk add --no-cache chromium ffmpeg',
+                    'yum install -y chromium chromium-codecs-ffmpeg'
+                ];
 
-                try {
-                    await execPromise('sudo apk add --no-cache chromium ffmpeg');
-                    if (this.logDebug) this.emit('debug', 'Chromium installed successfully via apk.');
-                    return '/usr/bin/chromium-browser';
-                } catch { }
+                for (const cmd of installCommands) {
+                    try {
+                        if (this.logDebug) this.emit('debug', `Trying installation: ${cmd}`);
+                        await execPromise(`sudo ${cmd}`);
+                        // Check for binary after install
+                        const { stdout: checkOut } = await execPromise('which chromium || which chromium-browser || true');
+                        chromiumPath = checkOut.trim() || '/usr/bin/chromium';
+                        if (chromiumPath) {
+                            if (this.logDebug) this.emit('debug', `Chromium installed successfully at ${chromiumPath}`);
+                            return chromiumPath;
+                        }
+                    } catch (err) {
+                        if (this.logDebug) this.emit('debug', `Install attempt failed: ${cmd} → ${err.message}`);
+                    }
+                }
 
-                try {
-                    await execPromise('sudo yum install -y chromium chromium-codecs-ffmpeg');
-                    if (this.logDebug) this.emit('debug', 'Chromium installed successfully via yum.');
-                    return '/usr/bin/chromium-browser';
-                } catch { }
+                if (isDocker) {
+                    // Docker fallback specific
+                    try {
+                        await execPromise('sudo apt-get update -y && sudo apt-get install -y chromium');
+                        await access('/usr/bin/chromium', fs.constants.X_OK);
+                        if (this.logDebug) this.emit('debug', 'Chromium installed successfully inside Docker at /usr/bin/chromium');
+                        return '/usr/bin/chromium';
+                    } catch {
+                        if (this.logError) this.emit('error', 'Failed to install Chromium inside Docker.');
+                    }
+                }
 
                 if (this.logDebug) this.emit('debug', 'Chromium not found on Linux. Using Puppeteer bundled Chromium.');
                 return null;
@@ -149,5 +178,6 @@ class Functions extends EventEmitter {
         }
     }
 
+
 }
 export default Functions

package/src/melcloud.js

@@ -447,7 +447,7 @@ class MelCloud extends EventEmitter {
     }
 
     async connect(refresh) {
-        const TIMEOUT_MS = 30000;
+        const TIMEOUT_MS = 45000;
 
         try {
             const result = await Promise.race([