WIP

.devcontainer/README.md

@@ -6,7 +6,7 @@ You can modifiy Uptime Kuma in your browser without setting up a local developme
 
 1. Click `Code` -> `Create codespace on master`
 2. Wait a few minutes until you see there are two exposed ports
-3. Go to the `3000` url, see if it is working
+3. Go to the `3000` url, see if it is working 
 
 ![image](https://github.com/louislam/uptime-kuma/assets/1336778/909b2eb4-4c5e-44e4-ac26-6d20ed856e7f)
 

.devcontainer/devcontainer.json

@@ -13,10 +13,9 @@
     "customizations": {
         "vscode": {
             "extensions": [
-				"streetsidesoftware.code-spell-checker",
-				"dbaeumer.vscode-eslint",
-				"GitHub.copilot-chat"
-			]
+                "streetsidesoftware.code-spell-checker",
+                "dbaeumer.vscode-eslint"
+            ]
         }
     },
     "forwardPorts": [3000, 3001]

.dockerignore

@@ -30,15 +30,11 @@ SECURITY.md
 tsconfig.json
 .env
 /tmp
+/babel.config.js
 /ecosystem.config.js
 /extra/healthcheck.exe
 /extra/healthcheck
-/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
+extra/exe-builder
 
 
 ### .gitignore content (commented rules are duplicated)

.eslintrc.js

