Merge c2f363be64 into c86706f189

1.23.13 changes merge to 2.0.0 (#4708 )
Update server/model/monitor.js
2024-04-27 10:55:42 +10:00 · 2024-04-26 15:11:26 +08:00 · 2024-04-26 15:01:03 +08:00 · 2024-04-25 23:45:30 +08:00 · 2024-04-25 23:45:24 +08:00 · 2024-04-25 15:49:32 +08:00
17 changed files with 699 additions and 263 deletions
--- a/db/patch-monitor-tls-info-add-fk.sql
+++ b/db/patch-monitor-tls-info-add-fk.sql
@ -0,0 +1,18 @@
+BEGIN TRANSACTION;
+
+PRAGMA writable_schema = TRUE;
+
+UPDATE
+	SQLITE_MASTER
+SET
+	sql = replace(sql,
+	'monitor_id INTEGER NOT NULL',
+	'monitor_id INTEGER NOT NULL REFERENCES [monitor] ([id]) ON DELETE CASCADE ON UPDATE CASCADE'
+)
+WHERE
+	name = 'monitor_tls_info'
+	AND type = 'table';
+
+PRAGMA writable_schema = RESET;
+
+COMMIT;
--- a/package-lock.json
+++ b/package-lock.json
@ -14,7 +14,7 @@
                "@louislam/sqlite3": "15.1.6",
                "@vvo/tzdb": "^6.125.0",
                "args-parser": "~1.3.0",
-                "axios": "~0.28.0",
+                "axios": "~0.28.1",
                "axios-ntlm": "1.3.0",
                "badge-maker": "~3.3.1",
                "bcryptjs": "~2.4.3",
@ -52,7 +52,7 @@
                "mongodb": "~4.17.1",
                "mqtt": "~4.3.7",
                "mssql": "~8.1.4",
-                "mysql2": "~3.6.2",
+                "mysql2": "~3.9.6",
                "nanoid": "~3.3.4",
                "node-cloudflared-tunnel": "~1.0.9",
                "node-radius-client": "~1.0.0",
@ -75,14 +75,14 @@
                "socket.io": "~4.6.1",
                "socket.io-client": "~4.6.1",
                "socks-proxy-agent": "6.1.1",
-                "tar": "~6.1.11",
+                "tar": "~6.2.1",
                "tcp-ping": "~0.1.1",
                "thirty-two": "~1.0.2",
                "tough-cookie": "~4.1.3",
                "ws": "^8.13.0"
            },
            "devDependencies": {
-                "@actions/github": "~5.0.1",
+                "@actions/github": "~5.1.1",
                "@fortawesome/fontawesome-svg-core": "~1.2.36",
                "@fortawesome/free-regular-svg-icons": "~5.15.4",
                "@fortawesome/free-solid-svg-icons": "~5.15.4",
@ -106,7 +106,7 @@
                "cross-env": "~7.0.3",
                "delay": "^5.0.0",
                "dns2": "~2.0.1",
-                "dompurify": "~2.4.3",
+                "dompurify": "~3.0.11",
                "eslint": "~8.14.0",
                "eslint-plugin-jsdoc": "~46.4.6",
                "eslint-plugin-vue": "~8.7.1",
@ -127,7 +127,7 @@
                "test": "~3.3.0",
                "typescript": "~4.4.4",
                "v-pagination-3": "~0.1.7",
-                "vite": "~5.0.10",
+                "vite": "~5.2.8",
                "vite-plugin-compression": "^0.5.1",
                "vite-plugin-vue-devtools": "^7.0.15",
                "vue": "~3.4.2",
@ -146,7 +146,7 @@
                "whatwg-url": "~12.0.1"
            },
            "engines": {
-                "node": "14 || 16 || 18 || >= 20.4.0"
+                "node": "18 || >= 20.4.0"
            }
        },
        "node_modules/@aashutoshrathi/word-wrap": {
@ -159,9 +159,9 @@
            }
        },
        "node_modules/@actions/github": {
-            "version": "5.0.3",
-            "resolved": "https://registry.npmjs.org/@actions/github/-/github-5.0.3.tgz",
-            "integrity": "sha512-myjA/pdLQfhUGLtRZC/J4L1RXOG4o6aYdiEq+zr5wVVKljzbFld+xv10k1FX6IkIJtNxbAq44BdwSNpQ015P0A==",
+            "version": "5.1.1",
+            "resolved": "https://registry.npmjs.org/@actions/github/-/github-5.1.1.tgz",
+            "integrity": "sha512-Nk59rMDoJaV+mHCOJPXuvB1zIbomlKS0dmSIqPGxd0enAXBnOfn4VWF+CGtRCwXZG9Epa54tZA7VIRlJDS8A6g==",
            "dev": true,
            "dependencies": {
                "@actions/http-client": "^2.0.1",
@ -1962,9 +1962,9 @@
            }
        },
        "node_modules/@esbuild/aix-ppc64": {
-            "version": "0.19.12",
-            "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.19.12.tgz",
-            "integrity": "sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==",
+            "version": "0.20.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.2.tgz",
+            "integrity": "sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==",
            "cpu": [
                "ppc64"
            ],
@ -1978,9 +1978,9 @@
            }
        },
        "node_modules/@esbuild/android-arm": {
-            "version": "0.19.12",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.12.tgz",
-            "integrity": "sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==",
+            "version": "0.20.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.2.tgz",
+            "integrity": "sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==",
            "cpu": [
                "arm"
            ],
@ -1994,9 +1994,9 @@
            }
        },
        "node_modules/@esbuild/android-arm64": {
-            "version": "0.19.12",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.12.tgz",
-            "integrity": "sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==",
+            "version": "0.20.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.2.tgz",
+            "integrity": "sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==",
            "cpu": [
                "arm64"
            ],
@ -2010,9 +2010,9 @@
            }
        },
        "node_modules/@esbuild/android-x64": {
-            "version": "0.19.12",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.12.tgz",
-            "integrity": "sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==",
+            "version": "0.20.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.2.tgz",
+            "integrity": "sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==",
            "cpu": [
                "x64"
            ],
@ -2026,9 +2026,9 @@
            }
        },
        "node_modules/@esbuild/darwin-arm64": {
-            "version": "0.19.12",
-            "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.12.tgz",
-            "integrity": "sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==",
+            "version": "0.20.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.2.tgz",
+            "integrity": "sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==",
            "cpu": [
                "arm64"
            ],
@ -2042,9 +2042,9 @@
            }
        },
        "node_modules/@esbuild/darwin-x64": {
-            "version": "0.19.12",
-            "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.12.tgz",
-            "integrity": "sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==",
+            "version": "0.20.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz",
+            "integrity": "sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==",
            "cpu": [
                "x64"
            ],
@ -2058,9 +2058,9 @@
            }
        },
        "node_modules/@esbuild/freebsd-arm64": {
-            "version": "0.19.12",
-            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.12.tgz",
-            "integrity": "sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==",
+            "version": "0.20.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.2.tgz",
+            "integrity": "sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==",
            "cpu": [
                "arm64"
            ],
@ -2074,9 +2074,9 @@
            }
        },
        "node_modules/@esbuild/freebsd-x64": {
-            "version": "0.19.12",
-            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.12.tgz",
-            "integrity": "sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==",
+            "version": "0.20.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.2.tgz",
+            "integrity": "sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==",
            "cpu": [
                "x64"
            ],
@ -2090,9 +2090,9 @@
            }
        },
        "node_modules/@esbuild/linux-arm": {
-            "version": "0.19.12",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.12.tgz",
-            "integrity": "sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==",
+            "version": "0.20.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.2.tgz",
+            "integrity": "sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==",
            "cpu": [
                "arm"
            ],
@ -2106,9 +2106,9 @@
            }
        },
        "node_modules/@esbuild/linux-arm64": {
-            "version": "0.19.12",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.19.12.tgz",
-            "integrity": "sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==",
+            "version": "0.20.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.2.tgz",
+            "integrity": "sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==",
            "cpu": [
                "arm64"
            ],
@ -2122,9 +2122,9 @@
            }
        },
        "node_modules/@esbuild/linux-ia32": {
-            "version": "0.19.12",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.12.tgz",
-            "integrity": "sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==",
+            "version": "0.20.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.2.tgz",
+            "integrity": "sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==",
            "cpu": [
                "ia32"
            ],
@ -2138,9 +2138,9 @@
            }
        },
        "node_modules/@esbuild/linux-loong64": {
-            "version": "0.19.12",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.12.tgz",
-            "integrity": "sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==",
+            "version": "0.20.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.2.tgz",
+            "integrity": "sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==",
            "cpu": [
                "loong64"
            ],
@ -2154,9 +2154,9 @@
            }
        },
        "node_modules/@esbuild/linux-mips64el": {
-            "version": "0.19.12",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.12.tgz",
-            "integrity": "sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==",
+            "version": "0.20.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.2.tgz",
+            "integrity": "sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==",
            "cpu": [
                "mips64el"
            ],
@ -2170,9 +2170,9 @@
            }
        },
        "node_modules/@esbuild/linux-ppc64": {
-            "version": "0.19.12",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.12.tgz",
-            "integrity": "sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==",
+            "version": "0.20.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.2.tgz",
+            "integrity": "sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==",
            "cpu": [
                "ppc64"
            ],
@ -2186,9 +2186,9 @@
            }
        },
        "node_modules/@esbuild/linux-riscv64": {
-            "version": "0.19.12",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.12.tgz",
-            "integrity": "sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==",
+            "version": "0.20.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.2.tgz",
+            "integrity": "sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==",
            "cpu": [
                "riscv64"
            ],
@ -2202,9 +2202,9 @@
            }
        },
        "node_modules/@esbuild/linux-s390x": {
-            "version": "0.19.12",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.12.tgz",
-            "integrity": "sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==",
+            "version": "0.20.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.2.tgz",
+            "integrity": "sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==",
            "cpu": [
                "s390x"
            ],
@ -2218,9 +2218,9 @@
            }
        },
        "node_modules/@esbuild/linux-x64": {
-            "version": "0.19.12",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.12.tgz",
-            "integrity": "sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==",
+            "version": "0.20.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz",
+            "integrity": "sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==",
            "cpu": [
                "x64"
            ],
@ -2234,9 +2234,9 @@
            }
        },
        "node_modules/@esbuild/netbsd-x64": {
-            "version": "0.19.12",
-            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.12.tgz",
-            "integrity": "sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==",
+            "version": "0.20.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.2.tgz",
+            "integrity": "sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==",
            "cpu": [
                "x64"
            ],
@ -2250,9 +2250,9 @@
            }
        },
        "node_modules/@esbuild/openbsd-x64": {
-            "version": "0.19.12",
-            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.12.tgz",
-            "integrity": "sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==",
+            "version": "0.20.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.2.tgz",
+            "integrity": "sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==",
            "cpu": [
                "x64"
            ],
@ -2266,9 +2266,9 @@
            }
        },
        "node_modules/@esbuild/sunos-x64": {
-            "version": "0.19.12",
-            "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.12.tgz",
-            "integrity": "sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==",
+            "version": "0.20.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.2.tgz",
+            "integrity": "sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==",
            "cpu": [
                "x64"
            ],
@ -2282,9 +2282,9 @@
            }
        },
        "node_modules/@esbuild/win32-arm64": {
-            "version": "0.19.12",
-            "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.12.tgz",
-            "integrity": "sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==",
+            "version": "0.20.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.2.tgz",
+            "integrity": "sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==",
            "cpu": [
                "arm64"
            ],
@ -2298,9 +2298,9 @@
            }
        },
        "node_modules/@esbuild/win32-ia32": {
-            "version": "0.19.12",
-            "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.12.tgz",
-            "integrity": "sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==",
+            "version": "0.20.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.2.tgz",
+            "integrity": "sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==",
            "cpu": [
                "ia32"
            ],
@ -2314,9 +2314,9 @@
            }
        },
        "node_modules/@esbuild/win32-x64": {
-            "version": "0.19.12",
-            "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.12.tgz",
-            "integrity": "sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==",
+            "version": "0.20.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz",
+            "integrity": "sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==",
            "cpu": [
                "x64"
            ],
@ -5078,9 +5078,9 @@
            "integrity": "sha512-aDczADvlvTGajTDjcjpJMqRkOF6Qdz3YbPZm/PyW6tKPkx2hlYBzxMhEywM/tU72HrVZjgl5VCdRuMlA7pZ8Gw=="
        },
        "node_modules/axios": {
-            "version": "0.28.0",
-            "resolved": "https://registry.npmjs.org/axios/-/axios-0.28.0.tgz",
-            "integrity": "sha512-Tu7NYoGY4Yoc7I+Npf9HhUMtEEpV7ZiLH9yndTCoNhcpBH0kwcvFbzYN9/u5QKI5A6uefjsNNWaz5olJVYS62Q==",
+            "version": "0.28.1",
+            "resolved": "https://registry.npmjs.org/axios/-/axios-0.28.1.tgz",
+            "integrity": "sha512-iUcGA5a7p0mVb4Gm/sy+FSECNkPFT4y7wt6OM/CDpO/OnNCvSs3PoMG8ibrC9jRoGYU0gUK5pXVC4NPXq6lHRQ==",
            "dependencies": {
                "follow-redirects": "^1.15.0",
                "form-data": "^4.0.0",
@ -6671,9 +6671,9 @@
            }
        },
        "node_modules/dompurify": {
-            "version": "2.4.9",
-            "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.4.9.tgz",
-            "integrity": "sha512-iHtnxYMotKgOTvxIqq677JsKHvCOkAFqj9x8Mek2zdeHW1XjuFKwjpmZeMaXQRQ8AbJZDbcRz/+r1QhwvFtmQg==",
+            "version": "3.0.11",
+            "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.0.11.tgz",
+            "integrity": "sha512-Fan4uMuyB26gFV3ovPoEoQbxRRPfTu3CvImyZnhGq5fsIEO+gEFLp45ISFt+kQBWsK5ulDdT0oV28jS1UrwQLg==",
            "dev": true
        },
        "node_modules/domutils": {
@ -7032,9 +7032,9 @@
            }
        },
        "node_modules/esbuild": {
-            "version": "0.19.12",
-            "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.12.tgz",
-            "integrity": "sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==",
+            "version": "0.20.2",
+            "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.2.tgz",
+            "integrity": "sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==",
            "dev": true,
            "hasInstallScript": true,
            "bin": {
@ -7044,29 +7044,29 @@
                "node": ">=12"
            },
            "optionalDependencies": {
-                "@esbuild/aix-ppc64": "0.19.12",
-                "@esbuild/android-arm": "0.19.12",
-                "@esbuild/android-arm64": "0.19.12",
-                "@esbuild/android-x64": "0.19.12",
-                "@esbuild/darwin-arm64": "0.19.12",
-                "@esbuild/darwin-x64": "0.19.12",
-                "@esbuild/freebsd-arm64": "0.19.12",
-                "@esbuild/freebsd-x64": "0.19.12",
-                "@esbuild/linux-arm": "0.19.12",
-                "@esbuild/linux-arm64": "0.19.12",
-                "@esbuild/linux-ia32": "0.19.12",
-                "@esbuild/linux-loong64": "0.19.12",
-                "@esbuild/linux-mips64el": "0.19.12",
-                "@esbuild/linux-ppc64": "0.19.12",
-                "@esbuild/linux-riscv64": "0.19.12",
-                "@esbuild/linux-s390x": "0.19.12",
-                "@esbuild/linux-x64": "0.19.12",
-                "@esbuild/netbsd-x64": "0.19.12",
-                "@esbuild/openbsd-x64": "0.19.12",
-                "@esbuild/sunos-x64": "0.19.12",
-                "@esbuild/win32-arm64": "0.19.12",
-                "@esbuild/win32-ia32": "0.19.12",
-                "@esbuild/win32-x64": "0.19.12"
+                "@esbuild/aix-ppc64": "0.20.2",
+                "@esbuild/android-arm": "0.20.2",
+                "@esbuild/android-arm64": "0.20.2",
+                "@esbuild/android-x64": "0.20.2",
+                "@esbuild/darwin-arm64": "0.20.2",
+                "@esbuild/darwin-x64": "0.20.2",
+                "@esbuild/freebsd-arm64": "0.20.2",
+                "@esbuild/freebsd-x64": "0.20.2",
+                "@esbuild/linux-arm": "0.20.2",
+                "@esbuild/linux-arm64": "0.20.2",
+                "@esbuild/linux-ia32": "0.20.2",
+                "@esbuild/linux-loong64": "0.20.2",
+                "@esbuild/linux-mips64el": "0.20.2",
+                "@esbuild/linux-ppc64": "0.20.2",
+                "@esbuild/linux-riscv64": "0.20.2",
+                "@esbuild/linux-s390x": "0.20.2",
+                "@esbuild/linux-x64": "0.20.2",
+                "@esbuild/netbsd-x64": "0.20.2",
+                "@esbuild/openbsd-x64": "0.20.2",
+                "@esbuild/sunos-x64": "0.20.2",
+                "@esbuild/win32-arm64": "0.20.2",
+                "@esbuild/win32-ia32": "0.20.2",
+                "@esbuild/win32-x64": "0.20.2"
            }
        },
        "node_modules/escalade": {
@ -10249,9 +10249,9 @@
            }
        },
        "node_modules/mysql2": {
-            "version": "3.6.5",
-            "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-3.6.5.tgz",
-            "integrity": "sha512-pS/KqIb0xlXmtmqEuTvBXTmLoQ5LmAz5NW/r8UyQ1ldvnprNEj3P9GbmuQQ2J0A4LO+ynotGi6TbscPa8OUb+w==",
+            "version": "3.9.7",
+            "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-3.9.7.tgz",
+            "integrity": "sha512-KnJT8vYRcNAZv73uf9zpXqNbvBG7DJrs+1nACsjZP1HMJ1TgXEy8wnNilXAn/5i57JizXKtrUtwDB7HxT9DDpw==",
            "dependencies": {
                "denque": "^2.1.0",
                "generate-function": "^2.3.1",
@ -13323,9 +13323,9 @@
            "dev": true
        },
        "node_modules/tar": {
-            "version": "6.1.15",
-            "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.15.tgz",
-            "integrity": "sha512-/zKt9UyngnxIT/EAGYuxaMYgOIJiP81ab9ZfkILq4oNLPFX50qyYmu7jRj9qeXoxmJHjGlbH0+cm2uy1WCs10A==",
+            "version": "6.2.1",
+            "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz",
+            "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==",
            "dependencies": {
                "chownr": "^2.0.0",
                "fs-minipass": "^2.0.0",
@ -13967,14 +13967,14 @@
            }
        },
        "node_modules/vite": {
-            "version": "5.0.13",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-5.0.13.tgz",
-            "integrity": "sha512-/9ovhv2M2dGTuA+dY93B9trfyWMDRQw2jdVBhHNP6wr0oF34wG2i/N55801iZIpgUpnHDm4F/FabGQLyc+eOgg==",
+            "version": "5.2.10",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-5.2.10.tgz",
+            "integrity": "sha512-PAzgUZbP7msvQvqdSD+ErD5qGnSFiGOoWmV5yAKUEI0kdhjbH6nMWVyZQC/hSc4aXwc0oJ9aEdIiF9Oje0JFCw==",
            "dev": true,
            "dependencies": {
-                "esbuild": "^0.19.3",
-                "postcss": "^8.4.32",
-                "rollup": "^4.2.0"
+                "esbuild": "^0.20.1",
+                "postcss": "^8.4.38",
+                "rollup": "^4.13.0"
            },
            "bin": {
                "vite": "bin/vite.js"
--- a/package.json
+++ b/package.json
@ -49,7 +49,7 @@
        "build-docker-nightly-local": "npm run build && docker build -f docker/dockerfile -t louislam/uptime-kuma:nightly2 --target nightly .",
        "build-docker-pr-test": "docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64 -t louislam/uptime-kuma:pr-test2 --target pr-test2 . --push",
        "upload-artifacts": "docker buildx build -f docker/dockerfile --platform linux/amd64 -t louislam/uptime-kuma:upload-artifact --build-arg VERSION --build-arg GITHUB_TOKEN --target upload-artifact . --progress plain",
-        "setup": "git checkout 1.23.11 && npm ci --production && npm run download-dist",
+        "setup": "git checkout 1.23.13 && npm ci --production && npm run download-dist",
        "download-dist": "node extra/download-dist.js",
        "mark-as-nightly": "node extra/mark-as-nightly.js",
        "reset-password": "node extra/reset-password.js",
@ -79,7 +79,7 @@
        "@louislam/sqlite3": "15.1.6",
        "@vvo/tzdb": "^6.125.0",
        "args-parser": "~1.3.0",
-        "axios": "~0.28.0",
+        "axios": "~0.28.1",
        "axios-ntlm": "1.3.0",
        "badge-maker": "~3.3.1",
        "bcryptjs": "~2.4.3",
@ -117,7 +117,7 @@
        "mongodb": "~4.17.1",
        "mqtt": "~4.3.7",
        "mssql": "~8.1.4",
-        "mysql2": "~3.6.2",
+        "mysql2": "~3.9.6",
        "nanoid": "~3.3.4",
        "node-cloudflared-tunnel": "~1.0.9",
        "node-radius-client": "~1.0.0",
@ -140,14 +140,14 @@
        "socket.io": "~4.6.1",
        "socket.io-client": "~4.6.1",
        "socks-proxy-agent": "6.1.1",
-        "tar": "~6.1.11",
+        "tar": "~6.2.1",
        "tcp-ping": "~0.1.1",
        "thirty-two": "~1.0.2",
        "tough-cookie": "~4.1.3",
        "ws": "^8.13.0"
    },
    "devDependencies": {
-        "@actions/github": "~5.0.1",
+        "@actions/github": "~5.1.1",
        "@fortawesome/fontawesome-svg-core": "~1.2.36",
        "@fortawesome/free-regular-svg-icons": "~5.15.4",
        "@fortawesome/free-solid-svg-icons": "~5.15.4",
@ -171,7 +171,7 @@
        "cross-env": "~7.0.3",
        "delay": "^5.0.0",
        "dns2": "~2.0.1",
-        "dompurify": "~2.4.3",
+        "dompurify": "~3.0.11",
        "eslint": "~8.14.0",
        "eslint-plugin-jsdoc": "~46.4.6",
        "eslint-plugin-vue": "~8.7.1",
@ -192,7 +192,7 @@
        "test": "~3.3.0",
        "typescript": "~4.4.4",
        "v-pagination-3": "~0.1.7",
-        "vite": "~5.0.10",
+        "vite": "~5.2.8",
        "vite-plugin-compression": "^0.5.1",
        "vite-plugin-vue-devtools": "^7.0.15",
        "vue": "~3.4.2",
--- a/server/model/monitor.js
+++ b/server/model/monitor.js
@ -245,12 +245,12 @@ class Monitor extends BeanModel {
    /**
     * Encode user and password to Base64 encoding
     * for HTTP "basic" auth, as per RFC-7617
-     * @param {string} user Username to encode
-     * @param {string} pass Password to encode
-     * @returns {string} Encoded username:password
+     * @param {string|null} user - The username (nullable if not changed by a user)
+     * @param {string|null} pass - The password (nullable if not changed by a user)
+     * @returns {string} Encoded Base64 string
     */
    encodeBase64(user, pass) {
-        return Buffer.from(user + ":" + pass).toString("base64");
+        return Buffer.from(`${user || ""}:${pass || ""}`).toString("base64");
    }

    /**
@ -533,6 +533,18 @@ class Monitor extends BeanModel {
                        }
                    }

+                    let tlsInfo = {};
+                    // Store tlsInfo when secureConnect event is emitted
+                    // The keylog event listener is a workaround to access the tlsSocket
+                    options.httpsAgent.once("keylog", async (line, tlsSocket) => {
+                        tlsSocket.once("secureConnect", async () => {
+                            tlsInfo = checkCertificate(tlsSocket);
+                            tlsInfo.valid = tlsSocket.authorized || false;
+
+                            await this.handleTlsInfo(tlsInfo);
+                        });
+                    });
+
                    log.debug("monitor", `[${this.name}] Axios Options: ${JSON.stringify(options)}`);
                    log.debug("monitor", `[${this.name}] Axios Request`);

@ -542,31 +554,19 @@ class Monitor extends BeanModel {
                    bean.msg = `${res.status} - ${res.statusText}`;
                    bean.ping = dayjs().valueOf() - startTime;

-                    // Check certificate if https is used
-                    let certInfoStartTime = dayjs().valueOf();
-                    if (this.getUrl()?.protocol === "https:") {
-                        log.debug("monitor", `[${this.name}] Check cert`);
-                        try {
-                            let tlsInfoObject = checkCertificate(res);
-                            tlsInfo = await this.updateTlsInfo(tlsInfoObject);
+                    // fallback for if kelog event is not emitted, but we may still have tlsInfo,
+                    // e.g. if the connection is made through a proxy
+                    if (this.getUrl()?.protocol === "https:" && tlsInfo.valid === undefined) {
+                        const tlsSocket = res.request.res.socket;

-                            if (!this.getIgnoreTls() && this.isEnabledExpiryNotification()) {
-                                log.debug("monitor", `[${this.name}] call checkCertExpiryNotifications`);
-                                await this.checkCertExpiryNotifications(tlsInfoObject);
-                            }
+                        if (tlsSocket) {
+                            tlsInfo = checkCertificate(tlsSocket);
+                            tlsInfo.valid = tlsSocket.authorized || false;

-                        } catch (e) {
-                            if (e.message !== "No TLS certificate in response") {
-                                log.error("monitor", "Caught error");
-                                log.error("monitor", e.message);
-                            }
+                            await this.handleTlsInfo(tlsInfo);
                        }
                    }

-                    if (process.env.TIMELOGGER === "1") {
-                        log.debug("monitor", "Cert Info Query Time: " + (dayjs().valueOf() - certInfoStartTime) + "ms");
-                    }
-
                    if (process.env.UPTIME_KUMA_LOG_RESPONSE_BODY_MONITOR_ID === this.id) {
                        log.info("monitor", res.data);
                    }
@ -599,8 +599,12 @@ class Monitor extends BeanModel {
                        let data = res.data;

                        // convert data to object
-                        if (typeof data === "string") {
-                            data = JSON.parse(data);
+                        if (typeof data === "string" && res.headers["content-type"] !== "application/json") {
+                            try {
+                                data = JSON.parse(data);
+                            } catch (_) {
+                                // Failed to parse as JSON, just process it as a string
+                            }
                        }

                        let expression = jsonata(this.jsonPath);
@ -1615,6 +1619,20 @@ class Monitor extends BeanModel {
        return oAuthAccessToken;
    }

+    /**
+     * Store TLS certificate information and check for expiry
+     * @param {object} tlsInfo Information about the TLS connection
+     * @returns {Promise<void>}
+     */
+    async handleTlsInfo(tlsInfo) {
+        await this.updateTlsInfo(tlsInfo);
+        this.prometheus?.update(null, tlsInfo);
+
+        if (!this.getIgnoreTls() && this.isEnabledExpiryNotification()) {
+            log.debug("monitor", `[${this.name}] call checkCertExpiryNotifications`);
+            await this.checkCertExpiryNotifications(tlsInfo);
+        }
+    }
 }

 module.exports = Monitor;
--- a/server/monitor-types/real-browser-monitor-type.js
+++ b/server/monitor-types/real-browser-monitor-type.js
@ -10,6 +10,10 @@ const jwt = require("jsonwebtoken");
 const config = require("../config");
 const { RemoteBrowser } = require("../remote-browser");

+/**
+ * Cached instance of a browser
+ * @type {import ("playwright-core").Browser}
+ */
 let browser = null;

 let allowedList = [];
@ -71,10 +75,12 @@ async function isAllowedChromeExecutable(executablePath) {
 /**
 * Get the current instance of the browser. If there isn't one, create
 * it.
- * @returns {Promise<Browser>} The browser
+ * @returns {Promise<import ("playwright-core").Browser>} The browser
 */
 async function getBrowser() {
-    if (!browser) {
+    if (browser && browser.isConnected()) {
+        return browser;
+    } else {
        let executablePath = await Settings.get("chromeExecutable");

        executablePath = await prepareChromeExecutable(executablePath);
@ -83,8 +89,9 @@ async function getBrowser() {
            //headless: false,
            executablePath,
        });
+
+        return browser;
    }
-    return browser;
 }

 /**
--- a/server/notification-providers/dingding.js
+++ b/server/notification-providers/dingding.js
@ -62,7 +62,7 @@ class DingDing extends NotificationProvider {
        if (result.data.errmsg === "ok") {
            return true;
        }
-        return false;
+        throw new Error(result.data.errmsg);
    }

    /**
--- a/server/prometheus.js
+++ b/server/prometheus.js
@ -80,23 +80,25 @@ class Prometheus {
            }
        }

-        try {
-            monitorStatus.set(this.monitorLabelValues, heartbeat.status);
-        } catch (e) {
-            log.error("prometheus", "Caught error");
-            log.error("prometheus", e);
-        }
-
-        try {
-            if (typeof heartbeat.ping === "number") {
-                monitorResponseTime.set(this.monitorLabelValues, heartbeat.ping);
-            } else {
-                // Is it good?
-                monitorResponseTime.set(this.monitorLabelValues, -1);
+        if (heartbeat) {
+            try {
+                monitorStatus.set(this.monitorLabelValues, heartbeat.status);
+            } catch (e) {
+                log.error("prometheus", "Caught error");
+                log.error("prometheus", e);
+            }
+
+            try {
+                if (typeof heartbeat.ping === "number") {
+                    monitorResponseTime.set(this.monitorLabelValues, heartbeat.ping);
+                } else {
+                    // Is it good?
+                    monitorResponseTime.set(this.monitorLabelValues, -1);
+                }
+            } catch (e) {
+                log.error("prometheus", "Caught error");
+                log.error("prometheus", e);
            }
-        } catch (e) {
-            log.error("prometheus", "Caught error");
-            log.error("prometheus", e);
        }
    }

--- a/server/server.js
+++ b/server/server.js
@ -149,6 +149,7 @@ const apicache = require("./modules/apicache");
 const { resetChrome } = require("./monitor-types/real-browser-monitor-type");
 const { EmbeddedMariaDB } = require("./embedded-mariadb");
 const { SetupDatabase } = require("./setup-database");
+const { chartSocketHandler } = require("./socket-handlers/chart-socket-handler");

 app.use(express.json());

@ -1319,6 +1320,12 @@ let needSetup = false;
                    await doubleCheckPassword(socket, currentPassword);
                }

+                // Log out all clients if enabling auth
+                // GHSA-23q2-5gf8-gjpp
+                if (currentDisabledAuth && !data.disableAuth) {
+                    server.disconnectAllSocketClients(socket.userID, socket.id);
+                }
+
                const previousChromeExecutable = await Settings.get("chromeExecutable");
                const previousNSCDStatus = await Settings.get("nscd");

@ -1522,6 +1529,7 @@ let needSetup = false;
        apiKeySocketHandler(socket);
        remoteBrowserSocketHandler(socket);
        generalSocketHandler(socket, server);
+        chartSocketHandler(socket);

        log.debug("server", "added all socket handlers");

--- a/server/socket-handlers/chart-socket-handler.js
+++ b/server/socket-handlers/chart-socket-handler.js
@ -0,0 +1,38 @@
+const { checkLogin } = require("../util-server");
+const { UptimeCalculator } = require("../uptime-calculator");
+const { log } = require("../../src/util");
+
+module.exports.chartSocketHandler = (socket) => {
+    socket.on("getMonitorChartData", async (monitorID, period, callback) => {
+        try {
+            checkLogin(socket);
+
+            log.debug("monitor", `Get Monitor Chart Data: ${monitorID} User ID: ${socket.userID}`);
+
+            if (period == null) {
+                throw new Error("Invalid period.");
+            }
+
+            let uptimeCalculator = await UptimeCalculator.getUptimeCalculator(monitorID);
+
+            let data;
+            if (period <= 24) {
+                data = uptimeCalculator.getDataArray(period * 60, "minute");
+            } else if (period <= 720) {
+                data = uptimeCalculator.getDataArray(period, "hour");
+            } else {
+                data = uptimeCalculator.getDataArray(period / 24, "day");
+            }
+
+            callback({
+                ok: true,
+                data,
+            });
+        } catch (e) {
+            callback({
+                ok: false,
+                msg: e.message,
+            });
+        }
+    });
+};
--- a/server/uptime-calculator.js
+++ b/server/uptime-calculator.js
@ -290,7 +290,7 @@ class UptimeCalculator {
        dailyStatBean.pingMax = dailyData.maxPing;
        {
            // eslint-disable-next-line no-unused-vars
-            const { up, down, avgPing, minPing, maxPing, ...extras } = dailyData;
+            const { up, down, avgPing, minPing, maxPing, timestamp, ...extras } = dailyData;
            if (Object.keys(extras).length > 0) {
                dailyStatBean.extras = JSON.stringify(extras);
            }
@ -305,7 +305,7 @@ class UptimeCalculator {
        hourlyStatBean.pingMax = hourlyData.maxPing;
        {
            // eslint-disable-next-line no-unused-vars
-            const { up, down, avgPing, minPing, maxPing, ...extras } = hourlyData;
+            const { up, down, avgPing, minPing, maxPing, timestamp, ...extras } = hourlyData;
            if (Object.keys(extras).length > 0) {
                hourlyStatBean.extras = JSON.stringify(extras);
            }
@ -320,7 +320,7 @@ class UptimeCalculator {
        minutelyStatBean.pingMax = minutelyData.maxPing;
        {
            // eslint-disable-next-line no-unused-vars
-            const { up, down, avgPing, minPing, maxPing, ...extras } = minutelyData;
+            const { up, down, avgPing, minPing, maxPing, timestamp, ...extras } = minutelyData;
            if (Object.keys(extras).length > 0) {
                minutelyStatBean.extras = JSON.stringify(extras);
            }
--- a/server/util-server.js
+++ b/server/util-server.js
@ -653,21 +653,27 @@ const parseCertificateInfo = function (info) {

 /**
 * Check if certificate is valid
- * @param {object} res Response object from axios
+ * @param {tls.TLSSocket} socket TLSSocket, which may or may not be connected
 * @returns {object} Object containing certificate information
- * @throws No socket was found to check certificate for
 */
-exports.checkCertificate = function (res) {
-    if (!res.request.res.socket) {
-        throw new Error("No socket found");
+exports.checkCertificate = function (socket) {
+    let certInfoStartTime = dayjs().valueOf();
+
+    // Return null if there is no socket
+    if (socket === undefined || socket == null) {
+        return null;
    }

-    const info = res.request.res.socket.getPeerCertificate(true);
-    const valid = res.request.res.socket.authorized || false;
+    const info = socket.getPeerCertificate(true);
+    const valid = socket.authorized || false;

    log.debug("cert", "Parsing Certificate Info");
    const parsedInfo = parseCertificateInfo(info);

+    if (process.env.TIMELOGGER === "1") {
+        log.debug("monitor", "Cert Info Query Time: " + (dayjs().valueOf() - certInfoStartTime) + "ms");
+    }
+
    return {
        valid: valid,
        certInfo: parsedInfo
--- a/src/components/PingChart.vue
+++ b/src/components/PingChart.vue
@ -1,16 +1,24 @@
 <template>
    <div>
        <div class="period-options">
-            <button type="button" class="btn btn-light dropdown-toggle btn-period-toggle" data-bs-toggle="dropdown" aria-expanded="false">
+            <button
+                type="button" class="btn btn-light dropdown-toggle btn-period-toggle" data-bs-toggle="dropdown"
+                aria-expanded="false"
+            >
                {{ chartPeriodOptions[chartPeriodHrs] }}&nbsp;
            </button>
            <ul class="dropdown-menu dropdown-menu-end">
                <li v-for="(item, key) in chartPeriodOptions" :key="key">
-                    <a class="dropdown-item" :class="{ active: chartPeriodHrs == key }" href="#" @click="chartPeriodHrs = key">{{ item }}</a>
+                    <button
+                        type="button" class="dropdown-item" :class="{ active: chartPeriodHrs == key }"
+                        @click="chartPeriodHrs = key"
+                    >
+                        {{ item }}
+                    </button>
                </li>
            </ul>
        </div>
-        <div class="chart-wrapper" :class="{ loading : loading}">
+        <div class="chart-wrapper" :class="{ loading: loading }">
            <Line :data="chartData" :options="chartOptions" />
        </div>
    </div>
@ -19,9 +27,8 @@
 <script lang="js">
 import { BarController, BarElement, Chart, Filler, LinearScale, LineController, LineElement, PointElement, TimeScale, Tooltip } from "chart.js";
 import "chartjs-adapter-dayjs-4";
-import dayjs from "dayjs";
 import { Line } from "vue-chartjs";
-import { DOWN, PENDING, MAINTENANCE, log } from "../util.ts";
+import { UP, DOWN, PENDING, MAINTENANCE } from "../util.ts";

 Chart.register(LineController, BarController, LineElement, PointElement, TimeScale, BarElement, LinearScale, Tooltip, Filler);

@ -39,8 +46,9 @@ export default {

            loading: false,

-            // Configurable filtering on top of the returned data
-            chartPeriodHrs: 0,
+            // Time period for the chart to display, in hours
+            // Initial value is 0 as a workaround for triggering a data fetch on created()
+            chartPeriodHrs: "0",

            chartPeriodOptions: {
                0: this.$t("recent"),
@ -50,9 +58,8 @@ export default {
                168: "1w",
            },

-            // A heartbeatList for 3h, 6h, 24h, 1w
-            // Uses the $root.heartbeatList when value is null
-            heartbeatList: null
+            chartRawData: null,
+            chartDataFetchInterval: null,
        };
    },
    computed: {
@ -157,34 +164,197 @@ export default {
            };
        },
        chartData() {
+            if (this.chartPeriodHrs === "0") {
+                return this.getChartDatapointsFromHeartbeatList();
+            } else {
+                return this.getChartDatapointsFromStats();
+            }
+        },
+    },
+    watch: {
+        // Update chart data when the selected chart period changes
+        chartPeriodHrs: function (newPeriod) {
+            if (this.chartDataFetchInterval) {
+                clearInterval(this.chartDataFetchInterval);
+                this.chartDataFetchInterval = null;
+            }
+
+            // eslint-disable-next-line eqeqeq
+            if (newPeriod == "0") {
+                this.heartbeatList = null;
+                this.$root.storage().removeItem(`chart-period-${this.monitorId}`);
+            } else {
+                this.loading = true;
+
+                let period;
+                try {
+                    period = parseInt(newPeriod);
+                } catch (e) {
+                    // Invalid period
+                    period = 24;
+                }
+
+                this.$root.getMonitorChartData(this.monitorId, period, (res) => {
+                    if (!res.ok) {
+                        this.$root.toastError(res.msg);
+                    } else {
+                        this.chartRawData = res.data;
+                        this.$root.storage()[`chart-period-${this.monitorId}`] = newPeriod;
+                    }
+                    this.loading = false;
+                });
+
+                this.chartDataFetchInterval = setInterval(() => {
+                    this.$root.getMonitorChartData(this.monitorId, period, (res) => {
+                        if (res.ok) {
+                            this.chartRawData = res.data;
+                        }
+                    });
+                }, 5 * 60 * 1000);
+            }
+        }
+    },
+    created() {
+        // Load chart period from storage if saved
+        let period = this.$root.storage()[`chart-period-${this.monitorId}`];
+        if (period != null) {
+            // Has this ever been not a string?
+            if (typeof period !== "string") {
+                period = period.toString();
+            }
+            this.chartPeriodHrs = period;
+        } else {
+            this.chartPeriodHrs = "24";
+        }
+    },
+    beforeUnmount() {
+        if (this.chartDataFetchInterval) {
+            clearInterval(this.chartDataFetchInterval);
+        }
+    },
+    methods: {
+        // Get color of bar chart for this datapoint
+        getBarColorForDatapoint(datapoint) {
+            if (datapoint.maintenance != null) {
+                // Target is in maintenance
+                return "rgba(23,71,245,0.41)";
+            } else if (datapoint.down === 0) {
+                // Target is up, no need to display a bar
+                return "#000";
+            } else if (datapoint.up === 0) {
+                // Target is down
+                return "rgba(220, 53, 69, 0.41)";
+            } else {
+                // Show yellow for mixed status
+                return "rgba(245, 182, 23, 0.41)";
+            }
+        },
+        // push datapoint to chartData
+        pushDatapoint(datapoint, avgPingData, minPingData, maxPingData, downData, colorData) {
+            const x = this.$root.unixToDateTime(datapoint.timestamp);
+
+            // Show ping values if it was up in this period
+            avgPingData.push({
+                x,
+                y: datapoint.up > 0 && datapoint.avgPing > 0 ? datapoint.avgPing : null,
+            });
+            minPingData.push({
+                x,
+                y: datapoint.up > 0 && datapoint.avgPing > 0 ? datapoint.minPing : null,
+            });
+            maxPingData.push({
+                x,
+                y: datapoint.up > 0 && datapoint.avgPing > 0 ? datapoint.maxPing : null,
+            });
+            downData.push({
+                x,
+                y: datapoint.down + (datapoint.maintenance || 0),
+            });
+
+            colorData.push(this.getBarColorForDatapoint(datapoint));
+        },
+        // get the average of a set of datapoints
+        getAverage(datapoints) {
+            const totalUp = datapoints.reduce((total, current) => total + current.up, 0);
+            const totalDown = datapoints.reduce((total, current) => total + current.down, 0);
+            const totalMaintenance = datapoints.reduce((total, current) => total + (current.maintenance || 0), 0);
+            const totalPing = datapoints.reduce((total, current) => total + current.avgPing * current.up, 0);
+            const minPing = datapoints.reduce((min, current) => Math.min(min, current.minPing), Infinity);
+            const maxPing = datapoints.reduce((max, current) => Math.max(max, current.maxPing), 0);
+
+            // Find the middle timestamp to use
+            let midpoint = Math.floor(datapoints.length / 2);
+
+            return {
+                timestamp: datapoints[midpoint].timestamp,
+                up: totalUp,
+                down: totalDown,
+                maintenance: totalMaintenance > 0 ? totalMaintenance : undefined,
+                avgPing: totalUp > 0 ? totalPing / totalUp : 0,
+                minPing,
+                maxPing,
+            };
+        },
+        getChartDatapointsFromHeartbeatList() {
+            // Render chart using heartbeatList
+            let lastHeartbeatTime;
+            const monitorInterval = this.$root.monitorList[this.monitorId]?.interval;
            let pingData = [];  // Ping Data for Line Chart, y-axis contains ping time
            let downData = [];  // Down Data for Bar Chart, y-axis is 1 if target is down (red color), under maintenance (blue color) or pending (orange color), 0 if target is up
            let colorData = []; // Color Data for Bar Chart

-            let heartbeatList = this.heartbeatList ||
-             (this.monitorId in this.$root.heartbeatList && this.$root.heartbeatList[this.monitorId]) ||
-             [];
+            let heartbeatList = (this.monitorId in this.$root.heartbeatList && this.$root.heartbeatList[this.monitorId]) || [];

-            heartbeatList
-                .filter(
-                    // Filtering as data gets appended
-                    // not the most efficient, but works for now
-                    (beat) => dayjs.utc(beat.time).tz(this.$root.timezone).isAfter(
-                        dayjs().subtract(Math.max(this.chartPeriodHrs, 6), "hours")
-                    )
-                )
-                .map((beat) => {
-                    const x = this.$root.datetime(beat.time);
-                    pingData.push({
-                        x,
-                        y: beat.ping,
-                    });
-                    downData.push({
-                        x,
-                        y: (beat.status === DOWN || beat.status === MAINTENANCE || beat.status === PENDING) ? 1 : 0,
-                    });
-                    colorData.push((beat.status === MAINTENANCE) ? "rgba(23,71,245,0.41)" : ((beat.status === PENDING) ? "rgba(245,182,23,0.41)" : "#DC354568"));
+            for (const beat of heartbeatList) {
+                const beatTime = this.$root.toDayjs(beat.time);
+                const x = beatTime.format("YYYY-MM-DD HH:mm:ss");
+
+                // Insert empty datapoint to separate big gaps
+                if (lastHeartbeatTime && monitorInterval) {
+                    const diff = Math.abs(beatTime.diff(lastHeartbeatTime));
+                    if (diff > monitorInterval * 1000 * 10) {
+                        // Big gap detected
+                        const gapX = [
+                            lastHeartbeatTime.add(monitorInterval, "second").format("YYYY-MM-DD HH:mm:ss"),
+                            beatTime.subtract(monitorInterval, "second").format("YYYY-MM-DD HH:mm:ss")
+                        ];
+
+                        for (const x of gapX) {
+                            pingData.push({
+                                x,
+                                y: null,
+                            });
+                            downData.push({
+                                x,
+                                y: null,
+                            });
+                            colorData.push("#000");
+                        }
+
+                    }
+                }
+
+                pingData.push({
+                    x,
+                    y: beat.status === UP ? beat.ping : null,
                });
+                downData.push({
+                    x,
+                    y: (beat.status === DOWN || beat.status === MAINTENANCE || beat.status === PENDING) ? 1 : 0,
+                });
+                switch (beat.status) {
+                    case MAINTENANCE:
+                        colorData.push("rgba(23 ,71, 245, 0.41)");
+                        break;
+                    case PENDING:
+                        colorData.push("rgba(245, 182, 23, 0.41)");
+                        break;
+                    default:
+                        colorData.push("rgba(220, 53, 69, 0.41)");
+                }
+
+                lastHeartbeatTime = beatTime;
+            }

            return {
                datasets: [
@ -214,54 +384,155 @@ export default {
                ],
            };
        },
-    },
-    watch: {
-        // Update chart data when the selected chart period changes
-        chartPeriodHrs: function (newPeriod) {
+        getChartDatapointsFromStats() {
+            // Render chart using UptimeCalculator data
+            let lastHeartbeatTime;
+            const monitorInterval = this.$root.monitorList[this.monitorId]?.interval;

-            // eslint-disable-next-line eqeqeq
-            if (newPeriod == "0") {
-                this.heartbeatList = null;
-                this.$root.storage().removeItem(`chart-period-${this.monitorId}`);
-            } else {
-                this.loading = true;
+            let avgPingData = [];  // Ping Data for Line Chart, y-axis contains ping time
+            let minPingData = [];  // Ping Data for Line Chart, y-axis contains ping time
+            let maxPingData = [];  // Ping Data for Line Chart, y-axis contains ping time
+            let downData = [];  // Down Data for Bar Chart, y-axis is number of down datapoints in this period
+            let colorData = []; // Color Data for Bar Chart

-                this.$root.getMonitorBeats(this.monitorId, newPeriod, (res) => {
-                    if (!res.ok) {
-                        this.$root.toastError(res.msg);
+            const period = parseInt(this.chartPeriodHrs);
+            let aggregatePoints = period > 6 ? 12 : 4;
+
+            let aggregateBuffer = [];
+
+            if (this.chartRawData) {
+                for (const datapoint of this.chartRawData) {
+                    // Empty datapoints are ignored
+                    if (datapoint.up === 0 && datapoint.down === 0 && datapoint.maintenance === 0) {
+                        continue;
+                    }
+
+                    const beatTime = this.$root.unixToDayjs(datapoint.timestamp);
+
+                    // Insert empty datapoint to separate big gaps
+                    if (lastHeartbeatTime && monitorInterval) {
+                        const diff = Math.abs(beatTime.diff(lastHeartbeatTime));
+                        const oneSecond = 1000;
+                        const oneMinute = oneSecond * 60;
+                        const oneHour = oneMinute * 60;
+                        if ((period <= 24 && diff > Math.max(oneMinute * 10, monitorInterval * oneSecond * 10)) ||
+                            (period > 24 && diff > Math.max(oneHour * 10, monitorInterval * oneSecond * 10))) {
+                            // Big gap detected
+                            // Clear the aggregate buffer
+                            if (aggregateBuffer.length > 0) {
+                                const average = this.getAverage(aggregateBuffer);
+                                this.pushDatapoint(average, avgPingData, minPingData, maxPingData, downData, colorData);
+                                aggregateBuffer = [];
+                            }
+
+                            const gapX = [
+                                lastHeartbeatTime.subtract(monitorInterval, "second").format("YYYY-MM-DD HH:mm:ss"),
+                                this.$root.unixToDateTime(datapoint.timestamp + 60),
+                            ];
+
+                            for (const x of gapX) {
+                                avgPingData.push({
+                                    x,
+                                    y: null,
+                                });
+                                minPingData.push({
+                                    x,
+                                    y: null,
+                                });
+                                maxPingData.push({
+                                    x,
+                                    y: null,
+                                });
+                                downData.push({
+                                    x,
+                                    y: null,
+                                });
+                                colorData.push("#000");
+                            }
+
+                        }
+                    }
+
+                    if (datapoint.up > 0 && this.chartRawData.length > aggregatePoints * 2) {
+                        // Aggregate Up data using a sliding window
+                        aggregateBuffer.push(datapoint);
+
+                        if (aggregateBuffer.length === aggregatePoints) {
+                            const average = this.getAverage(aggregateBuffer);
+                            this.pushDatapoint(average, avgPingData, minPingData, maxPingData, downData, colorData);
+                            // Remove the first half of the buffer
+                            aggregateBuffer = aggregateBuffer.slice(Math.floor(aggregatePoints / 2));
+                        }
                    } else {
-                        this.heartbeatList = res.data;
-                        this.$root.storage()[`chart-period-${this.monitorId}`] = newPeriod;
-                    }
-                    this.loading = false;
-                });
-            }
-        }
-    },
-    created() {
-        // Setup Watcher on the root heartbeatList,
-        // And mirror latest change to this.heartbeatList
-        this.$watch(() => this.$root.heartbeatList[this.monitorId],
-            (heartbeatList) => {
+                        // datapoint is fully down or too few datapoints, no need to aggregate
+                        // Clear the aggregate buffer
+                        if (aggregateBuffer.length > 0) {
+                            const average = this.getAverage(aggregateBuffer);
+                            this.pushDatapoint(average, avgPingData, minPingData, maxPingData, downData, colorData);
+                            aggregateBuffer = [];
+                        }

-                log.debug("ping_chart", `this.chartPeriodHrs type ${typeof this.chartPeriodHrs}, value: ${this.chartPeriodHrs}`);
-
-                // eslint-disable-next-line eqeqeq
-                if (this.chartPeriodHrs != "0") {
-                    const newBeat = heartbeatList.at(-1);
-                    if (newBeat && dayjs.utc(newBeat.time) > dayjs.utc(this.heartbeatList.at(-1)?.time)) {
-                        this.heartbeatList.push(heartbeatList.at(-1));
+                        this.pushDatapoint(datapoint, avgPingData, minPingData, maxPingData, downData, colorData);
                    }
+
+                    lastHeartbeatTime = beatTime;
                }
-            },
-            { deep: true }
-        );
+                // Clear the aggregate buffer if there are still datapoints
+                if (aggregateBuffer.length > 0) {
+                    const average = this.getAverage(aggregateBuffer);
+                    this.pushDatapoint(average, avgPingData, minPingData, maxPingData, downData, colorData);
+                    aggregateBuffer = [];
+                }
+            }

-        // 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);
-        }
+            return {
+                datasets: [
+                    {
+                        // average ping chart
+                        data: avgPingData,
+                        fill: "origin",
+                        tension: 0.2,
+                        borderColor: "#5CDD8B",
+                        backgroundColor: "#5CDD8B06",
+                        yAxisID: "y",
+                        label: "avg-ping",
+                    },
+                    {
+                        // minimum ping chart
+                        data: minPingData,
+                        fill: "origin",
+                        tension: 0.2,
+                        borderColor: "#3CBD6B38",
+                        backgroundColor: "#5CDD8B06",
+                        yAxisID: "y",
+                        label: "min-ping",
+                    },
+                    {
+                        // maximum ping chart
+                        data: maxPingData,
+                        fill: "origin",
+                        tension: 0.2,
+                        borderColor: "#7CBD6B38",
+                        backgroundColor: "#5CDD8B06",
+                        yAxisID: "y",
+                        label: "max-ping",
+                    },
+                    {
+                        // Bar Chart
+                        type: "bar",
+                        data: downData,
+                        borderColor: "#00000000",
+                        backgroundColor: colorData,
+                        yAxisID: "y1",
+                        barThickness: "flex",
+                        barPercentage: 1,
+                        categoryPercentage: 1,
+                        inflateAmount: 0.05,
+                        label: "status",
+                    },
+                ],
+            };
+        },
    }
 };
 </script>
@ -296,6 +567,7 @@ export default {

            .dark & {
                background: $dark-bg;
+                color: $dark-font-color;
            }

            .dark &:hover {
--- a/src/components/notifications/SMTP.vue
+++ b/src/components/notifications/SMTP.vue
@ -5,6 +5,14 @@
            <input id="hostname" v-model="$parent.notification.smtpHost" type="text" class="form-control" required>
        </div>

+        <i18n-t tag="div" keypath="Either enter the hostname of the server you want to connect to or localhost if you intend to use a locally configured mail transfer agent" class="form-text">
+            <template #localhost>
+                <code>localhost</code>
+            </template>
+            <template #local_mta>
+                <a href="https://wikipedia.org/wiki/Mail_Transfer_Agent" target="_blank">{{ $t("locally configured mail transfer agent") }}</a>
+            </template>
+        </i18n-t>
        <div class="mb-3">
            <label for="port" class="form-label">{{ $t("Port") }}</label>
            <input id="port" v-model="$parent.notification.smtpPort" type="number" class="form-control" required min="0" max="65535" step="1">
--- a/src/i18n.js
+++ b/src/i18n.js
@ -59,10 +59,29 @@ for (let lang in languageList) {

 const rtlLangs = [ "he-IL", "fa", "ar-SY", "ur" ];

-export const currentLocale = () => localStorage.locale
-    || languageList[navigator.language] && navigator.language
-    || languageList[navigator.language.substring(0, 2)] && navigator.language.substring(0, 2)
-    || "en";
+/**
+ * Find the best matching locale to display
+ * If no locale can be matched, the default is "en"
+ * @returns {string} the locale that should be displayed
+ */
+export function currentLocale() {
+    for (const locale of [ localStorage.locale, navigator.language, ...navigator.languages ]) {
+        // localstorage might not have a value or there might not be a language in `navigator.language`
+        if (!locale) {
+            continue;
+        }
+        if (locale in messages) {
+            return locale;
+        }
+        // some locales are further specified such as "en-US".
+        // If we only have a generic locale for this, we can use it too
+        const genericLocale = locale.split("-")[0];
+        if (genericLocale in messages) {
+            return genericLocale;
+        }
+    }
+    return "en";
+}

 export const localeDirection = () => {
    return rtlLangs.includes(currentLocale()) ? "rtl" : "ltr";
--- a/src/lang/en.json
+++ b/src/lang/en.json
@ -63,6 +63,8 @@
    "Friendly Name": "Friendly Name",
    "URL": "URL",
    "Hostname": "Hostname",
+    "locally configured mail transfer agent": "locally configured mail transfer agent",
+    "Either enter the hostname of the server you want to connect to or localhost if you intend to use a locally configured mail transfer agent": "Either enter the hostname of the server you want to connect to or {localhost} if you intend to use a {local_mta}",
    "Port": "Port",
    "Heartbeat Interval": "Heartbeat Interval",
    "Request Timeout": "Request Timeout",
--- a/src/mixins/datetime.js
+++ b/src/mixins/datetime.js
@ -41,6 +41,33 @@ export default {
            return this.datetimeFormat(value, "YYYY-MM-DD HH:mm:ss");
        },

+        /**
+         * Converts a Unix timestamp to a formatted date and time string.
+         * @param {number} value - The Unix timestamp to convert.
+         * @returns {string} The formatted date and time string.
+         */
+        unixToDateTime(value) {
+            return dayjs.unix(value).tz(this.timezone).format("YYYY-MM-DD HH:mm:ss");
+        },
+
+        /**
+         * Converts a Unix timestamp to a dayjs object.
+         * @param {number} value - The Unix timestamp to convert.
+         * @returns {dayjs.Dayjs} The dayjs object representing the given timestamp.
+         */
+        unixToDayjs(value) {
+            return dayjs.unix(value).tz(this.timezone);
+        },
+
+        /**
+         * Converts the given value to a dayjs object.
+         * @param {string} value - the value to be converted
+         * @returns {dayjs.Dayjs} a dayjs object in the timezone of this instance
+         */
+        toDayjs(value) {
+            return dayjs.utc(value).tz(this.timezone);
+        },
+
        /**
         * Get time for maintenance
         * @param {string | number | Date | dayjs.Dayjs} value Time to
--- a/src/mixins/socket.js
+++ b/src/mixins/socket.js
@ -673,6 +673,17 @@ export default {
        getMonitorBeats(monitorID, period, callback) {
            socket.emit("getMonitorBeats", monitorID, period, callback);
        },
+
+        /**
+         * Retrieves monitor chart data.
+         * @param {string} monitorID - The ID of the monitor.
+         * @param {number} period - The time period for the chart data, in hours.
+         * @param {socketCB} callback - The callback function to handle the chart data.
+         * @returns {void}
+         */
+        getMonitorChartData(monitorID, period, callback) {
+            socket.emit("getMonitorChartData", monitorID, period, callback);
+        }
    },

    computed: {
Author	SHA1	Message	Date
Nelson Chan	e7784c9657	Merge `c2f363be64` into `c86706f189`	2024-04-27 10:55:42 +10:00
Louis Lam	c86706f189	1.23.13 changes merge to 2.0.0 (#4708 )	2024-04-26 15:11:26 +08:00
Louis Lam	1d091739c8	Update server/model/monitor.js Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>	2024-04-26 15:01:03 +08:00
Louis Lam	27bcc968ec	Update server/util-server.js Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>	2024-04-25 23:45:30 +08:00
Louis Lam	c0db036187	Update server/model/monitor.js Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>	2024-04-25 23:45:24 +08:00
Louis Lam	7da5b2311c	Fix merge issue	2024-04-25 15:49:32 +08:00
Louis Lam	996db6281b	Update dependencies and remove an empty file	2024-04-25 15:46:18 +08:00
Louis Lam	63a380326d	Merge branch '1.23.X' into 1.23.13-to-2.0.0 # Conflicts: # .github/workflows/auto-test.yml # package-lock.json # package.json # server/database.js # server/model/monitor.js # server/monitor-types/real-browser-monitor-type.js # server/util-server.js # test/cypress/unit/i18n.spec.js	2024-04-25 15:42:53 +08:00
Louis Lam	2778929f74	Update to 1.23.13	2024-04-25 15:27:28 +08:00
Louis Lam	f71d35e53e	Update dependencies	2024-04-25 15:26:49 +08:00
Nelson Chan	1490443618	Fix: Getting TLS certificate through proxy & prometheus update (#4700 )	2024-04-24 14:37:17 +08:00
Frank Elsinga	add5c128ce	fix: Localisation-matching algorithm missing some edgecase (#4692 )	2024-04-21 20:23:34 +08:00
Louis Lam	e797abd108	Update to 1.23.12	2024-04-19 01:17:13 +08:00
Louis Lam	7a9e2f5de6	Merge pull request from GHSA-23q2-5gf8-gjpp	2024-04-19 01:08:31 +08:00
Louis Lam	7b5d2a71ff	Update dependencies	2024-04-18 20:48:07 +08:00
Nelson Chan	c2f363be64	Fix: Revert default value change	2024-04-14 01:21:10 +08:00
Nelson Chan	ddfe06c72f	Chore: Apply suggestions	2024-04-14 01:03:12 +08:00
Nelson Chan	d9da6819ff	Chore: Simplify bar def. Co-authored-by: Frank Elsinga <frank@elsinga.de>	2024-04-09 13:46:46 +08:00
Nelson Chan	182f471851	Chore: formatting Co-authored-by: Frank Elsinga <frank@elsinga.de>	2024-04-09 13:42:42 +08:00
Nelson Chan	73952b8f7d	Chore: Simplify midpoint calc. Co-authored-by: Frank Elsinga <frank@elsinga.de>	2024-04-09 13:42:26 +08:00
Nelson Chan	1c34f30f57	Fix: Change role to type Co-authored-by: Frank Elsinga <frank@elsinga.de>	2024-04-09 13:41:53 +08:00
Nelson Chan	6b03bb227c	Chore: Change logging to debug only	2024-04-06 23:00:01 +08:00
Nelson Chan	2bb3fb1aaa	Fix: Do not save timestamp in extras	2024-04-06 22:51:58 +08:00
Nelson Chan	7688a04768	Fix: Insert empty datapoint on both sides of the gap	2024-04-06 22:23:23 +08:00
Nelson Chan	1a2a652af4	Feat: Insert empty datapoint to break time gaps	2024-04-06 22:23:23 +08:00
Nelson Chan	024db606db	Chore: Set 24 Hrs as default	2024-04-06 22:23:23 +08:00
Nelson Chan	499632d69b	Feat: Support maintenance in chart	2024-04-06 22:23:23 +08:00
Nelson Chan	86f2a86a4e	Feat: Periodic refresh chart data	2024-04-06 22:23:22 +08:00
Nelson Chan	909415bb1e	Chore: Format code	2024-04-06 22:23:22 +08:00
Nelson Chan	03b8e82445	Fix: Do not push datapoint if ping is 0	2024-04-06 22:23:22 +08:00
Nelson Chan	caec763e21	Fix: Use hourly data for chart Fix: Do not aggregate too few datapoints	2024-04-06 22:23:22 +08:00
Nelson Chan	1ba7935376	Fix: css in dark mode	2024-04-06 22:23:22 +08:00
Nelson Chan	05641d2e1e	Feat: Improve aggregate using sliding window	2024-04-06 22:23:22 +08:00
Nelson Chan	25ebfdedbe	Chore: Change to button to preserve scroll position	2024-04-06 22:23:22 +08:00
Nelson Chan	129dfbb1c8	Feat: simple aggregate function	2024-04-06 22:23:22 +08:00
Nelson Chan	b5d1fc52fc	Chore: Fix comments	2024-04-06 22:23:22 +08:00
Nelson Chan	4ab1a03cb9	Fix: Do not show ping if not up	2024-04-06 22:23:22 +08:00
Nelson Chan	bdfdcdb84c	Fix: chartPeriodHrs is always a string	2024-04-06 22:23:22 +08:00
Nelson Chan	cc22a87d30	Chore: Remove logging	2024-04-06 22:23:22 +08:00
Nelson Chan	716dffa47d	Chore: Remove unused	2024-04-06 22:23:21 +08:00
Nelson Chan	e78eb5e626	WIP: fetch historic data for ping-chart	2024-04-06 22:23:21 +08:00
Nelson Chan	893278bd3d	Feat: Use keylog event to obtain TLS certificate for better reliability [1.23.X] (#4630 ) Co-authored-by: Frank Elsinga <frank@elsinga.de>	2024-04-06 18:43:08 +08:00
Adam Stachowicz	0e30ea830d	fix: Update nodemailer to fix GHSA-9h6g-pr28-7cqp [1.23.X] (#4653 )	2024-04-05 17:38:24 +02:00
Louis Lam	c67a2070b8	Update deps	2024-04-05 12:12:36 +08:00
Adam Stachowicz	9863a10321	fix: Update `axios`, `@actions/github` and `dompurify` [1.23.X] (#4652 )	2024-04-05 11:47:46 +08:00
Nelson Chan	ee7f8680c1	Fix: Add missing FK for monitor-tls-info table [1.23.X] (#4631 )	2024-03-31 12:05:38 +08:00
Nelson Chan	c1301804d4	Fix: Fix CI on Windows Runner [1.23.X] (#4633 )	2024-03-31 10:33:59 +08:00
Frank Elsinga	b385e81608	Improved helptext of how to send mail via the systems mail subsystem (#4477 )	2024-03-05 19:40:45 +01:00
Frank Elsinga	f37f55e06c	Fixed lining issues introduced by code reivew	2024-02-11 22:44:57 +01:00
Frank Elsinga	87d7a780e3	changed the helptext a bit to make it more usefull for novice users	2024-02-11 22:40:47 +01:00
apio-sys	0fc372f558	#2793	2024-02-11 20:20:52 +01:00
Joris Le Blansch	67a13e1259	#2793	2024-02-11 20:03:17 +01:00
Nelson Chan	2b8f55194f	Fix: [JSON-Query] Prevent parsing string-only JSON (#4425 )	2024-01-28 03:18:24 +08:00
Nelson Chan	288cab6dd7	Fix: Make sure browser is connected before returning (#4417 )	2024-01-25 07:59:42 +08:00
AnnAngela	b4e45c7ce8	fix(notification-dingding): throw error when failed (#3598 )	2024-01-20 03:29:13 +08:00
Frank Elsinga	7635ab54a0	made sure that the i18n does use `navigator.languages` instead of `navigator.language` for automatic language detection (#4244 )	2024-01-07 23:55:10 +08:00
Adam Stachowicz	458cdf9f9b	Fix `encodeBase64` for empty password or user in HTTP Basic Authentication (#4326 )	2024-01-07 02:06:06 +08:00