homebridge-melcloud-control 4.2.3-beta.19 → 4.2.3-beta.20

package/package.json

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

package/src/melcloud.js

@@ -19,7 +19,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))
@@ -61,17 +62,12 @@ class MelCloud extends EventEmitter {
     async checkDevicesList() {
         try {
             const devicesList = { State: false, Info: null, Devices: [] }
-            const headers = {
-                'X-MitsContextKey': this.contextKey,
-                'Content-Type': 'application/json'
-            }
-
             if (this.logDebug) this.emit('debug', `Scanning for devices...`);
             const listDevicesData = await axios(ApiUrls.ListDevices, {
                 method: 'GET',
                 baseURL: ApiUrls.BaseURL,
                 timeout: 15000,
-                headers: headers
+                headers: this.headers
             });
 
             if (!listDevicesData || !listDevicesData.data) {
@@ -138,7 +134,7 @@ class MelCloud extends EventEmitter {
         if (this.logDebug) this.emit('debug', `Connecting to MELCloud`);
 
         try {
-            const accountInfo = { State: false, Info: '', LoginData: null, ContextKey: null, UseFahrenheit: false }
+            const accountInfo = { State: false, Info: '', LoginData: null, Headers: {}, UseFahrenheit: false }
 
             const payload = {
                 Email: this.user,
@@ -174,12 +170,16 @@ class MelCloud extends EventEmitter {
                 accountInfo.Info = 'Context key missing'
                 return accountInfo;
             }
-            this.contextKey = contextKey;
+
+            this.headers = {
+                'X-MitsContextKey': contextKey,
+                'Content-Type': 'application/json'
+            };
 
             accountInfo.State = true;
             accountInfo.Info = 'Connect to MELCloud Success';
             accountInfo.LoginData = loginData;
-            accountInfo.ContextKey = contextKey;
+            accountInfo.Headers = this.headers;
             await this.functions.saveData(this.accountFile, accountInfo);
 
             return accountInfo
@@ -190,18 +190,14 @@ class MelCloud extends EventEmitter {
 
     async send(accountInfo) {
         try {
-            const axiosInstance = axios.create({
+            const payload = { data: accountInfo.LoginData };
+            await axios(ApiUrls.UpdateApplicationOptions, {
                 method: 'POST',
                 baseURL: ApiUrls.BaseURL,
                 timeout: 15000,
-                headers: {
-                    'X-MitsContextKey': accountInfo.ContextKey,
-                    'content-type': 'application/json'
-                }
+                headers: accountInfo.Headers,
+                data: payload
             });
-
-            const payload = { data: accountInfo.LoginData };
-            await axiosInstance(ApiUrls.UpdateApplicationOptions, payload);
             await this.functions.saveData(this.accountFile, accountInfo);
             return true;
         } catch (error) {

package/src/melcloudhome.js

@@ -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))
@@ -64,25 +65,12 @@ class MelCloud extends EventEmitter {
     async checkDevicesList() {
         try {
             const devicesList = { State: false, Info: null, Devices: [] }
-            const headers = {
-                'Accept': '*/*',
-                'Accept-Encoding': 'gzip, deflate, br',
-                'Accept-Language': LanguageLocaleMap[this.language],
-                'Cookie': this.contextKey,
-                'Priority': 'u=3, i',
-                'Referer': ApiUrlsHome.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 devices`);
             const listDevicesData = await axios(ApiUrlsHome.GetUserContext, {
                 method: 'GET',
                 baseURL: ApiUrlsHome.BaseURL,
                 timeout: 25000,
-                headers: headers
+                headers: this.headers
             });
             const buildingsList = listDevicesData.data.buildings;
             if (this.logDebug) this.emit('debug', `Buildings: ${JSON.stringify(buildingsList, null, 2)}`);
@@ -161,7 +149,7 @@ class MelCloud extends EventEmitter {
                         DeviceName: GivenDisplayName,
                         SerialNumber: Id,
                         Device: deviceObject,
-                        Headers: headers
+                        Headers: this.headers
                     };
                 };
 
@@ -202,7 +190,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 ===
@@ -314,16 +302,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;
@@ -341,18 +341,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) {