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

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "MELCloud Control",
   "name": "homebridge-melcloud-control",
-  "version": "4.0.0-beta.449",
+  "version": "4.0.0-beta.451",
   "description": "Homebridge plugin to control Mitsubishi Air Conditioner, Heat Pump and Energy Recovery Ventilation.",
   "license": "MIT",
   "author": "grzegorz914",
@@ -39,10 +39,7 @@
     "async-mqtt": "^2.6.3",
     "axios": "^1.13.0",
     "express": "^5.1.0",
-    "puppeteer": "^24.26.1",
-    "axios-cookiejar-support": "^6.0.4",
-    "tough-cookie": "^6.0.0",
-    "jsdom": "^27.0.1"
+    "puppeteer": "^24.26.1"
   },
   "keywords": [
     "homebridge",

package/src/functions.js

@@ -54,28 +54,55 @@ class Functions extends EventEmitter {
         }
     }
 
-    async ensureChromiumInstalled() {
-        let chromiumPath = '/usr/bin/chromium-browser';
+async ensureChromiumInstalled() {
+    let chromiumPath = '/usr/bin/chromium-browser';
 
-        try {
-            // Detect OS
-            const { stdout: osOut } = await execPromise('uname -s');
-            const osName = osOut.trim();
-            if (this.logDebug) this.emit('debug', `Detected OS: ${osName}`);
+    try {
+        // --- Detect OS ---
+        const { stdout: osOut } = await execPromise('uname -s');
+        const osName = osOut.trim();
+        if (this.logDebug) this.emit('debug', `Detected OS: ${osName}`);
+
+        // --- Detect Architecture ---
+        const { stdout: archOut } = await execPromise('uname -m');
+        const arch = archOut.trim();
+        if (this.logDebug) this.emit('debug', `Detected architecture: ${arch}`);
+
+        // === macOS ===
+        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.logDebug) this.emit('debug', 'System Chrome not found on macOS, will use Puppeteer bundled Chromium.');
+                return null;
+            }
+        }
 
-            if (osName === 'Darwin') {
-                chromiumPath = '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome';
+        // === ARM (e.g. Raspberry Pi) ===
+        if (arch.startsWith('arm')) {
+            try {
+                await access('/usr/bin/chromium-browser', fs.constants.X_OK);
+                if (this.logDebug) this.emit('debug', 'Using system Chromium on ARM platform.');
+                return '/usr/bin/chromium-browser';
+            } catch {
+                if (this.logWarn) this.emit('warn', 'System Chromium not found on ARM. Attempting installation...');
                 try {
-                    await access(chromiumPath, fs.constants.X_OK);
-                    if (this.logDebug) this.emit('debug', `Using system Chrome at ${chromiumPath}`);
-                    return chromiumPath;
+                    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 on ARM.');
+                    return '/usr/bin/chromium-browser';
                 } catch {
-                    if (this.logWarn) this.emit('warn', 'System Chrome not found on macOS.');
+                    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;
                 }
             }
+        }
 
-            // Check if Chromium exists on Linux
+        // === Linux (x64 etc.) ===
+        if (osName === 'Linux') {
             try {
                 const { stdout: checkOut } = await execPromise('which chromium || which chromium-browser || true');
                 chromiumPath = checkOut.trim();
@@ -85,21 +112,42 @@ class Functions extends EventEmitter {
                 }
             } catch { }
 
-            // 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 { }
 
-            // If everything fails, return null
-            if (this.logWarn) this.emit('warn', 'Chromium not found. Use Puppeteer bundled Chromium.');
-            return null;
+            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...');
+            }
 
-        } catch (error) {
-            if (this.logError) this.emit('error', `Chromium detection/install error: ${error.message}`);
+            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 { }
+
+            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 (this.logDebug) this.emit('debug', 'Chromium not found on Linux. Using Puppeteer bundled Chromium.');
             return null;
         }
+
+        // Unknown OS
+        if (this.logDebug) this.emit('debug', `Unsupported OS: ${osName}. Using Puppeteer bundled Chromium.`);
+        return null;
+
+    } catch (error) {
+        if (this.logError) this.emit('error', `Chromium detection/install error: ${error.message}`);
+        if (this.logDebug) this.emit('debug', 'Using Puppeteer bundled Chromium due to detection error.');
+        return null;
     }
+}
 
 }
 export default Functions

package/src/melcloud.js

@@ -344,8 +344,8 @@ class MelCloud extends EventEmitter {
             });
 
             const page = await browser.newPage();
-            page.on('error', err => { if (this.logError) this.emit('error', `Page crashed: ${err.message}`); });
-            page.on('pageerror', err => { if (this.logError) this.emit('error', `Browser error: ${err.message}`); });
+            page.on('error', error => { if (this.logError) this.emit('error', `Page crashed: ${error.message}`); });
+            page.on('pageerror', error => { if (this.logError) this.emit('error', `Browser error: ${error.message}`); });
             page.on('close', () => { if (this.logDebug) this.emit('debug', 'Page was closed unexpectedly'); });
             browser.on('disconnected', () => { if (this.logDebug) this.emit('debug', 'Browser disconnected unexpectedly'); });