Update to 1.23.5-beta.0

* Fix: Use ActionSelect Docker Host & validate input

* Fix: Handle docker host deleted while editing

* UI: Use add for ActionSelect & prevent delete instead

---------

Co-authored-by: Nelson Chan <chakflying@hotmail.com>

.dockerignore

@@ -1,8 +1,6 @@
-# Should be very similar to .npmignore, but the syntax is a bit different
-
 /.idea
 /node_modules
-/data*
+/data
 /cypress
 /out
 /test
@@ -14,8 +12,9 @@
 **/.gitignore
 **/docker-compose*
 **/[Dd]ockerfile*
+LICENSE
+README.md
 .editorconfig
-.vs
 .vscode
 .eslint*
 .stylelint*
@@ -33,15 +32,27 @@ tsconfig.json
 /tmp
 /babel.config.js
 /ecosystem.config.js
-extra/exe-builder
-/public
-
-.DS_Store
-dist-ssr
-*.local
-
-# .dockerignore only, not in .npmignore
 /extra/healthcheck.exe
 /extra/healthcheck
-LICENSE
-README.md
+/extra/exe-builder
+/extra/push-examples
+/extra/uptime-kuma-push
+
+# Comment the following line if you want to rebuild the healthcheck binary
+/extra/healthcheck-armv7
+
+
+### .gitignore content (commented rules are duplicated)
+
+#node_modules
+.DS_Store
+#dist
+dist-ssr
+*.local
+#.idea
+
+#/data
+#!/data/.gitkeep
+#.vscode
+
+### End of .gitignore content

.eslintrc.js

@@ -14,7 +14,6 @@ module.exports = {
     extends: [
         "eslint:recommended",
         "plugin:vue/vue3-recommended",
-        "plugin:jsdoc/recommended-error",
     ],
     parser: "vue-eslint-parser",
     parserOptions: {
@@ -22,9 +21,6 @@ module.exports = {
         sourceType: "module",
         requireConfigFile: false,
     },
-    plugins: [
-        "jsdoc"
-    ],
     rules: {
         "yoda": "error",
         eqeqeq: [ "warn", "smart" ],
@@ -101,42 +97,7 @@ module.exports = {
         }],
         "no-control-regex": "off",
         "one-var": [ "error", "never" ],
-        "max-statements-per-line": [ "error", { "max": 1 }],
-        "jsdoc/check-tag-names": [
-            "error",
-            {
-                "definedTags": [ "link" ]
-            }
-        ],
-        "jsdoc/no-undefined-types": "off",
-        "jsdoc/no-defaults": [
-            "error",
-            { "noOptionalParamNames": true }
-        ],
-        "jsdoc/require-throws": "error",
-        "jsdoc/require-jsdoc": [
-            "error",
-            {
-                "require": {
-                    "FunctionDeclaration": true,
-                    "MethodDefinition": true,
-                }
-            }
-        ],
-        "jsdoc/no-blank-block-descriptions": "error",
-        "jsdoc/require-returns-check": [
-            "error",
-            { "reportMissingReturnForUndefinedTypes": false }
-        ],
-        "jsdoc/require-returns": [
-            "error",
-            {
-                "forceRequireReturn": true,
-                "forceReturnsWithAsync": true
-            }
-        ],
-        "jsdoc/require-param-type": "error",
-        "jsdoc/require-param-description": "error"
+        "max-statements-per-line": [ "error", { "max": 1 }]
     },
     "overrides": [
         {

.github/workflows/auto-test.yml

@@ -5,11 +5,11 @@ name: Auto Test
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master, 1.23.X ]
     paths-ignore:
       - '*.md'
   pull_request:
-    branches: [ master ]
+    branches: [ master, 1.23.X ]
     paths-ignore:
       - '*.md'
 
@@ -33,7 +33,7 @@ jobs:
       uses: actions/setup-node@v3
       with:
         node-version: ${{ matrix.node }}
-    - run: npm install npm@latest -g
+    - run: npm install npm@9 -g
     - run: npm install
     - run: npm run build
     - run: npm test
@@ -50,7 +50,7 @@ jobs:
     strategy:
       matrix:
         os: [ ARMv7 ]
-        node: [ 14.21.3, 20.5.0 ]
+        node: [ 14, 20 ]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:
@@ -61,7 +61,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node }}
-      - run: npm install npm@latest -g
+      - run: npm install npm@9 -g
       - run: npm ci --production
 
   check-linters:
@@ -71,10 +71,10 @@ jobs:
     - run: git config --global core.autocrlf false  # Mainly for Windows
     - uses: actions/checkout@v3
 
-    - name: Use Node.js 20
+    - name: Use Node.js 14
       uses: actions/setup-node@v3
       with:
-        node-version: 20
+        node-version: 14
     - run: npm install
     - run: npm run lint
 

.github/workflows/json-yaml-validate.yml

@@ -1,4 +1,4 @@
-name: json-yaml-validate 
+name: json-yaml-validate
 on:
   push:
     branches:
@@ -6,6 +6,7 @@ on:
   pull_request:
     branches:
       - master
+      - 2.0.X
   workflow_dispatch:
 
 permissions:

.gitignore

@@ -7,7 +7,6 @@ dist-ssr
 
 /data
 !/data/.gitkeep
-/data*
 .vscode
 
 /private

.npmignore

@@ -1,45 +0,0 @@
-# Should be very similar to .dockerignore, but the syntax is a bit different
-
-/.idea
-/node_modules
-/data
-/cypress
-/out
-/test
-/kubernetes
-/.do
-/.dockerignore
-/private
-/.git
-/.gitignore
-/docker-compose*
-/[Dd]ockerfile*
-.editorconfig
-.vs
-.vscode
-.eslint*
-.stylelint*
-/.devcontainer
-/.github
-yarn.lock
-app.json
-CODE_OF_CONDUCT.md
-CONTRIBUTING.md
-CNAME
-install.sh
-SECURITY.md
-tsconfig.json
-.env
-/tmp
-/babel.config.js
-/ecosystem.config.js
-extra/exe-builder
-/public
-
-.DS_Store
-dist-ssr
-*.local
-
-## .npmignore only, not in .dockerignore
-/docker
-/extra/healthcheck*

CONTRIBUTING.md

@@ -2,13 +2,13 @@
 
 First of all, I want to thank everyone who made pull requests for Uptime Kuma. I never thought the GitHub Community would be so nice! Because of this, I also never thought that other people would actually read and edit my code. It is not very well structured or commented, sorry about that.
 
-The project was created with vite.js (vue3). Then I created a subdirectory called "server" for server part. Both frontend and backend share the same package.json.
+The project was created with vite.js (vue3). Then I created a subdirectory called "server" for the server part. Both frontend and backend share the same package.json.
 
-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.
+The frontend code builds into "dist" directory. The server (express.js) exposes the "dist" directory as the root of the endpoint. This is how production is working.
 
 ## Key Technical Skills
 
-- Node.js (You should know what are promise, async/await and arrow function etc.)
+- Node.js (You should know about promise, async/await and arrow function etc.)
 - Socket.io
 - SCSS
 - Vue.js
@@ -30,7 +30,7 @@ The frontend code build into "dist" directory. The server (express.js) exposes t
 
 ## Can I create a pull request for Uptime Kuma?
 
-Yes or no, it depends on what you will try to do. Since I don't want to waste your time, be sure to **create an empty draft pull request or open an issue, so we can have a discussion first**. Especially for a large pull request or you don't know it will be merged or not.
+Yes or no, it depends on what you will try to do. Since I don't want to waste your time, be sure to **create an empty draft pull request or open an issue, so we can have a discussion first**. Especially for a large pull request or you don't know if it will be merged or not.
 
 Here are some references:
 
@@ -46,8 +46,8 @@ Here are some references:
 - New features
 
 ### ❌ Won't be merged:
