Merge branch 'master' into master

.github/workflows/auto-test.yml

@@ -43,7 +43,7 @@ jobs:
     - run: git config --global core.autocrlf false  # Mainly for Windows
     - uses: actions/checkout@v3
 
-    - name: Use Node.js LTS
+    - name: Use Node.js 14
       uses: actions/setup-node@v3
       with:
         node-version: 14

package-lock.json

@@ -13,7 +13,7 @@
                 "@fortawesome/free-regular-svg-icons": "~5.15.4",
                 "@fortawesome/free-solid-svg-icons": "~5.15.4",
                 "@fortawesome/vue-fontawesome": "~3.0.0-5",
-                "@louislam/sqlite3": "~15.0.3",
+                "@louislam/sqlite3": "~15.0.6",
                 "@popperjs/core": "~2.10.2",
                 "args-parser": "~1.3.0",
                 "axios": "~0.26.1",
@@ -2697,9 +2697,9 @@
             }
         },
         "node_modules/@louislam/sqlite3": {
-            "version": "15.0.3",
+            "version": "15.0.6",
-            "resolved": "https://registry.npmjs.org/@louislam/sqlite3/-/sqlite3-15.0.3.tgz",
+            "resolved": "https://registry.npmjs.org/@louislam/sqlite3/-/sqlite3-15.0.6.tgz",
-            "integrity": "sha512-rCH6PIaa+TgBzpTRnqBKUa4H/5G2hIk5ukYK5rXxK+8hVGykRin3UMGzGejrPzIKzDnZGByIF0XD4ndi6lprRQ==",
+            "integrity": "sha512-+HF/4OEy+yakYzJlSPJbLDtf499t0s0eaglXC9y3Oa9OBZ+dKAaTW5+Ft1RCvfUJLFw/oyYjHtMsg9V+7NT05g==",
             "hasInstallScript": true,
             "dependencies": {
                 "@mapbox/node-pre-gyp": "^1.0.0",
@@ -18665,9 +18665,9 @@
             }
         },
         "@louislam/sqlite3": {
-            "version": "15.0.3",
+            "version": "15.0.6",
-            "resolved": "https://registry.npmjs.org/@louislam/sqlite3/-/sqlite3-15.0.3.tgz",
+            "resolved": "https://registry.npmjs.org/@louislam/sqlite3/-/sqlite3-15.0.6.tgz",
-            "integrity": "sha512-rCH6PIaa+TgBzpTRnqBKUa4H/5G2hIk5ukYK5rXxK+8hVGykRin3UMGzGejrPzIKzDnZGByIF0XD4ndi6lprRQ==",
+            "integrity": "sha512-+HF/4OEy+yakYzJlSPJbLDtf499t0s0eaglXC9y3Oa9OBZ+dKAaTW5+Ft1RCvfUJLFw/oyYjHtMsg9V+7NT05g==",
             "requires": {
                 "@mapbox/node-pre-gyp": "^1.0.0",
                 "node-addon-api": "^4.2.0",

package.json

@@ -64,7 +64,7 @@
         "@fortawesome/free-regular-svg-icons": "~5.15.4",
         "@fortawesome/free-solid-svg-icons": "~5.15.4",
         "@fortawesome/vue-fontawesome": "~3.0.0-5",
-        "@louislam/sqlite3": "~15.0.3",
+        "@louislam/sqlite3": "~15.0.6",
         "@popperjs/core": "~2.10.2",
         "args-parser": "~1.3.0",
         "axios": "~0.26.1",

server/model/monitor.js

@@ -7,7 +7,7 @@ dayjs.extend(timezone);
 const axios = require("axios");
 const { Prometheus } = require("../prometheus");
 const { log, UP, DOWN, PENDING, MAINTENANCE, flipStatus, TimeLogger } = require("../../src/util");
-const { tcping, ping, dnsResolve, checkCertificate, checkStatusCode, getTotalClientInRoom, setting, errorLog, mqttAsync } = require("../util-server");
+const { tcping, ping, dnsResolve, checkCertificate, checkStatusCode, getTotalClientInRoom, setting, mqttAsync } = require("../util-server");
 const { R } = require("redbean-node");
 const { BeanModel } = require("redbean-node/dist/bean-model");
 const { Notification } = require("../notification");
@@ -15,6 +15,7 @@ const { Proxy } = require("../proxy");
 const { demoMode } = require("../config");
 const version = require("../../package.json").version;
 const apicache = require("../modules/apicache");
+const { UptimeKumaServer } = require("../uptime-kuma-server");
 
 /**
  * status:
@@ -533,7 +534,7 @@ class Monitor extends BeanModel {
                 await beat();
             } catch (e) {
                 console.trace(e);
-                errorLog(e, false);
+                UptimeKumaServer.errorLog(e, false);
                 log.error("monitor", "Please report to https://github.com/louislam/uptime-kuma/issues");
 
                 if (! this.isStop) {

server/server.js

@@ -60,7 +60,7 @@ log.info("server", "Importing this project modules");
 log.debug("server", "Importing Monitor");
 const Monitor = require("./model/monitor");
 log.debug("server", "Importing Settings");
-const { getSettings, setSettings, setting, initJWTSecret, checkLogin, startUnitTest, FBSD, errorLog, doubleCheckPassword } = require("./util-server");
+const { getSettings, setSettings, setting, initJWTSecret, checkLogin, startUnitTest, FBSD, doubleCheckPassword } = require("./util-server");
 
 log.debug("server", "Importing Notification");
 const { Notification } = require("./notification");
@@ -1974,6 +1974,6 @@ gracefulShutdown(server.httpServer, {
 // Catch unexpected errors here
 process.addListener("unhandledRejection", (error, promise) => {
     console.trace(error);
-    errorLog(error, false);
+    UptimeKumaServer.errorLog(error, false);
     console.error("If you keep encountering errors, please report to https://github.com/louislam/uptime-kuma/issues");
 });

server/uptime-kuma-server.js

@@ -5,13 +5,14 @@ const http = require("http");
 const { Server } = require("socket.io");
 const { R } = require("redbean-node");
 const { log } = require("../src/util");
+const Database = require("./database");
+const util = require("util");
 
 /**
  * `module.exports` (alias: `server`) should be inside this class, in order to avoid circular dependency issue.
  * @type {UptimeKumaServer}
  */
 class UptimeKumaServer {
-
     /**
      *
      * @type {UptimeKumaServer}
@@ -83,6 +84,32 @@ class UptimeKumaServer {
 
         return result;
     }
+
+    /**
+     * Write error to log file
+     * @param {any} error The error to write
+     * @param {boolean} outputToConsole Should the error also be output to console?
+     */
+    static errorLog(error, outputToConsole = true) {
+        const errorLogStream = fs.createWriteStream(Database.dataDir + "/error.log", {
+            flags: "a"
+        });
+
+        errorLogStream.on("error", () => {
+            log.info("", "Cannot write to error.log");
+        });
+
+        if (errorLogStream) {
+            const dateTime = R.isoDateTime();
+            errorLogStream.write(`[${dateTime}] ` + util.format(error) + "\n");
+
+            if (outputToConsole) {
+                console.error(error);
+            }
+        }
+
+        errorLogStream.end();
+    }
 }
 
 module.exports = {

server/util-server.js

@@ -7,8 +7,6 @@ const { Resolver } = require("dns");
 const childProcess = require("child_process");
 const iconv = require("iconv-lite");
 const chardet = require("chardet");
-const fs = require("fs");
-const nodeJsUtil = require("util");
 const mqtt = require("mqtt");
 
 // From ping-lite
@@ -206,7 +204,7 @@ exports.dnsResolve = function (hostname, resolverServer, rrtype) {
 /**
  * Retrieve value of setting based on key
  * @param {string} key Key of setting to retrieve
- * @returns {Promise<Object>} Object representation of setting
+ * @returns {Promise<any>} Value
  */
 exports.setting = async function (key) {
     let value = await R.getCell("SELECT `value` FROM setting WHERE `key` = ? ", [
@@ -524,29 +522,3 @@ exports.convertToUTF8 = (body) => {
     const str = iconv.decode(body, guessEncoding);
     return str.toString();
 };
-
-let logFile;
-
-try {
-    logFile = fs.createWriteStream("./data/error.log", {
-        flags: "a"
-    });
-} catch (_) { }
-
-/**
- * Write error to log file
- * @param {any} error The error to write
- * @param {boolean} outputToConsole Should the error also be output to console?
- */
-exports.errorLog = (error, outputToConsole = true) => {
-    try {
-        if (logFile) {
-            const dateTime = R.isoDateTime();
-            logFile.write(`[${dateTime}] ` + nodeJsUtil.format(error) + "\n");
-
-            if (outputToConsole) {
-                console.error(error);
-            }
-        }
-    } catch (_) { }
-};

src/layouts/Layout.vue

@@ -33,7 +33,7 @@
                 </li>
                 <li v-if="$root.loggedIn" class="nav-item">
                     <div class="dropdown dropdown-profile-pic">
-                        <div type="button" class="nav-link" data-bs-toggle="dropdown">
+                        <div class="nav-link" data-bs-toggle="dropdown">
                             <div class="profile-pic">{{ $root.usernameFirstChar }}</div>
                             <font-awesome-icon icon="angle-down" />
                         </div>