update to 1.5.0

Traduction pour le language France (FR Translation)

.do/deploy.template.yaml

@@ -1,11 +0,0 @@
-spec:
-  name: uptime-kuma
-  services:
-    - name: server
-      git:
-        repo_clone_url: https://github.com/louislam/uptime-kuma
-        branch: master
-      http_port: 3001
-      build_command: npm run setup
-      run_command: npm run start-server
-

.eslintrc.js

@@ -16,6 +16,9 @@ module.exports = {
         requireConfigFile: false,
     },
     rules: {
+        "camelcase": ["warn", {
+            "properties": "never"
+        }],
         // override/add rules settings here, such as:
         // 'vue/no-unused-vars': 'error'
         "no-unused-vars": "warn",
@@ -36,6 +39,11 @@ module.exports = {
         "no-multi-spaces": ["error", {
             ignoreEOLComments: true,
         }],
+        "space-before-function-paren": ["error", {
+            "anonymous": "always",
+            "named": "never",
+            "asyncArrow": "always"
+        }],
         "curly": "error",
         "object-curly-spacing": ["error", "always"],
         "object-curly-newline": "off",
@@ -66,5 +74,11 @@ module.exports = {
         "eol-last": ["error", "always"],
         //'prefer-template': 'error',
         "comma-dangle": ["warn", "only-multiline"],
+        "no-empty": ["error", {
+            "allowEmptyCatch": true
+        }],
+        "no-control-regex": "off",
+        "one-var": ["error", "never"],
+        "max-statements-per-line": ["error", { "max": 1 }]
     },
 }

.github/FUNDING.yml

@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+#github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+#patreon: # Replace with a single Patreon username
+open_collective: uptime-kuma # Replace with a single Open Collective username
+#ko_fi: # Replace with a single Ko-fi username
+#tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+#community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+#liberapay: # Replace with a single Liberapay username
+#issuehunt: # Replace with a single IssueHunt username
+#otechie: # Replace with a single Otechie username
+#custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/ISSUE_TEMPLATE/ask-for-help.md

@@ -9,3 +9,9 @@ assignees: ''
 **Is it a duplicate question?**
 Please search in Issues without filters: https://github.com/louislam/uptime-kuma/issues?q=
 
+**Info**
+Uptime Kuma Version:
+Using Docker?: Yes/No
+OS:
+Browser:
+

.github/ISSUE_TEMPLATE/bug_report.md

@@ -23,15 +23,16 @@ Steps to reproduce the behavior:
 **Expected behavior**
 A clear and concise description of what you expected to happen.
 
+
+**Info**
+- Uptime Kuma Version:
+- Using Docker?: Yes/No
+- OS: 
+- Browser:
+
 **Screenshots**
 If applicable, add screenshots to help explain your problem.
 
-**Desktop (please complete the following information):**
- - Uptime Kuma Version:
- - Using Docker?: Yes/No
- - OS: 
- - Browser:
+**Error Log**
+It is easier for us to find out the problem.
 
-
-**Additional context**
-Add any other context about the problem here.

.github/workflows/reviewdog.yml

@@ -1,12 +0,0 @@
-name: reviewdog
-on: [pull_request]
-jobs:
-  eslint:
-    name: runner / eslint
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: reviewdog/action-eslint@v1
-        with:
-          reporter: github-pr-review
-          eslint_flags: --ext .js,.ts,.vue .

.stylelintrc

@@ -1,3 +1,9 @@
 {
-  "extends": "stylelint-config-recommended",
+    "extends": "stylelint-config-standard",
+    "rules": {
+        "indentation": 4,
+        "no-descending-specificity": null,
+        "selector-list-comma-newline-after": null,
+        "declaration-empty-line-before": null
+    }
 }

CNAME

@@ -0,0 +1 @@
+git.kuma.pet

CONTRIBUTING.md

@@ -6,7 +6,38 @@ The project was created with vite.js (vue3). Then I created a sub-directory call
 
 The frontend code build into "dist" directory. The server uses "dist" as root. This is how production is working.
 
-Your IDE should follow the config in ".editorconfig". The most special thing is I set it to 4 spaces indentation. I know 2 spaces indentation became a kind of standard nowadays for js, but my eyes is not so comfortable for this. In my opinion, there is no callback-hell nowadays, it is good to go back 4 spaces world again.
+# Can I create a pull request for Uptime Kuma?
+
+Generally, if the pull request is working fine and it do not affect any existing logic, workflow and perfomance, I will merge to the master branch once it is tested.
+
+If you are not sure, feel free to create an empty pull request draft first.
+
+## Pull Request Examples
+
+### ✅ High - Medium Priority
+
+- Add a new notification
+- Add a chart
+- Fix a bug
+
+### *️⃣ Requires one more reviewer 
+
+I do not have such knowledge to test it.
+
+- Add k8s supports 
+
+### *️⃣ Low Priority 
+
+It changed my current workflow and require further studies.
+
+- Change my release approach
+
+### ❌ Won't Merge
+
+- Duplicated pull request
+- Buggy
+- Existing logic is completely modified or deleted
+- A function that is completely out of scope
 
 # Project Styles
 
@@ -19,16 +50,33 @@ For example, recently, because I am not a python expert, I spent a 2 hours to re
 - All settings in frontend.
 - Easy to use
 
+# Coding Styles
+
+- Follow .editorconfig
+- Follow eslint
+
+## Name convention
+
+- Javascript/Typescript: camelCaseType
+- SQLite: underscore_type
+- CSS/SCSS: dash-type
+
 # Tools
 - Node.js >= 14
 - Git
-- IDE that supports .editorconfig  (I am using Intellji Idea)
+- IDE that supports .editorconfig and eslint (I am using Intellji Idea)
 - A SQLite tool (I am using SQLite Expert Personal)
 
-# Prepare the dev
+# Install dependencies 
 
 ```bash
-npm install
+npm install --dev
+```
+
+For npm@7, you need --legacy-peer-deps
+
+```
+npm install --legacy-peer-deps --dev
 ```
 
 # Backend Dev
@@ -39,7 +87,6 @@ npm run start-server
 # Or 
 
 node server/server.js
-
 ```
 
 It binds to 0.0.0.0:3001 by default.
@@ -92,7 +139,8 @@ The data and socket logic in "src/mixins/socket.js"
 
 # Database Migration
 
-TODO
+1. create `patch{num}.sql` in `./db/`
+1. update `latestVersion` in `./server/database.js`
 
 # Unit Test
 

README.md

@@ -10,118 +10,67 @@ It is a self-hosted monitoring tool like "Uptime Robot".
 
 <img src="https://louislam.net/uptimekuma/1.jpg" width="512" alt="" />
 
-## Features
+## ⭐ Features
 
-* Monitoring uptime for HTTP(s) / TCP / Ping.
+* Monitoring uptime for HTTP(s) / TCP / Ping / DNS Record.
 * Fancy, Reactive, Fast UI/UX.
-* Notifications via Webhook, Telegram, Discord, Gotify, Slack, Pushover, Email (SMTP) and more by Apprise.
+* Notifications via Telegram, Discord, Gotify, Slack, Pushover, Email (SMTP), and [70+ notification services, click here for the full list](https://github.com/louislam/uptime-kuma/issues/284). 
 * 20 seconds interval.
 
-## How to Use
+## 🔧 How to Install
 
-### Docker
+### 🐳 Docker
 
 ```bash
-# Create a volume
 docker volume create uptime-kuma
-
-# Start the container
 docker run -d --restart=always -p 3001:3001 -v uptime-kuma:/app/data --name uptime-kuma louislam/uptime-kuma:1
 ```
 
 Browse to http://localhost:3001 after started.
 
-Change Port and Volume
-
-```bash
-docker run -d --restart=always -p <YOUR_PORT>:3001 -v <YOUR_DIR OR VOLUME>:/app/data --name uptime-kuma louislam/uptime-kuma:1
-```
-
-### Without Docker (x86/x64 only)
+### 💪🏻 Without Docker
 
 Required Tools: Node.js >= 14, git and pm2.
 
-(**Not recommanded for ARM CPU users.** Since there is no prebuilt for node-sqlite3, it is hard to get it running)
-
 ```bash
 git clone https://github.com/louislam/uptime-kuma.git
 cd uptime-kuma
 npm run setup
 
 # Option 1. Try it
-npm run start-server
+node server/server.js
 
-# (Recommended)
-# Option 2. Run in background using PM2
+# (Recommended) Option 2. Run in background using PM2
 # Install PM2 if you don't have: npm install pm2 -g
-pm2 start npm --name uptime-kuma -- run start-server
-
-# Listen to different port or hostname
-pm2 start npm --name uptime-kuma -- run start-server -- --port=80 --hostname=0.0.0.0
-
-```
-
-More useful commands if you have installed.
-
-```bash
-pm2 start uptime-kuma
-pm2 restart uptime-kuma
-pm2 stop uptime-kuma
+pm2 start server/server.js --name uptime-kuma
 ```
 
 Browse to http://localhost:3001 after started.
 
-### (Optional) One more step for Reverse Proxy
+### Advanced Installation
 
-This is optional for someone who want to do reverse proxy.
+If you need more options or need to browse via a reserve proxy, please read:
 
-Unlikely other web apps, Uptime Kuma is based on WebSocket. You need two more headers **"Upgrade"** and **"Connection"** in order to reverse proxy WebSocket.
+https://github.com/louislam/uptime-kuma/wiki/%F0%9F%94%A7-How-to-Install
 
-Please read wiki for more info:
-https://github.com/louislam/uptime-kuma/wiki/Reverse-Proxy
 
-### One-click Deploy
+## 🆙 How to Update
 
-<!---
-Abort. Heroku instance killed the server.js if idle, stupid.
-[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/louislam/uptime-kuma/tree/1.1.0)
--->
+Please read:
 
-[![Deploy to DO](https://www.deploytodo.com/do-btn-blue.svg)](https://cloud.digitalocean.com/apps/new?repo=https://github.com/louislam/uptime-kuma/tree/master&refcode=e2c7eb658434)
+https://github.com/louislam/uptime-kuma/wiki/%F0%9F%86%99-How-to-Update
 
-## How to Update
-
-### Docker
-
-Re-pull the latest docker image and create another container with the same volume.
-
-For someone who used my "How-to-use" commands to install Uptime Kuma, you can update by this:
-
-```bash
-docker pull louislam/uptime-kuma:1
-docker stop uptime-kuma
-docker rm uptime-kuma
-docker run -d --restart=always -p 3001:3001 -v uptime-kuma:/app/data --name uptime-kuma louislam/uptime-kuma:1
-```
-
-PS: For every new release, it takes some time to build the docker image, please be patient if it is not available yet.
-
-### Without Docker
-
-```bash
-git fetch --all
-git checkout 1.1.0 --force
-npm install
-npm run build
-pm2 restart uptime-kuma
-```
-
-## What's Next?
+## 🆕 What's Next?
 
 I will mark requests/issues to the next milestone.
+
 https://github.com/louislam/uptime-kuma/milestones
 
-## More Screenshots
+## 🖼 More Screenshots
+
+Dark Mode:
+
+<img src="https://user-images.githubusercontent.com/1336778/128710166-908f8d88-9256-43f3-9c49-bfc2c56011d2.png" width="400" alt="" />
 
 Settings Page:
 
@@ -133,7 +82,7 @@ Telegram Notification Sample:
 
 ## Motivation
 
-* I was looking for a self-hosted monitoring tool like "Uptime Robot", but it is hard to find a suitable one. One of the close one is statping. Unfortunately, it is not stable and unmaintained.
+* I was looking for a self-hosted monitoring tool like "Uptime Robot", but it is hard to find a suitable one. One of the close ones is statping. Unfortunately, it is not stable and unmaintained.
 * Want to build a fancy UI.
 * Learn Vue 3 and vite.js.
 * Show the power of Bootstrap 5.
@@ -146,6 +95,6 @@ If you love this project, please consider giving me a ⭐.
 
 If you want to report a bug or request a new feature. Free feel to open a new issue.
 
-If you want to modify Uptime Kuma, this guideline maybe useful for you: https://github.com/louislam/uptime-kuma/blob/master/CONTRIBUTING.md
+If you want to modify Uptime Kuma, this guideline may be useful for you: https://github.com/louislam/uptime-kuma/blob/master/CONTRIBUTING.md
 
-English proofreading is needed too, because my grammar is not that great sadly. Feel free to correct my grammar in this Readme, source code or wiki.
+English proofreading is needed too because my grammar is not that great sadly. Feel free to correct my grammar in this readme, source code, or wiki.

SECURITY.md

@@ -0,0 +1,14 @@
+# Security Policy
+
+## Supported Versions
+
+Use this section to tell people about which versions of your project are
+currently being supported with security updates.
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 1.x.x  | :white_check_mark: |
+
+## Reporting a Vulnerability
+
+https://github.com/louislam/uptime-kuma/issues

app.json

@@ -1,7 +0,0 @@
-{
-    "name": "Uptime Kuma",
-    "description": "A fancy self-hosted monitoring tool",
-    "repository": "https://github.com/louislam/uptime-kuma",
-    "logo": "https://raw.githubusercontent.com/louislam/uptime-kuma/master/public/icon.png",
-    "keywords": ["node", "express", "socket-io", "uptime-kuma", "uptime"]
-}

db/patch7.sql

@@ -0,0 +1,10 @@
+-- You should not modify if this have pushed to Github, unless it does serious wrong with the db.
+BEGIN TRANSACTION;
+
+ALTER TABLE monitor
+	ADD dns_resolve_type VARCHAR(5);
+
+ALTER TABLE monitor
+	ADD dns_resolve_server VARCHAR(255);
+
+COMMIT;

db/patch8.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 dns_last_result VARCHAR(255);
+
+COMMIT;

dockerfile

@@ -2,27 +2,18 @@
 FROM node:14-alpine3.12 AS release
 WORKDIR /app
 
-# split the sqlite install here, so that it can caches the arm prebuilt
-RUN apk add --no-cache --virtual .build-deps make g++ python3 python3-dev && \
-            ln -s /usr/bin/python3 /usr/bin/python && \
-            npm install @louislam/sqlite3@5.0.3 bcrypt@5.0.1 && \
-            apk del .build-deps && \
-            rm -f /usr/bin/python
-
-# Touching above code may causes sqlite3 re-compile again, painful slow.
-
 # Install apprise
 RUN apk add --no-cache python3 py3-cryptography py3-pip py3-six py3-yaml py3-click py3-markdown py3-requests py3-requests-oauthlib
 RUN pip3 --no-cache-dir install apprise && \
             rm -rf /root/.cache
 
 COPY . .
-RUN npm install && npm run build && npm prune
+RUN npm install --legacy-peer-deps && npm run build && npm prune
 
 EXPOSE 3001
 VOLUME ["/app/data"]
 HEALTHCHECK --interval=60s --timeout=30s --start-period=300s CMD node extra/healthcheck.js
-CMD ["npm", "run", "start-server"]
+CMD ["node", "server/server.js"]
 
 FROM release AS nightly
 RUN npm run mark-as-nightly

extra/compile-install-script.ps1

@@ -0,0 +1,2 @@
+# Must enable File Sharing in Docker Desktop
+docker run -it --rm -v ${pwd}:/app louislam/batsh /usr/bin/batsh bash --output ./install.sh ./extra/install.batsh

extra/install.batsh

@@ -0,0 +1,245 @@
+// install.sh is generated by ./extra/install.batsh, do not modify it directly.
+// "npm run compile-install-script" to compile install.sh
+// The command is working on Windows PowerShell and Docker for Windows only.
+
+
+// curl -o kuma_install.sh https://raw.githubusercontent.com/louislam/uptime-kuma/master/install.sh && sudo bash kuma_install.sh
+println("=====================");
+println("Uptime Kuma Installer");
+println("=====================");
+println("Supported OS: CentOS 7/8, Ubuntu >= 16.04 and Debian");
+println("---------------------------------------");
+println("This script is designed for Linux and basic usage.");
+println("For advanced usage, please go to https://github.com/louislam/uptime-kuma/wiki/Installation");
+println("---------------------------------------");
+println("");
+println("Local - Install Uptime Kuma in your current machine with git, Node.js 14 and pm2");
+println("Docker - Install Uptime Kuma Docker container");
+println("");
+
+if ("$1" != "") {
+    type = "$1";
+} else {
+    call("read", "-p", "Which installation method do you prefer? [DOCKER/local]: ", "type");
+}
+
+defaultPort = "3001";
+
+function checkNode() {
+    bash("nodeVersion=$(node -e 'console.log(process.versions.node.split(`.`)[0])')");
+    println("Node Version: " ++ nodeVersion);
+
+    if (nodeVersion < "12") {
+        println("Error: Required Node.js 14");
+        call("exit", "1");
+    }
+
+    if (nodeVersion == "12") {
+        println("Warning: NodeJS " ++ nodeVersion ++ " is not tested.");
+    }
+}
+
+function deb() {
+    bash("nodeCheck=$(node -v)");
+    bash("apt --yes update");
+
+    if (nodeCheck != "") {
+        checkNode();
+    } else {
+
+        // Old nodejs binary name is "nodejs"
+        bash("check=$(nodejs --version)");
+        if (check != "") {
+            println("Error: 'node' command is not found, but 'nodejs' command is found. Your NodeJS should be too old.");
+            bash("exit 1");
+        }
+
+        bash("curlCheck=$(curl --version)");
+        if (curlCheck == "") {
+            println("Installing Curl");
+            bash("apt --yes install curl");
+        }
+
+        println("Installing Node.js 14");
+        bash("curl -sL https://deb.nodesource.com/setup_14.x | bash - > log.txt");
+        bash("apt --yes install nodejs");
+        bash("node -v");
+
+        bash("nodeCheckAgain=$(node -v)");
+
+        if (nodeCheckAgain == "") {
+            println("Error during Node.js installation");
+            bash("exit 1");
+        }
+    }
+
+    bash("check=$(git --version)");
+    if (check == "") {
+        println("Installing Git");
+        bash("apt --yes install git");
+    }
+}
+
+if (type == "local") {
+    defaultInstallPath = "/opt/uptime-kuma";
+
+    if (exists("/etc/redhat-release")) {
+        os = call("cat", "/etc/redhat-release");
+        distribution = "rhel";
+
+    } else if (exists("/etc/issue")) {
+        bash("os=$(head -n1 /etc/issue | cut -f 1 -d ' ')");
+        if (os == "Ubuntu") {
+            distribution = "ubuntu";
+        }
+        if (os == "Debian") {
+            distribution = "debian";
+        }
+    }
+
+    bash("arch=$(uname -i)");
+
+    println("Your OS: " ++ os);
+    println("Distribution: " ++ distribution);
+    println("Arch: " ++ arch);
+
+    if ("$3" != "") {
+        port = "$3";
+    } else {
+        call("read", "-p", "Listening Port [$defaultPort]: ", "port");
+
+        if (port == "") {
+            port = defaultPort;
+        }
+    }
+
+    if ("$2" != "") {
+        installPath = "$2";
+    } else {
+        call("read", "-p", "Installation Path [$defaultInstallPath]: ", "installPath");
+
+        if (installPath == "") {
+            installPath = defaultInstallPath;
+        }
+    }
+
+    // CentOS
+    if (distribution == "rhel") {
+        bash("nodeCheck=$(node -v)");
+
+        if (nodeCheck != "") {
+            checkNode();
+        } else {
+
+            bash("curlCheck=$(curl --version)");
+            if (curlCheck == "") {
+                println("Installing Curl");
+                bash("yum -y -q install curl");
+            }
+
+            println("Installing Node.js 14");
+            bash("curl -sL https://rpm.nodesource.com/setup_14.x | bash - > log.txt");
+            bash("yum install -y -q nodejs");
+            bash("node -v");
+
+            bash("nodeCheckAgain=$(node -v)");
+
+            if (nodeCheckAgain == "") {
+                println("Error during Node.js installation");
+                bash("exit 1");
+            }
+        }
+
+        bash("check=$(git --version)");
+        if (check == "") {
+            println("Installing Git");
+            bash("yum -y -q install git");
+        }
+
+    // Ubuntu
+    } else if (distribution == "ubuntu") {
+        deb();
+
+    // Debian
+    } else if (distribution == "debian") {
+        deb();
+
+    } else {
+        // Unknown distribution
+        error = 0;
+
+        bash("check=$(git --version)");
+        if (check == "") {
+            error = 1;
+            println("Error: git is missing");
+        }
+
+        bash("check=$(node -v)");
+        if (check == "") {
+            error = 1;
+            println("Error: node is missing");
+        }
+
+        if (error > 0) {
+            println("Please install above missing software");
+            bash("exit 1");
+        }
+   }
+
+   bash("check=$(pm2 --version)");
+   if (check == "") {
+       println("Installing PM2");
+       bash("npm install pm2 -g");
+       bash("pm2 startup");
+   }
+
+   bash("mkdir -p $installPath");
+   bash("cd $installPath");
+   bash("git clone https://github.com/louislam/uptime-kuma.git .");
+   bash("npm run setup");
+
+   bash("pm2 start server/server.js --name uptime-kuma -- --port=$port");
+
+} else {
+    defaultVolume = "uptime-kuma";
+
+    bash("check=$(docker -v)");
+    if (check == "") {
+        println("Error: docker is not found!");
+        bash("exit 1");
+    }
+
+    bash("check=$(docker info)");
+
+    bash("if [[ \"$check\" == *\"Is the docker daemon running\"* ]]; then
+      echo \"Error: docker is not running\"
+      exit 1
+    fi");
+
+    if ("$3" != "") {
+        port = "$3";
+    } else {
+        call("read", "-p", "Expose Port [$defaultPort]: ", "port");
+
+        if (port == "") {
+            port = defaultPort;
+        }
+    }
+
+    if ("$2" != "") {
+        volume = "$2";
+    } else {
+        call("read", "-p", "Volume Name [$defaultVolume]: ", "volume");
+
+        if (volume == "") {
+            volume = defaultVolume;
+        }
+    }
+
+    println("Port: $port");
+    println("Volume: $volume");
+    bash("docker volume create $volume");
+    bash("docker run -d --restart=always -p $port:3001 -v $volume:/app/data --name uptime-kuma louislam/uptime-kuma:1");
+}
+
+println("http://localhost:$port");

extra/simple-dns-server.js

@@ -0,0 +1,144 @@
+/*
+ * Simple DNS Server
+ * For testing DNS monitoring type, dev only
+ */
+const dns2 = require("dns2");
+
+const { Packet } = dns2;
+
+const server = dns2.createServer({
+    udp: true
+});
+
+server.on("request", (request, send, rinfo) => {
+    for (let question of request.questions) {
+        console.log(question.name, type(question.type), question.class);
+
+        const response = Packet.createResponseFromRequest(request);
+
+        if (question.name === "existing.com") {
+
+            if (question.type === Packet.TYPE.A) {
+                response.answers.push({
+                    name: question.name,
+                    type: question.type,
+                    class: question.class,
+                    ttl: 300,
+                    address: "1.2.3.4"
+                });
+            } if (question.type === Packet.TYPE.AAAA) {
+                response.answers.push({
+                    name: question.name,
+                    type: question.type,
+                    class: question.class,
+                    ttl: 300,
+                    address: "fe80::::1234:5678:abcd:ef00",
+                });
+            } else if (question.type === Packet.TYPE.CNAME) {
+                response.answers.push({
+                    name: question.name,
+                    type: question.type,
+                    class: question.class,
+                    ttl: 300,
+                    domain: "cname1.existing.com",
+                });
+            } else if (question.type === Packet.TYPE.MX) {
+                response.answers.push({
+                    name: question.name,
+                    type: question.type,
+                    class: question.class,
+                    ttl: 300,
+                    exchange: "mx1.existing.com",
+                    priority: 5
+                });
+            } else if (question.type === Packet.TYPE.NS) {
+                response.answers.push({
+                    name: question.name,
+                    type: question.type,
+                    class: question.class,
+                    ttl: 300,
+                    ns: "ns1.existing.com",
+                });
+            } else if (question.type === Packet.TYPE.SOA) {
+                response.answers.push({
+                    name: question.name,
+                    type: question.type,
+                    class: question.class,
+                    ttl: 300,
+                    primary: "existing.com",
+                    admin: "admin@existing.com",
+                    serial: 2021082701,
+                    refresh: 300,
+                    retry: 3,
+                    expiration: 10,
+                    minimum: 10,
+                });
+            } else if (question.type === Packet.TYPE.SRV) {
+                response.answers.push({
+                    name: question.name,
+                    type: question.type,
+                    class: question.class,
+                    ttl: 300,
+                    priority: 5,
+                    weight: 5,
+                    port: 8080,
+                    target: "srv1.existing.com",
+                });
+            } else if (question.type === Packet.TYPE.TXT) {
+                response.answers.push({
+                    name: question.name,
+                    type: question.type,
+                    class: question.class,
+                    ttl: 300,
+                    data: "#v=spf1 include:_spf.existing.com ~all",
+                });
+            } else if (question.type === Packet.TYPE.CAA) {
+                response.answers.push({
+                    name: question.name,
+                    type: question.type,
+                    class: question.class,
+                    ttl: 300,
+                    flags: 0,
+                    tag: "issue",
+                    value: "ca.existing.com",
+                });
+            }
+
+        }
+
+        if (question.name === "4.3.2.1.in-addr.arpa") {
+            if (question.type === Packet.TYPE.PTR) {
+                response.answers.push({
+                    name: question.name,
+                    type: question.type,
+                    class: question.class,
+                    ttl: 300,
+                    domain: "ptr1.existing.com",
+                });
+            }
+        }
+
+        send(response);
+    }
+});
+
+server.on("listening", () => {
+    console.log("Listening");
+    console.log(server.addresses());
+});
+
+server.on("close", () => {
+    console.log("server closed");
+});
+
+server.listen({
+    udp: 5300
+});
+
+function type(code) {
+    for (let name in Packet.TYPE) {
+        if (Packet.TYPE[name] === code) {
+            return name;
+        }
+    }
+}

extra/update-version.js

@@ -25,9 +25,6 @@ if (! exists) {
     pkg.scripts["build-docker"] = pkg.scripts["build-docker"].replaceAll(oldVersion, newVersion);
     fs.writeFileSync("package.json", JSON.stringify(pkg, null, 4) + "\n");
 
-    // Process README.md
-    fs.writeFileSync("README.md", fs.readFileSync("README.md", "utf8").replaceAll(oldVersion, newVersion));
-
     commit(newVersion);
     tag(newVersion);
 } else {

index.html

@@ -1,13 +1,12 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-    <meta charset="UTF-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
-    <link rel="icon" type="image/svg+xml" href="/icon.svg"/>
-    <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5">
-    <meta name="theme-color" content="#5cdd8b"/>
-    <meta name="description" content="Uptime Kuma monitoring tool"/>
+    <link rel="icon" type="image/svg+xml" href="/icon.svg" />
+    <meta name="theme-color" id="theme-color" content="" />
+    <meta name="description" content="Uptime Kuma monitoring tool" />
     <title>Uptime Kuma</title>
 </head>
 <body>

install.sh

@@ -0,0 +1,203 @@
+# install.sh is generated by ./extra/install.batsh, do not modify it directly.
+# "npm run compile-install-script" to compile install.sh
+# The command is working on Windows PowerShell and Docker for Windows only.
+# curl -o kuma_install.sh https://raw.githubusercontent.com/louislam/uptime-kuma/master/install.sh && sudo bash kuma_install.sh
+"echo" "-e" "====================="
+"echo" "-e" "Uptime Kuma Installer"
+"echo" "-e" "====================="
+"echo" "-e" "Supported OS: CentOS 7/8, Ubuntu >= 16.04 and Debian"
+"echo" "-e" "---------------------------------------"
+"echo" "-e" "This script is designed for Linux and basic usage."
+"echo" "-e" "For advanced usage, please go to https://github.com/louislam/uptime-kuma/wiki/Installation"
+"echo" "-e" "---------------------------------------"
+"echo" "-e" ""
+"echo" "-e" "Local - Install Uptime Kuma in your current machine with git, Node.js 14 and pm2"
+"echo" "-e" "Docker - Install Uptime Kuma Docker container"
+"echo" "-e" ""
+if [ "$1" != "" ]; then
+  type="$1"
+else
+  "read" "-p" "Which installation method do you prefer? [DOCKER/local]: " "type"
+fi
+defaultPort="3001"
+function checkNode {
+  local _0
+  nodeVersion=$(node -e 'console.log(process.versions.node.split(`.`)[0])')
+  "echo" "-e" "Node Version: ""$nodeVersion"
+  _0="12"
+  if [ $(($nodeVersion < $_0)) == 1 ]; then
+    "echo" "-e" "Error: Required Node.js 14"
+    "exit" "1"  
+fi
+  if [ "$nodeVersion" == "12" ]; then
+    "echo" "-e" "Warning: NodeJS ""$nodeVersion"" is not tested."  
+fi
+}
+function deb {
+  nodeCheck=$(node -v)
+  apt --yes update
+  if [ "$nodeCheck" != "" ]; then
+    "checkNode" 
+  else
+    # Old nodejs binary name is "nodejs"
+    check=$(nodejs --version)
+    if [ "$check" != "" ]; then
+      "echo" "-e" "Error: 'node' command is not found, but 'nodejs' command is found. Your NodeJS should be too old."
+      exit 1    
+fi
+    curlCheck=$(curl --version)
+    if [ "$curlCheck" == "" ]; then
+      "echo" "-e" "Installing Curl"
+      apt --yes install curl    
+fi
+    "echo" "-e" "Installing Node.js 14"
+    curl -sL https://deb.nodesource.com/setup_14.x | bash - > log.txt
+    apt --yes install nodejs
+    node -v
+    nodeCheckAgain=$(node -v)
+    if [ "$nodeCheckAgain" == "" ]; then
+      "echo" "-e" "Error during Node.js installation"
+      exit 1    
+fi
+  fi
+  check=$(git --version)
+  if [ "$check" == "" ]; then
+    "echo" "-e" "Installing Git"
+    apt --yes install git  
+fi
+}
+if [ "$type" == "local" ]; then
+  defaultInstallPath="/opt/uptime-kuma"
+  if [ -e "/etc/redhat-release" ]; then
+    os=$("cat" "/etc/redhat-release")
+    distribution="rhel"
+  else
+    if [ -e "/etc/issue" ]; then
+      os=$(head -n1 /etc/issue | cut -f 1 -d ' ')
+      if [ "$os" == "Ubuntu" ]; then
+        distribution="ubuntu"      
+fi
+      if [ "$os" == "Debian" ]; then
+        distribution="debian"      
+fi    
+fi
+  fi
+  arch=$(uname -i)
+  "echo" "-e" "Your OS: ""$os"
+  "echo" "-e" "Distribution: ""$distribution"
+  "echo" "-e" "Arch: ""$arch"
+  if [ "$3" != "" ]; then
+    port="$3"
+  else
+    "read" "-p" "Listening Port [$defaultPort]: " "port"
+    if [ "$port" == "" ]; then
+      port="$defaultPort"    
+fi
+  fi
+  if [ "$2" != "" ]; then
+    installPath="$2"
+  else
+    "read" "-p" "Installation Path [$defaultInstallPath]: " "installPath"
+    if [ "$installPath" == "" ]; then
+      installPath="$defaultInstallPath"    
+fi
+  fi
+  # CentOS
+  if [ "$distribution" == "rhel" ]; then
+    nodeCheck=$(node -v)
+    if [ "$nodeCheck" != "" ]; then
+      "checkNode" 
+    else
+      curlCheck=$(curl --version)
+      if [ "$curlCheck" == "" ]; then
+        "echo" "-e" "Installing Curl"
+        yum -y -q install curl      
+fi
+      "echo" "-e" "Installing Node.js 14"
+      curl -sL https://rpm.nodesource.com/setup_14.x | bash - > log.txt
+      yum install -y -q nodejs
+      node -v
+      nodeCheckAgain=$(node -v)
+      if [ "$nodeCheckAgain" == "" ]; then
+        "echo" "-e" "Error during Node.js installation"
+        exit 1      
+fi
+    fi
+    check=$(git --version)
+    if [ "$check" == "" ]; then
+      "echo" "-e" "Installing Git"
+      yum -y -q install git    
+fi
+    # Ubuntu
+  else
+    if [ "$distribution" == "ubuntu" ]; then
+      "deb" 
+      # Debian
+    else
+      if [ "$distribution" == "debian" ]; then
+        "deb" 
+      else
+        # Unknown distribution
+        error=$((0))
+        check=$(git --version)
+        if [ "$check" == "" ]; then
+          error=$((1))
+          "echo" "-e" "Error: git is missing"        
+fi
+        check=$(node -v)
+        if [ "$check" == "" ]; then
+          error=$((1))
+          "echo" "-e" "Error: node is missing"        
+fi
+        if [ $(($error > 0)) == 1 ]; then
+          "echo" "-e" "Please install above missing software"
+          exit 1        
+fi
+      fi
+    fi
+  fi
+  check=$(pm2 --version)
+  if [ "$check" == "" ]; then
+    "echo" "-e" "Installing PM2"
+    npm install pm2 -g
+    pm2 startup  
+fi
+  mkdir -p $installPath
+  cd $installPath
+  git clone https://github.com/louislam/uptime-kuma.git .
+  npm run setup
+  pm2 start server/server.js --name uptime-kuma -- --port=$port
+else
+  defaultVolume="uptime-kuma"
+  check=$(docker -v)
+  if [ "$check" == "" ]; then
+    "echo" "-e" "Error: docker is not found!"
+    exit 1  
+fi
+  check=$(docker info)
+  if [[ "$check" == *"Is the docker daemon running"* ]]; then
+      echo "Error: docker is not running"
+      exit 1
+    fi
+  if [ "$3" != "" ]; then
+    port="$3"
+  else
+    "read" "-p" "Expose Port [$defaultPort]: " "port"
+    if [ "$port" == "" ]; then
+      port="$defaultPort"    
+fi
+  fi
+  if [ "$2" != "" ]; then
+    volume="$2"
+  else
+    "read" "-p" "Volume Name [$defaultVolume]: " "volume"
+    if [ "$volume" == "" ]; then
+      volume="$defaultVolume"    
+fi
+  fi
+  "echo" "-e" "Port: $port"
+  "echo" "-e" "Volume: $volume"
+  docker volume create $volume
+  docker run -d --restart=always -p $port:3001 -v $volume:/app/data --name uptime-kuma louislam/uptime-kuma:1
+fi
+"echo" "-e" "http://localhost:$port"

kubernetes/README.md

@@ -0,0 +1,28 @@
+# Uptime-Kuma K8s Deployment
+## How does it work?
+
+Kustomize is a tool which builds a complete deployment file for all config elements.
+You can edit the files in the ```uptime-kuma``` folder except the ```kustomization.yml``` until you know what you're doing.
+If you want to choose another namespace you can edit the ```kustomization.yml``` in the ```kubernetes```-Folder and change the ```namespace: uptime-kuma``` to something you like.
+
+It creates a certificate with the specified Issuer and creates the Ingress for the Uptime-Kuma ClusterIP-Service
+
+## What do i have to edit?
+You have to edit the ```ingressroute.yml``` to your needs.
+This ingressroute.yml is for the [nginx-ingress-controller](https://kubernetes.github.io/ingress-nginx/) in combination with the [cert-manager](https://cert-manager.io/).
+
+- host
+- secrets and secret names
+- (Cluster)Issuer (optional)
+- the Version in the Deployment-File
+  - update:
+    - change to newer version and run the above commands, it will update the pods one after another
+
+## How To use:
+
+- install [kustomize](https://kubectl.docs.kubernetes.io/installation/kustomize/)
+- Edit files mentioned above to your needs
+- run ```kustomize build > apply.yml```
+- run ```kubectl apply -f apply.yml```
+
+Now you should see some k8s magic and Uptime-Kuma should be available at the specified address.

kubernetes/kustomization.yml

@@ -0,0 +1,10 @@
+namespace: uptime-kuma
+namePrefix: uptime-kuma-
+
+commonLabels:
+  app: uptime-kuma
+
+bases:
+   - uptime-kuma
+
+

kubernetes/uptime-kuma/deployment.yml

@@ -0,0 +1,42 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    component: uptime-kuma
+  name: deployment
+spec:
+  selector:
+    matchLabels:
+      component: uptime-kuma
+  replicas: 1
+  strategy:
+    type: Recreate
+
+  template:
+    metadata:
+      labels:
+        component: uptime-kuma
+    spec:
+      containers:
+        - name: app
+          image: louislam/uptime-kuma:1
+          ports:
+            - containerPort: 3001
+          volumeMounts:
+            - mountPath: /app/data
+              name: storage
+          livenessProbe:
+            exec:
+              command:
+                - node
+                - extra/healthcheck.js
+          readinessProbe:
+            httpGet:
+              path: /
+              port: 3001
+              scheme: HTTP
+
+      volumes:
+        - name: storage
+          persistentVolumeClaim:
+            claimName: pvc

kubernetes/uptime-kuma/ingressroute.yml

@@ -0,0 +1,39 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  annotations:
+    kubernetes.io/ingress.class: nginx
+    cert-manager.io/cluster-issuer: letsencrypt-prod
+    nginx.ingress.kubernetes.io/proxy-read-timeout: "3600"
+    nginx.ingress.kubernetes.io/proxy-send-timeout: "3600"
+    nginx.ingress.kubernetes.io/server-snippets: |
+      location / {
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_http_version 1.1;
+        proxy_set_header X-Forwarded-Host $http_host;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_set_header X-Forwarded-For $remote_addr;
+        proxy_set_header Host $host;
+        proxy_set_header Connection "upgrade";
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Upgrade $http_upgrade;
+        proxy_cache_bypass $http_upgrade;
+        }
+  name: ingress
+spec:
+  tls:
+  - hosts:
+    - example.com
+    secretName: example-com-tls
+  rules:
+  - host: example.com
+    http:
+      paths:
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: service
+            port:
+              number: 3001

kubernetes/uptime-kuma/kustomization.yml

@@ -0,0 +1,5 @@
+resources:
+  - deployment.yml
+  - service.yml
+  - ingressroute.yml
+  - pvc.yml

kubernetes/uptime-kuma/pvc.yml

@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: pvc
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 4Gi

kubernetes/uptime-kuma/service.yml

@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: Service
+metadata:  
+  name: service
+spec:
+  selector:    
+    component: uptime-kuma
+  type: ClusterIP
+  ports:  
+  - name: http
+    port: 3001
+    targetPort: 3001
+    protocol: TCP

package.json

@@ -1,6 +1,6 @@
 {
     "name": "uptime-kuma",
-    "version": "1.1.0",
+    "version": "1.5.0",
     "license": "MIT",
     "repository": {
         "type": "git",
@@ -10,31 +10,46 @@
         "node": "14.*"
     },
     "scripts": {
+        "lint:js": "eslint --ext \".js,.vue\" --ignore-path .gitignore .",
+        "lint:style": "stylelint \"**/*.{vue,css,scss}\" --ignore-path .gitignore",
+        "lint": "npm run lint:js && npm run lint:style",
         "dev": "vite --host",
         "start": "npm run start-server",
         "start-server": "node server/server.js",
+        "start-demo-server": "set NODE_ENV=demo && node server/server.js",
         "update": "",
         "build": "vite build",
         "vite-preview-dist": "vite preview --host",
-        "build-docker": "docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma -t louislam/uptime-kuma:1 -t louislam/uptime-kuma:1.1.0 --target release . --push",
+        "build-docker": "docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma -t louislam/uptime-kuma:1 -t louislam/uptime-kuma:1.5.0 --target release . --push",
         "build-docker-nightly": "docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:nightly --target nightly . --push",
-        "build-docker-nightly-amd64": "docker buildx build --platform linux/amd64 -t louislam/uptime-kuma:nightly-amd64 --target nightly . --push",
-        "setup": "git checkout 1.1.0 && npm install && npm run build",
+        "build-docker-nightly-amd64": "docker buildx build --platform linux/amd64 -t louislam/uptime-kuma:nightly-amd64 --target nightly . --push --progress plain",
+        "setup": "git checkout 1.5.0 && npm install --legacy-peer-deps && npm run build && npm prune",
         "update-version": "node extra/update-version.js",
         "mark-as-nightly": "node extra/mark-as-nightly.js",
-        "reset-password": "node extra/reset-password.js"
+        "reset-password": "node extra/reset-password.js",
+        "compile-install-script": "@powershell -NoProfile -ExecutionPolicy Unrestricted -Command ./extra/compile-install-script.ps1",
+        "test-install-script-centos7": "npm run compile-install-script && docker build --progress plain -f test/test_install_script/centos7.dockerfile .",
+        "test-install-script-alpine3": "npm run compile-install-script && docker build --progress plain -f test/test_install_script/alpine3.dockerfile .",
+        "test-install-script-ubuntu": "npm run compile-install-script && docker build --progress plain -f test/test_install_script/ubuntu.dockerfile .",
+        "test-install-script-ubuntu1604": "npm run compile-install-script && docker build --progress plain -f test/test_install_script/ubuntu1604.dockerfile .",
+        "test-install-script-debian": "npm run compile-install-script && docker build --progress plain -f test/test_install_script/debian.dockerfile .",
+        "simple-dns-server": "node extra/simple-dns-server.js"
     },
     "dependencies": {
         "@fortawesome/fontawesome-svg-core": "^1.2.36",
         "@fortawesome/free-regular-svg-icons": "^5.15.4",
         "@fortawesome/free-solid-svg-icons": "^5.15.4",
         "@fortawesome/vue-fontawesome": "^3.0.0-4",
+        "@louislam/better-sqlite3-with-prebuilds": "^7.4.3",
         "@popperjs/core": "^2.9.3",
         "args-parser": "^1.3.0",
         "axios": "^0.21.1",
-        "bcrypt": "^5.0.1",
+        "bcryptjs": "^2.4.3",
         "bootstrap": "^5.1.0",
+        "chart.js": "^3.5.1",
+        "chartjs-adapter-dayjs": "^1.0.0",
         "command-exists": "^1.2.9",
+        "compare-versions": "^3.6.0",
         "dayjs": "^1.10.6",
         "express": "^4.17.1",
         "express-basic-auth": "^1.2.0",
@@ -43,32 +58,33 @@
         "jsonwebtoken": "^8.5.1",
         "nodemailer": "^6.6.3",
         "password-hash": "^1.2.2",
-        "prom-client": "^13.1.0",
+        "prom-client": "^13.2.0",
         "prometheus-api-metrics": "^3.2.0",
-        "redbean-node": "0.0.21",
+        "redbean-node": "0.1.2",
         "socket.io": "^4.1.3",
         "socket.io-client": "^4.1.3",
-        "@louislam/sqlite3": "^5.0.3",
         "tcp-ping": "^0.1.1",
         "v-pagination-3": "^0.1.6",
-        "vue": "^3.1.5",
+        "vue": "^3.2.2",
+        "vue-chart-3": "^0.5.7",
         "vue-confirm-dialog": "^1.0.2",
+        "vue-i18n": "^9.1.7",
         "vue-multiselect": "^3.0.0-alpha.2",
-        "vue-router": "^4.0.10",
+        "vue-router": "^4.0.11",
         "vue-toastification": "^2.0.0-rc.1"
     },
     "devDependencies": {
         "@babel/eslint-parser": "^7.15.0",
-        "@types/bootstrap": "^5.0.17",
+        "@types/bootstrap": "^5.1.1",
         "@vitejs/plugin-legacy": "^1.5.1",
-        "@vitejs/plugin-vue": "^1.3.0",
-        "@vue/compiler-sfc": "^3.1.5",
-        "core-js": "^3.16.0",
+        "@vitejs/plugin-vue": "^1.4.0",
+        "@vue/compiler-sfc": "^3.2.2",
+        "core-js": "^3.16.1",
+        "dns2": "^2.0.1",
         "eslint": "^7.32.0",
-        "eslint-plugin-vue": "^7.15.1",
+        "eslint-plugin-vue": "^7.16.0",
         "sass": "^1.37.5",
         "stylelint": "^13.13.1",
-        "stylelint-config-recommended": "^5.0.0",
         "stylelint-config-standard": "^22.0.0",
         "typescript": "^4.3.5",
         "vite": "^2.4.4"

server/check-version.js

@@ -0,0 +1,44 @@
+const { setSetting } = require("./util-server");
+const axios = require("axios");
+const { isDev } = require("../src/util");
+
+exports.version = require("../package.json").version;
+exports.latestVersion = null;
+
+let interval;
+
+exports.startInterval = () => {
+    let check = async () => {
+        try {
+            const res = await axios.get("https://raw.githubusercontent.com/louislam/uptime-kuma/master/package.json");
+
+            if (typeof res.data === "string") {
+                res.data = JSON.parse(res.data);
+            }
+
+            // For debug
+            if (process.env.TEST_CHECK_VERSION === "1") {
+                res.data.version = "1000.0.0"
+            }
+
+            exports.latestVersion = res.data.version;
+            console.log("Latest Version: " + exports.latestVersion);
+        } catch (_) { }
+
+    };
+
+    check();
+    interval = setInterval(check, 3600 * 1000 * 48);
+};
+
+exports.enableCheckUpdate = async (value) => {
+    await setSetting("checkUpdate", value);
+
+    clearInterval(interval);
+
+    if (value) {
+        exports.startInterval();
+    }
+};
+
+exports.socket = null;

server/database.js

@@ -1,36 +1,44 @@
 const fs = require("fs");
-const { sleep } = require("../src/util");
 const { R } = require("redbean-node");
 const { setSetting, setting } = require("./util-server");
-const knex = require("knex");
 
 class Database {
 
     static templatePath = "./db/kuma.db"
     static path = "./data/kuma.db";
-    static latestVersion = 6;
+    static latestVersion = 8;
     static noReject = true;
+    static sqliteInstance = null;
 
     static async connect() {
-        const Dialect = require("knex/lib/dialects/sqlite3/index.js");
-        Dialect.prototype._driver = () => require("@louislam/sqlite3");
+        const acquireConnectionTimeout = 120 * 1000;
 
-        R.setup(knex({
-            client: Dialect,
-            connection: {
-                filename: Database.path,
-            },
+        R.useBetterSQLite3 = true;
+        R.betterSQLite3Options.timeout = acquireConnectionTimeout;
+
+        R.setup("sqlite", {
+            filename: Database.path,
             useNullAsDefault: true,
-            pool: {
-                min: 1,
-                max: 1,
-                idleTimeoutMillis: 30000,
-            }
-        }));
+            acquireConnectionTimeout: acquireConnectionTimeout,
+        }, {
+            min: 1,
+            max: 1,
+            idleTimeoutMillis: 120 * 1000,
+            propagateCreateError: false,
+            acquireTimeoutMillis: acquireConnectionTimeout,
+        });
+
+        if (process.env.SQL_LOG === "1") {
+            R.debug(true);
+        }
 
         // Auto map the model to a bean object
         R.freeze(true)
         await R.autoloadModels("./server/model");
+
+        // Change to WAL
+        await R.exec("PRAGMA journal_mode = WAL");
+        console.log(await R.getAll("PRAGMA journal_mode"));
     }
 
     static async patch() {
@@ -54,6 +62,16 @@ class Database {
             const backupPath = "./data/kuma.db.bak" + version;
             fs.copyFileSync(Database.path, backupPath);
 
+            const shmPath = Database.path + "-shm";
+            if (fs.existsSync(shmPath)) {
+                fs.copyFileSync(shmPath, shmPath + ".bak" + version);
+            }
+
+            const walPath = Database.path + "-wal";
+            if (fs.existsSync(walPath)) {
+                fs.copyFileSync(walPath, walPath + ".bak" + version);
+            }
+
             // Try catch anything here, if gone wrong, restore the backup
             try {
                 for (let i = version + 1; i <= this.latestVersion; i++) {
@@ -106,37 +124,27 @@ class Database {
                 return statement !== "";
             })
 
+        // Use better-sqlite3 to run, prevent "This statement does not return data. Use run() instead"
+        const db = await this.getBetterSQLite3Database();
+
         for (let statement of statements) {
-            await R.exec(statement);
+            db.prepare(statement).run();
         }
     }
 
+    static getBetterSQLite3Database() {
+        return R.knex.client.acquireConnection();
+    }
+
     /**
      * Special handle, because tarn.js throw a promise reject that cannot be caught
      * @returns {Promise<void>}
      */
     static async close() {
-        const listener = (reason, p) => {
-            Database.noReject = false;
-        };
-        process.addListener("unhandledRejection", listener);
-
-        console.log("Closing DB")
-
-        while (true) {
-            Database.noReject = true;
-            await R.close()
-            await sleep(2000)
-
-            if (Database.noReject) {
-                break;
-            } else {
-                console.log("Waiting to close the db")
-            }
+        if (this.sqliteInstance) {
+            this.sqliteInstance.close();
         }
-        console.log("SQLite closed")
-
-        process.removeListener("unhandledRejection", listener);
+        console.log("Stopped database");
     }
 }
 

server/model/monitor.js

@@ -6,11 +6,12 @@ dayjs.extend(utc)
 dayjs.extend(timezone)
 const axios = require("axios");
 const { Prometheus } = require("../prometheus");
-const { debug, UP, DOWN, PENDING, flipStatus } = require("../../src/util");
-const { tcping, ping, checkCertificate, checkStatusCode } = require("../util-server");
+const { debug, UP, DOWN, PENDING, flipStatus, TimeLogger } = require("../../src/util");
+const { tcping, ping, dnsResolve, checkCertificate, checkStatusCode, getTotalClientInRoom } = require("../util-server");
 const { R } = require("redbean-node");
 const { BeanModel } = require("redbean-node/dist/bean-model");
 const { Notification } = require("../notification")
+const version = require("../../package.json").version;
 
 /**
  * status:
@@ -47,6 +48,9 @@ class Monitor extends BeanModel {
             upsideDown: this.isUpsideDown(),
             maxredirects: this.maxredirects,
             accepted_statuscodes: this.getAcceptedStatuscodes(),
+            dns_resolve_type: this.dns_resolve_type,
+            dns_resolve_server: this.dns_resolve_server,
+            dns_last_result: this.dns_last_result,
             notificationIDList,
         };
     }
@@ -79,6 +83,10 @@ class Monitor extends BeanModel {
 
         const beat = async () => {
 
+            // Expose here for prometheus update
+            // undefined if not https
+            let tlsInfo = undefined;
+
             if (! previousBeat) {
                 previousBeat = await R.findOne("heartbeat", " monitor_id = ? ORDER BY time DESC", [
                     this.id,
@@ -105,17 +113,17 @@ class Monitor extends BeanModel {
 
             try {
                 if (this.type === "http" || this.type === "keyword") {
+                    // Do not do any queries/high loading things before the "bean.ping"
                     let startTime = dayjs().valueOf();
 
-                    // Use Custom agent to disable session reuse
-                    // https://github.com/nodejs/node/issues/3940
                     let res = await axios.get(this.url, {
-                        timeout: 15000,
+                        timeout: this.interval * 1000 * 0.8,
                         headers: {
-                            "User-Agent": "Uptime-Kuma",
+                            "Accept": "*/*",
+                            "User-Agent": "Uptime-Kuma/" + version,
                         },
                         httpsAgent: new https.Agent({
-                            maxCachedSessions: 0,
+                            maxCachedSessions: 0,      // Use Custom agent to disable session reuse (https://github.com/nodejs/node/issues/3940)
                             rejectUnauthorized: ! this.getIgnoreTls(),
                         }),
                         maxRedirects: this.maxredirects,
@@ -127,11 +135,10 @@ class Monitor extends BeanModel {
                     bean.ping = dayjs().valueOf() - startTime;
 
                     // Check certificate if https is used
-
                     let certInfoStartTime = dayjs().valueOf();
                     if (this.getUrl()?.protocol === "https:") {
                         try {
-                            await this.updateTlsInfo(checkCertificate(res));
+                            tlsInfo = await this.updateTlsInfo(checkCertificate(res));
                         } catch (e) {
                             if (e.message !== "No TLS certificate in response") {
                                 console.error(e.message)
@@ -170,6 +177,46 @@ class Monitor extends BeanModel {
                     bean.ping = await ping(this.hostname);
                     bean.msg = ""
                     bean.status = UP;
+                } else if (this.type === "dns") {
+                    let startTime = dayjs().valueOf();
+                    let dnsMessage = "";
+
+                    let dnsRes = await dnsResolve(this.hostname, this.dns_resolve_server, this.dns_resolve_type);
+                    bean.ping = dayjs().valueOf() - startTime;
+
+                    if (this.dns_resolve_type == "A" || this.dns_resolve_type == "AAAA" || this.dns_resolve_type == "TXT") {
+                        dnsMessage += "Records: ";
+                        dnsMessage += dnsRes.join(" | ");
+                    } else if (this.dns_resolve_type == "CNAME" || this.dns_resolve_type == "PTR") {
+                        dnsMessage = dnsRes[0];
+                    } else if (this.dns_resolve_type == "CAA") {
+                        dnsMessage = dnsRes[0].issue;
+                    } else if (this.dns_resolve_type == "MX") {
+                        dnsRes.forEach(record => {
+                            dnsMessage += `Hostname: ${record.exchange} - Priority: ${record.priority} | `;
+                        });
+                        dnsMessage = dnsMessage.slice(0, -2)
+                    } else if (this.dns_resolve_type == "NS") {
+                        dnsMessage += "Servers: ";
+                        dnsMessage += dnsRes.join(" | ");
+                    } else if (this.dns_resolve_type == "SOA") {
+                        dnsMessage += `NS-Name: ${dnsRes.nsname} | Hostmaster: ${dnsRes.hostmaster} | Serial: ${dnsRes.serial} | Refresh: ${dnsRes.refresh} | Retry: ${dnsRes.retry} | Expire: ${dnsRes.expire} | MinTTL: ${dnsRes.minttl}`;
+                    } else if (this.dns_resolve_type == "SRV") {
+                        dnsRes.forEach(record => {
+                            dnsMessage += `Name: ${record.name} | Port: ${record.port} | Priority: ${record.priority} | Weight: ${record.weight} | `;
+                        });
+                        dnsMessage = dnsMessage.slice(0, -2)
+                    }
+
+                    if (this.dnsLastResult !== dnsMessage) {
+                        R.exec("UPDATE `monitor` SET dns_last_result = ? WHERE id = ? ", [
+                            dnsMessage,
+                            this.id
+                        ]);
+                    }
+
+                    bean.msg = dnsMessage;
+                    bean.status = UP;
                 }
 
                 if (this.isUpsideDown()) {
@@ -236,7 +283,8 @@ class Monitor extends BeanModel {
                         try {
                             await Notification.send(JSON.parse(notification.config), msg, await this.toJSON(), bean.toJSON())
                         } catch (e) {
-                            console.error("Cannot send notification to " + notification.name)
+                            console.error("Cannot send notification to " + notification.name);
+                            console.log(e);
                         }
                     }
                 }
@@ -253,22 +301,22 @@ class Monitor extends BeanModel {
                 console.warn(`Monitor #${this.id} '${this.name}': Failing: ${bean.msg} | Type: ${this.type}`)
             }
 