@@ -1,7 +1,6 @@
 module.exports = {
     ignorePatterns: [
-        "test/*.js",
-        "test/cypress",
+        "test/*",
         "server/modules/apicache/*",
         "src/util.js"
     ],
@@ -19,13 +18,12 @@ module.exports = {
     ],
     parser: "vue-eslint-parser",
     parserOptions: {
-        parser: "@typescript-eslint/parser",
+        parser: "@babel/eslint-parser",
         sourceType: "module",
         requireConfigFile: false,
     },
     plugins: [
-        "jsdoc",
-        "@typescript-eslint",
+        "jsdoc"
     ],
     rules: {
         "yoda": "error",
@@ -77,14 +75,14 @@ module.exports = {
         "no-var": "error",
         "key-spacing": "warn",
         "keyword-spacing": "warn",
-        "space-infix-ops": "error",
+        "space-infix-ops": "warn",
         "arrow-spacing": "warn",
         "no-trailing-spaces": "error",
         "no-constant-condition": [ "error", {
             "checkLoops": false,
         }],
         "space-before-blocks": "warn",
-        //"no-console": "warn",
+        //'no-console': 'warn',
         "no-extra-boolean-cast": "off",
         "no-multiple-empty-lines": [ "warn", {
             "max": 1,
@@ -96,8 +94,7 @@ module.exports = {
         "no-unneeded-ternary": "error",
         "array-bracket-newline": [ "error", "consistent" ],
         "eol-last": [ "error", "always" ],
-        //"prefer-template": "error",
-        "template-curly-spacing": [ "warn", "never" ],
+        //'prefer-template': 'error',
         "comma-dangle": [ "warn", "only-multiline" ],
         "no-empty": [ "error", {
             "allowEmptyCatch": true
@@ -150,20 +147,21 @@ module.exports = {
             }
         },
 
-        // Override for TypeScript
+        // Override for jest puppeteer
         {
             "files": [
-                "**/*.ts",
+                "**/*.spec.js",
+                "**/*.spec.jsx"
             ],
-            extends: [
-                "plugin:@typescript-eslint/recommended",
-            ],
-            "rules": {
-                "jsdoc/require-returns-type": "off",
-                "jsdoc/require-param-type": "off",
-                "@typescript-eslint/no-explicit-any": "off",
-                "prefer-const": "off",
-            }
+            env: {
+                jest: true,
+            },
+            globals: {
+                page: true,
+                browser: true,
+                context: true,
+                jestPuppeteer: true,
+            },
         }
     ]
 };

.github/ISSUE_TEMPLATE/security.md

@@ -12,6 +12,8 @@ labels:
 
 DO NOT PROVIDE ANY DETAILS HERE. Please privately report to https://github.com/louislam/uptime-kuma/security/advisories/new.
 
+
 Why need this issue? It is because GitHub Advisory do not send a notification to @louislam, it is a workaround to do so.
 
 Your GitHub Advisory URL:
+

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,7 +1,7 @@
 ⚠️⚠️⚠️ Since we do not accept all types of pull requests and do not want to waste your time. Please be sure that you have read pull request rules:
 https://github.com/louislam/uptime-kuma/blob/master/CONTRIBUTING.md#can-i-create-a-pull-request-for-uptime-kuma
 
-Tick the checkbox if you understand [x]:
+Tick the checkbox if you understand [x]: 
 - [ ] I have read and understand the pull request rules.
 
 # Description
@@ -15,7 +15,7 @@ Please delete any options that are not relevant.
 - Bug fix (non-breaking change which fixes an issue)
 - User interface (UI)
 - New feature (non-breaking change which adds functionality)
-- Breaking change (a fix or feature that would cause existing functionality to not work as expected)
+- Breaking change (fix or feature that would cause existing functionality to not work as expected)
 - Other
 - This change requires a documentation update
 
@@ -24,8 +24,9 @@ Please delete any options that are not relevant.
 - [ ] My code follows the style guidelines of this project
 - [ ] I ran ESLint and other linters for modified files
 - [ ] I have performed a self-review of my own code and tested it
-- [ ] I have commented my code, particularly in hard-to-understand areas (including JSDoc for methods)
-- [ ] My changes generates no new warnings
+- [ ] I have commented my code, particularly in hard-to-understand areas
+  (including JSDoc for methods)
+- [ ] My changes generate no new warnings
 - [ ] My code needed automated testing. I have added them (this is optional task)
 
 ## Screenshots (if any)

.github/workflows/auto-test.yml

@@ -5,38 +5,38 @@ name: Auto Test
 
 on:
   push:
-    branches: [ master, 1.23.X ]
+    branches: [ master ]
     paths-ignore:
       - '*.md'
   pull_request:
-    branches: [ master, 1.23.X ]
+    branches: [ master, 2.0.X ]
     paths-ignore:
       - '*.md'
 
 jobs:
   auto-test:
-    needs: [ check-linters, e2e-test ]
+    needs: [ check-linters ]
     runs-on: ${{ matrix.os }}
     timeout-minutes: 15
 
     strategy:
       matrix:
         os: [macos-latest, ubuntu-latest, windows-latest, ARM64]
-        node: [ 14, 20.5 ]
+        node: [ 14, 20 ]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:
     - run: git config --global core.autocrlf false  # Mainly for Windows
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
 
     - name: Use Node.js ${{ matrix.node }}
-      uses: actions/setup-node@v4
+      uses: actions/setup-node@v3
       with:
         node-version: ${{ matrix.node }}
-    - run: npm install npm@9 -g
+    - run: npm install npm@latest -g
     - run: npm install
     - run: npm run build
-    - run: npm run test-backend
+    - run: npm test
       env:
         HEADLESS_TEST: 1
         JUST_FOR_TEST: ${{ secrets.JUST_FOR_TEST }}
@@ -55,13 +55,13 @@ jobs:
 
     steps:
       - run: git config --global core.autocrlf false  # Mainly for Windows
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
 
       - name: Use Node.js ${{ matrix.node }}
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node }}
-      - run: npm install npm@9 -g
+      - run: npm install npm@latest -g
       - run: npm ci --production
 
   check-linters:
@@ -69,27 +69,42 @@ jobs:
 
     steps:
     - run: git config --global core.autocrlf false  # Mainly for Windows
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
 
     - name: Use Node.js 20
-      uses: actions/setup-node@v4
+      uses: actions/setup-node@v3
       with:
         node-version: 20
     - run: npm install
-    - run: npm run lint:prod
+    - run: npm run lint
 
-  e2e-test:
+# TODO: Temporarily disable, as it cannot pass the test in 2.0.0 yet
+#  e2e-tests:
+#    needs: [ check-linters ]
+#    runs-on: ubuntu-latest
+#    steps:
+#    - run: git config --global core.autocrlf false  # Mainly for Windows
+#    - uses: actions/checkout@v3
+#
+#    - name: Use Node.js 14
+#      uses: actions/setup-node@v3
+#      with:
+#        node-version: 14
+#    - run: npm install
+#    - run: npm run build
+#    - run: npm run cy:test
+
+  frontend-unit-tests:
     needs: [ check-linters ]
-    runs-on: ARM64
+    runs-on: ubuntu-latest
     steps:
     - run: git config --global core.autocrlf false  # Mainly for Windows
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
 
-    - name: Use Node.js 20
-      uses: actions/setup-node@v4
+    - name: Use Node.js 14
+      uses: actions/setup-node@v3
       with:
-        node-version: 20
+        node-version: 14
     - run: npm install
-    - run: npx playwright install
     - run: npm run build
-    - run: npm run test-e2e
+    - run: npm run cy:run:unit

.github/workflows/close-incorrect-issue.yml

@@ -14,10 +14,10 @@ jobs:
         node-version: [16]
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
 
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v4
+      uses: actions/setup-node@v3
       with:
         node-version: ${{ matrix.node-version }}
         cache: 'npm'

.github/workflows/codeql-analysis.yml

@@ -1,43 +0,0 @@
-name: "CodeQL"
-
-on:
-  push:
-    branches: [ "master", "1.23.X"]
-  pull_request:
-    branches: [ "master", "1.23.X"]
-  schedule:
-    - cron: '16 22 * * 0'
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-    timeout-minutes: 360
-
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [ 'go', 'javascript-typescript' ]
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v3
-
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
-      with:
-        languages: ${{ matrix.language }}
-
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
-      with:
-        category: "/language:${{matrix.language}}"

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

@@ -6,7 +6,7 @@ on:
   pull_request:
     branches:
       - master
-      - 1.23.X
+      - 2.0.X
   workflow_dispatch:
 
 permissions:
@@ -17,11 +17,11 @@ jobs:
   json-yaml-validate:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
 
       - name: json-yaml-validate
         id: json-yaml-validate
-        uses: GrantBirki/json-yaml-validate@v2.4.0
+        uses: GrantBirki/json-yaml-validate@v1.3.0
         with:
           comment: "true" # enable comment mode
           exclude_file: ".github/config/exclude.txt" # gitignore style file for exclusions

.github/workflows/prevent-file-change.yml

@@ -1,17 +0,0 @@
-name: prevent-file-change
-
-on:
-  pull_request:
-
-jobs:
-  check-file-changes:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Prevent file change
-        uses: xalvarez/prevent-file-change-action@v1
-        with:
-          githubToken: ${{ secrets.GITHUB_TOKEN }}
-          # Regex, /src/lang/*.json is not allowed to be changed, except for /src/lang/en.json
-          pattern: '^(?!src/lang/en\.json$)src/lang/.*\.json$'
-          trustedAuthors: UptimeKumaBot
-

.github/workflows/stale-bot.yml

@@ -1,4 +1,4 @@
-name: 'Automatically close stale issues'
+name: 'Automatically close stale issues and PRs'
 on:
   workflow_dispatch:
   schedule:
@@ -9,14 +9,14 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v8
+      - uses: actions/stale@v7
         with:
           stale-issue-message: 'We are clearing up our old issues and your ticket has been open for 3 months with no activity. Remove stale label or comment or this will be closed in 2 days.'
           close-issue-message: 'This issue was closed because it has been stalled for 2 days with no activity.'
           days-before-stale: 90
           days-before-close: 2
-          days-before-pr-stale: -1
-          days-before-pr-close: -1
+          days-before-pr-stale: 999999999
+          days-before-pr-close: 1
           exempt-issue-labels: 'News,Medium,High,discussion,bug,doc,feature-request'
           exempt-issue-assignees: 'louislam'
           operations-per-run: 200

.gitignore

@@ -15,6 +15,9 @@ dist-ssr
 /tmp
 .env
 
+cypress/videos
+cypress/screenshots
+
 /extra/healthcheck.exe
 /extra/healthcheck
 /extra/healthcheck-armv7

CONTRIBUTING.md

@@ -1,14 +1,14 @@
 # Project Info
 
-First of all, I want to thank everyone who have 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.
+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 the 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 server part. Both frontend and backend share the same package.json.
 
-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.
+The frontend code build into "dist" directory. The server (express.js) exposes the "dist" directory as root of the endpoint. This is how production is working.
 
 ## Key Technical Skills
 
-- Node.js (You should know about promises, async/await, arrow functions, etc.)
+- Node.js (You should know what are promise, async/await and arrow function etc.)
 - Socket.io
 - SCSS
 - Vue.js
@@ -30,31 +30,28 @@ The frontend code builds into "dist" directory. The server (express.js) exposes
 
 ## 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 if 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 it will be merged or not.
 
 Here are some references:
 
-### ✅ Usually accepted
-
+### ✅ Usually accepted:
 - Bug fix
 - Security fix
 - Adding notification providers
 - Adding new language files (see [these instructions](https://github.com/louislam/uptime-kuma/blob/master/src/lang/README.md))
 - Adding new language keys: `$t("...")`
 
-### ⚠️ Discussion required
-
+### ⚠️ Discussion required:
 - Large pull requests
 - 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
+### ❌ 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
 - Any breaking changes
 - Duplicated pull requests
 - Buggy
-- UI/UX is not close to Uptime Kuma
+- UI/UX is not close to Uptime Kuma 
 - Modifications or deletions of existing logic without a valid reason.
 - Adding functions that is completely out of scope
 - Converting existing code into other programming languages
@@ -62,33 +59,35 @@ Here are some references:
 
 The above cases may not cover all possible situations.
 
-I ([@louislam](https://github.com/louislam)) have the final say. If your pull request does not meet my expectations, I will reject it, no matter how much time you spent on it. Therefore, it is essential to have a discussion beforehand.
+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 assign your pull request to a [milestone](https://github.com/louislam/uptime-kuma/milestones), if I plan to review and merge it.
+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.
+
+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
 
 Before deep into coding, discussion first is preferred. Creating an empty pull request for discussion would be recommended.
 
 1. Fork the project
-2. Clone your fork repo to local
-3. Create a new branch
-4. Create an empty commit: `git commit -m "<YOUR TASK NAME>" --allow-empty`
-5. Push to your fork repo
-6. Prepare a pull request: https://github.com/louislam/uptime-kuma/compare
-7. Write a proper description. You can mention @louislam in it, so @louislam will get the notification.
-8. Create your pull request as a Draft
-9. Wait for the discussion
+1. Clone your fork repo to local
+1. Create a new branch
+1. Create an empty commit
+   `git commit -m "[empty commit] pull request for <YOUR TASK NAME>" --allow-empty`
+1. Push to your fork repo
+1. Create a pull request: https://github.com/louislam/uptime-kuma/compare
+1. Write a proper description
+1. Click "Change to draft"
+1. Discussion
 
 ## 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 will 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 could 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, and 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, 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 variables are discouraged, unless it is related to startup such as `DATA_DIR`
+- Settings should be configurable in the frontend. Environment variable is not encouraged, unless it is related to startup such as `DATA_DIR`
 - Easy to use
 - The web UI styling should be consistent and nice
 
@@ -113,18 +112,6 @@ I personally do not like something that requires so many configurations before y
 - IDE that supports [`ESLint`](https://eslint.org/) and EditorConfig (I am using [`IntelliJ IDEA`](https://www.jetbrains.com/idea/))
 - A SQLite GUI tool (f.ex. [`SQLite Expert Personal`](https://www.sqliteexpert.com/download.html) or [`DBeaver Community`](https://dbeaver.io/download/))
 
-### GitHub Codespaces
-
-If you don't want to setup an local environment, you can now develop on GitHub Codespaces, read more:
-
-https://github.com/louislam/uptime-kuma/tree/master/.devcontainer
-
-## Git Branches
-
-- `master`: 2.X.X development. If you want to add a new feature, your pull request should base on this.
-- `1.23.X`: 1.23.X development. If you want to fix a bug for v1 and v2, your pull request should base on this.
-- All other branches are unused, outdated or for dev.
-
 ## Install Dependencies for Development
 
 ```bash
@@ -143,9 +130,8 @@ Port `3000` and port `3001` will be used.
 npm run dev
 ```
 
-But sometimes, you would like to restart the server, but not the frontend, you can run these commands in two terminals:
-
-```bash
+But sometimes, you would like to keep restart the server, but not the frontend, you can run these command in two terminals:
+```
 npm run start-frontend-dev
 npm run start-server-dev
 ```
@@ -154,18 +140,19 @@ npm run start-server-dev
 
 It binds to `0.0.0.0:3001` by default.
 
+
 It is mainly a socket.io app + express.js.
 
-express.js is used for:
-
+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 the status page
+- serving internal APIs of 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)
@@ -176,9 +163,9 @@ express.js is used for:
 
 ## Frontend Dev Server
 
-It binds to `0.0.0.0:3000` by default. The frontend dev server is used for development only.
+It binds to `0.0.0.0:3000` by default. Frontend dev server is used for development only. 
 
-For production, it is not used. It will be compiled to `dist` directory instead.
+For production, it is not used. It will be compiled to `dist` directory instead. 
 
 You can use Vue.js devtools Chrome extension for debugging.
 
@@ -194,13 +181,14 @@ 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 the frontend is stored at the root level, even though you changed the current router to any other pages.
+As you can see, most data in frontend is stored in root level, even though you changed the current router to any other pages.
 
 The data and socket logic are in `src/mixins/socket.js`.
 
 ## Database Migration
 
-See: https://github.com/louislam/uptime-kuma/tree/master/db/knex_migrations
+1. Create `patch-{name}.sql` in `./db/`
+2. Add your patch filename in the `patchList` list in `./server/database.js`
 
 ## Unit Test
 
@@ -222,7 +210,7 @@ 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 the patch release version only.
+Since previously updating Vite 2.5.10 to 2.6.0 broke the application completely, from now on, it should update patch release version only.
 
 Patch release = the third digit ([Semantic Versioning](https://semver.org/))
 
@@ -230,60 +218,24 @@ If for security / bug / other reasons, a library must be updated, breaking chang
 
 ## Translations
 
-Please add **all** the strings which are translatable to `src/lang/en.json` (if translation keys are omitted, they can not be translated.)
+Please add **all** the strings which are translatable to `src/lang/en.json` (If translation keys are ommited, they can not be translated).
 
-**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.
+**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.
 
 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
 
-Since there is no way to make a pull request to the wiki, I have set up another repo to do that.
+Since there is no way to make a pull request to wiki's repo, I have set up another repo to do that.
 
 https://github.com/louislam/uptime-kuma-wiki
 
-## Docker
-
-### Arch
-
-- amd64
-- arm64
-- armv7
-
-### Docker Tags
-
-#### v2
-
-- `2`, `latest-2`: v2 with full features such as Chromium and bundled MariaDB
-- `2.x.x`
-- `2-slim`: v2 with basic features
-- `2.x.x-slim`
-- `beta2`: Latest beta build
-- `2.x.x-beta.x`
-- `nightly2`: Dev build
-- `base2`: Basic Debian setup without Uptime Kuma source code (Full features)
-- `base2-slim`: Basic Debian setup without Uptime Kuma source code
-- `pr-test2`: For testing pull request without setting up a local environment
-
-#### v1
-
-- `1`, `latest`, `1-debian`, `debian`: Latest version of v1
-- `1.x.x`, `1.x.x-debian`
-- `1.x.x-beta.x`: Beta build
-- `beta`: Latest beta build
-- `nightly`: Dev build
-- `base-debian`: Basic Debian setup without Uptime Kuma source code
-- `pr-test`: For testing pull request without setting up a local environment
-- `base-alpine`: (Deprecated) Basic Alpine setup without Uptime Kuma source code
-- `1-alpine`, `alpine`: (Deprecated)
-- `1.x.x-alpine`: (Deprecated)
-
 ## Maintainer
 
 Check the latest issues and pull requests:
@@ -294,12 +246,12 @@ https://github.com/louislam/uptime-kuma/issues?q=sort%3Aupdated-desc
 1. Draft a release note
 2. Make sure the repo is cleared
 3. If the healthcheck is updated, remember to re-compile it: `npm run build-docker-builder-go`
-4. `npm run release-final` with env vars: `VERSION` and `GITHUB_TOKEN`
-5. Wait until the `Press any key to continue`
-6. `git push`
-7. Publish the release note as 1.X.X
-8. Press any key to continue
-9. Deploy to the demo server: `npm run deploy-demo-server`
+3. `npm run release-final with env vars: `VERSION` and `GITHUB_TOKEN`
+4. Wait until the `Press any key to continue`
+5. `git push`
+6. Publish the release note as 1.X.X 
+7. Press any key to continue
+8. Deploy to the demo server: `npm run deploy-demo-server`
 
 Checking:
 
@@ -332,11 +284,3 @@ git remote add production https://github.com/louislam/uptime-kuma.wiki.git
 git pull
 git push production master
 ```
-
-## Useful Commands
-
-Change the base of a pull request such as `master` to `1.23.X`
-
-```bash
-git rebase --onto <new parent> <old parent>
-```

README.md

@@ -23,17 +23,17 @@ It is a temporary live demo, all data will be deleted after 10 minutes. Use the
 
 ## ⭐ Features
 
-- 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
-- [Multi Languages](https://github.com/louislam/uptime-kuma/tree/master/src/lang)
-- Multiple status pages
-- Map status pages to specific domains
-- Ping chart
-- Certificate info
-- Proxy support
-- 2FA support
+* 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
+* [Multi Languages](https://github.com/louislam/uptime-kuma/tree/master/src/lang)
+* Multiple status pages
+* Map status pages to specific domains
+* Ping chart
+* Certificate info
+* Proxy support
+* 2FA support
 
 ## 🔧 How to Install
 
@@ -43,27 +43,25 @@ It is a temporary live demo, all data will be deleted after 10 minutes. Use the
 docker run -d --restart=always -p 3001:3001 -v uptime-kuma:/app/data --name uptime-kuma louislam/uptime-kuma:1
 ```
 
-Uptime Kuma is now running on http://localhost:3001
+⚠️ Please use a **local volume** only. Other types such as NFS are not supported.
 
-> [!WARNING]
-> File Systems like **NFS** (Network File System) are **NOT** supported. Please map to a local directory or volume.
+Uptime Kuma is now running on http://localhost:3001
 
 ### 💪🏻 Non-Docker
 
 Requirements:
-
 - Platform
   - ✅ Major Linux distros such as Debian, Ubuntu, CentOS, Fedora and ArchLinux etc.
   - ✅ Windows 10 (x64), Windows Server 2012 R2 (x64) or higher
   - ❌ Replit / Heroku
 - [Node.js](https://nodejs.org/en/download/) 14 / 16 / 18 / 20.4
-- [npm](https://docs.npmjs.com/cli/) 9
+- [npm](https://docs.npmjs.com/cli/) >= 7
 - [Git](https://git-scm.com/downloads)
 - [pm2](https://pm2.keymetrics.io/) - For running Uptime Kuma in the background
 
 ```bash
-# Update your npm
-npm install npm@9 -g
+# Update your npm to the latest version
+npm install npm -g
 
 git clone https://github.com/louislam/uptime-kuma.git
 cd uptime-kuma
@@ -72,14 +70,15 @@ npm run setup
 # Option 1. Try it
 node server/server.js
 
-# (Recommended) Option 2. Run in the background using PM2
+# (Recommended) Option 2. Run in background using PM2
 # Install PM2 if you don't have it:
 npm install pm2 -g && pm2 install pm2-logrotate
 
 # Start Server
 pm2 start server/server.js --name uptime-kuma
-```
 
+
+```
 Uptime Kuma is now running on http://localhost:3001
 
 More useful PM2 Commands
@@ -92,6 +91,10 @@ pm2 monit
 pm2 save && pm2 startup
 ```
 
+### Windows Portable (x64)
+
+https://github.com/louislam/uptime-kuma/files/11886108/uptime-kuma-win64-portable-1.0.1.zip
+
 ### Advanced Installation
 
 If you need more options or need to browse via a reverse proxy, please read:
@@ -106,10 +109,14 @@ https://github.com/louislam/uptime-kuma/wiki/%F0%9F%86%99-How-to-Update
 
 ## 🆕 What's Next?
 
-I will assign requests/issues to the next milestone.
+I will mark requests/issues to the next milestone.
 
 https://github.com/louislam/uptime-kuma/milestones
 
+Project Plan:
+
+https://github.com/users/louislam/projects/4/views/1
+
 ## ❤️ Sponsors
 
 Thank you so much! (GitHub Sponsors will be updated manually. OpenCollective sponsors will be updated automatically, the list will be cached by GitHub though. It may need some time to be updated)
@@ -136,33 +143,29 @@ Telegram Notification Sample:
 
 ## Motivation
 
-- I was looking for a self-hosted monitoring tool like "Uptime Robot", but it is hard to find a suitable one. One of the closest ones is statping. Unfortunately, it is not stable and no longer maintained.
-- Wanted to build a fancy UI.
-- Learn Vue 3 and vite.js.
-- Show the power of Bootstrap 5.
-- Try to use WebSocket with SPA instead of a REST API.
-- Deploy my first Docker image to Docker Hub.
+* I was looking for a self-hosted monitoring tool like "Uptime Robot", but it is hard to find a suitable one. One of the close ones is statping. Unfortunately, it is not stable and no longer maintained.
+* Want to build a fancy UI.
+* Learn Vue 3 and vite.js.
+* Show the power of Bootstrap 5.
+* Try to use WebSocket with SPA instead of REST API.
+* Deploy my first Docker image to Docker Hub.
 
-If you love this project, please consider giving it a ⭐.
+If you love this project, please consider giving me a ⭐.
 
 ## 🗣️ Discussion / Ask for Help
 
-⚠️ For any general or technical questions, please don't send me an email, as I am unable to provide support in that manner. I will not respond if you ask questions there.
+⚠️ For any general or technical questions, please don't send me an email, as I am unable to provide support in that manner. I will not response if you asked such questions.
 
-I recommend using Google, GitHub Issues, or Uptime Kuma's subreddit for finding answers to your question. If you cannot find the information you need, feel free to ask:
+I recommend using Google, GitHub Issues, or Uptime Kuma's Subreddit for finding answers to your question. If you cannot find the information you need, feel free to ask:
 
 - [GitHub Issues](https://github.com/louislam/uptime-kuma/issues)
-- [Subreddit (r/UptimeKuma)](https://www.reddit.com/r/UptimeKuma/)
+- [Subreddit r/Uptime kuma](https://www.reddit.com/r/UptimeKuma/)
 
-My Reddit account: [u/louislamlam](https://reddit.com/u/louislamlam)
-You can mention me if you ask a question on the subreddit.
+My Reddit account: [u/louislamlam](https://reddit.com/u/louislamlam).  
+You can mention me if you ask a question on Reddit.
 
-## Contributions
 
-### Create Pull Requests
-
-We DO NOT accept all types of pull requests and do not want to waste your time. Please be sure that you have read and follow pull request rules:
-[CONTRIBUTING.md#can-i-create-a-pull-request-for-uptime-kuma](https://github.com/louislam/uptime-kuma/blob/master/CONTRIBUTING.md#can-i-create-a-pull-request-for-uptime-kuma)
+## Contribute
 
 ### Test Pull Requests
 
@@ -176,16 +179,15 @@ https://github.com/louislam/uptime-kuma/wiki/Test-Pull-Requests
 Check out the latest beta release here: https://github.com/louislam/uptime-kuma/releases
 
 ### Bug Reports / Feature Requests
-
 If you want to report a bug or request a new feature, feel free to open a [new issue](https://github.com/louislam/uptime-kuma/issues).
 
 ### Translations
-
 If you want to translate Uptime Kuma into your language, please visit [Weblate Readme](https://github.com/louislam/uptime-kuma/blob/master/src/lang/README.md).
 
-### Spelling & Grammar
+## 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.
 
+### Create Pull Requests
+If you want to modify Uptime Kuma, please read this guide and follow the rules here: https://github.com/louislam/uptime-kuma/blob/master/CONTRIBUTING.md

SECURITY.md

@@ -3,28 +3,28 @@
 ## Reporting a Vulnerability
 
 1. Please report security issues to https://github.com/louislam/uptime-kuma/security/advisories/new.
-2. 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
+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
 
-Do not use the public issue tracker or discuss it in public as it will cause more damage.
+Do not use the public issue tracker or discuss it in the 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 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.
+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.
 
 ## 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 latest version.
+You should use or upgrade to the latest version of Uptime Kuma. All `1.X.X` versions are upgradable to the lastest version.
 
 ### Upgradable Docker Tags
 
-| Tag | Supported |
-|-|-|
+| Tag | Supported          |
+| ------- | ------------------ |
 | 1 | :white_check_mark: |
 | 1-debian | :white_check_mark: |
 | latest | :white_check_mark: |
 | debian | :white_check_mark: |
 | 1-alpine | ⚠️ Deprecated |
 | alpine | ⚠️ Deprecated |
-| All other tags | ❌ |
+| All other tags  | ❌ |

babel.config.js

@@ -0,0 +1,7 @@
+const config = {};
+
+if (process.env.TEST_FRONTEND) {
+    config.presets = [ "@babel/preset-env" ];
+}
+
+module.exports = config;

config/playwright.config.js

@@ -1,60 +0,0 @@
-import { defineConfig, devices } from "@playwright/test";
-
-const port = 30001;
-const url = `http://localhost:${port}`;
-
-export default defineConfig({
-    // Look for test files in the "tests" directory, relative to this configuration file.
-    testDir: "../test/e2e",
-    outputDir: "../private/playwright-test-results",
-    fullyParallel: false,
-    locale: "en-US",
-
-    // Fail the build on CI if you accidentally left test.only in the source code.
-    forbidOnly: !!process.env.CI,
-
-    // Retry on CI only.
-    retries: process.env.CI ? 2 : 0,
-
-    // Opt out of parallel tests on CI.
-    workers: 1,
-
-    // Reporter to use
-    reporter: [
-        [
-            "html", {
-                outputFolder: "../private/playwright-report",
-                open: "never",
-            }
-        ],
-    ],
-
-    use: {
-        // Base URL to use in actions like `await page.goto('/')`.
-        baseURL: url,
-
-        // Collect trace when retrying the failed test.
-        trace: "on-first-retry",
-    },
-
-    // Configure projects for major browsers.
-    projects: [
-        {
-            name: "chromium",
-            use: { ...devices["Desktop Chrome"] },
-        },
-        /*
-        {
-            name: "firefox",
-            use: { browserName: "firefox" }
-        },*/
-    ],
-
-    // Run your local dev server before starting the tests.
-    webServer: {
-        command: `node extra/remove-playwright-test-data.js && node server/server.js --port=${port} --data-dir=./data/playwright-test`,
-        url,
-        reuseExistingServer: false,
-        cwd: "../",
-    },
-});

config/vite.config.js

@@ -1,7 +1,9 @@
+import legacy from "@vitejs/plugin-legacy";
 import vue from "@vitejs/plugin-vue";
 import { defineConfig } from "vite";
 import visualizer from "rollup-plugin-visualizer";
 import viteCompression from "vite-plugin-compression";
+import commonjs from "vite-plugin-commonjs";
 
 const postCssScss = require("postcss-scss");
 const postcssRTLCSS = require("postcss-rtlcss");
@@ -20,7 +22,11 @@ export default defineConfig({
         "CODESPACE_NAME": JSON.stringify(process.env.CODESPACE_NAME),
     },
     plugins: [
+        commonjs(),
         vue(),
+        legacy({
+            targets: [ "since 2015" ],
+        }),
         visualizer({
             filename: "tmp/dist-stats.html"
         }),

db/knex_init_db.js

@@ -272,10 +272,10 @@ async function createTables() {
     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);
-        table.text("config", "longtext");
     });
 
     // monitor_notification
@@ -493,11 +493,8 @@ ALTER TABLE monitor
     await knex.schema.table("monitor", function (table) {
         table.string("kafka_producer_topic", 255);
         table.text("kafka_producer_brokers");
-
-        // patch-fix-kafka-producer-booleans.sql
-        table.boolean("kafka_producer_ssl").defaultTo(0).notNullable();
-        table.boolean("kafka_producer_allow_auto_topic_creation").defaultTo(0).notNullable();
-
+        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");
     });

db/knex_migrations/2023-08-16-0000-create-uptime.js

@@ -1,41 +0,0 @@
-exports.up = function (knex) {
-    return knex.schema
-        .createTable("stat_minutely", function (table) {
-            table.increments("id");
-            table.comment("This table contains the minutely aggregate statistics for each monitor");
-            table.integer("monitor_id").unsigned().notNullable()
-                .references("id").inTable("monitor")
-                .onDelete("CASCADE")
-                .onUpdate("CASCADE");
-            table.integer("timestamp")
-                .notNullable()
-                .comment("Unix timestamp rounded down to the nearest minute");
-            table.float("ping").notNullable().comment("Average ping in milliseconds");
-            table.smallint("up").notNullable();
-            table.smallint("down").notNullable();
-
-            table.unique([ "monitor_id", "timestamp" ]);
-        })
-        .createTable("stat_daily", function (table) {
-            table.increments("id");
-            table.comment("This table contains the daily aggregate statistics for each monitor");
-            table.integer("monitor_id").unsigned().notNullable()
-                .references("id").inTable("monitor")
-                .onDelete("CASCADE")
-                .onUpdate("CASCADE");
-            table.integer("timestamp")
-                .notNullable()
-                .comment("Unix timestamp rounded down to the nearest day");
-            table.float("ping").notNullable().comment("Average ping in milliseconds");
-            table.smallint("up").notNullable();
-            table.smallint("down").notNullable();
-
-            table.unique([ "monitor_id", "timestamp" ]);
-        });
-};
-
-exports.down = function (knex) {
-    return knex.schema
-        .dropTable("stat_minutely")
-        .dropTable("stat_daily");
-};

db/knex_migrations/2023-08-18-0301-heartbeat.js

@@ -1,16 +0,0 @@
-exports.up = function (knex) {
-    // Add new column heartbeat.end_time
-    return knex.schema
-        .alterTable("heartbeat", function (table) {
-            table.datetime("end_time").nullable().defaultTo(null);
-        });
-
-};
-
-exports.down = function (knex) {
-    // Rename heartbeat.start_time to heartbeat.time
-    return knex.schema
-        .alterTable("heartbeat", function (table) {
-            table.dropColumn("end_time");
-        });
-};

db/knex_migrations/2023-09-29-0000-heartbeat-retires.js

@@ -1,15 +0,0 @@
-exports.up = function (knex) {
-    // Add new column heartbeat.retries
-    return knex.schema
-        .alterTable("heartbeat", function (table) {
-            table.integer("retries").notNullable().defaultTo(0);
-        });
-
-};
-
-exports.down = function (knex) {
-    return knex.schema
-        .alterTable("heartbeat", function (table) {
-            table.dropColumn("retries");
-        });
-};

db/knex_migrations/2023-10-08-0000-mqtt-query.js

@@ -1,16 +0,0 @@
-exports.up = function (knex) {
-    // Add new column monitor.mqtt_check_type
-    return knex.schema
-        .alterTable("monitor", function (table) {
-            table.string("mqtt_check_type", 255).notNullable().defaultTo("keyword");
-        });
-
-};
-
-exports.down = function (knex) {
-    // Drop column monitor.mqtt_check_type
-    return knex.schema
-        .alterTable("monitor", function (table) {
-            table.dropColumn("mqtt_check_type");
-        });
-};

db/knex_migrations/2023-10-11-1915-push-token-to-32.js

@@ -1,14 +0,0 @@
-exports.up = function (knex) {
-    // update monitor.push_token to 32 length
-    return knex.schema
-        .alterTable("monitor", function (table) {
-            table.string("push_token", 32).alter();
-        });
-};
-
-exports.down = function (knex) {
-    return knex.schema
-        .alterTable("monitor", function (table) {
-            table.string("push_token", 20).alter();
-        });
-};

db/knex_migrations/2023-10-16-0000-create-remote-browsers.js

@@ -1,21 +0,0 @@
-exports.up = function (knex) {
-    return knex.schema
-        .createTable("remote_browser", function (table) {
-            table.increments("id");
-            table.string("name", 255).notNullable();
-            table.string("url", 255).notNullable();
-            table.integer("user_id").unsigned();
-        }).alterTable("monitor", function (table) {
-            // Add new column monitor.remote_browser
-            table.integer("remote_browser").nullable().defaultTo(null).unsigned()
-                .index()
-                .references("id")
-                .inTable("remote_browser");
-        });
-};
-
-exports.down = function (knex) {
-    return knex.schema.dropTable("remote_browser").alterTable("monitor", function (table) {
-        table.dropColumn("remote_browser");
-    });
-};

db/knex_migrations/README.md

@@ -1,15 +1,16 @@
-# Info
+## Info
 
 https://knexjs.org/guide/migrations.html#knexfile-in-other-languages
 
 ## Basic rules
-
 - All tables must have a primary key named `id`
 - Filename format: `YYYY-MM-DD-HHMM-patch-name.js`
-- Avoid native SQL syntax, use knex methods, because Uptime Kuma supports SQLite and MariaDB.
+- Avoid native SQL syntax, use knex methods, because Uptime Kuma supports multiple databases
 
 ## Template
 
+Filename: YYYYMMDDHHMMSS_name.js
+
 ```js
 exports.up = function(knex) {
 

db/old_migrations/patch-add-clickable-status-page-link.sql

@@ -1,7 +1,5 @@
 -- You should not modify if this have pushed to Github, unless it does serious wrong with the db.
 BEGIN TRANSACTION;
-
 ALTER TABLE monitor_group
     ADD send_url BOOLEAN DEFAULT 0 NOT NULL;
-
 COMMIT;

db/old_migrations/patch-add-gamedig-monitor.sql

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

db/old_migrations/patch-add-google-analytics-status-page-tag.sql

@@ -1,7 +1,4 @@
 -- You should not modify if this have pushed to Github, unless it does serious wrong with the db.
 BEGIN TRANSACTION;
-
-ALTER TABLE status_page
-    ADD google_analytics_tag_id VARCHAR;
-
+ALTER TABLE status_page ADD google_analytics_tag_id VARCHAR;
 COMMIT;

db/old_migrations/patch-add-parent-monitor.sql

@@ -1,7 +1,6 @@
--- You should not modify if this have pushed to Github, unless it does serious wrong with the db.
 BEGIN TRANSACTION;
 
 ALTER TABLE monitor
     ADD parent INTEGER REFERENCES [monitor] ([id]) ON DELETE SET NULL ON UPDATE CASCADE;
 
-COMMIT;
+COMMIT

db/old_migrations/patch-add-radius-monitor.sql

@@ -1,4 +1,3 @@
--- You should not modify if this have pushed to Github, unless it does serious wrong with the db.
 BEGIN TRANSACTION;
 
 ALTER TABLE monitor
@@ -16,4 +15,4 @@ ALTER TABLE monitor
 ALTER TABLE monitor
     ADD radius_secret VARCHAR(255);
 
-COMMIT;
+COMMIT

db/old_migrations/patch-add-timeout-monitor.sql

@@ -3,5 +3,4 @@ BEGIN TRANSACTION;
 
 ALTER TABLE monitor
     ADD timeout DOUBLE default 0 not null;
-
-COMMIT;
+COMMIT;

db/old_migrations/patch-api-key-table.sql

@@ -1,6 +1,5 @@
 -- You should not modify if this have pushed to Github, unless it does serious wrong with the db.
 BEGIN TRANSACTION;
-
 CREATE TABLE [api_key] (
     [id] INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
     [key] VARCHAR(255) NOT NULL,
@@ -11,5 +10,4 @@ CREATE TABLE [api_key] (
     [expires] DATETIME DEFAULT NULL,
     CONSTRAINT FK_user FOREIGN KEY ([user_id]) REFERENCES [user]([id]) ON DELETE CASCADE ON UPDATE CASCADE
 );
-
 COMMIT;

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

@@ -1,34 +0,0 @@
--- 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;
-
--- These SQL is still not fully safe. See https://github.com/louislam/uptime-kuma/issues/4039.
-
--- 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/old_migrations/patch-notification-config.sql

@@ -1,10 +0,0 @@
--- 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/old_migrations/patch-ping-packet-size.sql

@@ -1,7 +1,5 @@
 -- You should not modify if this have pushed to Github, unless it does serious wrong with the db.
 BEGIN TRANSACTION;
-
 ALTER TABLE monitor
     ADD packet_size INTEGER DEFAULT 56 NOT NULL;
-
 COMMIT;

db/old_migrations/patch-setting-value-type.sql

@@ -18,4 +18,5 @@ drop table setting;
 
 alter table setting_dg_tmp rename to setting;
 
+
 COMMIT;

db/old_migrations/patch-status-page-footer-css.sql

@@ -1,11 +1,6 @@
 -- You should not modify if this have pushed to Github, unless it does serious wrong with the db.
 BEGIN TRANSACTION;
-
-ALTER TABLE status_page
-    ADD footer_text TEXT;
-ALTER TABLE status_page
-    ADD custom_css TEXT;
-ALTER TABLE status_page
-    ADD show_powered_by BOOLEAN NOT NULL DEFAULT 1;
-
+ALTER TABLE status_page ADD footer_text TEXT;
+ALTER TABLE status_page ADD custom_css TEXT;
+ALTER TABLE status_page ADD show_powered_by BOOLEAN NOT NULL DEFAULT 1;
 COMMIT;

db/old_migrations/patch-timeout.sql

@@ -1,7 +0,0 @@
--- 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;

db/old_migrations/patch2.sql

@@ -1,4 +1,3 @@
--- You should not modify if this have pushed to Github, unless it does serious wrong with the db.
 BEGIN TRANSACTION;
 
 CREATE TABLE monitor_tls_info (

docker/debian-base.dockerfile

@@ -2,6 +2,8 @@
 FROM node:20-bookworm-slim AS base2-slim
 ARG TARGETPLATFORM
 
+WORKDIR /app
+
 # Specify --no-install-recommends to skip unused dependencies, make the base much smaller!
 # apprise = for notifications (From testing repo)
 # sqlite3 = for debugging
@@ -42,10 +44,13 @@ 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.yml

@@ -2,7 +2,7 @@ version: '3.8'
 
 services:
   uptime-kuma:
-    image: louislam/uptime-kuma:1
+    image: louislam/uptime-kuma:2
     container_name: uptime-kuma
     volumes:
       - uptime-kuma:/app/data

docker/dockerfile

@@ -21,7 +21,6 @@ COPY --chown=node:node 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
-RUN mkdir ./data
 
 ############################################
 # ⭐ Main Image
@@ -30,8 +29,6 @@ FROM $BASE_IMAGE AS release
 USER node
 WORKDIR /app
 
-LABEL org.opencontainers.image.source="https://github.com/louislam/uptime-kuma"
-
 ENV UPTIME_KUMA_IS_CONTAINER=1
 
 # Copy app files from build layer
@@ -42,19 +39,12 @@ HEALTHCHECK --interval=60s --timeout=30s --start-period=180s --retries=5 CMD ext
 ENTRYPOINT ["/usr/bin/dumb-init", "--"]
 CMD ["node", "server/server.js"]
 
-############################################
-# Rootless Image
-############################################
-FROM release AS rootless
-
 ############################################
 # Mark as Nightly
 ############################################
 FROM release AS nightly
-RUN npm run mark-as-nightly
-
-FROM nightly AS nightly-rootless
 USER node
+RUN npm run mark-as-nightly
 
 ############################################
 # Build an image for testing pr

extra/exe-builder/Program.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Drawing;
@@ -28,15 +28,9 @@ namespace UptimeKuma {
                 Environment.CurrentDirectory = cwd;
             }
 
-            bool isIntranet = args.Contains("--intranet");
-
-            if (isIntranet) {
-                Console.WriteLine("The --intranet argument was provided, so we will not try to access the internet. The first time this application runs you'll need to run it without the --intranet param or copy the result from another machine to the intranet server.");
-            }
-
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
-            Application.Run(new UptimeKumaApplicationContext(isIntranet));
+            Application.Run(new UptimeKumaApplicationContext());
         }
     }
 
@@ -55,9 +49,8 @@ namespace UptimeKuma {
 
         private RegistryKey registryKey = Registry.CurrentUser.OpenSubKey("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run", true);
 
-        private readonly bool intranetOnly;
 
-        public UptimeKumaApplicationContext(bool intranetOnly) {
+        public UptimeKumaApplicationContext() {
 
             // Single instance only
             bool createdNew;
@@ -66,8 +59,6 @@ namespace UptimeKuma {
                 return;
             }
 
-            this.intranetOnly = intranetOnly;
-
             var startingText = "Starting server...";
             trayIcon = new NotifyIcon();
             trayIcon.Text = startingText;
@@ -107,10 +98,6 @@ namespace UptimeKuma {
         }
 
         void DownloadFiles() {
-            if (intranetOnly) {
-                return;
-            }
-
             var form = new DownloadForm();
             form.Closed += Exit;
             form.Show();
@@ -186,9 +173,7 @@ namespace UptimeKuma {
         }
 
         void CheckForUpdate(object sender, EventArgs e) {
-            if (intranetOnly) {
-                return;
-            }
+            var needUpdate = false;
 
             // Check version.json exists
             if (File.Exists("version.json")) {
@@ -219,12 +204,8 @@ namespace UptimeKuma {
 
         }
 
-        void VisitGitHub(object sender, EventArgs e) {
-            if (intranetOnly) {
-                MessageBox.Show("You have parsed in --intranet so we will not try to access the internet or visit github.com, please go to https://github.com/louislam/uptime-kuma if you want to visit github.");
-                return;
-            }
-
+        void VisitGitHub(object sender, EventArgs e)
+        {
             Process.Start("https://github.com/louislam/uptime-kuma");
         }
 

extra/exe-builder/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.2.0")]
-[assembly: AssemblyFileVersion("1.0.2.0")]
+[assembly: AssemblyVersion("1.0.1.0")]
+[assembly: AssemblyFileVersion("1.0.1.0")]

extra/exe-builder/UptimeKuma.csproj

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <Import Project="packages\Costura.Fody.5.7.0\build\Costura.Fody.props" Condition="Exists('packages\Costura.Fody.5.7.0\build\Costura.Fody.props')" />
     <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
     <PropertyGroup>
         <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -38,104 +39,107 @@
         <ApplicationManifest>app.manifest</ApplicationManifest>
     </PropertyGroup>
     <PropertyGroup>
-        <PostBuildEvent>COPY "$(SolutionDir)bin\Debug\uptime-kuma.exe" "%UserProfile%\Desktop\uptime-kuma-win64\"</PostBuildEvent>
+      <PostBuildEvent>COPY "$(SolutionDir)bin\Debug\uptime-kuma.exe" "%UserProfile%\Desktop\uptime-kuma-win64\"</PostBuildEvent>
     </PropertyGroup>
     <ItemGroup>
+        <Reference Include="Costura, Version=5.7.0.0, Culture=neutral, processorArchitecture=MSIL">
+          <HintPath>packages\Costura.Fody.5.7.0\lib\netstandard1.0\Costura.dll</HintPath>
+        </Reference>
         <Reference Include="Microsoft.Win32.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-            <HintPath>packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll</HintPath>
+          <HintPath>packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll</HintPath>
         </Reference>
         <Reference Include="mscorlib" />
         <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-            <HintPath>packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+          <HintPath>packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
         </Reference>
         <Reference Include="System" />
         <Reference Include="System.AppContext, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-            <HintPath>packages\System.AppContext.4.3.0\lib\net463\System.AppContext.dll</HintPath>
+          <HintPath>packages\System.AppContext.4.3.0\lib\net463\System.AppContext.dll</HintPath>
         </Reference>
         <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-            <HintPath>packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+          <HintPath>packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
         </Reference>
         <Reference Include="System.ComponentModel.Composition" />
         <Reference Include="System.Console, Version=4.0.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-            <HintPath>packages\System.Console.4.3.1\lib\net46\System.Console.dll</HintPath>
+          <HintPath>packages\System.Console.4.3.1\lib\net46\System.Console.dll</HintPath>
         </Reference>
         <Reference Include="System.Core" />
         <Reference Include="System.Diagnostics.DiagnosticSource, Version=7.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-            <HintPath>packages\System.Diagnostics.DiagnosticSource.7.0.1\lib\net462\System.Diagnostics.DiagnosticSource.dll</HintPath>
+          <HintPath>packages\System.Diagnostics.DiagnosticSource.7.0.1\lib\net462\System.Diagnostics.DiagnosticSource.dll</HintPath>
         </Reference>
         <Reference Include="System.Diagnostics.Tracing, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-            <HintPath>packages\System.Diagnostics.Tracing.4.3.0\lib\net462\System.Diagnostics.Tracing.dll</HintPath>
+          <HintPath>packages\System.Diagnostics.Tracing.4.3.0\lib\net462\System.Diagnostics.Tracing.dll</HintPath>
         </Reference>
         <Reference Include="System.Globalization.Calendars, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-            <HintPath>packages\System.Globalization.Calendars.4.3.0\lib\net46\System.Globalization.Calendars.dll</HintPath>
+          <HintPath>packages\System.Globalization.Calendars.4.3.0\lib\net46\System.Globalization.Calendars.dll</HintPath>
         </Reference>
         <Reference Include="System.IO, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-            <HintPath>packages\System.IO.4.3.0\lib\net462\System.IO.dll</HintPath>
+          <HintPath>packages\System.IO.4.3.0\lib\net462\System.IO.dll</HintPath>
         </Reference>
         <Reference Include="System.IO.Compression, Version=4.1.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-            <HintPath>packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll</HintPath>
+          <HintPath>packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll</HintPath>
         </Reference>
         <Reference Include="System.IO.Compression.FileSystem" />
         <Reference Include="System.IO.Compression.ZipFile, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-            <HintPath>packages\System.IO.Compression.ZipFile.4.3.0\lib\net46\System.IO.Compression.ZipFile.dll</HintPath>
+          <HintPath>packages\System.IO.Compression.ZipFile.4.3.0\lib\net46\System.IO.Compression.ZipFile.dll</HintPath>
         </Reference>
         <Reference Include="System.IO.FileSystem, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-            <HintPath>packages\System.IO.FileSystem.4.3.0\lib\net46\System.IO.FileSystem.dll</HintPath>
+          <HintPath>packages\System.IO.FileSystem.4.3.0\lib\net46\System.IO.FileSystem.dll</HintPath>
         </Reference>
         <Reference Include="System.IO.FileSystem.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-            <HintPath>packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll</HintPath>
+          <HintPath>packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll</HintPath>
         </Reference>
         <Reference Include="System.Linq, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-            <HintPath>packages\System.Linq.4.3.0\lib\net463\System.Linq.dll</HintPath>
+          <HintPath>packages\System.Linq.4.3.0\lib\net463\System.Linq.dll</HintPath>
         </Reference>
         <Reference Include="System.Linq.Expressions, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-            <HintPath>packages\System.Linq.Expressions.4.3.0\lib\net463\System.Linq.Expressions.dll</HintPath>
+          <HintPath>packages\System.Linq.Expressions.4.3.0\lib\net463\System.Linq.Expressions.dll</HintPath>
         </Reference>
         <Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-            <HintPath>packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
+          <HintPath>packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
         </Reference>
         <Reference Include="System.Net.Http, Version=4.1.1.3, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-            <HintPath>packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll</HintPath>
+          <HintPath>packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll</HintPath>
         </Reference>
         <Reference Include="System.Net.Sockets, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-            <HintPath>packages\System.Net.Sockets.4.3.0\lib\net46\System.Net.Sockets.dll</HintPath>
+          <HintPath>packages\System.Net.Sockets.4.3.0\lib\net46\System.Net.Sockets.dll</HintPath>
         </Reference>
         <Reference Include="System.Numerics" />
         <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-            <HintPath>packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+          <HintPath>packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
         </Reference>
         <Reference Include="System.Reflection, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-            <HintPath>packages\System.Reflection.4.3.0\lib\net462\System.Reflection.dll</HintPath>
+          <HintPath>packages\System.Reflection.4.3.0\lib\net462\System.Reflection.dll</HintPath>
         </Reference>
         <Reference Include="System.Runtime, Version=4.1.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-            <HintPath>packages\System.Runtime.4.3.1\lib\net462\System.Runtime.dll</HintPath>
+          <HintPath>packages\System.Runtime.4.3.1\lib\net462\System.Runtime.dll</HintPath>
         </Reference>
         <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-            <HintPath>packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+          <HintPath>packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
         </Reference>
         <Reference Include="System.Runtime.Extensions, Version=4.1.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-            <HintPath>packages\System.Runtime.Extensions.4.3.1\lib\net462\System.Runtime.Extensions.dll</HintPath>
+          <HintPath>packages\System.Runtime.Extensions.4.3.1\lib\net462\System.Runtime.Extensions.dll</HintPath>
         </Reference>
         <Reference Include="System.Runtime.InteropServices, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-            <HintPath>packages\System.Runtime.InteropServices.4.3.0\lib\net463\System.Runtime.InteropServices.dll</HintPath>
+          <HintPath>packages\System.Runtime.InteropServices.4.3.0\lib\net463\System.Runtime.InteropServices.dll</HintPath>
         </Reference>
         <Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-            <HintPath>packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
+          <HintPath>packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
         </Reference>
         <Reference Include="System.Security.Cryptography.Algorithms, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-            <HintPath>packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net463\System.Security.Cryptography.Algorithms.dll</HintPath>
+          <HintPath>packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net463\System.Security.Cryptography.Algorithms.dll</HintPath>
         </Reference>
         <Reference Include="System.Security.Cryptography.Encoding, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-            <HintPath>packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
+          <HintPath>packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
         </Reference>
         <Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-            <HintPath>packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
+          <HintPath>packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
         </Reference>
         <Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.2, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-            <HintPath>packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
+          <HintPath>packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
         </Reference>
         <Reference Include="System.Text.RegularExpressions, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-            <HintPath>packages\System.Text.RegularExpressions.4.3.1\lib\net463\System.Text.RegularExpressions.dll</HintPath>
+          <HintPath>packages\System.Text.RegularExpressions.4.3.1\lib\net463\System.Text.RegularExpressions.dll</HintPath>
         </Reference>
         <Reference Include="System.Xml.Linq" />
         <Reference Include="System.Data.DataSetExtensions" />
@@ -146,21 +150,21 @@
         <Reference Include="System.Windows.Forms" />
         <Reference Include="System.Xml" />
         <Reference Include="System.Xml.ReaderWriter, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-            <HintPath>packages\System.Xml.ReaderWriter.4.3.1\lib\net46\System.Xml.ReaderWriter.dll</HintPath>
+          <HintPath>packages\System.Xml.ReaderWriter.4.3.1\lib\net46\System.Xml.ReaderWriter.dll</HintPath>
         </Reference>
     </ItemGroup>
     <ItemGroup>
         <Compile Include="DownloadForm.cs">
-            <SubType>Form</SubType>
+          <SubType>Form</SubType>
         </Compile>
         <Compile Include="DownloadForm.Designer.cs">
-            <DependentUpon>DownloadForm.cs</DependentUpon>
+          <DependentUpon>DownloadForm.cs</DependentUpon>
         </Compile>
         <Compile Include="Program.cs" />
         <Compile Include="Properties\AssemblyInfo.cs" />
         <Compile Include="Version.cs" />
         <EmbeddedResource Include="DownloadForm.resx">
-            <DependentUpon>DownloadForm.cs</DependentUpon>
+          <DependentUpon>DownloadForm.cs</DependentUpon>
         </EmbeddedResource>
         <EmbeddedResource Include="Properties\Resources.resx">
             <Generator>ResXFileCodeGenerator</Generator>
@@ -172,7 +176,7 @@
             <DependentUpon>Resources.resx</DependentUpon>
         </Compile>
         <None Include="..\..\public\favicon.ico">
-            <Link>favicon.ico</Link>
+          <Link>favicon.ico</Link>
         </None>
         <None Include="packages.config" />
         <None Include="Properties\Settings.settings">
@@ -189,15 +193,20 @@
         <None Include="App.config" />
     </ItemGroup>
     <ItemGroup>
-        <Content Include=".gitignore" />
-        <Content Include="app.manifest" />
+      <Content Include=".gitignore" />
+      <Content Include="app.manifest" />
     </ItemGroup>
     <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
     <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-        <PropertyGroup>
-            <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}.</ErrorText>
-        </PropertyGroup>
-        <Error Condition="!Exists('packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets'))" />
+      <PropertyGroup>
+        <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}.</ErrorText>
+      </PropertyGroup>
+      <Error Condition="!Exists('packages\Costura.Fody.5.7.0\build\Costura.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Costura.Fody.5.7.0\build\Costura.Fody.props'))" />
+      <Error Condition="!Exists('packages\Costura.Fody.5.7.0\build\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Costura.Fody.5.7.0\build\Costura.Fody.targets'))" />
+      <Error Condition="!Exists('packages\Fody.6.6.4\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Fody.6.6.4\build\Fody.targets'))" />
+      <Error Condition="!Exists('packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets'))" />
     </Target>
+    <Import Project="packages\Costura.Fody.5.7.0\build\Costura.Fody.targets" Condition="Exists('packages\Costura.Fody.5.7.0\build\Costura.Fody.targets')" />
+    <Import Project="packages\Fody.6.6.4\build\Fody.targets" Condition="Exists('packages\Fody.6.6.4\build\Fody.targets')" />
     <Import Project="packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
 </Project>

extra/exe-builder/packages.config

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Costura.Fody" version="5.7.0" targetFramework="net472" developmentDependency="true" />
+  <package id="Fody" version="6.6.4" targetFramework="net472" developmentDependency="true" />
   <package id="Microsoft.NETCore.Platforms" version="7.0.0" targetFramework="net472" />
   <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net472" />
   <package id="NETStandard.Library" version="2.0.3" targetFramework="net472" />
@@ -51,4 +53,4 @@
   <package id="System.Threading.Tasks" version="4.3.0" targetFramework="net472" />
   <package id="System.Threading.Timer" version="4.3.0" targetFramework="net472" />
   <package id="System.Xml.XDocument" version="4.3.0" targetFramework="net472" />
-</packages>
+</packages>

extra/fs-rmSync.js

@@ -5,7 +5,7 @@ const fs = require("fs");
  * 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 information of `fs.rmdirSync`
+ * @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`.

extra/healthcheck.js

@@ -6,7 +6,7 @@
  * ⚠️ Deprecated: Changed to healthcheck.go, it will be deleted in the future.
  * This script should be run after a period of time (180s), because the server may need some time to prepare.
  */
-const FBSD = /^freebsd/.test(process.platform);
+const { FBSD } = require("../server/util-server");
 
 process.env.NODE_TLS_REJECT_UNAUTHORIZED = "0";
 

extra/install.batsh

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

extra/push-examples/.gitignore

@@ -1,3 +0,0 @@
-java/Index.class
-csharp/index.exe
-typescript-fetch/index.js

extra/push-examples/bash-curl/index.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-# Filename: index.sh
-PUSH_URL="https://example.com/api/push/key?status=up&msg=OK&ping="
-INTERVAL=60
-
-while true; do
-    curl -s -o /dev/null $PUSH_URL
-    echo "Pushed!"
-    sleep $INTERVAL
-done

extra/push-examples/csharp/index.cs

@@ -1,24 +0,0 @@
-using System;
-using System.Net;
-using System.Threading;
-
-/**
- * Compile: C:\Windows\Microsoft.NET\Framework\v4.0.30319\csc.exe index.cs
- * Run: index.exe
- */
-class Index
-{
-    const string PushURL  = "https://example.com/api/push/key?status=up&msg=OK&ping=";
-    const int Interval = 60;
-
-    static void Main(string[] args)
-    {
-        while (true)
-        {
-            WebClient client = new WebClient();
-            client.DownloadString(PushURL);
-            Console.WriteLine("Pushed!");
-            Thread.Sleep(Interval * 1000);
-        }
-    }
-}

extra/push-examples/docker/index.sh

@@ -1 +0,0 @@
-docker run -d --restart=always --name uptime-kuma-push louislam/uptime-kuma:push "https://example.com/api/push/key?status=up&msg=OK&ping=" 60

extra/push-examples/go/index.go

@@ -1,20 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"net/http"
-	"time"
-)
-
-func main() {
-	const PushURL = "https://example.com/api/push/key?status=up&msg=OK&ping="
-	const Interval = 60
-
-	for {
-		_, err := http.Get(PushURL)
-		if err == nil {
-			fmt.Println("Pushed!")
-		}
-		time.Sleep(Interval * time.Second)
-	}
-}

extra/push-examples/java/index.java

@@ -1,32 +0,0 @@
-import java.net.HttpURLConnection;
-import java.net.URL;
-
-/**
- * Compile: javac index.java
- * Run: java Index
- */
-class Index {
-
-    public static final String PUSH_URL = "https://example.com/api/push/key?status=up&msg=OK&ping=";
-    public static final int INTERVAL = 60;
-
-    public static void main(String[] args) {
-        while (true) {
-            try {
-                URL url = new URL(PUSH_URL);
-                HttpURLConnection con = (HttpURLConnection) url.openConnection();
-                con.setRequestMethod("GET");
-                con.getResponseCode();
-                con.disconnect();
-                System.out.println("Pushed!");
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-            try {
-                Thread.sleep(INTERVAL * 1000);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-    }
-}

extra/push-examples/javascript-fetch/index.js

@@ -1,11 +0,0 @@
-// Supports: Node.js >= 18, Deno, Bun
-const pushURL = "https://example.com/api/push/key?status=up&msg=OK&ping=";
-const interval = 60;
-
-const push = async () => {
-    await fetch(pushURL);
-    console.log("Pushed!");
-};
-
-push();
-setInterval(push, interval * 1000);

extra/push-examples/javascript-fetch/package.json

@@ -1,5 +0,0 @@
-{
-    "scripts": {
-        "start": "node index.js"
-    }
-}

extra/push-examples/php/index.php

@@ -1,13 +0,0 @@
-<?php
-const PUSH_URL = "https://example.com/api/push/key?status=up&msg=OK&ping=";
-const interval = 60;
-
-while (true) {
-    $ch = curl_init();
-    curl_setopt($ch, CURLOPT_URL, PUSH_URL);
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-    curl_exec($ch);
-    curl_close($ch);
-    echo "Pushed!\n";
-    sleep(interval);
-}

extra/push-examples/powershell/index.ps1

@@ -1,9 +0,0 @@
-# Filename: index.ps1
-$pushURL = "https://example.com/api/push/key?status=up&msg=OK&ping="
-$interval = 60
-
-while ($true) {
-    $res = Invoke-WebRequest -Uri $pushURL
-    Write-Host "Pushed!"
-    Start-Sleep -Seconds $interval
-}

extra/push-examples/python/index.py

@@ -1,10 +0,0 @@
-import urllib.request
-import time
-
-push_url = "https://example.com/api/push/key?status=up&msg=OK&ping="
-interval = 60
-
-while True:
-    urllib.request.urlopen(push_url)
-    print("Pushed!\n")
-    time.sleep(interval)

extra/push-examples/typescript-fetch/README.md

@@ -1,19 +0,0 @@
-# How to run
-
-Node.js (ts-node)
-
-```bash
-ts-node index.ts
-```
-
-Deno
-
-```bash
-deno run --allow-net index.ts
-```
-
-Bun.js
-
-```bash
-bun index.ts
-```

extra/push-examples/typescript-fetch/index.ts

@@ -1,11 +0,0 @@
-// Supports: Deno, Bun, Node.js >= 18 (ts-node)
-const pushURL : string = "https://example.com/api/push/key?status=up&msg=OK&ping=";
-const interval : number = 60;
-
-const push = async () => {
-    await fetch(pushURL);
-    console.log("Pushed!");
-};
-
-push();
-setInterval(push, interval * 1000);

extra/push-examples/typescript-fetch/package.json

@@ -1,13 +0,0 @@
-{
-    "scripts": {
-        "ts-node": "ts-node index.ts",
-        "deno": "deno run --allow-net index.ts",
-        "bun": "bun index.ts"
-    },
-    "devDependencies": {
-        "@types/node": "^20.6.0",
-        "ts-node": "^10.9.1",
-        "tslib": "^2.6.2",
-        "typescript": "^5.2.2"
-    }
-}

extra/rebase-pr.js

@@ -1,40 +0,0 @@
-const { execSync } = require("child_process");
-
-/**
- * Rebase a PR onto such as 1.23.X or master
- * @returns {Promise<void>}
- */
-async function main() {
-    const branch = process.argv[2];
-
-    // Use gh to get current branch's pr id
-    let currentBranchPRID = execSync("gh pr view --json number --jq \".number\"").toString().trim();
-    console.log("Pr ID: ", currentBranchPRID);
-
-    // Use gh commend to get pr commits
-    const prCommits = JSON.parse(execSync(`gh pr view ${currentBranchPRID} --json commits`).toString().trim()).commits;
-
-    console.log("Found commits: ", prCommits.length);
-
-    // Sort the commits by authoredDate
-    prCommits.sort((a, b) => {
-        return new Date(a.authoredDate) - new Date(b.authoredDate);
-    });
-
-    // Get the oldest commit id
-    const oldestCommitID = prCommits[0].oid;
-    console.log("Oldest commit id of this pr:", oldestCommitID);
-
-    // Get the latest commit id of the target branch
-    const latestCommitID = execSync(`git rev-parse origin/${branch}`).toString().trim();
-    console.log("Latest commit id of " + branch + ":", latestCommitID);
-
-    // Get the original parent commit id of the oldest commit
-    const originalParentCommitID = execSync(`git log --pretty=%P -n 1 "${oldestCommitID}"`).toString().trim();
-    console.log("Original parent commit id of the oldest commit:", originalParentCommitID);
-
-    // Rebase the pr onto the target branch
-    execSync(`git rebase --onto ${latestCommitID} ${originalParentCommitID}`);
-}
-
-main();

extra/reformat-changelog.js

@@ -1,44 +0,0 @@
-// Generate on GitHub
-const input = `
-* Add Korean translation by @Alanimdeo in https://github.com/louislam/dockge/pull/86
-`;
-
-const template = `
-### 🆕 New Features
-
-### 💇‍♀️ Improvements
-
-### 🐞 Bug Fixes
-
-### ⬆️ Security Fixes
-
-### 🦎 Translation Contributions
-
-### Others
-- Other small changes, code refactoring and comment/doc updates in this repo:
-`;
-
-const lines = input.split("\n").filter((line) => line.trim() !== "");
-
-for (const line of lines) {
-    // Split the last " by "
-    const usernamePullRequesURL = line.split(" by ").pop();
-
-    if (!usernamePullRequesURL) {
-        console.log("Unable to parse", line);
-        continue;
-    }
-
-    const [ username, pullRequestURL ] = usernamePullRequesURL.split(" in ");
-    const pullRequestID = "#" + pullRequestURL.split("/").pop();
-    let message = line.split(" by ").shift();
-
-    if (!message) {
-        console.log("Unable to parse", line);
-        continue;
-    }
-
-    message = message.split("* ").pop();
-    console.log("-", pullRequestID, message, `(Thanks ${username})`);
-}
-console.log(template);

extra/remove-playwright-test-data.js

@@ -1,6 +0,0 @@
-const fs = require("fs");
-
-fs.rmSync("./data/playwright-test", {
-    recursive: true,
-    force: true,
-});

extra/reset-password.js

@@ -5,8 +5,6 @@ const { R } = require("redbean-node");
 const readline = require("readline");
 const { initJWTSecret } = require("../server/util-server");
 const User = require("../server/model/user");
-const { io } = require("socket.io-client");
-const { localWebSocketURL } = require("../server/config");
 const args = require("args-parser")(process.argv);
 const rl = readline.createInterface({
     input: process.stdin,
@@ -14,10 +12,6 @@ const rl = readline.createInterface({
 });
 
 const main = async () => {
-    if ("dry-run" in args) {
-        console.log("Dry run mode, no changes will be made.");
-    }
-
     console.log("Connecting the database");
     Database.initDataDir(args);
     await Database.connect(false, false, true);
@@ -33,36 +27,21 @@ const main = async () => {
             console.log("Found user: " + user.username);
 
             while (true) {
-                let password;
-                let confirmPassword;
-
-                // When called with "--new-password" argument for unattended modification (e.g. npm run reset-password -- --new_password=secret)
-                if ("new-password" in args) {
-                    console.log("Using password from argument");
-                    console.warn("\x1b[31m%s\x1b[0m", "Warning: the password might be stored, in plain text, in your shell's history");
-                    password = confirmPassword = args["new-password"] + "";
-                } else {
-                    password = await question("New Password: ");
-                    confirmPassword = await question("Confirm New Password: ");
-                }
+                let password = await question("New Password: ");
+                let confirmPassword = await question("Confirm New Password: ");
 
                 if (password === confirmPassword) {
-                    if (!("dry-run" in args)) {
-                        await User.resetPassword(user.id, password);
+                    await User.resetPassword(user.id, password);
 
-                        // Reset all sessions by reset jwt secret
-                        await initJWTSecret();
+                    // Reset all sessions by reset jwt secret
+                    await initJWTSecret();
 
-                        // Disconnect all other socket clients of the user
-                        await disconnectAllSocketClients(user.username, password);
-                    }
                     break;
                 } else {
                     console.log("Passwords do not match, please try again.");
                 }
             }
             console.log("Password reset successfully.");
-
         }
     } catch (e) {
         console.error("Error: " + e.message);
@@ -87,50 +66,6 @@ function question(question) {
     });
 }
 
-/**
- * Disconnect all socket clients of the user
- * @param {string} username Username
- * @param {string} password Password
- * @returns {Promise<void>} Promise
- */
-function disconnectAllSocketClients(username, password) {
-    return new Promise((resolve) => {
-        console.log("Connecting to " + localWebSocketURL + " to disconnect all other socket clients");
-
-        // Disconnect all socket connections
-        const socket = io(localWebSocketURL, {
-            reconnection: false,
-            timeout: 5000,
-        });
-        socket.on("connect", () => {
-            socket.emit("login", {
-                username,
-                password,
-            }, (res) => {
-                if (res.ok) {
-                    console.log("Logged in.");
-                    socket.emit("disconnectOtherSocketClients");
-                } else {
-                    console.warn("Login failed.");
-                    console.warn("Please restart the server to disconnect all sessions.");
-                }
-                socket.close();
-            });
-        });
-
-        socket.on("connect_error", function () {
-            // The localWebSocketURL is not guaranteed to be working for some complicated Uptime Kuma setup
-            // Ask the user to restart the server manually
-            console.warn("Failed to connect to " + localWebSocketURL);
-            console.warn("Please restart the server to disconnect all sessions manually.");
-            resolve();
-        });
-        socket.on("disconnect", () => {
-            resolve();
-        });
-    });
-}
-
 if (!process.env.TEST_BACKEND) {
     main();
 }

extra/uptime-kuma-push/.gitignore

@@ -1 +0,0 @@
-build/*

extra/uptime-kuma-push/Dockerfile

@@ -1,18 +0,0 @@
-FROM node AS build
-RUN useradd --create-home kuma
-USER kuma
-WORKDIR /home/kuma
-ARG TARGETPLATFORM
-COPY --chown=kuma:kuma ./build/ ./build/
-COPY --chown=kuma:kuma build.js build.js
-RUN node build.js $TARGETPLATFORM
-
-FROM debian:bookworm-slim AS release
-RUN useradd --create-home kuma
-USER kuma
-WORKDIR /home/kuma
-COPY --from=build /home/kuma/uptime-kuma-push ./uptime-kuma-push
-
-ENTRYPOINT ["/home/kuma/uptime-kuma-push"]
-
-

extra/uptime-kuma-push/build.js

@@ -1,48 +0,0 @@
-const fs = require("fs");
-const platform = process.argv[2];
-
-if (!platform) {
-    console.error("No platform??");
-    process.exit(1);
-}
-
-const supportedPlatforms = [
-    {
-        name: "linux/amd64",
-        bin: "./build/uptime-kuma-push-amd64"
-    },
-    {
-        name: "linux/arm64",
-        bin: "./build/uptime-kuma-push-arm64"
-    },
-    {
-        name: "linux/arm/v7",
-        bin: "./build/uptime-kuma-push-armv7"
-    }
-];
-
-let platformObj = null;
-
-// Check if the platform is supported
-for (let i = 0; i < supportedPlatforms.length; i++) {
-    if (supportedPlatforms[i].name === platform) {
-        platformObj = supportedPlatforms[i];
-        break;
-    }
-}
-
-if (platformObj) {
-    let filename = platformObj.bin;
-
-    if (!fs.existsSync(filename)) {
-        console.error(`prebuilt: ${filename} is not found, please build it first`);
-        process.exit(1);
-    }
-
-    fs.renameSync(filename, "./uptime-kuma-push");
-    process.exit(0);
-} else {
-    console.error("Unsupported platform: " + platform);
-    process.exit(1);
-}
-

extra/uptime-kuma-push/package.json

@@ -1,13 +0,0 @@
-{
-    "scripts": {
-        "build-docker": "npm run build-all && docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:push . --push --target release",
-        "build-all": "npm run build-win && npm run build-linux-amd64 && npm run build-linux-arm64 && npm run build-linux-armv7 && npm run build-linux-armv6 && npm run build-linux-armv5 && npm run build-linux-riscv64",
-        "build-win": "cross-env GOOS=windows GOARCH=amd64 go build -x -o ./build/uptime-kuma-push.exe uptime-kuma-push.go",
-        "build-linux-amd64": "cross-env GOOS=linux GOARCH=amd64 go build -x -o ./build/uptime-kuma-push-amd64 uptime-kuma-push.go",
-        "build-linux-arm64": "cross-env GOOS=linux GOARCH=arm64 go build -x -o ./build/uptime-kuma-push-arm64 uptime-kuma-push.go",
-        "build-linux-armv7": "cross-env GOOS=linux GOARCH=arm GOARM=7 go build -x -o ./build/uptime-kuma-push-armv7 uptime-kuma-push.go",
-        "build-linux-armv6": "cross-env GOOS=linux GOARCH=arm GOARM=6 go build -x -o ./build/uptime-kuma-push-armv6 uptime-kuma-push.go",
-        "build-linux-armv5": "cross-env GOOS=linux GOARCH=arm GOARM=5 go build -x -o ./build/uptime-kuma-push-armv5 uptime-kuma-push.go",
-        "build-linux-riscv64": "cross-env GOOS=linux GOARCH=riscv64 go build -x -o ./build/uptime-kuma-push-riscv64 uptime-kuma-push.go"
-    }
-}

extra/uptime-kuma-push/uptime-kuma-push.go

@@ -1,44 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"net/http"
-	os "os"
-	"time"
-)
-
-func main() {
-	if len(os.Args) < 2 {
-		fmt.Fprintln(os.Stderr, "Usage: uptime-kuma-push <url> [<interval>]")
-		os.Exit(1)
-	}
-
-	pushURL := os.Args[1]
-
-	var interval time.Duration
-
-	if len(os.Args) >= 3 {
-		intervalString, err := time.ParseDuration(os.Args[2] + "s")
-		interval = intervalString
-
-		if err != nil {
-			fmt.Fprintln(os.Stderr, "Error: Invalid interval", err)
-			os.Exit(1)
-		}
-
-	} else {
-		interval = 60 * time.Second
-	}
-
-	for {
-		_, err := http.Get(pushURL)
-		if err == nil {
-			fmt.Print("Pushed!")
-		} else {
-			fmt.Print("Error: ", err)
-		}
-
-		fmt.Println(" Sleeping for", interval)
-		time.Sleep(interval)
-	}
-}

install.sh

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

package.json

@@ -1,6 +1,6 @@
 {
     "name": "uptime-kuma",
-    "version": "2.0.0-dev",
+    "version": "1.23.0-beta.1",
     "license": "MIT",
     "repository": {
         "type": "git",
@@ -10,30 +10,23 @@
         "node": "14 || 16 || 18 || >= 20.4.0"
     },
     "scripts": {
+        "install-legacy": "npm install",
+        "update-legacy": "npm update",
         "lint:js": "eslint --ext \".js,.vue\" --ignore-path .gitignore .",
-        "lint:js-prod": "npm run lint:js -- --max-warnings 0",
         "lint-fix:js": "eslint --ext \".js,.vue\" --fix --ignore-path .gitignore .",
         "lint:style": "stylelint \"**/*.{vue,css,scss}\" --ignore-path .gitignore",
         "lint-fix:style": "stylelint \"**/*.{vue,css,scss}\" --fix --ignore-path .gitignore",
         "lint": "npm run lint:js && npm run lint:style",
-        "lint:prod": "npm run lint:js-prod && npm run lint:style",
         "dev": "concurrently -k -r \"wait-on tcp:3000 && npm run start-server-dev \" \"npm run start-frontend-dev\"",
         "start-frontend-dev": "cross-env NODE_ENV=development vite --host --config ./config/vite.config.js",
         "start-frontend-devcontainer": "cross-env NODE_ENV=development DEVCONTAINER=1 vite --host --config ./config/vite.config.js",
         "start": "npm run start-server",
         "start-server": "node server/server.js",
         "start-server-dev": "cross-env NODE_ENV=development node server/server.js",
-        "start-server-dev:watch": "cross-env NODE_ENV=development node --watch server/server.js",
         "build": "vite build --config ./config/vite.config.js",
-        "test": "npm run test-backend && npm run test-e2e",
+        "test": "node test/prepare-test-server.js && npm run jest-backend",
         "test-with-build": "npm run build && npm test",
-        "test-backend": "node test/backend-test-entry.js",
-        "test-backend:14": "cross-env TEST_BACKEND=1 NODE_OPTIONS=\"--experimental-abortcontroller --no-warnings\" node--test test/backend-test",
-        "test-backend:18": "cross-env TEST_BACKEND=1 node --test test/backend-test",
-        "test-e2e": "playwright test --config ./config/playwright.config.js",
-        "test-e2e-ui": "playwright test --config ./config/playwright.config.js --ui --ui-port=51063",
-        "playwright-codegen": "playwright codegen localhost:3000 --save-storage=./private/e2e-auth.json",
-        "playwright-show-report": "playwright show-report ./private/playwright-report",
+        "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",
@@ -43,35 +36,39 @@
         "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-slim-rootless": "node ./extra/env2arg.js docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:2-slim-rootless -t louislam/uptime-kuma:$VERSION-slim-rootless --target rootless --build-arg BASE_IMAGE=louislam/uptime-kuma:base2-slim . --push",
-        "build-docker-full-rootless": "node ./extra/env2arg.js docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:2-rootless -t louislam/uptime-kuma:$VERSION-rootless --target rootless . --push",
-        "build-docker-nightly-rootless": "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-rootless --target nightly-rootless . --push",
         "build-docker-nightly-local": "npm run build && docker build -f docker/dockerfile -t louislam/uptime-kuma:nightly2 --target nightly .",
-        "build-docker-pr-test": "docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64 -t louislam/uptime-kuma:pr-test2 --target pr-test2 . --push",
+        "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.23.10 && npm ci --production && npm run download-dist",
+        "setup": "git checkout 1.22.1 && 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",
         "remove-2fa": "node extra/remove-2fa.js",
+        "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-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 .",
+        "test-install-script-ubuntu1804": "npm run compile-install-script && docker build --progress plain -f test/test_install_script/ubuntu1804.dockerfile .",
+        "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",
         "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",
+        "cy:test": "node test/prepare-test-server.js && node server/server.js --port=3002 --data-dir=./data/test/ --e2e",
+        "cy:run": "npx cypress run --browser chrome --headless --config-file ./config/cypress.config.js",
+        "cy:run:unit": "npx cypress run --browser chrome --headless --config-file ./config/cypress.frontend.config.js",
+        "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",
-        "rebase-pr-to-1.23.X": "node extra/rebase-pr.js 1.23.X",
-        "start-server-node14-win": "private\\node14\\node.exe server/server.js"
+        "start-dev-container": "cd docker && docker-compose -f docker-compose-dev.yml up --force-recreate"
     },
     "dependencies": {
         "@grpc/grpc-js": "~1.7.3",
@@ -82,6 +79,7 @@
         "axios-ntlm": "1.3.0",
         "badge-maker": "~3.3.1",
         "bcryptjs": "~2.4.3",
+        "cacheable-lookup": "~6.0.4",
         "chardet": "~1.4.0",
         "check-password-strength": "^2.0.5",
         "cheerio": "~1.0.0-rc.12",
@@ -96,9 +94,7 @@
         "express-basic-auth": "~1.2.1",
         "express-static-gzip": "~2.1.7",
         "form-data": "~4.0.0",
-        "gamedig": "^4.2.0",
-        "html-escaper": "^3.0.3",
-        "http-cookie-agent": "~5.0.4",
+        "gamedig": "~4.0.5",
         "http-graceful-shutdown": "~3.1.7",
         "http-proxy-agent": "~5.0.0",
         "https-proxy-agent": "~5.0.1",
@@ -112,11 +108,10 @@
         "knex": "^2.4.2",
         "limiter": "~2.1.0",
         "liquidjs": "^10.7.0",
-        "mitt": "~3.0.1",
-        "mongodb": "~4.17.1",
+        "mongodb": "~4.14.0",
         "mqtt": "~4.3.7",
         "mssql": "~8.1.4",
-        "mysql2": "~3.6.2",
+        "mysql2": "~2.3.3",
         "nanoid": "~3.3.4",
         "node-cloudflared-tunnel": "~1.0.9",
         "node-radius-client": "~1.0.0",
@@ -125,12 +120,11 @@
         "notp": "~2.0.3",
         "openid-client": "^5.4.2",
         "password-hash": "~1.2.2",
-        "pg": "~8.11.3",
-        "pg-connection-string": "~2.6.2",
-        "playwright-core": "~1.39.0",
+        "pg": "~8.8.0",
+        "pg-connection-string": "~2.5.0",
+        "playwright-core": "~1.35.1",
         "prom-client": "~13.2.0",
         "prometheus-api-metrics": "~3.2.1",
-        "promisify-child-process": "~4.1.2",
         "protobufjs": "~7.2.4",
         "qs": "~6.10.4",
         "redbean-node": "~0.3.0",
@@ -142,21 +136,19 @@
         "tar": "~6.1.11",
         "tcp-ping": "~0.1.1",
         "thirty-two": "~1.0.2",
-        "tough-cookie": "~4.1.3",
         "ws": "^8.13.0"
     },
     "devDependencies": {
         "@actions/github": "~5.0.1",
+        "@babel/eslint-parser": "^7.22.7",
+        "@babel/preset-env": "^7.15.8",
         "@fortawesome/fontawesome-svg-core": "~1.2.36",
         "@fortawesome/free-regular-svg-icons": "~5.15.4",
         "@fortawesome/free-solid-svg-icons": "~5.15.4",
         "@fortawesome/vue-fontawesome": "~3.0.0-5",
-        "@playwright/test": "~1.39.0",
         "@popperjs/core": "~2.10.2",
         "@types/bootstrap": "~5.1.9",
-        "@types/node": "^20.8.6",
-        "@typescript-eslint/eslint-plugin": "^6.7.5",
-        "@typescript-eslint/parser": "^6.7.5",
+        "@vitejs/plugin-legacy": "~4.1.0",
         "@vitejs/plugin-vue": "~4.2.3",
         "@vue/compiler-sfc": "~3.3.4",
         "@vuepic/vue-datepicker": "~3.4.8",
@@ -168,14 +160,15 @@
         "core-js": "~3.26.1",
         "cronstrue": "~2.24.0",
         "cross-env": "~7.0.3",
+        "cypress": "^12.17.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-jsdoc": "^46.4.6",
         "eslint-plugin-vue": "~8.7.1",
         "favico.js": "~0.3.10",
-        "get-port-please": "^3.1.1",
+        "jest": "~29.6.1",
         "marked": "~4.2.5",
         "node-ssh": "~13.1.0",
         "postcss-html": "~1.5.0",
@@ -188,11 +181,11 @@
         "stylelint": "^15.10.1",
         "stylelint-config-standard": "~25.0.0",
         "terser": "~5.15.0",
-        "test": "~3.3.0",
         "timezones-list": "~3.0.1",
         "typescript": "~4.4.4",
         "v-pagination-3": "~0.1.7",
         "vite": "~4.4.1",
+        "vite-plugin-commonjs": "^0.8.0",
         "vite-plugin-compression": "^0.5.1",
         "vue": "~3.3.4",
         "vue-chartjs": "~5.2.0",
@@ -206,7 +199,7 @@
         "vue-router": "~4.0.14",
         "vue-toastification": "~2.0.0-rc.5",
         "vuedraggable": "~4.1.0",
-        "wait-on": "^7.2.0",
+        "wait-on": "^6.0.1",
         "whatwg-url": "~12.0.1"
     }
 }

public/icon.svg

@@ -1,9 +1,10 @@
-<svg width="640" height="640" viewBox="0 0 640 640" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
-<g transform="matrix(1 0 0 1 320 320)">
-<linearGradient id="S3" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1 0 0 1 -319.99875 -320.0001577393)"  x1="259.78" y1="261.15" x2="463.85" y2="456.49">
+<svg width="640" height="640" viewBox="0 0 640 640" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M490.4 235.64C544.09 358.38 544.09 435.34 490.4 466.5C409.85 513.24 199.96 527.49 139.54 455.64C99.2601 407.74 99.2601 334.4 139.54 235.64C180.5 168.18 238.71 134.45 314.17 134.45C389.64 134.45 448.38 168.18 490.4 235.64Z" fill="url(#paint0_linear_381_799)"/>
+<path d="M490.4 235.64C544.09 358.38 544.09 435.34 490.4 466.5C409.85 513.24 199.96 527.49 139.54 455.64C99.2601 407.74 99.2601 334.4 139.54 235.64C180.5 168.18 238.71 134.45 314.17 134.45C389.64 134.45 448.38 168.18 490.4 235.64Z" stroke="#F2F2F2" stroke-opacity="0.51" stroke-width="200"/>
+<defs>
+<linearGradient id="paint0_linear_381_799" x1="259.78" y1="261.15" x2="463.85" y2="456.49" gradientUnits="userSpaceOnUse">
 <stop stop-color="#5CDD8B"/>
 <stop offset="1" stop-color="#86E6A9"/>
 </linearGradient>
-<path style="stroke: rgb(242,242,242); stroke-opacity: 0.51; stroke-width: 200; stroke-dasharray: none; stroke-linecap: butt; stroke-dashoffset: 0; stroke-linejoin: miter; stroke-miterlimit: 4; fill: url(#S3); fill-rule: nonzero; opacity: 1;"  transform=" translate(0, 0)" d="M 170.40125 -84.36016 C 224.09125 38.37984 224.09125 115.33984 170.40125 146.49984 C 89.85125000000001 193.23984000000002 -120.03875 207.48984000000002 -180.45875 135.63984 C -220.73875 87.73983999999999 -220.73875 14.399839999999998 -180.45875 -84.36016000000001 C -139.49875 -151.82016 -81.28875000000001 -185.55016 -5.828750000000014 -185.55016 C 69.64124999999999 -185.55016 128.38125 -151.82016000000002 170.40124999999998 -84.36016000000001 z" stroke-linecap="round" />
-</g>
+</defs>
 </svg>

server/cacheable-dns-http-agent.js

@@ -0,0 +1,88 @@
+const https = require("https");
+const http = require("http");
+const CacheableLookup = require("cacheable-lookup");
+const { Settings } = require("./settings");
+const { log } = require("../src/util");
+
+class CacheableDnsHttpAgent {
+
+    static cacheable = new CacheableLookup();
+
+    static httpAgentList = {};
+    static httpsAgentList = {};
+
+    static enable = false;
+
+    /**
+     * Register/Disable cacheable to global agents
+     * @returns {void}
+     */
+    static async update() {
+        log.debug("CacheableDnsHttpAgent", "update");
+        let isEnable = await Settings.get("dnsCache");
+
+        if (isEnable !== this.enable) {
+            log.debug("CacheableDnsHttpAgent", "value changed");
+
+            if (isEnable) {
+                log.debug("CacheableDnsHttpAgent", "enable");
+                this.cacheable.install(http.globalAgent);
+                this.cacheable.install(https.globalAgent);
+            } else {
+                log.debug("CacheableDnsHttpAgent", "disable");
+                this.cacheable.uninstall(http.globalAgent);
+                this.cacheable.uninstall(https.globalAgent);
+            }
+        }
+
+        this.enable = isEnable;
+    }
+
+    /**
+     * 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
+     */
+    static getHttpsAgent(agentOptions) {
+        if (!this.enable) {
+            return new https.Agent(agentOptions);
+        }
+
+        let key = JSON.stringify(agentOptions);
+        if (!(key in this.httpsAgentList)) {
+            this.httpsAgentList[key] = new https.Agent(agentOptions);
+            this.cacheable.install(this.httpsAgentList[key]);
+        }
+        return this.httpsAgentList[key];
+    }
+
+    /**
+     * @param {http.AgentOptions} agentOptions Options to pass to the HTTP agent
+     * @returns {https.Agents} The new HTTP agent
+     */
+    static getHttpAgent(agentOptions) {
+        if (!this.enable) {
+            return new http.Agent(agentOptions);
+        }
+
+        let key = JSON.stringify(agentOptions);
+        if (!(key in this.httpAgentList)) {
+            this.httpAgentList[key] = new http.Agent(agentOptions);
+            this.cacheable.install(this.httpAgentList[key]);
+        }
+        return this.httpAgentList[key];
+    }
+
+}
+
+module.exports = {
+    CacheableDnsHttpAgent,
+};

server/client.js

@@ -45,6 +45,8 @@ async function sendNotificationList(socket) {
  * @returns {Promise<void>}
  */
 async function sendHeartbeatList(socket, monitorID, toUser = false, overwrite = false) {
+    const timeLogger = new TimeLogger();
+
     let list = await R.getAll(`
         SELECT * FROM heartbeat
         WHERE monitor_id = ?
@@ -61,6 +63,8 @@ async function sendHeartbeatList(socket, monitorID, toUser = false, overwrite =
     } else {
         socket.emit("heartbeatList", monitorID, result, overwrite);
     }
+
+    timeLogger.print(`[Monitor: ${monitorID}] sendHeartbeatList`);
 }
 
 /**
@@ -143,18 +147,15 @@ async function sendAPIKeyList(socket) {
 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(),
@@ -185,30 +186,6 @@ async function sendDockerHostList(socket) {
     return list;
 }
 
-/**
- * Send list of docker hosts to client
- * @param {Socket} socket Socket.io socket instance
- * @returns {Promise<Bean[]>} List of docker hosts
- */
-async function sendRemoteBrowserList(socket) {
-    const timeLogger = new TimeLogger();
-
-    let result = [];
-    let list = await R.find("remote_browser", " user_id = ? ", [
-        socket.userID,
-    ]);
-
-    for (let bean of list) {
-        result.push(bean.toJSON());
-    }
-
-    io.to(socket.userID).emit("remoteBrowserList", result);
-
-    timeLogger.print("Send Remote Browser List");
-
-    return list;
-}
-
 module.exports = {
     sendNotificationList,
     sendImportantHeartbeatList,
@@ -216,6 +193,5 @@ module.exports = {
     sendProxyList,
     sendAPIKeyList,
     sendInfo,
-    sendDockerHostList,
-    sendRemoteBrowserList,
+    sendDockerHostList
 };

server/config.js

@@ -1,46 +1,29 @@
-const isFreeBSD = /^freebsd/.test(process.platform);
-
 // Interop with browser
 const args = (typeof process !== "undefined") ? require("args-parser")(process.argv) : {};
-
-// If host is omitted, the server will accept connections on the unspecified IPv6 address (::) when IPv6 is available and the unspecified IPv4 address (0.0.0.0) otherwise.
-// Dual-stack support for (::)
-// Also read HOST if not FreeBSD, as HOST is a system environment variable in FreeBSD
-let hostEnv = isFreeBSD ? null : process.env.HOST;
-const hostname = args.host || process.env.UPTIME_KUMA_HOST || hostEnv;
-
-const port = [ args.port, process.env.UPTIME_KUMA_PORT, process.env.PORT, 3001 ]
-    .map(portValue => parseInt(portValue))
-    .find(portValue => !isNaN(portValue));
-
-const sslKey = args["ssl-key"] || process.env.UPTIME_KUMA_SSL_KEY || process.env.SSL_KEY || undefined;
-const sslCert = args["ssl-cert"] || process.env.UPTIME_KUMA_SSL_CERT || process.env.SSL_CERT || undefined;
-const sslKeyPassphrase = args["ssl-key-passphrase"] || process.env.UPTIME_KUMA_SSL_KEY_PASSPHRASE || process.env.SSL_KEY_PASSPHRASE || undefined;
-
-const isSSL = sslKey && sslCert;
-
-/**
- * Get the local WebSocket URL
- * @returns {string} The local WebSocket URL
- */
-function getLocalWebSocketURL() {
-    const protocol = isSSL ? "wss" : "ws";
-    const host = hostname || "localhost";
-    return `${protocol}://${host}:${port}`;
-}
-
-const localWebSocketURL = getLocalWebSocketURL();
-
 const demoMode = args["demo"] || false;
 
+const badgeConstants = {
+    naColor: "#999",
+    defaultUpColor: "#66c20a",
+    defaultWarnColor: "#eed202",
+    defaultDownColor: "#c2290a",
+    defaultPendingColor: "#f8a306",
+    defaultMaintenanceColor: "#1747f5",
+    defaultPingColor: "blue",  // as defined by badge-maker / shields.io
+    defaultStyle: "flat",
+    defaultPingValueSuffix: "ms",
+    defaultPingLabelSuffix: "h",
+    defaultUptimeValueSuffix: "%",
+    defaultUptimeLabelSuffix: "h",
+    defaultCertExpValueSuffix: " days",
+    defaultCertExpLabelSuffix: "h",
+    // Values Come From Default Notification Times
+    defaultCertExpireWarnDays: "14",
+    defaultCertExpireDownDays: "7"
+};
+
 module.exports = {
     args,
-    hostname,
-    port,
-    sslKey,
-    sslCert,
-    sslKeyPassphrase,
-    isSSL,
-    localWebSocketURL,
     demoMode,
+    badgeConstants,
 };

server/database.js

@@ -12,40 +12,22 @@ const mysql = require("mysql2/promise");
  */
 class Database {
 
-    /**
-     * Boostrap database for SQLite
-     * @type {string}
-     */
     static templatePath = "./db/kuma.db";
 
     /**
      * Data Dir (Default: ./data)
-     * @type {string}
      */
     static dataDir;
 
     /**
      * User Upload Dir (Default: ./data/upload)
-     * @type {string}
      */
     static uploadDir;
 
-    /**
-     * Chrome Screenshot Dir (Default: ./data/screenshots)
-     * @type {string}
-     */
     static screenshotDir;
 
-    /**
-     * SQLite file path (Default: ./data/kuma.db)
-     * @type {string}
-     */
     static sqlitePath;
 
-    /**
-     * For storing Docker TLS certs (Default: ./data/docker-tls)
-     * @type {string}
-     */
     static dockerTLSDir;
 
     /**
@@ -102,10 +84,7 @@ 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,
-        "patch-notification-config.sql": true,
-        "patch-fix-kafka-producer-booleans.sql": true,
-        "patch-timeout.sql": true, // The last file so far converted to a knex migration file
+        "patch-add-gamedig-given-port.sql": true,   // The last file so far converted to a knex migration file
     };
 
     /**
@@ -151,14 +130,11 @@ class Database {
             fs.mkdirSync(Database.dockerTLSDir, { recursive: true });
         }
 
-        log.info("server", `Data Dir: ${Database.dataDir}`);
+        log.info("db", `Data Dir: ${Database.dataDir}`);
     }
 
     /**
-     * Read the database config
-     * @throws {Error} If the config is invalid
-     * @typedef {string|undefined} envString
-     * @returns {{type: "sqlite"} | {type:envString, hostname:envString, port:envString, database:envString, username:envString, password:envString}} Database config
+     *
      */
     static readDBConfig() {
         let dbConfig;
@@ -177,9 +153,7 @@ class Database {
     }
 
     /**
-     * @typedef {string|undefined} envString
-     * @param {{type: "sqlite"} | {type:envString, hostname:envString, port:envString, database:envString, username:envString, password:envString}} dbConfig the database configuration that should be written
-     * @returns {void}
+     * @param dbConfig
      */
     static writeDBConfig(dbConfig) {
         fs.writeFileSync(path.join(Database.dataDir, "db-config.json"), JSON.stringify(dbConfig, null, 4));
@@ -187,8 +161,10 @@ class Database {
 
     /**
      * Connect to the database
-     * @param {boolean} testMode Should the connection be started in test mode?
-     * @param {boolean} autoloadModels Should models be automatically loaded?
+     * @param {boolean} testMode Should the connection be
+     * started in test mode?
+     * @param {boolean} autoloadModels Should models be
+     * automatically loaded?
      * @param {boolean} noLog Should logs not be output?
      * @returns {Promise<void>}
      */
@@ -207,12 +183,6 @@ class Database {
 
         let config = {};
 
-        let mariadbPoolConfig = {
-            afterCreate: function (conn, done) {
-
-            }
-        };
-
         log.info("db", `Database Type: ${dbConfig.type}`);
 
         if (dbConfig.type === "sqlite") {
@@ -263,16 +233,7 @@ class Database {
                     user: dbConfig.username,
                     password: dbConfig.password,
                     database: dbConfig.dbName,
-                    timezone: "Z",
-                    typeCast: function (field, next) {
-                        if (field.type === "DATETIME") {
-                            // Do not perform timezone conversion
-                            return field.string();
-                        }
-                        return next();
-                    },
-                },
-                pool: mariadbPoolConfig,
+                }
             };
         } else if (dbConfig.type === "embedded-mariadb") {
             let embeddedMariaDB = EmbeddedMariaDB.getInstance();
@@ -284,16 +245,7 @@ class Database {
                     socketPath: embeddedMariaDB.socketPath,
                     user: "node",
                     database: "kuma",
-                    timezone: "Z",
-                    typeCast: function (field, next) {
-                        if (field.type === "DATETIME") {
-                            // Do not perform timezone conversion
-                            return field.string();
-                        }
-                        return next();
-                    },
-                },
-                pool: mariadbPoolConfig,
+                }
             };
         } else {
             throw new Error("Unknown Database type: " + dbConfig.type);
@@ -331,9 +283,8 @@ class Database {
     }
 
     /**
-     @param {boolean} testMode Should the connection be started in test mode?
-     @param {boolean} noLog Should logs not be output?
-     @returns {Promise<void>}
+     * @param testMode
+     * @param noLog
      */
     static async initSQLite(testMode, noLog) {
         await R.exec("PRAGMA foreign_keys = ON");
@@ -353,16 +304,15 @@ class Database {
         await R.exec("PRAGMA synchronous = NORMAL");
 
         if (!noLog) {
-            log.debug("db", "SQLite config:");
-            log.debug("db", await R.getAll("PRAGMA journal_mode"));
-            log.debug("db", await R.getAll("PRAGMA cache_size"));
-            log.debug("db", "SQLite Version: " + await R.getCell("SELECT sqlite_version()"));
+            log.info("db", "SQLite config:");
+            log.info("db", await R.getAll("PRAGMA journal_mode"));
+            log.info("db", await R.getAll("PRAGMA cache_size"));
+            log.info("db", "SQLite Version: " + await R.getCell("SELECT sqlite_version()"));
         }
     }
 
     /**
-     * Initialize MariaDB
-     * @returns {Promise<void>}
+     *
      */
     static async initMariaDB() {
         log.debug("db", "Checking if MariaDB database exists...");
@@ -394,19 +344,12 @@ class Database {
                 directory: Database.knexMigrationsPath,
             });
         } catch (e) {
-            // Allow missing patch files for downgrade or testing pr.
-            if (e.message.includes("the following files are missing:")) {
-                log.warn("db", e.message);
-                log.warn("db", "Database migration failed, you may be downgrading Uptime Kuma.");
-            } else {
-                log.error("db", "Database migration failed");
-                throw e;
-            }
+            log.error("db", "Database migration failed");
+            throw e;
         }
     }
 
     /**
-     * TODO
      * @returns {Promise<void>}
      */
     static async rollbackLatestPatch() {
@@ -415,7 +358,6 @@ class Database {
 
     /**
      * Patch the database for SQLite
-     * @returns {Promise<void>}
      * @deprecated
      */
     static async patchSqlite() {
@@ -425,15 +367,13 @@ class Database {
             version = 0;
         }
 
-        if (version !== this.latestVersion) {
-            log.info("db", "Your database version: " + version);
-            log.info("db", "Latest database version: " + this.latestVersion);
-        }
+        log.info("db", "Your database version: " + version);
+        log.info("db", "Latest database version: " + this.latestVersion);
 
         if (version === this.latestVersion) {
-            log.debug("db", "Database patch not needed");
+            log.info("db", "Database patch not needed");
         } else if (version > this.latestVersion) {
-            log.warn("db", "Warning: Database version is newer than expected");
+            log.info("db", "Warning: Database version is newer than expected");
         } else {
             log.info("db", "Database patch is needed");
 
@@ -469,7 +409,7 @@ class Database {
      * @returns {Promise<void>}
      */
     static async patchSqlite2() {
-        log.debug("db", "Database Patch 2.0 Process");
+        log.info("db", "Database Patch 2.0 Process");
         let databasePatchedFiles = await setting("databasePatchedFiles");
 
         if (! databasePatchedFiles) {
@@ -642,6 +582,14 @@ class Database {
         }
     }
 
+    /**
+     * Aquire a direct connection to database
+     * @returns {any} Database connection
+     */
+    static getBetterSQLite3Database() {
+        return R.knex.client.acquireConnection();
+    }
+
     /**
      * Special handle, because tarn.js throw a promise reject that cannot be caught
      * @returns {Promise<void>}
@@ -655,9 +603,7 @@ class Database {
         log.info("db", "Closing the database");
 
         // Flush WAL to main database
-        if (Database.dbConfig.type === "sqlite") {
-            await R.exec("PRAGMA wal_checkpoint(TRUNCATE)");
-        }
+        await R.exec("PRAGMA wal_checkpoint(TRUNCATE)");
 
         while (true) {
             Database.noReject = true;
@@ -670,23 +616,20 @@ class Database {
                 log.info("db", "Waiting to close the database");
             }
         }
-        log.info("db", "Database closed");
+        log.info("db", "SQLite closed");
 
         process.removeListener("unhandledRejection", listener);
     }
 
     /**
-     * Get the size of the database (SQLite only)
+     * Get the size of the database
      * @returns {number} Size of database
      */
     static getSize() {
-        if (Database.dbConfig.type === "sqlite") {
-            log.debug("db", "Database.getSize()");
-            let stats = fs.statSync(Database.sqlitePath);
-            log.debug("db", stats);
-            return stats.size;
-        }
-        return 0;
+        log.debug("db", "Database.getSize()");
+        let stats = fs.statSync(Database.sqlitePath);
+        log.debug("db", stats);
+        return stats.size;
     }
 
     /**
@@ -694,16 +637,14 @@ class Database {
      * @returns {Promise<void>}
      */
     static async shrink() {
-        if (Database.dbConfig.type === "sqlite") {
-            await R.exec("VACUUM");
-        }
+        await R.exec("VACUUM");
     }
 
     /**
-     * @returns {string} Get the SQL for the current time plus a number of hours
+     *
      */
     static sqlHourOffset() {
-        if (Database.dbConfig.type === "sqlite") {
+        if (this.dbConfig.client === "sqlite3") {
             return "DATETIME('now', ? || ' hours')";
         } else {
             return "DATE_ADD(NOW(), INTERVAL ? HOUR)";

server/docker.js

@@ -1,10 +1,10 @@
 const axios = require("axios");
 const { R } = require("redbean-node");
+const version = require("../package.json").version;
 const https = require("https");
 const fs = require("fs");
 const path = require("path");
 const Database = require("./database");
-const { axiosAbortSignal } = require("./util-server");
 
 class DockerHost {
 
@@ -70,47 +70,39 @@ class DockerHost {
     static async testDockerHost(dockerHost) {
         const options = {
             url: "/containers/json?all=true",
-            timeout: 5000,
             headers: {
                 "Accept": "*/*",
+                "User-Agent": "Uptime-Kuma/" + version
             },
-            signal: axiosAbortSignal(6000),
         };
 
         if (dockerHost.dockerType === "socket") {
             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));
 
-        try {
-            let res = await axios.request(options);
+        let res = await axios.request(options);
 
-            if (Array.isArray(res.data)) {
+        if (Array.isArray(res.data)) {
 
-                if (res.data.length > 1) {
+            if (res.data.length > 1) {
 
-                    if ("ImageID" in res.data[0]) {
-                        return res.data.length;
-                    } else {
-                        throw new Error("Invalid Docker response, is it Docker really a daemon?");
-                    }
-
-                } else {
+                if ("ImageID" in res.data[0]) {
                     return res.data.length;
+                } else {
+                    throw new Error("Invalid Docker response, is it Docker really a daemon?");
                 }
 
             } else {
-                throw new Error("Invalid Docker response, is it Docker really a daemon?");
-            }
-        } catch (e) {
-            if (e.code === "ECONNABORTED" || e.name === "CanceledError") {
-                throw new Error("Connection to Docker daemon timed out.");
-            } else {
-                throw e;
+                return res.data.length;
             }
+
+        } else {
+            throw new Error("Invalid Docker response, is it Docker really a daemon?");
         }
+
     }
 
     /**

server/embedded-mariadb.js

@@ -18,17 +18,13 @@ class EmbeddedMariaDB {
 
     socketPath = this.runDir + "/mysqld.sock";
 
-    /**
-     * @type {ChildProcessWithoutNullStreams}
-     * @private
-     */
     childProcess = null;
     running = false;
 
     started = false;
 
     /**
-     * @returns {EmbeddedMariaDB} The singleton instance
+     * @returns {EmbeddedMariaDB}
      */
     static getInstance() {
         if (!EmbeddedMariaDB.instance) {
@@ -38,15 +34,14 @@ class EmbeddedMariaDB {
     }
 
     /**
-     * @returns {boolean} If the singleton instance is created
+     *
      */
     static hasInstance() {
         return !!EmbeddedMariaDB.instance;
     }
 
     /**
-     * Start the embedded MariaDB
-     * @returns {Promise<void>|void} A promise that resolves when the MariaDB is started or void if it is already started
+     *
      */
     start() {
         if (this.childProcess) {
@@ -108,8 +103,7 @@ class EmbeddedMariaDB {
     }
 
     /**
-     * Stop all the child processes
-     * @returns {void}
+     *
      */
     stop() {
         if (this.childProcess) {
@@ -119,8 +113,7 @@ class EmbeddedMariaDB {
     }
 
     /**
-     * Install MariaDB if it is not installed and make sure the `runDir` directory exists
-     * @returns {void}
+     *
      */
     initDB() {
         if (!fs.existsSync(this.mariadbDataDir)) {
@@ -153,8 +146,7 @@ class EmbeddedMariaDB {
     }
 
     /**
-     * Initialise the "kuma" database in mariadb if it does not exist
-     * @returns {Promise<void>}
+     *
      */
     async initDBAfterStarted() {
         const connection = mysql.createConnection({

server/google-analytics.js

@@ -1,5 +1,4 @@
 const jsesc = require("jsesc");
-const { escape } = require("html-escaper");
 
 /**
  * Returns a string that represents the javascript that is required to insert the Google Analytics scripts
@@ -8,18 +7,15 @@ const { escape } = require("html-escaper");
  * @returns {string} HTML script tags to inject into page
  */
 function getGoogleAnalyticsScript(tagId) {
-    let escapedTagIdJS = jsesc(tagId, { isScriptContext: true });
+    let escapedTagId = jsesc(tagId, { isScriptContext: true });
 
-    if (escapedTagIdJS) {
-        escapedTagIdJS = escapedTagIdJS.trim();
+    if (escapedTagId) {
+        escapedTagId = escapedTagId.trim();
     }
 
-    // Escape the tag ID for use in an HTML attribute.
-    let escapedTagIdHTMLAttribute = escape(tagId);
-
     return `
-        <script async src="https://www.googletagmanager.com/gtag/js?id=${escapedTagIdHTMLAttribute}"></script>
-        <script>window.dataLayer = window.dataLayer || []; function gtag(){dataLayer.push(arguments);} gtag('js', new Date());gtag('config', '${escapedTagIdJS}'); </script>
+        <script async src="https://www.googletagmanager.com/gtag/js?id=${escapedTagId}"></script>
+        <script>window.dataLayer = window.dataLayer || []; function gtag(){dataLayer.push(arguments);} gtag('js', new Date());gtag('config', '${escapedTagId}'); </script>
     `;
 }
 

server/jobs/clear-old-data.js

@@ -43,9 +43,7 @@ const clearOldData = async () => {
                 [ parsedPeriod * -24 ]
             );
 
-            if (Database.dbConfig.type === "sqlite") {
-                await R.exec("PRAGMA optimize;");
-            }
+            await R.exec("PRAGMA optimize;");
         } catch (e) {
             log.error("clearOldData", `Failed to clear old data: ${e.message}`);
         }

server/model/heartbeat.js

@@ -29,17 +29,24 @@ class Heartbeat extends BeanModel {
      */
     toJSON() {
         return {
-            monitorID: this._monitorId,
-            status: this._status,
-            time: this._time,
-            msg: this._msg,
-            ping: this._ping,
-            important: this._important,
-            duration: this._duration,
-            retries: this._retries,
+            monitorID: this.monitor_id,
+            status: this.status,
+            time: this.time,
+            msg: this.msg,
+            ping: this.ping,
+            important: this.important,
+            duration: this.duration,
         };
     }
 
+    /**
+     * TODO: Find the msg from the `msg` table and get the msg_id
+     * @param value
+     */
+    set msg(value) {
+        throw new Error("Not implemented yet")
+    }
+
 }
 
 module.exports = Heartbeat;

server/model/monitor.js

@@ -1,11 +1,12 @@
+const https = require("https");
 const dayjs = require("dayjs");
 const axios = require("axios");
 const { Prometheus } = require("../prometheus");
-const { log, UP, DOWN, PENDING, MAINTENANCE, flipStatus, MAX_INTERVAL_SECOND, MIN_INTERVAL_SECOND,
+const { log, UP, DOWN, PENDING, MAINTENANCE, flipStatus, TimeLogger, MAX_INTERVAL_SECOND, MIN_INTERVAL_SECOND,
     SQL_DATETIME_FORMAT
 } = require("../../src/util");
-const { tcping, ping, checkCertificate, checkStatusCode, getTotalClientInRoom, setting, mssqlQuery, postgresQuery, mysqlQuery, setSetting, httpNtlm, radius, grpcQuery,
-    redisPingAsync, mongodbPing, kafkaProducerAsync, getOidcTokenClientCredentials, rootCertificatesFingerprints, axiosAbortSignal
+const { tcping, ping, dnsResolve, checkCertificate, checkStatusCode, getTotalClientInRoom, setting, mssqlQuery, postgresQuery, mysqlQuery, mqttAsync, setSetting, httpNtlm, radius, grpcQuery,
+    redisPingAsync, mongodbPing, kafkaProducerAsync, getOidcTokenClientCredentials,
 } = require("../util-server");
 const { R } = require("redbean-node");
 const { BeanModel } = require("redbean-node/dist/bean-model");
@@ -15,18 +16,13 @@ const { demoMode } = require("../config");
 const version = require("../../package.json").version;
 const apicache = require("../modules/apicache");
 const { UptimeKumaServer } = require("../uptime-kuma-server");
+const { CacheableDnsHttpAgent } = require("../cacheable-dns-http-agent");
 const { DockerHost } = require("../docker");
+const { UptimeCacheList } = require("../uptime-cache-list");
 const Gamedig = require("gamedig");
 const jsonata = require("jsonata");
 const jwt = require("jsonwebtoken");
-const crypto = require("crypto");
-const { UptimeCalculator } = require("../uptime-calculator");
-const { CookieJar } = require("tough-cookie");
-const { HttpsCookieAgent } = require("http-cookie-agent/http");
-const https = require("https");
-const http = require("http");
-
-const rootCertificates = rootCertificatesFingerprints();
+const Database = require("../database");
 
 /**
  * status:
@@ -61,7 +57,7 @@ class Monitor extends BeanModel {
             obj.tags = await this.getTags();
         }
 
-        if (certExpiry && (this.type === "http" || this.type === "keyword" || this.type === "json-query") && this.getURLProtocol() === "https:") {
+        if (certExpiry && this.type === "http") {
             const { certExpiryDaysRemaining, validCert } = await this.getCertExpiry(this.id);
             obj.certExpiryDaysRemaining = certExpiryDaysRemaining;
             obj.validCert = validCert;
@@ -135,7 +131,6 @@ class Monitor extends BeanModel {
             maintenance: await Monitor.isUnderMaintenance(this.id),
             mqttTopic: this.mqttTopic,
             mqttSuccessMessage: this.mqttSuccessMessage,
-            mqttCheckType: this.mqttCheckType,
             databaseQuery: this.databaseQuery,
             authMethod: this.authMethod,
             grpcUrl: this.grpcUrl,
@@ -152,11 +147,10 @@ class Monitor extends BeanModel {
             expectedValue: this.expectedValue,
             kafkaProducerTopic: this.kafkaProducerTopic,
             kafkaProducerBrokers: JSON.parse(this.kafkaProducerBrokers),
-            kafkaProducerSsl: this.getKafkaProducerSsl(),
-            kafkaProducerAllowAutoTopicCreation: this.getKafkaProducerAllowAutoTopicCreation(),
+            kafkaProducerSsl: this.kafkaProducerSsl === "1" && true || false,
+            kafkaProducerAllowAutoTopicCreation: this.kafkaProducerAllowAutoTopicCreation === "1" && true || false,
             kafkaProducerMessage: this.kafkaProducerMessage,
             screenshot,
-            remote_browser: this.remote_browser,
         };
 
         if (includeSensitiveData) {
@@ -298,29 +292,12 @@ class Monitor extends BeanModel {
     }
 
     /**
-     * Get if game dig should only use the port which was provided
-     * @returns {boolean} gamedig should only use the provided port
+     *
      */
     getGameDigGivenPortOnly() {
         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
@@ -355,9 +332,6 @@ class Monitor extends BeanModel {
                 previousBeat = await R.findOne("heartbeat", " monitor_id = ? ORDER BY time DESC", [
                     this.id,
                 ]);
-                if (previousBeat) {
-                    retries = previousBeat.retries;
-                }
             }
 
             const isFirstBeat = !previousBeat;
@@ -372,10 +346,11 @@ class Monitor extends BeanModel {
                 bean.status = flipStatus(bean.status);
             }
 
-            // 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;
+            // Duration
+            if (!isFirstBeat) {
+                bean.duration = dayjs(bean.time).diff(dayjs(previousBeat.time), "second");
+            } else {
+                bean.duration = 0;
             }
 
             try {
@@ -433,7 +408,9 @@ class Monitor extends BeanModel {
                     if (this.auth_method === "oauth2-cc") {
                         try {
                             if (this.oauthAccessToken === undefined || new Date(this.oauthAccessToken.expires_at * 1000) <= new Date()) {
-                                this.oauthAccessToken = await this.makeOidcTokenClientCredentialsRequest();
+                                log.debug("monitor", `[${this.name}] The oauth access-token undefined or expired. Requesting a new one`);
+                                this.oauthAccessToken = await getOidcTokenClientCredentials(this.oauth_token_url, this.oauth_client_id, this.oauth_client_secret, this.oauth_scopes, this.oauth_auth_method);
+                                log.debug("monitor", `[${this.name}] Obtained oauth access-token. Expires at ${new Date(this.oauthAccessToken.expires_at * 1000)}`);
                             }
                             oauth2AuthHeader = {
                                 "Authorization": this.oauthAccessToken.token_type + " " + this.oauthAccessToken.access_token,
@@ -446,7 +423,6 @@ class Monitor extends BeanModel {
                     const httpsAgentOptions = {
                         maxCachedSessions: 0, // Use Custom agent to disable session reuse (https://github.com/nodejs/node/issues/3940)
                         rejectUnauthorized: !this.getIgnoreTls(),
-                        secureOptions: crypto.constants.SSL_OP_LEGACY_SERVER_CONNECT,
                     };
 
                     log.debug("monitor", `[${this.name}] Prepare Options for axios`);
@@ -462,9 +438,6 @@ class Monitor extends BeanModel {
                             } catch (e) {
                                 throw new Error("Your JSON body is invalid. " + e.message);
                             }
-                        } else if (this.httpBodyEncoding === "form") {
-                            bodyValue = this.body;
-                            contentType = "application/x-www-form-urlencoded";
                         } else if (this.httpBodyEncoding === "xml") {
                             bodyValue = this.body;
                             contentType = "text/xml; charset=utf-8";
@@ -478,6 +451,7 @@ class Monitor extends BeanModel {
                         timeout: this.timeout * 1000,
                         headers: {
                             "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9",
+                            "User-Agent": "Uptime-Kuma/" + version,
                             ...(contentType ? { "Content-Type": contentType } : {}),
                             ...(basicAuthHeader),
                             ...(oauth2AuthHeader),
@@ -487,7 +461,6 @@ class Monitor extends BeanModel {
                         validateStatus: (status) => {
                             return checkStatusCode(status, this.getAcceptedStatuscodes());
                         },
-                        signal: axiosAbortSignal((this.timeout + 10) * 1000),
                     };
 
                     if (bodyValue) {
@@ -509,12 +482,7 @@ class Monitor extends BeanModel {
                     }
 
                     if (!options.httpsAgent) {
-                        let jar = new CookieJar();
-                        let httpsCookieAgentOptions = {
-                            ...httpsAgentOptions,
-                            cookies: { jar }
-                        };
-                        options.httpsAgent = new HttpsCookieAgent(httpsCookieAgentOptions);
+                        options.httpsAgent = new https.Agent(httpsAgentOptions);
                     }
 
                     if (this.auth_method === "mtls") {
@@ -620,6 +588,46 @@ class Monitor extends BeanModel {
                     bean.ping = await ping(this.hostname, this.packetSize);
                     bean.msg = "";
                     bean.status = UP;
+                } else if (this.type === "dns") {
+                    let startTime = dayjs().valueOf();
+                    let dnsMessage = "";
+
+                    let dnsRes = await dnsResolve(this.hostname, this.dns_resolve_server, this.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") {
+                        dnsMessage += "Records: ";
+                        dnsMessage += dnsRes.join(" | ");
+                    } else if (this.dns_resolve_type === "CNAME" || this.dns_resolve_type === "PTR") {
+                        dnsMessage = dnsRes[0];
+                    } else if (this.dns_resolve_type === "CAA") {
+                        dnsMessage = dnsRes[0].issue;
+                    } else if (this.dns_resolve_type === "MX") {
+                        dnsRes.forEach(record => {
+                            dnsMessage += `Hostname: ${record.exchange} - Priority: ${record.priority} | `;
+                        });
+                        dnsMessage = dnsMessage.slice(0, -2);
+                    } else if (this.dns_resolve_type === "NS") {
+                        dnsMessage += "Servers: ";
+                        dnsMessage += dnsRes.join(" | ");
+                    } else if (this.dns_resolve_type === "SOA") {
+                        dnsMessage += `NS-Name: ${dnsRes.nsname} | Hostmaster: ${dnsRes.hostmaster} | Serial: ${dnsRes.serial} | Refresh: ${dnsRes.refresh} | Retry: ${dnsRes.retry} | Expire: ${dnsRes.expire} | MinTTL: ${dnsRes.minttl}`;
+                    } else if (this.dns_resolve_type === "SRV") {
+                        dnsRes.forEach(record => {
+                            dnsMessage += `Name: ${record.name} | Port: ${record.port} | Priority: ${record.priority} | Weight: ${record.weight} | `;
+                        });
+                        dnsMessage = dnsMessage.slice(0, -2);
+                    }
+
+                    if (this.dnsLastResult !== dnsMessage) {
+                        R.exec("UPDATE `monitor` SET dns_last_result = ? WHERE id = ? ", [
+                            dnsMessage,
+                            this.id
+                        ]);
+                    }
+
+                    bean.msg = dnsMessage;
+                    bean.status = UP;
                 } else if (this.type === "push") {      // Type: Push
                     log.debug("monitor", `[${this.name}] Checking monitor at ${dayjs().format("YYYY-MM-DD HH:mm:ss.SSS")}`);
                     const bufferTime = 1000; // 1s buffer to accommodate clock differences
@@ -632,7 +640,6 @@ class Monitor extends BeanModel {
                         // If the previous beat was down or pending we use the regular
                         // beatInterval/retryInterval in the setTimeout further below
                         if (previousBeat.status !== (this.isUpsideDown() ? DOWN : UP) || msSinceLastBeat > beatInterval * 1000 + bufferTime) {
-                            bean.duration = Math.round(msSinceLastBeat / 1000);
                             throw new Error("No heartbeat in the time window");
                         } else {
                             let timeout = beatInterval * 1000 - msSinceLastBeat;
@@ -648,7 +655,6 @@ class Monitor extends BeanModel {
                             return;
                         }
                     } else {
-                        bean.duration = beatInterval;
                         throw new Error("No heartbeat in the time window");
                     }
 
@@ -665,13 +671,13 @@ class Monitor extends BeanModel {
                         timeout: this.timeout * 1000,
                         headers: {
                             "Accept": "*/*",
+                            "User-Agent": "Uptime-Kuma/" + version,
                         },
-                        httpsAgent: new https.Agent({
+                        httpsAgent: CacheableDnsHttpAgent.getHttpsAgent({
                             maxCachedSessions: 0,      // Use Custom agent to disable session reuse (https://github.com/nodejs/node/issues/3940)
                             rejectUnauthorized: !this.getIgnoreTls(),
-                            secureOptions: crypto.constants.SSL_OP_LEGACY_SERVER_CONNECT,
                         }),
-                        httpAgent: new http.Agent({
+                        httpAgent: CacheableDnsHttpAgent.getHttpAgent({
                             maxCachedSessions: 0,
                         }),
                         maxRedirects: this.maxredirects,
@@ -712,33 +718,29 @@ 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,
                         headers: {
                             "Accept": "*/*",
+                            "User-Agent": "Uptime-Kuma/" + version,
                         },
-                        httpsAgent: new https.Agent({
+                        httpsAgent: CacheableDnsHttpAgent.getHttpsAgent({
                             maxCachedSessions: 0,      // Use Custom agent to disable session reuse (https://github.com/nodejs/node/issues/3940)
                             rejectUnauthorized: !this.getIgnoreTls(),
-                            secureOptions: crypto.constants.SSL_OP_LEGACY_SERVER_CONNECT,
                         }),
-                        httpAgent: new http.Agent({
+                        httpAgent: CacheableDnsHttpAgent.getHttpAgent({
                             maxCachedSessions: 0,
                         }),
                     };
 
-                    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") {
                         options.baseURL = DockerHost.patchDockerURL(dockerHost._dockerDaemon);
-                        options.httpsAgent = new https.Agent(
+                        options.httpsAgent = CacheableDnsHttpAgent.getHttpsAgent(
                             DockerHost.getHttpsAgentOptions(dockerHost._dockerType, options.baseURL)
                         );
                     }
@@ -757,10 +759,18 @@ class Monitor extends BeanModel {
                     } else {
                         throw Error("Container State is " + res.data.State.Status);
                     }
+                } else if (this.type === "mqtt") {
+                    bean.msg = await mqttAsync(this.hostname, this.mqttTopic, this.mqttSuccessMessage, {
+                        port: this.port,
+                        username: this.mqttUsername,
+                        password: this.mqttPassword,
+                        interval: this.interval,
+                    });
+                    bean.status = UP;
                 } else if (this.type === "sqlserver") {
                     let startTime = dayjs().valueOf();
 
-                    await mssqlQuery(this.databaseConnectionString, this.databaseQuery || "SELECT 1");
+                    await mssqlQuery(this.databaseConnectionString, this.databaseQuery);
 
                     bean.msg = "";
                     bean.status = UP;
@@ -799,7 +809,7 @@ class Monitor extends BeanModel {
                 } else if (this.type === "postgres") {
                     let startTime = dayjs().valueOf();
 
-                    await postgresQuery(this.databaseConnectionString, this.databaseQuery || "SELECT 1");
+                    await postgresQuery(this.databaseConnectionString, this.databaseQuery);
 
                     bean.msg = "";
                     bean.status = UP;
@@ -807,11 +817,7 @@ class Monitor extends BeanModel {
                 } else if (this.type === "mysql") {
                     let startTime = dayjs().valueOf();
 
-                    // 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.msg = await mysqlQuery(this.databaseConnectionString, this.databaseQuery);
                     bean.status = UP;
                     bean.ping = dayjs().valueOf() - startTime;
                 } else if (this.type === "mongodb") {
@@ -899,11 +905,7 @@ class Monitor extends BeanModel {
 
             } catch (error) {
 
-                if (error?.name === "CanceledError") {
-                    bean.msg = `timeout by AbortSignal (${this.timeout}s)`;
-                } else {
-                    bean.msg = error.message;
-                }
+                bean.msg = error.message;
 
                 // If UP come in here, it must be upside down mode
                 // Just reset the retries
@@ -913,14 +915,9 @@ class Monitor extends BeanModel {
                 } else if ((this.maxretries > 0) && (retries < this.maxretries)) {
                     retries++;
                     bean.status = PENDING;
-                } else {
-                    // Continue counting retries during DOWN
-                    retries++;
                 }
             }
 
-            bean.retries = retries;
-
             log.debug("monitor", `[${this.name}] Check isImportant`);
             let isImportant = Monitor.isImportantBeat(isFirstBeat, previousBeat?.status, bean.status);
 
@@ -974,17 +971,11 @@ class Monitor extends BeanModel {
                 log.warn("monitor", `Monitor #${this.id} '${this.name}': Failing: ${bean.msg} | Interval: ${beatInterval} seconds | Type: ${this.type} | Down Count: ${bean.downCount} | Resend Interval: ${this.resendInterval}`);
             }
 
-            // Calculate uptime
-            let uptimeCalculator = await UptimeCalculator.getUptimeCalculator(this.id);
-            let endTimeDayjs = await uptimeCalculator.update(bean.status, parseFloat(bean.ping));
-            bean.end_time = R.isoDateTimeMillis(endTimeDayjs);
-
-            // Send to frontend
             log.debug("monitor", `[${this.name}] Send to socket`);
+            UptimeCacheList.clearCache(this.id);
             io.to(this.user_id).emit("heartbeat", bean.toJSON());
             Monitor.sendStats(io, this.id, this.user_id);
 
-            // Store to database
             log.debug("monitor", `[${this.name}] Store`);
             await R.store(bean);
 
@@ -995,15 +986,7 @@ class Monitor extends BeanModel {
 
             if (! this.isStop) {
                 log.debug("monitor", `[${this.name}] SetTimeout for next check.`);
-
-                let intervalRemainingMs = Math.max(
-                    1,
-                    beatInterval * 1000 - dayjs().diff(dayjs.utc(bean.time))
-                );
-
-                log.debug("monitor", `[${this.name}] Next heartbeat in: ${intervalRemainingMs}ms`);
-
-                this.heartbeatInterval = setTimeout(safeBeat, intervalRemainingMs);
+                this.heartbeatInterval = setTimeout(safeBeat, beatInterval * 1000);
             } else {
                 log.info("monitor", `[${this.name}] isStop = true, no next check.`);
             }
@@ -1063,35 +1046,18 @@ class Monitor extends BeanModel {
             }
 
             return res;
-        } catch (error) {
-
-            /**
-             * Make a single attempt to obtain an new access token in the event that
-             * the recent api request failed for authentication purposes
-             */
-            if (this.auth_method === "oauth2-cc" && error.response.status === 401 && !finalCall) {
-                this.oauthAccessToken = await this.makeOidcTokenClientCredentialsRequest();
-                let oauth2AuthHeader = {
-                    "Authorization": this.oauthAccessToken.token_type + " " + this.oauthAccessToken.access_token,
-                };
-                options.headers = { ...(options.headers),
-                    ...(oauth2AuthHeader)
-                };
-
-                return this.makeAxiosRequest(options, true);
-            }
-
+        } catch (e) {
             // Fix #2253
             // Read more: https://stackoverflow.com/questions/1759956/curl-error-18-transfer-closed-with-outstanding-read-data-remaining
-            if (!finalCall && typeof error.message === "string" && error.message.includes("maxContentLength size of -1 exceeded")) {
+            if (!finalCall && typeof e.message === "string" && e.message.includes("maxContentLength size of -1 exceeded")) {
                 log.debug("monitor", "makeAxiosRequest with gzip");
                 options.headers["Accept-Encoding"] = "gzip, deflate";
                 return this.makeAxiosRequest(options, true);
             } else {
-                if (typeof error.message === "string" && error.message.includes("maxContentLength size of -1 exceeded")) {
-                    error.message = "response timeout: incomplete response within a interval";
+                if (typeof e.message === "string" && e.message.includes("maxContentLength size of -1 exceeded")) {
+                    e.message = "response timeout: incomplete response within a interval";
                 }
-                throw error;
+                throw e;
             }
         }
     }
@@ -1129,19 +1095,6 @@ class Monitor extends BeanModel {
         }
     }
 
-    /**
-     * Example: http: or https:
-     * @returns {(null|string)} URL's protocol
-     */
-    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
@@ -1196,31 +1149,44 @@ class Monitor extends BeanModel {
      */
     static async sendStats(io, monitorID, userID) {
         const hasClients = getTotalClientInRoom(io, userID) > 0;
-        let uptimeCalculator = await UptimeCalculator.getUptimeCalculator(monitorID);
 
         if (hasClients) {
-            // Send 24 hour average ping
-            let data24h = await uptimeCalculator.get24Hour();
-            io.to(userID).emit("avgPing", monitorID, (data24h.avgPing) ? Number(data24h.avgPing.toFixed(2)) : null);
-
-            // Send 24 hour uptime
-            io.to(userID).emit("uptime", monitorID, 24, data24h.uptime);
-
-            // Send 30 day uptime
-            let data30d = await uptimeCalculator.get30Day();
-            io.to(userID).emit("uptime", monitorID, 720, data30d.uptime);
-
-            // Send 1-year uptime
-            let data1y = await uptimeCalculator.get1Year();
-            io.to(userID).emit("uptime", monitorID, "1y", data1y.uptime);
-
-            // Send Cert Info
+            await Monitor.sendAvgPing(24, io, monitorID, userID);
+            await Monitor.sendUptime(24, io, monitorID, userID);
+            await Monitor.sendUptime(24 * 30, io, monitorID, userID);
             await Monitor.sendCertInfo(io, monitorID, userID);
         } else {
             log.debug("monitor", "No clients in the room, no need to send stats");
         }
     }
 
+    /**
+     * 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}
+            AND ping IS NOT NULL
+            AND monitor_id = ? `, [
+            -duration,
+            monitorID,
+        ]));
+
+        timeLogger.print(`[Monitor: ${monitorID}] avgPing`);
+
+        io.to(userID).emit("avgPing", monitorID, avgPing);
+    }
+
     /**
      * Send certificate information to client
      * @param {Server} io Socket server instance
@@ -1237,6 +1203,101 @@ class Monitor extends BeanModel {
         }
     }
 
+    /**
+     * Uptime with calculation
+     * Calculation based on:
+     * 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) {
+
+        if (!forceNoCache) {
+            let cachedUptime = UptimeCacheList.getUptime(monitorID, duration);
+            if (cachedUptime != null) {
+                return cachedUptime;
+            }
+        }
+
+        const timeLogger = new TimeLogger();
+
+        const startTime = R.isoDateTime(dayjs.utc().subtract(duration, "hour"));
+
+        // Handle if heartbeat duration longer than the target duration
+        // e.g. If the last beat's duration is bigger that the 24hrs window, it will use the duration between the (beat time - window margin) (THEN case in SQL)
+        let result = await R.getRow(`
+            SELECT
+               -- SUM all duration, also trim off the beat out of time window
+                SUM(
+                    CASE
+                        WHEN (JULIANDAY(\`time\`) - JULIANDAY(?)) * 86400 < duration
+                        THEN (JULIANDAY(\`time\`) - JULIANDAY(?)) * 86400
+                        ELSE duration
+                    END
+                ) AS total_duration,
+
+               -- SUM all uptime duration, also trim off the beat out of time window
+                SUM(
+                    CASE
+                        WHEN (status = 1 OR status = 3)
+                        THEN
+                            CASE
+                                WHEN (JULIANDAY(\`time\`) - JULIANDAY(?)) * 86400 < duration
+                                    THEN (JULIANDAY(\`time\`) - JULIANDAY(?)) * 86400
+                                ELSE duration
+                            END
+                        END
+                ) AS uptime_duration
+            FROM heartbeat
+            WHERE time > ?
+            AND monitor_id = ?
+        `, [
+            startTime, startTime, startTime, startTime, startTime,
+            monitorID,
+        ]);
+
+        timeLogger.print(`[Monitor: ${monitorID}][${duration}] sendUptime`);
+
+        let totalDuration = result.total_duration;
+        let uptimeDuration = result.uptime_duration;
+        let uptime = 0;
+
+        if (totalDuration > 0) {
+            uptime = uptimeDuration / totalDuration;
+            if (uptime < 0) {
+                uptime = 0;
+            }
+
+        } else {
+            // Handle new monitor with only one beat, because the beat's duration = 0
+            let status = parseInt(await R.getCell("SELECT `status` FROM heartbeat WHERE monitor_id = ?", [ monitorID ]));
+
+            if (status === UP) {
+                uptime = 1;
+            }
+        }
+
+        // Cache
+        UptimeCacheList.addUptime(monitorID, duration, uptime);
+
+        return uptime;
+    }
+
+    /**
+     * Send Uptime
+     * @param {number} duration Hours
+     * @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);
+        io.to(userID).emit("uptime", monitorID, duration, uptime);
+    }
+
     /**
      * Has status of monitor changed since last beat?
      * @param {boolean} isFirstBeat Is this the first beat of this monitor?
@@ -1382,10 +1443,7 @@ class Monitor extends BeanModel {
                     let certInfo = tlsInfoObject.certInfo;
                     while (certInfo) {
                         let subjectCN = certInfo.subject["CN"];
-                        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) {
+                        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}.`);
@@ -1451,7 +1509,10 @@ class Monitor extends BeanModel {
      * @returns {Promise<LooseObject<any>>} Previous heartbeat
      */
     static async getPreviousHeartbeat(monitorID) {
-        return await R.findOne("heartbeat", " id = (select MAX(id) from heartbeat where monitor_id = ?)", [
+        return await R.getRow(`
+            SELECT ping, status, time FROM heartbeat
+            WHERE id = (select MAX(id) from heartbeat where monitor_id = ?)
+        `, [
             monitorID
         ]);
     }
@@ -1594,23 +1655,6 @@ class Monitor extends BeanModel {
         const parentActive = await Monitor.isParentActive(parent.id);
         return parent.active && parentActive;
     }
-
-    /**
-     * Obtains a new Oidc Token
-     * @returns {Promise<object>} OAuthProvider client
-     */
-    async makeOidcTokenClientCredentialsRequest() {
-        log.debug("monitor", `[${this.name}] The oauth access-token undefined or expired. Requesting a new token`);
-        const oAuthAccessToken = await getOidcTokenClientCredentials(this.oauth_token_url, this.oauth_client_id, this.oauth_client_secret, this.oauth_scopes, this.oauth_auth_method);
-        if (this.oauthAccessToken?.expires_at) {
-            log.debug("monitor", `[${this.name}] Obtained oauth access-token. Expires at ${new Date(this.oauthAccessToken?.expires_at * 1000)}`);
-        } else {
-            log.debug("monitor", `[${this.name}] Obtained oauth access-token. Time until expiry was not provided`);
-        }
-
-        return oAuthAccessToken;
-    }
-
 }
 
 module.exports = Monitor;

server/model/remote_browser.js

@@ -1,17 +0,0 @@
-const { BeanModel } = require("redbean-node/dist/bean-model");
-
-class RemoteBrowser extends BeanModel {
-    /**
-     * Returns an object that ready to parse to JSON
-     * @returns {object} Object ready to parse
-     */
-    toJSON() {
-        return {
-            id: this.id,
-            url: this.url,
-            name: this.name,
-        };
-    }
-}
-
-module.exports = RemoteBrowser;

server/model/status_page.js

@@ -21,12 +21,6 @@ class StatusPage extends BeanModel {
      * @returns {void}
      */
     static async handleStatusPageResponse(response, indexHTML, slug) {
-        // Handle url with trailing slash (http://localhost:3001/status/)
-        // The slug comes from the route "/status/:slug". If the slug is empty, express converts it to "index.html"
-        if (slug === "index.html") {
-            slug = "default";
-        }
-
         let statusPage = await R.findOne("status_page", " slug = ? ", [
             slug
         ]);

server/model/user.js

@@ -1,8 +1,6 @@
 const { BeanModel } = require("redbean-node/dist/bean-model");
 const passwordHash = require("../password-hash");
 const { R } = require("redbean-node");
-const jwt = require("jsonwebtoken");
-const { shake256, SHAKE256_LENGTH } = require("../util-server");
 
 class User extends BeanModel {
     /**
@@ -25,27 +23,8 @@ class User extends BeanModel {
      * @returns {Promise<void>}
      */
     async resetPassword(newPassword) {
-        const hashedPassword = passwordHash.generate(newPassword);
-
-        await R.exec("UPDATE `user` SET password = ? WHERE id = ? ", [
-            hashedPassword,
-            this.id
-        ]);
-
-        this.password = hashedPassword;
-    }
-
-    /**
-     * Create a new JWT for a user
-     * @param {User} user The User to create a JsonWebToken for
-     * @param {string} jwtSecret The key used to sign the JsonWebToken
-     * @returns {string} the JsonWebToken as a string
-     */
-    static createJWT(user, jwtSecret) {
-        return jwt.sign({
-            username: user.username,
-            h: shake256(user.password, SHAKE256_LENGTH),
-        }, jwtSecret);
+        await User.resetPassword(this.id, newPassword);
+        this.password = newPassword;
     }
 
 }

server/monitor-types/dns.js

@@ -1,56 +0,0 @@
-const { MonitorType } = require("./monitor-type");
-const { UP } = require("../../src/util");
-const dayjs = require("dayjs");
-const { dnsResolve } = require("../util-server");
-const { R } = require("redbean-node");
-
-class DnsMonitorType extends MonitorType {
-
-    name = "dns";
-
-    /**
-     * @inheritdoc
-     */
-    async check(monitor, heartbeat, _server) {
-        let startTime = dayjs().valueOf();
-        let dnsMessage = "";
-
-        let dnsRes = await dnsResolve(monitor.hostname, monitor.dns_resolve_server, monitor.port, monitor.dns_resolve_type);
-        heartbeat.ping = dayjs().valueOf() - startTime;
-
-        if (monitor.dns_resolve_type === "A" || monitor.dns_resolve_type === "AAAA" || monitor.dns_resolve_type === "TXT" || monitor.dns_resolve_type === "PTR") {
-            dnsMessage += "Records: ";
-            dnsMessage += dnsRes.join(" | ");
-        } else if (monitor.dns_resolve_type === "CNAME" || monitor.dns_resolve_type === "PTR") {
-            dnsMessage += dnsRes[0];
-        } else if (monitor.dns_resolve_type === "CAA") {
-            dnsMessage += dnsRes[0].issue;
-        } else if (monitor.dns_resolve_type === "MX") {
-            dnsRes.forEach(record => {
-                dnsMessage += `Hostname: ${record.exchange} - Priority: ${record.priority} | `;
-            });
-            dnsMessage = dnsMessage.slice(0, -2);
-        } else if (monitor.dns_resolve_type === "NS") {
-            dnsMessage += "Servers: ";
-            dnsMessage += dnsRes.join(" | ");
-        } else if (monitor.dns_resolve_type === "SOA") {
-            dnsMessage += `NS-Name: ${dnsRes.nsname} | Hostmaster: ${dnsRes.hostmaster} | Serial: ${dnsRes.serial} | Refresh: ${dnsRes.refresh} | Retry: ${dnsRes.retry} | Expire: ${dnsRes.expire} | MinTTL: ${dnsRes.minttl}`;
-        } else if (monitor.dns_resolve_type === "SRV") {
-            dnsRes.forEach(record => {
-                dnsMessage += `Name: ${record.name} | Port: ${record.port} | Priority: ${record.priority} | Weight: ${record.weight} | `;
-            });
-            dnsMessage = dnsMessage.slice(0, -2);
-        }
-
-        if (monitor.dns_last_result !== dnsMessage && dnsMessage !== undefined) {
-            await R.exec("UPDATE `monitor` SET dns_last_result = ? WHERE id = ? ", [ dnsMessage, monitor.id ]);
-        }
-
-        heartbeat.msg = dnsMessage;
-        heartbeat.status = UP;
-    }
-}
-
-module.exports = {
-    DnsMonitorType,
-};

server/monitor-types/mqtt.js

@@ -1,121 +0,0 @@
-const { MonitorType } = require("./monitor-type");
-const { log, UP } = require("../../src/util");
-const mqtt = require("mqtt");
-const jsonata = require("jsonata");
-
-class MqttMonitorType extends MonitorType {
-
-    name = "mqtt";
-
-    /**
-     * Run the monitoring check on the MQTT monitor
-     * @param {Monitor} monitor Monitor to check
-     * @param {Heartbeat} heartbeat Monitor heartbeat to update
-     * @param {UptimeKumaServer} server Uptime Kuma server
-     * @returns {Promise<void>}
-     */
-    async check(monitor, heartbeat, server) {
-        const receivedMessage = await this.mqttAsync(monitor.hostname, monitor.mqttTopic, {
-            port: monitor.port,
-            username: monitor.mqttUsername,
-            password: monitor.mqttPassword,
-            interval: monitor.interval,
-        });
-
-        if (monitor.mqttCheckType == null || monitor.mqttCheckType === "") {
-            // use old default
-            monitor.mqttCheckType = "keyword";
-        }
-
-        if (monitor.mqttCheckType === "keyword") {
-            if (receivedMessage != null && receivedMessage.includes(monitor.mqttSuccessMessage)) {
-                heartbeat.msg = `Topic: ${monitor.mqttTopic}; Message: ${receivedMessage}`;
-                heartbeat.status = UP;
-            } else {
-                throw Error(`Message Mismatch - Topic: ${monitor.mqttTopic}; Message: ${receivedMessage}`);
-            }
-        } else if (monitor.mqttCheckType === "json-query") {
-            const parsedMessage = JSON.parse(receivedMessage);
-
-            let expression = jsonata(monitor.jsonPath);
-
-            let result = await expression.evaluate(parsedMessage);
-
-            if (result?.toString() === monitor.expectedValue) {
-                heartbeat.msg = "Message received, expected value is found";
-                heartbeat.status = UP;
-            } else {
-                throw new Error("Message received but value is not equal to expected value, value was: [" + result + "]");
-            }
-        } else {
-            throw Error("Unknown MQTT Check Type");
-        }
-    }
-
-    /**
-     * Connect to MQTT Broker, subscribe to topic and receive message as String
-     * @param {string} hostname Hostname / address of machine to test
-     * @param {string} topic MQTT topic
-     * @param {object} options MQTT options. Contains port, username,
-     * password and interval (interval defaults to 20)
-     * @returns {Promise<string>} Received MQTT message
-     */
-    mqttAsync(hostname, topic, options = {}) {
-        return new Promise((resolve, reject) => {
-            const { port, username, password, interval = 20 } = options;
-
-            // Adds MQTT protocol to the hostname if not already present
-            if (!/^(?:http|mqtt|ws)s?:\/\//.test(hostname)) {
-                hostname = "mqtt://" + hostname;
-            }
-
-            const timeoutID = setTimeout(() => {
-                log.debug("mqtt", "MQTT timeout triggered");
-                client.end();
-                reject(new Error("Timeout, Message not received"));
-            }, interval * 1000 * 0.8);
-
-            const mqttUrl = `${hostname}:${port}`;
-
-            log.debug("mqtt", `MQTT connecting to ${mqttUrl}`);
-
-            let client = mqtt.connect(mqttUrl, {
-                username,
-                password
-            });
-
-            client.on("connect", () => {
-                log.debug("mqtt", "MQTT connected");
-
-                try {
-                    client.subscribe(topic, () => {
-                        log.debug("mqtt", "MQTT subscribed to topic");
-                    });
-                } catch (e) {
-                    client.end();
-                    clearTimeout(timeoutID);
-                    reject(new Error("Cannot subscribe topic"));
-                }
-            });
-
-            client.on("error", (error) => {
-                client.end();
-                clearTimeout(timeoutID);
-                reject(error);
-            });
-
-            client.on("message", (messageTopic, message) => {
-                if (messageTopic === topic) {
-                    client.end();
-                    clearTimeout(timeoutID);
-                    resolve(message.toString("utf8"));
-                }
-            });
-
-        });
-    }
-}
-
-module.exports = {
-    MqttMonitorType,
-};

server/monitor-types/real-browser-monitor-type.js

@@ -8,7 +8,6 @@ const path = require("path");
 const Database = require("../database");
 const jwt = require("jsonwebtoken");
 const config = require("../config");
-const { RemoteBrowser } = require("../remote-browser");
 
 let browser = null;
 
@@ -25,9 +24,6 @@ if (process.platform === "win32") {
     allowedList.push(process.env.PROGRAMFILES + "\\Chromium\\Application\\chrome.exe");
     allowedList.push(process.env["ProgramFiles(x86)"] + "\\Chromium\\Application\\chrome.exe");
 
-    // Allow MS Edge
-    allowedList.push(process.env["ProgramFiles(x86)"] + "\\Microsoft\\Edge\\Application\\msedge.exe");
-
     // For Loop A to Z
     for (let i = 65; i <= 90; i++) {
         let drive = String.fromCharCode(i);
@@ -44,15 +40,17 @@ if (process.platform === "win32") {
         "/usr/bin/chromium",
         "/usr/bin/chromium-browser",
         "/usr/bin/google-chrome",
-        "/snap/bin/chromium",           // Ubuntu
     ];
 } else if (process.platform === "darwin") {
+    // TODO: Generated by GitHub Copilot, but not sure if it's correct
     allowedList = [
         "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome",
         "/Applications/Chromium.app/Contents/MacOS/Chromium",
     ];
 }
 
+log.debug("chrome", allowedList);
+
 /**
  * Is the executable path allowed?
  * @param {string} executablePath Path to executable
@@ -87,19 +85,6 @@ async function getBrowser() {
     return browser;
 }
 
-/**
- * Get the current instance of the browser. If there isn't one, create it
- * @param {integer} remoteBrowserID Path to executable
- * @param {integer} userId User ID
- * @returns {Promise<Browser>} The browser
- */
-async function getRemoteBrowser(remoteBrowserID, userId) {
-    let remoteBrowser = await RemoteBrowser.get(remoteBrowserID, userId);
-    log.debug("MONITOR", `Using remote browser: ${remoteBrowser.name} (${remoteBrowser.id})`);
-    browser = chromium.connect(remoteBrowser.url);
-    return browser;
-}
-
 /**
  * Prepare the chrome executable path
  * @param {string} executablePath Path to chrome executable
@@ -206,21 +191,11 @@ async function testChrome(executablePath) {
         throw new Error(e.message);
     }
 }
-// test remote browser
+
 /**
- * @param {string} remoteBrowserURL Remote Browser URL
- * @returns {Promise<boolean>} Returns if connection worked
+ * TODO: connect remote browser? https://playwright.dev/docs/api/class-browsertype#browser-type-connect
+ *
  */
-async function testRemoteBrowser(remoteBrowserURL) {
-    try {
-        const browser = await chromium.connect(remoteBrowserURL);
-        browser.version();
-        await browser.close();
-        return true;
-    } catch (e) {
-        throw new Error(e.message);
-    }
-}
 class RealBrowserMonitorType extends MonitorType {
 
     name = "real-browser";
@@ -229,7 +204,7 @@ class RealBrowserMonitorType extends MonitorType {
      * @inheritdoc
      */
     async check(monitor, heartbeat, server) {
-        const browser = monitor.remote_browser ? await getRemoteBrowser(monitor.remote_browser, monitor.user_id) : await getBrowser();
+        const browser = await getBrowser();
         const context = await browser.newContext();
         const page = await context.newPage();
 
@@ -262,5 +237,4 @@ module.exports = {
     RealBrowserMonitorType,
     testChrome,
     resetChrome,
-    testRemoteBrowser,
 };

server/monitor-types/tailscale-ping.js

@@ -1,6 +1,6 @@
 const { MonitorType } = require("./monitor-type");
-const { UP } = require("../../src/util");
-const childProcessAsync = require("promisify-child-process");
+const { UP, log } = require("../../src/util");
+const exec = require("child_process").exec;
 
 /**
  * A TailscalePing class extends the MonitorType.
@@ -23,6 +23,7 @@ class TailscalePing extends MonitorType {
             let tailscaleOutput = await this.runTailscalePing(monitor.hostname, monitor.interval);
             this.parseTailscaleOutput(tailscaleOutput, heartbeat);
         } catch (err) {
+            log.debug("Tailscale", err);
             // trigger log function somewhere to display a notification or alert to the user (but how?)
             throw new Error(`Error checking Tailscale ping: ${err}`);
         }
@@ -36,18 +37,26 @@ class TailscalePing extends MonitorType {
      * @throws Will throw an error if the command execution encounters any error.
      */
     async runTailscalePing(hostname, interval) {
-        let timeout = interval * 1000 * 0.8;
-        let res = await childProcessAsync.spawn("tailscale", [ "ping", "--c", "1", hostname ], {
-            timeout: timeout
+        let cmd = `tailscale ping ${hostname}`;
+
+        log.debug("Tailscale", cmd);
+
+        return new Promise((resolve, reject) => {
+            let timeout = interval * 1000 * 0.8;
+            exec(cmd, { timeout: timeout }, (error, stdout, stderr) => {
+                // we may need to handle more cases if tailscale reports an error that isn't necessarily an error (such as not-logged in or DERP health-related issues)
+                if (error) {
+                    reject(`Execution error: ${error.message}`);
+                    return;
+                }
+                if (stderr) {
+                    reject(`Error in output: ${stderr}`);
+                    return;
+                }
+
+                resolve(stdout);
+            });
         });
-        if (res.stderr && res.stderr.toString()) {
-            throw new Error(`Error in output: ${res.stderr.toString()}`);
-        }
-        if (res.stdout && res.stdout.toString()) {
-            return res.stdout.toString();
-        } else {
-            throw new Error("No output from Tailscale ping");
-        }
     }
 
     /**
@@ -65,7 +74,7 @@ class TailscalePing extends MonitorType {
                 heartbeat.status = UP;
                 let time = line.split(" in ")[1].split(" ")[0];
                 heartbeat.ping = parseInt(time);
-                heartbeat.msg = "OK";
+                heartbeat.msg = line;
                 break;
             } else if (line.includes("timed out")) {
                 throw new Error(`Ping timed out: "${line}"`);

server/notification-providers/apprise.js

@@ -1,5 +1,5 @@
 const NotificationProvider = require("./notification-provider");
-const childProcessAsync = require("promisify-child-process");
+const childProcess = require("child_process");
 
 class Apprise extends NotificationProvider {
 
@@ -14,7 +14,7 @@ class Apprise extends NotificationProvider {
             args.push("-t");
             args.push(notification.title);
         }
-        const s = await childProcessAsync.spawn("apprise", args);
+        const s = childProcess.spawnSync("apprise", args);
 
         const output = (s.stdout) ? s.stdout.toString() : "ERROR: maybe apprise not found";
 

server/notification-providers/bark.js

@@ -46,7 +46,8 @@ class Bark extends NotificationProvider {
     }
 
     /**
-     * Add additional parameter for Bark v1 endpoints
+     * Add additional parameter for better on device styles (iOS 15
+     * optimized)
      * @param {BeanModel} notification Notification to send
      * @param {string} postUrl URL to append parameters to
      * @returns {string} Additional URL parameters
@@ -95,23 +96,12 @@ class Bark extends NotificationProvider {
      * @returns {string} Success message
      */
     async postNotification(notification, title, subtitle, endpoint) {
-        let result;
-        if (notification.apiVersion === "v1" || notification.apiVersion == null) {
-            // url encode title and subtitle
-            title = encodeURIComponent(title);
-            subtitle = encodeURIComponent(subtitle);
-            let postUrl = endpoint + "/" + title + "/" + subtitle;
-            postUrl = this.appendAdditionalParameters(notification, postUrl);
-            result = await axios.get(postUrl);
-        } else {
-            result = await axios.post(`${endpoint}/push`, {
-                title,
-                body: subtitle,
-                icon: barkNotificationAvatar,
-                sound: notification.barkSound || "telegraph", // default sound is telegraph
-                group: notification.barkGroup || "UptimeKuma", // default group is UptimeKuma
-            });
-        }
+        // url encode title and subtitle
+        title = encodeURIComponent(title);
+        subtitle = encodeURIComponent(subtitle);
+        let postUrl = endpoint + "/" + title + "/" + subtitle;
+        postUrl = this.appendAdditionalParameters(notification, postUrl);
+        let result = await axios.get(postUrl);
         this.checkResult(result);
         if (result.statusText != null) {
             return "Bark notification succeed: " + result.statusText;

server/notification-providers/discord.js

@@ -33,7 +33,6 @@ class Discord extends NotificationProvider {
                     break;
                 case "port":
                 case "dns":
-                case "gamedig":
                 case "steam":
                     address = monitorJSON["hostname"];
                     if (monitorJSON["port"]) {

server/notification-providers/grafana-oncall.js

@@ -1,61 +0,0 @@
-const NotificationProvider = require("./notification-provider");
-const axios = require("axios");
-const { DOWN, UP } = require("../../src/util");
-
-class GrafanaOncall extends NotificationProvider {
-
-    name = "GrafanaOncall";
-
-    /**
-     * @inheritdoc
-     */
-    async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-
-        if (!notification.GrafanaOncallURL) {
-            throw new Error("GrafanaOncallURL cannot be empty");
-        }
-
-        let okMsg = "Sent Successfully.";
-        try {
-            if (heartbeatJSON === null) {
-                let grafanaupdata = {
-                    title: "General notification",
-                    message: msg,
-                    state: "alerting",
-                };
-                await axios.post(
-                    notification.GrafanaOncallURL,
-                    grafanaupdata
-                );
-                return okMsg;
-            } else if (heartbeatJSON["status"] === DOWN) {
-                let grafanadowndata = {
-                    title: monitorJSON["name"] + " is down",
-                    message: heartbeatJSON["msg"],
-                    state: "alerting",
-                };
-                await axios.post(
-                    notification.GrafanaOncallURL,
-                    grafanadowndata
-                );
-                return okMsg;
-            } else if (heartbeatJSON["status"] === UP) {
-                let grafanaupdata = {
-                    title: monitorJSON["name"] + " is up",
-                    message: heartbeatJSON["msg"],
-                    state: "ok",
-                };
-                await axios.post(
-                    notification.GrafanaOncallURL,
-                    grafanaupdata
-                );
-                return okMsg;
-            }
-        } catch (error) {
-            this.throwGeneralAxiosError(error);
-        }
-
-    }
-}
-
-module.exports = GrafanaOncall;

server/notification-providers/mattermost.js

@@ -78,12 +78,12 @@ class Mattermost extends NotificationProvider {
                     {
                         fallback:
                             "Your " +
-                            monitorJSON.pathName +
+                            monitorJSON.name +
                             " service went " +
                             statusText,
                         color: color,
                         title:
-                            monitorJSON.pathName +
+                            monitorJSON.name +
                             " service went " +
                             statusText,
                         title_link: monitorJSON.url,