Merge branch 'master' into background-jobs

# Conflicts:
#	package-lock.json
#	package.json
#	src/languages/en.js

.dockerignore

@@ -28,6 +28,7 @@ install.sh
 SECURITY.md
 tsconfig.json
 .env
+/tmp
 
 ### .gitignore content (commented rules are duplicated)
 

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

@@ -9,9 +9,8 @@ assignees: ''
 **Is it a duplicate question?**
 Please search in Issues without filters: https://github.com/louislam/uptime-kuma/issues?q=
 
-
 **Describe your problem**
-
+Please describe what you are asking for
 
 **Info**
 Uptime Kuma Version:

CONTRIBUTING.md

@@ -6,7 +6,7 @@ The project was created with vite.js (vue3). Then I created a sub-directory call
 
 The frontend code build into "dist" directory. The server (express.js) exposes the "dist" directory as root of the endpoint. This is how production is working.
 
-# Key Technical Skills
+## Key Technical Skills
 
 - Node.js (You should know what are promise, async/await and arrow function etc.)
 - Socket.io
@@ -15,7 +15,7 @@ The frontend code build into "dist" directory. The server (express.js) exposes t
 - Bootstrap
 - SQLite
 
-# Directories
+## Directories
 
 - data (App data)
 - dist (Frontend build)
@@ -25,50 +25,50 @@ The frontend code build into "dist" directory. The server (express.js) exposes t
 - src (Frontend source code)
 - test (unit test)
 
-# Can I create a pull request for Uptime Kuma?
+## 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 into 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
+### Pull Request Examples
 
-### ✅ High - Medium Priority
+#### ✅ High - Medium Priority
 
 - Add a new notification
 - Add a chart
 - Fix a bug
 - Translations
 
-### *️⃣ Requires one more reviewer
+#### *️⃣ Requires one more reviewer
 
 I do not have such knowledge to test it.
 
 - Add k8s supports
 
-### *️⃣ Low Priority
+#### *️⃣ Low Priority
 
 It changed my current workflow and require further studies.
 
 - Change my release approach
 
-### ❌ Won't Merge
+#### ❌ Won't Merge
 
 - Duplicated pull request
 - Buggy
 - Existing logic is completely modified or deleted
 - A function that is completely out of scope
 
-# Project Styles
+## Project Styles
 
 I personally do not like something need to learn so much and need to config so much before you can finally start the app.
 
 - Easy to install for non-Docker users, no native build dependency is needed (at least for x86_64), no extra config, no extra effort to get it run
-- Single container for Docker users, no very complex docker-composer file. Just map the volume and expose the port, then good to go
+- Single container for Docker users, no very complex docker-compose file. Just map the volume and expose the port, then good to go
 - Settings should be configurable in the frontend. Env var is not encouraged.
 - Easy to use
 
-# Coding Styles
+## Coding Styles
 
 - 4 spaces indentation
 - Follow `.editorconfig`
@@ -80,20 +80,20 @@ I personally do not like something need to learn so much and need to config so m
 - SQLite: underscore_type
 - CSS/SCSS: dash-type
 
-# Tools
+## Tools
 
 - Node.js >= 14
 - Git
 - IDE that supports ESLint and EditorConfig (I am using Intellji Idea)
 - A SQLite tool (SQLite Expert Personal is suggested)
 
-# Install dependencies
+## Install dependencies
 
 ```bash
 npm ci
 ```
 
-# How to start the Backend Dev Server
+## How to start the Backend Dev Server
 
 (2021-09-23 Update)
 
@@ -103,7 +103,7 @@ npm run start-server-dev
 
 It binds to `0.0.0.0:3001` by default.
 
-## Backend Details
+### Backend Details
 
 It is mainly a socket.io app + express.js.
 
