diff --git a/.eslintrc.js b/.eslintrc.js
index 67a80d24..cdd49e6e 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,4 +1,9 @@
 module.exports = {
+    ignorePatterns: [
+        "test/*",
+        "server/modules/apicache/*",
+        "src/util.js"
+    ],
     root: true,
     env: {
         browser: true,
@@ -22,9 +27,9 @@ module.exports = {
             "properties": "never",
             "ignoreImports": true
         }],
-        // override/add rules settings here, such as:
-        // 'vue/no-unused-vars': 'error'
-        "no-unused-vars": "warn",
+        "no-unused-vars": ["warn", {
+            "args": "none"
+        }],
         indent: [
             "error",
             4,
@@ -34,7 +39,7 @@ module.exports = {
             },
         ],
         quotes: ["warn", "double"],
-        semi: "warn",
+        semi: "error",
         "vue/html-indent": ["warn", 4], // default: 2
         "vue/max-attributes-per-line": "off",
         "vue/singleline-html-element-content-newline": "off",
diff --git a/.github/workflows/auto-test.yml b/.github/workflows/auto-test.yml
index e01c02ce..269e3085 100644
--- a/.github/workflows/auto-test.yml
+++ b/.github/workflows/auto-test.yml
@@ -20,6 +20,7 @@ jobs:
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:
+    - run: git config --global core.autocrlf false  # Mainly for Windows
     - uses: actions/checkout@v2
 
     - name: Use Node.js ${{ matrix.node-version }}
diff --git a/.stylelintrc b/.stylelintrc
index aad673db..52301b54 100644
--- a/.stylelintrc
+++ b/.stylelintrc
@@ -1,9 +1,13 @@
 {
     "extends": "stylelint-config-standard",
+    "customSyntax": "postcss-html",
     "rules": {
         "indentation": 4,
         "no-descending-specificity": null,
         "selector-list-comma-newline-after": null,
-        "declaration-empty-line-before": null
+        "declaration-empty-line-before": null,
+        "alpha-value-notation": "number",
+        "color-function-notation": "legacy",
+        "shorthand-property-no-redundant-values": null
     }
 }
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index e58ee679..a6499ef9 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -11,3 +11,4 @@ services:
       - ./uptime-kuma:/app/data
     ports:
       - 3001:3001
+    restart: always
diff --git a/ecosystem.config.js b/ecosystem.config.js
index 5f403400..bff3451f 100644
--- a/ecosystem.config.js
+++ b/ecosystem.config.js
@@ -1,6 +1,6 @@
 module.exports = {
-  apps: [{
-    name: "uptime-kuma",
-    script: "./server/server.js",
-  }]
-}
+    apps: [{
+        name: "uptime-kuma",
+        script: "./server/server.js",
+    }]
+};
diff --git a/extra/beta/update-version.js b/extra/beta/update-version.js
index e452f32d..3ab47ea9 100644
--- a/extra/beta/update-version.js
+++ b/extra/beta/update-version.js
@@ -1,11 +1,10 @@
 const pkg = require("../../package.json");
 const fs = require("fs");
-const child_process = require("child_process");
+const childProcess = require("child_process");
 const util = require("../../src/util");
 
 util.polyfill();
 
-const oldVersion = pkg.version;
 const version = process.env.VERSION;
 
 console.log("Beta Version: " + version);
@@ -32,7 +31,7 @@ if (! exists) {
 function commit(version) {
     let msg = "Update to " + version;
 
-    let res = child_process.spawnSync("git", ["commit", "-m", msg, "-a"]);
+    let res = childProcess.spawnSync("git", ["commit", "-m", msg, "-a"]);
     let stdout = res.stdout.toString().trim();
     console.log(stdout);
 
@@ -40,15 +39,15 @@ function commit(version) {
         throw new Error("commit error");
     }
 
-    res = child_process.spawnSync("git", ["push", "origin", "master"]);
+    res = childProcess.spawnSync("git", ["push", "origin", "master"]);
     console.log(res.stdout.toString().trim());
 }
 
 function tag(version) {
-    let res = child_process.spawnSync("git", ["tag", version]);
+    let res = childProcess.spawnSync("git", ["tag", version]);
     console.log(res.stdout.toString().trim());
 
-    res = child_process.spawnSync("git", ["push", "origin", version]);
+    res = childProcess.spawnSync("git", ["push", "origin", version]);
     console.log(res.stdout.toString().trim());
 }
 
@@ -57,15 +56,7 @@ function tagExists(version) {
         throw new Error("invalid version");
     }
 
-    let res = child_process.spawnSync("git", ["tag", "-l", version]);
+    let res = childProcess.spawnSync("git", ["tag", "-l", version]);
 
     return res.stdout.toString().trim() === version;
 }
-
-function safeDelete(dir) {
-    if (fs.existsSync(dir)) {
-        fs.rmdirSync(dir, {
-            recursive: true,
-        });
-    }
-}
diff --git a/extra/mark-as-nightly.js b/extra/mark-as-nightly.js
index 0316596b..a55fd98f 100644
--- a/extra/mark-as-nightly.js
+++ b/extra/mark-as-nightly.js
@@ -4,21 +4,21 @@ const util = require("../src/util");
 
 util.polyfill();
 
-const oldVersion = pkg.version
-const newVersion = oldVersion + "-nightly"
+const oldVersion = pkg.version;
+const newVersion = oldVersion + "-nightly";
 
-console.log("Old Version: " + oldVersion)
-console.log("New Version: " + newVersion)
+console.log("Old Version: " + oldVersion);
+console.log("New Version: " + newVersion);
 
 if (newVersion) {
     // Process package.json
-    pkg.version = newVersion
-    pkg.scripts.setup = pkg.scripts.setup.replaceAll(oldVersion, newVersion)
-    pkg.scripts["build-docker"] = pkg.scripts["build-docker"].replaceAll(oldVersion, newVersion)
-    fs.writeFileSync("package.json", JSON.stringify(pkg, null, 4) + "\n")
+    pkg.version = newVersion;
+    pkg.scripts.setup = pkg.scripts.setup.replaceAll(oldVersion, newVersion);
+    pkg.scripts["build-docker"] = pkg.scripts["build-docker"].replaceAll(oldVersion, newVersion);
+    fs.writeFileSync("package.json", JSON.stringify(pkg, null, 4) + "\n");
 
     // Process README.md
     if (fs.existsSync("README.md")) {
-        fs.writeFileSync("README.md", fs.readFileSync("README.md", "utf8").replaceAll(oldVersion, newVersion))
+        fs.writeFileSync("README.md", fs.readFileSync("README.md", "utf8").replaceAll(oldVersion, newVersion));
     }
 }
diff --git a/extra/simple-dns-server.js b/extra/simple-dns-server.js
index 5e5745f0..376dbdd0 100644
--- a/extra/simple-dns-server.js
+++ b/extra/simple-dns-server.js
@@ -26,7 +26,7 @@ server.on("request", (request, send, rinfo) => {
                     ttl: 300,
                     address: "1.2.3.4"
                 });
-            } if (question.type === Packet.TYPE.AAAA) {
+            } else if (question.type === Packet.TYPE.AAAA) {
                 response.answers.push({
                     name: question.name,
                     type: question.type,
diff --git a/extra/update-version.js b/extra/update-version.js
index d72fee68..abca92e2 100644
--- a/extra/update-version.js
+++ b/extra/update-version.js
@@ -1,7 +1,6 @@
 const pkg = require("../package.json");
 const fs = require("fs");
-const rmSync = require("./fs-rmSync.js");
-const child_process = require("child_process");
+const childProcess = require("child_process");
 const util = require("../src/util");
 
 util.polyfill();
@@ -42,7 +41,7 @@ if (! exists) {
 function commit(version) {
     let msg = "Update to " + version;
 
-    let res = child_process.spawnSync("git", ["commit", "-m", msg, "-a"]);
+    let res = childProcess.spawnSync("git", ["commit", "-m", msg, "-a"]);
     let stdout = res.stdout.toString().trim();
     console.log(stdout);
 
@@ -52,7 +51,7 @@ function commit(version) {
 }
 
 function tag(version) {
-    let res = child_process.spawnSync("git", ["tag", version]);
+    let res = childProcess.spawnSync("git", ["tag", version]);
     console.log(res.stdout.toString().trim());
 }
 
@@ -67,7 +66,7 @@ function tagExists(version) {
         throw new Error("invalid version");
     }
 
-    let res = child_process.spawnSync("git", ["tag", "-l", version]);
+    let res = childProcess.spawnSync("git", ["tag", "-l", version]);
 
     return res.stdout.toString().trim() === version;
 }
diff --git a/extra/update-wiki-version.js b/extra/update-wiki-version.js
index 10631c33..f318839f 100644
--- a/extra/update-wiki-version.js
+++ b/extra/update-wiki-version.js
@@ -1,4 +1,4 @@
-const child_process = require("child_process");
+const childProcess = require("child_process");
 const fs = require("fs");
 
 const newVersion = process.env.VERSION;
@@ -16,23 +16,23 @@ function updateWiki(newVersion) {
 
     safeDelete(wikiDir);
 
-    child_process.spawnSync("git", ["clone", "https://github.com/louislam/uptime-kuma.wiki.git", wikiDir]);
+    childProcess.spawnSync("git", ["clone", "https://github.com/louislam/uptime-kuma.wiki.git", wikiDir]);
     let content = fs.readFileSync(howToUpdateFilename).toString();
 
     // Replace the version: https://regex101.com/r/hmj2Bc/1
     content = content.replace(/(git checkout )([^\s]+)/, `$1${newVersion}`);
     fs.writeFileSync(howToUpdateFilename, content);
 
-    child_process.spawnSync("git", ["add", "-A"], {
+    childProcess.spawnSync("git", ["add", "-A"], {
         cwd: wikiDir,
     });
 
-    child_process.spawnSync("git", ["commit", "-m", `Update to ${newVersion}`], {
+    childProcess.spawnSync("git", ["commit", "-m", `Update to ${newVersion}`], {
         cwd: wikiDir,
     });
 
     console.log("Pushing to Github");
-    child_process.spawnSync("git", ["push"], {
+    childProcess.spawnSync("git", ["push"], {
         cwd: wikiDir,
     });
 
diff --git a/package-lock.json b/package-lock.json
index 91ca4e52..5d183fc6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "uptime-kuma",
-    "version": "1.14.0-beta.0",
+    "version": "1.14.0",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "uptime-kuma",
-            "version": "1.14.0-beta.0",
+            "version": "1.14.0",
             "license": "MIT",
             "dependencies": {
                 "@fortawesome/fontawesome-svg-core": "~1.2.36",
@@ -85,6 +85,7 @@
                 "jest": "~27.2.5",
                 "jest-puppeteer": "~6.0.3",
                 "npm-check-updates": "^12.5.5",
+                "postcss-html": "^1.3.1",
                 "puppeteer": "~13.1.3",
                 "sass": "~1.42.1",
                 "stylelint": "~14.2.0",
@@ -5612,6 +5613,41 @@
                 "node": ">=6.0.0"
             }
         },
+        "node_modules/dom-serializer": {
+            "version": "1.4.1",
+            "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
+            "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
+            "dev": true,
+            "dependencies": {
+                "domelementtype": "^2.0.1",
+                "domhandler": "^4.2.0",
+                "entities": "^2.0.0"
+            },
+            "funding": {
+                "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+            }
+        },
+        "node_modules/dom-serializer/node_modules/entities": {
+            "version": "2.2.0",
+            "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
+            "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
+            "dev": true,
+            "funding": {
+                "url": "https://github.com/fb55/entities?sponsor=1"
+            }
+        },
+        "node_modules/domelementtype": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
+            "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/fb55"
+                }
+            ]
+        },
         "node_modules/domexception": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz",
@@ -5633,6 +5669,35 @@
                 "node": ">=8"
             }
         },
+        "node_modules/domhandler": {
+            "version": "4.3.1",
+            "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
+            "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
+            "dev": true,
+            "dependencies": {
+                "domelementtype": "^2.2.0"
+            },
+            "engines": {
+                "node": ">= 4"
+            },
+            "funding": {
+                "url": "https://github.com/fb55/domhandler?sponsor=1"
+            }
+        },
+        "node_modules/domutils": {
+            "version": "2.8.0",
+            "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
+            "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
+            "dev": true,
+            "dependencies": {
+                "dom-serializer": "^1.0.1",
+                "domelementtype": "^2.2.0",
+                "domhandler": "^4.2.0"
+            },
+            "funding": {
+                "url": "https://github.com/fb55/domutils?sponsor=1"
+            }
+        },
         "node_modules/dot-prop": {
             "version": "5.3.0",
             "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz",
@@ -5817,6 +5882,18 @@
                 "node": ">=8.6"
             }
         },
+        "node_modules/entities": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz",
+            "integrity": "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==",
+            "dev": true,
+            "engines": {
+                "node": ">=0.12"
+            },
+            "funding": {
+                "url": "https://github.com/fb55/entities?sponsor=1"
+            }
+        },
         "node_modules/env-paths": {
             "version": "2.2.1",
             "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
@@ -7557,6 +7634,25 @@
                 "node": ">=8"
             }
         },
+        "node_modules/htmlparser2": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-7.2.0.tgz",
+            "integrity": "sha512-H7MImA4MS6cw7nbyURtLPO1Tms7C5H602LRETv95z1MxO/7CP7rDVROehUYeYBUYEON94NXXDEPmZuq+hX4sog==",
+            "dev": true,
+            "funding": [
+                "https://github.com/fb55/htmlparser2?sponsor=1",
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/fb55"
+                }
+            ],
+            "dependencies": {
+                "domelementtype": "^2.0.1",
+                "domhandler": "^4.2.2",
+                "domutils": "^2.8.0",
+                "entities": "^3.0.1"
+            }
+        },
         "node_modules/http-cache-semantics": {
             "version": "4.1.0",
             "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
@@ -12505,6 +12601,20 @@
                 "node": "^10 || ^12 || >=14"
             }
         },
+        "node_modules/postcss-html": {
+            "version": "1.3.1",
+            "resolved": "https://registry.npmjs.org/postcss-html/-/postcss-html-1.3.1.tgz",
+            "integrity": "sha512-SJ7iRw+IngyZv3Z9lChlZU30a9y9MZjZZcoUJmx0T/nKE9S+hetJ8fAv/MRu4bPnGDsXhVlaFs5+umpK3yaaQQ==",
+            "dev": true,
+            "dependencies": {
+                "htmlparser2": "^7.1.2",
+                "postcss": "^8.4.0",
+                "postcss-safe-parser": "^6.0.0"
+            },
+            "engines": {
+                "node": "^12 || >=14"
+            }
+        },
         "node_modules/postcss-media-query-parser": {
             "version": "0.2.3",
             "resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz",
@@ -20003,6 +20113,31 @@
                 "esutils": "^2.0.2"
             }
         },
+        "dom-serializer": {
+            "version": "1.4.1",
+            "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
+            "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
+            "dev": true,
+            "requires": {
+                "domelementtype": "^2.0.1",
+                "domhandler": "^4.2.0",
+                "entities": "^2.0.0"
+            },
+            "dependencies": {
+                "entities": {
+                    "version": "2.2.0",
+                    "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
+                    "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
+                    "dev": true
+                }
+            }
+        },
+        "domelementtype": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
+            "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
+            "dev": true
+        },
         "domexception": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz",
@@ -20020,6 +20155,26 @@
                 }
             }
         },
+        "domhandler": {
+            "version": "4.3.1",
+            "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
+            "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
+            "dev": true,
+            "requires": {
+                "domelementtype": "^2.2.0"
+            }
+        },
+        "domutils": {
+            "version": "2.8.0",
+            "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
+            "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
+            "dev": true,
+            "requires": {
+                "dom-serializer": "^1.0.1",
+                "domelementtype": "^2.2.0",
+                "domhandler": "^4.2.0"
+            }
+        },
         "dot-prop": {
             "version": "5.3.0",
             "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz",
@@ -20157,6 +20312,12 @@
                 "ansi-colors": "^4.1.1"
             }
         },
+        "entities": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz",
+            "integrity": "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==",
+            "dev": true
+        },
         "env-paths": {
             "version": "2.2.1",
             "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
@@ -21437,6 +21598,18 @@
             "integrity": "sha512-1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg==",
             "dev": true
         },
+        "htmlparser2": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-7.2.0.tgz",
+            "integrity": "sha512-H7MImA4MS6cw7nbyURtLPO1Tms7C5H602LRETv95z1MxO/7CP7rDVROehUYeYBUYEON94NXXDEPmZuq+hX4sog==",
+            "dev": true,
+            "requires": {
+                "domelementtype": "^2.0.1",
+                "domhandler": "^4.2.2",
+                "domutils": "^2.8.0",
+                "entities": "^3.0.1"
+            }
+        },
         "http-cache-semantics": {
             "version": "4.1.0",
             "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
@@ -25173,6 +25346,17 @@
                 "source-map-js": "^1.0.2"
             }
         },
