homebridge-melcloud-control 4.3.11-beta.24 → 4.3.11-beta.25

package/package.json

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

package/src/melcloud.js

@@ -56,7 +56,7 @@ class MelCloud extends EventEmitter {
         try {
             const devicesList = { State: false, Info: null, Devices: [], Scenes: [] }
             if (this.logDebug) this.emit('debug', `Scanning for devices...`);
-            const listDevicesData = await this.axiosInstance(ApiUrls.ListDevices, { method: 'GET', });
+            const listDevicesData = await this.client(ApiUrls.ListDevices, { method: 'GET', });
 
             if (!listDevicesData || !listDevicesData.data) {
                 devicesList.Info = 'Invalid or empty response from MELCloud API'
@@ -165,11 +165,12 @@ class MelCloud extends EventEmitter {
             this.emit('headers', headers);
             
             this.headers = headers;
-            this.axiosInstance = axios.create({
+            this.client = axios.create({
                 baseURL: ApiUrls.BaseURL,
                 timeout: 30000,
                 headers: headers
             });
+            this.emit('client',  this.client);
 
             accountInfo.State = true;
             accountInfo.Info = 'Connect Success';

package/src/melcloudata.js

@@ -24,11 +24,14 @@ class MelCloudAta extends EventEmitter {
 
         //set default values
         this.deviceData = {};
+        this.client = melcloud.client;
         this.headers = melcloud.headers;
 
         //handle melcloud events
         let deviceData = null;
-        melcloud.on('headers', (headers) => {
+        melcloud.on('client', (client) => {
+            this.client = client;
+        }).on('headers', (headers) => {
             this.headers = headers;
         }).on('devicesList', async (devicesData) => {
             try {
@@ -326,11 +329,8 @@ class MelCloudAta extends EventEmitter {
                     headers.Origin = ApiUrlsHome.Origin;
                     if (!this.logDebug) this.emit('debug', `Send data: ${JSON.stringify(payload, null, 2)}`);
 
-                    await axios(path, {
+                    await this.client(path, {
                         method: method,
-                        baseURL: ApiUrlsHome.BaseURL,
-                        timeout: 30000,
-                        headers: headers,
                         data: payload
                     });
 

package/src/melcloudhome.js

@@ -85,7 +85,7 @@ class MelCloudHome extends EventEmitter {
     async checkScenesList() {
         try {
             if (this.logDebug) this.emit('debug', `Scanning for scenes`);
-            const listScenesData = await this.axiosInstance(ApiUrlsHome.GetUserScenes, { method: 'GET', });
+            const listScenesData = await this.client(ApiUrlsHome.GetUserScenes, { method: 'GET', });
 
             const scenesList = listScenesData.data;
             if (this.logDebug) this.emit('debug', `Scenes: ${JSON.stringify(scenesList, null, 2)}`);
@@ -117,7 +117,7 @@ class MelCloudHome extends EventEmitter {
         try {
             const devicesList = { State: false, Info: null, Devices: [], Scenes: [] }
             if (this.logDebug) this.emit('debug', `Scanning for devices`);
-            const listDevicesData = await this.axiosInstance(ApiUrlsHome.GetUserContext, { method: 'GET' });
+            const listDevicesData = await this.client(ApiUrlsHome.GetUserContext, { method: 'GET' });
 
             const userContext = listDevicesData.data;
             const buildings = userContext.buildings ?? [];
@@ -422,11 +422,12 @@ class MelCloudHome extends EventEmitter {
             this.emit('headers', headers);
 
             this.headers = headers;
-            this.axiosInstance = axios.create({
+            this.client = axios.create({
                 baseURL: ApiUrlsHome.BaseURL,
                 timeout: 30000,
                 headers: headers
             })
+            this.emit('client',  this.client);
 
             this.webSocketOptions = {
                 Hash: hash,