homebridge-melcloud-control 4.0.0-beta.563 → 4.0.0-beta.565

package/package.json

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

package/src/deviceata.js

@@ -949,7 +949,7 @@ class DeviceAta extends EventEmitter {
                     this.serialNumber = serialNumber.toString();
                     this.firmwareRevision = firmwareAppVersion.toString();
 
-                    this.informationService?.setCharacteristic(Characteristic.FirmwareRevision, this.firmwareAppVersion);
+                    this.informationService?.setCharacteristic(Characteristic.FirmwareRevision, this.firmwareRevision);
                 })
                 .on('deviceState', async (deviceData) => {
                     this.deviceData = deviceData;

package/src/deviceatw.js

@@ -1324,7 +1324,7 @@ class DeviceAtw extends EventEmitter {
                     this.serialNumber = serialNumber.toString();
                     this.firmwareRevision = firmwareAppVersion.toString();
 
-                    this.informationService?.setCharacteristic(Characteristic.FirmwareRevision, this.firmwareAppVersion);
+                    this.informationService?.setCharacteristic(Characteristic.FirmwareRevision, this.firmwareRevision);
                 })
                 .on('deviceState', async (deviceData) => {
                     this.deviceData = deviceData;

package/src/deviceerv.js

@@ -869,7 +869,7 @@ class DeviceErv extends EventEmitter {
                     this.serialNumber = serialNumber.toString();
                     this.firmwareRevision = firmwareAppVersion.toString();
 
-                    this.informationService?.setCharacteristic(Characteristic.FirmwareRevision, this.firmwareAppVersion);
+                    this.informationService?.setCharacteristic(Characteristic.FirmwareRevision, this.firmwareRevision);
                 })
                 .on('deviceState', async (deviceData) => {
                     this.deviceData = deviceData;

package/src/melcloud.js

@@ -323,14 +323,14 @@ class MelCloud extends EventEmitter {
             // Verify executable works
             try {
                 const { stdout } = await execPromise(`"${chromiumPath}" --version`);
-                this.emit('warn', `Chromium detected: ${stdout.trim()}`);
+                if (this.logDebug) this.emit('debug', `Chromium detected: ${stdout.trim()}`);
                 if (this.logDebug) this.emit('debug', `Chromium detected: ${stdout.trim()}`);
             } catch (error) {
                 accountInfo.Info = `Chromium found at ${chromiumPath}, but cannot be executed: ${error.message}`;
                 return accountInfo;
             }
 
-            this.emit('warn', `Launching Chromium...`);
+            if (this.logDebug) this.emit('debug', `Launching Chromium...`);
             browser = await puppeteer.launch({
                 headless: true,
                 executablePath: chromiumPath,
@@ -354,14 +354,13 @@ class MelCloud extends EventEmitter {
                 const client = await page.createCDPSession();
                 await client.send('Network.clearBrowserCookies');
             } catch (error) {
-                this.emit('warn', `Warning: could not clear cookies: ${error.message}`);
+                if (this.logError) this.emit('error', `Clear cookies error: ${error.message}`);
             }
 
             page.on('error', error => this.emit('error', `Page crashed: ${error.message}`));
             page.on('pageerror', error => this.emit('error', `Browser error: ${error.message}`));
             browser.on('disconnected', () => this.emit('debug', 'Browser disconnected'));
 
-            this.emit('warn', `Navigating to MELCloud...`);
             try {
                 await page.goto(ApiUrlsHome.BaseURL, { waitUntil: ['domcontentloaded', 'networkidle2'], timeout: GLOBAL_TIMEOUT });
             } catch (error) {
@@ -371,21 +370,17 @@ class MelCloud extends EventEmitter {
 
             // Wait extra to ensure UI is rendered
             await new Promise(r => setTimeout(r, 3000));
-
-            this.emit('warn', `Looking for login button...`);
             const loginBtn = await page.waitForSelector('button.btn--blue', { timeout: GLOBAL_TIMEOUT / 4 });
             const loginText = await page.evaluate(el => el.textContent.trim(), loginBtn);
 
             if (!['Zaloguj', 'Sign In', 'Login'].includes(loginText)) {
-                accountInfo.Info = `Login button ${loginText} not found in search array`;
+                accountInfo.Info = `Login button ${loginText} not found`;
                 return accountInfo;
             }
-
-            this.emit('warn', `Found login button ${loginText}`);
+            ;
             await loginBtn.click();
             await page.waitForNavigation({ waitUntil: 'networkidle2', timeout: 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) {
@@ -393,22 +388,16 @@ 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.Info = 'Submit button not found';
                 return accountInfo;
             }
-
-            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,7 +413,6 @@ class MelCloud extends EventEmitter {
                 return accountInfo;
             }
 
-            this.emit('warn', `Found cookies`);
             const contextKey = [
                 '__Secure-monitorandcontrol=chunks-2',
                 `__Secure-monitorandcontrolC1=${c1}`,
@@ -443,7 +431,9 @@ class MelCloud extends EventEmitter {
         } finally {
             if (browser) {
                 try { await browser.close(); }
-                catch (closeErr) { this.emit('error', `Failed to close Puppeteer: ${closeErr.message}`); }
+                catch (closeErr) {
+                    if (this.logError) this.emit('error', `Failed to close Puppeteer: ${closeErr.message}`);
+                }
             }
         }
     }

package/src/melcloudata.js

@@ -252,7 +252,7 @@ class MelCloudAta extends EventEmitter {
                             VaneVerticalDirection: AirConditioner.VaneVerticalDirectionMapEnumToString[deviceData.Device.VaneVerticalDirection]
                         }
                     };
-                    if (!this.logDebug) this.emit('warn', `Send Data: ${JSON.stringify(settings.data, null, 2)}`);
+                    if (this.logDebug) this.emit('debug', `Send Data: ${JSON.stringify(settings.data, null, 2)}`);
 
                     const path = ApiUrlsHome.SetAta.replace('deviceid', deviceData.DeviceID);
                     await axiosInstancePut(path, settings);