Merge branch 'louislam:master' into bulgarian

.dockerignore

@@ -28,6 +28,8 @@ SECURITY.md
 tsconfig.json
 .env
 /tmp
+/babel.config.js
+/ecosystem.config.js
 
 ### .gitignore content (commented rules are duplicated)
 
@@ -42,4 +44,6 @@ dist-ssr
 #!/data/.gitkeep
 #.vscode
 
+
+
 ### End of .gitignore content

.npmrc

@@ -0,0 +1 @@
+legacy-peer-deps=true

CONTRIBUTING.md

@@ -44,6 +44,8 @@ My long story here: https://www.reddit.com/r/UptimeKuma/comments/t1t6or/comment/
 
 ### Recommended Pull Request Guideline
 
+Before deep into coding, disscussion first is preferred. Creating an empty pull request for disscussion would be recommended.
+
 1. Fork the project
 1. Clone your fork repo to local
 1. Create a new branch
@@ -53,6 +55,7 @@ My long story here: https://www.reddit.com/r/UptimeKuma/comments/t1t6or/comment/
 1. Create a pull request: https://github.com/louislam/uptime-kuma/compare
 1. Write a proper description
 1. Click "Change to draft"
+1. Discussion
 
 #### ❌ Won't Merge
 

README.md

@@ -37,7 +37,6 @@ VPS is sponsored by Uptime Kuma sponsors on [Open Collective](https://opencollec
 ### 🐳 Docker
 
 ```bash
-docker volume create uptime-kuma
 docker run -d --restart=always -p 3001:3001 -v uptime-kuma:/app/data --name uptime-kuma louislam/uptime-kuma:1
 ```
 
@@ -47,7 +46,10 @@ Browse to http://localhost:3001 after starting.
 
 ### 💪🏻 Non-Docker
 
-Required Tools: Node.js >= 14, git and pm2.
+Required Tools: 
+- [Node.js](https://nodejs.org/en/download/) >= 14
+- [Git](https://git-scm.com/downloads) 
+- [pm2](https://pm2.keymetrics.io/) - For run in background
 
 ```bash
 # Update your npm to the latest version
@@ -67,11 +69,19 @@ npm install pm2 -g && pm2 install pm2-logrotate
 # Start Server
 pm2 start server/server.js --name uptime-kuma
 
+
+```
+Browse to http://localhost:3001 after starting.
+
+More useful PM2 Commands
+
+```bash
 # If you want to see the current console output
 pm2 monit
-```
 
-Browse to http://localhost:3001 after starting.
+# If you want to add it to startup
+pm2 save && pm2 startup
+```
 
 ### Advanced Installation
 
@@ -99,7 +109,7 @@ https://github.com/louislam/uptime-kuma/projects/1
 
 Thank you so much! (GitHub Sponsors will be updated manually. OpenCollective sponsors will be updated automatically, the list will be cached by GitHub though. It may need some time to be updated)
 
-<img src="https://uptime.kuma.pet/sponsors?v=3" alt />
+<img src="https://uptime.kuma.pet/sponsors?v=6" alt />
 
 ## 🖼 More Screenshots
 

db/patch-monitor-expiry-notification.sql

@@ -0,0 +1,7 @@
+-- You should not modify if this have pushed to Github, unless it does serious wrong with the db.
+BEGIN TRANSACTION;
+
+ALTER TABLE monitor
+    ADD expiry_notification BOOLEAN default 1;
+
+COMMIT;

db/patch-proxy.sql

@@ -0,0 +1,23 @@
+-- You should not modify if this have pushed to Github, unless it does serious wrong with the db.
+BEGIN TRANSACTION;
+
+CREATE TABLE proxy (
+    id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    user_id INT NOT NULL,
+    protocol VARCHAR(10) NOT NULL,
+    host VARCHAR(255) NOT NULL,
+    port SMALLINT NOT NULL,
+    auth BOOLEAN NOT NULL,
+    username VARCHAR(255) NULL,
+    password VARCHAR(255) NULL,
+    active BOOLEAN NOT NULL DEFAULT 1,
+    'default' BOOLEAN NOT NULL DEFAULT 0,
+    created_date DATETIME DEFAULT (DATETIME('now')) NOT NULL
+);
+
+ALTER TABLE monitor ADD COLUMN proxy_id INTEGER REFERENCES proxy(id);
+
+CREATE INDEX proxy_id ON monitor (proxy_id);
+CREATE INDEX proxy_user_id ON proxy (user_id);
+
+COMMIT;

docker/debian-base.dockerfile

@@ -1,8 +1,11 @@
 # DON'T UPDATE TO node:14-bullseye-slim, see #372.
 # If the image changed, the second stage image should be changed too
 FROM node:16-buster-slim
+ARG TARGETPLATFORM
+
 WORKDIR /app
 
+# Install Curl
 # Install Apprise, add sqlite3 cli for debugging in the future, iputils-ping for ping, util-linux for setpriv
 # Stupid python3 and python3-pip actually install a lot of useless things into Debian, specify --no-install-recommends to skip them, make the base even smaller than alpine!
 RUN apt update && \
@@ -10,3 +13,14 @@ RUN apt update && \
         sqlite3 iputils-ping util-linux dumb-init && \
     pip3 --no-cache-dir install apprise==0.9.7 && \
     rm -rf /var/lib/apt/lists/*
+
+# Install cloudflared
+# dpkg --add-architecture arm: cloudflared do not provide armhf, this is workaround. Read more: https://github.com/cloudflare/cloudflared/issues/583
+COPY extra/download-cloudflared.js ./extra/download-cloudflared.js
+RUN node ./extra/download-cloudflared.js $TARGETPLATFORM && \
+    dpkg --add-architecture arm && \
+    apt update && \
+    apt --yes --no-install-recommends install ./cloudflared.deb && \
+    rm -rf /var/lib/apt/lists/* && \
+    rm -f cloudflared.deb
+

docker/docker-compose.yml

@@ -5,7 +5,7 @@ version: '3.3'
 
 services:
   uptime-kuma:
-    image: louislam/uptime-kuma
+    image: louislam/uptime-kuma:1
     container_name: uptime-kuma
     volumes:
       - ./uptime-kuma:/app/data

extra/beta/update-version.js

@@ -10,11 +10,6 @@ const version = process.env.VERSION;
 
 console.log("Beta Version: " + version);
 
-if (!oldVersion || oldVersion.includes("-beta.")) {
-    console.error("Error: old version should not be a beta version?");
-    process.exit(1);
-}
-
 if (!version || !version.includes("-beta.")) {
     console.error("invalid version, beta version only");
     process.exit(1);

extra/download-cloudflared.js

@@ -0,0 +1,44 @@
+//
+
+const http = require("https"); // or 'https' for https:// URLs
+const fs = require("fs");
+
+const platform = process.argv[2];
+
+if (!platform) {
+    console.error("No platform??");
+    process.exit(1);
+}
+
+let arch = null;
+
+if (platform === "linux/amd64") {
+    arch = "amd64";
+} else if (platform === "linux/arm64") {
+    arch = "arm64";
+} else if (platform === "linux/arm/v7") {
+    arch = "arm";
+} else {
+    console.error("Invalid platform?? " + platform);
+}
+
+const file = fs.createWriteStream("cloudflared.deb");
+get("https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-" + arch + ".deb");
+
+function get(url) {
+    http.get(url, function (res) {
+        if (res.statusCode >= 300 && res.statusCode < 400 && res.headers.location) {
+            console.log("Redirect to " + res.headers.location);
+            get(res.headers.location);
+        } else if (res.statusCode >= 200 && res.statusCode < 300) {
+            res.pipe(file);
+
+            res.on("end", function () {
+                console.log("Downloaded");
+            });
+        } else {
+            console.error(res.statusCode);
+            process.exit(1);
+        }
+    });
+}

extra/download-dist.js

@@ -4,6 +4,7 @@ const tar = require("tar");
 
 const packageJSON = require("../package.json");
 const fs = require("fs");
+const rmSync = require("./fs-rmSync.js");
 const version = packageJSON.version;
 
 const filename = "dist.tar.gz";
@@ -21,7 +22,7 @@ function download(url) {
             if (fs.existsSync("./dist")) {
 
                 if (fs.existsSync("./dist-backup")) {
-                    fs.rmdirSync("./dist-backup", {
+                    rmSync("./dist-backup", {
                         recursive: true
                     });
                 }
@@ -35,7 +36,7 @@ function download(url) {
 
             tarStream.on("close", () => {
                 if (fs.existsSync("./dist-backup")) {
-                    fs.rmdirSync("./dist-backup", {
+                    rmSync("./dist-backup", {
                         recursive: true
                     });
                 }

extra/fs-rmSync.js

@@ -0,0 +1,23 @@
+const fs = require("fs");
+/**
+ * Detect if `fs.rmSync` is available
+ * to avoid the runtime deprecation warning triggered for using `fs.rmdirSync` with `{ recursive: true }` in Node.js v16,
+ * or the `recursive` property removing completely in the future Node.js version.
+ * See the link below.
+ *
+ * @todo Once we drop the support for Node.js v14 (or at least versions before v14.14.0), we can safely replace this function with `fs.rmSync`, since `fs.rmSync` was add in Node.js v14.14.0 and currently we supports all the Node.js v14 versions that include the versions before the v14.14.0, and this function have almost the same signature with `fs.rmSync`.
+ * @link https://nodejs.org/docs/latest-v16.x/api/deprecations.html#dep0147-fsrmdirpath--recursive-true- the deprecation infomation of `fs.rmdirSync`
+ * @link https://nodejs.org/docs/latest-v16.x/api/fs.html#fsrmsyncpath-options the document of `fs.rmSync`
+ * @param {fs.PathLike} path Valid types for path values in "fs".
+ * @param {fs.RmDirOptions} [options] options for `fs.rmdirSync`, if `fs.rmSync` is available and property `recursive` is true, it will automatically have property `force` with value `true`.
+ */
+const rmSync = (path, options) => {
+    if (typeof fs.rmSync === "function") {
+        if (options.recursive) {
+            options.force = true;
+        }
+        return fs.rmSync(path, options);
+    }
+    return fs.rmdirSync(path, options);
+};
+module.exports = rmSync;

extra/press-any-key.js

@@ -1,4 +1,4 @@
-console.log("Publish the release note on github, then press any key to continue");
+console.log("Git Push and Publish the release note on github, then press any key to continue");
 
 process.stdin.setRawMode(true);
 process.stdin.resume();

extra/reset-password.js

@@ -1,7 +1,5 @@
 console.log("== Uptime Kuma Reset Password Tool ==");
 
-console.log("Loading the database");
-
 const Database = require("../server/database");
 const { R } = require("redbean-node");
 const readline = require("readline");
@@ -13,8 +11,9 @@ const rl = readline.createInterface({
 });
 
 const main = async () => {
+    console.log("Connecting the database");
     Database.init(args);
-    await Database.connect();
+    await Database.connect(false, false, true);
 
     try {
         // No need to actually reset the password for testing, just make sure no connection problem. It is ok for now.

extra/update-language-files/index.js

@@ -3,6 +3,7 @@
 import fs from "fs";
 import path from "path";
 import util from "util";
+import rmSync from "../fs-rmSync.js";
 
 // https://stackoverflow.com/questions/13786160/copy-folder-recursively-in-node-js
 /**
@@ -30,7 +31,7 @@ console.log("Arguments:", process.argv);
 const baseLangCode = process.argv[2] || "en";
 console.log("Base Lang: " + baseLangCode);
 if (fs.existsSync("./languages")) {
-    fs.rmdirSync("./languages", { recursive: true });
+    rmSync("./languages", { recursive: true });
 }
 copyRecursiveSync("../../src/languages", "./languages");
 
@@ -40,7 +41,7 @@ const files = fs.readdirSync("./languages");
 console.log("Files:", files);
 
 for (const file of files) {
-    if (!file.endsWith(".js")) {
+    if (! file.endsWith(".js")) {
         console.log("Skipping " + file);
         continue;
     }
@@ -82,5 +83,5 @@ for (const file of files) {
     fs.writeFileSync(`../../src/languages/${file}`, code);
 }
 
-fs.rmdirSync("./languages", { recursive: true });
+rmSync("./languages", { recursive: true });
 console.log("Done. Fixing formatting by ESLint...");

extra/update-version.js

@@ -1,5 +1,6 @@
 const pkg = require("../package.json");
 const fs = require("fs");
+const rmSync = require("./fs-rmSync.js");
 const child_process = require("child_process");
 const util = require("../src/util");
 
@@ -58,4 +59,3 @@ function tagExists(version) {
 
     return res.stdout.toString().trim() === version;
 }
-

package.json

@@ -1,6 +1,6 @@
 {
     "name": "uptime-kuma",
-    "version": "1.13.1",
+    "version": "1.14.0",
     "license": "MIT",
     "repository": {
         "type": "git",
@@ -36,7 +36,7 @@
         "build-docker-nightly-alpine": "docker buildx build -f docker/dockerfile-alpine --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:nightly-alpine --target nightly . --push",
         "build-docker-nightly-amd64": "docker buildx build -f docker/dockerfile --platform linux/amd64 -t louislam/uptime-kuma:nightly-amd64 --target nightly . --push --progress plain",
         "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.13.1 && npm ci --production && npm run download-dist",
+        "setup": "git checkout 1.14.0 && 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",
@@ -51,7 +51,7 @@
         "update-language-files-with-base-lang": "cd extra/update-language-files && node index.js %npm_config_base_lang% && eslint ../../src/languages/**.js --fix",
         "update-language-files": "cd extra/update-language-files && node index.js && eslint ../../src/languages/**.js --fix",
         "ncu-patch": "npm-check-updates -u -t patch",
-        "release-final": "node extra/update-version.js && npm run build-docker && git push --tags && node ./extra/press-any-key.js && npm run upload-artifacts && node ./extra/update-wiki-version.js",
+        "release-final": "node extra/update-version.js && npm run build-docker && node ./extra/press-any-key.js && npm run upload-artifacts && node ./extra/update-wiki-version.js",
         "release-beta": "node extra/beta/update-version.js && npm run build && node ./extra/env2arg.js docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:$VERSION -t louislam/uptime-kuma:beta .  --target release --push && node ./extra/press-any-key.js && npm run upload-artifacts",
         "git-remove-tag": "git tag -d"
     },
@@ -79,10 +79,13 @@
         "favico.js": "^0.3.10",
         "form-data": "~4.0.0",
         "http-graceful-shutdown": "~3.1.7",
+        "http-proxy-agent": "^5.0.0",
+        "https-proxy-agent": "^5.0.0",
         "iconv-lite": "^0.6.3",
         "jsonwebtoken": "~8.5.1",
         "jwt-decode": "^3.1.2",
         "limiter": "^2.1.0",
+        "node-cloudflared-tunnel": "~1.0.9",
         "nodemailer": "~6.6.5",
         "notp": "~2.0.3",
         "password-hash": "~1.2.2",
@@ -94,6 +97,7 @@
         "redbean-node": "0.1.3",
         "socket.io": "~4.4.1",
         "socket.io-client": "~4.4.1",
+        "socks-proxy-agent": "^6.1.1",
         "tar": "^6.1.11",
         "tcp-ping": "~0.1.1",
         "thirty-two": "~1.0.2",
@@ -112,7 +116,7 @@
         "vuedraggable": "~4.1.0"
     },
     "devDependencies": {
-        "@actions/github": "~5.0.0",
+        "@actions/github": "~5.0.1",
         "@babel/eslint-parser": "~7.15.8",
         "@babel/preset-env": "^7.15.8",
         "@types/bootstrap": "~5.1.9",
@@ -127,7 +131,7 @@
         "eslint-plugin-vue": "~7.18.0",
         "jest": "~27.2.5",
         "jest-puppeteer": "~6.0.3",
-        "npm-check-updates": "^12.5.4",
+        "npm-check-updates": "^12.5.5",
         "puppeteer": "~13.1.3",
         "sass": "~1.42.1",
         "stylelint": "~14.2.0",

server/auth.js

@@ -12,6 +12,10 @@ const { loginRateLimiter } = require("./rate-limiter");
  * @returns {Promise<Bean|null>}
  */
 exports.login = async function (username, password) {
+    if (typeof username !== "string" || typeof password !== "string") {
+        return null;
+    }
+
     let user = await R.findOne("user", " username = ? AND active = 1 ", [
         username,
     ]);

server/check-version.js

@@ -17,7 +17,7 @@ exports.startInterval = () => {
                 res.data.slow = "1000.0.0";
             }
 
-            if (!await setting("checkUpdate")) {
+            if (await setting("checkUpdate") === false) {
                 return;
             }
 

server/client.js

@@ -83,6 +83,23 @@ async function sendImportantHeartbeatList(socket, monitorID, toUser = false, ove
 
 }
 
+/**
+ * Delivers proxy list
+ *
+ * @param socket
+ * @return {Promise<Bean[]>}
+ */
+async function sendProxyList(socket) {
+    const timeLogger = new TimeLogger();
+
+    const list = await R.find("proxy", " user_id = ? ", [socket.userID]);
+    io.to(socket.userID).emit("proxyList", list.map(bean => bean.export()));
+
+    timeLogger.print("Send Proxy List");
+
+    return list;
+}
+
 async function sendInfo(socket) {
     socket.emit("info", {
         version: checkVersion.version,
@@ -95,6 +112,6 @@ module.exports = {
     sendNotificationList,
     sendImportantHeartbeatList,
     sendHeartbeatList,
-    sendInfo
+    sendProxyList,
+    sendInfo,
 };
-

server/database.js

@@ -54,6 +54,8 @@ class Database {
         "patch-notification_sent_history.sql": true,
         "patch-monitor-basic-auth.sql": true,
         "patch-status-page.sql": true,
+        "patch-proxy.sql": true,
+        "patch-monitor-expiry-notification.sql": true,
     }
 
     /**
@@ -81,7 +83,7 @@ class Database {
         console.log(`Data Dir: ${Database.dataDir}`);
     }
 
-    static async connect(testMode = false) {
+    static async connect(testMode = false, autoloadModels = true, noLog = false) {
         const acquireConnectionTimeout = 120 * 1000;
 
         const Dialect = require("knex/lib/dialects/sqlite3/index.js");
@@ -111,7 +113,10 @@ class Database {
 
         // Auto map the model to a bean object
         R.freeze(true);
-        await R.autoloadModels("./server/model");
+
+        if (autoloadModels) {
+            await R.autoloadModels("./server/model");
+        }
 
         await R.exec("PRAGMA foreign_keys = ON");
         if (testMode) {
@@ -124,10 +129,17 @@ class Database {
         await R.exec("PRAGMA cache_size = -12000");
         await R.exec("PRAGMA auto_vacuum = FULL");
 
-        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()"));
+        // This ensures that an operating system crash or power failure will not corrupt the database.
+        // FULL synchronous is very safe, but it is also slower.
+        // Read more: https://sqlite.org/pragma.html#pragma_synchronous
+        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()"));
+        }
     }
 
     static async patch() {

server/jobs.js

@@ -1,7 +1,7 @@
 const path = require("path");
 const Bree = require("bree");
 const { SHARE_ENV } = require("worker_threads");
-
+let bree;
 const jobs = [
     {
         name: "clear-old-data",
@@ -10,7 +10,7 @@ const jobs = [
 ];
 
 const initBackgroundJobs = function (args) {
-    const bree = new Bree({
+    bree = new Bree({
         root: path.resolve("server", "jobs"),
         jobs,
         worker: {
@@ -26,6 +26,13 @@ const initBackgroundJobs = function (args) {
     return bree;
 };
 
-module.exports = {
-    initBackgroundJobs
+const stopBackgroundJobs = function () {
+    if (bree) {
+        bree.stop();
+    }
+};
+
+module.exports = {
+    initBackgroundJobs,
+    stopBackgroundJobs
 };

server/model/monitor.js

@@ -11,6 +11,7 @@ const { tcping, ping, dnsResolve, checkCertificate, checkStatusCode, getTotalCli
 const { R } = require("redbean-node");
 const { BeanModel } = require("redbean-node/dist/bean-model");
 const { Notification } = require("../notification");
+const { Proxy } = require("../proxy");
 const { demoMode } = require("../config");
 const version = require("../../package.json").version;
 const apicache = require("../modules/apicache");
@@ -73,6 +74,7 @@ class Monitor extends BeanModel {
             interval: this.interval,
             retryInterval: this.retryInterval,
             keyword: this.keyword,
+            expiryNotification: this.isEnabledExpiryNotification(),
             ignoreTls: this.getIgnoreTls(),
             upsideDown: this.isUpsideDown(),
             maxredirects: this.maxredirects,
@@ -81,6 +83,7 @@ class Monitor extends BeanModel {
             dns_resolve_server: this.dns_resolve_server,
             dns_last_result: this.dns_last_result,
             pushToken: this.pushToken,
+            proxyId: this.proxy_id,
             notificationIDList,
             tags: tags,
         };
@@ -99,6 +102,10 @@ class Monitor extends BeanModel {
         return Buffer.from(user + ":" + pass).toString("base64");
     }
 
+    isEnabledExpiryNotification() {
+        return Boolean(this.expiryNotification);
+    }
+
     /**
      * Parse to boolean
      * @returns {boolean}
@@ -181,6 +188,11 @@ class Monitor extends BeanModel {
                         };
                     }
 
+                    const httpsAgentOptions = {
+                        maxCachedSessions: 0, // Use Custom agent to disable session reuse (https://github.com/nodejs/node/issues/3940)
+                        rejectUnauthorized: !this.getIgnoreTls(),
+                    };
+
                     debug(`[${this.name}] Prepare Options for axios`);
 
                     const options = {
@@ -194,17 +206,33 @@ class Monitor extends BeanModel {
                             ...(this.headers ? JSON.parse(this.headers) : {}),
                             ...(basicAuthHeader),
                         },
-                        httpsAgent: new https.Agent({
-                            maxCachedSessions: 0,      // Use Custom agent to disable session reuse (https://github.com/nodejs/node/issues/3940)
-                            rejectUnauthorized: ! this.getIgnoreTls(),
-                        }),
                         maxRedirects: this.maxredirects,
                         validateStatus: (status) => {
                             return checkStatusCode(status, this.getAcceptedStatuscodes());
                         },
                     };
 
+                    if (this.proxy_id) {
+                        const proxy = await R.load("proxy", this.proxy_id);
+
+                        if (proxy && proxy.active) {
+                            const { httpAgent, httpsAgent } = Proxy.createAgents(proxy, {
+                                httpsAgentOptions: httpsAgentOptions,
+                            });
+
+                            options.proxy = false;
+                            options.httpAgent = httpAgent;
+                            options.httpsAgent = httpsAgent;
+                        }
+                    }
+
+                    if (!options.httpsAgent) {
+                        options.httpsAgent = new https.Agent(httpsAgentOptions);
+                    }
+
+                    debug(`[${this.name}] Axios Options: ${JSON.stringify(options)}`);
                     debug(`[${this.name}] Axios Request`);
+
                     let res = await axios.request(options);
                     bean.msg = `${res.status} - ${res.statusText}`;
                     bean.ping = dayjs().valueOf() - startTime;
@@ -217,7 +245,7 @@ class Monitor extends BeanModel {
                             let tlsInfoObject = checkCertificate(res);
                             tlsInfo = await this.updateTlsInfo(tlsInfoObject);
 
-                            if (!this.getIgnoreTls()) {
+                            if (!this.getIgnoreTls() && this.isEnabledExpiryNotification()) {
                                 debug(`[${this.name}] call sendCertNotification`);
                                 await this.sendCertNotification(tlsInfoObject);
                             }
@@ -477,6 +505,12 @@ class Monitor extends BeanModel {
     stop() {
         clearTimeout(this.heartbeatInterval);
         this.isStop = true;
+
+        this.prometheus().remove();
+    }
+
+    prometheus() {
+        return new Prometheus(this);
     }
 
     /**

server/model/proxy.js

@@ -0,0 +1,21 @@
+const { BeanModel } = require("redbean-node/dist/bean-model");
+
+class Proxy extends BeanModel {
+    toJSON() {
+        return {
+            id: this._id,
+            userId: this._user_id,
+            protocol: this._protocol,
+            host: this._host,
+            port: this._port,
+            auth: !!this._auth,
+            username: this._username,
+            password: this._password,
+            active: !!this._active,
+            default: !!this._default,
+            createdDate: this._created_date,
+        };
+    }
+}
+
+module.exports = Proxy;

server/model/status_page.js

@@ -3,6 +3,20 @@ const { R } = require("redbean-node");
 
 class StatusPage extends BeanModel {
 
+    static domainMappingList = { };
+
+    /**
+     * Return object like this: { "test-uptime.kuma.pet": "default" }
+     * @returns {Promise<void>}
+     */
+    static async loadDomainMappingList() {
+        StatusPage.domainMappingList = await R.getAssoc(`
+            SELECT domain, slug
+            FROM status_page, status_page_cname
+            WHERE status_page.id = status_page_cname.status_page_id
+        `);
+    }
+
     static async sendStatusPageList(io, socket) {
         let result = {};
 
@@ -16,6 +30,57 @@ class StatusPage extends BeanModel {
         return list;
     }
 
+    async updateDomainNameList(domainNameList) {
+
+        if (!Array.isArray(domainNameList)) {
+            throw new Error("Invalid array");
+        }
+
+        let trx = await R.begin();
+
+        await trx.exec("DELETE FROM status_page_cname WHERE status_page_id = ?", [
+            this.id,
+        ]);
+
+        try {
+            for (let domain of domainNameList) {
+                if (typeof domain !== "string") {
+                    throw new Error("Invalid domain");
+                }
+
+                if (domain.trim() === "") {
+                    continue;
+                }
+
+                // If the domain name is used in another status page, delete it
+                await trx.exec("DELETE FROM status_page_cname WHERE domain = ?", [
+                    domain,
+                ]);
+
+                let mapping = trx.dispense("status_page_cname");
+                mapping.status_page_id = this.id;
+                mapping.domain = domain;
+                await trx.store(mapping);
+            }
+            await trx.commit();
+        } catch (error) {
+            await trx.rollback();
+            throw error;
+        }
+    }
+
+    getDomainNameList() {
+        let domainList = [];
+        for (let domain in StatusPage.domainMappingList) {
+            let s = StatusPage.domainMappingList[domain];
+
+            if (this.slug === s) {
+                domainList.push(domain);
+            }
+        }
+        return domainList;
+    }
+
     async toJSON() {
         return {
             id: this.id,
@@ -26,6 +91,7 @@ class StatusPage extends BeanModel {
             theme: this.theme,
             published: !!this.published,
             showTags: !!this.show_tags,
+            domainNameList: this.getDomainNameList(),
         };
     }
 

server/notification-providers/alerta.js

@@ -14,7 +14,7 @@ class Alerta extends NotificationProvider {
             let config = {
                 headers: {
                     "Content-Type": "application/json;charset=UTF-8",
-                    "Authorization": "Key " + notification.alertaapiKey,
+                    "Authorization": "Key " + notification.alertaApiKey,
                 }
             };
             let data = {

server/notification-providers/mattermost.js

@@ -15,12 +15,17 @@ class Mattermost extends NotificationProvider {
                 let mattermostTestData = {
                     username: mattermostUserName,
                     text: msg,
-                }
-                await axios.post(notification.mattermostWebhookUrl, mattermostTestData)
+                };
+                await axios.post(notification.mattermostWebhookUrl, mattermostTestData);
                 return okMsg;
             }
 
-            const mattermostChannel = notification.mattermostchannel.toLowerCase();
+            let mattermostChannel;
+
+            if (typeof notification.mattermostchannel === "string") {
+                mattermostChannel = notification.mattermostchannel.toLowerCase();
+            }
+
             const mattermostIconEmoji = notification.mattermosticonemo;
             const mattermostIconUrl = notification.mattermosticonurl;
 

server/prometheus.js

@@ -86,6 +86,16 @@ class Prometheus {
         }
     }
 
+    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);
+        } catch (e) {
+            console.error(e);
+        }
+    }
 }
 
 module.exports = {

server/proxy.js

@@ -0,0 +1,187 @@
+const { R } = require("redbean-node");
+const HttpProxyAgent = require("http-proxy-agent");
+const HttpsProxyAgent = require("https-proxy-agent");
+const SocksProxyAgent = require("socks-proxy-agent");
+const { debug } = require("../src/util");
+const server = require("./server");
+
+class Proxy {
+
+    static SUPPORTED_PROXY_PROTOCOLS = ["http", "https", "socks", "socks5", "socks4"]
+
+    /**
+     * Saves and updates given proxy entity
+     *
+     * @param proxy
+     * @param proxyID
+     * @param userID
+     * @return {Promise<Bean>}
+     */
+    static async save(proxy, proxyID, userID) {
+        let bean;
+
+        if (proxyID) {
+            bean = await R.findOne("proxy", " id = ? AND user_id = ? ", [proxyID, userID]);
+
+            if (!bean) {
+                throw new Error("proxy not found");
+            }
+
+        } else {
+            bean = R.dispense("proxy");
+        }
+
+        // Make sure given proxy protocol is supported
+        if (!this.SUPPORTED_PROXY_PROTOCOLS.includes(proxy.protocol)) {
+            throw new Error(`
+                Unsupported proxy protocol "${proxy.protocol}.
+                Supported protocols are ${this.SUPPORTED_PROXY_PROTOCOLS.join(", ")}."`
+            );
+        }
+
+        // When proxy is default update deactivate old default proxy
+        if (proxy.default) {
+            await R.exec("UPDATE proxy SET `default` = 0 WHERE `default` = 1");
+        }
+
+        bean.user_id = userID;
+        bean.protocol = proxy.protocol;
+        bean.host = proxy.host;
+        bean.port = proxy.port;
+        bean.auth = proxy.auth;
+        bean.username = proxy.username;
+        bean.password = proxy.password;
+        bean.active = proxy.active || true;
+        bean.default = proxy.default || false;
+
+        await R.store(bean);
+
+        if (proxy.applyExisting) {
+            await applyProxyEveryMonitor(bean.id, userID);
+        }
+
+        return bean;
+    }
+
+    /**
+     * Deletes proxy with given id and removes it from monitors
+     *
+     * @param proxyID
+     * @param userID
+     * @return {Promise<void>}
+     */
+    static async delete(proxyID, userID) {
+        const bean = await R.findOne("proxy", " id = ? AND user_id = ? ", [proxyID, userID]);
+
+        if (!bean) {
+            throw new Error("proxy not found");
+        }
+
+        // Delete removed proxy from monitors if exists
+        await R.exec("UPDATE monitor SET proxy_id = null WHERE proxy_id = ?", [proxyID]);
+
+        // Delete proxy from list
+        await R.trash(bean);
+    }
+
+    /**
+     * Create HTTP and HTTPS agents related with given proxy bean object
+     *
+     * @param proxy proxy bean object
+     * @param options http and https agent options
+     * @return {{httpAgent: Agent, httpsAgent: Agent}}
+     */
+    static createAgents(proxy, options) {
+        const { httpAgentOptions, httpsAgentOptions } = options || {};
+        let agent;
+        let httpAgent;
+        let httpsAgent;
+
+        const proxyOptions = {
+            protocol: proxy.protocol,
+            host: proxy.host,
+            port: proxy.port,
+        };
+
+        if (proxy.auth) {
+            proxyOptions.auth = `${proxy.username}:${proxy.password}`;
+        }
+
+        debug(`Proxy Options: ${JSON.stringify(proxyOptions)}`);
+        debug(`HTTP Agent Options: ${JSON.stringify(httpAgentOptions)}`);
+        debug(`HTTPS Agent Options: ${JSON.stringify(httpsAgentOptions)}`);
+
+        switch (proxy.protocol) {
+            case "http":
+            case "https":
+                httpAgent = new HttpProxyAgent({
+                    ...httpAgentOptions || {},
+                    ...proxyOptions
+                });
+
+                httpsAgent = new HttpsProxyAgent({
+                    ...httpsAgentOptions || {},
+                    ...proxyOptions,
+                });
+                break;
+            case "socks":
+            case "socks5":
+            case "socks4":
+                agent = new SocksProxyAgent({
+                    ...httpAgentOptions,
+                    ...httpsAgentOptions,
+                    ...proxyOptions,
+                });
+
+                httpAgent = agent;
+                httpsAgent = agent;
+                break;
+
+            default: throw new Error(`Unsupported proxy protocol provided. ${proxy.protocol}`);
+        }
+
+        return {
+            httpAgent,
+            httpsAgent
+        };
+    }
+
+    /**
+     * Reload proxy settings for current monitors
+     * @returns {Promise<void>}
+     */
+    static async reloadProxy() {
+        let updatedList = await R.getAssoc("SELECT id, proxy_id FROM monitor");
+
+        for (let monitorID in server.monitorList) {
+            let monitor = server.monitorList[monitorID];
+
+            if (updatedList[monitorID]) {
+                monitor.proxy_id = updatedList[monitorID].proxy_id;
+            }
+        }
+    }
+}
+
+/**
+ * Applies given proxy id to monitors
+ *
+ * @param proxyID
+ * @param userID
+ * @return {Promise<void>}
+ */
+async function applyProxyEveryMonitor(proxyID, userID) {
+    // Find all monitors with id and proxy id
+    const monitors = await R.getAll("SELECT id, proxy_id FROM monitor WHERE user_id = ?", [userID]);
+
+    // Update proxy id not match with given proxy id
+    for (const monitor of monitors) {
+        if (monitor.proxy_id !== proxyID) {
+            await R.exec("UPDATE monitor SET proxy_id = ? WHERE id = ?", [proxyID, monitor.id]);
+        }
+    }
+}
+
+module.exports = {
+    Proxy,
+};

