homebridge-melcloud-control 2.5.0-beta.2 → 2.5.0-beta.21

package/homebridge-ui/public/index.html

@@ -6,7 +6,7 @@
 <div id="melCloudAccount" style="display: none;" class="card card-body">
   <form id="configForm">
     <div class="text-center">
-      <label id="accountName" style="font-size: 23px">Account Name</label><br>
+      <label id="accountName" style="font-size: 23px">Account</label><br>
       <label id="info" style="text-align: center; font-size: 17px;">MELCloud</label><br><br>
     </div>
     <div class="form-group">
@@ -20,8 +20,7 @@
       <input id="language" type="text" class="form-control"><br>
     </div>
     <div class="text-center">
-      <button id="logIn" type="button" class="btn btn-primary">Log In</button>
-      <button id="getDevices" type="button" class="btn btn-primary">Get Devices</button>
+      <button id="logIn" type="button" class="btn btn-primary">Connect to MELCloud</button>
       <button id="configButton" type="button" class="btn btn-primary"><i class="fas fa-gear"></i></button>
     </div>
   </form>
@@ -64,7 +63,8 @@
         document.getElementById('language').value = pluginConfig[0].accounts[i].language || '';
 
         const accountConfigured = pluginConfig[0].accounts[i].name && pluginConfig[0].accounts[i].user && pluginConfig[0].accounts[i].passwd && pluginConfig[0].accounts[i].language;
-        const setButtonName = accountConfigured ? document.getElementById('logIn').removeAttribute('disabled') : document.getElementById('logIn').setAttribute('disabled');
+        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;
       });
@@ -83,7 +83,7 @@
       pluginConfig[0].accounts[this.deviceIndex].language = document.querySelector('#language').value;
 
       const accountConfigured = pluginConfig[0].accounts[i].name && pluginConfig[0].accounts[i].user && pluginConfig[0].accounts[i].passwd && pluginConfig[0].accounts[i].language;
-      const setButtonMode = accountConfigured ? document.getElementById('logIn').removeAttribute('disabled') : document.getElementById('logIn').setAttribute('disabled');
+      const setButtonState = accountConfigured ? document.getElementById('logIn').removeAttribute('disabled') : document.getElementById('logIn').setAttribute('disabled');
 
       await homebridge.updatePluginConfig(pluginConfig);
       await homebridge.savePluginConfig(pluginConfig);
@@ -101,7 +101,7 @@
 
       try {
         await homebridge.updatePluginConfig(pluginConfig)
-        document.getElementById('info').innerHTML = '';
+        document.getElementById('info').innerHTML = 'Connecting...';
 
         const accountName = pluginConfig[0].accounts[this.deviceIndex].name;
         const user = pluginConfig[0].accounts[this.deviceIndex].user;
@@ -111,7 +111,6 @@
         const refreshInterval = pluginConfig[0].accounts[this.deviceIndex].refreshInterval;
 
         const payload = {
-          mode: 'connect',
           accountName: accountName,
           user: user,
           passwd: passwd,
@@ -120,77 +119,42 @@
           refreshInterval: refreshInterval
         };
         const response = await homebridge.request('/connect', payload);
-        const info = response.info;
+        const info = response.info ?? '';
         const status = response.status;
-        const data = response.data;
-        const error = response.error;
+        const devices = response.data ?? [];
 
         switch (status) {
           case 0:
-            document.getElementById('info').innerHTML = info;
-            document.getElementById('getDevices').removeAttribute('disabled');
-            break;
-          case 2:
-            document.getElementById('getDevices').setAttribute('disabled');
-            document.getElementById('info').innerHTML = `MELCloud error: ${JSON.stringify(error, null, 2)}`;
-            document.getElementById('info').style.color = 'red';
-            break;
-        };
-
-        homebridge.hideSpinner();
-      } catch (e) {
-        homebridge.toast.error(`Data error: ${e.message}`);
-      } finally {
-        homebridge.hideSpinner();
-      };
-    });
-
-    //get devices
-    document.getElementById('getDevices').addEventListener('click', async () => {
-      homebridge.showSpinner();
-      try {
-        const devicesId = [];
-
-        const payload = {
-          mode: 'getdevices'
-        };
-        const response = await homebridge.request('/getDevices', payload);
-
-        const info = response.info;
-        const status = response.status;
-        const devices = response.data;
-        const error = response.error;
-
-        switch (status) {
-          case 1:
             //get device info fom devices
             for (const deviceInfo of devices) {
               const deviceId = deviceInfo.DeviceID;
               const deviceName = deviceInfo.DeviceName;
-
-              //prepare device if not in devices array
-              if (!devicesId.includes(deviceId)) {
-                devicesId.push(deviceId);
-              }
             };
 
-            document.getElementById('info').innerHTML = `${info} Found: ${devicesId.length} devices. Now You can start configure it.`;
+            const devicesCount = devices.length;
+            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;
-          case 2:
-            document.getElementById('info').innerHTML = `MELCloud error: ${JSON.stringify(error, null, 2)}`;
+          case 1:
+            document.getElementById('info').innerHTML = info;
             document.getElementById('info').style.color = 'red';
             break;
+          default:
+            document.getElementById('info').innerHTML = `Received unknown status: ${status}, please try again.`;
+            document.getElementById('info').style.color = 'yellow';
+            break;
         };
 
         homebridge.hideSpinner();
       } catch (e) {
-        homebridge.toast.error(`Get devices error: ${e.message}`);
+        document.getElementById('info').innerHTML = 'Please try again.';
+        homebridge.toast.error(`Data error: ${e.message}`);
       } finally {
         homebridge.hideSpinner();
-      }
+      };
     });