-- A dedicated pr for translating existing languages (see [these instructions](https://github.com/louislam/uptime-kuma/blob/master/src/lang/README.md))
-- Do not pass the auto test
+- A dedicated PR for translating existing languages (see [these instructions](https://github.com/louislam/uptime-kuma/blob/master/src/lang/README.md))
+- Do not pass the auto-test
 - Any breaking changes
 - Duplicated pull requests
 - Buggy
@@ -61,9 +61,9 @@ The above cases may not cover all possible situations.
 
 I (@louislam) have the final say. If your pull request does not meet my expectations, I will reject it, no matter how much time you spend on it. Therefore, it is essential to have a discussion beforehand.
 
-I will mark your pull request in the [milestones](https://github.com/louislam/uptime-kuma/milestones), if I am plan to review and merge it.
+I will assign your pull request to a [milestone](https://github.com/louislam/uptime-kuma/milestones), if I plan to review and merge it.
 
-Also, please don't rush or ask for ETA, because I have to understand the pull request, make sure it is no breaking changes and stick to my vision of this project, especially for large pull requests.
+Also, please don't rush or ask for an ETA, because I have to understand the pull request, make sure it is no breaking changes and stick to my vision of this project, especially for large pull requests.
 
 
 ### Recommended Pull Request Guideline
@@ -83,11 +83,11 @@ Before deep into coding, discussion first is preferred. Creating an empty pull r
 
 ## Project Styles
 
-I personally do not like something that requires so many configurations before you can finally start the app. I hope Uptime Kuma installation could be as easy as like installing a mobile app.
+I personally do not like something that requires so many configurations before you can finally start the app. I hope Uptime Kuma installation will be as easy as like installing a mobile app.
 
-- Easy to install for non-Docker users, no native build dependency is needed (for x86_64/armv7/arm64), no extra config, no extra effort required to get it running
+- Easy to install for non-Docker users, no native build dependency is needed (for x86_64/armv7/arm64), no extra config, and no extra effort required to get it running
 - 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. Environment variable is not encouraged, unless it is related to startup such as `DATA_DIR`
+- Settings should be configurable in the frontend. Environment variables are discouraged, unless it is related to startup such as `DATA_DIR`
 - Easy to use
 - The web UI styling should be consistent and nice
 
@@ -130,7 +130,7 @@ Port `3000` and port `3001` will be used.
 npm run dev
 ```
 
-But sometimes, you would like to keep restart the server, but not the frontend, you can run these command in two terminals:
+But sometimes, you would like to restart the server, but not the frontend, you can run these commands in two terminals:
 ```
 npm run start-frontend-dev
 npm run start-server-dev
@@ -146,13 +146,13 @@ It is mainly a socket.io app + express.js.
 express.js is used for: 
 - entry point such as redirecting to a status page or the dashboard
 - serving the frontend built files (index.html, .js and .css etc.)
-- serving internal APIs of status page
+- serving internal APIs of the status page
 
 
 ### Structure in /server/
 
 - jobs/ (Jobs that are running in another process)
-- model/ (Object model, auto mapping to the database table name)
+- model/ (Object model, auto-mapping to the database table name)
 - modules/ (Modified 3rd-party modules)
 - monitor_types (Monitor Types)
 - notification-providers/ (individual notification logic)
@@ -163,7 +163,7 @@ express.js is used for:
 
 ## Frontend Dev Server
 
-It binds to `0.0.0.0:3000` by default. Frontend dev server is used for development only. 
+It binds to `0.0.0.0:3000` by default. The frontend dev server is used for development only. 
 
 For production, it is not used. It will be compiled to `dist` directory instead. 
 
@@ -181,7 +181,7 @@ Uptime Kuma Frontend is a single page application (SPA). Most paths are handled
 
 The router is in `src/router.js`
 
-As you can see, most data in frontend is stored in root level, even though you changed the current router to any other pages.
+As you can see, most data in the frontend is stored at the root level, even though you changed the current router to any other pages.
 
 The data and socket logic are in `src/mixins/socket.js`.
 
@@ -210,25 +210,25 @@ Both frontend and backend share the same package.json. However, the frontend dep
 
 ### Update Dependencies
 
-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 the patch release version only.
 
 Patch release = the third digit ([Semantic Versioning](https://semver.org/))
 
-If for maybe security reasons, a library must be updated. Then you must need to check if there are any breaking changes.
+If for security / bug / other reasons, a library must be updated, breaking changes need to be checked by the person proposing the change.
 
 ## Translations
 
-Please add **all** the strings which are translatable to `src/lang/en.json` (If translation keys are ommited, they can not be translated).
+Please add **all** the strings which are translatable to `src/lang/en.json` (If translation keys are omitted, they can not be translated).
 
-**Don't include any other languages in your inital Pull-Request** (even if this is your mother tounge), to avoid merge-conflicts between weblate and `master`.  
-The translations can then (after merging a PR into `master`) be translated by awesome people donating their language-skills.
+**Don't include any other languages in your initial Pull-Request** (even if this is your mother tongue), to avoid merge-conflicts between weblate and `master`.  
+The translations can then (after merging a PR into `master`) be translated by awesome people donating their language skills.
 
 If you want to help by translating Uptime Kuma into your language, please visit the [instructions on how to translate using weblate](https://github.com/louislam/uptime-kuma/blob/master/src/lang/README.md).
 
 ## Spelling & Grammar
 
 Feel free to correct the grammar in the documentation or code.
-My mother language is not english and my grammar is not that great.
+My mother language is not English and my grammar is not that great.
 
 ## Wiki
 

README.md

@@ -26,7 +26,7 @@ It is a temporary live demo, all data will be deleted after 10 minutes. Use the
 * Monitoring uptime for HTTP(s) / TCP / HTTP(s) Keyword / HTTP(s) Json Query / Ping / DNS Record / Push / Steam Game Server / Docker Containers
 * Fancy, Reactive, Fast UI/UX
 * Notifications via Telegram, Discord, Gotify, Slack, Pushover, Email (SMTP), and [90+ notification services, click here for the full list](https://github.com/louislam/uptime-kuma/tree/master/src/components/notifications)
-* 20 second intervals
+* 20-second intervals
 * [Multi Languages](https://github.com/louislam/uptime-kuma/tree/master/src/lang)
 * Multiple status pages
 * Map status pages to specific domains
@@ -70,7 +70,7 @@ npm run setup
 # Option 1. Try it
 node server/server.js
 
-# (Recommended) Option 2. Run in background using PM2
+# (Recommended) Option 2. Run in the background using PM2
 # Install PM2 if you don't have it:
 npm install pm2 -g && pm2 install pm2-logrotate
 
@@ -93,7 +93,7 @@ pm2 save && pm2 startup
 
 ### Windows Portable (x64)
 
-https://github.com/louislam/uptime-kuma/files/11886108/uptime-kuma-win64-portable-1.0.1.zip
+https://github.com/louislam/uptime-kuma/releases/download/1.23.1/uptime-kuma-windows-x64-portable-1.23.1.zip
 
 ### Advanced Installation
 
@@ -109,7 +109,7 @@ https://github.com/louislam/uptime-kuma/wiki/%F0%9F%86%99-How-to-Update
 
 ## 🆕 What's Next?
 
-I will mark requests/issues to the next milestone.
+I will assign requests/issues to the next milestone.
 
 https://github.com/louislam/uptime-kuma/milestones
 

SECURITY.md

@@ -3,19 +3,19 @@
 ## Reporting a Vulnerability
 
 1. Please report security issues to https://github.com/louislam/uptime-kuma/security/advisories/new.
-1. Please also create a empty security issues for alerting me, as GitHub Advisory do not send a notification, I probably will miss without this. https://github.com/louislam/uptime-kuma/issues/new?assignees=&labels=help&template=security.md
+1. Please also create an empty security issue to alert me, as GitHub Advisories do not send a notification, I probably will miss it without this. https://github.com/louislam/uptime-kuma/issues/new?assignees=&labels=help&template=security.md
 
-Do not use the public issue tracker or discuss it in the public as it will cause more damage.
+Do not use the public issue tracker or discuss it in public as it will cause more damage.
 
 ## Do you accept other 3rd-party bug bounty platforms?
 
-At this moment, I DO NOT accept other bug bounty platforms, because I am not familiar with these platforms and someone have tried to send a phishing link to me by this already. To minimize my own risk, please report through GitHub Advisories only. I will ignore all 3rd-party bug bounty platforms emails.
+At this moment, I DO NOT accept other bug bounty platforms, because I am not familiar with these platforms and someone has tried to send a phishing link to me by doing this already. To minimize my own risk, please report through GitHub Advisories only. I will ignore all 3rd-party bug bounty platforms emails.
 
 ## Supported Versions
 
 ### Uptime Kuma Versions
 
-You should use or upgrade to the latest version of Uptime Kuma. All `1.X.X` versions are upgradable to the lastest version.
+You should use or upgrade to the latest version of Uptime Kuma. All `1.X.X` versions are upgradable to the latest version.
 
 ### Upgradable Docker Tags
 

db/knex_init_db.js

@@ -1,559 +0,0 @@
-const { R } = require("redbean-node");
-const { log } = require("../src/util");
-
-/**
- * ⚠️⚠️⚠️⚠️⚠️⚠️ DO NOT ADD ANYTHING HERE!
- * IF YOU NEED TO ADD FIELDS, ADD IT TO ./db/knex_migrations
- * See ./db/knex_migrations/README.md for more information
- * @returns {Promise<void>}
- */
-async function createTables() {
-    log.info("mariadb", "Creating basic tables for MariaDB");
-    const knex = R.knex;
-
-    // TODO: Should check later if it is really the final patch sql file.
-
-    // docker_host
-    await knex.schema.createTable("docker_host", (table) => {
-        table.increments("id");
-        table.integer("user_id").unsigned().notNullable();
-        table.string("docker_daemon", 255);
-        table.string("docker_type", 255);
-        table.string("name", 255);
-    });
-
-    // group
-    await knex.schema.createTable("group", (table) => {
-        table.increments("id");
-        table.string("name", 255).notNullable();
-        table.datetime("created_date").notNullable().defaultTo(knex.fn.now());
-        table.boolean("public").notNullable().defaultTo(false);
-        table.boolean("active").notNullable().defaultTo(true);
-        table.integer("weight").notNullable().defaultTo(1000);
-        table.integer("status_page_id").unsigned();
-    });
-
-    // proxy
-    await knex.schema.createTable("proxy", (table) => {
-        table.increments("id");
-        table.integer("user_id").unsigned().notNullable();
-        table.string("protocol", 10).notNullable();
-        table.string("host", 255).notNullable();
-        table.smallint("port").notNullable();           // TODO: Maybe a issue with MariaDB, need migration to int
-        table.boolean("auth").notNullable();
-        table.string("username", 255).nullable();
-        table.string("password", 255).nullable();
-        table.boolean("active").notNullable().defaultTo(true);
-        table.boolean("default").notNullable().defaultTo(false);
-        table.datetime("created_date").notNullable().defaultTo(knex.fn.now());
-
-        table.index("user_id", "proxy_user_id");
-    });
-
-    // user
-    await knex.schema.createTable("user", (table) => {
-        table.increments("id");
-        table.string("username", 255).notNullable().unique().collate("utf8_general_ci");
-        table.string("password", 255);
-        table.boolean("active").notNullable().defaultTo(true);
-        table.string("timezone", 150);
-        table.string("twofa_secret", 64);
-        table.boolean("twofa_status").notNullable().defaultTo(false);
-        table.string("twofa_last_token", 6);
-    });
-
-    // monitor
-    await knex.schema.createTable("monitor", (table) => {
-        table.increments("id");
-        table.string("name", 150);
-        table.boolean("active").notNullable().defaultTo(true);
-        table.integer("user_id").unsigned()
-            .references("id").inTable("user")
-            .onDelete("SET NULL")
-            .onUpdate("CASCADE");
-        table.integer("interval").notNullable().defaultTo(20);
-        table.text("url");
-        table.string("type", 20);
-        table.integer("weight").defaultTo(2000);
-        table.string("hostname", 255);
-        table.integer("port");
-        table.datetime("created_date").notNullable().defaultTo(knex.fn.now());
-        table.string("keyword", 255);
-        table.integer("maxretries").notNullable().defaultTo(0);
-        table.boolean("ignore_tls").notNullable().defaultTo(false);
-        table.boolean("upside_down").notNullable().defaultTo(false);
-        table.integer("maxredirects").notNullable().defaultTo(10);
-        table.text("accepted_statuscodes_json").notNullable().defaultTo("[\"200-299\"]");
-        table.string("dns_resolve_type", 5);
-        table.string("dns_resolve_server", 255);
-        table.string("dns_last_result", 255);
-        table.integer("retry_interval").notNullable().defaultTo(0);
-        table.string("push_token", 20).defaultTo(null);
-        table.text("method").notNullable().defaultTo("GET");
-        table.text("body").defaultTo(null);
-        table.text("headers").defaultTo(null);
-        table.text("basic_auth_user").defaultTo(null);
-        table.text("basic_auth_pass").defaultTo(null);
-        table.integer("docker_host").unsigned()
-            .references("id").inTable("docker_host");
-        table.string("docker_container", 255);
-        table.integer("proxy_id").unsigned()
-            .references("id").inTable("proxy");
-        table.boolean("expiry_notification").defaultTo(true);
-        table.text("mqtt_topic");
-        table.string("mqtt_success_message", 255);
-        table.string("mqtt_username", 255);
-        table.string("mqtt_password", 255);
-        table.string("database_connection_string", 2000);
-        table.text("database_query");
-        table.string("auth_method", 250);
-        table.text("auth_domain");
-        table.text("auth_workstation");
-        table.string("grpc_url", 255).defaultTo(null);
-        table.text("grpc_protobuf").defaultTo(null);
-        table.text("grpc_body").defaultTo(null);
-        table.text("grpc_metadata").defaultTo(null);
-        table.text("grpc_method").defaultTo(null);
-        table.text("grpc_service_name").defaultTo(null);
-        table.boolean("grpc_enable_tls").notNullable().defaultTo(false);
-        table.string("radius_username", 255);
-        table.string("radius_password", 255);
-        table.string("radius_calling_station_id", 50);
-        table.string("radius_called_station_id", 50);
-        table.string("radius_secret", 255);
-        table.integer("resend_interval").notNullable().defaultTo(0);
-        table.integer("packet_size").notNullable().defaultTo(56);
-        table.string("game", 255);
-    });
-
-    // heartbeat
-    await knex.schema.createTable("heartbeat", (table) => {
-        table.increments("id");
-        table.boolean("important").notNullable().defaultTo(false);
-        table.integer("monitor_id").unsigned().notNullable()
-            .references("id").inTable("monitor")
-            .onDelete("CASCADE")
-            .onUpdate("CASCADE");
-        table.smallint("status").notNullable();
-
-        table.text("msg");
-        table.datetime("time").notNullable();
-        table.integer("ping");
-        table.integer("duration").notNullable().defaultTo(0);
-        table.integer("down_count").notNullable().defaultTo(0);
-
-        table.index("important");
-        table.index([ "monitor_id", "time" ], "monitor_time_index");
-        table.index("monitor_id");
-        table.index([ "monitor_id", "important", "time" ], "monitor_important_time_index");
-    });
-
-    // incident
-    await knex.schema.createTable("incident", (table) => {
-        table.increments("id");
-        table.string("title", 255).notNullable();
-        table.text("content", 255).notNullable();
-        table.string("style", 30).notNullable().defaultTo("warning");
-        table.datetime("created_date").notNullable().defaultTo(knex.fn.now());
-        table.datetime("last_updated_date");
-        table.boolean("pin").notNullable().defaultTo(true);
-        table.boolean("active").notNullable().defaultTo(true);
-        table.integer("status_page_id").unsigned();
-    });
-
-    // maintenance
-    await knex.schema.createTable("maintenance", (table) => {
-        table.increments("id");
-        table.string("title", 150).notNullable();
-        table.text("description").notNullable();
-        table.integer("user_id").unsigned()
-            .references("id").inTable("user")
-            .onDelete("SET NULL")
-            .onUpdate("CASCADE");
-        table.boolean("active").notNullable().defaultTo(true);
-        table.string("strategy", 50).notNullable().defaultTo("single");
-        table.datetime("start_date");
-        table.datetime("end_date");
-        table.time("start_time");
-        table.time("end_time");
-        table.string("weekdays", 250).defaultTo("[]");
-        table.text("days_of_month").defaultTo("[]");
-        table.integer("interval_day");
-
-        table.index("active");
-        table.index([ "strategy", "active" ], "manual_active");
-        table.index("user_id", "maintenance_user_id");
-    });
-
-    // status_page
-    await knex.schema.createTable("status_page", (table) => {
-        table.increments("id");
-        table.string("slug", 255).notNullable().unique().collate("utf8_general_ci");
-        table.string("title", 255).notNullable();
-        table.text("description");
-        table.string("icon", 255).notNullable();
-        table.string("theme", 30).notNullable();
-        table.boolean("published").notNullable().defaultTo(true);
-        table.boolean("search_engine_index").notNullable().defaultTo(true);
-        table.boolean("show_tags").notNullable().defaultTo(false);
-        table.string("password");
-        table.datetime("created_date").notNullable().defaultTo(knex.fn.now());
-        table.datetime("modified_date").notNullable().defaultTo(knex.fn.now());
-        table.text("footer_text");
-        table.text("custom_css");
-        table.boolean("show_powered_by").notNullable().defaultTo(true);
-        table.string("google_analytics_tag_id");
-    });
-
-    // maintenance_status_page
-    await knex.schema.createTable("maintenance_status_page", (table) => {
-        table.increments("id");
-
-        table.integer("status_page_id").unsigned().notNullable()
-            .references("id").inTable("status_page")
-            .onDelete("CASCADE")
-            .onUpdate("CASCADE");
-
-        table.integer("maintenance_id").unsigned().notNullable()
-            .references("id").inTable("maintenance")
-            .onDelete("CASCADE")
-            .onUpdate("CASCADE");
-    });
-
-    // maintenance_timeslot
-    await knex.schema.createTable("maintenance_timeslot", (table) => {
-        table.increments("id");
-        table.integer("maintenance_id").unsigned().notNullable()
-            .references("id").inTable("maintenance")
-            .onDelete("CASCADE")
-            .onUpdate("CASCADE");
-        table.datetime("start_date").notNullable();
-        table.datetime("end_date");
-        table.boolean("generated_next").defaultTo(false);
-
-        table.index("maintenance_id");
-        table.index([ "maintenance_id", "start_date", "end_date" ], "active_timeslot_index");
-        table.index("generated_next", "generated_next_index");
-    });
-
-    // monitor_group
-    await knex.schema.createTable("monitor_group", (table) => {
-        table.increments("id");
-        table.integer("monitor_id").unsigned().notNullable()
-            .references("id").inTable("monitor")
-            .onDelete("CASCADE")
-            .onUpdate("CASCADE");
-        table.integer("group_id").unsigned().notNullable()
-            .references("id").inTable("group")
-            .onDelete("CASCADE")
-            .onUpdate("CASCADE");
-        table.integer("weight").notNullable().defaultTo(1000);
-        table.boolean("send_url").notNullable().defaultTo(false);
-
-        table.index([ "monitor_id", "group_id" ], "fk");
-    });
-    // monitor_maintenance
-    await knex.schema.createTable("monitor_maintenance", (table) => {
-        table.increments("id");
-        table.integer("monitor_id").unsigned().notNullable()
-            .references("id").inTable("monitor")
-            .onDelete("CASCADE")
-            .onUpdate("CASCADE");
-        table.integer("maintenance_id").unsigned().notNullable()
-            .references("id").inTable("maintenance")
-            .onDelete("CASCADE")
-            .onUpdate("CASCADE");
-
-        table.index("maintenance_id", "maintenance_id_index2");
-        table.index("monitor_id", "monitor_id_index");
-    });
-
-    // notification
-    await knex.schema.createTable("notification", (table) => {
-        table.increments("id");
-        table.string("name", 255);
-        table.string("config", 255);        // TODO: should use TEXT!
-        table.boolean("active").notNullable().defaultTo(true);
-        table.integer("user_id").unsigned();
-        table.boolean("is_default").notNullable().defaultTo(false);
-    });
-
-    // monitor_notification
-    await knex.schema.createTable("monitor_notification", (table) => {
-        table.increments("id").unsigned();      // TODO: no auto increment????
-        table.integer("monitor_id").unsigned().notNullable()
-            .references("id").inTable("monitor")
-            .onDelete("CASCADE")
-            .onUpdate("CASCADE");
-        table.integer("notification_id").unsigned().notNullable()
-            .references("id").inTable("notification")
-            .onDelete("CASCADE")
-            .onUpdate("CASCADE");
-
-        table.index([ "monitor_id", "notification_id" ], "monitor_notification_index");
-    });
-
-    // tag
-    await knex.schema.createTable("tag", (table) => {
-        table.increments("id");
-        table.string("name", 255).notNullable();
-        table.string("color", 255).notNullable();
-        table.datetime("created_date").notNullable().defaultTo(knex.fn.now());
-    });
-
-    // monitor_tag
-    await knex.schema.createTable("monitor_tag", (table) => {
-        table.increments("id");
-        table.integer("monitor_id").unsigned().notNullable()
-            .references("id").inTable("monitor")
-            .onDelete("CASCADE")
-            .onUpdate("CASCADE");
-        table.integer("tag_id").unsigned().notNullable()
-            .references("id").inTable("tag")
-            .onDelete("CASCADE")
-            .onUpdate("CASCADE");
-        table.text("value");
-    });
-
-    // monitor_tls_info
-    await knex.schema.createTable("monitor_tls_info", (table) => {
-        table.increments("id");
-        table.integer("monitor_id").unsigned().notNullable();         //TODO: no fk ?
-        table.text("info_json");
-    });
-
-    // notification_sent_history
-    await knex.schema.createTable("notification_sent_history", (table) => {
-        table.increments("id");
-        table.string("type", 50).notNullable();
-        table.integer("monitor_id").unsigned().notNullable();
-        table.integer("days").notNullable();
-        table.unique([ "type", "monitor_id", "days" ]);
-        table.index([ "type", "monitor_id", "days" ], "good_index");
-    });
-
-    // setting
-    await knex.schema.createTable("setting", (table) => {
-        table.increments("id");
-        table.string("key", 200).notNullable().unique().collate("utf8_general_ci");
-        table.text("value");
-        table.string("type", 20);
-    });
-
-    // status_page_cname
-    await knex.schema.createTable("status_page_cname", (table) => {
-        table.increments("id");
-        table.integer("status_page_id").unsigned()
-            .references("id").inTable("status_page")
-            .onDelete("CASCADE")
-            .onUpdate("CASCADE");
-        table.string("domain").notNullable().unique().collate("utf8_general_ci");
-    });
-
-    /*********************
-    * Converted Patch here
-    *********************/
-
-    // 2023-06-30-1348-http-body-encoding.js
-    // ALTER TABLE monitor ADD http_body_encoding VARCHAR(25);
-    // UPDATE monitor SET http_body_encoding = 'json' WHERE (type = 'http' or type = 'keyword') AND http_body_encoding IS NULL;
-    await knex.schema.table("monitor", function (table) {
-        table.string("http_body_encoding", 25);
-    });
-
-    await knex("monitor")
-        .where(function () {
-            this.where("type", "http").orWhere("type", "keyword");
-        })
-        .whereNull("http_body_encoding")
-        .update({
-            http_body_encoding: "json",
-        });
-
-    // 2023-06-30-1354-add-description-monitor.js
-    // ALTER TABLE monitor ADD description TEXT default null;
-    await knex.schema.table("monitor", function (table) {
-        table.text("description").defaultTo(null);
-    });
-
-    // 2023-06-30-1357-api-key-table.js
-    /*
-        CREATE TABLE [api_key] (
-            [id] INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-            [key] VARCHAR(255) NOT NULL,
-            [name] VARCHAR(255) NOT NULL,
-            [user_id] INTEGER NOT NULL,
-            [created_date] DATETIME DEFAULT (DATETIME('now')) NOT NULL,
-            [active] BOOLEAN DEFAULT 1 NOT NULL,
-            [expires] DATETIME DEFAULT NULL,
-            CONSTRAINT FK_user FOREIGN KEY ([user_id]) REFERENCES [user]([id]) ON DELETE CASCADE ON UPDATE CASCADE
-        );
-     */
-    await knex.schema.createTable("api_key", function (table) {
-        table.increments("id").primary();
-        table.string("key", 255).notNullable();
-        table.string("name", 255).notNullable();
-        table.integer("user_id").unsigned().notNullable()
-            .references("id").inTable("user")
-            .onDelete("CASCADE")
-            .onUpdate("CASCADE");
-        table.dateTime("created_date").defaultTo(knex.fn.now()).notNullable();
-        table.boolean("active").defaultTo(1).notNullable();
-        table.dateTime("expires").defaultTo(null);
-    });
-
-    // 2023-06-30-1400-monitor-tls.js
-    /*
-    ALTER TABLE monitor
-        ADD tls_ca TEXT default null;
-
-    ALTER TABLE monitor
-        ADD tls_cert TEXT default null;
-
-    ALTER TABLE monitor
-        ADD tls_key TEXT default null;
-    */
-    await knex.schema.table("monitor", function (table) {
-        table.text("tls_ca").defaultTo(null);
-        table.text("tls_cert").defaultTo(null);
-        table.text("tls_key").defaultTo(null);
-    });
-
-    // 2023-06-30-1401-maintenance-cron.js
-    /*
-        -- 999 characters. https://stackoverflow.com/questions/46134830/maximum-length-for-cron-job
-        DROP TABLE maintenance_timeslot;
-        ALTER TABLE maintenance ADD cron TEXT;
-        ALTER TABLE maintenance ADD timezone VARCHAR(255);
-        ALTER TABLE maintenance ADD duration INTEGER;
-    */
-    await knex.schema
-        .dropTableIfExists("maintenance_timeslot")
-        .table("maintenance", function (table) {
-            table.text("cron");
-            table.string("timezone", 255);
-            table.integer("duration");
-        });
-
-    // 2023-06-30-1413-add-parent-monitor.js.
-    /*
-        ALTER TABLE monitor
-        ADD parent INTEGER REFERENCES [monitor] ([id]) ON DELETE SET NULL ON UPDATE CASCADE;
-    */
-    await knex.schema.table("monitor", function (table) {
-        table.integer("parent").unsigned()
-            .references("id").inTable("monitor")
-            .onDelete("SET NULL")
-            .onUpdate("CASCADE");
-    });
-
-    /*
-        patch-add-invert-keyword.sql
-        ALTER TABLE monitor
-        ADD invert_keyword BOOLEAN default 0 not null;
-     */
-    await knex.schema.table("monitor", function (table) {
-        table.boolean("invert_keyword").defaultTo(0).notNullable();
-    });
-
-    /*
-        patch-added-json-query.sql
-        ALTER TABLE monitor
-	    ADD json_path TEXT;
-
-        ALTER TABLE monitor
-	    ADD expected_value VARCHAR(255);
-     */
-    await knex.schema.table("monitor", function (table) {
-        table.text("json_path");
-        table.string("expected_value", 255);
-    });
-
-    /*
-    patch-added-kafka-producer.sql
-
-    ALTER TABLE monitor
-	ADD kafka_producer_topic VARCHAR(255);
-
-ALTER TABLE monitor
-	ADD kafka_producer_brokers TEXT;
-
-ALTER TABLE monitor
-	ADD kafka_producer_ssl INTEGER;
-
-ALTER TABLE monitor
-	ADD kafka_producer_allow_auto_topic_creation VARCHAR(255);
-
-ALTER TABLE monitor
-	ADD kafka_producer_sasl_options TEXT;
-
-ALTER TABLE monitor
-	ADD kafka_producer_message TEXT;
-     */
-    await knex.schema.table("monitor", function (table) {
-        table.string("kafka_producer_topic", 255);
-        table.text("kafka_producer_brokers");
-        table.integer("kafka_producer_ssl");
-        table.string("kafka_producer_allow_auto_topic_creation", 255);
-        table.text("kafka_producer_sasl_options");
-        table.text("kafka_producer_message");
-    });
-
-    /*
-    patch-add-certificate-expiry-status-page.sql
-    ALTER TABLE status_page
-    ADD show_certificate_expiry BOOLEAN default 0 NOT NULL;
-     */
-    await knex.schema.table("status_page", function (table) {
-        table.boolean("show_certificate_expiry").defaultTo(0).notNullable();
-    });
-
-    /*
-    patch-monitor-oauth-cc.sql
-    ALTER TABLE monitor
-    ADD oauth_client_id TEXT default null;
-
-ALTER TABLE monitor
-    ADD oauth_client_secret TEXT default null;
-
-ALTER TABLE monitor
-    ADD oauth_token_url TEXT default null;
-
-ALTER TABLE monitor
-    ADD oauth_scopes TEXT default null;
-
-ALTER TABLE monitor
-    ADD oauth_auth_method TEXT default null;
-     */
-    await knex.schema.table("monitor", function (table) {
-        table.text("oauth_client_id").defaultTo(null);
-        table.text("oauth_client_secret").defaultTo(null);
-        table.text("oauth_token_url").defaultTo(null);
-        table.text("oauth_scopes").defaultTo(null);
-        table.text("oauth_auth_method").defaultTo(null);
-    });
-
-    /*
-    patch-add-timeout-monitor.sql
-    ALTER TABLE monitor
-    ADD timeout DOUBLE default 0 not null;
-     */
-    await knex.schema.table("monitor", function (table) {
-        table.double("timeout").defaultTo(0).notNullable();
-    });
-
-    /*
-    patch-add-gamedig-given-port.sql
-    ALTER TABLE monitor
-    ADD gamedig_given_port_only BOOLEAN default 1 not null;
-     */
-    await knex.schema.table("monitor", function (table) {
-        table.boolean("gamedig_given_port_only").defaultTo(1).notNullable();
-    });
-
-    log.info("mariadb", "Created basic tables for MariaDB");
-}
-
-module.exports = {
-    createTables,
-};

db/knex_migrations/README.md

@@ -1,55 +0,0 @@
-## Info
-
-https://knexjs.org/guide/migrations.html#knexfile-in-other-languages
-
-
-## Template
-
-Filename: YYYYMMDDHHMMSS_name.js
-
-```js
-exports.up = function(knex) {
-
-};
-
-exports.down = function(knex) {
-
-};
-
-// exports.config = { transaction: false };
-```
-
-## Example
-
-YYYY-MM-DD-HHMM-create-users-products.js
-
-2023-06-30-1348-create-users-products.js
-
-```js
-exports.up = function(knex) {
-  return knex.schema
-    .createTable('users', function (table) {
-        table.increments('id');
-        table.string('first_name', 255).notNullable();
-        table.string('last_name', 255).notNullable();
-    })
-    .createTable('products', function (table) {
-        table.increments('id');
-        table.decimal('price').notNullable();
-        table.string('name', 1000).notNullable();
-    }).then(() => {
-        knex("products").insert([
-            { price: 10, name: "Apple" },
-            { price: 20, name: "Orange" },
-        ]);
-    });
-};
-
-exports.down = function(knex) {
-  return knex.schema
-      .dropTable("products")
-      .dropTable("users");
-};
-```
-
-https://knexjs.org/guide/migrations.html#transactions-in-migrations

db/old_migrations/README.md

@@ -1,3 +0,0 @@
-# Don't create a new migration file here
-
-Please go to ./db/knex_migrations/README.md

db/patch-fix-kafka-producer-booleans.sql

@@ -0,0 +1,32 @@
+-- You should not modify if this have pushed to Github, unless it does serious wrong with the db.
+BEGIN TRANSACTION;
+
+-- Rename COLUMNs to another one (suffixed by `_old`)
+ALTER TABLE monitor
+    RENAME COLUMN kafka_producer_ssl TO kafka_producer_ssl_old;
+
+ALTER TABLE monitor
+    RENAME COLUMN kafka_producer_allow_auto_topic_creation TO kafka_producer_allow_auto_topic_creation_old;
+
+-- Add correct COLUMNs
+ALTER TABLE monitor
+    ADD COLUMN kafka_producer_ssl BOOLEAN default 0 NOT NULL;
+
+ALTER TABLE monitor
+    ADD COLUMN kafka_producer_allow_auto_topic_creation BOOLEAN default 0 NOT NULL;
+
+-- Set bring old values from `_old` COLUMNs to correct ones
+UPDATE monitor SET kafka_producer_allow_auto_topic_creation = monitor.kafka_producer_allow_auto_topic_creation_old
+    WHERE monitor.kafka_producer_allow_auto_topic_creation_old IS NOT NULL;
+
+UPDATE monitor SET kafka_producer_ssl = monitor.kafka_producer_ssl_old
+    WHERE monitor.kafka_producer_ssl_old IS NOT NULL;
+
+-- Remove old COLUMNs
+ALTER TABLE monitor
+    DROP COLUMN kafka_producer_allow_auto_topic_creation_old;
+
+ALTER TABLE monitor
+    DROP COLUMN kafka_producer_ssl_old;
+
+COMMIT;

db/patch-notification-config.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;
+
+-- SQLite: Change the data type of the column "config" from VARCHAR to TEXT
+ALTER TABLE notification RENAME COLUMN config TO config_old;
+ALTER TABLE notification ADD COLUMN config TEXT;
+UPDATE notification SET config = config_old;
+ALTER TABLE notification DROP COLUMN config_old;
+
+COMMIT;

db/patch-timeout.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;
+
+UPDATE monitor SET timeout = (interval * 0.8)
+WHERE timeout IS NULL OR timeout <= 0;
+
+COMMIT;

docker/alpine-base.dockerfile

@@ -0,0 +1,8 @@
+# DON'T UPDATE TO alpine3.13, 1.14, see #41.
+FROM node:16-alpine3.12
+WORKDIR /app
+
+# Install apprise, iputils for non-root ping, setpriv
+RUN apk add --no-cache iputils setpriv dumb-init python3 py3-cryptography py3-pip py3-six py3-yaml py3-click py3-markdown py3-requests py3-requests-oauthlib git && \
+    pip3 --no-cache-dir install apprise==1.4.0 && \
+    rm -rf /root/.cache

docker/debian-base.dockerfile

@@ -1,11 +1,12 @@
-# If the image changed, the second stage image should be changed too
-FROM node:20-bookworm-slim AS base2-slim
+# DON'T UPDATE TO bullseye-slim, see #372.
+# There is no 20-buster-slim for armv7 unfortunately, 18-buster-slim is the last one for Uptime Kuma v1.
+FROM node:18-buster-slim
 ARG TARGETPLATFORM
 
 WORKDIR /app
 
 # Specify --no-install-recommends to skip unused dependencies, make the base much smaller!
-# apprise = for notifications (From testing repo)
+# python3* = apprise's dependencies
 # sqlite3 = for debugging
 # iputils-ping = for ping
 # util-linux = for setpriv (Should be dropped in 2.0.0?)
@@ -14,25 +15,29 @@ WORKDIR /app
 # ca-certificates = keep the cert up-to-date
 # sudo = for start service nscd with non-root user
 # nscd = for better DNS caching
-RUN echo "deb http://deb.debian.org/debian testing main" >> /etc/apt/sources.list && \
-    apt update && \
-    apt --yes --no-install-recommends -t testing install apprise sqlite3 ca-certificates && \
-    apt --yes --no-install-recommends -t stable install  \
+# (pip) apprise = for notifications
+RUN apt-get update && \
+    apt-get --yes --no-install-recommends install  \
+        python3 python3-pip python3-cryptography python3-six python3-yaml python3-click python3-markdown python3-requests python3-requests-oauthlib \
+        sqlite3  \
         iputils-ping  \
         util-linux  \
         dumb-init  \
         curl  \
+        ca-certificates \
         sudo \
         nscd && \
+    pip3 --no-cache-dir install apprise==1.4.5 && \
     rm -rf /var/lib/apt/lists/* && \
     apt --yes autoremove
 
-
 # Install cloudflared
-RUN curl https://pkg.cloudflare.com/cloudflare-main.gpg --output /usr/share/keyrings/cloudflare-main.gpg && \
-    echo 'deb [signed-by=/usr/share/keyrings/cloudflare-main.gpg] https://pkg.cloudflare.com/cloudflared bullseye main' | tee /etc/apt/sources.list.d/cloudflared.list && \
-    apt update && \
-    apt install --yes --no-install-recommends -t stable cloudflared && \
+RUN set -eux && \
+    mkdir -p --mode=0755 /usr/share/keyrings && \
+    curl --fail --show-error --silent --location --insecure https://pkg.cloudflare.com/cloudflare-main.gpg --output /usr/share/keyrings/cloudflare-main.gpg && \
+    echo 'deb [signed-by=/usr/share/keyrings/cloudflare-main.gpg] https://pkg.cloudflare.com/cloudflared buster main' | tee /etc/apt/sources.list.d/cloudflared.list && \
+    apt-get update && \
+    apt-get install --yes --no-install-recommends cloudflared && \
     cloudflared version && \
     rm -rf /var/lib/apt/lists/* && \
     apt --yes autoremove
@@ -41,16 +46,3 @@ RUN curl https://pkg.cloudflare.com/cloudflare-main.gpg --output /usr/share/keyr
 COPY ./docker/etc/nscd.conf /etc/nscd.conf
 COPY ./docker/etc/sudoers /etc/sudoers
 
-
-# Full Base Image
-# MariaDB, Chromium and fonts
-# Not working for armv7, so use the older version (10.5) of MariaDB from the debian repo
-# curl -LsS https://r.mariadb.com/downloads/mariadb_repo_setup | bash -s -- --mariadb-server-version="mariadb-11.1" && \
-FROM base2-slim AS base2
-ENV UPTIME_KUMA_ENABLE_EMBEDDED_MARIADB=1
-RUN apt update && \
-    apt --yes --no-install-recommends install chromium fonts-indic fonts-noto fonts-noto-cjk mariadb-server && \
-    apt --yes remove curl && \
-    rm -rf /var/lib/apt/lists/* && \
-    apt --yes autoremove && \
-    chown -R node:node /var/lib/mysql

docker/docker-compose-dev.yml

@@ -1,14 +0,0 @@
-version: '3.8'
-
-services:
-  uptime-kuma:
-    container_name: uptime-kuma-dev
-    image: louislam/uptime-kuma:nightly2
-    volumes:
-      #- ./data:/app/data
-      - ../server:/app/server
-      - ../db:/app/db
-    ports:
-      - "3001:3001"  # <Host Port>:<Container Port>
-      - "3307:3306"
-

docker/docker-compose.yml

@@ -1,15 +1,14 @@
-version: '3.8'
+# Simple docker-compose.yml
+# You can change your port or volume location
+
+version: '3.3'
 
 services:
   uptime-kuma:
-    image: louislam/uptime-kuma:2
+    image: louislam/uptime-kuma:1
     container_name: uptime-kuma
     volumes:
-      - uptime-kuma:/app/data
+      - ./uptime-kuma-data:/app/data
     ports:
-      - "3001:3001"  # <Host Port>:<Container Port>
+      - 3001:3001  # <Host Port>:<Container Port>
     restart: always
-
-volumes:
-  uptime-kuma:
-

docker/dockerfile

@@ -1,8 +1,6 @@
-ARG BASE_IMAGE=louislam/uptime-kuma:base2
-
 ############################################
 # Build in Golang
-# Run npm run build-healthcheck-armv7 in the host first, otherwise it will be super slow where it is building the armv7 healthcheck
+# Run npm run build-healthcheck-armv7 in the host first, another it will be super slow where it is building the armv7 healthcheck
 # Check file: builder-go.dockerfile
 ############################################
 FROM louislam/uptime-kuma:builder-go AS build_healthcheck
@@ -10,47 +8,49 @@ FROM louislam/uptime-kuma:builder-go AS build_healthcheck
 ############################################
 # Build in Node.js
 ############################################
-FROM louislam/uptime-kuma:base2 AS build
-USER node
+FROM louislam/uptime-kuma:base-debian AS build
 WORKDIR /app
 
 ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1
-COPY --chown=node:node .npmrc .npmrc
-COPY --chown=node:node package.json package.json
-COPY --chown=node:node package-lock.json package-lock.json
+COPY .npmrc .npmrc
+COPY package.json package.json
+COPY package-lock.json package-lock.json
 RUN npm ci --omit=dev
 COPY . .
-COPY --chown=node:node --from=build_healthcheck /app/extra/healthcheck /app/extra/healthcheck
+COPY --from=build_healthcheck /app/extra/healthcheck /app/extra/healthcheck
+RUN chmod +x /app/extra/entrypoint.sh
 
 ############################################
 # ⭐ Main Image
 ############################################
-FROM $BASE_IMAGE AS release
-USER node
+FROM louislam/uptime-kuma:base-debian AS release
 WORKDIR /app
 
 ENV UPTIME_KUMA_IS_CONTAINER=1
 
 # Copy app files from build layer
-COPY --chown=node:node --from=build /app /app
+COPY --from=build /app /app
+
 
 EXPOSE 3001
+VOLUME ["/app/data"]
 HEALTHCHECK --interval=60s --timeout=30s --start-period=180s --retries=5 CMD extra/healthcheck
-ENTRYPOINT ["/usr/bin/dumb-init", "--"]
+ENTRYPOINT ["/usr/bin/dumb-init", "--", "extra/entrypoint.sh"]
 CMD ["node", "server/server.js"]
 
 ############################################
 # Mark as Nightly
 ############################################
 FROM release AS nightly
-USER node
 RUN npm run mark-as-nightly
 
 ############################################
 # Build an image for testing pr
 ############################################
-FROM louislam/uptime-kuma:base2 AS pr-test2
+FROM louislam/uptime-kuma:base-debian AS pr-test
+
 WORKDIR /app
+
 ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1
 
 ## Install Git
@@ -78,7 +78,7 @@ CMD ["npm", "run", "start-pr-test"]
 ############################################
 # Upload the artifact to Github
 ############################################
-FROM louislam/uptime-kuma:base2 AS upload-artifact
+FROM louislam/uptime-kuma:base-debian AS upload-artifact
 WORKDIR /
 RUN apt update && \
     apt --yes install curl file

docker/dockerfile-alpine

@@ -0,0 +1,27 @@
+FROM louislam/uptime-kuma:base-alpine AS build
+WORKDIR /app
+
+ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1
+
+COPY .npmrc .npmrc
+COPY package.json package.json
+COPY package-lock.json package-lock.json
+RUN npm ci --omit=dev
+COPY . .
+RUN chmod +x /app/extra/entrypoint.sh
+
+FROM louislam/uptime-kuma:base-alpine AS release
+WORKDIR /app
+
+# Copy app files from build layer
+COPY --from=build /app /app
+
+EXPOSE 3001
+VOLUME ["/app/data"]
+HEALTHCHECK --interval=60s --timeout=30s --start-period=180s --retries=5 CMD node extra/healthcheck.js
+ENTRYPOINT ["/usr/bin/dumb-init", "--", "extra/entrypoint.sh"]
+CMD ["node", "server/server.js"]
+
+
+FROM release AS nightly
+RUN npm run mark-as-nightly

extra/beta/update-version.js

@@ -36,8 +36,6 @@ if (! exists) {
 /**
  * Commit updated files
  * @param {string} version Version to update to
- * @returns {void}
- * @throws Error committing files
  */
 function commit(version) {
     let msg = "Update to " + version;
@@ -57,7 +55,6 @@ function commit(version) {
 /**
  * Create a tag with the specified version
  * @param {string} version Tag to create
- * @returns {void}
  */
 function tag(version) {
     let res = childProcess.spawnSync("git", [ "tag", version ]);
@@ -71,7 +68,6 @@ function tag(version) {
  * Check if a tag exists for the specified version
  * @param {string} version Version to check
  * @returns {boolean} Does the tag already exist
- * @throws Version is not valid
  */
 function tagExists(version) {
     if (! version) {

extra/cli.js

@@ -1,75 +0,0 @@
-#!/usr/bin/env node
-const path = require("path");
-const args = require("args-parser")(process.argv);
-
-// Set the data directory
-if (!process.env.DATA_DIR) {
-    if (process.platform === "win32") {
-        process.env.DATA_DIR = process.env.LOCALAPPDATA + "\\uptime-kuma\\";
-    } else if (process.platform === "linux") {
-        process.env.DATA_DIR = process.env.HOME + "/.local/share/uptime-kuma/";
-    } else if (process.platform === "darwin") {
-        // TODO: Not sure if this is the correct path for macOS
-        process.env.DATA_DIR = process.env.HOME + "/Library/Preferences/uptime-kuma/";
-    } else {
-        console.error("Unable to detect app data directory on platform: " + process.platform);
-        console.error("Please set the DATA_DIR environment variable or `--data-dir=` to the directory where you want to store your data.");
-        process.exit(1);
-    }
-}
-
-// Change the working directory to the root of the project, so it can read the dist folder
-process.chdir(path.join(__dirname, ".."));
-
-if (args.run) {
-    require("../server/server");
-
-} else if (args.installService) {
-
-    if (process.platform === "win32") {
-        let Service = require("node-windows").Service;
-
-        // Create a new service object
-        let svc = new Service({
-            name: "Uptime Kuma",
-            description: "Uptime Kuma is an easy-to-use self-hosted monitoring tool.",
-            script: "C:\\path\\to\\helloworld.js",
-            nodeOptions: [
-                "--harmony",
-                "--max_old_space_size=4096"
-            ]
-            //, workingDirectory: '...'
-            //, allowServiceLogon: true
-        });
-
-        // Listen for the "install" event, which indicates the
-        // process is available as a service.
-        svc.on("install", function () {
-            svc.start();
-        });
-
-        svc.install();
-    } else if (process.platform === "linux") {
-
-    } else {
-        console.error("Unable to install service on platform: " + process.platform);
-        process.exit(1);
-    }
-
-} else if (args.version || args.v) {
-    const version = require("../package.json").version;
-    console.log("Uptime Kuma version: " + version);
-
-} else {
-    console.log(`Usage: uptime-kuma [options]
-
-Options:
-    --install-service    Install Uptime Kuma service (Windows and Linux only)
-    --uninstall-service  Uninstall Uptime Kuma service
-    --run                Run Uptime Kuma directly in the terminal
-    --data-dir="your path"    Set the data directory
-    --version            Print the version
-    --help               Print this help
-    `);
-}
-

extra/download-dist.js

@@ -15,7 +15,6 @@ download(url);
 /**
  * Downloads the latest version of the dist from a GitHub release.
  * @param {string} url The URL to download from.
- * @returns {void}
  *
  * Generated by Trelent
  */

extra/entrypoint.sh

@@ -0,0 +1,21 @@
+#!/usr/bin/env sh
+
+# set -e Exit the script if an error happens
+set -e
+PUID=${PUID=0}
+PGID=${PGID=0}
+
+files_ownership () {
+    # -h Changes the ownership of an encountered symbolic link and not that of the file or directory pointed to by the symbolic link.
+    # -R Recursively descends the specified directories
+    # -c Like verbose but report only when a change is made
+    chown -hRc "$PUID":"$PGID" /app/data
+}
+
+echo "==> Performing startup jobs and maintenance tasks"
+files_ownership
+
+echo "==> Starting application with user $PUID group $PGID"
+
+# --clear-groups Clear supplementary groups.
+exec setpriv --reuid "$PUID" --regid "$PGID" --clear-groups "$@"

extra/fs-rmSync.js

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

extra/install.batsh

@@ -189,13 +189,15 @@ if (type == "local") {
         bash("check=$(git --version)");
         if (check == "") {
             error = 1;
-            println("Error: git is missing");
+            println("Error: git is not found!");
+            println("help: an installation guide is available at https://git-scm.com/book/en/v2/Getting-Started-Installing-Git");
         }
 
         bash("check=$(node -v)");
         if (check == "") {
             error = 1;
-            println("Error: node is missing");
+            println("Error: node is not found");
+            println("help: an installation guide is available at https://nodejs.org/en/download");
         }
 
         if (error > 0) {
@@ -216,6 +218,7 @@ if (type == "local") {
    bash("check=$(pm2 --version)");
    if (check == "") {
        println("Error: pm2 is not found!");
+       println("help: an installation guide is available at https://pm2.keymetrics.io/docs/usage/quick-start/");
        bash("exit 1");
    }
 
@@ -232,6 +235,7 @@ if (type == "local") {
     bash("check=$(docker -v)");
     if (check == "") {
         println("Error: docker is not found!");
+        println("help: an installation guide is available at https://docs.docker.com/desktop/");
         bash("exit 1");
     }
 
@@ -239,6 +243,7 @@ if (type == "local") {
 
     bash("if [[ \"$check\" == *\"Is the docker daemon running\"* ]]; then
       \"echo\" \"Error: docker is not running\"
+      \"echo\" \"help: a troubleshooting guide is available at https://docs.docker.com/config/daemon/troubleshoot/\"
       \"exit\" \"1\"
     fi");
 

extra/remove-2fa.js

@@ -12,7 +12,7 @@ const rl = readline.createInterface({
 });
 
 const main = async () => {
-    Database.initDataDir(args);
+    Database.init(args);
     await Database.connect();
 
     try {

extra/reset-password.js

@@ -13,7 +13,7 @@ const rl = readline.createInterface({
 
 const main = async () => {
     console.log("Connecting the database");
-    Database.initDataDir(args);
+    Database.init(args);
     await Database.connect(false, false, true);
 
     try {

extra/simple-dns-server.js

@@ -138,7 +138,7 @@ server.listen({
 /**
  * Get human readable request type from request code
  * @param {number} code Request code to translate
- * @returns {string|void} Human readable request type
+ * @returns {string} Human readable request type
  */
 function type(code) {
     for (let name in Packet.TYPE) {

extra/simple-mqtt-server.js

@@ -7,17 +7,11 @@ class SimpleMqttServer {
     aedes = require("aedes")();
     server = require("net").createServer(this.aedes.handle);
 
-    /**
-     * @param {number} port Port to listen on
-     */
     constructor(port) {
         this.port = port;
     }
 
-    /**
-     * Start the MQTT server
-     * @returns {void}
-     */
+    /** Start the MQTT server */
     start() {
         this.server.listen(this.port, () => {
             console.log("server started and listening on port ", this.port);

extra/update-language-files/index.js

@@ -12,7 +12,6 @@ import rmSync from "../fs-rmSync.js";
  * created with this code if one does not already exist
  * @param {string} baseLang The second base language file to copy. This
  * will be ignored if set to "en" as en.js is copied by default
- * @returns {void}
  */
 function copyFiles(langCode, baseLang) {
     if (fs.existsSync("./languages")) {
@@ -34,8 +33,7 @@ function copyFiles(langCode, baseLang) {
 /**
  * Update the specified language file
  * @param {string} langCode Language code to update
- * @param {string} baseLangCode Second language to copy keys from
- * @returns {void}
+ * @param {string} baseLang Second language to copy keys from
  */
 async function updateLanguage(langCode, baseLangCode) {
     const en = (await import("./languages/en.js")).default;

extra/update-version.js

@@ -39,8 +39,6 @@ if (! exists) {
 /**
  * Commit updated files
  * @param {string} version Version to update to
- * @returns {void}
- * @throws Error when committing files
  */
 function commit(version) {
     let msg = "Update to " + version;
@@ -57,7 +55,6 @@ function commit(version) {
 /**
  * Create a tag with the specified version
  * @param {string} version Tag to create
- * @returns {void}
  */
 function tag(version) {
     let res = childProcess.spawnSync("git", [ "tag", version ]);
@@ -68,7 +65,6 @@ function tag(version) {
  * Check if a tag exists for the specified version
  * @param {string} version Version to check
  * @returns {boolean} Does the tag already exist
- * @throws Version is not valid
  */
 function tagExists(version) {
     if (! version) {

extra/update-wiki-version.js

@@ -13,7 +13,6 @@ updateWiki(newVersion);
 /**
  * Update the wiki with new version number
  * @param {string} newVersion Version to update to
- * @returns {void}
  */
 function updateWiki(newVersion) {
     const wikiDir = "./tmp/wiki";
@@ -47,7 +46,6 @@ function updateWiki(newVersion) {
 /**
  * Check if a directory exists and then delete it
  * @param {string} dir Directory to delete
- * @returns {void}
  */
 function safeDelete(dir) {
     if (fs.existsSync(dir)) {

index.html

@@ -9,8 +9,24 @@
     <meta name="theme-color" id="theme-color" content="" />
     <meta name="description" content="Uptime Kuma monitoring tool" />
     <title>Uptime Kuma</title>
+    <style>
+        .noscript-message {
+            font-size: 20px;
+            text-align: center;
+            padding: 10px;
+            max-width: 500px;
+            margin: 0 auto;
+        }
+    </style>
 </head>
 <body>
+<noscript>
+<div class="noscript-message">
+    Sorry, you don't seem to have JavaScript enabled or your browser
+    doesn't support it.<br />This website requires JavaScript to function.
+    Please enable JavaScript in your browser settings to continue.
+</div>
+</noscript>
 <div id="app"></div>
 <script type="module" src="/src/main.js"></script>
 </body>

install.sh

@@ -156,12 +156,14 @@ fi
         check=$(git --version)
         if [ "$check" == "" ]; then
           error=$((1))
-          "echo" "-e" "Error: git is missing"        
+          "echo" "-e" "Error: git is not found!"
+          "echo" "-e" "help: an installation guide is available at https://git-scm.com/book/en/v2/Getting-Started-Installing-Git"        
 fi
         check=$(node -v)
         if [ "$check" == "" ]; then
           error=$((1))
-          "echo" "-e" "Error: node is missing"        
+          "echo" "-e" "Error: node is not found"
+          "echo" "-e" "help: an installation guide is available at https://nodejs.org/en/download"        
 fi
         if [ $(($error > 0)) == 1 ]; then
           "echo" "-e" "Please install above missing software"
@@ -180,6 +182,7 @@ fi
   check=$(pm2 --version)
   if [ "$check" == "" ]; then
     "echo" "-e" "Error: pm2 is not found!"
+    "echo" "-e" "help: an installation guide is available at https://pm2.keymetrics.io/docs/usage/quick-start/"
     exit 1  
 fi
   mkdir -p $installPath
@@ -192,11 +195,13 @@ else
   check=$(docker -v)
   if [ "$check" == "" ]; then
     "echo" "-e" "Error: docker is not found!"
+    "echo" "-e" "help: an installation guide is available at https://docs.docker.com/desktop/"
     exit 1  
 fi
   check=$(docker info)
   if [[ "$check" == *"Is the docker daemon running"* ]]; then
       "echo" "Error: docker is not running"
+      "echo" "help: a troubleshooting guide is available at https://docs.docker.com/config/daemon/troubleshoot/"
       "exit" "1"
     fi
   if [ "$3" != "" ]; then

package.json

@@ -1,7 +1,6 @@
 {
     "name": "uptime-kuma",
-    "description": "Uptime Kuma is an easy-to-use self-hosted monitoring tool",
-    "version": "1.23.0-beta.1",
+    "version": "1.23.5-beta.0",
     "license": "MIT",
     "repository": {
         "type": "git",
@@ -10,11 +9,7 @@
     "engines": {
         "node": "14 || 16 || 18 || >= 20.4.0"
     },
-    "bin": {
-        "uptime-kuma": "./extra/cli.js"
-    },
     "scripts": {
-        "uptime-kuma": "node ./extra/cli.js",
         "install-legacy": "npm install",
         "update-legacy": "npm update",
         "lint:js": "eslint --ext \".js,.vue\" --ignore-path .gitignore .",
@@ -34,17 +29,18 @@
         "jest-backend": "cross-env TEST_BACKEND=1 jest --runInBand --detectOpenHandles --forceExit --config=./config/jest-backend.config.js",
         "tsc": "tsc",
         "vite-preview-dist": "vite preview --host --config ./config/vite.config.js",
-        "build-docker": "npm run build && npm run build-docker-full && npm run build-docker-slim",
-        "build-docker-base": "docker buildx build -f docker/debian-base.dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:base2 --target base2 . --push",
-        "build-docker-base-slim": "docker buildx build -f docker/debian-base.dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:base2-slim --target base2-slim . --push",
+        "build-docker": "npm run build && npm run build-docker-debian && npm run build-docker-alpine",
+        "build-docker-alpine-base": "docker buildx build -f docker/alpine-base.dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:base-alpine . --push",
+        "build-docker-debian-base": "docker buildx build -f docker/debian-base.dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:base-debian . --push",
         "build-docker-builder-go": "docker buildx build -f docker/builder-go.dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:builder-go . --push",
-        "build-docker-slim": "node ./extra/env2arg.js docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:2-slim -t louislam/uptime-kuma:$VERSION-slim --target release --build-arg BASE_IMAGE=louislam/uptime-kuma:base2-slim . --push",
-        "build-docker-full": "node ./extra/env2arg.js docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:2 -t louislam/uptime-kuma:$VERSION --target release . --push",
-        "build-docker-nightly": "node ./extra/test-docker.js && npm run build && docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:nightly2 --target nightly . --push",
-        "build-docker-nightly-local": "npm run build && docker build -f docker/dockerfile -t louislam/uptime-kuma:nightly2 --target nightly .",
+        "build-docker-alpine": "node ./extra/env2arg.js docker buildx build -f docker/dockerfile-alpine --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:alpine -t louislam/uptime-kuma:1-alpine -t louislam/uptime-kuma:$VERSION-alpine --target release . --push",
+        "build-docker-debian": "node ./extra/env2arg.js docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma -t louislam/uptime-kuma:1 -t louislam/uptime-kuma:$VERSION -t louislam/uptime-kuma:debian -t louislam/uptime-kuma:1-debian -t louislam/uptime-kuma:$VERSION-debian --target release . --push",
+        "build-docker-nightly": "node ./extra/test-docker.js && npm run build && docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:nightly --target nightly . --push",
+        "build-docker-nightly-alpine": "docker buildx build -f docker/dockerfile-alpine --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:nightly-alpine --target nightly . --push",
+        "build-docker-nightly-amd64": "docker buildx build -f docker/dockerfile --platform linux/amd64 -t louislam/uptime-kuma:nightly-amd64 --target nightly . --push --progress plain",
         "build-docker-pr-test": "docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64 -t louislam/uptime-kuma:pr-test --target pr-test . --push",
         "upload-artifacts": "docker buildx build -f docker/dockerfile --platform linux/amd64 -t louislam/uptime-kuma:upload-artifact --build-arg VERSION --build-arg GITHUB_TOKEN --target upload-artifact . --progress plain",
-        "setup": "git checkout 1.22.1 && npm ci --production && npm run download-dist",
+        "setup": "git checkout 1.23.4 && npm ci --production && npm run download-dist",
         "download-dist": "node extra/download-dist.js",
         "mark-as-nightly": "node extra/mark-as-nightly.js",
         "reset-password": "node extra/reset-password.js",
@@ -52,6 +48,7 @@
         "compile-install-script": "@powershell -NoProfile -ExecutionPolicy Unrestricted -Command ./extra/compile-install-script.ps1",
         "test-install-script-rockylinux": "npm run compile-install-script && docker build --progress plain -f test/test_install_script/rockylinux.dockerfile .",
         "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-debian": "npm run compile-install-script && docker build --progress plain -f test/test_install_script/debian.dockerfile .",
         "test-install-script-debian-buster": "npm run compile-install-script && docker build --progress plain -f test/test_install_script/debian-buster.dockerfile .",
         "test-install-script-ubuntu": "npm run compile-install-script && docker build --progress plain -f test/test_install_script/ubuntu.dockerfile .",
@@ -59,9 +56,13 @@
         "test-install-script-ubuntu1604": "npm run compile-install-script && docker build --progress plain -f test/test_install_script/ubuntu1604.dockerfile .",
         "simple-dns-server": "node extra/simple-dns-server.js",
         "simple-mqtt-server": "node extra/simple-mqtt-server.js",
+        "simple-mongo": "docker run --rm -p 27017:27017 mongo",
+        "simple-postgres": "docker run --rm -p 5432:5432 -e POSTGRES_PASSWORD=postgres postgres",
+        "simple-mariadb": "docker run --rm -p 3306:3306 -e MYSQL_ROOT_PASSWORD=mariadb# mariadb",
         "update-language-files": "cd extra/update-language-files && node index.js && cross-env-shell eslint ../../src/languages/$npm_config_language.js --fix",
-        "release-final": "node ./extra/test-docker.js && node extra/update-version.js && npm run build-docker && node ./extra/press-any-key.js && npm run upload-artifacts && node ./extra/update-wiki-version.js && npm run publish-to-npm",
-        "release-beta": "node ./extra/test-docker.js && node extra/beta/update-version.js && npm run build && node ./extra/env2arg.js docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:$VERSION -t louislam/uptime-kuma:beta .  --target release --push && node ./extra/press-any-key.js && npm run upload-artifacts && npm run publish-to-npm-beta",
+        "ncu-patch": "npm-check-updates -u -t patch",
+        "release-final": "node ./extra/test-docker.js && node extra/update-version.js && npm run build-docker && node ./extra/press-any-key.js && npm run upload-artifacts && node ./extra/update-wiki-version.js",
+        "release-beta": "node ./extra/test-docker.js && node extra/beta/update-version.js && npm run build && node ./extra/env2arg.js docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:$VERSION -t louislam/uptime-kuma:beta .  --target release --push && node ./extra/press-any-key.js && npm run upload-artifacts",
         "git-remove-tag": "git tag -d",
         "build-dist-and-restart": "npm run build && npm run start-server-dev",
         "start-pr-test": "node extra/checkout-pr.js && npm install && npm run dev",
@@ -71,12 +72,7 @@
         "cypress-open": "concurrently -k -r \"node test/prepare-test-server.js && node server/server.js --port=3002 --data-dir=./data/test/\" \"cypress open --config-file ./config/cypress.config.js\"",
         "build-healthcheck-armv7": "cross-env GOOS=linux GOARCH=arm GOARM=7 go build -x -o ./extra/healthcheck-armv7 ./extra/healthcheck.go",
         "deploy-demo-server": "node extra/deploy-demo-server.js",
-        "sort-contributors": "node extra/sort-contributors.js",
-        "quick-run-nightly": "docker run --rm --env NODE_ENV=development -p 3001:3001 louislam/uptime-kuma:nightly2",
-        "start-dev-container": "cd docker && docker-compose -f docker-compose-dev.yml up --force-recreate",
-        "publish-to-npm-dev": "npm run build && npm publish --tag dev",
-        "publish-to-npm-beta": "npm publish --tag beta",
-        "publish-to-npm": "npm publish"
+        "sort-contributors": "node extra/sort-contributors.js"
     },
     "dependencies": {
         "@grpc/grpc-js": "~1.7.3",
@@ -102,7 +98,7 @@
         "express-basic-auth": "~1.2.1",
         "express-static-gzip": "~2.1.7",
         "form-data": "~4.0.0",
-        "gamedig": "~4.0.5",
+        "gamedig": "~4.1.0",
         "http-graceful-shutdown": "~3.1.7",
         "http-proxy-agent": "~5.0.0",
         "https-proxy-agent": "~5.0.1",
@@ -113,24 +109,22 @@
         "jsonwebtoken": "~9.0.0",
         "jwt-decode": "~3.1.2",
         "kafkajs": "^2.2.4",
-        "knex": "^2.4.2",
         "limiter": "~2.1.0",
         "liquidjs": "^10.7.0",
-        "mongodb": "~4.14.0",
+        "mongodb": "~4.17.1",
         "mqtt": "~4.3.7",
         "mssql": "~8.1.4",
-        "mysql2": "~2.3.3",
+        "mysql2": "~3.6.2",
         "nanoid": "~3.3.4",
         "node-cloudflared-tunnel": "~1.0.9",
         "node-radius-client": "~1.0.0",
-        "node-windows": "^1.0.0-beta.8",
         "nodemailer": "~6.6.5",
         "nostr-tools": "^1.13.1",
         "notp": "~2.0.3",
         "openid-client": "^5.4.2",
         "password-hash": "~1.2.2",
-        "pg": "~8.8.0",
-        "pg-connection-string": "~2.5.0",
+        "pg": "~8.11.3",
+        "pg-connection-string": "~2.6.2",
         "playwright-core": "~1.35.1",
         "prom-client": "~13.2.0",
         "prometheus-api-metrics": "~3.2.1",
@@ -169,12 +163,11 @@
         "core-js": "~3.26.1",
         "cronstrue": "~2.24.0",
         "cross-env": "~7.0.3",
-        "cypress": "^12.17.0",
+        "cypress": "^13.2.0",
         "delay": "^5.0.0",
         "dns2": "~2.0.1",
         "dompurify": "~2.4.3",
         "eslint": "~8.14.0",
-        "eslint-plugin-jsdoc": "^46.4.6",
         "eslint-plugin-vue": "~8.7.1",
         "favico.js": "~0.3.10",
         "jest": "~29.6.1",

server/auth.js

@@ -9,9 +9,9 @@ const dayjs = require("dayjs");
 
 /**
  * Login to web app
- * @param {string} username Username to login with
- * @param {string} password Password to login with
- * @returns {Promise<(Bean|null)>} User or null if login failed
+ * @param {string} username
+ * @param {string} password
+ * @returns {Promise<(Bean|null)>}
  */
 exports.login = async function (username, password) {
     if (typeof username !== "string" || typeof password !== "string") {
@@ -39,7 +39,6 @@ exports.login = async function (username, password) {
 /**
  * Validate a provided API key
  * @param {string} key API key to verify
- * @returns {boolean} API is ok?
  */
 async function verifyAPIKey(key) {
     if (typeof key !== "string") {
@@ -74,10 +73,9 @@ async function verifyAPIKey(key) {
 
 /**
  * Custom authorizer for express-basic-auth
- * @param {string} username Username to login with
- * @param {string} password Password to login with
- * @param {authCallback} callback Callback to handle login result
- * @returns {void}
+ * @param {string} username
+ * @param {string} password
+ * @param {authCallback} callback
  */
 function apiAuthorizer(username, password, callback) {
     // API Rate Limit
@@ -101,10 +99,9 @@ function apiAuthorizer(username, password, callback) {
 
 /**
  * Custom authorizer for express-basic-auth
- * @param {string} username Username to login with
- * @param {string} password Password to login with
- * @param {authCallback} callback Callback to handle login result
- * @returns {void}
+ * @param {string} username
+ * @param {string} password
+ * @param {authCallback} callback
  */
 function userAuthorizer(username, password, callback) {
     // Login Rate Limit
@@ -129,8 +126,7 @@ function userAuthorizer(username, password, callback) {
  * Use basic auth if auth is not disabled
  * @param {express.Request} req Express request object
  * @param {express.Response} res Express response object
- * @param {express.NextFunction} next Next handler in chain
- * @returns {void}
+ * @param {express.NextFunction} next
  */
 exports.basicAuth = async function (req, res, next) {
     const middleware = basicAuth({
@@ -152,8 +148,7 @@ exports.basicAuth = async function (req, res, next) {
  * Use use API Key if API keys enabled, else use basic auth
  * @param {express.Request} req Express request object
  * @param {express.Response} res Express response object
- * @param {express.NextFunction} next Next handler in chain
- * @returns {void}
+ * @param {express.NextFunction} next
  */
 exports.apiAuth = async function (req, res, next) {
     if (!await Settings.get("disableAuth")) {

server/cacheable-dns-http-agent.js

@@ -15,7 +15,6 @@ class CacheableDnsHttpAgent {
 
     /**
      * Register/Disable cacheable to global agents
-     * @returns {void}
      */
     static async update() {
         log.debug("CacheableDnsHttpAgent", "update");
@@ -41,15 +40,14 @@ class CacheableDnsHttpAgent {
     /**
      * Attach cacheable to HTTP agent
      * @param {http.Agent} agent Agent to install
-     * @returns {void}
      */
     static install(agent) {
         this.cacheable.install(agent);
     }
 
     /**
-     * @param {https.AgentOptions} agentOptions Options to pass to HTTPS agent
-     * @returns {https.Agent} The new HTTPS agent
+     * @var {https.AgentOptions} agentOptions
+     * @return {https.Agent}
      */
     static getHttpsAgent(agentOptions) {
         if (!this.enable) {
@@ -65,8 +63,8 @@ class CacheableDnsHttpAgent {
     }
 
     /**
-     * @param {http.AgentOptions} agentOptions Options to pass to the HTTP agent
-     * @returns {https.Agents} The new HTTP agent
+     * @var {http.AgentOptions} agentOptions
+     * @return {https.Agents}
      */
     static getHttpAgent(agentOptions) {
         if (!this.enable) {

server/client.js

@@ -12,7 +12,7 @@ const checkVersion = require("./check-version");
 /**
  * Send list of notification providers to client
  * @param {Socket} socket Socket.io socket instance
- * @returns {Promise<Bean[]>} List of notifications
+ * @returns {Promise<Bean[]>}
  */
 async function sendNotificationList(socket) {
     const timeLogger = new TimeLogger();
@@ -40,8 +40,8 @@ async function sendNotificationList(socket) {
  * Send Heartbeat History list to socket
  * @param {Socket} socket Socket.io instance
  * @param {number} monitorID ID of monitor to send heartbeat history
- * @param {boolean} toUser  True = send to all browsers with the same user id, False = send to the current browser only
- * @param {boolean} overwrite Overwrite client-side's heartbeat list
+ * @param {boolean} [toUser=false]  True = send to all browsers with the same user id, False = send to the current browser only
+ * @param {boolean} [overwrite=false] Overwrite client-side's heartbeat list
  * @returns {Promise<void>}
  */
 async function sendHeartbeatList(socket, monitorID, toUser = false, overwrite = false) {
@@ -71,8 +71,8 @@ async function sendHeartbeatList(socket, monitorID, toUser = false, overwrite =
  * Important Heart beat list (aka event list)
  * @param {Socket} socket Socket.io instance
  * @param {number} monitorID ID of monitor to send heartbeat history
- * @param {boolean} toUser  True = send to all browsers with the same user id, False = send to the current browser only
- * @param {boolean} overwrite Overwrite client-side's heartbeat list
+ * @param {boolean} [toUser=false]  True = send to all browsers with the same user id, False = send to the current browser only
+ * @param {boolean} [overwrite=false] Overwrite client-side's heartbeat list
  * @returns {Promise<void>}
  */
 async function sendImportantHeartbeatList(socket, monitorID, toUser = false, overwrite = false) {
@@ -100,7 +100,7 @@ async function sendImportantHeartbeatList(socket, monitorID, toUser = false, ove
 /**
  * Emit proxy list to client
  * @param {Socket} socket Socket.io socket instance
- * @returns {Promise<Bean[]>} List of proxies
+ * @return {Promise<Bean[]>}
  */
 async function sendProxyList(socket) {
     const timeLogger = new TimeLogger();
@@ -141,21 +141,24 @@ async function sendAPIKeyList(socket) {
 /**
  * Emits the version information to the client.
  * @param {Socket} socket Socket.io socket instance
- * @param {boolean} hideVersion Should we hide the version information in the response?
+ * @param {boolean} hideVersion
  * @returns {Promise<void>}
  */
 async function sendInfo(socket, hideVersion = false) {
     let version;
     let latestVersion;
+    let isContainer;
 
     if (!hideVersion) {
         version = checkVersion.version;
         latestVersion = checkVersion.latestVersion;
+        isContainer = (process.env.UPTIME_KUMA_IS_CONTAINER === "1");
     }
 
     socket.emit("info", {
         version,
         latestVersion,
+        isContainer,
         primaryBaseURL: await setting("primaryBaseURL"),
         serverTimezone: await server.getTimezone(),
         serverTimezoneOffset: server.getTimezoneOffset(),
@@ -165,7 +168,7 @@ async function sendInfo(socket, hideVersion = false) {
 /**
  * Send list of docker hosts to client
  * @param {Socket} socket Socket.io socket instance
- * @returns {Promise<Bean[]>} List of docker hosts
+ * @returns {Promise<Bean[]>}
  */
 async function sendDockerHostList(socket) {
     const timeLogger = new TimeLogger();

server/database.js

@@ -4,8 +4,6 @@ const { setSetting, setting } = require("./util-server");
 const { log, sleep } = require("../src/util");
 const knex = require("knex");
 const path = require("path");
-const { EmbeddedMariaDB } = require("./embedded-mariadb");
-const mysql = require("mysql2/promise");
 
 /**
  * Database & App Data Folder
@@ -26,7 +24,7 @@ class Database {
 
     static screenshotDir;
 
-    static sqlitePath;
+    static path;
 
     static dockerTLSDir;
 
@@ -36,13 +34,11 @@ class Database {
     static patched = false;
 
     /**
-     * SQLite only
      * Add patch filename in key
      * Values:
      *      true: Add it regardless of order
      *      false: Do nothing
      *      { parents: []}: Need parents before add it
-     *  @deprecated
      */
     static patchList = {
         "patch-setting-value-type.sql": true,
@@ -84,7 +80,10 @@ class Database {
         "patch-add-certificate-expiry-status-page.sql": true,
         "patch-monitor-oauth-cc.sql": true,
         "patch-add-timeout-monitor.sql": true,
-        "patch-add-gamedig-given-port.sql": true,   // The last file so far converted to a knex migration file
+        "patch-add-gamedig-given-port.sql": true,
+        "patch-notification-config.sql": true,
+        "patch-fix-kafka-producer-booleans.sql": true,
+        "patch-timeout.sql": true,
     };
 
     /**
@@ -95,20 +94,15 @@ class Database {
 
     static noReject = true;
 
-    static dbConfig = {};
-
-    static knexMigrationsPath = "./db/knex_migrations";
-
     /**
-     * Initialize the data directory
-     * @param {object} args Arguments to initialize DB with
-     * @returns {void}
+     * Initialize the database
+     * @param {Object} args Arguments to initialize DB with
      */
-    static initDataDir(args) {
+    static init(args) {
         // Data Directory (must be end with "/")
         Database.dataDir = process.env.DATA_DIR || args["data-dir"] || "./data/";
 
-        Database.sqlitePath = path.join(Database.dataDir, "kuma.db");
+        Database.path = path.join(Database.dataDir, "kuma.db");
         if (! fs.existsSync(Database.dataDir)) {
             fs.mkdirSync(Database.dataDir, { recursive: true });
         }
@@ -133,128 +127,36 @@ class Database {
         log.info("db", `Data Dir: ${Database.dataDir}`);
     }
 
-    static readDBConfig() {
-        let dbConfig;
-
-        let dbConfigString = fs.readFileSync(path.join(Database.dataDir, "db-config.json")).toString("utf-8");
-        dbConfig = JSON.parse(dbConfigString);
-
-        if (typeof dbConfig !== "object") {
-            throw new Error("Invalid db-config.json, it must be an object");
-        }
-
-        if (typeof dbConfig.type !== "string") {
-            throw new Error("Invalid db-config.json, type must be a string");
-        }
-        return dbConfig;
-    }
-
-    static writeDBConfig(dbConfig) {
-        fs.writeFileSync(path.join(Database.dataDir, "db-config.json"), JSON.stringify(dbConfig, null, 4));
-    }
-
     /**
      * Connect to the database
-     * @param {boolean} testMode Should the connection be
+     * @param {boolean} [testMode=false] Should the connection be
      * started in test mode?
-     * @param {boolean} autoloadModels Should models be
+     * @param {boolean} [autoloadModels=true] Should models be
      * automatically loaded?
-     * @param {boolean} noLog Should logs not be output?
+     * @param {boolean} [noLog=false] Should logs not be output?
      * @returns {Promise<void>}
      */
     static async connect(testMode = false, autoloadModels = true, noLog = false) {
         const acquireConnectionTimeout = 120 * 1000;
-        let dbConfig;
-        try {
-            dbConfig = this.readDBConfig();
-            Database.dbConfig = dbConfig;
-        } catch (err) {
-            log.warn("db", err.message);
-            dbConfig = {
-                type: "sqlite",
-            };
-        }
 
-        let config = {};
+        const Dialect = require("knex/lib/dialects/sqlite3/index.js");
+        Dialect.prototype._driver = () => require("@louislam/sqlite3");
 
-        log.info("db", `Database Type: ${dbConfig.type}`);
-
-        if (dbConfig.type === "sqlite") {
-
-            if (! fs.existsSync(Database.sqlitePath)) {
-                log.info("server", "Copying Database");
-                fs.copyFileSync(Database.templatePath, Database.sqlitePath);
+        const knexInstance = knex({
+            client: Dialect,
+            connection: {
+                filename: Database.path,
+                acquireConnectionTimeout: acquireConnectionTimeout,
+            },
+            useNullAsDefault: true,
+            pool: {
+                min: 1,
+                max: 1,
+                idleTimeoutMillis: 120 * 1000,
+                propagateCreateError: false,
+                acquireTimeoutMillis: acquireConnectionTimeout,
             }
-
-            const Dialect = require("knex/lib/dialects/sqlite3/index.js");
-            Dialect.prototype._driver = () => require("@louislam/sqlite3");
-
-            config = {
-                client: Dialect,
-                connection: {
-                    filename: Database.sqlitePath,
-                    acquireConnectionTimeout: acquireConnectionTimeout,
-                },
-                useNullAsDefault: true,
-                pool: {
-                    min: 1,
-                    max: 1,
-                    idleTimeoutMillis: 120 * 1000,
-                    propagateCreateError: false,
-                    acquireTimeoutMillis: acquireConnectionTimeout,
-                }
-            };
-        } else if (dbConfig.type === "mariadb") {
-            if (!/^\w+$/.test(dbConfig.dbName)) {
-                throw Error("Invalid database name. A database name can only consist of letters, numbers and underscores");
-            }
-
-            const connection = await mysql.createConnection({
-                host: dbConfig.hostname,
-                port: dbConfig.port,
-                user: dbConfig.username,
-                password: dbConfig.password,
-            });
-
-            await connection.execute("CREATE DATABASE IF NOT EXISTS " + dbConfig.dbName + " CHARACTER SET utf8mb4");
-            connection.end();
-
-            config = {
-                client: "mysql2",
-                connection: {
-                    host: dbConfig.hostname,
-                    port: dbConfig.port,
-                    user: dbConfig.username,
-                    password: dbConfig.password,
-                    database: dbConfig.dbName,
-                }
-            };
-        } else if (dbConfig.type === "embedded-mariadb") {
-            let embeddedMariaDB = EmbeddedMariaDB.getInstance();
-            await embeddedMariaDB.start();
-            log.info("mariadb", "Embedded MariaDB started");
-            config = {
-                client: "mysql2",
-                connection: {
-                    socketPath: embeddedMariaDB.socketPath,
-                    user: "node",
-                    database: "kuma",
-                }
-            };
-        } else {
-            throw new Error("Unknown Database type: " + dbConfig.type);
-        }
-
-        // Set to utf8mb4 for MariaDB
-        if (dbConfig.type.endsWith("mariadb")) {
-            config.pool = {
-                afterCreate(conn, done) {
-                    conn.query("SET CHARACTER SET utf8mb4;", (err) => done(err, conn));
-                },
-            };
-        }
-
-        const knexInstance = knex(config);
+        });
 
         R.setup(knexInstance);
 
@@ -269,14 +171,6 @@ class Database {
             await R.autoloadModels("./server/model");
         }
 
-        if (dbConfig.type === "sqlite") {
-            await this.initSQLite(testMode, noLog);
-        } else if (dbConfig.type.endsWith("mariadb")) {
-            await this.initMariaDB();
-        }
-    }
-
-    static async initSQLite(testMode, noLog) {
         await R.exec("PRAGMA foreign_keys = ON");
         if (testMode) {
             // Change to MEMORY
@@ -301,54 +195,8 @@ class Database {
         }
     }
 
-    static async initMariaDB() {
-        log.debug("db", "Checking if MariaDB database exists...");
-
-        let hasTable = await R.hasTable("docker_host");
-        if (!hasTable) {
-            const { createTables } = require("../db/knex_init_db");
-            await createTables();
-        } else {
-            log.debug("db", "MariaDB database already exists");
-        }
-    }
-
-    /**
-     * Patch the database
-     * @returns {void}
-     */
+    /** Patch the database */
     static async patch() {
-        // Still need to keep this for old versions of Uptime Kuma
-        if (Database.dbConfig.type === "sqlite") {
-            await this.patchSqlite();
-        }
-
-        // Using knex migrations
-        // https://knexjs.org/guide/migrations.html
-        // https://gist.github.com/NigelEarle/70db130cc040cc2868555b29a0278261
-        try {
-            await R.knex.migrate.latest({
-                directory: Database.knexMigrationsPath,
-            });
-        } catch (e) {
-            log.error("db", "Database migration failed");
-            throw e;
-        }
-    }
-
-    /**
-     *
-     * @returns {Promise<void>}
-     */
-    static async rollbackLatestPatch() {
-
-    }
-
-    /**
-     * Patch the database for SQLite
-     * @deprecated
-     */
-    static async patchSqlite() {
         let version = parseInt(await setting("database_version"));
 
         if (! version) {
@@ -368,7 +216,7 @@ class Database {
             // Try catch anything here
             try {
                 for (let i = version + 1; i <= this.latestVersion; i++) {
-                    const sqlFile = `./db/old_migrations/patch${i}.sql`;
+                    const sqlFile = `./db/patch${i}.sql`;
                     log.info("db", `Patching ${sqlFile}`);
                     await Database.importSQLFile(sqlFile);
                     log.info("db", `Patched ${sqlFile}`);
@@ -385,18 +233,17 @@ class Database {
             }
         }
 
-        await this.patchSqlite2();
+        await this.patch2();
         await this.migrateNewStatusPage();
     }
 
     /**
      * Patch DB using new process
      * Call it from patch() only
-     * @deprecated
      * @private
      * @returns {Promise<void>}
      */
-    static async patchSqlite2() {
+    static async patch2() {
         log.info("db", "Database Patch 2.0 Process");
         let databasePatchedFiles = await setting("databasePatchedFiles");
 
@@ -430,7 +277,6 @@ class Database {
     }
 
     /**
-     * SQlite only
      * Migrate status page value in setting to "status_page" table
      * @returns {Promise<void>}
      */
@@ -502,8 +348,8 @@ class Database {
      * Patch database using new patching process
      * Used it patch2() only
      * @private
-     * @param {string} sqlFilename Name of SQL file to load
-     * @param {object} databasePatchedFiles Patch status of database files
+     * @param sqlFilename
+     * @param databasePatchedFiles
      * @returns {Promise<void>}
      */
     static async patch2Recursion(sqlFilename, databasePatchedFiles) {
@@ -527,7 +373,7 @@ class Database {
 
             log.info("db", sqlFilename + " is patching");
             this.patched = true;
-            await this.importSQLFile("./db/old_migrations/" + sqlFilename);
+            await this.importSQLFile("./db/" + sqlFilename);
             databasePatchedFiles[sqlFilename] = true;
             log.info("db", sqlFilename + " was patched successfully");
 
@@ -538,7 +384,7 @@ class Database {
 
     /**
      * Load an SQL file and execute it
-     * @param {string} filename Filename of SQL file to import
+     * @param filename Filename of SQL file to import
      * @returns {Promise<void>}
      */
     static async importSQLFile(filename) {
@@ -572,7 +418,7 @@ class Database {
 
     /**
      * Aquire a direct connection to database
-     * @returns {any} Database connection
+     * @returns {any}
      */
     static getBetterSQLite3Database() {
         return R.knex.client.acquireConnection();
@@ -609,13 +455,10 @@ class Database {
         process.removeListener("unhandledRejection", listener);
     }
 
-    /**
-     * Get the size of the database
-     * @returns {number} Size of database
-     */
+    /** Get the size of the database */
     static getSize() {
         log.debug("db", "Database.getSize()");
-        let stats = fs.statSync(Database.sqlitePath);
+        let stats = fs.statSync(Database.path);
         log.debug("db", stats);
         return stats.size;
     }
@@ -627,15 +470,6 @@ class Database {
     static async shrink() {
         await R.exec("VACUUM");
     }
-
-    static sqlHourOffset() {
-        if (this.dbConfig.client === "sqlite3") {
-            return "DATETIME('now', ? || ' hours')";
-        } else {
-            return "DATE_ADD(NOW(), INTERVAL ? HOUR)";
-        }
-    }
-
 }
 
 module.exports = Database;

server/docker.js

@@ -14,10 +14,10 @@ class DockerHost {
 
     /**
      * Save a docker host
-     * @param {object} dockerHost Docker host to save
+     * @param {Object} dockerHost Docker host to save
      * @param {?number} dockerHostID ID of the docker host to update
      * @param {number} userID ID of the user who adds the docker host
-     * @returns {Promise<Bean>} Updated docker host
+     * @returns {Promise<Bean>}
      */
     static async save(dockerHost, dockerHostID, userID) {
         let bean;
@@ -64,7 +64,7 @@ class DockerHost {
 
     /**
      * Fetches the amount of containers on the Docker host
-     * @param {object} dockerHost Docker host to check for
+     * @param {Object} dockerHost Docker host to check for
      * @returns {number} Total amount of containers on the host
      */
     static async testDockerHost(dockerHost) {
@@ -80,8 +80,8 @@ class DockerHost {
             options.socketPath = dockerHost.dockerDaemon;
         } else if (dockerHost.dockerType === "tcp") {
             options.baseURL = DockerHost.patchDockerURL(dockerHost.dockerDaemon);
+            options.httpsAgent = new https.Agent(DockerHost.getHttpsAgentOptions(dockerHost.dockerType, options.baseURL));
         }
-        options.httpsAgent = new https.Agent(DockerHost.getHttpsAgentOptions(dockerHost.dockerType, options.baseURL));
 
         let res = await axios.request(options);
 
@@ -108,8 +108,6 @@ class DockerHost {
     /**
      * Since axios 0.27.X, it does not accept `tcp://` protocol.
      * Change it to `http://` on the fly in order to fix it. (https://github.com/louislam/uptime-kuma/issues/2165)
-     * @param {any} url URL to fix
-     * @returns {any} URL with tcp:// replaced by http://
      */
     static patchDockerURL(url) {
         if (typeof url === "string") {
@@ -131,10 +129,11 @@ class DockerHost {
      * 'data/docker-tls/example.com/' would be searched for certificate files),
      * then 'ca.pem', 'key.pem' and 'cert.pem' files are included in the agent options.
      * File names can also be overridden via 'DOCKER_TLS_FILE_NAME_(CA|KEY|CERT)'.
-     * @param {string} dockerType i.e. "tcp" or "socket"
-     * @param {string} url The docker host URL rewritten to https://
-     * @returns {object} HTTP agent options
-     */
+     *
+     * @param {String} dockerType i.e. "tcp" or "socket"
+     * @param {String} url The docker host URL rewritten to https://
+     * @return {Object}
+     * */
     static getHttpsAgentOptions(dockerType, url) {
         let baseOptions = {
             maxCachedSessions: 0,

server/embedded-mariadb.js

@@ -1,157 +0,0 @@
-const { log } = require("../src/util");
-const childProcess = require("child_process");
-const fs = require("fs");
-const mysql = require("mysql2");
-
-/**
- * It is only used inside the docker container
- */
-class EmbeddedMariaDB {
-
-    static instance = null;
-
-    exec = "mariadbd";
-
-    mariadbDataDir = "/app/data/mariadb";
-
-    runDir = "/app/data/run/mariadb";
-
-    socketPath = this.runDir + "/mysqld.sock";
-
-    childProcess = null;
-    running = false;
-
-    started = false;
-
-    /**
-     *
-     * @returns {EmbeddedMariaDB}
-     */
-    static getInstance() {
-        if (!EmbeddedMariaDB.instance) {
-            EmbeddedMariaDB.instance = new EmbeddedMariaDB();
-        }
-        return EmbeddedMariaDB.instance;
-    }
-
-    static hasInstance() {
-        return !!EmbeddedMariaDB.instance;
-    }
-
-    /**
-     *
-     */
-    start() {
-        if (this.childProcess) {
-            log.info("mariadb", "Already started");
-            return;
-        }
-
-        this.initDB();
-
-        this.running = true;
-        log.info("mariadb", "Starting Embedded MariaDB");
-        this.childProcess = childProcess.spawn(this.exec, [
-            "--user=node",
-            "--datadir=" + this.mariadbDataDir,
-            `--socket=${this.socketPath}`,
-            `--pid-file=${this.runDir}/mysqld.pid`,
-        ]);
-
-        this.childProcess.on("close", (code) => {
-            this.running = false;
-            this.childProcess = null;
-            this.started = false;
-            log.info("mariadb", "Stopped Embedded MariaDB: " + code);
-
-            if (code !== 0) {
-                log.info("mariadb", "Try to restart Embedded MariaDB as it is not stopped by user");
-                this.start();
-            }
-        });
-
-        this.childProcess.on("error", (err) => {
-            if (err.code === "ENOENT") {
-                log.error("mariadb", `Embedded MariaDB: ${this.exec} is not found`);
-            } else {
-                log.error("mariadb", err);
-            }
-        });
-
-        let handler = (data) => {
-            log.debug("mariadb", data.toString("utf-8"));
-            if (data.toString("utf-8").includes("ready for connections")) {
-                this.initDBAfterStarted();
-            }
-        };
-
-        this.childProcess.stdout.on("data", handler);
-        this.childProcess.stderr.on("data", handler);
-
-        return new Promise((resolve) => {
-            let interval = setInterval(() => {
-                if (this.started) {
-                    clearInterval(interval);
-                    resolve();
-                } else {
-                    log.info("mariadb", "Waiting for Embedded MariaDB to start...");
-                }
-            }, 1000);
-        });
-    }
-
-    stop() {
-        if (this.childProcess) {
-            this.childProcess.kill("SIGINT");
-            this.childProcess = null;
-        }
-    }
-
-    initDB() {
-        if (!fs.existsSync(this.mariadbDataDir)) {
-            log.info("mariadb", `Embedded MariaDB: ${this.mariadbDataDir} is not found, create one now.`);
-            fs.mkdirSync(this.mariadbDataDir, {
-                recursive: true,
-            });
-
-            let result = childProcess.spawnSync("mysql_install_db", [
-                "--user=node",
-                "--ldata=" + this.mariadbDataDir,
-            ]);
-
-            if (result.status !== 0) {
-                let error = result.stderr.toString("utf-8");
-                log.error("mariadb", error);
-                return;
-            } else {
-                log.info("mariadb", "Embedded MariaDB: mysql_install_db done:" + result.stdout.toString("utf-8"));
-            }
-        }
-
-        if (!fs.existsSync(this.runDir)) {
-            log.info("mariadb", `Embedded MariaDB: ${this.runDir} is not found, create one now.`);
-            fs.mkdirSync(this.runDir, {
-                recursive: true,
-            });
-        }
-
-    }
-
-    async initDBAfterStarted() {
-        const connection = mysql.createConnection({
-            socketPath: this.socketPath,
-            user: "node",
-        });
-
-        let result = await connection.execute("CREATE DATABASE IF NOT EXISTS `kuma`");
-        log.debug("mariadb", "CREATE DATABASE: " + JSON.stringify(result));
-
-        log.info("mariadb", "Embedded MariaDB is ready for connections");
-        this.started = true;
-    }
-
-}
-
-module.exports = {
-    EmbeddedMariaDB,
-};

server/google-analytics.js

@@ -3,8 +3,8 @@ const jsesc = require("jsesc");
 /**
  * Returns a string that represents the javascript that is required to insert the Google Analytics scripts
  * into a webpage.
- * @param {string} tagId Google UA/G/AW/DC Property ID to use with the Google Analytics script.
- * @returns {string} HTML script tags to inject into page
+ * @param tagId Google UA/G/AW/DC Property ID to use with the Google Analytics script.
+ * @returns {string}
  */
 function getGoogleAnalyticsScript(tagId) {
     let escapedTagId = jsesc(tagId, { isScriptContext: true });

server/image-data-uri.js

@@ -10,7 +10,7 @@ let ImageDataURI = (() => {
     /**
      * Decode the data:image/ URI
      * @param {string} dataURI data:image/ URI to decode
-     * @returns {?object} An object with properties "imageType" and "dataBase64".
+     * @returns {?Object} An object with properties "imageType" and "dataBase64".
      * The former is the image type, e.g., "png", and the latter is a base64
      * encoded string of the image's binary data. If it fails to parse, returns
      * null instead of an object.
@@ -52,8 +52,8 @@ let ImageDataURI = (() => {
     /**
      * Write data URI to file
      * @param {string} dataURI data:image/ URI
-     * @param {string} filePath Path to write file to
-     * @returns {Promise<string|void>} Write file error
+     * @param {string} [filePath] Path to write file to
+     * @returns {Promise<string>}
      */
     function outputFile(dataURI, filePath) {
         filePath = filePath || "./";

server/jobs.js

@@ -39,10 +39,7 @@ const initBackgroundJobs = async function () {
 
 };
 
-/**
- * Stop all background jobs if running
- * @returns {void}
- */
+/** Stop all background jobs if running */
 const stopBackgroundJobs = function () {
     for (const job of jobs) {
         if (job.croner) {

server/jobs/clear-old-data.js

@@ -1,13 +1,12 @@
 const { R } = require("redbean-node");
 const { log } = require("../../src/util");
 const { setSetting, setting } = require("../util-server");
-const Database = require("../database");
 
 const DEFAULT_KEEP_PERIOD = 180;
 
 /**
  * Clears old data from the heartbeat table of the database.
- * @returns {Promise<void>} A promise that resolves when the data has been cleared.
+ * @return {Promise<void>} A promise that resolves when the data has been cleared.
  */
 
 const clearOldData = async () => {
@@ -35,12 +34,10 @@ const clearOldData = async () => {
 
         log.debug("clearOldData", `Clearing Data older than ${parsedPeriod} days...`);
 
-        const sqlHourOffset = Database.sqlHourOffset();
-
         try {
             await R.exec(
-                "DELETE FROM heartbeat WHERE time < " + sqlHourOffset,
-                [ parsedPeriod * -24 ]
+                "DELETE FROM heartbeat WHERE time < DATETIME('now', '-' || ? || ' days') ",
+                [ parsedPeriod ]
             );
 
             await R.exec("PRAGMA optimize;");

server/jobs/incremental-vacuum.js

@@ -1,19 +1,13 @@
 const { R } = require("redbean-node");
 const { log } = require("../../src/util");
-const Database = require("../database");
 
 /**
  * Run incremental_vacuum and checkpoint the WAL.
- * @returns {Promise<void>} A promise that resolves when the process is finished.
+ * @return {Promise<void>} A promise that resolves when the process is finished.
  */
 
 const incrementalVacuum = async () => {
     try {
-        if (Database.dbConfig.type !== "sqlite") {
-            log.debug("incrementalVacuum", "Skipping incremental_vacuum, not using SQLite.");
-            return;
-        }
-
         log.debug("incrementalVacuum", "Running incremental_vacuum and wal_checkpoint(PASSIVE)...");
         await R.exec("PRAGMA incremental_vacuum(200)");
         await R.exec("PRAGMA wal_checkpoint(PASSIVE)");

server/model/api_key.js

@@ -19,7 +19,7 @@ class APIKey extends BeanModel {
 
     /**
      * Returns an object that ready to parse to JSON
-     * @returns {object} Object ready to parse
+     * @returns {Object}
      */
     toJSON() {
         return {
@@ -37,7 +37,7 @@ class APIKey extends BeanModel {
     /**
      * Returns an object that ready to parse to JSON with sensitive fields
      * removed
-     * @returns {object} Object ready to parse
+     * @returns {Object}
      */
     toPublicJSON() {
         return {
@@ -53,9 +53,9 @@ class APIKey extends BeanModel {
 
     /**
      * Create a new API Key and store it in the database
-     * @param {object} key Object sent by client
+     * @param {Object} key Object sent by client
      * @param {int} userID ID of socket user
-     * @returns {Promise<bean>} API key
+     * @returns {Promise<bean>}
      */
     static async save(key, userID) {
         let bean;

server/model/docker_host.js

@@ -3,7 +3,7 @@ const { BeanModel } = require("redbean-node/dist/bean-model");
 class DockerHost extends BeanModel {
     /**
      * Returns an object that ready to parse to JSON
-     * @returns {object} Object ready to parse
+     * @returns {Object}
      */
     toJSON() {
         return {

server/model/group.js

@@ -4,12 +4,10 @@ const { R } = require("redbean-node");
 class Group extends BeanModel {
 
     /**
-     * Return an object that ready to parse to JSON for public Only show
-     * necessary data to public
-     * @param {boolean} showTags Should the JSON include monitor tags
-     * @param {boolean} certExpiry Should JSON include info about
-     * certificate expiry?
-     * @returns {object} Object ready to parse
+     * Return an object that ready to parse to JSON for public
+     * Only show necessary data to public
+     * @param {boolean} [showTags=false] Should the JSON include monitor tags
+     * @returns {Object}
      */
     async toPublicJSON(showTags = false, certExpiry = false) {
         let monitorBeanList = await this.getMonitorList();
@@ -29,7 +27,7 @@ class Group extends BeanModel {
 
     /**
      * Get all monitors
-     * @returns {Bean[]} List of monitors
+     * @returns {Bean[]}
      */
     async getMonitorList() {
         return R.convertToBeans("monitor", await R.getAll(`

server/model/heartbeat.js

@@ -12,7 +12,7 @@ class Heartbeat extends BeanModel {
     /**
      * Return an object that ready to parse to JSON for public
      * Only show necessary data to public
-     * @returns {object} Object ready to parse
+     * @returns {Object}
      */
     toPublicJSON() {
         return {
@@ -25,7 +25,7 @@ class Heartbeat extends BeanModel {
 
     /**
      * Return an object that ready to parse to JSON
-     * @returns {object} Object ready to parse
+     * @returns {Object}
      */
     toJSON() {
         return {

server/model/incident.js

@@ -5,7 +5,7 @@ class Incident extends BeanModel {
     /**
      * Return an object that ready to parse to JSON for public
      * Only show necessary data to public
-     * @returns {object} Object ready to parse
+     * @returns {Object}
      */
     toPublicJSON() {
         return {

server/model/maintenance.js

@@ -11,7 +11,7 @@ class Maintenance extends BeanModel {
     /**
      * Return an object that ready to parse to JSON for public
      * Only show necessary data to public
-     * @returns {object} Object ready to parse
+     * @returns {Object}
      */
     async toPublicJSON() {
 
@@ -98,7 +98,7 @@ class Maintenance extends BeanModel {
     /**
      * Return an object that ready to parse to JSON
      * @param {string} timezone If not specified, the timeRange will be in UTC
-     * @returns {object} Object ready to parse
+     * @returns {Object}
      */
     async toJSON(timezone = null) {
         return this.toPublicJSON(timezone);
@@ -142,7 +142,7 @@ class Maintenance extends BeanModel {
     /**
      * Convert data from socket to bean
      * @param {Bean} bean Bean to fill in
-     * @param {object} obj Data to fill bean with
+     * @param {Object} obj Data to fill bean with
      * @returns {Bean} Filled bean
      */
     static async jsonToBean(bean, obj) {
@@ -188,7 +188,7 @@ class Maintenance extends BeanModel {
 
     /**
      * Throw error if cron is invalid
-     * @param {string|Date} cron Pattern or date
+     * @param cron
      * @returns {Promise<void>}
      */
     static async validateCron(cron) {
@@ -198,8 +198,6 @@ class Maintenance extends BeanModel {
 
     /**
      * Run the cron
-     * @param {boolean} throwError Should an error be thrown on failure
-     * @returns {Promise<void>}
      */
     async run(throwError = false) {
         if (this.beanMeta.job) {
@@ -292,10 +290,6 @@ class Maintenance extends BeanModel {
         }
     }
 
-    /**
-     * Get timeslots where maintenance is running
-     * @returns {object|null} Maintenance time slot
-     */
     getRunningTimeslot() {
         let start = dayjs(this.beanMeta.job.nextRun(dayjs().add(-this.duration, "second").toDate()));
         let end = start.add(this.duration, "second");
@@ -311,10 +305,6 @@ class Maintenance extends BeanModel {
         }
     }
 
-    /**
-     * Stop the maintenance
-     * @returns {void}
-     */
     stop() {
         if (this.beanMeta.job) {
             this.beanMeta.job.stop();
@@ -322,18 +312,10 @@ class Maintenance extends BeanModel {
         }
     }
 
-    /**
-     * Is this maintenance currently active
-     * @returns {boolean} The maintenance is active?
-     */
     async isUnderMaintenance() {
         return (await this.getStatus()) === "under-maintenance";
     }
 
-    /**
-     * Get the timezone of the maintenance
-     * @returns {string} timezone
-     */
     async getTimezone() {
         if (!this.timezone || this.timezone === "SAME_AS_SERVER") {
             return await UptimeKumaServer.getInstance().getTimezone();
@@ -341,18 +323,10 @@ class Maintenance extends BeanModel {
         return this.timezone;
     }
 
-    /**
-     * Get offset for timezone
-     * @returns {string} offset
-     */
     async getTimezoneOffset() {
         return dayjs.tz(dayjs(), await this.getTimezone()).format("Z");
     }
 
-    /**
-     * Get the current status of the maintenance
-     * @returns {string} Current status
-     */
     async getStatus() {
         if (!this.active) {
             return "inactive";

server/model/monitor.js

@@ -3,10 +3,10 @@ const dayjs = require("dayjs");
 const axios = require("axios");
 const { Prometheus } = require("../prometheus");
 const { log, UP, DOWN, PENDING, MAINTENANCE, flipStatus, TimeLogger, MAX_INTERVAL_SECOND, MIN_INTERVAL_SECOND,
-    SQL_DATETIME_FORMAT
+    SQL_DATETIME_FORMAT, isDev, sleep, getRandomInt
 } = require("../../src/util");
 const { tcping, ping, dnsResolve, checkCertificate, checkStatusCode, getTotalClientInRoom, setting, mssqlQuery, postgresQuery, mysqlQuery, mqttAsync, setSetting, httpNtlm, radius, grpcQuery,
-    redisPingAsync, mongodbPing, kafkaProducerAsync, getOidcTokenClientCredentials,
+    redisPingAsync, mongodbPing, kafkaProducerAsync, getOidcTokenClientCredentials, rootCertificatesFingerprints, axiosAbortSignal
 } = require("../util-server");
 const { R } = require("redbean-node");
 const { BeanModel } = require("redbean-node/dist/bean-model");
@@ -22,7 +22,8 @@ const { UptimeCacheList } = require("../uptime-cache-list");
 const Gamedig = require("gamedig");
 const jsonata = require("jsonata");
 const jwt = require("jsonwebtoken");
-const Database = require("../database");
+
+const rootCertificates = rootCertificatesFingerprints();
 
 /**
  * status:
@@ -34,12 +35,9 @@ const Database = require("../database");
 class Monitor extends BeanModel {
 
     /**
-     * Return an object that ready to parse to JSON for public Only show
-     * necessary data to public
-     * @param {boolean} showTags Include tags in JSON
-     * @param {boolean} certExpiry Include certificate expiry info in
-     * JSON
-     * @returns {object} Object ready to parse
+     * Return an object that ready to parse to JSON for public
+     * Only show necessary data to public
+     * @returns {Object}
      */
     async toPublicJSON(showTags = false, certExpiry = false) {
         let obj = {
@@ -57,7 +55,7 @@ class Monitor extends BeanModel {
             obj.tags = await this.getTags();
         }
 
-        if (certExpiry && this.type === "http") {
+        if (certExpiry && (this.type === "http" || this.type === "keyword" || this.type === "json-query") && this.getURLProtocol() === "https:") {
             const { certExpiryDaysRemaining, validCert } = await this.getCertExpiry(this.id);
             obj.certExpiryDaysRemaining = certExpiryDaysRemaining;
             obj.validCert = validCert;
@@ -68,9 +66,7 @@ class Monitor extends BeanModel {
 
     /**
      * Return an object that ready to parse to JSON
-     * @param {boolean} includeSensitiveData Include sensitive data in
-     * JSON
-     * @returns {object} Object ready to parse
+     * @returns {Object}
      */
     async toJSON(includeSensitiveData = true) {
 
@@ -147,8 +143,8 @@ class Monitor extends BeanModel {
             expectedValue: this.expectedValue,
             kafkaProducerTopic: this.kafkaProducerTopic,
             kafkaProducerBrokers: JSON.parse(this.kafkaProducerBrokers),
-            kafkaProducerSsl: this.kafkaProducerSsl === "1" && true || false,
-            kafkaProducerAllowAutoTopicCreation: this.kafkaProducerAllowAutoTopicCreation === "1" && true || false,
+            kafkaProducerSsl: this.getKafkaProducerSsl(),
+            kafkaProducerAllowAutoTopicCreation: this.getKafkaProducerAllowAutoTopicCreation(),
             kafkaProducerMessage: this.kafkaProducerMessage,
             screenshot,
         };
@@ -188,9 +184,9 @@ class Monitor extends BeanModel {
     }
 
     /**
-     * Checks if the monitor is active based on itself and its parents
-     * @returns {Promise<boolean>} Is the monitor active?
-     */
+	 * Checks if the monitor is active based on itself and its parents
+	 * @returns {Promise<Boolean>}
+	 */
     async isActive() {
         const parentActive = await Monitor.isParentActive(this.id);
 
@@ -199,8 +195,7 @@ class Monitor extends BeanModel {
 
     /**
      * Get all tags applied to this monitor
-     * @returns {Promise<LooseObject<any>[]>} List of tags on the
-     * monitor
+     * @returns {Promise<LooseObject<any>[]>}
      */
     async getTags() {
         return await R.getAll("SELECT mt.*, tag.name, tag.color FROM monitor_tag mt JOIN tag ON mt.tag_id = tag.id WHERE mt.monitor_id = ? ORDER BY tag.name", [ this.id ]);
@@ -209,8 +204,7 @@ class Monitor extends BeanModel {
     /**
      * Gets certificate expiry for this monitor
      * @param {number} monitorID ID of monitor to send
-     * @returns {Promise<LooseObject<any>>} Certificate expiry info for
-     * monitor
+     * @returns {Promise<LooseObject<any>>}
      */
     async getCertExpiry(monitorID) {
         let tlsInfoBean = await R.findOne("monitor_tls_info", "monitor_id = ?", [
@@ -235,9 +229,7 @@ class Monitor extends BeanModel {
     /**
      * Encode user and password to Base64 encoding
      * for HTTP "basic" auth, as per RFC-7617
-     * @param {string} user Username to encode
-     * @param {string} pass Password to encode
-     * @returns {string} Encoded username:password
+     * @returns {string}
      */
     encodeBase64(user, pass) {
         return Buffer.from(user + ":" + pass).toString("base64");
@@ -245,7 +237,7 @@ class Monitor extends BeanModel {
 
     /**
      * Is the TLS expiry notification enabled?
-     * @returns {boolean} Enabled?
+     * @returns {boolean}
      */
     isEnabledExpiryNotification() {
         return Boolean(this.expiryNotification);
@@ -253,7 +245,7 @@ class Monitor extends BeanModel {
 
     /**
      * Parse to boolean
-     * @returns {boolean} Should TLS errors be ignored?
+     * @returns {boolean}
      */
     getIgnoreTls() {
         return Boolean(this.ignoreTls);
@@ -261,7 +253,7 @@ class Monitor extends BeanModel {
 
     /**
      * Parse to boolean
-     * @returns {boolean} Is the monitor in upside down mode?
+     * @returns {boolean}
      */
     isUpsideDown() {
         return Boolean(this.upsideDown);
@@ -269,7 +261,7 @@ class Monitor extends BeanModel {
 
     /**
      * Parse to boolean
-     * @returns {boolean} Invert keyword match?
+     * @returns {boolean}
      */
     isInvertKeyword() {
         return Boolean(this.invertKeyword);
@@ -277,7 +269,7 @@ class Monitor extends BeanModel {
 
     /**
      * Parse to boolean
-     * @returns {boolean} Enable TLS for gRPC?
+     * @returns {boolean}
      */
     getGrpcEnableTls() {
         return Boolean(this.grpcEnableTls);
@@ -285,7 +277,7 @@ class Monitor extends BeanModel {
 
     /**
      * Get accepted status codes
-     * @returns {object} Accepted status codes
+     * @returns {Object}
      */
     getAcceptedStatuscodes() {
         return JSON.parse(this.accepted_statuscodes_json);
@@ -295,10 +287,25 @@ class Monitor extends BeanModel {
         return Boolean(this.gamedigGivenPortOnly);
     }
 
+    /**
+     * Parse to boolean
+     * @returns {boolean} Kafka Producer Ssl enabled?
+     */
+    getKafkaProducerSsl() {
+        return Boolean(this.kafkaProducerSsl);
+    }
+
+    /**
+     * Parse to boolean
+     * @returns {boolean} Kafka Producer Allow Auto Topic Creation Enabled?
+     */
+    getKafkaProducerAllowAutoTopicCreation() {
+        return Boolean(this.kafkaProducerAllowAutoTopicCreation);
+    }
+
     /**
      * Start monitor
      * @param {Server} io Socket server instance
-     * @returns {void}
      */
     start(io) {
         let previousBeat = null;
@@ -321,6 +328,16 @@ class Monitor extends BeanModel {
                 }
             }
 
+            // Evil
+            if (isDev) {
+                if (process.env.EVIL_RANDOM_MONITOR_SLEEP === "SURE") {
+                    if (getRandomInt(0, 100) === 0) {
+                        log.debug("evil", `[${this.name}] Evil mode: Random sleep: ` + beatInterval * 10000);
+                        await sleep(beatInterval * 10000);
+                    }
+                }
+            }
+
             // Expose here for prometheus update
             // undefined if not https
             let tlsInfo = undefined;
@@ -350,6 +367,12 @@ class Monitor extends BeanModel {
                 bean.duration = 0;
             }
 
+            // Runtime patch timeout if it is 0
+            // See https://github.com/louislam/uptime-kuma/pull/3961#issuecomment-1804149144
+            if (!this.timeout || this.timeout <= 0) {
+                this.timeout = this.interval * 1000 * 0.8;
+            }
+
             try {
                 if (await Monitor.isUnderMaintenance(this.id)) {
                     bean.msg = "Monitor under maintenance";
@@ -458,6 +481,7 @@ class Monitor extends BeanModel {
                         validateStatus: (status) => {
                             return checkStatusCode(status, this.getAcceptedStatuscodes());
                         },
+                        signal: axiosAbortSignal(this.timeout * 1000),
                     };
 
                     if (bodyValue) {
@@ -592,13 +616,13 @@ class Monitor extends BeanModel {
                     let dnsRes = await dnsResolve(this.hostname, this.dns_resolve_server, this.port, 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") {
+                    if (this.dns_resolve_type === "A" || this.dns_resolve_type === "AAAA" || this.dns_resolve_type === "TXT" || this.dns_resolve_type === "PTR") {
                         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 === "CNAME") {
+                        dnsMessage += dnsRes[0];
                     } else if (this.dns_resolve_type === "CAA") {
-                        dnsMessage = dnsRes[0].issue;
+                        dnsMessage += dnsRes[0].issue;
                     } else if (this.dns_resolve_type === "MX") {
                         dnsRes.forEach(record => {
                             dnsMessage += `Hostname: ${record.exchange} - Priority: ${record.priority} | `;
@@ -616,7 +640,7 @@ class Monitor extends BeanModel {
                         dnsMessage = dnsMessage.slice(0, -2);
                     }
 
-                    if (this.dnsLastResult !== dnsMessage) {
+                    if (this.dnsLastResult !== dnsMessage && dnsMessage !== undefined) {
                         R.exec("UPDATE `monitor` SET dns_last_result = ? WHERE id = ? ", [
                             dnsMessage,
                             this.id
@@ -715,8 +739,6 @@ class Monitor extends BeanModel {
                 } else if (this.type === "docker") {
                     log.debug("monitor", `[${this.name}] Prepare Options for Axios`);
 
-                    const dockerHost = await R.load("docker_host", this.docker_host);
-
                     const options = {
                         url: `/containers/${this.docker_container}/json`,
                         timeout: this.interval * 1000 * 0.8,
@@ -733,6 +755,12 @@ class Monitor extends BeanModel {
                         }),
                     };
 
+                    const dockerHost = await R.load("docker_host", this.docker_host);
+
+                    if (!dockerHost) {
+                        throw new Error("Failed to load docker host config");
+                    }
+
                     if (dockerHost._dockerType === "socket") {
                         options.socketPath = dockerHost._dockerDaemon;
                     } else if (dockerHost._dockerType === "tcp") {
@@ -767,7 +795,7 @@ class Monitor extends BeanModel {
                 } else if (this.type === "sqlserver") {
                     let startTime = dayjs().valueOf();
 
-                    await mssqlQuery(this.databaseConnectionString, this.databaseQuery);
+                    await mssqlQuery(this.databaseConnectionString, this.databaseQuery || "SELECT 1");
 
                     bean.msg = "";
                     bean.status = UP;
@@ -806,7 +834,7 @@ class Monitor extends BeanModel {
                 } else if (this.type === "postgres") {
                     let startTime = dayjs().valueOf();
 
-                    await postgresQuery(this.databaseConnectionString, this.databaseQuery);
+                    await postgresQuery(this.databaseConnectionString, this.databaseQuery || "SELECT 1");
 
                     bean.msg = "";
                     bean.status = UP;
@@ -814,7 +842,11 @@ class Monitor extends BeanModel {
                 } else if (this.type === "mysql") {
                     let startTime = dayjs().valueOf();
 
-                    bean.msg = await mysqlQuery(this.databaseConnectionString, this.databaseQuery);
+                    // Use `radius_password` as `password` field, since there are too many unnecessary fields
+                    // TODO: rename `radius_password` to `password` later for general use
+                    let mysqlPassword = this.radiusPassword;
+
+                    bean.msg = await mysqlQuery(this.databaseConnectionString, this.databaseQuery || "SELECT 1", mysqlPassword);
                     bean.status = UP;
                     bean.ping = dayjs().valueOf() - startTime;
                 } else if (this.type === "mongodb") {
@@ -984,19 +1016,19 @@ class Monitor extends BeanModel {
             if (! this.isStop) {
                 log.debug("monitor", `[${this.name}] SetTimeout for next check.`);
                 this.heartbeatInterval = setTimeout(safeBeat, beatInterval * 1000);
+                this.lastScheduleBeatTime = dayjs();
             } else {
                 log.info("monitor", `[${this.name}] isStop = true, no next check.`);
             }
 
         };
 
-        /**
-         * Get a heartbeat and handle errors7
-         * @returns {void}
-         */
+        /** Get a heartbeat and handle errors */
         const safeBeat = async () => {
             try {
+                this.lastStartBeatTime = dayjs();
                 await beat();
+                this.lastEndBeatTime = dayjs();
             } catch (e) {
                 console.trace(e);
                 UptimeKumaServer.errorLog(e, false);
@@ -1005,6 +1037,9 @@ class Monitor extends BeanModel {
                 if (! this.isStop) {
                     log.info("monitor", "Try to restart the monitor");
                     this.heartbeatInterval = setTimeout(safeBeat, this.interval * 1000);
+                    this.lastScheduleBeatTime = dayjs();
+                } else {
+                    log.info("monitor", "isStop = true, no next check.");
                 }
             }
         };
@@ -1021,10 +1056,10 @@ class Monitor extends BeanModel {
 
     /**
      * Make a request using axios
-     * @param {object} options Options for Axios
+     * @param {Object} options Options for Axios
      * @param {boolean} finalCall Should this be the final call i.e
-     * don't retry on failure
-     * @returns {object} Axios response
+     * don't retry on faliure
+     * @returns {Object} Axios response
      */
     async makeAxiosRequest(options, finalCall = false) {
         try {
@@ -1059,10 +1094,7 @@ class Monitor extends BeanModel {
         }
     }
 
-    /**
-     * Stop monitor
-     * @returns {void}
-     */
+    /** Stop monitor */
     stop() {
         clearTimeout(this.heartbeatInterval);
         this.isStop = true;
@@ -1072,7 +1104,7 @@ class Monitor extends BeanModel {
 
     /**
      * Get prometheus instance
-     * @returns {Prometheus|undefined} Current prometheus instance
+     * @returns {Prometheus|undefined}
      */
     getPrometheus() {
         return this.prometheus;
@@ -1082,7 +1114,7 @@ class Monitor extends BeanModel {
      * Helper Method:
      * returns URL object for further usage
      * returns null if url is invalid
-     * @returns {(null|URL)} Monitor URL
+     * @returns {(null|URL)}
      */
     getUrl() {
         try {
@@ -1092,10 +1124,23 @@ class Monitor extends BeanModel {
         }
     }
 
+    /**
+     * Example: http: or https:
+     * @returns {(null|string)}
+     */
+    getURLProtocol() {
+        const url = this.getUrl();
+        if (url) {
+            return this.getUrl().protocol;
+        } else {
+            return null;
+        }
+    }
+
     /**
      * Store TLS info to database
-     * @param {object} checkCertificateResult Certificate to update
-     * @returns {Promise<object>} Updated certificate
+     * @param checkCertificateResult
+     * @returns {Promise<Object>}
      */
     async updateTlsInfo(checkCertificateResult) {
         let tlsInfoBean = await R.findOne("monitor_tls_info", "monitor_id = ?", [
@@ -1142,7 +1187,6 @@ class Monitor extends BeanModel {
      * @param {Server} io Socket server instance
      * @param {number} monitorID ID of monitor to send
      * @param {number} userID ID of user to send to
-     * @returns {void}
      */
     static async sendStats(io, monitorID, userID) {
         const hasClients = getTotalClientInRoom(io, userID) > 0;
@@ -1160,19 +1204,14 @@ class Monitor extends BeanModel {
     /**
      * Send the average ping to user
      * @param {number} duration Hours
-     * @param {Server} io Socket instance to send data to
-     * @param {number} monitorID ID of monitor to read
-     * @param {number} userID ID of user to send data to
-     * @returns {void}
      */
     static async sendAvgPing(duration, io, monitorID, userID) {
         const timeLogger = new TimeLogger();
-        const sqlHourOffset = Database.sqlHourOffset();
 
         let avgPing = parseInt(await R.getCell(`
             SELECT AVG(ping)
             FROM heartbeat
-            WHERE time > ${sqlHourOffset}
+            WHERE time > DATETIME('now', ? || ' hours')
             AND ping IS NOT NULL
             AND monitor_id = ? `, [
             -duration,
@@ -1189,7 +1228,6 @@ class Monitor extends BeanModel {
      * @param {Server} io Socket server instance
      * @param {number} monitorID ID of monitor to send
      * @param {number} userID ID of user to send to
-     * @returns {void}
      */
     static async sendCertInfo(io, monitorID, userID) {
         let tlsInfo = await R.findOne("monitor_tls_info", "monitor_id = ?", [
@@ -1206,8 +1244,6 @@ class Monitor extends BeanModel {
      * https://www.uptrends.com/support/kb/reporting/calculation-of-uptime-and-downtime
      * @param {number} duration Hours
      * @param {number} monitorID ID of monitor to calculate
-     * @param {boolean} forceNoCache Should the uptime be recalculated?
-     * @returns {number} Uptime of monitor
      */
     static async calcUptime(duration, monitorID, forceNoCache = false) {
 
@@ -1288,7 +1324,6 @@ class Monitor extends BeanModel {
      * @param {Server} io Socket server instance
      * @param {number} monitorID ID of monitor to send
      * @param {number} userID ID of user to send to
-     * @returns {void}
      */
     static async sendUptime(duration, io, monitorID, userID) {
         const uptime = await this.calcUptime(duration, monitorID);
@@ -1363,7 +1398,6 @@ class Monitor extends BeanModel {
      * @param {boolean} isFirstBeat Is this beat the first of this monitor?
      * @param {Monitor} monitor The monitor to send a notificaton about
      * @param {Bean} bean Status information about monitor
-     * @returns {void}
      */
     static async sendNotification(isFirstBeat, monitor, bean) {
         if (!isFirstBeat || bean.status === DOWN) {
@@ -1404,7 +1438,7 @@ class Monitor extends BeanModel {
     /**
      * Get list of notification providers for a given monitor
      * @param {Monitor} monitor Monitor to get notification providers for
-     * @returns {Promise<LooseObject<any>[]>} List of notifications
+     * @returns {Promise<LooseObject<any>[]>}
      */
     static async getNotificationList(monitor) {
         let notificationList = await R.getAll("SELECT notification.* FROM notification, monitor_notification WHERE monitor_id = ? AND monitor_notification.notification_id = notification.id ", [
@@ -1415,8 +1449,7 @@ class Monitor extends BeanModel {
 
     /**
      * checks certificate chain for expiring certificates
-     * @param {object} tlsInfoObject Information about certificate
-     * @returns {void}
+     * @param {Object} tlsInfoObject Information about certificate
      */
     async checkCertExpiryNotifications(tlsInfoObject) {
         if (tlsInfoObject && tlsInfoObject.certInfo && tlsInfoObject.certInfo.daysRemaining) {
@@ -1440,7 +1473,10 @@ class Monitor extends BeanModel {
                     let certInfo = tlsInfoObject.certInfo;
                     while (certInfo) {
                         let subjectCN = certInfo.subject["CN"];
-                        if (certInfo.daysRemaining > targetDays) {
+                        if (rootCertificates.has(certInfo.fingerprint256)) {
+                            log.debug("monitor", `Known root cert: ${certInfo.certType} certificate "${subjectCN}" (${certInfo.daysRemaining} days valid) on ${targetDays} deadline.`);
+                            break;
+                        } else if (certInfo.daysRemaining > targetDays) {
                             log.debug("monitor", `No need to send cert notification for ${certInfo.certType} certificate "${subjectCN}" (${certInfo.daysRemaining} days valid) on ${targetDays} deadline.`);
                         } else {
                             log.debug("monitor", `call sendCertNotificationByTargetDays for ${targetDays} deadline on certificate ${subjectCN}.`);
@@ -1503,7 +1539,7 @@ class Monitor extends BeanModel {
     /**
      * Get the status of the previous heartbeat
      * @param {number} monitorID ID of monitor to check
-     * @returns {Promise<LooseObject<any>>} Previous heartbeat
+     * @returns {Promise<LooseObject<any>>}
      */
     static async getPreviousHeartbeat(monitorID) {
         return await R.getRow(`
@@ -1517,7 +1553,7 @@ class Monitor extends BeanModel {
     /**
      * Check if monitor is under maintenance
      * @param {number} monitorID ID of monitor to check
-     * @returns {Promise<boolean>} Is the monitor under maintenance
+     * @returns {Promise<boolean>}
      */
     static async isUnderMaintenance(monitorID) {
         const maintenanceIDList = await R.getCol(`
@@ -1540,11 +1576,7 @@ class Monitor extends BeanModel {
         return false;
     }
 
-    /**
-     * Make sure monitor interval is between bounds
-     * @returns {void}
-     * @throws Interval is outside of range
-     */
+    /** Make sure monitor interval is between bounds */
     validate() {
         if (this.interval > MAX_INTERVAL_SECOND) {
             throw new Error(`Interval cannot be more than ${MAX_INTERVAL_SECOND} seconds`);
@@ -1557,7 +1589,7 @@ class Monitor extends BeanModel {
     /**
      * Gets Parent of the monitor
      * @param {number} monitorID ID of monitor to get
-     * @returns {Promise<LooseObject<any>>} Parent
+     * @returns {Promise<LooseObject<any>>}
      */
     static async getParent(monitorID) {
         return await R.getRow(`
@@ -1573,7 +1605,7 @@ class Monitor extends BeanModel {
     /**
      * Gets all Children of the monitor
      * @param {number} monitorID ID of monitor to get
-     * @returns {Promise<LooseObject<any>>} Children
+     * @returns {Promise<LooseObject<any>>}
      */
     static async getChildren(monitorID) {
         return await R.getAll(`
@@ -1586,7 +1618,7 @@ class Monitor extends BeanModel {
 
     /**
      * Gets Full Path-Name (Groups and Name)
-     * @returns {Promise<string>} Full path name of this monitor
+     * @returns {Promise<String>}
      */
     async getPathName() {
         let path = this.name;
@@ -1606,8 +1638,8 @@ class Monitor extends BeanModel {
 
     /**
      * Gets recursive all child ids
-     * @param {number} monitorID ID of the monitor to get
-     * @returns {Promise<Array>} IDs of all children
+	 * @param {number} monitorID ID of the monitor to get
+     * @returns {Promise<Array>}
      */
     static async getAllChildrenIDs(monitorID) {
         const childs = await Monitor.getChildren(monitorID);
@@ -1638,10 +1670,10 @@ class Monitor extends BeanModel {
     }
 
     /**
-     * Checks recursive if parent (ancestors) are active
-     * @param {number} monitorID ID of the monitor to get
-     * @returns {Promise<boolean>} Is the parent monitor active?
-     */
+	 * Checks recursive if parent (ancestors) are active
+	 * @param {number} monitorID ID of the monitor to get
+	 * @returns {Promise<Boolean>}
+	 */
     static async isParentActive(monitorID) {
         const parent = await Monitor.getParent(monitorID);
 

server/model/proxy.js

@@ -3,7 +3,7 @@ const { BeanModel } = require("redbean-node/dist/bean-model");
 class Proxy extends BeanModel {
     /**
      * Return an object that ready to parse to JSON
-     * @returns {object} Object ready to parse
+     * @returns {Object}
      */
     toJSON() {
         return {