@@ -116,24 +116,26 @@ express.js is just used for serving the frontend built files (index.html, .js an
 - scoket-handler (Socket.io Handlers)
 - server.js (Server main logic)
 
-# How to start the Frontend Dev Server
+## How to start the Frontend Dev Server
 
 1. Set the env var `NODE_ENV` to "development".
 2. Start the frontend dev server by the following command.
+
    ```bash
    npm run dev
    ```
+
    It binds to `0.0.0.0:3000` by default.
 
 You can use Vue.js devtools Chrome extension for debugging.
 
-## Build the frontend
+### Build the frontend
 
 ```bash
 npm run build
 ```
 
-## Frontend Details
+### Frontend Details
 
 Uptime Kuma Frontend is a single page application (SPA). Most paths are handled by Vue Router.
 
@@ -143,24 +145,23 @@ As you can see, most data in frontend is stored in root level, even though you c
 
 The data and socket logic are in `src/mixins/socket.js`.
 
-
-# Database Migration
+## Database Migration
 
 1. Create `patch-{name}.sql` in `./db/`
 2. Add your patch filename in the `patchList` list in `./server/database.js`
 
-# Unit Test
+## Unit Test
 
 It is an end-to-end testing. It is using Jest and Puppeteer.
 
-```
+```bash
 npm run build
 npm test
 ```
 
 By default, the Chromium window will be shown up during the test. Specifying `HEADLESS_TEST=1` for terminal environments.
 
-# Update Dependencies
+## Update Dependencies
 
 Install `ncu`
 https://github.com/raineorshine/npm-check-updates
@@ -170,10 +171,10 @@ ncu -u -t patch
 npm install
 ```
 
-Since previously updating vite 2.5.10 to 2.6.0 broke the application completely, from now on, it should update patch release version only. 
+Since previously updating vite 2.5.10 to 2.6.0 broke the application completely, from now on, it should update patch release version only.
 
-Patch release = the third digit
+Patch release = the third digit ([Semantic Versioning](https://semver.org/))
 
-# Translations
+## Translations
 
 Please read: https://github.com/louislam/uptime-kuma/tree/master/src/languages

README.md

@@ -2,7 +2,6 @@
 
 <a target="_blank" href="https://github.com/louislam/uptime-kuma"><img src="https://img.shields.io/github/stars/louislam/uptime-kuma" /></a> <a target="_blank" href="https://hub.docker.com/r/louislam/uptime-kuma"><img src="https://img.shields.io/docker/pulls/louislam/uptime-kuma" /></a> <a target="_blank" href="https://hub.docker.com/r/louislam/uptime-kuma"><img src="https://img.shields.io/docker/v/louislam/uptime-kuma/latest?label=docker%20image%20ver." /></a> <a target="_blank" href="https://github.com/louislam/uptime-kuma"><img src="https://img.shields.io/github/last-commit/louislam/uptime-kuma" /></a>  <a target="_blank" href="https://opencollective.com/uptime-kuma"><img src="https://opencollective.com/uptime-kuma/total/badge.svg?label=Backers&color=brightgreen" /></a>
 
-
 <div align="center" width="100%">
     <img src="./public/icon.svg" width="128" alt="" />
 </div>
@@ -17,17 +16,20 @@ Try it!
 
 https://demo.uptime.kuma.pet
 
-It is a 5 minutes live demo, all data will be deleted after that. The server is located at Tokyo, if you live far away from here, it may affact your experience. I suggest that you should install to try it.
+It is a 10 minutes live demo, all data will be deleted after that. The server is located at Tokyo, if you live far away from here, it may affact your experience. I suggest that you should install to try it.
 
 VPS is sponsored by Uptime Kuma sponsors on [Open Collective](https://opencollective.com/uptime-kuma)! Thank you so much!
 
 ## ⭐ Features
 
-* Monitoring uptime for HTTP(s) / TCP / Ping / DNS Record.
+* Monitoring uptime for HTTP(s) / TCP / Ping / DNS Record / Push.
 * Fancy, Reactive, Fast UI/UX.
-* 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).
+* 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/tree/master/src/components/notifications).
 * 20 seconds interval.
 * [Multi Languages](https://github.com/louislam/uptime-kuma/tree/master/src/languages)
+* Simple Status Page
+* Ping Chart
+* Certificate Info
 
 ## 🔧 How to Install
 
@@ -116,9 +118,11 @@ If you love this project, please consider giving me a ⭐.
 ## 🗣️ Discussion
 
 ### Issues Page
+
 You can discuss or ask for help in [Issues](https://github.com/louislam/uptime-kuma/issues).
 
 ### Subreddit
+
 My Reddit account: louislamlam
 You can mention me if you ask question on Reddit.
 https://www.reddit.com/r/UptimeKuma/

SECURITY.md

@@ -5,12 +5,27 @@
 Use this section to tell people about which versions of your project are
 currently being supported with security updates.
 
+### Uptime Kuma Versions
+
 | Version | Supported          |
 | ------- | ------------------ |
-| 1.7.X  | :white_check_mark: |
-| < 1.7  | ❌ |
+| 1.8.X  | :white_check_mark: |
+| <= 1.7.X  | ❌ |
+
+### Upgradable Docker Tags
+
+| Tag | Supported          |
+| ------- | ------------------ |
+| 1 | :white_check_mark: |
+| 1-debian | :white_check_mark: |
+| 1-alpine | :white_check_mark: |
+| latest | :white_check_mark: |
+| debian | :white_check_mark: |
+| alpine | :white_check_mark: |
+| All other tags  | ❌ |
 
 ## Reporting a Vulnerability
+
 Please report security issues to [email protected].
 
 Do not use the issue tracker or discuss it in the public as it will cause more damage.

babel.config.js

@@ -4,4 +4,8 @@ if (process.env.TEST_FRONTEND) {
     config.presets = ["@babel/preset-env"];
 }
 
+if (process.env.TEST_BACKEND) {
+    config.plugins = ["babel-plugin-rewire"];
+}
+
 module.exports = config;

config/jest-backend.config.js

@@ -0,0 +1,5 @@
+module.exports = {
+    "rootDir": "..",
+    "testRegex": "./test/backend.spec.js",
+};
+

jest-frontend.config.js → config/jest-frontend.config.js

@@ -1,5 +1,5 @@
 module.exports = {
-    "rootDir": ".",
+    "rootDir": "..",
     "testRegex": "./test/frontend.spec.js",
 };
 

jest.config.js → config/jest.config.js

@@ -5,7 +5,7 @@ module.exports = {
         "__DEV__": true
     },
     "testRegex": "./test/e2e.spec.js",
-    "rootDir": ".",
+    "rootDir": "..",
     "testTimeout": 30000,
 };
 

vite.config.js → config/vite.config.js

@@ -1,9 +1,9 @@
-import legacy from "@vitejs/plugin-legacy"
-import vue from "@vitejs/plugin-vue"
-import { defineConfig } from "vite"
+import legacy from "@vitejs/plugin-legacy";
+import vue from "@vitejs/plugin-vue";
+import { defineConfig } from "vite";
 
-const postCssScss = require("postcss-scss")
-const postcssRTLCSS = require('postcss-rtlcss');
+const postCssScss = require("postcss-scss");
+const postcssRTLCSS = require("postcss-rtlcss");
 
 // https://vitejs.dev/config/
 export default defineConfig({
@@ -20,5 +20,5 @@ export default defineConfig({
             "map": false,
             "plugins": [postcssRTLCSS]
         }
-      },
-})
+    },
+});

