From caec93318600f0997f14504a75d0d6801fe94648 Mon Sep 17 00:00:00 2001
From: LouisLam <louislam@users.noreply.github.com>
Date: Fri, 23 Jul 2021 12:58:05 +0800
Subject: [PATCH] prevent unexpected error throw from checkCertificate
 interrupt the beat

---
 server/model/monitor.js | 16 ++++++++++++----
 server/util.js          |  6 ++++++
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/server/model/monitor.js b/server/model/monitor.js
index 0fb747da0..9043803b3 100644
--- a/server/model/monitor.js
+++ b/server/model/monitor.js
@@ -6,7 +6,7 @@ var timezone = require('dayjs/plugin/timezone')
 dayjs.extend(utc)
 dayjs.extend(timezone)
 const axios = require("axios");
-const {UP, DOWN, PENDING} = require("../util");
+const {debug, UP, DOWN, PENDING} = require("../util");
 const {tcping, ping, checkCertificate} = require("../util-server");
 const {R} = require("redbean-node");
 const {BeanModel} = require("redbean-node/dist/bean-model");
@@ -89,10 +89,18 @@ class Monitor extends BeanModel {
                     bean.ping = dayjs().valueOf() - startTime;
 
                     // Check certificate if https is used
+
+                    let certInfoStartTime = dayjs().valueOf();
                     if (this.getUrl()?.protocol === "https:") {
-                        await this.updateTlsInfo(checkCertificate(res));
+                        try {
+                            await this.updateTlsInfo(checkCertificate(res));
+                        } catch (e) {
+                            console.error(e.message)
+                        }
                     }
 
+                    debug("Cert Info Query Time: " + (dayjs().valueOf() - certInfoStartTime) + "ms")
+
                     if (this.type === "http") {
                         bean.status = UP;
                     } else {
@@ -207,7 +215,7 @@ class Monitor extends BeanModel {
         clearInterval(this.heartbeatInterval)
     }
 
-    // Helper Method: 
+    // Helper Method:
     // returns URL object for further usage
     // returns null if url is invalid
     getUrl() {
@@ -228,7 +236,7 @@ class Monitor extends BeanModel {
             tls_info_bean.monitor_id = this.id;
         }
         tls_info_bean.info_json = JSON.stringify(checkCertificateResult);
-        R.store(tls_info_bean);
+        await R.store(tls_info_bean);
     }
 
     static async sendStats(io, monitorID, userID) {
diff --git a/server/util.js b/server/util.js
index 33b306b5c..081561bf9 100644
--- a/server/util.js
+++ b/server/util.js
@@ -18,3 +18,9 @@ exports.ucfirst = function (str) {
     return firstLetter.toUpperCase() + str.substr(1);
 }
 
+exports.debug = (msg) => {
+    if (process.env.NODE_ENV === "development") {
+        console.log(msg)
+    }
+}
+