homebridge-melcloud-control 4.4.1-beta.27 → 4.4.1-beta.29

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "MELCloud Control",
   "name": "homebridge-melcloud-control",
-  "version": "4.4.1-beta.27",
+  "version": "4.4.1-beta.29",
   "description": "Homebridge plugin to control Mitsubishi Air Conditioner, Heat Pump and Energy Recovery Ventilation.",
   "license": "MIT",
   "author": "grzegorz914",
@@ -40,8 +40,7 @@
     "axios": "^1.13.2",
     "express": "^5.2.1",
     "puppeteer": "^24.33.0",
-    "ws": "^8.18.3",
-    "crypto": "^1.0.1"
+    "ws": "^8.18.3"
   },
   "keywords": [
     "homebridge",

package/src/functions.js

@@ -88,10 +88,7 @@ class Functions extends EventEmitter {
 
             /* ===================== macOS ===================== */
             if (isMac) {
-                const macCandidates = [
-                    '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome',
-                    '/Applications/Chromium.app/Contents/MacOS/Chromium'
-                ];
+                const macCandidates = ['/Applications/Google Chrome.app/Contents/MacOS/Google Chrome', '/Applications/Chromium.app/Contents/MacOS/Chromium'];
                 for (const path of macCandidates) {
                     try {
                         await access(path, fs.constants.X_OK);
@@ -138,7 +135,6 @@ class Functions extends EventEmitter {
             /* ===================== Linux ARM ===================== */
             if (isLinux && isARM) {
                 const armCandidates = ['/usr/bin/chromium-browser', '/usr/bin/chromium', '/snap/bin/chromium'];
-
                 for (const path of armCandidates) {
                     try {
                         await access(path, fs.constants.X_OK);
@@ -151,8 +147,7 @@ class Functions extends EventEmitter {
                 if (!isDocker) {
                     try {
                         await execPromise('sudo apt update -y');
-                        await execPromise('sudo apt install -y chromium chromium-browser chromium-codecs-ffmpeg');
-                        await execPromise('sudo apt install -y libnspr4 libnss3 libx11-6 libxcomposite1 libxdamage1 libxrandr2 libatk1.0-0 libcups2 libdrm2 libgbm1 libasound2');
+                        await execPromise('sudo apt install -y chromium chromium-browser chromium-codecs-ffmpeg libnspr4 libnss3 libx11-6 libxcomposite1 libxdamage1 libxrandr2 libatk1.0-0 libcups2 libdrm2 libgbm1 libasound2');
                     } catch (error) {
                         if (this.logError) this.emit('error', `Install package for Linux ARM error: ${error}`);
                     }
@@ -192,13 +187,18 @@ class Functions extends EventEmitter {
                 if (isDocker) {
                     try {
                         await execPromise('apt update -y && apt install -y chromium');
-                        await access('/usr/bin/chromium', fs.constants.X_OK);
-                        result.path = '/usr/bin/chromium';
-                        result.system = 'Linux Docker';
-                        return result;
                     } catch (error) {
                         if (this.logError) this.emit('error', `Install package for Linux Docker error: ${error}`);
                     }
+
+                    for (const path of linuxCandidates) {
+                        try {
+                            await access(path, fs.constants.X_OK);
+                            result.path = path;
+                            result.system = 'Linux Docker';
+                            return result;
+                        } catch { }
+                    }
                 }
             }
 

package/src/melcloudhome.js

@@ -9,11 +9,6 @@ import Functions from './functions.js';
 import { ApiUrls, LanguageLocaleMap } from './constants.js';
 const execPromise = promisify(exec);
 
-import CookieJar from './helper.js';
-
-import crypto from 'crypto';
-import { URL } from 'url';
-
 class MelCloudHome extends EventEmitter {
     constructor(account, accountFile, buildingsFile, pluginStart = false) {
         super();
@@ -220,7 +215,7 @@ class MelCloudHome extends EventEmitter {
         }
     }
 
-    async connect1() {
+    async connect() {
         if (this.logDebug) this.emit('debug', 'Connecting to MELCloud Home');
         const GLOBAL_TIMEOUT = 120000;
 
@@ -445,187 +440,6 @@ class MelCloudHome extends EventEmitter {
             }
         }
     }
-
-
-    async axiosRequest(url, options, jar, maxRedirects = 15) {
-        let currentUrl = url;
-        let previousUrl = null;
-        let method = options.method || 'GET';
-        let body = options.body;
-
-        for (let i = 0; i < maxRedirects; i++) {
-            const cookieHeader = jar.headerFor(currentUrl);
-
-            const headers = {
-                'User-Agent': options.headers?.['User-Agent'],
-                'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
-                'Accept-Language': 'en-US,en;q=0.9',
-                'Accept-Encoding': 'identity',
-                ...(previousUrl ? { Referer: previousUrl } : {}),
-                ...(cookieHeader ? { Cookie: cookieHeader } : {}),
-                ...options.headers,
-            };
-
-            const response = await axios({
-                url: currentUrl,
-                method,
-                data: body,
-                headers,
-                maxRedirects: 0,
-                validateStatus: () => true,
-                responseType: 'text',
-            });
-
-            jar.addFromHeader(response.headers['set-cookie'], currentUrl);
-
-            /* ========= HTTP REDIRECT ========= */
-            if ([301, 302, 303, 307, 308].includes(response.status)) {
-                const location = response.headers.location;
-                if (!location) break;
-
-                // SUCCESS: app redirect
-                if (location.startsWith('melcloudhome://')) {
-                    return { url: location, data: response.data };
-                }
-
-                previousUrl = currentUrl;
-                currentUrl = location.startsWith('http')
-                    ? location
-                    : new URL(location, currentUrl).toString();
-
-                method = 'GET';
-                body = undefined;
-                continue;
-            }
-
-            /* ========= META REFRESH ========= */
-            const metaMatch = response.data?.match(
-                /<meta[^>]+http-equiv=["']?refresh["']?[^>]+content=["']?\d+;\s*url=([^"'>]+)["']?/i
-            );
-
-            if (metaMatch) {
-                const redirectPath = metaMatch[1]
-                    .replace(/&amp;/g, '&')
-                    .replace(/&#x2F;/g, '/');
-
-                previousUrl = currentUrl;
-                currentUrl = redirectPath.startsWith('http')
-                    ? redirectPath
-                    : new URL(redirectPath, currentUrl).toString();
-
-                method = 'GET';
-                body = undefined;
-                continue;
-            }
-
-            /* ========= FINAL RESPONSE ========= */
-            return {
-                url: currentUrl,
-                data: response.data,
-                headers: response.headers,
-            };
-        }
-
-        throw new Error('OAuth flow aborted: too many redirects');
-    }
-
-
-    async loginWithCredentials(email, password) {
-        const jar = new CookieJar();
-
-        const userAgent = 'Mozilla/5.0 (iPhone; CPU iPhone OS 18_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.1 Mobile Safari/604.1';
-
-        const codeVerifier = crypto.randomBytes(32).toString('base64url');
-        const codeChallenge = crypto
-            .createHash('sha256')
-            .update(codeVerifier)
-            .digest('base64url');
-
-        const authUrl = 'https://auth.melcloudhome.com/connect/authorize?' +
-            new URLSearchParams({
-                client_id: 'homemobile',
-                redirect_uri: 'melcloudhome://',
-                response_type: 'code',
-                scope: 'openid profile email offline_access IdentityServerApi',
-                code_challenge: codeChallenge,
-                code_challenge_method: 'S256',
-            }).toString();
-
-        // STEP 1 – get login page
-        const loginPage = await this.axiosRequest(authUrl, {
-            headers: { 'User-Agent': userAgent },
-        }, jar);
-
-        const csrfMatch = loginPage.data.match(/name="(_csrf|__RequestVerificationToken)".*?value="([^"]+)"/);
-        if (!csrfMatch) throw new Error('CSRF token not found');
-        const csrfToken = csrfMatch[2];
-
-        // STEP 2 – submit credentials
-        const form = new URLSearchParams({
-            _csrf: csrfToken,
-            username: email,
-            password,
-        }).toString();
-
-        const loginResult = await this.axiosRequest(loginPage.url, {
-            method: 'POST',
-            headers: {
-                'User-Agent': userAgent,
-                'Content-Type': 'application/x-www-form-urlencoded',
-                'Content-Length': Buffer.byteLength(form),
-            },
-            body: form,
-        }, jar);
-
-        if (!loginResult.url.startsWith('melcloudhome://')) {
-            throw new Error('OAuth redirect not received');
-        }
-
-        const code = new URL(loginResult.url).searchParams.get('code');
-        if (!code) throw new Error('Authorization code missing');
-
-        // STEP 3 – exchange token
-        const tokenResponse = await axios.post('https://auth.melcloudhome.com/connect/token',
-            new URLSearchParams({
-                grant_type: 'authorization_code',
-                client_id: 'homemobile',
-                redirect_uri: 'melcloudhome://',
-                code,
-                code_verifier: codeVerifier,
-            }).toString(),
-            {
-                headers: {
-                    'Content-Type': 'application/x-www-form-urlencoded',
-                    'Authorization': 'Basic aG9tZW1vYmlsZTo=',
-                },
-            },
-        );
-
-        if (!tokenResponse.data.refresh_token) {
-            throw new Error('No refresh token returned');
-        }
-
-        return {
-            refreshToken: tokenResponse.data.refresh_token,
-            accessToken: tokenResponse.data.access_token,
-            expiresIn: tokenResponse.data.expires_in,
-        };
-    }
-
-    async connect() {
-        if (this.logDebug) this.emit('debug', 'Connecting to MELCloud Home');
-
-        try {
-            const accountInfo = { State: false, Info: '', Account: {}, UseFahrenheit: false };
-
-            const tokens = await this.loginWithCredentials(this.user, this.passwd);
-            this.emit('debug', `Tokens: ${JSON.stringify(tokens, null, 2)}`);
-            return accountInfo
-        } catch (error) {
-            throw new Error(`Connect error: ${error.message}`);
-        }
-    }
-
 }
 
 export default MelCloudHome;

package/src/helper.js

@@ -1,70 +0,0 @@
-class CookieJar {
-    constructor() {
-        this.cookies = [];
-    }
-
-    addFromHeader(setCookie, url) {
-        if (!setCookie) return;
-
-        const urlObj = new URL(url);
-        const headers = Array.isArray(setCookie) ? setCookie : [setCookie];
-
-        for (const header of headers) {
-            const parts = header.split(';').map(p => p.trim());
-            const [name, value] = parts[0].split('=');
-
-            const cookie = {
-                name,
-                value,
-                domain: urlObj.hostname,
-                path: '/',
-                expires: null,
-            };
-
-            for (const part of parts.slice(1)) {
-                const [key, val] = part.split('=').map(v => v?.trim());
-                if (!key) continue;
-
-                switch (key.toLowerCase()) {
-                    case 'domain':
-                        cookie.domain = val;
-                        break;
-                    case 'path':
-                        cookie.path = val || '/';
-                        break;
-                    case 'expires':
-                        cookie.expires = new Date(val);
-                        break;
-                    case 'max-age':
-                        cookie.expires = new Date(Date.now() + Number(val) * 1000);
-                        break;
-                }
-            }
-
-            this.cookies = this.cookies.filter(
-                c => !(c.name === cookie.name && c.domain === cookie.domain && c.path === cookie.path),
-            );
-
-            this.cookies.push(cookie);
-        }
-    }
-
-    headerFor(url) {
-        const urlObj = new URL(url);
-        const now = Date.now();
-
-        const validCookies = this.cookies.filter(cookie => {
-            if (cookie.expires && cookie.expires.getTime() <= now) return false;
-            if (!urlObj.hostname.endsWith(cookie.domain)) return false;
-            if (!urlObj.pathname.startsWith(cookie.path)) return false;
-            return true;
-        });
-
-        return validCookies.length
-            ? validCookies.map(c => `${c.name}=${c.value}`).join('; ')
-            : null;
-    }
-}
-
-
-export default CookieJar