homebridge-melcloud-control 4.0.0-beta.30 → 4.0.0-beta.32

package/config.schema.json

@@ -201,6 +201,34 @@
                 }
               ]
             },
+            "displayType": {
+              "title": "Account Type",
+              "type": "integer",
+              "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",
@@ -1817,6 +1845,7 @@
           "type": "password"
         },
         "accounts[].language",
+        "accounts[].displayType",
         {
           "key": "accounts[]",
           "type": "tabarray",

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 || 1;
+				if (displayType === 0) 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,7 +90,7 @@ 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(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}`))
@@ -98,14 +100,14 @@ class MelCloudPlatform {
 								//connect
 								let response;
 								try {
-									response = await melCloud.connect('home');
+									response = await melCloud.connect(displayType);
 								} 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 contextKey = displayType === 1 ? response.contextKey : response;
 								const useFahrenheit = response.useFahrenheit ?? false;
 
 								if (contextKey === false) {
@@ -115,7 +117,8 @@ class MelCloudPlatform {
 								//check devices list
 								let devicesInMelcloud;
 								try {
-									devicesInMelcloud = await melCloud.checkDevicesList(contextKey);
+									devicesInMelcloud = await melCloud.checkDevicesList(displayType, 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.30",
+  "version": "4.0.0-beta.32",
   "description": "Homebridge plugin to control Mitsubishi Air Conditioner, Heat Pump and Energy Recovery Ventilation.",
   "license": "MIT",
   "author": "grzegorz914",

package/src/melcloud.js

@@ -7,7 +7,7 @@ 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(user, passwd, language, accountFile, buildingsFile, devicesFile, logWarn, logDebug, requestConfig) {
         super();
         this.user = user;
         this.passwd = passwd;
@@ -15,7 +15,6 @@ class MelCloud extends EventEmitter {
         this.accountFile = accountFile;
         this.buildingsFile = buildingsFile;
         this.devicesFile = devicesFile;
-        this.cookiesFile = cookiesFile;
         this.logWarn = logWarn;
         this.logDebug = logDebug;
         this.requestConfig = requestConfig;
@@ -58,7 +57,7 @@ class MelCloud extends EventEmitter {
         }
     }
 
-    async checkDevicesList(contextKey) {
+    async checkMelcloudDevicesList(contextKey) {
         try {
             const axiosInstanceGet = axios.create({
                 method: 'GET',
@@ -109,7 +108,7 @@ class MelCloud extends EventEmitter {
         }
     }
 
-    async connectMelCloud() {
+    async connectToMelCloud() {
         if (this.logDebug) this.emit('debug', `Connecting to MELCloud`);
 
         try {
@@ -156,25 +155,20 @@ 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 connectMelCloudHome() {
+    async checkMelcloudHomeDevicesList(cookies) {
         if (this.logDebug) this.emit('debug', `Connecting to MELCloud Home`);
 
         try {
-            const coocies = await this.getCookies();
-            const c1 = coocies.C1.trim();
-            const c2 = coocies.C2.trim();
+            const c1 = cookies.c1.trim();
+            const c2 = cookies.c2.trim();
 
-            const cookies = [
+            const cookie = [
                 '__Secure-monitorandcontrol=chunks-2',
                 `__Secure-monitorandcontrolC1=${c1}`,
                 `__Secure-monitorandcontrolC2=${c2}`,
@@ -190,8 +184,8 @@ class MelCloud extends EventEmitter {
                 headers: {
                     'Accept': '*/*',
                     'Accept-Language': 'en-US,en;q=0.9',
-                    'Cookie': cookies,
-                    'User-Agent': 'homebridge-melcloud-home/0.2.0',
+                    'Cookie': cookie,
+                    'User-Agent': 'homebridge-melcloud-control/4.0.0',
                     'DNT': '1',
                     'Origin': 'https://melcloudhome.com',
                     'Referer': 'https://melcloudhome.com/dashboard',
@@ -202,62 +196,74 @@ class MelCloud extends EventEmitter {
                 }
             });
 
-            const response = await axiosInstance.get(ApiUrlsHome.GetUserContext);
-            const homeData = response.data;
-            if (this.logDebug) this.emit('debug', `MELCloud Home data: ${JSON.stringify(homeData, null, 2)}`);
+            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)}`);
 
-            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`);
+
+            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;
+            }
 
-            return
+            await this.functions.saveData(this.devicesFile, devices);
+            if (this.logDebug) this.emit('debug', `${devicesCount} devices saved`);
+
+            return devices;
         } catch (error) {
             throw new Error(`Connect to MELCloud Home error: ${error.message}`);
         }
     }
 
-    async getCookies() {
+    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...');
+            // Open MELCloud Home
             await page.goto(ApiUrlsHome.BaseURL, { waitUntil: 'networkidle2' });
-
-            // Kliknij przycisk logowania
             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') {
+                if (text.trim() === 'Zaloguj' || text.trim() === 'Log In') {
                     loginBtn = btn;
                     break;
                 }
             }
 
-            if (!loginBtn) throw new Error('Login button not found on homepage');
-
-            await Promise.all([
-                loginBtn.click(),
-                page.waitForNavigation({ waitUntil: 'networkidle2', timeout: 20000 })
-            ]);
+            if (!loginBtn && this.logWarn) this.emit('warn', `Login button not found`);
 
-            // Poczekaj, aż strona przekieruje do Cognito login
+            // Set credentials and login
+            await Promise.all([loginBtn.click(), page.waitForNavigation({ waitUntil: 'networkidle2', timeout: 20000 })]);
             await page.waitForSelector('input[name="username"]', { timeout: 15000 });
-
-            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 });
 
-            // Kliknij przycisk logowania
             const button1 = await page.$('input[type="submit"]');
-            await Promise.all([
-                button1.click(),
-                page.waitForNavigation({ waitUntil: 'networkidle2', timeout: 20000 })
-            ]);
+            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();
 
-            // Loop max 20s, czekamy aż pojawią się cookies
+            // 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;
@@ -266,30 +272,45 @@ class MelCloud extends EventEmitter {
             }
 
             if (!c1 || !c2) {
-                await browser.close();
-                throw new Error('Cookies C1/C2 not found after login');
+                if (this.logWarn) this.emit('warn', `Cookies C1/C2 missing`);
+                return null;
             }
 
-            // Zapis do pliku
-            const data = { C1: c1, C2: c2, date: new Date().toISOString() };
-            await this.functions.saveData(this.cookiesFile, data);
+            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 { c1, c2 };
+        } catch (error) {
+            throw new Error(`Connect to MELCloud Home error: ${error.message}`);
         } finally {
             await browser.close();
         }
     }
 
-    async connect(mode) {
-        switch (mode) {
-            case 'home':
-                return await this.connectMelCloudHome();
+    async connect(type) {
+        let response = null;
+        switch (type) {
+            case 1:
+                response = await this.connectToMelCloud();
+                return response
+            case 2:
+                response = await this.connectToMelCloudHome();
+                return response
             default:
-                return await this.connectMelCloud();
+                return null
+        }
+    }
+
+    async checkDevicesList(type, key) {
+        let devices = null;
+        switch (type) {
+            case 1:
+                devices = await this.checkMelcloudDevicesList(key);
+                return devices
+            case 2:
+                devices = await this.checkMelcloudHomeDevicesList(key);
+                return devices
+            default:
+                return null;
         }
     }