homebridge-melcloud-control 2.5.0-beta.95 → 2.5.0-beta.96

package/homebridge-ui/server.js

@@ -26,7 +26,9 @@ class PluginUiServer extends HomebridgePluginUiServer {
     try {
       let data = {};
       const melCloud = new MelCloud(user, passwd, language, accountInfoFile, deviceInfoFile, buildingsFile, false, 0, true);
-      const contextKey = await melCloud.connect();
+      const response = await melCloud.connect();
+      const accountInfo = response.accountInfo;
+      const contextKey = response.contextKey;
       const devices = await melCloud.chackDevicesList(contextKey);
       return data = {
         info: '',

package/index.js

@@ -2,6 +2,7 @@
 const path = require('path');
 const fs = require('fs');
 const MelCloud = require('./src/melcloud.js')
+const MelCloudDevices = require('./src/melclouddevices.js')
 const DeviceAta = require('./src/deviceata.js')
 const DeviceAtw = require('./src/deviceatw.js')
 const DeviceErv = require('./src/deviceerv.js')
@@ -17,7 +18,7 @@ class MelCloudPlatform {
 		this.accessories = [];
 		const accountsName = [];
 
-		api.on('didFinishLaunching', () => {
+		api.on('didFinishLaunching', async () => {
 			//loop through accounts
 			for (const account of config.accounts) {
 				const accountName = account.name;
@@ -73,8 +74,12 @@ class MelCloudPlatform {
 				const deviceRefreshInterval = account.deviceRefreshInterval * 1000 || 5000;
 
 				//melcloud account
-				const melCloud = new MelCloud(user, passwd, language, accountInfoFile, buildingsFile, deviceFile, enableDebugMode, refreshInterval, false);
-				melCloud.on('checkDevicesListComplete', (accountInfo, contextKey) => {
+				try {
+					const melCloud = new MelCloud(user, passwd, language, accountInfoFile, buildingsFile, deviceFile, enableDebugMode, refreshInterval, false);
+					const response = await melCloud.connect();
+					const accountInfo = response.accountInfo;
+					const contextKey = response.contextKey;
+					const devices = await melCloud.chackDevicesList(contextKey);
 
 					//Air Conditioner
 					for (const device of account.ataDevices) {
@@ -189,24 +194,24 @@ class MelCloudPlatform {
 								log.error(`${deviceTypeText}, ${deviceName}, ${error}`);
 							});
 					};
-				})
-					.on('success', (message) => {
+					melCloud.on('success', (message) => {
 						log.success(`Account ${accountName}, ${message}`);
 					})
-					.on('message', (message) => {
-						log.info(`Account ${accountName}, ${message}`);
-					})
-					.on('debug', (debug) => {
-						log.info(`Account ${accountName}, debug: ${debug}`);
-					})
-					.on('warn', (warn) => {
-						log.warn(`${deviceTypeText}, ${deviceName}, ${warn}`);
-					})
-					.on('error', async (error) => {
-						log.error(`Account ${accountName}, ${error}, check again in: ${refreshInterval / 1000}s.`);
-						await new Promise(resolve => setTimeout(resolve, refreshInterval));
-						await melCloud.connect();
-					});
+						.on('message', (message) => {
+							log.info(`Account ${accountName}, ${message}`);
+						})
+						.on('debug', (debug) => {
+							log.info(`Account ${accountName}, debug: ${debug}`);
+						})
+						.on('warn', (warn) => {
+							log.warn(`Account ${accountName}, ${warn}`);
+						})
+						.on('error', async (error) => {
+							log.error(`Account ${accountName}, ${error}.`);
+						});
+				} catch (error) {
+					log.error(`Account: ${accountName}, MELCloud error: ${error.message ?? error}`);
+				}
 			};
 		});
 	};

package/package.json

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

package/src/melcloud.js

@@ -16,7 +16,6 @@ class MelCloud extends EventEmitter {
         this.enableDebugMode = enableDebugMode;
         this.refreshInterval = refreshInterval;
         this.requestConfig = requestConfig;
-        this.emitData = true;
         this.contextKey = '';
         this.devicesId = [];
 
@@ -36,7 +35,7 @@ class MelCloud extends EventEmitter {
             this.impulseGenerator = new ImpulseGenerator();
             this.impulseGenerator.on('checkDevicesList', async () => {
                 try {
-                    await this.chackDevicesList(this.contextKey);
+                    const devices = await this.chackDevicesList(this.contextKey);
                 } catch (error) {
                     this.emit('error', `Check devices list: ${error}.`);
                 };
@@ -66,6 +65,7 @@ class MelCloud extends EventEmitter {
             const account = accountData.data;
             const accountInfo = account.LoginData;
             const contextKey = accountInfo.ContextKey;
+            this.contextKey = contextKey;
 
             //remove sensitive data
             const debugData = {
@@ -83,30 +83,21 @@ class MelCloud extends EventEmitter {
                 this.emit('warn', `Context key: ${contextKey}, missing.`)
                 return;
             };
-            this.accountInfo = accountInfo;
-            this.contextKey = contextKey;
 
             //save melcloud info to the file
             await this.saveData(this.accountInfoFile, accountInfo);
 
-            //return if connect for config
-            if (this.requestConfig) {
-                return contextKey;
-            };
-
-            //check devices list
-            await this.chackDevicesList(contextKey);
-
             //emit connect success
             this.emit('success', `Connect to MELCloud Success.`)
 
-            //start impulse generator
-            const timers = [{ name: 'checkDevicesList', sampling: this.refreshInterval }];
-            this.impulseGenerator.start(timers);
+            const obj = {
+                accountInfo: accountInfo,
+                contextKey: contextKey
+            }
 
-            return true;
+            return obj;
         } catch (error) {
-            this.emit('error', `Connect to MELCloud error: ${error.message ?? error}.`);
+            throw new Error(`Connect to MELCloud error: ${error.message ?? error}.`);
         };
     }
 
@@ -177,20 +168,15 @@ class MelCloud extends EventEmitter {
                 const debug = this.enableDebugMode ? this.emit('debug', `Device: ${deviceName} info saved.`) : false;
             };
 
-            //return devices list for config
-            if (this.requestConfig) {
-                return devices;
-            };
-
-            //emit check devices list complete
-            if (!this.requestConfig && this.emitData) {
-                this.emit('checkDevicesListComplete', this.accountInfo, contextKey)
-                this.emitData = false;
-            };
+            if (!this.requestConfig) {
+                //start impulse generator
+                const timers = [{ name: 'checkDevicesList', sampling: this.refreshInterval }];
+                this.impulseGenerator.start(timers);
+            }
 
-            return true;
+            return devices;
         } catch (error) {
-            const stop = connectForConfig ? false : this.impulseGenerator.stop();
+            const stop = !this.requestConfig ? false : this.impulseGenerator.stop();
             throw new Error(`Scanning for devices error: ${error.message ?? error}.`);
         };
     }