Merge branch 'louislam:master' into clear-monitor-data

server/model/monitor.js

@@ -7,7 +7,7 @@ dayjs.extend(timezone)
 const axios = require("axios");
 const { Prometheus } = require("../prometheus");
 const { debug, UP, DOWN, PENDING, flipStatus, TimeLogger } = require("../../src/util");
-const { tcping, ping, dnsResolve, checkCertificate, checkStatusCode } = require("../util-server");
+const { tcping, ping, dnsResolve, checkCertificate, checkStatusCode, getTotalClientInRoom } = require("../util-server");
 const { R } = require("redbean-node");
 const { BeanModel } = require("redbean-node/dist/bean-model");
 const { Notification } = require("../notification")
@@ -353,10 +353,16 @@ class Monitor extends BeanModel {
     }
 
     static async sendStats(io, monitorID, userID) {
-        await Monitor.sendAvgPing(24, io, monitorID, userID);
-        await Monitor.sendUptime(24, io, monitorID, userID);
-        await Monitor.sendUptime(24 * 30, io, monitorID, userID);
-        await Monitor.sendCertInfo(io, monitorID, userID);
+        const hasClients = getTotalClientInRoom(io, userID) > 0;
+
+        if (hasClients) {
+            await Monitor.sendAvgPing(24, io, monitorID, userID);
+            await Monitor.sendUptime(24, io, monitorID, userID);
+            await Monitor.sendUptime(24 * 30, io, monitorID, userID);
+            await Monitor.sendCertInfo(io, monitorID, userID);
+        } else {
+            debug("No clients in the room, no need to send stats");
+        }
     }
 
     /**

server/notification.js

@@ -96,9 +96,16 @@ class Notification {
                     return okMsg;
                 }
 
-                let url = monitorJSON["url"] === "https://" ? monitorJSON["hostname"] : monitorJSON["url"]
-                if (monitorJSON["port"]) {
-                    url += ":" + monitorJSON[port];
+                let url;
+
+                if (monitorJSON["type"] === "port") {
+                    url = monitorJSON["hostname"];
+                    if (monitorJSON["port"]) {
+                        url += ":" + monitorJSON["port"];
+                    }
+
+                } else {
+                    url = monitorJSON["url"];
                 }
 
                 // If heartbeatJSON is not null, we go into the normal alerting loop.
@@ -331,7 +338,7 @@ class Notification {
                     await axios.post(notification.mattermostWebhookUrl, mattermostTestData)
                     return okMsg;
                 }
-                
+
                 const mattermostChannel = notification.mattermostchannel;
                 const mattermostIconEmoji = notification.mattermosticonemo;
                 const mattermostIconUrl = notification.mattermosticonurl;

server/password-hash.js

@@ -1,5 +1,5 @@
 const passwordHashOld = require("password-hash");
-const bcrypt = require("bcrypt");
+const bcrypt = require("bcryptjs");
 const saltRounds = 10;
 
 exports.generate = function (password) {

server/ping-lite.js

@@ -1,14 +1,13 @@
 // https://github.com/ben-bradley/ping-lite/blob/master/ping-lite.js
 // Fixed on Windows
 const net = require("net");
-const spawn = require("child_process").spawn,
-    events = require("events"),
-    fs = require("fs"),
-    WIN = /^win/.test(process.platform),
-    LIN = /^linux/.test(process.platform),
-    MAC = /^darwin/.test(process.platform);
-    FBSD = /^freebsd/.test(process.platform);
-const { debug } = require("../src/util");
+const spawn = require("child_process").spawn;
+const events = require("events");
+const fs = require("fs");
+const WIN = /^win/.test(process.platform);
+const LIN = /^linux/.test(process.platform);
+const MAC = /^darwin/.test(process.platform);
+const FBSD = /^freebsd/.test(process.platform);
 
 module.exports = Ping;
 
@@ -22,15 +21,17 @@ function Ping(host, options) {
 
     events.EventEmitter.call(this);
 
+    const timeout = 10;
+
     if (WIN) {
         this._bin = "c:/windows/system32/ping.exe";
-        this._args = (options.args) ? options.args : [ "-n", "1", "-w", "5000", host ];
+        this._args = (options.args) ? options.args : [ "-n", "1", "-w", timeout * 1000, host ];
         this._regmatch = /[><=]([0-9.]+?)ms/;
 
     } else if (LIN) {
         this._bin = "/bin/ping";
 
-        const defaultArgs = [ "-n", "-w", "2", "-c", "1", host ];
+        const defaultArgs = [ "-n", "-w", timeout, "-c", "1", host ];
 
         if (net.isIPv6(host) || options.ipv6) {
             defaultArgs.unshift("-6");
@@ -47,13 +48,13 @@ function Ping(host, options) {
             this._bin = "/sbin/ping";
         }
 
-        this._args = (options.args) ? options.args : [ "-n", "-t", "2", "-c", "1", host ];
+        this._args = (options.args) ? options.args : [ "-n", "-t", timeout, "-c", "1", host ];
         this._regmatch = /=([0-9.]+?) ms/;
-        
+
     } else if (FBSD) {
         this._bin = "/sbin/ping";
 
-        const defaultArgs = [ "-n", "-t", "2", "-c", "1", host ];
+        const defaultArgs = [ "-n", "-t", timeout, "-c", "1", host ];
 
         if (net.isIPv6(host) || options.ipv6) {
             defaultArgs.unshift("-6");
@@ -88,7 +89,9 @@ Ping.prototype.send = function (callback) {
         return self.emit("result", ms);
     };
 
-    let _ended, _exited, _errored;
+    let _ended;
+    let _exited;
+    let _errored;
 
     this._ping = spawn(this._bin, this._args); // spawn the binary
 
@@ -120,9 +123,9 @@ Ping.prototype.send = function (callback) {
     });
 
     function onEnd() {
-        let stdout = this.stdout._stdout,
-            stderr = this.stderr._stderr,
-            ms;
+        let stdout = this.stdout._stdout;
+        let stderr = this.stderr._stderr;
+        let ms;
 
         if (stderr) {
             return callback(new Error(stderr));

server/util-server.js

@@ -248,3 +248,26 @@ exports.checkStatusCode = function (status, accepted_codes) {
 
     return false;
 }
+
+exports.getTotalClientInRoom = (io, roomName) => {
+
+    const sockets = io.sockets;
+
+    if (! sockets) {
+        return 0;
+    }
+
+    const adapter = sockets.adapter;
+
+    if (! adapter) {
+        return 0;
+    }
+
+    const room = adapter.rooms.get(roomName);
+
+    if (room) {
+        return room.size;
+    } else {
+        return 0;
+    }
+}