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

package/package.json

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

package/src/functions.js

@@ -1,4 +1,5 @@
 import fs from 'fs';
+import { exec } from 'child_process';
 import { promises as fsPromises } from 'fs';
 import { promisify } from 'util';
 const execAsync = promisify(exec);
@@ -48,40 +49,75 @@ class Functions {
     }
 
     async ensureChromiumInstalled(logInfo, logWarn, logError) {
+        let chromiumPath = '/usr/bin/chromium-browser';
+
         try {
+            // --- Detect architecture ---
             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');
+            // --- Detect OS safely ---
+            let osName = 'unknown';
+            try {
+                const { stdout: osRelease } = await execAsync('cat /etc/os-release');
+                osName = osRelease.split('\n')[0] || 'unknown';
+            } catch {
+                logWarn('/etc/os-release not found, skipping OS detection.');
+            }
+            logInfo(`Detected OS: ${osName}`);
 
+            // --- 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}`);
-            } 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;
             }
 
+            logWarn('Chromium not found. Attempting installation...');
+
+            // --- Try apt-get first ---
+            try {
+                await execAsync('sudo apt-get update -y && sudo apt-get install -y chromium-browser chromium-codecs-ffmpeg');
+                chromiumPath = '/usr/bin/chromium-browser';
+                logInfo('Chromium installed successfully via apt-get.');
+                return chromiumPath;
+            } catch (aptErr) {
+                logWarn('apt-get install failed. Trying apk (Alpine) or yum (RHEL/CentOS)...');
+            }
+
+            // --- Try Alpine APK ---
+            try {
+                await execAsync('sudo apk add --no-cache chromium ffmpeg');
+                chromiumPath = '/usr/bin/chromium-browser'; // standardowa ścieżka w Alpine
+                logInfo('Chromium installed successfully via apk.');
+                return chromiumPath;
+            } catch (apkErr) {
+                logWarn('apk install failed. Trying yum (RHEL/CentOS)...');
+            }
+
+            // --- Try YUM ---
+            try {
+                await execAsync('sudo yum install -y chromium chromium-codecs-ffmpeg');
+                chromiumPath = '/usr/bin/chromium-browser';
+                logInfo('Chromium installed successfully via yum.');
+                return chromiumPath;
+            } catch (yumErr) {
+                logWarn('yum install failed. Falling back to Puppeteer bundled Chromium.');
+            }
+
+            // --- Fallback: Puppeteer Chromium ---
+            chromiumPath = puppeteer.executablePath();
+            logWarn(`Using bundled Puppeteer Chromium at ${chromiumPath}`);
             return chromiumPath;
+
         } catch (err) {
-            logError(`Chromium detection error: ${err.message}`);
+            logError(`Chromium detection/install error: ${err.message}`);
             throw err;
         }
     }
 
+
     async isRunningInDocker() {
         try {
             if (fs.existsSync('/.dockerenv')) return true;