homebridge-melcloud-control 4.5.6-beta.1 → 4.5.6-beta.3

package/package.json

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

package/src/functions.js

@@ -81,9 +81,7 @@ class Functions extends EventEmitter {
 
             try {
                 const { stdout } = await execPromise('cat /proc/1/cgroup');
-                if (stdout.includes('docker') || stdout.includes('containerd')) {
-                    isDocker = true;
-                }
+                if (stdout.includes('docker') || stdout.includes('containerd')) isDocker = true;
             } catch { }
 
             /* ===================== macOS ===================== */
@@ -128,44 +126,37 @@ class Functions extends EventEmitter {
                 return { path: null, arch, system: 'Qnap' };
             }
 
-            /* ===================== Linux ARM ===================== */
-            if (isLinux && isARM) {
-                const armCandidates = ['/usr/bin/chromium-browser', '/usr/bin/chromium'];
-                for (const path of armCandidates) {
+            /* ===================== Linux ===================== */
+            if (isLinux) {
+                const linuxCandidates = ['/usr/bin/google-chrome', '/usr/bin/chromium-browser', '/usr/bin/chromium'];
+
+                // Detect existing browser (ARM + x64)
+                for (const path of linuxCandidates) {
                     try {
                         await access(path, fs.constants.X_OK);
-                        return { path, arch, system: 'Linux ARM' };
+                        return { path, arch, system: isDocker ? 'Linux Docker' : (isARM ? 'Linux ARM' : 'Linux') };
                     } catch { }
                 }
 
-                // ARM: detect only, no runtime install
-                return { path: null, arch, system: 'Linux ARM' };
-            }
-
-            /* ===================== Linux x64 ===================== */
-            if (isLinux && !isARM) {
-                const linuxCandidates = ['/usr/bin/google-chrome', '/usr/bin/chromium-browser', '/usr/bin/chromium'];
-
-                try {
-                    const { stdout } = await execPromise('command -v google-chrome || command -v chromium-browser || command -v chromium');
-                    if (stdout.trim()) {
-                        return { path: stdout.trim(), arch, system: isDocker ? 'Linux Docker' : 'Linux' };
-                    }
-                } catch { }
+                // ARM → detect only
+                if (isARM) {
+                    return { path: null, arch, system: 'Linux ARM' };
+                }
 
+                /* ===================== Linux x64 ===================== */
                 if (isDocker) {
                     try {
                         await execPromise(`
                         apt update -y &&
                         apt install -y wget gnupg ca-certificates &&
                         mkdir -p /etc/apt/keyrings &&
-                        wget -qO /etc/apt/keyrings/google.gpg https://dl.google.com/linux/linux_signing_key.pub &&
-                        sh -c 'echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/google.gpg] http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list' &&
+                        wget -qO- https://dl.google.com/linux/linux_signing_key.pub | gpg --dearmor > /etc/apt/keyrings/google-chrome.gpg && sh -c 'echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/google-chrome.gpg] http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list' &&
                         apt update -y &&
                         apt install -y google-chrome-stable
-                    `);
+                        `);
                     } catch (error) {
                         if (this.logError) this.emit('error', `Chrome install error: ${error}`);
+                        return { path: null, arch, system: 'Linux Docker' };
                     }
 
                     for (const path of linuxCandidates) {
@@ -176,7 +167,7 @@ class Functions extends EventEmitter {
                     }
                 }
 
-                return { path: null, arch, system: 'Linux' };
+                return { path: null, arch, system: isDocker ? 'Linux Docker' : 'Linux' };
             }
 
             return { path: null, arch, system: 'unknown' };