homebridge-melcloud-control 4.0.0-beta.38 → 4.0.0-beta.4

package/config.schema.json

@@ -201,34 +201,6 @@
                 }
               ]
             },
-            "displayType": {
-              "title": "Account Type",
-              "type": "string",
-              "minimum": 0,
-              "maximum": 2,
-              "default": 1,
-              "description": "Here select the language used in MELCloud account.",
-              "oneOf": [
-                {
-                  "title": "None/Disabled",
-                  "enum": [
-                    "0"
-                  ]
-                },
-                {
-                  "title": "MELCLoud",
-                  "enum": [
-                    "1"
-                  ]
-                },
-                {
-                  "title": "MELCLoud Home",
-                  "enum": [
-                    "2"
-                  ]
-                }
-              ]
-            },
             "ataDevices": {
               "title": "Devices ATA",
               "type": "array",
@@ -1826,8 +1798,7 @@
             "name",
             "user",
             "passwd",
-            "language",
-            "displayType"
+            "language"
           ]
         }
       }
@@ -1846,7 +1817,6 @@
           "type": "password"
         },
         "accounts[].language",
-        "accounts[].displayType",
         {
           "key": "accounts[]",
           "type": "tabarray",

package/homebridge-ui/public/index.html

@@ -76,15 +76,6 @@
           </select>
         </div>
 
-        <div class="mb-2">
-          <label for="accountType" class="form-label">Account Type</label>
-          <select id="accountType" name="accountType" class="form-control">
-            <option value="0">None/Disabled</option>
-            <option value="1">MELCloud</option>
-            <option value="2">MELCloud Home</option>
-          </select>
-        </div>
-
         <div class="text-center">
           <button id="logIn" type="button" class="btn btn-secondary">Connect to MELCloud</button>
           <button id="configButton" type="button" class="btn btn-secondary"><i class="fas fa-gear"></i></button>
@@ -128,8 +119,7 @@
           document.getElementById('user').value = acc.user || '';
           document.getElementById('passwd').value = acc.passwd || '';
           document.getElementById('language').value = acc.language || '';
-          document.getElementById('accountType').value = acc.displayType || '';
-          document.getElementById('logIn').disabled = !(acc.name && acc.user && acc.passwd && acc.language && acc.displayType);
+          document.getElementById('logIn').disabled = !(acc.name && acc.user && acc.passwd && acc.language);
           this.deviceIndex = i;
         });
 
@@ -144,9 +134,8 @@
         acc.user = document.querySelector('#user').value;
         acc.passwd = document.querySelector('#passwd').value;
         acc.language = document.querySelector('#language').value;
-        acc.displayType = document.querySelector('#accountType').value;
 
-        document.getElementById('logIn').disabled = !(acc.name && acc.user && acc.passwd && acc.languaged && acc.displayType);
+        document.getElementById('logIn').disabled = !(acc.name && acc.user && acc.passwd && acc.language);
 
         await homebridge.updatePluginConfig(pluginConfig);
         await homebridge.savePluginConfig(pluginConfig);
