homebridge-melcloud-control 2.5.0-beta.0 → 2.5.0-beta.10

package/homebridge-ui/public/index.html

@@ -7,10 +7,10 @@
   <form id="configForm">
     <div class="text-center">
       <label id="accountName" style="font-size: 23px">Account Name</label><br>
-      <label id="info" style="text-align: center; font-size: 17px;">MELCloud Account</label><br><br>
+      <label id="info" style="text-align: center; font-size: 17px;">MELCloud</label><br><br>
     </div>
     <div class="form-group">
-      <label for="name">Account Name</label>
+      <label for="name">Name</label>
       <input id="name" type="text" class="form-control"><br>
       <label for="user">MELCloud User</label>
       <input id="user" type="text" class="form-control"><br>
@@ -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>
@@ -57,11 +56,11 @@
           const setRemoveAtribute = j === i ? document.getElementById(`button${j}`).setAttribute("class", "btn btn-secondary") : document.getElementById(`button${j}`).setAttribute("class", "btn btn-primary");
         }
 
-        document.getElementById('accountName').value = pluginConfig[0].accounts[i].name || '';
+        document.getElementById('accountName').innerHTML = pluginConfig[0].accounts[i].name || '';
         document.getElementById('name').value = pluginConfig[0].accounts[i].name || '';
         document.getElementById('user').value = pluginConfig[0].accounts[i].user || '';
         document.getElementById('passwd').value = pluginConfig[0].accounts[i].passwd || '';
-        document.getElementById('lnguage').value = pluginConfig[0].accounts[i].language || '';
+        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');
@@ -101,7 +100,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 +110,6 @@
         const refreshInterval = pluginConfig[0].accounts[this.deviceIndex].refreshInterval;
 
         const payload = {
-          mode: 'connect',
           accountName: accountName,
           user: user,
           passwd: passwd,
@@ -122,75 +120,51 @@
         const response = await homebridge.request('/connect', payload);
         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.`;
+            document.getElementById('info').innerHTML = `${info} Found: ${devices.length} devices. Now You can start to configure it.`;
+            document.getElementById('info').style.color = 'green';
             await homebridge.updatePluginConfig(pluginConfig);
             await homebridge.savePluginConfig(pluginConfig);
             break;
+          case 1:
+            document.getElementById('info').innerHTML = info;
+            document.getElementById('info').style.color = 'green';
+            break;
           case 2:
-            document.getElementById('info').innerHTML = `MELCloud error: ${JSON.stringify(error, null, 2)}`;
+            document.getElementById('info').innerHTML = info;
+            document.getElementById('info').style.color = 'white';
+            break;
+          case 3:
+            document.getElementById('info').innerHTML = info;
+            document.getElementById('info').style.color = 'gray';
+            break;
+          case 4:
+            document.getElementById('info').innerHTML = info;
+            document.getElementById('info').style.color = 'yellow';
+            break;
+          case 5:
+            document.getElementById('info').innerHTML = info;
             document.getElementById('info').style.color = 'red';
             break;
         };
 
         homebridge.hideSpinner();
+        document.getElementById('info').innerHTML = 'Please try again.';
       } 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;
@@ -28,41 +23,56 @@ class PluginUiServer extends HomebridgePluginUiServer {
     const refreshInterval = payload.refreshInterval;
     const accountInfoFile = `${this.homebridgeStoragePath}/melcloud/${accountName}_Account`;
     const deviceInfoFile = `${this.homebridgeStoragePath}/melcloud/${accountName}_Device_`;
-    const melCloud = new MelCloud(user, passwd, language, accountInfoFile, deviceInfoFile, enableDebugMode, refreshInterval);
-
+    const buildingsFile = `${this.homebridgeStoragePath}/melcloud/${accountName}_Buildings`;
     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
+
+    try {
+      const melCloud = new MelCloud(user, passwd, language, accountInfoFile, deviceInfoFile, buildingsFile, enableDebugMode, refreshInterval, true);
+      melCloud.on('devicesList', (devices) => {
+        data = {
+          info: 'Check devices list complete.',
+          status: 0,
+          data: devices
+        };
+      })
+        .on('success', (message) => {
+          data = {
+            info: message,
+            status: 1
           };
-        } catch (error) {
-          return data = {
-            info: 'Connect error:',
-            status: 2,
-            data: error
+        })
+        .on('message', (message) => {
+          data = {
+            info: message,
+            status: 2
           };
-        };
-      case 'getdevices':
-        try {
-          const response = await melCloud.chackDevicesList();
-          return data = {
-            info: 'Get devices success.',
-            status: 0,
-            data: response
+        })
+        .on('debug', (debug) => {
+          data = {
+            info: debug,
+            status: 3
           };
-        } catch (error) {
-          return data = {
-            info: 'Get devices error:',
-            status: 2,
-            data: error
+        })
+        .on('warn', (warn) => {
+          data = {
+            info: warn,
+            status: 4
           };
-        };
+        })
+        .on('error', async (error) => {
+          data = {
+            info: error,
+            status: 5
+          };
+        });
+    } catch (error) {
+      data = {
+        info: error,
+        status: 5
+      };
     };
+
+    return data;
   };
 };
 

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.0",
+  "version": "2.5.0-beta.10",
   "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 = {
@@ -128,7 +129,7 @@ class MelCloud extends EventEmitter {
 
             //start impulse generator
             const timers = [{ name: 'checkDevicesList', sampling: this.refreshInterval }];
-            this.impulseGenerator.start(timers)
+            const startImpulseGenerator = this.connectForConfig ? false : this.impulseGenerator.start(timers);
 
             return true;
         } catch (error) {
@@ -175,6 +176,12 @@ class MelCloud extends EventEmitter {
             }
             const debug3 = this.enableDebugMode ? this.emit('debug', `Found: ${devicesCount} devices.`) : false;
 
+            //emit devices list for config
+            this.emit('devicesList', devices);
+            if (this.connectForConfig) {
+                return;
+            }
+
             //get device info fom devices
             for (const deviceInfo of devices) {
                 const deviceId = deviceInfo.DeviceID
@@ -192,7 +199,7 @@ class MelCloud extends EventEmitter {
                 }
             };
 
-            return devices;
+            return true;
         } catch (error) {
             this.impulseGenerator.stop();
             throw new Error(`Scanning for devices error: ${error.message ?? error}.`);