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

package/package.json

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

package/src/functions.js

@@ -54,100 +54,100 @@ class Functions extends EventEmitter {
         }
     }
 
-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}`);
-
-        // --- 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;
+    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}`);
+
+            // --- 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;
+                }
             }
-        }
 
-        // === 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...');
+            // === ARM (e.g. Raspberry Pi) ===
+            if (arch.startsWith('arm')) {
                 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 on ARM.');
+                    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.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;
+                    if (this.logWarn) this.emit('warn', 'System Chromium not found on ARM. Attempting installation...');
+                    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 on ARM.');
+                        return '/usr/bin/chromium-browser';
+                    } catch {
+                        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;
+                    }
                 }
             }
-        }
 
-        // === Linux (x64 etc.) ===
-        if (osName === 'Linux') {
-            try {
-                const { stdout: checkOut } = await execPromise('which chromium || which chromium-browser || true');
-                chromiumPath = checkOut.trim();
-                if (chromiumPath) {
-                    if (this.logDebug) this.emit('debug', `Found system Chromium: ${chromiumPath}`);
-                    return chromiumPath;
+            // === Linux (x64 etc.) ===
+            if (osName === 'Linux') {
+                try {
+                    const { stdout: checkOut } = await execPromise('which chromium || which chromium-browser || true');
+                    chromiumPath = checkOut.trim();
+                    if (chromiumPath) {
+                        if (this.logDebug) this.emit('debug', `Found system Chromium: ${chromiumPath}`);
+                        return chromiumPath;
+                    }
+                } catch { }
+
+                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');
+                    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 { }
 
-            if (this.logWarn) this.emit('warn', 'Chromium not found. Attempting installation...');
+                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 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...');
-            }
+                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 { }
 
-            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 { }
+                if (this.logDebug) this.emit('debug', 'Chromium not found on Linux. Using Puppeteer bundled Chromium.');
+                return null;
+            }
 
-            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 { }
+            // Unknown OS
+            if (this.logDebug) this.emit('debug', `Unsupported OS: ${osName}. Using Puppeteer bundled Chromium.`);
+            return null;
 
-            if (this.logDebug) this.emit('debug', 'Chromium not found on Linux. Using Puppeteer bundled Chromium.');
+        } 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;
         }
-
-        // 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

@@ -1,7 +1,6 @@
 import axios from 'axios';
 import EventEmitter from 'events';
 import puppeteer from 'puppeteer';
-import MelCloudHomeToken from './melcloudhometoken.js';
 import ImpulseGenerator from './impulsegenerator.js';
 import Functions from './functions.js';
 import { ApiUrls, ApiUrlsHome } from './constants.js';
@@ -298,32 +297,6 @@ class MelCloud extends EventEmitter {
         }
     }
 
