homebridge-melcloud-control 4.2.3-beta.8 → 4.2.4

package/src/melcloudhome.js

@@ -6,7 +6,7 @@ import EventEmitter from 'events';
 import puppeteer from 'puppeteer';
 import ImpulseGenerator from './impulsegenerator.js';
 import Functions from './functions.js';
-import { ApiUrlsHome } from './constants.js';
+import { ApiUrlsHome, LanguageLocaleMap } from './constants.js';
 const execPromise = promisify(exec);
 
 class MelCloud extends EventEmitter {
@@ -22,7 +22,8 @@ class MelCloud extends EventEmitter {
         this.accountFile = accountFile;
         this.buildingsFile = buildingsFile;
         this.devicesFile = devicesFile;
-        this.contextKey = null;
+        this.headers = {};
+
         this.functions = new Functions(this.logWarn, this.logError, this.logDebug)
             .on('warn', warn => this.emit('warn', warn))
             .on('error', error => this.emit('error', error))
@@ -36,7 +37,7 @@ class MelCloud extends EventEmitter {
             };
             this.impulseGenerator = new ImpulseGenerator()
                 .on('connect', () => this.handleWithLock('connect', async () => {
-                    await this.connect(true);
+                    await this.connect();
                 }))
                 .on('checkDevicesList', () => this.handleWithLock('checkDevicesList', async () => {
                     await this.checkDevicesList();
@@ -61,31 +62,57 @@ class MelCloud extends EventEmitter {
     }
 
     // MELCloud Home
-    async checkDevicesList() {
+    async checkScenesList() {
         try {
-            const devicesList = { State: false, Info: null, Devices: [] }
-            const headers = {
-                'Accept': '*/*',
-                'Accept-Language': 'en-US,en;q=0.9',
-                'Cookie': this.contextKey,
-                'User-Agent': 'homebridge-melcloud-control/4.0.0',
-                'DNT': '1',
-                'Origin': 'https://melcloudhome.com',
-                'Referer': 'https://melcloudhome.com/dashboard',
-                'Sec-Fetch-Dest': 'empty',
-                'Sec-Fetch-Mode': 'cors',
-                'Sec-Fetch-Site': 'same-origin',
-                'X-CSRF': '1'
+            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 scenesList = listScenesData.data;
+            if (this.logDebug) this.emit('debug', `Scenes: ${JSON.stringify(scenesList, null, 2)}`);
+
+            const capitalizeKeysDeep = obj => {
+                if (Array.isArray(obj)) {
+                    return obj.map(item => capitalizeKeysDeep(item));
+                }
+
+                if (obj && typeof obj === 'object') {
+                    return Object.fromEntries(
+                        Object.entries(obj).map(([key, value]) => [
+                            key.charAt(0).toUpperCase() + key.slice(1),
+                            capitalizeKeysDeep(value)
+                        ])
+                    );
+                }
+
+                return obj;
             };
 
+            return capitalizeKeysDeep(scenesList);
+        } catch (error) {
+            throw new Error(`Check scenes list error: ${error.message}`);
+        }
+    }
+
+    async checkDevicesList() {
+        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: headers
+                headers: this.headers
             });
-            const buildingsList = listDevicesData.data.buildings;
+
+            const userContext = listDevicesData.data;
+            const buildings = userContext.buildings ?? [];
+            const guestBuildings = userContext.guestBuildings ?? [];
+            const buildingsList = [...buildings, ...guestBuildings];
             if (this.logDebug) this.emit('debug', `Buildings: ${JSON.stringify(buildingsList, null, 2)}`);
 
             if (!buildingsList) {
@@ -93,7 +120,7 @@ class MelCloud extends EventEmitter {
                 return devicesList;
             }
 
-            await this.functions.saveData(this.buildingsFile, buildingsList);
+            await this.functions.saveData(this.buildingsFile, userContext);
             if (this.logDebug) this.emit('debug', `Buildings list saved`);
 
             const devices = buildingsList.flatMap(building => {
@@ -142,6 +169,7 @@ class MelCloud extends EventEmitter {
                         ...capitalizeKeys(device.Capabilities || {}),
                         ...settingsObject,
                         DeviceType: type,
+                        FirmwareAppVersion: device.ConnectedInterfaceIdentifier,
                         IsConnected: device.IsConnected
                     };
 
@@ -149,7 +177,7 @@ class MelCloud extends EventEmitter {
                     if (device.FrostProtection) device.FrostProtection = { ...capitalizeKeys(device.FrostProtection || {}) };
                     if (device.OverheatProtection) device.OverheatProtection = { ...capitalizeKeys(device.OverheatProtection || {}) };
                     if (device.HolidayMode) device.HolidayMode = { ...capitalizeKeys(device.HolidayMode || {}) };
-                    if (Array.isArray(device.Schedule)) device.Schedule = device.Schedule.map(capitalizeKeysDeep);
+                    if (Array.isArray(device.Schedule)) device.Schedule = device.Schedule.map(capitalizeKeysDeep || []);
 
                     // Usuń stare pola Settings i Capabilities
                     const { Settings, Capabilities, Id, GivenDisplayName, ...rest } = device;
@@ -159,8 +187,9 @@ class MelCloud extends EventEmitter {
                         Type: type,
                         DeviceID: Id,
                         DeviceName: GivenDisplayName,
+                        SerialNumber: Id,
                         Device: deviceObject,
-                        Headers: headers
+                        Headers: this.headers
                     };
                 };
 
@@ -177,17 +206,21 @@ class MelCloud extends EventEmitter {
                 return devicesList;
             }
 
-            await this.functions.saveData(this.devicesFile, devices);
-            if (this.logDebug) this.emit('debug', `${devicesCount} devices saved`);
+            const scenes = await this.checkScenesList();
 
             devicesList.State = true;
             devicesList.Info = `Found ${devicesCount} devices`;
             devicesList.Devices = devices;
+            devicesList.Scenes = scenes;
+
+            await this.functions.saveData(this.devicesFile, devicesList);
+            if (this.logDebug) this.emit('debug', `${devicesCount} devices saved`);
+
             return devicesList;
         } catch (error) {
             if (error.response?.status === 401) {
-                await connectToMelCloudHome();
                 if (this.logWarn) this.emit('warn', 'Check devices list not possible, cookies expired, trying to get new.');
+                await this.connect();
                 return;
             }
 
@@ -201,7 +234,7 @@ class MelCloud extends EventEmitter {
 
         let browser;
         try {
-            const accountInfo = { State: false, Info: '', ContextKey: null, UseFahrenheit: false };
+            const accountInfo = { State: false, Info: '', Headers: {}, UseFahrenheit: false };
             let chromiumPath = await this.functions.ensureChromiumInstalled();
 
             // === Fallback to Puppeteer's built-in Chromium ===
@@ -313,16 +346,28 @@ class MelCloud extends EventEmitter {
                 return accountInfo;
             }
 
-            const contextKey = [
+            const cookies = [
                 '__Secure-monitorandcontrol=chunks-2',
                 `__Secure-monitorandcontrolC1=${c1}`,
                 `__Secure-monitorandcontrolC2=${c2}`
             ].join('; ');
-            this.contextKey = contextKey;
+
+            this.headers = {
+                'Accept': '*/*',
+                'Accept-Encoding': 'gzip, deflate, br',
+                'Accept-Language': LanguageLocaleMap[this.language],
+                'Cookie': cookies,
+                'Priority': 'u=3, i',
+                'Referer': ApiUrlsHome.Dashboard,
+                'Sec-Fetch-Dest': 'empty',
+                'Sec-Fetch-Mode': 'cors',
+                'Sec-Fetch-Site': 'same-origin',
+                'x-csrf': '1'
+            };
 
             accountInfo.State = true;
             accountInfo.Info = 'Connect to MELCloud Home Success';
-            accountInfo.ContextKey = contextKey;
+            accountInfo.Headers = this.headers;
             await this.functions.saveData(this.accountFile, accountInfo);
 
             return accountInfo;
@@ -340,18 +385,12 @@ class MelCloud extends EventEmitter {
 
     async send(accountInfo) {
         try {
-            const axiosInstance = axios.create({
+            await axios(ApiUrlsHome.UpdateApplicationOptions, {
                 method: 'POST',
                 baseURL: ApiUrlsHome.BaseURL,
                 timeout: 15000,
-                headers: {
-                    'X-MitsContextKey': accountInfo.ContextKey,
-                    'content-type': 'application/json'
-                }
+                headers: accountInfo.Headers
             });
-
-            const payload = { data: accountInfo.LoginData };
-            await axiosInstance(ApiUrlsHome.UpdateApplicationOptions, payload);
             await this.functions.saveData(this.accountFile, accountInfo);
             return true;
         } catch (error) {