homebridge-melcloud-control 4.0.0-beta.447 → 4.0.0-beta.449

package/package.json

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

package/src/functions.js

@@ -58,85 +58,48 @@ class Functions extends EventEmitter {
         let chromiumPath = '/usr/bin/chromium-browser';
 
         try {
-            // Detect architecture
-            const { stdout: archOut } = await execPromise('uname -m');
-            const arch = archOut.trim();
-            if (this.logDebug) this.emit('debug', `Detected architecture: ${arch}`);
-
             // Detect OS
             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') {
                 chromiumPath = '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome';
-
                 try {
                     await access(chromiumPath, fs.constants.X_OK);
                     if (this.logDebug) this.emit('debug', `Using system Chrome at ${chromiumPath}`);
                     return chromiumPath;
                 } catch {
-                    if (this.logError) this.emit('error', 'System Chrome not found, using builtin chrome.');
+                    if (this.logWarn) this.emit('warn', 'System Chrome not found on macOS.');
                     return null;
                 }
             }
 
-            // Linux distro detection
-            let linuxDistro = 'unknown';
-            try {
-                const { stdout: distroOut } = await execPromise('cat /etc/os-release');
-                linuxDistro = distroOut.split('\n')[0] || 'unknown';
-            } catch {
-                if (this.logError) this.emit('error', '/etc/os-release not found, skipping OS detection.');
-            }
-            if (this.logDebug) this.emit('debug', `Linux distro: ${linuxDistro}`);
-
-            // Check if Chromium exists
-            let chromiumCheck = '';
+            // Check if Chromium exists on Linux
             try {
                 const { stdout: checkOut } = await execPromise('which chromium || which chromium-browser || true');
-                chromiumCheck = checkOut.trim();
+                chromiumPath = checkOut.trim();
+                if (chromiumPath) {
+                    if (this.logDebug) this.emit('debug', `Found system Chromium: ${chromiumPath}`);
+                    return chromiumPath;
+                }
             } catch { }
-            if (chromiumCheck) {
-                chromiumPath = chromiumCheck;
-                if (this.logDebug) this.emit('debug', `Found system Chromium: ${chromiumPath}`);
-                return chromiumPath;
-            }
 
+            // Optional: attempt installation (Linux)
             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'); return chromiumPath; } catch { }
+            try { await execPromise('sudo apk add --no-cache chromium ffmpeg'); return chromiumPath; } catch { }
+            try { await execPromise('sudo yum install -y chromium chromium-codecs-ffmpeg'); return chromiumPath; } catch { }
 
-            // apt-get
-            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 chromiumPath;
-            } catch {
-                if (this.logError) this.emit('error', 'apt-get install failed. Trying apk or yum...');
-            }
-
-            // apk (Alpine)
-            try {
-                await execPromise('sudo apk add --no-cache chromium ffmpeg');
-                if (this.logDebug) this.emit('debug', 'Chromium installed successfully via apk.');
-                return chromiumPath;
-            } catch {
-                if (this.logError) this.emit('error', 'apk install failed. Trying yum...');
-            }
+            // If everything fails, return null
+            if (this.logWarn) this.emit('warn', 'Chromium not found. Use Puppeteer bundled Chromium.');
+            return null;
 
-            // yum (RHEL/CentOS)
-            try {
-                await execPromise('sudo yum install -y chromium chromium-codecs-ffmpeg');
-                if (this.logDebug) this.emit('debug', 'Chromium installed successfully via yum.');
-                return chromiumPath;
-            } catch {
-                if (this.logError) this.emit('error', 'yum install failed. Falling back to Puppeteer bundled Chromium.');
-            }
-
-            return chromiumPath;
         } catch (error) {
-            throw new Error(`Chromium detection/install error: ${error.message}`);
+            if (this.logError) this.emit('error', `Chromium detection/install error: ${error.message}`);
+            return null;
         }
     }
+
 }
 export default Functions