homebridge-melcloud-control 4.2.5-beta.3 → 4.2.5-beta.31

package/src/melclouderv.js

@@ -5,7 +5,7 @@ import Functions from './functions.js';
 import { ApiUrls, ApiUrlsHome, Ventilation } from './constants.js';
 
 class MelCloudErv extends EventEmitter {
-    constructor(account, device, devicesFile, defaultTempsFile) {
+    constructor(account, device, devicesFile, defaultTempsFile, accountFile) {
         super();
         this.accountType = account.type;
         this.logWarn = account.log?.warn;
@@ -16,6 +16,7 @@ class MelCloudErv extends EventEmitter {
         this.deviceId = device.id;
         this.devicesFile = devicesFile;
         this.defaultTempsFile = defaultTempsFile;
+        this.accountFile = accountFile;
         this.functions = new Functions(this.logWarn, this.logError, this.logDebug)
             .on('warn', warn => this.emit('warn', warn))
             .on('error', error => this.emit('error', error))
@@ -26,7 +27,7 @@ class MelCloudErv extends EventEmitter {
         this.headers = {};
 
         //lock flags
-        this.locks = true;
+        this.locks = false;
         this.impulseGenerator = new ImpulseGenerator()
             .on('checkState', () => this.handleWithLock(async () => {
                 await this.checkState();
@@ -53,24 +54,19 @@ class MelCloudErv extends EventEmitter {
         try {
             //read device info from file
             const devicesData = await this.functions.readData(this.devicesFile, true);
+            if (!devicesData) return;
+
             this.headers = devicesData.Headers;
-            const scenes = devicesData.Scenes ?? [];
             const deviceData = devicesData.Devices.find(device => device.DeviceID === this.deviceId);
-
             if (this.accountType === 'melcloudhome') {
-                deviceData.Scenes = scenes;
+                deviceData.Scenes = devicesData.Scenes ?? [];
 
                 //read default temps
                 const temps = await this.functions.readData(this.defaultTempsFile, true);
                 deviceData.Device.DefaultHeatingSetTemperature = temps?.defaultHeatingSetTemperature ?? 20;
                 deviceData.Device.DefaultCoolingSetTemperature = temps?.defaultCoolingSetTemperature ?? 24;
             }
-
-            const safeConfig = {
-                ...deviceData,
-                Headers: 'removed',
-            };
-            if (this.logDebug) this.emit('debug', `Device Data: ${JSON.stringify(safeConfig, null, 2)}`);
+            if (this.logDebug) this.emit('debug', `Device Data: ${JSON.stringify(deviceData, null, 2)}`);
 
             //device
             const serialNumber = deviceData.SerialNumber || '4.0.0';
@@ -132,50 +128,61 @@ class MelCloudErv extends EventEmitter {
             let path = '';
             switch (accountType) {
                 case "melcloud":
-                    //set target temp based on display mode and ventilation mode
-                    switch (displayType) {
-                        case 1: //Heather/Cooler
-                            switch (deviceData.Device.VentilationMode) {
-                                case 0: //LOSNAY
-                                    deviceData.Device.SetTemperature = deviceData.Device.DefaultHeatingSetTemperature;
-                                    break;
-                                case 1: //BYPASS
-                                    deviceData.Device.SetTemperature = deviceData.Device.DefaultCoolingSetTemperature;
-                                    break;
-                                case 2: //AUTO
-                                    const setTemperature = (deviceData.Device.DefaultCoolingSetTemperature + deviceData.Device.DefaultHeatingSetTemperature) / 2;
-                                    deviceData.Device.SetTemperature = setTemperature;
+                    switch (flag) {
+                        case 'account':
+                            flagData.Account.LoginData.UseFahrenheit = flagData.UseFahrenheit;
+                            payload = { data: flagData.LoginData };
+                            path = ApiUrls.UpdateApplicationOptions;
+                            await this.functions.saveData(this.accountFile, flagData);
+                            break;
+                        default:
+                            //set target temp based on display mode and ventilation mode
+                            switch (displayType) {
+                                case 1: //Heather/Cooler
+                                    switch (deviceData.Device.VentilationMode) {
+                                        case 0: //LOSNAY
+                                            deviceData.Device.SetTemperature = deviceData.Device.DefaultHeatingSetTemperature;
+                                            break;
+                                        case 1: //BYPASS
+                                            deviceData.Device.SetTemperature = deviceData.Device.DefaultCoolingSetTemperature;
+                                            break;
+                                        case 2: //AUTO
+                                            const setTemperature = (deviceData.Device.DefaultCoolingSetTemperature + deviceData.Device.DefaultHeatingSetTemperature) / 2;
+                                            deviceData.Device.SetTemperature = setTemperature;
+                                            break;
+                                    };
+                                case 2: //Thermostat
+                                    deviceData.Device.SetTemperature = deviceData.Device.SetTemperature;
                                     break;
                             };
-                        case 2: //Thermostat
-                            deviceData.Device.SetTemperature = deviceData.Device.SetTemperature;
-                            break;
-                    };
 
-                    //device state
-                    deviceData.Device.EffectiveFlags = flag;
-                    payload = {
-                        DeviceID: deviceData.Device.DeviceID,
-                        EffectiveFlags: deviceData.Device.EffectiveFlags,
-                        Power: deviceData.Device.Power,
-                        SetTemperature: deviceData.Device.SetTemperature,
-                        SetFanSpeed: deviceData.Device.SetFanSpeed,
-                        OperationMode: deviceData.Device.OperationMode,
-                        VentilationMode: deviceData.Device.VentilationMode,
-                        DefaultCoolingSetTemperature: deviceData.Device.DefaultCoolingSetTemperature,
-                        DefaultHeatingSetTemperature: deviceData.Device.DefaultHeatingSetTemperature,
-                        HideRoomTemperature: deviceData.Device.HideRoomTemperature,
-                        HideSupplyTemperature: deviceData.Device.HideSupplyTemperature,
-                        HideOutdoorTemperature: deviceData.Device.HideOutdoorTemperature,
-                        NightPurgeMode: deviceData.Device.NightPurgeMode,
-                        HasPendingCommand: true
+                            //device state
+                            deviceData.Device.EffectiveFlags = flag;
+                            payload = {
+                                DeviceID: deviceData.Device.DeviceID,
+                                EffectiveFlags: deviceData.Device.EffectiveFlags,
+                                Power: deviceData.Device.Power,
+                                SetTemperature: deviceData.Device.SetTemperature,
+                                SetFanSpeed: deviceData.Device.SetFanSpeed,
+                                OperationMode: deviceData.Device.OperationMode,
+                                VentilationMode: deviceData.Device.VentilationMode,
+                                DefaultCoolingSetTemperature: deviceData.Device.DefaultCoolingSetTemperature,
+                                DefaultHeatingSetTemperature: deviceData.Device.DefaultHeatingSetTemperature,
+                                HideRoomTemperature: deviceData.Device.HideRoomTemperature,
+                                HideSupplyTemperature: deviceData.Device.HideSupplyTemperature,
+                                HideOutdoorTemperature: deviceData.Device.HideOutdoorTemperature,
+                                NightPurgeMode: deviceData.Device.NightPurgeMode,
+                                HasPendingCommand: true
+                            }
+                            path = ApiUrls.SetErv;
+                            break;
                     }
 
                     if (this.logDebug) this.emit('debug', `Send Data: ${JSON.stringify(payload, null, 2)}`);
-                    await axios(ApiUrls.SetErv, {
+                    await axios(path, {
                         method: 'POST',
                         baseURL: ApiUrls.BaseURL,
-                        timeout: 10000,
+                        timeout: 30000,
                         headers: this.headers,
                         data: payload
                     });
@@ -228,7 +235,7 @@ class MelCloudErv extends EventEmitter {
                             };
                             method = 'PUT';
                             path = ApiUrlsHome.PutErv.replace('deviceid', deviceData.DeviceID);
-                            this.headers.Referer = ApiUrlsHome.Referers.PutDeviceSettings
+                            this.headers.Referer = ApiUrlsHome.Referers.PutDeviceSettings;
                             break
                     }
 
@@ -238,7 +245,7 @@ class MelCloudErv extends EventEmitter {
                     await axios(path, {
                         method: method,
                         baseURL: ApiUrlsHome.BaseURL,
-                        timeout: 10000,
+                        timeout: 30000,
                         headers: this.headers,
                         data: payload
                     });
@@ -254,12 +261,12 @@ class MelCloudErv extends EventEmitter {
     }
 
     updateData(deviceData) {
-        this.lock = true;
+        this.locks = true;
         this.emit('deviceState', deviceData);
 
         setTimeout(() => {
-            this.lock = false
-        }, 2500);
+            this.locks = false
+        }, 5000);
     }
 };
 export default MelCloudErv;

package/src/melcloudhome.js

@@ -9,7 +9,7 @@ import Functions from './functions.js';
 import { ApiUrlsHome, LanguageLocaleMap } from './constants.js';
 const execPromise = promisify(exec);
 
-class MelCloud extends EventEmitter {
+class MelCloudHome extends EventEmitter {
     constructor(account, accountFile, buildingsFile, devicesFile, pluginStart = false) {
         super();
         this.accountType = account.type;
@@ -61,16 +61,10 @@ class MelCloud extends EventEmitter {
         }
     }
 
-    // MELCloud Home
     async checkScenesList() {
         try {
             if (this.logDebug) this.emit('debug', `Scanning for scenes`);
-            const listScenesData = await axios(ApiUrlsHome.GetUserScenes, {
-                method: 'GET',
-                baseURL: ApiUrlsHome.BaseURL,
-                timeout: 25000,
-                headers: this.headers
-            });
+            const listScenesData = await this.axiosInstance(ApiUrlsHome.GetUserScenes, { method: 'GET', });
 
             const scenesList = listScenesData.data;
             if (this.logDebug) this.emit('debug', `Scenes: ${JSON.stringify(scenesList, null, 2)}`);
@@ -102,12 +96,7 @@ class MelCloud extends EventEmitter {
         try {
             const devicesList = { State: false, Info: null, Devices: [], Scenes: [] }
             if (this.logDebug) this.emit('debug', `Scanning for devices`);
-            const listDevicesData = await axios(ApiUrlsHome.GetUserContext, {
-                method: 'GET',
-                baseURL: ApiUrlsHome.BaseURL,
-                timeout: 25000,
-                headers: this.headers
-            });
+            const listDevicesData = await this.axiosInstance(ApiUrlsHome.GetUserContext, { method: 'GET' });
 
             const userContext = listDevicesData.data;
             const buildings = userContext.buildings ?? [];
@@ -205,10 +194,17 @@ class MelCloud extends EventEmitter {
                 return devicesList;
             }
 
-            const scenes = await this.checkScenesList();
+            // Get scenes
+            let scenes = [];
+            try {
+                scenes = await this.checkScenesList();
+                if (this.logDebug) this.emit('debug', `Found ${scenes.length} svenes`);
+            } catch (error) {
+                if (this.logDebug) this.emit('debug', `Get scenes error: ${error} `);
+            }
 
             devicesList.State = true;
-            devicesList.Info = `Found ${devicesCount} devices`;
+            devicesList.Info = `Found ${devicesCount} devices and ${scenes.length} scenes`;
             devicesList.Devices = devices;
             devicesList.Scenes = scenes;
             devicesList.Headers = this.headers;
@@ -218,12 +214,6 @@ class MelCloud extends EventEmitter {
 
             return devicesList;
         } catch (error) {
-            if (error.response?.status === 401) {
-                if (this.logWarn) this.emit('warn', 'Check devices list not possible, cookies expired, trying to get new.');
-                await this.connect();
-                return;
-            }
-
             throw new Error(`Check devices list error: ${error.message}`);
         }
     }
@@ -234,7 +224,7 @@ class MelCloud extends EventEmitter {
 
         let browser;
         try {
-            const accountInfo = { State: false, Info: '', Headers: {}, UseFahrenheit: false };
+            const accountInfo = { State: false, Info: '', Account: {}, UseFahrenheit: false };
             let chromiumPath = await this.functions.ensureChromiumInstalled();
 
             // === Fallback to Puppeteer's built-in Chromium ===
@@ -286,14 +276,6 @@ class MelCloud extends EventEmitter {
             page.setDefaultTimeout(GLOBAL_TIMEOUT);
             page.setDefaultNavigationTimeout(GLOBAL_TIMEOUT);
 
-            // Clear cookies before navigation
-            try {
-                const client = await page.createCDPSession();
-                await client.send('Network.clearBrowserCookies');
-            } catch (error) {
-                if (this.logError) this.emit('error', `Clear cookies error: ${error.message}`);
-            }
-
             try {
                 await page.goto(ApiUrlsHome.BaseURL, { waitUntil: ['domcontentloaded', 'networkidle2'], timeout: GLOBAL_TIMEOUT });
             } catch (error) {
@@ -303,7 +285,7 @@ class MelCloud extends EventEmitter {
 
             // Wait extra to ensure UI is rendered
             await new Promise(r => setTimeout(r, 3000));
-            const loginBtn = await page.waitForSelector('button.btn--blue', { timeout: GLOBAL_TIMEOUT / 4 });
+            const loginBtn = await page.waitForSelector('button.btn--blue', { timeout: GLOBAL_TIMEOUT / 3 });
             const loginText = await page.evaluate(el => el.textContent.trim(), loginBtn);
 
             if (!['Zaloguj', 'Sign In', 'Login'].includes(loginText)) {
@@ -329,13 +311,13 @@ class MelCloud extends EventEmitter {
                 accountInfo.Info = 'Submit button not found';
                 return accountInfo;
             }
-            await Promise.race([Promise.all([submitButton.click(), page.waitForNavigation({ waitUntil: ['domcontentloaded', 'networkidle2'], timeout: GLOBAL_TIMEOUT / 4 })]), new Promise(r => setTimeout(r, GLOBAL_TIMEOUT / 3))]);
+            await Promise.race([Promise.all([submitButton.click(), page.waitForNavigation({ waitUntil: ['domcontentloaded', 'networkidle2'], timeout: GLOBAL_TIMEOUT / 3 })]), new Promise(r => setTimeout(r, GLOBAL_TIMEOUT / 3))]);
 
             // Extract cookies
             let c1 = null, c2 = null;
             const start = Date.now();
             while ((!c1 || !c2) && Date.now() - start < GLOBAL_TIMEOUT / 2) {
-                const cookies = await page.browserContext().cookies();
+                const cookies = await browser.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));
@@ -352,7 +334,9 @@ class MelCloud extends EventEmitter {
                 `__Secure-monitorandcontrolC2=${c2}`
             ].join('; ');
 
-            this.headers = {
+
+            const userAgent = await page.evaluate(() => navigator.userAgent);
+            const headers = {
                 'Accept': '*/*',
                 'Accept-Encoding': 'gzip, deflate, br',
                 'Accept-Language': LanguageLocaleMap[this.language],
@@ -362,12 +346,18 @@ class MelCloud extends EventEmitter {
                 'Sec-Fetch-Dest': 'empty',
                 'Sec-Fetch-Mode': 'cors',
                 'Sec-Fetch-Site': 'same-origin',
+                'User-Agent': userAgent,
                 'x-csrf': '1'
             };
+            this.headers = headers;
+            this.axiosInstance = axios.create({
+                baseURL: ApiUrlsHome.BaseURL,
+                timeout: 30000,
+                headers: headers
+            })
 
             accountInfo.State = true;
             accountInfo.Info = 'Connect to MELCloud Home Success';
-            accountInfo.Headers = this.headers;
             await this.functions.saveData(this.accountFile, accountInfo);
 
             return accountInfo;
@@ -382,22 +372,7 @@ class MelCloud extends EventEmitter {
             }
         }
     }
-
-    async send(accountInfo) {
-        try {
-            await axios(ApiUrlsHome.UpdateApplicationOptions, {
-                method: 'POST',
-                baseURL: ApiUrlsHome.BaseURL,
-                timeout: 15000,
-                headers: accountInfo.Headers
-            });
-            await this.functions.saveData(this.accountFile, accountInfo);
-            return true;
-        } catch (error) {
-            throw new Error(`Send data error: ${error.message}`);
-        }
-    }
 }
 
-export default MelCloud;
+export default MelCloudHome;