+        "postcss-html": {
+            "version": "1.3.1",
+            "resolved": "https://registry.npmjs.org/postcss-html/-/postcss-html-1.3.1.tgz",
+            "integrity": "sha512-SJ7iRw+IngyZv3Z9lChlZU30a9y9MZjZZcoUJmx0T/nKE9S+hetJ8fAv/MRu4bPnGDsXhVlaFs5+umpK3yaaQQ==",
+            "dev": true,
+            "requires": {
+                "htmlparser2": "^7.1.2",
+                "postcss": "^8.4.0",
+                "postcss-safe-parser": "^6.0.0"
+            }
+        },
         "postcss-media-query-parser": {
             "version": "0.2.3",
             "resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz",
diff --git a/package.json b/package.json
index 28db266a..73035922 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
         "start-server": "node server/server.js",
         "start-server-dev": "cross-env NODE_ENV=development node server/server.js",
         "build": "vite build --config ./config/vite.config.js",
-        "test": "node test/prepare-test-server.js && node server/server.js --port=3002 --data-dir=./data/test/ --test",
+        "test": "npm run lint && node test/prepare-test-server.js && node server/server.js --port=3002 --data-dir=./data/test/ --test",
         "test-with-build": "npm run build && npm test",
         "jest": "node test/prepare-jest.js && npm run jest-frontend && npm run jest-backend",
         "jest-frontend": "cross-env TEST_FRONTEND=1 jest --config=./config/jest-frontend.config.js",
@@ -132,6 +132,7 @@
         "jest": "~27.2.5",
         "jest-puppeteer": "~6.0.3",
         "npm-check-updates": "^12.5.5",
+        "postcss-html": "^1.3.1",
         "puppeteer": "~13.1.3",
         "sass": "~1.42.1",
         "stylelint": "~14.2.0",
diff --git a/server/2fa.js b/server/2fa.js
index bc8145cf..f8d700bf 100644
--- a/server/2fa.js
+++ b/server/2fa.js
@@ -1,4 +1,3 @@
-const { checkLogin } = require("./util-server");
 const { R } = require("redbean-node");
 
 class TwoFA {
diff --git a/server/auth.js b/server/auth.js
index cd14f690..d9412ae3 100644
--- a/server/auth.js
+++ b/server/auth.js
@@ -2,7 +2,6 @@ const basicAuth = require("express-basic-auth");
 const passwordHash = require("./password-hash");
 const { R } = require("redbean-node");
 const { setting } = require("./util-server");
-const { debug } = require("../src/util");
 const { loginRateLimiter } = require("./rate-limiter");
 
 /**
diff --git a/server/database.js b/server/database.js
index b852cc98..b398101e 100644
--- a/server/database.js
+++ b/server/database.js
@@ -1,7 +1,7 @@
 const fs = require("fs");
 const { R } = require("redbean-node");
 const { setSetting, setting } = require("./util-server");
-const { debug, sleep } = require("../src/util");
+const { log, sleep } = require("../src/util");
 const dayjs = require("dayjs");
 const knex = require("knex");
 
@@ -80,7 +80,7 @@ class Database {
             fs.mkdirSync(Database.uploadDir, { recursive: true });
         }
 
-        console.log(`Data Dir: ${Database.dataDir}`);
+        log.info("db", `Data Dir: ${Database.dataDir}`);
     }
 
     static async connect(testMode = false, autoloadModels = true, noLog = false) {
@@ -135,10 +135,10 @@ class Database {
         await R.exec("PRAGMA synchronous = FULL");
 
         if (!noLog) {
-            console.log("SQLite config:");
-            console.log(await R.getAll("PRAGMA journal_mode"));
-            console.log(await R.getAll("PRAGMA cache_size"));
-            console.log("SQLite Version: " + await R.getCell("SELECT sqlite_version()"));
+            log.info("db", "SQLite config:");
+            log.info("db", await R.getAll("PRAGMA journal_mode"));
+            log.info("db", await R.getAll("PRAGMA cache_size"));
+            log.info("db", "SQLite Version: " + await R.getCell("SELECT sqlite_version()"));
         }
     }
 
@@ -149,15 +149,15 @@ class Database {
             version = 0;
         }
 
-        console.info("Your database version: " + version);
-        console.info("Latest database version: " + this.latestVersion);
+        log.info("db", "Your database version: " + version);
+        log.info("db", "Latest database version: " + this.latestVersion);
 
         if (version === this.latestVersion) {
-            console.info("Database patch not needed");
+            log.info("db", "Database patch not needed");
         } else if (version > this.latestVersion) {
-            console.info("Warning: Database version is newer than expected");
+            log.info("db", "Warning: Database version is newer than expected");
         } else {
-            console.info("Database patch is needed");
+            log.info("db", "Database patch is needed");
 
             this.backup(version);
 
@@ -165,17 +165,17 @@ class Database {
             try {
                 for (let i = version + 1; i <= this.latestVersion; i++) {
                     const sqlFile = `./db/patch${i}.sql`;
-                    console.info(`Patching ${sqlFile}`);
+                    log.info("db", `Patching ${sqlFile}`);
                     await Database.importSQLFile(sqlFile);
-                    console.info(`Patched ${sqlFile}`);
+                    log.info("db", `Patched ${sqlFile}`);
                     await setSetting("database_version", i);
                 }
             } catch (ex) {
                 await Database.close();
 
-                console.error(ex);
-                console.error("Start Uptime-Kuma failed due to issue patching the database");
-                console.error("Please submit a bug report if you still encounter the problem after restart: https://github.com/louislam/uptime-kuma/issues");
+                log.error("db", ex);
+                log.error("db", "Start Uptime-Kuma failed due to issue patching the database");
+                log.error("db", "Please submit a bug report if you still encounter the problem after restart: https://github.com/louislam/uptime-kuma/issues");
 
                 this.restore();
                 process.exit(1);
@@ -191,15 +191,15 @@ class Database {
      * @returns {Promise<void>}
      */
     static async patch2() {
-        console.log("Database Patch 2.0 Process");
+        log.info("db", "Database Patch 2.0 Process");
         let databasePatchedFiles = await setting("databasePatchedFiles");
 
         if (! databasePatchedFiles) {
             databasePatchedFiles = {};
         }
 
-        debug("Patched files:");
-        debug(databasePatchedFiles);
+        log.debug("db", "Patched files:");
+        log.debug("db", databasePatchedFiles);
 
         try {
             for (let sqlFilename in this.patchList) {
@@ -207,15 +207,15 @@ class Database {
             }
 
             if (this.patched) {
-                console.log("Database Patched Successfully");
+                log.info("db", "Database Patched Successfully");
             }
 
         } catch (ex) {
             await Database.close();
 
-            console.error(ex);
-            console.error("Start Uptime-Kuma failed due to issue patching the database");
-            console.error("Please submit the bug report if you still encounter the problem after restart: https://github.com/louislam/uptime-kuma/issues");
+            log.error("db", ex);
+            log.error("db", "Start Uptime-Kuma failed due to issue patching the database");
+            log.error("db", "Please submit the bug report if you still encounter the problem after restart: https://github.com/louislam/uptime-kuma/issues");
 
             this.restore();
 
@@ -302,16 +302,16 @@ class Database {
         let value = this.patchList[sqlFilename];
 
         if (! value) {
-            console.log(sqlFilename + " skip");
+            log.info("db", sqlFilename + " skip");
             return;
         }
 
         // Check if patched
         if (! databasePatchedFiles[sqlFilename]) {
-            console.log(sqlFilename + " is not patched");
+            log.info("db", sqlFilename + " is not patched");
 
             if (value.parents) {
-                console.log(sqlFilename + " need parents");
+                log.info("db", sqlFilename + " need parents");
                 for (let parentSQLFilename of value.parents) {
                     await this.patch2Recursion(parentSQLFilename, databasePatchedFiles);
                 }
@@ -319,14 +319,14 @@ class Database {
 
             this.backup(dayjs().format("YYYYMMDDHHmmss"));
 
-            console.log(sqlFilename + " is patching");
+            log.info("db", sqlFilename + " is patching");
             this.patched = true;
             await this.importSQLFile("./db/" + sqlFilename);
             databasePatchedFiles[sqlFilename] = true;
-            console.log(sqlFilename + " was patched successfully");
+            log.info("db", sqlFilename + " was patched successfully");
 
         } else {
-            debug(sqlFilename + " is already patched, skip");
+            log.debug("db", sqlFilename + " is already patched, skip");
         }
     }
 
@@ -378,7 +378,7 @@ class Database {
         };
         process.addListener("unhandledRejection", listener);
 
-        console.log("Closing the database");
+        log.info("db", "Closing the database");
 
         while (true) {
             Database.noReject = true;
@@ -388,10 +388,10 @@ class Database {
             if (Database.noReject) {
                 break;
             } else {
-                console.log("Waiting to close the database");
+                log.info("db", "Waiting to close the database");
             }
         }
-        console.log("SQLite closed");
+        log.info("db", "SQLite closed");
 
         process.removeListener("unhandledRejection", listener);
     }
@@ -403,7 +403,7 @@ class Database {
      */
     static backup(version) {
         if (! this.backupPath) {
-            console.info("Backing up the database");
+            log.info("db", "Backing up the database");
             this.backupPath = this.dataDir + "kuma.db.bak" + version;
             fs.copyFileSync(Database.path, this.backupPath);
 
@@ -426,7 +426,7 @@ class Database {
      */
     static restore() {
         if (this.backupPath) {
-            console.error("Patching the database failed!!! Restoring the backup");
+            log.error("db", "Patching the database failed!!! Restoring the backup");
 
             const shmPath = Database.path + "-shm";
             const walPath = Database.path + "-wal";
@@ -445,7 +445,7 @@ class Database {
                     fs.unlinkSync(walPath);
                 }
             } catch (e) {
-                console.log("Restore failed; you may need to restore the backup manually");
+                log.error("db", "Restore failed; you may need to restore the backup manually");
                 process.exit(1);
             }
 
@@ -461,14 +461,14 @@ class Database {
             }
 
         } else {
-            console.log("Nothing to restore");
+            log.info("db", "Nothing to restore");
         }
     }
 
     static getSize() {
-        debug("Database.getSize()");
+        log.debug("db", "Database.getSize()");
         let stats = fs.statSync(Database.path);
-        debug(stats);
+        log.debug("db", stats);
         return stats.size;
     }
 
diff --git a/server/image-data-uri.js b/server/image-data-uri.js
index 1ab499c1..fbff9340 100644
--- a/server/image-data-uri.js
+++ b/server/image-data-uri.js
@@ -3,6 +3,7 @@
     Modified with 0 dependencies
  */
 let fs = require("fs");
+const { log } = require("../src/util");
 
 let ImageDataURI = (() => {
 
@@ -14,7 +15,7 @@ let ImageDataURI = (() => {
      */
     function decode(dataURI) {
         if (!/data:image\//.test(dataURI)) {
-            console.log("ImageDataURI :: Error :: It seems that it is not an Image Data URI. Couldn't match \"data:image/\"");
+            log.error("image-data-uri", "It seems that it is not an Image Data URI. Couldn't match \"data:image/\"");
             return null;
         }
 
@@ -35,7 +36,7 @@ let ImageDataURI = (() => {
      */
     function encode(data, mediaType) {
         if (!data || !mediaType) {
-            console.log("ImageDataURI :: Error :: Missing some of the required params: data, mediaType ");
+            log.error("image-data-uri", "Missing some of the required params: data, mediaType");
             return null;
         }
 
diff --git a/server/jobs.js b/server/jobs.js
index d33adb98..739e867d 100644
--- a/server/jobs.js
+++ b/server/jobs.js
@@ -1,6 +1,7 @@
 const path = require("path");
 const Bree = require("bree");
 const { SHARE_ENV } = require("worker_threads");
+const { log } = require("../src/util");
 let bree;
 const jobs = [
     {
@@ -18,7 +19,7 @@ const initBackgroundJobs = function (args) {
             workerData: args,
         },
         workerMessageHandler: (message) => {
-            console.log("[Background Job]:", message);
+            log.info("jobs", message);
         }
     });
 
diff --git a/server/logger.js b/server/logger.js
new file mode 100644
index 00000000..e69de29b
diff --git a/server/model/monitor.js b/server/model/monitor.js
index aef213c8..87572113 100644
--- a/server/model/monitor.js
+++ b/server/model/monitor.js
@@ -6,7 +6,7 @@ dayjs.extend(utc);
 dayjs.extend(timezone);
 const axios = require("axios");
 const { Prometheus } = require("../prometheus");
-const { debug, UP, DOWN, PENDING, flipStatus, TimeLogger } = require("../../src/util");
+const { log, UP, DOWN, PENDING, flipStatus, TimeLogger } = require("../../src/util");
 const { tcping, ping, dnsResolve, checkCertificate, checkStatusCode, getTotalClientInRoom, setting, errorLog } = require("../util-server");
 const { R } = require("redbean-node");
 const { BeanModel } = require("redbean-node/dist/bean-model");
@@ -193,7 +193,7 @@ class Monitor extends BeanModel {
                         rejectUnauthorized: !this.getIgnoreTls(),
                     };
 
-                    debug(`[${this.name}] Prepare Options for axios`);
+                    log.debug("monitor", `[${this.name}] Prepare Options for axios`);
 
                     const options = {
                         url: this.url,
@@ -230,8 +230,8 @@ class Monitor extends BeanModel {
                         options.httpsAgent = new https.Agent(httpsAgentOptions);
                     }
 
-                    debug(`[${this.name}] Axios Options: ${JSON.stringify(options)}`);
-                    debug(`[${this.name}] Axios Request`);
+                    log.debug("monitor", `[${this.name}] Axios Options: ${JSON.stringify(options)}`);
+                    log.debug("monitor", `[${this.name}] Axios Request`);
 
                     let res = await axios.request(options);
                     bean.msg = `${res.status} - ${res.statusText}`;
@@ -240,29 +240,30 @@ class Monitor extends BeanModel {
                     // Check certificate if https is used
                     let certInfoStartTime = dayjs().valueOf();
                     if (this.getUrl()?.protocol === "https:") {
-                        debug(`[${this.name}] Check cert`);
+                        log.debug("monitor", `[${this.name}] Check cert`);
                         try {
                             let tlsInfoObject = checkCertificate(res);
                             tlsInfo = await this.updateTlsInfo(tlsInfoObject);
 
                             if (!this.getIgnoreTls() && this.isEnabledExpiryNotification()) {
-                                debug(`[${this.name}] call sendCertNotification`);
+                                log.debug("monitor", `[${this.name}] call sendCertNotification`);
                                 await this.sendCertNotification(tlsInfoObject);
                             }
 
                         } catch (e) {
                             if (e.message !== "No TLS certificate in response") {
-                                console.error(e.message);
+                                log.error("monitor", "Caught error");
+                                log.error("monitor", e.message);
                             }
                         }
                     }
 
                     if (process.env.TIMELOGGER === "1") {
-                        debug("Cert Info Query Time: " + (dayjs().valueOf() - certInfoStartTime) + "ms");
+                        log.debug("monitor", "Cert Info Query Time: " + (dayjs().valueOf() - certInfoStartTime) + "ms");
                     }
 
                     if (process.env.UPTIME_KUMA_LOG_RESPONSE_BODY_MONITOR_ID == this.id) {
-                        console.log(res.data);
+                        log.info("monitor", res.data);
                     }
 
                     if (this.type === "http") {
@@ -342,7 +343,7 @@ class Monitor extends BeanModel {
                         time
                     ]);
 
-                    debug("heartbeatCount" + heartbeatCount + " " + time);
+                    log.debug("monitor", "heartbeatCount" + heartbeatCount + " " + time);
 
                     if (heartbeatCount <= 0) {
                         // Fix #922, since previous heartbeat could be inserted by api, it should get from database
@@ -426,7 +427,7 @@ class Monitor extends BeanModel {
                 }
             }
 
-            debug(`[${this.name}] Check isImportant`);
+            log.debug("monitor", `[${this.name}] Check isImportant`);
             let isImportant = Monitor.isImportantBeat(isFirstBeat, previousBeat?.status, bean.status);
 
             // Mark as important if status changed, ignore pending pings,
@@ -434,11 +435,11 @@ class Monitor extends BeanModel {
             if (isImportant) {
                 bean.important = true;
 
-                debug(`[${this.name}] sendNotification`);
+                log.debug("monitor", `[${this.name}] sendNotification`);
                 await Monitor.sendNotification(isFirstBeat, this, bean);
 
                 // Clear Status Page Cache
-                debug(`[${this.name}] apicache clear`);
+                log.debug("monitor", `[${this.name}] apicache clear`);
                 apicache.clear();
 
             } else {
@@ -446,33 +447,33 @@ class Monitor extends BeanModel {
             }
 
             if (bean.status === UP) {
-                console.info(`Monitor #${this.id} '${this.name}': Successful Response: ${bean.ping} ms | Interval: ${beatInterval} seconds | Type: ${this.type}`);
+                log.info("monitor", `Monitor #${this.id} '${this.name}': Successful Response: ${bean.ping} ms | Interval: ${beatInterval} seconds | Type: ${this.type}`);
             } else if (bean.status === PENDING) {
                 if (this.retryInterval > 0) {
                     beatInterval = this.retryInterval;
                 }
-                console.warn(`Monitor #${this.id} '${this.name}': Pending: ${bean.msg} | Max retries: ${this.maxretries} | Retry: ${retries} | Retry Interval: ${beatInterval} seconds | Type: ${this.type}`);
+                log.warn("monitor", `Monitor #${this.id} '${this.name}': Pending: ${bean.msg} | Max retries: ${this.maxretries} | Retry: ${retries} | Retry Interval: ${beatInterval} seconds | Type: ${this.type}`);
             } else {
-                console.warn(`Monitor #${this.id} '${this.name}': Failing: ${bean.msg} | Interval: ${beatInterval} seconds | Type: ${this.type}`);
+                log.warn("monitor", `Monitor #${this.id} '${this.name}': Failing: ${bean.msg} | Interval: ${beatInterval} seconds | Type: ${this.type}`);
             }
 
-            debug(`[${this.name}] Send to socket`);
+            log.debug("monitor", `[${this.name}] Send to socket`);
             io.to(this.user_id).emit("heartbeat", bean.toJSON());
             Monitor.sendStats(io, this.id, this.user_id);
 
-            debug(`[${this.name}] Store`);
+            log.debug("monitor", `[${this.name}] Store`);
             await R.store(bean);
 
-            debug(`[${this.name}] prometheus.update`);
+            log.debug("monitor", `[${this.name}] prometheus.update`);
             prometheus.update(bean, tlsInfo);
 
             previousBeat = bean;
 
             if (! this.isStop) {
-                debug(`[${this.name}] SetTimeout for next check.`);
+                log.debug("monitor", `[${this.name}] SetTimeout for next check.`);
                 this.heartbeatInterval = setTimeout(safeBeat, beatInterval * 1000);
             } else {
-                console.log(`[${this.name}] isStop = true, no next check.`);
+                log.info("monitor", `[${this.name}] isStop = true, no next check.`);
             }
 
         };
@@ -483,10 +484,10 @@ class Monitor extends BeanModel {
             } catch (e) {
                 console.trace(e);
                 errorLog(e, false);
-                console.error("Please report to https://github.com/louislam/uptime-kuma/issues");
+                log.error("monitor", "Please report to https://github.com/louislam/uptime-kuma/issues");
 
                 if (! this.isStop) {
-                    console.log("Try to restart the monitor");
+                    log.info("monitor", "Try to restart the monitor");
                     this.heartbeatInterval = setTimeout(safeBeat, this.interval * 1000);
                 }
             }
@@ -533,41 +534,41 @@ class Monitor extends BeanModel {
      * @returns {Promise<object>}
      */
     async updateTlsInfo(checkCertificateResult) {
-        let tls_info_bean = await R.findOne("monitor_tls_info", "monitor_id = ?", [
+        let tlsInfoBean = await R.findOne("monitor_tls_info", "monitor_id = ?", [
             this.id,
         ]);
 
-        if (tls_info_bean == null) {
-            tls_info_bean = R.dispense("monitor_tls_info");
-            tls_info_bean.monitor_id = this.id;
+        if (tlsInfoBean == null) {
+            tlsInfoBean = R.dispense("monitor_tls_info");
+            tlsInfoBean.monitor_id = this.id;
         } else {
 
             // Clear sent history if the cert changed.
             try {
-                let oldCertInfo = JSON.parse(tls_info_bean.info_json);
+                let oldCertInfo = JSON.parse(tlsInfoBean.info_json);
 
                 let isValidObjects = oldCertInfo && oldCertInfo.certInfo && checkCertificateResult && checkCertificateResult.certInfo;
 
                 if (isValidObjects) {
                     if (oldCertInfo.certInfo.fingerprint256 !== checkCertificateResult.certInfo.fingerprint256) {
-                        debug("Resetting sent_history");
+                        log.debug("monitor", "Resetting sent_history");
                         await R.exec("DELETE FROM notification_sent_history WHERE type = 'certificate' AND monitor_id = ?", [
                             this.id
                         ]);
                     } else {
-                        debug("No need to reset sent_history");
-                        debug(oldCertInfo.certInfo.fingerprint256);
-                        debug(checkCertificateResult.certInfo.fingerprint256);
+                        log.debug("monitor", "No need to reset sent_history");
+                        log.debug("monitor", oldCertInfo.certInfo.fingerprint256);
+                        log.debug("monitor", checkCertificateResult.certInfo.fingerprint256);
                     }
                 } else {
-                    debug("Not valid object");
+                    log.debug("monitor", "Not valid object");
                 }
             } catch (e) { }
 
         }
 
-        tls_info_bean.info_json = JSON.stringify(checkCertificateResult);
-        await R.store(tls_info_bean);
+        tlsInfoBean.info_json = JSON.stringify(checkCertificateResult);
+        await R.store(tlsInfoBean);
 
         return checkCertificateResult;
     }
@@ -581,7 +582,7 @@ class Monitor extends BeanModel {
             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");
+            log.debug("monitor", "No clients in the room, no need to send stats");
         }
     }
 
@@ -608,11 +609,11 @@ class Monitor extends BeanModel {
     }
 
     static async sendCertInfo(io, monitorID, userID) {
-        let tls_info = await R.findOne("monitor_tls_info", "monitor_id = ?", [
+        let tlsInfo = await R.findOne("monitor_tls_info", "monitor_id = ?", [
             monitorID,
         ]);
-        if (tls_info != null) {
-            io.to(userID).emit("certInfo", monitorID, tls_info.info_json);
+        if (tlsInfo != null) {
+            io.to(userID).emit("certInfo", monitorID, tlsInfo.info_json);
         }
     }
 
@@ -728,8 +729,8 @@ class Monitor extends BeanModel {
                 try {
                     await Notification.send(JSON.parse(notification.config), msg, await monitor.toJSON(), bean.toJSON());
                 } catch (e) {
-                    console.error("Cannot send notification to " + notification.name);
-                    console.log(e);
+                    log.error("monitor", "Cannot send notification to " + notification.name);
+                    log.error("monitor", e);
                 }
             }
         }
@@ -746,7 +747,7 @@ class Monitor extends BeanModel {
         if (tlsInfoObject && tlsInfoObject.certInfo && tlsInfoObject.certInfo.daysRemaining) {
             const notificationList = await Monitor.getNotificationList(this);
 
-            debug("call sendCertNotificationByTargetDays");
+            log.debug("monitor", "call sendCertNotificationByTargetDays");
             await this.sendCertNotificationByTargetDays(tlsInfoObject.certInfo.daysRemaining, 21, notificationList);
             await this.sendCertNotificationByTargetDays(tlsInfoObject.certInfo.daysRemaining, 14, notificationList);
             await this.sendCertNotificationByTargetDays(tlsInfoObject.certInfo.daysRemaining, 7, notificationList);
@@ -756,7 +757,7 @@ class Monitor extends BeanModel {
     async sendCertNotificationByTargetDays(daysRemaining, targetDays, notificationList) {
 
         if (daysRemaining > targetDays) {
-            debug(`No need to send cert notification. ${daysRemaining} > ${targetDays}`);
+            log.debug("monitor", `No need to send cert notification. ${daysRemaining} > ${targetDays}`);
             return;
         }
 
@@ -770,21 +771,21 @@ class Monitor extends BeanModel {
 
             // Sent already, no need to send again
             if (row) {
-                debug("Sent already, no need to send again");
+                log.debug("monitor", "Sent already, no need to send again");
                 return;
             }
 
             let sent = false;
-            debug("Send certificate notification");
+            log.debug("monitor", "Send certificate notification");
 
             for (let notification of notificationList) {
                 try {
-                    debug("Sending to " + notification.name);
+                    log.debug("monitor", "Sending to " + notification.name);
                     await Notification.send(JSON.parse(notification.config), `[${this.name}][${this.url}] Certificate will be expired in ${daysRemaining} days`);
                     sent = true;
                 } catch (e) {
-                    console.error("Cannot send cert notification to " + notification.name);
-                    console.error(e);
+                    log.error("monitor", "Cannot send cert notification to " + notification.name);
+                    log.error("monitor", e);
                 }
             }
 
@@ -796,7 +797,7 @@ class Monitor extends BeanModel {
                 ]);
             }
         } else {
-            debug("No notification, no need to send cert notification");
+            log.debug("monitor", "No notification, no need to send cert notification");
         }
     }
 
diff --git a/server/notification-providers/apprise.js b/server/notification-providers/apprise.js
index fdcd8d61..aa8daca6 100644
--- a/server/notification-providers/apprise.js
+++ b/server/notification-providers/apprise.js
@@ -1,12 +1,12 @@
 const NotificationProvider = require("./notification-provider");
-const child_process = require("child_process");
+const childProcess = require("child_process");
 
 class Apprise extends NotificationProvider {
 
     name = "apprise";
 
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        let s = child_process.spawnSync("apprise", [ "-vv", "-b", msg, notification.appriseURL])
+        let s = childProcess.spawnSync("apprise", [ "-vv", "-b", msg, notification.appriseURL]);
 
         let output = (s.stdout) ? s.stdout.toString() : "ERROR: maybe apprise not found";
 
@@ -16,7 +16,7 @@ class Apprise extends NotificationProvider {
                 return "Sent Successfully";
             }
 
-            throw new Error(output)
+            throw new Error(output);
         } else {
             return "No output from apprise";
         }
diff --git a/server/notification-providers/bark.js b/server/notification-providers/bark.js
index 4ebe978a..a4c52512 100644
--- a/server/notification-providers/bark.js
+++ b/server/notification-providers/bark.js
@@ -21,31 +21,26 @@ class Bark extends NotificationProvider {
     name = "Bark";
 
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        try {
-            var barkEndpoint = notification.barkEndpoint;
+        let barkEndpoint = notification.barkEndpoint;
 
-            // check if the endpoint has a "/" suffix, if so, delete it first
-            if (barkEndpoint.endsWith("/")) {
-                barkEndpoint = barkEndpoint.substring(0, barkEndpoint.length - 1);
-            }
+        // check if the endpoint has a "/" suffix, if so, delete it first
+        if (barkEndpoint.endsWith("/")) {
+            barkEndpoint = barkEndpoint.substring(0, barkEndpoint.length - 1);
+        }
 
-            if (msg != null && heartbeatJSON != null && heartbeatJSON["status"] == UP) {
-                let title = "UptimeKuma Monitor Up";
-                return await this.postNotification(title, msg, barkEndpoint);
-            }
+        if (msg != null && heartbeatJSON != null && heartbeatJSON["status"] == UP) {
+            let title = "UptimeKuma Monitor Up";
+            return await this.postNotification(title, msg, barkEndpoint);
+        }
 
-            if (msg != null && heartbeatJSON != null && heartbeatJSON["status"] == DOWN) {
-                let title = "UptimeKuma Monitor Down";
-                return await this.postNotification(title, msg, barkEndpoint);
-            }
+        if (msg != null && heartbeatJSON != null && heartbeatJSON["status"] == DOWN) {
+            let title = "UptimeKuma Monitor Down";
+            return await this.postNotification(title, msg, barkEndpoint);
+        }
 
-            if (msg != null) {
-                let title = "UptimeKuma Message";
-                return await this.postNotification(title, msg, barkEndpoint);
-            }
-
-        } catch (error) {
-            throw error;
+        if (msg != null) {
+            let title = "UptimeKuma Message";
+            return await this.postNotification(title, msg, barkEndpoint);
         }
     }
 
diff --git a/server/notification-providers/clicksendsms.js b/server/notification-providers/clicksendsms.js
index 74e2f4c5..e66b982c 100644
--- a/server/notification-providers/clicksendsms.js
+++ b/server/notification-providers/clicksendsms.js
@@ -12,7 +12,7 @@ class ClickSendSMS extends NotificationProvider {
             let config = {
                 headers: {
                     "Content-Type": "application/json",
-                    "Authorization": "Basic " + Buffer.from(notification.clicksendsmsLogin + ":" + notification.clicksendsmsPassword).toString('base64'),
+                    "Authorization": "Basic " + Buffer.from(notification.clicksendsmsLogin + ":" + notification.clicksendsmsPassword).toString("base64"),
                     "Accept": "text/json",
                 }
             };
diff --git a/server/notification-providers/discord.js b/server/notification-providers/discord.js
index 881ad211..f5c22a44 100644
--- a/server/notification-providers/discord.js
+++ b/server/notification-providers/discord.js
@@ -17,8 +17,8 @@ class Discord extends NotificationProvider {
                 let discordtestdata = {
                     username: discordDisplayName,
                     content: msg,
-                }
-                await axios.post(notification.discordWebhookUrl, discordtestdata)
+                };
+                await axios.post(notification.discordWebhookUrl, discordtestdata);
                 return okMsg;
             }
 
@@ -61,13 +61,13 @@ class Discord extends NotificationProvider {
                             },
                         ],
                     }],
-                }
+                };
 
                 if (notification.discordPrefixMessage) {
                     discorddowndata.content = notification.discordPrefixMessage;
                 }
 
-                await axios.post(notification.discordWebhookUrl, discorddowndata)
+                await axios.post(notification.discordWebhookUrl, discorddowndata);
                 return okMsg;
 
             } else if (heartbeatJSON["status"] == UP) {
@@ -96,17 +96,17 @@ class Discord extends NotificationProvider {
                             },
                         ],
                     }],
-                }
+                };
 
                 if (notification.discordPrefixMessage) {
                     discordupdata.content = notification.discordPrefixMessage;
                 }
 
-                await axios.post(notification.discordWebhookUrl, discordupdata)
+                await axios.post(notification.discordWebhookUrl, discordupdata);
                 return okMsg;
             }
         } catch (error) {
-            this.throwGeneralAxiosError(error)
+            this.throwGeneralAxiosError(error);
         }
     }
 
diff --git a/server/notification-providers/google-chat.js b/server/notification-providers/google-chat.js
index 6fb32428..02cb4823 100644
--- a/server/notification-providers/google-chat.js
+++ b/server/notification-providers/google-chat.js
@@ -13,11 +13,11 @@ class GoogleChat extends NotificationProvider {
         try {
             // Google Chat message formatting: https://developers.google.com/chat/api/guides/message-formats/basic
 
-            let textMsg = ''
+            let textMsg = "";
             if (heartbeatJSON && heartbeatJSON.status === UP) {
-                textMsg = `✅ Application is back online\n`;
+                textMsg = "✅ Application is back online\n";
             } else if (heartbeatJSON && heartbeatJSON.status === DOWN) {
-                textMsg = `🔴 Application went down\n`;
+                textMsg = "🔴 Application went down\n";
             }
 
             if (monitorJSON && monitorJSON.name) {
diff --git a/server/notification-providers/gotify.js b/server/notification-providers/gotify.js
index 08526189..0c524493 100644
--- a/server/notification-providers/gotify.js
+++ b/server/notification-providers/gotify.js
@@ -15,7 +15,7 @@ class Gotify extends NotificationProvider {
                 "message": msg,
                 "priority": notification.gotifyPriority || 8,
                 "title": "Uptime-Kuma",
-            })
+            });
 
             return okMsg;
 
diff --git a/server/notification-providers/line.js b/server/notification-providers/line.js
index 327696ed..6a09b502 100644
--- a/server/notification-providers/line.js
+++ b/server/notification-providers/line.js
@@ -25,8 +25,8 @@ class Line extends NotificationProvider {
                             "text": "Test Successful!"
                         }
                     ]
-                }
-                await axios.post(lineAPIUrl, testMessage, config)
+                };
+                await axios.post(lineAPIUrl, testMessage, config);
             } else if (heartbeatJSON["status"] == DOWN) {
                 let downMessage = {
                     "to": notification.lineUserID,
@@ -36,8 +36,8 @@ class Line extends NotificationProvider {
                             "text": "UptimeKuma Alert: [🔴 Down]\n" + "Name: " + monitorJSON["name"] + " \n" + heartbeatJSON["msg"] + "\nTime (UTC): " + heartbeatJSON["time"]
                         }
                     ]
-                }
-                await axios.post(lineAPIUrl, downMessage, config)
+                };
+                await axios.post(lineAPIUrl, downMessage, config);
             } else if (heartbeatJSON["status"] == UP) {
                 let upMessage = {
                     "to": notification.lineUserID,
@@ -47,12 +47,12 @@ class Line extends NotificationProvider {
                             "text": "UptimeKuma Alert: [✅ Up]\n" + "Name: " + monitorJSON["name"] + " \n" + heartbeatJSON["msg"] + "\nTime (UTC): " + heartbeatJSON["time"]
                         }
                     ]
-                }
-                await axios.post(lineAPIUrl, upMessage, config)
+                };
+                await axios.post(lineAPIUrl, upMessage, config);
             }
             return okMsg;
         } catch (error) {
-            this.throwGeneralAxiosError(error)
+            this.throwGeneralAxiosError(error);
         }
     }
 }
diff --git a/server/notification-providers/lunasea.js b/server/notification-providers/lunasea.js
index c41f400e..82d2fde5 100644
--- a/server/notification-providers/lunasea.js
+++ b/server/notification-providers/lunasea.js
@@ -8,15 +8,15 @@ class LunaSea extends NotificationProvider {
 
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
         let okMsg = "Sent Successfully.";
-        let lunaseadevice = "https://notify.lunasea.app/v1/custom/device/" + notification.lunaseaDevice
+        let lunaseadevice = "https://notify.lunasea.app/v1/custom/device/" + notification.lunaseaDevice;
 
         try {
             if (heartbeatJSON == null) {
                 let testdata = {
                     "title": "Uptime Kuma Alert",
                     "body": "Testing Successful.",
-                }
-                await axios.post(lunaseadevice, testdata)
+                };
+                await axios.post(lunaseadevice, testdata);
                 return okMsg;
             }
 
@@ -24,8 +24,8 @@ class LunaSea extends NotificationProvider {
                 let downdata = {
                     "title": "UptimeKuma Alert: " + monitorJSON["name"],
                     "body": "[🔴 Down] " + heartbeatJSON["msg"] + "\nTime (UTC): " + heartbeatJSON["time"],
-                }
-                await axios.post(lunaseadevice, downdata)
+                };
+                await axios.post(lunaseadevice, downdata);
                 return okMsg;
             }
 
@@ -33,13 +33,13 @@ class LunaSea extends NotificationProvider {
                 let updata = {
                     "title": "UptimeKuma Alert: " + monitorJSON["name"],
                     "body": "[✅ Up] " + heartbeatJSON["msg"] + "\nTime (UTC): " + heartbeatJSON["time"],
-                }
-                await axios.post(lunaseadevice, updata)
+                };
+                await axios.post(lunaseadevice, updata);
                 return okMsg;
             }
 
         } catch (error) {
-            this.throwGeneralAxiosError(error)
+            this.throwGeneralAxiosError(error);
         }
 
     }
diff --git a/server/notification-providers/matrix.js b/server/notification-providers/matrix.js
index c1054fce..915c772d 100644
--- a/server/notification-providers/matrix.js
+++ b/server/notification-providers/matrix.js
@@ -1,7 +1,7 @@
 const NotificationProvider = require("./notification-provider");
 const axios = require("axios");
 const Crypto = require("crypto");
-const { debug } = require("../../src/util");
+const { log } = require("../../src/util");
 
 class Matrix extends NotificationProvider {
     name = "matrix";
@@ -17,11 +17,11 @@ class Matrix extends NotificationProvider {
                 .slice(0, size)
         );
 
-        debug("Random String: " + randomString);
+        log.debug("notification", "Random String: " + randomString);
 
         const roomId = encodeURIComponent(notification.internalRoomId);
 
-        debug("Matrix Room ID: " + roomId);
+        log.debug("notification", "Matrix Room ID: " + roomId);
 
         try {
             let config = {
diff --git a/server/notification-providers/notification-provider.js b/server/notification-providers/notification-provider.js
index 61c6242d..87687baa 100644
--- a/server/notification-providers/notification-provider.js
+++ b/server/notification-providers/notification-provider.js
@@ -25,11 +25,11 @@ class NotificationProvider {
             if (typeof error.response.data === "string") {
                 msg += error.response.data;
             } else {
-                msg += JSON.stringify(error.response.data)
+                msg += JSON.stringify(error.response.data);
             }
         }
 
-        throw new Error(msg)
+        throw new Error(msg);
     }
 }
 
diff --git a/server/notification-providers/octopush.js b/server/notification-providers/octopush.js
index 9d77aa5b..68416b9a 100644
--- a/server/notification-providers/octopush.js
+++ b/server/notification-providers/octopush.js
@@ -30,7 +30,7 @@ class Octopush extends NotificationProvider {
                     "purpose": "alert",
                     "sender": notification.octopushSenderName
                 };
-                await axios.post("https://api.octopush.com/v1/public/sms-campaign/send", data, config)
+                await axios.post("https://api.octopush.com/v1/public/sms-campaign/send", data, config);
             } else if (notification.octopushVersion == 1) {
                 let data = {
                     "user_login": notification.octopushDMLogin,
@@ -49,7 +49,7 @@ class Octopush extends NotificationProvider {
                     },
                     params: data
                 };
-                await axios.post("https://www.octopush-dm.com/api/sms/json", {}, config)
+                await axios.post("https://www.octopush-dm.com/api/sms/json", {}, config);
             } else {
                 throw new Error("Unknown Octopush version!");
             }
diff --git a/server/notification-providers/onebot.js b/server/notification-providers/onebot.js
new file mode 100644
index 00000000..c08cc01e
--- /dev/null
+++ b/server/notification-providers/onebot.js
@@ -0,0 +1,45 @@
+const NotificationProvider = require("./notification-provider");
+const axios = require("axios");
+
+class OneBot extends NotificationProvider {
+
+    name = "OneBot";
+
+    async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
+        let okMsg = "Sent Successfully.";
+        try {
+            let httpAddr = notification.httpAddr;
+            if (!httpAddr.startsWith("http")) {
+                httpAddr = "http://" + httpAddr;
+            }
+            if (!httpAddr.endsWith("/")) {
+                httpAddr += "/";
+            }
+            let onebotAPIUrl = httpAddr + "send_msg";
+            let config = {
+                headers: {
+                    "Content-Type": "application/json",
+                    "Authorization": "Bearer " + notification.accessToken,
+                }
+            };
+            let pushText = "UptimeKuma Alert: " + msg;
+            let data = {
+                "auto_escape": true,
+                "message": pushText,
+            };
+            if (notification.msgType == "group") {
+                data["message_type"] = "group";
+                data["group_id"] = notification.recieverId;
+            } else {
+                data["message_type"] = "private";
+                data["user_id"] = notification.recieverId;
+            }
+            await axios.post(onebotAPIUrl, data, config);
+            return okMsg;
+        } catch (error) {
+            this.throwGeneralAxiosError(error);
+        }
+    }
+}
+
+module.exports = OneBot;
diff --git a/server/notification-providers/promosms.js b/server/notification-providers/promosms.js
index 362ef714..4f7e8f90 100644
--- a/server/notification-providers/promosms.js
+++ b/server/notification-providers/promosms.js
@@ -12,7 +12,7 @@ class PromoSMS extends NotificationProvider {
             let config = {
                 headers: {
                     "Content-Type": "application/json",
-                    "Authorization": "Basic " + Buffer.from(notification.promosmsLogin + ":" + notification.promosmsPassword).toString('base64'),
+                    "Authorization": "Basic " + Buffer.from(notification.promosmsLogin + ":" + notification.promosmsPassword).toString("base64"),
                     "Accept": "text/json",
                 }
             };
@@ -30,7 +30,7 @@ class PromoSMS extends NotificationProvider {
                 let error = "Something gone wrong. Api returned " + resp.data.response.status + ".";
                 this.throwGeneralAxiosError(error);
             }
-            
+
             return okMsg;
         } catch (error) {
             this.throwGeneralAxiosError(error);
diff --git a/server/notification-providers/pushbullet.js b/server/notification-providers/pushbullet.js
index c7b824a2..07b4ed68 100644
--- a/server/notification-providers/pushbullet.js
+++ b/server/notification-providers/pushbullet.js
@@ -23,26 +23,26 @@ class Pushbullet extends NotificationProvider {
                     "type": "note",
                     "title": "Uptime Kuma Alert",
                     "body": "Testing Successful.",
-                }
-                await axios.post(pushbulletUrl, testdata, config)
+                };
+                await axios.post(pushbulletUrl, testdata, config);
             } else if (heartbeatJSON["status"] == DOWN) {
                 let downdata = {
                     "type": "note",
                     "title": "UptimeKuma Alert: " + monitorJSON["name"],
                     "body": "[🔴 Down] " + heartbeatJSON["msg"] + "\nTime (UTC): " + heartbeatJSON["time"],
-                }
-                await axios.post(pushbulletUrl, downdata, config)
+                };
+                await axios.post(pushbulletUrl, downdata, config);
             } else if (heartbeatJSON["status"] == UP) {
                 let updata = {
                     "type": "note",
                     "title": "UptimeKuma Alert: " + monitorJSON["name"],
                     "body": "[✅ Up] " + heartbeatJSON["msg"] + "\nTime (UTC): " + heartbeatJSON["time"],
-                }
-                await axios.post(pushbulletUrl, updata, config)
+                };
+                await axios.post(pushbulletUrl, updata, config);
             }
             return okMsg;
         } catch (error) {
-            this.throwGeneralAxiosError(error)
+            this.throwGeneralAxiosError(error);
         }
     }
 }
