homebridge-melcloud-control 4.2.2-beta.2 → 4.2.2-beta.4

package/package.json

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

package/src/melcloud.js

@@ -76,22 +76,19 @@ class MelCloud extends EventEmitter {
             });
 
             if (this.logDebug) this.emit('debug', `Scanning for devices...`);
-
             const listDevicesData = await axiosInstance(ApiUrls.ListDevices);
 
             if (!listDevicesData || !listDevicesData.data) {
-                if (this.logWarn) this.emit('warn', `Invalid or empty response from MELCloud API`);
-                return null;
+                devicesList.Info = 'Invalid or empty response from MELCloud API'
+                return devicesList;
             }
 
             const buildingsList = listDevicesData.data;
-
-            if (this.logDebug)
-                this.emit('debug', `Buildings: ${JSON.stringify(buildingsList, null, 2)}`);
+            if (this.logDebug) this.emit('debug', `Buildings: ${JSON.stringify(buildingsList, null, 2)}`);
 
             if (!Array.isArray(buildingsList) || buildingsList.length === 0) {
-                if (this.logWarn) this.emit('warn', `No buildings found in MELCloud account`);
-                return null;
+                devicesList.Info = 'No building found'
+                return devicesList;
             }
 
             await this.functions.saveData(this.buildingsFile, buildingsList);
@@ -137,8 +134,7 @@ class MelCloud extends EventEmitter {
             devicesList.Info = `Found ${devicesCount} devices`;
             return devicesList;
         } catch (error) {
-            const msg = error.response ? `HTTP ${error.response.status}: ${error.response.statusText}` : error.message;
-            throw new Error(`Check devices list error: ${msg}`);
+            throw new Error(`Check devices list error: ${error.message}`);
         }
     }
 
@@ -227,7 +223,6 @@ class MelCloud extends EventEmitter {
             if (this.logDebug) this.emit('debug', `Buildings: ${JSON.stringify(buildingsList, null, 2)}`);
 
             if (!buildingsList) {
-                devicesList.State = false;
                 devicesList.Info = 'No building found'
                 return devicesList;
             }

package/src/melcloudata.js

@@ -25,11 +25,9 @@ class MelCloudAta extends EventEmitter {
         this.deviceData = {};
 
         //lock flags
-        this.locks = {
-            checkState: false,
-        };
+        this.locks = true;
         this.impulseGenerator = new ImpulseGenerator()
-            .on('checkState', () => this.handleWithLock('checkState', async () => {
+            .on('checkState', () => this.handleWithLock(async () => {
                 await this.checkState();
             }))
             .on('state', (state) => {
@@ -37,16 +35,16 @@ class MelCloudAta extends EventEmitter {
             });
     }
 
-    async handleWithLock(lockKey, fn) {
-        if (this.locks[lockKey]) return;
+    async handleWithLock(fn) {
+        if (this.locks) return;
 
-        this.locks[lockKey] = true;
+        this.locks = true;
         try {
             await fn();
         } catch (error) {
             this.emit('error', `Inpulse generator error: ${error}`);
         } finally {
-            this.locks[lockKey] = false;
+            this.locks = false;
         }
     }
 
@@ -282,9 +280,12 @@ class MelCloudAta extends EventEmitter {
     }
 
     updateData(deviceData) {
+        this.lock = true;
+        this.emit('deviceState', deviceData);
+
         setTimeout(() => {
-            this.emit('deviceState', deviceData);
-        }, 300);
+            this.lock = false
+        }, 1500);
     }
 
 };

package/src/melcloudatw.js

@@ -25,11 +25,9 @@ class MelCloudAtw extends EventEmitter {
         this.devicesData = {};
 
         //lock flags
-        this.locks = {
-            checkState: false,
-        };
+        this.locks = true;
         this.impulseGenerator = new ImpulseGenerator()
-            .on('checkState', () => this.handleWithLock('checkState', async () => {
+            .on('checkState', () => this.handleWithLock(async () => {
                 await this.checkState();
             }))
             .on('state', (state) => {
@@ -37,16 +35,16 @@ class MelCloudAtw extends EventEmitter {
             });
     }
 
-    async handleWithLock(lockKey, fn) {
-        if (this.locks[lockKey]) return;
+    async handleWithLock(fn) {
+        if (this.locks) return;
 
-        this.locks[lockKey] = true;
+        this.locks = true;
         try {
             await fn();
         } catch (error) {
             this.emit('error', `Inpulse generator error: ${error}`);
         } finally {
-            this.locks[lockKey] = false;
+            this.locks = false;
         }
     }
 
@@ -252,9 +250,12 @@ class MelCloudAtw extends EventEmitter {
     }
 
     updateData(deviceData) {
+        this.lock = true;
+        this.emit('deviceState', deviceData);
+
         setTimeout(() => {
-            this.emit('deviceState', deviceData);
-        }, 300);
+            this.lock = false
+        }, 1500);
     }
 };
 export default MelCloudAtw;

package/src/melclouderv.js

@@ -25,11 +25,9 @@ class MelCloudErv extends EventEmitter {
         this.devicesData = {};
 
         //lock flags
-        this.locks = {
-            checkState: false,
-        };
+        this.locks = true;
         this.impulseGenerator = new ImpulseGenerator()
-            .on('checkState', () => this.handleWithLock('checkState', async () => {
+            .on('checkState', () => this.handleWithLock(async () => {
                 await this.checkState();
             }))
             .on('state', (state) => {
@@ -37,16 +35,16 @@ class MelCloudErv extends EventEmitter {
             });
     }
 
-    async handleWithLock(lockKey, fn) {
-        if (this.locks[lockKey]) return;
+    async handleWithLock(fn) {
+        if (this.locks) return;
 
-        this.locks[lockKey] = true;
+        this.locks = true;
         try {
             await fn();
         } catch (error) {
             this.emit('error', `Inpulse generator error: ${error}`);
         } finally {
-            this.locks[lockKey] = false;
+            this.locks = false;
         }
     }
 
@@ -260,9 +258,12 @@ class MelCloudErv extends EventEmitter {
     }
 
     updateData(deviceData) {
+        this.lock = true;
+        this.emit('deviceState', deviceData);
+
         setTimeout(() => {
-            this.emit('deviceState', deviceData);
-        }, 300);
+            this.lock = false
+        }, 1500);
     }
 };
 export default MelCloudErv;