db/patch-http-monitor-method-body-and-headers.sql

@@ -0,0 +1,13 @@
+-- You should not modify if this have pushed to Github, unless it does serious wrong with the db.
+BEGIN TRANSACTION;
+
+ALTER TABLE monitor
+    ADD method TEXT default 'GET' not null;
+
+ALTER TABLE monitor
+    ADD body TEXT default null;
+
+ALTER TABLE monitor
+    ADD headers TEXT default null;
+
+COMMIT;

dockerfile → docker/dockerfile

@@ -4,9 +4,9 @@ WORKDIR /app
 ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1
 
 COPY . .
-RUN npm install --legacy-peer-deps && \
+RUN npm ci && \
     npm run build && \
-    npm prune --production && \
+    npm ci --production && \
     chmod +x /app/extra/entrypoint.sh
 
 
@@ -47,5 +47,5 @@ RUN chmod +x /app/extra/upload-github-release-asset.sh
 
 # Dist only
 RUN cd /app && tar -zcvf $DIST dist
-RUN /app/extra/upload-github-release-asset.sh github_api_token=$GITHUB_TOKEN owner=louislam repo=uptime-kuma tag=$VERSION filename=$DIST
+RUN /app/extra/upload-github-release-asset.sh github_api_token=$GITHUB_TOKEN owner=louislam repo=uptime-kuma tag=$VERSION filename=/app/$DIST
 

dockerfile-alpine → docker/dockerfile-alpine

@@ -4,9 +4,9 @@ WORKDIR /app
 ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1
 
 COPY . .
-RUN npm install --legacy-peer-deps && \
+RUN npm ci && \
     npm run build && \
-    npm prune --production && \
+    npm ci --production && \
     chmod +x /app/extra/entrypoint.sh
 
 

ecosystem.config.js

@@ -0,0 +1,6 @@
+module.exports = {
+  apps: [{
+    name: "uptime-kuma",
+    script: "./server/server.js",
+  }]
+}