server/rate-limiter.js

@@ -34,6 +34,14 @@ const loginRateLimiter = new KumaRateLimiter({
     errorMessage: "Too frequently, try again later."
 });
 
+const twoFaRateLimiter = new KumaRateLimiter({
+    tokensPerInterval: 30,
+    interval: "minute",
+    fireImmediately: true,
+    errorMessage: "Too frequently, try again later."
+});
+
 module.exports = {
-    loginRateLimiter
+    loginRateLimiter,
+    twoFaRateLimiter,
 };

server/routers/api-router.js

@@ -12,9 +12,19 @@ let router = express.Router();
 let cache = apicache.middleware;
 let io = server.io;
 
-router.get("/api/entry-page", async (_, response) => {
+router.get("/api/entry-page", async (request, response) => {
     allowDevAllOrigin(response);
-    response.json(server.entryPage);
+
+    let result = { };
+
+    if (request.hostname in StatusPage.domainMappingList) {
+        result.type = "statusPageMatchedDomain";
+        result.statusPageSlug = StatusPage.domainMappingList[request.hostname];
+    } else {
+        result.type = "entryPage";
+        result.entryPage = server.entryPage;
+    }
+    response.json(result);
 });
 
 router.get("/api/push/:pushToken", async (request, response) => {

server/server.js

@@ -48,22 +48,46 @@ debug("Importing 2FA Modules");
 const notp = require("notp");
 const base32 = require("thirty-two");
 
+/**
+ * `module.exports` (alias: `server`) should be inside this class, in order to avoid circular dependency issue.
+ * @type {UptimeKumaServer}
+ */
+class UptimeKumaServer {
+    /**
+     * Main monitor list
+     * @type {{}}
+     */
+    monitorList = {};
+    entryPage = "dashboard";
+
+    async sendMonitorList(socket) {
+        let list = await getMonitorJSONList(socket.userID);
+        io.to(socket.userID).emit("monitorList", list);
+        return list;
+    }
+}
+
+const server = module.exports = new UptimeKumaServer();
+
 console.log("Importing this project modules");
 debug("Importing Monitor");
 const Monitor = require("./model/monitor");
 debug("Importing Settings");
-const { getSettings, setSettings, setting, initJWTSecret, checkLogin, startUnitTest, FBSD, errorLog } = require("./util-server");
+const { getSettings, setSettings, setting, initJWTSecret, checkLogin, startUnitTest, FBSD, errorLog, doubleCheckPassword } = require("./util-server");
 
 debug("Importing Notification");
 const { Notification } = require("./notification");
 Notification.init();
 
+debug("Importing Proxy");
+const { Proxy } = require("./proxy");
+
 debug("Importing Database");
 const Database = require("./database");
 
 debug("Importing Background Jobs");
-const { initBackgroundJobs } = require("./jobs");
-const { loginRateLimiter } = require("./rate-limiter");
+const { initBackgroundJobs, stopBackgroundJobs } = require("./jobs");
+const { loginRateLimiter, twoFaRateLimiter } = require("./rate-limiter");
 
 const { basicAuth } = require("./auth");
 const { login } = require("./auth");
@@ -74,23 +98,23 @@ console.info("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 (::)
-let hostname = process.env.UPTIME_KUMA_HOST || args.host;
-
 // Also read HOST if not FreeBSD, as HOST is a system environment variable in FreeBSD
-if (!hostname && !FBSD) {
-    hostname = process.env.HOST;
-}
+let hostEnv = FBSD ? null : process.env.HOST;
+let hostname = args.host || process.env.UPTIME_KUMA_HOST || hostEnv;
 
 if (hostname) {
     console.log("Custom hostname: " + hostname);
 }
 
-const port = parseInt(process.env.UPTIME_KUMA_PORT || process.env.PORT || args.port || 3001);
+const port = [args.port, process.env.UPTIME_KUMA_PORT, process.env.PORT, 3001]
+    .map(portValue => parseInt(portValue))
+    .find(portValue => !isNaN(portValue));
 
 // SSL
-const sslKey = process.env.UPTIME_KUMA_SSL_KEY || process.env.SSL_KEY || args["ssl-key"] || undefined;
-const sslCert = process.env.UPTIME_KUMA_SSL_CERT || process.env.SSL_CERT || args["ssl-cert"] || undefined;
-const disableFrameSameOrigin = !!process.env.UPTIME_KUMA_DISABLE_FRAME_SAMEORIGIN || args["disable-frame-sameorigin"] || false;
+const sslKey = args["ssl-key"] || process.env.UPTIME_KUMA_SSL_KEY || process.env.SSL_KEY || undefined;
+const sslCert = args["ssl-cert"] || process.env.UPTIME_KUMA_SSL_CERT || process.env.SSL_CERT || undefined;
+const disableFrameSameOrigin = args["disable-frame-sameorigin"] || !!process.env.UPTIME_KUMA_DISABLE_FRAME_SAMEORIGIN || false;
+const cloudflaredToken = args["cloudflared-token"] || process.env.UPTIME_KUMA_CLOUDFLARED_TOKEN || undefined;
 
 // 2FA / notp verification defaults
 const twofa_verification_opts = {
@@ -111,28 +135,30 @@ if (config.demoMode) {
 console.log("Creating express and socket.io instance");
 const app = express();
 
-let server;
+let httpServer;
 
 if (sslKey && sslCert) {
     console.log("Server Type: HTTPS");
-    server = https.createServer({
+    httpServer = https.createServer({
         key: fs.readFileSync(sslKey),
         cert: fs.readFileSync(sslCert)
     }, app);
 } else {
     console.log("Server Type: HTTP");
-    server = http.createServer(app);
+    httpServer = http.createServer(app);
 }
 
-const io = new Server(server);
+const io = new Server(httpServer);
 module.exports.io = io;
 
 // Must be after io instantiation
-const { sendNotificationList, sendHeartbeatList, sendImportantHeartbeatList, sendInfo } = require("./client");
+const { sendNotificationList, sendHeartbeatList, sendImportantHeartbeatList, sendInfo, sendProxyList } = require("./client");
 const { statusPageSocketHandler } = require("./socket-handlers/status-page-socket-handler");
 const databaseSocketHandler = require("./socket-handlers/database-socket-handler");
 const TwoFA = require("./2fa");
 const StatusPage = require("./model/status_page");
+const { cloudflaredSocketHandler, autoStart: cloudflaredAutoStart, stop: cloudflaredStop } = require("./socket-handlers/cloudflared-socket-handler");
+const { proxySocketHandler } = require("./socket-handlers/proxy-socket-handler");
 
 app.use(express.json());
 
@@ -157,12 +183,6 @@ let totalClient = 0;
  */
 let jwtSecret = null;
 
-/**
- * Main monitor list
- * @type {{}}
- */
-let monitorList = {};
-
 /**
  * Show Setup Page
  * @type {boolean}
@@ -185,13 +205,12 @@ try {
     }
 }
 
-exports.entryPage = "dashboard";
-
 (async () => {
     Database.init(args);
     await initDatabase(testMode);
 
     exports.entryPage = await setting("entryPage");
+    await StatusPage.loadDomainMappingList();
 
     console.log("Adding route");
 
@@ -200,8 +219,13 @@ exports.entryPage = "dashboard";
     // ***************************
 
     // Entry Page
-    app.get("/", async (_request, response) => {
-        if (exports.entryPage && exports.entryPage.startsWith("statusPage-")) {
+    app.get("/", async (request, response) => {
+        debug(`Request Domain: ${request.hostname}`);
+
+        if (request.hostname in StatusPage.domainMappingList) {
+            debug("This is a status page domain");
+            response.send(indexHTML);
+        } else if (exports.entryPage && exports.entryPage.startsWith("statusPage-")) {
             response.redirect("/status/" + exports.entryPage.replace("statusPage-", ""));
         } else {
             response.redirect("/dashboard");
@@ -305,6 +329,15 @@ exports.entryPage = "dashboard";
         socket.on("login", async (data, callback) => {
             console.log("Login");
 
+            // Checking
+            if (typeof callback !== "function") {
+                return;
+            }
+
+            if (!data) {
+                return;
+            }
+
             // Login Rate Limit
             if (! await loginRateLimiter.pass(callback)) {
                 return;
@@ -363,14 +396,27 @@ exports.entryPage = "dashboard";
         });
 
         socket.on("logout", async (callback) => {
+            // Rate Limit
+            if (! await loginRateLimiter.pass(callback)) {
+                return;
+            }
+
             socket.leave(socket.userID);
             socket.userID = null;
-            callback();
+
+            if (typeof callback === "function") {
+                callback();
+            }
         });
 
-        socket.on("prepare2FA", async (callback) => {
+        socket.on("prepare2FA", async (currentPassword, callback) => {
             try {
+                if (! await twoFaRateLimiter.pass(callback)) {
+                    return;
+                }
+
                 checkLogin(socket);
+                await doubleCheckPassword(socket, currentPassword);
 
                 let user = await R.findOne("user", " id = ? AND active = 1 ", [
                     socket.userID,
@@ -405,14 +451,19 @@ exports.entryPage = "dashboard";
             } catch (error) {
                 callback({
                     ok: false,
-                    msg: "Error while trying to prepare 2FA.",
+                    msg: error.message,
                 });
             }
         });
 
-        socket.on("save2FA", async (callback) => {
+        socket.on("save2FA", async (currentPassword, callback) => {
             try {
+                if (! await twoFaRateLimiter.pass(callback)) {
+                    return;
+                }
+
                 checkLogin(socket);
+                await doubleCheckPassword(socket, currentPassword);
 
                 await R.exec("UPDATE `user` SET twofa_status = 1 WHERE id = ? ", [
                     socket.userID,
@@ -425,14 +476,19 @@ exports.entryPage = "dashboard";
             } catch (error) {
                 callback({
                     ok: false,
-                    msg: "Error while trying to change 2FA.",
+                    msg: error.message,
                 });
             }
         });
 
-        socket.on("disable2FA", async (callback) => {
+        socket.on("disable2FA", async (currentPassword, callback) => {
             try {
+                if (! await twoFaRateLimiter.pass(callback)) {
+                    return;
+                }
+
                 checkLogin(socket);
+                await doubleCheckPassword(socket, currentPassword);
                 await TwoFA.disable2FA(socket.userID);
 
                 callback({
@@ -442,36 +498,47 @@ exports.entryPage = "dashboard";
             } catch (error) {
                 callback({
                     ok: false,
-                    msg: "Error while trying to change 2FA.",
+                    msg: error.message,
                 });
             }
         });
 
-        socket.on("verifyToken", async (token, callback) => {
-            let user = await R.findOne("user", " id = ? AND active = 1 ", [
-                socket.userID,
-            ]);
+        socket.on("verifyToken", async (token, currentPassword, callback) => {
+            try {
+                checkLogin(socket);
+                await doubleCheckPassword(socket, currentPassword);
 
-            let verify = notp.totp.verify(token, user.twofa_secret, twofa_verification_opts);
+                let user = await R.findOne("user", " id = ? AND active = 1 ", [
+                    socket.userID,
+                ]);
 
-            if (user.twofa_last_token !== token && verify) {
-                callback({
-                    ok: true,
-                    valid: true,
-                });
-            } else {
+                let verify = notp.totp.verify(token, user.twofa_secret, twofa_verification_opts);
+
+                if (user.twofa_last_token !== token && verify) {
+                    callback({
+                        ok: true,
+                        valid: true,
+                    });
+                } else {
+                    callback({
+                        ok: false,
+                        msg: "Invalid Token.",
+                        valid: false,
+                    });
+                }
+
+            } catch (error) {
                 callback({
                     ok: false,
-                    msg: "Invalid Token.",
-                    valid: false,
+                    msg: error.message,
                 });
             }
         });
 
         socket.on("twoFAStatus", async (callback) => {
-            checkLogin(socket);
-
             try {
+                checkLogin(socket);
+
                 let user = await R.findOne("user", " id = ? AND active = 1 ", [
                     socket.userID,
                 ]);
@@ -488,9 +555,10 @@ exports.entryPage = "dashboard";
                     });
                 }
             } catch (error) {
+                console.log(error);
                 callback({
                     ok: false,
-                    msg: "Error while trying to get 2FA status.",
+                    msg: error.message,
                 });
             }
         });
@@ -551,7 +619,7 @@ exports.entryPage = "dashboard";
 
                 await updateMonitorNotification(bean.id, notificationIDList);
 
-                await sendMonitorList(socket);
+                await server.sendMonitorList(socket);
                 await startMonitor(socket.userID, bean.id);
 
                 callback({
@@ -579,6 +647,9 @@ exports.entryPage = "dashboard";
                     throw new Error("Permission denied.");
                 }
 
+                // Reset Prometheus labels
+                server.monitorList[monitor.id]?.prometheus()?.remove();
+
                 bean.name = monitor.name;
                 bean.type = monitor.type;
                 bean.url = monitor.url;
@@ -594,12 +665,14 @@ exports.entryPage = "dashboard";
                 bean.port = monitor.port;
                 bean.keyword = monitor.keyword;
                 bean.ignoreTls = monitor.ignoreTls;
+                bean.expiryNotification = monitor.expiryNotification;
                 bean.upsideDown = monitor.upsideDown;
                 bean.maxredirects = monitor.maxredirects;
                 bean.accepted_statuscodes_json = JSON.stringify(monitor.accepted_statuscodes);
                 bean.dns_resolve_type = monitor.dns_resolve_type;
                 bean.dns_resolve_server = monitor.dns_resolve_server;
                 bean.pushToken = monitor.pushToken;
+                bean.proxyId = Number.isInteger(monitor.proxyId) ? monitor.proxyId : null;
 
                 await R.store(bean);
 
@@ -609,7 +682,7 @@ exports.entryPage = "dashboard";
                     await restartMonitor(socket.userID, bean.id);
                 }
 
-                await sendMonitorList(socket);
+                await server.sendMonitorList(socket);
 
                 callback({
                     ok: true,
@@ -629,7 +702,7 @@ exports.entryPage = "dashboard";
         socket.on("getMonitorList", async (callback) => {
             try {
                 checkLogin(socket);
-                await sendMonitorList(socket);
+                await server.sendMonitorList(socket);
                 callback({
                     ok: true,
                 });
@@ -703,7 +776,7 @@ exports.entryPage = "dashboard";
             try {
                 checkLogin(socket);
                 await startMonitor(socket.userID, monitorID);
-                await sendMonitorList(socket);
+                await server.sendMonitorList(socket);
 
                 callback({
                     ok: true,
@@ -722,7 +795,7 @@ exports.entryPage = "dashboard";
             try {
                 checkLogin(socket);
                 await pauseMonitor(socket.userID, monitorID);
-                await sendMonitorList(socket);
+                await server.sendMonitorList(socket);
 
                 callback({
                     ok: true,
@@ -743,9 +816,9 @@ exports.entryPage = "dashboard";
 
                 console.log(`Delete Monitor: ${monitorID} User ID: ${socket.userID}`);
 
-                if (monitorID in monitorList) {
-                    monitorList[monitorID].stop();
-                    delete monitorList[monitorID];
+                if (monitorID in server.monitorList) {
+                    server.monitorList[monitorID].stop();
+                    delete server.monitorList[monitorID];
                 }
 
                 await R.exec("DELETE FROM monitor WHERE id = ? AND user_id = ? ", [
@@ -758,7 +831,7 @@ exports.entryPage = "dashboard";
                     msg: "Deleted Successfully.",
                 });
 
-                await sendMonitorList(socket);
+                await server.sendMonitorList(socket);
                 // Clear heartbeat list on client
                 await sendImportantHeartbeatList(socket, monitorID, true, true);
 
@@ -936,21 +1009,13 @@ exports.entryPage = "dashboard";
                     throw new Error("Password is too weak. It should contain alphabetic and numeric characters. It must be at least 6 characters in length.");
                 }
 
-                let user = await R.findOne("user", " id = ? AND active = 1 ", [
-                    socket.userID,
-                ]);
+                let user = await doubleCheckPassword(socket, password.currentPassword);
+                await user.resetPassword(password.newPassword);
 
-                if (user && passwordHash.verify(password.currentPassword, user.password)) {
-
-                    user.resetPassword(password.newPassword);
-
-                    callback({
-                        ok: true,
-                        msg: "Password has been updated successfully.",
-                    });
-                } else {
-                    throw new Error("Incorrect current password");
-                }
+                callback({
+                    ok: true,
+                    msg: "Password has been updated successfully.",
+                });
 
             } catch (e) {
                 callback({
@@ -977,10 +1042,14 @@ exports.entryPage = "dashboard";
             }
         });
 
-        socket.on("setSettings", async (data, callback) => {
+        socket.on("setSettings", async (data, currentPassword, callback) => {
             try {
                 checkLogin(socket);
 
+                if (data.disableAuth) {
+                    await doubleCheckPassword(socket, currentPassword);
+                }
+
                 await setSettings("general", data);
                 exports.entryPage = data.entryPage;
 
@@ -1080,6 +1149,7 @@ exports.entryPage = "dashboard";
                 console.log(`Importing Backup, User ID: ${socket.userID}, Version: ${backupData.version}`);
 
                 let notificationListData = backupData.notificationList;
+                let proxyListData = backupData.proxyList;
                 let monitorListData = backupData.monitorList;
 
                 let version17x = compareVersions.compare(backupData.version, "1.7.0", ">=");
@@ -1087,8 +1157,8 @@ exports.entryPage = "dashboard";
                 // If the import option is "overwrite" it'll clear most of the tables, except "settings" and "user"
                 if (importHandle == "overwrite") {
                     // Stops every monitor first, so it doesn't execute any heartbeat while importing
-                    for (let id in monitorList) {
-                        let monitor = monitorList[id];
+                    for (let id in server.monitorList) {
+                        let monitor = server.monitorList[id];
                         await monitor.stop();
                     }
                     await R.exec("DELETE FROM heartbeat");
@@ -1098,6 +1168,7 @@ exports.entryPage = "dashboard";
                     await R.exec("DELETE FROM monitor_tag");
                     await R.exec("DELETE FROM tag");
                     await R.exec("DELETE FROM monitor");
+                    await R.exec("DELETE FROM proxy");
                 }
 
                 // Only starts importing if the backup file contains at least one notification
@@ -1117,6 +1188,24 @@ exports.entryPage = "dashboard";
                     }
                 }
 
+                // Only starts importing if the backup file contains at least one proxy
+                if (proxyListData.length >= 1) {
+                    const proxies = await R.findAll("proxy");
+
+                    // Loop over proxy list and save proxies
+                    for (const proxy of proxyListData) {
+                        const exists = proxies.find(item => item.id === proxy.id);
+
+                        // Do not process when proxy already exists in import handle is skip and keep
+                        if (["skip", "keep"].includes(importHandle) && !exists) {
+                            return;
+                        }
+
+                        // Save proxy as new entry if exists update exists one
+                        await Proxy.save(proxy, exists ? proxy.id : undefined, proxy.userId);
+                    }
+                }
+
                 // Only starts importing if the backup file contains at least one monitor
                 if (monitorListData.length >= 1) {
                     // Get every existing monitor name and puts them in one simple string
@@ -1166,6 +1255,7 @@ exports.entryPage = "dashboard";
                                 dns_resolve_type: monitorListData[i].dns_resolve_type,
                                 dns_resolve_server: monitorListData[i].dns_resolve_server,
                                 notificationIDList: {},
+                                proxy_id: monitorListData[i].proxy_id || null,
                             };
 
                             if (monitorListData[i].pushToken) {
@@ -1231,7 +1321,7 @@ exports.entryPage = "dashboard";
                     }
 
                     await sendNotificationList(socket);
-                    await sendMonitorList(socket);
+                    await server.sendMonitorList(socket);
                 }
 
                 callback({
@@ -1319,7 +1409,9 @@ exports.entryPage = "dashboard";
 
         // Status Page Socket Handler for admin only
         statusPageSocketHandler(socket);
+        cloudflaredSocketHandler(socket);
         databaseSocketHandler(socket);
+        proxySocketHandler(socket);
 
         debug("added all socket handlers");
 
@@ -1340,12 +1432,12 @@ exports.entryPage = "dashboard";
 
     console.log("Init the server");
 
-    server.once("error", async (err) => {
+    httpServer.once("error", async (err) => {
         console.error("Cannot listen: " + err.message);
-        await Database.close();
+        await shutdownFunction();
     });
 
-    server.listen(port, hostname, () => {
+    httpServer.listen(port, hostname, () => {
         if (hostname) {
             console.log(`Listening on ${hostname}:${port}`);
         } else {
@@ -1361,6 +1453,9 @@ exports.entryPage = "dashboard";
 
     initBackgroundJobs(args);
 
+    // Start cloudflared at the end if configured
+    await cloudflaredAutoStart(cloudflaredToken);
+
 })();
 
 async function updateMonitorNotification(monitorID, notificationIDList) {
@@ -1389,18 +1484,13 @@ async function checkOwner(userID, monitorID) {
     }
 }
 
-async function sendMonitorList(socket) {
-    let list = await getMonitorJSONList(socket.userID);
-    io.to(socket.userID).emit("monitorList", list);
-    return list;
-}
-
 async function afterLogin(socket, user) {
     socket.userID = user.id;
     socket.join(user.id);
 
-    let monitorList = await sendMonitorList(socket);
+    let monitorList = await server.sendMonitorList(socket);
     sendNotificationList(socket);
+    sendProxyList(socket);
 
     await sleep(500);
 
@@ -1481,11 +1571,11 @@ async function startMonitor(userID, monitorID) {
         monitorID,
     ]);
 
-    if (monitor.id in monitorList) {
-        monitorList[monitor.id].stop();
+    if (monitor.id in server.monitorList) {
+        server.monitorList[monitor.id].stop();
     }
 
-    monitorList[monitor.id] = monitor;
+    server.monitorList[monitor.id] = monitor;
     monitor.start(io);
 }
 
@@ -1503,8 +1593,8 @@ async function pauseMonitor(userID, monitorID) {
         userID,
     ]);
 
-    if (monitorID in monitorList) {
-        monitorList[monitorID].stop();
+    if (monitorID in server.monitorList) {
+        server.monitorList[monitorID].stop();
     }
 }
 
@@ -1515,7 +1605,7 @@ async function startMonitors() {
     let list = await R.find("monitor", " active = 1 ");
 
     for (let monitor of list) {
-        monitorList[monitor.id] = monitor;
+        server.monitorList[monitor.id] = monitor;
     }
 
     for (let monitor of list) {
@@ -1530,19 +1620,22 @@ async function shutdownFunction(signal) {
     console.log("Called signal: " + signal);
 
     console.log("Stopping all monitors");
-    for (let id in monitorList) {
-        let monitor = monitorList[id];
+    for (let id in server.monitorList) {
+        let monitor = server.monitorList[id];
         monitor.stop();
     }
     await sleep(2000);
     await Database.close();
+
+    stopBackgroundJobs();
+    await cloudflaredStop();
 }
 
 function finalFunction() {
     console.log("Graceful shutdown successful!");
 }
 
-gracefulShutdown(server, {
+gracefulShutdown(httpServer, {
     signals: "SIGINT SIGTERM",
     timeout: 30000,                   // timeout: 30 secs
     development: false,               // not in dev mode

server/socket-handlers/cloudflared-socket-handler.js

@@ -0,0 +1,90 @@
+const { checkLogin, setSetting, setting, doubleCheckPassword } = require("../util-server");
+const { CloudflaredTunnel } = require("node-cloudflared-tunnel");
+const { io } = require("../server");
+
+const prefix = "cloudflared_";
+const cloudflared = new CloudflaredTunnel();
+
+cloudflared.change = (running, message) => {
+    io.to("cloudflared").emit(prefix + "running", running);
+    io.to("cloudflared").emit(prefix + "message", message);
+};
+
+cloudflared.error = (errorMessage) => {
+    io.to("cloudflared").emit(prefix + "errorMessage", errorMessage);
+};
+
+module.exports.cloudflaredSocketHandler = (socket) => {
+
+    socket.on(prefix + "join", async () => {
+        try {
+            checkLogin(socket);
+            socket.join("cloudflared");
+            io.to(socket.userID).emit(prefix + "installed", cloudflared.checkInstalled());
+            io.to(socket.userID).emit(prefix + "running", cloudflared.running);
+            io.to(socket.userID).emit(prefix + "token", await setting("cloudflaredTunnelToken"));
+        } catch (error) { }
+    });
+
+    socket.on(prefix + "leave", async () => {
+        try {
+            checkLogin(socket);
+            socket.leave("cloudflared");
+        } catch (error) { }
+    });
+
+    socket.on(prefix + "start", async (token) => {
+        try {
+            checkLogin(socket);
+            if (token && typeof token === "string") {
+                await setSetting("cloudflaredTunnelToken", token);
+                cloudflared.token = token;
+            } else {
+                cloudflared.token = null;
+            }
+            cloudflared.start();
+        } catch (error) { }
+    });
+
+    socket.on(prefix + "stop", async (currentPassword, callback) => {
+        try {
+            checkLogin(socket);
+            await doubleCheckPassword(socket, currentPassword);
+            cloudflared.stop();
+        } catch (error) {
+            callback({
+                ok: false,
+                msg: error.message,
+            });
+        }
+    });
+
+    socket.on(prefix + "removeToken", async () => {
+        try {
+            checkLogin(socket);
+            await setSetting("cloudflaredTunnelToken", "");
+        } catch (error) { }
+    });
+
+};
+
+module.exports.autoStart = async (token) => {
+    if (!token) {
+        token = await setting("cloudflaredTunnelToken");
+    } else {
+        // Override the current token via args or env var
+        await setSetting("cloudflaredTunnelToken", token);
+        console.log("Use cloudflared token from args or env var");
+    }
+
+    if (token) {
+        console.log("Start cloudflared");
+        cloudflared.token = token;
+        cloudflared.start();
+    }
+};
+
+module.exports.stop = async () => {
+    console.log("Stop cloudflared");
+    cloudflared.stop();
+};

server/socket-handlers/proxy-socket-handler.js

@@ -0,0 +1,53 @@
+const { checkLogin } = require("../util-server");
+const { Proxy } = require("../proxy");
+const { sendProxyList } = require("../client");
+const server = require("../server");
+
+module.exports.proxySocketHandler = (socket) => {
+    socket.on("addProxy", async (proxy, proxyID, callback) => {
+        try {
+            checkLogin(socket);
+
+            const proxyBean = await Proxy.save(proxy, proxyID, socket.userID);
+            await sendProxyList(socket);
+
+            if (proxy.applyExisting) {
+                await Proxy.reloadProxy();
+                await server.sendMonitorList(socket);
+            }
+
+            callback({
+                ok: true,
+                msg: "Saved",
+                id: proxyBean.id,
+            });
+
+        } catch (e) {
+            callback({
+                ok: false,
+                msg: e.message,
+            });
+        }
+    });
+
+    socket.on("deleteProxy", async (proxyID, callback) => {
+        try {
+            checkLogin(socket);
+
+            await Proxy.delete(proxyID, socket.userID);
+            await sendProxyList(socket);
+            await Proxy.reloadProxy();
+
+            callback({
+                ok: true,
+                msg: "Deleted",
+            });
+
+        } catch (e) {
+            callback({
+                ok: false,
+                msg: e.message,
+            });
+        }
+    });
+};

server/socket-handlers/status-page-socket-handler.js

@@ -85,15 +85,35 @@ module.exports.statusPageSocketHandler = (socket) => {
         }
     });
 
+    socket.on("getStatusPage", async (slug, callback) => {
+        try {
+            checkLogin(socket);
+
+            let statusPage = await R.findOne("status_page", " slug = ? ", [
+                slug
+            ]);
+
+            if (!statusPage) {
+                throw new Error("No slug?");
+            }
+
+            callback({
+                ok: true,
+                config: await statusPage.toJSON(),
+            });
+        } catch (error) {
+            callback({
+                ok: false,
+                msg: error.message,
+            });
+        }
+    });
+
     // Save Status Page
     // imgDataUrl Only Accept PNG!
     socket.on("saveStatusPage", async (slug, config, imgDataUrl, publicGroupList, callback) => {
-
         try {
-            checkSlug(config.slug);
-
             checkLogin(socket);
-            apicache.clear();
 
             // Save Config
             let statusPage = await R.findOne("status_page", " slug = ? ", [
@@ -104,6 +124,8 @@ module.exports.statusPageSocketHandler = (socket) => {
                 throw new Error("No slug?");
             }
 
+            checkSlug(config.slug);
+
             const header = "data:image/png;base64,";
 
             // Check logo format
@@ -137,6 +159,9 @@ module.exports.statusPageSocketHandler = (socket) => {
 
             await R.store(statusPage);
 
+            await statusPage.updateDomainNameList(config.domainNameList);
+            await StatusPage.loadDomainMappingList();
+
             // Save Public Group List
             const groupIDList = [];
             let groupOrder = 1;
@@ -193,6 +218,8 @@ module.exports.statusPageSocketHandler = (socket) => {
                 await setSetting("entryPage", server.entryPage, "general");
             }
 
+            apicache.clear();
+
             callback({
                 ok: true,
                 publicGroupList,

server/util-server.js

@@ -1,9 +1,8 @@
 const tcpp = require("tcp-ping");
 const Ping = require("./ping-lite");
 const { R } = require("redbean-node");
-const { debug } = require("../src/util");
+const { debug, genSecret } = require("../src/util");
 const passwordHash = require("./password-hash");
-const dayjs = require("dayjs");
 const { Resolver } = require("dns");
 const child_process = require("child_process");
 const iconv = require("iconv-lite");
@@ -32,7 +31,7 @@ exports.initJWTSecret = async () => {
         jwtSecretBean.key = "jwtSecret";
     }
 
-    jwtSecretBean.value = passwordHash.generate(dayjs() + "");
+    jwtSecretBean.value = passwordHash.generate(genSecret());
     await R.store(jwtSecretBean);
     return jwtSecretBean;
 };
@@ -321,6 +320,28 @@ exports.checkLogin = (socket) => {
     }
 };
 
+/**
+ * For logged-in users, double-check the password
+ * @param socket
+ * @param currentPassword
+ * @returns {Promise<Bean>}
+ */
+exports.doubleCheckPassword = async (socket, currentPassword) => {
+    if (typeof currentPassword !== "string") {
+        throw new Error("Wrong data type?");
+    }
+
+    let user = await R.findOne("user", " id = ? AND active = 1 ", [
+        socket.userID,
+    ]);
+
+    if (!user || !passwordHash.verify(currentPassword, user.password)) {
+        throw new Error("Incorrect current password");
+    }
+
+    return user;
+};
+
 exports.startUnitTest = async () => {
     console.log("Starting unit test...");
     const npm = /^win/.test(process.platform) ? "npm.cmd" : "npm";

src/assets/app.scss

@@ -22,6 +22,18 @@ textarea.form-control {
     width: 10px;
 }
 
+.list-group {
+    border-radius: 0.75rem;
+
+    .dark & {
+        .list-group-item {
+            background-color: $dark-bg;
+            color: $dark-font-color;
+            border-color: $dark-border-color;
+        }
+    }
+}
+
 ::-webkit-scrollbar-thumb {
     background: #ccc;
     border-radius: 20px;
@@ -412,6 +424,10 @@ textarea.form-control {
     background-color: rgba(239, 239, 239, 0.7);
     border-radius: 8px;
 
+    &.no-bg {
+        background-color: transparent !important;
+    }
+
     &:focus {
         outline: 0 solid #eee;
         background-color: rgba(245, 245, 245, 0.9);

src/components/CertificateInfoRow.vue

@@ -11,23 +11,23 @@
                 <table class="text-start">
                     <tbody>
                         <tr class="my-3">
-                            <td class="px-3">Subject:</td>
+                            <td class="px-3">{{ $t("Subject:") }}</td>
                             <td>{{ formatSubject(cert.subject) }}</td>
                         </tr>
                         <tr class="my-3">
-                            <td class="px-3">Valid To:</td>
+                            <td class="px-3">{{ $t("Valid To:") }}</td>
                             <td><Datetime :value="cert.validTo" /></td>
                         </tr>
                         <tr class="my-3">
-                            <td class="px-3">Days Remaining:</td>
+                            <td class="px-3">{{ $t("Days Remaining:") }}</td>
                             <td>{{ cert.daysRemaining }}</td>
                         </tr>
                         <tr class="my-3">
-                            <td class="px-3">Issuer:</td>
+                            <td class="px-3">{{ $t("Issuer:") }}</td>
                             <td>{{ formatSubject(cert.issuer) }}</td>
                         </tr>
                         <tr class="my-3">
-                            <td class="px-3">Fingerprint:</td>
+                            <td class="px-3">{{ $t("Fingerprint:") }}</td>
                             <td>{{ cert.fingerprint }}</td>
                         </tr>
                     </tbody>

src/components/MonitorList.vue

@@ -9,7 +9,9 @@
                 <a v-if="searchText != ''" class="search-icon" @click="clearSearchText">
                     <font-awesome-icon icon="times" />
                 </a>
-                <input v-model="searchText" class="form-control search-input" :placeholder="$t('Search...')" />
+                <form>
+                    <input v-model="searchText" class="form-control search-input" :placeholder="$t('Search...')" autocomplete="off" />
+                </form>
             </div>
         </div>
         <div class="monitor-list" :class="{ scrollbar: scrollbar }">
@@ -34,7 +36,7 @@
                 </div>
 
                 <div v-if="$root.userHeartbeatBar == 'bottom'" class="row">
-                    <div class="col-12">
+                    <div class="col-12 bottom-style">
                         <HeartbeatBar size="small" :monitor-id="item.id" />
                     </div>
                 </div>
@@ -201,9 +203,16 @@ export default {
 }
 
 .tags {
-    padding-left: 62px;
+    margin-top: 4px;
+    padding-left: 67px;
     display: flex;
     flex-wrap: wrap;
     gap: 0;
 }
+
+.bottom-style {
+    padding-left: 67px;
+    margin-top: 5px;
+}
+
 </style>

src/components/ProxyDialog.vue

@@ -0,0 +1,206 @@
+<template>
+    <form @submit.prevent="submit">
+        <div ref="modal" class="modal fade" tabindex="-1" data-bs-backdrop="static">
+            <div class="modal-dialog">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <h5 id="exampleModalLabel" class="modal-title">
+                            {{ $t("Setup Proxy") }}
+                        </h5>
+                        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close" />
+                    </div>
+                    <div class="modal-body">
+                        <div class="mb-3">
+                            <label for="proxy-protocol" class="form-label">{{ $t("Proxy Protocol") }}</label>
+                            <select id="proxy-protocol" v-model="proxy.protocol" class="form-select">
+                                <option value="https">HTTPS</option>
+                                <option value="http">HTTP</option>
+                                <option value="socks">SOCKS</option>
+                                <option value="socks5">SOCKS v5</option>
+                                <option value="socks4">SOCKS v4</option>
+                            </select>
+                        </div>
+
+                        <div class="mb-3">
+                            <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')">
+                            </div>
+                        </div>
+
+                        <div class="mb-3">
+                            <div class="form-check form-switch">
+                                <input id="mark-auth" v-model="proxy.auth" class="form-check-input" type="checkbox">
+                                <label for="mark-auth" class="form-check-label">{{ $t("Proxy server has authentication") }}</label>
+                            </div>
+                        </div>
+
+                        <div v-if="proxy.auth" class="mb-3">
+                            <label for="proxy-username" class="form-label">{{ $t("User") }}</label>
+                            <input id="proxy-username" v-model="proxy.username" type="text" class="form-control" required>
+                        </div>
+
+                        <div v-if="proxy.auth" class="mb-3">
+                            <label for="proxy-password" class="form-label">{{ $t("Password") }}</label>
+                            <input id="proxy-password" v-model="proxy.password" type="password" class="form-control" required>
+                        </div>
+
+                        <div class="mb-3 mt-4">
+                            <hr class="dropdown-divider mb-4">
+
+                            <div class="form-check form-switch">
+                                <input id="mark-active" v-model="proxy.active" class="form-check-input" type="checkbox">
+                                <label for="mark-active" class="form-check-label">{{ $t("enabled") }}</label>
+                            </div>
+                            <div class="form-text">
+                                {{ $t("enableProxyDescription") }}
+                            </div>
+
+                            <br />
+
+                            <div class="form-check form-switch">
+                                <input id="mark-default" v-model="proxy.default" class="form-check-input" type="checkbox">
+                                <label for="mark-default" class="form-check-label">{{ $t("setAsDefault") }}</label>
+                            </div>
+                            <div class="form-text">
+                                {{ $t("setAsDefaultProxyDescription") }}
+                            </div>
+
+                            <br />
+
+                            <div class="form-check form-switch">
+                                <input id="apply-existing" v-model="proxy.applyExisting" class="form-check-input" type="checkbox">
+                                <label class="form-check-label" for="apply-existing">{{ $t("Apply on all existing monitors") }}</label>
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="modal-footer">
+                        <button v-if="id" type="button" class="btn btn-danger" :disabled="processing" @click="deleteConfirm">
+                            {{ $t("Delete") }}
+                        </button>
+                        <button type="submit" class="btn btn-primary" :disabled="processing">
+                            <div v-if="processing" class="spinner-border spinner-border-sm me-1"></div>
+                            {{ $t("Save") }}
+                        </button>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </form>
+
+    <Confirm ref="confirmDelete" btn-style="btn-danger" :yes-text="$t('Yes')" :no-text="$t('No')" @yes="deleteProxy">
+        {{ $t("deleteProxyMsg") }}
+    </Confirm>
+</template>
+
+<script lang="ts">
+import { Modal } from "bootstrap";
+
+import Confirm from "./Confirm.vue";
+
+export default {
+    components: {
+        Confirm,
+    },
+    props: {},
+    emits: ["added"],
+    data() {
+        return {
+            model: null,
+            processing: false,
+            id: null,
+            proxy: {
+                protocol: null,
+                host: null,
+                port: null,
+                auth: false,
+                username: null,
+                password: null,
+                active: false,
+                default: false,
+                applyExisting: false,
+            }
+        };
+    },
+
+    mounted() {
+        this.modal = new Modal(this.$refs.modal);
+    },
+
+    methods: {
+        deleteConfirm() {
+            this.modal.hide();
+            this.$refs.confirmDelete.show();
+        },
+
+        show(proxyID) {
+            if (proxyID) {
+                this.id = proxyID;
+
+                for (let proxy of this.$root.proxyList) {
+                    if (proxy.id === proxyID) {
+                        this.proxy = proxy;
+                        break;
+                    }
+                }
+            } else {
+                this.id = null;
+                this.proxy = {
+                    protocol: "https",
+                    host: null,
+                    port: null,
+                    auth: false,
+                    username: null,
+                    password: null,
+                    active: true,
+                    default: false,
+                    applyExisting: false,
+                };
+            }
+
+            this.modal.show();
+        },
+
+        submit() {
+            this.processing = true;
+            this.$root.getSocket().emit("addProxy", this.proxy, this.id, (res) => {
+                this.$root.toastRes(res);
+                this.processing = false;
+
+                if (res.ok) {
+                    this.modal.hide();
+
+                    // Emit added event, doesn't emit edit.
+                    if (! this.id) {
+                        this.$emit("added", res.id);
+                    }
+                }
+            });
+        },
+
+        deleteProxy() {
+            this.processing = true;
+            this.$root.getSocket().emit("deleteProxy", this.id, (res) => {
+                this.$root.toastRes(res);
+                this.processing = false;
+
+                if (res.ok) {
+                    this.modal.hide();
+                }
+            });
+        },
+    },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../assets/vars.scss";
+
+.dark {
+    .modal-dialog .form-text, .modal-dialog p {
+        color: $dark-font-color;
+    }
+}
+</style>

src/components/TwoFADialog.vue

@@ -19,6 +19,19 @@
                             </div>
                             <p v-if="showURI && twoFAStatus == false" class="text-break mt-2">{{ uri }}</p>
 
+                            <div v-if="!(uri && twoFAStatus == false)" class="mb-3">
+                                <label for="current-password" class="form-label">
+                                    {{ $t("Current Password") }}
+                                </label>
+                                <input
+                                    id="current-password"
+                                    v-model="currentPassword"
+                                    type="password"
+                                    class="form-control"
+                                    required
+                                />
+                            </div>
+
                             <button v-if="uri == null && twoFAStatus == false" class="btn btn-primary" type="button" @click="prepare2FA()">
                                 {{ $t("Enable 2FA") }}
                             </button>
@@ -59,11 +72,11 @@
 </template>
 
 <script lang="ts">
-import { Modal } from "bootstrap"
+import { Modal } from "bootstrap";
 import Confirm from "./Confirm.vue";
-import VueQrcode from "vue-qrcode"
-import { useToast } from "vue-toastification"
-const toast = useToast()
+import VueQrcode from "vue-qrcode";
+import { useToast } from "vue-toastification";
+const toast = useToast();
 
 export default {
     components: {
@@ -73,35 +86,36 @@ export default {
     props: {},
     data() {
         return {
+            currentPassword: "",
             processing: false,
             uri: null,
             tokenValid: false,
             twoFAStatus: null,
             token: null,
             showURI: false,
-        }
+        };
     },
     mounted() {
-        this.modal = new Modal(this.$refs.modal)
+        this.modal = new Modal(this.$refs.modal);
         this.getStatus();
     },
     methods: {
         show() {
-            this.modal.show()
+            this.modal.show();
         },
 
         confirmEnableTwoFA() {
-            this.$refs.confirmEnableTwoFA.show()
+            this.$refs.confirmEnableTwoFA.show();
         },
 
         confirmDisableTwoFA() {
-            this.$refs.confirmDisableTwoFA.show()
+            this.$refs.confirmDisableTwoFA.show();
         },
 
         prepare2FA() {
             this.processing = true;
 
-            this.$root.getSocket().emit("prepare2FA", (res) => {
+            this.$root.getSocket().emit("prepare2FA", this.currentPassword, (res) => {
                 this.processing = false;
 
                 if (res.ok) {
@@ -109,49 +123,51 @@ export default {
                 } else {
                     toast.error(res.msg);
                 }
-            })
+            });
         },
 
         save2FA() {
             this.processing = true;
 
-            this.$root.getSocket().emit("save2FA", (res) => {
+            this.$root.getSocket().emit("save2FA", this.currentPassword, (res) => {
                 this.processing = false;
 
                 if (res.ok) {
-                    this.$root.toastRes(res)
+                    this.$root.toastRes(res);
                     this.getStatus();
+                    this.currentPassword = "";
                     this.modal.hide();
                 } else {
                     toast.error(res.msg);
                 }
-            })
+            });
         },
 
         disable2FA() {
             this.processing = true;
 
-            this.$root.getSocket().emit("disable2FA", (res) => {
+            this.$root.getSocket().emit("disable2FA", this.currentPassword, (res) => {
                 this.processing = false;
 
                 if (res.ok) {
-                    this.$root.toastRes(res)
+                    this.$root.toastRes(res);
                     this.getStatus();
+                    this.currentPassword = "";
                     this.modal.hide();
                 } else {
                     toast.error(res.msg);
                 }
-            })
+            });
         },
 
         verifyToken() {
-            this.$root.getSocket().emit("verifyToken", this.token, (res) => {
+            this.$root.getSocket().emit("verifyToken", this.token, this.currentPassword, (res) => {
                 if (res.ok) {
                     this.tokenValid = res.valid;
                 } else {
                     toast.error(res.msg);
                 }
-            })
+            });
         },
 
         getStatus() {
@@ -161,10 +177,10 @@ export default {
                 } else {
                     toast.error(res.msg);
                 }
-            })
+            });
         },
     },
-}
+};
 </script>
 
 <style lang="scss" scoped>

src/components/settings/Proxies.vue

@@ -0,0 +1,48 @@
+<template>
+    <div>
+        <!-- Proxies -->
+        <div class="proxy-list my-4">
+            <p v-if="$root.proxyList.length === 0">
+                {{ $t("Not available, please setup.") }}
+            </p>
+            <p v-else>
+                {{ $t("proxyDescription") }}
+            </p>
+
+            <ul class="list-group mb-3" style="border-radius: 1rem;">
+                <li v-for="(proxy, index) in $root.proxyList" :key="index" class="list-group-item">
+                    {{ proxy.host }}:{{ proxy.port }} ({{ proxy.protocol }})
+                    <span v-if="proxy.default === true" class="badge bg-primary ms-2">{{ $t("Default") }}</span><br>
+                    <a href="#" @click="$refs.proxyDialog.show(proxy.id)">{{ $t("Edit") }}</a>
+                </li>
+            </ul>
+
+            <button class="btn btn-primary me-2" type="button" @click="$refs.proxyDialog.show()">
+                {{ $t("Setup Proxy") }}
+            </button>
+        </div>
+
+        <ProxyDialog ref="proxyDialog" />
+    </div>
+</template>
+
+<script>
+import ProxyDialog from "../../components/ProxyDialog.vue";
+
+export default {
+    components: {
+        ProxyDialog
+    },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../../assets/vars.scss";
+
+.dark {
+    .list-group-item {
+        background-color: $dark-bg2;
+        color: $dark-font-color;
+    }
+}
+</style>

src/components/settings/ReverseProxy.vue

@@ -0,0 +1,144 @@
+<template>
+    <div>
+        <h4 class="mt-4">Cloudflare Tunnel</h4>
+
+        <div class="my-3">
+            <div>
+                cloudflared:
+                <span v-if="installed === true" class="text-primary">{{ $t("Installed") }}</span>
+                <span v-else-if="installed === false" class="text-danger">{{ $t("Not installed") }}</span>
+            </div>
+
+            <div>
+                {{ $t("Status") }}:
+                <span v-if="running" class="text-primary">{{ $t("Running") }}</span>
+                <span v-else-if="!running" class="text-danger">{{ $t("Not running") }}</span>
+            </div>
+
+            <div v-if="false">
+                {{ message }}
+            </div>
+
+            <div v-if="errorMessage" class="mt-3">
+                {{ $t("Message:") }}
+                <textarea v-model="errorMessage" class="form-control" readonly></textarea>
+            </div>
+
+            <i18n-t v-if="installed === false" tag="p" keypath="wayToGetCloudflaredURL">
+                <a
+                    href="https://developers.cloudflare.com/cloudflare-one/connections/connect-apps/install-and-setup/installation/"
+                    target="_blank"
+                >{{ $t("cloudflareWebsite") }}</a>
+            </i18n-t>
+        </div>
+
+        <!-- If installed show token input -->
+        <div v-if="installed" class="mb-2">
+            <div class="mb-4">
+                <label class="form-label" for="cloudflareTunnelToken">
+                    Cloudflare Tunnel {{ $t("Token") }}
+                </label>
+                <HiddenInput
+                    id="cloudflareTunnelToken"
+                    v-model="cloudflareTunnelToken"
+                    autocomplete="one-time-code"
+                    :readonly="running"
+                />
+                <div class="form-text">
+                    <div v-if="cloudflareTunnelToken" class="mb-3">
+                        <span v-if="!running" class="remove-token" @click="removeToken">{{ $t("Remove Token") }}</span>
+                    </div>
+
+                    {{ $t("Don't know how to get the token? Please read the guide:") }}<br />
+                    <a href="https://github.com/louislam/uptime-kuma/wiki/Reverse-Proxy-with-Cloudflare-Tunnel" target="_blank">
+                        https://github.com/louislam/uptime-kuma/wiki/Reverse-Proxy-with-Cloudflare-Tunnel
+                    </a>
+                </div>
+            </div>
+
+            <div>
+                <button v-if="!running" class="btn btn-primary" type="submit" @click="start">
+                    {{ $t("Start") }} cloudflared
+                </button>
+
+                <button v-if="running" class="btn btn-danger" type="submit" @click="$refs.confirmStop.show();">
+                    {{ $t("Stop") }} cloudflared
+                </button>
+
+                <Confirm ref="confirmStop" btn-style="btn-danger" :yes-text="$t('Stop') + ' cloudflared'" :no-text="$t('Cancel')" @yes="stop">
+                    {{ $t("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.") }}
+
+                    <div class="mt-3">
+                        <label for="current-password2" class="form-label">
+                            {{ $t("Current Password") }}
+                        </label>
+                        <input
+                            id="current-password2"
+                            v-model="currentPassword"
+                            type="password"
+                            class="form-control"
+                            required
+                        />
+                    </div>
+                </Confirm>
+            </div>
+        </div>
+
+        <h4 class="mt-4">{{ $t("Other Software") }}</h4>
+        <div>
+            {{ $t("For example: nginx, Apache and Traefik.") }} <br />
+            {{ $t("Please read") }} <a href="https://github.com/louislam/uptime-kuma/wiki/Reverse-Proxy" target="_blank">https://github.com/louislam/uptime-kuma/wiki/Reverse-Proxy</a>.
+        </div>
+    </div>
+</template>
+
+<script>
+import HiddenInput from "../../components/HiddenInput.vue";
+import Confirm from "../Confirm.vue";
+
+const prefix = "cloudflared_";
+
+export default {
+    components: {
+        HiddenInput,
+        Confirm
+    },
+    data() {
+        // See /src/mixins/socket.js
+        return this.$root.cloudflared;
+    },
+    computed: {
+
+    },
+    watch: {
+
+    },
+    created() {
+        this.$root.getSocket().emit(prefix + "join");
+    },
+    unmounted() {
+        this.$root.getSocket().emit(prefix + "leave");
+    },
+    methods: {
+        start() {
+            this.$root.getSocket().emit(prefix + "start", this.cloudflareTunnelToken);
+        },
+        stop() {
+            this.$root.getSocket().emit(prefix + "stop", this.currentPassword, (res) => {
+                this.$root.toastRes(res);
+            });
+        },
+        removeToken() {
+            this.$root.getSocket().emit(prefix + "removeToken");
+            this.cloudflareTunnelToken = "";
+        }
+    }
+};
+</script>
+
+<style lang="scss" scoped>
+.remove-token {
+    text-decoration: underline;
+    cursor: pointer;
+}
+</style>

src/components/settings/Security.vue

@@ -192,6 +192,12 @@
                 <p>Пожалуйста, используйте с осторожностью.</p>
             </template>
 
+            <template v-else-if="$i18n.locale === 'uk-UA' ">
+                <p>Ви впевнені, що бажаєте <strong>вимкнути авторизацію</strong>?</p>
+                <p>Це підходить для <strong>тих, у кого встановлена інша авторизація</strong> пееред відкриттям Uptime Kuma, наприклад Cloudflare Access.</p>
+                <p>Будь ласка, використовуйте з обережністю.</p>
+            </template>
+
             <template v-else-if="$i18n.locale === 'fa' ">
                 <p>آیا مطمئن هستید که میخواهید <strong>احراز هویت را غیر فعال کنید</strong>?</p>
                 <p>این ویژگی برای کسانی است که <strong> لایه امنیتی شخص ثالث دیگر بر روی این آدرس فعال کرده‌اند</strong>، مانند Cloudflare Access.</p>
@@ -215,14 +221,14 @@
                 <p>Dette er for <strong>de som har tredjepartsautorisering</strong> foran Uptime Kuma, for eksempel Cloudflare Access.</p>
                 <p>Vennligst vær forsiktig.</p>
             </template>
-            
+
             <template v-else-if="$i18n.locale === 'cs-CZ' ">
                 <p>Opravdu chcete <strong>deaktivovat autentifikaci</strong>?</p>
                 <p>Tato možnost je určena pro případy, kdy <strong>máte autentifikaci zajištěnou třetí stranou</strong> ještě před přístupem do Uptime Kuma, například prostřednictvím Cloudflare Access.</p>
                 <p>Používejte ji prosím s rozmyslem.</p>
             </template>
 
-			<template v-else-if="$i18n.locale === 'vi-VN' ">
+            <template v-else-if="$i18n.locale === 'vi-VN' ">
                 <p>Bạn có muốn <strong>TẮT XÁC THỰC</strong> không?</p>
                 <p>Điều này rất nguy hiểm<strong>BẤT KỲ AI</strong> cũng có thể truy cập và cướp quyền điều khiển.</p>
                 <p>Vui lòng <strong>cẩn thận</strong>.</p>
@@ -234,6 +240,19 @@
                 <p>It is designed for scenarios <strong>where you intend to implement third-party authentication</strong> in front of Uptime Kuma such as Cloudflare Access, Authelia or other authentication mechanisms.</p>
                 <p>Please use this option carefully!</p>
             </template>
+
+            <div class="mb-3">
+                <label for="current-password2" class="form-label">
+                    {{ $t("Current Password") }}
+                </label>
+                <input
+                    id="current-password2"
+                    v-model="password.currentPassword"
+                    type="password"
+                    class="form-control"
+                    required
+                />
+            </div>
         </Confirm>
     </div>
 </template>
@@ -310,7 +329,12 @@ export default {
 
         disableAuth() {
             this.settings.disableAuth = true;
-            this.saveSettings();
+
+            // Need current password to disable auth
+            // Set it to empty if done
+            this.saveSettings(() => {
+                this.password.currentPassword = "";
+            }, this.password.currentPassword);
         },
 
         enableAuth() {

src/i18n.js

@@ -29,7 +29,8 @@ const languageList = {
     "pl": "Polski",
     "et-EE": "eesti",
     "vi-VN": "Tiếng Việt",
-    "zh-TW": "繁體中文 (台灣)"
+    "zh-TW": "繁體中文 (台灣)",
+    "uk-UA": "Український",
 };
 
 let messages = {

src/icon.js

@@ -37,6 +37,8 @@ import {
     faPen,
     faExternalLinkSquareAlt,
     faSpinner,
+    faUndo,
+    faPlusCircle,
 } from "@fortawesome/free-solid-svg-icons";
 
 library.add(
@@ -73,6 +75,8 @@ library.add(
     faPen,
     faExternalLinkSquareAlt,
     faSpinner,
+    faUndo,
+    faPlusCircle,
 );
 
 export { FontAwesomeIcon };

src/languages/en.js

@@ -331,21 +331,21 @@ export default {
     dark: "dark",
     Post: "Post",
     "Please input title and content": "Please input title and content",
-    "Created": "Created",
+    Created: "Created",
     "Last Updated": "Last Updated",
-    "Unpin": "Unpin",
+    Unpin: "Unpin",
     "Switch to Light Theme": "Switch to Light Theme",
     "Switch to Dark Theme": "Switch to Dark Theme",
     "Show Tags": "Show Tags",
     "Hide Tags": "Hide Tags",
-    "Description": "Description",
+    Description: "Description",
     "No monitors available.": "No monitors available.",
     "Add one": "Add one",
     "No Monitors": "No Monitors",
     "Untitled Group": "Untitled Group",
-    "Services": "Services",
-    "Discard": "Discard",
-    "Cancel": "Cancel",
+    Services: "Services",
+    Discard: "Discard",
+    Cancel: "Cancel",
     "Powered by": "Powered by",
     shrinkDatabaseDescription: "Trigger database VACUUM for SQLite. If your database is created after 1.10.0, AUTO_VACUUM is already enabled and this action is not needed.",
     serwersms: "SerwerSMS.pl",
@@ -371,4 +371,75 @@ export default {
     alertaAlertState: "Alert State",
     alertaRecoverState: "Recover State",
     deleteStatusPageMsg: "Are you sure want to delete this status page?",
+    Proxies: "Proxies",
+    default: "Default",
+    enabled: "Enabled",
+    setAsDefault: "Set As Default",
+    deleteProxyMsg: "Are you sure want to delete this proxy for all monitors?",
+    proxyDescription: "Proxies must be assigned to a monitor to function.",
+    enableProxyDescription: "This proxy will not effect on monitor requests until it is activated. You can control temporarily disable the proxy from all monitors by activation status.",
+    setAsDefaultProxyDescription: "This proxy will be enabled by default for new monitors. You can still disable the proxy separately for each monitor.",
+    "Certificate Chain": "Certificate Chain",
+    Valid: "Valid",
+    Invalid: "Invalid",
+    AccessKeyId: "AccessKey ID",
+    SecretAccessKey: "AccessKey Secret",
+    PhoneNumbers: "PhoneNumbers",
+    TemplateCode: "TemplateCode",
+    SignName: "SignName",
+    "Sms template must contain parameters: ": "Sms template must contain parameters: ",
+    "Bark Endpoint": "Bark Endpoint",
+    WebHookUrl: "WebHookUrl",
+    SecretKey: "SecretKey",
+    "For safety, must use secret key": "For safety, must use secret key",
+    "Device Token": "Device Token",
+    Platform: "Platform",
+    iOS: "iOS",
+    Android: "Android",
+    Huawei: "Huawei",
+    High: "High",
+    Retry: "Retry",
+    Topic: "Topic",
+    "WeCom Bot Key": "WeCom Bot Key",
+    "Setup Proxy": "Setup Proxy",
+    "Proxy Protocol": "Proxy Protocol",
+    "Proxy Server": "Proxy Server",
+    "Proxy server has authentication": "Proxy server has authentication",
+    User: "User",
+    Installed: "Installed",
+    "Not installed": "Not installed",
+    Running: "Running",
+    "Not running": "Not running",
+    "Remove Token": "Remove Token",
+    Start: "Start",
+    Stop: "Stop",
+    "Uptime Kuma": "Uptime Kuma",
+    "Add New Status Page": "Add New Status Page",
+    Slug: "Slug",
+    "Accept characters:": "Accept characters:",
+    "startOrEndWithOnly": "Start or end with {0} only",
+    "No consecutive dashes": "No consecutive dashes",
+    Next: "Next",
+    "The slug is already taken. Please choose another slug.": "The slug is already taken. Please choose another slug.",
+    "No Proxy": "No Proxy",
+    "HTTP Basic Auth": "HTTP Basic Auth",
+    "New Status Page": "New Status Page",
+    "Page Not Found": "Page Not Found",
+    "Reverse Proxy": "Reverse Proxy",
+    Backup: "Backup",
+    About: "About",
+    wayToGetCloudflaredURL: "(Download cloudflared from {0})",
+    cloudflareWebsite: "Cloudflare Website",
+    "Message:": "Message:",
+    "Don't know how to get the token? Please read the guide:": "Don't know how to get the token? Please read the guide:",
+    "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.": "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.",
+    "Other Software": "Other Software",
+    "For example: nginx, Apache and Traefik.": "For example: nginx, Apache and Traefik.",
+    "Please read": "Please read",
+    "Subject:": "Subject:",
+    "Valid To:": "Valid To:",
+    "Days Remaining:": "Days Remaining:",
+    "Issuer:": "Issuer:",
+    "Fingerprint:": "Fingerprint:",
+    "No status pages": "No status pages",
 };

src/languages/hr-HR.js

@@ -183,7 +183,7 @@ export default {
     "Edit Status Page": "Uredi Statusnu stranicu",
     "Go to Dashboard": "Na Kontrolnu ploču",
     "Status Page": "Statusna stranica",
-    "Status Pages": "Statusna stranica",
+    "Status Pages": "Statusne stranice",
     defaultNotificationName: "Moja {number}. {notification} obavijest",
     here: "ovdje",
     Required: "Potrebno",
@@ -347,4 +347,30 @@ export default {
     Cancel: "Otkaži",
     "Powered by": "Pokreće",
     Saved: "Spremljeno",
+    PushByTechulus: "Push by Techulus",
+    GoogleChat: "Google Chat (preko platforme Google Workspace)",
+    shrinkDatabaseDescription: "Pokreni VACUUM operaciju za SQLite. Ako je baza podataka kreirana nakon inačice 1.10.0, AUTO_VACUUM opcija već je uključena te ova akcija nije nužna.",
+    serwersms: "SerwerSMS.pl",
+    serwersmsAPIUser: "API korisničko ime (uključujući webapi_ prefiks)",
+    serwersmsAPIPassword: "API lozinka",
+    serwersmsPhoneNumber: "Broj telefona",
+    serwersmsSenderName: "Ime SMS pošiljatelja (registrirano preko korisničkog portala)",
+    stackfield: "Stackfield",
+    smtpDkimSettings: "DKIM postavke",
+    smtpDkimDesc: "Za više informacija, postoji Nodemailer DKIM {0}.",
+    documentation: "dokumentacija",
+    smtpDkimDomain: "Domena",
+    smtpDkimKeySelector: "Odabir ključa",
+    smtpDkimPrivateKey: "Privatni ključ",
+    smtpDkimHashAlgo: "Hash algoritam (neobavezno)",
+    smtpDkimheaderFieldNames: "Ključevi zaglavlja za potpis (neobavezno)",
+    smtpDkimskipFields: "Ključevi zaglavlja koji se neće potpisati (neobavezno)",
+    gorush: "Gorush",
+    alerta: "Alerta",
+    alertaApiEndpoint: "Krajnja točka API-ja (Endpoint)",
+    alertaEnvironment: "Okruženje (Environment)",
+    alertaApiKey: "API ključ",
+    alertaAlertState: "Stanje upozorenja",
+    alertaRecoverState: "Stanje oporavka",
+    deleteStatusPageMsg: "Sigurno želite obrisati ovu statusnu stranicu?",
 };

src/languages/hu.js

@@ -197,7 +197,7 @@ export default {
     line: "Line Messenger",
     mattermost: "Mattermost",
     "Status Page": "Státusz oldal",
-    "Status Pages": "Státusz oldal",
+    "Status Pages": "Státusz oldalak",
     "Primary Base URL": "Elsődleges URL",
     "Push URL": "Meghívandó URL",
     needPushEvery: "Ezt az URL-t kell meghívni minden {0} másodpercben.",
@@ -370,4 +370,5 @@ export default {
     alertaApiKey: "API kulcs",
     alertaAlertState: "Figyelmeztetési állapot",
     alertaRecoverState: "Visszaállási állapot",
+    deleteStatusPageMsg: "Biztos, hogy törölni akarja a státusz oldalt?",
 };

src/languages/ru-RU.js

@@ -180,8 +180,8 @@ export default {
     "Add a monitor": "Добавить монитор",
     "Edit Status Page": "Редактировать",
     "Go to Dashboard": "Панель управления",
-    "Status Page": "Мониторинг",
-    "Status Pages": "Página de Status",
+    "Status Page": "Страница статуса",
+    "Status Pages": "Страницы статуса",
     Discard: "Отмена",
     "Create Incident": "Создать инцидент",
     "Switch to Dark Theme": "Тёмная тема",
@@ -311,28 +311,28 @@ export default {
     "One record": "Одна запись",
     steamApiKeyDescription: "Для мониторинга игрового сервера Steam вам необходим Web-API ключ Steam. Зарегистрировать его можно здесь: ",
     "Certificate Chain": "Цепочка сертификатов",
-    "Valid": "Действительный",
+    Valid: "Действительный",
     "Hide Tags": "Скрыть тэги",
     Title: "Название инцидента:",
     Content: "Содержание инцидента:",
     Post: "Опубликовать",
-    "Cancel": "Отмена",
-    "Created": "Создано",
-    "Unpin": "Открепить",
+    Cancel: "Отмена",
+    Created: "Создано",
+    Unpin: "Открепить",
     "Show Tags": "Показать тэги",
-    "recent": "Сейчас",
+    recent: "Сейчас",
     "3h": "3 часа",
     "6h": "6 часов",
     "24h": "24 часа",
     "1w": "1 неделя",
     "No monitors available.": "Нет доступных мониторов",
     "Add one": "Добавить новый",
-    "Backup": "Резервная копия",
-    "Security": "Безопасность",
+    Backup: "Резервная копия",
+    Security: "Безопасность",
     "Shrink Database": "Сжать Базу Данных",
     "Current User": "Текущий пользователь",
-    "About": "О программе",
-    "Description": "Описание",
+    About: "О программе",
+    Description: "Описание",
     "Powered by": "Работает на основе скрипта от",
     shrinkDatabaseDescription: "Включает VACUUM для базы данных SQLite. Если ваша база данных была создана на версии 1.10.0 и более, AUTO_VACUUM уже включен и это действие не требуется.",
     deleteStatusPageMsg: "Вы действительно хотите удалить эту страницу статуса сервисов?",
@@ -343,4 +343,50 @@ export default {
     primary: "ОСНОВНОЙ",
     light: "СВЕТЛЫЙ",
     dark: "ТЕМНЫЙ",
+    "New Status Page": "Новая страница статуса",
+    "Show update if available": "Показывать доступные обновления",
+    "Also check beta release": "Проверять обновления для бета версий",
+    "Add New Status Page": "Добавить страницу статуса",
+    Next: "Далее",
+    "Accept characters: a-z 0-9 -": "Разрешены символы: a-z 0-9 -",
+    "Start or end with a-z 0-9 only": "Начало и окончание имени только на символы: a-z 0-9",
+    "No consecutive dashes --": "Запрещено использовать тире --",
+    "HTTP Options": "HTTP Опции",
+    "Basic Auth": "HTTP Авторизация",
+    PushByTechulus: "Push by Techulus",
+    clicksendsms: "ClickSend SMS",
+    GoogleChat: "Google Chat (только Google Workspace)",
+    apiCredentials: "API реквизиты",
+    Done: "Готово",
+    Info: "Инфо",
+    "Steam API Key": "Steam API-Ключ",
+    "Pick a RR-Type...": "Выберите RR-Тип...",
+    "Pick Accepted Status Codes...": "Выберите принятые коды состояния...",
+    Default: "По умолчанию",
+    "Please input title and content": "Пожалуйста, введите название и содержание",
+    "Last Updated": "Последнее Обновление",
+    "Untitled Group": "Группа без названия",
+    Services: "Сервисы",
+    serwersms: "SerwerSMS.pl",
+    serwersmsAPIUser: "API Пользователь (включая префикс webapi_)",
+    serwersmsAPIPassword: "API Пароль",
+    serwersmsPhoneNumber: "Номер телефона",
+    serwersmsSenderName: "SMS Имя Отправителя (регистрированный через пользовательский портал)",
+    stackfield: "Stackfield",
+    smtpDkimSettings: "DKIM Настройки",
+    smtpDkimDesc: "Please refer to the Nodemailer DKIM {0} for usage.",
+    documentation: "документация",
+    smtpDkimDomain: "Имя Домена",
+    smtpDkimKeySelector: "Ключ",
+    smtpDkimPrivateKey: "Приватный ключ",
+    smtpDkimHashAlgo: "Алгоритм хэша (опционально)",
+    smtpDkimheaderFieldNames: "Заголовок ключей для подписи (опционально)",
+    smtpDkimskipFields: "Заколовок ключей не для подписи (опционально)",
+    gorush: "Gorush",
+    alerta: "Alerta",
+    alertaApiEndpoint: "Конечная точка API",
+    alertaEnvironment: "Среда",
+    alertaApiKey: "Ключ API",
+    alertaAlertState: "Состояние алерта",
+    alertaRecoverState: "Состояние восстановления",
 };

src/languages/uk-UA.js

@@ -0,0 +1,392 @@
+export default {
+    languageName: "Український",
+    checkEverySecond: "Перевірка кожні {0} секунд",
+    retriesDescription: "Максимальна кількість спроб перед позначенням сервісу як недоступного та надсиланням повідомлення",
+    ignoreTLSError: "Ігнорувати помилку TLS/SSL для сайтів HTTPS",
+    upsideDownModeDescription: "Реверс статусу сервісу. Якщо сервіс доступний, він позначається як НЕДОСТУПНИЙ.",
+    maxRedirectDescription: "Максимальна кількість перенаправлень. Поставте 0, щоб вимкнути перенаправлення.",
+    acceptedStatusCodesDescription: "Виберіть коди статусів для визначення доступності сервісу.",
+    passwordNotMatchMsg: "Повторення паролю не збігається.",
+    notificationDescription: "Прив'яжіть повідомлення до моніторів.",
+    keywordDescription: "Пошук слова в чистому HTML або JSON-відповіді (чутливо до регістру)",
+    pauseDashboardHome: "Пауза",
+    deleteMonitorMsg: "Ви дійсно хочете видалити цей монітор?",
+    deleteNotificationMsg: "Ви дійсно хочете видалити це повідомлення для всіх моніторів?",
+    resolverserverDescription: "Cloudflare є сервером за замовчуванням. Ви завжди можете змінити цей сервер.",
+    rrtypeDescription: "Виберіть тип ресурсного запису, який ви хочете відстежувати",
+    pauseMonitorMsg: "Ви дійсно хочете поставити на паузу?",
+    Settings: "Налаштування",
+    Dashboard: "Панель управління",
+    "New Update": "Оновлення",
+    Language: "Мова",
+    Appearance: "Зовнішній вигляд",
+    Theme: "Тема",
+    General: "Загальне",
+    Version: "Версія",
+    "Check Update On GitHub": "Перевірити оновлення на GitHub",
+    List: "Список",
+    Add: "Додати",
+    "Add New Monitor": "Новий монітор",
+    "Quick Stats": "Статистика",
+    Up: "Доступний",
+    Down: "Недоступний",
+    Pending: "Очікування",
+    Unknown: "Невідомо",
+    Pause: "Пауза",
+    Name: "Ім'я",
+    Status: "Статус",
+    DateTime: "Дата і час",
+    Message: "Повідомлення",
+    "No important events": "Важливих подій немає",
+    Resume: "Відновити",
+    Edit: "Змінити",
+    Delete: "Видалити",
+    Current: "Поточний",
+    Uptime: "Аптайм",
+    "Cert Exp.": "Сертифікат спливає",
+    days: "днів",
+    day: "день",
+    "-day": " днів",
+    hour: "година",
+    "-hour": " години",
+    Response: "Відповідь",
+    Ping: "Пінг",
+    "Monitor Type": "Тип монітора",
+    Keyword: "Ключове слово",
+    "Friendly Name": "Ім'я",
+    URL: "URL",
+    Hostname: "Ім'я хоста",
+    Port: "Порт",
+    "Heartbeat Interval": "Частота опитування",
+    Retries: "Спроб",
+    Advanced: "Додатково",
+    "Upside Down Mode": "Реверс статусу",
+    "Max. Redirects": "Макс. кількість перенаправлень",
+    "Accepted Status Codes": "Припустимі коди статусу",
+    Save: "Зберегти",
+    Notifications: "Повідомлення",
+    "Not available, please setup.": "Доступних сповіщень немає, необхідно створити.",
+    "Setup Notification": "Створити сповіщення",
+    Light: "Світла",
+    Dark: "Темна",
+    Auto: "Авто",
+    "Theme - Heartbeat Bar": "Тема - Смуга частоти опитування",
+    Normal: "Звичайний",
+    Bottom: "Знизу",
+    None: "Відсутня",
+    Timezone: "Часовий пояс",
+    "Search Engine Visibility": "Індексація пошуковими системами:",
+    "Allow indexing": "Дозволити індексування",
+    "Discourage search engines from indexing site": "Заборонити індексування",
+    "Change Password": "Змінити пароль",
+    "Current Password": "Поточний пароль",
+    "New Password": "Новий пароль",
+    "Repeat New Password": "Повтор нового пароля",
+    "Update Password": "Оновити пароль",
+    "Disable Auth": "Вимкнути авторизацію",
+    "Enable Auth": "Увімкнути авторизацію",
+    Logout: "Вийти",
+    Leave: "Відміна",
+    "I understand, please disable": "Я розумію, все одно відключити",
+    Confirm: "Підтвердити",
+    Yes: "Так",
+    No: "Ні",
+    Username: "Логін",
+    Password: "Пароль",
+    "Remember me": "Запам'ятати мене",
+    Login: "Вхід до системи",
+    "No Monitors, please": "Моніторів немає, будь ласка",
+    "No Monitors": "Монітори відсутні",
+    "add one": "створіть новий",
+    "Notification Type": "Тип повідомлення",
+    Email: "Пошта",
+    Test: "Перевірка",
+    "Certificate Info": "Інформація про сертифікат",
+    "Resolver Server": "DNS сервер",
+    "Resource Record Type": "Тип ресурсного запису",
+    "Last Result": "Останній результат",
+    "Create your admin account": "Створіть обліковий запис адміністратора",
+    "Repeat Password": "Повторіть пароль",
+    respTime: "Час відповіді (мс)",
+    notAvailableShort: "Н/д",
+    Create: "Створити",
+    clearEventsMsg: "Ви дійсно хочете видалити всю статистику подій цього монітора?",
+    clearHeartbeatsMsg: "Ви дійсно хочете видалити всю статистику опитувань цього монітора?",
+    confirmClearStatisticsMsg: "Ви дійсно хочете видалити ВСЮ статистику?",
+    "Clear Data": "Видалити статистику",
+    Events: "Події",
+    Heartbeats: "Опитування",
+    "Auto Get": "Авто-отримання",
+    enableDefaultNotificationDescription: "Для кожного нового монітора це повідомлення буде включено за замовчуванням. Ви все ще можете відключити повідомлення в кожному моніторі окремо.",
+    "Default enabled": "Використовувати за промовчанням",
+    "Also apply to existing monitors": "Застосувати до існуючих моніторів",
+    Export: "Експорт",
+    Import: "Імпорт",
+    backupDescription: "Ви можете зберегти резервну копію всіх моніторів та повідомлень у вигляді JSON-файлу",
+    backupDescription2: "P.S.: Історія та події збережені не будуть",
+    backupDescription3: "Важливі дані, такі як токени повідомлень, додаються під час експорту, тому зберігайте файли в безпечному місці",
+    alertNoFile: "Виберіть файл для імпорту.",
+    alertWrongFileType: "Виберіть JSON-файл.",
+    twoFAVerifyLabel: "Будь ласка, введіть свій токен, щоб перевірити роботу 2FA",
+    tokenValidSettingsMsg: "Токен дійсний! Тепер ви можете зберегти налаштування 2FA.",
+    confirmEnableTwoFAMsg: "Ви дійсно хочете увімкнути 2FA?",
+    confirmDisableTwoFAMsg: "Ви дійсно хочете вимкнути 2FA?",
+    "Apply on all existing monitors": "Застосувати до всіх існуючих моніторів",
+    "Verify Token": "Перевірити токен",
+    "Setup 2FA": "Налаштування 2FA",
+    "Enable 2FA": "Увімкнути 2FA",
+    "Disable 2FA": "Вимкнути 2FA",
+    "2FA Settings": "Налаштування 2FA",
+    "Two Factor Authentication": "Двофакторна аутентифікація",
+    Active: "Активно",
+    Inactive: "Неактивно",
+    Token: "Токен",
+    "Show URI": "Показати URI",
+    "Clear all statistics": "Очистити статистику",
+    retryCheckEverySecond: "Повтор кожні {0} секунд",
+    importHandleDescription: "Виберіть \"Пропустити існуючі\", якщо ви хочете пропустити кожен монітор або повідомлення з таким же ім'ям. \"Перезаписати\" видалить кожен існуючий монітор або повідомлення та додасть заново. Варіант \"Не перевіряти\" примусово відновлює всі монітори і повідомлення, навіть якщо вони вже існують.",
+    confirmImportMsg: "Ви дійсно хочете відновити резервну копію? Переконайтеся, що ви вибрали відповідний варіант імпорту.",
+    "Heartbeat Retry Interval": "Інтервал повтору опитування",
+    "Import Backup": "Імпорт",
+    "Export Backup": "Експорт",
+    "Skip existing": "Пропустити існуючі",
+    Overwrite: "Перезаписати",
+    Options: "Опції",
+    "Keep both": "Не перевіряти",
+    Tags: "Теги",
+    "Add New below or Select...": "Додати новий або вибрати...",
+    "Tag with this name already exist.": "Такий тег вже існує.",
+    "Tag with this value already exist.": "Тег із таким значенням вже існує.",
+    color: "колір",
+    "value (optional)": "значення (опціонально)",
+    Gray: "Сірий",
+    Red: "Червоний",
+    Orange: "Помаранчевий",
+    Green: "Зелений",
+    Blue: "Синій",
+    Indigo: "Індиго",
+    Purple: "Пурпурний",
+    Pink: "Рожевий",
+    "Search...": "Пошук...",
+    "Avg. Ping": "Середнє значення пінгу",
+    "Avg. Response": "Середній час відповіді",
+    "Entry Page": "Головна сторінка",
+    statusPageNothing: "Тут порожньо. Додайте групу або монітор.",
+    "No Services": "Немає сервісів",
+    "All Systems Operational": "Всі системи працюють у штатному режимі",
+    "Partially Degraded Service": "Сервіси працюють частково",
+    "Degraded Service": "Всі сервіси не працюють",
+    "Add Group": "Додати групу",
+    "Add a monitor": "Додати монітор",
+    "Edit Status Page": "Редагувати",
+    "Go to Dashboard": "Панель управління",
+    "Status Page": "Сторінка статусу",
+    "Status Pages": "Сторінки статусу",
+    Discard: "Скасування",
+    "Create Incident": "Створити інцидент",
+    "Switch to Dark Theme": "Темна тема",
+    "Switch to Light Theme": "Світла тема",
+    telegram: "Telegram",
+    webhook: "Вебхук",
+    smtp: "Email (SMTP)",
+    discord: "Discord",
+    teams: "Microsoft Teams",
+    signal: "Signal",
+    gotify: "Gotify",
+    slack: "Slack",
+    "rocket.chat": "Rocket.chat",
+    pushover: "Pushover",
+    pushy: "Pushy",
+    octopush: "Octopush",
+    promosms: "PromoSMS",
+    lunasea: "LunaSea",
+    apprise: "Apprise (Підтримка 50+ сервісів повідомлень)",
+    pushbullet: "Pushbullet",
+    line: "Line Messenger",
+    mattermost: "Mattermost",
+    "Primary Base URL": "Основна URL",
+    "Push URL": "URL пуша",
+    needPushEvery: "До цієї URL необхідно звертатися кожні {0} секунд",
+    pushOptionalParams: "Опціональні параметри: {0}",
+    defaultNotificationName: "Моє повідомлення {notification} ({number})",
+    here: "тут",
+    Required: "Потрібно",
+    "Bot Token": "Токен бота",
+    wayToGetTelegramToken: "Ви можете взяти токен тут - {0}.",
+    "Chat ID": "ID чату",
+    supportTelegramChatID: "Підтримуються ID чатів, груп та каналів",
+    wayToGetTelegramChatID: "Ви можете взяти ID вашого чату, відправивши повідомлення боту і перейшовши по цьому URL для перегляду chat_id:",
+    "YOUR BOT TOKEN HERE": "ВАШ ТОКЕН БОТА ТУТ",
+    chatIDNotFound: "ID чату не знайдено; будь ласка, відправте спочатку повідомлення боту",
+    "Post URL": "Post URL",
+    "Content Type": "Тип контенту",
+    webhookJsonDesc: "{0} підходить для будь-яких сучасних HTTP-серверів, наприклад Express.js",
+    webhookFormDataDesc: "{multipart} підходить для PHP. JSON-вивід необхідно буде обробити за допомогою {decodeFunction}",
+    secureOptionNone: "Ні / STARTTLS (25, 587)",
+    secureOptionTLS: "TLS (465)",
+    "Ignore TLS Error": "Ігнорувати помилки TLS",
+    "From Email": "Від кого",
+    emailCustomSubject: "Своя тема",
+    "To Email": "Кому",
+    smtpCC: "Копія",
+    smtpBCC: "Прихована копія",
+    "Discord Webhook URL": "Discord Вебхук URL",
+    wayToGetDiscordURL: "Ви можете створити його в Параметрах сервера -> Інтеграції -> Створити вебхук",
+    "Bot Display Name": "Ім'я бота, що відображається",
+    "Prefix Custom Message": "Свій префікс повідомлення",
+    "Hello @everyone is...": "Привіт {'@'}everyone це...",
+    "Webhook URL": "URL вебхука",
+    wayToGetTeamsURL: "Як створити URL вебхука ви можете дізнатися тут - {0}.",
+    Номер: "Номер",
+    Recipients: "Одержувачі",
+    needSignalAPI: "Вам необхідний клієнт Signal із підтримкою REST API.",
+    wayToCheckSignalURL: "Пройдіть по цьому URL, щоб дізнатися як налаштувати такий клієнт:",
+    signalImportant: "ВАЖЛИВО: Не можна змішувати в Одержувачах групи та номери!",
+    "Application Token": "Токен програми",
+    "Server URL": "URL сервера",
+    Priority: "Пріоритет",
+    "Icon Emoji": "Іконка Emoji",
+    "Channel Name": "Ім'я каналу",
+    "Uptime Kuma URL": "Uptime Kuma URL",
+    aboutWebhooks: "Більше інформації про вебхуки: {0}",
+    aboutChannelName: "Введіть ім'я каналу в поле {0} Ім'я каналу, якщо ви хочете обійти канал вебхука. Наприклад: #other-channel",
+    aboutKumaURL: "Якщо поле Uptime Kuma URL в налаштуваннях залишиться порожнім, за замовчуванням буде використовуватися посилання на проект на GitHub.",
+    emojiCheatSheet: "Шпаргалка по Emoji: {0}",
+    "User Key": "Ключ користувача",
+    Device: "Пристрій",
+    "Message Title": "Заголовок повідомлення",
+    "Notification Sound": "Звук повідомлення",
+    "More info on:": "Більше інформації: {0}",
+    pushoverDesc1: "Екстренний пріоритет (2) має таймуут повтору за замовчуванням 30 секунд і закінчується через 1 годину.",
+    pushoverDesc2: "Якщо ви бажаєте надсилати повідомлення різним пристроям, необхідно заповнити поле Пристрій.",
+    "SMS Type": "Тип SMS",
+    octopushTypePremium: "Преміум (Швидкий - рекомендується для алертів)",
+    octopushTypeLowCost: "Дешевий (Повільний - іноді блокується операторами)",
+    checkPrice: "Тарифи {0}:",
+    octopushLegacyHint: "Ви використовуєте стару версію Octopush (2011-2020) або нову?",
+    "Check octopush prices": "Тарифи Octopush {0}.",
+    octopushPhoneNumber: "Номер телефону (між. формат, наприклад: +380123456789)",
+    octopushSMSSender: "Ім'я відправника SMS: 3-11 символів алвафіту, цифр та пробілів (a-zA-Z0-9)",
+    "LunaSea Device ID": "ID пристрою LunaSea",
+    "Apprise URL": "Apprise URL",
+    "Example:": "Приклад: {0}",
+    "Read more:": "Докладніше: {0}",
+    "Status:": "Статус: {0}",
+    "Read more": "Докладніше",
+    appriseInstalled: "Apprise встановлено.",
+    appriseNotInstalled: "Apprise не встановлено. {0}",
+    "Access Token": "Токен доступу",
+    "Channel access token": "Токен доступу каналу",
+    "Line Developers Console": "Консоль розробників Line",
+    lineDevConsoleTo: "Консоль розробників Line - {0}",
+    "Basic Settings": "Базові налаштування",
+    "User ID": "ID користувача",
+    "Messaging API": "API повідомлень",
+    wayToGetLineChannelToken: "Спочатку зайдіть в {0}, створіть провайдера та канал (API повідомлень), потім ви зможете отримати токен доступу каналу та ID користувача з вищезгаданих пунктів меню.",
+    "Icon URL": "URL іконки",
+    aboutIconURL: "Ви можете надати посилання на іконку в полі \"URL іконки\", щоб перевизначити картинку профілю за замовчуванням. Не використовується, якщо задана іконка Emoji.",
+    aboutMattermostChannelName: "Ви можете перевизначити канал за замовчуванням, в який пише вебхук, ввівши ім'я каналу в полі \"Ім'я каналу\". Це необхідно включити в налаштуваннях вебхука Mattermost. Наприклад: #other-channel",
+    matrix: "Matrix",
+    promosmsTypeEco: "SMS ECO - дешево та повільно, часто перевантажений. Тільки для одержувачів з Польщі.",
+    promosmsTypeFlash: "SMS FLASH - повідомлення автоматично з'являться на пристрої одержувача. Тільки для одержувачів з Польщі.",
+    promosmsTypeFull: "SMS FULL - преміум-рівень SMS, можна використовувати своє ім'я відправника (попередньо зареєструвавши його). Надійно для алертів.",
+    promosmsTypeSpeed: "SMS SPEED - найвищий пріоритет у системі. Дуже швидко і надійно, але дуже дорого (вдвічі дорожче, ніж SMS FULL).",
+    promosmsPhoneNumber: "Номер телефону (для одержувачів з Польщі можна пропустити код регіону)",
+    promosmsSMSSender: "Ім'я відправника SMS: Зареєстроване або одне з імен за замовчуванням: InfoSMS, SMS Info, MaxSMS, INFO, SMS",
+    "Feishu WebHookURL": "Feishu WebHookURL",
+    matrixHomeserverURL: "URL сервера (разом з http(s):// і опціонально порт)",
+    "Internal Room Id": "Внутрішній ID кімнати",
+    matrixDesc1: "Внутрішній ID кімнати можна знайти в Подробицях у параметрах каналу вашого Matrix клієнта. Він повинен виглядати приблизно як !QMdRCpUIfLwsfjxye6:home.server.",
+    matrixDesc2: "Рекомендується створити нового користувача і не використовувати токен доступу особистого користувача Matrix, тому що це спричиняє повний доступ до облікового запису та до кімнат, в яких ви є. Замість цього створіть нового користувача і запросіть його тільки в ту кімнату, в якій ви хочете отримувати повідомлення.Токен доступу можна отримати, виконавши команду {0}",
+    Method: "Метод",
+    Body: "Тіло",
+    Headers: "Заголовки",
+    PushUrl: "URL пуша",
+    HeadersInvalidFormat: "Заголовки запиту некоректні JSON: ",
+    BodyInvalidFormat: "Тіло запиту некоректне JSON: ",
+    "Monitor History": "Статистика",
+    clearDataOlderThan: "Зберігати статистику за {0} днів.",
+    PasswordsDoNotMatch: "Паролі не співпадають.",
+    records: "записів",
+    "One record": "Один запис",
+    steamApiKeyDescription: "Для моніторингу ігрового сервера Steam вам потрібен Web-API ключ Steam. Зареєструвати його можна тут: ",
+    "Certificate Chain": "Ланцюжок сертифікатів",
+    Valid: "Дійсний",
+    "Hide Tags": "Приховати теги",
+    Title: "Назва інциденту:",
+    Content: "Зміст інциденту:",
+    Post: "Опублікувати",
+    Cancel: "Скасувати",
+    Created: "Створено",
+    Unpin: "Відкріпити",
+    "Show Tags": "Показати теги",
+    recent: "Зараз",
+    "3h": "3 години",
+    "6h": "6 годин",
+    "24h": "24 години",
+    "1w": "1 тиждень",
+    "No monitors available.": "Немає доступних моніторів",
+    "Add one": "Додати новий",
+    Backup: "Резервна копія",
+    Security: "Безпека",
+    "Shrink Database": "Стиснути базу даних",
+    "Current User": "Поточний користувач",
+    About: "Про програму",
+    Description: "Опис",
+    "Powered by": "Працює на основі скрипту від",
+    shrinkDatabaseDescription: "Включає VACUUM для бази даних SQLite. Якщо база даних була створена на версії 1.10.0 і більше, AUTO_VACUUM вже включений і ця дія не потрібна.",
+    Style: "Стиль",
+    info: "ІНФО",
+    warning: "УВАГА",
+    danger: "ПОМИЛКА",
+    primary: "ОСНОВНИЙ",
+    light: "СВІТЛИЙ",
+    dark: "ТЕМНИЙ",
+    "New Status Page": "Нова сторінка статусу",
+    "Show update if available": "Показувати доступні оновлення",
+    "Also check beta release": "Перевіряти оновлення для бета версій",
+    "Add New Status Page": "Додати сторінку статусу",
+    Next: "Далі",
+    "Acz characters: a-z 0-9 -": "Дозволені символи: a-z 0-9 -",
+    "Start or end with a-z 0-9 only": "Початок та закінчення імені лише на символи: a-z 0-9",
+    "No consecutive dashes --": "Заборонено використовувати тире --",
+    "HTTP Options": "HTTP Опції",
+    "Basic Auth": "HTTP Авторизація",
+    PushByTechulus: "Push by Techulus",
+    clicksendsms: "ClickSend SMS",
+    GoogleChat: "Google Chat (тільки Google Workspace)",
+    apiCredentials: "API реквізити",
+    Done: "Готово",
+    Info: "Інфо",
+    "Steam API Key": "Steam API-Ключ",
+    "Pick a RR-Type...": "Виберіть RR-тип...",
+    "Pick Accepted Status Codes...": "Виберіть прийняті коди стану...",
+    Default: "За замовчуванням",
+    "Please input title and content": "Будь ласка, введіть назву та зміст",
+    "Last Updated": "Останнє Оновлення",
+    "Untitled Group": "Група без назви",
+    Services: "Сервіси",
+    serwersms: "SerwerSMS.pl",
+    serwersmsAPIUser: "API Користувач (включаючи префікс webapi_)",
+    serwersmsAPIPassword: "API Пароль",
+    serwersmsPhoneNumber: "Номер телефону",
+    serwersmsSenderName: "SMS ім'я відправника (реєстрований через портал користувача)",
+    stackfield: "Stackfield",
+    smtpDkimSettings: "DKIM Налаштування",
+    smtpDkimDesc: "Повернутися до Nodemailer DKIM {0} для використання.",
+    documentation: "документація",
+    smtpDkimDomain: "Ім'я домена",
+    smtpDkimKeySelector: "Ключ",
+    smtpDkimPrivateKey: "Приватний ключ",
+    smtpDkimHashAlgo: "Алгоритм хеша (опціонально)",
+    smtpDkimheaderFieldNames: "Заголовок ключів для підпису (опціонально)",
+    smtpDkimskipFields: "Заколовок ключів не для підпису (опціонально)",
+    gorush: "Gorush",
+    alerta: "Alerta",
+    alertaApiEndpoint: "Кінцева точка API",
+    alertaEnvironment: "Середовище",
+    alertaApiKey: "Ключ API",
+    alertaAlertState: "Стан алерту",
+    alertaRecoverState: "Стан відновлення",
+    deleteStatusPageMsg: "Дійсно хочете видалити цю сторінку статусів?",
+};

src/languages/zh-CN.js

@@ -88,8 +88,8 @@ export default {
     Dark: "黑暗",
     Auto: "自动",
     "Theme - Heartbeat Bar": "主题 - 心跳栏",
-    Normal: "正常显示",
-    Bottom: "靠下显示",
+    Normal: "正常", // 此处还供 Gorush 的通知优先级功能使用，不应翻译为“正常显示”
+    Bottom: "靠下",
     None: "不显示",
     Timezone: "时区",
     "Search Engine Visibility": "搜索引擎可见性",
@@ -373,4 +373,80 @@ export default {
     "For safety, must use secret key": "出于安全考虑，必须使用加签密钥",
     WeCom: "企业微信群机器人",
     "WeCom Bot Key": "企业微信群机器人 Key",
+    PushByTechulus: "Push by Techulus",
+    gorush: "Gorush",
+    alerta: "Alerta",
+    alertaApiEndpoint: "API 接入点",
+    alertaEnvironment: "环境参数",
+    alertaApiKey: "API Key",
+    alertaAlertState: "报警时的严重性",
+    alertaRecoverState: "恢复后的严重性",
+    deleteStatusPageMsg: "您确认要删除此状态页吗？",
+    Proxies: "代理",
+    default: "默认",
+    enabled: "启用",
+    setAsDefault: "设为默认",
+    deleteProxyMsg: "您确认要在所有监控项中删除此代理吗？",
+    proxyDescription: "代理必须配置到至少一个监控项后才会工作。",
+    enableProxyDescription: "此代理必须启用才能对监控项的网络请求起作用。您可以通过修改激活状态，临时在所有监控项中禁用此代理。",
+    setAsDefaultProxyDescription: "此代理会对新创建的监控项默认激活，您仍可以在监控项配置中单独禁用此代理。",
+    "Proxy Protocol": "代理协议",
+    "Proxy Server": "代理服务器",
+    "Server Address": "服务器地址",
+    "Certificate Chain": "证书链",
+    Valid: "有效",
+    Invalid: "无效",
+    AccessKeyId: "AccessKey ID",
+    SecretAccessKey: "AccessKey Secret",
+    /* 以下为阿里云短信服务 API Dysms#SendSms 的参数 */
+    PhoneNumbers: "PhoneNumbers",
+    TemplateCode: "TemplateCode",
+    SignName: "SignName",
+    /* 以上为阿里云短信服务 API Dysms#SendSms 的参数 */
+    "Bark Endpoint": "Bark 接入点",
+    "Device Token": "Apple Device Token",
+    Platform: "平台",
+    iOS: "iOS",
+    Android: "Android",
+    Huawei: "华为",
+    High: "高",
+    Retry: "重试次数",
+    Topic: "Gorush Topic",
+    "Setup Proxy": "设置代理",
+    "Proxy server has authentication": "代理服务器启用了身份验证功能",
+    User: "用户名",
+    Installed: "已安装",
+    "Not installed": "未安装",
+    Running: "运行中",
+    "Not running": "未运行",
+    "Message:": "信息：",
+    wayToGetCloudflaredURL: "（可从 {0} 下载 cloudflared）",
+    cloudflareWebsite: "Cloudflare 网站",
+    "Don't know how to get the token? Please read the guide:": "不知道如何获取 Token？请阅读指南：",
+    "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.": "如果您正在通过 Cloudflare Tunnel 访问网站，则停止可能会导致当前连接断开。您确定要停止吗？请输入密码以确认。",
+    "Other Software": "其他软件",
+    "For example: nginx, Apache and Traefik.": "例如：nginx、Apache 和 Traefik。",
+    "Please read": "请阅读",
+    "Remove Token": "移除 Token",
+    Start: "启动",
+    Stop: "停止",
+    "Uptime Kuma": "Uptime Kuma",
+    "Add New Status Page": "添加新的状态页",
+    Slug: "路径",
+    "Accept characters:": "可接受的字符：",
+    "startOrEndWithOnly": "开头和结尾必须为 {0}",
+    "No consecutive dashes": "不能有连续的破折号",
+    Next: "下一步",
+    "The slug is already taken. Please choose another slug.": "该路径已被使用。请选择其他路径。",
+    "No Proxy": "无代理",
+    "HTTP Basic Auth": "HTTP 基础身份验证",
+    "New Status Page": "新的状态页",
+    "Page Not Found": "状态页未找到",
+    "Reverse Proxy": "反向代理",
+    "Subject:": "颁发给：",
+    "Valid To:": "有效期至：",
+    "Days Remaining:": "剩余有效天数：",
+    "Issuer:": "颁发者：",
+    "Fingerprint:": "指纹：",
+    "No status pages": "无状态页",
 };

src/languages/zh-HK.js

@@ -200,4 +200,182 @@ export default {
     line: "Line Messenger",
     mattermost: "Mattermost",
     deleteStatusPageMsg: "是否確定刪除這個 Status Page？",
+    "Push URL": "推送網址",
+    needPushEvery: "您應每 {0} 秒呼叫此網址。",
+    pushOptionalParams: "選填參數：{0}",
+    defaultNotificationName: "我的 {notification} 通知 ({number})",
+    here: "此處",
+    Required: "必填",
+    "Bot Token": "機器人權杖",
+    wayToGetTelegramToken: "您可以從 {0} 取得 Token。",
+    "Chat ID": "聊天 ID",
+    supportTelegramChatID: "支援 對話/群組/頻道的聊天 ID",
+    wayToGetTelegramChatID: "傳送訊息給機器人，並前往以下網址以取得您的 chat ID：",
+    "YOUR BOT TOKEN HERE": "在此填入您的機器人權杖",
+    chatIDNotFound: "找不到 Chat ID；請先傳送訊息給機器人",
+    "Post URL": "Post 網址",
+    "Content Type": "Content Type",
+    webhookJsonDesc: "{0} 適合任何現代的 HTTP 伺服器，如 Express.js",
+    webhookFormDataDesc: "{multipart} 適合 PHP。 JSON 必須先經由 {decodeFunction} 剖析。",
+    secureOptionNone: "無 / STARTTLS (25, 587)",
+    secureOptionTLS: "TLS (465)",
+    "Ignore TLS Error": "忽略 TLS 錯誤",
+    "From Email": "寄件人",
+    emailCustomSubject: "自訂主旨",
+    "To Email": "收件人",
+    smtpCC: "CC",
+    smtpBCC: "BCC",
+    "Discord Webhook URL": "Discord Webhook 網址",
+    wayToGetDiscordURL: "您可以前往伺服器設定 -> 整合 -> Webhook -> 新 Webhook 以取得",
+    "Bot Display Name": "機器人顯示名稱",
+    "Prefix Custom Message": "前綴自訂訊息",
+    "Webhook URL": "Webhook 網址",
+    wayToGetTeamsURL: "您可以前往此頁面以了解如何建立 Webhook 網址 {0}。",
+    Number: "號碼",
+    Recipients: "收件人",
+    needSignalAPI: "您需要有 REST API 的 Signal 客戶端。",
+    wayToCheckSignalURL: "您可以前往下列網址以了解如何設定：",
+    signalImportant: "注意: 不得混合收件人的群組和號碼！",
+    "Application Token": "應用程式權杖",
+    "Server URL": "伺服器網址",
+    Priority: "優先度",
+    "Icon Emoji": "Emoji 圖示",
+    "Channel Name": "頻道名稱",
+    "Uptime Kuma URL": "Uptime Kuma 網址",
+    aboutWebhooks: "更多關於 Webhook 的資訊: {0}",
+    aboutChannelName: "如果您不想使用 Webhook 頻道，請在 {0} 頻道名稱欄位填入您想使用的頻道。例如: #其他頻道",
+    aboutKumaURL: "如果您未填入 Uptime Kuma 網址。將預設使用專案 Github 頁面。",
+    emojiCheatSheet: "Emoji 一覽表: {0}",
+    PushByTechulus: "Push by Techulus",
+    clicksendsms: "ClickSend SMS",
+    GoogleChat: "Google Chat (僅限 Google Workspace)",
+    "User Key": "使用者金鑰",
+    Device: "裝置",
+    "Message Title": "訊息標題",
+    "Notification Sound": "通知音效",
+    "More info on:": "更多資訊: {0}",
+    pushoverDesc1: "緊急優先度 (2) 的重試間隔為 30 秒並且會在 1 小時後過期。",
+    pushoverDesc2: "如果您想要傳送通知到不同裝置，請填寫裝置欄位。",
+    "SMS Type": "簡訊類型",
+    octopushTypePremium: "Premium (快速 - 建議用於警報)",
+    octopushTypeLowCost: "Low Cost (緩慢 - 有時會被營運商阻擋)",
+    checkPrice: "查看 {0} 價格：",
+    apiCredentials: "API 認證",
+    octopushLegacyHint: "您使用的是舊版的 Octopush (2011-2020) 還是新版？",
+    "Check octopush prices": "查看 octopush 價格 {0}。",
+    octopushPhoneNumber: "電話號碼 (intl 格式，例如：+33612345678) ",
+    octopushSMSSender: "簡訊寄件人名稱：3-11位英數字元及空白 (a-zA-Z0-9)",
+    "LunaSea Device ID": "LunaSea 裝置 ID",
+    "Apprise URL": "Apprise 網址",
+    "Example:": "範例：{0}",
+    "Read more:": "深入瞭解：{0}",
+    "Status:": "狀態：{0}",
+    "Read more": "深入瞭解",
+    appriseInstalled: "已安裝 Apprise。",
+    appriseNotInstalled: "尚未安裝 Apprise。{0}",
+    "Access Token": "存取權杖",
+    "Channel access token": "頻道存取權杖",
+    "Line Developers Console": "Line 開發者控制台",
+    lineDevConsoleTo: "Line 開發者控制台 - {0}",
+    "Basic Settings": "基本設定",
+    "User ID": "使用者 ID",
+    "Messaging API": "Messaging API",
+    wayToGetLineChannelToken: "首先，前往 {0}，建立 provider 和 channel (Messaging API)。接著您就可以從上面提到的選單項目中取得頻道存取權杖及使用者 ID。",
+    "Icon URL": "圖示網址",
+    aboutIconURL: "您可以在 \"圖示網址\" 中提供圖片網址以覆蓋預設個人檔案圖片。若已設定 Emoji 圖示，將忽略此設定。",
+    aboutMattermostChannelName: "您可以在 \"頻道名稱\" 欄位中填寫頻道名稱以覆蓋 Webhook 的預設頻道。必須在 Mattermost 的 Webhook 設定中啟用。例如：#其他頻道",
+    matrix: "Matrix",
+    promosmsTypeEco: "SMS ECO - 便宜，但是很慢且經常過載。僅限位於波蘭的收件人。",
+    promosmsTypeFlash: "SMS FLASH - 訊息會自動在收件人的裝置上顯示。僅限位於波蘭的收件人。",
+    promosmsTypeFull: "SMS FULL - 高級版，您可以使用您的寄件人名稱 (必須先註冊名稱。對於警報來說十分可靠。",
+    promosmsTypeSpeed: "SMS SPEED - 系統中的最高優先度。快速、可靠，但昂貴 (約 SMS FULL 的兩倍價格)。",
+    promosmsPhoneNumber: "電話號碼 (若收件人位於波蘭則無需輸入區域代碼)",
+    promosmsSMSSender: "簡訊寄件人名稱：預先註冊的名稱或以下的預設名稱：InfoSMS、SMS Info、MaxSMS、INFO、SMS",
+    "Feishu WebHookUrl": "飛書 WebHook 網址",
+    matrixHomeserverURL: "Homeserver 網址 (開頭為 http(s)://，結尾可能帶連接埠)",
+    "Internal Room Id": "Internal Room ID",
+    matrixDesc1: "您可以在 Matrix 客戶端的房間設定中的進階選項找到 internal room ID。應該看起來像 !QMdRCpUIfLwsfjxye6:home.server。",
+    matrixDesc2: "使用您自己的 Matrix 使用者存取權杖將賦予存取您的帳號和您加入的房間的完整權限。建議建立新使用者，並邀請至您想要接收通知的房間中。您可以執行 {0} 以取得存取權杖",
+    Method: "方法",
+    Body: "主體",
+    Headers: "標頭",
+    PushUrl: "Push URL",
+    HeadersInvalidFormat: "要求標頭不是有效的 JSON：",
+    BodyInvalidFormat: "請求主體不是有效的 JSON：",
+    "Monitor History": "監測器歷史紀錄",
+    clearDataOlderThan: "保留 {0} 天內的監測器歷史紀錄。",
+    PasswordsDoNotMatch: "密碼不相符。",
+    records: "記錄",
+    "One record": "一項記錄",
+    "Showing {from} to {to} of {count} records": "正在顯示 {count} 項記錄中的 {from} 至 {to} 項",
+    steamApiKeyDescription: "若要監測 Steam 遊戲伺服器，您將需要 Steam Web-API 金鑰。您可以在此註冊您的 API 金鑰：",
+    "Current User": "目前使用者",
+    recent: "最近",
+    Done: "完成",
+    Info: "資訊",
+    Security: "安全性",
+    "Steam API Key": "Steam API 金鑰",
+    "Shrink Database": "壓縮資料庫",
+    "Pick a RR-Type...": "選擇資源記錄類型...",
+    "Pick Accepted Status Codes...": "選擇可接受的狀態碼...",
+    Default: "預設",
+    "HTTP Options": "HTTP 選項",
+    "Create Incident": "建立事件",
+    Title: "標題",
+    Content: "內容",
+    Style: "樣式",
+    info: "資訊",
+    warning: "警告",
+    danger: "危險",
+    primary: "主要",
+    light: "淺色",
+    dark: "暗色",
+    Post: "發佈",
+    "Please input title and content": "請輸入標題及內容",
+    Created: "建立",
+    "Last Updated": "最後更新",
+    Unpin: "取消釘選",
+    "Switch to Light Theme": "切換至淺色佈景主題",
+    "Switch to Dark Theme": "切換至深色佈景主題",
+    "Show Tags": "顯示標籤",
+    "Hide Tags": "隱藏標籤",
+    Description: "描述",
+    "No monitors available.": "沒有可用的監測器。",
+    "Add one": "新增一個",
+    "No Monitors": "無監測器",
+    "Untitled Group": "未命名群組",
+    Services: "服務",
+    Discard: "捨棄",
+    Cancel: "取消",
+    shrinkDatabaseDescription: "觸發 SQLite 的資料庫清理 (VACUUM)。如果您的資料庫是在 1.10.0 版本後建立，AUTO_VACUUM 已自動啟用，則無需此操作。",
+    serwersms: "SerwerSMS.pl",
+    serwersmsAPIUser: "API 使用者名稱 (包括 webapi_ 前綴)",
+    serwersmsAPIPassword: "API 密碼",
+    serwersmsPhoneNumber: "電話號碼",
+    serwersmsSenderName: "SMS 寄件人名稱 (由客戶入口網站註冊)",
+    stackfield: "Stackfield",
+    smtpDkimSettings: "DKIM 設定",
+    smtpDkimDesc: "請參考 Nodemailer DKIM {0} 使用方式。",
+    documentation: "文件",
+    smtpDkimDomain: "網域名稱",
+    smtpDkimKeySelector: "DKIM 選取器",
+    smtpDkimPrivateKey: "私密金鑰",
+    smtpDkimHashAlgo: "雜湊演算法 (選填)",
+    smtpDkimheaderFieldNames: "要簽署的郵件標頭 (選填)",
+    smtpDkimskipFields: "不簽署的郵件標頭 (選填)",
+    gorush: "Gorush",
+    alerta: "Alerta",
+    alertaApiEndpoint: "API Endpoint",
+    alertaEnvironment: "環境",
+    alertaApiKey: "API 金鑰",
+    alertaAlertState: "警示狀態",
+    alertaRecoverState: "恢復狀態",
+    Proxies: "代理伺服器",
+    default: "預設",
+    enabled: "啟用",
+    setAsDefault: "設為預設",
+    deleteProxyMsg: "您確定要為所有監測器刪除此代理伺服器嗎？",
+    proxyDescription: "必須將代理伺服器指派給監測器才能運作。",
+    enableProxyDescription: "此代理伺服器在啟用前不會在監測器上生效，您可以藉由控制啟用狀態來暫時對所有的監測器停用代理伺服器。",
+    setAsDefaultProxyDescription: "預設情況下，新監測器將啟用此代理伺服器。您仍可分別停用各監測器的代理伺服器。",
 };

src/languages/zh-TW.js

@@ -239,11 +239,13 @@ export default {
     "rocket.chat": "Rocket.Chat",
     pushover: "Pushover",
     pushy: "Pushy",
+    PushByTechulus: "Push by Techulus",
     octopush: "Octopush",
     promosms: "PromoSMS",
     clicksendsms: "ClickSend SMS",
     lunasea: "LunaSea",
     apprise: "Apprise (支援 50 種以上的通知服務)",
+    GoogleChat: "Google Chat (僅限 Google Workspace)",
     pushbullet: "Pushbullet",
     line: "Line Messenger",
     mattermost: "Mattermost",
@@ -352,5 +354,30 @@ export default {
     serwersmsAPIPassword: "API 密碼",
     serwersmsPhoneNumber: "電話號碼",
     serwersmsSenderName: "SMS 寄件人名稱 (由客戶入口網站註冊)",
-    "stackfield": "Stackfield",
+    stackfield: "Stackfield",
+    smtpDkimSettings: "DKIM 設定",
+    smtpDkimDesc: "請參考 Nodemailer DKIM {0} 使用方式。",
+    documentation: "文件",
+    smtpDkimDomain: "網域名稱",
+    smtpDkimKeySelector: "DKIM 選取器",
+    smtpDkimPrivateKey: "私密金鑰",
+    smtpDkimHashAlgo: "雜湊演算法 (選填)",
+    smtpDkimheaderFieldNames: "要簽署的郵件標頭 (選填)",
+    smtpDkimskipFields: "不簽署的郵件標頭 (選填)",
+    gorush: "Gorush",
+    alerta: "Alerta",
+    alertaApiEndpoint: "API Endpoint",
+    alertaEnvironment: "環境",
+    alertaApiKey: "API 金鑰",
+    alertaAlertState: "警示狀態",
+    alertaRecoverState: "恢復狀態",
+    deleteStatusPageMsg: "您確定要刪除此狀態頁嗎？",
+    Proxies: "代理伺服器",
+    default: "預設",
+    enabled: "啟用",
+    setAsDefault: "設為預設",
+    deleteProxyMsg: "您確定要為所有監測器刪除此代理伺服器嗎？",
+    proxyDescription: "必須將代理伺服器指派給監測器才能運作。",
+    enableProxyDescription: "此代理伺服器在啟用前不會在監測器上生效，您可以藉由控制啟用狀態來暫時對所有的監測器停用代理伺服器。",
+    setAsDefaultProxyDescription: "預設情況下，新監測器將啟用此代理伺服器。您仍可分別停用各監測器的代理伺服器。",
 };

src/layouts/Layout.vue

@@ -48,7 +48,7 @@
         </header>
 
         <main>
-            <router-view v-if="$root.loggedIn" />
+            <router-view v-if="$root.loggedIn || forceShowContent" />
             <Login v-if="! $root.loggedIn && $root.allowLoginDialog" />
         </main>
 
@@ -189,6 +189,7 @@ main {
     color: white;
     position: fixed;
     width: 100%;
+    z-index: 99999;
 }
 
 .dark {

src/mixins/socket.js

@@ -40,8 +40,17 @@ export default {
             notificationList: [],
             statusPageListLoaded: false,
             statusPageList: [],
+            proxyList: [],
             connectionErrorMsg: "Cannot connect to the socket server. Reconnecting...",
             showReverseProxyGuide: true,
+            cloudflared: {
+                cloudflareTunnelToken: "",
+                installed: null,
+                running: false,
+                message: "",
+                errorMessage: "",
+                currentPassword: "",
+            }
         };
     },
 
@@ -120,6 +129,16 @@ export default {
                 this.statusPageList = data;
             });
 
+            socket.on("proxyList", (data) => {
+                this.proxyList = data.map(item => {
+                    item.auth = !!item.auth;
+                    item.active = !!item.active;
+                    item.default = !!item.default;
+
+                    return item;
+                });
+            });
+
             socket.on("heartbeat", (data) => {
                 if (! (data.monitorID in this.heartbeatList)) {
                     this.heartbeatList[data.monitorID] = [];
@@ -231,6 +250,12 @@ export default {
                 this.socket.firstConnect = false;
             });
 
+            // cloudflared
+            socket.on("cloudflared_installed", (res) => this.cloudflared.installed = res);
+            socket.on("cloudflared_running", (res) => this.cloudflared.running = res);
+            socket.on("cloudflared_message", (res) => this.cloudflared.message = res);
+            socket.on("cloudflared_errorMessage", (res) => this.cloudflared.errorMessage = res);
+            socket.on("cloudflared_token", (res) => this.cloudflared.cloudflareTunnelToken = res);
         },
 
         storage() {

src/mixins/theme.js

@@ -6,6 +6,7 @@ export default {
             userTheme: localStorage.theme,
             userHeartbeatBar: localStorage.heartbeatBarTheme,
             statusPageTheme: "light",
+            forceStatusPageTheme: false,
             path: "",
         };
     },
@@ -27,6 +28,10 @@ export default {
 
     computed: {
         theme() {
+            // As entry can be status page now, set forceStatusPageTheme to true to use status page theme
+            if (this.forceStatusPageTheme) {
+                return this.statusPageTheme;
+            }
 
             // Entry no need dark
             if (this.path === "") {

src/pages/AddStatusPage.vue

@@ -21,7 +21,9 @@
                         <div class="form-text">
                             <ul>
                                 <li>{{ $t("Accept characters:") }} <mark>a-z</mark> <mark>0-9</mark> <mark>-</mark></li>
-                                <li>{{ $t("Start or end with") }} <mark>a-z</mark> <mark>0-9</mark> only</li>
+                                <i18n-t tag="li" keypath="startOrEndWithOnly">
+                                    <mark>a-z</mark> <mark>0-9</mark>
+                                </i18n-t>
                                 <li>{{ $t("No consecutive dashes") }} <mark>--</mark></li>
                             </ul>
                         </div>

src/pages/EditMonitor.vue

@@ -139,6 +139,15 @@
 
                             <h2 v-if="monitor.type !== 'push'" class="mt-5 mb-2">{{ $t("Advanced") }}</h2>
 
+                            <div class="my-3 form-check">
+                                <input id="expiry-notification" v-model="monitor.expiryNotification" class="form-check-input" type="checkbox">
+                                <label class="form-check-label" for="expiry-notification">
+                                    {{ $t("Domain Name Expiry Notification") }}
+                                </label>
+                                <div class="form-text">
+                                </div>
+                            </div>
+
                             <div v-if="monitor.type === 'http' || monitor.type === 'keyword' " class="my-3 form-check">
                                 <input id="ignore-tls" v-model="monitor.ignoreTls" class="form-check-input" type="checkbox" value="">
                                 <label class="form-check-label" for="ignore-tls">
@@ -222,6 +231,34 @@
                                 {{ $t("Setup Notification") }}
                             </button>
 
+                            <!-- Proxies -->
+                            <div v-if="monitor.type === 'http' || monitor.type === 'keyword'">
+                                <h2 class="mt-5 mb-2">{{ $t("Proxy") }}</h2>
+                                <p v-if="$root.proxyList.length === 0">
+                                    {{ $t("Not available, please setup.") }}
+                                </p>
+
+                                <div v-if="$root.proxyList.length > 0" class="form-check my-3">
+                                    <input id="proxy-disable" v-model="monitor.proxyId" :value="null" name="proxy" class="form-check-input" type="radio">
+                                    <label class="form-check-label" for="proxy-disable">{{ $t("No Proxy") }}</label>
+                                </div>
+
+                                <div v-for="proxy in $root.proxyList" :key="proxy.id" class="form-check my-3">
+                                    <input :id="`proxy-${proxy.id}`" v-model="monitor.proxyId" :value="proxy.id" name="proxy" class="form-check-input" type="radio">
+
+                                    <label class="form-check-label" :for="`proxy-${proxy.id}`">
+                                        {{ proxy.host }}:{{ proxy.port }} ({{ proxy.protocol }})
+                                        <a href="#" @click="$refs.proxyDialog.show(proxy.id)">{{ $t("Edit") }}</a>
+                                    </label>
+
+                                    <span v-if="proxy.default === true" class="badge bg-primary ms-2">{{ $t("default") }}</span>
+                                </div>
+
+                                <button class="btn btn-primary me-2" type="button" @click="$refs.proxyDialog.show()">
+                                    {{ $t("Setup Proxy") }}
+                                </button>
+                            </div>
+
                             <!-- HTTP Options -->
                             <template v-if="monitor.type === 'http' || monitor.type === 'keyword' ">
                                 <h2 class="mt-5 mb-2">{{ $t("HTTP Options") }}</h2>
@@ -285,12 +322,14 @@
             </form>
 
             <NotificationDialog ref="notificationDialog" @added="addedNotification" />
+            <ProxyDialog ref="proxyDialog" @added="addedProxy" />
         </div>
     </transition>
 </template>
 
 <script>
 import NotificationDialog from "../components/NotificationDialog.vue";
+import ProxyDialog from "../components/ProxyDialog.vue";
 import TagsManager from "../components/TagsManager.vue";
 import CopyableInput from "../components/CopyableInput.vue";
 
@@ -302,6 +341,7 @@ const toast = useToast();
 
 export default {
     components: {
+        ProxyDialog,
         CopyableInput,
         NotificationDialog,
         TagsManager,
@@ -368,6 +408,17 @@ export default {
 
     },
     watch: {
+        "$root.proxyList"() {
+            if (this.isAdd) {
+                if (this.$root.proxyList && !this.monitor.proxyId) {
+                    const proxy = this.$root.proxyList.find(proxy => proxy.default);
+
+                    if (proxy) {
+                        this.monitor.proxyId = proxy.id;
+                    }
+                }
+            }
+        },
 
         "$route.fullPath"() {
             this.init();
@@ -435,12 +486,22 @@ export default {
                     notificationIDList: {},
                     ignoreTls: false,
                     upsideDown: false,
+                    expiryNotification: false,
                     maxredirects: 10,
                     accepted_statuscodes: ["200-299"],
                     dns_resolve_type: "A",
                     dns_resolve_server: "1.1.1.1",
+                    proxyId: null,
                 };
 
+                if (this.$root.proxyList && !this.monitor.proxyId) {
+                    const proxy = this.$root.proxyList.find(proxy => proxy.default);
+
+                    if (proxy) {
+                        this.monitor.proxyId = proxy.id;
+                    }
+                }
+
                 for (let i = 0; i < this.$root.notificationList.length; i++) {
                     if (this.$root.notificationList[i].isDefault == true) {
                         this.monitor.notificationIDList[this.$root.notificationList[i].id] = true;
@@ -532,6 +593,12 @@ export default {
         addedNotification(id) {
             this.monitor.notificationIDList[id] = true;
         },
+
+        // Added a Proxy Event
+        // Enable it if the proxy is added in EditMonitor.vue
+        addedProxy(id) {
+            this.monitor.proxyId = id;
+        },
     },
 };
 </script>

src/pages/Entry.vue

@@ -1,19 +1,45 @@
 <template>
-    <div></div>
+    <div>
+        <StatusPage v-if="statusPageSlug" :override-slug="statusPageSlug" />
+    </div>
 </template>
 
 <script>
 import axios from "axios";
+import StatusPage from "./StatusPage.vue";
 
 export default {
+    components: {
+        StatusPage,
+    },
+    data() {
+        return {
+            statusPageSlug: null,
+        };
+    },
     async mounted() {
-        let entryPage = (await axios.get("/api/entry-page")).data;
 
-        if (entryPage === "statusPage") {
-            this.$router.push("/status");
+        // There are only 2 cases that could come in here.
+        // 1. Matched status Page domain name
+        // 2. Vue Frontend Dev
+        let res = (await axios.get("/api/entry-page")).data;
+
+        if (res.type === "statusPageMatchedDomain") {
+            this.statusPageSlug = res.statusPageSlug;
+            this.$root.forceStatusPageTheme = true;
+
+        } else if (res.type === "entryPage") {          // Dev only. For production, the logic is in the server side
+            const entryPage = res.entryPage;
+
+            if (entryPage === "statusPage") {
+                this.$router.push("/status");
+            } else {
+                this.$router.push("/dashboard");
+            }
         } else {
             this.$router.push("/dashboard");
         }
+
     },
 
 };

src/pages/ManageStatusPage.vue

@@ -12,7 +12,7 @@
             <div class="shadow-box">
                 <template v-if="$root.statusPageListLoaded">
                     <span v-if="Object.keys($root.statusPageList).length === 0" class="d-flex align-items-center justify-content-center my-3">
-                        No status pages
+                        {{ $t("No status pages") }}
                     </span>
 
                     <!-- use <a> instead of <router-link>, because the heartbeat won't load. -->

src/pages/NotFound.vue

@@ -0,0 +1,99 @@
+<template>
+    <div>
+        <!-- Desktop header -->
+        <header v-if="! $root.isMobile" class="d-flex flex-wrap justify-content-center py-3 mb-3 border-bottom">
+            <router-link to="/" class="d-flex align-items-center mb-3 mb-md-0 me-md-auto text-dark text-decoration-none">
+                <object class="bi me-2 ms-4" width="40" height="40" data="/icon.svg" />
+                <span class="fs-4 title">Uptime Kuma</span>
+            </router-link>
+        </header>
+
+        <!-- Mobile header -->
+        <header v-else class="d-flex flex-wrap justify-content-center pt-2 pb-2 mb-3">
+            <router-link to="/dashboard" class="d-flex align-items-center text-dark text-decoration-none">
+                <object class="bi" width="40" height="40" data="/icon.svg" />
+                <span class="fs-4 title ms-2">Uptime Kuma</span>
+            </router-link>
+        </header>
+
+        <div class="content">
+            <div>
+                <strong>🐻 {{ $t("Page Not Found") }}</strong>
+            </div>
+
+            <div class="guide">
+                Most likely causes:
+                <ul>
+                    <li>The resource is no longer available.</li>
+                    <li>There might be a typing error in the address.</li>
+                </ul>
+
+                What you can try:<br />
+                <ul>
+                    <li>Retype the address.</li>
+                    <li><a href="#" class="go-back" @click="goBack()">Go back to the previous page.</a></li>
+                </ul>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+    async mounted() {
+
+    },
+    methods: {
+        goBack() {
+            history.back();
+        }
+    }
+};
+</script>
+
+<style scoped lang="scss">
+@import "../assets/vars.scss";
+
+.go-back {
+    text-decoration: none;
+    color: $primary !important;
+}
+
+.content {
+    display: flex;
+    justify-content: center;
+    align-content: center;
+    align-items: center;
+    flex-direction: column;
+    gap: 50px;
+    padding-top: 30px;
+
+    strong {
+        font-size: 24px;
+    }
+}
+
+.guide {
+    max-width: 800px;
+    font-size: 14px;
+}
+
+.title {
+    font-weight: bold;
+}
+
+.dark {
+    header {
+        background-color: $dark-header-bg;
+        border-bottom-color: $dark-header-bg !important;
+
+        span {
+            color: #f0f6fc;
+        }
+    }
+
+    .bottom-nav {
+        background-color: $dark-bg;
+    }
+}
+</style>

src/pages/Settings.vue

@@ -75,12 +75,18 @@ export default {
                 notifications: {
                     title: this.$t("Notifications"),
                 },
+                "reverse-proxy": {
+                    title: this.$t("Reverse Proxy"),
+                },
                 "monitor-history": {
                     title: this.$t("Monitor History"),
                 },
                 security: {
                     title: this.$t("Security"),
                 },
+                proxies: {
+                    title: this.$t("Proxies"),
+                },
                 backup: {
                     title: this.$t("Backup"),
                 },
@@ -115,6 +121,10 @@ export default {
             this.$root.getSocket().emit("getSettings", (res) => {
                 this.settings = res.data;
 
+                if (this.settings.checkUpdate === undefined) {
+                    this.settings.checkUpdate = true;
+                }
+
                 if (this.settings.searchEngineIndex === undefined) {
                     this.settings.searchEngineIndex = false;
                 }
@@ -131,10 +141,18 @@ export default {
             });
         },
 
-        saveSettings() {
-            this.$root.getSocket().emit("setSettings", this.settings, (res) => {
+        /**
+         * Save Settings
+         * @param currentPassword (Optional) Only need for disableAuth to true
+         */
+        saveSettings(callback, currentPassword) {
+            this.$root.getSocket().emit("setSettings", this.settings, currentPassword, (res) => {
                 this.$root.toastRes(res);
                 this.loadSettings();
+
+                if (callback) {
+                    callback();
+                }
             });
         },
     }

src/pages/StatusPage.vue

@@ -2,49 +2,61 @@
     <div v-if="loadedTheme" class="container mt-3">
         <!-- Sidebar for edit mode -->
         <div v-if="enableEditMode" class="sidebar">
-            <div class="my-3">
-                <label for="slug" class="form-label">{{ $t("Slug") }}</label>
-                <div class="input-group">
-                    <span id="basic-addon3" class="input-group-text">/status/</span>
-                    <input id="slug" v-model="config.slug" type="text" class="form-control">
+            <div class="sidebar-body">
+                <div class="my-3">
+                    <label for="slug" class="form-label">{{ $t("Slug") }}</label>
+                    <div class="input-group">
+                        <span id="basic-addon3" class="input-group-text">/status/</span>
+                        <input id="slug" v-model="config.slug" type="text" class="form-control">
+                    </div>
                 </div>
-            </div>
 
-            <div class="my-3">
-                <label for="title" class="form-label">{{ $t("Title") }}</label>
-                <input id="title" v-model="config.title" type="text" class="form-control">
-            </div>
+                <div class="my-3">
+                    <label for="title" class="form-label">{{ $t("Title") }}</label>
+                    <input id="title" v-model="config.title" type="text" class="form-control">
+                </div>
 
-            <div class="my-3">
-                <label for="description" class="form-label">{{ $t("Description") }}</label>
-                <textarea id="description" v-model="config.description" class="form-control"></textarea>
-            </div>
+                <div class="my-3">
+                    <label for="description" class="form-label">{{ $t("Description") }}</label>
+                    <textarea id="description" v-model="config.description" class="form-control"></textarea>
+                </div>
 
-            <div class="my-3 form-check form-switch">
-                <input id="switch-theme" v-model="config.theme" class="form-check-input" type="checkbox" true-value="dark" false-value="light">
-                <label class="form-check-label" for="switch-theme">{{ $t("Switch to Dark Theme") }}</label>
-            </div>
+                <div class="my-3 form-check form-switch">
+                    <input id="switch-theme" v-model="config.theme" class="form-check-input" type="checkbox" true-value="dark" false-value="light">
+                    <label class="form-check-label" for="switch-theme">{{ $t("Switch to Dark Theme") }}</label>
+                </div>
 
-            <div class="my-3 form-check form-switch">
-                <input id="showTags" v-model="config.showTags" class="form-check-input" type="checkbox">
-                <label class="form-check-label" for="showTags">{{ $t("Show Tags") }}</label>
-            </div>
+                <div class="my-3 form-check form-switch">
+                    <input id="showTags" v-model="config.showTags" class="form-check-input" type="checkbox">
+                    <label class="form-check-label" for="showTags">{{ $t("Show Tags") }}</label>
+                </div>
 
-            <div v-if="false" class="my-3">
-                <label for="password" class="form-label">{{ $t("Password") }} <sup>Coming Soon</sup></label>
-                <input id="password" v-model="config.password" disabled type="password" autocomplete="new-password" class="form-control">
-            </div>
+                <div v-if="false" class="my-3">
+                    <label for="password" class="form-label">{{ $t("Password") }} <sup>Coming Soon</sup></label>
+                    <input id="password" v-model="config.password" disabled type="password" autocomplete="new-password" class="form-control">
+                </div>
 
-            <div v-if="false" class="my-3">
-                <label for="cname" class="form-label">Domain Names <sup>Coming Soon</sup></label>
-                <textarea id="cname" v-model="config.domanNames" rows="3" disabled class="form-control" :placeholder="domainNamesPlaceholder"></textarea>
-            </div>
+                <!-- Domain Name List -->
+                <div class="my-3">
+                    <label class="form-label">
+                        Domain Names
+                        <font-awesome-icon icon="plus-circle" class="btn-add-domain action text-primary" @click="addDomainField" />
+                    </label>
 
-            <div class="danger-zone">
-                <button class="btn btn-danger me-2" @click="deleteDialog">
-                    <font-awesome-icon icon="trash" />
-                    {{ $t("Delete") }}
-                </button>
+                    <ul class="list-group domain-name-list">
+                        <li v-for="(domain, index) in config.domainNameList" :key="index" class="list-group-item">
+                            <input v-model="config.domainNameList[index]" type="text" class="no-bg domain-input" placeholder="example.com" />
+                            <font-awesome-icon icon="times" class="action remove ms-2 me-3 text-danger" @click="removeDomain(index)" />
+                        </li>
+                    </ul>
+                </div>
+
+                <div class="danger-zone">
+                    <button class="btn btn-danger me-2" @click="deleteDialog">
+                        <font-awesome-icon icon="trash" />
+                        {{ $t("Delete") }}
+                    </button>
+                </div>
             </div>
 
             <!-- Sidebar Footer -->
@@ -55,7 +67,7 @@
                 </button>
 
                 <button class="btn btn-danger me-2" @click="discard">
-                    <font-awesome-icon icon="save" />
+                    <font-awesome-icon icon="undo" />
                     {{ $t("Discard") }}
                 </button>
             </div>
@@ -67,7 +79,7 @@
             <h1 class="mb-4 title-flex">
                 <!-- Logo -->
                 <span class="logo-wrapper" @click="showImageCropUploadMethod">
-                    <img :src="logoURL" alt class="logo me-2" :class="logoClass" />
+                    <img :src="logoURL" alt class="logo me-2" :class="logoClass" @load="statusPageLogoLoaded" />
                     <font-awesome-icon v-if="enableEditMode" class="icon-upload" icon="upload" />
                 </span>
 
@@ -120,7 +132,7 @@
 
                 <!-- Incident Date -->
                 <div class="date mt-3">
-                    {{ $t("Created") }}: {{ $root.datetime(incident.createdDate) }} ({{ dateFromNow(incident.createdDate) }})<br />
+                    {{ $t("Date Created") }}: {{ $root.datetime(incident.createdDate) }} ({{ dateFromNow(incident.createdDate) }})<br />
                     <span v-if="incident.lastUpdatedDate">
                         {{ $t("Last Updated") }}: {{ $root.datetime(incident.lastUpdatedDate) }} ({{ dateFromNow(incident.lastUpdatedDate) }})
                     </span>
@@ -259,6 +271,7 @@ const favicon = new Favico({
 });
 
 export default {
+
     components: {
         PublicGroupList,
         ImageCropUpload,
@@ -278,6 +291,14 @@ export default {
         next();
     },
 
+    props: {
+        overrideSlug: {
+            type: String,
+            required: false,
+            default: null,
+        },
+    },
+
     data() {
         return {
             slug: null,
@@ -294,7 +315,6 @@ export default {
             loadedData: false,
             baseURL: "",
             clickedEditButton: false,
-            domainNamesPlaceholder: "domain1.com\ndomain2.com\n..."
         };
     },
     computed: {
@@ -389,6 +409,22 @@ export default {
     },
     watch: {
 
+        /**
+         * If connected to the socket and logged in, request private data of this statusPage
+         * @param connected
+         */
+        "$root.loggedIn"(loggedIn) {
+            if (loggedIn) {
+                this.$root.getSocket().emit("getStatusPage", this.slug, (res) => {
+                    if (res.ok) {
+                        this.config = res.config;
+                    } else {
+                        toast.error(res.msg);
+                    }
+                });
+            }
+        },
+
         /**
          * Selected a monitor and add to the list.
          */
@@ -449,7 +485,7 @@ export default {
         this.baseURL = getResBaseURL();
     },
     async mounted() {
-        this.slug = this.$route.params.slug;
+        this.slug = this.overrideSlug || this.$route.params.slug;
 
         if (!this.slug) {
             this.slug = "default";
@@ -458,6 +494,10 @@ export default {
         axios.get("/api/status-page/" + this.slug).then((res) => {
             this.config = res.data.config;
 
+            if (!this.config.domainNameList) {
+                this.config.domainNameList = [];
+            }
+
             if (this.config.icon) {
                 this.imgDataUrl = this.config.icon;
             }
@@ -575,6 +615,10 @@ export default {
             });
         },
 
+        addDomainField() {
+            this.config.domainNameList.push("");
+        },
+
         discard() {
             location.href = "/status/" + this.slug;
         },
@@ -592,6 +636,11 @@ export default {
             }
         },
 
+        statusPageLogoLoaded(eventPayload) {
+            // Remark: may not work in dev, due to cros
+            favicon.image(eventPayload.target);
+        },
+
         createIncident() {
             this.enableEditIncidentMode = true;
 
@@ -652,6 +701,10 @@ export default {
             return dayjs.utc(date).fromNow();
         },
 
+        removeDomain(index) {
+            this.config.domainNameList.splice(index, 1);
+        },
+
     }
 };
 </script>
@@ -700,9 +753,7 @@ h1 {
     top: 0;
     width: 300px;
     height: 100vh;
-    padding: 15px 15px 68px 15px;
-    overflow-x: hidden;
-    overflow-y: auto;
+
     border-right: 1px solid #ededed;
 
     .danger-zone {
@@ -710,13 +761,25 @@ h1 {
         padding-top: 15px;
     }
 
+    .sidebar-body {
+        padding: 0 10px 10px 10px;
+        overflow-x: hidden;
+        overflow-y: auto;
+        height: calc(100% - 70px);
+    }
+
     .sidebar-footer {
-        width: 100%;
-        bottom: 0;
-        left: 0;
-        padding: 15px;
-        position: absolute;
         border-top: 1px solid #ededed;
+        border-right: 1px solid #ededed;
+        padding: 10px;
+        width: 300px;
+        height: 70px;
+        position: fixed;
+        left: 0;
+        bottom: 0;
+        background-color: white;
+        display: flex;
+        align-items: center;
     }
 }
 
@@ -803,7 +866,29 @@ footer {
         }
 
         .sidebar-footer {
+            border-right-color: $dark-border-color;
             border-top-color: $dark-border-color;
+            background-color: $dark-header-bg;
+        }
+    }
+}
+
+.domain-name-list {
+    li {
+        display: flex;
+        align-items: center;
+        padding: 10px 0 10px 10px;
+
+        .domain-input {
+            flex-grow: 1;
+            background-color: transparent;
+            border: none;
+            color: $dark-font-color;
+            outline: none;
+
+            &::placeholder {
+                color: #1d2634;
+            }
         }
     }
 }

src/router.js

@@ -14,12 +14,15 @@ import Entry from "./pages/Entry.vue";
 import Appearance from "./components/settings/Appearance.vue";
 import General from "./components/settings/General.vue";
 import Notifications from "./components/settings/Notifications.vue";
+import ReverseProxy from "./components/settings/ReverseProxy.vue";
 import MonitorHistory from "./components/settings/MonitorHistory.vue";
 import Security from "./components/settings/Security.vue";
+import Proxies from "./components/settings/Proxies.vue";
 import Backup from "./components/settings/Backup.vue";
 import About from "./components/settings/About.vue";
 import ManageStatusPage from "./pages/ManageStatusPage.vue";
 import AddStatusPage from "./pages/AddStatusPage.vue";
+import NotFound from "./pages/NotFound.vue";
 
 const routes = [
     {
@@ -82,6 +85,10 @@ const routes = [
                                 path: "notifications",
                                 component: Notifications,
                             },
+                            {
+                                path: "reverse-proxy",
+                                component: ReverseProxy,
+                            },
                             {
                                 path: "monitor-history",
                                 component: MonitorHistory,
@@ -90,6 +97,10 @@ const routes = [
                                 path: "security",
                                 component: Security,
                             },
+                            {
+                                path: "proxies",
+                                component: Proxies,
+                            },
                             {
                                 path: "backup",
                                 component: Backup,
@@ -128,6 +139,10 @@ const routes = [
         path: "/status/:slug",
         component: StatusPage,
     },
+    {
+        path: "/:pathMatch(.*)*",
+        component: NotFound,
+    },
 ];
 
 export const router = createRouter({

test/prepare-jest.js

@@ -1,9 +1,10 @@
 const fs = require("fs");
+const rmSync = require("../extra/fs-rmSync.js");
 
 const path = "./data/test-chrome-profile";
 
 if (fs.existsSync(path)) {
-    fs.rmdirSync(path, {
+    rmSync(path, {
         recursive: true,
     });
 }

test/prepare-test-server.js

@@ -1,9 +1,10 @@
 const fs = require("fs");
+const rmSync = require("../extra/fs-rmSync.js");
 
 const path = "./data/test";
 
 if (fs.existsSync(path)) {
-    fs.rmdirSync(path, {
+    rmSync(path, {
         recursive: true,
     });
 }