-    async connectToMelCloudHome1() {
-        try {
-            const melCloudHomeToken = new MelCloudHomeToken({
-                user: this.user,
-                passwd: this.passwd,
-                logWarn: this.logWarn,
-                logError: this.logError,
-                logDebug: this.logDebug,
-            })
-                .on('success', message => this.emit('success', message))
-                .on('warn', warn => this.emit('warn', warn))
-                .on('error', error => this.emit('error', error));
-
-            const { codeVerifier, url } = await melCloudHomeToken.buildAuthorizeUrl();
-            const code = await melCloudHomeToken.loginToMelCloudHome(url);
-            const token = await melCloudHomeToken.getTokens(code, codeVerifier);
-
-            const accountInfo = { ContextKey: code, UseFahrenheit: false };
-            this.contextKey = code;
-
-            return accountInfo
-        } catch (error) {
-            throw error;
-        }
-    }
-
     async connectToMelCloudHome(refresh = false) {
         if (this.logDebug) this.emit('debug', 'Connecting to MELCloud Home');
 

package/src/melcloudhometoken.js

@@ -1,231 +0,0 @@
-import axios from 'axios';
-import crypto from 'crypto';
-import { wrapper } from 'axios-cookiejar-support';
-import { CookieJar } from 'tough-cookie';
-import { JSDOM } from 'jsdom';
-import EventEmitter from 'events';
-
-const MOBILE_USER_AGENT = 'MonitorAndControl.App.Mobile/35 CFNetwork/3860.100.1 Darwin/25.0.0';
-const CLIENT_ID = 'homemobile';
-const REDIRECT_URI = 'melcloudhome://';
-const SCOPE = 'openid profile email offline_access IdentityServerApi';
-const TOKEN_ENDPOINT = 'https://auth.melcloudhome.com/connect/token';
-const AUTHORIZE_ENDPOINT = 'https://auth.melcloudhome.com/connect/authorize';
-
-class MelCloudHomeToken extends EventEmitter {
-    constructor(config) {
-        super();
-        this.user = config.user;
-        this.passwd = config.passwd;
-        this.logWarn = config.logWarn;
-        this.logError = config.logError;
-
-        const jar = new CookieJar();
-        this.client = wrapper(axios.create({ jar, withCredentials: true }));
-        this.client.defaults.headers['User-Agent'] = MOBILE_USER_AGENT;
-    }
-
-    generatePKCE() {
-        const verifier = crypto.randomBytes(32).toString('base64url');
-        const challenge = crypto.createHash('sha256').update(verifier).digest('base64url');
-        return { verifier, challenge };
-    }
-
-    generateState() {
-        return crypto.randomBytes(32).toString('hex');
-    }
-
-    async buildAuthorizeUrl() {
-        const pkce = this.generatePKCE();
-        const state = this.generateState();
-
-        const authUrl = new URL(AUTHORIZE_ENDPOINT);
-        authUrl.searchParams.set('client_id', CLIENT_ID);
-        authUrl.searchParams.set('redirect_uri', REDIRECT_URI);
-        authUrl.searchParams.set('response_type', 'code');
-        authUrl.searchParams.set('scope', SCOPE);
-        authUrl.searchParams.set('code_challenge', pkce.challenge);
-        authUrl.searchParams.set('code_challenge_method', 'S256');
-        authUrl.searchParams.set('state', state);
-
-        return { url: authUrl.toString(), codeVerifier: pkce.verifier };
-    }
-
-    async loginToMelCloudHome(authUrl) {
-        try {
-            const getResp = await this.client.get(authUrl, { headers: { 'Accept': 'text/html' } });
-            const cookies = getResp.headers['set-cookie'] || [];
-            const dom = new JSDOM(getResp.data);
-            const csrf = dom.window.document.querySelector('input[name="_csrf"]')?.value;
-
-            if (!csrf) {
-                if (this.logWarn) this.emit('warn', 'CSRF token not found');
-                return null;
-            }
-
-            const formData = new URLSearchParams({
-                _csrf: csrf,
-                username: this.user,
-                password: this.passwd
-            });
-
-            const response = await this.client.post(authUrl, formData.toString(), {
-                headers: {
-                    'User-Agent': MOBILE_USER_AGENT,
-                    'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
-                    'Accept-Language': 'en-US,en;q=0.9',
-                    'Content-Type': 'application/x-www-form-urlencoded',
-                    'Content-Length': formData.toString().length,
-                    'Cookie': cookies.join('; '),
-                    'Origin': 'https://live-melcloudhome.auth.eu-west-1.amazoncognito.com',
-                    'Referer': authUrl
-                },
-                maxRedirects: 0,
-                validateStatus: status => [200, 302, 400].includes(status)
-            });
-
-            if (response.status === 400) {
-                if (this.logWarn) this.emit('warn', `Login failed: ${response.data}`);
-                return null;
-            }
-
-            // Extract authorization code
-            const code = await this.extractCodeFromResponse(
-                response.data,
-                response.headers,
-                async (url) => {
-                    const r = await this.client.get(url, {
-                        maxRedirects: 0,
-                        validateStatus: status => [200, 302, 303].includes(status)
-                    });
-                    return this.extractCodeFromResponse(r.data, r.headers, async u => this.extractCodeFromResponse(r.data, r.headers, u));
-                }
-            );
-
-            if (code) this.emit('warn', `Authorization code obtained: ${code}`);
-            return code || null;
-
-        } catch (err) {
-            if (this.logWarn) this.emit('warn', `loginToMelCloudHome error: ${err}`);
-            return null;
-        }
-    }
-
-    async extractCodeFromResponse(data, headers, followRedirect) {
-        return new Promise(async (resolve, reject) => {
-            try {
-                const locationHeader = headers['location'] || headers['Location'];
-
-                // 1️⃣ Location header
-                if (locationHeader && locationHeader.startsWith('melcloudhome://')) {
-                    const match = locationHeader.match(/[?&]code=([^&]+)/);
-                    if (match) {
-                        if (this.logWarn) this.emit('warn', `Found code in Location header: ${match[1]}`);
-                        resolve(match[1]);
-                        return;
-                    }
-                }
-
-                // 2️⃣ form_post HTML
-                const formCodeMatch = data.match(/name="code"\s+value="([^"]+)"/);
-                const formStateMatch = data.match(/name="state"\s+value="([^"]+)"/);
-                const formActionMatch = data.match(/action="([^"]+)"/);
-
-                if (formCodeMatch && formStateMatch && formActionMatch) {
-                    if (this.logWarn) this.emit('warn', 'Found form_post, submitting...');
-                    try {
-                        const code = await this.submitFormPost(formActionMatch[1], formCodeMatch[1], formStateMatch[1]);
-                        if (this.logWarn) this.emit('warn', `submitFormPost returned code: ${code}`);
-                        resolve(code);
-                        return;
-                    } catch (err) {
-                        if (this.logWarn) this.emit('warn', `submitFormPost failed: ${err}`);
-                        reject(err);
-                        return;
-                    }
-                }
-
-                // 3️⃣ JS redirect in body
-                const bodyCodeMatch = data.match(/melcloudhome:\/\/[^"'\s]*[?&]code=([^&"'\s]+)/);
-                if (bodyCodeMatch) {
-                    if (this.logWarn) this.emit('warn', `Found code in body: ${bodyCodeMatch[1]}`);
-                    resolve(bodyCodeMatch[1]);
-                    return;
-                }
-
-                // 4️⃣ Follow redirect
-                if (locationHeader && ['301', '302', '303'].includes(headers['status'] || '')) {
-                    if (this.logWarn) this.emit('warn', `Following redirect to ${locationHeader}`);
-                    try {
-                        const code = await followRedirect(locationHeader);
-                        resolve(code);
-                        return;
-                    } catch (err) {
-                        if (this.logWarn) this.emit('warn', `Follow redirect failed: ${err}`);
-                        reject(err);
-                        return;
-                    }
-                }
-
-                if (this.logWarn) this.emit('warn', 'Authorization code not found in response');
-                reject(new Error('Authorization code not found'));
-            } catch (err) {
-                if (this.logWarn) this.emit('warn', `extractCodeFromResponse error: ${err}`);
-                reject(err);
-            }
-        });
-    }
-
-    async submitFormPost(actionUrl, code, state) {
-        const formData = new URLSearchParams({ code, state });
-        if (this.logWarn) this.emit('warn', `Submitting form_post to ${actionUrl}`);
-        const res = await this.client.post(actionUrl, formData.toString(), {
-            headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-            maxRedirects: 0,
-            validateStatus: status => [200, 302, 303].includes(status)
-        });
-
-        const location = res.headers['location'];
-        if (location) {
-            const match = location.match(/[?&]code=([^&]+)/);
-            if (match) return match[1];
-        }
-
-        if (this.logWarn) this.emit('warn', 'Code not found after form_post submission');
-        throw new Error('Code not found after form_post submission');
-    }
-
-    async getTokens(code, codeVerifier) {
-        const tokenData = new URLSearchParams({
-            grant_type: 'authorization_code',
-            code: code,
-            redirect_uri: REDIRECT_URI,
-            client_id: CLIENT_ID,
-            code_verifier: codeVerifier
-        });
-
-        try {
-            const tokenResponse = await this.client.post(TOKEN_ENDPOINT, tokenData.toString(), {
-                headers: {
-                    'Content-Type': 'application/x-www-form-urlencoded',
-                    'Authorization': 'Basic aG9tZW1vYmlsZTo='
-                }
-            });
-
-            const tokens = tokenResponse.data;
-            if (this.logWarn) this.emit('warn', `Token obtained: ${JSON.stringify(tokens)}`);
-            return tokens;
-
-        } catch (err) {
-            throw new Error(`Failed to obtain OAuth token: ${err}`);
-        }
-    }
-}
-
-export default MelCloudHomeToken;
-
-
-
-
-
-