homebridge-melcloud-control 2.5.0-beta.17 → 2.5.0-beta.19

package/homebridge-ui/server.js

@@ -28,7 +28,8 @@ class PluginUiServer extends HomebridgePluginUiServer {
     try {
       let data = {};
       const melCloud = new MelCloud(user, passwd, language, accountInfoFile, deviceInfoFile, buildingsFile, enableDebugMode, refreshInterval, true);
-      const devices = melCloud.chackDevicesList();
+      const contextKey = await melCloud.connect();
+      const devices = await melCloud.chackDevicesList(contextKey);
       return data = {
         info: 'Check devices list complete.',
         status: 0,

package/package.json

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

package/src/melcloud.js

@@ -39,7 +39,9 @@ class MelCloud extends EventEmitter {
             };
         }).on('state', (state) => { });
 
-        this.connect();
+        if (!connectForConfig) {
+            this.connect();
+        };
     };
 
     async connect() {
@@ -80,41 +82,6 @@ class MelCloud extends EventEmitter {
                 return;
             };
 
-            //create axios instance get
-            this.axiosInstanceGet = axios.create({
-                method: 'GET',
-                baseURL: CONSTANTS.ApiUrls.BaseURL,
-                timeout: 5000,
-                headers: {
-                    'X-MitsContextKey': contextKey
-                },
-                maxContentLength: 100000000,
-                maxBodyLength: 1000000000,
-                withCredentials: true,
-                httpsAgent: new https.Agent({
-                    keepAlive: false,
-                    rejectUnauthorized: false
-                })
-            });
-
-            //create axios instance post
-            this.axiosInstancePost = axios.create({
-                method: 'POST',
-                baseURL: CONSTANTS.ApiUrls.BaseURL,
-                timeout: 5000,
-                headers: {
-                    'X-MitsContextKey': contextKey,
-                    'content-type': 'application/json'
-                },
-                maxContentLength: 100000000,
-                maxBodyLength: 1000000000,
-                withCredentials: true,
-                httpsAgent: new https.Agent({
-                    keepAlive: false,
-                    rejectUnauthorized: false
-                })
-            });
-
             this.accountInfo = accountInfo;
             this.contextKey = contextKey;
 
@@ -122,29 +89,49 @@ class MelCloud extends EventEmitter {
             await this.saveData(this.accountInfoFile, accountInfo);
 
             //return if connect for config
-            if (!this.connectForConfig) {
+            if (this.connectForConfig) {
+                return contextKey;
+            };
 
-                //check devices list
-                await this.chackDevicesList();
+            //check devices list
+            await this.chackDevicesList(contextKey);
 
-                //emit connect success
-                this.emit('success', `Connect to MELCloud Success.`)
+            //emit connect success
+            this.emit('success', `Connect to MELCloud Success.`)
 
-                //start impulse generator
-                const timers = [{ name: 'checkDevicesList', sampling: this.refreshInterval }];
-                this.impulseGenerator.start(timers);
+            //start impulse generator
+            const timers = [{ name: 'checkDevicesList', sampling: this.refreshInterval }];
+            this.impulseGenerator.start(timers);
 
-                return true;
-            };
+            return true;
         } catch (error) {
             this.emit('error', `Connect to MELCloud error: ${error.message ?? error}.`);
         };
     }
 
-    async chackDevicesList() {
+    async chackDevicesList(key) {
         try {
+            const contextKey = this.contextKey ?? key;
+
+            //create axios instance get
+            const axiosInstanceGet = axios.create({
+                method: 'GET',
+                baseURL: CONSTANTS.ApiUrls.BaseURL,
+                timeout: 5000,
+                headers: {
+                    'X-MitsContextKey': contextKey
+                },
+                maxContentLength: 100000000,
+                maxBodyLength: 1000000000,
+                withCredentials: true,
+                httpsAgent: new https.Agent({
+                    keepAlive: false,
+                    rejectUnauthorized: false
+                })
+            });
+
             const debug = this.enableDebugMode ? this.emit('debug', `Scanning for devices.`) : false;
-            const listDevicesData = await this.axiosInstanceGet(CONSTANTS.ApiUrls.ListDevices);
+            const listDevicesData = await axiosInstanceGet(CONSTANTS.ApiUrls.ListDevices);
             const buildingsList = listDevicesData.data;
             const debug1 = this.enableDebugMode ? this.emit('debug', `Buildings: ${JSON.stringify(buildingsList, null, 2)}`) : false;
 
@@ -198,7 +185,7 @@ class MelCloud extends EventEmitter {
                 //prepare device if not in devices array
                 if (!this.devicesId.includes(deviceId)) {
                     this.devicesId.push(deviceId);
-                    this.emit('checkDevicesListComplete', this.accountInfo, this.contextKey, deviceInfo);
+                    this.emit('checkDevicesListComplete', this.accountInfo, contextKey, deviceInfo);
                 }
             };
 
@@ -221,11 +208,29 @@ class MelCloud extends EventEmitter {
 
     async send(accountInfo) {
         try {
+            //create axios instance post
+            const axiosInstancePost = axios.create({
+                method: 'POST',
+                baseURL: CONSTANTS.ApiUrls.BaseURL,
+                timeout: 5000,
+                headers: {
+                    'X-MitsContextKey': this.contextKey,
+                    'content-type': 'application/json'
+                },
+                maxContentLength: 100000000,
+                maxBodyLength: 1000000000,
+                withCredentials: true,
+                httpsAgent: new https.Agent({
+                    keepAlive: false,
+                    rejectUnauthorized: false
+                })
+            });
+
             const options = {
                 data: accountInfo
             };
 
-            await this.axiosInstancePost(CONSTANTS.ApiUrls.UpdateApplicationOptions, options);
+            await axiosInstancePost(CONSTANTS.ApiUrls.UpdateApplicationOptions, options);
             await this.saveData(this.accountInfoFile, accountInfo);
             return true;
         } catch (error) {