homebridge-melcloud-control 4.1.2-beta.58 → 4.1.2-beta.59

package/package.json

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

package/src/functions.js

@@ -68,14 +68,13 @@ class Functions extends EventEmitter {
             const arch = archOut.trim();
             if (this.logDebug) this.emit('debug', `Detected architecture: ${arch}`);
 
-            // --- Detect Docker environment ---
+            // --- Detect Docker ---
             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 ===
@@ -86,8 +85,10 @@ class Functions extends EventEmitter {
 
             // === ARM ===
             if (arch.startsWith('arm')) {
-                try { await access('/usr/bin/chromium-browser', fs.constants.X_OK); return '/usr/bin/chromium-browser'; } catch {
-                    try { await execPromise('sudo apt-get update -y && sudo apt-get install -y chromium-browser chromium-codecs-ffmpeg'); return '/usr/bin/chromium-browser'; } catch { return null; }
+                try { await access('/usr/bin/chromium-browser', fs.constants.X_OK); return '/usr/bin/chromium-browser'; }
+                catch {
+                    try { await execPromise('sudo apt-get update -y && sudo apt-get install -y chromium-browser chromium-codecs-ffmpeg'); return '/usr/bin/chromium-browser'; }
+                    catch { return null; }
                 }
             }
 
@@ -107,35 +108,27 @@ class Functions extends EventEmitter {
 
                 if (entwareExists) {
                     try {
-                        if (this.logDebug) this.emit('debug', 'Detected Entware. Installing Chromium via opkg...');
+                        if (this.logDebug) this.emit('debug', 'Detected Entware. Installing Chromium and libraries via opkg...');
                         await execPromise('/opt/bin/opkg update');
                         await execPromise('/opt/bin/opkg install chromium');
+
+                        // Install all essential dependencies
                         await execPromise('/opt/bin/opkg install nspr nss libx11 libxcomposite libxdamage libxrandr libatk libatk-bridge libcups libdrm libgbm libasound');
+
+                        // Add Entware lib path to LD_LIBRARY_PATH
                         process.env.LD_LIBRARY_PATH = '/opt/lib:' + (process.env.LD_LIBRARY_PATH || '');
+                        if (this.logDebug) this.emit('debug', 'LD_LIBRARY_PATH set for Chromium');
+
+                        // Verify binary exists
                         const { stdout: checkOut } = await execPromise('which chromium || which chromium-browser || true');
                         chromiumPath = checkOut.trim() || '/opt/bin/chromium';
-                        return chromiumPath;
+                        if (chromiumPath) return chromiumPath;
                     } catch (error) {
-                        if (this.logDebug) this.emit('debug', `Entware installation failed: ${error.message}`);
+                        if (this.logError) this.emit('error', `Entware Chromium/libs installation failed: ${error.message}`);
                     }
                 }
 
-                // --- Fallback Puppeteer Chromium ---
-                try {
-                    const puppeteerPath = puppeteer.executablePath();
-                    if (puppeteerPath && fs.existsSync(puppeteerPath)) {
-                        chromiumPath = puppeteerPath;
-                        if (this.logDebug) this.emit('debug', `Using Puppeteer bundled Chromium at ${chromiumPath}`);
-                        // Try auto-set LD_LIBRARY_PATH for QNAP
-                        if (fs.existsSync('/opt/lib')) {
-                            process.env.LD_LIBRARY_PATH = '/opt/lib:' + (process.env.LD_LIBRARY_PATH || '');
-                            if (this.logDebug) this.emit('debug', 'LD_LIBRARY_PATH set for Chromium');
-                        }
-                        return chromiumPath;
-                    }
-                } catch { }
-
-                // --- Generic Linux installs ---
+                // --- Generic Linux install ---
                 const installCommands = [
                     'apt-get update -y && apt-get install -y chromium chromium-browser chromium-codecs-ffmpeg',
                     'apk add --no-cache chromium ffmpeg',
@@ -155,11 +148,11 @@ class Functions extends EventEmitter {
 
             if (this.logDebug) this.emit('debug', `Unsupported OS: ${osName}.`);
             return null;
-
         } catch (error) {
             if (this.logError) this.emit('error', `Chromium detection/install error: ${error.message}`);
             return null;
         }
     }
+
 }
 export default Functions