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

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 {
-      const response = await melCloud.connect();
-      const devices = await melCloud.chackDevicesList(response.contextKey);
+      await melCloud.connect();
+      const devices = await melCloud.chackDevicesList();
       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.6",
+  "version": "3.9.8-beta.0",
   "description": "Homebridge plugin to control Mitsubishi Air Conditioner, Heat Pump and Energy Recovery Ventilation.",
   "license": "MIT",
   "author": "grzegorz914",

package/src/melcloud.js

@@ -29,41 +29,36 @@ class MelCloud extends EventEmitter {
             }
         };
 
+        this.axiosInstance = axios.create({
+            baseURL: ApiUrls.BaseURL,
+            timeout: 15000,
+            withCredentials: true,
+            maxContentLength: 100000000,
+            maxBodyLength: 1000000000,
+            httpsAgent: new Agent({
+                keepAlive: false,
+                rejectUnauthorized: false
+            })
+        });
+
         if (!requestConfig) {
-            this.impulseGenerator = new ImpulseGenerator();
-            this.impulseGenerator.on('checkDevicesList', async () => {
-                try {
-                    await this.chackDevicesList(this.contextKey);
-                } catch (error) {
-                    this.emit('error', `Impulse generator error: ${error}`);
-                };
-            }).on('state', (state) => {
-                const emitState = state ? this.emit('success', `Impulse generator started`) : this.emit('warn', `Impulse generator stopped`);
-            });
+            this.impulseGenerator = new ImpulseGenerator()
+                .on('checkDevicesList', async () => {
+                    try {
+                        await this.chackDevicesList(this.contextKey);
+                    } catch (error) {
+                        this.emit('error', `Impulse generator error: ${error}`);
+                    };
+                }).on('state', (state) => {
+                    this.emit('success', `Impulse generator ${state ? 'started' : 'stopped'}.`);
+                });
         };
     };
 
-    async chackDevicesList(contextKey) {
+    async chackDevicesList() {
         try {
-            //create axios instance get
-            const axiosInstanceGet = axios.create({
-                method: 'GET',
-                baseURL: ApiUrls.BaseURL,
-                timeout: 10000,
-                headers: {
-                    'X-MitsContextKey': contextKey
-                },
-                maxContentLength: 100000000,
-                maxBodyLength: 1000000000,
-                withCredentials: true,
-                httpsAgent: new Agent({
-                    keepAlive: false,
-                    rejectUnauthorized: false
-                })
-            });
-
             if (this.enableDebugMode) this.emit('debug', `Scanning for devices`);
-            const listDevicesData = await axiosInstanceGet(ApiUrls.ListDevices);
+            const listDevicesData = await this.axiosInstance.get(ApiUrls.ListDevices);
             const buildingsList = listDevicesData.data;
             if (this.enableDebugMode) this.emit('debug', `Buildings: ${JSON.stringify(buildingsList, null, 2)}`);
 
@@ -112,19 +107,7 @@ class MelCloud extends EventEmitter {
         if (this.enableDebugMode) this.emit('debug', `Connecting to MELCloud`);
 
         try {
-            const axiosInstanceLogin = axios.create({
-                method: 'POST',
-                baseURL: ApiUrls.BaseURL,
-                timeout: 10000,
-                withCredentials: true,
-                maxContentLength: 100000000,
-                maxBodyLength: 1000000000,
-                httpsAgent: new Agent({
-                    keepAlive: false,
-                    rejectUnauthorized: false
-                })
-            });
-            const accountData = await axiosInstanceLogin(ApiUrls.ClientLogin, this.options);
+            const accountData = await this.axiosInstance.post(ApiUrls.ClientLogin, this.options);
             const account = accountData.data;
             const accountInfo = account.LoginData;
             const contextKey = accountInfo.ContextKey;
@@ -149,8 +132,7 @@ class MelCloud extends EventEmitter {
             };
 
             //create axios instance post
-            this.axiosInstancePost = axios.create({
-                method: 'POST',
+            this.axiosInstance = axios.create({
                 baseURL: ApiUrls.BaseURL,
                 timeout: 10000,
                 headers: {
@@ -190,7 +172,7 @@ class MelCloud extends EventEmitter {
                 data: accountInfo
             };
 
-            await this.axiosInstancePost(ApiUrls.UpdateApplicationOptions, options);
+            await this.axiosInstance.post(ApiUrls.UpdateApplicationOptions, options);
             await this.functions.saveData(this.accountFile, accountInfo);
             return true;
         } catch (error) {

package/src/melcloudata.js

@@ -60,7 +60,8 @@ class MelCloudAta extends EventEmitter {
     async checkState() {
         try {
             //read device info from file
-            const devicesData = await this.functions.readData(this.devicesFile);
+            const data = await this.functions.readData(this.devicesFile);
+            const devicesData = JSON.parse(data);
 
             if (!Array.isArray(devicesData)) {
                 this.emit('warn', `Device data not found`);

package/src/melcloudatw.js

@@ -60,7 +60,8 @@ class MelCloudAtw extends EventEmitter {
     async checkState() {
         try {
             //read device info from file
-            const devicesData = await this.functions.readData(this.devicesFile);
+            const data = await this.functions.readData(this.devicesFile);
+            const devicesData = JSON.parse(data);
 
             if (!Array.isArray(devicesData)) {
                 this.emit('warn', `Device data not found`);

package/src/melclouderv.js

@@ -60,7 +60,8 @@ class MelCloudErv extends EventEmitter {
     async checkState() {
         try {
             //read device info from file
-            const devicesData = await this.functions.readData(this.devicesFile);
+            const data = await this.functions.readData(this.devicesFile);
+            const devicesData = JSON.parse(data);
 
             if (!Array.isArray(devicesData)) {
                 this.emit('warn', `Device data not found`);