homebridge-melcloud-control 2.5.0-beta.20 → 2.5.0-beta.22

package/homebridge-ui/public/index.html

@@ -64,6 +64,7 @@
 
         const accountConfigured = pluginConfig[0].accounts[i].name && pluginConfig[0].accounts[i].user && pluginConfig[0].accounts[i].passwd && pluginConfig[0].accounts[i].language;
         const setButtonState = accountConfigured ? document.getElementById('logIn').removeAttribute('disabled') : document.getElementById('logIn').setAttribute('disabled');
+        document.getElementById('configButton').setAttribute('disabled');
         await homebridge.updatePluginConfig(pluginConfig);
         this.deviceIndex = i;
       });
@@ -106,16 +107,12 @@
         const user = pluginConfig[0].accounts[this.deviceIndex].user;
         const passwd = pluginConfig[0].accounts[this.deviceIndex].passwd;
         const language = pluginConfig[0].accounts[this.deviceIndex].language;
-        const enableDebugMode = pluginConfig[0].accounts[this.deviceIndex].enableDebugMode;
-        const refreshInterval = pluginConfig[0].accounts[this.deviceIndex].refreshInterval;
 
         const payload = {
           accountName: accountName,
           user: user,
           passwd: passwd,
-          language: language,
-          enableDebugMode: enableDebugMode,
-          refreshInterval: refreshInterval
+          language: language
         };
         const response = await homebridge.request('/connect', payload);
         const info = response.info ?? '';
@@ -131,8 +128,9 @@
             };
 
             const devicesCount = devices.length;
-            document.getElementById('info').innerHTML = `${info}, found ${devicesCount} ${devicesCount !== 1 ? 'devices' : 'device'}. Now You can start to configure it.`;
+            document.getElementById('info').innerHTML = `Success, found ${devicesCount} ${devicesCount !== 1 ? 'devices' : 'device'}. Now You can start to configure it.`;
             document.getElementById('info').style.color = 'green';
+            document.getElementById('configButton').removeAttribute('disabled');
             await homebridge.updatePluginConfig(pluginConfig);
             await homebridge.savePluginConfig(pluginConfig);
             break;

package/homebridge-ui/server.js

@@ -19,19 +19,17 @@ class PluginUiServer extends HomebridgePluginUiServer {
     const user = payload.user;
     const passwd = payload.passwd;
     const language = payload.language;
-    const enableDebugMode = payload.enableDebugMode;
-    const refreshInterval = payload.refreshInterval;
     const accountInfoFile = `${this.homebridgeStoragePath}/melcloud/${accountName}_Account`;
     const deviceInfoFile = `${this.homebridgeStoragePath}/melcloud/${accountName}_Device_`;
     const buildingsFile = `${this.homebridgeStoragePath}/melcloud/${accountName}_Buildings`;
 
     try {
       let data = {};
-      const melCloud = new MelCloud(user, passwd, language, accountInfoFile, deviceInfoFile, buildingsFile, enableDebugMode, refreshInterval, true);
+      const melCloud = new MelCloud(user, passwd, language, accountInfoFile, deviceInfoFile, buildingsFile, false, 0, true);
       const contextKey = await melCloud.connect();
       const devices = await melCloud.chackDevicesList(contextKey);
       return data = {
-        info: 'Success!',
+        info: '',
         status: 0,
         data: devices
       };

package/package.json

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

package/src/melcloud.js

@@ -10,12 +10,13 @@ const CONSTANTS = require('./constants.json');
 class MelCloud extends EventEmitter {
     constructor(user, passwd, language, accountInfoFile, deviceInfoFile, buildingsFile, enableDebugMode, refreshInterval, connectForConfig) {
         super();
-        this.enableDebugMode = enableDebugMode;
         this.accountInfoFile = accountInfoFile;
         this.buildingsFile = buildingsFile;
         this.deviceInfoFile = deviceInfoFile;
+        this.enableDebugMode = enableDebugMode;
         this.refreshInterval = refreshInterval;
         this.connectForConfig = connectForConfig;
+        this.contextKey = '';
         this.devicesId = [];
 
         this.options = {
@@ -33,7 +34,7 @@ class MelCloud extends EventEmitter {
         this.impulseGenerator = new ImpulseGenerator();
         this.impulseGenerator.on('checkDevicesList', async () => {
             try {
-                await this.chackDevicesList();
+                await this.chackDevicesList(this.contextKey);
             } catch (error) {
                 this.emit('error', `Check devices list: ${error}.`);
             };
@@ -81,18 +82,17 @@ 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.connectForConfig) {
                 return contextKey;
             };
 
+            //save melcloud info to the file
+            await this.saveData(this.accountInfoFile, accountInfo);
+
             //check devices list
             await this.chackDevicesList(contextKey);
 
@@ -109,10 +109,8 @@ class MelCloud extends EventEmitter {
         };
     }
 
-    async chackDevicesList(key) {
+    async chackDevicesList(contextKey) {
         try {
-            const contextKey = this.contextKey ?? key;
-
             //create axios instance get
             const axiosInstanceGet = axios.create({
                 method: 'GET',