From a7cf14c6634a82f863f98f0d0d3fc0cf78a9e4f6 Mon Sep 17 00:00:00 2001
From: LouisLam <louislam@users.noreply.github.com>
Date: Wed, 8 Sep 2021 16:27:37 +0800
Subject: [PATCH] move userMonitorList out of server.js

---
 server/client.js            | 1 +
 server/model/monitor.js     | 1 +
 server/server.js            | 7 +------
 server/user-monitor-list.js | 8 ++++++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/server/client.js b/server/client.js
index 4f28a2fa..fcfddeb5 100644
--- a/server/client.js
+++ b/server/client.js
@@ -4,6 +4,7 @@
 const { TimeLogger } = require("../src/util");
 const { R } = require("redbean-node");
 const { io } = require("./server");
+const { userMonitorList } = require("./user-monitor-list");
 
 async function sendNotificationList(socket) {
     const timeLogger = new TimeLogger();
diff --git a/server/model/monitor.js b/server/model/monitor.js
index 19f21d92..57815cdd 100644
--- a/server/model/monitor.js
+++ b/server/model/monitor.js
@@ -11,6 +11,7 @@ const { tcping, ping, dnsResolve, checkCertificate, checkStatusCode, getTotalCli
 const { R } = require("redbean-node");
 const { BeanModel } = require("redbean-node/dist/bean-model");
 const { Notification } = require("../notification")
+const { userMonitorList } = require("../user-monitor-list");
 const version = require("../../package.json").version;
 
 /**
diff --git a/server/server.js b/server/server.js
index b8eb79ee..126aa18d 100644
--- a/server/server.js
+++ b/server/server.js
@@ -27,7 +27,7 @@ debug("Importing Monitor");
 const Monitor = require("./model/monitor");
 debug("Importing Settings");
 const { getSettings, setSettings, setting, initJWTSecret } = require("./util-server");
-const UserMonitorList = require("./user-monitor-list");
+const { userMonitorList } = require("./user-monitor-list");
 
 debug("Importing Notification");
 const { Notification } = require("./notification");
@@ -105,11 +105,6 @@ let totalClient = 0;
  */
 let jwtSecret = null;
 
-/**
- * Main monitor list, filled by startMonitors()
- */
-let userMonitorList = new UserMonitorList();
-
 /**
  * Show Setup Page
  * @type {boolean}
diff --git a/server/user-monitor-list.js b/server/user-monitor-list.js
index 49c5bbe4..053060bd 100644
--- a/server/user-monitor-list.js
+++ b/server/user-monitor-list.js
@@ -1,5 +1,7 @@
+/**
+ * Main monitor list
+ */
 class UserMonitorList {
-
     list = {};
 
     add(userID, monitor) {
@@ -46,4 +48,6 @@ class UserMonitorList {
 
 }
 
-module.exports = UserMonitorList;
+module.exports = {
+    userMonitorList: new UserMonitorList(),
+};