added connection timeout and refactored code

server/model/monitor.js

@@ -321,7 +321,12 @@ class Monitor extends BeanModel {
                     }
                 } else if (this.type === "mqtt") {
                     try {
-                        bean.msg = await mqttAsync(this.url, this.mqttPort, this.mqttUsername, this.mqttPassword, this.mqttTopic, this.mqttSuccessMessage);
+                        bean.msg = await mqttAsync(this.url, this.mqttTopic, this.mqttSuccessMessage, {
+                            mqttPort: this.mqttPort,
+                            mqttUsername: this.mqttUsername,
+                            mqttPassword: this.mqttPassword,
+                            interval: this.interval,
+                        });
                         bean.status = UP;
                     } catch (error) {
                         bean.status = DOWN;

server/util-server.js

@@ -90,8 +90,9 @@ exports.pingAsync = function (hostname, ipv6 = false) {
     });
 };
 
-exports.mqttAsync = function (hostname, port = undefined, username = undefined, password = undefined, topic, okMessage) {
+exports.mqttAsync = function (hostname, topic, okMessage, options = {}) {
     return new Promise((resolve, reject) => {
+        const { port, username, password, interval = 20 } = options;
         try {
             let client = mqtt.connect(hostname, {
                 port,
@@ -112,6 +113,9 @@ exports.mqttAsync = function (hostname, port = undefined, username = undefined,
                     }
                 }
             });
+            setTimeout(() => {
+                client.end();
+            }, interval * 1000);
         } catch (error) {
             reject(new Error(error));
         }