homebridge-melcloud-control 4.0.0-beta.6 → 4.0.0-beta.60

package/CHANGELOG.md

@@ -16,6 +16,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - do not configure it manually, always using Config UI X
   - required Homebridge v2.0.0 and above
 
+## [4.0.0] - (xx.10.2025)
+
+## Changes
+
+- added support for MELCloud Home [#215](https://github.com/grzegorz914/homebridge-melcloud-control/issues/215)
+- redme updated
+- config schema updated
+- cleanup
+
 ## [3.9.5] - (02.09.2025)
 
 ## Changes

package/README.md

@@ -204,9 +204,10 @@ Homebridge plugin for Air Conditioner, Heat Pump and Energy Recovery Ventilation
 | Key | Description |
 | --- | --- |
 | `name` | Here set the own account name. |
-| `user` | Here set the MELCloud username. |
-| `passwd` | Here set the MELCloud password. |
-| `language` | Here select the MELCloud language. |
+| `user` | Here set the account username. |
+| `passwd` | Here set the account password. |
+| `language` | Here select the account language. |
+| `displayMode` | Here select the account type `None/Disabled`, `MELCloud`, `MELCloud Home`. |
 | `ataDevices[]` | Array of ATA devices created automatically after login to MELCloud from plugin config UI. |
 | `ataDevices[].id` | Read only data, do not change it. |
 | `ataDevices[].type` | Read only data, do not change it. |

package/config.schema.json

@@ -201,6 +201,32 @@
                 }
               ]
             },
+            "displayType": {
+              "title": "Account Type",
+              "type": "string",
+              "default": "disabled",
+              "description": "Here select the language used in MELCloud account.",
+              "oneOf": [
+                {
+                  "title": "None/Disabled",
+                  "enum": [
+                    "disabled"
+                  ]
+                },
+                {
+                  "title": "MELCLoud",
+                  "enum": [
+                    "melcloud"
+                  ]
+                },
+                {
+                  "title": "MELCLoud Home",
+                  "enum": [
+                    "melcloudhome"
+                  ]
+                }
+              ]
+            },
             "ataDevices": {
               "title": "Devices ATA",
               "type": "array",
@@ -1798,7 +1824,8 @@
             "name",
             "user",
             "passwd",
-            "language"
+            "language",
+            "displayType"
           ]
         }
       }
@@ -1817,6 +1844,7 @@
           "type": "password"
         },
         "accounts[].language",
+        "accounts[].displayType",
         {
           "key": "accounts[]",
           "type": "tabarray",

package/homebridge-ui/public/index.html

@@ -76,14 +76,22 @@
           </select>
         </div>
 
+        <div class="mb-2">
+          <label for="displayType" class="form-label">Account Type</label>
+          <select id="displayType" name="displayType" class="form-control">
+            <option value="disabled">None/Disabled</option>
+            <option value="melcloud">MELCloud</option>
+            <option value="melcloudhome">MELCloud Home</option>
+          </select>
+        </div>
+
         <div class="text-center">
-          <button id="logIn" type="button" class="btn btn-secondary">Connect to MELCloud</button>
+          <button id="logIn" type="button" class="btn btn-secondary">Log In</button>
           <button id="configButton" type="button" class="btn btn-secondary"><i class="fas fa-gear"></i></button>
         </div>
       </form>
+      <div id="accountButton" class="text-center mt-2"></div>
     </div>
-
-    <div id="accountButton" class="mt-2"></div>
   </div>
 
   <script>
@@ -96,8 +104,7 @@
         return;
       }
 