@@ -203,7 +192,7 @@
 
         try {
           const acc = pluginConfig[0].accounts[this.deviceIndex];
-          const payload = { accountName: acc.name, user: acc.user, passwd: acc.passwd, language: acc.language, accountType: acc.displayType };
+          const payload = { accountName: acc.name, user: acc.user, passwd: acc.passwd, language: acc.language };
           const devicesInMelCloud = await homebridge.request('/connect', payload);
 
           // Initialize devices arrays

package/homebridge-ui/server.js

@@ -17,11 +17,10 @@ class PluginUiServer extends HomebridgePluginUiServer {
     const user = payload.user;
     const passwd = payload.passwd;
     const language = payload.language;
-    const accountType = payload.accountType;
     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(accountType, user, passwd, language, accountFile, buildingsFile, devicesFile, false, true);
+    const melCloud = new MelCloud(user, passwd, language, accountFile, buildingsFile, devicesFile, false, true);
 
     try {
       const response = await melCloud.connect();

package/index.js

@@ -30,9 +30,6 @@ class MelCloudPlatform {
 		api.on('didFinishLaunching', async () => {
 			//loop through accounts
 			for (const account of config.accounts) {
-				const displayType = account.displayType || 1;
-				if (displayType === 0) continue;
-
 				const accountName = account.name;
 				const user = account.user;
 				const passwd = account.passwd;
@@ -67,7 +64,7 @@ class MelCloudPlatform {
 						passwd: 'removed',
 						mqtt: {
 							auth: {
-								...account.mqtt?.auth,
+								...device.mqtt?.auth,
 								passwd: 'removed',
 							}
 						},
@@ -79,6 +76,7 @@ class MelCloudPlatform {
 				const accountFile = `${prefDir}/${accountName}_Account`;
 				const buildingsFile = `${prefDir}/${accountName}_Buildings`;
 				const devicesFile = `${prefDir}/${accountName}_Devices`;
+				const coociesFile = `${prefDir}/${accountName}_Coocies`;
 
 
 				//set account refresh interval
@@ -90,13 +88,17 @@ class MelCloudPlatform {
 						.on('start', async () => {
 							try {
 								//melcloud account
-								const melCloud = new MelCloud(displayType, user, passwd, language, accountFile, buildingsFile, devicesFile, logLevel.warn, logLevel.debug, false)
+								const melCloud = new MelCloud(user, passwd, language, accountFile, buildingsFile, devicesFile, coociesFile, 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;
 								try {
@@ -107,10 +109,10 @@ class MelCloudPlatform {
 								}
 
 								const accountInfo = response.accountInfo ?? false;
-								const contextKey = response.contextKey;
+								const contextKey = response.contextKey ?? false;
 								const useFahrenheit = response.useFahrenheit ?? false;
 
-								if (!contextKey) {
+								if (contextKey === false) {
 									return;
 								}
 
@@ -118,7 +120,6 @@ class MelCloudPlatform {
 								let devicesInMelcloud;
 								try {
 									devicesInMelcloud = await melCloud.checkDevicesList(contextKey);
-									return
 								} catch (error) {
 									if (logLevel.error) log.error(`${accountName}, Check devices list error: ${error.message ?? error}`);
 									return;

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "MELCloud Control",
   "name": "homebridge-melcloud-control",
-  "version": "4.0.0-beta.38",
+  "version": "4.0.0-beta.4",
   "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(displayType, user, passwd, language, accountFile, buildingsFile, devicesFile, logWarn, logDebug, requestConfig) {
+    constructor(user, passwd, language, accountFile, buildingsFile, devicesFile, coociesFile, 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.coociesFile = coociesFile;
         this.logWarn = logWarn;
         this.logDebug = logDebug;
         this.requestConfig = requestConfig;
@@ -58,7 +58,7 @@ class MelCloud extends EventEmitter {
         }
     }
 
-    async checkMelcloudDevicesList(contextKey) {
+    async checkDevicesList(contextKey) {
         try {
             const axiosInstanceGet = axios.create({
                 method: 'GET',
@@ -109,7 +109,7 @@ class MelCloud extends EventEmitter {
         }
     }
 
-    async connectToMelCloud() {
+    async connect() {
         if (this.logDebug) this.emit('debug', `Connecting to MELCloud`);
 
         try {
@@ -156,18 +156,24 @@ class MelCloud extends EventEmitter {
 
             this.emit('success', `Connect to MELCloud Success`);
 
-            return { accountInfo, contextKey, useFahrenheit };
+            return {
+                accountInfo,
+                contextKey,
+                useFahrenheit
+            };
         } catch (error) {
             throw new Error(`Connect to MELCloud error: ${error.message}`);
         }
     }
 
-    async checkMelcloudHomeDevicesList(cookies) {
+    async connectHome(cookieC1, cookieC2) {
+        if (this.logDebug) this.emit('debug', `Connecting to MELCloud Home`);
+
         try {
-            const c1 = cookies.c1.trim();
-            const c2 = cookies.c2.trim();
+            const c1 = cookieC1.trim();
+            const c2 = cookieC2.trim();
 
-            const cookie = [
+            const cookieString = [
                 '__Secure-monitorandcontrol=chunks-2',
                 `__Secure-monitorandcontrolC1=${c1}`,
                 `__Secure-monitorandcontrolC2=${c2}`,
@@ -175,7 +181,7 @@ class MelCloud extends EventEmitter {
 
             const axiosInstance = axios.create({
                 baseURL: ApiUrlsHome.BaseURL,
-                timeout: 20000,
+                timeout: 10000,
                 httpsAgent: new Agent({
                     keepAlive: false,
                     rejectUnauthorized: false
@@ -183,8 +189,8 @@ class MelCloud extends EventEmitter {
                 headers: {
                     'Accept': '*/*',
                     'Accept-Language': 'en-US,en;q=0.9',
-                    'Cookie': cookie,
-                    'User-Agent': 'homebridge-melcloud-control/4.0.0',
+                    'Cookie': cookieString,
+                    'User-Agent': 'homebridge-melcloud-home/0.2.0',
                     'DNT': '1',
                     'Origin': 'https://melcloudhome.com',
                     'Referer': 'https://melcloudhome.com/dashboard',
@@ -195,127 +201,93 @@ class MelCloud extends EventEmitter {
                 }
             });
 
-            if (this.logDebug) this.emit('debug', `Scanning for devices`);
-            const listDevicesData = await axiosInstance.get(ApiUrlsHome.GetUserContext);
-            const buildingsList = listDevicesData.data.buildings;
-            if (this.logDebug) this.emit('debug', `Buildings: ${JSON.stringify(buildingsList, null, 2)}`);
-
-            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`);
-
-            const devices = buildingsList.flatMap(building => [
-                ...(building.airToAirUnits || []),
-                ...(building.airToWaterUnits || [])
-            ]);
-
-            const devicesCount = devices.length;
-            if (devicesCount === 0) {
-                if (this.logWarn) this.emit('warn', `No devices found`);
-                return null;
-            }
+            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)}`);
 
-            await this.functions.saveData(this.devicesFile, devices);
-            if (this.logDebug) this.emit('debug', `${devicesCount} devices saved`);
+            this.emit('success', `Connect to MELCloud Home Success`);
 
-            return devices;
+            return
         } catch (error) {
             throw new Error(`Connect to MELCloud Home error: ${error.message}`);
         }
     }
 
-    async connectToMelCloudHome() {
-        if (this.logDebug) this.emit('debug', `Connecting to MELCloud Home`);
+    async connectHomeCoocies() {
+        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'] });
-        const page = await browser.newPage();
 
-        try {
-            // 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;
-                }
-            }
 
-            if (!loginBtn && this.logWarn) this.emit('warn', `Login button not found`);
+        const browser = await puppeteer.launch({
+            headless: true,
+            args: ['--no-sandbox', '--disable-setuid-sandbox']
+        });
 
-            // 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 });
+        const page = await browser.newPage();
 
-            const button1 = await page.$('input[type="submit"]');
-            await Promise.all([button1.click(), page.waitForNavigation({ waitUntil: 'networkidle2', timeout: 20000 })]);
+        // Otwórz stronę logowania
+        this.emit('warn', `Opening login page...`);
+        await page.goto(loginUrl, { waitUntil: 'networkidle2' });
+
+        // Wpisz login i hasło
+        this.emit('warn', `Typing credentials...`);
+        await page.type('input[name="username"]', this.user, { delay: 50 });
+        await page.type('input[name="password"]', this.passwd, { delay: 50 });
+
+        // Sprawdź kilka możliwych wariantów
+        const buttonSelectors = [
+            'button[type="submit"]',
+            'input[type="submit"]',
+            'button[name="signIn"]',
+            'button.btn-primary',
+            'button:has-text("Sign in")',
+            'button:has-text("Zaloguj")'
+        ];
+
+        // Kliknij "Sign in" (przycisk AWS Cognito)
+        let buttonFound = false;
+        for (const selector of buttonSelectors) {
+            const button = await page.$(selector);
+            if (button) {
+                console.log(`Found submit button: ${selector}`);
+                await Promise.all([
+                    button.click(),
+                    page.waitForNavigation({ waitUntil: 'networkidle2', timeout: 15000 })
+                ]);
+                buttonFound = true;
+                break;
+            }
+        }
 
-            // 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ż załaduje się MELCloud Home
+        this.emit('warn', `Waiting for redirect to melcloudhome.com...`);
+        await new Promise(resolve => setTimeout(resolve, 5000));
 
-            if (!c1 || !c2) {
-                if (this.logWarn) this.emit('warn', `Cookies C1/C2 missing`);
-                return null;
-            }
+        // Pobierz cookies dla domeny melcloudhome.com
+        const cookies = await page.cookies();
 
-            const accountInfo = {};
-            const contextKey = { c1, c2 };
-            const useFahrenheit = false;
-            this.contextKey = contextKey;
+        // Znajdź __Secure-monitorandcontrolC1 i C2
+        const c1 = cookies.find(c => c.name === '__Secure-monitorandcontrolC1')?.value || null;
+        const c2 = cookies.find(c => c.name === '__Secure-monitorandcontrolC2')?.value || null;
 
-            this.emit('success', `Connect to MELCloud Home Success`);
+        // Zapisz do pliku
+        const data = { C1: c1, C2: c2, date: new Date().toISOString() };
+        await this.functions.saveData(this.coociesFile, data);
 
-            return { accountInfo, contextKey, useFahrenheit };
-        } catch (error) {
-            throw new Error(`Connect to MELCloud Home error: ${error.message}`);
-        } finally {
-            await browser.close();
-        }
-    }
+        await browser.close();
 
-    async connect() {
-        let response = null;
-        switch (this.displayType) {
-            case "1":
-                response = await this.connectToMelCloud();
-                return response
-            case "2":
-                response = await this.connectToMelCloudHome();
-                return response
-            default:
-                return null
-        }
-    }
+        this.emit('warn', `Login successful.`);
 
-    async checkDevicesList(key) {
-        let devices = null;
-        switch (this.displayType) {
-            case "1":
-                devices = await this.checkMelcloudDevicesList(key);
-                return devices
-            case "2":
-                devices = await this.checkMelcloudHomeDevicesList(key);
-                return devices
-            default:
-                return null;
-        }
+        return false;
     }
 
     async send(accountInfo) {