homebridge-melcloud-control 4.0.0-beta.420 → 4.0.0-beta.421

package/homebridge-ui/server.js

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

package/index.js

@@ -115,7 +115,7 @@ class MelCloudPlatform {
 								//check devices list
 								let devicesInMelcloud;
 								try {
-									devicesInMelcloud = await melCloud.checkDevicesList(contextKey);
+									devicesInMelcloud = await melCloud.checkDevicesList();
 								} catch (error) {
 									if (logLevel.error) log.error(`${accountName}, Check devices list error: ${error.message ?? error}`);
 									return;

package/package.json

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

package/src/melcloud.js

@@ -28,35 +28,45 @@ class MelCloud extends EventEmitter {
         this.tokens = null;
 
         if (!requestConfig) {
+            //lock flags
+            this.locks = {
+                connect: false,
+                checkDevicesList: false
+            };
             this.impulseGenerator = new ImpulseGenerator()
-                .on('connect', async () => {
-                    try {
-                        await this.connect(true);
-                    } catch (error) {
-                        this.emit('error', `Impulse generator error: ${error}`);
-                    }
+                .on('connect', () => this.handleWithLock('connect', async () => {
+                    await this.connect(true);
+                }))
+                .on('checkDevicesList', () => this.handleWithLock('checkDevicesList', async () => {
+                    await this.checkDevicesList();
                 })
-                .on('checkDevicesList', async () => {
-                    try {
-                        await this.checkDevicesList(this.contextKey);
-                    } catch (error) {
-                        this.emit('error', `Impulse generator error: ${error}`);
-                    }
-                })
-                .on('state', (state) => {
-                    this.emit('success', `Impulse generator ${state ? 'started' : 'stopped'}.`);
-                });
+                    .on('state', (state) => {
+                        this.emit('success', `Impulse generator ${state ? 'started' : 'stopped'}.`);
+                    }));
+        }
+    }
+
+    async handleWithLock(lockKey, fn) {
+        if (this.locks[lockKey]) return;
+
+        this.locks[lockKey] = true;
+        try {
+            await fn();
+        } catch (error) {
+            this.emit('error', `Inpulse generator error: ${error}`);
+        } finally {
+            this.locks[lockKey] = false;
         }
     }
 
     // MELCloud
-    async checkMelcloudDevicesList(contextKey) {
+    async checkMelcloudDevicesList() {
         try {
             const axiosInstance = axios.create({
                 method: 'GET',
                 baseURL: ApiUrls.BaseURL,
                 timeout: 15000,
-                headers: { 'X-MitsContextKey': contextKey }
+                headers: { 'X-MitsContextKey': this.contextKey }
             });
 
             if (this.logDebug) this.emit('debug', `Scanning for devices...`);
@@ -186,7 +196,7 @@ class MelCloud extends EventEmitter {
     }
 
     // MELCloud Home
-    async checkMelcloudHomeDevicesList(contextKey) {
+    async checkMelcloudHomeDevicesList() {
         try {
             const axiosInstance = axios.create({
                 method: 'GET',
@@ -195,7 +205,7 @@ class MelCloud extends EventEmitter {
                 headers: {
                     'Accept': '*/*',
                     'Accept-Language': 'en-US,en;q=0.9',
-                    'Cookie': contextKey,
+                    'Cookie': this.contextKey,
                     'User-Agent': 'homebridge-melcloud-control/4.0.0',
                     'DNT': '1',
                     'Origin': 'https://melcloudhome.com',
@@ -231,7 +241,7 @@ class MelCloud extends EventEmitter {
                     );
 
                 // Funkcja tworząca finalny obiekt Device
-                const createDevice = (device, type, contextKey) => {
+                const createDevice = (device, type) => {
                     // Settings już kapitalizowane w nazwach
                     const settingsArray = device.Settings || [];
 
@@ -259,7 +269,7 @@ class MelCloud extends EventEmitter {
 
                     return {
                         ...rest,
-                        ContextKey: contextKey,
+                        ContextKey: this.contextKey,
                         Type: type,
                         DeviceID: Id,
                         DeviceName: GivenDisplayName,
@@ -268,9 +278,9 @@ class MelCloud extends EventEmitter {
                 };
 
                 return [
-                    ...(building.airToAirUnits || []).map(d => createDevice(capitalizeKeys(d), 0, this.contextKey)),
-                    ...(building.airToWaterUnits || []).map(d => createDevice(capitalizeKeys(d), 1, this.contextKey)),
-                    ...(building.airToVentilationUnits || []).map(d => createDevice(capitalizeKeys(d), 3, this.contextKey))
+                    ...(building.airToAirUnits || []).map(d => createDevice(capitalizeKeys(d), 0)),
+                    ...(building.airToWaterUnits || []).map(d => createDevice(capitalizeKeys(d), 1)),
+                    ...(building.airToVentilationUnits || []).map(d => createDevice(capitalizeKeys(d), 3))
                 ];
             });
 
@@ -483,14 +493,14 @@ class MelCloud extends EventEmitter {
         }
     }
 
-    async checkDevicesList(contextKey) {
+    async checkDevicesList() {
         let devices = [];
         switch (this.accountType) {
             case "melcloud":
-                devices = await this.checkMelcloudDevicesList(contextKey);
+                devices = await this.checkMelcloudDevicesList();
                 return devices
             case "melcloudhome":
-                devices = await this.checkMelcloudHomeDevicesList(contextKey);
+                devices = await this.checkMelcloudHomeDevicesList();
                 return devices;
             default:
                 return devices;