homebridge-melcloud-control 3.9.8-beta.0 → 3.9.8-beta.2

package/homebridge-ui/server.js

@@ -23,8 +23,8 @@ class PluginUiServer extends HomebridgePluginUiServer {
     const melCloud = new MelCloud(user, passwd, language, accountFile, buildingsFile, devicesFile, false, true);
 
     try {
-      await melCloud.connect();
-      const devices = await melCloud.chackDevicesList();
+      const response = await melCloud.connect();
+      const devices = await melCloud.chackDevicesList(response.contextKey);
       return devices;
     } catch (error) {
       throw new Error(`MELCloud error: ${error.message ?? error}.`);

package/package.json

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

package/src/melcloud.js

@@ -17,48 +17,52 @@ class MelCloud extends EventEmitter {
         this.contextKey = '';
         this.functions = new Functions();
 
-        this.options = {
-            data: {
-                Email: user,
-                Password: passwd,
-                Language: language,
-                AppVersion: '1.34.12',
-                CaptchaChallenge: '',
-                CaptchaResponse: '',
-                Persist: true
-            }
+        this.loginData = {
+            Email: user,
+            Password: passwd,
+            Language: language,
+            AppVersion: '1.34.12',
+            CaptchaChallenge: '',
+            CaptchaResponse: '',
+            Persist: true
         };
 
-        this.axiosInstance = axios.create({
-            baseURL: ApiUrls.BaseURL,
-            timeout: 15000,
-            withCredentials: true,
+        this.axiosDefaults = {
+            timeout: 10000,
             maxContentLength: 100000000,
             maxBodyLength: 1000000000,
             httpsAgent: new Agent({
                 keepAlive: false,
                 rejectUnauthorized: false
             })
-        });
+        };
 
         if (!requestConfig) {
             this.impulseGenerator = new ImpulseGenerator()
                 .on('checkDevicesList', async () => {
                     try {
-                        await this.chackDevicesList(this.contextKey);
+                        await this.checkDevicesList(this.contextKey);
                     } catch (error) {
                         this.emit('error', `Impulse generator error: ${error}`);
-                    };
-                }).on('state', (state) => {
+                    }
+                })
+                .on('state', (state) => {
                     this.emit('success', `Impulse generator ${state ? 'started' : 'stopped'}.`);
                 });
-        };
-    };
+        }
+    }
 