-
   })();
 </script>

package/homebridge-ui/server.js

@@ -7,9 +7,6 @@ class PluginUiServer extends HomebridgePluginUiServer {
   constructor() {
     super();
 
-    //get devices
-    this.onRequest('/getdevices', this.start.bind(this));
-
     //connect
     this.onRequest('/connect', this.start.bind(this));
 
@@ -18,8 +15,6 @@ class PluginUiServer extends HomebridgePluginUiServer {
   };
 
   async start(payload) {
-
-    const mode = payload.mode;
     const accountName = payload.accountName;
     const user = payload.user;
     const passwd = payload.passwd;
@@ -29,40 +24,22 @@ class PluginUiServer extends HomebridgePluginUiServer {
     const accountInfoFile = `${this.homebridgeStoragePath}/melcloud/${accountName}_Account`;
     const deviceInfoFile = `${this.homebridgeStoragePath}/melcloud/${accountName}_Device_`;
     const buildingsFile = `${this.homebridgeStoragePath}/melcloud/${accountName}_Buildings`;
-    const melCloud = new MelCloud(user, passwd, language, accountInfoFile, deviceInfoFile, buildingsFile, enableDebugMode, refreshInterval);
 
-    let data = {};
-    switch (mode) {
-      case 'connect':
-        try {
-          const response = await melCloud.connect();
-          return data = {
-            info: 'Connect to MELCloud success, now pres the button Get Devices.',
-            status: 1,
-            data: response
-          };
-        } catch (error) {
-          return data = {
-            info: 'Connect error:',
-            status: 2,
-            data: error
-          };
-        };
-      case 'getdevices':
-        try {
-          const response = await melCloud.chackDevicesList();
-          return data = {
-            info: 'Get devices success.',
-            status: 0,
-            data: response
-          };
-        } catch (error) {
-          return data = {
-            info: 'Get devices error:',
-            status: 2,
-            data: error
-          };
-        };
+    try {
+      let data = {};
+      const melCloud = new MelCloud(user, passwd, language, accountInfoFile, deviceInfoFile, buildingsFile, enableDebugMode, refreshInterval, true);
+      const contextKey = await melCloud.connect();
+      const devices = await melCloud.chackDevicesList(contextKey);
+      return data = {
+        info: '',
+        status: 0,
+        data: devices
+      };
+    } catch (error) {
+      return data = {
+        info: error,
+        status: 1
+      };
     };
   };
 };

package/index.js

@@ -78,7 +78,7 @@ class MelCloudPlatform {
 				const deviceRefreshInterval = account.deviceRefreshInterval * 1000 || 5000;
 
 				//melcloud account
-				const melCloud = new MelCloud(user, passwd, language, accountInfoFile, buildingsFile, deviceInfoFile, enableDebugMode, refreshInterval);
+				const melCloud = new MelCloud(user, passwd, language, accountInfoFile, buildingsFile, deviceInfoFile, enableDebugMode, refreshInterval, false);
 				melCloud.on('checkDevicesListComplete', (accountInfo, contextKey, deviceInfo) => {
 					const deviceId = deviceInfo.DeviceID.toString();
 					const deviceType = deviceInfo.Type;

package/package.json

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

package/src/melcloud.js

@@ -8,13 +8,14 @@ const ImpulseGenerator = require('./impulsegenerator.js');
 const CONSTANTS = require('./constants.json');
 
 class MelCloud extends EventEmitter {
-    constructor(user, passwd, language, accountInfoFile, deviceInfoFile, buildingsFile, enableDebugMode, refreshInterval) {
+    constructor(user, passwd, language, accountInfoFile, deviceInfoFile, buildingsFile, enableDebugMode, refreshInterval, connectForConfig) {
         super();
         this.enableDebugMode = enableDebugMode;
         this.accountInfoFile = accountInfoFile;
         this.buildingsFile = buildingsFile;
         this.deviceInfoFile = deviceInfoFile;
         this.refreshInterval = refreshInterval;
+        this.connectForConfig = connectForConfig;
         this.devicesId = [];
 
         this.options = {
@@ -38,7 +39,9 @@ class MelCloud extends EventEmitter {
             };
         }).on('state', (state) => { });
 
-        this.connect();
+        if (!connectForConfig) {
+            this.connect();
+        };
     };
 
     async connect() {
@@ -79,56 +82,26 @@ class MelCloud extends EventEmitter {
                 return;
             };
 
-            //create axios instance get
-            this.axiosInstanceGet = axios.create({
-                method: 'GET',
-                baseURL: CONSTANTS.ApiUrls.BaseURL,
-                timeout: 5000,
-                headers: {
-                    'X-MitsContextKey': contextKey
-                },
-                maxContentLength: 100000000,
-                maxBodyLength: 1000000000,
-                withCredentials: true,
-                httpsAgent: new https.Agent({
-                    keepAlive: false,
-                    rejectUnauthorized: false
-                })
-            });
-
-            //create axios instance post
-            this.axiosInstancePost = axios.create({
-                method: 'POST',
-                baseURL: CONSTANTS.ApiUrls.BaseURL,
-                timeout: 5000,
-                headers: {
-                    'X-MitsContextKey': contextKey,
-                    'content-type': 'application/json'
-                },
-                maxContentLength: 100000000,
-                maxBodyLength: 1000000000,
-                withCredentials: true,
-                httpsAgent: new https.Agent({
-                    keepAlive: false,
-                    rejectUnauthorized: false
-                })
-            });
-
             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;
+            };
+
             //check devices list
-            await this.chackDevicesList();
+            await this.chackDevicesList(contextKey);
 
             //emit connect success
             this.emit('success', `Connect to MELCloud Success.`)
 
             //start impulse generator
             const timers = [{ name: 'checkDevicesList', sampling: this.refreshInterval }];
-            this.impulseGenerator.start(timers)
+            this.impulseGenerator.start(timers);
 
             return true;
         } catch (error) {
@@ -136,10 +109,29 @@ class MelCloud extends EventEmitter {
         };
     }
 
-    async chackDevicesList() {
+    async chackDevicesList(key) {
         try {
+            const contextKey = this.contextKey ?? key;
+
+            //create axios instance get
+            const axiosInstanceGet = axios.create({
+                method: 'GET',
+                baseURL: CONSTANTS.ApiUrls.BaseURL,
+                timeout: 5000,
+                headers: {
+                    'X-MitsContextKey': contextKey
+                },
+                maxContentLength: 100000000,
+                maxBodyLength: 1000000000,
+                withCredentials: true,
+                httpsAgent: new https.Agent({
+                    keepAlive: false,
+                    rejectUnauthorized: false
+                })
+            });
+
             const debug = this.enableDebugMode ? this.emit('debug', `Scanning for devices.`) : false;
-            const listDevicesData = await this.axiosInstanceGet(CONSTANTS.ApiUrls.ListDevices);
+            const listDevicesData = await axiosInstanceGet(CONSTANTS.ApiUrls.ListDevices);
             const buildingsList = listDevicesData.data;
             const debug1 = this.enableDebugMode ? this.emit('debug', `Buildings: ${JSON.stringify(buildingsList, null, 2)}`) : false;
 
@@ -175,6 +167,11 @@ class MelCloud extends EventEmitter {
             }
             const debug3 = this.enableDebugMode ? this.emit('debug', `Found: ${devicesCount} devices.`) : false;
 
+            //return devices list for config
+            if (this.connectForConfig) {
+                return devices;
+            };
+
             //get device info fom devices
             for (const deviceInfo of devices) {
                 const deviceId = deviceInfo.DeviceID
@@ -188,11 +185,11 @@ class MelCloud extends EventEmitter {
                 //prepare device if not in devices array
                 if (!this.devicesId.includes(deviceId)) {
                     this.devicesId.push(deviceId);
-                    this.emit('checkDevicesListComplete', this.accountInfo, this.contextKey, deviceInfo);
+                    this.emit('checkDevicesListComplete', this.accountInfo, contextKey, deviceInfo);
                 }
             };
 
-            return devices;
+            return true;
         } catch (error) {
             this.impulseGenerator.stop();
             throw new Error(`Scanning for devices error: ${error.message ?? error}.`);
@@ -211,11 +208,29 @@ class MelCloud extends EventEmitter {
 
     async send(accountInfo) {
         try {
+            //create axios instance post
+            const axiosInstancePost = axios.create({
+                method: 'POST',
+                baseURL: CONSTANTS.ApiUrls.BaseURL,
+                timeout: 5000,
+                headers: {
+                    'X-MitsContextKey': this.contextKey,
+                    'content-type': 'application/json'
+                },
+                maxContentLength: 100000000,
+                maxBodyLength: 1000000000,
+                withCredentials: true,
+                httpsAgent: new https.Agent({
+                    keepAlive: false,
+                    rejectUnauthorized: false
+                })
+            });
+
             const options = {
                 data: accountInfo
             };
 
-            await this.axiosInstancePost(CONSTANTS.ApiUrls.UpdateApplicationOptions, options);
+            await axiosInstancePost(CONSTANTS.ApiUrls.UpdateApplicationOptions, options);
             await this.saveData(this.accountInfoFile, accountInfo);
             return true;
         } catch (error) {