homebridge-melcloud-control 4.4.1-beta.1 → 4.4.1-beta.10

package/src/melcloudhome.js

@@ -1,4 +1,3 @@
-import fs from 'fs';
 import axios from 'axios';
 import WebSocket from 'ws';
 import { exec } from 'child_process';
@@ -7,7 +6,7 @@ import EventEmitter from 'events';
 import puppeteer from 'puppeteer';
 import ImpulseGenerator from './impulsegenerator.js';
 import Functions from './functions.js';
-import { ApiUrlsHome, LanguageLocaleMap } from './constants.js';
+import { ApiUrls, LanguageLocaleMap } from './constants.js';
 const execPromise = promisify(exec);
 
 class MelCloudHome extends EventEmitter {
@@ -17,7 +16,6 @@ class MelCloudHome extends EventEmitter {
         this.user = account.user;
         this.passwd = account.passwd;
         this.language = account.language;
-        this.logSuccess = account.log?.success;
         this.logWarn = account.log?.warn;
         this.logError = account.log?.error;
         this.logDebug = account.log?.debug;
@@ -79,7 +77,7 @@ class MelCloudHome extends EventEmitter {
     async checkScenesList() {
         try {
             if (this.logDebug) this.emit('debug', `Scanning for scenes`);
-            const listScenesData = await this.client(ApiUrlsHome.GetUserScenes, { method: 'GET', });
+            const listScenesData = await this.client(ApiUrls.Home.Get.Scenes, { method: 'GET', });
 
             const scenesList = listScenesData.data;
             if (this.logDebug) this.emit('debug', `Scenes: ${JSON.stringify(scenesList, null, 2)}`);
@@ -111,7 +109,7 @@ class MelCloudHome extends EventEmitter {
         try {
             const devicesList = { State: false, Info: null, Devices: [], Scenes: [] }
             if (this.logDebug) this.emit('debug', `Scanning for devices`);
-            const listDevicesData = await this.client(ApiUrlsHome.GetUserContext, { method: 'GET' });
+            const listDevicesData = await this.client(ApiUrls.Home.Get.ListDevices, { method: 'GET' });
 
             const userContext = listDevicesData.data;
             const buildings = userContext.buildings ?? [];
@@ -225,26 +223,45 @@ class MelCloudHome extends EventEmitter {
         try {
             const accountInfo = { State: false, Info: '', Account: {}, UseFahrenheit: false };
 
-            // Get Chromium path
+            // Get Chromium path from resolver
             let chromiumPath = await this.functions.ensureChromiumInstalled();
 
-            // Fallback to Puppeteer's bundled Chromium
+            // Detect architecture again (cheap & explicit)
+            const { stdout: archOut } = await execPromise('uname -m');
+            const arch = archOut.trim();
+            const isARM =
+                arch.startsWith('arm') ||
+                arch.startsWith('aarch64') ||
+                arch.startsWith('aarch');
+
+            // Detect QNAP
+            const isQnap =
+                fs.existsSync('/etc/config/uLinux.conf') ||
+                fs.existsSync('/etc/config/qpkg.conf');
+
+            // Conditional Puppeteer fallback
             if (!chromiumPath) {
-                try {
-                    const puppeteerPath = puppeteer.executablePath();
-                    if (puppeteerPath && puppeteerPath.length > 0) {
+                if (!isARM && !isQnap) {
+                    try {
+                        const puppeteerPath = puppeteer.executablePath();
+                        if (!puppeteerPath) {
+                            accountInfo.Info = 'Puppeteer returned empty Chromium path';
+                            return accountInfo;
+                        }
+
                         chromiumPath = puppeteerPath;
                         if (this.logDebug) this.emit('debug', `Using Puppeteer bundled Chromium at ${chromiumPath}`);
-                    } else {
-                        accountInfo.Info = `Puppeteer returned empty Chromium path`;
+                    } catch (error) {
+                        accountInfo.Info = `Failed to get Puppeteer Chromium path: ${error.message}`;
                         return accountInfo;
                     }
-                } catch (error) {
-                    accountInfo.Info = `Failed to get Puppeteer Chromium path: ${error.message}`;
+                } else {
+                    accountInfo.Info = 'Chromium not available for this platform. Install system Chromium.';
                     return accountInfo;
                 }
             }
 
+
             // Verify Chromium executable
             try {
                 const { stdout } = await execPromise(`"${chromiumPath}" --version`);
@@ -282,7 +299,7 @@ class MelCloudHome extends EventEmitter {
             await client.send('Network.enable')
             client.on('Network.webSocketCreated', ({ url }) => {
                 try {
-                    if (url.startsWith(`${ApiUrlsHome.WebSocketURL}`)) {
+                    if (url.startsWith(`${ApiUrls.Home.WebSocket}`)) {
                         const params = new URL(url).searchParams;
                         const hash = params.get('hash');
                         if (this.logDebug) this.emit('debug', `Web socket hash detected: ${hash}`);
@@ -293,11 +310,11 @@ class MelCloudHome extends EventEmitter {
 
                             try {
                                 const headers = {
-                                    'Origin': ApiUrlsHome.BaseURL,
+                                    'Origin': ApiUrls.Home.Base,
                                     'Pragma': 'no-cache',
                                     'Cache-Control': 'no-cache'
                                 };
-                                const webSocket = new WebSocket(`${ApiUrlsHome.WebSocketURL}${hash}`, { headers: headers })
+                                const webSocket = new WebSocket(`${ApiUrls.Home.WebSocket}${hash}`, { headers: headers })
                                     .on('error', (error) => {
                                         if (this.logError) this.emit('error', `Web socket error: ${error}`);
                                         try {
@@ -326,7 +343,7 @@ class MelCloudHome extends EventEmitter {
                                     })
                                     .on('message', (message) => {
                                         const parsedMessage = JSON.parse(message);
-                                        if (this.logDebug) this.emit('debug', `Incoming message: ${JSON.stringify(parsedMessage, null, 2)}`);
+                                        if (!this.logDebug) this.emit('debug', `Incoming message: ${JSON.stringify(parsedMessage, null, 2)}`);
                                         if (parsedMessage.message === 'Forbidden') return;
 
                                         this.emit('webSocket', parsedMessage);
@@ -343,9 +360,9 @@ class MelCloudHome extends EventEmitter {
             });
 
             try {
-                await page.goto(ApiUrlsHome.BaseURL, { waitUntil: ['domcontentloaded', 'networkidle2'], timeout: GLOBAL_TIMEOUT });
+                await page.goto(ApiUrls.Home.Base, { waitUntil: ['domcontentloaded', 'networkidle2'], timeout: GLOBAL_TIMEOUT });
             } catch (error) {
-                accountInfo.Info = `Navigation to ${ApiUrlsHome.BaseURL} failed: ${error.message}`;
+                accountInfo.Info = `Navigation to ${ApiUrls.Home.Base} failed: ${error.message}`;
                 return accountInfo;
             }
 
@@ -407,7 +424,7 @@ class MelCloudHome extends EventEmitter {
                 'Accept-Language': LanguageLocaleMap[this.language],
                 'Cookie': cookies,
                 'Priority': 'u=3, i',
-                'Referer': ApiUrlsHome.Dashboard,
+                'Referer': ApiUrls.Home.Dashboard,
                 'Sec-Fetch-Dest': 'empty',
                 'Sec-Fetch-Mode': 'cors',
                 'Sec-Fetch-Site': 'same-origin',
@@ -416,7 +433,7 @@ class MelCloudHome extends EventEmitter {
             };
 
             this.client = axios.create({
-                baseURL: ApiUrlsHome.BaseURL,
+                baseURL: ApiUrls.Home.Base,
                 timeout: 30000,
                 headers: headers
             })