-    async chackDevicesList() {
+    async checkDevicesList(contextKey) {
         try {
+            const axiosInstanceGet = axios.create({
+                method: 'GET',
+                baseURL: ApiUrls.BaseURL,
+                headers: { 'X-MitsContextKey': contextKey },
+                ...this.axiosDefaults
+            });
+
             if (this.enableDebugMode) this.emit('debug', `Scanning for devices`);
-            const listDevicesData = await this.axiosInstance.get(ApiUrls.ListDevices);
+            const listDevicesData = await axiosInstanceGet(ApiUrls.ListDevices);
             const buildingsList = listDevicesData.data;
             if (this.enableDebugMode) this.emit('debug', `Buildings: ${JSON.stringify(buildingsList, null, 2)}`);
 
@@ -67,23 +71,20 @@ class MelCloud extends EventEmitter {
                 return null;
             }
 
-            //save buildings to the file
             await this.functions.saveData(this.buildingsFile, buildingsList);
             if (this.enableDebugMode) this.emit('debug', `Buildings list saved`);
 
-            //read buildings structure and get the devices
             const devices = [];
             for (const building of buildingsList) {
                 const buildingStructure = building.Structure;
-
-                //get all devices from the building structure
                 const allDevices = [
-                    ...buildingStructure.Floors.flatMap(floor => [...floor.Areas.flatMap(area => area.Devices), ...floor.Devices]),
+                    ...buildingStructure.Floors.flatMap(floor => [
+                        ...floor.Areas.flatMap(area => area.Devices),
+                        ...floor.Devices
+                    ]),
                     ...buildingStructure.Areas.flatMap(area => area.Devices),
                     ...buildingStructure.Devices
                 ];
-
-                //add all devices to the devices array
                 devices.push(...allDevices);
             }
 
@@ -93,28 +94,32 @@ class MelCloud extends EventEmitter {
                 return null;
             }
 
-            //save buildings to the file
             await this.functions.saveData(this.devicesFile, devices);
             if (this.enableDebugMode) this.emit('debug', `${devicesCount} devices saved`);
 
             return devices;
         } catch (error) {
-            throw new Error(`Check devices list error: ${error}`);
-        };
+            throw new Error(`Check devices list error: ${error.message}`);
+        }
     }
 
     async connect() {
         if (this.enableDebugMode) this.emit('debug', `Connecting to MELCloud`);
 
         try {
-            const accountData = await this.axiosInstance.post(ApiUrls.ClientLogin, this.options);
+            const axiosInstanceLogin = axios.create({
+                method: 'POST',
+                baseURL: ApiUrls.BaseURL,
+                ...this.axiosDefaults
+            });
+
+            const accountData = await axiosInstanceLogin(ApiUrls.ClientLogin, this.loginData);
             const account = accountData.data;
             const accountInfo = account.LoginData;
             const contextKey = accountInfo.ContextKey;
             const useFahrenheit = accountInfo.UseFahrenheit ?? false;
             this.contextKey = contextKey;
 
-            //remove sensitive data
             const debugData = {
                 ...accountInfo,
                 ContextKey: 'removed',
@@ -126,58 +131,46 @@ class MelCloud extends EventEmitter {
             };
             if (this.enableDebugMode) this.emit('debug', `MELCloud Info: ${JSON.stringify(debugData, null, 2)}`);
 
-            if (contextKey === undefined || contextKey === null) {
-                this.emit('warn', `Context key: ${contextKey}, missing`)
+            if (!contextKey) {
+                this.emit('warn', `Context key missing`);
                 return null;
-            };
+            }
 
-            //create axios instance post
-            this.axiosInstance = axios.create({
+            this.axiosInstancePost = axios.create({
+                method: 'POST',
                 baseURL: ApiUrls.BaseURL,
-                timeout: 10000,
                 headers: {
                     'X-MitsContextKey': contextKey,
                     'content-type': 'application/json'
                 },
-                maxContentLength: 100000000,
-                maxBodyLength: 1000000000,
-                withCredentials: true,
-                httpsAgent: new Agent({
-                    keepAlive: false,
-                    rejectUnauthorized: false
-                })
+                ...this.axiosDefaults
             });
 
-            //save melcloud info to the file
             await this.functions.saveData(this.accountFile, accountInfo);
 
-            //emit connect success
-            this.emit('success', `Connect to MELCloud Success`)
+            this.emit('success', `Connect to MELCloud Success`);
 
-            const obj = {
-                accountInfo: accountInfo,
-                contextKey: contextKey,
-                useFahrenheit: useFahrenheit
-            }
-
-            return obj;
+            return {
+                accountInfo,
+                contextKey,
+                useFahrenheit
+            };
         } catch (error) {
-            throw new Error(`Connect to MELCloud error: ${error}`);
-        };
+            throw new Error(`Connect to MELCloud error: ${error.message}`);
+        }
     }
 
     async send(accountInfo) {
         try {
-            const options = {
-                data: accountInfo
-            };
-
-            await this.axiosInstance.post(ApiUrls.UpdateApplicationOptions, options);
+            const options = { data: accountInfo };
+            await this.axiosInstancePost(ApiUrls.UpdateApplicationOptions, options);
             await this.functions.saveData(this.accountFile, accountInfo);
             return true;
         } catch (error) {
-            throw new Error(`Send data error: ${error}`);
-        };
-    };
-};
+            throw new Error(`Send data error: ${error.message}`);
+        }
+    }
+}
+
 export default MelCloud;
+