-      this.deviceIndex = 0;
-
+      this.accountIndex = 0;
       const accountsCount = pluginConfig[0].accounts.length;
       for (let i = 0; i < accountsCount; i++) {
         const button = document.createElement("button");
@@ -110,7 +117,7 @@
 
         button.addEventListener('click', async () => {
           for (let j = 0; j < accountsCount; j++) {
-            document.getElementById(`button${j}`).className = (j === i ? 'btn btn-secondary' : 'btn btn-primary');
+            document.getElementById(`button${j}`).className = (j === i ? 'btn btn-primary' : 'btn btn-secondary');
           }
 
           const acc = pluginConfig[0].accounts[i];
@@ -118,9 +125,10 @@
           document.getElementById('name').value = acc.name || '';
           document.getElementById('user').value = acc.user || '';
           document.getElementById('passwd').value = acc.passwd || '';
-          document.getElementById('language').value = acc.language || '';
-          document.getElementById('logIn').disabled = !(acc.name && acc.user && acc.passwd && acc.language);
-          this.deviceIndex = i;
+          document.getElementById('language').value = acc.language || '0';
+          document.getElementById('displayType').value = acc.displayType || 'disabled';
+          document.getElementById('logIn').disabled = !(acc.name && acc.user && acc.passwd && acc.language && acc.displayType);
+          this.accountIndex = i;
         });
 
         if (i === accountsCount - 1) document.getElementById(`button0`).click();
@@ -129,13 +137,14 @@
       document.getElementById('melCloudAccount').style.display = 'block';
 
       document.getElementById('configForm').addEventListener('input', async () => {
-        const acc = pluginConfig[0].accounts[this.deviceIndex];
+        const acc = pluginConfig[0].accounts[this.accountIndex];
         acc.name = document.querySelector('#name').value;
         acc.user = document.querySelector('#user').value;
         acc.passwd = document.querySelector('#passwd').value;
         acc.language = document.querySelector('#language').value;
+        acc.displayType = document.querySelector('#displayType').value;
 
-        document.getElementById('logIn').disabled = !(acc.name && acc.user && acc.passwd && acc.language);
+        document.getElementById('logIn').disabled = !(acc.name && acc.user && acc.passwd && acc.languaged && acc.displayType);
 
         await homebridge.updatePluginConfig(pluginConfig);
         await homebridge.savePluginConfig(pluginConfig);
@@ -191,8 +200,8 @@
         updateInfo('info', 'Connecting...', 'yellow');
 
         try {
-          const acc = pluginConfig[0].accounts[this.deviceIndex];
-          const payload = { accountName: acc.name, user: acc.user, passwd: acc.passwd, language: acc.language };
+          const acc = pluginConfig[0].accounts[this.accountIndex];
+          const payload = { accountName: acc.name, user: acc.user, passwd: acc.passwd, language: acc.language, displayType: acc.displayType };
           const devicesInMelCloud = await homebridge.request('/connect', payload);
 
           // Initialize devices arrays

package/homebridge-ui/server.js

@@ -17,14 +17,15 @@ class PluginUiServer extends HomebridgePluginUiServer {
     const user = payload.user;
     const passwd = payload.passwd;
     const language = payload.language;
+    const displayType = payload.displayType;
     const accountFile = `${this.homebridgeStoragePath}/melcloud/${accountName}_Account`;
     const buildingsFile = `${this.homebridgeStoragePath}/melcloud/${accountName}_Buildings`;
     const devicesFile = `${this.homebridgeStoragePath}/melcloud/${accountName}_Devices`;
-    const melCloud = new MelCloud(user, passwd, language, accountFile, buildingsFile, devicesFile, false, true);
+    const melCloud = new MelCloud(displayType, user, passwd, language, accountFile, buildingsFile, devicesFile, false, true);
 
     try {
-      const response = await melCloud.connect();
-      const devices = await melCloud.checkDevicesList(response.contextKey);
+      const accountInfo = await melCloud.connect();
+      const devices = await melCloud.checkDevicesList(accountInfo.ContextKey);
       return devices;
     } catch (error) {
       throw new Error(`MELCloud error: ${error.message ?? error}.`);

package/index.js

@@ -30,6 +30,9 @@ class MelCloudPlatform {
 		api.on('didFinishLaunching', async () => {
 			//loop through accounts
 			for (const account of config.accounts) {
+				const displayType = account.displayType || 'disabled';
+				if (displayType === 'disabled') continue;
+
 				const accountName = account.name;
 				const user = account.user;
 				const passwd = account.passwd;
@@ -64,7 +67,7 @@ class MelCloudPlatform {
 						passwd: 'removed',
 						mqtt: {
 							auth: {
-								...device.mqtt?.auth,
+								...account.mqtt?.auth,
 								passwd: 'removed',
 							}
 						},
@@ -76,7 +79,6 @@ class MelCloudPlatform {
 				const accountFile = `${prefDir}/${accountName}_Account`;
 				const buildingsFile = `${prefDir}/${accountName}_Buildings`;
 				const devicesFile = `${prefDir}/${accountName}_Devices`;
-				const cookiesFile = `${prefDir}/${accountName}cookies`;
 
 
 				//set account refresh interval
@@ -88,31 +90,26 @@ class MelCloudPlatform {
 						.on('start', async () => {
 							try {
 								//melcloud account
-								const melCloud = new MelCloud(user, passwd, language, accountFile, buildingsFile, devicesFile, cookiesFile, logLevel.warn, logLevel.debug, false)
+								const melCloud = new MelCloud(displayType, user, passwd, language, accountFile, buildingsFile, devicesFile, logLevel.warn, logLevel.debug, false)
 									.on('success', (msg) => logLevel.success && log.success(`${accountName}, ${msg}`))
 									.on('info', (msg) => logLevel.info && log.info(`${accountName}, ${msg}`))
 									.on('debug', (msg) => logLevel.debug && log.info(`${accountName}, debug: ${msg}`))
 									.on('warn', (msg) => logLevel.warn && log.warn(`${accountName}, ${msg}`))
 									.on('error', (msg) => logLevel.error && log.error(`${accountName}, ${msg}`));
 
-								await melCloud.connectHomeCoocies()
-								return;
-
-
 								//connect
-								let response;
+								let accountInfo;
 								try {
-									response = await melCloud.connect();
+									accountInfo = await melCloud.connect();
 								} catch (error) {
 									if (logLevel.error) log.error(`${accountName}, Connect error: ${error.message ?? error}`);
 									return;
 								}
 
-								const accountInfo = response.accountInfo ?? false;
-								const contextKey = response.contextKey ?? false;
-								const useFahrenheit = response.useFahrenheit ?? false;
+								const contextKey = accountInfo.ContextKey;
+								const useFahrenheit = accountInfo.UseFahrenheit;
 
-								if (contextKey === false) {
+								if (!contextKey) {
 									return;
 								}
 

package/package.json

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

package/src/melcloud.js

@@ -7,15 +7,15 @@ import Functions from './functions.js';
 import { ApiUrls, ApiUrlsHome } from './constants.js';
 
 class MelCloud extends EventEmitter {
-    constructor(user, passwd, language, accountFile, buildingsFile, devicesFile, cookiesFile, logWarn, logDebug, requestConfig) {
+    constructor(displayType, user, passwd, language, accountFile, buildingsFile, devicesFile, logWarn, logDebug, requestConfig) {
         super();
+        this.displayType = displayType;
         this.user = user;
         this.passwd = passwd;
         this.language = language;
         this.accountFile = accountFile;
         this.buildingsFile = buildingsFile;
         this.devicesFile = devicesFile;
-        this.cookiesFile = cookiesFile;
         this.logWarn = logWarn;
         this.logDebug = logDebug;
         this.requestConfig = requestConfig;
@@ -58,7 +58,7 @@ class MelCloud extends EventEmitter {
         }
     }
 
-    async checkDevicesList(contextKey) {
+    async checkMelcloudDevicesList(contextKey) {
         try {
             const axiosInstanceGet = axios.create({
                 method: 'GET',
@@ -109,7 +109,7 @@ class MelCloud extends EventEmitter {
         }
     }
 
-    async connect() {
+    async connectToMelCloud() {
         if (this.logDebug) this.emit('debug', `Connecting to MELCloud`);
 
         try {
@@ -123,7 +123,6 @@ class MelCloud extends EventEmitter {
             const account = accountData.data;
             const accountInfo = account.LoginData;
             const contextKey = accountInfo?.ContextKey;
-            const useFahrenheit = accountInfo?.UseFahrenheit ?? false;
             this.contextKey = contextKey;
 
             const debugData = {
@@ -153,44 +152,24 @@ class MelCloud extends EventEmitter {
             });
 
             await this.functions.saveData(this.accountFile, accountInfo);
-
             this.emit('success', `Connect to MELCloud Success`);
 
-            return {
-                accountInfo,
-                contextKey,
-                useFahrenheit
-            };
+            return accountInfo
         } catch (error) {
             throw new Error(`Connect to MELCloud error: ${error.message}`);
         }
     }
 
-    async connectHome(cookieC1, cookieC2) {
-        if (this.logDebug) this.emit('debug', `Connecting to MELCloud Home`);
-
+    async checkMelcloudHomeDevicesList(contextKey) {
         try {
-            const c1 = cookieC1.trim();
-            const c2 = cookieC2.trim();
-
-            const cookieString = [
-                '__Secure-monitorandcontrol=chunks-2',
-                `__Secure-monitorandcontrolC1=${c1}`,
-                `__Secure-monitorandcontrolC2=${c2}`,
-            ].join('; ');
-
             const axiosInstance = axios.create({
+                method: 'GET',
                 baseURL: ApiUrlsHome.BaseURL,
-                timeout: 10000,
-                httpsAgent: new Agent({
-                    keepAlive: false,
-                    rejectUnauthorized: false
-                }),
                 headers: {
                     'Accept': '*/*',
                     'Accept-Language': 'en-US,en;q=0.9',
-                    'Cookie': cookieString,
-                    'User-Agent': 'homebridge-melcloud-home/0.2.0',
+                    'Cookie': contextKey,
+                    'User-Agent': 'homebridge-melcloud-control/4.0.0',
                     'DNT': '1',
                     'Origin': 'https://melcloudhome.com',
                     'Referer': 'https://melcloudhome.com/dashboard',
@@ -198,93 +177,188 @@ class MelCloud extends EventEmitter {
                     'Sec-Fetch-Mode': 'cors',
                     'Sec-Fetch-Site': 'same-origin',
                     'X-CSRF': '1'
-                }
+                },
+                ...this.axiosDefaults
             });
 
-            const response = await axiosInstance.get(ApiUrlsHome.GetUserContext);
-            const homeData = response.data;
-            if (this.logDebug) this.emit('debug', `[MELCloudHome] Response data: ${JSON.stringify(homeData, null, 2)}`);
+            if (this.logDebug) this.emit('debug', `Scanning for devices`);
+            const listDevicesData = await axiosInstance(ApiUrlsHome.GetUserContext);
+            const buildingsList = listDevicesData.data.buildings;
+            if (this.logDebug) this.emit('debug', `Buildings: ${JSON.stringify(buildingsList, null, 2)}`);
 
-            this.emit('success', `Connect to MELCloud Home Success`);
+            if (!buildingsList) {
+                if (this.logWarn) this.emit('warn', `No building found`);
+                return null;
+            }
+
+            await this.functions.saveData(this.buildingsFile, buildingsList);
+            if (this.logDebug) this.emit('debug', `Buildings list saved`);
 
-            return
+            const devices = buildingsList.flatMap(building => {
+                // Funkcja kapitalizująca klucze obiektu
+                const capitalizeKeys = obj =>
+                    Object.fromEntries(
+                        Object.entries(obj).map(([key, value]) => [
+                            key.charAt(0).toUpperCase() + key.slice(1),
+                            value
+                        ])
+                    );
+
+                // Funkcja tworząca finalny obiekt Device
+                const createDevice = (device, type) => {
+                    // Settings już kapitalizowane w nazwach
+                    const settingsArray = device.Settings || [];
+
+                    const settingsObject = Object.fromEntries(
+                        settingsArray.map(({ name, value }) => {
+                            let parsedValue = value;
+                            if (value === "True") parsedValue = true;
+                            else if (value === "False") parsedValue = false;
+                            else if (!isNaN(value) && value !== "") parsedValue = Number(value);
+
+                            const key = name.charAt(0).toUpperCase() + name.slice(1);
+                            return [key, parsedValue];
+                        })
+                    );
+
+                    // Scal Capabilities + Settings + DeviceType w Device
+                    const deviceObject = {
+                        ...capitalizeKeys(device.Capabilities || {}),
+                        ...settingsObject,
+                        DeviceType: type
+                    };
+
+                    // Usuń stare pola Settings i Capabilities
+                    const { Settings, Capabilities, Id, GivenDisplayName, ...rest } = device;
+
+                    return {
+                        ...rest,
+                        Type: type,               // <-- Type na głównym poziomie według źródła
+                        DeviceID: Id,
+                        DeviceName: GivenDisplayName,
+                        Device: deviceObject
+                    };
+                };
+
+                return [
+                    ...(building.airToAirUnits || []).map(d => createDevice(capitalizeKeys(d), 0)),
+                    ...(building.airToWaterUnits || []).map(d => createDevice(capitalizeKeys(d), 1)),
+                    ...(building.airToVentilationUnits || []).map(d => createDevice(capitalizeKeys(d), 3))
+                ];
+            });
+
+            // Jeśli nie ma urządzeń
+            if (devices.length === 0) {
+                if (this.logWarn) this.emit('warn', `No devices found`);
+                return null;
+            }
+
+
+            // Jeśli nie ma urządzeń
+            if (devices.length === 0) {
+                if (this.logWarn) this.emit('warn', `No devices found`);
+                return null;
+            }
+
+
+            await this.functions.saveData(this.devicesFile, devices);
+            if (this.logDebug) this.emit('debug', `${devices.length} devices saved`);
+
+            return devices;
         } catch (error) {
             throw new Error(`Connect to MELCloud Home error: ${error.message}`);
         }
     }
 
-    async connectHomeCookies() {
-        const loginUrl = new URL('https://live-melcloudhome.auth.eu-west-1.amazoncognito.com/login');
-        loginUrl.searchParams.set('client_id', '3g4d5l5kivuqi7oia68gib7uso');
-        loginUrl.searchParams.set('redirect_uri', 'https://auth.melcloudhome.com/signin-oidc-meu');
-        loginUrl.searchParams.set('response_type', 'code');
-        loginUrl.searchParams.set('scope', 'openid profile');
-        loginUrl.searchParams.set('response_mode', 'form_post');
-
-        const browser = await puppeteer.launch({
-            headless: true,
-            args: ['--no-sandbox', '--disable-setuid-sandbox']
-        });
+    async connectToMelCloudHome() {
+        if (this.logDebug) this.emit('debug', `Connecting to MELCloud Home`);
 
+        const browser = await puppeteer.launch({ headless: true, args: ['--no-sandbox', '--disable-setuid-sandbox'] });
         const page = await browser.newPage();
 
         try {
-            this.emit('warn', 'Opening login page...');
-            await page.goto(loginUrl.toString(), { waitUntil: 'networkidle2' });
+            // Open MELCloud Home
+            await page.goto(ApiUrlsHome.BaseURL, { waitUntil: 'networkidle2' });
+            const buttons = await page.$$('button.btn--blue');
+            let loginBtn = null;
+            for (const btn of buttons) {
+                const text = await page.evaluate(el => el.textContent, btn);
+                if (text.trim() === 'Zaloguj' || text.trim() === 'Log In') {
+                    loginBtn = btn;
+                    break;
+                }
+            }
 
-            this.emit('warn', 'Typing credentials...');
+            if (!loginBtn && this.logWarn) this.emit('warn', `Login button not found`);
+
+            // Set credentials and login
+            await Promise.all([loginBtn.click(), page.waitForNavigation({ waitUntil: 'networkidle2', timeout: 20000 })]);
+            await page.waitForSelector('input[name="username"]', { timeout: 15000 });
             await page.type('input[name="username"]', this.user, { delay: 50 });
             await page.type('input[name="password"]', this.passwd, { delay: 50 });
 
-            // Wyszukiwanie przycisku logowania
-            const buttonSelectors = [
-                'button[type="submit"]',
-                'input[type="submit"]',
-                'button[name="signIn"]',
-                'button.btn-primary'
-            ];
-
-            let buttonFound = false;
-            for (const selector of buttonSelectors) {
-                const button = await page.$(selector);
-                if (button) {
-                    this.emit('warn', `Found submit button: ${selector}`);
-                    await Promise.all([
-                        button.click(),
-                        page.waitForNavigation({ waitUntil: 'networkidle2', timeout: 20000 }) // czekamy na redirect
-                    ]);
-                    buttonFound = true;
-                    break;
-                }
-            }
+            const button1 = await page.$('input[type="submit"]');
+            await Promise.all([button1.click(), page.waitForNavigation({ waitUntil: 'networkidle2', timeout: 20000 })]);
+
+            // Get cookies C1 and C2
+            let c1 = null, c2 = null;
+            const start = Date.now();
 
-            if (!buttonFound) {
-                throw new Error('❌ Could not find login button on the page.');
+            // Loop max 20s
+            while ((!c1 || !c2) && Date.now() - start < 20000) {
+                const cookies = await page.cookies();
+                c1 = cookies.find(c => c.name === '__Secure-monitorandcontrolC1')?.value || c1;
+                c2 = cookies.find(c => c.name === '__Secure-monitorandcontrolC2')?.value || c2;
+                if (!c1 || !c2) await new Promise(r => setTimeout(r, 500));
             }
 
-            // ✅ Poczekaj aż dashboard MELCloud Home będzie gotowy
-            this.emit('warn', 'Waiting for MELCloud Home dashboard...');
-            await page.waitForSelector('#dashboard, .dashboard-container', { timeout: 20000 });
+            if (!c1 || !c2) {
+                if (this.logWarn) this.emit('warn', `Cookies C1/C2 missing`);
+                return null;
+            }
 
-            // Pobranie cookies po zalogowaniu
-            const cookies = await page.cookies();
-            const c1 = cookies.find(c => c.name === '__Secure-monitorandcontrolC1')?.value || null;
-            const c2 = cookies.find(c => c.name === '__Secure-monitorandcontrolC2')?.value || null;
+            const contextKey = ['__Secure-monitorandcontrol=chunks-2', `__Secure-monitorandcontrolC1=${c1}`, `__Secure-monitorandcontrolC2=${c2}`,].join('; ');
+            const accountInfo = { ContextKey: contextKey, UseFahrenheit: false };
+            this.contextKey = contextKey;
 
-            const data = { C1: c1, C2: c2, date: new Date().toISOString() };
-            await this.functions.saveData(this.cookiesFile, data);
+            await this.functions.saveData(this.accountFile, accountInfo);
+            this.emit('success', `Connect to MELCloud Home Success`);
 
-            this.emit('warn', 'Login successful.');
-            return data;
-        } catch (err) {
-            this.emit('error', `Login failed: ${err.message}`);
-            return null;
+            return accountInfo;
+        } catch (error) {
+            throw new Error(`Connect to MELCloud Home error: ${error.message}`);
         } finally {
             await browser.close();
         }
     }
 
+    async connect() {
+        let response = {};
+        switch (this.displayType) {
+            case "melcloud":
+                response = await this.connectToMelCloud();
+                return response
+            case "melcloudhome":
+                response = await this.connectToMelCloudHome();
+                return response
+            default:
+                return response
+        }
+    }
 
+    async checkDevicesList(contextKey) {
+        let devices = [];
+        switch (this.displayType) {
+            case "melcloud":
+                devices = await this.checkMelcloudDevicesList(contextKey);
+                return devices
+            case "melcloudhome":
+                devices = await this.checkMelcloudHomeDevicesList(contextKey);
+                return devices;
+            default:
+                return devices;
+        }
+    }
 
     async send(accountInfo) {
         try {