[Eliminate Blocking] Push example (#5925)

Co-authored-by: Frank Elsinga <frank@elsinga.de>

.dockerignore

@@ -32,7 +32,6 @@ tsconfig.json
 /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

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

@@ -1,75 +0,0 @@
-name: "❓ Ask for help"
-description: "Submit any question related to Uptime Kuma"
-#title: "[Help] "
-labels: [help]
-body:
-  - type: checkboxes
-    id: no-duplicate-issues
-    attributes:
-      label: "⚠️ Please verify that this question has NOT been raised before."
-      description: "Search in the issues sections by clicking [HERE](https://github.com/louislam/uptime-kuma/issues?q=)"
-      options:
-        - label: "I checked and didn't find similar issue"
-          required: true
-  - type: checkboxes
-    attributes:
-      label: "🛡️ Security Policy"
-      description: Please review the security policy before reporting security related issues/bugs.
-      options:
-        - label: I agree to have read this project [Security Policy](https://github.com/louislam/uptime-kuma/security/policy)
-          required: true
-  - type: textarea
-    id: steps-to-reproduce
-    validations:
-      required: true
-    attributes:
-      label: "📝 Describe your problem"
-      description: "Please walk us through it step by step. Include all important details and add screenshots where appropriate"
-      placeholder: "Describe what are you asking for..."
-  - type: textarea
-    id: error-msg
-    validations:
-      required: false
-    attributes:
-      label: "📝 Error Message(s) or Log"
-  - type: input
-    id: uptime-kuma-version
-    attributes:
-      label: "🐻 Uptime-Kuma Version"
-      description: "Which version of Uptime-Kuma are you running? Please do NOT provide the docker tag such as latest or 1"
-      placeholder: "Ex. 1.10.0"
-    validations:
-      required: true
-  - type: input
-    id: operating-system
-    attributes:
-      label: "💻 Operating System and Arch"
-      description: "Which OS is your server/device running on? (For Replit, please do not report this bug)"
-      placeholder: "Ex. Ubuntu 20.04 x86"
-    validations:
-      required: true
-  - type: input
-    id: browser-vendor
-    attributes:
-      label: "🌐 Browser"
-      description: "Which browser are you running on? (For Replit, please do not report this bug)"
-      placeholder: "Ex. Google Chrome 95.0.4638.69"
-    validations:
-      required: true
-  - type: textarea
-    id: deployment-info
-    attributes:
-      label: "🖥️ Deployment Environment"
-      description: |
-        examples:
-          - **Runtime**: Docker 20.10.9 / nodejs 14.18.0 / K8S via ... v1.3.3 / ..
-          - **Database**: sqlite/embedded mariadb/external mariadb
-          - **Filesystem used to store the database on**: Windows/ZFS/btrfs/NFSv3 on a SSD/HDD/eMMC
-          - **number of monitors**: 42
-      value: |
-        - Runtime: 
-        - Database: 
-        - Filesystem used to store the database on: 
-        - number of monitors: 
-    validations:
-      required: true

.github/ISSUE_TEMPLATE/ask_for_help.yml

@@ -0,0 +1,120 @@
+---
+name: ❓ Ask for help
+description: |
+  Submit any question related to Uptime Kuma
+#title: "[Help]"
+labels: ["help", "P3-low"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        🚫 **We kindly ask you to refrain from pinging maintainers unless absolutely necessary. Pings are reserved for critical/urgent issues that require immediate attention.**
+
+        **Why**: Reserving pings for urgent matters ensures maintainers can prioritize critical tasks effectively
+
+  - type: checkboxes
+    id: no-duplicate-question
+    attributes:
+      label: ⚠️ Please verify that your question has not already been reported
+      description: |
+        To avoid duplicate reports, please search for any existing issues before submitting a new one. You can find the list of existing issues **[HERE](https://github.com/louislam/uptime-kuma/issues?q=is%3Aissue%20sort%3Acreated-desc%20)**.
+      options:
+        - label: |
+            I have searched the [existing issues](https://github.com/louislam/uptime-kuma/issues?q=is%3Aissue%20sort%3Acreated-desc%20) and found no similar reports.
+          required: true
+
+  - type: checkboxes
+    id: security-policy
+    attributes:
+      label: 🛡️ Security Policy
+      description: |
+        Please review and acknowledge the Security Policy before reporting any security-related issues or bugs. You can find the full Security Policy **[HERE](https://github.com/louislam/uptime-kuma/security/policy)**.
+      options:
+        - label: |
+            I have read and agree to Uptime Kuma's [Security Policy](https://github.com/louislam/uptime-kuma/security/policy).
+          required: true
+
+  - type: textarea
+    id: steps-to-reproduce
+    validations:
+      required: true
+    attributes:
+      label: 📝 Describe your problem
+      description: |
+        Please walk us through it step by step. Include all important details and add screenshots where appropriate
+      placeholder: |
+        Describe what are you asking for ...
+
+  - type: textarea
+    id: error-msg
+    attributes:
+      label: 📝 Error Message(s) or Log
+      description: |
+        Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
+      render: bash session
+    validations:
+      required: false
+
+  - type: input
+    id: uptime-kuma-version
+    attributes:
+      label: 🐻 Uptime-Kuma Version
+      description: |
+        What version of Uptime-Kuma are you running? Please do not provide Docker tags like `latest` or `1`.
+      placeholder: |
+        e.g., 1.23.16 or 2.0.0-beta.2
+    validations:
+      required: true
+
+  - type: input
+    id: operating-system
+    attributes:
+      label: 💻 Operating System and Arch
+      description: |
+        Which OS is your server/device running on? (For Replit, please do not report this bug)
+      placeholder: |
+        e.g., Ubuntu Server 24.04.2 LTS (GNU/Linux 6.8.0-55-generic x86_64)
+    validations:
+      required: true
+
+  - type: input
+    id: browser-vendor
+    attributes:
+      label: 🌐 Browser
+      description: |
+        Which browser are you running on? (For Replit, please do not report this bug)
+      placeholder: |
+        e.g., Google Chrome 134.0.6998.183 (Official Build) (64-bit)
+    validations:
+      required: true
+
+  - type: textarea
+    id: deployment-info
+    attributes:
+      label: 🖥️ Deployment Environment
+      description: |
+        Provide details about the deployment environment, including runtime components, databases, and storage configurations. This will
+        help assess the infrastructure and identify any potential compatibility requirements.
+
+        **Remove any fields that do not apply to your setup.**
+      value: |
+        - **Runtime Environment**:
+          - Docker: Version `X.X.X` (Build `Y.Y.Y`)
+          - Docker Compose: Version `X.X.X`
+          - Portainer (BE/CE): Version `X.X.X` (LTS: Yes/No)
+          - MariaDB: Version `X.X.X` (LTS: Yes/No)
+          - Node.js: Version `X.X.X` (LTS: Yes/No)
+          - Kubernetes (K3S/K8S): Version `X.X.X` (LTS: Yes/No, via `[method/tool]`)
+        - **Database**:
+          - SQLite: Embedded
+          - MariaDB: Embedded/External
+        - **Database Storage**:
+          - **Filesystem**:
+            - Linux: ext4/XFS/Btrfs/ZFS/F2FS
+            - macOS: APFS/ HFS+
+            - Windows: NTFS/ReFS
+          - **Storage Medium**: HDD/eMMC/SSD/NVMe
+        - **Uptime Kuma Setup**:
+          - Number of monitors: `X`
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -1,100 +0,0 @@
-name: "🐛 Bug Report"
-description: "Submit a bug report to help us improve"
-#title: "[Bug] "
-labels: [bug]
-body:
-  - type: textarea
-    id: related-issues
-    validations:
-      required: true
-    attributes:
-      label: "📑 I have found these related issues/pull requests"
-      description: "Search related issues by clicking [HERE](https://github.com/louislam/uptime-kuma/issues?q=) and explain what the difference between them or explain that you are unable to find any related issues"
-      placeholder: "Related to #1 by also touching the ... system. They should not be merged because ..."
-  - type: checkboxes
-    attributes:
-      label: "🛡️ Security Policy"
-      description: Please review the security policy before reporting security related issues/bugs.
-      options:
-        - label: I agree to have read this project [Security Policy](https://github.com/louislam/uptime-kuma/security/policy)
-          required: true
-  - type: textarea
-    id: description
-    validations:
-      required: false
-    attributes:
-      label: "Description"
-      description: "You could also upload screenshots"
-  - type: textarea
-    id: steps-to-reproduce
-    validations:
-      required: true
-    attributes:
-      label: "👟 Reproduction steps"
-      description: "How do you trigger this bug? Please walk us through it step by step. Include all important details and add screenshots where appropriate"
-      placeholder: "..."
-  - type: textarea
-    id: expected-behavior
-    validations:
-      required: true
-    attributes:
-      label: "👀 Expected behavior"
-      description: "What did you think would happen?"
-      placeholder: "..."
-  - type: textarea
-    id: actual-behavior
-    validations:
-      required: true
-    attributes:
-      label: "😓 Actual Behavior"
-      description: "What actually happen?"
-      placeholder: "..."
-  - type: input
-    id: uptime-kuma-version
-    attributes:
-      label: "🐻 Uptime-Kuma Version"
-      description: "Which version of Uptime-Kuma are you running? Please do NOT provide the docker tag such as latest or 1"
-      placeholder: "Ex. 1.10.0"
-    validations:
-      required: true
-  - type: input
-    id: operating-system
-    attributes:
-      label: "💻 Operating System and Arch"
-      description: "Which OS is your server/device running on? (For Replit, please do not report this bug)"
-      placeholder: "Ex. Ubuntu 20.04 x64 "
-    validations:
-      required: true
-  - type: input
-    id: browser-vendor
-    attributes:
-      label: "🌐 Browser"
-      description: "Which browser are you running on?"
-      placeholder: "Ex. Google Chrome 95.0.4638.69"
-    validations:
-      required: true
-  - type: textarea
-    id: deployment-info
-    attributes:
-      label: "🖥️ Deployment Environment"
-      description: |
-        examples:
-          - **Runtime**: Docker 20.10.9 / nodejs 18.17.1 / K8S via ... v1.3.3 / ..
-          - **Database**: sqlite/embedded mariadb/external mariadb
-          - **Filesystem used to store the database on**: Windows/ZFS/btrfs/NFSv3 on a SSD/HDD/eMMC
-          - **number of monitors**: 42
-      value: |
-        - Runtime: 
-        - Database: 
-        - Filesystem used to store the database on: 
-        - number of monitors: 
-    validations:
-      required: true
-  - type: textarea
-    id: logs
-    attributes:
-      label: "📝 Relevant log output"
-      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
-      render: shell
-    validations:
-      required: false

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,154 @@
+---
+name: 🐛 Bug Report
+description: |
+  Submit a bug report to help us improve
+#title: "[Bug]"
+labels: ["bug", "P2-medium"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        🚫 **We kindly ask you to refrain from pinging maintainers unless absolutely necessary. Pings are reserved for critical/urgent issues that require immediate attention.**
+
+        **Why**: Reserving pings for urgent matters ensures maintainers can prioritize critical tasks effectively
+
+  - type: textarea
+    id: related-issues
+    validations:
+      required: true
+    attributes:
+      label: 📑 I have found these related issues/pull requests
+      description: |
+        Please search for related **[ISSUES](https://github.com/louislam/uptime-kuma/issues?q=is%3Aissue%20sort%3Acreated-desc)**
+        and **[PULL REQUESTS](https://github.com/louislam/uptime-kuma/pulls?q=is%3Apr+sort%3Acreated-desc+)**.
+        Explain the differences between them or clarify if you were unable to find any related issues/pull requests.
+      placeholder: |
+        Example: This relates to issue #1, which also affects the ... system. It should not be merged because ...
+
+  - type: checkboxes
+    id: security-policy
+    attributes:
+      label: 🛡️ Security Policy
+      description: |
+        Please review and acknowledge the Security Policy before reporting any security-related issues or bugs. You can find the full Security Policy **[HERE](https://github.com/louislam/uptime-kuma/security/policy)**.
+      options:
+        - label: |
+            I have read and agree to Uptime Kuma's [Security Policy](https://github.com/louislam/uptime-kuma/security/policy).
+          required: true
+
+  - type: textarea
+    id: description
+    validations:
+      required: false
+    attributes:
+      label: 📝 Description
+      description: |
+        You could also upload screenshots
+
+  - type: textarea
+    id: steps-to-reproduce
+    validations:
+      required: true
+    attributes:
+      label: 👟 Reproduction steps
+      description: |
+        How do you trigger this bug? Please walk us through it step by step. Include all important details and add screenshots where appropriate
+      placeholder: |
+        ...
+
+  - type: textarea
+    id: expected-behavior
+    validations:
+      required: true
+    attributes:
+      label: 👀 Expected behavior
+      description: |
+        What did you think would happen?
+      placeholder: |
+        ...
+
+  - type: textarea
+    id: actual-behavior
+    validations:
+      required: true
+    attributes:
+      label: 😓 Actual Behavior
+      description: |
+        What actually happen?
+      placeholder: |
+        ...
+
+  - type: input
+    id: uptime-kuma-version
+    attributes:
+      label: 🐻 Uptime-Kuma Version
+      description: |
+        What version of Uptime-Kuma are you running? Please do not provide Docker tags like `latest` or `1`.
+      placeholder: |
+        e.g., 1.23.16 or 2.0.0-beta.2
+    validations:
+      required: true
+
+  - type: input
+    id: operating-system
+    attributes:
+      label: 💻 Operating System and Arch
+      description: |
+        Which OS is your server/device running on? (For Replit, please do not
+        report this bug)
+      placeholder: |
+        e.g., Ubuntu Server 24.04.2 LTS (GNU/Linux 6.8.0-55-generic x86_64)
+    validations:
+      required: true
+
+  - type: input
+    id: browser-vendor
+    attributes:
+      label: 🌐 Browser
+      description: |
+        Which browser are you running on?
+      placeholder: |
+        e.g., Google Chrome 134.0.6998.183 (Official Build) (64-bit)
+    validations:
+      required: true
+
+  - type: textarea
+    id: deployment-info
+    attributes:
+      label: 🖥️ Deployment Environment
+      description: |
+        Provide details about the deployment environment, including runtime components, databases, and storage configurations. This will
+        help assess the infrastructure and identify any potential compatibility requirements.
+
+        **Remove any fields that do not apply to your setup.**
+      value: |
+        - **Runtime Environment**:
+          - Docker: Version `X.X.X` (Build `Y.Y.Y`)
+          - Docker Compose: Version `X.X.X`
+          - Portainer (BE/CE): Version `X.X.X` (LTS: Yes/No)
+          - MariaDB: Version `X.X.X` (LTS: Yes/No)
+          - Node.js: Version `X.X.X` (LTS: Yes/No)
+          - Kubernetes (K3S/K8S): Version `X.X.X` (LTS: Yes/No, via `[method/tool]`)
+        - **Database**:
+          - SQLite: Embedded
+          - MariaDB: Embedded/External
+        - **Database Storage**:
+          - **Filesystem**:
+            - Linux: ext4/XFS/Btrfs/ZFS/F2FS
+            - macOS: APFS/ HFS+
+            - Windows: NTFS/ReFS
+          - **Storage Medium**: HDD/eMMC/SSD/NVMe
+        - **Uptime Kuma Setup**:
+          - Number of monitors: `X`
+    validations:
+      required: true
+
+  - type: textarea
+    id: logs
+    attributes:
+      label: 📝 Relevant log output
+      description: |
+        Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
+      render: bash session
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,2 @@
+---
+blank_issues_enabled: false

.github/ISSUE_TEMPLATE/feature_request.yaml

@@ -1,66 +0,0 @@
-name: 🚀 Feature Request
-description: "Submit a proposal for a new feature"
-#title: "[Feature] "
-labels: [feature-request]
-body:
-  - type: textarea
-    id: related-issues
-    validations:
-      required: true
-    attributes:
-      label: "📑 I have found these related issues/pull requests"
-      description: "Search related issues by clicking [HERE](https://github.com/louislam/uptime-kuma/issues?q=) and explain what the difference between them or explain that you are unable to find any related issues"
-      placeholder: "Related to #1 by also touching the ... system. They should not be merged because ..."
-  - type: dropdown
-    id: feature-area
-    attributes:
-      label: "🏷️ Feature Request Type"
-      description: "What kind of feature request is this?"
-      multiple: true
-      options:
-        - API / automation options
-        - New notification-provider
-        - Change to existing notification-provider
-        - New monitor
-        - Change to existing monitor
-        - Dashboard
-        - Status-page
-        - Maintenance
-        - Deployment
-        - Certificate expiry
-        - Settings
-        - Other
-    validations:
-      required: true
-  - type: textarea
-    id: feature-description
-    validations:
-      required: true
-    attributes:
-      label: "🔖 Feature description"
-      description: "A clear and concise description of what the feature request is."
-      placeholder: "You should add ..."
-  - type: textarea
-    id: solution
-    validations:
-      required: true
-    attributes:
-      label: "✔️ Solution"
-      description: "A clear and concise description of what you want to happen."
-      placeholder: "In my use-case, ..."
-  - type: textarea
-    id: alternatives
-    validations:
-      required: false
-    attributes:
-      label: "❓ Alternatives"
-      description: "A clear and concise description of any alternative solutions or features you've considered."
-      placeholder: "I have considered ..."
-  - type: textarea
-    id: additional-context
-    validations:
-      required: false
-    attributes:
-      label: "📝 Additional Context"
-      description: "Add any other context or screenshots about the feature request here."
-      placeholder: "..."

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -0,0 +1,106 @@
+---
+name: 🚀 Feature Request
+description: |
+  Submit a proposal for a new feature
+# title: "[Feature]"
+labels: ["feature-request", "P3-low"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        ## ❗Important Announcement
+
+        ### 🚧 Temporary Delay in Feature Requests and Pull Request Reviews
+
+        **At this time, we may be slower to respond to new feature requests and review pull requests. Existing requests and PRs will remain in the backlog but may not be prioritized immediately.**
+
+        - **Reason**: Our current focus is on addressing bugs, improving system performance, and implementing essential updates. This will help stabilize the project and ensure smoother management.
+        - **Impact**: While no new feature requests or pull requests are being outright rejected, there may be significant delays in reviews. We encourage the community to help by reviewing PRs or assisting other users in the meantime.
+        - **What You Can Do**: If you're interested in contributing, reviewing open PRs by following our [Review Guidelines](https://github.com/louislam/uptime-kuma/blob/master/.github/REVIEW_GUIDELINES.md) or offering help to other users is greatly appreciated. All feature requests and PRs will be revisited once the suspension period is lifted.
+
+        We appreciate your patience and understanding as we continue to improve Uptime Kuma.
+
+        ### 🚫 Please Avoid Unnecessary Pinging of Maintainers
+
+        **We kindly ask you to refrain from pinging maintainers unless absolutely necessary. Pings are reserved for critical/urgent pull requests that require immediate attention.**
+
+        **Why**: Reserving pings for urgent matters ensures maintainers can prioritize critical tasks effectively.
+  - type: textarea
+    id: related-issues
+    validations:
+      required: true
+    attributes:
+      label: 📑 I have found these related issues/pull requests
+      description: |
+        Please search for related **[ISSUES](https://github.com/louislam/uptime-kuma/issues?q=is%3Aissue%20sort%3Acreated-desc)**
+        and **[PULL REQUESTS](https://github.com/louislam/uptime-kuma/pulls?q=is%3Apr+sort%3Acreated-desc+)**.
+        Explain the differences between them or clarify if you were unable to find any related issues/pull requests.
+      placeholder: |
+        Example: This relates to issue #1, which also affects the ... system. It should not be merged because ...
+
+  - type: dropdown
+    id: feature-area
+    attributes:
+      label: 🏷️ Feature Request Type
+      description: |
+        What kind of feature request is this?
+      multiple: true
+      options:
+        - API / automation options
+        - New notification-provider
+        - Change to existing notification-provider
+        - New monitor
+        - Change to existing monitor
+        - Dashboard
+        - Status-page
+        - Maintenance
+        - Deployment
+        - Certificate expiry
+        - Settings
+        - Other
+    validations:
+      required: true
+
+  - type: textarea
+    id: feature-description
+    validations:
+      required: true
+    attributes:
+      label: 🔖 Feature description
+      description: |
+        A clear and concise description of what the feature request is.
+      placeholder: |
+        You should add ...
+
+  - type: textarea
+    id: solution
+    validations:
+      required: true
+    attributes:
+      label: ✔️ Solution
+      description: |
+        A clear and concise description of what you want to happen.
+      placeholder: |
+        In my use-case, ...
+
+  - type: textarea
+    id: alternatives
+    validations:
+      required: false
+    attributes:
+      label: ❓ Alternatives
+      description: |
+        A clear and concise description of any alternative solutions or features you've considered.
+      placeholder: |
+        I have considered ...
+
+  - type: textarea
+    id: additional-context
+    validations:
+      required: false
+    attributes:
+      label: 📝 Additional Context
+      description: |
+        Add any other context or screenshots about the feature request here.
+      placeholder: |
+        ...

.github/ISSUE_TEMPLATE/security.md

@@ -1,17 +0,0 @@
----
-
-name: "Security Issue"
-about: "Just for alerting @louislam, do not provide any details here"
-title: "Security Issue"
-ref: "main"
-labels:
-
-- security
-
----
-
-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/ISSUE_TEMPLATE/security_issue.yml

@@ -0,0 +1,45 @@
+---
+name: 🛡️ Security Issue
+description: |
+  Notify Louis Lam about a security concern. Please do NOT include any sensitive details in this issue.
+# title: "Security Issue"
+labels: ["security", "P1-high"]
+assignees: [louislam]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        ## ❗ IMPORTANT: DO NOT SHARE VULNERABILITY DETAILS HERE
+
+        ### ⚠️ Report a Security Vulnerability
+
+        **If you have discovered a security vulnerability, please report it securely using the GitHub Security Advisory.**
+
+        **Note**: This issue is only for notifying the maintainers of the repository, as the GitHub Security Advisory does not automatically send notifications.
+
+        - **Confidentiality**: The information you provide in the GitHub Security Advisory will initially remain confidential. However, once the vulnerability is addressed, the advisory will be publicly disclosed on GitHub.
+        - **Access and Visibility**: Until the advisory is published, it will only be visible to the maintainers of the repository and invited collaborators.
+        - **Credit**: You will be automatically credited as a contributor for identifying and reporting the vulnerability. Your contribution will be reflected in the MITRE Credit System.
+        - **Important Reminder**: **Do not include any sensitive or detailed vulnerability information in this issue.** This issue is only for sharing the advisory URL to notify the maintainers of the repository, not for discussing the vulnerability itself.
+
+        **Thank you for helping us keep Uptime Kuma secure!**
+
+        ## **Step 1: Submit a GitHub Security Advisory**
+
+        Right-click the link below and select `Open link in new tab` to access the page. This will keep the security issue open, allowing you to easily return and paste the Advisory URL here later.
+
+        ➡️ [Create a New Security Advisory](https://github.com/louislam/uptime-kuma/security/advisories/new)
+
+        ## **Step 2: Share the Advisory URL**
+
+        Once you've created your advisory, please share the URL below. This will notify Louis Lam and enable them to take the appropriate action.
+
+  - type: textarea
+    id: github-advisory-url
+    validations:
+      required: true
+    attributes:
+      label: GitHub Advisory URL for @louislam
+      placeholder: |
+        Please paste the GitHub Advisory URL here. Only the URL is required.
+        Example: https://github.com/louislam/uptime-kuma/security/advisories/GHSA-8h5r-7t6l-q3kz

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,33 +1,122 @@
-⚠️⚠️⚠️ 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:
+**⚠️ Please Note: We do not accept all types of pull requests, and we want to ensure we don’t waste your time. Before submitting, make sure you have read our pull request guidelines: [Pull Request Rules](https://github.com/louislam/uptime-kuma/blob/master/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
 
-Tick the checkbox if you understand [x]:
+## ❗ Important Announcement
-- [ ] I have read and understand the pull request rules.
 
-# Description
+<details><summary>Click here for more details:</summary>
+</p>
 
-Fixes #(issue)
+### 🚧 Temporary Delay in Feature Requests and Pull Request Reviews
 
-## Type of change
+**At this time, we may be slower to respond to new feature requests and review pull requests. Existing requests and PRs will remain in the backlog but may not be prioritized immediately.**
 
-Please delete any options that are not relevant.
+- **Reason**: Our current focus is on addressing bugs, improving system performance, and implementing essential updates. This will help stabilize the project and ensure smoother management.
+- **Impact**: While no new feature requests or pull requests are being outright rejected, there may be significant delays in reviews. We encourage the community to help by reviewing PRs or assisting other users in the meantime.
+- **What You Can Do**: If you're interested in contributing, reviewing open PRs by following our [Review Guidelines](https://github.com/louislam/uptime-kuma/blob/master/.github/REVIEW_GUIDELINES.md) or offering support to other users is greatly appreciated. All feature requests and PRs will be revisited once the suspension period is lifted.
 
-- Bug fix (non-breaking change which fixes an issue)
+We appreciate your patience and understanding as we continue to improve Uptime Kuma.
-- 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)
-- Other
-- This change requires a documentation update
 
-## Checklist
+### 🚫 Please Avoid Unnecessary Pinging of Maintainers
 
-- [ ] My code follows the style guidelines of this project
+**We kindly ask you to refrain from pinging maintainers unless absolutely necessary. Pings are reserved for critical/urgent pull requests that require immediate attention.**
-- [ ] 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
-- [ ] My code needed automated testing. I have added them (this is optional task)
 
-## Screenshots (if any)
+**Why**: Reserving pings for urgent matters ensures maintainers can prioritize critical tasks effectively.
 
-Please do not use any external image service. Instead, just paste in or drag and drop the image here, and it will be uploaded automatically.
+</p>
+</details>
+
+## 📋 Overview
+
+Provide a clear summary of the purpose and scope of this pull request:
+
+- **What problem does this pull request address?**
+
+  - Please provide a detailed explanation here.
+
+- **What features or functionality does this pull request introduce or enhance?**
+
+  - Please provide a detailed explanation here.
+
+## 🔄 Changes
+
+### 🛠️ Type of change
+
+<!-- Please select all options that apply -->
+
+- [ ] 🐛 Bugfix (a non-breaking change that resolves an issue)
+- [ ] ✨ New feature (a non-breaking change that adds new functionality)
+- [ ] ⚠️ Breaking change (a fix or feature that alters existing functionality in a way that could cause issues)
+- [ ] 🎨 User Interface (UI) updates
+- [ ] 📄 New Documentation (addition of new documentation)
+- [ ] 📄 Documentation Update (modification of existing documentation)
+- [ ] 📄 Documentation Update Required (the change requires updates to related documentation)
+- [ ] 🔧 Other (please specify):
+  - Provide additional details here.
+
+## 🔗 Related Issues
+
+<!--
+Please link any GitHub issues or tasks that this pull request addresses. Use the appropriate issue numbers or links.
+
+**Note**: Include only issues directly related to this PR. Remove any irrelevant reference.
+-->
+
+- Relates to #issue-number
+- Resolves #issue-number
+- Fixes #issue-number
+
+## 📄 Checklist *
+
+<!-- Please select all options that apply -->
+
+- [ ] 🔍 My code adheres to the style guidelines of this project.
+- [ ] ✅ I ran ESLint and other code linters for modified files.
+- [ ] 🛠️ I have reviewed and tested my code.
+- [ ] 📝 I have commented my code, especially in hard-to-understand areas (e.g., using JSDoc for methods).
+- [ ] ⚠️ My changes generate no new warnings.
+- [ ] 🤖 My code needed automated testing. I have added them (this is an optional task).
+- [ ] 📄 Documentation updates are included (if applicable).
+- [ ] 🔒 I have considered potential security impacts and mitigated risks.
+- [ ] 🧰 Dependency updates are listed and explained.
+- [ ] 📚 I have read and understood the [Pull Request guidelines](https://github.com/louislam/uptime-kuma/blob/master/CONTRIBUTING.md#recommended-pull-request-guideline).
+
+## 📷 Screenshots or Visual Changes
+
+<!--
+Please upload the image directly here by pasting it or dragging and dropping. Avoid using external image services as the image will be uploaded automatically.
+
+If this pull request introduces visual changes, please provide the following details.
+If not, remove this section.
+-->
+
+- **UI Modifications**: Highlight any changes made to the user interface.
+- **Before & After**: Include screenshots or comparisons (if applicable).
+
+| Event              | Before                | After                |
+| ------------------ | --------------------- | -------------------- |
+| `UP`               | ![Before](image-link) | ![After](image-link) |
+| `DOWN`             | ![Before](image-link) | ![After](image-link) |
+| Certificate-expiry | ![Before](image-link) | ![After](image-link) |
+| Testing            | ![Before](image-link) | ![After](image-link) |
+
+## ℹ️ Additional Context
+
+Provide any relevant details to assist reviewers in understanding the changes.
+
+<details><summary>Click here for more details:</summary>
+</p>
+
+**Key Considerations**:
+
+- **Design decisions** – Key choices or trade-offs made during development.
+- **Alternative solutions** – Approaches considered but not implemented, along with reasons.
+- **Relevant links** – Specifications, discussions, or resources that provide context.
+- **Dependencies** – Related pull requests or issues that must be resolved before merging.
+- **Additional context** – Any other details that may help reviewers understand the changes.
+
+Provide details here
+
+## 💬 Requested Feedback
+
+<!-- If a part of our docs is unclear, you are unsure how to do something/.. this is where we would appreciate your feedback -->
+
+- `Mention documents needing feedback here`

.github/REVIEW_GUIDELINES.md

@@ -0,0 +1,224 @@
+# Uptime Kuma Review Guidelines
+
+> [!NOTE]
+> These review guidelines are a work in progress, and are frequently
+> updated and improved, so please check back frequently for the latest version.
+
+## Preparing for a PR Review
+
+### Read the PR description carefully
+
+Make sure you understand what the PR is trying to solve or implement. This could
+be a bug fix, a new feature, or a refactor.
+
+### Check the linked issues
+
+If the PR has a linked issue, read it to better understand the context and the
+reason for the change.
+
+### Check the test coverage
+
+Make sure relevant tests have been added or modified. If the PR adds new
+functionality, there should be tests covering the change.
+
+## General Review
+
+### Code formatting and style
+
+Check if the code adheres to the style guidelines of the project. Make sure
+there are no unused imports, variables, `console.log` for debugging in the PR.
+
+- [Project Style](../CONTRIBUTING.md#project-styles)
+- [Coding Style](../CONTRIBUTING.md#coding-styles)
+
+### Readability and maintainability
+
+Is the code easy to understand for other developers? Make sure complex parts are
+explained with comments about **_why_** something is done, and use clear names
+to show **_how_**. Are variables and functions well-named, and is there a
+consistent naming style? Also, check if the code is maintainable:
+
+- Is it unnecessarily complex? Could it be simplified?
+- Does it follow the **[Single Responsibility Principle (SRP)]**?
+
+[Single Responsibility Principle (SRP)]: https://www.geeksforgeeks.org/single-responsibility-in-solid-design-principle/
+
+### Documentation
+
+Is the PR well documented? Check if the descriptions of functions, parameters,
+and return values are present. Are there any changes needed to the README or
+other documentation, for example, if new features or configurations are
+introduced?
+
+## Functional Review
+
+### Testing
+
+Ensure that the new code is properly tested. This includes unit tests,
+integration tests, and if necessary, end-to-end tests.
+
+### Test results
+
+Did all tests pass in the CI pipeline (e.g., GitHub Actions, Travis, CircleCI)?
+
+### Testing in different environments
+
+If the changes depend on certain environments or configurations, verify that the
+code has been tested in various environments (e.g., local development, staging,
+production).
+
+- [How to test Pull Requests](https://github.com/louislam/uptime-kuma/wiki/Test-Pull-Requests)
+
+### Edge cases and regressions
+
+- Are there test cases for possible edge cases?
+- Could this change introduce regressions in other parts of the system?
+
+## Security
+
+### Security issues
+
+Check for potential security problems, such as SQL injection, XSS attacks, or
+unsafe API calls. Are there passwords, tokens, or other sensitive data left in
+the code by mistake?
+
+### Authentication and authorization
+
+Is access to sensitive data or functionality properly secured? Check that the
+correct authorization and authentication mechanisms are in place.
+
+### Security Best Practices
+
+- Ensure that the code is free from common vulnerabilities like **SQL
+    injection**, **XSS attacks**, and **insecure API calls**.
+- Check for proper encryption of sensitive data, and ensure that **passwords**
+    or **API tokens** are not hardcoded in the code.
+
+## Performance
+
+### Performance impact
+
+Check if the changes negatively impact performance. This can include factors
+like load times, memory usage, or other performance aspects.
+
+### Use of external libraries
+
+- Have the right libraries been chosen?
+- Are there unnecessary dependencies that might reduce performance or increase
+    code complexity?
+- Are these dependencies actively maintained and free of known vulnerabilities?
+
+### Performance Best Practices
+
+- **Measure performance** using tools like Lighthouse or profiling libraries.
+- **Avoid unnecessary dependencies** that may bloat the codebase.
+- Ensure that the **code does not degrade the user experience** (e.g., by
+    increasing load times or memory consumption).
+
+## Compliance and Integration
+
+### Alignment with the project
+
+Are the changes consistent with the project goals and requirements? Ensure the
+PR aligns with the architecture and design principles of the project.
+
+### Integration
+
+If the PR depends on other PRs or changes, verify that they integrate well with
+the rest of the project. Ensure the code does not cause conflicts with other
+active PRs.
+
+### Backward compatibility
+
+Does the change break compatibility with older versions of the software or
+dependencies? If so, is there a migration plan in place?
+
+## Logging and Error Handling
+
+### Proper error handling
+
+- Are errors properly caught and handled instead of being silently ignored?
+- Are exceptions used appropriately?
+
+### Logging
+
+- Is sufficient logging included for debugging and monitoring?
+- Is there excessive logging that could affect performance?
+
+## Accessibility (for UI-related changes)
+
+If the PR affects the user interface, ensure that it meets accessibility
+standards:
+
+- Can users navigate using only the keyboard?
+- Are screen readers supported?
+- Is there proper color contrast for readability?
+- Are there **WCAG** (Web Content Accessibility Guidelines) compliance issues?
+- Use tools like **Axe** or **Lighthouse** to evaluate accessibility.
+
+## Providing Feedback
+
+### Constructive feedback
+
+Provide clear, constructive feedback on what is good and what can be improved.
+If improvements are needed, be specific about what should change.
+
+### Clarity and collaboration
+
+Ensure your feedback is friendly and open, so the team member who submitted the
+PR feels supported and motivated to make improvements.
+
+<details><summary><b>For Maintainers only</b> (click to expand)</summary>
+<p>
+
+## Go/No-Go Decision
+
+### Go
+
+If the code has no issues and meets the project requirements, approve it (and
+possibly merge it).
+
+### No-Go
+
+If there are significant issues, such as missing tests, security
+vulnerabilities, or performance problems, request the necessary changes before
+the PR can be approved. Some examples of **significant issues** include:
+
+- Missing tests for new functionality.
+- Identified **security vulnerabilities**.
+- Code changes that break **backward compatibility** without a proper migration
+    plan.
+- Code that causes **major performance regressions** (e.g., high CPU/memory
+    usage).
+
+## After the Review
+
+### Reordering and merging
+
+Once the necessary changes have been made and the PR is approved, the code can
+be merged into the main branch (e.g., `main` or `master`).
+
+### Testing after merging
+
+Ensure that the build passes after merging the PR, and re-test the functionality
+in the production environment if necessary.
+
+## Follow-up
+
+### Communication with team members
+
+If the PR has long-term technical or functional implications, communicate the
+changes to the team.
+
+### Monitoring
+
+Continue monitoring the production environment for any unexpected issues that
+may arise after the code has been merged.
+
+</p>
+</details>
+
+---
+
+This process ensures that PRs are systematically and thoroughly reviewed,
+improving overall code quality.

.github/workflows/auto-test.yml

@@ -78,7 +78,7 @@ jobs:
 
   e2e-test:
     needs: [ ]
-    runs-on: ARM64
+    runs-on: ubuntu-24.04-arm
     steps:
     - run: git config --global core.autocrlf false  # Mainly for Windows
     - uses: actions/checkout@v4

CODE_OF_CONDUCT.md

@@ -6,8 +6,8 @@ We as members, contributors, and leaders pledge to make participation in our
 community a harassment-free experience for everyone, regardless of age, body
 size, visible or invisible disability, ethnicity, sex characteristics, gender
 identity and expression, level of experience, education, socio-economic status,
-nationality, personal appearance, race, religion, or sexual identity
+nationality, personal appearance, race, caste, color, religion, or sexual
-and orientation.
+identity and orientation.
 
 We pledge to act and interact in ways that contribute to an open, welcoming,
 diverse, inclusive, and healthy community.
@@ -17,23 +17,23 @@ diverse, inclusive, and healthy community.
 Examples of behavior that contributes to a positive environment for our
 community include:
 
-* Demonstrating empathy and kindness toward other people
+- Demonstrating empathy and kindness toward other people
-* Being respectful of differing opinions, viewpoints, and experiences
+- Being respectful of differing opinions, viewpoints, and experiences
-* Giving and gracefully accepting constructive feedback
+- Giving and gracefully accepting constructive feedback
-* Accepting responsibility and apologizing to those affected by our mistakes,
+- Accepting responsibility and apologizing to those affected by our mistakes,
   and learning from the experience
-* Focusing on what is best not just for us as individuals, but for the
+- Focusing on what is best not just for us as individuals, but for the overall
-  overall community
+  community
 
 Examples of unacceptable behavior include:
 
-* The use of sexualized language or imagery, and sexual attention or
+- The use of sexualized language or imagery, and sexual attention or advances of
-  advances of any kind
+  any kind
-* Trolling, insulting or derogatory comments, and personal or political attacks
+- Trolling, insulting or derogatory comments, and personal or political attacks
-* Public or private harassment
+- Public or private harassment
-* Publishing others' private information, such as a physical or email
+- Publishing others' private information, such as a physical or email address,
-  address, without their explicit permission
+  without their explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
+- Other conduct which could reasonably be considered inappropriate in a
   professional setting
 
 ## Enforcement Responsibilities
@@ -52,7 +52,7 @@ decisions when appropriate.
 
 This Code of Conduct applies within all community spaces, and also applies when
 an individual is officially representing the community in public spaces.
-Examples of representing our community include using an official e-mail address,
+Examples of representing our community include using an official email address,
 posting via an official social media account, or acting as an appointed
 representative at an online or offline event.
 
@@ -60,8 +60,8 @@ representative at an online or offline event.
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
 reported to the community leaders responsible for enforcement at
-uptime@kuma.pet.
+<uptime@kuma.pet>. All complaints will be reviewed and investigated promptly and
-All complaints will be reviewed and investigated promptly and fairly.
+fairly.
 
 All community leaders are obligated to respect the privacy and security of the
 reporter of any incident.
@@ -82,15 +82,15 @@ behavior was inappropriate. A public apology may be requested.
 
 ### 2. Warning
 
-**Community Impact**: A violation through a single incident or series
+**Community Impact**: A violation through a single incident or series of
-of actions.
+actions.
 
 **Consequence**: A warning with consequences for continued behavior. No
 interaction with the people involved, including unsolicited interaction with
 those enforcing the Code of Conduct, for a specified period of time. This
 includes avoiding interactions in community spaces as well as external channels
-like social media. Violating these terms may lead to a temporary or
+like social media. Violating these terms may lead to a temporary or permanent
-permanent ban.
+ban.
 
 ### 3. Temporary Ban
 
@@ -109,20 +109,24 @@ Violating these terms may lead to a permanent ban.
 standards, including sustained inappropriate behavior, harassment of an
 individual, or aggression toward or disparagement of classes of individuals.
 
-**Consequence**: A permanent ban from any sort of public interaction within
+**Consequence**: A permanent ban from any sort of public interaction within the
-the community.
+community.
 
 ## Attribution
 
 This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 2.0, available at
+version 2.1, available at
-https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
 
 Community Impact Guidelines were inspired by [Mozilla's code of conduct
-enforcement ladder](https://github.com/mozilla/diversity).
+enforcement ladder][Mozilla CoC].
-
-[homepage]: https://www.contributor-covenant.org
 
 For answers to common questions about this code of conduct, see the FAQ at
-https://www.contributor-covenant.org/faq. Translations are available at
+[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
-https://www.contributor-covenant.org/translations.
+[https://www.contributor-covenant.org/translations][translations].
+
+[homepage]: https://www.contributor-covenant.org
+[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
+[Mozilla CoC]: https://github.com/mozilla/diversity
+[FAQ]: https://www.contributor-covenant.org/faq
+[translations]: https://www.contributor-covenant.org/translations

CONTRIBUTING.md

@@ -1,16 +1,18 @@
 # Project Info
 
-First of all, I want to thank everyone who has submitted issues or shared pull requests for Uptime Kuma.
+First of all, I want to thank everyone who has submitted issues or shared pull
-I never thought the GitHub community would be so nice!
+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.
+Because of this, I also never thought that other people would actually read and
-Parts of the code are not very well-structured or commented, sorry about that.
+edit my code. Parts of the code are not very well-structured or commented, sorry
+about that.
 
-The project was created with `vite.js` and is written in `vue3`.
+The project was created with `vite.js` and is written in `vue3`. Our backend
-Our backend lives in the `server`-directory and mostly communicates via websockets.
+lives in the `server`-directory and mostly communicates via websockets. Both
-Both frontend and backend share the same `package.json`.
+frontend and backend share the same `package.json`.
 
-For production, the frontend is built into the `dist`-directory and the server (`express.js`) exposes the `dist` directory as the root of the endpoint.
+For production, the frontend is built into the `dist`-directory and the server
-For development, we run vite in development mode on another port. 
+(`express.js`) exposes the `dist` directory as the root of the endpoint. For
+development, we run vite in development mode on another port.
 
 ## Directories
 
@@ -25,193 +27,437 @@ For development, we run vite in development mode on another port.
 - `src` (Frontend source code)
 - `test` (unit test)
 
-## Can I create a pull request for Uptime Kuma?
+## Can I Create a Pull Request for Uptime Kuma?
 
-Yes or no, it depends on what you will try to do.
+Whether or not you can create a pull request depends on the nature of your
-Both yours and our maintainers' time is precious, and we don't want to waste either.
+contribution. We value both your time and our maintainers' time, so we want to
+make sure it's spent efficiently.
 
-If you have any questions about any process/.. is not clear, you are likely not alone => please ask them ^^
+If you're unsure about any process or step, you're probably not the only one
+with that question—please feel free to ask. We're happy to help!
 
-Different guidelines exist for different types of pull requests (PRs):
+Different types of pull requests (PRs) may have different guidelines, so be sure
-- <details><summary><b>security fixes</b></summary>
+to review the appropriate one for your contribution.
+
+- <details><summary><b>Security Fixes</b> (click to expand)</summary>
   <p>
-  
+
   Submitting security fixes is something that may put the community at risk.
-  Please read through our [security policy](SECURITY.md) and submit vulnerabilities via an [advisory](https://github.com/louislam/uptime-kuma/security/advisories/new) + [issue](https://github.com/louislam/uptime-kuma/issues/new?assignees=&labels=help&template=security.md) instead.
+  Please read through our [security policy](SECURITY.md) and submit
-  We encourage you to submit how to fix a vulnerability if you know how to, this is not required.
+  vulnerabilities via an [advisory] + [issue] instead. We encourage you to
-  Following the security policy allows us to properly test, fix bugs.
+  submit how to fix a vulnerability if you know how to, this is not required.
-  This review allows us to notice, if there are any changes necessary to unrelated parts like the documentation.  
+  Following the security policy allows us to properly test, fix bugs. This
+  review allows us to notice, if there are any changes necessary to unrelated
+  parts like the documentation.
   [**PLEASE SEE OUR SECURITY POLICY.**](SECURITY.md)
-  
+
+  [advisory]: https://github.com/louislam/uptime-kuma/security/advisories/new
+  [issue]:
+    https://github.com/louislam/uptime-kuma/issues/new?template=security_issue.yml
+
   </p>
   </details>
-- <details><summary><b>small, non-breaking bug fixes</b></summary>
+
+- <details><summary><b>Small, Non-Breaking Bug Fixes</b> (click to expand)</summary>
   <p>
-  
+
   If you come across a bug and think you can solve, we appreciate your work.
   Please make sure that you follow these rules:
-  - keep the PR as small as possible, fix only one thing at a time => keeping it reviewable
-  - test that your code does what you claim it does.
-  
-  <sub>Because maintainer time is precious, junior maintainers may merge uncontroversial PRs in this area.</sub>
-  </p>
-  </details> 
-- <details><summary><b>translations / internationalisation (i18n)</b></summary>
-  <p>
-  
-  We use weblate to localise this project into many languages.
-  If you are unhappy with a translation this is the best start.
-  On how to translate using weblate, please see [these instructions](https://github.com/louislam/uptime-kuma/blob/master/src/lang/README.md).
-  
-  There are two cases in which a change cannot be done in weblate and requires a PR:
-  - A text may not be currently localisable. In this case, **adding a new language key** via `$t("languageKey")` might be nessesary
-  - language keys need to be **added to `en.json`** to be visible in weblate. If this has not happened, a PR is appreciated.
-  - **Adding a new language** requires a new file see [these instructions](https://github.com/louislam/uptime-kuma/blob/master/src/lang/README.md)
-  
-  <sub>Because maintainer time is precious, junior maintainers may merge uncontroversial PRs in this area.</sub>
-  </p>
-  </details> 
-- <details><summary><b>new notification providers</b></summary>
-  <p>
-  
-  To set up a new notification provider these files need to be modified/created:
-  - `server/notification-providers/PROVIDER_NAME.js` is where the heart of the notification provider lives.
-    - Both `monitorJSON` and `heartbeatJSON` can be `null` for some events.
-      If both are `null`, this is a general testing message, but if just `heartbeatJSON` is `null` this is a certificate expiry.
-    - Please wrap the axios call into a 
-      ```js
-      try {
-        let result = await axios.post(...);
-        if (result.status === ...) ...
-      } catch (error) {
-        this.throwGeneralAxiosError(error);
-      }
-      ```
-  - `server/notification.js` is where the backend of the notification provider needs to be registered.
-    *If you have an idea how we can skip this step, we would love to hear about it ^^*
-  - `src/components/NotificationDialog.vue` you need to decide if the provider is a regional or a global one and add it with a name to the respective list
-  - `src/components/notifications/PROVIDER_NAME.vue` is where the frontend of each provider lives.
-    Please make sure that you have:
-    - used `HiddenInput` for secret credentials
-    - included all the necessary helptexts/placeholder/.. to make sure the notification provider is simple to setup for new users. 
-    - include all translations (`{{ $t("Translation key") }}`, [`i18n-t keypath="Translation key">`](https://vue-i18n.intlify.dev/guide/advanced/component.html)) in `src/lang/en.json` to enable our translators to translate this
-  - `src/components/notifications/index.js` is where the frontend of the provider needs to be registered.
-    *If you have an idea how we can skip this step, we would love to hear about it ^^*
 
-  Offering notifications is close to the core of what we are as an uptime monitor.
+  - keep the PR as small as possible, fix only one thing at a time => keeping it
-  Therefore, making sure that they work is also really important.
+    reviewable
-  Because testing notification providers is quite time intensive, we mostly offload this onto the person contributing a notification provider.
+  - test that your code does what you claim it does.
-  
+
-  To make sure you have tested the notification provider, please include screenshots of the following events in the pull-request description:
+  <sub>Because maintainer time is precious, junior maintainers may merge
-    - `UP`/`DOWN`
+  uncontroversial PRs in this area.</sub>
-    - Certificate Expiry via https://expired.badssl.com/
+
-    - Testing (the test button on the notification provider setup page)
+  </p>
-  
+  </details>
-  Using the following way to format this is encouraged:
+
-  ```md
+- <details><summary><b>Translations / Internationalisation (i18n)</b> (click to expand)</summary>
-  | Event | Before | After |
+  <p>
-  ------------------
+
-  | `UP` | paste-image-here | paste-image-here |
+  We use weblate to localise this project into many languages. If you are
-  | `DOWN` | paste-image-here | paste-image-here |
+  unhappy with a translation this is the best start. On how to translate using
-  | Certificate-expiry | paste-image-here | paste-image-here |
+  weblate, please see
-  | Testing | paste-image-here | paste-image-here |
+  [these instructions](https://github.com/louislam/uptime-kuma/blob/master/src/lang/README.md).
+
+  There are two cases in which a change cannot be done in weblate and requires a
+  PR:
+
+  - A text may not be currently localisable. In this case, **adding a new
+    language key** via `$t("languageKey")` might be nessesary
+  - language keys need to be **added to `en.json`** to be visible in weblate. If
+    this has not happened, a PR is appreciated.
+  - **Adding a new language** requires a new file see
+    [these instructions](https://github.com/louislam/uptime-kuma/blob/master/src/lang/README.md)
+
+  <sub>Because maintainer time is precious, junior maintainers may merge
+  uncontroversial PRs in this area.</sub>
+
+  </p>
+  </details>
+
+- <details><summary><b>New Notification Providers</b> (click to expand)</summary>
+  <p>
+
+  To set up a new notification provider these files need to be modified/created:
+
+  - `server/notification-providers/PROVIDER_NAME.js` is where the heart of the
+    notification provider lives.
+
+        - Both `monitorJSON` and `heartbeatJSON` can be `null` for some events. If
+
+  both are `null`, this is a general testing message, but if just
+  `heartbeatJSON` is `null` this is a certificate expiry.
+
+        - Please wrap the axios call into a
+
+  ```js
+  try {
+    let result = await axios.post(...);
+    if (result.status === ...) ...
+  } catch (error) {
+    this.throwGeneralAxiosError(error);
+  }
   ```
 
-  <sub>Because maintainer time is precious, junior maintainers may merge uncontroversial PRs in this area.</sub>
+  - `server/notification.js` is where the backend of the notification provider
+    needs to be registered. _If you have an idea how we can skip this step, we
+    would love to hear about it ^^_
+
+  - `src/components/NotificationDialog.vue` you need to decide if the provider
+    is a regional or a global one and add it with a name to the respective list
+
+  - `src/components/notifications/PROVIDER_NAME.vue` is where the frontend of
+    each provider lives. Please make sure that you have:
+
+        - used `HiddenInput` for secret credentials
+        - included all the necessary helptexts/placeholder/.. to make sure the
+
+  notification provider is simple to setup for new users. - include all
+  translations (`{{ $t("Translation key") }}`,
+  [`i18n-t keypath="Translation key">`](https://vue-i18n.intlify.dev/guide/advanced/component.html))
+  in `src/lang/en.json` to enable our translators to translate this
+
+  - `src/components/notifications/index.js` is where the frontend of the
+    provider needs to be registered. _If you have an idea how we can skip this
+    step, we would love to hear about it ^^_
+
+  Offering notifications is close to the core of what we are as an uptime
+  monitor. Therefore, making sure that they work is also really important.
+  Because testing notification providers is quite time intensive, we mostly
+  offload this onto the person contributing a notification provider.
+
+  To make sure you have tested the notification provider, please include
+  screenshots of the following events in the pull-request description:
+
+  - `UP`/`DOWN`
+  - Certificate Expiry via <https://expired.badssl.com/>
+  - Testing (the test button on the notification provider setup page)
+
+  <br/>
+
+  Using the following way to format this is encouraged:
+
+  ```md
+  | Event              | Before                | After                |
+  | ------------------ | --------------------- | -------------------- |
+  | `UP`               | ![Before](image-link) | ![After](image-link) |
+  | `DOWN`             | ![Before](image-link) | ![After](image-link) |
+  | Certificate-expiry | ![Before](image-link) | ![After](image-link) |
+  | Testing            | ![Before](image-link) | ![After](image-link) |
+  ```
+
+  <sub>Because maintainer time is precious, junior maintainers may merge
+  uncontroversial PRs in this area.</sub>
+
   </p>
   </details>
-- <details><summary><b>new monitoring types</b></summary>
+
+- <details><summary><b>New Monitoring Types</b> (click to expand)</summary>
   <p>
 
   To set up a new notification provider these files need to be modified/created:
-  - `server/monitor-types/MONITORING_TYPE.js` is the core of each monitor.
+
-    the `async check(...)`-function should:
+  - `server/monitor-types/MONITORING_TYPE.js` is the core of each monitor. the
-    - throw an error for each fault that is detected with an actionable error message
+    `async check(...)`-function should:
-    - in the happy-path, you should set `heartbeat.msg` to a successful message and set `heartbeat.status = UP`
+
-  - `server/uptime-kuma-server.js` is where the monitoring backend needs to be registered.
+        - throw an error for each fault that is detected with an actionable error
-    *If you have an idea how we can skip this step, we would love to hear about it ^^*
+
+  message - in the happy-path, you should set `heartbeat.msg` to a successful
+  message and set `heartbeat.status = UP`
+
+  - `server/uptime-kuma-server.js` is where the monitoring backend needs to be
+    registered. _If you have an idea how we can skip this step, we would love to
+    hear about it ^^_
+
   - `src/pages/EditMonitor.vue` is the shared frontend users interact with.
-    Please make sure that you have:
+    Please make sure that you have: - used `HiddenInput` for secret
-    - used `HiddenInput` for secret credentials
+    credentials - included all the necessary helptexts/placeholder/.. to make
-    - included all the necessary helptexts/placeholder/.. to make sure the notification provider is simple to setup for new users.
+    sure the notification provider is simple to setup for new users. - include
-    - include all translations (`{{ $t("Translation key") }}`, [`i18n-t keypath="Translation key">`](https://vue-i18n.intlify.dev/guide/advanced/component.html)) in `src/lang/en.json` to enable our translators to translate this
+    all translations (`{{ $t("Translation key") }}`,
-  - 
+    [`i18n-t keypath="Translation key">`](https://vue-i18n.intlify.dev/guide/advanced/component.html))
+    in `src/lang/en.json` to enable our translators to translate this
 
+  <sub>Because maintainer time is precious, junior maintainers may merge
+  uncontroversial PRs in this area.</sub>
 
-  <sub>Because maintainer time is precious, junior maintainers may merge uncontroversial PRs in this area.</sub>
-  </p>
-  </details> 
-- <details><summary><b>new features/ major changes / breaking bugfixes</b></summary>
-  <p>
-  
-  be sure to **create an empty draft pull request or open an issue, so we can have a discussion first**.
-  This is especially important for a large pull request or when you don't know if it will be merged or not.
-  
-  <sub>Because of the large impact of this work, only senior maintainers may merge PRs in this area.</sub>
   </p>
   </details>
 
-The following rules are essential for making your PR mergable:
+- <details><summary><b>New Features / Major Changes / Breaking Bugfixes</b> (click to expand)</summary>
-- Merging multiple issues by a huge PR is more difficult to review and causes conflicts with other PRs. Please
+  <p>
+
+  be sure to **create an empty draft pull request or open an issue, so we can
+  have a discussion first**. This is especially important for a large pull
+  request or when you don't know if it will be merged or not.
+
+  <sub>Because of the large impact of this work, only senior maintainers may
+  merge PRs in this area. </sub>
+
+  </p>
+  </details>
+
+- <details><summary><b>Pull Request Guidelines</b> (click to expand)</summary>
+  <p>
+
+  ## Steps to Submit a Pull Request
+
+  1. **Fork** the [Uptime-Kuma repository].
+
+  [Uptime-Kuma repository]: https://github.com/louislam/uptime-kuma/
+
+  2. **Clone** your forked repository to your local machine.
+  3. **Create a new branch** for your changes (e.g.,
+     `feature/add-new-notification-provider-signal`).
+  4. **Initiate a discussion before making major changes** by creating an empty
+     commit:
+
+     ```sh
+     git commit -m "<YOUR TASK NAME>" --allow-empty
+     ```
+
+  5. **Push** your branch to your forked repository.
+  6. **Open a pull request** using this link: [Compare & Pull Request].
+
+  [Compare & Pull Request]: https://github.com/louislam/uptime-kuma/compare/
+
+  7. **Select the correct source and target branches**.
+  8. **Link to related issues** for context.
+  9. **Provide a clear and concise description** explaining the changes and
+     their purpose.
+
+  - **Type of changes**
+
+    - Bugfix (a non-breaking change that resolves an issue)
+    - New feature (a non-breaking change that adds new functionality)
+    - Breaking change (a fix or feature that alters existing functionality in a
+      way that could cause issues)
+    - User Interface (UI) updates
+    - New Documentation (addition of new documentation)
+    - Documentation Update (modification of existing documentation)
+    - Documentation Update Required (the change requires updates to related
+      documentation)
+    - Other (please specify):
+      - Provide additional details here.
+
+  - **Checklist**
+
+    - My code adheres to the style guidelines of this project.
+    - I ran ESLint and other code linters for modified files.
+    - I have reviewed and tested my code.
+    - I have commented my code, especially in hard-to-understand areas (e.g.,
+      using JSDoc for methods).
+    - My changes generate no new warnings.
+    - My code needed automated testing. I have added them (this is an optional
+      task).
+    - Documentation updates are included (if applicable).
+    - I have considered potential security impacts and mitigated risks.
+    - Dependency updates are listed and explained.
+    - I have read and understood the
+      [Pull Request guidelines](#recommended-pull-request-guideline).
+
+  10. **When publishing your PR, set it as a** `Draft pull request` **to allow
+      for review and prevent automatic merging.**
+  11. **Maintainers will assign relevant labels** (e.g., `A:maintenance`,
+      `A:notifications`).
+  12. **Complete the PR checklist**, ensuring that:
+
+      - Documentation is updated if necessary.
+      - Tests are written or updated.
+      - CI/CD checks pass successfully.
+
+  13. **Request feedback** from team members to refine your changes before the
+      final review.
+
+  ## When Can You Change the PR Status to "Ready for Review"?
+
+  A PR should remain in **draft status** until all tasks are completed. Only
+  change the status to **Ready for Review** when:
+
+  - You have implemented all planned changes.
+  - You have addressed all feedback.
+  - Your code is fully tested and ready for integration.
+  - You have updated or created the necessary tests.
+  - You have verified that CI/CD checks pass successfully.
+
+  <br />
+
+  A **work-in-progress (WIP) PR** must stay in **draft status** until everything
+  is finalized.
+
+  <sub>Since maintainer time is valuable, junior maintainers may merge
+  uncontroversial PRs.</sub>
+
+  </p>
+  </details>
+
+## The following rules are essential for making your PR mergable
+
+- Merging multiple issues by a huge PR is more difficult to review and causes
+  conflicts with other PRs. Please
+
   - (if possible) **create one PR for one issue** or
-  - (if not possible) **explain which issues a PR addresses and why this PR should not be broken apart**
+  - (if not possible) **explain which issues a PR addresses and why this PR
-- Make sure your **PR passes our continuous integration**.
+    should not be broken apart**
-  PRs will not be merged unless all CI-Checks are green.
+
-- **Breaking changes** (unless for a good reason and discussed beforehand) will not get merged / not get merged quickly.
+- Make sure your **PR passes our continuous integration**. PRs will not be
-  Such changes require a major version release.
+  merged unless all CI-Checks are green.
-- **Test your code** before submitting a PR.
+- **Breaking changes** (unless for a good reason and discussed beforehand) will
-  Buggy PRs will not be merged.
+  not get merged / not get merged quickly. Such changes require a major version
+  release.
+- **Test your code** before submitting a PR. Buggy PRs will not be merged.
 - Make sure the **UI/UX is close to Uptime Kuma**.
-- **Think about the maintainability**:
+- **Think about the maintainability**: Don't add functionality that is
-  Don't add functionality that is completely **out of scope**.
+  completely **out of scope**. Keep in mind that we need to be able to maintain
-  Keep in mind that we need to be able to maintain the functionality.
+  the functionality.
 - Don't modify or delete existing logic without a valid reason.
 - Don't convert existing code into other programming languages for no reason.
 
-I ([@louislam](https://github.com/louislam)) have the final say.
+I ([@louislam](https://github.com/louislam)) have the final say. If your pull
-If your pull request does not meet my expectations, I will reject it, no matter how much time you spent on it.
+request does not meet my expectations, I will reject it, no matter how much time
-Therefore, it is essential to have a discussion beforehand.
+you spent 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 assign your pull request to a [milestone], if I plan to review and merge
+it.
 
-Please don't rush or ask for an ETA.
+[milestone]: https://github.com/louislam/uptime-kuma/milestones
-We have to understand the pull request, make sure it has no breaking changes and stick to the vision of this project, especially for large pull requests.
 
+Please don't rush or ask for an ETA. We have to understand the pull request,
+make sure it has no breaking changes and stick to the vision of this project,
+especially for large pull requests.
 
-## I'd like to work on an issue. How do I do that?
+## I'd Like to Work on an Issue. How Do I Do That?
 
-We have found that assigning people to issues is management-overhead that we don't need.
+We have found that assigning people to issues is unnecessary management
-A short comment that you want to try your hand at this issue is appreciated to save other devs time.
+overhead. Instead, a short comment stating that you want to work on an issue is
-If you come across any problem during development, feel free to leave a comment with what you are stuck on.
+appreciated, as it saves time for other developers. If you encounter any
+problems during development, feel free to leave a comment describing what you
+are stuck on.
 
 ### Recommended Pull Request Guideline
 
-Before diving deep into coding, having a discussion first by creating an empty pull request for discussion is preferred.
+Before jumping into coding, it's recommended to initiate a discussion by
-The rationale behind this is that we can align the direction and scope of the feature to eliminate any conflicts with existing and planned work, and can help by pointing out any potential pitfalls.
+creating an empty pull request. This approach allows us to align on the
+direction and scope of the feature, ensuring it doesn't conflict with existing
+or planned work. It also provides an opportunity to identify potential pitfalls
+early on, helping to avoid issues down the line.
 
-1. Fork the project
+1. **Fork** the [Uptime-Kuma repository].
-2. Clone your fork repo to local
+2. **Clone** your forked repository to your local machine.
-3. Create a new branch
+3. **Create a new branch** for your changes (e.g.,
-4. Create an empty commit: `git commit -m "<YOUR TASK NAME>" --allow-empty`
+   `feature/add-new-notification-provider-signal`).
-5. Push to your fork repo
+4. **Initiate a discussion before making major changes** by creating an empty
-6. Prepare a pull request: https://github.com/louislam/uptime-kuma/compare
+   commit:
-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
+   ```sh
-9. Wait for the discussion
+   git commit -m "<YOUR TASK NAME>" --allow-empty
+   ```
+
+5. **Push** your branch to your forked repository.
+6. **Open a pull request** using this link: [Compare & Pull Request].
+7. **Select the correct source and target branches**.
+8. **Link to related issues** for context.
+9. **Provide a clear and concise description** explaining the changes and their
+   purpose.
+
+   - **Type of changes**
+
+     - Bugfix (a non-breaking change that resolves an issue)
+     - New feature (a non-breaking change that adds new functionality)
+     - Breaking change (a fix or feature that alters existing functionality in a
+       way that could cause issues)
+     - User Interface (UI) updates
+     - New Documentation (addition of new documentation)
+     - Documentation Update (modification of existing documentation)
+     - Documentation Update Required (the change requires updates to related
+       documentation)
+     - Other (please specify):
+       - Provide additional details here.
+
+   - **Checklist**
+
+     - My code adheres to the style guidelines of this project.
+     - I ran ESLint and other code linters for modified files.
+     - I have reviewed and tested my code.
+     - I have commented my code, especially in hard-to-understand areas (e.g.,
+       using JSDoc for methods).
+     - My changes generate no new warnings.
+     - My code needed automated testing. I have added them (this is an optional
+       task).
+     - Documentation updates are included (if applicable).
+     - I have considered potential security impacts and mitigated risks.
+     - Dependency updates are listed and explained.
+     - I have read and understood the
+       [Pull Request guidelines](#recommended-pull-request-guideline).
+
+10. **When publishing your PR, set it as a** `Draft pull request` **to allow for
+    review and prevent automatic merging.**
+11. **Maintainers will assign relevant labels** (e.g., `A:maintenance`,
+    `A:notifications`).
+12. **Complete the PR checklist**, ensuring that:
+
+    - Documentation is updated if necessary.
+    - Tests are written or updated.
+    - CI/CD checks pass successfully.
+
+13. **Request feedback** from team members to refine your changes before the
+    final review.
+
+### When Can You Change the PR Status to "Ready for Review"?
+
+A PR should remain in **draft status** until all tasks are completed. Only
+change the status to **Ready for Review** when:
+
+- You have implemented all planned changes.
+- You have addressed all feedback.
+- Your code is fully tested and ready for integration.
+- You have updated or created the necessary tests.
+- You have verified that CI/CD checks pass successfully.
+
+A **work-in-progress (WIP) PR** must stay in **draft status** until everything
+is finalized.
 
 ## Project Styles
 
-I personally do not like something that requires a lot of configuration before you can finally start the app.
+I personally do not like something that requires a lot of configuration before
-The goal is to make the Uptime Kuma installation as easy as installing a mobile app.
+you can finally start the app. The goal is to make the Uptime Kuma installation
+as easy as installing a mobile app.
 
 - Easy to install for non-Docker users
+
   - no native build dependency is needed (for `x86_64`/`armv7`/`arm64`)
   - no extra configuration and
   - no extra effort required to get it running
+
 - Single container for Docker users
+
   - no complex docker-compose file
   - mapping the volume and exposing the port should be the only requirements
-- 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 variables are
+  discouraged, unless it is related to startup such as `DATA_DIR`
 - Easy to use
 - The web UI styling should be consistent and nice
 
@@ -233,13 +479,18 @@ The goal is to make the Uptime Kuma installation as easy as installing a mobile
 - [`Node.js`](https://nodejs.org/) >= 18
 - [`npm`](https://www.npmjs.com/) >= 9.3
 - [`git`](https://git-scm.com/)
-- IDE that supports [`ESLint`](https://eslint.org/) and EditorConfig (I am using [`IntelliJ IDEA`](https://www.jetbrains.com/idea/))
+- IDE that supports [`ESLint`](https://eslint.org/) and EditorConfig (I am using
-- A SQLite GUI tool (f.ex. [`SQLite Expert Personal`](https://www.sqliteexpert.com/download.html) or [`DBeaver Community`](https://dbeaver.io/download/))
+  [`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/))
 
 ## Git Branches
 
-- `master`: 2.X.X development. If you want to add a new feature, your pull request should base on this.
+- `master`: 2.X.X development. If you want to add a new feature, your pull
-- `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.
+  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
@@ -260,7 +511,8 @@ Port `3000` and port `3001` will be used.
 npm run dev
 ```
 
-But sometimes you may want to restart the server without restarting the frontend. In that case, you can run these commands in two terminals:
+But sometimes you may want to restart the server without restarting the
+frontend. In that case, you can run these commands in two terminals:
 
 ```bash
 npm run start-frontend-dev
@@ -271,9 +523,9 @@ npm run start-server-dev
 
 It binds to `0.0.0.0:3001` by default.
 
-The backend is an `express.js` server with `socket.io` integrated.
+The backend is an `express.js` server with `socket.io` integrated. It uses
-It uses `socket.io` to communicate with clients, and most server logic is encapsulated in the `socket.io` handlers.
+`socket.io` to communicate with clients, and most server logic is encapsulated
-`express.js` is also used to serve:
+in the `socket.io` handlers. `express.js` is also used to serve:
 
 - as an entry point for redirecting to a status page or the dashboard
 - the frontend built files (`index.html`, `*.js`, `*.css`, etc.)
@@ -289,11 +541,13 @@ It uses `socket.io` to communicate with clients, and most server logic is encaps
 - `routers/` (Express Routers)
 - `socket-handler/` (Socket.io Handlers)
 - `server.js` (Server entry point)
-- `uptime-kuma-server.js` (UptimeKumaServer class, main logic should be here, but some still in `server.js`)
+- `uptime-kuma-server.js` (UptimeKumaServer class, main logic should be here,
+  but some still in `server.js`)
 
 ## 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. The frontend dev server is used for
+development only.
 
 For production, it is not used. It will be compiled to `dist` directory instead.
 
@@ -307,17 +561,19 @@ npm run build
 
 ### Frontend Details
 
-Uptime Kuma Frontend is a single page application (SPA). Most paths are handled by Vue Router.
+Uptime Kuma Frontend is a single page application (SPA). Most paths are handled
+by Vue Router.
 
 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 the frontend is stored at the root level, even
+though you changed the current router to any other pages.
 
 The data and socket logic are in `src/mixins/socket.js`.
 
 ## Database Migration
 
-See: https://github.com/louislam/uptime-kuma/tree/master/db/knex_migrations
+See: <https://github.com/louislam/uptime-kuma/tree/master/db/knex_migrations>
 
 ## Unit Test
 
@@ -328,11 +584,12 @@ npm test
 
 ## Dependencies
 
-Both frontend and backend share the same `package.json`.
+Both frontend and backend share the same `package.json`. However, the frontend
-However, the frontend dependencies are eventually not used in the production environment, because it is usually also baked into `dist` files. So:
+dependencies are eventually not used in the production environment, because it
+is usually also baked into `dist` files. So:
 
 - Frontend dependencies = "devDependencies"
-  - Examples: `vue`, `chart.js`
+  - Examples: - `vue`, `chart.js`
 - Backend dependencies = "dependencies"
   - Examples: `socket.io`, `sqlite3`
 - Development dependencies = "devDependencies"
@@ -340,31 +597,41 @@ However, the frontend dependencies are eventually not used in the production env
 
 ### 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 the patch release version only.
 
 Patch release = the third digit ([Semantic Versioning](https://semver.org/))
 
-If for security / bug / other reasons, a library must be updated, breaking changes need to be checked by the person proposing the change.
+If for security / bug / other reasons, a library must be updated, breaking
+changes need to be checked by the person proposing the change.
 
 ## Translations
 
-Please add **all** the strings which are translatable to `src/lang/en.json` (if translation keys are omitted, they can not be translated.)
+Please add **all** the strings which are translatable to `src/lang/en.json` (if
+translation keys are omitted, they can not be translated.)
 
-**Don't include any other languages in your initial pull request** (even if this is your mother tongue), to avoid merge-conflicts between weblate and `master`.
+**Don't include any other languages in your initial pull request** (even if this
-The translations can then (after merging a PR into `master`) be translated by awesome people donating their language skills.
+is your mother tongue), to avoid merge-conflicts between weblate and `master`.
+The translations can then (after merging a PR into `master`) be translated by
+awesome people donating their language skills.
 
-If you want to help by translating Uptime Kuma into your language, please visit the [instructions on how to translate using weblate](https://github.com/louislam/uptime-kuma/blob/master/src/lang/README.md).
+If you want to help by translating Uptime Kuma into your language, please visit
+the [instructions on how to translate using weblate].
+
+[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.
+Feel free to correct the grammar in the documentation or code. My mother
-My mother language is not English and my grammar is not that great.
+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 the wiki, I have set up another
+repo to do that.
 
-https://github.com/louislam/uptime-kuma-wiki
+<https://github.com/louislam/uptime-kuma-wiki>
 
 ## Docker
 
@@ -405,7 +672,7 @@ https://github.com/louislam/uptime-kuma-wiki
 ## Maintainer
 
 Check the latest issues and pull requests:
-https://github.com/louislam/uptime-kuma/issues?q=sort%3Aupdated-desc
+<https://github.com/louislam/uptime-kuma/issues?q=sort%3Aupdated-desc>
 
 ### What is a maintainer and what are their roles?
 
@@ -413,7 +680,7 @@ This project has multiple maintainers who specialise in different areas.
 Currently, there are 3 maintainers:
 
 | Person            | Role              | Main Area        |
-|-------------------|-------------------|------------------|
+| ----------------- | ----------------- | ---------------- |
 | `@louislam`       | senior maintainer | major features   |
 | `@chakflying`     | junior maintainer | fixing bugs      |
 | `@commanderstorm` | junior maintainer | issue-management |
@@ -421,39 +688,49 @@ Currently, there are 3 maintainers:
 ### Procedures
 
 We have a few procedures we follow. These are documented here:
-- <details><summary>Set up a Docker Builder</summary>
+
+- <details><summary><b>Set up a Docker Builder</b> (click to expand)</summary>
   <p>
 
   - amd64, armv7 using local.
-  - arm64 using remote arm64 cpu, as the emulator is too slow and can no longer pass the `npm ci` command.
+  - arm64 using remote arm64 cpu, as the emulator is too slow and can no longer
-     1. Add the public key to the remote server.
+    pass the `npm ci` command.
-     2. Add the remote context. The remote machine must be arm64 and installed Docker CE. 
+
-        ```
+  1. Add the public key to the remote server.
-        docker context create oracle-arm64-jp --docker "host=ssh://root@100.107.174.88"
+  2. Add the remote context. The remote machine must be arm64 and installed
-        ```
+     Docker CE.
-     3. Create a new builder.
+
-        ```
+     ```bash
-        docker buildx create --name kuma-builder --platform linux/amd64,linux/arm/v7
+     docker context create oracle-arm64-jp --docker "host=ssh://root@100.107.174.88"
-        docker buildx use kuma-builder
+     ```
-        docker buildx inspect --bootstrap
+
-        ```
+  3. Create a new builder.
-     4. Append the remote context to the builder.
+
-        ```
+     ```bash
-        docker buildx create --append --name kuma-builder --platform linux/arm64 oracle-arm64-jp
+     docker buildx create --name kuma-builder --platform linux/amd64,linux/arm/v7
-        ```
+     docker buildx use kuma-builder
-     5. Verify the builder and check if the builder is using `kuma-builder`.
+     docker buildx inspect --bootstrap
-        ```
+     ```
-        docker buildx inspect kuma-builder
+
-        docker buildx ls
+  4. Append the remote context to the builder.
-        ```
+
+     ```bash
+     docker buildx create --append --name kuma-builder --platform linux/arm64 oracle-arm64-jp
+     ```
+
+  5. Verify the builder and check if the builder is using `kuma-builder`.
+     `docker buildx inspect kuma-builder docker buildx ls`
+
   </p>
   </details>
-- <details><summary>Release</summary>
+
+- <details><summary><b>Release</b> (click to expand)</summary>
   <p>
 
   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`
+  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`
@@ -463,13 +740,16 @@ We have a few procedures we follow. These are documented here:
 
   These Items need to be checked:
 
-  - [ ] Check all tags is fine on https://hub.docker.com/r/louislam/uptime-kuma/tags
+  - [ ] Check all tags is fine on
-  - [ ] Try the Docker image with tag 1.X.X (Clean install / amd64 / arm64 / armv7)
+        <https://hub.docker.com/r/louislam/uptime-kuma/tags>
+  - [ ] Try the Docker image with tag 1.X.X (Clean install / amd64 / arm64 /
+        armv7)
   - [ ] Try clean installation with Node.js
-  
+
   </p>
   </details>
-- <details><summary>Release Beta</summary>
+
+- <details><summary><b>Release Beta</b> (click to expand)</summary>
   <p>
 
   1. Draft a release note, check `This is a pre-release`
@@ -478,35 +758,37 @@ We have a few procedures we follow. These are documented here:
   4. Wait until the `Press any key to continue`
   5. Publish the release note as `1.X.X-beta.X`
   6. Press any key to continue
-  
+
   </p>
   </details>
-- <details><summary>Release Wiki</summary>
+
+- <details><summary><b>Release Wiki</b> (click to expand)</summary>
   <p>
 
   **Setup Repo**
-  
+
   ```bash
   git clone https://github.com/louislam/uptime-kuma-wiki.git
   cd uptime-kuma-wiki
   git remote add production https://github.com/louislam/uptime-kuma.wiki.git
   ```
-  
+
   **Push to Production Wiki**
-  
+
   ```bash
   git pull
   git push production master
   ```
-  
+
   </p>
   </details>
-- <details><summary>Change the base of a pull request such as <code>master</code> to <code>1.23.X</code></summary>
+
+- <details><summary>Change the base of a pull request such as <code>master</code> to <code>1.23.X</code> (click to expand)</summary>
   <p>
-  
+
   ```bash
   git rebase --onto <new parent> <old parent>
   ```
-  
+
   </p>
   </details>

README.md

@@ -62,6 +62,7 @@ Requirements:
 - Platform
   - ✅ Major Linux distros such as Debian, Ubuntu, CentOS, Fedora and ArchLinux etc.
   - ✅ Windows 10 (x64), Windows Server 2012 R2 (x64) or higher
+  - ❌ FreeBSD / OpenBSD / NetBSD
   - ❌ Replit / Heroku
 - [Node.js](https://nodejs.org/en/download/) 18 / 20.4
 - [npm](https://docs.npmjs.com/cli/) 9

SECURITY.md

@@ -2,29 +2,37 @@
 
 ## Reporting a Vulnerability
 
-1. Please report security issues to https://github.com/louislam/uptime-kuma/security/advisories/new.
+1. Please report security issues to
-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
+   <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>
 
-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 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 has tried to send a phishing link to
+me by doing this already. To minimize my own risk, please report through GitHub
+Advisories only. I will ignore all 3rd-party bug bounty platforms emails.
 
 ## Supported Versions
 
 ### Uptime Kuma Versions
 
-You should use or upgrade to the latest version of Uptime Kuma. All `1.X.X` versions are upgradable to the latest version.
+You should use or upgrade to the latest version of Uptime Kuma. All `1.X.X`
+versions are upgradable to the latest version.
 
 ### Upgradable Docker Tags
 
-| Tag | Supported |
+| Tag            | Supported          |
-|-|-|
+| -------------- | ------------------ |
-| 1 | :white_check_mark: |
+| 1              | :white_check_mark: |
-| 1-debian | :white_check_mark: |
+| 1-debian       | :white_check_mark: |
-| latest | :white_check_mark: |
+| latest         | :white_check_mark: |
-| debian | :white_check_mark: |
+| debian         | :white_check_mark: |
-| 1-alpine | ⚠️ Deprecated |
+| 1-alpine       | ⚠️ Deprecated      |
-| alpine | ⚠️ Deprecated |
+| alpine         | ⚠️ Deprecated      |
-| All other tags | ❌ |
+| All other tags | ❌                 |

db/knex_migrations/2025-01-01-0000-add-smtp.js

@@ -0,0 +1,12 @@
+exports.up = function (knex) {
+    return knex.schema
+        .alterTable("monitor", function (table) {
+            table.string("smtp_security").defaultTo(null);
+        });
+};
+
+exports.down = function (knex) {
+    return knex.schema.alterTable("monitor", function (table) {
+        table.dropColumn("smtp_security");
+    });
+};

db/knex_migrations/2025-03-04-0000-ping-advanced-options.js

@@ -0,0 +1,24 @@
+/* SQL:
+ALTER TABLE monitor ADD ping_count INTEGER default 1 not null;
+ALTER TABLE monitor ADD ping_numeric BOOLEAN default true not null;
+ALTER TABLE monitor ADD ping_per_request_timeout INTEGER default 2 not null;
+*/
+exports.up = function (knex) {
+    // Add new columns to table monitor
+    return knex.schema
+        .alterTable("monitor", function (table) {
+            table.integer("ping_count").defaultTo(1).notNullable();
+            table.boolean("ping_numeric").defaultTo(true).notNullable();
+            table.integer("ping_per_request_timeout").defaultTo(2).notNullable();
+        });
+
+};
+
+exports.down = function (knex) {
+    return knex.schema
+        .alterTable("monitor", function (table) {
+            table.dropColumn("ping_count");
+            table.dropColumn("ping_numeric");
+            table.dropColumn("ping_per_request_timeout");
+        });
+};

db/knex_migrations/2025-03-25-0127-fix-5721.js

@@ -0,0 +1,13 @@
+// Fix #5721: Change proxy port column type to integer to support larger port numbers
+exports.up = function (knex) {
+    return knex.schema
+        .alterTable("proxy", function (table) {
+            table.integer("port").alter();
+        });
+};
+
+exports.down = function (knex) {
+    return knex.schema.alterTable("proxy", function (table) {
+        table.smallint("port").alter();
+    });
+};

db/knex_migrations/2025-05-09-0000-add-custom-url.js

@@ -0,0 +1,13 @@
+// Add column custom_url to monitor_group table
+exports.up = function (knex) {
+    return knex.schema
+        .alterTable("monitor_group", function (table) {
+            table.text("custom_url", "text");
+        });
+};
+
+exports.down = function (knex) {
+    return knex.schema.alterTable("monitor_group", function (table) {
+        table.dropColumn("custom_url");
+    });
+};

db/knex_migrations/2025-06-03-0000-add-ip-family.js

@@ -0,0 +1,13 @@
+exports.up = function (knex) {
+    return knex.schema
+        .alterTable("monitor", function (table) {
+            table.boolean("ip_family").defaultTo(null);
+        });
+};
+
+exports.down = function (knex) {
+    return knex.schema
+        .alterTable("monitor", function (table) {
+            table.dropColumn("ip_family");
+        });
+};

db/knex_migrations/2025-06-11-0000-add-manual-monitor.js

@@ -0,0 +1,12 @@
+exports.up = function (knex) {
+    return knex.schema
+        .alterTable("monitor", function (table) {
+            table.string("manual_status").defaultTo(null);
+        });
+};
+
+exports.down = function (knex) {
+    return knex.schema.alterTable("monitor", function (table) {
+        table.dropColumn("manual_status");
+    });
+};

db/knex_migrations/2025-06-15-0001-manual-monitor-fix.js

@@ -0,0 +1,13 @@
+// Fix: Change manual_status column type to smallint
+exports.up = function (knex) {
+    return knex.schema
+        .alterTable("monitor", function (table) {
+            table.smallint("manual_status").alter();
+        });
+};
+
+exports.down = function (knex) {
+    return knex.schema.alterTable("monitor", function (table) {
+        table.string("manual_status").alter();
+    });
+};

extra/reset-password.js

@@ -3,6 +3,7 @@ console.log("== Uptime Kuma Reset Password Tool ==");
 const Database = require("../server/database");
 const { R } = require("redbean-node");
 const readline = require("readline");
+const { passwordStrength } = require("check-password-strength");
 const { initJWTSecret } = require("../server/util-server");
 const User = require("../server/model/user");
 const { io } = require("socket.io-client");
@@ -42,8 +43,15 @@ const main = async () => {
                     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"] + "";
+                    if (passwordStrength(password).value === "Too weak") {
+                        throw new Error("Password is too weak, please use a stronger password.");
+                    }
                 } else {
                     password = await question("New Password: ");
+                    if (passwordStrength(password).value === "Too weak") {
+                        console.log("Password is too weak, please try again.");
+                        continue;
+                    }
                     confirmPassword = await question("Confirm New Password: ");
                 }
 

package.json

@@ -1,6 +1,6 @@
 {
     "name": "uptime-kuma",
-    "version": "2.0.0-beta.1",
+    "version": "2.0.0-beta.3",
     "license": "MIT",
     "repository": {
         "type": "git",
@@ -32,7 +32,7 @@
         "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",
-        "tsc": "tsc",
+        "tsc": "tsc --project ./tsconfig-backend.json",
         "vite-preview-dist": "vite preview --host --config ./config/vite.config.js",
         "build-docker-base": "docker buildx build -f docker/debian-base.dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:base2 --target base2 . --push",
         "build-docker-base-slim": "docker buildx build -f docker/debian-base.dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:base2-slim --target base2-slim . --push",
@@ -41,7 +41,7 @@
         "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",
         "upload-artifacts": "node extra/release/upload-artifacts.mjs",
         "upload-artifacts-beta": "node extra/release/upload-artifacts-beta.mjs",
-        "setup": "git checkout 1.23.15 && npm ci --production && npm run download-dist",
+        "setup": "git checkout 1.23.16 && npm ci --omit dev && 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",
@@ -72,7 +72,7 @@
         "@louislam/sqlite3": "15.1.6",
         "@vvo/tzdb": "^6.125.0",
         "args-parser": "~1.3.0",
-        "axios": "~0.28.1",
+        "axios": "~0.30.0",
         "badge-maker": "~3.3.1",
         "bcryptjs": "~2.4.3",
         "chardet": "~1.4.0",
@@ -82,6 +82,7 @@
         "command-exists": "~1.2.9",
         "compare-versions": "~3.6.0",
         "compression": "~1.7.4",
+        "country-flag-emoji-polyfill": "^0.1.8",
         "croner": "~8.1.0",
         "dayjs": "~1.11.5",
         "dev-null": "^0.1.1",
@@ -95,8 +96,8 @@
         "html-escaper": "^3.0.3",
         "http-cookie-agent": "~5.0.4",
         "http-graceful-shutdown": "~3.1.7",
-        "http-proxy-agent": "~5.0.0",
+        "http-proxy-agent": "~7.0.2",
-        "https-proxy-agent": "~5.0.1",
+        "https-proxy-agent": "~7.0.6",
         "iconv-lite": "~0.6.3",
         "isomorphic-ws": "^5.0.0",
         "jsesc": "~3.0.2",
@@ -118,7 +119,7 @@
         "node-cloudflared-tunnel": "~1.0.9",
         "node-radius-client": "~1.0.0",
         "nodemailer": "~6.9.13",
-        "nostr-tools": "^1.13.1",
+        "nostr-tools": "^2.10.4",
         "notp": "~2.0.3",
         "openid-client": "^5.4.2",
         "password-hash": "~1.2.2",
@@ -135,7 +136,7 @@
         "semver": "~7.5.4",
         "socket.io": "~4.8.0",
         "socket.io-client": "~4.8.0",
-        "socks-proxy-agent": "6.1.1",
+        "socks-proxy-agent": "~8.0.5",
         "tar": "~6.2.1",
         "tcp-ping": "~0.1.1",
         "thirty-two": "~1.0.2",
@@ -143,7 +144,7 @@
         "ws": "^8.13.0"
     },
     "devDependencies": {
-        "@actions/github": "~5.1.1",
+        "@actions/github": "~6.0.0",
         "@fortawesome/fontawesome-svg-core": "~1.2.36",
         "@fortawesome/free-regular-svg-icons": "~5.15.4",
         "@fortawesome/free-solid-svg-icons": "~5.15.4",
@@ -169,7 +170,7 @@
         "cross-env": "~7.0.3",
         "delay": "^5.0.0",
         "dns2": "~2.0.1",
-        "dompurify": "~3.1.7",
+        "dompurify": "~3.2.4",
         "eslint": "~8.14.0",
         "eslint-plugin-jsdoc": "~46.4.6",
         "eslint-plugin-vue": "~8.7.1",
@@ -179,7 +180,7 @@
         "postcss-html": "~1.5.0",
         "postcss-rtlcss": "~3.7.2",
         "postcss-scss": "~4.0.4",
-        "prismjs": "~1.29.0",
+        "prismjs": "~1.30.0",
         "qrcode": "~1.5.0",
         "rollup-plugin-visualizer": "^5.6.0",
         "sass": "~1.42.1",
@@ -190,14 +191,14 @@
         "testcontainers": "^10.13.1",
         "typescript": "~4.4.4",
         "v-pagination-3": "~0.1.7",
-        "vite": "~5.2.8",
+        "vite": "~5.4.15",
         "vite-plugin-compression": "^0.5.1",
         "vite-plugin-vue-devtools": "^7.0.15",
         "vue": "~3.4.2",
         "vue-chartjs": "~5.2.0",
         "vue-confirm-dialog": "~1.0.2",
         "vue-contenteditable": "~3.0.4",
-        "vue-i18n": "~9.2.2",
+        "vue-i18n": "~9.14.3",
         "vue-image-crop-upload": "~3.0.3",
         "vue-multiselect": "~3.0.0-alpha.2",
         "vue-prism-editor": "~2.0.0-alpha.2",

server/auth.js

@@ -26,7 +26,7 @@ exports.login = async function (username, password) {
         // Upgrade the hash to bcrypt
         if (passwordHash.needRehash(user.password)) {
             await R.exec("UPDATE `user` SET password = ? WHERE id = ? ", [
-                passwordHash.generate(password),
+                await passwordHash.generate(password),
                 user.id,
             ]);
         }

server/database.js

@@ -1,4 +1,5 @@
 const fs = require("fs");
+const fsAsync = fs.promises;
 const { R } = require("redbean-node");
 const { setSetting, setting } = require("./util-server");
 const { log, sleep } = require("../src/util");
@@ -707,12 +708,12 @@ class Database {
 
     /**
      * Get the size of the database (SQLite only)
-     * @returns {number} Size of database
+     * @returns {Promise<number>} Size of database
      */
-    static getSize() {
+    static async getSize() {
         if (Database.dbConfig.type === "sqlite") {
             log.debug("db", "Database.getSize()");
-            let stats = fs.statSync(Database.sqlitePath);
+            let stats = await fsAsync.stat(Database.sqlitePath);
             log.debug("db", stats);
             return stats.size;
         }
@@ -736,7 +737,7 @@ class Database {
         if (Database.dbConfig.type === "sqlite") {
             return "DATETIME('now', ? || ' hours')";
         } else {
-            return "DATE_ADD(NOW(), INTERVAL ? HOUR)";
+            return "DATE_ADD(UTC_TIMESTAMP(), INTERVAL ? HOUR)";
         }
     }
 

server/model/group.js

@@ -33,7 +33,7 @@ class Group extends BeanModel {
      */
     async getMonitorList() {
         return R.convertToBeans("monitor", await R.getAll(`
-            SELECT monitor.*, monitor_group.send_url FROM monitor, monitor_group
+            SELECT monitor.*, monitor_group.send_url, monitor_group.custom_url FROM monitor, monitor_group
             WHERE monitor.id = monitor_group.monitor_id
             AND group_id = ?
             ORDER BY monitor_group.weight

server/model/maintenance.js

@@ -158,12 +158,22 @@ class Maintenance extends BeanModel {
         bean.active = obj.active;
 
         if (obj.dateRange[0]) {
+            const parsedDate = new Date(obj.dateRange[0]);
+            if (isNaN(parsedDate.getTime()) || parsedDate.getFullYear() > 9999) {
+                throw new Error("Invalid start date");
+            }
+
             bean.start_date = obj.dateRange[0];
         } else {
             bean.start_date = null;
         }
 
         if (obj.dateRange[1]) {
+            const parsedDate = new Date(obj.dateRange[1]);
+            if (isNaN(parsedDate.getTime()) || parsedDate.getFullYear() > 9999) {
+                throw new Error("Invalid end date");
+            }
+
             bean.end_date = obj.dateRange[1];
         } else {
             bean.end_date = null;
@@ -233,7 +243,7 @@ class Maintenance extends BeanModel {
             try {
                 this.beanMeta.status = "scheduled";
 
-                let startEvent = (customDuration = 0) => {
+                let startEvent = async (customDuration = 0) => {
                     log.info("maintenance", "Maintenance id: " + this.id + " is under maintenance now");
 
                     this.beanMeta.status = "under-maintenance";

server/model/monitor.js

@@ -2,7 +2,11 @@ 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,
-    SQL_DATETIME_FORMAT, evaluateJsonQuery
+    SQL_DATETIME_FORMAT, evaluateJsonQuery,
+    PING_PACKET_SIZE_MIN, PING_PACKET_SIZE_MAX, PING_PACKET_SIZE_DEFAULT,
+    PING_GLOBAL_TIMEOUT_MIN, PING_GLOBAL_TIMEOUT_MAX, PING_GLOBAL_TIMEOUT_DEFAULT,
+    PING_COUNT_MIN, PING_COUNT_MAX, PING_COUNT_DEFAULT,
+    PING_PER_REQUEST_TIMEOUT_MIN, PING_PER_REQUEST_TIMEOUT_MAX, PING_PER_REQUEST_TIMEOUT_DEFAULT
 } = require("../../src/util");
 const { tcping, ping, checkCertificate, checkStatusCode, getTotalClientInRoom, setting, mssqlQuery, postgresQuery, mysqlQuery, setSetting, httpNtlm, radius, grpcQuery,
     redisPingAsync, kafkaProducerAsync, getOidcTokenClientCredentials, rootCertificatesFingerprints, axiosAbortSignal
@@ -53,7 +57,7 @@ class Monitor extends BeanModel {
         };
 
         if (this.sendUrl) {
-            obj.url = this.url;
+            obj.url = this.customUrl ?? this.url;
         }
 
         if (showTags) {
@@ -153,8 +157,15 @@ class Monitor extends BeanModel {
             snmpOid: this.snmpOid,
             jsonPathOperator: this.jsonPathOperator,
             snmpVersion: this.snmpVersion,
+            smtpSecurity: this.smtpSecurity,
             rabbitmqNodes: JSON.parse(this.rabbitmqNodes),
             conditions: JSON.parse(this.conditions),
+            ipFamily: this.ipFamily,
+
+            // ping advanced options
+            ping_numeric: this.isPingNumeric(),
+            ping_count: this.ping_count,
+            ping_per_request_timeout: this.ping_per_request_timeout,
         };
 
         if (includeSensitiveData) {
@@ -247,6 +258,14 @@ class Monitor extends BeanModel {
         return Boolean(this.expiryNotification);
     }
 
+    /**
+     * Check if ping should use numeric output only
+     * @returns {boolean} True if IP addresses will be output instead of symbolic hostnames
+     */
+    isPingNumeric() {
+        return Boolean(this.ping_numeric);
+    }
+
     /**
      * Parse to boolean
      * @returns {boolean} Should TLS errors be ignored?
@@ -380,39 +399,6 @@ class Monitor extends BeanModel {
                 if (await Monitor.isUnderMaintenance(this.id)) {
                     bean.msg = "Monitor under maintenance";
                     bean.status = MAINTENANCE;
-                } else if (this.type === "group") {
-                    const children = await Monitor.getChildren(this.id);
-
-                    if (children.length > 0) {
-                        bean.status = UP;
-                        bean.msg = "All children up and running";
-                        for (const child of children) {
-                            if (!child.active) {
-                                // Ignore inactive childs
-                                continue;
-                            }
-                            const lastBeat = await Monitor.getPreviousHeartbeat(child.id);
-
-                            // Only change state if the monitor is in worse conditions then the ones before
-                            // lastBeat.status could be null
-                            if (!lastBeat) {
-                                bean.status = PENDING;
-                            } else if (bean.status === UP && (lastBeat.status === PENDING || lastBeat.status === DOWN)) {
-                                bean.status = lastBeat.status;
-                            } else if (bean.status === PENDING && lastBeat.status === DOWN) {
-                                bean.status = lastBeat.status;
-                            }
-                        }
-
-                        if (bean.status !== UP) {
-                            bean.msg = "Child inaccessible";
-                        }
-                    } else {
-                        // Set status pending if group is empty
-                        bean.status = PENDING;
-                        bean.msg = "Group empty";
-                    }
-
                 } else if (this.type === "http" || this.type === "keyword" || this.type === "json-query") {
                     // Do not do any queries/high loading things before the "bean.ping"
                     let startTime = dayjs().valueOf();
@@ -441,10 +427,26 @@ class Monitor extends BeanModel {
                         }
                     }
 
+                    let agentFamily = undefined;
+                    if (this.ipFamily === "ipv4") {
+                        agentFamily = 4;
+                    }
+                    if (this.ipFamily === "ipv6") {
+                        agentFamily = 6;
+                    }
+
                     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,
+                        autoSelectFamily: true,
+                        ...(agentFamily ? { family: agentFamily } : {})
+                    };
+
+                    const httpAgentOptions = {
+                        maxCachedSessions: 0,
+                        autoSelectFamily: true,
+                        ...(agentFamily ? { family: agentFamily } : {})
                     };
 
                     log.debug("monitor", `[${this.name}] Prepare Options for axios`);
@@ -506,6 +508,7 @@ class Monitor extends BeanModel {
                         if (proxy && proxy.active) {
                             const { httpAgent, httpsAgent } = Proxy.createAgents(proxy, {
                                 httpsAgentOptions: httpsAgentOptions,
+                                httpAgentOptions: httpAgentOptions,
                             });
 
                             options.proxy = false;
@@ -514,6 +517,10 @@ class Monitor extends BeanModel {
                         }
                     }
 
+                    if (!options.httpAgent) {
+                        options.httpAgent = new http.Agent(httpAgentOptions);
+                    }
+
                     if (!options.httpsAgent) {
                         let jar = new CookieJar();
                         let httpsCookieAgentOptions = {
@@ -617,7 +624,7 @@ class Monitor extends BeanModel {
                     bean.status = UP;
 
                 } else if (this.type === "ping") {
-                    bean.ping = await ping(this.hostname, this.packetSize);
+                    bean.ping = await ping(this.hostname, this.ping_count, "", this.ping_numeric, this.packetSize, this.timeout, this.ping_per_request_timeout);
                     bean.msg = "";
                     bean.status = UP;
                 } else if (this.type === "push") {      // Type: Push
@@ -689,7 +696,7 @@ class Monitor extends BeanModel {
                         bean.msg = res.data.response.servers[0].name;
 
                         try {
-                            bean.ping = await ping(this.hostname, this.packetSize);
+                            bean.ping = await ping(this.hostname, PING_COUNT_DEFAULT, "", true, this.packetSize, PING_GLOBAL_TIMEOUT_DEFAULT, PING_PER_REQUEST_TIMEOUT_DEFAULT);
                         } catch (_) { }
                     } else {
                         throw new Error("Server not found on Steam");
@@ -1327,7 +1334,8 @@ class Monitor extends BeanModel {
                 try {
                     const heartbeatJSON = bean.toJSON();
                     const monitorData = [{ id: monitor.id,
-                        active: monitor.active
+                        active: monitor.active,
+                        name: monitor.name
                     }];
                     const preloadData = await Monitor.preparePreloadData(monitorData);
                     // Prevent if the msg is undefined, notifications such as Discord cannot send out.
@@ -1434,7 +1442,7 @@ class Monitor extends BeanModel {
         for (let notification of notificationList) {
             try {
                 log.debug("monitor", "Sending to " + notification.name);
-                await Notification.send(JSON.parse(notification.config), `[${this.name}][${this.url}] ${certType} certificate ${certCN} will be expired in ${daysRemaining} days`);
+                await Notification.send(JSON.parse(notification.config), `[${this.name}][${this.url}] ${certType} certificate ${certCN} will expire in ${daysRemaining} days`);
                 sent = true;
             } catch (e) {
                 log.error("monitor", "Cannot send cert notification to " + notification.name);
@@ -1500,6 +1508,31 @@ class Monitor extends BeanModel {
         if (this.interval < MIN_INTERVAL_SECOND) {
             throw new Error(`Interval cannot be less than ${MIN_INTERVAL_SECOND} seconds`);
         }
+
+        if (this.type === "ping") {
+            // ping parameters validation
+            if (this.packetSize && (this.packetSize < PING_PACKET_SIZE_MIN || this.packetSize > PING_PACKET_SIZE_MAX)) {
+                throw new Error(`Packet size must be between ${PING_PACKET_SIZE_MIN} and ${PING_PACKET_SIZE_MAX} (default: ${PING_PACKET_SIZE_DEFAULT})`);
+            }
+
+            if (this.ping_per_request_timeout && (this.ping_per_request_timeout < PING_PER_REQUEST_TIMEOUT_MIN || this.ping_per_request_timeout > PING_PER_REQUEST_TIMEOUT_MAX)) {
+                throw new Error(`Per-ping timeout must be between ${PING_PER_REQUEST_TIMEOUT_MIN} and ${PING_PER_REQUEST_TIMEOUT_MAX} seconds (default: ${PING_PER_REQUEST_TIMEOUT_DEFAULT})`);
+            }
+
+            if (this.ping_count && (this.ping_count < PING_COUNT_MIN || this.ping_count > PING_COUNT_MAX)) {
+                throw new Error(`Echo requests count must be between ${PING_COUNT_MIN} and ${PING_COUNT_MAX} (default: ${PING_COUNT_DEFAULT})`);
+            }
+
+            if (this.timeout) {
+                const pingGlobalTimeout = Math.round(Number(this.timeout));
+
+                if (pingGlobalTimeout < this.ping_per_request_timeout || pingGlobalTimeout < PING_GLOBAL_TIMEOUT_MIN || pingGlobalTimeout > PING_GLOBAL_TIMEOUT_MAX) {
+                    throw new Error(`Timeout must be between ${PING_GLOBAL_TIMEOUT_MIN} and ${PING_GLOBAL_TIMEOUT_MAX} seconds (default: ${PING_GLOBAL_TIMEOUT_DEFAULT})`);
+                }
+
+                this.timeout = pingGlobalTimeout;
+            }
+        }
     }
 
     /**
@@ -1625,7 +1658,7 @@ class Monitor extends BeanModel {
     /**
      * Gets all Children of the monitor
      * @param {number} monitorID ID of monitor to get
-     * @returns {Promise<LooseObject<any>>} Children
+     * @returns {Promise<LooseObject<any>[]>} Children
      */
     static async getChildren(monitorID) {
         return await R.getAll(`

server/model/status_page.js

@@ -120,8 +120,8 @@ class StatusPage extends BeanModel {
 
         const head = $("head");
 
-        if (statusPage.googleAnalyticsTagId) {
+        if (statusPage.google_analytics_tag_id) {
-            let escapedGoogleAnalyticsScript = googleAnalytics.getGoogleAnalyticsScript(statusPage.googleAnalyticsTagId);
+            let escapedGoogleAnalyticsScript = googleAnalytics.getGoogleAnalyticsScript(statusPage.google_analytics_tag_id);
             head.append($(escapedGoogleAnalyticsScript));
         }
 

server/model/user.js

@@ -14,7 +14,7 @@ class User extends BeanModel {
      */
     static async resetPassword(userID, newPassword) {
         await R.exec("UPDATE `user` SET password = ? WHERE id = ? ", [
-            passwordHash.generate(newPassword),
+            await passwordHash.generate(newPassword),
             userID
         ]);
     }
@@ -25,7 +25,7 @@ class User extends BeanModel {
      * @returns {Promise<void>}
      */
     async resetPassword(newPassword) {
-        const hashedPassword = passwordHash.generate(newPassword);
+        const hashedPassword = await passwordHash.generate(newPassword);
 
         await R.exec("UPDATE `user` SET password = ? WHERE id = ? ", [
             hashedPassword,

server/modules/apicache/apicache.js

@@ -485,7 +485,7 @@ function ApiCache() {
         }
 
         if (typeof duration === "string") {
-            let split = duration.match(/^([\d\.,]+)\s?(\w+)$/);
+            let split = duration.match(/^([\d\.,]+)\s?([a-zA-Z]+)$/);
 
             if (split.length === 3) {
                 let len = parseFloat(split[1]);

server/modules/axios-ntlm/lib/ntlmClient.js

@@ -89,6 +89,9 @@ function NtlmClient(credentials, AxiosConfig) {
             switch (_b.label) {
                 case 0:
                     error = err.response;
+                    // The header may look like this: `Negotiate, NTLM, Basic realm="itsahiddenrealm.example.net"`Add commentMore actions
+                    // so extract the 'NTLM' part first
+                    const ntlmheader = error.headers['www-authenticate'].split(',').find(_ => _.match(/ *NTLM/))?.trim() || '';
                     if (!(error && error.status === 401
                         && error.headers['www-authenticate']
                         && error.headers['www-authenticate'].includes('NTLM'))) return [3 /*break*/, 3];
@@ -96,12 +99,12 @@ function NtlmClient(credentials, AxiosConfig) {
                     // include the Negotiate option when responding with the T2 message
                     // There is nore we could do to ensure we are processing correctly,
                     // but this is the easiest option for now
-                    if (error.headers['www-authenticate'].length < 50) {
+                    if (ntlmheader.length < 50) {
                         t1Msg = ntlm.createType1Message(credentials.workstation, credentials.domain);
                         error.config.headers["Authorization"] = t1Msg;
                     }
                     else {
-                        t2Msg = ntlm.decodeType2Message((error.headers['www-authenticate'].match(/^NTLM\s+(.+?)(,|\s+|$)/) || [])[1]);
+                        t2Msg = ntlm.decodeType2Message((ntlmheader.match(/^NTLM\s+(.+?)(,|\s+|$)/) || [])[1]);
                         t3Msg = ntlm.createType3Message(t2Msg, credentials.username, credentials.password, credentials.workstation, credentials.domain);
                         error.config.headers["X-retry"] = "false";
                         error.config.headers["Authorization"] = t3Msg;

server/monitor-types/dns.js

@@ -34,12 +34,16 @@ class DnsMonitorType extends MonitorType {
         switch (monitor.dns_resolve_type) {
             case "A":
             case "AAAA":
-            case "TXT":
             case "PTR":
                 dnsMessage = `Records: ${dnsRes.join(" | ")}`;
                 conditionsResult = dnsRes.some(record => handleConditions({ record }));
                 break;
 
+            case "TXT":
+                dnsMessage = `Records: ${dnsRes.join(" | ")}`;
+                conditionsResult = dnsRes.flat().some(record => handleConditions({ record }));
+                break;
+
             case "CNAME":
                 dnsMessage = dnsRes[0];
                 conditionsResult = handleConditions({ record: dnsRes[0] });

server/monitor-types/group.js

@@ -0,0 +1,49 @@
+const { UP, PENDING, DOWN } = require("../../src/util");
+const { MonitorType } = require("./monitor-type");
+const Monitor = require("../model/monitor");
+
+class GroupMonitorType extends MonitorType {
+    name = "group";
+
+    /**
+     * @inheritdoc
+     */
+    async check(monitor, heartbeat, _server) {
+        const children = await Monitor.getChildren(monitor.id);
+
+        if (children.length > 0) {
+            heartbeat.status = UP;
+            heartbeat.msg = "All children up and running";
+            for (const child of children) {
+                if (!child.active) {
+                    // Ignore inactive childs
+                    continue;
+                }
+                const lastBeat = await Monitor.getPreviousHeartbeat(child.id);
+
+                // Only change state if the monitor is in worse conditions then the ones before
+                // lastBeat.status could be null
+                if (!lastBeat) {
+                    heartbeat.status = PENDING;
+                } else if (heartbeat.status === UP && (lastBeat.status === PENDING || lastBeat.status === DOWN)) {
+                    heartbeat.status = lastBeat.status;
+                } else if (heartbeat.status === PENDING && lastBeat.status === DOWN) {
+                    heartbeat.status = lastBeat.status;
+                }
+            }
+
+            if (heartbeat.status !== UP) {
+                heartbeat.msg = "Child inaccessible";
+            }
+        } else {
+            // Set status pending if group is empty
+            heartbeat.status = PENDING;
+            heartbeat.msg = "Group empty";
+        }
+    }
+}
+
+module.exports = {
+    GroupMonitorType,
+};
+

server/monitor-types/manual.js

@@ -0,0 +1,36 @@
+const { MonitorType } = require("./monitor-type");
+const { UP, DOWN, PENDING } = require("../../src/util");
+
+class ManualMonitorType extends MonitorType {
+    name = "Manual";
+    type = "manual";
+    description = "A monitor that allows manual control of the status";
+    supportsConditions = false;
+    conditionVariables = [];
+
+    /**
+     * @inheritdoc
+     */
+    async check(monitor, heartbeat) {
+        if (monitor.manual_status !== null) {
+            heartbeat.status = monitor.manual_status;
+            switch (monitor.manual_status) {
+                case UP:
+                    heartbeat.msg = "Up";
+                    break;
+                case DOWN:
+                    heartbeat.msg = "Down";
+                    break;
+                default:
+                    heartbeat.msg = "Pending";
+            }
+        } else {
+            heartbeat.status = PENDING;
+            heartbeat.msg = "Manual monitoring - No status set";
+        }
+    }
+}
+
+module.exports = {
+    ManualMonitorType
+};

server/monitor-types/smtp.js

@@ -0,0 +1,35 @@
+const { MonitorType } = require("./monitor-type");
+const { UP } = require("../../src/util");
+const nodemailer = require("nodemailer");
+
+class SMTPMonitorType extends MonitorType {
+    name = "smtp";
+
+    /**
+     * @inheritdoc
+     */
+    async check(monitor, heartbeat, _server) {
+        let options = {
+            port: monitor.port || 25,
+            host: monitor.hostname,
+            secure: monitor.smtpSecurity === "secure", // use SMTPS (not STARTTLS)
+            ignoreTLS: monitor.smtpSecurity === "nostarttls", // don't use STARTTLS even if it's available
+            requireTLS: monitor.smtpSecurity === "starttls", // use STARTTLS or fail
+        };
+        let transporter = nodemailer.createTransport(options);
+        try {
+            await transporter.verify();
+
+            heartbeat.status = UP;
+            heartbeat.msg = "SMTP connection verifies successfully";
+        } catch (e) {
+            throw new Error(`SMTP connection doesn't verify: ${e}`);
+        } finally {
+            transporter.close();
+        }
+    }
+}
+
+module.exports = {
+    SMTPMonitorType,
+};

server/notification-providers/aliyun-sms.js

@@ -17,7 +17,7 @@ class AliyunSMS extends NotificationProvider {
             if (heartbeatJSON != null) {
                 let msgBody = JSON.stringify({
                     name: monitorJSON["name"],
-                    time: heartbeatJSON["time"],
+                    time: heartbeatJSON["localDateTime"],
                     status: this.statusToString(heartbeatJSON["status"]),
                     msg: heartbeatJSON["msg"],
                 });

server/notification-providers/discord.js

@@ -18,17 +18,28 @@ class Discord extends NotificationProvider {
                 webhookUrl.searchParams.append("thread_id", notification.threadId);
             }
 
+            // Check if the webhook has an avatar
+            let webhookHasAvatar = true;
+            try {
+                const webhookInfo = await axios.get(webhookUrl.toString());
+                webhookHasAvatar = !!webhookInfo.data.avatar;
+            } catch (e) {
+                // If we can't verify, we assume he has an avatar to avoid forcing the default avatar
+                webhookHasAvatar = true;
+            }
+
             // If heartbeatJSON is null, assume we're testing.
             if (heartbeatJSON == null) {
                 let discordtestdata = {
                     username: discordDisplayName,
                     content: msg,
                 };
-
+                if (!webhookHasAvatar) {
+                    discordtestdata.avatar_url = "https://github.com/louislam/uptime-kuma/raw/master/public/icon.png";
+                }
                 if (notification.discordChannelType === "createNewForumPost") {
                     discordtestdata.thread_name = notification.postName;
                 }
-
                 await axios.post(webhookUrl.toString(), discordtestdata);
                 return okMsg;
             }
@@ -46,10 +57,10 @@ class Discord extends NotificationProvider {
                                 name: "Service Name",
                                 value: monitorJSON["name"],
                             },
-                            {
+                            ...(!notification.disableUrl ? [{
                                 name: monitorJSON["type"] === "push" ? "Service Type" : "Service URL",
                                 value: this.extractAddress(monitorJSON),
-                            },
+                            }] : []),
                             {
                                 name: `Time (${heartbeatJSON["timezone"]})`,
                                 value: heartbeatJSON["localDateTime"],
@@ -61,6 +72,9 @@ class Discord extends NotificationProvider {
                         ],
                     }],
                 };
+                if (!webhookHasAvatar) {
+                    discorddowndata.avatar_url = "https://github.com/louislam/uptime-kuma/raw/master/public/icon.png";
+                }
                 if (notification.discordChannelType === "createNewForumPost") {
                     discorddowndata.thread_name = notification.postName;
                 }
@@ -83,10 +97,10 @@ class Discord extends NotificationProvider {
                                 name: "Service Name",
                                 value: monitorJSON["name"],
                             },
-                            {
+                            ...(!notification.disableUrl ? [{
                                 name: monitorJSON["type"] === "push" ? "Service Type" : "Service URL",
                                 value: this.extractAddress(monitorJSON),
-                            },
+                            }] : []),
                             {
                                 name: `Time (${heartbeatJSON["timezone"]})`,
                                 value: heartbeatJSON["localDateTime"],
@@ -98,6 +112,9 @@ class Discord extends NotificationProvider {
                         ],
                     }],
                 };
+                if (!webhookHasAvatar) {
+                    discordupdata.avatar_url = "https://github.com/louislam/uptime-kuma/raw/master/public/icon.png";
+                }
 
                 if (notification.discordChannelType === "createNewForumPost") {
                     discordupdata.thread_name = notification.postName;

server/notification-providers/flashduty.js

@@ -73,13 +73,13 @@ class FlashDuty extends NotificationProvider {
         }
         const options = {
             method: "POST",
-            url: "https://api.flashcat.cloud/event/push/alert/standard?integration_key=" + notification.flashdutyIntegrationKey,
+            url: notification.flashdutyIntegrationKey.startsWith("http") ? notification.flashdutyIntegrationKey : "https://api.flashcat.cloud/event/push/alert/standard?integration_key=" + notification.flashdutyIntegrationKey,
             headers: { "Content-Type": "application/json" },
             data: {
                 description: `[${title}] [${monitorInfo.name}] ${body}`,
                 title,
                 event_status: eventStatus || "Info",
-                alert_key: String(monitorInfo.id) || Math.random().toString(36).substring(7),
+                alert_key: monitorInfo.id ? String(monitorInfo.id) : Math.random().toString(36).substring(7),
                 labels,
             }
         };

server/notification-providers/google-chat.js

@@ -72,6 +72,7 @@ class GoogleChat extends NotificationProvider {
 
             // construct json data
             let data = {
+                fallbackText: chatHeader["title"],
                 cardsV2: [
                     {
                         card: {

server/notification-providers/nostr.js

@@ -1,11 +1,10 @@
 const NotificationProvider = require("./notification-provider");
 const {
-    relayInit,
+    finalizeEvent,
-    getPublicKey,
+    Relay,
-    getEventHash,
+    kinds,
-    getSignature,
     nip04,
-    nip19
+    nip19,
 } = require("nostr-tools");
 
 // polyfills for node versions
@@ -31,7 +30,6 @@ class Nostr extends NotificationProvider {
         const createdAt = Math.floor(Date.now() / 1000);
 
         const senderPrivateKey = await this.getPrivateKey(notification.sender);
-        const senderPublicKey = getPublicKey(senderPrivateKey);
         const recipientsPublicKeys = await this.getPublicKeys(notification.recipients);
 
         // Create NIP-04 encrypted direct message event for each recipient
@@ -39,34 +37,41 @@ class Nostr extends NotificationProvider {
         for (const recipientPublicKey of recipientsPublicKeys) {
             const ciphertext = await nip04.encrypt(senderPrivateKey, recipientPublicKey, msg);
             let event = {
-                kind: 4,
+                kind: kinds.EncryptedDirectMessage,
-                pubkey: senderPublicKey,
                 created_at: createdAt,
                 tags: [[ "p", recipientPublicKey ]],
                 content: ciphertext,
             };
-            event.id = getEventHash(event);
+            const signedEvent = finalizeEvent(event, senderPrivateKey);
-            event.sig = getSignature(event, senderPrivateKey);
+            events.push(signedEvent);
-            events.push(event);
         }
 
         // Publish events to each relay
         const relays = notification.relays.split("\n");
         let successfulRelays = 0;
-
-        // Connect to each relay
         for (const relayUrl of relays) {
-            const relay = relayInit(relayUrl);
+            const relay = await Relay.connect(relayUrl);
-            try {
+            let eventIndex = 0;
-                await relay.connect();
-                successfulRelays++;
 
-                // Publish events
+            // Authenticate to the relay, if required
-                for (const event of events) {
+            try {
-                    relay.publish(event);
+                await relay.publish(events[0]);
-                }
+                eventIndex = 1;
             } catch (error) {
-                continue;
+                if (relay.challenge) {
+                    await relay.auth(async (evt) => {
+                        return finalizeEvent(evt, senderPrivateKey);
+                    });
+                }
+            }
+
+            try {
+                for (let i = eventIndex; i < events.length; i++) {
+                    await relay.publish(events[i]);
+                }
+                successfulRelays++;
+            } catch (error) {
+                console.error(`Failed to publish event to ${relayUrl}:`, error);
             } finally {
                 relay.close();
             }
@@ -90,7 +95,7 @@ class Nostr extends NotificationProvider {
             const { data } = senderDecodeResult;
             return data;
         } catch (error) {
-            throw new Error(`Failed to get private key: ${error.message}`);
+            throw new Error(`Failed to decode private key for sender ${sender}: ${error.message}`);
         }
     }
 
@@ -109,10 +114,10 @@ class Nostr extends NotificationProvider {
                 if (type === "npub") {
                     publicKeys.push(data);
                 } else {
-                    throw new Error("not an npub");
+                    throw new Error(`Recipient ${recipient} is not an npub`);
                 }
             } catch (error) {
-                throw new Error(`Error decoding recipient: ${error}`);
+                throw new Error(`Error decoding recipient ${recipient}: ${error}`);
             }
         }
         return publicKeys;

server/notification-providers/notifery.js

@@ -0,0 +1,53 @@
+const { getMonitorRelativeURL, UP } = require("../../src/util");
+const { setting } = require("../util-server");
+const NotificationProvider = require("./notification-provider");
+const axios = require("axios");
+
+class Notifery extends NotificationProvider {
+    name = "notifery";
+
+    /**
+     * @inheritdoc
+     */
+    async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
+        const okMsg = "Sent Successfully.";
+        const url = "https://api.notifery.com/event";
+
+        let data = {
+            title: notification.notiferyTitle || "Uptime Kuma Alert",
+            message: msg,
+        };
+
+        if (notification.notiferyGroup) {
+            data.group = notification.notiferyGroup;
+        }
+
+        // Link to the monitor
+        const baseURL = await setting("primaryBaseURL");
+        if (baseURL && monitorJSON) {
+            data.message += `\n\nMonitor: ${baseURL}${getMonitorRelativeURL(monitorJSON.id)}`;
+        }
+
+        if (heartbeatJSON) {
+            data.code = heartbeatJSON.status === UP ? 0 : 1;
+
+            if (heartbeatJSON.ping) {
+                data.duration = heartbeatJSON.ping;
+            }
+        }
+
+        try {
+            const headers = {
+                "Content-Type": "application/json",
+                "x-api-key": notification.notiferyApiKey,
+            };
+
+            await axios.post(url, data, { headers });
+            return okMsg;
+        } catch (error) {
+            this.throwGeneralAxiosError(error);
+        }
+    }
+}
+
+module.exports = Notifery;

server/notification-providers/notification-provider.js

@@ -1,3 +1,6 @@
+const { Liquid } = require("liquidjs");
+const { DOWN } = require("../../src/util");
+
 class NotificationProvider {
 
     /**
@@ -49,6 +52,50 @@ class NotificationProvider {
         }
     }
 
+    /**
+     * Renders a message template with notification context
+     * @param {string} template the template
+     * @param {string} msg the message that will be included in the context
+     * @param {?object} monitorJSON Monitor details (For Up/Down/Cert-Expiry only)
+     * @param {?object} heartbeatJSON Heartbeat details (For Up/Down only)
+     * @returns {Promise<string>} rendered template
+     */
+    async renderTemplate(template, msg, monitorJSON, heartbeatJSON) {
+        const engine = new Liquid();
+        const parsedTpl = engine.parse(template);
+
+        // Let's start with dummy values to simplify code
+        let monitorName = "Monitor Name not available";
+        let monitorHostnameOrURL = "testing.hostname";
+
+        if (monitorJSON !== null) {
+            monitorName = monitorJSON["name"];
+            monitorHostnameOrURL = this.extractAddress(monitorJSON);
+        }
+
+        let serviceStatus = "⚠️ Test";
+        if (heartbeatJSON !== null) {
+            serviceStatus = (heartbeatJSON["status"] === DOWN) ? "🔴 Down" : "✅ Up";
+        }
+
+        const context = {
+            // for v1 compatibility, to be removed in v3
+            "STATUS": serviceStatus,
+            "NAME": monitorName,
+            "HOSTNAME_OR_URL": monitorHostnameOrURL,
+
+            // variables which are officially supported
+            "status": serviceStatus,
+            "name": monitorName,
+            "hostnameOrURL": monitorHostnameOrURL,
+            monitorJSON,
+            heartbeatJSON,
+            msg,
+        };
+
+        return engine.render(parsedTpl, context);
+    }
+
     /**
      * Throws an error
      * @param {any} error The error to throw

server/notification-providers/ntfy.js

@@ -41,8 +41,8 @@ class Ntfy extends NotificationProvider {
                 if (heartbeatJSON.status === DOWN) {
                     tags = [ "red_circle" ];
                     status = "Down";
-                    // if priority is not 5, increase priority for down alerts
+                    // defaults to max(priority + 1, 5)
-                    priority = priority === 5 ? priority : priority + 1;
+                    priority = notification.ntfyPriorityDown || (priority === 5 ? priority : priority + 1);
                 } else if (heartbeatJSON["status"] === UP) {
                     tags = [ "green_circle" ];
                     status = "Up";

server/notification-providers/onechat.js

@@ -0,0 +1,73 @@
+const NotificationProvider = require("./notification-provider");
+const axios = require("axios");
+const { DOWN, UP } = require("../../src/util");
+
+class OneChat extends NotificationProvider {
+    name = "OneChat";
+
+    /**
+     * @inheritdoc
+     */
+    async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
+        const okMsg = "Sent Successfully.";
+        const url = "https://chat-api.one.th/message/api/v1/push_message";
+
+        try {
+            const config = {
+                headers: {
+                    "Content-Type": "application/json",
+                    Authorization: "Bearer " + notification.accessToken,
+                },
+            };
+            if (heartbeatJSON == null) {
+                const testMessage = {
+                    to: notification.recieverId,
+                    bot_id: notification.botId,
+                    type: "text",
+                    message: "Test Successful!",
+                };
+                await axios.post(url, testMessage, config);
+            } else if (heartbeatJSON["status"] === DOWN) {
+                const downMessage = {
+                    to: notification.recieverId,
+                    bot_id: notification.botId,
+                    type: "text",
+                    message:
+                        `UptimeKuma Alert:
+[🔴 Down]
+Name: ${monitorJSON["name"]}
+${heartbeatJSON["msg"]}
+Time (${heartbeatJSON["timezone"]}): ${heartbeatJSON["localDateTime"]}`,
+                };
+                await axios.post(url, downMessage, config);
+            } else if (heartbeatJSON["status"] === UP) {
+                const upMessage = {
+                    to: notification.recieverId,
+                    bot_id: notification.botId,
+                    type: "text",
+                    message:
+                        `UptimeKuma Alert:
+[🟢 Up]
+Name: ${monitorJSON["name"]}
+${heartbeatJSON["msg"]}
+Time (${heartbeatJSON["timezone"]}): ${heartbeatJSON["localDateTime"]}`,
+                };
+                await axios.post(url, upMessage, config);
+            }
+
+            return okMsg;
+        } catch (error) {
+            // Handle errors and throw a descriptive message
+            if (error.response) {
+                const errorMessage =
+                    error.response.data?.message ||
+                    "Unknown API error occurred.";
+                throw new Error(`OneChat API Error: ${errorMessage}`);
+            } else {
+                this.throwGeneralAxiosError(error);
+            }
+        }
+    }
+}
+
+module.exports = OneChat;

server/notification-providers/pumble.js

@@ -0,0 +1,48 @@
+const NotificationProvider = require("./notification-provider");
+const axios = require("axios");
+const { UP } = require("../../src/util");
+
+class Pumble extends NotificationProvider {
+    name = "pumble";
+
+    /**
+     * @inheritDoc
+     */
+    async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
+        const okMsg = "Sent Successfully.";
+
+        try {
+            if (heartbeatJSON === null && monitorJSON === null) {
+                let data = {
+                    "attachments": [
+                        {
+                            "title": "Uptime Kuma Alert",
+                            "text": msg,
+                            "color": "#5BDD8B"
+                        }
+                    ]
+                };
+
+                await axios.post(notification.webhookURL, data);
+                return okMsg;
+            }
+
+            let data = {
+                "attachments": [
+                    {
+                        "title": `${monitorJSON["name"]} is ${heartbeatJSON["status"] === UP ? "up" : "down"}`,
+                        "text": heartbeatJSON["msg"],
+                        "color": (heartbeatJSON["status"] === UP ? "#5BDD8B" : "#DC3645"),
+                    }
+                ]
+            };
+
+            await axios.post(notification.webhookURL, data);
+            return okMsg;
+        } catch (error) {
+            this.throwGeneralAxiosError(error);
+        }
+    }
+}
+
+module.exports = Pumble;

server/notification-providers/pushdeer.js

@@ -11,7 +11,8 @@ class PushDeer extends NotificationProvider {
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
         const okMsg = "Sent Successfully.";
         const serverUrl = notification.pushdeerServer || "https://api2.pushdeer.com";
-        const url = `${serverUrl.trim().replace(/\/*$/, "")}/message/push`;
+        // capture group below is nessesary to prevent an ReDOS-attack
+        const url = `${serverUrl.trim().replace(/([^/])\/+$/, "$1")}/message/push`;
 
         let valid = msg != null && monitorJSON != null && heartbeatJSON != null;
 

server/notification-providers/pushover.js

@@ -1,5 +1,6 @@
 const { getMonitorRelativeURL } = require("../../src/util");
 const { setting } = require("../util-server");
+const { UP } = require("../../src/util");
 
 const NotificationProvider = require("./notification-provider");
 const axios = require("axios");
@@ -43,15 +44,20 @@ class Pushover extends NotificationProvider {
             if (heartbeatJSON == null) {
                 await axios.post(url, data);
                 return okMsg;
-            } else {
-                data.message += `\n<b>Time (${heartbeatJSON["timezone"]})</b>:${heartbeatJSON["localDateTime"]}`;
-                await axios.post(url, data);
-                return okMsg;
             }
+
+            if (heartbeatJSON.status === UP && notification.pushoversounds_up) {
+                // default = DOWN => DOWN-sound is also played for non-UP/DOWN notiifcations
+                data.sound = notification.pushoversounds_up;
+            }
+
+            data.message += `\n<b>Time (${heartbeatJSON["timezone"]})</b>: ${heartbeatJSON["localDateTime"]}`;
+            await axios.post(url, data);
+            return okMsg;
+
         } catch (error) {
             this.throwGeneralAxiosError(error);
         }
-
     }
 }
 

server/notification-providers/pushplus.js

@@ -0,0 +1,56 @@
+const NotificationProvider = require("./notification-provider");
+const axios = require("axios");
+const { DOWN, UP } = require("../../src/util");
+
+class PushPlus extends NotificationProvider {
+    name = "PushPlus";
+
+    /**
+     * @inheritdoc
+     * @param {BeanModel} notification Notification object
+     * @param {string} msg Message content
+     * @param {?object} monitorJSON Monitor details
+     * @param {?object} heartbeatJSON Heartbeat details
+     * @returns {Promise<string>} Success message
+     */
+    async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
+        const okMsg = "Sent Successfully.";
+        const url = "https://www.pushplus.plus/send";
+        try {
+            const config = {
+                headers: {
+                    "Content-Type": "application/json",
+                },
+            };
+            const params = {
+                "token": notification.pushPlusSendKey,
+                "title": this.checkStatus(heartbeatJSON, monitorJSON),
+                "content": msg,
+                "template": "html"
+            };
+            await axios.post(url, params, config);
+            return okMsg;
+        } catch (error) {
+            this.throwGeneralAxiosError(error);
+        }
+    }
+
+    /**
+     * Get the formatted title for message
+     * @param {?object} heartbeatJSON Heartbeat details (For Up/Down only)
+     * @param {?object} monitorJSON Monitor details (For Up/Down only)
+     * @returns {string} Formatted title
+     */
+    checkStatus(heartbeatJSON, monitorJSON) {
+        let title = "UptimeKuma Message";
+        if (heartbeatJSON != null && heartbeatJSON["status"] === UP) {
+            title = "UptimeKuma Monitor Up " + monitorJSON["name"];
+        }
+        if (heartbeatJSON != null && heartbeatJSON["status"] === DOWN) {
+            title = "UptimeKuma Monitor Down " + monitorJSON["name"];
+        }
+        return title;
+    }
+}
+
+module.exports = PushPlus;

server/notification-providers/slack.js

@@ -145,6 +145,7 @@ class Slack extends NotificationProvider {
 
             const title = "Uptime Kuma Alert";
             let data = {
+                "text": msg,
                 "channel": notification.slackchannel,
                 "username": notification.slackusername,
                 "icon_emoji": notification.slackiconemo,

server/notification-providers/sms-planet.js

@@ -0,0 +1,40 @@
+const NotificationProvider = require("./notification-provider");
+const axios = require("axios");
+
+class SMSPlanet extends NotificationProvider {
+    name = "SMSPlanet";
+
+    /**
+     * @inheritdoc
+     */
+    async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
+        const okMsg = "Sent Successfully.";
+        const url = "https://api2.smsplanet.pl/sms";
+
+        try {
+            let config = {
+                headers: {
+                    "Authorization": "Bearer " + notification.smsplanetApiToken,
+                    "content-type": "multipart/form-data"
+                }
+            };
+
+            let data = {
+                "from": notification.smsplanetSenderName,
+                "to": notification.smsplanetPhoneNumbers,
+                "msg": msg.replace(/🔴/, "❌")
+            };
+
+            let response = await axios.post(url, data, config);
+            if (!response.data?.messageId) {
+                throw new Error(response.data?.errorMsg ?? "SMSPlanet server did not respond with the expected result");
+            }
+
+            return okMsg;
+        } catch (error) {
+            this.throwGeneralAxiosError(error);
+        }
+    }
+}
+
+module.exports = SMSPlanet;

server/notification-providers/smseagle.js

@@ -11,59 +11,127 @@ class SMSEagle extends NotificationProvider {
         const okMsg = "Sent Successfully.";
 
         try {
-            let config = {
+            if (notification.smseagleApiType === "smseagle-apiv1") { // according to https://www.smseagle.eu/apiv1/
-                headers: {
+                let config = {
-                    "Content-Type": "application/json",
+                    headers: {
+                        "Content-Type": "application/x-www-form-urlencoded",
+                    }
+                };
+
+                let sendMethod;
+                let recipientType;
+                let duration;
+                let voiceId;
+
+                if (notification.smseagleRecipientType === "smseagle-contact") {
+                    recipientType = "contactname";
+                    sendMethod = "/send_tocontact";
+                } else if (notification.smseagleRecipientType === "smseagle-group") {
+                    recipientType = "groupname";
+                    sendMethod = "/send_togroup";
+                } else if (notification.smseagleRecipientType === "smseagle-to") {
+                    recipientType = "to";
+                    sendMethod = "/send_sms";
+                    if (notification.smseagleMsgType !== "smseagle-sms") {
+                        duration = notification.smseagleDuration ?? 10;
+
+                        if (notification.smseagleMsgType === "smseagle-ring") {
+                            sendMethod = "/ring_call";
+                        } else if (notification.smseagleMsgType === "smseagle-tts") {
+                            sendMethod = "/tts_call";
+                        } else if (notification.smseagleMsgType === "smseagle-tts-advanced") {
+                            sendMethod = "/tts_adv_call";
+                            voiceId = notification.smseagleTtsModel ? notification.smseagleTtsModel : 1;
+                        }
+                    }
                 }
-            };
 
-            let postData;
+                const url = new URL(notification.smseagleUrl + "/http_api" + sendMethod);
-            let sendMethod;
-            let recipientType;
 
-            let encoding = (notification.smseagleEncoding) ? "1" : "0";
+                url.searchParams.append("access_token", notification.smseagleToken);
-            let priority = (notification.smseaglePriority) ? notification.smseaglePriority : "0";
+                url.searchParams.append(recipientType, notification.smseagleRecipient);
-
+                if (!notification.smseagleRecipientType || notification.smseagleRecipientType === "smseagle-sms") {
-            if (notification.smseagleRecipientType === "smseagle-contact") {
+                    url.searchParams.append("unicode", (notification.smseagleEncoding) ? "1" : "0");
-                recipientType = "contactname";
+                    url.searchParams.append("highpriority", notification.smseaglePriority ?? "0");
-                sendMethod = "sms.send_tocontact";
-            }
-            if (notification.smseagleRecipientType === "smseagle-group") {
-                recipientType = "groupname";
-                sendMethod = "sms.send_togroup";
-            }
-            if (notification.smseagleRecipientType === "smseagle-to") {
-                recipientType = "to";
-                sendMethod = "sms.send_sms";
-            }
-
-            let params = {
-                access_token: notification.smseagleToken,
-                [recipientType]: notification.smseagleRecipient,
-                message: msg,
-                responsetype: "extended",
-                unicode: encoding,
-                highpriority: priority
-            };
-
-            postData = {
-                method: sendMethod,
-                params: params
-            };
-
-            let resp = await axios.post(notification.smseagleUrl + "/jsonrpc/sms", postData, config);
-
-            if ((JSON.stringify(resp.data)).indexOf("message_id") === -1) {
-                let error = "";
-                if (resp.data.result && resp.data.result.error_text) {
-                    error = `SMSEagle API returned error: ${JSON.stringify(resp.data.result.error_text)}`;
                 } else {
-                    error = "SMSEagle API returned an unexpected response";
+                    url.searchParams.append("duration", duration);
+                }
+                if (notification.smseagleRecipientType !== "smseagle-ring") {
+                    url.searchParams.append("message", msg);
+                }
+                if (voiceId) {
+                    url.searchParams.append("voice_id", voiceId);
                 }
-                throw new Error(error);
-            }
 
-            return okMsg;
+                let resp = await axios.get(url.toString(), config);
+
+                if (resp.data.indexOf("OK") === -1) {
+                    let error = `SMSEagle API returned error: ${resp.data}`;
+                    throw new Error(error);
+                }
+
+                return okMsg;
+            } else if (notification.smseagleApiType === "smseagle-apiv2") { // according to https://www.smseagle.eu/docs/apiv2/
+                let config = {
+                    headers: {
+                        "access-token": notification.smseagleToken,
+                        "Content-Type": "application/json",
+                    }
+                };
+
+                let encoding = (notification.smseagleEncoding) ? "unicode" : "standard";
+                let priority = (notification.smseaglePriority) ?? 0;
+
+                let postData = {
+                    text: msg,
+                    encoding: encoding,
+                    priority: priority
+                };
+
+                if (notification.smseagleRecipientContact) {
+                    postData["contacts"] = notification.smseagleRecipientContact.split(",").map(Number);
+                }
+                if (notification.smseagleRecipientGroup) {
+                    postData["groups"] = notification.smseagleRecipientGroup.split(",").map(Number);
+                }
+                if (notification.smseagleRecipientTo) {
+                    postData["to"] = notification.smseagleRecipientTo.split(",");
+                }
+
+                let endpoint = "/messages/sms";
+
+                if (notification.smseagleMsgType !== "smseagle-sms") {
+
+                    postData["duration"] = notification.smseagleDuration ?? 10;
+
+                    if (notification.smseagleMsgType === "smseagle-ring") {
+                        endpoint = "/calls/ring";
+                    } else if (notification.smseagleMsgType === "smseagle-tts") {
+                        endpoint = "/calls/tts";
+                    } else if (notification.smseagleMsgType === "smseagle-tts-advanced") {
+                        endpoint = "/calls/tts_advanced";
+                        postData["voice_id"] = notification.smseagleTtsModel ?? 1;
+                    }
+                }
+
+                let resp = await axios.post(notification.smseagleUrl + "/api/v2" + endpoint, postData, config);
+
+                const queuedCount = resp.data.filter(x => x.status === "queued").length;
+                const unqueuedCount = resp.data.length - queuedCount;
+
+                if (resp.status !== 200 || queuedCount === 0) {
+                    if (!resp.data.length) {
+                        throw new Error("SMSEagle API returned an empty response");
+                    }
+                    throw new Error(`SMSEagle API returned error: ${JSON.stringify(resp.data)}`);
+                }
+
+                if (unqueuedCount) {
+                    return `Sent ${queuedCount}/${resp.data.length} Messages Successfully.`;
+                }
+
+                return okMsg;
+            }
         } catch (error) {
             this.throwGeneralAxiosError(error);
         }

server/notification-providers/smtp.js

@@ -1,7 +1,5 @@
 const nodemailer = require("nodemailer");
 const NotificationProvider = require("./notification-provider");
-const { DOWN } = require("../../src/util");
-const { Liquid } = require("liquidjs");
 
 class SMTP extends NotificationProvider {
     name = "smtp";
@@ -44,6 +42,7 @@ class SMTP extends NotificationProvider {
         // default values in case the user does not want to template
         let subject = msg;
         let body = msg;
+        let useHTMLBody = false;
         if (heartbeatJSON) {
             body = `${msg}\nTime (${heartbeatJSON["timezone"]}): ${heartbeatJSON["localDateTime"]}`;
         }
@@ -52,16 +51,12 @@ class SMTP extends NotificationProvider {
             // cannot end with whitespace as this often raises spam scores
             const customSubject = notification.customSubject?.trim() || "";
             const customBody = notification.customBody?.trim() || "";
-
-            const context = this.generateContext(msg, monitorJSON, heartbeatJSON);
-            const engine = new Liquid();
             if (customSubject !== "") {
-                const tpl = engine.parse(customSubject);
+                subject = await this.renderTemplate(customSubject, msg, monitorJSON, heartbeatJSON);
-                subject = await engine.render(tpl, context);
             }
             if (customBody !== "") {
-                const tpl = engine.parse(customBody);
+                useHTMLBody = notification.htmlBody || false;
-                body = await engine.render(tpl, context);
+                body = await this.renderTemplate(customBody, msg, monitorJSON, heartbeatJSON);
             }
         }
 
@@ -73,48 +68,12 @@ class SMTP extends NotificationProvider {
             bcc: notification.smtpBCC,
             to: notification.smtpTo,
             subject: subject,
-            text: body,
+            // If the email body is custom, and the user wants it, set the email body as HTML
+            [useHTMLBody ? "html" : "text"]: body
         });
 
         return okMsg;
     }
-
-    /**
-     * Generate context for LiquidJS
-     * @param {string} msg  the message that will be included in the context
-     * @param {?object} monitorJSON Monitor details (For Up/Down/Cert-Expiry only)
-     * @param {?object} heartbeatJSON Heartbeat details (For Up/Down only)
-     * @returns {{STATUS: string, status: string, HOSTNAME_OR_URL: string, hostnameOrUrl: string, NAME: string, name: string, monitorJSON: ?object, heartbeatJSON: ?object, msg: string}} the context
-     */
-    generateContext(msg, monitorJSON, heartbeatJSON) {
-        // Let's start with dummy values to simplify code
-        let monitorName = "Monitor Name not available";
-        let monitorHostnameOrURL = "testing.hostname";
-
-        if (monitorJSON !== null) {
-            monitorName = monitorJSON["name"];
-            monitorHostnameOrURL = this.extractAddress(monitorJSON);
-        }
-
-        let serviceStatus = "⚠️ Test";
-        if (heartbeatJSON !== null) {
-            serviceStatus = (heartbeatJSON["status"] === DOWN) ? "🔴 Down" : "✅ Up";
-        }
-        return {
-            // for v1 compatibility, to be removed in v3
-            "STATUS": serviceStatus,
-            "NAME": monitorName,
-            "HOSTNAME_OR_URL": monitorHostnameOrURL,
-
-            // variables which are officially supported
-            "status": serviceStatus,
-            "name": monitorName,
-            "hostnameOrURL": monitorHostnameOrURL,
-            monitorJSON,
-            heartbeatJSON,
-            msg,
-        };
-    }
 }
 
 module.exports = SMTP;

server/notification-providers/spugpush.js

@@ -0,0 +1,37 @@
+const NotificationProvider = require("./notification-provider");
+const axios = require("axios");
+const { DOWN, UP } = require("../../src/util");
+
+class SpugPush extends NotificationProvider {
+
+    name = "SpugPush";
+
+    /**
+     * @inheritdoc
+     */
+    async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
+        let okMsg = "Sent Successfully.";
+        try {
+            let formData = {
+                title: "Uptime Kuma Message",
+                content: msg
+            };
+            if (heartbeatJSON) {
+                if (heartbeatJSON["status"] === UP) {
+                    formData.title = `UptimeKuma 「${monitorJSON["name"]}」 is Up`;
+                    formData.content = `[✅ Up] ${heartbeatJSON["msg"]}`;
+                } else if (heartbeatJSON["status"] === DOWN) {
+                    formData.title = `UptimeKuma 「${monitorJSON["name"]}」 is Down`;
+                    formData.content = `[🔴 Down] ${heartbeatJSON["msg"]}`;
+                }
+            }
+            const apiUrl = `https://push.spug.cc/send/${notification.templateKey}`;
+            await axios.post(apiUrl, formData);
+            return okMsg;
+        } catch (error) {
+            this.throwGeneralAxiosError(error);
+        }
+    }
+}
+
+module.exports = SpugPush;

server/notification-providers/telegram.js

@@ -9,7 +9,7 @@ class Telegram extends NotificationProvider {
      */
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
         const okMsg = "Sent Successfully.";
-        const url = "https://api.telegram.org";
+        const url = notification.telegramServerUrl ?? "https://api.telegram.org";
 
         try {
             let params = {
@@ -22,6 +22,14 @@ class Telegram extends NotificationProvider {
                 params.message_thread_id = notification.telegramMessageThreadID;
             }
 
+            if (notification.telegramUseTemplate) {
+                params.text = await this.renderTemplate(notification.telegramTemplate, msg, monitorJSON, heartbeatJSON);
+
+                if (notification.telegramTemplateParseMode !== "plain") {
+                    params.parse_mode = notification.telegramTemplateParseMode;
+                }
+            }
+
             await axios.get(`${url}/bot${notification.telegramBotToken}/sendMessage`, {
                 params: params,
             });

server/notification-providers/waha.js

@@ -0,0 +1,40 @@
+const NotificationProvider = require("./notification-provider");
+const axios = require("axios");
+
+class WAHA extends NotificationProvider {
+    name = "waha";
+
+    /**
+     * @inheritdoc
+     */
+    async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
+        const okMsg = "Sent Successfully.";
+
+        try {
+            const config = {
+                headers: {
+                    "Accept": "application/json",
+                    "Content-Type": "application/json",
+                    "X-Api-Key": notification.wahaApiKey,
+                }
+            };
+
+            let data = {
+                "session": notification.wahaSession,
+                "chatId": notification.wahaChatId,
+                "text": msg,
+            };
+
+            let url = notification.wahaApiUrl.replace(/([^/])\/+$/, "$1") + "/api/sendText";
+
+            await axios.post(url, data, config);
+
+            return okMsg;
+        } catch (error) {
+            this.throwGeneralAxiosError(error);
+        }
+    }
+
+}
+
+module.exports = WAHA;

server/notification-providers/webhook.js

@@ -1,7 +1,6 @@
 const NotificationProvider = require("./notification-provider");
 const axios = require("axios");
 const FormData = require("form-data");
-const { Liquid } = require("liquidjs");
 
 class Webhook extends NotificationProvider {
     name = "webhook";
@@ -28,17 +27,7 @@ class Webhook extends NotificationProvider {
                 config.headers = formData.getHeaders();
                 data = formData;
             } else if (notification.webhookContentType === "custom") {
-                // Initialize LiquidJS and parse the custom Body Template
+                data = await this.renderTemplate(notification.webhookCustomBody, msg, monitorJSON, heartbeatJSON);
-                const engine = new Liquid();
-                const tpl = engine.parse(notification.webhookCustomBody);
-
-                // Insert templated values into Body
-                data = await engine.render(tpl,
-                    {
-                        msg,
-                        heartbeatJSON,
-                        monitorJSON
-                    });
             }
 
             if (notification.webhookAdditionalHeaders) {

server/notification-providers/whapi.js

@@ -24,7 +24,7 @@ class Whapi extends NotificationProvider {
                 "body": msg,
             };
 
-            let url = (notification.whapiApiUrl || "https://gate.whapi.cloud/").replace(/\/+$/, "") + "/messages/text";
+            let url = (notification.whapiApiUrl || "https://gate.whapi.cloud/").replace(/([^/])\/+$/, "$1") + "/messages/text";
 
             await axios.post(url, data, config);
 

server/notification-providers/yzj.js

@@ -0,0 +1,57 @@
+const NotificationProvider = require("./notification-provider");
+const { DOWN, UP } = require("../../src/util");
+const { default: axios } = require("axios");
+
+class YZJ extends NotificationProvider {
+    name = "YZJ";
+
+    /**
+     * @inheritdoc
+     */
+    async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
+        let okMsg = "Sent Successfully.";
+
+        try {
+            if (heartbeatJSON !== null) {
+                msg = `${this.statusToString(heartbeatJSON["status"])} ${monitorJSON["name"]} \n> ${heartbeatJSON["msg"]}\n> Time (${heartbeatJSON["timezone"]}): ${heartbeatJSON["localDateTime"]}`;
+            }
+
+            const config = {
+                headers: {
+                    "Content-Type": "application/json",
+                },
+            };
+            const params = {
+                content: msg
+            };
+            // yzjtype=0 => general robot
+            const url = `${notification.yzjWebHookUrl}?yzjtype=0&yzjtoken=${notification.yzjToken}`;
+
+            const result = await axios.post(url, params, config);
+            if (!result.data?.success) {
+                throw new Error(result.data?.errmsg ?? "yzj's server did not respond with the expected result");
+            }
+            return okMsg;
+        } catch (error) {
+            this.throwGeneralAxiosError(error);
+        }
+    }
+
+    /**
+     * Convert status constant to string
+     * @param {string} status The status constant
+     * @returns {string} status
+     */
+    statusToString(status) {
+        switch (status) {
+            case DOWN:
+                return "❌";
+            case UP:
+                return "✅";
+            default:
+                return status;
+        }
+    }
+}
+
+module.exports = YZJ;

server/notification.js

@@ -13,6 +13,7 @@ const DingDing = require("./notification-providers/dingding");
 const Discord = require("./notification-providers/discord");
 const Elks = require("./notification-providers/46elks");
 const Feishu = require("./notification-providers/feishu");
+const Notifery = require("./notification-providers/notifery");
 const FreeMobile = require("./notification-providers/freemobile");
 const GoogleChat = require("./notification-providers/google-chat");
 const Gorush = require("./notification-providers/gorush");
@@ -30,15 +31,18 @@ const Mattermost = require("./notification-providers/mattermost");
 const Nostr = require("./notification-providers/nostr");
 const Ntfy = require("./notification-providers/ntfy");
 const Octopush = require("./notification-providers/octopush");
+const OneChat = require("./notification-providers/onechat");
 const OneBot = require("./notification-providers/onebot");
 const Opsgenie = require("./notification-providers/opsgenie");
 const PagerDuty = require("./notification-providers/pagerduty");
+const Pumble = require("./notification-providers/pumble");
 const FlashDuty = require("./notification-providers/flashduty");
 const PagerTree = require("./notification-providers/pagertree");
 const PromoSMS = require("./notification-providers/promosms");
 const Pushbullet = require("./notification-providers/pushbullet");
 const PushDeer = require("./notification-providers/pushdeer");
 const Pushover = require("./notification-providers/pushover");
+const PushPlus = require("./notification-providers/pushplus");
 const Pushy = require("./notification-providers/pushy");
 const RocketChat = require("./notification-providers/rocket-chat");
 const SerwerSMS = require("./notification-providers/serwersms");
@@ -64,11 +68,15 @@ const ServerChan = require("./notification-providers/serverchan");
 const ZohoCliq = require("./notification-providers/zoho-cliq");
 const SevenIO = require("./notification-providers/sevenio");
 const Whapi = require("./notification-providers/whapi");
+const WAHA = require("./notification-providers/waha");
 const GtxMessaging = require("./notification-providers/gtx-messaging");
 const Cellsynt = require("./notification-providers/cellsynt");
 const Onesender = require("./notification-providers/onesender");
 const Wpush = require("./notification-providers/wpush");
 const SendGrid = require("./notification-providers/send-grid");
+const YZJ = require("./notification-providers/yzj");
+const SMSPlanet = require("./notification-providers/sms-planet");
+const SpugPush = require("./notification-providers/spugpush");
 
 class Notification {
 
@@ -116,6 +124,7 @@ class Notification {
             new Nostr(),
             new Ntfy(),
             new Octopush(),
+            new OneChat(),
             new OneBot(),
             new Onesender(),
             new Opsgenie(),
@@ -123,9 +132,11 @@ class Notification {
             new FlashDuty(),
             new PagerTree(),
             new PromoSMS(),
+            new Pumble(),
             new Pushbullet(),
             new PushDeer(),
             new Pushover(),
+            new PushPlus(),
             new Pushy(),
             new RocketChat(),
             new ServerChan(),
@@ -151,10 +162,15 @@ class Notification {
             new ZohoCliq(),
             new SevenIO(),
             new Whapi(),
+            new WAHA(),
             new GtxMessaging(),
             new Cellsynt(),
             new Wpush(),
-            new SendGrid()
+            new SendGrid(),
+            new YZJ(),
+            new SMSPlanet(),
+            new SpugPush(),
+            new Notifery(),
         ];
         for (let item of list) {
             if (! item.name) {

server/password-hash.js

@@ -5,10 +5,10 @@ const saltRounds = 10;
 /**
  * Hash a password
  * @param {string} password Password to hash
- * @returns {string} Hash
+ * @returns {Promise<string>} Hash
  */
 exports.generate = function (password) {
-    return bcrypt.hashSync(password, saltRounds);
+    return bcrypt.hash(password, saltRounds);
 };
 
 /**

server/prometheus.js

@@ -2,6 +2,7 @@ const PrometheusClient = require("prom-client");
 const { log } = require("../src/util");
 
 const commonLabels = [
+    "monitor_id",
     "monitor_name",
     "monitor_type",
     "monitor_url",
@@ -40,6 +41,7 @@ class Prometheus {
      */
     constructor(monitor) {
         this.monitorLabelValues = {
+            monitor_id: monitor.id,
             monitor_name: monitor.name,
             monitor_type: monitor.type,
             monitor_url: monitor.url,

server/proxy.js

@@ -1,7 +1,7 @@
 const { R } = require("redbean-node");
-const HttpProxyAgent = require("http-proxy-agent");
+const { HttpProxyAgent } = require("http-proxy-agent");
-const HttpsProxyAgent = require("https-proxy-agent");
+const { HttpsProxyAgent } = require("https-proxy-agent");
-const SocksProxyAgent = require("socks-proxy-agent");
+const { SocksProxyAgent } = require("socks-proxy-agent");
 const { debug } = require("../src/util");
 const { UptimeKumaServer } = require("./uptime-kuma-server");
 const { CookieJar } = require("tough-cookie");
@@ -100,17 +100,17 @@ class Proxy {
         let jar = new CookieJar();
 
         const proxyOptions = {
-            protocol: proxy.protocol,
-            host: proxy.host,
-            port: proxy.port,
             cookies: { jar },
         };
 
+        const proxyUrl = new URL(`${proxy.protocol}://${proxy.host}:${proxy.port}`);
+
         if (proxy.auth) {
-            proxyOptions.auth = `${proxy.username}:${proxy.password}`;
+            proxyUrl.username = proxy.username;
+            proxyUrl.password = proxy.password;
         }
 
-        debug(`Proxy Options: ${JSON.stringify(proxyOptions)}`);
+        debug(`Proxy URL: ${proxyUrl.toString()}`);
         debug(`HTTP Agent Options: ${JSON.stringify(httpAgentOptions)}`);
         debug(`HTTPS Agent Options: ${JSON.stringify(httpsAgentOptions)}`);
 
@@ -122,15 +122,15 @@ class Proxy {
                 // eslint-disable-next-line no-case-declarations
                 const HttpsCookieProxyAgent = createCookieAgent(HttpsProxyAgent);
 
-                httpAgent = new HttpCookieProxyAgent({
+                httpAgent = new HttpCookieProxyAgent(proxyUrl.toString(), {
-                    ...httpAgentOptions || {},
+                    ...(httpAgentOptions || {}),
+                    ...proxyOptions,
+                });
+                httpsAgent = new HttpsCookieProxyAgent(proxyUrl.toString(), {
+                    ...(httpsAgentOptions || {}),
                     ...proxyOptions,
                 });
 
-                httpsAgent = new HttpsCookieProxyAgent({
-                    ...httpsAgentOptions || {},
-                    ...proxyOptions,
-                });
                 break;
             case "socks":
             case "socks5":
@@ -138,10 +138,9 @@ class Proxy {
             case "socks4":
                 // eslint-disable-next-line no-case-declarations
                 const SocksCookieProxyAgent = createCookieAgent(SocksProxyAgent);
-                agent = new SocksCookieProxyAgent({
+                agent = new SocksCookieProxyAgent(proxyUrl.toString(), {
                     ...httpAgentOptions,
                     ...httpsAgentOptions,
-                    ...proxyOptions,
                     tls: {
                         rejectUnauthorized: httpsAgentOptions.rejectUnauthorized,
                     },

server/routers/api-router.js

@@ -50,7 +50,7 @@ router.all("/api/push/:pushToken", async (request, response) => {
         let msg = request.query.msg || "OK";
         let ping = parseFloat(request.query.ping) || null;
         let statusString = request.query.status || "up";
-        let status = (statusString === "up") ? UP : DOWN;
+        const statusFromParam = (statusString === "up") ? UP : DOWN;
 
         let monitor = await R.findOne("monitor", " push_token = ? AND active = 1 ", [
             pushToken
@@ -80,7 +80,7 @@ router.all("/api/push/:pushToken", async (request, response) => {
             msg = "Monitor under maintenance";
             bean.status = MAINTENANCE;
         } else {
-            determineStatus(status, previousHeartbeat, monitor.maxretries, monitor.isUpsideDown(), bean);
+            determineStatus(statusFromParam, previousHeartbeat, monitor.maxretries, monitor.isUpsideDown(), bean);
         }
 
         // Calculate uptime
@@ -92,21 +92,21 @@ router.all("/api/push/:pushToken", async (request, response) => {
         log.debug("router", "PreviousStatus: " + previousHeartbeat?.status);
         log.debug("router", "Current Status: " + bean.status);
 
-        bean.important = Monitor.isImportantBeat(isFirstBeat, previousHeartbeat?.status, status);
+        bean.important = Monitor.isImportantBeat(isFirstBeat, previousHeartbeat?.status, bean.status);
 
-        if (Monitor.isImportantForNotification(isFirstBeat, previousHeartbeat?.status, status)) {
+        if (Monitor.isImportantForNotification(isFirstBeat, previousHeartbeat?.status, bean.status)) {
             // Reset down count
             bean.downCount = 0;
 
-            log.debug("monitor", `[${this.name}] sendNotification`);
+            log.debug("monitor", `[${monitor.name}] sendNotification`);
             await Monitor.sendNotification(isFirstBeat, monitor, bean);
         } else {
-            if (bean.status === DOWN && this.resendInterval > 0) {
+            if (bean.status === DOWN && monitor.resendInterval > 0) {
                 ++bean.downCount;
-                if (bean.downCount >= this.resendInterval) {
+                if (bean.downCount >= monitor.resendInterval) {
                     // Send notification again, because we are still DOWN
-                    log.debug("monitor", `[${this.name}] sendNotification again: Down Count: ${bean.downCount} | Resend Interval: ${this.resendInterval}`);
+                    log.debug("monitor", `[${monitor.name}] sendNotification again: Down Count: ${bean.downCount} | Resend Interval: ${monitor.resendInterval}`);
-                    await Monitor.sendNotification(isFirstBeat, this, bean);
+                    await Monitor.sendNotification(isFirstBeat, monitor, bean);
 
                     // Reset down count
                     bean.downCount = 0;

server/routers/status-page-router.js

@@ -89,7 +89,7 @@ router.get("/api/status-page/heartbeat/:slug", cache("1 minutes"), async (reques
                     SELECT * FROM heartbeat
                     WHERE monitor_id = ?
                     ORDER BY time DESC
-                    LIMIT 50
+                    LIMIT 100
             `, [
                 monitorID,
             ]);

server/server.js

@@ -674,7 +674,7 @@ let needSetup = false;
 
                 let user = R.dispense("user");
                 user.username = username;
-                user.password = passwordHash.generate(password);
+                user.password = await passwordHash.generate(password);
                 await R.store(user);
 
                 needSetup = false;
@@ -792,6 +792,7 @@ let needSetup = false;
                 bean.url = monitor.url;
                 bean.method = monitor.method;
                 bean.body = monitor.body;
+                bean.ipFamily = monitor.ipFamily;
                 bean.headers = monitor.headers;
                 bean.basic_auth_user = monitor.basic_auth_user;
                 bean.basic_auth_pass = monitor.basic_auth_pass;
@@ -866,6 +867,7 @@ let needSetup = false;
                     monitor.kafkaProducerAllowAutoTopicCreation;
                 bean.gamedigGivenPortOnly = monitor.gamedigGivenPortOnly;
                 bean.remote_browser = monitor.remote_browser;
+                bean.smtpSecurity = monitor.smtpSecurity;
                 bean.snmpVersion = monitor.snmpVersion;
                 bean.snmpOid = monitor.snmpOid;
                 bean.jsonPathOperator = monitor.jsonPathOperator;
@@ -874,6 +876,12 @@ let needSetup = false;
                 bean.rabbitmqUsername = monitor.rabbitmqUsername;
                 bean.rabbitmqPassword = monitor.rabbitmqPassword;
                 bean.conditions = JSON.stringify(monitor.conditions);
+                bean.manual_status = monitor.manual_status;
+
+                // ping advanced options
+                bean.ping_numeric = monitor.ping_numeric;
+                bean.ping_count = monitor.ping_count;
+                bean.ping_per_request_timeout = monitor.ping_per_request_timeout;
 
                 bean.validate();
 

server/socket-handlers/api-key-socket-handler.js

@@ -20,7 +20,7 @@ module.exports.apiKeySocketHandler = (socket) => {
             checkLogin(socket);
 
             let clearKey = nanoid(40);
-            let hashedKey = passwordHash.generate(clearKey);
+            let hashedKey = await passwordHash.generate(clearKey);
             key["key"] = hashedKey;
             let bean = await APIKey.save(key, socket.userID);
 

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

@@ -14,7 +14,7 @@ module.exports.databaseSocketHandler = (socket) => {
             checkLogin(socket);
             callback({
                 ok: true,
-                size: Database.getSize(),
+                size: await Database.getSize(),
             });
         } catch (error) {
             callback({

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

@@ -4,7 +4,7 @@ const { sendInfo } = require("../client");
 const { checkLogin } = require("../util-server");
 const GameResolver = require("gamedig/lib/GameResolver");
 const { testChrome } = require("../monitor-types/real-browser-monitor-type");
-const fs = require("fs");
+const fsAsync = require("fs").promises;
 const path = require("path");
 
 let gameResolver = new GameResolver();
@@ -90,17 +90,29 @@ module.exports.generalSocketHandler = (socket, server) => {
         }
     });
 
-    socket.on("getPushExample", (language, callback) => {
+    socket.on("getPushExample", async (language, callback) => {
+        try {
+            checkLogin(socket);
+            if (!/^[a-z-]+$/.test(language)) {
+                throw new Error("Invalid language");
+            }
+        } catch (e) {
+            callback({
+                ok: false,
+                msg: e.message,
+            });
+            return;
+        }
 
         try {
             let dir = path.join("./extra/push-examples", language);
-            let files = fs.readdirSync(dir);
+            let files = await fsAsync.readdir(dir);
 
             for (let file of files) {
                 if (file.startsWith("index.")) {
                     callback({
                         ok: true,
-                        code: fs.readFileSync(path.join(dir, file), "utf8"),
+                        code: await fsAsync.readFile(path.join(dir, file), "utf8"),
                     });
                     return;
                 }

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

@@ -211,6 +211,10 @@ module.exports.statusPageSocketHandler = (socket) => {
                         relationBean.send_url = monitor.sendUrl;
                     }
 
+                    if (monitor.url !== undefined) {
+                        relationBean.custom_url = monitor.url;
+                    }
+
                     await R.store(relationBean);
                 }
 

server/uptime-kuma-server.js

@@ -113,9 +113,12 @@ class UptimeKumaServer {
         UptimeKumaServer.monitorTypeList["tailscale-ping"] = new TailscalePing();
         UptimeKumaServer.monitorTypeList["dns"] = new DnsMonitorType();
         UptimeKumaServer.monitorTypeList["mqtt"] = new MqttMonitorType();
+        UptimeKumaServer.monitorTypeList["smtp"] = new SMTPMonitorType();
+        UptimeKumaServer.monitorTypeList["group"] = new GroupMonitorType();
         UptimeKumaServer.monitorTypeList["snmp"] = new SNMPMonitorType();
         UptimeKumaServer.monitorTypeList["mongodb"] = new MongodbMonitorType();
         UptimeKumaServer.monitorTypeList["rabbitmq"] = new RabbitMqMonitorType();
+        UptimeKumaServer.monitorTypeList["manual"] = new ManualMonitorType();
 
         // Allow all CORS origins (polling) in development
         let cors = undefined;
@@ -551,7 +554,10 @@ const { RealBrowserMonitorType } = require("./monitor-types/real-browser-monitor
 const { TailscalePing } = require("./monitor-types/tailscale-ping");
 const { DnsMonitorType } = require("./monitor-types/dns");
 const { MqttMonitorType } = require("./monitor-types/mqtt");
+const { SMTPMonitorType } = require("./monitor-types/smtp");
+const { GroupMonitorType } = require("./monitor-types/group");
 const { SNMPMonitorType } = require("./monitor-types/snmp");
 const { MongodbMonitorType } = require("./monitor-types/mongodb");
 const { RabbitMqMonitorType } = require("./monitor-types/rabbitmq");
+const { ManualMonitorType } = require("./monitor-types/manual");
 const Monitor = require("./model/monitor");

server/util-server.js

@@ -1,7 +1,11 @@
 const tcpp = require("tcp-ping");
 const ping = require("@louislam/ping");
 const { R } = require("redbean-node");
-const { log, genSecret, badgeConstants } = require("../src/util");
+const {
+    log, genSecret, badgeConstants,
+    PING_PACKET_SIZE_DEFAULT, PING_GLOBAL_TIMEOUT_DEFAULT,
+    PING_COUNT_DEFAULT, PING_PER_REQUEST_TIMEOUT_DEFAULT
+} = require("../src/util");
 const passwordHash = require("./password-hash");
 const { Resolver } = require("dns");
 const iconv = require("iconv-lite");
@@ -47,7 +51,7 @@ exports.initJWTSecret = async () => {
         jwtSecretBean.key = "jwtSecret";
     }
 
-    jwtSecretBean.value = passwordHash.generate(genSecret());
+    jwtSecretBean.value = await passwordHash.generate(genSecret());
     await R.store(jwtSecretBean);
     return jwtSecretBean;
 };
@@ -118,20 +122,33 @@ exports.tcping = function (hostname, port) {
 
 /**
  * Ping the specified machine
- * @param {string} hostname Hostname / address of machine
+ * @param {string} destAddr Hostname / IP address of machine to ping
- * @param {number} size Size of packet to send
+ * @param {number} count Number of packets to send before stopping
+ * @param {string} sourceAddr Source address for sending/receiving echo requests
+ * @param {boolean} numeric If true, IP addresses will be output instead of symbolic hostnames
+ * @param {number} size Size (in bytes) of echo request to send
+ * @param {number} deadline Maximum time in seconds before ping stops, regardless of packets sent
+ * @param {number} timeout Maximum time in seconds to wait for each response
  * @returns {Promise<number>} Time for ping in ms rounded to nearest integer
  */
-exports.ping = async (hostname, size = 56) => {
+exports.ping = async (
+    destAddr,
+    count = PING_COUNT_DEFAULT,
+    sourceAddr = "",
+    numeric = true,
+    size = PING_PACKET_SIZE_DEFAULT,
+    deadline = PING_GLOBAL_TIMEOUT_DEFAULT,
+    timeout = PING_PER_REQUEST_TIMEOUT_DEFAULT,
+) => {
     try {
-        return await exports.pingAsync(hostname, false, size);
+        return await exports.pingAsync(destAddr, false, count, sourceAddr, numeric, size, deadline, timeout);
     } catch (e) {
         // If the host cannot be resolved, try again with ipv6
         log.debug("ping", "IPv6 error message: " + e.message);
 
         // As node-ping does not report a specific error for this, try again if it is an empty message with ipv6 no matter what.
         if (!e.message) {
-            return await exports.pingAsync(hostname, true, size);
+            return await exports.pingAsync(destAddr, true, count, sourceAddr, numeric, size, deadline, timeout);
         } else {
             throw e;
         }
@@ -140,18 +157,35 @@ exports.ping = async (hostname, size = 56) => {
 
 /**
  * Ping the specified machine
- * @param {string} hostname Hostname / address of machine to ping
+ * @param {string} destAddr Hostname / IP address of machine to ping
  * @param {boolean} ipv6 Should IPv6 be used?
- * @param {number} size Size of ping packet to send
+ * @param {number} count Number of packets to send before stopping
+ * @param {string} sourceAddr Source address for sending/receiving echo requests
+ * @param {boolean} numeric If true, IP addresses will be output instead of symbolic hostnames
+ * @param {number} size Size (in bytes) of echo request to send
+ * @param {number} deadline Maximum time in seconds before ping stops, regardless of packets sent
+ * @param {number} timeout Maximum time in seconds to wait for each response
  * @returns {Promise<number>} Time for ping in ms rounded to nearest integer
  */
-exports.pingAsync = function (hostname, ipv6 = false, size = 56) {
+exports.pingAsync = function (
+    destAddr,
+    ipv6 = false,
+    count = PING_COUNT_DEFAULT,
+    sourceAddr = "",
+    numeric = true,
+    size = PING_PACKET_SIZE_DEFAULT,
+    deadline = PING_GLOBAL_TIMEOUT_DEFAULT,
+    timeout = PING_PER_REQUEST_TIMEOUT_DEFAULT,
+) {
     return new Promise((resolve, reject) => {
-        ping.promise.probe(hostname, {
+        ping.promise.probe(destAddr, {
             v6: ipv6,
-            min_reply: 1,
+            min_reply: count,
-            deadline: 10,
+            sourceAddr: sourceAddr,
+            numeric: numeric,
             packetSize: size,
+            deadline: deadline,
+            timeout: timeout
         }).then((res) => {
             // If ping failed, it will set field to unknown
             if (res.alive) {

src/App.vue

@@ -4,9 +4,11 @@
 
 <script>
 import { setPageLocale } from "./util-frontend";
+import { polyfillCountryFlagEmojis } from "country-flag-emoji-polyfill";
 export default {
     created() {
         setPageLocale();
     },
 };
+polyfillCountryFlagEmojis();
 </script>

src/assets/app.scss

@@ -3,7 +3,7 @@
 @import "node_modules/bootstrap/scss/bootstrap";
 
 #app {
-    font-family: BlinkMacSystemFont, segoe ui, Roboto, helvetica neue, Arial, noto sans, sans-serif, apple color emoji, segoe ui emoji, segoe ui symbol, noto color emoji;
+    font-family: "Twemoji Country Flags", BlinkMacSystemFont, segoe ui, Roboto, helvetica neue, Arial, noto sans, sans-serif, apple color emoji, segoe ui emoji, segoe ui symbol, noto color emoji;
 }
 
 h1 {

src/components/CreateGroupDialog.vue

@@ -42,6 +42,9 @@ export default {
     mounted() {
         this.modal = new Modal(this.$refs.modal);
     },
+    beforeUnmount() {
+        this.cleanupModal();
+    },
     methods: {
         /**
          * Show the confirm dialog
@@ -58,6 +61,19 @@ export default {
             this.$emit("added", this.groupName);
             this.modal.hide();
         },
+        /**
+         * Clean up modal and restore scroll behavior
+         * @returns {void}
+         */
+        cleanupModal() {
+            if (this.modal) {
+                try {
+                    this.modal.hide();
+                } catch (e) {
+                    console.warn("Modal hide failed:", e);
+                }
+            }
+        }
     },
 };
 </script>

src/components/MonitorListItem.vue

@@ -14,7 +14,7 @@
 
             <router-link :to="monitorURL(monitor.id)" class="item" :class="{ 'disabled': ! monitor.active }">
                 <div class="row">
-                    <div class="col-9 col-md-8 small-padding" :class="{ 'monitor-item': $root.userHeartbeatBar == 'bottom' || $root.userHeartbeatBar == 'none' }">
+                    <div class="col-6 small-padding" :class="{ 'monitor-item': $root.userHeartbeatBar == 'bottom' || $root.userHeartbeatBar == 'none' }">
                         <div class="info">
                             <Uptime :monitor="monitor" type="24" :pill="true" />
                             <span v-if="hasChildren" class="collapse-padding" @click.prevent="changeCollapsed">
@@ -22,11 +22,11 @@
                             </span>
                             {{ monitor.name }}
                         </div>
-                        <div v-if="monitor.tags.length > 0" class="tags">
+                        <div v-if="monitor.tags.length > 0" class="tags gap-1">
                             <Tag v-for="tag in monitor.tags" :key="tag" :item="tag" :size="'sm'" />
                         </div>
                     </div>
-                    <div v-show="$root.userHeartbeatBar == 'normal'" :key="$root.userHeartbeatBar" class="col-3 col-md-4">
+                    <div v-show="$root.userHeartbeatBar == 'normal'" :key="$root.userHeartbeatBar" class="col-6">
                         <HeartbeatBar ref="heartbeatBar" size="small" :monitor-id="monitor.id" />
                     </div>
                 </div>

src/components/MonitorSettingDialog.vue

@@ -10,7 +10,7 @@
                 </div>
                 <div class="modal-body">
                     <div class="my-3 form-check">
-                        <input id="show-clickable-link" v-model="monitor.isClickAble" class="form-check-input" type="checkbox" @click="toggleLink(monitor.group_index, monitor.monitor_index)" />
+                        <input id="show-clickable-link" v-model="monitor.isClickAble" class="form-check-input" type="checkbox" data-testid="show-clickable-link" @click="toggleLink(monitor.group_index, monitor.monitor_index)" />
                         <label class="form-check-label" for="show-clickable-link">
                             {{ $t("Show Clickable Link") }}
                         </label>
@@ -19,6 +19,16 @@
                         </div>
                     </div>
 
+                    <!-- Custom URL -->
+                    <template v-if="monitor.isClickAble">
+                        <label for="customUrl" class="form-label">{{ $t("Custom URL") }}</label>
+                        <input id="customUrl" :value="monitor.url" type="url" class="form-control" data-testid="custom-url-input" @input="e => changeUrl(monitor.group_index, monitor.monitor_index, e.target!.value)">
+
+                        <div class="form-text mb-3">
+                            {{ $t("customUrlDescription") }}
+                        </div>
+                    </template>
+
                     <button
                         class="btn btn-primary btn-add-group me-2"
                         @click="$refs.badgeGeneratorDialog.show(monitor.id, monitor.name)"
@@ -29,7 +39,7 @@
                 </div>
 
                 <div class="modal-footer">
-                    <button type="submit" class="btn btn-danger" data-bs-dismiss="modal">
+                    <button type="submit" class="btn btn-danger" data-bs-dismiss="modal" data-testid="monitor-settings-close">
                         {{ $t("Close") }}
                     </button>
                 </div>
@@ -78,6 +88,7 @@ export default {
                 monitor_index: monitor.index,
                 group_index: group.index,
                 isClickAble: this.showLink(monitor),
+                url: monitor.element.url,
             };
 
             this.MonitorSettingDialog.show();
@@ -110,6 +121,17 @@ export default {
             }
             return monitor.element.sendUrl && monitor.element.url && monitor.element.url !== "https://" && !this.editMode;
         },
+
+        /**
+         * Toggle the value of sendUrl
+         * @param {number} groupIndex Index of group monitor is member of
+         * @param {number} index Index of monitor within group
+         * @param {string} value The new value of the url
+         * @returns {void}
+         */
+        changeUrl(groupIndex, index, value) {
+            this.$root.publicGroupList[groupIndex].monitorList[index].url = value;
+        },
     },
 };
 </script>

src/components/NotificationDialog.vue

@@ -135,11 +135,13 @@ export default {
                 "nostr": "Nostr",
                 "ntfy": "Ntfy",
                 "octopush": "Octopush",
+                "OneChat": "OneChat",
                 "OneBot": "OneBot",
                 "Onesender": "Onesender",
                 "Opsgenie": "Opsgenie",
                 "PagerDuty": "PagerDuty",
                 "PagerTree": "PagerTree",
+                "pumble": "Pumble",
                 "pushbullet": "Pushbullet",
                 "PushByTechulus": "Push by Techulus",
                 "pushover": "Pushover",
@@ -163,9 +165,11 @@ export default {
                 "ZohoCliq": "ZohoCliq",
                 "SevenIO": "SevenIO",
                 "whapi": "WhatsApp (Whapi)",
+                "waha": "WhatsApp (WAHA)",
                 "gtxmessaging": "GtxMessaging",
                 "Cellsynt": "Cellsynt",
-                "SendGrid": "SendGrid"
+                "SendGrid": "SendGrid",
+                "notifery": "Notifery"
             };
 
             // Put notifications here if it's not supported in most regions or its documentation is not in English
@@ -181,8 +185,12 @@ export default {
                 "SMSManager": "SmsManager (smsmanager.cz)",
                 "WeCom": "WeCom (企业微信群机器人)",
                 "ServerChan": "ServerChan (Server酱)",
+                "PushPlus": "PushPlus (推送加)",
+                "SpugPush": "SpugPush（Spug推送助手）",
                 "smsc": "SMSC",
                 "WPush": "WPush(wpush.cn)",
+                "YZJ": "YZJ (云之家自定义机器人)",
+                "SMSPlanet": "SMSPlanet.pl"
             };
 
             // Sort by notification name
@@ -232,6 +240,9 @@ export default {
     mounted() {
         this.modal = new Modal(this.$refs.modal);
     },
+    beforeUnmount() {
+        this.cleanupModal();
+    },
     methods: {
 
         /**
@@ -336,6 +347,20 @@ export default {
                 });
             } while (this.$root.notificationList.find(it => it.name === name));
             return name;
+        },
+
+        /**
+         * Clean up modal and restore scroll behavior
+         * @returns {void}
+         */
+        cleanupModal() {
+            if (this.modal) {
+                try {
+                    this.modal.hide();
+                } catch (e) {
+                    console.warn("Modal hide failed:", e);
+                }
+            }
         }
     },
 };

src/components/ProxyDialog.vue

@@ -125,11 +125,12 @@ export default {
             }
         };
     },
-
     mounted() {
         this.modal = new Modal(this.$refs.modal);
     },
-
+    beforeUnmount() {
+        this.cleanupModal();
+    },
     methods: {
         /**
          * Show dialog to confirm deletion
@@ -209,6 +210,20 @@ export default {
                 }
             });
         },
+
+        /**
+         * Clean up modal and restore scroll behavior
+         * @returns {void}
+         */
+        cleanupModal() {
+            if (this.modal) {
+                try {
+                    this.modal.hide();
+                } catch (e) {
+                    console.warn("Modal hide failed:", e);
+                }
+            }
+        }
     },
 };
 </script>

src/components/PublicGroupList.vue

@@ -33,7 +33,7 @@
                         <template #item="monitor">
                             <div class="item" data-testid="monitor">
                                 <div class="row">
-                                    <div class="col-9 col-md-8 small-padding">
+                                    <div class="col-6 small-padding">
                                         <div class="info">
                                             <font-awesome-icon v-if="editMode" icon="arrows-alt-v" class="action drag me-3" />
                                             <font-awesome-icon v-if="editMode" icon="times" class="action remove me-3" @click="removeMonitor(group.index, monitor.index)" />
@@ -58,6 +58,7 @@
                                                     v-if="editMode"
                                                     :class="{'link-active': true, 'btn-link': true}"
                                                     icon="cog" class="action me-3"
+                                                    data-testid="monitor-settings"
                                                     @click="$refs.monitorSettingDialog.show(group, monitor)"
                                                 />
                                             </span>
@@ -71,7 +72,7 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <div :key="$root.userHeartbeatBar" class="col-3 col-md-4">
+                                    <div :key="$root.userHeartbeatBar" class="col-6">
                                         <HeartbeatBar size="mid" :monitor-id="monitor.element.id" />
                                     </div>
                                 </div>

src/components/Tag.vue

@@ -6,7 +6,6 @@
                   'm-2': size == 'normal',
                   'px-2': size == 'sm',
                   'py-0': size == 'sm',
-                  'mx-1': size == 'sm',
         }"
         :style="{ backgroundColor: item.color, fontSize: size == 'sm' ? '0.7em' : '1em' }"
     >
@@ -48,7 +47,7 @@ export default {
     },
     computed: {
         displayText() {
-            if (this.item.value === "" || this.item.value === undefined) {
+            if (this.item.value === "" || this.item.value === undefined || this.item.value === null) {
                 return this.item.name;
             } else {
                 return `${this.item.name}: ${this.item.value}`;

src/components/TagsManager.vue

@@ -4,7 +4,7 @@
         <div v-if="selectedTags.length > 0" class="mb-2 p-1">
             <tag
                 v-for="item in selectedTags"
-                :key="item.id"
+                :key="`${item.tag_id || item.id}-${item.value || ''}`"
                 :item="item"
                 :remove="deleteTag"
             />
@@ -20,10 +20,20 @@
                 <font-awesome-icon class="me-1" icon="plus" /> {{ $t("Add") }}
             </button>
         </div>
-        <div ref="modal" class="modal fade" tabindex="-1">
+        <div ref="modal" class="modal fade" tabindex="-1" data-bs-backdrop="static" data-bs-keyboard="false">
             <div class="modal-dialog modal-dialog-centered">
                 <div class="modal-content">
                     <div class="modal-body">
+                        <h4 v-if="stagedForBatchAdd.length > 0">{{ $t("Add Tags") }}</h4>
+                        <div v-if="stagedForBatchAdd.length > 0" class="mb-3 staging-area" style="max-height: 150px; overflow-y: auto;">
+                            <Tag
+                                v-for="stagedTag in stagedForBatchAdd"
+                                :key="stagedTag.keyForList"
+                                :item="mapStagedTagToDisplayItem(stagedTag)"
+                                :remove="() => unstageTag(stagedTag)"
+                            />
+                        </div>
+
                         <vue-multiselect
                             v-model="newDraftTag.select"
                             class="mb-2"
@@ -58,14 +68,11 @@
                             <div class="w-50 pe-2">
                                 <input
                                     v-model="newDraftTag.name" class="form-control"
-                                    :class="{'is-invalid': validateDraftTag.nameInvalid}"
+                                    :class="{'is-invalid': validateDraftTag.invalid && (validateDraftTag.messageKey === 'tagNameColorRequired' || validateDraftTag.messageKey === 'tagNameExists')}"
                                     :placeholder="$t('Name')"
                                     data-testid="tag-name-input"
                                     @keydown.enter.prevent="onEnter"
                                 />
-                                <div class="invalid-feedback">
-                                    {{ $t("Tag with this name already exist.") }}
-                                </div>
                             </div>
                             <div class="w-50 ps-2">
                                 <vue-multiselect
@@ -104,27 +111,24 @@
                         <div class="mb-2">
                             <input
                                 v-model="newDraftTag.value" class="form-control"
-                                :class="{'is-invalid': validateDraftTag.valueInvalid}"
+                                :class="{'is-invalid': validateDraftTag.invalid && validateDraftTag.messageKey === 'tagAlreadyOnMonitor'}"
                                 :placeholder="$t('value (optional)')"
                                 data-testid="tag-value-input"
                                 @keydown.enter.prevent="onEnter"
                             />
-                            <div class="invalid-feedback">
-                                {{ $t("Tag with this value already exist.") }}
-                            </div>
                         </div>
-                        <div class="mb-2">
+
-                            <button
+                        <div v-if="validateDraftTag.invalid && validateDraftTag.messageKey" class="form-text text-danger mb-2">
-                                type="button"
+                            {{ $t(validateDraftTag.messageKey, validateDraftTag.messageParams) }}
-                                class="btn btn-secondary float-end"
-                                :disabled="processing || validateDraftTag.invalid"
-                                data-testid="tag-submit-button"
-                                @click.stop="addDraftTag"
-                            >
-                                {{ $t("Add") }}
-                            </button>
                         </div>
                     </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-secondary" @click.stop="clearStagingAndCloseModal">{{ $t("Cancel") }}</button>
+                        <button type="button" class="btn btn-outline-primary me-2" :disabled="processing || validateDraftTag.invalid" @click.stop="stageCurrentTag">
+                            {{ $t("Add Another Tag") }}
+                        </button>
+                        <button type="button" class="btn btn-primary" :disabled="processing || (stagedForBatchAdd.length === 0 && validateDraftTag.invalid)" data-testid="add-tags-final-button" @click.stop="confirmAndCommitStagedTags">{{ $t("Done") }}</button>
+                    </div>
                 </div>
             </div>
         </div>
@@ -176,71 +180,146 @@ export default {
             newTags: [],
             /** @type {Tag[]} */
             deleteTags: [],
+            /**
+             * @type {Array<object>} Holds tag objects staged for addition.
+             * Each object: { name, color, value, isNewSystemTag, systemTagId, keyForList }
+             */
+            stagedForBatchAdd: [],
             newDraftTag: {
                 name: null,
                 select: null,
                 color: null,
                 value: "",
-                invalid: true,
-                nameInvalid: false,
             },
         };
     },
     computed: {
         tagOptions() {
-            const tagOptions = this.existingTags;
+            const tagOptions = [ ...this.existingTags ]; // Create a copy
+
+            // Add tags from newTags
             for (const tag of this.newTags) {
                 if (!tagOptions.find(t => t.name === tag.name && t.color === tag.color)) {
                     tagOptions.push(tag);
                 }
             }
+
+            // Add newly created system tags from staging area
+            for (const stagedTag of this.stagedForBatchAdd) {
+                if (stagedTag.isNewSystemTag) {
+                    // Check if this system tag is already in the options
+                    if (!tagOptions.find(t => t.name === stagedTag.name && t.color === stagedTag.color)) {
+                        // Create a tag option object for the dropdown
+                        tagOptions.push({
+                            id: null, // Will be assigned when actually created
+                            name: stagedTag.name,
+                            color: stagedTag.color
+                        });
+                    }
+                }
+            }
+
             return tagOptions;
         },
         selectedTags() {
-            return this.preSelectedTags.concat(this.newTags).filter(tag => !this.deleteTags.find(monitorTag => monitorTag.id === tag.id));
+            // Helper function to normalize tag values for comparison
+            const normalizeValue = (value) => {
+                if (value === null || value === undefined) {
+                    return "";
+                }
+                return String(value).trim();
+            };
+
+            // Helper function to get tag ID from different structures
+            const getTagId = (tag) => tag.tag_id || tag.id;
+
+            return this.preSelectedTags.concat(this.newTags).filter(tag =>
+                !this.deleteTags.find(monitorTag => {
+                    const tagIdMatch = getTagId(monitorTag) === getTagId(tag);
+                    const valueMatch = normalizeValue(monitorTag.value) === normalizeValue(tag.value);
+                    return tagIdMatch && valueMatch;
+                })
+            );
         },
+        /**
+         * @returns {boolean} True if more new system tags can be staged, false otherwise.
+         */
+        canStageMoreNewSystemTags() {
+            return true; // Always allow adding more tags, no limit
+        },
+        /**
+         * Provides the color options for the tag color selector.
+         * @returns {Array<object>} Array of color options.
+         */
         colorOptions() {
             return colorOptions(this);
         },
+        /**
+         * Validates the current draft tag based on several conditions.
+         * @returns {{invalid: boolean, messageKey: string|null, messageParams: object|null}} Object indicating validity, and a message key/params if invalid.
+         */
         validateDraftTag() {
-            let nameInvalid = false;
+            // If defining a new system tag (newDraftTag.select == null)
-            let valueInvalid = false;
+            if (this.newDraftTag.select == null) {
-            let invalid = true;
+                if (!this.newDraftTag.name || this.newDraftTag.name.trim() === "" || !this.newDraftTag.color) {
-            if (this.deleteTags.find(tag => tag.name === this.newDraftTag.select?.name && tag.value === this.newDraftTag.value)) {
+                    // Keep button disabled, but don't show the explicit message for this case
-                // Undo removing a Tag
+                    return {
-                nameInvalid = false;
+                        invalid: true,
-                valueInvalid = false;
+                        messageKey: null,
-                invalid = false;
+                        messageParams: null,
-            } else if (this.existingTags.filter(tag => tag.name === this.newDraftTag.name).length > 0 && this.newDraftTag.select == null) {
+                    };
-                // Try to create new tag with existing name
+                }
-                nameInvalid = true;
+                if (this.tagOptions.find(opt => opt.name.toLowerCase() === this.newDraftTag.name.trim().toLowerCase())) {
-                invalid = true;
+                    return {
-            } else if (this.newTags.concat(this.preSelectedTags).filter(tag => (
+                        invalid: true,
-                tag.name === this.newDraftTag.select?.name && tag.value === this.newDraftTag.value
+                        messageKey: "tagNameExists",
-            ) || (
+                        messageParams: null,
-                tag.name === this.newDraftTag.name && tag.value === this.newDraftTag.value
+                    };
-            )).length > 0) {
+                }
-                // Try to add a tag with existing name and value
-                valueInvalid = true;
-                invalid = true;
-            } else if (this.newDraftTag.select != null) {
-                // Select an existing tag, no need to validate
-                invalid = false;
-                valueInvalid = false;
-            } else if (this.newDraftTag.color == null || this.newDraftTag.name === "") {
-                // Missing form inputs
-                nameInvalid = false;
-                invalid = true;
-            } else {
-                // Looks valid
-                invalid = false;
-                nameInvalid = false;
-                valueInvalid = false;
             }
+
+            // For any tag definition (new or existing system tag + value)
+            const draftTagName = this.newDraftTag.select ? this.newDraftTag.select.name : this.newDraftTag.name.trim();
+            const draftTagValue = this.newDraftTag.value ? this.newDraftTag.value.trim() : ""; // Treat null/undefined value as empty string for comparison
+
+            // Check if (name + value) combination already exists in this.stagedForBatchAdd
+            if (this.stagedForBatchAdd.find(staged => staged.name === draftTagName && staged.value === draftTagValue)) {
+                return {
+                    invalid: true,
+                    messageKey: "tagAlreadyStaged",
+                    messageParams: null,
+                };
+            }
+
+            // Check if (name + value) combination already exists in this.selectedTags (final list on monitor)
+            // AND it's NOT an "undo delete"
+            const isUndoDelete = this.deleteTags.find(dTag =>
+                dTag.tag_id === (this.newDraftTag.select ? this.newDraftTag.select.id : null) &&
+                dTag.value === draftTagValue
+            );
+
+            if (!isUndoDelete && this.selectedTags.find(sTag => sTag.name === draftTagName && sTag.value === draftTagValue)) {
+                return {
+                    invalid: true,
+                    messageKey: "tagAlreadyOnMonitor",
+                    messageParams: null,
+                };
+            }
+            // If an existing tag is selected at this point, it has passed all relevant checks
+            if (this.newDraftTag.select != null) {
+                return {
+                    invalid: false,
+                    messageKey: null,
+                    messageParams: null,
+                };
+            }
+
+            // If it's a new tag definition, and it passed its specific checks, it's valid.
+            // (This also serves as a final default to valid if other logic paths were missed, though ideally covered above)
             return {
-                invalid,
+                invalid: false,
-                nameInvalid,
+                messageKey: null,
-                valueInvalid,
+                messageParams: null,
             };
         },
     },
@@ -248,12 +327,18 @@ export default {
         this.modal = new Modal(this.$refs.modal);
         this.getExistingTags();
     },
+    beforeUnmount() {
+        this.cleanupModal();
+    },
     methods: {
         /**
          * Show the add tag dialog
          * @returns {void}
          */
         showAddDialog() {
+            this.stagedForBatchAdd = [];
+            this.clearDraftTag();
+            this.getExistingTags();
             this.modal.show();
         },
         /**
@@ -297,37 +382,6 @@ export default {
                 return this.$root.theme === "light" ? "var(--bs-body-color)" : "inherit";
             }
         },
-        /**
-         * Add a draft tag
-         * @returns {void}
-         */
-        addDraftTag() {
-            console.log("Adding Draft Tag: ", this.newDraftTag);
-            if (this.newDraftTag.select != null) {
-                if (this.deleteTags.find(tag => tag.name === this.newDraftTag.select.name && tag.value === this.newDraftTag.value)) {
-                    // Undo removing a tag
-                    this.deleteTags = this.deleteTags.filter(tag => !(tag.name === this.newDraftTag.select.name && tag.value === this.newDraftTag.value));
-                } else {
-                    // Add an existing Tag
-                    this.newTags.push({
-                        id: this.newDraftTag.select.id,
-                        color: this.newDraftTag.select.color,
-                        name: this.newDraftTag.select.name,
-                        value: this.newDraftTag.value,
-                        new: true,
-                    });
-                }
-            } else {
-                // Add new Tag
-                this.newTags.push({
-                    color: this.newDraftTag.color.color,
-                    name: this.newDraftTag.name.trim(),
-                    value: this.newDraftTag.value,
-                    new: true,
-                });
-            }
-            this.clearDraftTag();
-        },
         /**
          * Remove a draft tag
          * @returns {void}
@@ -338,10 +392,8 @@ export default {
                 select: null,
                 color: null,
                 value: "",
-                invalid: true,
+                // invalid: true, // Initial validation will be handled by computed prop
-                nameInvalid: false,
             };
-            this.modal.hide();
         },
         /**
          * Add a tag asynchronously
@@ -383,7 +435,7 @@ export default {
          */
         onEnter() {
             if (!this.validateDraftTag.invalid) {
-                this.addDraftTag();
+                this.stageCurrentTag();
             }
         },
         /**
@@ -459,7 +511,132 @@ export default {
             this.newTags = [];
             this.deleteTags = [];
             this.processing = false;
-        }
+        },
+        /**
+         * Clean up modal and restore scroll behavior
+         * @returns {void}
+         */
+        cleanupModal() {
+            if (this.modal) {
+                try {
+                    this.modal.hide();
+                } catch (e) {
+                    console.warn("Modal hide failed:", e);
+                }
+            }
+            this.stagedForBatchAdd = [];
+        },
+        /**
+         * Stages the current draft tag for batch addition.
+         * @returns {void}
+         */
+        stageCurrentTag() {
+            if (this.validateDraftTag.invalid) {
+                return;
+            }
+
+            const isNew = this.newDraftTag.select == null;
+            const name = isNew ? this.newDraftTag.name.trim() : this.newDraftTag.select.name;
+            const color = isNew ? this.newDraftTag.color.color : this.newDraftTag.select.color;
+            const value = this.newDraftTag.value ? this.newDraftTag.value.trim() : "";
+
+            const stagedTagObject = {
+                name: name,
+                color: color,
+                value: value,
+                isNewSystemTag: isNew,
+                systemTagId: isNew ? null : this.newDraftTag.select.id,
+                keyForList: `staged-${Date.now()}-${Math.random().toString(36).substring(2, 15)}` // Unique key
+            };
+
+            this.stagedForBatchAdd.push(stagedTagObject);
+            this.clearDraftTag(); // Reset input fields for the next tag
+        },
+        /**
+         * Removes a tag from the staged list.
+         * @param {object} tagToUnstage The tag object to remove from staging.
+         * @returns {void}
+         */
+        unstageTag(tagToUnstage) {
+            this.stagedForBatchAdd = this.stagedForBatchAdd.filter(tag => tag.keyForList !== tagToUnstage.keyForList);
+        },
+        /**
+         * Maps a staged tag object to the structure expected by the Tag component.
+         * @param {object} stagedTag The staged tag object.
+         * @returns {object} Object with name, color, value for the Tag component.
+         */
+        mapStagedTagToDisplayItem(stagedTag) {
+            return {
+                name: stagedTag.name,
+                color: stagedTag.color,
+                value: stagedTag.value,
+                // id: stagedTag.keyForList, // Pass keyForList as id for the Tag component if it expects an id for display/keying internally beyond v-for key
+            };
+        },
+        /**
+         * Clears the staging list, draft inputs, and closes the modal.
+         * @returns {void}
+         */
+        clearStagingAndCloseModal() {
+            this.stagedForBatchAdd = [];
+            this.clearDraftTag(); // Clears input fields
+            this.modal.hide();
+        },
+        /**
+         * Processes all staged tags, adds them to the monitor, and closes the modal.
+         * @returns {void}
+         */
+        confirmAndCommitStagedTags() {
+            // Phase 1: If there's a currently valid newDraftTag that hasn't been staged yet,
+            // (e.g. user typed a full tag and directly clicked the footer "Add"), then stage it now.
+            // stageCurrentTag has its own check for validateDraftTag.invalid and will clear the draft.
+            if (!this.validateDraftTag.invalid) {
+                // Check if newDraftTag actually has content, to avoid staging an empty cleared draft.
+                // A valid draft implies it has content, but double-checking select or name is safer.
+                if (this.newDraftTag.select || (this.newDraftTag.name && this.newDraftTag.color)) {
+                    this.stageCurrentTag();
+                }
+            }
+
+            // Phase 2: Process everything that is now in stagedForBatchAdd.
+            if (this.stagedForBatchAdd.length === 0) {
+                this.clearDraftTag(); // Ensure draft is clear even if nothing was committed
+                this.modal.hide();
+                return;
+            }
+
+            for (const sTag of this.stagedForBatchAdd) {
+                let isAnUndo = false; // Flag to track if this was an undo
+                // Check if it's an "undo delete"
+                if (sTag.systemTagId) { // Only existing system tags can be an undo delete
+                    const undoDeleteIndex = this.deleteTags.findIndex(
+                        dTag => dTag.tag_id === sTag.systemTagId && dTag.value === sTag.value
+                    );
+                    if (undoDeleteIndex > -1) {
+                        this.deleteTags.splice(undoDeleteIndex, 1);
+                        isAnUndo = true;
+                    }
+                }
+
+                // Only add to newTags if it's not an "undo delete" operation.
+                // An "undo delete" means the tag is now considered active again from its previous state.
+                if (!isAnUndo) {
+                    const tagObjectForNewTags = {
+                        id: sTag.systemTagId, // This will be null for brand new system tags
+                        color: sTag.color,
+                        name: sTag.name,
+                        value: sTag.value,
+                        new: true, // As per plan, signals new to this monitor transaction
+                    };
+                    this.newTags.push(tagObjectForNewTags);
+                }
+            }
+
+            // newDraftTag should have been cleared if stageCurrentTag ran in Phase 1, or earlier.
+            // Call clearDraftTag again to be certain the form is reset before closing.
+            this.clearDraftTag();
+            this.modal.hide();
+        },
     },
 };
 </script>

src/components/TemplatedInput.vue

@@ -0,0 +1,75 @@
+<template>
+    <div class="form-text mb-2">
+        <i18n-t tag="div" keypath="liquidIntroduction">
+            <a href="https://liquidjs.com/" target="_blank">{{ $t("documentation") }}</a>
+        </i18n-t>
+
+        <code v-pre>{{ msg }}</code>: {{ $t("templateMsg") }}<br />
+        <code v-pre>{{ name }}</code>: {{ $t("templateServiceName") }}<br />
+        <code v-pre>{{ status }}</code>: {{ $t("templateStatus") }}<br />
+        <code v-pre>{{ hostnameOrURL }}</code>: {{ $t("templateHostnameOrURL") }}<br />
+        <code v-pre>{{ heartbeatJSON }}</code>: {{ $t("templateHeartbeatJSON") }} <b>({{ $t("templateLimitedToUpDownNotifications") }})</b><br />
+        <code v-pre>{{ monitorJSON }}</code>: {{ $t("templateMonitorJSON") }} <b>({{ $t("templateLimitedToUpDownCertNotifications") }})</b><br />
+    </div>
+
+    <input
+        :id="id"
+        ref="templatedInput"
+        v-model="model"
+        type="text"
+        class="form-control"
+        :placeholder="placeholder"
+        :required="required"
+        autocomplete="false"
+    >
+</template>
+
+<script>
+export default {
+    props: {
+        /**
+         * The value of the templated input.
+         */
+        modelValue: {
+            type: String,
+            default: ""
+        },
+        /**
+         * id for the templated input.
+         */
+        id: {
+            type: String,
+            required: true,
+        },
+        /**
+         * Whether the templated input is required.
+         * @example true
+         */
+        required: {
+            type: Boolean,
+            required: true,
+        },
+        /**
+         * Placeholder text for the templated input.
+         */
+        placeholder: {
+            type: String,
+            default: ""
+        },
+    },
+    emits: [ "update:modelValue" ],
+    computed: {
+        /**
+         * Send value update to parent on change.
+         */
+        model: {
+            get() {
+                return this.modelValue;
+            },
+            set(value) {
+                this.$emit("update:modelValue", value);
+            }
+        }
+    },
+};
+</script>

src/components/TemplatedTextarea.vue

@@ -0,0 +1,80 @@
+<template>
+    <div class="form-text mb-2">
+        <i18n-t tag="div" keypath="liquidIntroduction">
+            <a href="https://liquidjs.com/" target="_blank">{{ $t("documentation") }}</a>
+        </i18n-t>
+
+        <code v-pre>{{ msg }}</code>: {{ $t("templateMsg") }}<br />
+        <code v-pre>{{ name }}</code>: {{ $t("templateServiceName") }}<br />
+        <code v-pre>{{ status }}</code>: {{ $t("templateStatus") }}<br />
+        <code v-pre>{{ hostnameOrURL }}</code>: {{ $t("templateHostnameOrURL") }}<br />
+        <code v-pre>{{ heartbeatJSON }}</code>: {{ $t("templateHeartbeatJSON") }} <b>({{ $t("templateLimitedToUpDownNotifications") }})</b><br />
+        <code v-pre>{{ monitorJSON }}</code>: {{ $t("templateMonitorJSON") }} <b>({{ $t("templateLimitedToUpDownCertNotifications") }})</b><br />
+    </div>
+
+    <textarea
+        :id="id"
+        ref="templatedTextarea"
+        v-model="model"
+        class="form-control"
+        :placeholder="placeholder"
+        :required="required"
+        autocomplete="false"
+    ></textarea>
+</template>
+
+<script>
+export default {
+    props: {
+        /**
+         * The value of the templated textarea.
+         */
+        modelValue: {
+            type: String,
+            default: ""
+        },
+        /**
+         * id for the templated textarea.
+         */
+        id: {
+            type: String,
+            required: true,
+        },
+        /**
+         * Whether the templated textarea is required.
+         * @example true
+         */
+        required: {
+            type: Boolean,
+            required: true,
+        },
+        /**
+         * Placeholder text for the templated textarea.
+         */
+        placeholder: {
+            type: String,
+            default: ""
+        },
+    },
+    emits: [ "update:modelValue" ],
+    computed: {
+        /**
+         * Send value update to parent on change.
+         */
+        model: {
+            get() {
+                return this.modelValue;
+            },
+            set(value) {
+                this.$emit("update:modelValue", value);
+            }
+        }
+    },
+};
+</script>
+
+<style lang="scss" scoped>
+textarea {
+    min-height: 150px;
+}
+</style>

src/components/notifications/Discord.vue

@@ -53,6 +53,13 @@
             </div>
         </div>
     </div>
+
+    <div class="mb-3">
+        <div class="form-check form-switch">
+            <input id="discord-disable-url" v-model="$parent.notification.disableUrl" class="form-check-input" type="checkbox" role="switch">
+            <label class="form-check-label" for="discord-disable-url">{{ $t("Disable URL in Notification") }}</label>
+        </div>
+    </div>
 </template>
 <script>
 export default {
@@ -60,6 +67,9 @@ export default {
         if (!this.$parent.notification.discordChannelType) {
             this.$parent.notification.discordChannelType = "channel";
         }
+        if (this.$parent.notification.disableUrl === undefined) {
+            this.$parent.notification.disableUrl = false;
+        }
     }
 };
 </script>

src/components/notifications/FlashDuty.vue

@@ -1,7 +1,10 @@
 <template>
     <div class="mb-3">
-        <label for="flashduty-integration-url" class="form-label">Integration Key</label>
+        <label for="flashduty-integration-url" class="form-label">{{ $t("FlashDuty Push URL") }} <span style="color: red;"><sup>*</sup></span></label>
-        <HiddenInput id="flashduty-integration-url" v-model="$parent.notification.flashdutyIntegrationKey" autocomplete="false"></HiddenInput>
+        <HiddenInput id="flashduty-integration-url" v-model="$parent.notification.flashdutyIntegrationKey" autocomplete="false" :placeholder="$t('FlashDuty Push URL Placeholder')" />
+        <div class="form-text">
+            <p><span style="color: red;"><sup>*</sup></span>{{ $t("Required") }}</p>
+        </div>
         <i18n-t tag="div" keypath="wayToGetFlashDutyKey" class="form-text">
             <a href="https://flashcat.cloud/product/flashduty?from=kuma" target="_blank">{{ $t("here") }}</a>
         </i18n-t>
@@ -18,7 +21,6 @@
 
 <script>
 import HiddenInput from "../HiddenInput.vue";
-
 export default {
     components: {
         HiddenInput,

src/components/notifications/Matrix.vue

@@ -18,7 +18,7 @@
             {{ $t("matrixDesc1") }}
         </p>
         <i18n-t tag="p" keypath="matrixDesc2" style="margin-top: 8px;">
-            <code>curl -XPOST -d '{"type": "m.login.password", "identifier": {"user": "botusername", "type": "m.id.user"}, "password": "passwordforuser"}' "https://home.server/_matrix/client/r0/login"</code>.
+            <code>curl -XPOST -d '{"type": "m.login.password", "identifier": {"user": "botusername", "type": "m.id.user"}, "password": "passwordforuser"}' "https://home.server/_matrix/client/v3/login"</code>.
         </i18n-t>
     </div>
 </template>

src/components/notifications/Notifery.vue

@@ -0,0 +1,49 @@
+<template>
+    <div class="mb-3">
+        <label for="notifery-api-key" class="form-label">{{
+            $t("API Key")
+        }}</label>
+        <HiddenInput
+            id="notifery-api-key"
+            v-model="$parent.notification.notiferyApiKey"
+            :required="true"
+            autocomplete="new-password"
+        ></HiddenInput>
+    </div>
+
+    <div class="mb-3">
+        <label for="notifery-title" class="form-label">{{ $t("Title") }}</label>
+        <input
+            id="notifery-title"
+            v-model="$parent.notification.notiferyTitle"
+            type="text"
+            class="form-control"
+            placeholder="Uptime Kuma Alert"
+        />
+    </div>
+
+    <div class="mb-3">
+        <label for="notifery-group" class="form-label">{{ $t("Group") }}</label>
+        <input
+            id="notifery-group"
+            v-model="$parent.notification.notiferyGroup"
+            type="text"
+            class="form-control"
+            :placeholder="$t('Optional')"
+        />
+    </div>
+
+    <i18n-t tag="p" keypath="More info on:" style="margin-top: 8px;">
+        <a href="https://docs.notifery.com/api/event/" target="_blank">https://docs.notifery.com/api/event/</a>
+    </i18n-t>
+</template>
+
+<script>
+import HiddenInput from "../HiddenInput.vue";
+
+export default {
+    components: {
+        HiddenInput,
+    },
+};
+</script>

src/components/notifications/Ntfy.vue

@@ -13,13 +13,20 @@
     <div class="mb-3">
         <label for="ntfy-priority" class="form-label">{{ $t("Priority") }}</label>
         <input id="ntfy-priority" v-model="$parent.notification.ntfyPriority" type="number" class="form-control" required min="1" max="5" step="1">
+        <label for="ntfy-priority-down" class="form-label">{{ $t("ntfyPriorityDown") }}</label>
+        <input id="ntfy-priority-down" v-model="$parent.notification.ntfyPriorityDown" type="number" class="form-control" required min="1" max="5" step="1">
         <div class="form-text">
-            <p v-if="$parent.notification.ntfyPriority >= 5">
+            <p v-if="$parent.notification.ntfyPriority == $parent.notification.ntfyPriorityDown && $parent.notification.ntfyPriority >= 5">
                 {{ $t("ntfyPriorityHelptextAllEvents") }}
             </p>
+            <i18n-t v-else-if="$parent.notification.ntfyPriority > $parent.notification.ntfyPriorityDown" tag="p" keypath="ntfyPriorityHelptextPriorityHigherThanDown">
+                <code>DOWN</code>
+                <code>{{ $parent.notification.ntfyPriority }}</code>
+                <code>{{ $parent.notification.ntfyPriorityDown }}</code>
+            </i18n-t>
             <i18n-t v-else tag="p" keypath="ntfyPriorityHelptextAllExceptDown">
                 <code>DOWN</code>
-                <code>{{ $parent.notification.ntfyPriority + 1 }}</code>
+                <code>{{ $parent.notification.ntfyPriorityDown }}</code>
             </i18n-t>
         </div>
     </div>
@@ -69,6 +76,11 @@ export default {
             this.$parent.notification.ntfyPriority = 5;
         }
 
+        // Setting down priority if it's undefined
+        if (typeof this.$parent.notification.ntfyPriorityDown === "undefined") {
+            this.$parent.notification.ntfyPriorityDown = 5;
+        }
+
         // Handling notifications that added before 1.22.0
         if (typeof this.$parent.notification.ntfyAuthenticationMethod === "undefined") {
             if (!this.$parent.notification.ntfyusername) {

src/components/notifications/OneChat.vue

@@ -0,0 +1,64 @@
+<template>
+    <div class="mb-3">
+        <!-- Access Token Input -->
+        <div class="mb-3">
+            <label for="onechat-access-token" class="form-label">
+                OneChat Access Token<span style="color: red;"><sup>*</sup></span>
+            </label>
+            <HiddenInput
+                id="onechat-access-token"
+                v-model="$parent.notification.accessToken"
+                :required="true"
+            >
+            </HiddenInput>
+            <div class="form-text">
+                <p>{{ $t("OneChatAccessToken") }}</p>
+            </div>
+        </div>
+
+        <!-- Receiver ID Input -->
+        <div class="mb-3">
+            <label for="onechat-receiver-id" class="form-label">
+                {{ $t("OneChatUserIdOrGroupId") }}<span style="color: red;"><sup>*</sup></span>
+            </label>
+            <input
+                id="onechat-receiver-id"
+                v-model="$parent.notification.recieverId"
+                type="text"
+                class="form-control"
+                required
+            />
+        </div>
+
+        <!-- Bot ID Input -->
+        <div class="mb-3">
+            <label for="onechat-bot-id" class="form-label">
+                {{ $t("OneChatBotId") }}<span style="color: red;"><sup>*</sup></span>
+            </label>
+            <input
+                id="onechat-bot-id"
+                v-model="$parent.notification.botId"
+                type="text"
+                class="form-control"
+                required
+            />
+        </div>
+
+        <!-- Document Link -->
+        <div class="form-text">
+            <i18n-t tag="p" keypath="Read more:">
+                <a href="https://chat-develop.one.th/docs" target="_blank">https://chat-develop.one.th/docs</a>
+            </i18n-t>
+        </div>
+    </div>
+</template>
+
+<script>
+import HiddenInput from "../HiddenInput.vue";
+
+export default {
+    components: {
+        HiddenInput,
+    },
+};
+</script>

src/components/notifications/Pumble.vue

@@ -0,0 +1,9 @@
+<template>
+    <div class="mb-3">
+        <label for="pumble-webhook-url" class="form-label mb-2">{{ $t("Webhook URL") }}</label><span style="color: red;"><sup>*</sup></span>
+        <input id="pumble-webhook-url" v-model="$parent.notification.webhookURL" type="url" class="form-control" required>
+    </div>
+    <div class="mb-3">
+        <a href="https://pumble.com/help/integrations/add-pumble-apps/incoming-webhooks-for-pumble/" target="_blank">{{ $t("documentationOf", ["Pumble Webbhook"]) }}</a>
+    </div>
+</template>

src/components/notifications/PushPlus.vue

@@ -0,0 +1,19 @@
+<template>
+    <div class="mb-3">
+        <label for="pushPlus-sendkey" class="form-label">{{ $t("SendKey") }}</label>
+        <HiddenInput id="pushPlus-sendkey" v-model="$parent.notification.pushPlusSendKey" :required="true" autocomplete="new-password"></HiddenInput>
+    </div>
+    <i18n-t tag="div" keypath="More info on:" class="mb-3 form-text">
+        <a href="https://www.pushplus.plus/" target="_blank">https://www.pushplus.plus/</a>
+    </i18n-t>
+</template>
+
+<script>
+import HiddenInput from "../HiddenInput.vue";
+
+export default {
+    components: {
+        HiddenInput,
+    },
+};
+</script>

src/components/notifications/Pushover.vue

@@ -16,34 +16,24 @@
             <option>1</option>
             <option>2</option>
         </select>
-        <label for="pushover-sound" class="form-label">{{ $t("Notification Sound") }}</label>
+
-        <select id="pushover-sound" v-model="$parent.notification.pushoversounds" class="form-select">
+        <label for="pushover-sound-down" class="form-label">{{ $t("Notification Sound") }} - Up</label>
-            <option value="pushover">{{ $t("pushoversounds pushover") }}</option>
+        <select id="pushover-sound-down" v-model="$parent.notification.pushoversounds" class="form-select">
-            <option value="bike">{{ $t("pushoversounds bike") }}</option>
+            <option v-for="sound in soundOptions" :key="sound" :value="sound">
-            <option value="bugle">{{ $t("pushoversounds bugle") }}</option>
+                {{ $t(`pushoversounds ${sound}`) }}
-            <option value="cashregister">{{ $t("pushoversounds cashregister") }}</option>
+            </option>
-            <option value="classical">{{ $t("pushoversounds classical") }}</option>
-            <option value="cosmic">{{ $t("pushoversounds cosmic") }}</option>
-            <option value="falling">{{ $t("pushoversounds falling") }}</option>
-            <option value="gamelan">{{ $t("pushoversounds gamelan") }}</option>
-            <option value="incoming">{{ $t("pushoversounds incoming") }}</option>
-            <option value="intermission">{{ $t("pushoversounds intermission") }}</option>
-            <option value="magic">{{ $t("pushoversounds magic") }}</option>
-            <option value="mechanical">{{ $t("pushoversounds mechanical") }}</option>
-            <option value="pianobar">{{ $t("pushoversounds pianobar") }}</option>
-            <option value="siren">{{ $t("pushoversounds siren") }}</option>
-            <option value="spacealarm">{{ $t("pushoversounds spacealarm") }}</option>
-            <option value="tugboat">{{ $t("pushoversounds tugboat") }}</option>
-            <option value="alien">{{ $t("pushoversounds alien") }}</option>
-            <option value="climb">{{ $t("pushoversounds climb") }}</option>
-            <option value="persistent">{{ $t("pushoversounds persistent") }}</option>
-            <option value="echo">{{ $t("pushoversounds echo") }}</option>
-            <option value="updown">{{ $t("pushoversounds updown") }}</option>
-            <option value="vibrate">{{ $t("pushoversounds vibrate") }}</option>
-            <option value="none">{{ $t("pushoversounds none") }}</option>
         </select>
+
+        <label for="pushover-sound-up" class="form-label">{{ $t("Notification Sound") }} - Down</label>
+        <select id="pushover-sound-up" v-model="$parent.notification.pushoversounds_up" class="form-select">
+            <option v-for="sound in soundOptions" :key="sound" :value="sound">
+                {{ $t(`pushoversounds ${sound}`) }}
+            </option>
+        </select>
+
         <label for="pushover-ttl" class="form-label">{{ $t("pushoverMessageTtl") }}</label>
         <input id="pushover-ttl" v-model="$parent.notification.pushoverttl" type="number" min="0" step="1" class="form-control">
+
         <div class="form-text">
             <span style="color: red;"><sup>*</sup></span>{{ $t("Required") }}
             <i18n-t tag="p" keypath="More info on:" style="margin-top: 8px;">
@@ -66,5 +56,34 @@ export default {
     components: {
         HiddenInput,
     },
+    data() {
+        return {
+            soundOptions: [
+                "pushover",
+                "bike",
+                "bugle",
+                "cashregister",
+                "classical",
+                "cosmic",
+                "falling",
+                "gamelan",
+                "incoming",
+                "intermission",
+                "magic",
+                "mechanical",
+                "pianobar",
+                "siren",
+                "spacealarm",
+                "tugboat",
+                "alien",
+                "climb",
+                "persistent",
+                "echo",
+                "updown",
+                "vibrate",
+                "none",
+            ],
+        };
+    },
 };
 </script>