homebridge-melcloud-control 4.0.0-beta.40 → 4.0.0-beta.41

package/package.json

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

package/src/melcloud.js

@@ -162,28 +162,15 @@ class MelCloud extends EventEmitter {
         }
     }
 
-    async checkMelcloudHomeDevicesList(cookies) {
+    async checkMelcloudHomeDevicesList(contextKey) {
         try {
-            const c1 = cookies.c1.trim();
-            const c2 = cookies.c2.trim();
-
-            const cookie = [
-                '__Secure-monitorandcontrol=chunks-2',
-                `__Secure-monitorandcontrolC1=${c1}`,
-                `__Secure-monitorandcontrolC2=${c2}`,
-            ].join('; ');
-
             const axiosInstance = axios.create({
+                method: 'GET',
                 baseURL: ApiUrlsHome.BaseURL,
-                timeout: 20000,
-                httpsAgent: new Agent({
-                    keepAlive: false,
-                    rejectUnauthorized: false
-                }),
                 headers: {
                     'Accept': '*/*',
                     'Accept-Language': 'en-US,en;q=0.9',
-                    'Cookie': cookie,
+                    'Cookie': contextKey,
                     'User-Agent': 'homebridge-melcloud-control/4.0.0',
                     'DNT': '1',
                     'Origin': 'https://melcloudhome.com',
@@ -192,11 +179,12 @@ class MelCloud extends EventEmitter {
                     'Sec-Fetch-Mode': 'cors',
                     'Sec-Fetch-Site': 'same-origin',
                     'X-CSRF': '1'
-                }
+                },
+                ...this.axiosDefaults
             });
 
             if (this.logDebug) this.emit('debug', `Scanning for devices`);
-            const listDevicesData = await axiosInstance.get(ApiUrlsHome.GetUserContext);
+            const listDevicesData = await axiosInstance(ApiUrlsHome.GetUserContext);
             const buildingsList = listDevicesData.data.buildings;
             if (this.logDebug) this.emit('debug', `Buildings: ${JSON.stringify(buildingsList, null, 2)}`);
 
@@ -276,10 +264,11 @@ class MelCloud extends EventEmitter {
             }
 
             const accountInfo = {};
-            const contextKey = { c1, c2 };
+            const contextKey = ['__Secure-monitorandcontrol=chunks-2', `__Secure-monitorandcontrolC1=${c1}`, `__Secure-monitorandcontrolC2=${c2}`,].join('; ');
             const useFahrenheit = false;
             this.contextKey = contextKey;
 
+
             this.emit('success', `Connect to MELCloud Home Success`);
 
             return { accountInfo, contextKey, useFahrenheit };
@@ -304,14 +293,14 @@ class MelCloud extends EventEmitter {
         }
     }
 
-    async checkDevicesList(key) {
+    async checkDevicesList(contextKey) {
         let devices = null;
         switch (this.displayType) {
             case "1":
-                devices = await this.checkMelcloudDevicesList(key);
+                devices = await this.checkMelcloudDevicesList(contextKey);
                 return devices
             case "2":
-                devices = await this.checkMelcloudHomeDevicesList(key);
+                devices = await this.checkMelcloudHomeDevicesList(contextKey);
                 return devices
             default:
                 return null;