diff --git a/server/notification-providers/pushdeer.js b/server/notification-providers/pushdeer.js
new file mode 100644
index 00000000..620c1b20
--- /dev/null
+++ b/server/notification-providers/pushdeer.js
@@ -0,0 +1,52 @@
+const NotificationProvider = require("./notification-provider");
+const axios = require("axios");
+const { DOWN, UP } = require("../../src/util");
+
+class PushDeer extends NotificationProvider {
+
+    name = "PushDeer";
+
+    async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
+        let okMsg = "Sent Successfully.";
+        let pushdeerlink = "https://api2.pushdeer.com/message/push";
+
+        let valid = msg != null && monitorJSON != null && heartbeatJSON != null;
+
+        let title;
+        if (valid && heartbeatJSON.status == UP) {
+            title = "## Uptime Kuma: " + monitorJSON.name + " up";
+        } else if (valid && heartbeatJSON.status == DOWN) {
+            title = "## Uptime Kuma: " + monitorJSON.name + " down";
+        } else {
+            title = "## Uptime Kuma Message";
+        }
+
+        let data = {
+            "pushkey": notification.pushdeerKey,
+            "text": title,
+            "desp": msg.replace(/\n/g, "\n\n"),
+            "type": "markdown",
+        };
+
+        try {
+            let res = await axios.post(pushdeerlink, data);
+
+            if ("error" in res.data) {
+                let error = res.data.error;
+                this.throwGeneralAxiosError(error);
+            }
+            if (res.data.content.result.length === 0) {
+                let error = "Invalid PushDeer key";
+                this.throwGeneralAxiosError(error);
+            } else if (JSON.parse(res.data.content.result[0]).success != "ok") {
+                let error = "Unknown error";
+                this.throwGeneralAxiosError(error);
+            }
+            return okMsg;
+        } catch (error) {
+            this.throwGeneralAxiosError(error);
+        }
+    }
+}
+
+module.exports = PushDeer;
diff --git a/server/notification-providers/pushy.js b/server/notification-providers/pushy.js
index 2bb89934..1d6e7f32 100644
--- a/server/notification-providers/pushy.js
+++ b/server/notification-providers/pushy.js
@@ -19,10 +19,10 @@ class Pushy extends NotificationProvider {
                     "badge": 1,
                     "sound": "ping.aiff"
                 }
