homebridge-melcloud-control 4.0.0-beta.114 → 4.0.0-beta.115

package/index.js

@@ -30,8 +30,8 @@ class MelCloudPlatform {
 		api.on('didFinishLaunching', async () => {
 			//loop through accounts
 			for (const account of config.accounts) {
-				const displayType = account.displayType || 'disabled';
-				if (displayType === 'disabled') continue;
+				const accountType = account.accountType || 'disabled';
+				if (accountType === 'disabled') continue;
 
 				const accountName = account.name;
 				const user = account.user;
@@ -90,7 +90,7 @@ class MelCloudPlatform {
 						.on('start', async () => {
 							try {
 								//melcloud account
-								const melCloud = new MelCloud(displayType, user, passwd, language, accountFile, buildingsFile, devicesFile, logLevel.warn, logLevel.debug, false)
+								const melCloud = new MelCloud(accountType, user, passwd, language, accountFile, buildingsFile, devicesFile, logLevel.warn, logLevel.debug, false)
 									.on('success', (msg) => logLevel.success && log.success(`${accountName}, ${msg}`))
 									.on('info', (msg) => logLevel.info && log.info(`${accountName}, ${msg}`))
 									.on('debug', (msg) => logLevel.debug && log.info(`${accountName}, debug: ${msg}`))
@@ -181,8 +181,10 @@ class MelCloudPlatform {
 										api.publishExternalAccessories(PluginName, [accessory]);
 										if (logLevel.success) log.success(`${accountName}, ${deviceTypeText}, ${deviceName}, Published as external accessory.`);
 
-										//start impulse generators
-										await melCloud.impulseGenerator.state(true, [{ name: 'checkDevicesList', sampling: refreshInterval }]);
+										//start impulse generators\
+										const timmers = accountType === 'melcloudhome' ? [{ name: 'connect', sampling: 150000 }, { name: 'checkDevicesList', sampling: deviceRefreshInterval }] : [{ name: 'checkDevicesList', sampling: refreshInterval }];
+										const impulseGenerator = configuredDevice.getImpulseGenerator();
+										await melCloud.impulseGenerator.state(true, timmers);
 										await configuredDevice.startStopImpulseGenerator(true, [{ name: 'checkState', sampling: deviceRefreshInterval }]);
 
 										//stop impulse generator

package/package.json

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

package/src/melcloud.js

@@ -7,9 +7,9 @@ import Functions from './functions.js';
 import { ApiUrls, ApiUrlsHome } from './constants.js';
 
 class MelCloud extends EventEmitter {
-    constructor(displayType, user, passwd, language, accountFile, buildingsFile, devicesFile, logWarn, logDebug, requestConfig) {
+    constructor(accountType, user, passwd, language, accountFile, buildingsFile, devicesFile, logWarn, logDebug, requestConfig) {
         super();
-        this.displayType = displayType;
+        this.accountType = accountType;
         this.user = user;
         this.passwd = passwd;
         this.language = language;
@@ -45,6 +45,13 @@ class MelCloud extends EventEmitter {
 
         if (!requestConfig) {
             this.impulseGenerator = new ImpulseGenerator()
+                .on('connect', async () => {
+                    try {
+                        await this.connect();
+                    } catch (error) {
+                        this.emit('error', `Impulse generator error: ${error}`);
+                    }
+                })
                 .on('checkDevicesList', async () => {
                     try {
                         await this.checkDevicesList(this.contextKey);
@@ -292,13 +299,13 @@ class MelCloud extends EventEmitter {
             if (!loginBtn && this.logWarn) this.emit('warn', `Login button not found`);
 
             // Set credentials and login
-            await Promise.all([loginBtn.click(), page.waitForNavigation({ waitUntil: 'networkidle2', timeout: 20000 })]);
-            await page.waitForSelector('input[name="username"]', { timeout: 15000 });
+            await Promise.all([loginBtn.click(), page.waitForNavigation({ waitUntil: 'networkidle2', timeout: 5000 })]);
+            await page.waitForSelector('input[name="username"]', { timeout: 5000 });
             await page.type('input[name="username"]', this.user, { delay: 50 });
             await page.type('input[name="password"]', this.passwd, { delay: 50 });
 
             const button1 = await page.$('input[type="submit"]');
-            await Promise.all([button1.click(), page.waitForNavigation({ waitUntil: 'networkidle2', timeout: 20000 })]);
+            await Promise.all([button1.click(), page.waitForNavigation({ waitUntil: 'networkidle2', timeout: 5000 })]);
 
             // Get cookies C1 and C2
             let c1 = null, c2 = null;
@@ -332,23 +339,9 @@ class MelCloud extends EventEmitter {
         }
     }
 
-    async connect() {
-        let response = {};
-        switch (this.displayType) {
-            case "melcloud":
-                response = await this.connectToMelCloud();
-                return response
-            case "melcloudhome":
-                response = await this.connectToMelCloudHome();
-                return response
-            default:
-                return response
-        }
-    }
-
     async checkDevicesList(contextKey) {
         let devices = [];
-        switch (this.displayType) {
+        switch (this.accountType) {
             case "melcloud":
                 devices = await this.checkMelcloudDevicesList(contextKey);
                 return devices
@@ -360,6 +353,20 @@ class MelCloud extends EventEmitter {
         }
     }
 
+    async connect() {
+        let response = {};
+        switch (this.accountType) {
+            case "melcloud":
+                response = await this.connectToMelCloud();
+                return response
+            case "melcloudhome":
+                response = await this.connectToMelCloudHome();
+                return response
+            default:
+                return response
+        }
+    }
+
     async send(accountInfo) {
         try {
             const options = { data: accountInfo };