homebridge-melcloud-control 4.0.0-beta.491 → 4.0.0-beta.493

package/homebridge-ui/public/index.html

@@ -230,10 +230,10 @@
 
         try {
           const account = pluginConfig[0].accounts[this.accountIndex];
-          const devicesInMelCloud = await homebridge.request('/connect', account);
-          if (devicesInMelCloud === 'No chromium installed') {
+          const response = await homebridge.request('/connect', account);
+          if (!response.State) {
             homebridge.hideSpinner();
-            updateInfo('info', 'Chromium not found on Your device, please install it manually and try again.', 'Red');
+            updateInfo('info', response.Info);
             return;
           }
 
@@ -241,7 +241,7 @@
           const newDevices = { ata: [], ataPresets: [], atw: [], atwPresets: [], erv: [], ervPresets: [] };
           const devicesByType = { ata: [], atw: [], erv: [] };
 
-          devicesInMelCloud.forEach(d => {
+          response.forEach(d => {
             if (d.Type === 0) devicesByType.ata.push(d);
             if (d.Type === 1) devicesByType.atw.push(d);
             if (d.Type === 3) devicesByType.erv.push(d);

package/homebridge-ui/server.js

@@ -21,6 +21,8 @@ class PluginUiServer extends HomebridgePluginUiServer {
 
     try {
       const accountInfo = await melCloud.connect();
+      if (!accountInfo.State) return accountInfo;
+
       const devices = await melCloud.checkDevicesList();
       return devices;
     } catch (error) {

package/index.js

@@ -105,6 +105,11 @@ class MelCloudPlatform {
 									return;
 								}
 
+								if (!accountInfo.State) {
+									if (logLevel.warn) log.warn(`${accountName}, Connect not possible: ${accountInfo.Info}`);
+									return;
+								}
+
 								const contextKey = accountInfo.ContextKey;
 								const useFahrenheit = accountInfo.UseFahrenheit;
 

package/package.json

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

package/src/melcloud.js

@@ -140,13 +140,14 @@ class MelCloud extends EventEmitter {
         if (this.logDebug) this.emit('debug', `Connecting to MELCloud`);
 
         try {
+            const accountInfo = { State: false, Info: '', ContextKey: null, UseFahrenheit: false }
             const axiosInstance = axios.create({
                 method: 'POST',
                 baseURL: ApiUrls.BaseURL,
                 timeout: 15000,
             });
 
-            const loginData = {
+            const data = {
                 Email: this.user,
                 Password: this.passwd,
                 Language: this.language,
@@ -156,14 +157,14 @@ class MelCloud extends EventEmitter {
                 Persist: true
             };
 
-            const accountData = await axiosInstance(ApiUrls.ClientLogin, { data: loginData });
+            const accountData = await axiosInstance(ApiUrls.ClientLogin, { data: data });
             const account = accountData.data;
-            const accountInfo = account.LoginData ?? [];
-            const contextKey = accountInfo.ContextKey;
+            const loginData = account.LoginData ?? [];
+            const contextKey = LoginData.ContextKey;
             this.contextKey = contextKey;
 
             const debugData = {
-                ...accountInfo,
+                ...loginData,
                 ContextKey: 'removed',
                 ClientId: 'removed',
                 Client: 'removed',
@@ -175,9 +176,16 @@ class MelCloud extends EventEmitter {
 
             if (!contextKey) {
                 if (this.logWarn) this.emit('warn', `Context key missing`);
-                return null;
+                accountInfo.State = false;
+                accountInfo.Info = 'Context key missing'
+                return accountInfo;
             }
 
+            accountInfo.State = true;
+            accountInfo.Info = 'Connect success';
+            accountInfo.LoginData = loginData;
+            accountInfo.ContextKey = contextKey;
+
             await this.functions.saveData(this.accountFile, accountInfo);
             this.emit('success', `Connect to MELCloud Success`);
 
@@ -297,10 +305,13 @@ class MelCloud extends EventEmitter {
         let browser;
 
         try {
+            const accountInfo = { State: false, Info: '', ContextKey: null, UseFahrenheit: false }
             const chromiumPath = await this.functions.ensureChromiumInstalled();
             if (!chromiumPath) {
-                if (this.logWarn) this.emit('warn', 'Chromium not found on Your device, please install it manually and try again.');
-                return 'No chromium installed';
+                if (this.logWarn) this.emit('warn', 'Chromium not found on Your device, please install it manually and try again');
+                accountInfo.State = false;
+                accountInfo.Info = 'Chromium not found on Your device, please install it manually and try again'
+                return accountInfo;
             }
 
             this.emit('warn', `Test 1`);
@@ -325,7 +336,7 @@ class MelCloud extends EventEmitter {
             const pages = await browser.pages();
             let page = pages[0];
             if (!page) {
-                if (this.logWarn) this.emit('warn', 'No initial page found, creating a new one.');
+                if (this.logWarn) this.emit('warn', 'No initial page found, creating a new one');
                 page = await browser.newPage();
                 await new Promise(r => setTimeout(r, 2000));
             }
@@ -353,20 +364,21 @@ class MelCloud extends EventEmitter {
                 }, { timeout: 5000 }); // max 5s czekania
             } catch {
                 if (this.logWarn) this.emit('warn', 'Login button not found after 5s');
-                return null;
+                accountInfo.State = false;
+                accountInfo.Info = 'Login button not found after 5s';
+                return accountInfo;
             }
 
-            await Promise.race([
-                Promise.all([loginBtn.click(), page.waitForNavigation({ waitUntil: ['domcontentloaded', 'networkidle2'], timeout: 15000 })]),
-                new Promise(r => setTimeout(r, 12000))
-            ]);
+            await Promise.race([Promise.all([loginBtn.click(), page.waitForNavigation({ waitUntil: ['domcontentloaded', 'networkidle2'], timeout: 10000 })]), new Promise(r => setTimeout(r, 8000))]);
 
             this.emit('warn', `Test 7`);
             const usernameInput = await page.$('input[name="username"]');
             const passwordInput = await page.$('input[name="password"]');
             if (!usernameInput || !passwordInput) {
                 if (this.logWarn) this.emit('warn', 'Username or password input not found');
-                return null;
+                accountInfo.State = false;
+                accountInfo.Info = 'Username or password input not found';
+                return accountInfo;
             }
 
             this.emit('warn', `Test 8`);
@@ -377,13 +389,12 @@ class MelCloud extends EventEmitter {
             const submitButton = await page.$('input[type="submit"], button[type="submit"]');
             if (!submitButton) {
                 if (this.logWarn) this.emit('warn', 'Submit button not found on login form');
-                return null;
+                accountInfo.State = false;
+                accountInfo.Info = 'Submit button not found on login form';
+                return accountInfo;
             }
 
-            await Promise.race([
-                Promise.all([submitButton.click(), page.waitForNavigation({ waitUntil: ['domcontentloaded', 'networkidle2'], timeout: 20000 })]),
-                new Promise(r => setTimeout(r, 15000))
-            ]);
+            await Promise.race([Promise.all([submitButton.click(), page.waitForNavigation({ waitUntil: ['domcontentloaded', 'networkidle2'], timeout: 10000 })]), new Promise(r => setTimeout(r, 8000))]);
 
             this.emit('warn', `Test 10`);
             let c1 = null, c2 = null;
@@ -398,7 +409,9 @@ class MelCloud extends EventEmitter {
             this.emit('warn', `Test 11`);
             if (!c1 || !c2) {
                 if (this.logWarn) this.emit('warn', 'Cookies C1/C2 missing after login');
-                return null;
+                accountInfo.State = false;
+                accountInfo.Info = 'Cookies C1/C2 missing after login';
+                return accountInfo;
             }
 
             const contextKey = [
@@ -406,10 +419,12 @@ class MelCloud extends EventEmitter {
                 `__Secure-monitorandcontrolC1=${c1}`,
                 `__Secure-monitorandcontrolC2=${c2}`
             ].join('; ');
-
-            const accountInfo = { ContextKey: contextKey, UseFahrenheit: false };
             this.contextKey = contextKey;
 
+            accountInfo.State = true;
+            accountInfo.Info = 'Connect success';
+            accountInfo.ContextKey = contextKey;
+
             this.emit('warn', `Test 12`);
             await this.functions.saveData(this.accountFile, accountInfo);
 
@@ -450,7 +465,7 @@ class MelCloud extends EventEmitter {
     }
 
     async connect(refresh) {
-        const TIMEOUT_MS = 75000;
+        const TIMEOUT_MS = 60000;
 
         try {
             const result = await Promise.race([
@@ -464,7 +479,7 @@ class MelCloud extends EventEmitter {
                             return {};
                     }
                 })(),
-                new Promise((_, reject) => setTimeout(() => reject(new Error('Connection timeout (75s)')), TIMEOUT_MS))
+                new Promise((_, reject) => setTimeout(() => reject(new Error('Connection timeout (60s)')), TIMEOUT_MS))
             ]);
 
             return result;