-            })
+            });
             return okMsg;
         } catch (error) {
-            this.throwGeneralAxiosError(error)
+            this.throwGeneralAxiosError(error);
         }
     }
 }
diff --git a/server/notification-providers/rocket-chat.js b/server/notification-providers/rocket-chat.js
index 25b0b945..fb48ce1a 100644
--- a/server/notification-providers/rocket-chat.js
+++ b/server/notification-providers/rocket-chat.js
@@ -2,7 +2,7 @@ const NotificationProvider = require("./notification-provider");
 const axios = require("axios");
 const Slack = require("./slack");
 const { setting } = require("../util-server");
-const { getMonitorRelativeURL, UP, DOWN } = require("../../src/util");
+const { getMonitorRelativeURL, DOWN } = require("../../src/util");
 
 class RocketChat extends NotificationProvider {
 
diff --git a/server/notification-providers/signal.js b/server/notification-providers/signal.js
index fee65754..677208ee 100644
--- a/server/notification-providers/signal.js
+++ b/server/notification-providers/signal.js
@@ -16,10 +16,10 @@ class Signal extends NotificationProvider {
             };
             let config = {};
 
-            await axios.post(notification.signalURL, data, config)
+            await axios.post(notification.signalURL, data, config);
             return okMsg;
         } catch (error) {
-            this.throwGeneralAxiosError(error)
+            this.throwGeneralAxiosError(error);
         }
     }
 }
diff --git a/server/notification-providers/smtp.js b/server/notification-providers/smtp.js
index d85ee88c..a6a0cc01 100644
--- a/server/notification-providers/smtp.js
+++ b/server/notification-providers/smtp.js
@@ -1,6 +1,6 @@
 const nodemailer = require("nodemailer");
 const NotificationProvider = require("./notification-provider");
-const { DOWN, UP } = require("../../src/util");
+const { DOWN } = require("../../src/util");
 
 class SMTP extends NotificationProvider {
 
diff --git a/server/notification-providers/techulus-push.js b/server/notification-providers/techulus-push.js
index f844d17c..751ff4c3 100644
--- a/server/notification-providers/techulus-push.js
+++ b/server/notification-providers/techulus-push.js
@@ -12,10 +12,10 @@ class TechulusPush extends NotificationProvider {
             await axios.post(`https://push.techulus.com/api/v1/notify/${notification.pushAPIKey}`, {
                 "title": "Uptime-Kuma",
                 "body": msg,
-            })
+            });
             return okMsg;
         } catch (error) {
-            this.throwGeneralAxiosError(error)
+            this.throwGeneralAxiosError(error);
         }
     }
 }
diff --git a/server/notification-providers/telegram.js b/server/notification-providers/telegram.js
index 54d33bfb..2b057622 100644
--- a/server/notification-providers/telegram.js
+++ b/server/notification-providers/telegram.js
@@ -14,12 +14,12 @@ class Telegram extends NotificationProvider {
                     chat_id: notification.telegramChatID,
                     text: msg,
                 },
-            })
+            });
             return okMsg;
 
         } catch (error) {
-            let msg = (error.response.data.description) ? error.response.data.description : "Error without description"
-            throw new Error(msg)
+            let msg = (error.response.data.description) ? error.response.data.description : "Error without description";
+            throw new Error(msg);
         }
     }
 }
diff --git a/server/notification-providers/webhook.js b/server/notification-providers/webhook.js
index 9cb361f3..d4933cf0 100644
--- a/server/notification-providers/webhook.js
+++ b/server/notification-providers/webhook.js
@@ -24,17 +24,17 @@ class Webhook extends NotificationProvider {
 
                 config = {
                     headers: finalData.getHeaders(),
-                }
+                };
 
             } else {
                 finalData = data;
             }
 
-            await axios.post(notification.webhookURL, finalData, config)
+            await axios.post(notification.webhookURL, finalData, config);
             return okMsg;
 
         } catch (error) {
-            this.throwGeneralAxiosError(error)
+            this.throwGeneralAxiosError(error);
         }
 
     }
diff --git a/server/notification-providers/wecom.js b/server/notification-providers/wecom.js
index 7ba8c378..b377cedd 100644
--- a/server/notification-providers/wecom.js
+++ b/server/notification-providers/wecom.js
@@ -26,7 +26,7 @@ class WeCom extends NotificationProvider {
 
     composeMessage(heartbeatJSON, msg) {
         let title;
-        if (msg != null && heartbeatJSON != null && heartbeatJSON['status'] == UP) {
+        if (msg != null && heartbeatJSON != null && heartbeatJSON["status"] == UP) {
             title = "UptimeKuma Monitor Up";
         }
         if (msg != null && heartbeatJSON != null && heartbeatJSON["status"] == DOWN) {
diff --git a/server/notification.js b/server/notification.js
index 35a26864..842e0e2f 100644
--- a/server/notification.js
+++ b/server/notification.js
@@ -24,19 +24,22 @@ const Feishu = require("./notification-providers/feishu");
 const AliyunSms = require("./notification-providers/aliyun-sms");
 const DingDing = require("./notification-providers/dingding");
 const Bark = require("./notification-providers/bark");
+const { log } = require("../src/util");
 const SerwerSMS = require("./notification-providers/serwersms");
 const Stackfield = require("./notification-providers/stackfield");
 const WeCom = require("./notification-providers/wecom");
 const GoogleChat = require("./notification-providers/google-chat");
 const Gorush = require("./notification-providers/gorush");
 const Alerta = require("./notification-providers/alerta");
+const OneBot = require("./notification-providers/onebot");
+const PushDeer = require("./notification-providers/pushdeer");
 
 class Notification {
 
     providerList = {};
 
     static init() {
-        console.log("Prepare Notification Providers");
+        log.info("notification", "Prepare Notification Providers");
 
         this.providerList = {};
 
@@ -72,6 +75,8 @@ class Notification {
             new GoogleChat(),
             new Gorush(),
             new Alerta(),
+            new OneBot(),
+            new PushDeer(),
         ];
 
         for (let item of list) {
@@ -104,27 +109,27 @@ class Notification {
     }
 
     static async save(notification, notificationID, userID) {
-        let bean
+        let bean;
 
         if (notificationID) {
             bean = await R.findOne("notification", " id = ? AND user_id = ? ", [
                 notificationID,
                 userID,
-            ])
+            ]);
 
             if (! bean) {
-                throw new Error("notification not found")
+                throw new Error("notification not found");
             }
 
         } else {
-            bean = R.dispense("notification")
+            bean = R.dispense("notification");
         }
 
         bean.name = notification.name;
         bean.user_id = userID;
         bean.config = JSON.stringify(notification);
         bean.is_default = notification.isDefault || false;
-        await R.store(bean)
+        await R.store(bean);
 
         if (notification.applyExisting) {
             await applyNotificationEveryMonitor(bean.id, userID);
@@ -137,13 +142,13 @@ class Notification {
         let bean = await R.findOne("notification", " id = ? AND user_id = ? ", [
             notificationID,
             userID,
-        ])
+        ]);
 
         if (! bean) {
-            throw new Error("notification not found")
+            throw new Error("notification not found");
         }
 
-        await R.trash(bean)
+        await R.trash(bean);
     }
 
     static checkApprise() {
@@ -170,17 +175,17 @@ async function applyNotificationEveryMonitor(notificationID, userID) {
         let checkNotification = await R.findOne("monitor_notification", " monitor_id = ? AND notification_id = ? ", [
             monitors[i].id,
             notificationID,
-        ])
+        ]);
 
         if (! checkNotification) {
             let relation = R.dispense("monitor_notification");
             relation.monitor_id = monitors[i].id;
             relation.notification_id = notificationID;
-            await R.store(relation)
+            await R.store(relation);
         }
     }
 }
 
 module.exports = {
     Notification,
-}
+};
diff --git a/server/password-hash.js b/server/password-hash.js
index 91e5e1ad..a42b4df0 100644
--- a/server/password-hash.js
+++ b/server/password-hash.js
@@ -4,20 +4,20 @@ const saltRounds = 10;
 
 exports.generate = function (password) {
     return bcrypt.hashSync(password, saltRounds);
-}
+};
 
 exports.verify = function (password, hash) {
     if (isSHA1(hash)) {
-        return passwordHashOld.verify(password, hash)
+        return passwordHashOld.verify(password, hash);
     }
 
     return bcrypt.compareSync(password, hash);
-}
+};
 
 function isSHA1(hash) {
-    return (typeof hash === "string" && hash.startsWith("sha1"))
+    return (typeof hash === "string" && hash.startsWith("sha1"));
 }
 
 exports.needRehash = function (hash) {
     return isSHA1(hash);
-}
+};
diff --git a/server/prometheus.js b/server/prometheus.js
index 86ad381b..ead5c44c 100644
--- a/server/prometheus.js
+++ b/server/prometheus.js
@@ -1,4 +1,5 @@
 const PrometheusClient = require("prom-client");