-            prometheus.update(bean)
-
             io.to(this.user_id).emit("heartbeat", bean.toJSON());
-
-            await R.store(bean)
             Monitor.sendStats(io, this.id, this.user_id)
 
+            await R.store(bean);
+            prometheus.update(bean, tlsInfo);
+
             previousBeat = bean;
+
+            this.heartbeatInterval = setTimeout(beat, this.interval * 1000);
         }
 
         beat();
-        this.heartbeatInterval = setInterval(beat, this.interval * 1000);
     }
 
     stop() {
-        clearInterval(this.heartbeatInterval)
+        clearTimeout(this.heartbeatInterval);
     }
 
     /**
@@ -288,7 +336,7 @@ class Monitor extends BeanModel {
     /**
      * Store TLS info to database
      * @param checkCertificateResult
-     * @returns {Promise<void>}
+     * @returns {Promise<object>}
      */
     async updateTlsInfo(checkCertificateResult) {
         let tls_info_bean = await R.findOne("monitor_tls_info", "monitor_id = ?", [
@@ -300,13 +348,21 @@ class Monitor extends BeanModel {
         }
         tls_info_bean.info_json = JSON.stringify(checkCertificateResult);
         await R.store(tls_info_bean);
+
+        return checkCertificateResult;
     }
 
     static async sendStats(io, monitorID, userID) {
-        Monitor.sendAvgPing(24, io, monitorID, userID);
-        Monitor.sendUptime(24, io, monitorID, userID);
-        Monitor.sendUptime(24 * 30, io, monitorID, userID);
-        Monitor.sendCertInfo(io, monitorID, userID);
+        const hasClients = getTotalClientInRoom(io, userID) > 0;
+
+        if (hasClients) {
+            await Monitor.sendAvgPing(24, io, monitorID, userID);
+            await Monitor.sendUptime(24, io, monitorID, userID);
+            await Monitor.sendUptime(24 * 30, io, monitorID, userID);
+            await Monitor.sendCertInfo(io, monitorID, userID);
+        } else {
+            debug("No clients in the room, no need to send stats");
+        }
     }
 
     /**
@@ -314,6 +370,8 @@ class Monitor extends BeanModel {
      * @param duration : int Hours
      */
     static async sendAvgPing(duration, io, monitorID, userID) {
+        const timeLogger = new TimeLogger();
+
         let avgPing = parseInt(await R.getCell(`
             SELECT AVG(ping)
             FROM heartbeat
@@ -324,6 +382,8 @@ class Monitor extends BeanModel {
             monitorID,
         ]));
 
+        timeLogger.print(`[Monitor: ${monitorID}] avgPing`);
+
         io.to(userID).emit("avgPing", monitorID, avgPing);
     }
 
@@ -343,6 +403,8 @@ class Monitor extends BeanModel {
      * @param duration : int Hours
      */
     static async sendUptime(duration, io, monitorID, userID) {
+        const timeLogger = new TimeLogger();
+
         let sec = duration * 3600;
 
         let heartbeatList = await R.getAll(`
@@ -354,6 +416,8 @@ class Monitor extends BeanModel {
             monitorID,
         ]);
 
+        timeLogger.print(`[Monitor: ${monitorID}][${duration}] sendUptime`);
+
         let downtime = 0;
         let total = 0;
         let uptime;

server/notification.js

@@ -95,12 +95,25 @@ class Notification {
                     await axios.post(notification.discordWebhookUrl, discordtestdata)
                     return okMsg;
                 }
+
+                let url;
+
+                if (monitorJSON["type"] === "port") {
+                    url = monitorJSON["hostname"];
+                    if (monitorJSON["port"]) {
+                        url += ":" + monitorJSON["port"];
+                    }
+
+                } else {
+                    url = monitorJSON["url"];
+                }
+
                 // If heartbeatJSON is not null, we go into the normal alerting loop.
                 if (heartbeatJSON["status"] == 0) {
                     let discorddowndata = {
                         username: discordDisplayName,
                         embeds: [{
-                            title: "❌ One of your services went down. ❌",
+                            title: "❌ Your service " + monitorJSON["name"] + " went down. ❌",
                             color: 16711680,
                             timestamp: heartbeatJSON["time"],
                             fields: [
@@ -110,7 +123,7 @@ class Notification {
                                 },
                                 {
                                     name: "Service URL",
-                                    value: monitorJSON["url"],
+                                    value: url,
                                 },
                                 {
                                     name: "Time (UTC)",
@@ -140,7 +153,7 @@ class Notification {
                                 },
                                 {
                                     name: "Service URL",
-                                    value: "[Visit Service](" + monitorJSON["url"] + ")",
+                                    value: url.startsWith("http") ? "[Visit Service](" + url + ")" : url,
                                 },
                                 {
                                     name: "Time (UTC)",
@@ -193,6 +206,34 @@ class Notification {
                 console.log(error)
                 return false;
             }
+        } else if (notification.type === "octopush") {
+            try {
+                let config = {
+                    headers: {
+                        "api-key": notification.octopushAPIKey,
+                        "api-login": notification.octopushLogin,
+                        "cache-control": "no-cache"
+                    }
+                };
+                let data = {
+                    "recipients": [
+                        {
+                            "phone_number": notification.octopushPhoneNumber
+                        }
+                    ],
+                    //octopush not supporting non ascii char
+                    "text": msg.replace(/[^\x00-\x7F]/g, ""),
+                    "type": notification.octopushSMSType,
+                    "purpose": "alert",
+                    "sender": notification.octopushSenderName
+                };
+
+                await axios.post("https://api.octopush.com/v1/public/sms-campaign/send", data, config)
+                return true;
+            } catch (error) {
+                console.log(error)
+                return false;
+            }
         } else if (notification.type === "slack") {
             try {
                 if (heartbeatJSON == null) {
@@ -251,6 +292,150 @@ class Notification {
                 throwGeneralAxiosError(error)
             }
 
+        } else if (notification.type === "rocket.chat") {
+            try {
+                if (heartbeatJSON == null) {
+                    let data = {
+                        "text": "Uptime Kuma Rocket.chat testing successful.",
+                        "channel": notification.rocketchannel,
+                        "username": notification.rocketusername,
+                        "icon_emoji": notification.rocketiconemo,
+                    }
+                    await axios.post(notification.rocketwebhookURL, data)
+                    return okMsg;
+                }
+
+                const time = heartbeatJSON["time"];
+                let data = {
+                    "text": "Uptime Kuma Alert",
+                    "channel": notification.rocketchannel,
+                    "username": notification.rocketusername,
+                    "icon_emoji": notification.rocketiconemo,
+                    "attachments": [
+                        {
+                            "title": "Uptime Kuma Alert *Time (UTC)*\n" + time,
+                            "title_link": notification.rocketbutton,
+                            "text": "*Message*\n" + msg,
+                            "color": "#32cd32"
+                        }
+                    ]
+                }
+                await axios.post(notification.rocketwebhookURL, data)
+                return okMsg;
+            } catch (error) {
+                throwGeneralAxiosError(error)
+            }
+
+        } else if (notification.type === "mattermost") {
+            try {
+                const mattermostUserName = notification.mattermostusername || "Uptime Kuma";
+                // If heartbeatJSON is null, assume we're testing.
+                if (heartbeatJSON == null) {
+                    let mattermostTestData = {
+                        username: mattermostUserName,
+                        text: msg,
+                    }
+                    await axios.post(notification.mattermostWebhookUrl, mattermostTestData)
+                    return okMsg;
+                }
+
+                const mattermostChannel = notification.mattermostchannel;
+                const mattermostIconEmoji = notification.mattermosticonemo;
+                const mattermostIconUrl = notification.mattermosticonurl;
+
+                if (heartbeatJSON["status"] == 0) {
+                    let mattermostdowndata = {
+                        username: mattermostUserName,
+                        text: "Uptime Kuma Alert",
+                        channel: mattermostChannel,
+                        icon_emoji: mattermostIconEmoji,
+                        icon_url: mattermostIconUrl,
+                        attachments: [
+                            {
+                                fallback:
+                                    "Your " +
+                                    monitorJSON["name"] +
+                                    " service went down.",
+                                color: "#FF0000",
+                                title:
+                                    "❌ " +
+                                    monitorJSON["name"] +
+                                    " service went down. ❌",
+                                title_link: monitorJSON["url"],
+                                fields: [
+                                    {
+                                        short: true,
+                                        title: "Service Name",
+                                        value: monitorJSON["name"],
+                                    },
+                                    {
+                                        short: true,
+                                        title: "Time (UTC)",
+                                        value: heartbeatJSON["time"],
+                                    },
+                                    {
+                                        short: false,
+                                        title: "Error",
+                                        value: heartbeatJSON["msg"],
+                                    },
+                                ],
+                            },
+                        ],
+                    };
+                    await axios.post(
+                        notification.mattermostWebhookUrl,
+                        mattermostdowndata
+                    );
+                    return okMsg;
+                } else if (heartbeatJSON["status"] == 1) {
+                    let mattermostupdata = {
+                        username: mattermostUserName,
+                        text: "Uptime Kuma Alert",
+                        channel: mattermostChannel,
+                        icon_emoji: mattermostIconEmoji,
+                        icon_url: mattermostIconUrl,
+                        attachments: [
+                            {
+                                fallback:
+                                    "Your " +
+                                    monitorJSON["name"] +
+                                    " service went up!",
+                                color: "#32CD32",
+                                title:
+                                    "✅ " +
+                                    monitorJSON["name"] +
+                                    " service went up! ✅",
+                                title_link: monitorJSON["url"],
+                                fields: [
+                                    {
+                                        short: true,
+                                        title: "Service Name",
+                                        value: monitorJSON["name"],
+                                    },
+                                    {
+                                        short: true,
+                                        title: "Time (UTC)",
+                                        value: heartbeatJSON["time"],
+                                    },
+                                    {
+                                        short: false,
+                                        title: "Ping",
+                                        value: heartbeatJSON["ping"] + "ms",
+                                    },
+                                ],
+                            },
+                        ],
+                    };
+                    await axios.post(
+                        notification.mattermostWebhookUrl,
+                        mattermostupdata
+                    );
+                    return okMsg;
+                }
+            } catch (error) {
+                throwGeneralAxiosError(error);
+            }
+
         } else if (notification.type === "pushover") {
             let pushoverlink = "https://api.pushover.net/1/messages.json"
             try {
@@ -326,6 +511,88 @@ class Notification {
                 throwGeneralAxiosError(error)
             }
 
+        } else if (notification.type === "pushbullet") {
+            try {
+                let pushbulletUrl = "https://api.pushbullet.com/v2/pushes";
+                let config = {
+                    headers: {
+                        "Access-Token": notification.pushbulletAccessToken,
+                        "Content-Type": "application/json"
+                    }
+                };
+                if (heartbeatJSON == null) {
+                    let testdata = {
+                        "type": "note",
+                        "title": "Uptime Kuma Alert",
+                        "body": "Testing Successful.",
+                    }
+                    await axios.post(pushbulletUrl, testdata, config)
+                } else if (heartbeatJSON["status"] == 0) {
+                    let downdata = {
+                        "type": "note",
+                        "title": "UptimeKuma Alert:" + monitorJSON["name"],
+                        "body": "[🔴 Down]" + heartbeatJSON["msg"] + "\nTime (UTC):" + heartbeatJSON["time"],
+                    }
+                    await axios.post(pushbulletUrl, downdata, config)
+                } else if (heartbeatJSON["status"] == 1) {
+                    let updata = {
+                        "type": "note",
+                        "title": "UptimeKuma Alert:" + monitorJSON["name"],
+                        "body": "[✅ Up]" + heartbeatJSON["msg"] + "\nTime (UTC):" + heartbeatJSON["time"],
+                    }
+                    await axios.post(pushbulletUrl, updata, config)
+                }
+                return okMsg;
+            } catch (error) {
+                throwGeneralAxiosError(error)
+            }
+        } else if (notification.type === "line") {
+            try {
+                let lineAPIUrl = "https://api.line.me/v2/bot/message/push";
+                let config = {
+                    headers: {
+                        "Content-Type": "application/json",
+                        "Authorization": "Bearer " + notification.lineChannelAccessToken
+                    }
+                };
+                if (heartbeatJSON == null) {
+                    let testMessage = {
+                        "to": notification.lineUserID,
+                        "messages": [
+                            {
+                                "type": "text",
+                                "text": "Test Successful!"
+                            }
+                        ]
+                    }
+                    await axios.post(lineAPIUrl, testMessage, config)
+                } else if (heartbeatJSON["status"] == 0) {
+                    let downMessage = {
+                        "to": notification.lineUserID,
+                        "messages": [
+                            {
+                                "type": "text",
+                                "text": "UptimeKuma Alert: [🔴 Down]\n" + "Name: " + monitorJSON["name"] + " \n" + heartbeatJSON["msg"] + "\nTime (UTC): " + heartbeatJSON["time"]
+                            }
+                        ]
+                    }
+                    await axios.post(lineAPIUrl, downMessage, config)
+                } else if (heartbeatJSON["status"] == 1) {
+                    let upMessage = {
+                        "to": notification.lineUserID,
+                        "messages": [
+                            {
+                                "type": "text",
+                                "text": "UptimeKuma Alert: [✅ Up]\n" + "Name: " + monitorJSON["name"] + " \n" + heartbeatJSON["msg"] + "\nTime (UTC): " + heartbeatJSON["time"]
+                            }
+                        ]
+                    }
+                    await axios.post(lineAPIUrl, upMessage, config)
+                }
+                return okMsg;
+            } catch (error) {
+                throwGeneralAxiosError(error)
+            }
         } else {
             throw new Error("Notification type is not supported")
         }
@@ -369,15 +636,21 @@ class Notification {
 
     static async smtp(notification, msg) {
 
-        let transporter = nodemailer.createTransport({
+        const config = {
             host: notification.smtpHost,
             port: notification.smtpPort,
             secure: notification.smtpSecure,
-            auth: {
+        };
+
+        // Should fix the issue in https://github.com/louislam/uptime-kuma/issues/26#issuecomment-896373904
+        if (notification.smtpUsername || notification.smtpPassword) {
+            config.auth = {
                 user: notification.smtpUsername,
                 pass: notification.smtpPassword,
-            },
-        });
+            };
+        }
+
+        let transporter = nodemailer.createTransport(config);
 
         // send mail with defined transport object
         await transporter.sendMail({

server/password-hash.js

@@ -1,5 +1,5 @@
 const passwordHashOld = require("password-hash");
-const bcrypt = require("bcrypt");
+const bcrypt = require("bcryptjs");
 const saltRounds = 10;
 
 exports.generate = function (password) {

server/ping-lite.js

@@ -1,12 +1,13 @@
 // https://github.com/ben-bradley/ping-lite/blob/master/ping-lite.js
 // Fixed on Windows
-
-let spawn = require("child_process").spawn,
-    events = require("events"),
-    fs = require("fs"),
-    WIN = /^win/.test(process.platform),
-    LIN = /^linux/.test(process.platform),
-    MAC = /^darwin/.test(process.platform);
+const net = require("net");
+const spawn = require("child_process").spawn;
+const events = require("events");
+const fs = require("fs");
+const WIN = /^win/.test(process.platform);
+const LIN = /^linux/.test(process.platform);
+const MAC = /^darwin/.test(process.platform);
+const FBSD = /^freebsd/.test(process.platform);
 
 module.exports = Ping;
 
@@ -20,18 +21,48 @@ function Ping(host, options) {
 
     events.EventEmitter.call(this);
 
+    const timeout = 10;
+
     if (WIN) {
         this._bin = "c:/windows/system32/ping.exe";
-        this._args = (options.args) ? options.args : [ "-n", "1", "-w", "5000", host ];
+        this._args = (options.args) ? options.args : [ "-n", "1", "-w", timeout * 1000, host ];
         this._regmatch = /[><=]([0-9.]+?)ms/;
+
     } else if (LIN) {
         this._bin = "/bin/ping";
-        this._args = (options.args) ? options.args : [ "-n", "-w", "2", "-c", "1", host ];
-        this._regmatch = /=([0-9.]+?) ms/; // need to verify this
-    } else if (MAC) {
-        this._bin = "/sbin/ping";
-        this._args = (options.args) ? options.args : [ "-n", "-t", "2", "-c", "1", host ];
+
+        const defaultArgs = [ "-n", "-w", timeout, "-c", "1", host ];
+
+        if (net.isIPv6(host) || options.ipv6) {
+            defaultArgs.unshift("-6");
+        }
+
+        this._args = (options.args) ? options.args : defaultArgs;
         this._regmatch = /=([0-9.]+?) ms/;
+
+    } else if (MAC) {
+
+        if (net.isIPv6(host) || options.ipv6) {
+            this._bin = "/sbin/ping6";
+        } else {
+            this._bin = "/sbin/ping";
+        }
+
+        this._args = (options.args) ? options.args : [ "-n", "-t", timeout, "-c", "1", host ];
+        this._regmatch = /=([0-9.]+?) ms/;
+
+    } else if (FBSD) {
+        this._bin = "/sbin/ping";
+
+        const defaultArgs = [ "-n", "-t", timeout, "-c", "1", host ];
+
+        if (net.isIPv6(host) || options.ipv6) {
+            defaultArgs.unshift("-6");
+        }
+
+        this._args = (options.args) ? options.args : defaultArgs;
+        this._regmatch = /=([0-9.]+?) ms/;
+
     } else {
         throw new Error("Could not detect your ping binary.");
     }
@@ -49,40 +80,42 @@ Ping.prototype.__proto__ = events.EventEmitter.prototype;
 
 // SEND A PING
 // ===========
-Ping.prototype.send = function(callback) {
+Ping.prototype.send = function (callback) {
     let self = this;
-    callback = callback || function(err, ms) {
+    callback = callback || function (err, ms) {
         if (err) {
             return self.emit("error", err);
         }
         return self.emit("result", ms);
     };
 
-    let _ended, _exited, _errored;
+    let _ended;
+    let _exited;
+    let _errored;
 
     this._ping = spawn(this._bin, this._args); // spawn the binary
 
-    this._ping.on("error", function(err) { // handle binary errors
+    this._ping.on("error", function (err) { // handle binary errors
         _errored = true;
         callback(err);
     });
 
-    this._ping.stdout.on("data", function(data) { // log stdout
+    this._ping.stdout.on("data", function (data) { // log stdout
         this._stdout = (this._stdout || "") + data;
     });
 
-    this._ping.stdout.on("end", function() {
+    this._ping.stdout.on("end", function () {
         _ended = true;
         if (_exited && !_errored) {
             onEnd.call(self._ping);
         }
     });
 
-    this._ping.stderr.on("data", function(data) { // log stderr
+    this._ping.stderr.on("data", function (data) { // log stderr
         this._stderr = (this._stderr || "") + data;
     });
 
-    this._ping.on("exit", function(code) { // handle complete
+    this._ping.on("exit", function (code) { // handle complete
         _exited = true;
         if (_ended && !_errored) {
             onEnd.call(self._ping);
@@ -90,9 +123,9 @@ Ping.prototype.send = function(callback) {
     });
 
     function onEnd() {
-        let stdout = this.stdout._stdout,
-            stderr = this.stderr._stderr,
-            ms;
+        let stdout = this.stdout._stdout;
+        let stderr = this.stderr._stderr;
+        let ms;
 
         if (stderr) {
             return callback(new Error(stderr));
@@ -105,15 +138,15 @@ Ping.prototype.send = function(callback) {
         ms = stdout.match(self._regmatch); // parse out the ##ms response
         ms = (ms && ms[1]) ? Number(ms[1]) : ms;
 
-        callback(null, ms);
+        callback(null, ms, stdout);
     }
 };
 
 // CALL Ping#send(callback) ON A TIMER
 // ===================================
-Ping.prototype.start = function(callback) {
+Ping.prototype.start = function (callback) {
     let self = this;
-    this._i = setInterval(function() {
+    this._i = setInterval(function () {
         self.send(callback);
     }, (self._options.interval || 5000));
     self.send(callback);
@@ -121,6 +154,6 @@ Ping.prototype.start = function(callback) {
 
 // STOP SENDING PINGS
 // ==================
-Ping.prototype.stop = function() {
+Ping.prototype.stop = function () {
     clearInterval(this._i);
 };

server/prometheus.js

@@ -1,22 +1,33 @@
-const PrometheusClient = require('prom-client');
+const PrometheusClient = require("prom-client");
 
 const commonLabels = [
-    'monitor_name',
-    'monitor_type',
-    'monitor_url',
-    'monitor_hostname',
-    'monitor_port',
+    "monitor_name",
+    "monitor_type",
+    "monitor_url",
+    "monitor_hostname",
+    "monitor_port",
 ]
 
+const monitor_cert_days_remaining = new PrometheusClient.Gauge({
+    name: "monitor_cert_days_remaining",
+    help: "The number of days remaining until the certificate expires",
+    labelNames: commonLabels
+});
+
+const monitor_cert_is_valid = new PrometheusClient.Gauge({
+    name: "monitor_cert_is_valid",
+    help: "Is the certificate still valid? (1 = Yes, 0= No)",
+    labelNames: commonLabels
+});
 const monitor_response_time = new PrometheusClient.Gauge({
-    name: 'monitor_response_time',
-    help: 'Monitor Response Time (ms)',
+    name: "monitor_response_time",
+    help: "Monitor Response Time (ms)",
     labelNames: commonLabels
 });
 
 const monitor_status = new PrometheusClient.Gauge({
-    name: 'monitor_status',
-    help: 'Monitor Status (1 = UP, 0= DOWN)',
+    name: "monitor_status",
+    help: "Monitor Status (1 = UP, 0= DOWN)",
     labelNames: commonLabels
 });
 
@@ -33,7 +44,27 @@ class Prometheus {
         }
     }
 
-    update(heartbeat) {
+    update(heartbeat, tlsInfo) {
+        if (typeof tlsInfo !== "undefined") {
+            try {
+                let is_valid = 0
+                if (tlsInfo.valid == true) {
+                    is_valid = 1
+                } else {
+                    is_valid = 0
+                }
+                monitor_cert_is_valid.set(this.monitorLabelValues, is_valid)
+            } catch (e) {
+                console.error(e)
+            }
+
+            try {
+                monitor_cert_days_remaining.set(this.monitorLabelValues, tlsInfo.daysRemaining)
+            } catch (e) {
+                console.error(e)
+            }
+        }
+
         try {
             monitor_status.set(this.monitorLabelValues, heartbeat.status)
         } catch (e) {
@@ -41,7 +72,7 @@ class Prometheus {
         }
 
         try {
-            if (typeof heartbeat.ping === 'number') {
+            if (typeof heartbeat.ping === "number") {
                 monitor_response_time.set(this.monitorLabelValues, heartbeat.ping)
             } else {
                 // Is it good?

server/server.js

@@ -1,7 +1,7 @@
 console.log("Welcome to Uptime Kuma");
 console.log("Node Env: " + process.env.NODE_ENV);
 
-const { sleep, debug } = require("../src/util");
+const { sleep, debug, TimeLogger, getRandomInt } = require("../src/util");
 
 console.log("Importing Node libraries")
 const fs = require("fs");
@@ -12,8 +12,6 @@ debug("Importing express");
 const express = require("express");
 debug("Importing socket.io");
 const { Server } = require("socket.io");
-debug("Importing dayjs");
-const dayjs = require("dayjs");
 debug("Importing redbean-node");
 const { R } = require("redbean-node");
 debug("Importing jsonwebtoken");
@@ -39,11 +37,13 @@ const passwordHash = require("./password-hash");
 
 const args = require("args-parser")(process.argv);
 
-const version = require("../package.json").version;
-const hostname = process.env.HOST || args.host || "0.0.0.0"
-const port = parseInt(process.env.PORT || args.port || 3001);
+const checkVersion = require("./check-version");
+console.info("Version: " + checkVersion.version);
 
-console.info("Version: " + 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 (::)
+const hostname = process.env.HOST || args.host;
+const port = parseInt(process.env.PORT || args.port || 3001);
 
 console.log("Creating express and socket.io instance")
 const app = express();
@@ -115,7 +115,8 @@ let indexHTML = fs.readFileSync("./dist/index.html").toString();
     io.on("connection", async (socket) => {
 
         socket.emit("info", {
-            version,
+            version: checkVersion.version,
+            latestVersion: checkVersion.latestVersion,
         })
 
         totalClient++;
@@ -147,7 +148,7 @@ let indexHTML = fs.readFileSync("./dist/index.html").toString();
                 if (user) {
                     debug("afterLogin")
 
-                    await afterLogin(socket, user)
+                    afterLogin(socket, user)
 
                     debug("afterLogin ok")
 
@@ -175,7 +176,7 @@ let indexHTML = fs.readFileSync("./dist/index.html").toString();
             let user = await login(data.username, data.password)
 
             if (user) {
-                await afterLogin(socket, user)
+                afterLogin(socket, user)
 
                 callback({
                     ok: true,
@@ -290,6 +291,8 @@ let indexHTML = fs.readFileSync("./dist/index.html").toString();
                 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;
 
                 await R.store(bean)
 
@@ -558,7 +561,7 @@ let indexHTML = fs.readFileSync("./dist/index.html").toString();
         debug("check auto login")
         if (await setting("disableAuth")) {
             console.log("Disabled Auth: auto login to admin")
-            await afterLogin(socket, await R.findOne("user"))
+            afterLogin(socket, await R.findOne("user"))
             socket.emit("autoLogin")
         } else {
             debug("need auth")
@@ -566,16 +569,27 @@ let indexHTML = fs.readFileSync("./dist/index.html").toString();
 
     });
 
-    console.log("Init")
+    console.log("Init the server")
+
+    server.once("error", async (err) => {
+        console.error("Cannot listen: " + err.message);
+        await Database.close();
+    });
+
     server.listen(port, hostname, () => {
-        console.log(`Listening on ${hostname}:${port}`);
+        if (hostname) {
+            console.log(`Listening on ${hostname}:${port}`);
+        } else {
+            console.log(`Listening on ${port}`);
+        }
         startMonitors();
+        checkVersion.startInterval();
     });
 
 })();
 
 async function updateMonitorNotification(monitorID, notificationIDList) {
-    R.exec("DELETE FROM monitor_notification WHERE monitor_id = ? ", [
+    await R.exec("DELETE FROM monitor_notification WHERE monitor_id = ? ", [
         monitorID,
     ])
 
@@ -607,6 +621,8 @@ async function sendMonitorList(socket) {
 }
 
 async function sendNotificationList(socket) {
+    const timeLogger = new TimeLogger();
+
     let result = [];
     let list = await R.find("notification", " user_id = ? ", [
         socket.userID,
@@ -617,6 +633,9 @@ async function sendNotificationList(socket) {
     }
 
     io.to(socket.userID).emit("notificationList", result)
+
+    timeLogger.print("Send Notification List");
+
     return list;
 }
 
@@ -625,24 +644,27 @@ async function afterLogin(socket, user) {
     socket.join(user.id)
 
     let monitorList = await sendMonitorList(socket)
-
     sendNotificationList(socket)
 
-    // Delay a bit, so that it let the main page to query the data first, since SQLite can process one sql at the same time only.
-    // For example, query the edit data first.
-    setTimeout(() => {
-        for (let monitorID in monitorList) {
-            sendHeartbeatList(socket, monitorID);
-            sendImportantHeartbeatList(socket, monitorID);
-            Monitor.sendStats(io, monitorID, user.id)
-        }
-    }, 500);
+    await sleep(500);
+
+    for (let monitorID in monitorList) {
+        await sendHeartbeatList(socket, monitorID);
+    }
+
+    for (let monitorID in monitorList) {
+        await sendImportantHeartbeatList(socket, monitorID);
+    }
+
+    for (let monitorID in monitorList) {
+        await Monitor.sendStats(io, monitorID, user.id)
+    }
 }
 
 async function getMonitorJSONList(userID) {
     let result = {};
 
-    let monitorList = await R.find("monitor", " user_id = ? ", [
+    let monitorList = await R.find("monitor", " user_id = ? ORDER BY weight DESC, name", [
         userID,
     ])
 
@@ -741,15 +763,22 @@ async function startMonitors() {
     let list = await R.find("monitor", " active = 1 ")
 
     for (let monitor of list) {
-        monitor.start(io)
         monitorList[monitor.id] = monitor;
     }
+
+    for (let monitor of list) {
+        monitor.start(io);
+        // Give some delays, so all monitors won't make request at the same moment when just start the server.
+        await sleep(getRandomInt(300, 1000));
+    }
 }
 
 /**
  * Send Heartbeat History list to socket
  */
 async function sendHeartbeatList(socket, monitorID) {
+    const timeLogger = new TimeLogger();
+
     let list = await R.find("heartbeat", `
         monitor_id = ?
         ORDER BY time DESC
@@ -765,9 +794,13 @@ async function sendHeartbeatList(socket, monitorID) {
     }
 
     socket.emit("heartbeatList", monitorID, result)
+
+    timeLogger.print(`[Monitor: ${monitorID}] sendHeartbeatList`)
 }
 
 async function sendImportantHeartbeatList(socket, monitorID) {
+    const timeLogger = new TimeLogger();
+
     let list = await R.find("heartbeat", `
         monitor_id = ?
         AND important = 1
@@ -777,6 +810,8 @@ async function sendImportantHeartbeatList(socket, monitorID) {
         monitorID,
     ])
 
+    timeLogger.print(`[Monitor: ${monitorID}] sendImportantHeartbeatList`);
+
     socket.emit("importantHeartbeatList", monitorID, list)
 }
 
@@ -791,11 +826,10 @@ async function shutdownFunction(signal) {
     }
     await sleep(2000);
     await Database.close();
-    console.log("Stopped DB")
 }
 
 function finalFunction() {
-    console.log("Graceful Shutdown Done")
+    console.log("Graceful shutdown successfully!");
 }
 
 gracefulShutdown(server, {
@@ -806,3 +840,9 @@ gracefulShutdown(server, {
     onShutdown: shutdownFunction,     // shutdown function (async) - e.g. for cleanup DB, ...
     finally: finalFunction,            // finally function (sync) - e.g. for logging
 });
+
+// Catch unexpected errors here
+process.addListener("unhandledRejection", (error, promise) => {
+    console.trace(error);
+    console.error("If you keep encountering errors, please report to https://github.com/louislam/uptime-kuma/issues");
+});

server/util-server.js

@@ -4,6 +4,7 @@ const { R } = require("redbean-node");
 const { debug } = require("../src/util");
 const passwordHash = require("./password-hash");
 const dayjs = require("dayjs");
+const { Resolver } = require("dns");
 
 /**
  * Init or reset JWT secret
@@ -45,15 +46,30 @@ exports.tcping = function (hostname, port) {
     });
 }
 
-exports.ping = function (hostname) {
-    return new Promise((resolve, reject) => {
-        const ping = new Ping(hostname);
+exports.ping = async (hostname) => {
+    try {
+        return await exports.pingAsync(hostname);
+    } catch (e) {
+        // If the host cannot be resolved, try again with ipv6
+        if (e.message.includes("service not known")) {
+            return await exports.pingAsync(hostname, true);
+        } else {
+            throw e;
+        }
+    }
+}
 
-        ping.send(function (err, ms) {
+exports.pingAsync = function (hostname, ipv6 = false) {
+    return new Promise((resolve, reject) => {
+        const ping = new Ping(hostname, {
+            ipv6
+        });
+
+        ping.send(function (err, ms, stdout) {
             if (err) {
-                reject(err)
+                reject(err);
             } else if (ms === null) {
-                reject(new Error("timeout"))
+                reject(new Error(stdout))
             } else {
                 resolve(Math.round(ms))
             }
@@ -61,6 +77,30 @@ exports.ping = function (hostname) {
     });
 }
 
+exports.dnsResolve = function (hostname, resolver_server, rrtype) {
+    const resolver = new Resolver();
+    resolver.setServers([resolver_server]);
+    return new Promise((resolve, reject) => {
+        if (rrtype == "PTR") {
+            resolver.reverse(hostname, (err, records) => {
+                if (err) {
+                    reject(err);
+                } else {
+                    resolve(records);
+                }
+            });
+        } else {
+            resolver.resolve(hostname, rrtype, (err, records) => {
+                if (err) {
+                    reject(err);
+                } else {
+                    resolve(records);
+                }
+            });
+        }
+    })
+}
+
 exports.setting = async function (key) {
     let value = await R.getCell("SELECT `value` FROM setting WHERE `key` = ? ", [
         key,
@@ -208,3 +248,26 @@ exports.checkStatusCode = function (status, accepted_codes) {
 
     return false;
 }
+
+exports.getTotalClientInRoom = (io, roomName) => {
+
+    const sockets = io.sockets;
+
+    if (! sockets) {
+        return 0;
+    }
+
+    const adapter = sockets.adapter;
+
+    if (! adapter) {
+        return 0;
+    }
+
+    const room = adapter.rooms.get(roomName);
+
+    if (room) {
+        return room.size;
+    } else {
+        return 0;
+    }
+}

src/assets/app.scss

@@ -2,12 +2,11 @@
 @import "node_modules/bootstrap/scss/bootstrap";
 
 #app {
-    font-family: ui-sans-serif,system-ui,-apple-system,BlinkMacSystemFont,segoe ui,Roboto,helvetica neue,Arial,noto sans,sans-serif,apple color emoji,segoe ui emoji,segoe ui symbol,noto color emoji;
+    font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, segoe ui, Roboto, helvetica neue, Arial, noto sans, sans-serif, apple color emoji, segoe ui emoji, segoe ui symbol, noto color emoji;
 }
 
 h1 {
-    font-size: 31px;
-    height: 38px;
+    font-size: 32px;
 }
 
 h2 {
@@ -19,7 +18,7 @@ h2 {
 }
 
 ::-webkit-scrollbar-thumb {
-    background: #CCC;
+    background: #ccc;
     border-radius: 20px;
 }
 
@@ -29,7 +28,7 @@ h2 {
 
 .modal-content {
     border-radius: 1rem;
-    box-shadow: 0 15px 70px rgba(0, 0, 0, .1);
+    box-shadow: 0 15px 70px rgba(0, 0, 0, 0.1);
 
     .dark & {
         box-shadow: 0 15px 70px rgb(0 0 0);
@@ -42,10 +41,9 @@ h2 {
     text-align: center;
 }
 
-
 .shadow-box {
     //overflow: hidden;   // Forget why add this, but multiple select hide by this
-    box-shadow: 0 15px 70px rgba(0, 0, 0, .1);
+    box-shadow: 0 15px 70px rgba(0, 0, 0, 0.1);
     padding: 10px;
     border-radius: 10px;
 
@@ -73,14 +71,67 @@ h2 {
     }
 }
 
+.btn-info {
+    color: white;
 
+    &:hover, &:active, &:focus, &.active {
+        color: white;
+    }
+}
+
+@media (max-width: 550px) {
+    .table-shadow-box {
+        padding: 10px !important;
+
+        thead {
+            display: none;
+        }
+
+        tbody {
+            .shadow-box {
+                background-color: white;
+            }
+        }
+
+        tr {
+            margin-top: 0 !important;
+            padding: 4px 10px !important;
+            display: block;
+            margin-bottom: 6px;
+
+            td:first-child {
+                font-weight: bold;
+            }
+
+            td:nth-child(-n+3) {
+                text-align: center;
+            }
+
+            td:last-child {
+                text-align: left;
+            }
+
+            td {
+                border-bottom: 1px solid $dark-font-color;
+                display: block;
+                padding: 4px;
+
+                .badge {
+                    margin: auto;
+                    display: block;
+                    width: 30%;
+                }
+            }
+        }
+    }
+}
 
 // Dark Theme override here
 .dark {
-    background-color: #090C10;
+    background-color: #090c10;
     color: $dark-font-color;
 
-    &::-webkit-scrollbar-thumb {
+    &::-webkit-scrollbar-thumb, ::-webkit-scrollbar-thumb {
         background: $dark-border-color;
     }
 
@@ -100,6 +151,10 @@ h2 {
     .table,
     .nav-link {
         color: $dark-font-color;
+
+        &.btn-info {
+            color: white;
+        }
     }
 
     .form-control,
@@ -115,7 +170,7 @@ h2 {
     }
 
     .table-hover > tbody > tr:hover {
-        --bs-table-accent-bg: #070A10;
+        --bs-table-accent-bg: #070a10;
         color: $dark-font-color;
     }
 
@@ -132,7 +187,12 @@ h2 {
     }
 
     .btn-close {
-        opacity: 1;
+        box-shadow: none;
+        filter: invert(1);
+
+        &:hover {
+            opacity: 0.6;
+        }
     }
 
     .modal-header {
@@ -178,4 +238,37 @@ h2 {
     .multiselect__option--selected {
         background-color: $dark-bg;
     }
+
+    @media (max-width: 550px) {
+        .table-shadow-box {
+            tbody {
+                .shadow-box {
+                    background-color: $dark-bg2;
+
+                    td {
+                        border-bottom: 1px solid $dark-border-color;
+                    }
+                }
+            }
+        }
+    }
+}
+
+/*
+ * Transitions
+ */
+
+// page-change
+.slide-fade-enter-active {
+    transition: all 0.2s $easing-in;
+}
+
+.slide-fade-leave-active {
+    transition: all 0.2s $easing-in;
+}
+
+.slide-fade-enter-from,
+.slide-fade-leave-to {
+    transform: translateY(50px);
+    opacity: 0;
 }

src/assets/vars.scss

@@ -1,5 +1,5 @@
-$primary: #5CDD8B;
-$danger: #DC3545;
+$primary: #5cdd8b;
+$danger: #dc3545;
 $warning: #f8a306;
 $link-color: #111;
 $border-radius: 50rem;
@@ -9,6 +9,10 @@ $highlight-white: #e7faec;
 
 $dark-font-color: #b1b8c0;
 $dark-font-color2: #020b05;
-$dark-bg: #0D1117;
-$dark-bg2: #070A10;
+$dark-bg: #0d1117;
+$dark-bg2: #070a10;
 $dark-border-color: #1d2634;
+
+$easing-in: cubic-bezier(0.54, 0.78, 0.55, 0.97);
+$easing-out: cubic-bezier(0.25, 0.46, 0.45, 0.94);
+$easing-in-out: cubic-bezier(0.79, 0.14, 0.15, 0.86);

src/components/Confirm.vue

@@ -4,7 +4,7 @@
             <div class="modal-content">
                 <div class="modal-header">
                     <h5 id="exampleModalLabel" class="modal-title">
-                        Confirm
+                        {{ $t("Confirm") }}
                     </h5>
                     <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close" />
                 </div>
@@ -35,7 +35,7 @@ export default {
         },
         yesText: {
             type: String,
-            default: "Yes",
+            default: "Yes",     // TODO: No idea what to translate this
         },
         noText: {
             type: String,

src/components/Datetime.vue

@@ -22,15 +22,11 @@ export default {
 
     computed: {
         displayText() {
-            if (this.value !== undefined && this.value !== "") {
-                let format = "YYYY-MM-DD HH:mm:ss";
-                if (this.dateOnly) {
-                    format = "YYYY-MM-DD";
-                }
-                return dayjs.utc(this.value).tz(this.$root.timezone).format(format);
+            if (this.dateOnly) {
+                return this.$root.date(this.value);
+            } else {
+                return this.$root.datetime(this.value);
             }
-
-            return "";
         },
     },
 }

src/components/HeartbeatBar.vue

@@ -7,7 +7,7 @@
                 class="beat"
                 :class="{ 'empty' : (beat === 0), 'down' : (beat.status === 0), 'pending' : (beat.status === 2) }"
                 :style="beatStyle"
-                :title="beat.msg"
+                :title="getBeatTitle(beat)"
             />
         </div>
     </div>
@@ -21,7 +21,10 @@ export default {
             type: String,
             default: "big",
         },
-        monitorId: Number,
+        monitorId: {
+            type: Number,
+            required: true,
+        },
     },
     data() {
         return {
@@ -36,14 +39,15 @@ export default {
     computed: {
 
         beatList() {
-            if (! (this.monitorId in this.$root.heartbeatList)) {
-                this.$root.heartbeatList[this.monitorId] = [];
-            }
             return this.$root.heartbeatList[this.monitorId]
         },
 
         shortBeatList() {
-            let placeholders = []
+            if (! this.beatList) {
+                return [];
+            }
+
+            let placeholders = [];
 
             let start = this.beatList.length - this.maxBeat;
 
@@ -113,6 +117,11 @@ export default {
     unmounted() {
         window.removeEventListener("resize", this.resize);
     },
+    beforeMount() {
+        if (! (this.monitorId in this.$root.heartbeatList)) {
+            this.$root.heartbeatList[this.monitorId] = [];
+        }
+    },
     mounted() {
         if (this.size === "small") {
             this.beatWidth = 5.6;
@@ -129,6 +138,10 @@ export default {
                 this.maxBeat = Math.floor(this.$refs.wrap.clientWidth / (this.beatWidth + this.beatMargin * 2))
             }
         },
+
+        getBeatTitle(beat) {
+            return `${this.$root.datetime(beat.time)} - ${beat.msg}`;
+        }
     },
 }
 </script>
@@ -150,10 +163,6 @@ export default {
 
         &.empty {
             background-color: aliceblue;
-
-            .dark & {
-                background-color: #d0d3d5;
-            }
         }
 
         &.down {
@@ -173,7 +182,7 @@ export default {
 }
 
 .dark {
-    .hp-bar-big .beat.empty{
+    .hp-bar-big .beat.empty {
         background-color: #848484;
     }
 }

src/components/Login.vue

@@ -6,12 +6,12 @@
 
                 <div class="form-floating">
                     <input id="floatingInput" v-model="username" type="text" class="form-control" placeholder="Username">
-                    <label for="floatingInput">Username</label>
+                    <label for="floatingInput">{{ $t("Username") }}</label>
                 </div>
 
                 <div class="form-floating mt-3">
                     <input id="floatingPassword" v-model="password" type="password" class="form-control" placeholder="Password">
-                    <label for="floatingPassword">Password</label>
+                    <label for="floatingPassword">{{ $t("Password") }}</label>
                 </div>
 
                 <div class="form-check mb-3 mt-3 d-flex justify-content-center pe-4">
@@ -19,12 +19,12 @@
                         <input id="remember" v-model="$root.remember" type="checkbox" value="remember-me" class="form-check-input">
 
                         <label class="form-check-label" for="remember">
-                            Remember me
+                            {{ $t("Remember me") }}
                         </label>
                     </div>
                 </div>
                 <button class="w-100 btn btn-primary" type="submit" :disabled="processing">
-                    Login
+                    {{ $t("Login") }}
                 </button>
 
                 <div v-if="res && !res.ok" class="alert alert-danger mt-3" role="alert">

src/components/MonitorList.vue

@@ -0,0 +1,143 @@
+<template>
+    <div class="shadow-box list mb-3" :class="{ scrollbar: scrollbar }">
+        <div v-if="Object.keys($root.monitorList).length === 0" class="text-center mt-3">
+            {{ $t("No Monitors, please") }} <router-link to="/add">{{ $t("add one") }}</router-link>
+        </div>
+
+        <router-link v-for="(item, index) in sortedMonitorList" :key="index" :to="monitorURL(item.id)" class="item" :class="{ 'disabled': ! item.active }">
+            <div class="row">
+                <div class="col-6 col-md-8 small-padding" :class="{ 'monitorItem': $root.userHeartbeatBar == 'bottom' || $root.userHeartbeatBar == 'none' }">
+                    <div class="info">
+                        <Uptime :monitor="item" type="24" :pill="true" />
+                        {{ item.name }}
+                    </div>
+                </div>
+                <div v-show="$root.userHeartbeatBar == 'normal'" :key="$root.userHeartbeatBar" class="col-6 col-md-4">
+                    <HeartbeatBar size="small" :monitor-id="item.id" />
+                </div>
+            </div>
+
+            <div v-if="$root.userHeartbeatBar == 'bottom'" class="row">
+                <div class="col-12">
+                    <HeartbeatBar size="small" :monitor-id="item.id" />
+                </div>
+            </div>
+        </router-link>
+    </div>
+</template>
+
+<script>
+import HeartbeatBar from "../components/HeartbeatBar.vue";
+import Uptime from "../components/Uptime.vue";
+export default {
+    components: {
+        Uptime,
+        HeartbeatBar,
+    },
+    props: {
+        scrollbar: {
+            type: Boolean,
+        },
+    },
+    computed: {
+        sortedMonitorList() {
+            let result = Object.values(this.$root.monitorList);
+
+            result.sort((m1, m2) => {
+
+                if (m1.active !== m2.active) {
+                    if (m1.active === 0) {
+                        return 1;
+                    }
+
+                    if (m2.active === 0) {
+                        return -1;
+                    }
+                }
+
+                if (m1.weight !== m2.weight) {
+                    if (m1.weight > m2.weight) {
+                        return -1;
+                    }
+
+                    if (m1.weight < m2.weight) {
+                        return 1;
+                    }
+                }
+
+                return m1.name.localeCompare(m2.name);
+            })
+
+            return result;
+        },
+    },
+    methods: {
+        monitorURL(id) {
+            return "/dashboard/" + id;
+        },
+    },
+}
+</script>
+
+<style lang="scss" scoped>
+@import "../assets/vars.scss";
+
+.small-padding {
+    padding-left: 5px !important;
+    padding-right: 5px !important;
+}
+
+.list {
+    &.scrollbar {
+        min-height: calc(100vh - 240px);
+        max-height: calc(100vh - 30px);
+        overflow-y: auto;
+        position: sticky;
+        top: 10px;
+    }
+
+    .item {
+        display: block;
+        text-decoration: none;
+        padding: 13px 15px 10px 15px;
+        border-radius: 10px;
+        transition: all ease-in-out 0.15s;
+
+        &.disabled {
+            opacity: 0.3;
+        }
+
+        .info {
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+        }
+
+        &:hover {
+            background-color: $highlight-white;
+        }
+
+        &.active {
+            background-color: #cdf8f4;
+        }
+    }
+}
+
+.dark {
+    .list {
+        .item {
+            &:hover {
+                background-color: $dark-bg2;
+            }
+
+            &.active {
+                background-color: $dark-bg2;
+            }
+        }
+    }
+}
+
+.monitorItem {
+    width: 100%;
+}
+</style>

src/components/NotificationDialog.vue

@@ -5,30 +5,35 @@
                 <div class="modal-content">
                     <div class="modal-header">
                         <h5 id="exampleModalLabel" class="modal-title">
-                            Setup Notification
+                            {{ $t("Setup Notification") }}
                         </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="type" class="form-label">Notification Type</label>
+                            <label for="type" class="form-label">{{ $t("Notification Type") }}</label>
                             <select id="type" v-model="notification.type" class="form-select">
                                 <option value="telegram">Telegram</option>
                                 <option value="webhook">Webhook</option>
-                                <option value="smtp">Email (SMTP)</option>
+                                <option value="smtp">{{ $t("Email") }} (SMTP)</option>
                                 <option value="discord">Discord</option>
                                 <option value="signal">Signal</option>
                                 <option value="gotify">Gotify</option>
                                 <option value="slack">Slack</option>
+                                <option value="rocket.chat">Rocket.chat</option>
                                 <option value="pushover">Pushover</option>
                                 <option value="pushy">Pushy</option>
+                                <option value="octopush">Octopush</option>
                                 <option value="lunasea">LunaSea</option>
                                 <option value="apprise">Apprise (Support 50+ Notification services)</option>
+                                <option value="pushbullet">Pushbullet</option>
+                                <option value="line">Line Messenger</option>
+                                <option value="mattermost">Mattermost</option>
                             </select>
                         </div>
 
                         <div class="mb-3">
-                            <label for="name" class="form-label">Friendly Name</label>
+                            <label for="name" class="form-label">{{ $t("Friendly Name") }}</label>
                             <input id="name" v-model="notification.name" type="text" class="form-control" required>
                         </div>
 
@@ -207,7 +212,7 @@
 
                         <template v-if="notification.type === 'slack'">
                             <div class="mb-3">
-                                <label for="slack-webhook-url" class="form-label">Webhook URL<span style="color:red;"><sup>*</sup></span></label>
+                                <label for="slack-webhook-url" class="form-label">Webhook URL<span style="color: red;"><sup>*</sup></span></label>
                                 <input id="slack-webhook-url" v-model="notification.slackwebhookURL" type="text" class="form-control" required>
                                 <label for="slack-username" class="form-label">Username</label>
                                 <input id="slack-username" v-model="notification.slackusername" type="text" class="form-control">
@@ -218,7 +223,7 @@
                                 <label for="slack-button-url" class="form-label">Uptime Kuma URL</label>
                                 <input id="slack-button" v-model="notification.slackbutton" type="text" class="form-control">
                                 <div class="form-text">
-                                    <span style="color:red;"><sup>*</sup></span>Required
+                                    <span style="color: red;"><sup>*</sup></span>Required
                                     <p style="margin-top: 8px;">
                                         More info about webhooks on: <a href="https://api.slack.com/messaging/webhooks" target="_blank">https://api.slack.com/messaging/webhooks</a>
                                     </p>
@@ -235,6 +240,69 @@
                             </div>
                         </template>
 
+                        <template v-if="notification.type === 'rocket.chat'">
+                            <div class="mb-3">
+                                <label for="rocket-webhook-url" class="form-label">Webhook URL<span style="color: red;"><sup>*</sup></span></label>
+                                <input id="rocket-webhook-url" v-model="notification.rocketwebhookURL" type="text" class="form-control" required>
+                                <label for="rocket-username" class="form-label">Username</label>
+                                <input id="rocket-username" v-model="notification.rocketusername" type="text" class="form-control">
+                                <label for="rocket-iconemo" class="form-label">Icon Emoji</label>
+                                <input id="rocket-iconemo" v-model="notification.rocketiconemo" type="text" class="form-control">
+                                <label for="rocket-channel" class="form-label">Channel Name</label>
+                                <input id="rocket-channel-name" v-model="notification.rocketchannel" type="text" class="form-control">
+                                <label for="rocket-button-url" class="form-label">Uptime Kuma URL</label>
+                                <input id="rocket-button" v-model="notification.rocketbutton" type="text" class="form-control">
+                                <div class="form-text">
+                                    <span style="color: red;"><sup>*</sup></span>Required
+                                    <p style="margin-top: 8px;">
+                                        More info about webhooks on: <a href="https://docs.rocket.chat/guides/administration/administration/integrations" target="_blank">https://api.slack.com/messaging/webhooks</a>
+                                    </p>
+                                    <p style="margin-top: 8px;">
+                                        Enter the channel name on Rocket.chat Channel Name field if you want to bypass the webhook channel. Ex: #other-channel
+                                    </p>
+                                    <p style="margin-top: 8px;">
+                                        If you leave the Uptime Kuma URL field blank, it will default to the Project Github page.
+                                    </p>
+                                    <p style="margin-top: 8px;">
+                                        Emoji cheat sheet: <a href="https://www.webfx.com/tools/emoji-cheat-sheet/" target="_blank">https://www.webfx.com/tools/emoji-cheat-sheet/</a>
+                                    </p>
+                                </div>
+                            </div>
+                        </template>
+
+                        <template v-if="notification.type === 'mattermost'">
+                            <div class="mb-3">
+                                <label for="mattermost-webhook-url" class="form-label">Webhook URL<span style="color:red;"><sup>*</sup></span></label>
+                                <input id="mattermost-webhook-url" v-model="notification.mattermostWebhookUrl" type="text" class="form-control" required>
+                                <label for="mattermost-username" class="form-label">Username</label>
+                                <input id="mattermost-username" v-model="notification.mattermostusername" type="text" class="form-control">
+                                <label for="mattermost-iconurl" class="form-label">Icon URL</label>
+                                <input id="mattermost-iconurl" v-model="notification.mattermosticonurl" type="text" class="form-control">
+                                <label for="mattermost-iconemo" class="form-label">Icon Emoji</label>
+                                <input id="mattermost-iconemo" v-model="notification.mattermosticonemo" type="text" class="form-control">
+                                <label for="mattermost-channel" class="form-label">Channel Name</label>
+                                <input id="mattermost-channel-name" v-model="notification.mattermostchannel" type="text" class="form-control">
+                                <div class="form-text">
+                                    <span style="color:red;"><sup>*</sup></span>Required
+                                    <p style="margin-top: 8px;">
+                                        More info about webhooks on: <a href="https://docs.mattermost.com/developer/webhooks-incoming.html" target="_blank">https://docs.mattermost.com/developer/webhooks-incoming.html</a>
+                                    </p>
+                                    <p style="margin-top: 8px;">
+                                        You can override the default channel that webhook posts to by entering the channel name into "Channel Name" field. This needs to be enabled in Mattermost webhook settings. Ex: #other-channel
+                                    </p>
+                                    <p style="margin-top: 8px;">
+                                        If you leave the Uptime Kuma URL field blank, it will default to the Project Github page.
+                                    </p>
+                                    <p style="margin-top: 8px;">
+                                        You can provide a link to a picture in "Icon URL" to override the default profile picture. Will not be used if Icon Emoji is set.
+                                    </p>
+                                    <p style="margin-top: 8px;">
+                                        Emoji cheat sheet: <a href="https://www.webfx.com/tools/emoji-cheat-sheet/" target="_blank">https://www.webfx.com/tools/emoji-cheat-sheet/</a> Note: emoji takes preference over Icon URL.
+                                    </p>
+                                </div>
+                            </div>
+                        </template>
+
                         <template v-if="notification.type === 'pushy'">
                             <div class="mb-3">
                                 <label for="pushy-app-token" class="form-label">API_KEY</label>
@@ -252,11 +320,42 @@
                             </p>
                         </template>
 
+                        <template v-if="notification.type === 'octopush'">
+                            <div class="mb-3">
+                                <label for="octopush-key" class="form-label">API KEY</label>
+                                <input id="octopush-key" v-model="notification.octopushAPIKey" type="text" class="form-control" required>
+                                <label for="octopush-login" class="form-label">API LOGIN</label>
+                                <input id="octopush-login" v-model="notification.octopushLogin" type="text" class="form-control" required>
+                            </div>
+                            <div class="mb-3">
+                                <label for="octopush-type-sms" class="form-label">SMS Type</label>
+                                <select id="octopush-type-sms" v-model="notification.octopushSMSType" class="form-select">
+                                    <option value="sms_premium">Premium (Fast - recommended for alerting)</option>
+                                    <option value="sms_low_cost">Low Cost (Slow, sometimes blocked by operator)</option>
+                                </select>
+                                <div class="form-text">
+                                    Check octopush prices <a href="https://octopush.com/tarifs-sms-international/" target="_blank">https://octopush.com/tarifs-sms-international/</a>.
+                                </div>
+                            </div>
+                            <div class="mb-3">
+                                <label for="octopush-phone-number" class="form-label">Phone number (intl format, eg : +33612345678) </label>
+                                <input id="octopush-phone-number" v-model="notification.octopushPhoneNumber" type="text" class="form-control" required>
+                            </div>
+                            <div class="mb-3">
+                                <label for="octopush-sender-name" class="form-label">SMS Sender Name : 3-11 alphanumeric characters and space (a-zA-Z0-9)</label>
+                                <input id="octopush-sender-name" v-model="notification.octopushSenderName" type="text" minlength="3" maxlength="11" class="form-control">
+                            </div>
+
+                            <p style="margin-top: 8px;">
+                                More info on: <a href="https://octopush.com/api-sms-documentation/envoi-de-sms/" target="_blank">https://octopush.com/api-sms-documentation/envoi-de-sms/</a>
+                            </p>
+                        </template>
+
                         <template v-if="notification.type === 'pushover'">
                             <div class="mb-3">
-                                <label for="pushover-user" class="form-label">User Key<span style="color:red;"><sup>*</sup></span></label>
+                                <label for="pushover-user" class="form-label">User Key<span style="color: red;"><sup>*</sup></span></label>
                                 <input id="pushover-user" v-model="notification.pushoveruserkey" type="text" class="form-control" required>
-                                <label for="pushover-app-token" class="form-label">Application Token<span style="color:red;"><sup>*</sup></span></label>
+                                <label for="pushover-app-token" class="form-label">Application Token<span style="color: red;"><sup>*</sup></span></label>
                                 <input id="pushover-app-token" v-model="notification.pushoverapptoken" type="text" class="form-control" required>
                                 <label for="pushover-device" class="form-label">Device</label>
                                 <input id="pushover-device" v-model="notification.pushoverdevice" type="text" class="form-control">
@@ -296,7 +395,7 @@
                                     <option>none</option>
                                 </select>
                                 <div class="form-text">
-                                    <span style="color:red;"><sup>*</sup></span>Required
+                                    <span style="color: red;"><sup>*</sup></span>Required
                                     <p style="margin-top: 8px;">
                                         More info on: <a href="https://pushover.net/api" target="_blank">https://pushover.net/api</a>
                                     </p>
@@ -332,23 +431,54 @@
 
                         <template v-if="notification.type === 'lunasea'">
                             <div class="mb-3">
-                                <label for="lunasea-device" class="form-label">LunaSea Device ID<span style="color:red;"><sup>*</sup></span></label>
+                                <label for="lunasea-device" class="form-label">LunaSea Device ID<span style="color: red;"><sup>*</sup></span></label>
                                 <input id="lunasea-device" v-model="notification.lunaseaDevice" type="text" class="form-control" required>
                                 <div class="form-text">
-                                    <p><span style="color:red;"><sup>*</sup></span>Required</p>
+                                    <p><span style="color: red;"><sup>*</sup></span>Required</p>
                                 </div>
                             </div>
                         </template>
+
+                        <template v-if="notification.type === 'pushbullet'">
+                            <div class="mb-3">
+                                <label for="pushbullet-access-token" class="form-label">Access Token</label>
+                                <input id="pushbullet-access-token" v-model="notification.pushbulletAccessToken" type="text" class="form-control" required>
+                            </div>
+
+                            <p style="margin-top: 8px;">
+                                More info on: <a href="https://docs.pushbullet.com" target="_blank">https://docs.pushbullet.com</a>
+                            </p>
+                        </template>
+
+                        <template v-if="notification.type === 'line'">
+                            <div class="mb-3">
+                                <label for="line-channel-access-token" class="form-label">Channel access token</label>
+                                <input id="line-channel-access-token" v-model="notification.lineChannelAccessToken" type="text" class="form-control" required>
+                            </div>
+                            <div class="form-text">
+                                Line Developers Console - <b>Basic Settings</b>
+                            </div>
+                            <div class="mb-3" style="margin-top: 12px;">
+                                <label for="line-user-id" class="form-label">User ID</label>
+                                <input id="line-user-id" v-model="notification.lineUserID" type="text" class="form-control" required>
+                            </div>
+                            <div class="form-text">
+                                Line Developers Console - <b>Messaging API</b>
+                            </div>
+                            <div class="form-text" style="margin-top: 8px;">
+                                First access the <a href="https://developers.line.biz/console/" target="_blank">Line Developers Console</a>, create a provider and channel (Messaging API), then you can get the channel access token and user id from the above mentioned menu items.
+                            </div>
+                        </template>
                     </div>
                     <div class="modal-footer">
                         <button v-if="id" type="button" class="btn btn-danger" :disabled="processing" @click="deleteConfirm">
-                            Delete
+                            {{ $t("Delete") }}
                         </button>
                         <button type="button" class="btn btn-warning" :disabled="processing" @click="test">
-                            Test
+                            {{ $t("Test") }}
                         </button>
                         <button type="submit" class="btn btn-primary" :disabled="processing">
-                            Save
+                            {{ $t("Save") }}
                         </button>
                     </div>
                 </div>
@@ -356,8 +486,8 @@
         </div>
     </form>
 
-    <Confirm ref="confirmDelete" btn-style="btn-danger" @yes="deleteNotification">
-        Are you sure want to delete this notification for all monitors?
+    <Confirm ref="confirmDelete" btn-style="btn-danger" :yes-text="$t('Yes')" :no-text="$t('No')" @yes="deleteNotification">
+        {{ $t("deleteNotificationMsg") }}
     </Confirm>
 </template>
 

src/components/PingChart.vue

@@ -0,0 +1,176 @@
+<template>
+    <LineChart :chart-data="chartData" :options="chartOptions" />
+</template>
+
+<script>
+import { BarController, BarElement, Chart, Filler, LinearScale, LineController, LineElement, PointElement, TimeScale, Tooltip } from "chart.js";
+import dayjs from "dayjs";
+import utc from "dayjs/plugin/utc";
+import timezone from "dayjs/plugin/timezone";
+import "chartjs-adapter-dayjs";
+import { LineChart } from "vue-chart-3";
+dayjs.extend(utc);
+dayjs.extend(timezone);
+
+Chart.register(LineController, BarController, LineElement, PointElement, TimeScale, BarElement, LinearScale, Tooltip, Filler);
+
+export default {
+    components: { LineChart },
+    props: {
+        monitorId: {
+            type: Number,
+            required: true,
+        },
+    },
+    data() {
+        return {
+            // Configurable filtering on top of the returned data
+            chartPeriodHrs: 6,
+        };
+    },
+    computed: {
+        chartOptions() {
+            return {
+                responsive: true,
+                maintainAspectRatio: false,
+                onResize: (chart) => {
+                    chart.canvas.parentNode.style.position = "relative";
+                    if (screen.width < 576) {
+                        chart.canvas.parentNode.style.height = "275px";
+                    } else if (screen.width < 768) {
+                        chart.canvas.parentNode.style.height = "320px";
+                    } else if (screen.width < 992) {
+                        chart.canvas.parentNode.style.height = "300px";
+                    } else {
+                        chart.canvas.parentNode.style.height = "250px";
+                    }
+                },
+                layout: {
+                    padding: {
+                        left: 10,
+                        right: 30,
+                        top: 30,
+                        bottom: 10,
+                    },
+                },
+
+                elements: {
+                    point: {
+                        // Hide points on chart unless mouse-over
+                        radius: 0,
+                        hitRadius: 100,
+                    },
+                },
+                scales: {
+                    x: {
+                        type: "time",
+                        time: {
+                            minUnit: "minute",
+                            round: "second",
+                            tooltipFormat: "YYYY-MM-DD HH:mm:ss",
+                            displayFormats: {
+                                minute: "HH:mm",
+                                hour: "MM-DD HH:mm",
+                            }
+                        },
+                        ticks: {
+                            maxRotation: 0,
+                            autoSkipPadding: 30,
+                        },
+                        grid: {
+                            color: this.$root.theme === "light" ? "rgba(0,0,0,0.1)" : "rgba(255,255,255,0.1)",
+                            offset: false,
+                        },
+                    },
+                    y: {
+                        title: {
+                            display: true,
+                            text: "Resp. Time (ms)",
+                        },
+                        offset: false,
+                        grid: {
+                            color: this.$root.theme === "light" ? "rgba(0,0,0,0.1)" : "rgba(255,255,255,0.1)",
+                        },
+                    },
+                    y1: {
+                        display: false,
+                        position: "right",
+                        grid: {
+                            drawOnChartArea: false,
+                        },
+                        min: 0,
+                        max: 1,
+                        offset: false,
+                    },
+                },
+                bounds: "ticks",
+                plugins: {
+                    tooltip: {
+                        mode: "nearest",
+                        intersect: false,
+                        padding: 10,
+                        backgroundColor: this.$root.theme === "light" ? "rgba(212,232,222,1.0)" : "rgba(32,42,38,1.0)",
+                        bodyColor: this.$root.theme === "light" ? "rgba(12,12,18,1.0)" : "rgba(220,220,220,1.0)",
+                        titleColor: this.$root.theme === "light" ? "rgba(12,12,18,1.0)" : "rgba(220,220,220,1.0)",
+                        filter: function (tooltipItem) {
+                            return tooltipItem.datasetIndex === 0;  // Hide tooltip on Bar Chart
+                        },
+                        callbacks: {
+                            label: (context) => {
+                                return ` ${new Intl.NumberFormat().format(context.parsed.y)} ms`
+                            },
+                        }
+                    },
+                    legend: {
+                        display: false,
+                    },
+                },
+            }
+        },
+        chartData() {
+            let pingData = [];  // Ping Data for Line Chart, y-axis contains ping time
+            let downData = [];  // Down Data for Bar Chart, y-axis is 1 if target is down, 0 if target is up
+            if (this.monitorId in this.$root.heartbeatList) {
+                this.$root.heartbeatList[this.monitorId]
+                    .filter(
+                        (beat) => dayjs.utc(beat.time).tz(this.$root.timezone).isAfter(dayjs().subtract(this.chartPeriodHrs, "hours")))
+                    .map((beat) => {
+                        const x = this.$root.datetime(beat.time);
+                        pingData.push({
+                            x,
+                            y: beat.ping,
+                        });
+                        downData.push({
+                            x,
+                            y: beat.status === 0 ? 1 : 0,
+                        })
+                    });
+            }
+            return {
+                datasets: [
+                    {
+                        // Line Chart
+                        data: pingData,
+                        fill: "origin",
+                        tension: 0.2,
+                        borderColor: "#5CDD8B",
+                        backgroundColor: "#5CDD8B38",
+                        yAxisID: "y",
+                    },
+                    {
+                        // Bar Chart
+                        type: "bar",
+                        data: downData,
+                        borderColor: "#00000000",
+                        backgroundColor: "#DC354568",
+                        yAxisID: "y1",
+                        barThickness: "flex",
+                        barPercentage: 1,
+                        categoryPercentage: 1,
+                    },
+                ],
+            };
+        },
+    },
+};
+</script>

src/components/Status.vue

@@ -27,18 +27,18 @@ export default {
 
         text() {
             if (this.status === 0) {
-                return "Down"
+                return this.$t("Down");
             }
 
             if (this.status === 1) {
-                return "Up"
+                return this.$t("Up");
             }
 
             if (this.status === 2) {
-                return "Pending"
+                return this.$t("Pending");
             }
 
-            return "Unknown"
+            return this.$t("Unknown");
         },
     },
 }

src/icon.js

@@ -1,10 +1,10 @@
 import { library } from "@fortawesome/fontawesome-svg-core"
-import { faCog, faEdit, faList, faPause, faPlay, faPlus, faTachometerAlt, faTrash } from "@fortawesome/free-solid-svg-icons"
+import { faCog, faEdit, faPlus, faPause, faPlay, faTachometerAlt, faTrash, faList, faArrowAltCircleUp } from "@fortawesome/free-solid-svg-icons"
 //import { fa } from '@fortawesome/free-regular-svg-icons'
 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome"
 
 // Add Free Font Awesome Icons here
 // https://fontawesome.com/v5.15/icons?d=gallery&p=2&s=solid&m=free
-library.add(faCog, faTachometerAlt, faEdit, faPlus, faPause, faPlay, faTrash, faList)
+library.add(faCog, faEdit, faPlus, faPause, faPlay, faTachometerAlt, faTrash, faList, faArrowAltCircleUp);
 
 export { FontAwesomeIcon }

src/languages/de-DE.js

@@ -0,0 +1,107 @@
+export default {
+    languageName: "German",
+    Settings: "Einstellungen",
+    Dashboard: "Dashboard",
+    "New Update": "Update Verfügbar",
+    Language: "Sprache",
+    Appearance: "Erscheinung",
+    Theme: "Thema",
+    General: "Allgemein",
+    Version: "Version",
+    "Check Update On GitHub": "Überprüfen von Updates auf Github",
+    List: "Liste",
+    Add: "Hinzufügen",
+    "Add New Monitor": "Neuer Monitor",
+    "Quick Stats": "Übersicht",
+    Up: "Aktiv",
+    Down: "Inaktiv",
+    Pending: "Ausstehend",
+    Unknown: "Unbekannt",
+    Pause: "Pausieren",
+    pauseDashboardHome: "Pausiert",
+    Name: "Name",
+    Status: "Status",
+    DateTime: "Datum / Uhrzeit",
+    Message: "Nachricht",
+    "No important events": "Keine wichtigen Ereignisse",
+    Resume: "Fortsetzen",
+    Edit: "Bearbeiten",
+    Delete: "Löschen",
+    Current: "Aktuell",
+    Uptime: "Verfügbarkeit",
+    "Cert Exp.": "Zertifikatsablauf",
+    days: "Tage",
+    day: "Tag",
+    "-day": "-Tage",
+    hour: "Stunde",
+    "-hour": "-Stunden",
+    checkEverySecond: "Überprüfe alle {0} Sekunden",
+    "Avg.": "Durchschn. ",
+    Response: " Antwortzeit",
+    Ping: "Ping",
+    "Monitor Type": "Monitor Typ",
+    Keyword: "Schlüsselwort",
+    "Friendly Name": "Anzeigename",
+    URL: "URL",
+    Hostname: "Hostname",
+    Port: "Port",
+    "Heartbeat Interval": "Taktintervall",
+    Retries: "Wiederholungen",
+    retriesDescription: "Maximale Anzahl von Wiederholungen, bevor der Dienst als inaktiv markiert und eine Benachrichtigung gesendet wird.",
+    Advanced: "Erweitert",
+    ignoreTLSError: "Ignoriere TLS/SSL Fehler von Webseiten",
+    "Upside Down Mode": "Umgedrehter Modus",
+    upsideDownModeDescription: "Drehe den Modus um, ist der Dienst erreichbar, wird er als Inaktiv angezeigt.",
+    "Max. Redirects": "Max. Weiterleitungen",
+    maxRedirectDescription: "Maximale Anzahl von Weiterleitungen, denen gefolgt werden soll. Setzte auf 0, um Weiterleitungen zu deaktivieren.",
+    "Accepted Status Codes": "Erlaubte HTTP-Statuscodes",
+    acceptedStatusCodesDescription: "Wähle die Statuscodes aus, welche trotzdem als erfolgreich gewertet werden sollen.",
+    Save: "Speichern",
+    Notifications: "Benachrichtigungen",
+    "Not available, please setup.": "Keine verfügbar, bitte einrichten.",
+    "Setup Notification": "Benachrichtigung einrichten",
+    Light: "Hell",
+    Dark: "Dunkel",
+    Auto: "Auto",
+    "Theme - Heartbeat Bar": "Thema - Taktleiste",
+    Normal: "Normal",
+    Bottom: "Unten",
+    None: "Keine",
+    Timezone: "Zeitzone",
+    "Search Engine Visibility": "Suchmaschinensichtbarkeit",
+    "Allow indexing": "Indizierung zulassen",
+    "Discourage search engines from indexing site": "Halte Suchmaschinen von der Indexierung der Site ab",
+    "Change Password": "Passwort ändern",
+    "Current Password": "Dezeitiges Passwort",
+    "New Password": "Neues Passwort",
+    "Repeat New Password": "Wiederhole neues Passwort",
+    passwordNotMatchMsg: "Passwörter stimmen nicht überein. ",
+    "Update Password": "Ändere Passwort",
+    "Disable Auth": "Authentifizierung deaktivieren",
+    "Enable Auth": "Authentifizierung aktivieren",
+    Logout: "Ausloggen",
+    notificationDescription: "Weise den Monitor(en) eine Benachrichtigung zu, damit diese Funktion greift.",
+    Leave: "Verlassen",
+    "I understand, please disable": "Ich verstehe, bitte deaktivieren",
+    Confirm: "Bestätige",
+    Yes: "Ja",
+    No: "Nein",
+    Username: "Benutzername",
+    Password: "Passwort",
+    "Remember me": "Passwort merken",
+    Login: "Einloggen",
+    "No Monitors, please": "Keine Monitore, bitte",
+    "add one": "hinzufügen",
+    "Notification Type": "Benachrichtigungs Dienst",
+    "Email": "E-Mail",
+    "Test": "Test",
+    "Certificate Info": "Zertifikatsinfo",
+    keywordDescription: "Suche nach einen Schlüsselwort in einer schlichten HTML oder JSON Ausgabe. Bitte beachte, es wird in der Groß-/Kleinschreibung unterschieden.",
+    deleteMonitorMsg: "Bist du sicher das du den Monitor löschen möchtest?",
+    deleteNotificationMsg: "Möchtest du diese Benachrichtigung wirklich für alle Monitore löschen?",
+    resoverserverDescription: "Cloudflare ist der Standardserver, dieser kann jederzeit geändern werden.",
+    "Resolver Server": "Auflösungsserver",
+    rrtypeDescription: "Wähle den RR-Typ aus, welchen du überwachen möchtest.",
+    "Last Result": "Letztes Ergebnis",
+    pauseMonitorMsg: "Bist du sicher das du den Monitor pausieren möchtest?",
+}

src/languages/en.js

@@ -0,0 +1,19 @@
+export default {
+    languageName: "English",
+    checkEverySecond: "Check every {0} seconds.",
+    "Avg.": "Avg. ",
+    retriesDescription: "Maximum retries before the service is marked as down and a notification is sent",
+    ignoreTLSError: "Ignore TLS/SSL error for HTTPS websites",
+    upsideDownModeDescription: "Flip the status upside down. If the service is reachable, it is DOWN.",
+    maxRedirectDescription: "Maximum number of redirects to follow. Set to 0 to disable redirects.",
+    acceptedStatusCodesDescription: "Select status codes which are considered as a successful response.",
+    passwordNotMatchMsg: "The repeat password does not match.",
+    notificationDescription: "Please assign a notification to monitor(s) to get it to work.",
+    keywordDescription: "Search keyword in plain html or JSON response and it is case-sensitive",
+    pauseDashboardHome: "Pause",
+    deleteMonitorMsg: "Are you sure want to delete this monitor?",
+    deleteNotificationMsg: "Are you sure want to delete this notification for all monitors?",
+    resoverserverDescription: "Cloudflare is the default server, you can change the resolver server anytime.",
+    rrtypeDescription: "Select the RR-Type you want to monitor",
+    pauseMonitorMsg: "Are you sure want to pause?",
+}

src/languages/fr.js

@@ -0,0 +1,106 @@
+export default {
+    languageName: "Français (France)",
+    Settings: "Paramètres",
+    Dashboard: "Dashboard",
+    "New Update": "Mise à jour disponible",
+    Language: "Langue",
+    Appearance: "Apparence",
+    Theme: "Thème",
+    General: "Général",
+    Version: "Version",
+    "Check Update On GitHub": "Consulter les mises à jour sur Github",
+    List: "Lister",
+    Add: "Ajouter",
+    "Add New Monitor": "Ajouter un nouveau check",
+    "Quick Stats": "Résumé",
+    Up: "En ligne",
+    Down: "Hors ligne",
+    Pending: "Dans la file d'attente",
+    Unknown: "Inconnu",
+    Pause: "En Pause",
+    pauseDashboardHome: "Éléments mis en pause",
+    Name: "Nom",
+    Status: "État",
+    DateTime: "Heure",
+    Message: "Messages",
+    "No important events": "Pas d'évènements important",
+    Resume: "Reprendre",
+    Edit: "Modifier",
+    Delete: "Supprimer",
+    Current: "Actuellement",
+    Uptime: "Uptime",
+    "Cert Exp.": "Cert Exp.",
+    days: "Jours",
+    day: "Jour",
+    "-day": "Demi-Journée",
+    hour: "Heure",
+    "-hour": "Demi-Heure",
+    checkEverySecond: "Vérifier toutes les {0} secondes",
+    "Avg.": "Moy.",
+    Response: "Réponse",
+    Ping: "Ping",
+    "Monitor Type": "Type de Monitoring",
+    Keyword: "Mot-clé",
+    "Friendly Name": "Nom d'affichage",
+    URL: "URL",
+    Hostname: "Nom d'hôte",
+    Port: "Port",
+    "Heartbeat Interval": "Intervale de vérifications",
+    Retries: "Essais",
+    retriesDescription: "Nombre d'essais avant que le service soit déclaré hors-ligne.",
+    Advanced: "Avancé",
+    ignoreTLSError: "Ignorer les erreurs liées au certificat SSL/TLS",
+    "Upside Down Mode": "Mode inversé",
+    upsideDownModeDescription: "Si le service est en ligne il sera alors noté hors-ligne et vice-versa.",
+    "Max. Redirects": "Redirections",
+    maxRedirectDescription: "Nombre maximal de redirections avant que le service soit noté hors-ligne.",
+    "Accepted Status Codes": "Codes HTTP",
+    acceptedStatusCodesDescription: "Si les codes HTTP reçus sont ceux séléctionnés, alors le serveur sera noté en ligne.",
+    Save: "Sauvegarder",
+    Notifications: "Notifications",
+    "Not available, please setup.": "Créez des notifications depuis les paramètres.",
+    "Setup Notification": "Créer une notification",
+    Light: "Clair",
+    Dark: "Sombre",
+    Auto: "Automatique",
+    "Theme - Heartbeat Bar": "Voir les services monitorés",
+    Normal: "Général",
+    Bottom: "Au dessus",
+    None: "Neutre",
+    Timezone: "Fuseau Horaire",
+    "Search Engine Visibility": "SEO",
+    "Allow indexing": "Autoriser l'indexation par des moteurs de recherche",
+    "Discourage search engines from indexing site": "Empêche les moteurs de recherche d'indexer votre site",
+    "Change Password": "Changer le mot de passe",
+    "Current Password": "Mot de passe actuel",
+    "New Password": "Nouveau mot de passe",
+    "Repeat New Password": "Répéter votre nouveau mot de passe",
+    passwordNotMatchMsg: "Les mots de passe ne correspondent pas",
+    "Update Password": "Mettre à jour le mot de passe",
+    "Disable Auth": "Désactiver l'authentification intégrée",
+    "Enable Auth": "Activer l'authentification",
+    Logout: "Se déconnecter",
+    notificationDescription: "Une fois ajoutée, vous devez l'activer manuellement dans les paramètres de vos hosts.",
+    Leave: "Quitter",
+    "I understand, please disable": "Je comprends, je l'ai désactivé",
+    Confirm: "Confirmer",
+    Yes: "Oui",
+    No: "Non",
+    Username: "Nom d'utilisateur",
+    Password: "Mot de passe",
+    "Remember me": "Se souvenir de moi",
+    Login: "Se connecter",
+    "No Monitors, please": "Pas de monitor, veuillez ",
+    "add one": "en ajouter un.",
+    "Notification Type": "Type de notification",
+    "Email": "Email",
+    "Test": "Tester",
+    keywordDescription: "Le mot clé sera cherché dans la réponse HTML/JSON reçue du site internet.",
+    "Certificate Info": "Des informations sur le certificat SSL",
+    deleteMonitorMsg: "Êtes-vous sûr de vouloir supprimer ce monitor ?",
+    deleteNotificationMsg: "Êtes-vous sûr de vouloir supprimer ce type de notifications ? Une fois désactivée, les services qui l'utilisent ne pourront plus envoyer de notifications.",
+    "Resolver Server": "Serveur DNS utilisé",
+    "Resource Record Type": "Type d'enregistrement DNS recherché",
+    resoverserverDescription: "Le DNS de cloudflare est utilisé par défaut, mais vous pouvez le changer si vous le souhaitez.",
+    rrtypeDescription: "Veuillez séléctionner un type d'enregistrement DNS",
+}

src/languages/zh-HK.js

@@ -0,0 +1,106 @@
+export default {
+    languageName: "繁體中文 (香港)",
+    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: "暫停",
+    pauseDashboardHome: "暫停",
+    Name: "名稱",
+    Status: "狀態",
+    DateTime: "日期時間",
+    Message: "內容",
+    "No important events": "沒有重要事件",
+    Resume: "恢復",
+    Edit: "編輯",
+    Delete: "刪除",
+    Current: "目前",
+    Uptime: "上線率",
+    "Cert Exp.": "証書期限",
+    days: "日",
+    day: "日",
+    "-day": "日",
+    hour: "小時",
+    "-hour": "小時",
+    checkEverySecond: "每 {0} 秒檢查一次",
+    "Avg.": "平均",
+    Response: "反應時間",
+    Ping: "反應時間",
+    "Monitor Type": "監測器類型",
+    Keyword: "關鍵字",
+    "Friendly Name": "名稱",
+    URL: "網址 URL",
+    Hostname: "Hostname",
+    Port: "Port",
+    "Heartbeat Interval": "檢查間距",
+    Retries: "重試數次確定為離線",
+    retriesDescription: "重試多少次後才判定為離線及傳送通知。如數值為 0 會即判定為離線及傳送通知。",
+    Advanced: "進階",
+    ignoreTLSError: "忽略 TLS/SSL 錯誤",
+    "Upside Down Mode": "反轉模式",
+    upsideDownModeDescription: "反轉狀態，如網址是可正常瀏覽，會被判定為 '離線/DOWN'",
+    "Max. Redirects": "跟隨重新導向 (Redirect) 的次數",
+    maxRedirectDescription: "設為 0 即不跟蹤",
+    "Accepted Status Codes": "接受為上線的 HTTP 狀態碼",
+    acceptedStatusCodesDescription: "可多選",
+    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": "確認新密碼",
+    passwordNotMatchMsg: "密碼不一致",
+    "Update Password": "更新密碼",
+    "Disable Auth": "取消登入認証",
+    "Enable Auth": "開啟登入認証",
+    Logout: "登出",
+    notificationDescription: "新增後，你需要在監測器裡啟用。",
+    Leave: "離開",
+    "I understand, please disable": "我明白，請取消登入認証",
+    Confirm: "確認",
+    Yes: "是",
+    No: "否",
+    Username: "帳號",
+    Password: "密碼",
+    "Remember me": "記住我",
+    Login: "登入",
+    "No Monitors, please": "沒有監測器，請",
+    "add one": "新增",
+    "Notification Type": "通知類型",
+    "Email": "電郵",
+    "Test": "測試",
+    keywordDescription: "搜索 HTML 或 JSON 裡是否有出現關鍵字（注意英文大細階）",
+    "Certificate Info": "憑證詳細資料",
+    deleteMonitorMsg: "是否確定刪除這個監測器",
+    deleteNotificationMsg: "是否確定刪除這個通知設定？如監測器啟用了這個通知，將會收不到通知。",
+    "Resolver Server": "DNS 伺服器",
+    "Resource Record Type": "DNS 記錄類型",
+    resoverserverDescription: "預設值為 Cloudflare DNS 伺服器，你可以轉用其他 DNS 伺服器。",
+    rrtypeDescription: "請選擇 DNS 記錄類型",
+}

src/layouts/Layout.vue

@@ -1,5 +1,5 @@
 <template>
-    <div :class="$root.theme">
+    <div :class="classes">
         <div v-if="! $root.socket.connected && ! $root.socket.firstConnect" class="lost-connection">
             <div class="container-fluid">
                 {{ $root.connectionErrorMsg }}
@@ -9,19 +9,23 @@
         <!-- Desktop header -->
         <header v-if="! $root.isMobile" class="d-flex flex-wrap justify-content-center py-3 mb-3 border-bottom">
             <router-link to="/dashboard" 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" alt="Logo" />
+                <object class="bi me-2 ms-4" width="40" height="40" data="/icon.svg" />
                 <span class="fs-4 title">Uptime Kuma</span>
             </router-link>
 
+            <a v-if="hasNewVersion" target="_blank" href="https://github.com/louislam/uptime-kuma/releases" class="btn btn-info me-3">
+                <font-awesome-icon icon="arrow-alt-circle-up" /> {{ $t("New Update") }}
+            </a>
+
             <ul class="nav nav-pills">
                 <li class="nav-item">
                     <router-link to="/dashboard" class="nav-link">
-                        <font-awesome-icon icon="tachometer-alt" /> Dashboard
+                        <font-awesome-icon icon="tachometer-alt" /> {{ $t("Dashboard") }}
                     </router-link>
                 </li>
                 <li class="nav-item">
                     <router-link to="/settings" class="nav-link">
-                        <font-awesome-icon icon="cog" /> Settings
+                        <font-awesome-icon icon="cog" /> {{ $t("Settings") }}
                     </router-link>
                 </li>
             </ul>
@@ -36,40 +40,31 @@
         </header>
 
         <main>
-            <!-- Add :key to disable vue router re-use the same component -->
-            <router-view v-if="$root.loggedIn" :key="$route.fullPath" />
+            <router-view v-if="$root.loggedIn" />
             <Login v-if="! $root.loggedIn && $root.allowLoginDialog" />
         </main>
 
-        <footer>
-            <div class="container-fluid">
-                Uptime Kuma -
-                Version: {{ $root.info.version }} -
-                <a href="https://github.com/louislam/uptime-kuma/releases" target="_blank" rel="noopener">Check Update On GitHub</a>
-            </div>
-        </footer>
-
         <!-- Mobile Only -->
-        <div v-if="$root.isMobile" style="width: 100%;height: 60px;" />
+        <div v-if="$root.isMobile" style="width: 100%; height: 60px;" />
         <nav v-if="$root.isMobile" class="bottom-nav">
-            <router-link to="/dashboard" class="nav-link" @click="$root.cancelActiveList">
+            <router-link to="/dashboard" class="nav-link">
                 <div><font-awesome-icon icon="tachometer-alt" /></div>
-                Dashboard
+                {{ $t("Dashboard") }}
             </router-link>
 
-            <a href="#" :class=" { 'router-link-exact-active' : $root.showListMobile } " @click="$root.showListMobile = ! $root.showListMobile">
+            <router-link to="/list" class="nav-link">
                 <div><font-awesome-icon icon="list" /></div>
-                List
-            </a>
-
-            <router-link to="/add" class="nav-link" @click="$root.cancelActiveList">
-                <div><font-awesome-icon icon="plus" /></div>
-                Add
+                {{ $t("List") }}
             </router-link>
 
-            <router-link to="/settings" class="nav-link" @click="$root.cancelActiveList">
+            <router-link to="/add" class="nav-link">
+                <div><font-awesome-icon icon="plus" /></div>
+                {{ $t("Add") }}
+            </router-link>
+
+            <router-link to="/settings" class="nav-link">
                 <div><font-awesome-icon icon="cog" /></div>
-                Settings
+                {{ $t("Settings") }}
             </router-link>
         </nav>
     </div>
@@ -77,31 +72,56 @@
 
 <script>
 import Login from "../components/Login.vue";
+import compareVersions from "compare-versions";
 
 export default {
+
     components: {
         Login,
     },
+
     data() {
         return {}
     },
-    computed: {},
+
+    computed: {
+
+        // Theme or Mobile
+        classes() {
+            const classes = {};
+            classes[this.$root.theme] = true;
+            classes["mobile"] = this.$root.isMobile;
+            return classes;
+        },
+
+        hasNewVersion() {
+            if (this.$root.info.latestVersion && this.$root.info.version) {
+                return compareVersions(this.$root.info.latestVersion, this.$root.info.version) >= 1;
+            } else {
+                return false;
+            }
+        },
+
+    },
+
     watch: {
-        $route (to, from) {
+        $route(to, from) {
             this.init();
         },
     },
+
     mounted() {
         this.init();
     },
+
     methods: {
         init() {
             if (this.$route.name === "root") {
                 this.$router.push("/dashboard")
             }
         },
-
     },
+
 }
 </script>
 
@@ -144,7 +164,7 @@ export default {
 }
 
 main {
-    min-height: calc(100vh - 160px)
+    min-height: calc(100vh - 160px);
 }
 
 .title {
@@ -161,22 +181,13 @@ main {
     color: white;
 }
 
-footer {
-    color: #AAA;
-    font-size: 13px;
-    margin-top: 10px;
-    padding-bottom: 30px;
-    margin-left: 10px;
-    text-align: center;
-}
-
 .dark {
     header {
-        background-color: #161B22;
-        border-bottom-color: #161B22 !important;
+        background-color: #161b22;
+        border-bottom-color: #161b22 !important;
 
         span {
-            color: #F0F6FC;
+            color: #f0f6fc;
         }
     }
 

src/main.js

@@ -1,5 +1,6 @@
 import "bootstrap";
 import { createApp, h } from "vue";
+import { createI18n } from "vue-i18n"
 import { createRouter, createWebHistory } from "vue-router";
 import Toast from "vue-toastification";
 import "vue-toastification/dist/index.css";
@@ -10,14 +11,23 @@ import EmptyLayout from "./layouts/EmptyLayout.vue";
 import Layout from "./layouts/Layout.vue";
 import socket from "./mixins/socket";
 import theme from "./mixins/theme";
+import mobile from "./mixins/mobile";
+import datetime from "./mixins/datetime";
 import Dashboard from "./pages/Dashboard.vue";
 import DashboardHome from "./pages/DashboardHome.vue";
 import Details from "./pages/Details.vue";
 import EditMonitor from "./pages/EditMonitor.vue";
 import Settings from "./pages/Settings.vue";
 import Setup from "./pages/Setup.vue";
+import List from "./pages/List.vue";
+
 import { appName } from "./util.ts";
 
+import en from "./languages/en";
+import zhHK from "./languages/zh-HK";
+import deDE from "./languages/de-DE";
+import fr from "./languages/fr";
+
 const routes = [
     {
         path: "/",
@@ -51,6 +61,10 @@ const routes = [
                                 path: "/add",
                                 component: EditMonitor,
                             },
+                            {
+                                path: "/list",
+                                component: List,
+                            },
                         ],
                     },
                     {
@@ -75,10 +89,27 @@ const router = createRouter({
     routes,
 })
 
+const languageList = {
+    en,
+    "zh-HK": zhHK,
+    "de-DE": deDE,
+    "fr": fr,
+};
+
+const i18n = createI18n({
+    locale: localStorage.locale || "en",
+    fallbackLocale: "en",
+    silentFallbackWarn: true,
+    silentTranslationWarn: true,
+    messages: languageList
+});
+
 const app = createApp({
     mixins: [
         socket,
-        theme
+        theme,
+        mobile,
+        datetime
     ],
     data() {
         return {
@@ -88,7 +119,8 @@ const app = createApp({
     render: () => h(App),
 })
 
-app.use(router)
+app.use(router);
+app.use(i18n);
 
 const options = {
     position: "bottom-right",

src/mixins/datetime.js

@@ -0,0 +1,57 @@
+import dayjs from "dayjs";
+import utc from "dayjs/plugin/utc";
+import timezone from "dayjs/plugin/timezone";
+import relativeTime from "dayjs/plugin/relativeTime";
+dayjs.extend(utc);
+dayjs.extend(timezone);
+dayjs.extend(relativeTime);
+
+/**
+ * DateTime Mixin
+ * Handled timezone and format
+ */
+export default {
+    data() {
+        return {
+            userTimezone: localStorage.timezone || "auto",
+        }
+    },
+
+    methods: {
+        datetime(value) {
+            return this.datetimeFormat(value, "YYYY-MM-DD HH:mm:ss");
+        },
+
+        date(value) {
+            return this.datetimeFormat(value, "YYYY-MM-DD");
+        },
+
+        time(value, second = true) {
+            let secondString;
+            if (second) {
+                secondString = ":ss";
+            } else {
+                secondString = "";
+            }
+            return this.datetimeFormat(value, "HH:mm" + secondString);
+        },
+
+        datetimeFormat(value, format) {
+            if (value !== undefined && value !== "") {
+                return dayjs.utc(value).tz(this.timezone).format(format);
+            }
+            return "";
+        }
+    },
+
+    computed: {
+        timezone() {
+            if (this.userTimezone === "auto") {
+                return dayjs.tz.guess()
+            }
+
+            return this.userTimezone
+        },
+    }
+
+}

src/mixins/mobile.js

@@ -0,0 +1,25 @@
+export default {
+
+    data() {
+        return {
+            windowWidth: window.innerWidth,
+        }
+    },
+
+    created() {
+        window.addEventListener("resize", this.onResize);
+    },
+
+    methods: {
+        onResize() {
+            this.windowWidth = window.innerWidth;
+        },
+    },
+
+    computed: {
+        isMobile() {
+            return this.windowWidth <= 767.98;
+        },
+    }
+
+}

src/mixins/socket.js

@@ -1,4 +1,3 @@
-import dayjs from "dayjs";
 import { io } from "socket.io-client";
 import { useToast } from "vue-toastification";
 const toast = useToast()
@@ -17,7 +16,6 @@ export default {
                 connectCount: 0,
             },
             remember: (localStorage.remember !== "0"),
-            userTimezone: localStorage.timezone || "auto",
             allowLoginDialog: false,        // Allowed to show login dialog, but "loggedIn" have to be true too. This exists because prevent the login dialog show 0.1s in first before the socket server auth-ed.
             loggedIn: false,
             monitorList: { },
@@ -27,8 +25,6 @@ export default {
             uptimeList: { },
             certInfoList: {},
             notificationList: [],
-            windowWidth: window.innerWidth,
-            showListMobile: false,
             connectionErrorMsg: "Cannot connect to the socket server. Reconnecting...",
         }
     },
@@ -189,14 +185,6 @@ export default {
 
     methods: {
 
-        cancelActiveList() {
-            this.$root.showListMobile = false;
-        },
-
-        onResize() {
-            this.windowWidth = window.innerWidth;
-        },
-
         storage() {
             return (this.remember) ? localStorage : sessionStorage;
         },
@@ -270,19 +258,6 @@ export default {
 
     computed: {
 
-        isMobile() {
-            return this.windowWidth <= 767.98;
-        },
-
-        timezone() {
-
-            if (this.userTimezone === "auto") {
-                return dayjs.tz.guess()
-            }
-
-            return this.userTimezone
-        },
-
         lastHeartbeatList() {
             let result = {}
 

src/mixins/theme.js

@@ -2,8 +2,9 @@ export default {
 
     data() {
         return {
-            system: (window.matchMedia("(prefers-color-scheme: dark)")) ? "dark" : "light",
+            system: (window.matchMedia("(prefers-color-scheme: dark)").matches) ? "dark" : "light",
             userTheme: localStorage.theme,
+            userHeartbeatBar: localStorage.heartbeatBarTheme,
         };
     },
 
@@ -13,7 +14,13 @@ export default {
             this.userTheme = "light";
         }
 
+        // Default Heartbeat Bar
+        if (!this.userHeartbeatBar) {
+            this.userHeartbeatBar = "normal";
+        }
+
         document.body.classList.add(this.theme);
+        this.updateThemeColorMeta();
     },
 
     computed: {
@@ -33,6 +40,26 @@ export default {
         theme(to, from) {
             document.body.classList.remove(from);
             document.body.classList.add(this.theme);
+            this.updateThemeColorMeta();
+        },
+
+        userHeartbeatBar(to, from) {
+            localStorage.heartbeatBarTheme = to;
+        },
+
+        heartbeatBarTheme(to, from) {
+            document.body.classList.remove(from);
+            document.body.classList.add(this.heartbeatBarTheme);
+        }
+    },
+
+    methods: {
+        updateThemeColorMeta() {
+            if (this.theme === "dark") {
+                document.querySelector("#theme-color").setAttribute("content", "#161B22");
+            } else {
+                document.querySelector("#theme-color").setAttribute("content", "#5cdd8b");
+            }
         }
     }
 }

src/pages/Dashboard.vue

@@ -1,33 +1,16 @@
 <template>
     <div class="container-fluid">
         <div class="row">
-            <div class="col-12 col-md-5 col-xl-4">
-                <div v-if="! $root.isMobile">
-                    <router-link to="/add" class="btn btn-primary mb-3"><font-awesome-icon icon="plus" /> Add New Monitor</router-link>
-                </div>
-
-                <div v-if="showList" class="shadow-box list mb-4">
-                    <div v-if="Object.keys($root.monitorList).length === 0" class="text-center mt-3">
-                        No Monitors, please <router-link to="/add">add one</router-link>.
-                    </div>
-
-                    <router-link v-for="(item, index) in sortedMonitorList" :key="index" :to="monitorURL(item.id)" class="item" :class="{ 'disabled': ! item.active }" @click="$root.cancelActiveList">
-                        <div class="row">
-                            <div class="col-6 col-md-8 small-padding">
-                                <div class="info">
-                                    <Uptime :monitor="item" type="24" :pill="true" />
-                                    {{ item.name }}
-                                </div>
-                            </div>
-                            <div class="col-6 col-md-4">
-                                <HeartbeatBar size="small" :monitor-id="item.id" />
-                            </div>
-                        </div>
-                    </router-link>
+            <div v-if="! $root.isMobile" class="col-12 col-md-5 col-xl-4">
+                <div>
+                    <router-link to="/add" class="btn btn-primary mb-3"><font-awesome-icon icon="plus" /> {{ $t("Add New Monitor") }}</router-link>
                 </div>
+                <MonitorList scrollbar="true" />
             </div>
-            <div class="col-12 col-md-7 col-xl-8">
-                <router-view />
+
+            <div class="col-12 col-md-7 col-xl-8 mb-3">
+                <!-- Add :key to disable vue router re-use the same component -->
+                <router-view :key="$route.fullPath" />
             </div>
         </div>
     </div>
@@ -35,115 +18,20 @@
 
 <script>
 
-import HeartbeatBar from "../components/HeartbeatBar.vue";
-import Uptime from "../components/Uptime.vue";
+import MonitorList from "../components/MonitorList.vue";
 
 export default {
     components: {
-        Uptime,
-        HeartbeatBar,
+        MonitorList,
     },
     data() {
         return {}
     },
-    computed: {
-        sortedMonitorList() {
-            let result = Object.values(this.$root.monitorList);
-
-            result.sort((m1, m2) => {
-
-                if (m1.active !== m2.active) {
-                    if (m1.active === 0) {
-                        return 1;
-                    }
-
-                    if (m2.active === 0) {
-                        return -1;
-                    }
-                }
-
-                if (m1.weight !== m2.weight) {
-                    if (m1.weight > m2.weight) {
-                        return -1;
-                    }
-
-                    if (m1.weight < m2.weight) {
-                        return 1;
-                    }
-                }
-
-                return m1.name.localeCompare(m2.name);
-            })
-
-            return result;
-        },
-        showList() {
-            return ! this.$root.isMobile || this.$root.showListMobile;
-        },
-    },
-    methods: {
-        monitorURL(id) {
-            return "/dashboard/" + id;
-        },
-    },
 }
 </script>
 
 <style lang="scss" scoped>
-@import "../assets/vars.scss";
-
 .container-fluid {
-    width: 98%
+    width: 98%;
 }
-
-.list {
-    height: auto;
-    min-height: calc(100vh - 240px);
-
-    .item {
-        display: block;
-        text-decoration: none;
-        padding: 15px 15px 12px 15px;
-        border-radius: 10px;
-        transition: all ease-in-out 0.15s;
-
-        &.disabled {
-            opacity: 0.3;
-        }
-
-        .info {
-            white-space: nowrap;
-            overflow: hidden;
-            text-overflow: ellipsis;
-        }
-
-        &:hover {
-            background-color: $highlight-white;
-        }
-
-        &.active {
-            background-color: #cdf8f4;
-        }
-    }
-}
-
-.small-padding {
-    padding-left: 5px !important;
-    padding-right: 5px !important;
-}
-
-.dark {
-    .list {
-        .item {
-            &:hover {
-                background-color: $dark-bg2;
-            }
-
-            &.active {
-                background-color: $dark-bg2;
-            }
-        }
-    }
-}
-
 </style>

src/pages/DashboardHome.vue

@@ -1,78 +1,67 @@
 <template>
-    <div v-if="$route.name === 'DashboardHome'">
-        <h1 class="mb-3">
-            Quick Stats
-        </h1>
+    <transition name="slide-fade" appear>
+        <div v-if="$route.name === 'DashboardHome'">
+            <h1 class="mb-3">
+                {{ $t("Quick Stats") }}
+            </h1>
 
-        <div class="shadow-box big-padding text-center">
-            <div class="row">
-                <div class="col">
-                    <h3>Up</h3>
-                    <span class="num">{{ stats.up }}</span>
-                </div>
-                <div class="col">
-                    <h3>Down</h3>
-                    <span class="num text-danger">{{ stats.down }}</span>
-                </div>
-                <div class="col">
-                    <h3>Unknown</h3>
-                    <span class="num text-secondary">{{ stats.unknown }}</span>
-                </div>
-                <div class="col">
-                    <h3>Pause</h3>
-                    <span class="num text-secondary">{{ stats.pause }}</span>
+            <div class="shadow-box big-padding text-center mb-4">
+                <div class="row">
+                    <div class="col">
+                        <h3>{{ $t("Up") }}</h3>
+                        <span class="num">{{ stats.up }}</span>
+                    </div>
+                    <div class="col">
+                        <h3>{{ $t("Down") }}</h3>
+                        <span class="num text-danger">{{ stats.down }}</span>
+                    </div>
+                    <div class="col">
+                        <h3>{{ $t("Unknown") }}</h3>
+                        <span class="num text-secondary">{{ stats.unknown }}</span>
+                    </div>
+                    <div class="col">
+                        <h3>{{ $t("pauseDashboardHome") }}</h3>
+                        <span class="num text-secondary">{{ stats.pause }}</span>
+                    </div>
                 </div>
             </div>
-            <div v-if="false" class="row">
-                <div class="col-3">
-                    <h3>Uptime</h3>
-                    <p>(24-hour)</p>
-                    <span class="num" />
-                </div>
-                <div class="col-3">
-                    <h3>Uptime</h3>
-                    <p>(30-day)</p>
-                    <span class="num" />
+
+            <div class="shadow-box table-shadow-box" style="overflow-x: scroll;">
+                <table class="table table-borderless table-hover">
+                    <thead>
+                        <tr>
+                            <th>{{ $t("Name") }}</th>
+                            <th>{{ $t("Status") }}</th>
+                            <th>{{ $t("DateTime") }}</th>
+                            <th>{{ $t("Message") }}</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <tr v-for="(beat, index) in displayedRecords" :key="index" :class="{ 'shadow-box': $root.windowWidth <= 550}">
+                            <td>{{ beat.name }}</td>
+                            <td><Status :status="beat.status" /></td>
+                            <td :class="{ 'border-0':! beat.msg}"><Datetime :value="beat.time" /></td>
+                            <td class="border-0">{{ beat.msg }}</td>
+                        </tr>
+
+                        <tr v-if="importantHeartBeatList.length === 0">
+                            <td colspan="4">
+                                {{ $t("No important events") }}
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
+
+                <div class="d-flex justify-content-center kuma_pagination">
+                    <pagination
+                        v-model="page"
+                        :records="importantHeartBeatList.length"
+                        :per-page="perPage"
+                    />
                 </div>
             </div>
         </div>
-
-        <div class="shadow-box" style="margin-top: 25px;">
-            <table class="table table-borderless table-hover">
-                <thead>
-                    <tr>
-                        <th>Name</th>
-                        <th>Status</th>
-                        <th>DateTime</th>
-                        <th>Message</th>
-                    </tr>
-                </thead>
-                <tbody>
-                    <tr v-for="(beat, index) in displayedRecords" :key="index">
-                        <td>{{ beat.name }}</td>
-                        <td><Status :status="beat.status" /></td>
-                        <td><Datetime :value="beat.time" /></td>
-                        <td>{{ beat.msg }}</td>
-                    </tr>
-
-                    <tr v-if="importantHeartBeatList.length === 0">
-                        <td colspan="4">
-                            No important events
-                        </td>
-                    </tr>
-                </tbody>
-            </table>
-
-            <div class="d-flex justify-content-center kuma_pagination">
-                <pagination
-                    v-model="page"
-                    :records="importantHeartBeatList.length"
-                    :per-page="perPage"
-                />
-            </div>
-        </div>
-    </div>
-
+    </transition>
     <router-view ref="child" />
 </template>
 

src/pages/Details.vue

@@ -1,160 +1,183 @@
 <template>
-    <h1> {{ monitor.name }}</h1>
-    <p class="url">
-        <a v-if="monitor.type === 'http' || monitor.type === 'keyword' " :href="monitor.url" target="_blank">{{ monitor.url }}</a>
-        <span v-if="monitor.type === 'port'">TCP Ping {{ monitor.hostname }}:{{ monitor.port }}</span>
-        <span v-if="monitor.type === 'ping'">Ping: {{ monitor.hostname }}</span>
-        <span v-if="monitor.type === 'keyword'">
-            <br>
-            <span>Keyword:</span> <span class="keyword">{{ monitor.keyword }}</span>
-        </span>
-    </p>
-
-    <div class="functions">
-        <button v-if="monitor.active" class="btn btn-light" @click="pauseDialog">
-            <font-awesome-icon icon="pause" /> Pause
-        </button>
-        <button v-if="! monitor.active" class="btn btn-primary" @click="resumeMonitor">
-            <font-awesome-icon icon="play" /> Resume
-        </button>
-        <router-link :to=" '/edit/' + monitor.id " class="btn btn-secondary">
-            <font-awesome-icon icon="edit" /> Edit
-        </router-link>
-        <button class="btn btn-danger" @click="deleteDialog">
-            <font-awesome-icon icon="trash" /> Delete
-        </button>
-    </div>
-
-    <div class="shadow-box">
-        <div class="row">
-            <div class="col-md-8">
-                <HeartbeatBar :monitor-id="monitor.id" />
-                <span class="word">Check every {{ monitor.interval }} seconds.</span>
-            </div>
-            <div class="col-md-4 text-center">
-                <span class="badge rounded-pill" :class=" 'bg-' + status.color " style="font-size: 30px">{{ status.text }}</span>
-            </div>
-        </div>
-    </div>
-
-    <div class="shadow-box big-padding text-center stats">
-        <div class="row">
-            <div class="col">
-                <h4>{{ pingTitle }}</h4>
-                <p>(Current)</p>
-                <span class="num"><CountUp :value="ping" /></span>
-            </div>
-            <div class="col">
-                <h4>Avg. {{ pingTitle }}</h4>
-                <p>(24-hour)</p>
-                <span class="num"><CountUp :value="avgPing" /></span>
-            </div>
-            <div class="col">
-                <h4>Uptime</h4>
-                <p>(24-hour)</p>
-                <span class="num"><Uptime :monitor="monitor" type="24" /></span>
-            </div>
-            <div class="col">
-                <h4>Uptime</h4>
-                <p>(30-day)</p>
-                <span class="num"><Uptime :monitor="monitor" type="720" /></span>
-            </div>
-
-            <div v-if="certInfo" class="col">
-                <h4>Cert Exp.</h4>
-                <p>(<Datetime :value="certInfo.validTo" date-only />)</p>
-                <span class="num">
-                    <a href="#" @click.prevent="toggleCertInfoBox = !toggleCertInfoBox">{{ certInfo.daysRemaining }} days</a>
+    <transition name="slide-fade" appear>
+        <div v-if="monitor">
+            <h1> {{ monitor.name }}</h1>
+            <p class="url">
+                <a v-if="monitor.type === 'http' || monitor.type === 'keyword' " :href="monitor.url" target="_blank">{{ monitor.url }}</a>
+                <span v-if="monitor.type === 'port'">TCP Ping {{ monitor.hostname }}:{{ monitor.port }}</span>
+                <span v-if="monitor.type === 'ping'">Ping: {{ monitor.hostname }}</span>
+                <span v-if="monitor.type === 'keyword'">
+                    <br>
+                    <span>{{ $t("Keyword") }}:</span> <span class="keyword">{{ monitor.keyword }}</span>
                 </span>
-            </div>
-        </div>
-    </div>
+                <span v-if="monitor.type === 'dns'">[{{ monitor.dns_resolve_type }}] {{ monitor.hostname }}
+                    <br>
+                    <span>{{ $t("Last Result") }}:</span> <span class="keyword">{{ monitor.dns_last_result }}</span>
+                </span>
+            </p>
 
-    <div v-if="showCertInfoBox" class="shadow-box big-padding text-center">
-        <div class="row">
-            <div class="col">
-                <h4>Certificate Info</h4>
-                <table class="text-start">
+            <div class="functions">
+                <button v-if="monitor.active" class="btn btn-light" @click="pauseDialog">
+                    <font-awesome-icon icon="pause" /> {{ $t("Pause") }}
+                </button>
+                <button v-if="! monitor.active" class="btn btn-primary" @click="resumeMonitor">
+                    <font-awesome-icon icon="play" /> {{ $t("Resume") }}
+                </button>
+                <router-link :to=" '/edit/' + monitor.id " class="btn btn-secondary">
+                    <font-awesome-icon icon="edit" /> {{ $t("Edit") }}
+                </router-link>
+                <button class="btn btn-danger" @click="deleteDialog">
+                    <font-awesome-icon icon="trash" /> {{ $t("Delete") }}
+                </button>
+            </div>
+
+            <div class="shadow-box">
+                <div class="row">
+                    <div class="col-md-8">
+                        <HeartbeatBar :monitor-id="monitor.id" />
+                        <span class="word">{{ $t("checkEverySecond", [ monitor.interval ]) }}</span>
+                    </div>
+                    <div class="col-md-4 text-center">
+                        <span class="badge rounded-pill" :class=" 'bg-' + status.color " style="font-size: 30px;">{{ status.text }}</span>
+                    </div>
+                </div>
+            </div>
+
+            <div class="shadow-box big-padding text-center stats">
+                <div class="row">
+                    <div class="col">
+                        <h4>{{ pingTitle }}</h4>
+                        <p>({{ $t("Current") }})</p>
+                        <span class="num">
+                            <a href="#" @click.prevent="showPingChartBox = !showPingChartBox">
+                                <CountUp :value="ping" />
+                            </a>
+                        </span>
+                    </div>
+                    <div class="col">
+                        <h4>{{ $t("Avg.") }}{{ pingTitle }}</h4>
+                        <p>(24{{ $t("-hour") }})</p>
+                        <span class="num"><CountUp :value="avgPing" /></span>
+                    </div>
+                    <div class="col">
+                        <h4>{{ $t("Uptime") }}</h4>
+                        <p>(24{{ $t("-hour") }})</p>
+                        <span class="num"><Uptime :monitor="monitor" type="24" /></span>
+                    </div>
+                    <div class="col">
+                        <h4>{{ $t("Uptime") }}</h4>
+                        <p>(30{{ $t("-day") }})</p>
+                        <span class="num"><Uptime :monitor="monitor" type="720" /></span>
+                    </div>
+
+                    <div v-if="certInfo" class="col">
+                        <h4>{{ $t("Cert Exp.") }}</h4>
+                        <p>(<Datetime :value="certInfo.validTo" date-only />)</p>
+                        <span class="num">
+                            <a href="#" @click.prevent="toggleCertInfoBox = !toggleCertInfoBox">{{ certInfo.daysRemaining }} {{ $t("days") }}</a>
+                        </span>
+                    </div>
+                </div>
+            </div>
+
+            <transition name="slide-fade" appear>
+                <div v-if="showCertInfoBox" class="shadow-box big-padding text-center">
+                    <div class="row">
+                        <div class="col">
+                            <h4>{{ $t("Certificate Info") }}</h4>
+                            <table class="text-start">
+                                <tbody>
+                                    <tr class="my-3">
+                                        <td class="px-3">
+                                            Valid:
+                                        </td>
+                                        <td>{{ certInfo.valid }}</td>
+                                    </tr>
+                                    <tr class="my-3">
+                                        <td class="px-3">
+                                            Valid To:
+                                        </td>
+                                        <td><Datetime :value="certInfo.validTo" /></td>
+                                    </tr>
+                                    <tr class="my-3">
+                                        <td class="px-3">
+                                            Days Remaining:
+                                        </td>
+                                        <td>{{ certInfo.daysRemaining }}</td>
+                                    </tr>
+                                    <tr class="my-3">
+                                        <td class="px-3">
+                                            Issuer:
+                                        </td>
+                                        <td>{{ certInfo.issuer }}</td>
+                                    </tr>
+                                    <tr class="my-3">
+                                        <td class="px-3">
+                                            Fingerprint:
+                                        </td>
+                                        <td>{{ certInfo.fingerprint }}</td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+                </div>
+            </transition>
+
+            <div v-if="showPingChartBox" class="shadow-box big-padding text-center ping-chart-wrapper">
+                <div class="row">
+                    <div class="col">
+                        <PingChart :monitor-id="monitor.id" />
+                    </div>
+                </div>
+            </div>
+
+            <div class="shadow-box table-shadow-box">
+                <table class="table table-borderless table-hover">
+                    <thead>
+                        <tr>
+                            <th>{{ $t("Status") }}</th>
+                            <th>{{ $t("DateTime") }}</th>
+                            <th>{{ $t("Message") }}</th>
+                        </tr>
+                    </thead>
                     <tbody>
-                        <tr class="my-3">
-                            <td class="px-3">
-                                Valid:
-                            </td>
-                            <td>{{ certInfo.valid }}</td>
+                        <tr v-for="(beat, index) in displayedRecords" :key="index" :class="{ 'shadow-box': $root.windowWidth <= 550}" style="padding: 10px;">
+                            <td><Status :status="beat.status" /></td>
+                            <td :class="{ 'border-0':! beat.msg}"><Datetime :value="beat.time" /></td>
+                            <td class="border-0">{{ beat.msg }}</td>
                         </tr>
-                        <tr class="my-3">
-                            <td class="px-3">
-                                Valid To:
+
+                        <tr v-if="importantHeartBeatList.length === 0">
+                            <td colspan="3">
+                                {{ $t("No important events") }}
                             </td>
-                            <td><Datetime :value="certInfo.validTo" /></td>
-                        </tr>
-                        <tr class="my-3">
-                            <td class="px-3">
-                                Days Remaining:
-                            </td>
-                            <td>{{ certInfo.daysRemaining }}</td>
-                        </tr>
-                        <tr class="my-3">
-                            <td class="px-3">
-                                Issuer:
-                            </td>
-                            <td>{{ certInfo.issuer }}</td>
-                        </tr>
-                        <tr class="my-3">
-                            <td class="px-3">
-                                Fingerprint:
-                            </td>
-                            <td>{{ certInfo.fingerprint }}</td>
                         </tr>
                     </tbody>
                 </table>
+
+                <div class="d-flex justify-content-center kuma_pagination">
+                    <pagination
+                        v-model="page"
+                        :records="importantHeartBeatList.length"
+                        :per-page="perPage"
+                    />
+                </div>
             </div>
+
+            <Confirm ref="confirmPause" :yes-text="$t('Yes')" :no-text="$t('No')" @yes="pauseMonitor">
+                {{ $t("pauseMonitorMsg") }}
+            </Confirm>
+
+            <Confirm ref="confirmDelete" btn-style="btn-danger" :yes-text="$t('Yes')" :no-text="$t('No')" @yes="deleteMonitor">
+                {{ $t("deleteMonitorMsg") }}
+            </Confirm>
         </div>
-    </div>
-
-    <div class="shadow-box">
-        <table class="table table-borderless table-hover">
-            <thead>
-                <tr>
-                    <th>Status</th>
-                    <th>DateTime</th>
-                    <th>Message</th>
-                </tr>
-            </thead>
-            <tbody>
-                <tr v-for="(beat, index) in displayedRecords" :key="index">
-                    <td><Status :status="beat.status" /></td>
-                    <td><Datetime :value="beat.time" /></td>
-                    <td>{{ beat.msg }}</td>
-                </tr>
-
-                <tr v-if="importantHeartBeatList.length === 0">
-                    <td colspan="3">
-                        No important events
-                    </td>
-                </tr>
-            </tbody>
-        </table>
-
-        <div class="d-flex justify-content-center kuma_pagination">
-            <pagination
-                v-model="page"
-                :records="importantHeartBeatList.length"
-                :per-page="perPage"
-            />
-        </div>
-    </div>
-
-    <Confirm ref="confirmPause" @yes="pauseMonitor">
-        Are you sure want to pause?
-    </Confirm>
-
-    <Confirm ref="confirmDelete" btn-style="btn-danger" @yes="deleteMonitor">
-        Are you sure want to delete this monitor?
-    </Confirm>
+    </transition>
 </template>
 
 <script>
+import { defineAsyncComponent } from "vue";
 import { useToast } from "vue-toastification"
 const toast = useToast()
 import Confirm from "../components/Confirm.vue";
@@ -164,6 +187,7 @@ import Datetime from "../components/Datetime.vue";
 import CountUp from "../components/CountUp.vue";
 import Uptime from "../components/Uptime.vue";
 import Pagination from "v-pagination-3";
+const PingChart = defineAsyncComponent(() => import("../components/PingChart.vue"));
 
 export default {
     components: {
@@ -174,6 +198,7 @@ export default {
         Confirm,
         Status,
         Pagination,
+        PingChart,
     },
     data() {
         return {
@@ -181,16 +206,16 @@ export default {
             perPage: 25,
             heartBeatList: [],
             toggleCertInfoBox: false,
+            showPingChartBox: true,
         }
     },
     computed: {
 
         pingTitle() {
             if (this.monitor.type === "http") {
-                return "Response"
+                return this.$t("Response");
             }
-
-            return "Ping"
+            return this.$t("Ping");
         },
 
         monitor() {
@@ -306,6 +331,41 @@ export default {
 <style lang="scss" scoped>
 @import "../assets/vars.scss";
 
+@media (max-width: 767px) {
+    .badge {
+        margin-top: 14px;
+    }
+}
+
+@media (max-width: 550px) {
+    .functions {
+        text-align: center;
+    }
+
+    button, a {
+        margin-left: 10px !important;
+        margin-right: 10px !important;
+    }
+
+    .ping-chart-wrapper {
+        padding: 10px !important;
+    }
+}
+
+@media (max-width: 400px) {
+    .btn {
+        display: inline-flex;
+        flex-direction: column;
+        align-items: center;
+        padding-top: 10px;
+    }
+
+    a.btn {
+        padding-left: 25px;
+        padding-right: 25px;
+    }
+}
+
 .url {
     color: $primary;
     margin-bottom: 20px;
@@ -328,7 +388,7 @@ export default {
 }
 
 .word {
-    color: #AAA;
+    color: #aaa;
     font-size: 14px;
 }
 
@@ -342,7 +402,7 @@ table {
 
 .stats p {
     font-size: 13px;
-    color: #AAA;
+    color: #aaa;
 }
 
 .stats {
@@ -357,9 +417,10 @@ table {
     color: black;
 }
 
-.dark  {
+.dark {
     .keyword {
         color: $dark-font-color;
     }
 }
+
 </style>

src/pages/EditMonitor.vue

@@ -1,156 +1,203 @@
 <template>
-    <h1 class="mb-3">{{ pageName }}</h1>
-    <form @submit.prevent="submit">
-        <div class="shadow-box">
-            <div class="row">
-                <div class="col-md-6">
-                    <h2 class="mb-2">General</h2>
+    <transition name="slide-fade" appear>
+        <div>
+            <h1 class="mb-3">{{ pageName }}</h1>
+            <form @submit.prevent="submit">
+                <div class="shadow-box">
+                    <div class="row">
+                        <div class="col-md-6">
+                            <h2 class="mb-2">{{ $t("General") }}</h2>
 
-                    <div class="my-3">
-                        <label for="type" class="form-label">Monitor Type</label>
-                        <select id="type" v-model="monitor.type" class="form-select" aria-label="Default select example">
-                            <option value="http">
-                                HTTP(s)
-                            </option>
-                            <option value="port">
-                                TCP Port
-                            </option>
-                            <option value="ping">
-                                Ping
-                            </option>
-                            <option value="keyword">
-                                HTTP(s) - Keyword
-                            </option>
-                        </select>
-                    </div>
+                            <div class="my-3">
+                                <label for="type" class="form-label">{{ $t("Monitor Type") }}</label>
+                                <select id="type" v-model="monitor.type" class="form-select" aria-label="Default select example">
+                                    <option value="http">
+                                        HTTP(s)
+                                    </option>
+                                    <option value="port">
+                                        TCP Port
+                                    </option>
+                                    <option value="ping">
+                                        Ping
+                                    </option>
+                                    <option value="keyword">
+                                        HTTP(s) - {{ $t("Keyword") }}
+                                    </option>
+                                    <option value="dns">
+                                        DNS
+                                    </option>
+                                </select>
+                            </div>
 
-                    <div class="my-3">
-                        <label for="name" class="form-label">Friendly Name</label>
-                        <input id="name" v-model="monitor.name" type="text" class="form-control" required>
-                    </div>
+                            <div class="my-3">
+                                <label for="name" class="form-label">{{ $t("Friendly Name") }}</label>
+                                <input id="name" v-model="monitor.name" type="text" class="form-control" required>
+                            </div>
 
-                    <div v-if="monitor.type === 'http' || monitor.type === 'keyword' " class="my-3">
-                        <label for="url" class="form-label">URL</label>
-                        <input id="url" v-model="monitor.url" type="url" class="form-control" pattern="https?://.+" required>
-                    </div>
+                            <div v-if="monitor.type === 'http' || monitor.type === 'keyword' " class="my-3">
+                                <label for="url" class="form-label">{{ $t("URL") }}</label>
+                                <input id="url" v-model="monitor.url" type="url" class="form-control" pattern="https?://.+" required>
+                            </div>
 
-                    <div v-if="monitor.type === 'keyword' " class="my-3">
-                        <label for="keyword" class="form-label">Keyword</label>
-                        <input id="keyword" v-model="monitor.keyword" type="text" class="form-control" required>
-                        <div class="form-text">
-                            Search keyword in plain html or JSON response and it is case-sensitive
+                            <div v-if="monitor.type === 'keyword' " class="my-3">
+                                <label for="keyword" class="form-label">{{ $t("Keyword") }}</label>
+                                <input id="keyword" v-model="monitor.keyword" type="text" class="form-control" required>
+                                <div class="form-text">
+                                    {{ $t("keywordDescription") }}
+                                </div>
+                            </div>
+
+                            <!-- TCP Port / Ping / DNS only -->
+                            <div v-if="monitor.type === 'port' || monitor.type === 'ping' || monitor.type === 'dns' " class="my-3">
+                                <label for="hostname" class="form-label">{{ $t("Hostname") }}</label>
+                                <input id="hostname" v-model="monitor.hostname" type="text" class="form-control" required>
+                            </div>
+
+                            <!-- For TCP Port Type -->
+                            <div v-if="monitor.type === 'port' " class="my-3">
+                                <label for="port" class="form-label">{{ $t("Port") }}</label>
+                                <input id="port" v-model="monitor.port" type="number" class="form-control" required min="0" max="65535" step="1">
+                            </div>
+
+                            <!-- For DNS Type -->
+                            <template v-if="monitor.type === 'dns'">
+                                <div class="my-3">
+                                    <label for="dns_resolve_server" class="form-label">{{ $t("Resolver Server") }}</label>
+                                    <input id="dns_resolve_server" v-model="monitor.dns_resolve_server" type="text" class="form-control" :pattern="ipRegex" required>
+                                    <div class="form-text">
+                                        {{ $t("resoverserverDescription") }}
+                                    </div>
+                                </div>
+
+                                <div class="my-3">
+                                    <label for="dns_resolve_type" class="form-label">{{ $t("Resource Record Type") }}</label>
+
+                                    <!-- :allow-empty="false" is not working, set a default value instead https://github.com/shentao/vue-multiselect/issues/336   -->
+                                    <VueMultiselect
+                                        id="dns_resolve_type"
+                                        v-model="monitor.dns_resolve_type"
+                                        :options="dnsresolvetypeOptions"
+                                        :multiple="false"
+                                        :close-on-select="true"
+                                        :clear-on-select="false"
+                                        :preserve-search="false"
+                                        placeholder="Pick a RR-Type..."
+                                        :preselect-first="false"
+                                        :max-height="500"
+                                        :taggable="false"
+                                    ></VueMultiselect>
+
+                                    <div class="form-text">
+                                        {{ $t("rrtypeDescription") }}
+                                    </div>
+                                </div>
+                            </template>
+
+                            <div class="my-3">
+                                <label for="interval" class="form-label">{{ $t("Heartbeat Interval") }} ({{ $t("checkEverySecond", [ monitor.interval ]) }})</label>
+                                <input id="interval" v-model="monitor.interval" type="number" class="form-control" required min="20" step="1">
+                            </div>
+
+                            <div class="my-3">
+                                <label for="maxRetries" class="form-label">{{ $t("Retries") }}</label>
+                                <input id="maxRetries" v-model="monitor.maxretries" type="number" class="form-control" required min="0" step="1">
+                                <div class="form-text">
+                                    {{ $t("retriesDescription") }}
+                                </div>
+                            </div>
+
+                            <h2 class="mt-5 mb-2">{{ $t("Advanced") }}</h2>
+
+                            <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">
+                                    {{ $t("ignoreTLSError") }}
+                                </label>
+                            </div>
+
+                            <div class="my-3 form-check">
+                                <input id="upside-down" v-model="monitor.upsideDown" class="form-check-input" type="checkbox">
+                                <label class="form-check-label" for="upside-down">
+                                    {{ $t("Upside Down Mode") }}
+                                </label>
+                                <div class="form-text">
+                                    {{ $t("upsideDownModeDescription") }}
+                                </div>
+                            </div>
+
+                            <!-- HTTP / Keyword only -->
+                            <template v-if="monitor.type === 'http' || monitor.type === 'keyword' ">
+                                <div class="my-3">
+                                    <label for="maxRedirects" class="form-label">{{ $t("Max. Redirects") }}</label>
+                                    <input id="maxRedirects" v-model="monitor.maxredirects" type="number" class="form-control" required min="0" step="1">
+                                    <div class="form-text">
+                                        {{ $t("maxRedirectDescription") }}
+                                    </div>
+                                </div>
+
+                                <div class="my-3">
+                                    <label for="acceptedStatusCodes" class="form-label">{{ $t("Accepted Status Codes") }}</label>
+
+                                    <VueMultiselect
+                                        id="acceptedStatusCodes"
+                                        v-model="monitor.accepted_statuscodes"
+                                        :options="acceptedStatusCodeOptions"
+                                        :multiple="true"
+                                        :close-on-select="false"
+                                        :clear-on-select="false"
+                                        :preserve-search="true"
+                                        placeholder="Pick Accepted Status Codes..."
+                                        :preselect-first="false"
+                                        :max-height="600"
+                                        :taggable="true"
+                                    ></VueMultiselect>
+
+                                    <div class="form-text">
+                                        {{ $t("acceptedStatusCodesDescription") }}
+                                    </div>
+                                </div>
+                            </template>
+
+                            <div class="mt-5 mb-1">
+                                <button class="btn btn-primary" type="submit" :disabled="processing">{{ $t("Save") }}</button>
+                            </div>
                         </div>
-                    </div>
 
-                    <div v-if="monitor.type === 'port' || monitor.type === 'ping' " class="my-3">
-                        <label for="hostname" class="form-label">Hostname</label>
-                        <input id="hostname" v-model="monitor.hostname" type="text" class="form-control" required>
-                    </div>
+                        <div class="col-md-6">
+                            <div v-if="$root.isMobile" class="mt-3" />
 
-                    <div v-if="monitor.type === 'port' " class="my-3">
-                        <label for="port" class="form-label">Port</label>
-                        <input id="port" v-model="monitor.port" type="number" class="form-control" required min="0" max="65535" step="1">
-                    </div>
+                            <h2 class="mb-2">{{ $t("Notifications") }}</h2>
+                            <p v-if="$root.notificationList.length === 0">
+                                {{ $t("Not available, please setup.") }}
+                            </p>
 
-                    <div class="my-3">
-                        <label for="interval" class="form-label">Heartbeat Interval (Every {{ monitor.interval }} seconds)</label>
-                        <input id="interval" v-model="monitor.interval" type="number" class="form-control" required min="20" step="1">
-                    </div>
+                            <div v-for="notification in $root.notificationList" :key="notification.id" class="form-check form-switch my-3">
+                                <input :id=" 'notification' + notification.id" v-model="monitor.notificationIDList[notification.id]" class="form-check-input" type="checkbox">
 
-                    <div class="my-3">
-                        <label for="maxRetries" class="form-label">Retries</label>
-                        <input id="maxRetries" v-model="monitor.maxretries" type="number" class="form-control" required min="0" step="1">
-                        <div class="form-text">
-                            Maximum retries before the service is marked as down and a notification is sent
+                                <label class="form-check-label" :for=" 'notification' + notification.id">
+                                    {{ notification.name }}
+                                    <a href="#" @click="$refs.notificationDialog.show(notification.id)">{{ $t("Edit") }}</a>
+                                </label>
+                            </div>
+
+                            <button class="btn btn-primary me-2" type="button" @click="$refs.notificationDialog.show()">
+                                {{ $t("Setup Notification") }}
+                            </button>
                         </div>
                     </div>
-
-                    <h2 class="mt-5 mb-2">Advanced</h2>
-
-                    <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">
-                            Ignore TLS/SSL error for HTTPS websites
-                        </label>
-                    </div>
-
-                    <div class="my-3 form-check">
-                        <input id="upside-down" v-model="monitor.upsideDown" class="form-check-input" type="checkbox">
-                        <label class="form-check-label" for="upside-down">
-                            Upside Down Mode
-                        </label>
-                        <div class="form-text">
-                            Flip the status upside down. If the service is reachable, it is DOWN.
-                        </div>
-                    </div>
-
-                    <div v-if="monitor.type === 'http' || monitor.type === 'keyword' " class="my-3">
-                        <label for="maxRedirects" class="form-label">Max. Redirects</label>
-                        <input id="maxRedirects" v-model="monitor.maxredirects" type="number" class="form-control" required min="0" step="1">
-                        <div class="form-text">
-                            Maximum number of redirects to follow. Set to 0 to disable redirects.
-                        </div>
-                    </div>
-
-                    <div v-if="monitor.type === 'http' || monitor.type === 'keyword' " class="my-3">
-                        <label for="acceptedStatusCodes" class="form-label">Accepted Status Codes</label>
-
-                        <VueMultiselect
-                            id="acceptedStatusCodes"
-                            v-model="monitor.accepted_statuscodes"
-                            :options="acceptedStatusCodeOptions"
-                            :multiple="true"
-                            :close-on-select="false"
-                            :clear-on-select="false"
-                            :preserve-search="true"
-                            placeholder="Pick Accepted Status Codes..."
-                            :preselect-first="false"
-                            :max-height="600"
-                            :taggable="true"
-                        ></VueMultiselect>
-
-                        <div class="form-text">
-                            Select status codes which are considered as a successful response.
-                        </div>
-                    </div>
-
-                    <div class="mt-5 mb-1">
-                        <button class="btn btn-primary" type="submit" :disabled="processing">Save</button>
-                    </div>
                 </div>
+            </form>
 
-                <div class="col-md-6">
-                    <div v-if="$root.isMobile" class="mt-3" />
-
-                    <h2 class="mb-2">Notifications</h2>
-                    <p v-if="$root.notificationList.length === 0">
-                        Not available, please setup.
-                    </p>
-
-                    <div v-for="notification in $root.notificationList" :key="notification.id" class="form-check form-switch my-3">
-                        <input :id=" 'notification' + notification.id" v-model="monitor.notificationIDList[notification.id]" class="form-check-input" type="checkbox">
-
-                        <label class="form-check-label" :for=" 'notification' + notification.id">
-                            {{ notification.name }}
-                            <a href="#" @click="$refs.notificationDialog.show(notification.id)">Edit</a>
-                        </label>
-                    </div>
-
-                    <button class="btn btn-primary me-2" type="button" @click="$refs.notificationDialog.show()">
-                        Setup Notification
-                    </button>
-                </div>
-            </div>
+            <NotificationDialog ref="notificationDialog" />
         </div>
-    </form>
-
-    <NotificationDialog ref="notificationDialog" />
+    </transition>
 </template>
 
 <script>
 import NotificationDialog from "../components/NotificationDialog.vue";
 import { useToast } from "vue-toastification"
 import VueMultiselect from "vue-multiselect"
+import { isDev } from "../util.ts";
 const toast = useToast()
 
 export default {
@@ -164,14 +211,29 @@ export default {
             processing: false,
             monitor: {
                 notificationIDList: {},
+                // Do not add default value here, please check init() method
             },
             acceptedStatusCodeOptions: [],
+            dnsresolvetypeOptions: [],
+
+            // Source: https://digitalfortress.tech/tips/top-15-commonly-used-regex/
+            ipRegexPattern: "((^\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\s*$)|(^\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(%.+)?\s*$))",
         }
     },
 
     computed: {
+
+        ipRegex() {
+
+            // Allow to test with simple dns server with port (127.0.0.1:5300)
+            if (! isDev) {
+                return this.ipRegexPattern;
+            }
+            return null;
+        },
+
         pageName() {
-            return (this.isAdd) ? "Add New Monitor" : "Edit"
+            return this.$t((this.isAdd) ? "Add New Monitor" : "Edit");
         },
         isAdd() {
             return this.$route.path === "/add";
@@ -181,7 +243,7 @@ export default {
         },
     },
     watch: {
-        "$route.fullPath" () {
+        "$route.fullPath"() {
             this.init();
         },
     },
@@ -196,11 +258,25 @@ export default {
             "500-599",
         ];
 
+        let dnsresolvetypeOptions = [
+            "A",
+            "AAAA",
+            "CAA",
+            "CNAME",
+            "MX",
+            "NS",
+            "PTR",
+            "SOA",
+            "SRV",
+            "TXT",
+        ];
+
         for (let i = 100; i <= 999; i++) {
             acceptedStatusCodeOptions.push(i.toString());
         }
 
         this.acceptedStatusCodeOptions = acceptedStatusCodeOptions;
+        this.dnsresolvetypeOptions = dnsresolvetypeOptions;
     },
     methods: {
         init() {
@@ -217,6 +293,8 @@ export default {
                     upsideDown: false,
                     maxredirects: 10,
                     accepted_statuscodes: ["200-299"],
+                    dns_resolve_type: "A",
+                    dns_resolve_server: "1.1.1.1",
                 }
             } else if (this.isEdit) {
                 this.$root.getSocket().emit("getMonitor", this.$route.params.id, (res) => {

src/pages/List.vue

@@ -0,0 +1,16 @@
+<template>
+    <transition name="slide-fade" appear>
+        <MonitorList />
+    </transition>
+</template>
+
+<script>
+import MonitorList from "../components/MonitorList.vue";
+
+export default {
+    components: {
+        MonitorList,
+    },
+}
+</script>
+

src/pages/Settings.vue

@@ -1,139 +1,191 @@
 <template>
-    <h1 class="mb-3">
-        Settings
-    </h1>
+    <transition name="slide-fade" appear>
+        <div>
+            <h1 v-show="show" class="mb-3">
+                {{ $t("Settings") }}
+            </h1>
 
-    <div class="shadow-box">
-        <div class="row">
-            <div class="col-md-6">
-                <h2 class="mb-2">General</h2>
+            <div class="shadow-box">
+                <div class="row">
+                    <div class="col-md-6">
+                        <h2 class="mb-2">{{ $t("Appearance") }}</h2>
 
-                <form class="mb-3" @submit.prevent="saveGeneral">
-                    <div class="mb-3">
-                        <label for="timezone" class="form-label">Theme</label>
+                        <div class="mb-3">
+                            <label for="language" class="form-label">{{ $t("Language") }}</label>
+                            <select id="language" v-model="$i18n.locale" class="form-select">
+                                <option v-for="(lang, i) in $i18n.availableLocales" :key="`Lang${i}`" :value="lang">
+                                    {{ $i18n.messages[lang].languageName }}
+                                </option>
+                            </select>
+                        </div>
 
-                        <div>
-                            <div class="btn-group" role="group" aria-label="Basic checkbox toggle button group">
-                                <input id="btncheck1" v-model="$root.userTheme" type="radio" class="btn-check" name="theme" autocomplete="off" value="light">
-                                <label class="btn btn-outline-primary" for="btncheck1">Light</label>
+                        <div class="mb-3">
+                            <label for="timezone" class="form-label">{{ $t("Theme") }}</label>
 
-                                <input id="btncheck2" v-model="$root.userTheme" type="radio" class="btn-check" name="theme" autocomplete="off" value="dark">
-                                <label class="btn btn-outline-primary" for="btncheck2">Dark</label>
+                            <div>
+                                <div class="btn-group" role="group" aria-label="Basic checkbox toggle button group">
+                                    <input id="btncheck1" v-model="$root.userTheme" type="radio" class="btn-check" name="theme" autocomplete="off" value="light">
+                                    <label class="btn btn-outline-primary" for="btncheck1">{{ $t("Light") }}</label>
 
-                                <input id="btncheck3" v-model="$root.userTheme" type="radio" class="btn-check" name="theme" autocomplete="off" value="auto">
-                                <label class="btn btn-outline-primary" for="btncheck3">Auto</label>
+                                    <input id="btncheck2" v-model="$root.userTheme" type="radio" class="btn-check" name="theme" autocomplete="off" value="dark">
+                                    <label class="btn btn-outline-primary" for="btncheck2">{{ $t("Dark") }}</label>
+
+                                    <input id="btncheck3" v-model="$root.userTheme" type="radio" class="btn-check" name="theme" autocomplete="off" value="auto">
+                                    <label class="btn btn-outline-primary" for="btncheck3">{{ $t("Auto") }}</label>
+                                </div>
                             </div>
                         </div>
-                    </div>
 
-                    <div class="mb-3">
-                        <label for="timezone" class="form-label">Timezone</label>
-                        <select id="timezone" v-model="$root.userTimezone" class="form-select">
-                            <option value="auto">
-                                Auto: {{ guessTimezone }}
-                            </option>
-                            <option v-for="(timezone, index) in timezoneList" :key="index" :value="timezone.value">
-                                {{ timezone.name }}
-                            </option>
-                        </select>
-                    </div>
+                        <div class="mb-3">
+                            <label class="form-label">{{ $t("Theme - Heartbeat Bar") }}</label>
+                            <div>
+                                <div class="btn-group" role="group" aria-label="Basic checkbox toggle button group">
+                                    <input id="btncheck4" v-model="$root.userHeartbeatBar" type="radio" class="btn-check" name="heartbeatBarTheme" autocomplete="off" value="normal">
+                                    <label class="btn btn-outline-primary" for="btncheck4">{{ $t("Normal") }}</label>
 
-                    <div class="mb-3">
-                        <label class="form-label">Search Engine Visibility</label>
+                                    <input id="btncheck5" v-model="$root.userHeartbeatBar" type="radio" class="btn-check" name="heartbeatBarTheme" autocomplete="off" value="bottom">
+                                    <label class="btn btn-outline-primary" for="btncheck5">{{ $t("Bottom") }}</label>
 
-                        <div class="form-check">
-                            <input id="searchEngineIndexYes" v-model="settings.searchEngineIndex" class="form-check-input" type="radio" name="flexRadioDefault" :value="true" required>
-                            <label class="form-check-label" for="searchEngineIndexYes">
-                                Allow indexing
-                            </label>
+                                    <input id="btncheck6" v-model="$root.userHeartbeatBar" type="radio" class="btn-check" name="heartbeatBarTheme" autocomplete="off" value="none">
+                                    <label class="btn btn-outline-primary" for="btncheck6">{{ $t("None") }}</label>
+                                </div>
+                            </div>
                         </div>
-                        <div class="form-check">
-                            <input id="searchEngineIndexNo" v-model="settings.searchEngineIndex" class="form-check-input" type="radio" name="flexRadioDefault" :value="false" required>
-                            <label class="form-check-label" for="searchEngineIndexNo">
-                                Discourage search engines from indexing site
-                            </label>
-                        </div>
-                    </div>
 
-                    <div>
-                        <button class="btn btn-primary" type="submit">
-                            Save
-                        </button>
-                    </div>
-                </form>
-
-                <template v-if="loaded">
-                    <template v-if="! settings.disableAuth">
-                        <h2 class="mt-5 mb-2">Change Password</h2>
-                        <form class="mb-3" @submit.prevent="savePassword">
+                        <h2 class="mt-5 mb-2">{{ $t("General") }}</h2>
+                        <form class="mb-3" @submit.prevent="saveGeneral">
                             <div class="mb-3">
-                                <label for="current-password" class="form-label">Current Password</label>
-                                <input id="current-password" v-model="password.currentPassword" type="password" class="form-control" required>
+                                <label for="timezone" class="form-label">{{ $t("Timezone") }}</label>
+                                <select id="timezone" v-model="$root.userTimezone" class="form-select">
+                                    <option value="auto">
+                                        {{ $t("Auto") }}: {{ guessTimezone }}
+                                    </option>
+                                    <option v-for="(timezone, index) in timezoneList" :key="index" :value="timezone.value">
+                                        {{ timezone.name }}
+                                    </option>
+                                </select>
                             </div>
 
                             <div class="mb-3">
-                                <label for="new-password" class="form-label">New Password</label>
-                                <input id="new-password" v-model="password.newPassword" type="password" class="form-control" required>
-                            </div>
+                                <label class="form-label">{{ $t("Search Engine Visibility") }}</label>
 
-                            <div class="mb-3">
-                                <label for="repeat-new-password" class="form-label">Repeat New Password</label>
-                                <input id="repeat-new-password" v-model="password.repeatNewPassword" type="password" class="form-control" :class="{ 'is-invalid' : invalidPassword }" required>
-                                <div class="invalid-feedback">
-                                    The repeat password does not match.
+                                <div class="form-check">
+                                    <input id="searchEngineIndexYes" v-model="settings.searchEngineIndex" class="form-check-input" type="radio" name="flexRadioDefault" :value="true" required>
+                                    <label class="form-check-label" for="searchEngineIndexYes">
+                                        {{ $t("Allow indexing") }}
+                                    </label>
+                                </div>
+                                <div class="form-check">
+                                    <input id="searchEngineIndexNo" v-model="settings.searchEngineIndex" class="form-check-input" type="radio" name="flexRadioDefault" :value="false" required>
+                                    <label class="form-check-label" for="searchEngineIndexNo">
+                                        {{ $t("Discourage search engines from indexing site") }}
+                                    </label>
                                 </div>
                             </div>
 
                             <div>
                                 <button class="btn btn-primary" type="submit">
-                                    Update Password
+                                    {{ $t("Save") }}
                                 </button>
                             </div>
                         </form>
-                    </template>
 
-                    <h2 class="mt-5 mb-2">Advanced</h2>
+                        <template v-if="loaded">
+                            <template v-if="! settings.disableAuth">
+                                <h2 class="mt-5 mb-2">{{ $t("Change Password") }}</h2>
+                                <form class="mb-3" @submit.prevent="savePassword">
+                                    <div class="mb-3">
+                                        <label for="current-password" class="form-label">{{ $t("Current Password") }}</label>
+                                        <input id="current-password" v-model="password.currentPassword" type="password" class="form-control" required>
+                                    </div>
 
-                    <div class="mb-3">
-                        <button v-if="settings.disableAuth" class="btn btn-outline-primary me-1" @click="enableAuth">Enable Auth</button>
-                        <button v-if="! settings.disableAuth" class="btn btn-primary me-1" @click="confirmDisableAuth">Disable Auth</button>
-                        <button v-if="! settings.disableAuth" class="btn btn-danger me-1" @click="$root.logout">Logout</button>
+                                    <div class="mb-3">
+                                        <label for="new-password" class="form-label">{{ $t("New Password") }}</label>
+                                        <input id="new-password" v-model="password.newPassword" type="password" class="form-control" required>
+                                    </div>
+
+                                    <div class="mb-3">
+                                        <label for="repeat-new-password" class="form-label">{{ $t("Repeat New Password") }}</label>
+                                        <input id="repeat-new-password" v-model="password.repeatNewPassword" type="password" class="form-control" :class="{ 'is-invalid' : invalidPassword }" required>
+                                        <div class="invalid-feedback">
+                                            {{ $t("passwordNotMatchMsg") }}
+                                        </div>
+                                    </div>
+
+                                    <div>
+                                        <button class="btn btn-primary" type="submit">
+                                            {{ $t("Update Password") }}
+                                        </button>
+                                    </div>
+                                </form>
+                            </template>
+
+                            <h2 class="mt-5 mb-2">{{ $t("Advanced") }}</h2>
+
+                            <div class="mb-3">
+                                <button v-if="settings.disableAuth" class="btn btn-outline-primary me-1" @click="enableAuth">{{ $t("Enable Auth") }}</button>
+                                <button v-if="! settings.disableAuth" class="btn btn-primary me-1" @click="confirmDisableAuth">{{ $t("Disable Auth") }}</button>
+                                <button v-if="! settings.disableAuth" class="btn btn-danger me-1" @click="$root.logout">{{ $t("Logout") }}</button>
+                            </div>
+                        </template>
                     </div>
+
+                    <div class="notification-list col-md-6">
+                        <div v-if="$root.isMobile" class="mt-3" />
+
+                        <h2>{{ $t("Notifications") }}</h2>
+                        <p v-if="$root.notificationList.length === 0">
+                            {{ $t("Not available, please setup.") }}
+                        </p>
+                        <p v-else>
+                            {{ $t("notificationDescription") }}
+                        </p>
+
+                        <ul class="list-group mb-3" style="border-radius: 1rem;">
+                            <li v-for="(notification, index) in $root.notificationList" :key="index" class="list-group-item">
+                                {{ notification.name }}<br>
+                                <a href="#" @click="$refs.notificationDialog.show(notification.id)">{{ $t("Edit") }}</a>
+                            </li>
+                        </ul>
+
+                        <button class="btn btn-primary me-2" type="button" @click="$refs.notificationDialog.show()">
+                            {{ $t("Setup Notification") }}
+                        </button>
+                    </div>
+                </div>
+            </div>
+
+            <footer>
+                <div class="container-fluid">
+                    Uptime Kuma -
+                    {{ $t("Version") }}: {{ $root.info.version }} -
+                    <a href="https://github.com/louislam/uptime-kuma/releases" target="_blank" rel="noopener">{{ $t("Check Update On GitHub") }}</a>
+                </div>
+            </footer>
+
+            <NotificationDialog ref="notificationDialog" />
+
+            <Confirm ref="confirmDisableAuth" btn-style="btn-danger" :yes-text="$t('I understand, please disable')" :no-text="$t('Leave')" @yes="disableAuth">
+                <template v-if="$i18n.locale === 'en' ">
+                    <p>Are you sure want to <strong>disable auth</strong>?</p>
+                    <p>It is for <strong>someone who have 3rd-party auth</strong> in front of Uptime Kuma such as Cloudflare Access.</p>
+                    <p>Please use it carefully.</p>
                 </template>
-            </div>
 
-            <div class="notification-list col-md-6">
-                <div v-if="$root.isMobile" class="mt-3" />
+                <template v-if="$i18n.locale === 'zh-HK' ">
+                    <p>你是否確認<strong>取消登入認証</strong>？</p>
+                    <p>這個功能是設計給已有<strong>第三方認証</strong>的用家，例如 Cloudflare Access。</p>
+                    <p>請小心使用。</p>
+                </template>
 
-                <h2>Notifications</h2>
-                <p v-if="$root.notificationList.length === 0">
-                    Not available, please setup.
-                </p>
-                <p v-else>
-                    Please assign a notification to monitor(s) to get it to work.
-                </p>
-
-                <ul class="list-group mb-3" style="border-radius: 1rem;">
-                    <li v-for="(notification, index) in $root.notificationList" :key="index" class="list-group-item">
-                        {{ notification.name }}<br>
-                        <a href="#" @click="$refs.notificationDialog.show(notification.id)">Edit</a>
-                    </li>
-                </ul>
-
-                <button class="btn btn-primary me-2" type="button" @click="$refs.notificationDialog.show()">
-                    Setup Notification
-                </button>
-            </div>
+                <template v-if="$i18n.locale === 'de-DE' ">
+                    <p>Bist du sicher das du die <strong>Authentifizierung deaktivieren</strong> möchtest?</p>
+                    <p>Es ist für <strong>jemanden der eine externe Authentifizierung</strong> vor Uptime Kuma geschaltet hat, wie z.B. Cloudflare Access.</p>
+                    <p>Bitte mit Vorsicht nutzen.</p>
+                </template>
+            </Confirm>
         </div>
-    </div>
-
-    <NotificationDialog ref="notificationDialog" />
-
-    <Confirm ref="confirmDisableAuth" btn-style="btn-danger" yes-text="I understand, please disable" no-text="Leave" @yes="disableAuth">
-        <p>Are you sure want to <strong>disable auth</strong>?</p>
-        <p>It is for <strong>someone who have 3rd-party auth</strong> in front of  Uptime Kuma such as Cloudflare Access.</p>
-        <p>Please use it carefully.</p>
-    </Confirm>
+    </transition>
 </template>
 
 <script>
@@ -158,7 +210,7 @@ export default {
         return {
             timezoneList: timezoneList(),
             guessTimezone: dayjs.tz.guess(),
-
+            show: true,
             invalidPassword: false,
             password: {
                 currentPassword: "",
@@ -175,6 +227,10 @@ export default {
         "password.repeatNewPassword"() {
             this.invalidPassword = false;
         },
+
+        "$i18n.locale"() {
+            localStorage.locale = this.$i18n.locale;
+        },
     },
 
     mounted() {
@@ -248,10 +304,30 @@ export default {
     padding: 20px;
 }
 
+.btn-check:active + .btn-outline-primary,
+.btn-check:checked + .btn-outline-primary,
+.btn-check:hover + .btn-outline-primary {
+    color: #fff;
+}
+
 .dark {
     .list-group-item {
         background-color: $dark-bg2;
         color: $dark-font-color;
     }
+
+    .btn-check:active + .btn-outline-primary,
+    .btn-check:checked + .btn-outline-primary,
+    .btn-check:hover + .btn-outline-primary {
+        color: #000;
+    }
+}
+
+footer {
+    color: #aaa;
+    font-size: 13px;
+    margin-top: 20px;
+    padding-bottom: 30px;
+    text-align: center;
 }
 </style>

src/util.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.polyfill = exports.debug = exports.ucfirst = exports.sleep = exports.flipStatus = exports.PENDING = exports.UP = exports.DOWN = exports.appName = void 0;
+exports.getRandomInt = exports.getRandomArbitrary = exports.TimeLogger = exports.polyfill = exports.debug = exports.ucfirst = exports.sleep = exports.flipStatus = exports.PENDING = exports.UP = exports.DOWN = exports.appName = exports.isDev = void 0;
+const _dayjs = require("dayjs");
+const dayjs = _dayjs;
+exports.isDev = process.env.NODE_ENV === "development";
 exports.appName = "Uptime Kuma";
 exports.DOWN = 0;
 exports.UP = 1;
@@ -28,7 +31,7 @@ function ucfirst(str) {
 }
 exports.ucfirst = ucfirst;
 function debug(msg) {
-    if (process.env.NODE_ENV === "development") {
+    if (exports.isDev) {
         console.log(msg);
     }
 }
@@ -44,3 +47,24 @@ function polyfill() {
     }
 }
 exports.polyfill = polyfill;
+class TimeLogger {
+    constructor() {
+        this.startTime = dayjs().valueOf();
+    }
+    print(name) {
+        if (exports.isDev) {
+            console.log(name + ": " + (dayjs().valueOf() - this.startTime) + "ms");
+        }
+    }
+}
+exports.TimeLogger = TimeLogger;
+function getRandomArbitrary(min, max) {
+    return Math.random() * (max - min) + min;
+}
+exports.getRandomArbitrary = getRandomArbitrary;
+function getRandomInt(min, max) {
+    min = Math.ceil(min);
+    max = Math.floor(max);
+    return Math.floor(Math.random() * (max - min + 1)) + min;
+}
+exports.getRandomInt = getRandomInt;

src/util.ts

@@ -1,15 +1,18 @@
-// @ts-nocheck
 // Common Util for frontend and backend
 // Backend uses the compiled file util.js
 // Frontend uses util.ts
 // Need to run "tsc" to compile if there are any changes.
 
+import * as _dayjs from "dayjs";
+const dayjs = _dayjs;
+
+export const isDev = process.env.NODE_ENV === "development";
 export const appName = "Uptime Kuma";
 export const DOWN = 0;
 export const UP = 1;
 export const PENDING = 2;
 
-export function flipStatus(s) {
+export function flipStatus(s: number) {
     if (s === UP) {
         return DOWN;
     }
@@ -21,7 +24,7 @@ export function flipStatus(s) {
     return s;
 }
 
-export function sleep(ms) {
+export function sleep(ms: number) {
     return new Promise(resolve => setTimeout(resolve, ms));
 }
 
@@ -29,8 +32,8 @@ export function sleep(ms) {
  * PHP's ucfirst
  * @param str
  */
-export function ucfirst(str) {
-    if (! str) {
+export function ucfirst(str: string) {
+    if (!str) {
         return str;
     }
 
@@ -38,12 +41,15 @@ export function ucfirst(str) {
     return firstLetter.toUpperCase() + str.substr(1);
 }
 
-export function debug(msg) {
-    if (process.env.NODE_ENV === "development") {
+export function debug(msg: any) {
+    if (isDev) {
         console.log(msg);
     }
 }
 
+
+declare global { interface String { replaceAll(str: string, newStr: string): string; } }
+
 export function polyfill() {
     /**
      * String.prototype.replaceAll() polyfill
@@ -52,7 +58,7 @@ export function polyfill() {
      * @license MIT
      */
     if (!String.prototype.replaceAll) {
-        String.prototype.replaceAll = function(str, newStr) {
+        String.prototype.replaceAll = function (str: string, newStr: string) {
 
             // If a regex pattern
             if (Object.prototype.toString.call(str).toLowerCase() === "[object regexp]") {
@@ -65,3 +71,39 @@ export function polyfill() {
         };
     }
 }
+
+export class TimeLogger {
+    startTime: number;
+
+    constructor() {
+        this.startTime = dayjs().valueOf();
+    }
+
+    print(name: string) {
+        if (isDev) {
+            console.log(name + ": " + (dayjs().valueOf() - this.startTime) + "ms")
+        }
+    }
+}
+
+/**
+ * Returns a random number between min (inclusive) and max (exclusive)
+ */
+export function getRandomArbitrary(min: number, max: number) {
+    return Math.random() * (max - min) + min;
+}
+
+/**
+ * From: https://stackoverflow.com/questions/1527803/generating-random-whole-numbers-in-javascript-in-a-specific-range
+ *
+ * Returns a random integer between min (inclusive) and max (inclusive).
+ * The value is no lower than min (or the next integer greater than min
+ * if min isn't an integer) and no greater than max (or the next integer
+ * lower than max if max isn't an integer).
+ * Using Math.round() will give you a non-uniform distribution!
+ */
+export function getRandomInt(min: number, max: number) {
+    min = Math.ceil(min);
+    max = Math.floor(max);
+    return Math.floor(Math.random() * (max - min + 1)) + min;
+}

test/test_install_script/alpine3.dockerfile

@@ -0,0 +1,4 @@
+FROM alpine:3
+RUN apk add --update nodejs npm git
+COPY ./install.sh .
+RUN /bin/sh install.sh local /opt/uptime-kuma 3000 0.0.0.0

test/test_install_script/centos7.dockerfile

@@ -0,0 +1,4 @@
+FROM centos:7
+
+COPY ./install.sh .
+RUN bash install.sh local /opt/uptime-kuma 3000 0.0.0.0

test/test_install_script/centos8.dockerfile

@@ -0,0 +1,4 @@
+FROM centos:8
+
+COPY ./install.sh .
+RUN bash install.sh local /opt/uptime-kuma 3000 0.0.0.0

test/test_install_script/debian.dockerfile

@@ -0,0 +1,10 @@
+FROM debian
+
+# Test invalid node version, these commands install nodejs 10
+# RUN apt-get update
+# RUN apt --yes install nodejs
+# RUN ln -s /usr/bin/nodejs /usr/bin/node
+# RUN node -v
+
+COPY ./install.sh .
+RUN bash install.sh local /opt/uptime-kuma 3000 0.0.0.0

test/test_install_script/ubuntu.dockerfile

@@ -0,0 +1,10 @@
+FROM ubuntu
+
+# Test invalid node version, these commands install nodejs 10
+# RUN apt-get update
+# RUN apt --yes install nodejs
+# RUN ln -s /usr/bin/nodejs /usr/bin/node
+# RUN node -v
+
+COPY ./install.sh .
+RUN bash install.sh local /opt/uptime-kuma 3000 0.0.0.0

test/test_install_script/ubuntu1604.dockerfile

@@ -0,0 +1,10 @@
+FROM ubuntu:16.04
+
+# Test invalid node version, these commands install nodejs 10
+RUN apt-get update
+RUN apt --yes install nodejs
+# RUN ln -s /usr/bin/nodejs /usr/bin/node
+# RUN node -v
+
+COPY ./install.sh .
+RUN bash install.sh local /opt/uptime-kuma 3000 0.0.0.0

tsconfig.json

@@ -4,14 +4,15 @@
         "target": "es2018",
         "module": "commonjs",
         "lib": [
-            "es2020"
+            "es2020",
+            "DOM",
         ],
         "removeComments": true,
         "preserveConstEnums": true,
         "sourceMap": false,
-        "files.insertFinalNewline": true
+        "strict": true
     },
     "files": [
-        "./server/util.ts"
+        "./src/util.ts"
     ]
 }