homebridge-melcloud-control 4.0.0-beta.509 → 4.0.0-beta.510

package/package.json

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

package/src/melcloud.js

@@ -42,7 +42,7 @@ class MelCloud extends EventEmitter {
                     await this.checkDevicesList();
                 }))
                 .on('state', (state) => {
-                    this.emit('success', `Impulse generator ${state ? 'started' : 'stopped'}.`);
+                    this.emit(state ? 'success' : 'warn', `Impulse generator ${state ? 'started' : 'stopped'}`);
                 });
         }
     }
@@ -347,7 +347,7 @@ class MelCloud extends EventEmitter {
 
             page.on('error', err => this.emit('error', `Page crashed: ${err.message}`));
             page.on('pageerror', err => this.emit('error', `Browser error: ${err.message}`));
-            browser.on('disconnected', () => this.emit('warn', 'Browser disconnected unexpectedly'));
+            browser.on('disconnected', () => this.emit('debug', 'Browser disconnected'));
 
             this.emit('warn', `Navigating to MELCloud...`);
             try {
@@ -366,7 +366,8 @@ class MelCloud extends EventEmitter {
             try {
                 loginBtn = await page.waitForFunction(() => {
                     const btns = Array.from(document.querySelectorAll('button.btn--blue'));
-                    return btns.find(b => ['Zaloguj', 'Sign In', 'Login'].includes(b.textContent.trim()));
+                    btns.find(b => ['Zaloguj', 'Sign In', 'Login'].includes(b.textContent.trim()));
+                    return btns;
                 }, { timeout: GLOBAL_TIMEOUT / 6 });
             } catch {
                 accountInfo.State = false;
@@ -374,14 +375,10 @@ class MelCloud extends EventEmitter {
                 return accountInfo;
             }
 
-            await Promise.race([
-                Promise.all([
-                    loginBtn.click(),
-                    page.waitForNavigation({ waitUntil: ['domcontentloaded', 'networkidle2'], timeout: GLOBAL_TIMEOUT / 4 })
-                ]),
-                new Promise(r => setTimeout(r, GLOBAL_TIMEOUT / 3))
-            ]);
+            this.emit('warn', `Found login button  ${loginBtn}`);
+            await Promise.race([Promise.all([loginBtn.click(), page.waitForNavigation({ waitUntil: ['domcontentloaded', 'networkidle2'], timeout: GLOBAL_TIMEOUT / 4 })]), new Promise(r => setTimeout(r, GLOBAL_TIMEOUT / 3))]);
 
+            this.emit('warn', `Looking for credentials form...`);
             const usernameInput = await page.$('input[name="username"]');
             const passwordInput = await page.$('input[name="password"]');
             if (!usernameInput || !passwordInput) {
@@ -390,9 +387,11 @@ class MelCloud extends EventEmitter {
                 return accountInfo;
             }
 
+            this.emit('warn', `Type credentials data..`);
             await page.type('input[name="username"]', this.user, { delay: 50 });
             await page.type('input[name="password"]', this.passwd, { delay: 50 });
 
+            this.emit('warn', `Looking for submit button...`);
             const submitButton = await page.$('input[type="submit"], button[type="submit"]');
             if (!submitButton) {
                 accountInfo.State = false;
@@ -400,14 +399,10 @@ class MelCloud extends EventEmitter {
                 return accountInfo;
             }
 
-            await Promise.race([
-                Promise.all([
-                    submitButton.click(),
-                    page.waitForNavigation({ waitUntil: ['domcontentloaded', 'networkidle2'], timeout: GLOBAL_TIMEOUT / 4 })
-                ]),
-                new Promise(r => setTimeout(r, GLOBAL_TIMEOUT / 3))
-            ]);
+            this.emit('warn', `Found submit button  ${submitButton}`);
+            await Promise.race([Promise.all([submitButton.click(), page.waitForNavigation({ waitUntil: ['domcontentloaded', 'networkidle2'], timeout: GLOBAL_TIMEOUT / 4 })]), new Promise(r => setTimeout(r, GLOBAL_TIMEOUT / 3))]);
 
+            this.emit('warn', `Looking for cookies...`);
             // Extract cookies
             let c1 = null, c2 = null;
             const start = Date.now();
@@ -424,6 +419,7 @@ class MelCloud extends EventEmitter {
                 return accountInfo;
             }
 
+            this.emit('warn', `Found cookies`);
             const contextKey = [
                 '__Secure-monitorandcontrol=chunks-2',
                 `__Secure-monitorandcontrolC1=${c1}`,

package/src/melcloudata.js

@@ -31,7 +31,7 @@ class MelCloudAta extends EventEmitter {
                 await this.checkState();
             }))
             .on('state', (state) => {
-                this.emit('success', `Impulse generator ${state ? 'started' : 'stopped'}.`);
+                this.emit(state ? 'success' : 'warn', `Impulse generator ${state ? 'started' : 'stopped'}`);
             });
     }
 

package/src/melcloudatw.js

@@ -31,7 +31,7 @@ class MelCloudAtw extends EventEmitter {
                 await this.checkState();
             }))
             .on('state', (state) => {
-                this.emit('success', `Impulse generator ${state ? 'started' : 'stopped'}.`);
+                this.emit(state ? 'success' : 'warn', `Impulse generator ${state ? 'started' : 'stopped'}`);
             });
     }
 

package/src/melclouderv.js

@@ -31,7 +31,7 @@ class MelCloudErv extends EventEmitter {
                 await this.checkState();
             }))
             .on('state', (state) => {
-                this.emit('success', `Impulse generator ${state ? 'started' : 'stopped'}.`);
+                this.emit(state ? 'success' : 'warn', `Impulse generator ${state ? 'started' : 'stopped'}`);
             });
     }