+const { log } = require("../src/util");
 
 const commonLabels = [
     "monitor_name",
@@ -8,24 +9,24 @@ const commonLabels = [
     "monitor_port",
 ];
 
-const monitor_cert_days_remaining = new PrometheusClient.Gauge({
+const monitorCertDaysRemaining = new PrometheusClient.Gauge({
     name: "monitor_cert_days_remaining",
     help: "The number of days remaining until the certificate expires",
     labelNames: commonLabels
 });
 
-const monitor_cert_is_valid = new PrometheusClient.Gauge({
+const monitorCertIsValid = new PrometheusClient.Gauge({
     name: "monitor_cert_is_valid",
     help: "Is the certificate still valid? (1 = Yes, 0= No)",
     labelNames: commonLabels
 });
-const monitor_response_time = new PrometheusClient.Gauge({
+const monitorResponseTime = new PrometheusClient.Gauge({
     name: "monitor_response_time",
     help: "Monitor Response Time (ms)",
     labelNames: commonLabels
 });
 
-const monitor_status = new PrometheusClient.Gauge({
+const monitorStatus = new PrometheusClient.Gauge({
     name: "monitor_status",
     help: "Monitor Status (1 = UP, 0= DOWN)",
     labelNames: commonLabels
@@ -48,50 +49,54 @@ class Prometheus {
 
         if (typeof tlsInfo !== "undefined") {
             try {
-                let is_valid = 0;
+                let isValid = 0;
                 if (tlsInfo.valid == true) {
-                    is_valid = 1;
+                    isValid = 1;
                 } else {
-                    is_valid = 0;
+                    isValid = 0;
                 }
-                monitor_cert_is_valid.set(this.monitorLabelValues, is_valid);
+                monitorCertIsValid.set(this.monitorLabelValues, isValid);
             } catch (e) {
-                console.error(e);
+                log.error("prometheus", "Caught error");
+                log.error("prometheus", e);
             }
 
             try {
                 if (tlsInfo.certInfo != null) {
-                    monitor_cert_days_remaining.set(this.monitorLabelValues, tlsInfo.certInfo.daysRemaining);
+                    monitorCertDaysRemaining.set(this.monitorLabelValues, tlsInfo.certInfo.daysRemaining);
                 }
             } catch (e) {
-                console.error(e);
+                log.error("prometheus", "Caught error");
+                log.error("prometheus", e);
             }
         }
 
         try {
-            monitor_status.set(this.monitorLabelValues, heartbeat.status);
+            monitorStatus.set(this.monitorLabelValues, heartbeat.status);
         } catch (e) {
-            console.error(e);
+            log.error("prometheus", "Caught error");
+            log.error("prometheus", e);
         }
 
         try {
             if (typeof heartbeat.ping === "number") {
-                monitor_response_time.set(this.monitorLabelValues, heartbeat.ping);
+                monitorResponseTime.set(this.monitorLabelValues, heartbeat.ping);
             } else {
                 // Is it good?
-                monitor_response_time.set(this.monitorLabelValues, -1);
+                monitorResponseTime.set(this.monitorLabelValues, -1);
             }
         } catch (e) {
-            console.error(e);
+            log.error("prometheus", "Caught error");
+            log.error("prometheus", e);
         }
     }
 
     remove() {
         try {
-            monitor_cert_days_remaining.remove(this.monitorLabelValues);
-            monitor_cert_is_valid.remove(this.monitorLabelValues);
-            monitor_response_time.remove(this.monitorLabelValues);
-            monitor_status.remove(this.monitorLabelValues);
+            monitorCertDaysRemaining.remove(this.monitorLabelValues);
+            monitorCertIsValid.remove(this.monitorLabelValues);
+            monitorResponseTime.remove(this.monitorLabelValues);
+            monitorStatus.remove(this.monitorLabelValues);
         } catch (e) {
             console.error(e);
         }
diff --git a/server/rate-limiter.js b/server/rate-limiter.js
index 6422af8d..f58f16cb 100644
--- a/server/rate-limiter.js
+++ b/server/rate-limiter.js
@@ -1,5 +1,5 @@
 const { RateLimiter } = require("limiter");
-const { debug } = require("../src/util");
+const { log } = require("../src/util");
 
 class KumaRateLimiter {
     constructor(config) {
@@ -9,7 +9,7 @@ class KumaRateLimiter {
 
     async pass(callback, num = 1) {
         const remainingRequests = await this.removeTokens(num);
-        debug("Rate Limit (remainingRequests):" + remainingRequests);
+        log.info("rate-limit", "remaining requests: " + remainingRequests);
         if (remainingRequests < 0) {
             if (callback) {
                 callback({
diff --git a/server/routers/api-router.js b/server/routers/api-router.js
index 6f463b6b..51aa5f3f 100644
--- a/server/routers/api-router.js
+++ b/server/routers/api-router.js
@@ -1,11 +1,11 @@
 let express = require("express");
-const { allowDevAllOrigin, getSettings, setting } = require("../util-server");
+const { allowDevAllOrigin } = require("../util-server");
 const { R } = require("redbean-node");
 const server = require("../server");
 const apicache = require("../modules/apicache");
 const Monitor = require("../model/monitor");
 const dayjs = require("dayjs");
-const { UP, flipStatus, debug } = require("../../src/util");
+const { UP, flipStatus, log } = require("../../src/util");
 const StatusPage = require("../model/status_page");
 let router = express.Router();
 
@@ -62,8 +62,8 @@ router.get("/api/push/:pushToken", async (request, response) => {
             duration = dayjs(bean.time).diff(dayjs(previousHeartbeat.time), "second");
         }
 
-        debug("PreviousStatus: " + previousStatus);
-        debug("Current Status: " + status);
+        log.debug("router", "PreviousStatus: " + previousStatus);
+        log.debug("router", "Current Status: " + status);
 
         bean.important = Monitor.isImportantBeat(isFirstBeat, previousStatus, status);
         bean.monitor_id = monitor.id;
@@ -124,7 +124,7 @@ router.get("/api/status-page/:slug", cache("5 minutes"), async (request, respons
         // Public Group List
         const publicGroupList = [];
         const showTags = !!statusPage.show_tags;
-        debug("Show Tags???" + showTags);
+
         const list = await R.find("group", " public = 1 AND status_page_id = ? ORDER BY weight ", [
             statusPage.id
         ]);
@@ -195,14 +195,6 @@ router.get("/api/status-page/heartbeat/:slug", cache("1 minutes"), async (reques
     }
 });
 
-/**
- * Default is published
- * @returns {Promise<boolean>}
- */
-async function isPublished() {
-    return true;
-}
-
 function send403(res, msg = "") {
     res.status(403).json({
         "status": "fail",
diff --git a/server/server.js b/server/server.js
index 29b7fbe2..8a286d70 100644
--- a/server/server.js
+++ b/server/server.js
@@ -11,40 +11,42 @@ if (nodeVersion < requiredVersion) {
 }
 
 const args = require("args-parser")(process.argv);
-const { sleep, debug, getRandomInt, genSecret } = require("../src/util");
+const { sleep, log, getRandomInt, genSecret, debug } = require("../src/util");
 const config = require("./config");
 
-debug(args);
+log.info("server", "Welcome to Uptime Kuma");
+log.debug("server", "Arguments");
+log.debug("server", args);
 
 if (! process.env.NODE_ENV) {
     process.env.NODE_ENV = "production";
 }
 
-console.log("Node Env: " + process.env.NODE_ENV);
+log.info("server", "Node Env: " + process.env.NODE_ENV);
 
-console.log("Importing Node libraries");
+log.info("server", "Importing Node libraries");
 const fs = require("fs");
 const http = require("http");
 const https = require("https");
 
-console.log("Importing 3rd-party libraries");
-debug("Importing express");
+log.info("server", "Importing 3rd-party libraries");
+log.debug("server", "Importing express");
 const express = require("express");
-debug("Importing socket.io");
+log.debug("server", "Importing socket.io");
 const { Server } = require("socket.io");
-debug("Importing redbean-node");
+log.debug("server", "Importing redbean-node");
 const { R } = require("redbean-node");
-debug("Importing jsonwebtoken");
+log.debug("server", "Importing jsonwebtoken");
 const jwt = require("jsonwebtoken");
-debug("Importing http-graceful-shutdown");
+log.debug("server", "Importing http-graceful-shutdown");
 const gracefulShutdown = require("http-graceful-shutdown");
-debug("Importing prometheus-api-metrics");
+log.debug("server", "Importing prometheus-api-metrics");
 const prometheusAPIMetrics = require("prometheus-api-metrics");
-debug("Importing compare-versions");
+log.debug("server", "Importing compare-versions");
 const compareVersions = require("compare-versions");
 const { passwordStrength } = require("check-password-strength");
 
-debug("Importing 2FA Modules");
+log.debug("server", "Importing 2FA Modules");
 const notp = require("notp");
 const base32 = require("thirty-two");
 
@@ -69,23 +71,23 @@ class UptimeKumaServer {
 
 const server = module.exports = new UptimeKumaServer();
 
-console.log("Importing this project modules");
-debug("Importing Monitor");
+log.info("server", "Importing this project modules");
+log.debug("server", "Importing Monitor");
 const Monitor = require("./model/monitor");
-debug("Importing Settings");
+log.debug("server", "Importing Settings");
 const { getSettings, setSettings, setting, initJWTSecret, checkLogin, startUnitTest, FBSD, errorLog, doubleCheckPassword } = require("./util-server");
 
-debug("Importing Notification");
+log.debug("server", "Importing Notification");
 const { Notification } = require("./notification");
 Notification.init();
 
-debug("Importing Proxy");
+log.debug("server", "Importing Proxy");
 const { Proxy } = require("./proxy");
 
-debug("Importing Database");
+log.debug("server", "Importing Database");
 const Database = require("./database");
 
-debug("Importing Background Jobs");
+log.debug("server", "Importing Background Jobs");
 const { initBackgroundJobs, stopBackgroundJobs } = require("./jobs");
 const { loginRateLimiter, twoFaRateLimiter } = require("./rate-limiter");
 
@@ -94,7 +96,7 @@ const { login } = require("./auth");
 const passwordHash = require("./password-hash");
 
 const checkVersion = require("./check-version");
-console.info("Version: " + checkVersion.version);
+log.info("server", "Version: " + checkVersion.version);
 
 // If host is omitted, the server will accept connections on the unspecified IPv6 address (::) when IPv6 is available and the unspecified IPv4 address (0.0.0.0) otherwise.
 // Dual-stack support for (::)
@@ -103,7 +105,7 @@ let hostEnv = FBSD ? null : process.env.HOST;
 let hostname = args.host || process.env.UPTIME_KUMA_HOST || hostEnv;
 
 if (hostname) {
-    console.log("Custom hostname: " + hostname);
+    log.info("server", "Custom hostname: " + hostname);
 }
 
 const port = [args.port, process.env.UPTIME_KUMA_PORT, process.env.PORT, 3001]
@@ -117,7 +119,7 @@ const disableFrameSameOrigin = args["disable-frame-sameorigin"] || !!process.env
 const cloudflaredToken = args["cloudflared-token"] || process.env.UPTIME_KUMA_CLOUDFLARED_TOKEN || undefined;
 
 // 2FA / notp verification defaults
-const twofa_verification_opts = {
+const twoFAVerifyOptions = {
     "window": 1,
     "time": 30
 };
@@ -129,22 +131,22 @@ const twofa_verification_opts = {
 const testMode = !!args["test"] || false;
 
 if (config.demoMode) {
-    console.log("==== Demo Mode ====");
+    log.info("server", "==== Demo Mode ====");
 }
 
-console.log("Creating express and socket.io instance");
+log.info("server", "Creating express and socket.io instance");
 const app = express();
 
 let httpServer;
 
 if (sslKey && sslCert) {
-    console.log("Server Type: HTTPS");
+    log.info("server", "Server Type: HTTPS");
     httpServer = https.createServer({
         key: fs.readFileSync(sslKey),
         cert: fs.readFileSync(sslCert)
     }, app);
 } else {
-    console.log("Server Type: HTTP");
+    log.info("server", "Server Type: HTTP");
     httpServer = http.createServer(app);
 }
 
@@ -173,6 +175,7 @@ app.use(function (req, res, next) {
 
 /**
  * Total WebSocket client connected to server currently, no actual use
+ *
  * @type {number}
  */
 let totalClient = 0;
@@ -200,7 +203,7 @@ try {
 } catch (e) {
     // "dist/index.html" is not necessary for development
     if (process.env.NODE_ENV !== "development") {
-        console.error("Error: Cannot find 'dist/index.html', did you install correctly?");
+        log.error("server", "Error: Cannot find 'dist/index.html', did you install correctly?");
         process.exit(1);
     }
 }
@@ -212,7 +215,7 @@ try {
     exports.entryPage = await setting("entryPage");
     await StatusPage.loadDomainMappingList();
 
-    console.log("Adding route");
+    log.info("server", "Adding route");
 
     // ***************************
     // Normal Router here
@@ -270,7 +273,7 @@ try {
         }
     });
 
-    console.log("Adding socket handler");
+    log.info("server", "Adding socket handler");
     io.on("connection", async (socket) => {
 
         sendInfo(socket);
@@ -278,7 +281,7 @@ try {
         totalClient++;
 
         if (needSetup) {
-            console.log("Redirect to setup page");
+            log.info("server", "Redirect to setup page");
             socket.emit("setup");
         }
 
@@ -291,33 +294,40 @@ try {
         // ***************************
 
         socket.on("loginByToken", async (token, callback) => {
+            log.info("auth", `Login by token. IP=${getClientIp(socket)}`);
 
             try {
                 let decoded = jwt.verify(token, jwtSecret);
 
-                console.log("Username from JWT: " + decoded.username);
+                log.info("auth", "Username from JWT: " + decoded.username);
 
                 let user = await R.findOne("user", " username = ? AND active = 1 ", [
                     decoded.username,
                 ]);
 
                 if (user) {
-                    debug("afterLogin");
-
+                    log.debug("auth", "afterLogin");
                     afterLogin(socket, user);
+                    log.debug("auth", "afterLogin ok");
 
-                    debug("afterLogin ok");
+                    log.info("auth", `Successfully logged in user ${decoded.username}. IP=${getClientIp(socket)}`);
 
                     callback({
                         ok: true,
                     });
                 } else {
+
+                    log.info("auth", `Inactive or deleted user ${decoded.username}. IP=${getClientIp(socket)}`);
+
                     callback({
                         ok: false,
                         msg: "The user is inactive or deleted.",
                     });
                 }
             } catch (error) {
+
+                log.error("auth", `Invalid token. IP=${getClientIp(socket)}`);
+
                 callback({
                     ok: false,
                     msg: "Invalid token.",
@@ -327,7 +337,7 @@ try {
         });
 
         socket.on("login", async (data, callback) => {
-            console.log("Login");
+            log.info("auth", `Login by username + password. IP=${getClientIp(socket)}`);
 
             // Checking
             if (typeof callback !== "function") {
@@ -340,6 +350,7 @@ try {
 
             // Login Rate Limit
             if (! await loginRateLimiter.pass(callback)) {
+                log.info("auth", `Too many failed requests for user ${data.username}. IP=${getClientIp(socket)}`);
                 return;
             }
 
@@ -348,6 +359,9 @@ try {
             if (user) {
                 if (user.twofa_status == 0) {
                     afterLogin(socket, user);
+
+                    log.info("auth", `Successfully logged in user ${data.username}. IP=${getClientIp(socket)}`);
+
                     callback({
                         ok: true,
                         token: jwt.sign({
@@ -357,13 +371,16 @@ try {
                 }
 
                 if (user.twofa_status == 1 && !data.token) {
+
+                    log.info("auth", `2FA token required for user ${data.username}. IP=${getClientIp(socket)}`);
+
                     callback({
                         tokenRequired: true,
                     });
                 }
 
                 if (data.token) {
-                    let verify = notp.totp.verify(data.token, user.twofa_secret, twofa_verification_opts);
+                    let verify = notp.totp.verify(data.token, user.twofa_secret, twoFAVerifyOptions);
 
                     if (user.twofa_last_token !== data.token && verify) {
                         afterLogin(socket, user);
@@ -373,6 +390,8 @@ try {
                             socket.userID,
                         ]);
 
+                        log.info("auth", `Successfully logged in user ${data.username}. IP=${getClientIp(socket)}`);
+
                         callback({
                             ok: true,
                             token: jwt.sign({
@@ -380,6 +399,9 @@ try {
                             }, jwtSecret),
                         });
                     } else {
+
+                        log.warn("auth", `Invalid token provided for user ${data.username}. IP=${getClientIp(socket)}`);
+
                         callback({
                             ok: false,
                             msg: "Invalid Token!",
@@ -387,6 +409,9 @@ try {
                     }
                 }
             } else {
+
+                log.warn("auth", `Incorrect username or password for user ${data.username}. IP=${getClientIp(socket)}`);
+
                 callback({
                     ok: false,
                     msg: "Incorrect username or password.",
@@ -469,11 +494,16 @@ try {
                     socket.userID,
                 ]);
 
+                log.info("auth", `Saved 2FA token. IP=${getClientIp(socket)}`);
+
                 callback({
                     ok: true,
                     msg: "2FA Enabled.",
                 });
             } catch (error) {
+
+                log.error("auth", `Error changing 2FA token. IP=${getClientIp(socket)}`);
+
                 callback({
                     ok: false,
                     msg: error.message,
@@ -491,11 +521,16 @@ try {
                 await doubleCheckPassword(socket, currentPassword);
                 await TwoFA.disable2FA(socket.userID);
 
+                log.info("auth", `Disabled 2FA token. IP=${getClientIp(socket)}`);
+
                 callback({
                     ok: true,
                     msg: "2FA Disabled.",
                 });
             } catch (error) {
+
+                log.error("auth", `Error disabling 2FA token. IP=${getClientIp(socket)}`);
+
                 callback({
                     ok: false,
                     msg: error.message,
@@ -512,7 +547,7 @@ try {
                     socket.userID,
                 ]);
 
-                let verify = notp.totp.verify(token, user.twofa_secret, twofa_verification_opts);
+                let verify = notp.totp.verify(token, user.twofa_secret, twoFAVerifyOptions);
 
                 if (user.twofa_last_token !== token && verify) {
                     callback({
@@ -622,6 +657,8 @@ try {
                 await server.sendMonitorList(socket);
                 await startMonitor(socket.userID, bean.id);
 
+                log.info("monitor", `Added Monitor: ${monitor.id} User ID: ${socket.userID}`);
+
                 callback({
                     ok: true,
                     msg: "Added Successfully.",
@@ -629,6 +666,9 @@ try {
                 });
 
             } catch (e) {
+
+                log.error("monitor", `Error adding Monitor: ${monitor.id} User ID: ${socket.userID}`);
+
                 callback({
                     ok: false,
                     msg: e.message,
@@ -691,7 +731,7 @@ try {
                 });
 
             } catch (e) {
-                console.error(e);
+                log.error("monitor", e);
                 callback({
                     ok: false,
                     msg: e.message,
@@ -707,7 +747,7 @@ try {
                     ok: true,
                 });
             } catch (e) {
-                console.error(e);
+                log.error("monitor", e);
                 callback({
                     ok: false,
                     msg: e.message,
@@ -719,7 +759,7 @@ try {
             try {
                 checkLogin(socket);
 
-                console.log(`Get Monitor: ${monitorID} User ID: ${socket.userID}`);
+                log.info("monitor", `Get Monitor: ${monitorID} User ID: ${socket.userID}`);
 
                 let bean = await R.findOne("monitor", " id = ? AND user_id = ? ", [
                     monitorID,
@@ -743,7 +783,7 @@ try {
             try {
                 checkLogin(socket);
 
-                console.log(`Get Monitor Beats: ${monitorID} User ID: ${socket.userID}`);
+                log.info("monitor", `Get Monitor Beats: ${monitorID} User ID: ${socket.userID}`);
 
                 if (period == null) {
                     throw new Error("Invalid period.");
@@ -814,7 +854,7 @@ try {
             try {
                 checkLogin(socket);
 
-                console.log(`Delete Monitor: ${monitorID} User ID: ${socket.userID}`);
+                log.info("manage", `Delete Monitor: ${monitorID} User ID: ${socket.userID}`);
 
                 if (monitorID in server.monitorList) {
                     server.monitorList[monitorID].stop();
@@ -1146,7 +1186,7 @@ try {
 
                 let backupData = JSON.parse(uploadedJSON);
 
-                console.log(`Importing Backup, User ID: ${socket.userID}, Version: ${backupData.version}`);
+                log.info("manage", `Importing Backup, User ID: ${socket.userID}, Version: ${backupData.version}`);
 
                 let notificationListData = backupData.notificationList;
                 let proxyListData = backupData.proxyList;
@@ -1189,7 +1229,7 @@ try {
                 }
 
                 // Only starts importing if the backup file contains at least one proxy
-                if (proxyListData.length >= 1) {
+                if (proxyListData && proxyListData.length >= 1) {
                     const proxies = await R.findAll("proxy");
 
                     // Loop over proxy list and save proxies
@@ -1341,7 +1381,7 @@ try {
             try {
                 checkLogin(socket);
 
-                console.log(`Clear Events Monitor: ${monitorID} User ID: ${socket.userID}`);
+                log.info("manage", `Clear Events Monitor: ${monitorID} User ID: ${socket.userID}`);
 
                 await R.exec("UPDATE heartbeat SET msg = ?, important = ? WHERE monitor_id = ? ", [
                     "",
@@ -1367,7 +1407,7 @@ try {
             try {
                 checkLogin(socket);
 
-                console.log(`Clear Heartbeats Monitor: ${monitorID} User ID: ${socket.userID}`);
+                log.info("manage", `Clear Heartbeats Monitor: ${monitorID} User ID: ${socket.userID}`);
 
                 await R.exec("DELETE FROM heartbeat WHERE monitor_id = ?", [
                     monitorID
@@ -1391,7 +1431,7 @@ try {
             try {
                 checkLogin(socket);
 
-                console.log(`Clear Statistics User ID: ${socket.userID}`);
+                log.info("manage", `Clear Statistics User ID: ${socket.userID}`);
 
                 await R.exec("DELETE FROM heartbeat");
 
@@ -1413,24 +1453,24 @@ try {
         databaseSocketHandler(socket);
         proxySocketHandler(socket);
 
-        debug("added all socket handlers");
+        log.debug("server", "added all socket handlers");
 
         // ***************************
         // Better do anything after added all socket handlers here
         // ***************************
 
-        debug("check auto login");
+        log.debug("auth", "check auto login");
         if (await setting("disableAuth")) {
-            console.log("Disabled Auth: auto login to admin");
+            log.info("auth", "Disabled Auth: auto login to admin");
             afterLogin(socket, await R.findOne("user"));
             socket.emit("autoLogin");
         } else {
-            debug("need auth");
+            log.debug("auth", "need auth");
         }
 
     });
 
-    console.log("Init the server");
+    log.info("server", "Init the server");
 
     httpServer.once("error", async (err) => {
         console.error("Cannot listen: " + err.message);
@@ -1439,9 +1479,9 @@ try {
 
     httpServer.listen(port, hostname, () => {
         if (hostname) {
-            console.log(`Listening on ${hostname}:${port}`);
+            log.info("server", `Listening on ${hostname}:${port}`);
         } else {
-            console.log(`Listening on ${port}`);
+            log.info("server", `Listening on ${port}`);
         }
         startMonitors();
         checkVersion.startInterval();
@@ -1555,13 +1595,13 @@ async function getMonitorJSONList(userID) {
  */
 async function initDatabase(testMode = false) {
     if (! fs.existsSync(Database.path)) {
-        console.log("Copying Database");
+        log.info("server", "Copying Database");
         fs.copyFileSync(Database.templatePath, Database.path);
     }
 
-    console.log("Connecting to the Database");
+    log.info("server", "Connecting to the Database");
     await Database.connect(testMode);
-    console.log("Connected");
+    log.info("server", "Connected");
 
     // Patch the database
     await Database.patch();
@@ -1571,16 +1611,16 @@ async function initDatabase(testMode = false) {
     ]);
 
     if (! jwtSecretBean) {
-        console.log("JWT secret is not found, generate one.");
+        log.info("server", "JWT secret is not found, generate one.");
         jwtSecretBean = await initJWTSecret();
-        console.log("Stored JWT secret into database");
+        log.info("server", "Stored JWT secret into database");
     } else {
-        console.log("Load JWT secret from database.");
+        log.info("server", "Load JWT secret from database.");
     }
 
     // If there is no record in user table, it is a new Uptime Kuma instance, need to setup
     if ((await R.count("user")) === 0) {
-        console.log("No user, need setup");
+        log.info("server", "No user, need setup");
         needSetup = true;
     }
 
@@ -1597,7 +1637,7 @@ async function initDatabase(testMode = false) {
 async function startMonitor(userID, monitorID) {
     await checkOwner(userID, monitorID);
 
-    console.log(`Resume Monitor: ${monitorID} User ID: ${userID}`);
+    log.info("manage", `Resume Monitor: ${monitorID} User ID: ${userID}`);
 
     await R.exec("UPDATE monitor SET active = 1 WHERE id = ? AND user_id = ? ", [
         monitorID,
@@ -1630,7 +1670,7 @@ async function restartMonitor(userID, monitorID) {
 async function pauseMonitor(userID, monitorID) {
     await checkOwner(userID, monitorID);
 
-    console.log(`Pause Monitor: ${monitorID} User ID: ${userID}`);
+    log.info("manage", `Pause Monitor: ${monitorID} User ID: ${userID}`);
 
     await R.exec("UPDATE monitor SET active = 0 WHERE id = ? AND user_id = ? ", [
         monitorID,
@@ -1666,10 +1706,10 @@ async function startMonitors() {
  * Generated by Trelent
  */
 async function shutdownFunction(signal) {
-    console.log("Shutdown requested");
-    console.log("Called signal: " + signal);
+    log.info("server", "Shutdown requested");
+    log.info("server", "Called signal: " + signal);
 
-    console.log("Stopping all monitors");
+    log.info("server", "Stopping all monitors");
     for (let id in server.monitorList) {
         let monitor = server.monitorList[id];
         monitor.stop();
@@ -1681,8 +1721,12 @@ async function shutdownFunction(signal) {
     await cloudflaredStop();
 }
 
+function getClientIp(socket) {
+    return socket.client.conn.remoteAddress.replace(/^.*:/, "");
+}
+
 function finalFunction() {
-    console.log("Graceful shutdown successful!");
+    log.info("server", "Graceful shutdown successful!");
 }
 
 gracefulShutdown(httpServer, {
diff --git a/server/socket-handlers/status-page-socket-handler.js b/server/socket-handlers/status-page-socket-handler.js
index c844136e..36e90fb9 100644
--- a/server/socket-handlers/status-page-socket-handler.js
+++ b/server/socket-handlers/status-page-socket-handler.js
@@ -1,7 +1,7 @@
 const { R } = require("redbean-node");
-const { checkLogin, setSettings, setSetting } = require("../util-server");
+const { checkLogin, setSetting } = require("../util-server");
 const dayjs = require("dayjs");
-const { debug } = require("../../src/util");
+const { log } = require("../../src/util");
 const ImageDataURI = require("../image-data-uri");
 const Database = require("../database");
 const apicache = require("../modules/apicache");
@@ -202,8 +202,8 @@ module.exports.statusPageSocketHandler = (socket) => {
                 group.id = groupBean.id;
             }
 
-            // Delete groups that not in the list
-            debug("Delete groups that not in the list");
+            // Delete groups that are not in the list
+            log.debug("socket", "Delete groups that are not in the list");
             const slots = groupIDList.map(() => "?").join(",");
 
             const data = [
@@ -226,7 +226,7 @@ module.exports.statusPageSocketHandler = (socket) => {
             });
 
         } catch (error) {
-            console.error(error);
+            log.error("socket", error);
 
             callback({
                 ok: false,
diff --git a/server/util-server.js b/server/util-server.js
index b2c70d92..482fbaea 100644
--- a/server/util-server.js
+++ b/server/util-server.js
@@ -1,10 +1,10 @@
 const tcpp = require("tcp-ping");
 const Ping = require("./ping-lite");
 const { R } = require("redbean-node");
-const { debug, genSecret } = require("../src/util");
+const { log, genSecret } = require("../src/util");
 const passwordHash = require("./password-hash");
 const { Resolver } = require("dns");
-const child_process = require("child_process");
+const childProcess = require("child_process");
 const iconv = require("iconv-lite");
 const chardet = require("chardet");
 const fs = require("fs");
@@ -88,9 +88,9 @@ exports.pingAsync = function (hostname, ipv6 = false) {
     });
 };
 
-exports.dnsResolve = function (hostname, resolver_server, rrtype) {
+exports.dnsResolve = function (hostname, resolverServer, rrtype) {
     const resolver = new Resolver();
-    resolver.setServers([resolver_server]);
+    resolver.setServers([resolverServer]);
     return new Promise((resolve, reject) => {
         if (rrtype == "PTR") {
             resolver.reverse(hostname, (err, records) => {
@@ -119,7 +119,7 @@ exports.setting = async function (key) {
 
     try {
         const v = JSON.parse(value);
-        debug(`Get Setting: ${key}: ${v}`);
+        log.debug("util", `Get Setting: ${key}: ${v}`);
         return v;
     } catch (e) {
         return value;
@@ -206,7 +206,7 @@ const parseCertificateInfo = function (info) {
     const existingList = {};
 
     while (link) {
-        debug(`[${i}] ${link.fingerprint}`);
+        log.debug("util", `[${i}] ${link.fingerprint}`);
 
         if (!link.valid_from || !link.valid_to) {
             break;
@@ -221,7 +221,7 @@ const parseCertificateInfo = function (info) {
         if (link.issuerCertificate == null) {
             break;
         } else if (link.issuerCertificate.fingerprint in existingList) {
-            debug(`[Last] ${link.issuerCertificate.fingerprint}`);
+            log.debug("util", `[Last] ${link.issuerCertificate.fingerprint}`);
             link.issuerCertificate = null;
             break;
         } else {
@@ -242,7 +242,7 @@ exports.checkCertificate = function (res) {
     const info = res.request.res.socket.getPeerCertificate(true);
     const valid = res.request.res.socket.authorized || false;
 
-    debug("Parsing Certificate Info");
+    log.debug("util", "Parsing Certificate Info");
     const parsedInfo = parseCertificateInfo(info);
 
     return {
@@ -257,19 +257,19 @@ exports.checkCertificate = function (res) {
 // Return: true if the status code is within the accepted ranges, false otherwise
 // Will throw an error if the provided status code is not a valid range string or code string
 
-exports.checkStatusCode = function (status, accepted_codes) {
-    if (accepted_codes == null || accepted_codes.length === 0) {
+exports.checkStatusCode = function (status, acceptedCodes) {
+    if (acceptedCodes == null || acceptedCodes.length === 0) {
         return false;
     }
 
-    for (const code_range of accepted_codes) {
-        const code_range_split = code_range.split("-").map(string => parseInt(string));
-        if (code_range_split.length === 1) {
-            if (status === code_range_split[0]) {
+    for (const codeRange of acceptedCodes) {
+        const codeRangeSplit = codeRange.split("-").map(string => parseInt(string));
+        if (codeRangeSplit.length === 1) {
+            if (status === codeRangeSplit[0]) {
                 return true;
             }
-        } else if (code_range_split.length === 2) {
-            if (status >= code_range_split[0] && status <= code_range_split[1]) {
+        } else if (codeRangeSplit.length === 2) {
+            if (status >= codeRangeSplit[0] && status <= codeRangeSplit[1]) {
                 return true;
             }
         } else {
@@ -345,7 +345,7 @@ exports.doubleCheckPassword = async (socket, currentPassword) => {
 exports.startUnitTest = async () => {
     console.log("Starting unit test...");
     const npm = /^win/.test(process.platform) ? "npm.cmd" : "npm";
-    const child = child_process.spawn(npm, ["run", "jest"]);
+    const child = childProcess.spawn(npm, ["run", "jest"]);
 
     child.stdout.on("data", (data) => {
         console.log(data.toString());
@@ -367,7 +367,6 @@ exports.startUnitTest = async () => {
  */
 exports.convertToUTF8 = (body) => {
     const guessEncoding = chardet.detect(body);
-    //debug("Guess Encoding: " + guessEncoding);
     const str = iconv.decode(body, guessEncoding);
     return str.toString();
 };
diff --git a/src/App.vue b/src/App.vue
index 099450d4..f102360c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,12 +1,12 @@
 <template>
-  <router-view />
+    <router-view />
 </template>
 
 <script>
 import { setPageLocale } from "./util-frontend";
 export default {
-  created() {
-    setPageLocale();
-  },
+    created() {
+        setPageLocale();
+    },
 };
 </script>
diff --git a/src/components/Confirm.vue b/src/components/Confirm.vue
index 391155f4..fe5bf288 100644
--- a/src/components/Confirm.vue
+++ b/src/components/Confirm.vue
@@ -25,7 +25,7 @@
 </template>
 
 <script>
-import { Modal } from "bootstrap"
+import { Modal } from "bootstrap";
 
 export default {
     props: {
@@ -42,19 +42,20 @@ export default {
             default: "No",
         },
     },
+    emits: ["yes"],
     data: () => ({
         modal: null,
     }),
     mounted() {
-        this.modal = new Modal(this.$refs.modal)
+        this.modal = new Modal(this.$refs.modal);
     },
     methods: {
         show() {
-            this.modal.show()
+            this.modal.show();
         },
         yes() {
             this.$emit("yes");
         },
     },
-}
+};
 </script>
diff --git a/src/components/CopyableInput.vue b/src/components/CopyableInput.vue
index 1fe89802..08b60ddd 100644
--- a/src/components/CopyableInput.vue
+++ b/src/components/CopyableInput.vue
@@ -57,6 +57,7 @@ export default {
             default: undefined,
         },
     },
+    emits: ["update:modelValue"],
     data() {
         return {
             visibility: "password",
diff --git a/src/components/CountUp.vue b/src/components/CountUp.vue
index b321fde1..5a0deb74 100644
--- a/src/components/CountUp.vue
+++ b/src/components/CountUp.vue
@@ -5,7 +5,7 @@
 
 <script lang="ts">
 
-import { sleep } from "../util.ts"
+import { sleep } from "../util.ts";
 
 export default {
 
@@ -25,12 +25,12 @@ export default {
         return {
             output: "",
             frameDuration: 30,
-        }
+        };
     },
 
     computed: {
         isNum() {
-            return typeof this.value === "number"
+            return typeof this.value === "number";
         },
     },
 
@@ -45,7 +45,7 @@ export default {
             } else {
                 for (let i = 1; i < frames; i++) {
                     this.output += step;
-                    await sleep(15)
+                    await sleep(15);
                 }
             }
 
@@ -59,5 +59,5 @@ export default {
 
     methods: {},
 
-}
+};
 </script>
diff --git a/src/components/Datetime.vue b/src/components/Datetime.vue
index 1df982cb..8662e6d8 100644
--- a/src/components/Datetime.vue
+++ b/src/components/Datetime.vue
@@ -4,12 +4,12 @@
 
 <script>
 import dayjs from "dayjs";
-import relativeTime from "dayjs/plugin/relativeTime"
-import utc from "dayjs/plugin/utc"
-import timezone from "dayjs/plugin/timezone" // dependent on utc plugin
-dayjs.extend(utc)
-dayjs.extend(timezone)
-dayjs.extend(relativeTime)
+import relativeTime from "dayjs/plugin/relativeTime";
+import utc from "dayjs/plugin/utc";
+import timezone from "dayjs/plugin/timezone"; // dependent on utc plugin
+dayjs.extend(utc);
+dayjs.extend(timezone);
+dayjs.extend(relativeTime);
 
 export default {
     props: {
@@ -29,5 +29,5 @@ export default {
             }
         },
     },
-}
+};
 </script>
diff --git a/src/components/HeartbeatBar.vue b/src/components/HeartbeatBar.vue
index be0b122e..245a8512 100644
--- a/src/components/HeartbeatBar.vue
+++ b/src/components/HeartbeatBar.vue
@@ -38,7 +38,7 @@ export default {
             beatMargin: 4,
             move: false,
             maxBeat: -1,
-        }
+        };
     },
     computed: {
 
@@ -69,12 +69,12 @@ export default {
             if (start < 0) {
                 // Add empty placeholder
                 for (let i = start; i < 0; i++) {
-                    placeholders.push(0)
+                    placeholders.push(0);
                 }
                 start = 0;
             }
 
-            return placeholders.concat(this.beatList.slice(start))
+            return placeholders.concat(this.beatList.slice(start));
         },
 
         wrapStyle() {
@@ -84,7 +84,7 @@ export default {
             return {
                 padding: `${topBottom}px ${leftRight}px`,
                 width: "100%",
-            }
+            };
         },
 
         barStyle() {
@@ -94,12 +94,12 @@ export default {
                 return {
                     transition: "all ease-in-out 0.25s",
                     transform: `translateX(${width}px)`,
-                }
+                };
 
             }
             return {
                 transform: "translateX(0)",
-            }
+            };
 
         },
 
@@ -109,7 +109,7 @@ export default {
                 height: this.beatHeight + "px",
                 margin: this.beatMargin + "px",
                 "--hover-scale": this.hoverScale,
-            }
+            };
         },
 
     },
@@ -120,7 +120,7 @@ export default {
 
                 setTimeout(() => {
                     this.move = false;
-                }, 300)
+                }, 300);
             },
             deep: true,
         },
@@ -162,15 +162,15 @@ export default {
     methods: {
         resize() {
             if (this.$refs.wrap) {
-                this.maxBeat = Math.floor(this.$refs.wrap.clientWidth / (this.beatWidth + this.beatMargin * 2))
+                this.maxBeat = Math.floor(this.$refs.wrap.clientWidth / (this.beatWidth + this.beatMargin * 2));
             }
         },
 
         getBeatTitle(beat) {
-            return `${this.$root.datetime(beat.time)}` + ((beat.msg) ? ` - ${beat.msg}` : ``);
+            return `${this.$root.datetime(beat.time)}` + ((beat.msg) ? ` - ${beat.msg}` : "");
         }
     },
-}
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/HiddenInput.vue b/src/components/HiddenInput.vue
index 2b588af1..a9a789ce 100644
--- a/src/components/HiddenInput.vue
+++ b/src/components/HiddenInput.vue
@@ -48,18 +48,19 @@ export default {
             default: undefined,
         },
     },
+    emits: ["update:modelValue"],
     data() {
         return {
             visibility: "password",
-        }
+        };
     },
     computed: {
         model: {
             get() {
-                return this.modelValue
+                return this.modelValue;
             },
             set(value) {
-                this.$emit("update:modelValue", value)
+                this.$emit("update:modelValue", value);
             }
         }
     },
@@ -74,5 +75,5 @@ export default {
             this.visibility = "password";
         },
     }
-}
+};
 </script>
diff --git a/src/components/MonitorList.vue b/src/components/MonitorList.vue
index 325245a6..c8de6a6f 100644
--- a/src/components/MonitorList.vue
+++ b/src/components/MonitorList.vue
@@ -21,7 +21,7 @@
 
             <router-link v-for="(item, index) in sortedMonitorList" :key="index" :to="monitorURL(item.id)" class="item" :class="{ 'disabled': ! item.active }">
                 <div class="row">
-                    <div class="col-9 col-md-8 small-padding" :class="{ 'monitorItem': $root.userHeartbeatBar == 'bottom' || $root.userHeartbeatBar == 'none' }">
+                    <div class="col-9 col-md-8 small-padding" :class="{ 'monitor-item': $root.userHeartbeatBar == 'bottom' || $root.userHeartbeatBar == 'none' }">
                         <div class="info">
                             <Uptime :monitor="item" type="24" :pill="true" />
                             {{ item.name }}
@@ -172,7 +172,7 @@ export default {
 
 .dark {
     .footer {
-      //  background-color: $dark-bg;
+        //  background-color: $dark-bg;
     }
 }
 
@@ -198,7 +198,7 @@ export default {
     max-width: 15em;
 }
 
-.monitorItem {
+.monitor-item {
     width: 100%;
 }
 
diff --git a/src/components/NotificationDialog.vue b/src/components/NotificationDialog.vue
index 8c03dbbd..96ab8580 100644
--- a/src/components/NotificationDialog.vue
+++ b/src/components/NotificationDialog.vue
@@ -69,7 +69,6 @@
 
 <script lang="ts">
 import { Modal } from "bootstrap";
-import { ucfirst } from "../util.ts";
 
 import Confirm from "./Confirm.vue";
 import NotificationFormList from "./notifications";
diff --git a/src/components/PingChart.vue b/src/components/PingChart.vue
index aa209fab..9132b4e9 100644
--- a/src/components/PingChart.vue
+++ b/src/components/PingChart.vue
@@ -24,7 +24,7 @@ import timezone from "dayjs/plugin/timezone";
 import "chartjs-adapter-dayjs";
 import { LineChart } from "vue-chart-3";
 import { useToast } from "vue-toastification";
-import { UP, DOWN, PENDING } from "../util.ts";
+import { DOWN } from "../util.ts";
 
 dayjs.extend(utc);
 dayjs.extend(timezone);
@@ -220,6 +220,7 @@ export default {
             if (newPeriod == "0") {
                 newPeriod = null;
                 this.heartbeatList = null;
+                this.$root.storage().removeItem(`chart-period-${this.monitorId}`);
             } else {
                 this.loading = true;
 
@@ -228,6 +229,7 @@ export default {
                         toast.error(res.msg);
                     } else {
                         this.heartbeatList = res.data;
+                        this.$root.storage()[`chart-period-${this.monitorId}`] = newPeriod;
                     }
                     this.loading = false;
                 });
@@ -248,6 +250,12 @@ export default {
             },
             { deep: true }
         );
+
+        // Load chart period from storage if saved
+        let period = this.$root.storage()[`chart-period-${this.monitorId}`];
+        if (period != null) {
+            this.chartPeriodHrs = Math.min(period, 6);
+        }
     }
 };
 </script>
@@ -278,7 +286,7 @@ export default {
 
         .dropdown-item {
             border-radius: 0.3rem;
-            padding: 2px 16px 4px 16px;
+            padding: 2px 16px 4px;
 
             .dark & {
                 background: $dark-bg;
@@ -286,6 +294,7 @@ export default {
 
             .dark &:hover {
                 background: $dark-font-color;
+                color: $dark-font-color2;
             }
         }
 
diff --git a/src/components/ProxyDialog.vue b/src/components/ProxyDialog.vue
index c1895e5b..a6c23465 100644
--- a/src/components/ProxyDialog.vue
+++ b/src/components/ProxyDialog.vue
@@ -25,7 +25,7 @@
                             <label for="proxy-host" class="form-label">{{ $t("Proxy Server") }}</label>
                             <div class="d-flex">
                                 <input id="proxy-host" v-model="proxy.host" type="text" class="form-control" required :placeholder="$t('Server Address')">
-                                <input v-model="proxy.port" type="number" class="form-control ms-2" style="width: 100px" required min="1" max="65535" :placeholder="$t('Port')">
+                                <input v-model="proxy.port" type="number" class="form-control ms-2" style="width: 100px;" required min="1" max="65535" :placeholder="$t('Port')">
                             </div>
                         </div>
 
diff --git a/src/components/PublicGroupList.vue b/src/components/PublicGroupList.vue
index 37440e31..df94eec9 100644
--- a/src/components/PublicGroupList.vue
+++ b/src/components/PublicGroupList.vue
@@ -145,7 +145,7 @@ export default {
 
 .mobile {
     .item {
-        padding: 13px 0 10px 0;
+        padding: 13px 0 10px;
     }
 }
 
diff --git a/src/components/Tag.vue b/src/components/Tag.vue
index 434358aa..364a05c6 100644
--- a/src/components/Tag.vue
+++ b/src/components/Tag.vue
@@ -41,7 +41,7 @@ export default {
             }
         }
     }
-}
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/ToggleSection.vue b/src/components/ToggleSection.vue
index bc6028d7..daf9c00c 100644
--- a/src/components/ToggleSection.vue
+++ b/src/components/ToggleSection.vue
@@ -49,7 +49,7 @@ export default {
 <style lang="scss" scoped>
 @import "../assets/vars.scss";
 
-h5:after {
+h5::after {
     content: "";
     display: block;
     width: 50%;
diff --git a/src/components/TwoFADialog.vue b/src/components/TwoFADialog.vue
index 8a773d6b..049f7c87 100644
--- a/src/components/TwoFADialog.vue
+++ b/src/components/TwoFADialog.vue
@@ -46,7 +46,7 @@
                                     <input v-model="token" type="text" maxlength="6" class="form-control">
                                     <button class="btn btn-outline-primary" type="button" @click="verifyToken()">{{ $t("Verify Token") }}</button>
                                 </div>
-                                <p v-show="tokenValid" class="mt-2" style="color: green">{{ $t("tokenValidSettingsMsg") }}</p>
+                                <p v-show="tokenValid" class="mt-2" style="color: green;">{{ $t("tokenValidSettingsMsg") }}</p>
                             </div>
                         </div>
                     </div>
diff --git a/src/components/Uptime.vue b/src/components/Uptime.vue
index 2717672c..3a63c6d0 100644
--- a/src/components/Uptime.vue
+++ b/src/components/Uptime.vue
@@ -22,33 +22,33 @@ export default {
                 return Math.round(this.$root.uptimeList[key] * 10000) / 100 + "%";
             }
 
-            return this.$t("notAvailableShort")
+            return this.$t("notAvailableShort");
         },
 
         color() {
             if (this.lastHeartBeat.status === 0) {
-                return "danger"
+                return "danger";
             }
 
             if (this.lastHeartBeat.status === 1) {
-                return "primary"
+                return "primary";
             }
 
             if (this.lastHeartBeat.status === 2) {
-                return "warning"
+                return "warning";
             }
 
-            return "secondary"
+            return "secondary";
         },
 
         lastHeartBeat() {
             if (this.monitor.id in this.$root.lastHeartbeatList && this.$root.lastHeartbeatList[this.monitor.id]) {
-                return this.$root.lastHeartbeatList[this.monitor.id]
+                return this.$root.lastHeartbeatList[this.monitor.id];
             }
 
             return {
                 status: -1,
-            }
+            };
         },
 
         className() {
@@ -59,7 +59,7 @@ export default {
             return "";
         },
     },
-}
+};
 </script>
 
 <style>
diff --git a/src/components/notifications/Gotify.vue b/src/components/notifications/Gotify.vue
index 9e16d4e4..5c294f6d 100644
--- a/src/components/notifications/Gotify.vue
+++ b/src/components/notifications/Gotify.vue
@@ -28,5 +28,5 @@ export default {
             this.$parent.notification.gotifyPriority = 8;
         }
     },
-}
+};
 </script>
diff --git a/src/components/notifications/Mattermost.vue b/src/components/notifications/Mattermost.vue
index 2d174146..4d42999e 100644
--- a/src/components/notifications/Mattermost.vue
+++ b/src/components/notifications/Mattermost.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="mb-3">
-        <label for="mattermost-webhook-url" class="form-label">{{ $t("Webhook URL") }}<span style="color:red;"><sup>*</sup></span></label>
+        <label for="mattermost-webhook-url" class="form-label">{{ $t("Webhook URL") }}<span style="color: red;"><sup>*</sup></span></label>
         <input id="mattermost-webhook-url" v-model="$parent.notification.mattermostWebhookUrl" type="text" class="form-control" required>
         <label for="mattermost-username" class="form-label">{{ $t("Username") }}</label>
         <input id="mattermost-username" v-model="$parent.notification.mattermostusername" type="text" class="form-control">
@@ -11,7 +11,7 @@
         <label for="mattermost-channel" class="form-label">{{ $t("Channel Name") }}</label>
         <input id="mattermost-channel-name" v-model="$parent.notification.mattermostchannel" type="text" class="form-control">
         <div class="form-text">
-            <span style="color:red;"><sup>*</sup></span>{{ $t("Required") }}
+            <span style="color: red;"><sup>*</sup></span>{{ $t("Required") }}
             <i18n-t tag="p" keypath="aboutWebhooks" style="margin-top: 8px;">
                 <a href="https://docs.mattermost.com/developer/webhooks-incoming.html" target="_blank">https://docs.mattermost.com/developer/webhooks-incoming.html</a>
             </i18n-t>
diff --git a/src/components/notifications/OneBot.vue b/src/components/notifications/OneBot.vue
new file mode 100644
index 00000000..63604d60
--- /dev/null
+++ b/src/components/notifications/OneBot.vue
@@ -0,0 +1,34 @@
+<template>
+    <div class="mb-3">
+        <div class="mb-3">
+            <label for="onebot-http-addr" class="form-label">{{ $t("onebotHttpAddress") }}<span style="color: red;"><sup>*</sup></span></label>
+            <input id="HttpUrl" v-model="$parent.notification.httpAddr" type="text" class="form-control" required>
+        </div>
+        <div class="mb-3">
+            <label for="onebot-access-token" class="form-label">AccessToken<span style="color: red;"><sup>*</sup></span></label>
+            <input id="HttpUrl" v-model="$parent.notification.accessToken" type="text" class="form-control" required>
+            <div class="form-text">
+                <p>{{ $t("onebotSafetyTips") }}</p>
+            </div>
+        </div>
+
+        <div class="mb-3">
+            <label for="onebot-msg-type" class="form-label">{{ $t("onebotMessageType") }}</label>
+            <select id="onebot-msg-type" v-model="$parent.notification.msgType" class="form-select">
+                <option value="group">{{ $t("onebotGroupMessage") }}</option>
+                <option value="private">{{ $t("onebotPrivateMessage") }}</option>
+            </select>
+        </div>
+
+        <div class="mb-3">
+            <label for="onebot-reciever-id" class="form-label">{{ $t("onebotUserOrGroupId") }}<span style="color: red;"><sup>*</sup></span></label>
+            <input id="secretKey" v-model="$parent.notification.recieverId" type="text" class="form-control" required>
+        </div>
+
+        <div class="form-text">
+            <i18n-t tag="p" keypath="Read more:">
+                <a href="https://github.com/botuniverse/onebot-11" target="_blank">https://github.com/botuniverse/onebot-11</a>
+            </i18n-t>
+        </div>
+    </div>
+</template>
diff --git a/src/components/notifications/PushDeer.vue b/src/components/notifications/PushDeer.vue
new file mode 100644
index 00000000..c2b7f5cb
--- /dev/null
+++ b/src/components/notifications/PushDeer.vue
@@ -0,0 +1,19 @@
+<template>
+    <div class="mb-3">
+        <label for="pushdeer-key" class="form-label">{{ $t("PushDeer Key") }}</label>
+        <HiddenInput id="pushdeer-key" v-model="$parent.notification.pushdeerKey" :required="true" autocomplete="one-time-code" placeholder="PDUxxxx"></HiddenInput>
+    </div>
+
+    <i18n-t tag="p" keypath="More info on:" style="margin-top: 8px;">
+        <a href="http://www.pushdeer.com/" rel="noopener noreferrer" target="_blank">http://www.pushdeer.com/</a>
+    </i18n-t>
+</template>
+
+<script>
+import HiddenInput from "../HiddenInput.vue";
+export default {
+    components: {
+        HiddenInput,
+    },
+};
+</script>
diff --git a/src/components/notifications/Pushover.vue b/src/components/notifications/Pushover.vue
index af6e9d83..ee6276dd 100644
--- a/src/components/notifications/Pushover.vue
+++ b/src/components/notifications/Pushover.vue
@@ -63,5 +63,5 @@ export default {
     components: {
         HiddenInput,
     },
-}
+};
 </script>
diff --git a/src/components/notifications/index.js b/src/components/notifications/index.js
index 8d14e7f2..496d35fa 100644
--- a/src/components/notifications/index.js
+++ b/src/components/notifications/index.js
@@ -24,11 +24,13 @@ import AliyunSMS from "./AliyunSms.vue";
 import DingDing from "./DingDing.vue";
 import Bark from "./Bark.vue";
 import SerwerSMS from "./SerwerSMS.vue";
-import Stackfield from './Stackfield.vue';
+import Stackfield from "./Stackfield.vue";
 import WeCom from "./WeCom.vue";
 import GoogleChat from "./GoogleChat.vue";
 import Gorush from "./Gorush.vue";
 import Alerta from "./Alerta.vue";
+import OneBot from "./OneBot.vue";
+import PushDeer from "./PushDeer.vue";
 
 /**
  * Manage all notification form.
@@ -67,6 +69,8 @@ const NotificationFormList = {
     "GoogleChat": GoogleChat,
     "gorush": Gorush,
     "alerta": Alerta,
+    "OneBot": OneBot,
+    "PushDeer": PushDeer,
 };
 
 export default NotificationFormList;
diff --git a/src/components/settings/About.vue b/src/components/settings/About.vue
index ad134094..b4d7b659 100644
--- a/src/components/settings/About.vue
+++ b/src/components/settings/About.vue
@@ -44,6 +44,7 @@ export default {
 .logo {
     margin: 4em 1em;
 }
+
 .update-link {
     font-size: 0.9em;
 }
diff --git a/src/components/settings/Backup.vue b/src/components/settings/Backup.vue
index 6ac28d46..ba0f92f0 100644
--- a/src/components/settings/Backup.vue
+++ b/src/components/settings/Backup.vue
@@ -69,7 +69,7 @@
 
             <div class="mb-2">
                 <input
-                    id="importBackup"
+                    id="import-backend"
                     type="file"
                     class="form-control"
                     accept="application/json"
@@ -94,7 +94,7 @@
             <div
                 v-if="importAlert"
                 class="alert alert-danger mt-3"
-                style="padding: 6px 16px"
+                style="padding: 6px 16px;"
             >
                 {{ importAlert }}
             </div>
@@ -159,7 +159,7 @@ export default {
 
         importBackup() {
             this.processing = true;
-            let uploadItem = document.getElementById("importBackup").files;
+            let uploadItem = document.getElementById("import-backend").files;
 
             if (uploadItem.length <= 0) {
                 this.processing = false;
@@ -198,7 +198,7 @@ export default {
 @import "../../assets/vars.scss";
 
 .dark {
-    #importBackup {
+    #import-backend {
         &::file-selector-button {
             color: $primary;
             background-color: $dark-bg;
diff --git a/src/components/settings/General.vue b/src/components/settings/General.vue
index e6896945..a175988b 100644
--- a/src/components/settings/General.vue
+++ b/src/components/settings/General.vue
@@ -189,4 +189,3 @@ export default {
 };
 </script>
 
-<style></style>
diff --git a/src/components/settings/MonitorHistory.vue b/src/components/settings/MonitorHistory.vue
index 9b5b8bd7..0092727f 100644
--- a/src/components/settings/MonitorHistory.vue
+++ b/src/components/settings/MonitorHistory.vue
@@ -52,7 +52,7 @@
 
 <script>
 import Confirm from "../../components/Confirm.vue";
-import { debug } from "../../util.ts";
+import { log } from "../../util.ts";
 import { useToast } from "vue-toastification";
 
 const toast = useToast();
@@ -91,13 +91,13 @@ export default {
 
     methods: {
         loadDatabaseSize() {
-            debug("load database size");
+            log.debug("monitorhistory", "load database size");
             this.$root.getSocket().emit("getDatabaseSize", (res) => {
                 if (res.ok) {
                     this.databaseSize = res.size;
-                    debug("database size: " + res.size);
+                    log.debug("monitorhistory", "database size: " + res.size);
                 } else {
-                    debug(res);
+                    log.debug("monitorhistory", res);
                 }
             });
         },
@@ -108,7 +108,7 @@ export default {
                     this.loadDatabaseSize();
                     toast.success("Done");
                 } else {
-                    debug(res);
+                    log.debug("monitorhistory", res);
                 }
             });
         },
@@ -129,5 +129,3 @@ export default {
     },
 };
 </script>
-
-<style></style>
diff --git a/src/components/settings/Security.vue b/src/components/settings/Security.vue
index 1459519f..e5960004 100644
--- a/src/components/settings/Security.vue
+++ b/src/components/settings/Security.vue
@@ -355,7 +355,7 @@ export default {
 <style lang="scss" scoped>
 @import "../../assets/vars.scss";
 
-h5:after {
+h5::after {
     content: "";
     display: block;
     width: 50%;
diff --git a/src/languages/bg-BG.js b/src/languages/bg-BG.js
index 4dd79bfc..787db0b2 100644
--- a/src/languages/bg-BG.js
+++ b/src/languages/bg-BG.js
@@ -343,7 +343,7 @@ export default {
     "No Monitors": "Няма монитори",
     "Untitled Group": "Група без заглавие",
     Services: "Услуги",
-    Discard: "Премахни",
+    Discard: "Отмени",
     Cancel: "Отмени",
     "Powered by": "Създадено чрез",
     serwersms: "SerwerSMS.pl",
diff --git a/src/languages/de-DE.js b/src/languages/de-DE.js
index ef1148c8..63531dfa 100644
--- a/src/languages/de-DE.js
+++ b/src/languages/de-DE.js
@@ -350,7 +350,7 @@ export default {
     serwersmsAPIPassword: "API Passwort",
     serwersmsPhoneNumber: "Telefonnummer",
     serwersmsSenderName: "Name des SMS-Absenders (über Kundenportal registriert)",
-    "stackfield": "Stackfield",
+    stackfield: "Stackfield",
     clicksendsms: "ClickSend SMS",
     apiCredentials: "API Zugangsdaten",
     smtpDkimSettings: "DKIM Einstellungen",
@@ -362,6 +362,86 @@ export default {
     smtpDkimHashAlgo: "Hash-Algorithmus (Optional)",
     smtpDkimheaderFieldNames: "Zu validierende Header-Schlüssel (optional)",
     smtpDkimskipFields: "Zu ignorierende Header Schlüssel (optional)",
+    PushByTechulus: "Push by Techulus",
+    gorush: "Gorush",
+    alerta: "Alerta",
+    alertaApiEndpoint: "API Endpunkt",
+    alertaEnvironment: "Umgebung",
+    alertaApiKey: "API Schlüssel",
+    alertaAlertState: "Alarmstatus",
+    alertaRecoverState: "Wiederherstellungsstatus",
+    deleteStatusPageMsg: "Bist du sicher, dass du diese Status-Seite löschen willst?",
+    Proxies: "Proxies",
+    default: "Standard",
+    enabled: "Aktiviert",
+    setAsDefault: "Als Standard setzen",
+    deleteProxyMsg: "Bist du sicher, dass du diesen Proxy für alle Monitore löschen willst?",
+    proxyDescription: "Proxies müssen einem Monitor zugewiesen werden, um zu funktionieren.",
+    enableProxyDescription: "Dieser Proxy wird keinen Effekt auf Monitor-Anfragen haben, bis er aktiviert ist. Du kannst ihn temporär von allen Monitoren nach Aktivierungsstatus deaktivieren.",
+    setAsDefaultProxyDescription: "Dieser Proxy wird standardmäßig für alle neuen Monitore aktiviert sein. Du kannst den Proxy immernoch für jeden Monitor einzeln deaktivieren.",
+    "Certificate Chain": "Zertifikatskette",
+    Valid: "Gültig",
+    Invalid: "Ungültig",
+    AccessKeyId: "AccessKey ID",
+    SecretAccessKey: "AccessKey Secret",
+    PhoneNumbers: "Telefonnummern",
+    TemplateCode: "Vorlagencode",
+    SignName: "Signaturname",
+    "Sms template must contain parameters: ": "SMS Vorlage muss folgende Parameter enthalten: ",
+    "Bark Endpoint": "Bark Endpunkt",
+    WebHookUrl: "Webhook URL",
+    SecretKey: "Geheimer Schlüssel",
+    "For safety, must use secret key": "Zur Sicherheit muss ein geheimer Schlüssel verwendet werden",
+    "Device Token": "Gerätetoken",
+    Platform: "Platform",
+    iOS: "iOS",
+    Android: "Android",
+    Huawei: "Huawei",
+    High: "Hoch",
+    Retry: "Wiederholungen",
+    Topic: "Thema",
+    "WeCom Bot Key": "WeCom Bot Schlüssel",
+    "Setup Proxy": "Proxy einrichten",
+    "Proxy Protocol": "Proxy Protokoll",
+    "Proxy Server": "Proxy Server",
+    "Proxy server has authentication": "Proxy server hat Authentifizierung",
+    User: "Benutzer",
+    Installed: "Installiert",
+    "Not installed": "Nicht installiert",
+    Running: "Läuft",
+    "Not running": "Gestoppt",
+    "Remove Token": "Token entfernen",
+    Start: "Start",
+    Stop: "Stop",
+    "Uptime Kuma": "Uptime Kuma",
+    "Add New Status Page": "Neue Status-Seite hinzufügen",
+    Slug: "Slug",
+    "Accept characters:": "Akzeptierte Zeichen:",
+    startOrEndWithOnly: "Nur mit {0} anfangen und enden",
+    "No consecutive dashes": "Keine aufeinanderfolgenden Bindestriche",
+    Next: "Weiter",
+    "The slug is already taken. Please choose another slug.": "Der Slug ist bereits in Verwendung. Bitte wähle einen anderen.",
+    "No Proxy": "Kein Proxy",
+    "HTTP Basic Auth": "HTTP Basisauthentifizierung",
+    "New Status Page": "Neue Status-Seite",
+    "Page Not Found": "Seite nicht gefunden",
+    "Reverse Proxy": "Reverse Proxy",
+    Backup: "Sicherung",
+    About: "Über",
+    wayToGetCloudflaredURL: "(Lade cloudflared von {0} herunter)",
+    cloudflareWebsite: "Cloudflare Website",
+    "Message:": "Nachricht:",
+    "Don't know how to get the token? Please read the guide:": "Du weißt nicht, wie man den Token bekommt? Lies die Anleitung dazu:",
+    "The current connection may be lost if you are currently connecting via Cloudflare Tunnel. Are you sure want to stop it? Type your current password to confirm it.": "Die aktuelle Verbindung kann unterbrochen werden, wenn du aktuell über Cloudflare Tunnel verbunden bist. Bist du sicher, dass du es stoppen willst? Gib zur Bestätigung dein aktuelles Passwort ein.",
+    "Other Software": "Andere Software",
+    "For example: nginx, Apache and Traefik.": "Zum Beispiel: nginx, Apache und Traefik.",
+    "Please read": "Bitte lesen",
+    "Subject:": "Betreff:",
+    "Valid To:": "Gültig bis:",
+    "Days Remaining:": "Tage verbleibend:",
+    "Issuer:": "Aussteller:",
+    "Fingerprint:": "Fingerabdruck:",
+    "No status pages": "Keine Status-Seiten",
     Customize: "Anpassen",
     "Custom Footer": "Eigener Footer (Leerlassen für Standard)",
     "Custom CSS": "Eigenes CSS",
diff --git a/src/languages/en.js b/src/languages/en.js
index ee20c61e..957a1356 100644
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -445,4 +445,14 @@ export default {
     "Issuer:": "Issuer:",
     "Fingerprint:": "Fingerprint:",
     "No status pages": "No status pages",
+    "Domain Name Expiry Notification": "Domain Name Expiry Notification",
+    "Proxy": "Proxy",
+    "Date Created": "Date Created",
+    onebotHttpAddress: "OneBot HTTP Address",
+    onebotMessageType: "OneBot Message Type",
+    onebotGroupMessage: "Group",
+    onebotPrivateMessage: "Private",
+    onebotUserOrGroupId: "Group/User ID",
+    onebotSafetyTips: "For safety, must set access token",
+    "PushDeer Key": "PushDeer Key",
 };
diff --git a/src/languages/ru-RU.js b/src/languages/ru-RU.js
index c8212442..5e889e52 100644
--- a/src/languages/ru-RU.js
+++ b/src/languages/ru-RU.js
@@ -374,8 +374,8 @@ export default {
     serwersmsSenderName: "SMS Имя Отправителя (регистрированный через пользовательский портал)",
     stackfield: "Stackfield",
     smtpDkimSettings: "DKIM Настройки",
-    smtpDkimDesc: "Please refer to the Nodemailer DKIM {0} for usage.",
-    documentation: "документация",
+    smtpDkimDesc: "Пожалуйста ознакомьтесь с {0} Nodemailer DKIM для использования.",
+    documentation: "документацией",
     smtpDkimDomain: "Имя Домена",
     smtpDkimKeySelector: "Ключ",
     smtpDkimPrivateKey: "Приватный ключ",
@@ -389,4 +389,12 @@ export default {
     alertaApiKey: "Ключ API",
     alertaAlertState: "Состояние алерта",
     alertaRecoverState: "Состояние восстановления",
+    Proxies: "Прокси",
+    default: "По умолчанию",
+    enabled: "Включено",
+    setAsDefault: "Установлено по умолчанию",
+    deleteProxyMsg: "Вы действительно хотите удалить этот прокси для всех мониторов?",
+    proxyDescription: "Прокси должны быть привязаны к монитору, чтобы работать.",
+    enableProxyDescription: "Этот прокси не будет влиять на запросы монитора, пока не будет активирован. Вы можете контролировать временное отключение прокси для всех мониторов через статус активации.",
+    setAsDefaultProxyDescription: "Этот прокси будет по умолчанию включен для новых мониторов. Вы всё ещё можете отдельно отключать прокси в каждом мониторе.",
 };
diff --git a/src/languages/zh-CN.js b/src/languages/zh-CN.js
index 5bed4700..2f2d9f2b 100644
--- a/src/languages/zh-CN.js
+++ b/src/languages/zh-CN.js
@@ -449,4 +449,13 @@ export default {
     "Issuer:": "颁发者：",
     "Fingerprint:": "指纹：",
     "No status pages": "无状态页",
+    "Domain Name Expiry Notification": "域名到期时通知",
+    "Proxy": "代理",
+    "Date Created": "创建于",
+    onebotHttpAddress: "OneBot HTTP 地址",
+    onebotMessageType: "OneBot 消息类型",
+    onebotGroupMessage: "群聊",
+    onebotPrivateMessage: "私聊",
+    onebotUserOrGroupId: "群组/用户ID",
+    onebotSafetyTips: "出于安全原因，请务必设置AccessToken",
 };
diff --git a/src/layouts/EmptyLayout.vue b/src/layouts/EmptyLayout.vue
index a16d4208..825ec937 100644
--- a/src/layouts/EmptyLayout.vue
+++ b/src/layouts/EmptyLayout.vue
@@ -3,5 +3,6 @@
 </template>
 
 <script>
-export default {}
+export default {};
 </script>
+
diff --git a/src/mixins/socket.js b/src/mixins/socket.js
index 0f9846d4..e77a0cd4 100644
--- a/src/mixins/socket.js
+++ b/src/mixins/socket.js
@@ -1,6 +1,6 @@
 import { io } from "socket.io-client";
 import { useToast } from "vue-toastification";
-import jwt_decode from "jwt-decode";
+import jwtDecode from "jwt-decode";
 import Favico from "favico.js";
 const toast = useToast();
 
@@ -266,7 +266,7 @@ export default {
             const jwtToken = this.$root.storage().token;
 
             if (jwtToken && jwtToken !== "autoLogin") {
-                return jwt_decode(jwtToken);
+                return jwtDecode(jwtToken);
             }
             return undefined;
         },
diff --git a/src/pages/Dashboard.vue b/src/pages/Dashboard.vue
index 1cf237ce..38e5b9be 100644
--- a/src/pages/Dashboard.vue
+++ b/src/pages/Dashboard.vue
@@ -25,9 +25,9 @@ export default {
         MonitorList,
     },
     data() {
-        return {}
+        return {};
     },
-}
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/pages/DashboardHome.vue b/src/pages/DashboardHome.vue
index 6e8a5bbc..b60cd487 100644
--- a/src/pages/DashboardHome.vue
+++ b/src/pages/DashboardHome.vue
@@ -118,6 +118,7 @@ export default {
                 return 0;
             });
 
+            // eslint-disable-next-line vue/no-side-effects-in-computed-properties
             this.heartBeatList = result;
 
             return result;
diff --git a/src/pages/List.vue b/src/pages/List.vue
index 1082a3bf..9cbf3f2f 100644
--- a/src/pages/List.vue
+++ b/src/pages/List.vue
@@ -11,6 +11,6 @@ export default {
     components: {
         MonitorList,
     },
-}
+};
 </script>
 
diff --git a/src/pages/ManageStatusPage.vue b/src/pages/ManageStatusPage.vue
index 4ea8bbf8..c3360375 100644
--- a/src/pages/ManageStatusPage.vue
+++ b/src/pages/ManageStatusPage.vue
@@ -92,7 +92,6 @@ export default {
         }
 
         .info {
-
             .title {
                 font-weight: bold;
                 font-size: 20px;
diff --git a/src/pages/StatusPage.vue b/src/pages/StatusPage.vue
index 38116254..1b842c3d 100644
--- a/src/pages/StatusPage.vue
+++ b/src/pages/StatusPage.vue
@@ -283,6 +283,7 @@ const toast = useToast();
 
 const leavePageMsg = "Do you really want to leave? you have unsaved changes!";
 
+// eslint-disable-next-line no-unused-vars
 let feedInterval;
 
 const favicon = new Favico({
@@ -864,7 +865,7 @@ footer {
 
 .incident, .customize {
     .content {
-        &[contenteditable=true] {
+        &[contenteditable="true"] {
             min-height: 60px;
         }
     }
diff --git a/src/util.js b/src/util.js
index 9945d7cf..059e13c2 100644
--- a/src/util.js
+++ b/src/util.js
@@ -7,7 +7,7 @@
 // Backend uses the compiled file util.js
 // Frontend uses util.ts
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMonitorRelativeURL = exports.genSecret = exports.getCryptoRandomInt = exports.getRandomInt = exports.getRandomArbitrary = exports.TimeLogger = exports.polyfill = exports.debug = exports.ucfirst = exports.sleep = exports.flipStatus = exports.STATUS_PAGE_PARTIAL_DOWN = exports.STATUS_PAGE_ALL_UP = exports.STATUS_PAGE_ALL_DOWN = exports.PENDING = exports.UP = exports.DOWN = exports.appName = exports.isDev = void 0;
+exports.getMonitorRelativeURL = exports.genSecret = exports.getCryptoRandomInt = exports.getRandomInt = exports.getRandomArbitrary = exports.TimeLogger = exports.polyfill = exports.log = exports.debug = exports.ucfirst = exports.sleep = exports.flipStatus = exports.STATUS_PAGE_PARTIAL_DOWN = exports.STATUS_PAGE_ALL_UP = exports.STATUS_PAGE_ALL_DOWN = exports.PENDING = exports.UP = exports.DOWN = exports.appName = exports.isDev = void 0;
 const _dayjs = require("dayjs");
 const dayjs = _dayjs;
 exports.isDev = process.env.NODE_ENV === "development";
@@ -44,12 +44,60 @@ function ucfirst(str) {
     return firstLetter.toUpperCase() + str.substr(1);
 }
 exports.ucfirst = ucfirst;
+/**
+ * @deprecated Use log.debug
+ * @since https://github.com/louislam/uptime-kuma/pull/910
+ * @param msg
+ */
 function debug(msg) {
-    if (exports.isDev) {
-        console.log(msg);
-    }
+    exports.log.log("", msg, "debug");
 }
 exports.debug = debug;
+class Logger {
+    log(module, msg, level) {
+        module = module.toUpperCase();
+        level = level.toUpperCase();
+        const now = new Date().toISOString();
+        const formattedMessage = (typeof msg === "string") ? `${now} [${module}] ${level}: ${msg}` : msg;
+        if (level === "INFO") {
+            console.info(formattedMessage);
+        }
+        else if (level === "WARN") {
+            console.warn(formattedMessage);
+        }
+        else if (level === "ERROR") {
+            console.error(formattedMessage);
+        }
+        else if (level === "DEBUG") {
+            if (exports.isDev) {
+                console.debug(formattedMessage);
+            }
+        }
+        else {
+            console.log(formattedMessage);
+        }
+    }
+    info(module, msg) {
+        this.log(module, msg, "info");
+    }
+    warn(module, msg) {
+        this.log(module, msg, "warn");
+    }
+    error(module, msg) {
+        this.log(module, msg, "error");
+    }
+    debug(module, msg) {
+        this.log(module, msg, "debug");
+    }
+    exception(module, exception, msg) {
+        let finalMessage = exception;
+        if (msg) {
+            finalMessage = `${msg}: ${exception}`;
+        }
+        this.log(module, finalMessage, "error");
+    }
+}
+exports.log = new Logger();
 function polyfill() {
     /**
      * String.prototype.replaceAll() polyfill
@@ -121,13 +169,6 @@ let getRandomBytes = ((typeof window !== 'undefined' && window.crypto)
     : function () {
         return require("crypto").randomBytes;
     })();
-/**
- * Returns a random integer between min (inclusive) and max (exclusive).
- * @param {number} min The minimum value.
- * @param {number} max The maximum value.
- *
- * Generated by Trelent
- */
 function getCryptoRandomInt(min, max) {
     // synchronous version of: https://github.com/joepie91/node-random-number-csprng
     const range = max - min;
@@ -158,13 +199,6 @@ function getCryptoRandomInt(min, max) {
     }
 }
 exports.getCryptoRandomInt = getCryptoRandomInt;
-/**
- * Generates a random string of length `length` from the characters in `chars`.
- * @param {number} length The number of characters to generate.
- * @param {string} chars A string containing all the possible characters to use for generating the random string.
- *
- * Generated by Trelent
- */
 function genSecret(length = 64) {
     let secret = "";
     const chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
diff --git a/src/util.ts b/src/util.ts
index 633d933e..f584f604 100644
--- a/src/util.ts
+++ b/src/util.ts
@@ -49,12 +49,66 @@ export function ucfirst(str: string) {
     return firstLetter.toUpperCase() + str.substr(1);
 }
 
+/**
+ * @deprecated Use log.debug
+ * @since https://github.com/louislam/uptime-kuma/pull/910
+ * @param msg
+ */
 export function debug(msg: any) {
-    if (isDev) {
-        console.log(msg);
+    log.log("", msg, "debug");
+}
+
+class Logger {
+    log(module: string, msg: any, level: string) {
+        module = module.toUpperCase();
+        level = level.toUpperCase();
+
+        const now = new Date().toISOString();
+        const formattedMessage = (typeof msg === "string") ? `${now} [${module}] ${level}: ${msg}` : msg;
+
+        if (level === "INFO") {
+            console.info(formattedMessage);
+        } else if (level === "WARN") {
+            console.warn(formattedMessage);
+        } else if (level === "ERROR") {
+            console.error(formattedMessage);
+        } else if (level === "DEBUG") {
+            if (isDev) {
+                console.debug(formattedMessage);
+            }
+        } else {
+            console.log(formattedMessage);
+        }
+    }
+
+    info(module: string, msg: any) {
+        this.log(module, msg, "info");
+    }
+
+    warn(module: string, msg: any) {
+        this.log(module, msg, "warn");
+    }
+
+   error(module: string, msg: any) {
+       this.log(module, msg, "error");
+    }
+
+   debug(module: string, msg: any) {
+       this.log(module, msg, "debug");
+    }
+
+    exception(module: string, exception: any, msg: any) {
+        let finalMessage = exception
+
+        if (msg) {
+            finalMessage = `${msg}: ${exception}`
+        }
+
+        this.log(module, finalMessage , "error");
     }
 }
 
+export const log = new Logger();
 
 declare global { interface String { replaceAll(str: string, newStr: string): string; } }
 
diff --git a/test/backend.spec.js b/test/backend.spec.js
index bbfc6897..86b83fa5 100644
--- a/test/backend.spec.js
+++ b/test/backend.spec.js
@@ -1,4 +1,4 @@
-const { genSecret, sleep } = require("../src/util");
+const { genSecret } = require("../src/util");
 const utilServerRewire = require("../server/util-server");
 
 describe("Test parseCertificateInfo", () => {
diff --git a/test/e2e.spec.js b/test/e2e.spec.js
index d4835d1c..5535f57d 100644
--- a/test/e2e.spec.js
+++ b/test/e2e.spec.js
@@ -1,7 +1,6 @@
 // eslint-disable-next-line no-unused-vars
 const { Page, Browser } = require("puppeteer");
 const { sleep } = require("../src/util");
-const axios = require("axios");
 
 /**
  * Set back the correct data type for page object