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

package/config.schema.json

@@ -212,19 +212,19 @@
                 {
                   "title": "None/Disabled",
                   "enum": [
-                    "0"
+                    "disabled"
                   ]
                 },
                 {
                   "title": "MELCLoud",
                   "enum": [
-                    "1"
+                    "melcloud"
                   ]
                 },
                 {
                   "title": "MELCLoud Home",
                   "enum": [
-                    "2"
+                    "melcloudhome"
                   ]
                 }
               ]

package/homebridge-ui/public/index.html

@@ -79,9 +79,9 @@
         <div class="mb-2">
           <label for="displayType" class="form-label">Account Type</label>
           <select id="displayType" name="displayType" class="form-control">
-            <option value="0">None/Disabled</option>
-            <option value="1">MELCloud</option>
-            <option value="2">MELCloud Home</option>
+            <option value="disabled">None/Disabled</option>
+            <option value="melcloud">MELCloud</option>
+            <option value="melcloudhome">MELCloud Home</option>
           </select>
         </div>
 

package/index.js

@@ -30,8 +30,8 @@ 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 displayType = account.displayType || 'disabled';
+				if (displayType === 'disabled') continue;
 
 				const accountName = account.name;
 				const user = account.user;
@@ -106,9 +106,9 @@ class MelCloudPlatform {
 									return;
 								}
 
-								const accountInfo = response.accountInfo ?? false;
+								const accountInfo = response.accountInfo;
 								const contextKey = response.contextKey;
-								const useFahrenheit = response.useFahrenheit ?? false;
+								const useFahrenheit = response.useFahrenheit;
 
 								if (!contextKey) {
 									return;

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.42",
   "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,7 +264,7 @@ 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;
 
@@ -291,30 +279,30 @@ class MelCloud extends EventEmitter {
     }
 
     async connect() {
-        let response = null;
+        let response = {};
         switch (this.displayType) {
-            case "1":
+            case "melcloud":
                 response = await this.connectToMelCloud();
                 return response
-            case "2":
+            case "melcloudhome":
                 response = await this.connectToMelCloudHome();
                 return response
             default:
-                return null
+                return response
         }
     }
 
-    async checkDevicesList(key) {
-        let devices = null;
+    async checkDevicesList(contextKey) {
+        let devices = [];
         switch (this.displayType) {
-            case "1":
-                devices = await this.checkMelcloudDevicesList(key);
+            case "melcloud":
+                devices = await this.checkMelcloudDevicesList(contextKey);
                 return devices
-            case "2":
-                devices = await this.checkMelcloudHomeDevicesList(key);
+            case "melcloudhome":
+                devices = await this.checkMelcloudHomeDevicesList(contextKey);
                 return devices
             default:
-                return null;
+                return devices;
         }
     }