Merge pull request #3394 from bluewave-labs/develop

develop -> master 3.5.1 release

.gitattributes

@@ -1,2 +0,0 @@
-* text=auto
-* text eol=lf

.github/pull_request_template.md

@@ -1,28 +1,27 @@
-**(Please remove this line only before submitting your PR. Ensure that all relevant items are checked before submission.)**
+**(Please remove this line only before submitting your PR. Ensure that all relevant items are checked before submission.)** 
 
 ## Describe your changes
 
-Briefly describe the changes you made and their purpose.
+Briefly describe the changes you made and their purpose. 
 
 ## Write your issue number after "Fixes "
 
-Fixes #123
+Fixes #123 
 
 ## Please ensure all items are checked off before requesting a review. "Checked off" means you need to add an "x" character between brackets so they turn into checkmarks.
 
 - [ ] (Do not skip this or your PR will be closed) I deployed the application locally.
-- [ ] (Do not skip this or your PR will be closed) I have performed a self-reviewing and testing of my code.
+- [ ] (Do not skip this or your PR will be closed) I have performed a self-review and testing of my code.
 - [ ] I have included the issue # in the PR.
-- [ ] I have added i18n support to visible strings (instead of `<div>Add</div>`, use):
-
+- [ ] I have added i18n support to visible strings (instead of `<div>Add</div>`, use): 
 ```Javascript
 const { t } = useTranslation();
 <div>{t('add')}</div>
 ```
-
 - [ ] I have **not** included any files that are not related to my pull request, including package-lock and package-json if dependencies have not changed
 - [ ] I didn't use any hardcoded values (otherwise it will not scale, and will make it difficult to maintain consistency across the application).
 - [ ] I made sure font sizes, color choices etc are all referenced from the theme. I don't have any hardcoded dimensions.
 - [ ] My PR is granular and targeted to one specific feature.
 - [ ] I ran `npm run format` in server and client directories, which automatically formats your code.
 - [ ] I took a screenshot or a video and attached to this PR if there is a UI change.
+

.github/workflows/check-tests.yml

@@ -1,23 +0,0 @@
-name: Test Check (Server)
-on:
-  pull_request:
-  workflow_dispatch:
-
-jobs:
-  test-server:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Set up Node
-        uses: actions/setup-node@v4
-        with:
-          node-version: 22
-
-      - name: Install server dependencies
-        working-directory: server
-        run: npm install
-
-      - name: Run server tests
-        working-directory: server
-        run: npm test

.github/workflows/poeditor-sync.yml

@@ -1,138 +1,120 @@
-name: POEditor Translation Synchronization (disabled)
-
-# This workflow is intentionally disabled — kept for reference only.
-# The full definition is preserved commented-out below. To re-enable,
-# delete the stub job and uncomment the section starting at `on:`.
+name: POEditor Translation Synchronization
 
 on:
-    workflow_dispatch:
+  # For manual triggering
+  workflow_dispatch:
+    inputs:
+      languages:
+        description: "Languages to synchronize (comma separated, e.g.: tr,en,es)"
+        required: false
+        default: "ar,zh-tw,cs,en,fi,fr,de,pt-br,ru,es,tr,ja,zh-cn,th"
+      format:
+        description: "Export format (key_value_json or json)"
+        required: false
+        default: "key_value_json"
+
+permissions:
+  contents: write
+  pull-requests: write
 
 jobs:
-    disabled:
-        if: false
-        runs-on: ubuntu-latest
-        steps:
-            - run: echo "This workflow is disabled. See comments below for the original definition."
+  sync-translations:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      issues: write
+      pull-requests: write
 
-# ---------------------------------------------------------------------------
-# Original (disabled) workflow below. Do not uncomment if you don't know what you're doing.
-# ---------------------------------------------------------------------------
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          fetch-depth: 0
 
-# on:
-#   # For manual triggering
-#   workflow_dispatch:
-#     inputs:
-#       languages:
-#         description: "Languages to synchronize (comma separated, e.g.: tr,en,es)"
-#         required: false
-#         default: "ar,zh-tw,cs,en,fi,fr,de,pt-br,ru,es,tr,ja,zh-cn,th"
-#       format:
-#         description: "Export format (key_value_json or json)"
-#         required: false
-#         default: "key_value_json"
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: "22"
 
-# permissions:
-#   contents: write
-#   pull-requests: write
+      - name: Create package.json for scripts
+        run: |
+          mkdir -p .github/scripts
+          cat > .github/scripts/package.json << EOF
+          {
+            "name": "poeditor-scripts",
+            "version": "1.0.0",
+            "private": true,
+            "type": "module",
+            "dependencies": {
+              "axios": "^1.6.0",
+              "fs-extra": "^11.1.1"
+            }
+          }
+          EOF
 
-# jobs:
-#   sync-translations:
-#     runs-on: ubuntu-latest
-#     permissions:
-#       contents: write
-#       issues: write
-#       pull-requests: write
+      - name: Install dependencies
+        run: |
+          cd .github/scripts
+          npm install
 
-#     steps:
-#       - name: Checkout code
-#         uses: actions/checkout@v3
-#         with:
-#           token: ${{ secrets.GITHUB_TOKEN }}
-#           fetch-depth: 0
+      - name: Download translations from POEditor
+        env:
+          POEDITOR_API: ${{ secrets.POEDITOR_API }}
+          POEDITOR_PROJECT_ID: ${{ secrets.POEDITOR_PROJECT_ID }}
+          LANGUAGES: ${{ github.event.inputs.languages || 'tr,en' }}
+          EXPORT_FORMAT: ${{ github.event.inputs.format || 'key_value_json' }}
+        run: |
+          mkdir -p temp
+          node .github/scripts/download-translations.js
 
-#       - name: Setup Node.js
-#         uses: actions/setup-node@v3
-#         with:
-#           node-version: "22"
+      - name: Verify translation files
+        run: |
+          echo "Verifying translation files..."
+          for file in temp/*.json; do
+            echo "Checking $file"
+            if [ ! -s "$file" ]; then
+              echo "Error: $file is empty or does not exist"
+              exit 1
+            fi
+            # Validate JSON format
+            cat "$file" | jq . > /dev/null || { echo "Error: $file is not valid JSON"; exit 1; }
+          done
+          echo "All translation files are valid"
 
-#       - name: Create package.json for scripts
-#         run: |
-#           mkdir -p .github/scripts
-#           cat > .github/scripts/package.json << EOF
-#           {
-#             "name": "poeditor-scripts",
-#             "version": "1.0.0",
-#             "private": true,
-#             "type": "module",
-#             "dependencies": {
-#               "axios": "^1.6.0",
-#               "fs-extra": "^11.1.1"
-#             }
-#           }
-#           EOF
+      - name: Copy translations to project
+        run: |
+          mkdir -p client/src/locales
+          cp -r temp/* client/src/locales/
+          echo "Translation files copied to client/src/locales/"
 
-#       - name: Install dependencies
-#         run: |
-#           cd .github/scripts
-#           npm install
+      - name: Get current date
+        id: date
+        run: echo "date=$(date +'%Y-%m-%d %H:%M:%S')" >> $GITHUB_OUTPUT
 
-#       - name: Download translations from POEditor
-#         env:
-#           POEDITOR_API: ${{ secrets.POEDITOR_API }}
-#           POEDITOR_PROJECT_ID: ${{ secrets.POEDITOR_PROJECT_ID }}
-#           LANGUAGES: ${{ github.event.inputs.languages || 'tr,en' }}
-#           EXPORT_FORMAT: ${{ github.event.inputs.format || 'key_value_json' }}
-#         run: |
-#           mkdir -p temp
-#           node .github/scripts/download-translations.js
+      - name: Format client code
+        run: |
+          cd client
+          npm ci
+          npm run format
 
-#       - name: Verify translation files
-#         run: |
-#           echo "Verifying translation files..."
-#           for file in temp/*.json; do
-#             echo "Checking $file"
-#             if [ ! -s "$file" ]; then
-#               echo "Error: $file is empty or does not exist"
-#               exit 1
-#             fi
-#             # Validate JSON format
-#             cat "$file" | jq . > /dev/null || { echo "Error: $file is not valid JSON"; exit 1; }
-#           done
-#           echo "All translation files are valid"
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v7
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          commit-message: "feat: translations updated from POEditor"
+          title: "🌐 Updated Translations from POEditor"
+          body: |
+            This PR contains the latest translations from POEditor.
 
-#       - name: Copy translations to project
-#         run: |
-#           mkdir -p client/src/locales
-#           cp -r temp/* client/src/locales/
-#           echo "Translation files copied to client/src/locales/"
+            📅 Update Date: ${{ steps.date.outputs.date }}
+            🔄 Updated Languages: ${{ github.event.inputs.languages || 'tr,en' }}
 
-#       - name: Get current date
-#         id: date
-#         run: echo "date=$(date +'%Y-%m-%d %H:%M:%S')" >> $GITHUB_OUTPUT
-
-#       - name: Format client code
-#         run: |
-#           cd client
-#           npm ci
-#           npm run format
-
-#       - name: Create Pull Request
-#         uses: peter-evans/create-pull-request@v7
-#         with:
-#           token: ${{ secrets.GITHUB_TOKEN }}
-#           commit-message: "feat: translations updated from POEditor"
-#           title: "🌐 Updated Translations from POEditor"
-#           body: |
-#             This PR contains the latest translations from POEditor.
-
-#             📅 Update Date: ${{ steps.date.outputs.date }}
-#             🔄 Updated Languages: ${{ github.event.inputs.languages || 'tr,en' }}
-
-#             ⚠️ Please review the translations and approve the PR if everything looks correct.
-#           branch: translation-update-${{ github.run_number }}
-#           delete-branch: true
-#           base: develop
-#           add-paths: |
-#             client/src/locales/*.json
-#           committer: GitHub Action <github-actions[bot]@users.noreply.github.com>
-#           author: GitHub Action <github-actions[bot]@users.noreply.github.com>
+            ⚠️ Please review the translations and approve the PR if everything looks correct.
+          branch: translation-update-${{ github.run_number }}
+          delete-branch: true
+          base: develop
+          add-paths: |
+            client/src/locales/*.json
+          committer: GitHub Action <github-actions[bot]@users.noreply.github.com>
+          author: GitHub Action <github-actions[bot]@users.noreply.github.com>

.github/workflows/production-deploy.yml

@@ -2,7 +2,7 @@ name: Demo deploy
 
 on:
   push:
-    branches: [ "demo" ]
+    branches: ["demo"]
   workflow_dispatch:
 jobs:
   docker-build-and-push-client:
@@ -84,8 +84,7 @@ jobs:
           script: |
             cd checkmate
             git pull
-            cd docker/unified
+            cd docker/prod
             docker compose down
             docker compose pull
             docker compose up -d
-            docker system prune -af

.github/workflows/staging-deploy.yml

@@ -2,7 +2,7 @@ name: Staging deploy
 
 on:
   push:
-    branches: [ "develop" ]
+    branches: ["develop"]
 
 jobs:
   docker-build-and-push-client:
@@ -78,13 +78,13 @@ jobs:
       - name: SSH into server and restart container using Docker Compose
         uses: appleboy/ssh-action@v1.2.2
         with:
-          host: ${{ secrets.DEMO_SERVER_HOST }}
-          username: ${{ secrets.DEMO_SERVER_USER }}
-          key: ${{ secrets.DEMO_SERVER_SSH_KEY }}
+          host: ${{ secrets.STAGING_SERVER_HOST }}
+          username: ${{ secrets.STAGING_SERVER_USER }}
+          key: ${{ secrets.STAGING_SERVER_SSH_KEY }}
           script: |
             cd checkmate
             git pull
-            cd docker/unified
+            cd docker/staging
             docker compose down
             docker compose pull
             docker compose up -d

CLAUDE.md

@@ -105,56 +105,6 @@ client/src/
 - **Queue/Cache**: Redis + BullMQ + Pulse (cron scheduling)
 - **i18n**: i18next + react-i18next (translations via PoEditor)
 
----
-
-## Backend Architecture Patterns
-
-### Repository Pattern & Separation of Concerns
-
-The backend enforces a strict three-layer separation between HTTP handling, business logic, and data access:
-
-```
-Request → Controller → Service → Repository → MongoDB (Mongoose)
-```
-
-- **Controllers** (`/controllers`) handle HTTP concerns only: parsing request params, calling the appropriate service, and returning a response via the `responseHandler` middleware. They contain no business logic.
-- **Services** (`/service/business`) contain all business logic: deciding whether an incident should be created, whether a notification should fire, what state a monitor is in, etc.
-- **Repositories** (`/repositories`) are the sole layer that talks to MongoDB through Mongoose. They expose clean, reusable query methods (e.g. `findByMonitorId`, `createCheck`) so that services never construct raw DB queries directly.
-
-This separation makes each layer independently testable and keeps Mongoose-specific code out of business logic. When adding a new feature, the pattern to follow is: add a repository method for any new DB query, call it from a service, and expose it via a controller route.
-
-### Monitoring Flow: From Check to Notification
-
-Background monitoring runs on a scheduled queue, not on the HTTP request cycle. The high-level flow for uptime monitoring is:
-
-```
-Pulse (cron) → BullMQ Job → StatusService
-                                 ├── performs HTTP/port/ping check
-                                 ├── saves Check via CheckRepository
-                                 ├── evaluates monitor state change
-                                 │     └── calls IncidentService (create / resolve incident)
-                                 └── calls NotificationService (email, Slack, Discord, webhook)
-```
-
-1. **Pulse** (cron scheduler) enqueues a job into a **BullMQ** queue for each active monitor at its configured interval.
-2. A **BullMQ worker** picks up the job and calls `StatusService`, which performs the actual check (HTTP request, TCP port probe, ping, etc.).
-3. The result is persisted as a `Check` document via the repository layer.
-4. `StatusService` compares the new result against the monitor's previous state. If the monitor transitions from up → down (or down → up), it delegates to `IncidentService` to open or resolve an `Incident` document.
-5. On a state change, `NotificationService` reads the monitor's configured `Notification` documents and dispatches alerts to all enabled channels (email, Discord, Slack, webhooks).
-
-### Queue System (BullMQ + Redis)
-
-Redis serves two roles: job queue storage for BullMQ and ephemeral caching. BullMQ manages concurrency, retries, and backpressure for monitoring jobs, ensuring checks are processed reliably even under load.
-
-- Each monitor type (HTTP, port, ping, infrastructure) maps to its own queue worker so failures in one type don't block others.
-- Job scheduling interval is driven by the `interval` field on the `Monitor` model.
-- Failed jobs are retried with configurable backoff before being moved to a dead-letter state.
-- Redis is also used to cache frequently read data (e.g. aggregated stats) to reduce MongoDB query pressure.
-
-When working on anything related to check scheduling, incident lifecycle, or notifications, trace the flow starting from the relevant BullMQ worker rather than from the controller layer.
-
----
-
 ## Code Conventions
 
 ### Internationalization
@@ -192,4 +142,4 @@ Key Mongoose models in `/server/src/db/models/`:
 - **StatusPage** - Public status pages
 - **Notification** - Alert configuration (email, Discord, Slack, webhooks)
 - **MaintenanceWindow** - Scheduled maintenance periods
-- **AppSettings** - Global application settings
+- **AppSettings** - Global application settings

CODE_OF_CONDUCT.md

@@ -1,69 +1,69 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-We as members, contributors, and leaders pledge to make participation in the **checkmate** project and community a harassment-free experience for everyone, regardless of age, body size, visible or invisible disability, ethnicity, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation.
-
-We pledge to act and interact in ways that contribute to an open, welcoming, diverse, inclusive, and healthy community, especially during Hacktoberfest, where we encourage new contributors to join and feel supported.
-
-## Our Standards
-
-Examples of behavior that contributes to a positive environment for our community include:
-
-- Demonstrating empathy and kindness toward other people
-- Being respectful of differing opinions, viewpoints, and experiences
-- Giving and gracefully accepting constructive feedback
-- 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 overall community
-
-Examples of unacceptable behavior include:
-
-- The use of sexualized language or imagery, and sexual attention or advances of any kind
-- Trolling, insulting or derogatory comments, and personal or political attacks
-- Public or private harassment
-- Publishing others' private information, such as a physical or email address, without their explicit permission
-- Other conduct which could reasonably be considered inappropriate in a professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying and enforcing our standards of acceptable behavior and will take appropriate and fair corrective action in response to any behavior that they deem inappropriate, threatening, offensive, or harmful.
-
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned with this Code of Conduct, especially during Hacktoberfest to ensure a positive experience for all contributors.
-
-## Scope
-
-This Code of Conduct applies within all project spaces, and it also applies when an individual is officially representing the project or its community in public spaces. Examples of representing our project include using an official project email address, posting via an official social media account, or acting as an appointed representative at an online or offline event.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at hello@bluewavelabs.ca. All complaints will be reviewed and investigated promptly and fairly.
-
-All project team members are obligated to respect the privacy and security of the reporter of any incident.
-
-## Enforcement Guidelines
-
-Project maintainers will follow these Community Impact Guidelines in determining the consequences for any action they deem in violation of this Code of Conduct:
-
-### 1. Correction
-**Community Impact**: Use of inappropriate language or other behavior deemed unprofessional or unwelcome in the community.
-**Consequence**: A private, written warning from project maintainers, providing clarity around the nature of the violation and an explanation of why the behavior was inappropriate. A public apology may be requested.
-
-### 2. Warning
-**Community Impact**: A violation through a single incident or series of 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 permanent ban.
-
-### 3. Temporary Ban
-**Community Impact**: A serious violation of community standards, including sustained inappropriate behavior.
-**Consequence**: A temporary ban from any sort of interaction or public communication with the community for a specified period of time. No public or private interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, is allowed during this period. Violating these terms may lead to a permanent ban.
-
-### 4. Permanent Ban
-**Community Impact**: Demonstrating a pattern of violation of community 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 the community.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant](https://www.contributor-covenant.org), version 2.0, available at https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
-
----
-
-By following this Code of Conduct, we can ensure a welcoming and inclusive environment, encouraging new contributors to engage with the project and the community. Thank you for helping make **checkmate** a positive space for all!
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in the **bluewave-uptime** project and community a harassment-free experience for everyone, regardless of age, body size, visible or invisible disability, ethnicity, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming, diverse, inclusive, and healthy community, especially during Hacktoberfest, where we encourage new contributors to join and feel supported.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our community include:
+
+- Demonstrating empathy and kindness toward other people
+- Being respectful of differing opinions, viewpoints, and experiences
+- Giving and gracefully accepting constructive feedback
+- 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 overall community
+
+Examples of unacceptable behavior include:
+
+- The use of sexualized language or imagery, and sexual attention or advances of any kind
+- Trolling, insulting or derogatory comments, and personal or political attacks
+- Public or private harassment
+- Publishing others' private information, such as a physical or email address, without their explicit permission
+- Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying and enforcing our standards of acceptable behavior and will take appropriate and fair corrective action in response to any behavior that they deem inappropriate, threatening, offensive, or harmful.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned with this Code of Conduct, especially during Hacktoberfest to ensure a positive experience for all contributors.
+
+## Scope
+
+This Code of Conduct applies within all project spaces, and it also applies when an individual is officially representing the project or its community in public spaces. Examples of representing our project include using an official project email address, posting via an official social media account, or acting as an appointed representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at hello@bluewavelabs.ca. All complaints will be reviewed and investigated promptly and fairly.
+
+All project team members are obligated to respect the privacy and security of the reporter of any incident.
+
+## Enforcement Guidelines
+
+Project maintainers will follow these Community Impact Guidelines in determining the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+**Community Impact**: Use of inappropriate language or other behavior deemed unprofessional or unwelcome in the community.
+**Consequence**: A private, written warning from project maintainers, providing clarity around the nature of the violation and an explanation of why the behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+**Community Impact**: A violation through a single incident or series of 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 permanent ban.
+
+### 3. Temporary Ban
+**Community Impact**: A serious violation of community standards, including sustained inappropriate behavior.
+**Consequence**: A temporary ban from any sort of interaction or public communication with the community for a specified period of time. No public or private interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, is allowed during this period. Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+**Community Impact**: Demonstrating a pattern of violation of community 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 the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant](https://www.contributor-covenant.org), version 2.0, available at https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+---
+
+By following this Code of Conduct, we can ensure a welcoming and inclusive environment, encouraging new contributors to engage with the project and the community. Thank you for helping make **bluewave-uptime** a positive space for all!

CONTRIBUTING.md

@@ -16,7 +16,7 @@ PS: **We work closely with contributors on our [Discord channel](https://discord
 Before you dive in, make sure you have these installed:
 
 ```bash
-# Check Node.js (v20+ required)
+# Check Node.js (v16+ required)
 node --version
 
 # Check npm
@@ -96,16 +96,10 @@ cd docker/dev
 
 Build the Docker images:
 
-Linux:
 ```bash
 ./build_images.sh
 ```
 
-Windows:
-```bash
-./build_images.bat
-```
-
 Run MongoDB container:
 
 ```bash

PULLREQUESTS.md

@@ -33,4 +33,4 @@ Ensure you execute `npm run format` before submitting your pull requests in both
 
 ### Keep PRs focused
 
-It may be tempting to address a bug you suddenly remembered or make some tiny adjustments in some component that bothers you, but don’t!  Keep all commits in your pull request fully focused on the specific feature you are working on.  Open up another PR if you want to fix a bug or work on another feature.
+It may be tempting to address a bug you suddenly remembered or make some tiny adjustments in some component that bothers you, but don’t!  Keep all commits in your pull request fully focused on the specific feature you are working on.  Open up another PR if you want to fix a big or work on another feature.

README.es.md

@@ -76,7 +76,7 @@ También puedes ver el consumo de memoria de MongoDB y Redis en el mismo servido
 Si tienes alguna pregunta, sugerencia o comentario, tienes varias opciones:
 
 - [Canal de Discord](https://discord.gg/NAb6H3UTjK)
-- [Discusiones en GitHub](https://github.com/bluewave-labs/checkmate/discussions)
+- [Discusiones en GitHub](https://github.com/bluewave-labs/bluewave-uptime/discussions)
 - [Grupo en Reddit](https://www.reddit.com/r/CheckmateMonitoring/)
 
 ¡No dudes en hacer preguntas o compartir tus ideas, nos encantaría saber de ti!

README.md

@@ -14,8 +14,6 @@
 
 <p align="center"><strong>An open source uptime and infrastructure monitoring application</strong></p>
 
-[![Run on PikaPods](https://www.pikapods.com/static/run-button.svg)](https://www.pikapods.com/pods?run=checkmate)
-
 <img width="1660" alt="image" src="https://github.com/user-attachments/assets/b748f36d-a271-4965-ad0a-18bf153bbee7" />
 
 This repository contains both the frontend and the backend of Checkmate, an open-source, self-hosted monitoring tool for tracking server hardware, uptime, response times, and incidents in real-time with beautiful visualizations. Checkmate regularly checks whether a server/website is accessible and performs optimally, providing real-time alerts and reports on the monitored services' availability, downtime, and response time.
@@ -31,6 +29,7 @@ Checkmate has been stress-tested with 1000+ active monitors without any particul
 - [📦 Demo](#demo)  
 - [🔗 User's guide](#users-guide)  
 - [🛠️ Installation](#installation)
+- [🏁 Translations](#translations)  
 - [🚀 Performance](#performance)  
 - [💚 Questions & Ideas](#questions--ideas)  
 - [🧩 Features](#features)  
@@ -43,23 +42,17 @@ Checkmate has been stress-tested with 1000+ active monitors without any particul
 
 ## Demo
 
-You can see the latest build of [Checkmate](https://demo.checkmate.so/) in action. 
-
-The username is demouser@demo.com and the password is Demouser1! (just a note that we update the demo server from time to time, so if it doesn't work for you, please ping us on the Discussions channel).
+You can see the latest build of [Checkmate](https://checkmate-demo.bluewavelabs.ca/) in action. The username is demouser@demo.com and the password is Demouser1! (just a note that we update the demo server from time to time, so if it doesn't work for you, please ping us on the Discussions channel).
 
 ## User's guide
 
-Usage instructions can be found [here](https://checkmate.so/docs). 
-
-## Prerequisites
-- [Docker](https://www.docker.com/) installed
-- [Git](https://git-scm.com/) installed
+Usage instructions can be found [here](https://docs.checkmate.so/checkmate-2.1). It's still WIP and some of the information there might be outdated as we continuously add features weekly. Rest assured, we are doing our best! :)
 
 ## Installation
 
-See installation instructions in [Checkmate documentation portal](https://checkmate.so/docs). 
+See installation instructions in [Checkmate documentation portal](https://docs.checkmate.so/checkmate-2.1/users-guide/quickstart). 
 
-Alternatively, you can also use [Coolify](https://coolify.io/), [Elestio](https://elest.io/open-source/checkmate), [K8s](./charts/helm/checkmate/INSTALLATION.md), [Sive Host](https://sive.host) (South Africa), [Cloudzy](https://cloudzy.com/marketplace/checkmate) or [Pikapods](https://www.pikapods.com/) to quickly spin off a Checkmate instance. If you would like to monitor your server infrastructure, you'll need [Capture agent](https://github.com/bluewave-labs/capture). Capture repository also contains the installation instructions.
+Alternatively, you can also use [Elestio](https://elest.io/open-source/checkmate), [K8s](./charts/helm/checkmate/INSTALLATION.md), [Sive Host](https://sive.host) (South Africa) or [Pikapods](https://www.pikapods.com/) to quickly spin off a Checkmate instance. If you would like to monitor your server infrastructure, you'll need [Capture agent](https://github.com/bluewave-labs/capture). Capture repository also contains the installation instructions.
 
 ### Using a Custom CA
 
@@ -67,6 +60,11 @@ If you need to monitor internal HTTPS endpoints with certificates from private C
 
 For more documentation, see the [docs directory](./docs/).
 
+
+## Translations
+
+If you would like to use Checkmate in your language, please [go to this page](https://poeditor.com/join/project/lRUoGZFCsJ) and register for the language you would like to translate Checkmate to. 
+
 ## Performance
 
 Thanks to extensive optimizations, Checkmate operates with an exceptionally small memory footprint, requiring minimal memory and CPU resources. Here’s the memory usage of a Node.js instance running on a server that monitors 323 servers every minute:
@@ -82,7 +80,7 @@ You can see the memory footprint of MongoDB and Redis on the same server (398Mb
 If you have any questions, suggestions or comments, you have several options: 
 
 - [Discord channel](https://discord.gg/NAb6H3UTjK) (preferred)
-- [GitHub Discussions](https://github.com/bluewave-labs/Checkmate/discussions) (we check here from time to time)
+- [GitHub Discussions](https://github.com/bluewave-labs/bluewave-uptime/discussions) (we check here from time to time)
 
 Feel free to ask questions or share your ideas - we'd love to hear from you!
 
@@ -114,15 +112,6 @@ Feel free to ask questions or share your ideas - we'd love to hear from you!
 
 If you would like to sponsor an additional feature, [see this page](https://checkmate.so/sponsored-features).
 
-## Monitor Lifecycle
-
-1. A monitor executes a check (HTTP / ping / port / hardware via Capture agent)
-2. The result is stored (success/failure + response time)
-3. Recent check results are evaluated against the monitor's configured status change threshold
-4. If the monitor's status change threshold is met and the current status is not equal to the previous status, the monitor's state changes (e.g. `initializing`, `up`, `down`, `breached`)
-5. Upon a state change: an incident is either created or resolved, depending on the monitor's current status
-6. Notifications are triggered based on configuration
-
 ## Screenshots
 
 <p>
@@ -168,20 +157,27 @@ Here's how you can contribute:
 
 0. Star this repo :)
 1. Check [Contributor's guideline](https://github.com/bluewave-labs/Checkmate/blob/develop/CONTRIBUTING.md). First timers are encouraged to check `good-first-issue` tag.
-2. Read a detailed structure of [Checkmate](https://deepwiki.com/bluewave-labs/Checkmate) if you would like to deep dive into the architecture.
-3. Open an issue if you believe you've encountered a bug.
-4. Check for good-first-issue's if you are a newcomer.
-5. Make a pull request to add new features/make quality-of-life improvements/fix bugs.
-6. Check out this interactive walkthrough of the `Checkmate` codebase on CodeCanvas [here](https://www.code-canvas.com/?session=unauthenticatedGithub&repo=Checkmate&owner=bluewave-labs&branch=develop&OnboardingTutorial=true). To refine existing dataflow simulation or create new ones, follow the quick tutorial [here](https://docs.code-canvas.com/updating-diagram).
+2. Check [project structure](https://docs.checkmate.so/checkmate-2.1/developers-guide/general-project-structure) and [high level overview](https://bluewavelabs.gitbook.io/checkmate/developers-guide/high-level-overview).
+3. Read a detailed structure of [Checkmate](https://deepwiki.com/bluewave-labs/Checkmate) if you would like to deep dive into the architecture.
+4. Open an issue if you believe you've encountered a bug.
+5. Check for good-first-issue's if you are a newcomer.
+6. Make a pull request to add new features/make quality-of-life improvements/fix bugs.
+7. Check out this interactive walkthrough of the `Checkmate` codebase on CodeCanvas [here](https://www.code-canvas.com/?session=unauthenticatedGithub&repo=Checkmate&owner=bluewave-labs&branch=develop&OnboardingTutorial=true). To refine existing dataflow simulation or create new ones, follow the quick tutorial [here](https://docs.code-canvas.com/updating-diagram).
 
 <a href="https://github.com/bluewave-labs/checkmate/graphs/contributors">
   <img src="https://contrib.rocks/image?repo=bluewave-labs/checkmate" />
 </a>
 
-[![Star History Chart](https://api.star-history.com/svg?repos=bluewave-labs/checkmate&type=Date)](https://star-history.com/#bluewave-labs/Checkmate&Date)
+[![Star History Chart](https://api.star-history.com/svg?repos=bluewave-labs/checkmate&type=Date)](https://star-history.com/#bluewave-labs/bluewave-uptime&Date)
 
 ## Our sponsors
 
 Thanks to [Gitbook](https://gitbook.io/) for giving us a free tier for their documentation platform, and [Poeditor](https://poeditor.com/) providing us a free account to use their i18n services. If you would like to sponsor Checkmate, please send an email to hello@bluewavelabs.ca
 
 If you would like to sponsor a feature, [see this page](https://checkmate.so/sponsored-features).
+
+Also check other developer and contributor-friendly projects of BlueWave:
+
+- [VerifyWise](https://github.com/bluewave-labs/verifywise), the first open source AI governance platform.
+- [DataRoom](https://github.com/bluewave-labs/bluewave-dataroom), an secure file sharing application, aka dataroom.
+- [Guidefox](https://github.com/bluewave-labs/guidefox), an application that helps new users learn how to use your product via hints, tours, popups and banners.

client/package-lock.json

@@ -83,6 +83,7 @@
 		"node_modules/@babel/core": {
 			"version": "7.29.0",
 			"license": "MIT",
+			"peer": true,
 			"dependencies": {
 				"@babel/code-frame": "^7.29.0",
 				"@babel/generator": "^7.29.0",
@@ -353,6 +354,7 @@
 		"node_modules/@emotion/react": {
 			"version": "11.14.0",
 			"license": "MIT",
+			"peer": true,
 			"dependencies": {
 				"@babel/runtime": "^7.18.3",
 				"@emotion/babel-plugin": "^11.13.5",
@@ -390,6 +392,7 @@
 		"node_modules/@emotion/styled": {
 			"version": "11.14.1",
 			"license": "MIT",
+			"peer": true,
 			"dependencies": {
 				"@babel/runtime": "^7.18.3",
 				"@emotion/babel-plugin": "^11.13.5",
@@ -1159,6 +1162,7 @@
 		"node_modules/@mui/material": {
 			"version": "7.3.7",
 			"license": "MIT",
+			"peer": true,
 			"dependencies": {
 				"@babel/runtime": "^7.28.4",
 				"@mui/core-downloads-tracker": "^7.3.7",
@@ -1263,6 +1267,7 @@
 		"node_modules/@mui/system": {
 			"version": "7.3.7",
 			"license": "MIT",
+			"peer": true,
 			"dependencies": {
 				"@babel/runtime": "^7.28.4",
 				"@mui/private-theming": "^7.3.7",
@@ -2303,6 +2308,7 @@
 			"version": "24.5.2",
 			"devOptional": true,
 			"license": "MIT",
+			"peer": true,
 			"dependencies": {
 				"undici-types": "~7.12.0"
 			}
@@ -2318,6 +2324,7 @@
 		"node_modules/@types/react": {
 			"version": "18.3.27",
 			"license": "MIT",
+			"peer": true,
 			"dependencies": {
 				"@types/prop-types": "*",
 				"csstype": "^3.2.2"
@@ -2439,6 +2446,7 @@
 			"version": "8.15.0",
 			"dev": true,
 			"license": "MIT",
+			"peer": true,
 			"bin": {
 				"acorn": "bin/acorn"
 			},
@@ -2763,6 +2771,7 @@
 				}
 			],
 			"license": "MIT",
+			"peer": true,
 			"dependencies": {
 				"baseline-browser-mapping": "^2.9.0",
 				"caniuse-lite": "^1.0.30001759",
@@ -3194,7 +3203,8 @@
 		},
 		"node_modules/dayjs": {
 			"version": "1.11.13",
-			"license": "MIT"
+			"license": "MIT",
+			"peer": true
 		},
 		"node_modules/debug": {
 			"version": "4.4.3",
@@ -3576,6 +3586,7 @@
 			"version": "8.57.1",
 			"dev": true,
 			"license": "MIT",
+			"peer": true,
 			"dependencies": {
 				"@eslint-community/eslint-utils": "^4.2.0",
 				"@eslint-community/regexpp": "^4.6.1",
@@ -4320,6 +4331,7 @@
 				}
 			],
 			"license": "MIT",
+			"peer": true,
 			"dependencies": {
 				"@babel/runtime": "^7.27.6"
 			},
@@ -5103,6 +5115,7 @@
 			"resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-5.19.0.tgz",
 			"integrity": "sha512-REhYUN8gNP3HlcIZS6QU2uy8iovl31cXsrNDkCcqWSQbCkcpdYLczqDz5PVIwNH42UQNyvukjes/RoHPDrOUmQ==",
 			"license": "BSD-3-Clause",
+			"peer": true,
 			"dependencies": {
 				"@mapbox/geojson-rewind": "^0.5.2",
 				"@mapbox/jsonlint-lines-primitives": "^2.0.2",
@@ -5750,6 +5763,7 @@
 		"node_modules/react-dom": {
 			"version": "18.3.1",
 			"license": "MIT",
+			"peer": true,
 			"dependencies": {
 				"loose-envify": "^1.1.0",
 				"scheduler": "^0.23.2"
@@ -5761,6 +5775,7 @@
 		"node_modules/react-hook-form": {
 			"version": "7.71.1",
 			"license": "MIT",
+			"peer": true,
 			"engines": {
 				"node": ">=18.0.0"
 			},
@@ -5960,7 +5975,8 @@
 		},
 		"node_modules/redux": {
 			"version": "5.0.1",
-			"license": "MIT"
+			"license": "MIT",
+			"peer": true
 		},
 		"node_modules/redux-persist": {
 			"version": "6.0.0",
@@ -6106,10 +6122,11 @@
 			"license": "Unlicense"
 		},
 		"node_modules/rollup": {
-			"version": "4.57.1",
+			"version": "4.59.0",
 			"resolved": "https://registry.npmjs.org/rollup/-/rollup-4.59.0.tgz",
 			"integrity": "sha512-2oMpl67a3zCH9H79LeMcbDhXW/UmWG/y2zuqnF2jQq5uq9TbM9TVyXvA4+t+ne2IIkBdrLpAaRQAvo7YI/Yyeg==",
 			"license": "MIT",
+			"peer": true,
 			"dependencies": {
 				"@types/estree": "1.0.8"
 			},
@@ -6898,6 +6915,7 @@
 			"version": "5.9.3",
 			"devOptional": true,
 			"license": "Apache-2.0",
+			"peer": true,
 			"bin": {
 				"tsc": "bin/tsc",
 				"tsserver": "bin/tsserver"
@@ -7033,6 +7051,7 @@
 			"resolved": "https://registry.npmjs.org/vite/-/vite-6.4.1.tgz",
 			"integrity": "sha512-+Oxm7q9hDoLMyJOYfUYBuHQo+dkAloi33apOPP56pzj+vsdJDzr+j1NISE5pyaAuKL4A3UD34qd0lx5+kfKp2g==",
 			"license": "MIT",
+			"peer": true,
 			"dependencies": {
 				"esbuild": "^0.25.0",
 				"fdir": "^6.4.4",

client/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "client",
 	"private": true,
-	"version": "3.6.1",
+	"version": "0.0.0",
 	"type": "module",
 	"scripts": {
 		"dev": "vite",

client/scripts/migrate-locales.ts

@@ -1,258 +0,0 @@
-/**
- * Locale Migration Script
- *
- * Restructures all non-English locale files to match en.json's nested key structure.
- * Recovers translations via safe key-matching strategies, uses English placeholders
- * for unmatched keys.
- *
- * Usage: npx tsx client/scripts/migrate-locales.ts
- *
- * SAFETY: en.json is NEVER modified. Originals are backed up before overwriting.
- */
-
-import fs from "fs";
-import path from "path";
-
-const LOCALES_DIR = path.resolve(import.meta.dirname, "../src/locales");
-const BACKUP_DIR = path.join(LOCALES_DIR, "backup");
-const REPORT_PATH = path.join(LOCALES_DIR, "migration-report.json");
-
-// ── Helpers ──────────────────────────────────────────────────────────────────
-
-/** Flatten a nested object into { "a.b.c": value } pairs */
-function flattenKeys(obj: Record<string, unknown>, prefix = ""): Record<string, string> {
-	const result: Record<string, string> = {};
-	for (const [key, value] of Object.entries(obj)) {
-		const fullPath = prefix ? `${prefix}.${key}` : key;
-		if (typeof value === "object" && value !== null && !Array.isArray(value)) {
-			Object.assign(result, flattenKeys(value as Record<string, unknown>, fullPath));
-		} else {
-			result[fullPath] = String(value);
-		}
-	}
-	return result;
-}
-
-/** Set a value at a dot-separated path in a nested object */
-function setNestedValue(
-	obj: Record<string, unknown>,
-	keyPath: string,
-	value: string
-): void {
-	const parts = keyPath.split(".");
-	let current = obj;
-	for (let i = 0; i < parts.length - 1; i++) {
-		const part = parts[i];
-		if (!(part in current) || typeof current[part] !== "object") {
-			current[part] = {};
-		}
-		current = current[part] as Record<string, unknown>;
-	}
-	current[parts[parts.length - 1]] = value;
-}
-
-// ── Build mapping indexes from en.json ───────────────────────────────────────
-
-function buildIndexes(enFlat: Record<string, string>) {
-	const enKeys = Object.keys(enFlat);
-
-	// last segment -> en key paths
-	const lastSegIndex: Record<string, string[]> = {};
-	// last 2 segments -> en key paths
-	const suffixIndex: Record<string, string[]> = {};
-
-	for (const keyPath of enKeys) {
-		const parts = keyPath.split(".");
-		const lastSeg = parts[parts.length - 1].toLowerCase();
-		if (!lastSegIndex[lastSeg]) lastSegIndex[lastSeg] = [];
-		lastSegIndex[lastSeg].push(keyPath);
-
-		if (parts.length >= 2) {
-			const suffix = parts.slice(-2).join(".").toLowerCase();
-			if (!suffixIndex[suffix]) suffixIndex[suffix] = [];
-			suffixIndex[suffix].push(keyPath);
-		}
-	}
-
-	return { lastSegIndex, suffixIndex };
-}
-
-// ── Mapping logic ────────────────────────────────────────────────────────────
-
-type MatchStrategy = "exact" | "suffix-2" | "unique-name" | "english-placeholder";
-
-interface KeyMatch {
-	enKey: string;
-	value: string;
-	strategy: MatchStrategy;
-}
-
-function buildMigratedLocale(
-	enFlat: Record<string, string>,
-	langFlat: Record<string, string>,
-	indexes: ReturnType<typeof buildIndexes>
-): { matches: KeyMatch[]; result: Record<string, unknown> } {
-	const { lastSegIndex, suffixIndex } = indexes;
-	const matches: KeyMatch[] = [];
-	const result: Record<string, unknown> = {};
-
-	// Build reverse lookup: for each orphan key in lang, index by last segment and suffix
-	const langByLastSeg: Record<string, { key: string; value: string }[]> = {};
-	const langBySuffix: Record<string, { key: string; value: string }[]> = {};
-
-	for (const [langKey, langValue] of Object.entries(langFlat)) {
-		const parts = langKey.split(".");
-		const lastSeg = parts[parts.length - 1].toLowerCase();
-		if (!langByLastSeg[lastSeg]) langByLastSeg[lastSeg] = [];
-		langByLastSeg[lastSeg].push({ key: langKey, value: langValue });
-
-		if (parts.length >= 2) {
-			const suffix = parts.slice(-2).join(".").toLowerCase();
-			if (!langBySuffix[suffix]) langBySuffix[suffix] = [];
-			langBySuffix[suffix].push({ key: langKey, value: langValue });
-		}
-	}
-
-	for (const enKey of Object.keys(enFlat)) {
-		const enValue = enFlat[enKey];
-		const parts = enKey.split(".");
-		const lastSeg = parts[parts.length - 1].toLowerCase();
-		const suffix = parts.length >= 2 ? parts.slice(-2).join(".").toLowerCase() : null;
-
-		// Strategy 1: Exact path match
-		if (langFlat[enKey] !== undefined) {
-			const value = langFlat[enKey];
-			setNestedValue(result, enKey, value);
-			matches.push({ enKey, value, strategy: "exact" });
-			continue;
-		}
-
-		// Strategy 2: 2-segment suffix match (lang key suffix matches en key suffix, both unique)
-		if (suffix) {
-			const enCandidates = suffixIndex[suffix];
-			const langCandidates = langBySuffix[suffix];
-			if (
-				enCandidates &&
-				enCandidates.length === 1 &&
-				langCandidates &&
-				langCandidates.length === 1
-			) {
-				const value = langCandidates[0].value;
-				setNestedValue(result, enKey, value);
-				matches.push({ enKey, value, strategy: "suffix-2" });
-				continue;
-			}
-		}
-
-		// Strategy 3: Unique last-segment match
-		const enCandidates = lastSegIndex[lastSeg];
-		const langCandidates = langByLastSeg[lastSeg];
-		if (
-			enCandidates &&
-			enCandidates.length === 1 &&
-			langCandidates &&
-			langCandidates.length === 1
-		) {
-			const value = langCandidates[0].value;
-			setNestedValue(result, enKey, value);
-			matches.push({ enKey, value, strategy: "unique-name" });
-			continue;
-		}
-
-		// No match — use English placeholder
-		setNestedValue(result, enKey, enValue);
-		matches.push({ enKey, value: enValue, strategy: "english-placeholder" });
-	}
-
-	return { matches, result };
-}
-
-// ── Main ─────────────────────────────────────────────────────────────────────
-
-function main() {
-	// Load en.json
-	const enPath = path.join(LOCALES_DIR, "en.json");
-	const en = JSON.parse(fs.readFileSync(enPath, "utf8"));
-	const enFlat = flattenKeys(en);
-	const enKeyCount = Object.keys(enFlat).length;
-	const indexes = buildIndexes(enFlat);
-
-	console.log(`English: ${enKeyCount} keys (source of truth — NOT modified)\n`);
-
-	// Find all non-English locale files
-	const localeFiles = fs
-		.readdirSync(LOCALES_DIR)
-		.filter(
-			(f: string) =>
-				f.endsWith(".json") && f !== "en.json" && f !== "migration-report.json"
-		);
-
-	if (localeFiles.length === 0) {
-		console.log("No locale files to migrate.");
-		return;
-	}
-
-	// Create backup directory
-	if (!fs.existsSync(BACKUP_DIR)) {
-		fs.mkdirSync(BACKUP_DIR, { recursive: true });
-	}
-
-	const report: Record<
-		string,
-		{
-			total: number;
-			exact: number;
-			suffix: number;
-			uniqueName: number;
-			placeholder: number;
-		}
-	> = {};
-
-	for (const file of localeFiles) {
-		const lang = file.replace(".json", "");
-		const filePath = path.join(LOCALES_DIR, file);
-
-		// Backup original
-		const backupPath = path.join(BACKUP_DIR, file);
-		fs.copyFileSync(filePath, backupPath);
-
-		// Load and flatten
-		const langData = JSON.parse(fs.readFileSync(filePath, "utf8"));
-		const langFlat = flattenKeys(langData);
-
-		// Migrate
-		const { matches, result } = buildMigratedLocale(enFlat, langFlat, indexes);
-
-		// Write migrated file
-		fs.writeFileSync(filePath, JSON.stringify(result, null, "\t") + "\n", "utf8");
-
-		// Compute stats
-		const stats = {
-			total: enKeyCount,
-			exact: matches.filter((m) => m.strategy === "exact").length,
-			suffix: matches.filter((m) => m.strategy === "suffix-2").length,
-			uniqueName: matches.filter((m) => m.strategy === "unique-name").length,
-			placeholder: matches.filter((m) => m.strategy === "english-placeholder").length,
-		};
-		report[lang] = stats;
-
-		const translated = stats.exact + stats.suffix + stats.uniqueName;
-		const pct = ((translated / enKeyCount) * 100).toFixed(1);
-		console.log(
-			`${lang.padEnd(8)} ${String(translated).padStart(4)} translated (${pct}%)  |  ` +
-				`exact: ${stats.exact}  suffix: ${stats.suffix}  name: ${stats.uniqueName}  ` +
-				`placeholder: ${stats.placeholder}`
-		);
-	}
-
-	// Write report
-	fs.writeFileSync(REPORT_PATH, JSON.stringify(report, null, "\t") + "\n", "utf8");
-
-	const totalLangs = localeFiles.length;
-	console.log(
-		`\nMigrated ${totalLangs} locale files. Originals backed up to locales/backup/`
-	);
-	console.log(`Report written to ${REPORT_PATH}`);
-}
-
-main();

client/src/Components/common/charts/HeatmapResponseTimeTooltip.tsx

@@ -57,8 +57,7 @@ export const HeatmapResponseTimeTooltip = ({
 						{formatDateWithTz(check?.createdAt, "ddd, MMMM D, YYYY, HH:mm A", uiTimezone)}
 					</Typography>
 					<Typography>
-						{t("common.labels.responseTime")}:{" "}
-						{check?.originalResponseTime?.toFixed() ?? "N/A"} ms
+						{t("common.labels.responseTime")}: {check.originalResponseTime.toFixed()} ms
 					</Typography>
 					<Typography textTransform={"capitalize"}>
 						Status:{" "}

client/src/Components/inputs/Slider.tsx

@@ -11,26 +11,20 @@ import type { ResponsiveStyleValue } from "@mui/system";
 interface SliderInputProps extends SliderProps {
 	sx?: SliderProps["sx"];
 	showValue?: boolean;
-	formatDisplayValue?: (value: number) => string;
 }
 
 export const SliderInput = forwardRef<HTMLSpanElement, SliderInputProps>(
-	({ sx, showValue = false, formatDisplayValue, ...props }, ref) => {
+	({ sx, showValue = false, ...props }, ref) => {
 		const theme = useTheme();
 		const additionalSx = Array.isArray(sx) ? sx : sx ? [sx] : [];
 
-		const displayValue =
-			showValue && formatDisplayValue && typeof props.value === "number"
-				? formatDisplayValue(props.value)
-				: props.value;
-
 		return (
 			<Stack
 				gap={theme.spacing(8)}
 				direction={"row"}
 				alignItems={"center"}
 			>
-				{showValue && <Typography>{displayValue}</Typography>}
+				{showValue && <Typography>{props.value}</Typography>}
 				<Slider
 					{...props}
 					ref={ref}
@@ -69,21 +63,12 @@ interface SliderWithLabelProps extends SliderProps {
 	fieldLabel?: string;
 	required?: boolean;
 	showValue?: boolean;
-	formatDisplayValue?: (value: number) => string;
 	sliderMaxWidth?: ResponsiveStyleValue<number | string>;
 }
 
 export const SliderWithLabel = forwardRef<HTMLSpanElement, SliderWithLabelProps>(
 	(
-		{
-			fieldLabel,
-			required,
-			showValue = true,
-			formatDisplayValue,
-			value,
-			sliderMaxWidth = "100%",
-			...props
-		},
+		{ fieldLabel, required, showValue = true, value, sliderMaxWidth = "100%", ...props },
 		ref
 	) => {
 		const theme = useTheme();
@@ -97,7 +82,6 @@ export const SliderWithLabel = forwardRef<HTMLSpanElement, SliderWithLabelProps>
 					<SliderInput
 						{...props}
 						showValue={showValue}
-						formatDisplayValue={formatDisplayValue}
 						value={value}
 						ref={ref}
 					/>

client/src/Components/monitors/MonitorStatBoxes.tsx

@@ -25,7 +25,10 @@ export const MonitorStatBoxes = ({
 	}
 
 	const timeOfLastFailure = monitorStats?.timeOfLastFailure || 0;
-	const timeSinceLastFailure = timeOfLastFailure > 0 ? Date.now() - timeOfLastFailure : 0;
+	const timeSinceLastFailure =
+		timeOfLastFailure > 0
+			? Date.now() - timeOfLastFailure
+			: Date.now() - new Date(monitorStats?.createdAt || 0).getTime();
 
 	// Determine time since last check
 	const timeOfLastCheck = monitorStats?.lastCheckTimestamp || 0;
@@ -39,12 +42,6 @@ export const MonitorStatBoxes = ({
 	const streakTime = prettyMilliseconds(timeSinceLastFailure, options);
 
 	const lastCheckTime = prettyMilliseconds(timeSinceLastCheck, options);
-	const isActive =
-		monitor?.status === "up" ||
-		monitor?.status === "paused" ||
-		monitor?.status === "maintenance" ||
-		monitor?.status === "initializing" ||
-		monitor?.status === "breached";
 	const palette = getStatusPalette(monitor?.status);
 
 	return (
@@ -54,12 +51,8 @@ export const MonitorStatBoxes = ({
 		>
 			<StatBox
 				palette={palette}
-				title={
-					isActive
-						? t("pages.common.monitors.statBoxes.activeFor")
-						: t("pages.common.monitors.statBoxes.serviceIsDown")
-				}
-				subtitle={isActive ? streakTime : ""}
+				title={t("pages.common.monitors.statBoxes.activeFor")}
+				subtitle={streakTime}
 			/>
 			<StatBox
 				title={t("pages.common.monitors.statBoxes.lastCheck")}

client/src/Hooks/useNotificationForm.ts

@@ -1,94 +1,28 @@
 import { useMemo } from "react";
 import { notificationSchema } from "@/Validation/notifications";
-import type { NotificationFormData } from "@/Validation/notifications";
 import type { Notification } from "@/Types/Notification";
 
 interface UseNotificationFormOptions {
 	data?: Notification | null;
 }
 
-function buildDefaults(data: Notification | null): NotificationFormData {
-	if (data?.type === "matrix") {
-		return {
-			type: "matrix",
-			notificationName: data.notificationName || "",
-			homeserverUrl: data.homeserverUrl || "",
-			roomId: data.roomId || "",
-			accessToken: data.accessToken || "",
-		};
-	}
-	if (data?.type === "telegram") {
-		return {
-			type: "telegram",
-			notificationName: data.notificationName || "",
-			address: data.address || "",
-			accessToken: data.accessToken || "",
-		};
-	}
-	if (data?.type === "slack") {
-		return {
-			type: "slack",
-			notificationName: data.notificationName || "",
-			address: data.address || "",
-		};
-	}
-	if (data?.type === "discord") {
-		return {
-			type: "discord",
-			notificationName: data.notificationName || "",
-			address: data.address || "",
-		};
-	}
-	if (data?.type === "webhook") {
-		return {
-			type: "webhook",
-			notificationName: data.notificationName || "",
-			address: data.address || "",
-		};
-	}
-	if (data?.type === "pager_duty") {
-		return {
-			type: "pager_duty",
-			notificationName: data.notificationName || "",
-			address: data.address || "",
-		};
-	}
-	if (data?.type === "teams") {
-		return {
-			type: "teams",
-			notificationName: data.notificationName || "",
-			address: data.address || "",
-		};
-	}
-	if (data?.type === "twilio") {
-		return {
-			type: "twilio",
-			notificationName: data.notificationName || "",
-			accountSid: data.accountSid || "",
-			accessToken: data.accessToken || "",
-			phone: data.phone || "",
-			twilioPhoneNumber: data.twilioPhoneNumber || "",
-		};
-	}
-	if (data?.type === "pushover") {
-		return {
-			type: "pushover",
-			notificationName: data.notificationName || "",
-			address: data.address || "",
-			accessToken: data.accessToken || "",
-		};
-	}
-	// Default: email (covers both data === null and data.type === "email")
-	return {
-		type: "email",
-		notificationName: data?.notificationName || "",
-		address: data?.address || "",
-	};
-}
-
 export const useNotificationForm = ({ data = null }: UseNotificationFormOptions = {}) => {
 	return useMemo(() => {
-		const defaults = buildDefaults(data);
+		const defaults =
+			data?.type === "matrix"
+				? {
+						type: "matrix" as const,
+						notificationName: data.notificationName || "",
+						homeserverUrl: data.homeserverUrl || "",
+						roomId: data.roomId || "",
+						accessToken: data.accessToken || "",
+					}
+				: {
+						type: (data?.type || "email") as Exclude<Notification["type"], "matrix">,
+						notificationName: data?.notificationName || "",
+						address: data?.address || "",
+					};
+
 		return { schema: notificationSchema, defaults };
 	}, [data]);
 };

client/src/Hooks/useSettingsForm.ts

@@ -1,14 +1,14 @@
 import { useMemo } from "react";
 import { settingsSchema } from "@/Validation/settings";
 import type { Settings } from "@/Types/Settings";
-import type { SettingsFormInput } from "@/Validation/settings";
+import type { SettingsFormData } from "@/Validation/settings";
 
 interface UseSettingsFormOptions {
 	data?: Settings | null;
 }
 export const useSettingsForm = ({ data = null }: UseSettingsFormOptions = {}) => {
 	return useMemo(() => {
-		const defaults: SettingsFormInput = {
+		const defaults: SettingsFormData = {
 			systemEmailIgnoreTLS: data?.systemEmailIgnoreTLS ?? false,
 			systemEmailRequireTLS: data?.systemEmailRequireTLS ?? false,
 			systemEmailRejectUnauthorized: data?.systemEmailRejectUnauthorized ?? true,

client/src/Hooks/useStatusPageForm.ts

@@ -27,14 +27,12 @@ export const useStatusPageForm = ({
 			companyName: data?.companyName || "",
 			url: data?.url || generateDefaultUrl(),
 			timezone: data?.timezone || Intl.DateTimeFormat().resolvedOptions().timeZone,
-			type: data?.type || ["uptime"],
 			color: data?.color || "#4169E1",
 			monitors: data?.monitors || [],
 			isPublished: data?.isPublished ?? false,
 			showCharts: data?.showCharts ?? true,
 			showUptimePercentage: data?.showUptimePercentage ?? true,
 			showAdminLoginLink: data?.showAdminLoginLink ?? false,
-			showInfrastructure: data?.showInfrastructure ?? false,
 			customCSS: data?.customCSS || "",
 			logo: transformLogo(data?.logo),
 		};

client/src/Pages/Account/components/AddTeamMemberDialog.tsx

@@ -43,7 +43,6 @@ export const AddTeamMemberDialog = ({
 	const roleOptions: { value: UserRole; label: string }[] = [
 		{ value: "admin", label: t("common.auth.roles.admin") },
 		{ value: "user", label: t("common.auth.roles.user") },
-		{ value: "demo", label: t("common.auth.roles.demo") },
 	];
 
 	const handleClose = () => {

client/src/Pages/Account/components/InviteTeamMemberDialog.tsx

@@ -48,7 +48,6 @@ export const InviteTeamMemberDialog = ({
 	const roleOptions: { value: UserRole; label: string }[] = [
 		{ value: "admin", label: t("common.auth.roles.admin") },
 		{ value: "user", label: t("common.auth.roles.user") },
-		{ value: "demo", label: t("common.auth.roles.demo") },
 	];
 
 	const handleGenerateToken = async (data: InviteFormData) => {

client/src/Pages/Auth/Login/index.tsx

@@ -1,7 +1,6 @@
 import { BaseAuthPage, TextLink } from "@/Components/design-elements";
 import { Button, TextField } from "@/Components/inputs";
 
-import { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { useForm, Controller } from "react-hook-form";
 import { zodResolver } from "@hookform/resolvers/zod/dist/zod.js";
@@ -10,7 +9,7 @@ import type { LoginFormData } from "@/Validation/login";
 import { useDispatch } from "react-redux";
 import { useNavigate } from "react-router-dom";
 import { setAuthState } from "@/Features/Auth/authSlice";
-import { useLazyGet, usePost } from "@/Hooks/UseApi";
+import { usePost } from "@/Hooks/UseApi";
 
 const LoginPage = () => {
 	const { t } = useTranslation();
@@ -18,17 +17,6 @@ const LoginPage = () => {
 	const navigate = useNavigate();
 	const { post, loading } = usePost();
 
-	const [isCheckingAdmin, setIsCheckingAdmin] = useState(true);
-	const { get } = useLazyGet<boolean>();
-
-	useEffect(() => {
-		get("/auth/users/superadmin").then((res) => {
-			if (res?.data === false) navigate("/register", { replace: true });
-			else setIsCheckingAdmin(false);
-		});
-		// eslint-disable-next-line react-hooks/exhaustive-deps
-	}, []);
-
 	const { schema, defaults } = useLoginForm();
 
 	const { control, handleSubmit } = useForm<LoginFormData>({
@@ -36,8 +24,6 @@ const LoginPage = () => {
 		defaultValues: defaults,
 	});
 
-	if (isCheckingAdmin) return null;
-
 	const onSubmit = async (data: LoginFormData) => {
 		if (loading) return;
 
@@ -96,6 +82,12 @@ const LoginPage = () => {
 				linkText={t("pages.auth.login.links.forgotPassword.linkText")}
 				href="/forgot-password"
 			/>
+			<TextLink
+				alignSelf={"center"}
+				text={t("pages.auth.login.links.register.text")}
+				linkText={t("pages.auth.login.links.register.linkText")}
+				href="/register"
+			/>
 		</BaseAuthPage>
 	);
 };

client/src/Pages/Auth/Register/index.tsx

@@ -1,17 +1,16 @@
 import { BaseAuthPage } from "@/Components/design-elements";
 import { Button, TextField } from "@/Components/inputs";
-import Alert from "@mui/material/Alert";
 import { useForm, Controller } from "react-hook-form";
 import { zodResolver } from "@hookform/resolvers/zod/dist/zod.js";
 import { useRegisterForm } from "@/Hooks/useRegisterForm";
 import type { RegisterFormData } from "@/Validation/register";
 import { useTranslation } from "react-i18next";
-import { useLazyGet, usePost } from "@/Hooks/UseApi";
+import { usePost, useGet } from "@/Hooks/UseApi";
 import { setAuthState } from "@/Features/Auth/authSlice";
 import { useDispatch } from "react-redux";
 import { useNavigate, useParams } from "react-router-dom";
 import type { AuthResponse } from "@/Types/User";
-import { useEffect, useRef, useState } from "react";
+import { useEffect, useRef } from "react";
 
 interface RegisterPayload {
 	user: Omit<RegisterFormData, "confirm">;
@@ -33,23 +32,21 @@ const RegisterPage = () => {
 	const { post: verifyToken } = usePost<{ token: string }, InviteVerifyResponse>();
 	const hasVerified = useRef(false);
 
-	const [isCheckingAdmin, setIsCheckingAdmin] = useState(!token);
-	const { get } = useLazyGet<boolean>();
-
-	useEffect(() => {
-		if (token) return;
-		get("/auth/users/superadmin").then((res) => {
-			if (res?.data === true) navigate("/login", { replace: true });
-			else setIsCheckingAdmin(false);
-		});
-		// eslint-disable-next-line react-hooks/exhaustive-deps
-	}, []);
+	const { data: superAdminExists, isLoading: isCheckingAdmin } = useGet<boolean>(
+		token ? null : "/auth/users/superadmin"
+	);
 
 	const { control, handleSubmit, setError, reset } = useForm<RegisterFormData>({
 		resolver: zodResolver(schema),
 		defaultValues: defaults,
 	});
 
+	useEffect(() => {
+		if (superAdminExists === true) {
+			navigate("/login", { replace: true });
+		}
+	}, [superAdminExists, navigate]);
+
 	useEffect(() => {
 		if (!token || hasVerified.current) return;
 		hasVerified.current = true;
@@ -95,7 +92,6 @@ const RegisterPage = () => {
 			title={t("pages.auth.register.title")}
 			subtitle={t("pages.auth.register.subtitle")}
 		>
-			{!token && <Alert severity="info">{t("pages.auth.register.setupNotice")}</Alert>}
 			<Controller
 				name="firstName"
 				control={control}

client/src/Pages/CreateMonitor/index.tsx

@@ -302,49 +302,49 @@ const CreateMonitorPage = () => {
 									>
 										<RadioWithDescription
 											value="http"
-											label={t("pages.common.monitors.monitorTypes.optionHttp")}
+											label={t("pages.createMonitor.form.type.optionHttp")}
 											description={t(
 												"pages.createMonitor.form.type.optionHttpDescription"
 											)}
 										/>
 										<RadioWithDescription
 											value="ping"
-											label={t("pages.common.monitors.monitorTypes.optionPing")}
+											label={t("pages.createMonitor.form.type.optionPing")}
 											description={t(
 												"pages.createMonitor.form.type.optionPingDescription"
 											)}
 										/>
 										<RadioWithDescription
 											value="docker"
-											label={t("pages.common.monitors.monitorTypes.optionDocker")}
+											label={t("pages.createMonitor.form.type.optionDocker")}
 											description={t(
 												"pages.createMonitor.form.type.optionDockerDescription"
 											)}
 										/>
 										<RadioWithDescription
 											value="port"
-											label={t("pages.common.monitors.monitorTypes.optionPort")}
+											label={t("pages.createMonitor.form.type.optionPort")}
 											description={t(
 												"pages.createMonitor.form.type.optionPortDescription"
 											)}
 										/>
 										<RadioWithDescription
 											value="game"
-											label={t("pages.common.monitors.monitorTypes.optionGame")}
+											label={t("pages.createMonitor.form.type.optionGame")}
 											description={t(
 												"pages.createMonitor.form.type.optionGameDescription"
 											)}
 										/>
 										<RadioWithDescription
 											value="grpc"
-											label={t("pages.common.monitors.monitorTypes.optionGrpc")}
+											label={t("pages.createMonitor.form.type.optionGrpc")}
 											description={t(
 												"pages.createMonitor.form.type.optionGrpcDescription"
 											)}
 										/>
 										<RadioWithDescription
 											value="websocket"
-											label={t("pages.common.monitors.monitorTypes.optionWebSocket")}
+											label={t("pages.createMonitor.form.type.optionWebSocket")}
 											description={t(
 												"pages.createMonitor.form.type.optionWebSocketDescription"
 											)}

client/src/Pages/Notifications/create/index.tsx

@@ -147,201 +147,27 @@ const NotificationsCreatePage = () => {
 					/>
 				}
 			/>
-			{watchedType !== "matrix" &&
-				watchedType !== "telegram" &&
-				watchedType !== "pushover" &&
-				watchedType !== "twilio" && (
-					<ConfigBox
-						title={addressConfig.title}
-						subtitle={addressConfig.description}
-						rightContent={
-							<Controller
-								name="address"
-								control={control}
-								defaultValue={"address" in defaults ? defaults.address : ""}
-								render={({ field, fieldState }) => (
-									<TextField
-										{...field}
-										type="text"
-										fieldLabel={addressConfig.fieldLabel}
-										placeholder={addressConfig.placeholder}
-										fullWidth
-										error={!!fieldState.error}
-										helperText={fieldState.error?.message ?? ""}
-									/>
-								)}
-							/>
-						}
-					/>
-				)}
-			{watchedType === "telegram" && (
+			{watchedType !== "matrix" && (
 				<ConfigBox
-					title={t("pages.notifications.form.telegram.title")}
-					subtitle={t("pages.notifications.form.telegram.description")}
+					title={addressConfig.title}
+					subtitle={addressConfig.description}
 					rightContent={
-						<Stack spacing={theme.spacing(8)}>
-							<Controller
-								name="accessToken"
-								control={control}
-								defaultValue={"accessToken" in defaults ? defaults.accessToken : ""}
-								render={({ field, fieldState }) => (
-									<TextField
-										{...field}
-										type="text"
-										fieldLabel={t("pages.notifications.form.telegram.optionBotToken")}
-										placeholder={t(
-											"pages.notifications.form.telegram.placeholderBotToken"
-										)}
-										fullWidth
-										error={!!fieldState.error}
-										helperText={fieldState.error?.message ?? ""}
-									/>
-								)}
-							/>
-							<Controller
-								name="address"
-								control={control}
-								render={({ field, fieldState }) => (
-									<TextField
-										{...field}
-										type="text"
-										fieldLabel={t("pages.notifications.form.telegram.optionChatId")}
-										placeholder={t("pages.notifications.form.telegram.placeholderChatId")}
-										fullWidth
-										error={!!fieldState.error}
-										helperText={fieldState.error?.message ?? ""}
-									/>
-								)}
-							/>
-						</Stack>
-					}
-				/>
-			)}
-			{watchedType === "pushover" && (
-				<ConfigBox
-					title={t("pages.notifications.form.pushover.title")}
-					subtitle={t("pages.notifications.form.pushover.description")}
-					rightContent={
-						<Stack spacing={theme.spacing(8)}>
-							<Controller
-								name="accessToken"
-								control={control}
-								defaultValue={"accessToken" in defaults ? defaults.accessToken : ""}
-								render={({ field, fieldState }) => (
-									<TextField
-										{...field}
-										type="text"
-										fieldLabel={t("pages.notifications.form.pushover.optionAppToken")}
-										placeholder={t(
-											"pages.notifications.form.pushover.placeholderAppToken"
-										)}
-										fullWidth
-										error={!!fieldState.error}
-										helperText={fieldState.error?.message ?? ""}
-									/>
-								)}
-							/>
-							<Controller
-								name="address"
-								control={control}
-								defaultValue={"address" in defaults ? defaults.address : ""}
-								render={({ field, fieldState }) => (
-									<TextField
-										{...field}
-										type="text"
-										fieldLabel={t("pages.notifications.form.pushover.optionUserKey")}
-										placeholder={t(
-											"pages.notifications.form.pushover.placeholderUserKey"
-										)}
-										fullWidth
-										error={!!fieldState.error}
-										helperText={fieldState.error?.message ?? ""}
-									/>
-								)}
-							/>
-						</Stack>
-					}
-				/>
-			)}
-			{watchedType === "twilio" && (
-				<ConfigBox
-					title={t("pages.notifications.form.twilio.title")}
-					subtitle={t("pages.notifications.form.twilio.description")}
-					rightContent={
-						<Stack spacing={theme.spacing(8)}>
-							<Controller
-								name="accountSid"
-								control={control}
-								defaultValue={"accountSid" in defaults ? defaults.accountSid : ""}
-								render={({ field, fieldState }) => (
-									<TextField
-										{...field}
-										type="text"
-										fieldLabel={t("pages.notifications.form.twilio.optionAccountSid")}
-										placeholder={t(
-											"pages.notifications.form.twilio.placeholderAccountSid"
-										)}
-										fullWidth
-										error={!!fieldState.error}
-										helperText={fieldState.error?.message ?? ""}
-									/>
-								)}
-							/>
-							<Controller
-								name="accessToken"
-								control={control}
-								defaultValue={"accessToken" in defaults ? defaults.accessToken : ""}
-								render={({ field, fieldState }) => (
-									<TextField
-										{...field}
-										type="text"
-										fieldLabel={t("pages.notifications.form.twilio.optionAuthToken")}
-										placeholder={t(
-											"pages.notifications.form.twilio.placeholderAuthToken"
-										)}
-										fullWidth
-										error={!!fieldState.error}
-										helperText={fieldState.error?.message ?? ""}
-									/>
-								)}
-							/>
-							<Controller
-								name="twilioPhoneNumber"
-								control={control}
-								defaultValue={
-									"twilioPhoneNumber" in defaults ? defaults.twilioPhoneNumber : ""
-								}
-								render={({ field, fieldState }) => (
-									<TextField
-										{...field}
-										type="text"
-										fieldLabel={t("pages.notifications.form.twilio.optionFromNumber")}
-										placeholder={t(
-											"pages.notifications.form.twilio.placeholderFromNumber"
-										)}
-										fullWidth
-										error={!!fieldState.error}
-										helperText={fieldState.error?.message ?? ""}
-									/>
-								)}
-							/>
-							<Controller
-								name="phone"
-								control={control}
-								defaultValue={"phone" in defaults ? defaults.phone : ""}
-								render={({ field, fieldState }) => (
-									<TextField
-										{...field}
-										type="text"
-										fieldLabel={t("pages.notifications.form.twilio.optionToNumber")}
-										placeholder={t("pages.notifications.form.twilio.placeholderToNumber")}
-										fullWidth
-										error={!!fieldState.error}
-										helperText={fieldState.error?.message ?? ""}
-									/>
-								)}
-							/>
-						</Stack>
+						<Controller
+							name="address"
+							control={control}
+							defaultValue={defaults.address}
+							render={({ field, fieldState }) => (
+								<TextField
+									{...field}
+									type="text"
+									fieldLabel={addressConfig.fieldLabel}
+									placeholder={addressConfig.placeholder}
+									fullWidth
+									error={!!fieldState.error}
+									helperText={fieldState.error?.message ?? ""}
+								/>
+							)}
+						/>
 					}
 				/>
 			)}
@@ -354,7 +180,7 @@ const NotificationsCreatePage = () => {
 							<Controller
 								name="homeserverUrl"
 								control={control}
-								defaultValue={"homeserverUrl" in defaults ? defaults.homeserverUrl : ""}
+								defaultValue={defaults.homeserverUrl}
 								render={({ field, fieldState }) => (
 									<TextField
 										{...field}
@@ -370,7 +196,7 @@ const NotificationsCreatePage = () => {
 							<Controller
 								name="roomId"
 								control={control}
-								defaultValue={"roomId" in defaults ? defaults.roomId : ""}
+								defaultValue={defaults.roomId}
 								render={({ field, fieldState }) => (
 									<TextField
 										{...field}
@@ -386,7 +212,7 @@ const NotificationsCreatePage = () => {
 							<Controller
 								name="accessToken"
 								control={control}
-								defaultValue={"accessToken" in defaults ? defaults.accessToken : ""}
+								defaultValue={defaults.accessToken}
 								render={({ field, fieldState }) => (
 									<TextField
 										{...field}

client/src/Pages/Settings/index.tsx

@@ -20,7 +20,7 @@ import { useGet, usePatch, usePost, useLazyGet } from "@/Hooks/UseApi";
 import { useToast } from "@/Hooks/UseToast";
 import { useSettingsForm } from "@/Hooks/useSettingsForm";
 import { useIsAdmin } from "@/Hooks/useIsAdmin.js";
-import type { SettingsFormData, SettingsFormInput } from "@/Validation/settings";
+import type { SettingsFormData } from "@/Validation/settings";
 import { useState } from "react";
 import { Controller } from "react-hook-form";
 import { TextField, Button, FieldLabel, SliderWithLabel } from "@/Components/inputs";
@@ -37,7 +37,6 @@ import {
 } from "@/Features/UI/uiSlice.js";
 import timezones from "@/Utils/timezones.json";
 import type { RootState } from "@/Types/state";
-import { CHECK_TTL_SENTINEL } from "@/Types/Check";
 
 interface Timezone {
 	id: string;
@@ -89,7 +88,7 @@ export const SettingsPage = () => {
 	// Initialize form with schema and defaults
 	const { schema, defaults } = useSettingsForm({ data: fetchedSettings?.settings });
 
-	const form = useForm<SettingsFormInput, unknown, SettingsFormData>({
+	const form = useForm<SettingsFormData>({
 		resolver: zodResolver(schema),
 		defaultValues: defaults,
 		mode: "onChange",
@@ -256,7 +255,28 @@ export const SettingsPage = () => {
 			delete (dataToSend as any).systemEmailPassword;
 		}
 
-		const result = await patch("/settings", dataToSend as SettingsFormData);
+		// Convert undefined to empty string for backend unsetting
+		const processedData = Object.entries(dataToSend).reduce((acc, [key, value]) => {
+			const typedKey = key as keyof SettingsFormData;
+			if (value === undefined) {
+				(acc as any)[typedKey] = "";
+			} else if (typeof value === "object" && value !== null) {
+				// Handle nested objects like globalThresholds
+				// Convert 0 to "" for unsetting thresholds
+				(acc as any)[typedKey] = Object.entries(value).reduce(
+					(nested, [nestedKey, nestedValue]) => ({
+						...nested,
+						[nestedKey]: nestedValue === undefined ? "" : nestedValue,
+					}),
+					{}
+				);
+			} else {
+				(acc as any)[typedKey] = value;
+			}
+			return acc;
+		}, {} as Partial<SettingsFormData>);
+
+		const result = await patch("/settings", processedData as SettingsFormData);
 
 		if (result?.success) {
 			// Update API key state from response
@@ -442,43 +462,6 @@ export const SettingsPage = () => {
 					/>
 				)}
 
-				{/* Check Retention */}
-				{isAdmin && (
-					<ConfigBox
-						title={t("pages.settings.form.retention.title")}
-						subtitle={t("pages.settings.form.retention.description")}
-						rightContent={
-							<Controller
-								name="checkTTL"
-								control={form.control}
-								defaultValue={defaults.checkTTL}
-								render={({ field }) => (
-									<SliderWithLabel
-										{...field}
-										fieldLabel={t("pages.settings.form.retention.option.days.label")}
-										min={1}
-										max={CHECK_TTL_SENTINEL}
-										sliderMaxWidth={{ xs: "100%", md: "50%" }}
-										value={field.value || 30}
-										onChange={(_, value) => field.onChange(value)}
-										valueLabelDisplay="auto"
-										valueLabelFormat={(value: number) =>
-											value >= CHECK_TTL_SENTINEL
-												? t("pages.settings.form.retention.option.days.unlimited")
-												: `${value}`
-										}
-										formatDisplayValue={(value: number) =>
-											value >= CHECK_TTL_SENTINEL
-												? t("pages.settings.form.retention.option.days.unlimited")
-												: `${value}`
-										}
-									/>
-								)}
-							/>
-						}
-					/>
-				)}
-
 				{/* Global Thresholds */}
 				{isAdmin && (
 					<ConfigBox

client/src/Pages/StatusPage/Create/index.tsx

@@ -21,28 +21,19 @@ import {
 
 import { useTheme } from "@mui/material/styles";
 import { useTranslation } from "react-i18next";
-import { useEffect, useMemo, useState } from "react";
+import { useEffect, useState } from "react";
 import { useForm, Controller } from "react-hook-form";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { useStatusPageForm } from "@/Hooks/useStatusPageForm";
 import type { StatusPageFormData } from "@/Validation/statusPage";
 import { useGet, usePost, usePut, useDelete } from "@/Hooks/UseApi";
 import type { Monitor } from "@/Types/Monitor";
-import type { MonitorDisplayType, StatusPageResponse } from "@/Types/StatusPage";
-import { getMonitorTypeLabel } from "@/Types/StatusPage";
+import type { StatusPageResponse } from "@/Types/StatusPage";
 import timezones from "@/Utils/timezones.json";
 import { useNavigate, useParams } from "react-router-dom";
 import axios from "axios";
 import { HeaderConfigStatusControls } from "./Components/HeaderConfigStatusControls";
 
-const monitorsUrl = (() => {
-	const params = new URLSearchParams();
-	["http", "ping", "port", "docker", "game", "grpc", "websocket", "hardware"].forEach(
-		(type) => params.append("type", type)
-	);
-	return `/monitors/team?${params.toString()}`;
-})();
-
 interface TimezoneOption {
 	_id: string;
 	name: string;
@@ -58,11 +49,11 @@ const CreateStatusPage = () => {
 
 	// Fetch existing status page data when configuring
 	const { data: statusPageData, isLoading: isLoadingStatusPage } =
-		useGet<StatusPageResponse>(
-			isCreate ? null : `/status-page/${url}?type=uptime&type=infrastructure`
-		);
+		useGet<StatusPageResponse>(isCreate ? null : `/status-page/${url}?type=uptime`);
 
-	const { data: monitorsResponse } = useGet<Monitor[]>(monitorsUrl);
+	const { data: monitorsResponse } = useGet<Monitor[]>(
+		"/monitors/team?type=http&type=ping&type=port&type=docker"
+	);
 	const monitors = monitorsResponse ?? [];
 
 	const { post, loading: isSubmittingPost } = usePost();
@@ -90,24 +81,6 @@ const CreateStatusPage = () => {
 		reset(defaults);
 	}, [defaults, reset]);
 
-	const watchedMonitorIds: string[] = form.watch("monitors") ?? [];
-	const computedTypes: MonitorDisplayType[] = useMemo(() => {
-		const selectedMonitors = (watchedMonitorIds ?? [])
-			.map((id) => monitors.find((m) => m.id === id))
-			.filter((m): m is Monitor => m !== undefined);
-
-		const typesSet = new Set<MonitorDisplayType>();
-		selectedMonitors.forEach((m) => {
-			typesSet.add(m.type === "hardware" ? "infrastructure" : "uptime");
-		});
-
-		return typesSet.size ? Array.from(typesSet) : ["uptime"];
-	}, [watchedMonitorIds, monitors]);
-
-	useEffect(() => {
-		form.setValue("type", computedTypes);
-	}, [computedTypes]);
-
 	const onError = (errors: any) => {
 		logger.debug("Status page validation errors", errors);
 	};
@@ -130,6 +103,7 @@ const CreateStatusPage = () => {
 
 	const onSubmit = async (data: StatusPageFormData) => {
 		const fd = new FormData();
+		fd.append("type", "uptime");
 		fd.append("isPublished", String(data.isPublished));
 		if (data.companyName) fd.append("companyName", data.companyName);
 		if (data.url) fd.append("url", data.url);
@@ -138,16 +112,11 @@ const CreateStatusPage = () => {
 		fd.append("showCharts", String(data.showCharts));
 		fd.append("showUptimePercentage", String(data.showUptimePercentage));
 		fd.append("showAdminLoginLink", String(data.showAdminLoginLink));
-		fd.append("showInfrastructure", String(data.showInfrastructure));
 
 		data.monitors.forEach((monitorId) => {
 			fd.append("monitors[]", monitorId);
 		});
 
-		data.type.forEach((type) => {
-			fd.append("type[]", type);
-		});
-
 		// Handle logo upload
 		if (data.logo === null) {
 			// Signal to remove the logo
@@ -334,9 +303,7 @@ const CreateStatusPage = () => {
 																		}}
 																	>
 																		<GripVertical size={20} />
-																		<Typography
-																			flexGrow={1}
-																		>{`${monitor.name} (${getMonitorTypeLabel(monitor.type, t)})`}</Typography>
+																		<Typography flexGrow={1}>{monitor.name}</Typography>
 																		<IconButton
 																			size="small"
 																			onClick={() => {
@@ -458,23 +425,6 @@ const CreateStatusPage = () => {
 								/>
 							)}
 						/>
-						<Controller
-							name="showInfrastructure"
-							control={control}
-							render={({ field }) => (
-								<FormControlLabel
-									control={
-										<Checkbox
-											checked={field.value}
-											onChange={field.onChange}
-										/>
-									}
-									label={t(
-										"pages.statusPages.form.features.option.showInfrastructure.label"
-									)}
-								/>
-							)}
-						/>
 						{/* <Controller
 							name="showUptimePercentage"
 							control={control}

client/src/Pages/StatusPage/Status/Components/InfrastructureMetrics.tsx

@@ -1,246 +0,0 @@
-import Stack from "@mui/material/Stack";
-import Typography from "@mui/material/Typography";
-import { Gauge } from "@/Components/design-elements";
-import { useTheme } from "@mui/material/styles";
-import { useTranslation } from "react-i18next";
-import prettyBytes from "pretty-bytes";
-import type { Monitor } from "@/Types/Monitor";
-import Grid from "@mui/material/Grid";
-import useMediaQuery from "@mui/material/useMediaQuery";
-import Box from "@mui/material/Box";
-import { LAYOUT, SPACING } from "@/Utils/Theme/constants";
-
-const GAUGE_RADIUS = 60;
-const GAUGE_STROKE_WIDTH = 12;
-const PERCENTAGE_MULTIPLIER = 100;
-
-interface StatusPageMonitor extends Monitor {
-	checks?: Monitor["recentChecks"];
-}
-
-interface MetricDetail {
-	label: string;
-	value: string;
-}
-
-interface MetricConfig {
-	key: string;
-	label: string;
-	hasData: boolean;
-	progress: number;
-	details: MetricDetail[];
-}
-
-const MetricDetailRow = ({ label, value }: MetricDetail) => {
-	const theme = useTheme();
-	return (
-		<Stack
-			direction="row"
-			justifyContent="space-between"
-		>
-			<Typography
-				variant="body2"
-				color={theme.palette.text.secondary}
-			>
-				{label}
-			</Typography>
-			<Typography variant="body2">{value}</Typography>
-		</Stack>
-	);
-};
-
-interface MetricItemProps {
-	label: string;
-	progress: number;
-	details?: MetricDetail[];
-}
-
-const MetricItem = ({ label, progress, details }: MetricItemProps) => {
-	const theme = useTheme();
-	const isSmall = useMediaQuery(theme.breakpoints.down("md"));
-	return (
-		<Grid
-			size={isSmall ? 12 : 4}
-			sx={{
-				display: "flex",
-				flexDirection: "column",
-				alignItems: "center",
-				textAlign: "center",
-				gap: theme.spacing(SPACING.LG),
-				padding: theme.spacing(LAYOUT.XS),
-				borderRight: isSmall ? "none" : `1px solid ${theme.palette.divider}`,
-				borderBottom: isSmall ? `1px solid ${theme.palette.divider}` : "none",
-				"&:last-child": {
-					borderRight: "none",
-					borderBottom: "none",
-					paddingBottom: theme.spacing(SPACING.LG),
-				},
-			}}
-		>
-			<Box
-				display="flex"
-				flexDirection="column"
-				alignItems="center"
-			>
-				<Gauge
-					progress={progress}
-					radius={GAUGE_RADIUS}
-					strokeWidth={GAUGE_STROKE_WIDTH}
-				/>
-				<Typography variant="body2">{label}</Typography>
-			</Box>
-			{details && details.length > 0 && (
-				<Box
-					width="100%"
-					paddingX={theme.spacing(LAYOUT.LG)}
-				>
-					{details.map((detail) => (
-						<MetricDetailRow
-							key={detail.label}
-							label={detail.label}
-							value={detail.value}
-						/>
-					))}
-				</Box>
-			)}
-		</Grid>
-	);
-};
-
-type LatestCheck = NonNullable<Monitor["recentChecks"]>[number];
-
-const buildCpuMetric = (
-	check: LatestCheck,
-	t: (key: string) => string
-): MetricConfig | null => {
-	if (!check.cpu || typeof check.cpu.usage_percent !== "number") {
-		return null;
-	}
-	const usagePercent = (check.cpu.usage_percent ?? 0) * PERCENTAGE_MULTIPLIER;
-	return {
-		key: "cpu",
-		label: t("pages.statusPages.monitorsList.infrastructure.cpu"),
-		hasData: true,
-		progress: usagePercent,
-		details: [
-			{
-				label: t("pages.statusPages.monitorsList.infrastructure.usage"),
-				value: `${usagePercent.toFixed(2)}%`,
-			},
-		],
-	};
-};
-
-const buildMemoryMetric = (
-	check: LatestCheck,
-	t: (key: string) => string
-): MetricConfig | null => {
-	if (
-		!check.memory ||
-		typeof check.memory.usage_percent !== "number" ||
-		typeof check.memory.used_bytes !== "number" ||
-		typeof check.memory.total_bytes !== "number"
-	) {
-		return null;
-	}
-	return {
-		key: "memory",
-		label: t("pages.statusPages.monitorsList.infrastructure.memory"),
-		hasData: true,
-		progress: (check.memory.usage_percent ?? 0) * PERCENTAGE_MULTIPLIER,
-		details: [
-			{
-				label: t("pages.statusPages.monitorsList.infrastructure.used"),
-				value: prettyBytes(check.memory.used_bytes ?? 0),
-			},
-			{
-				label: t("pages.statusPages.monitorsList.infrastructure.total"),
-				value: prettyBytes(check.memory.total_bytes ?? 0),
-			},
-		],
-	};
-};
-
-const buildDiskMetric = (
-	check: LatestCheck,
-	t: (key: string) => string
-): MetricConfig | null => {
-	if (!check.disk || check.disk.length === 0) {
-		return null;
-	}
-	const disks = check.disk;
-	const avgUsagePercent =
-		(disks.reduce((acc, disk) => acc + (disk?.usage_percent ?? 0), 0) / disks.length) *
-		PERCENTAGE_MULTIPLIER;
-	const totalUsedBytes = disks.reduce((acc, disk) => acc + (disk?.used_bytes ?? 0), 0);
-	const totalTotalBytes = disks.reduce((acc, disk) => acc + (disk?.total_bytes ?? 0), 0);
-
-	return {
-		key: "disk",
-		label: t("pages.statusPages.monitorsList.infrastructure.disk"),
-		hasData: true,
-		progress: avgUsagePercent,
-		details: [
-			{
-				label: t("pages.statusPages.monitorsList.infrastructure.used"),
-				value: prettyBytes(totalUsedBytes),
-			},
-			{
-				label: t("pages.statusPages.monitorsList.infrastructure.total"),
-				value: prettyBytes(totalTotalBytes),
-			},
-		],
-	};
-};
-
-export const InfrastructureMetrics = ({ monitor }: { monitor: StatusPageMonitor }) => {
-	const theme = useTheme();
-	const { t } = useTranslation();
-
-	const latestCheck = monitor.recentChecks?.[0] ?? monitor.checks?.[0];
-
-	if (!latestCheck) {
-		return (
-			<Typography
-				variant="body2"
-				color={theme.palette.text.secondary}
-			>
-				{t("pages.statusPages.monitorsList.noData")}
-			</Typography>
-		);
-	}
-
-	const metrics: MetricConfig[] = [
-		buildCpuMetric(latestCheck, t),
-		buildMemoryMetric(latestCheck, t),
-		buildDiskMetric(latestCheck, t),
-	].filter((m): m is MetricConfig => m !== null);
-
-	if (metrics.length === 0) {
-		return (
-			<Typography
-				variant="body2"
-				color={theme.palette.text.secondary}
-			>
-				{t("pages.statusPages.monitorsList.noData")}
-			</Typography>
-		);
-	}
-
-	return (
-		<Grid
-			container
-			alignItems="center"
-			padding={theme.spacing(LAYOUT.XS)}
-		>
-			{metrics.map(({ key, label, progress, details }) => (
-				<MetricItem
-					key={key}
-					label={label}
-					progress={progress}
-					details={details}
-				/>
-			))}
-		</Grid>
-	);
-};

client/src/Pages/StatusPage/Status/Components/MonitorsList.tsx

@@ -5,16 +5,13 @@ import Typography from "@mui/material/Typography";
 import { HistogramResponseTime, HeatmapResponseTime } from "@/Components/common";
 import { StatusLabel, BaseBox } from "@/Components/design-elements";
 import { SwitchComponent } from "@/Components/inputs";
-import { InfrastructureMetrics } from "@/Pages/StatusPage/Status/Components/InfrastructureMetrics";
 
-import { useTheme, type Theme } from "@mui/material/styles";
+import { useTheme } from "@mui/material/styles";
 import { useSelector } from "react-redux";
 import { useState } from "react";
 import type { Monitor } from "@/Types/Monitor";
 import type { StatusPage } from "@/Types/StatusPage";
-import { getMonitorTypeLabel } from "@/Types/StatusPage";
 import type { RootState } from "@/Types/state";
-import { LAYOUT, SPACING } from "@/Utils/Theme/constants";
 
 interface StatusPageMonitor extends Monitor {
 	checks?: Monitor["recentChecks"];
@@ -25,124 +22,29 @@ interface MonitorsListProps {
 	monitors: StatusPageMonitor[];
 }
 
-const getMonitorBadgeStyles = (monitorType: string, theme: Theme) => {
-	const bg =
-		monitorType === "hardware" ? theme.palette.info.light : theme.palette.success.light;
-	return {
-		backgroundColor: bg,
-		color: theme.palette.background.paper,
-		padding: `${theme.spacing(SPACING.SM)} ${theme.spacing(SPACING.LG)}`,
-		borderRadius: theme.shape.borderRadius,
-	};
-};
-
-const MonitorHeader = ({
-	monitor,
-	showURL,
-}: {
-	monitor: StatusPageMonitor;
-	showURL: boolean;
-}) => {
-	const theme = useTheme();
-	const { t } = useTranslation();
-
-	return (
-		<Stack
-			direction="row"
-			alignItems="center"
-			justifyContent="space-between"
-			gap={theme.spacing(LAYOUT.XS)}
-			mb={theme.spacing(LAYOUT.XS)}
-		>
-			<Box sx={{ overflow: "hidden", minWidth: 0, flex: 1 }}>
-				<Stack
-					direction="row"
-					alignItems="center"
-					gap={theme.spacing(SPACING.LG)}
-					mb={theme.spacing(SPACING.SM)}
-				>
-					<Typography
-						variant="h6"
-						sx={{ overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap" }}
-					>
-						{monitor.name}
-					</Typography>
-					<Typography
-						variant="caption"
-						sx={getMonitorBadgeStyles(monitor.type ?? "", theme)}
-					>
-						{getMonitorTypeLabel(monitor.type, t)}
-					</Typography>
-				</Stack>
-				{showURL && monitor.url && (
-					<Typography
-						variant="body2"
-						color={theme.palette.text.secondary}
-						sx={{ overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap" }}
-					>
-						{monitor.url}
-					</Typography>
-				)}
-			</Box>
-			<StatusLabel status={monitor.status} />
-		</Stack>
-	);
-};
-
-const MonitorContent = ({
-	monitor,
-	statusPage,
-	chartType,
-}: {
-	monitor: StatusPageMonitor;
-	statusPage: StatusPage;
-	chartType: string;
-}) => {
-	const theme = useTheme();
-
-	if (monitor.type === "hardware") {
-		if (statusPage.showInfrastructure === false) return null;
-		return <InfrastructureMetrics monitor={monitor} />;
-	}
-
-	if (statusPage.showCharts === false) return null;
-
-	const checks = monitor.checks?.slice().reverse() ?? [];
-	return (
-		<Box sx={{ overflow: "hidden", minWidth: 0, flex: 1, mb: theme.spacing(SPACING.LG) }}>
-			{chartType === "histogram" ? (
-				<HistogramResponseTime
-					height={{ xs: 50, md: 100 }}
-					gap={{ xs: theme.spacing(SPACING.SM), md: theme.spacing(LAYOUT.SM) }}
-					checks={checks}
-				/>
-			) : (
-				<HeatmapResponseTime checks={checks} />
-			)}
-		</Box>
-	);
-};
-
 export const MonitorsList = ({ statusPage, monitors }: MonitorsListProps) => {
 	const theme = useTheme();
 	const { t } = useTranslation();
+
 	const showURL = useSelector((state: RootState) => state.ui?.showURL);
+
 	const [chartType, setChartType] = useState<"histogram" | "heatmap">("histogram");
 
 	return (
-		<Stack gap={theme.spacing(LAYOUT.MD)}>
-			{statusPage.showCharts && (
+		<Stack gap={theme.spacing(8)}>
+			{statusPage.showCharts !== false && (
 				<Stack
-					direction="row"
-					alignItems="center"
-					gap={theme.spacing(LAYOUT.SM)}
+					direction={"row"}
+					alignItems={"center"}
 				>
 					<Typography>{t("pages.statusPages.monitorsList.chartTypeHeatmap")}</Typography>
 					<SwitchComponent
 						dualOption
 						value={chartType}
 						checked={chartType === "histogram"}
-						onChange={(e) => setChartType(e.target.checked ? "histogram" : "heatmap")}
+						onChange={(e) => {
+							setChartType(e.target.checked ? "histogram" : "heatmap");
+						}}
 					/>
 					<Typography>
 						{t("pages.statusPages.monitorsList.chartTypeHistogram")}
@@ -150,22 +52,59 @@ export const MonitorsList = ({ statusPage, monitors }: MonitorsListProps) => {
 				</Stack>
 			)}
 
-			{monitors.map((monitor) => (
-				<BaseBox
-					key={monitor.id}
-					padding={theme.spacing(LAYOUT.MD)}
-				>
-					<MonitorHeader
-						monitor={monitor}
-						showURL={showURL}
-					/>
-					<MonitorContent
-						monitor={monitor}
-						statusPage={statusPage}
-						chartType={chartType}
-					/>
-				</BaseBox>
-			))}
+			{monitors?.map((monitor) => {
+				return (
+					<BaseBox
+						key={monitor.id}
+						padding={theme.spacing(4)}
+					>
+						<Stack
+							direction="row"
+							alignItems="center"
+							justifyContent="space-between"
+							gap={theme.spacing(4)}
+							mb={statusPage.showCharts !== false ? theme.spacing(4) : 0}
+						>
+							<Box sx={{ overflow: "hidden", minWidth: 0, flex: 1 }}>
+								<Typography
+									variant="h6"
+									sx={{
+										overflow: "hidden",
+										textOverflow: "ellipsis",
+										whiteSpace: "nowrap",
+									}}
+								>
+									{monitor.name}
+								</Typography>
+								{showURL && (
+									<Typography
+										variant="body2"
+										color="text.secondary"
+									>
+										{monitor.url}
+									</Typography>
+								)}
+							</Box>
+							<StatusLabel status={monitor.status} />
+						</Stack>
+						{statusPage.showCharts !== false && (
+							<Box sx={{ overflow: "hidden", minWidth: 0, flex: 1 }}>
+								{chartType === "histogram" ? (
+									<HistogramResponseTime
+										height={{ xs: 50, md: 100 }}
+										gap={{ xs: theme.spacing(0.5), md: theme.spacing(5) }}
+										checks={monitor?.checks?.slice().reverse() ?? []}
+									/>
+								) : (
+									<HeatmapResponseTime
+										checks={monitor?.checks?.slice().reverse() ?? []}
+									/>
+								)}
+							</Box>
+						)}
+					</BaseBox>
+				);
+			})}
 		</Stack>
 	);
 };

client/src/Pages/StatusPage/Status/Components/StatusBar.tsx

@@ -1,115 +1,35 @@
-import {
-	AlertTriangle,
-	CircleCheck,
-	CircleX,
-	Loader,
-	PauseCircle,
-	ShieldAlert,
-	Wrench,
-} from "lucide-react";
+import { AlertTriangle, CircleCheck } from "lucide-react";
 import Stack from "@mui/material/Stack";
 import Typography from "@mui/material/Typography";
 
 import { useTranslation } from "react-i18next";
-import { useTheme } from "@mui/material";
 import type { Theme } from "@mui/material";
-import type { Monitor, MonitorStatus } from "@/Types/Monitor";
-
-interface StatusDisplay {
-	icon: JSX.Element;
-	msg?: string;
-	color?: string;
-}
+import { useTheme } from "@mui/material";
+import type { Monitor } from "@/Types/Monitor";
 
 const getMonitorStatus = (monitors: Monitor[], theme: Theme, t: Function) => {
-	const monitorsStatus: StatusDisplay = {
+	const monitorsStatus: Record<string, any> = {
 		icon: <AlertTriangle size={24} />,
 	};
 
-	// Handle empty monitors array
-	if (monitors.length === 0) {
-		monitorsStatus.msg = t("pages.statusPages.statusBar.noMonitors");
-		monitorsStatus.color = theme.palette.warning.main;
-		monitorsStatus.icon = <CircleX size={24} />;
-		return monitorsStatus;
-	}
-
-	const allOf = (...statuses: MonitorStatus[]) =>
-		monitors.every((m) => statuses.includes(m.status));
-	const someOf = (...statuses: MonitorStatus[]) =>
-		monitors.some((m) => statuses.includes(m.status));
-	const noneOf = (...statuses: MonitorStatus[]) =>
-		monitors.every((m) => !statuses.includes(m.status));
-
-	// All monitors in a single state
-	if (allOf("up")) {
+	if (monitors.every((monitor) => monitor.status === "up")) {
 		monitorsStatus.msg = t("pages.statusPages.statusBar.allUp");
 		monitorsStatus.color = theme.palette.success.main;
 		monitorsStatus.icon = <CircleCheck size={24} />;
-	} else if (allOf("breached")) {
-		monitorsStatus.msg = t("pages.statusPages.statusBar.allBreached");
-		monitorsStatus.color = theme.palette.error.main;
-		monitorsStatus.icon = <ShieldAlert size={24} />;
-	} else if (allOf("maintenance")) {
-		monitorsStatus.msg = t("pages.statusPages.statusBar.allMaintenance");
-		monitorsStatus.color = theme.palette.warning.main;
-		monitorsStatus.icon = <Wrench size={24} />;
-	} else if (allOf("down")) {
+		return monitorsStatus;
+	} else if (monitors.every((monitor) => monitor.status === "down")) {
 		monitorsStatus.msg = t("pages.statusPages.statusBar.allDown");
 		monitorsStatus.color = theme.palette.error.main;
-		monitorsStatus.icon = <CircleX size={24} />;
-	} else if (allOf("paused")) {
-		monitorsStatus.msg = t("pages.statusPages.statusBar.allPaused");
-		monitorsStatus.color = theme.palette.warning.main;
-		monitorsStatus.icon = <PauseCircle size={24} />;
-	} else if (allOf("initializing")) {
-		monitorsStatus.msg = t("pages.statusPages.statusBar.allInitializing");
-		monitorsStatus.color = theme.palette.warning.main;
-		monitorsStatus.icon = <Loader size={24} />;
-
-		// Breached takes highest priority in mixed states
-	} else if (someOf("breached") && someOf("down")) {
-		monitorsStatus.msg = t("pages.statusPages.statusBar.breachedAndDown");
-		monitorsStatus.color = theme.palette.error.main;
-		monitorsStatus.icon = <ShieldAlert size={24} />;
-	} else if (someOf("breached")) {
-		monitorsStatus.msg = t("pages.statusPages.statusBar.breached");
-		monitorsStatus.color = theme.palette.error.main;
-		monitorsStatus.icon = <ShieldAlert size={24} />;
-
-		// Maintenance combinations
-	} else if (someOf("maintenance") && someOf("down")) {
-		monitorsStatus.msg = t("pages.statusPages.statusBar.maintenanceAndDown");
-		monitorsStatus.color = theme.palette.error.main;
-		monitorsStatus.icon = <Wrench size={24} />;
-	} else if (someOf("maintenance") && noneOf("down")) {
-		monitorsStatus.msg = t("pages.statusPages.statusBar.maintenance");
-		monitorsStatus.color = theme.palette.warning.main;
-		monitorsStatus.icon = <Wrench size={24} />;
-
-		// Degraded (some down, no maintenance/breached)
-	} else if (someOf("down")) {
+		return monitorsStatus;
+	} else if (monitors.some((monitor) => monitor.status === "down")) {
 		monitorsStatus.msg = t("pages.statusPages.statusBar.degraded");
 		monitorsStatus.color = theme.palette.warning.main;
-		monitorsStatus.icon = <AlertTriangle size={24} />;
-
-		// Some Paused
-	} else if (someOf("paused")) {
-		monitorsStatus.msg = t("pages.statusPages.statusBar.partiallyPaused");
-		monitorsStatus.color = theme.palette.warning.main;
-		monitorsStatus.icon = <PauseCircle size={24} />;
-
-		// Initializing
-	} else if (someOf("initializing")) {
-		monitorsStatus.msg = t("pages.statusPages.statusBar.initializing");
-		monitorsStatus.color = theme.palette.info.main;
-		monitorsStatus.icon = <Loader size={24} />;
+		return monitorsStatus;
 	} else {
 		monitorsStatus.msg = t("pages.statusPages.statusBar.unknown");
 		monitorsStatus.color = theme.palette.warning.main;
+		return monitorsStatus;
 	}
-
-	return monitorsStatus;
 };
 
 interface StatusBarProps {

client/src/Pages/StatusPage/Status/index.tsx

@@ -23,22 +23,16 @@ const StatusPageView = () => {
 	const isSmall = useMediaQuery(theme.breakpoints.down("md"));
 	const isPublic = location.pathname.startsWith("/status/public");
 
-	const apiUrl = url ? `/status-page/${url}?type=uptime&type=infrastructure` : null;
+	const apiUrl = url ? `/status-page/${url}?type=uptime` : null;
 
-	const { data, isLoading, error } = useGet<StatusPageResponse>(
-		apiUrl,
-		{},
-		{
-			refreshInterval: 10000,
-		}
-	);
+	const { data, isLoading, error } = useGet<StatusPageResponse>(apiUrl);
 
 	const statusPage = data?.statusPage;
 	const monitors = data?.monitors ?? [];
 
 	if (!statusPage) return null;
 
-	if (monitors.length === 0) {
+	if (monitors?.length === 0) {
 		return (
 			<BasePage
 				loading={isLoading}

client/src/Pages/StatusPage/StatusPages/Components/StatusPagesTable.tsx

@@ -97,7 +97,7 @@ export const StatusPagesTable = ({
 			{
 				id: "type",
 				content: t("common.table.headers.type"),
-				render: (row) => row.type.join(", "),
+				render: (row) => row.type,
 			},
 			{
 				id: "status",

client/src/Types/Check.ts

@@ -1,5 +1,3 @@
-export const CHECK_TTL_SENTINEL = 366;
-
 export interface CheckMetadata {
 	monitorId: string;
 	teamId: string;
@@ -127,6 +125,9 @@ export interface Check {
 	timings?: CheckTimings;
 	statusCode: number;
 	message: string;
+	ack: boolean;
+	ackAt?: string | null;
+	expiry: string;
 	cpu?: CheckCpuInfo;
 	memory?: CheckMemoryInfo;
 	disk?: CheckDiskInfo[];
@@ -139,6 +140,7 @@ export interface Check {
 	seo?: number;
 	performance?: number;
 	audits?: CheckAudits;
+	__v: number;
 	createdAt: string;
 	updatedAt: string;
 }
@@ -241,7 +243,10 @@ export interface ChecksSummary {
 	downChecks: number;
 }
 
-export type CheckSnapshot = Omit<Check, "metadata" | "__v" | "updatedAt"> & {
+export type CheckSnapshot = Omit<
+	Check,
+	"metadata" | "ack" | "ackAt" | "expiry" | "__v" | "updatedAt"
+> & {
 	originalResponseTime: number;
 };
 

client/src/Types/Notification.ts

@@ -5,10 +5,6 @@ export const NotificationChannels = [
 	"webhook",
 	"pager_duty",
 	"matrix",
-	"teams",
-	"telegram",
-	"pushover",
-	"twilio",
 ] as const;
 export type NotificationChannel = (typeof NotificationChannels)[number];
 
@@ -23,8 +19,6 @@ export interface Notification {
 	homeserverUrl?: string;
 	roomId?: string;
 	accessToken?: string;
-	accountSid?: string;
-	twilioPhoneNumber?: string;
 	createdAt: string;
 	updatedAt: string;
 }

client/src/Types/StatusPage.ts

@@ -1,31 +1,10 @@
-import type { Monitor, MonitorType } from "@/Types/Monitor";
-export type MonitorDisplayType = "uptime" | "infrastructure";
-
-export const MONITOR_TYPE_KEYS: Partial<Record<MonitorType, string>> = {
-	http: "pages.common.monitors.monitorTypes.optionHttp",
-	ping: "pages.common.monitors.monitorTypes.optionPing",
-	docker: "pages.common.monitors.monitorTypes.optionDocker",
-	port: "pages.common.monitors.monitorTypes.optionPort",
-	game: "pages.common.monitors.monitorTypes.optionGame",
-	grpc: "pages.common.monitors.monitorTypes.optionGrpc",
-	websocket: "pages.common.monitors.monitorTypes.optionWebSocket",
-	hardware: "pages.common.monitors.monitorTypes.optionHardware",
-	pagespeed: "pages.common.monitors.monitorTypes.optionPagespeed",
-};
-
-export const getMonitorTypeLabel = (
-	type: MonitorType,
-	t: (key: string) => string
-): string => {
-	const key = MONITOR_TYPE_KEYS[type];
-	return key ? t(key) : type;
-};
+import type { Monitor } from "@/Types/Monitor";
 
 export interface StatusPage {
 	id: string;
 	userId: string;
 	teamId: string;
-	type: MonitorDisplayType[];
+	type: string;
 	companyName: string;
 	url: string;
 	timezone?: string;
@@ -41,7 +20,6 @@ export interface StatusPage {
 	showCharts: boolean;
 	showUptimePercentage: boolean;
 	showAdminLoginLink: boolean;
-	showInfrastructure: boolean;
 	customCSS: string;
 	createdAt: string;
 	updatedAt: string;

client/src/Validation/notifications.ts

@@ -45,31 +45,6 @@ const matrixSchema = baseSchema.extend({
 	accessToken: z.string().min(1, "Access token is required"),
 });
 
-const teamsSchema = baseSchema.extend({
-	type: z.literal("teams"),
-	address: z.string().min(1, "Webhook URL is required").url("Please enter a valid URL"),
-});
-
-const telegramSchema = baseSchema.extend({
-	type: z.literal("telegram"),
-	address: z.string().min(1, "Chat ID is required"),
-	accessToken: z.string().min(1, "Bot token is required"),
-});
-
-const pushoverSchema = baseSchema.extend({
-	type: z.literal("pushover"),
-	address: z.string().min(1, "User key is required"),
-	accessToken: z.string().min(1, "App token is required"),
-});
-
-const twilioSchema = baseSchema.extend({
-	type: z.literal("twilio"),
-	accountSid: z.string().min(1, "Account SID is required"),
-	accessToken: z.string().min(1, "Auth token is required"),
-	phone: z.string().min(1, "Recipient phone number is required"),
-	twilioPhoneNumber: z.string().min(1, "Twilio phone number is required"),
-});
-
 export const notificationSchema = z.discriminatedUnion("type", [
 	emailSchema,
 	slackSchema,
@@ -77,10 +52,6 @@ export const notificationSchema = z.discriminatedUnion("type", [
 	webhookSchema,
 	pagerDutySchema,
 	matrixSchema,
-	teamsSchema,
-	telegramSchema,
-	pushoverSchema,
-	twilioSchema,
 ]);
 
 export type NotificationFormData = z.infer<typeof notificationSchema>;

client/src/Validation/settings.ts

@@ -1,4 +1,3 @@
-import { CHECK_TTL_SENTINEL } from "@/Types/Check";
 import { z } from "zod";
 
 export const settingsSchema = z.object({
@@ -7,42 +6,39 @@ export const settingsSchema = z.object({
 	systemEmailRejectUnauthorized: z.boolean(),
 	systemEmailConnectionHost: z
 		.string()
-		.transform((val) => (val.trim() === "" ? null : val.trim()))
+		.transform((val) => (val.trim() === "" ? undefined : val.trim()))
 		.optional(),
 	systemEmailSecure: z.boolean().optional(),
 	systemEmailPool: z.boolean().optional(),
 	showURL: z.boolean().optional(),
-	checkTTL: z
-		.number()
-		.int()
-		.min(1, "Please enter a value")
-		.max(CHECK_TTL_SENTINEL, `Maximum ${CHECK_TTL_SENTINEL}`),
+	checkTTL: z.number().int().min(1, "Please enter a value").max(365, "Maximum 365 days"),
 	pagespeedApiKey: z
 		.string()
-		.transform((val) => (val.trim() === "" ? null : val.trim()))
+		.transform((val) => (val.trim() === "" ? undefined : val.trim()))
 		.optional(),
 	systemEmailHost: z
 		.string()
 		.regex(/^[a-zA-Z0-9.-]*$/, "Invalid hostname or IP address")
-		.transform((val) => (val.trim() === "" ? null : val.trim()))
+		.transform((val) => (val.trim() === "" ? undefined : val.trim()))
 		.optional(),
 	systemEmailPort: z.number().int().min(1).max(65535).optional(),
 	systemEmailAddress: z
+		.string()
 		.email("Please enter a valid email address")
 		.or(z.literal(""))
-		.transform((val) => (val === "" ? null : val.toLowerCase().trim()))
+		.transform((val) => (val === "" ? undefined : val.toLowerCase().trim()))
 		.optional(),
 	systemEmailUser: z
 		.string()
-		.transform((val) => (val.trim() === "" ? null : val.trim()))
+		.transform((val) => (val.trim() === "" ? undefined : val.trim()))
 		.optional(),
 	systemEmailPassword: z
 		.string()
-		.transform((val) => (val.trim() === "" ? null : val.trim()))
+		.transform((val) => (val.trim() === "" ? undefined : val.trim()))
 		.optional(),
 	systemEmailTLSServername: z
 		.string()
-		.transform((val) => (val.trim() === "" ? null : val.trim()))
+		.transform((val) => (val.trim() === "" ? undefined : val.trim()))
 		.optional(),
 	globalThresholds: z.object({
 		cpu: z.number().int().min(1).max(100),
@@ -52,5 +48,4 @@ export const settingsSchema = z.object({
 	}),
 });
 
-export type SettingsFormInput = z.input<typeof settingsSchema>;
 export type SettingsFormData = z.infer<typeof settingsSchema>;

client/src/Validation/statusPage.ts

@@ -14,16 +14,12 @@ export const statusPageSchema = z.object({
 			"URL can only contain lowercase letters, numbers, and hyphens"
 		),
 	timezone: z.string().optional(),
-	type: z
-		.array(z.enum(["uptime", "infrastructure"]))
-		.min(1, "At least one type is required"),
 	color: z.string().min(1, "Color is required"),
 	monitors: z.array(z.string()).min(1, "At least one monitor is required"),
 	isPublished: z.boolean(),
 	showCharts: z.boolean(),
 	showUptimePercentage: z.boolean(),
 	showAdminLoginLink: z.boolean(),
-	showInfrastructure: z.boolean(),
 	customCSS: z.string().optional(),
 	logo: z
 		.object({

client/src/Validation/validation.js

@@ -288,13 +288,7 @@ const logoImageValidation = joi
 	.optional(); // Make entire object optional
 
 const statusPageValidation = joi.object({
-	type: joi
-		.alternatives()
-		.try(
-			joi.string().valid("uptime", "infrastructure"),
-			joi.array().items(joi.string().valid("uptime", "infrastructure"))
-		)
-		.required(),
+	type: joi.string().valid("uptime").required(),
 	isPublished: joi.bool(),
 	companyName: joi
 		.string()
@@ -323,7 +317,6 @@ const statusPageValidation = joi.object({
 	showUptimePercentage: joi.boolean(),
 	showCharts: joi.boolean(),
 	showAdminLoginLink: joi.boolean(),
-	showInfrastructure: joi.boolean(),
 });
 
 const settingsValidation = joi.object({

client/src/locales/en.json

@@ -343,7 +343,6 @@
 			"register": {
 				"title": "Welcome back to Checkmate!",
 				"subtitle": "Sign up to get started",
-				"setupNotice": "This page is only available during initial setup. Once a super admin is registered, additional users can be invited from team settings.",
 				"submit": "Register"
 			},
 			"forgotPassword": {
@@ -398,28 +397,16 @@
 					"activeFor": "Active for",
 					"certificateExpiry": "Certificate expiry",
 					"lastCheck": "Last check",
-					"lastResponseTime": "Last response time",
-					"serviceIsDown": "Service is down"
+					"lastResponseTime": "Last response time"
 				},
 				"status": {
 					"down": "down",
-					"breached": "threshold exceeded",
+					"breached": "breached",
 					"initializing": "initializing",
 					"maintenance": "maintenance",
 					"paused": "paused",
 					"total": "total",
 					"up": "up"
-				},
-				"monitorTypes": {
-					"optionDocker": "Docker",
-					"optionGame": "Game",
-					"optionHttp": "HTTP(S)",
-					"optionPing": "Ping",
-					"optionPort": "Port",
-					"optionPagespeed": "PageSpeed",
-					"optionHardware": "Infrastructure",
-					"optionGrpc": "gRPC",
-					"optionWebSocket": "WebSocket"
 				}
 			}
 		},
@@ -547,12 +534,19 @@
 				},
 				"type": {
 					"description": "Select the type of check to perform",
+					"optionDocker": "Docker",
 					"optionDockerDescription": "Use Docker to monitor if a container is running.",
+					"optionGame": "Game",
 					"optionGameDescription": "Monitor if a specific game server is online.",
+					"optionGrpc": "gRPC",
 					"optionGrpcDescription": "Monitor gRPC services using the standard Health Checking Protocol.",
+					"optionWebSocket": "WebSocket",
 					"optionWebSocketDescription": "Monitor WebSocket endpoints for connection health and response time.",
+					"optionHttp": "HTTP(S)",
 					"optionHttpDescription": "Use HTTP(S) to monitor your website or API endpoint.",
+					"optionPing": "Ping",
 					"optionPingDescription": "Use ICMP Ping to monitor if a server is online.",
+					"optionPort": "Port",
 					"optionPortDescription": "Monitor if a specific port on a server is open.",
 					"title": "Type"
 				},
@@ -953,34 +947,6 @@
 					"description": "Select the type of notification channel to create.",
 					"optionType": "Type",
 					"title": "Channel type"
-				},
-				"telegram": {
-					"title": "Telegram configuration",
-					"description": "Configure your Telegram bot to send notifications.",
-					"optionBotToken": "Bot token",
-					"placeholderBotToken": "123456789:ABCdefGhIJKlmNoPQRsTUVwxyZ",
-					"optionChatId": "Chat ID",
-					"placeholderChatId": "-1001234567890"
-				},
-				"pushover": {
-					"title": "Pushover configuration",
-					"description": "Configure Pushover to receive push notifications on your devices.",
-					"optionAppToken": "Application API token",
-					"placeholderAppToken": "azGDORePK8gMaC0QOYAMyEEuzJnyUi",
-					"optionUserKey": "User key",
-					"placeholderUserKey": "uQiRzpo4DXghDmr9QzzfQu27cmVRsG"
-				},
-				"twilio": {
-					"title": "Twilio SMS configuration",
-					"description": "Configure Twilio to send SMS notifications to a phone number.",
-					"optionAccountSid": "Account SID",
-					"placeholderAccountSid": "ACxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",
-					"optionAuthToken": "Auth token",
-					"placeholderAuthToken": "your_auth_token",
-					"optionFromNumber": "From number (Twilio)",
-					"placeholderFromNumber": "+15551234567",
-					"optionToNumber": "To number (recipient)",
-					"placeholderToNumber": "+15559876543"
 				}
 			},
 			"table": {
@@ -1075,7 +1041,7 @@
 				},
 				"stats": {
 					"title": "Monitor history",
-					"description": "Clear all monitoring history and statistics for your team. This action is irreversible.",
+					"description": "Define how long you want to retain historical data. You can also clear all existing data.",
 					"option": {
 						"clear": {
 							"label": "Clear all stats. This is irreversible."
@@ -1086,16 +1052,6 @@
 						"description": "This cannot be undone"
 					}
 				},
-				"retention": {
-					"title": "Check retention",
-					"description": "Set how long check data is retained before being automatically cleaned up.",
-					"option": {
-						"days": {
-							"label": "Retention period (days)",
-							"unlimited": "Unlimited"
-						}
-					}
-				},
 				"thresholds": {
 					"title": "Global Thresholds",
 					"description": "Set global CPU, Memory, Disk, and Temperature thresholds for infrastructure monitoring. These apply to all hardware monitors unless overridden.",
@@ -1212,38 +1168,12 @@
 			},
 			"monitorsList": {
 				"chartTypeHeatmap": "Heatmap",
-				"chartTypeHistogram": "Histogram",
-				"noData": "No data available",
-				"infrastructure": {
-					"title": "Infrastructure",
-					"cpu": "CPU",
-					"memory": "RAM",
-					"memoryText": "Memory",
-					"disk": "Disk",
-					"usage": "Usage",
-					"used": "Used",
-					"total": "Total"
-				},
-				"uptime": {
-					"title": "Uptime",
-					"responseTime": "Response time"
-				}
+				"chartTypeHistogram": "Histogram"
 			},
 			"statusBar": {
-				"allUp": "All systems operational",
-				"allBreached": "All systems have exceeded thresholds",
-				"allMaintenance": "All systems are under maintenance",
 				"allDown": "All systems are down",
-				"allPaused": "All systems are paused",
-				"allInitializing": "All systems are initializing",
-				"breachedAndDown": "Some systems have exceeded thresholds and are down",
-				"breached": "Some systems have exceeded thresholds",
+				"allUp": "All systems operational",
 				"degraded": "Some systems are experiencing issues",
-				"maintenanceAndDown": "Some systems are down during maintenance",
-				"maintenance": "Some systems are under maintenance",
-				"partiallyPaused": "Some systems are paused",
-				"initializing": "Some systems are initializing",
-				"noMonitors": "No monitors have been configured",
 				"unknown": "Unable to determine system status"
 			},
 			"table": {
@@ -1330,9 +1260,6 @@
 						},
 						"showAdminLoginLink": {
 							"label": "Show admin login link"
-						},
-						"showInfrastructure": {
-							"label": "Show infrastructure metrics"
 						}
 					}
 				}

client/vite.config.ts

@@ -3,13 +3,11 @@ import react from "@vitejs/plugin-react";
 import svgr from "vite-plugin-svgr";
 import path from "path";
 import { fileURLToPath } from "url";
-import { readFileSync } from "fs";
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
 export default defineConfig(({}) => {
-	const pkg = JSON.parse(readFileSync(path.resolve(__dirname, "package.json"), "utf-8"));
-	const version = pkg.version;
+	let version = "3.5.1";
 
 	return {
 		base: "/",

docker/coolify/build_images.bat

@@ -1,36 +0,0 @@
-@echo off
-setlocal enabledelayedexpansion
-
-REM Change directory to root Server directory for correct Docker Context
-cd /d "%~dp0"
-cd ../..
-
-REM Define service names and their corresponding Dockerfiles
-set services[0]=bluewaveuptime/uptime_client
-set dockerfiles[0]=.\docker\coolify\client.Dockerfile
-
-set services[1]=bluewaveuptime/uptime_database_mongo
-set dockerfiles[1]=.\docker\coolify\mongoDB.Dockerfile
-
-set services[2]=bluewaveuptime/uptime_redis
-set dockerfiles[2]=.\docker\coolify\redis.Dockerfile
-
-set services[3]=bluewaveuptime/uptime_server
-set dockerfiles[3]=.\docker\coolify\server.Dockerfile
-
-REM Loop through each service and build the corresponding image
-for /L %%i in (0,1,2,3) do (
-    set service=!services[%%i]!
-    set dockerfile=!dockerfiles[%%i]!
-
-    docker build -f "!dockerfile!" -t "!service!" .
-
-    REM Check if the build succeeded
-    if errorlevel 1 (
-        echo Error building !service! image. Exiting...
-        exit /b 1
-    )
-)
-
-echo All images built successfully
-exit /b 0

docker/coolify/build_images.sh

@@ -1,14 +1,14 @@
 #!/bin/bash
 # Change directory to root Server directory for correct Docker Context
 cd "$(dirname "$0")"
-cd ../../
+cd ../../../
 
 # Define an array of services and their Dockerfiles
 declare -A services=(
-  ["bluewaveuptime/uptime_client"]="./docker/coolify/client.Dockerfile"
-  ["bluewaveuptime/uptime_database_mongo"]="./docker/coolify/mongoDB.Dockerfile"
-  ["bluewaveuptime/uptime_redis"]="./docker/coolify/redis.Dockerfile"
-  ["bluewaveuptime/uptime_server"]="./docker/coolify/server.Dockerfile"
+  ["bluewaveuptime/uptime_client"]="./server/docker/dist/client.Dockerfile"
+  ["bluewaveuptime/uptime_database_mongo"]="./server/docker/dist/mongoDB.Dockerfile"
+  ["bluewaveuptime/uptime_redis"]="./server/docker/dist/redis.Dockerfile"
+  ["bluewaveuptime/uptime_server"]="./server/docker/dist/server.Dockerfile"
 )
 
 # Loop through each service and build the corresponding image

docker/dev/build_images.bat

@@ -1,33 +0,0 @@
-@echo off
-setlocal enabledelayedexpansion
-
-REM Change directory to root Server directory for correct Docker Context
-cd /d "%~dp0"
-cd ../..
-
-REM Define service names and their corresponding Dockerfiles
-set services[0]=uptime_client
-set dockerfiles[0]=.\docker\dev\client.Dockerfile
-
-set services[1]=uptime_mongo
-set dockerfiles[1]=.\docker\dev\mongoDB.Dockerfile
-
-set services[2]=uptime_server
-set dockerfiles[2]=.\docker\dev\server.Dockerfile
-
-REM Loop through each service and build the corresponding image
-for /L %%i in (0,1,2) do (
-    set service=!services[%%i]!
-    set dockerfile=!dockerfiles[%%i]!
-
-    docker build -f "!dockerfile!" -t "!service!" .
-
-    REM Check if the build succeeded
-    if errorlevel 1 (
-        echo Error building !service! image. Exiting...
-        exit /b 1
-    )
-)
-
-echo All images built successfully
-exit /b 0

docker/dist-arm/server.Dockerfile

@@ -1,16 +1,17 @@
 # ---------------------
 # Frontend build stage
 # ---------------------
-# Build on the host arch (BUILDPLATFORM) rather than under QEMU — the output is
-# pure JS so it's arch-independent, and this avoids the esbuild host/native
-# binary version mismatch under emulation.
-FROM --platform=$BUILDPLATFORM node:20-slim AS frontend-build
+FROM node:20-slim AS frontend-build
+
+
 
 WORKDIR /app/client
 
-COPY client/package*.json ./
+COPY client/package.json ./
 
-RUN npm ci
+RUN npm install
+
+RUN npm install esbuild@0.25.5 --build-from-source
 
 COPY client ./
 

docker/dist-mono/build_images.bat

@@ -1,30 +0,0 @@
-@echo off
-setlocal enabledelayedexpansion
-
-REM Change directory to root Server directory for correct Docker Context
-cd /d "%~dp0"
-cd ../..
-
-REM Define service names and their corresponding Dockerfiles
-set services[0]=uptime_database_mongo
-set dockerfiles[0]=.\docker\dist-mono\mongoDB.Dockerfile
-
-set services[1]=uptime_server
-set dockerfiles[1]=.\docker\dist-mono\server.Dockerfile
-
-REM Loop through each service and build the corresponding image
-for /L %%i in (0,1) do (
-    set service=!services[%%i]!
-    set dockerfile=!dockerfiles[%%i]!
-
-    docker build -f "!dockerfile!" -t "!service!" .
-
-    REM Check if the build succeeded
-    if errorlevel 1 (
-        echo Error building !service! image. Exiting...
-        exit /b 1
-    )
-)
-
-echo All images built successfully
-exit /b 0

docker/dist-mono/server.Dockerfile

@@ -19,10 +19,10 @@ WORKDIR /app/server
 
 COPY server ./
 
+
 RUN npm install
 
 RUN npm run build
-RUN cp -r src/templates dist/templates
 
 COPY --from=frontend-build /app/client/dist ./public
 
@@ -30,4 +30,4 @@ RUN chmod +x ./scripts/inject-vars.sh
 
 EXPOSE 52345
 
-CMD ./scripts/inject-vars.sh && node ./dist/index.js
+CMD ./scripts/inject-vars.sh && node ./dist/index.js

docker/dist/build_images.bat

@@ -1,33 +0,0 @@
-@echo off
-setlocal enabledelayedexpansion
-
-REM Change directory to root Server directory for correct Docker Context
-cd /d "%~dp0"
-cd ../..
-
-REM Define service names and their corresponding Dockerfiles
-set services[0]=bluewaveuptime/uptime_client
-set dockerfiles[0]=.\docker\dist\client.Dockerfile
-
-set services[1]=bluewaveuptime/uptime_database_mongo
-set dockerfiles[1]=.\docker\dist\mongoDB.Dockerfile
-
-set services[2]=bluewaveuptime/uptime_server
-set dockerfiles[2]=.\docker\dist\server.Dockerfile
-
-REM Loop through each service and build the corresponding image
-for /L %%i in (0,1,2) do (
-    set service=!services[%%i]!
-    set dockerfile=!dockerfiles[%%i]!
-
-    docker build -f "!dockerfile!" -t "!service!" .
-
-    REM Check if the build succeeded
-    if errorlevel 1 (
-        echo Error building !service! image. Exiting...
-        exit /b 1
-    )
-)
-
-echo All images built successfully
-exit /b 0

docker/prod/build_images.bat

@@ -1,33 +0,0 @@
-@echo off
-setlocal enabledelayedexpansion
-
-REM Change directory to root Server directory for correct Docker Context
-cd /d "%~dp0"
-cd ../..
-
-REM Define service names and their corresponding Dockerfiles
-set services[0]=uptime_client
-set dockerfiles[0]=.\docker\prod\client.Dockerfile
-
-set services[1]=uptime_database_mongo
-set dockerfiles[1]=.\docker\prod\mongoDB.Dockerfile
-
-set services[2]=uptime_server
-set dockerfiles[2]=.\docker\prod\server.Dockerfile
-
-REM Loop through each service and build the corresponding image
-for /L %%i in (0,1,2) do (
-    set service=!services[%%i]!
-    set dockerfile=!dockerfiles[%%i]!
-
-    docker build -f "!dockerfile!" -t "!service!" .
-
-    REM Check if the build succeeded
-    if errorlevel 1 (
-        echo Error building !service! image. Exiting...
-        exit /b 1
-    )
-)
-
-echo All images built successfully
-exit /b 0

docker/prod/docker-compose.yaml

@@ -3,8 +3,8 @@ services:
     image: ghcr.io/bluewave-labs/checkmate:frontend-demo
     restart: always
     environment:
-      UPTIME_APP_API_BASE_URL: "https://demo.checkmate.so/api/v1"
-      UPTIME_APP_CLIENT_HOST: "https://demo.checkmate.so"
+      UPTIME_APP_API_BASE_URL: "https://checkmate-demo.bluewavelabs.ca/api/v1"
+      UPTIME_APP_CLIENT_HOST: "https://checkmate-demo.bluewavelabs.ca"
     ports:
       - "80:80"
       - "443:443"
@@ -12,7 +12,16 @@ services:
       - server
     volumes:
       - ./nginx/conf.d:/etc/nginx/conf.d/:ro
-      - /etc/letsencrypt:/etc/nginx/ssl:ro
+      - ./certbot/www:/var/www/certbot/:ro
+      - ./certbot/conf/:/etc/nginx/ssl/:ro
+
+  certbot:
+    image: certbot/certbot:latest
+    restart: always
+    volumes:
+      - ./certbot/www/:/var/www/certbot/:rw
+      - ./certbot/conf/:/etc/letsencrypt/:rw
+    entrypoint: "/bin/sh -c 'trap exit TERM; while :; do certbot renew --webroot -w /var/www/certbot; sleep 12h & wait $${!}; done;'"
 
   server:
     image: ghcr.io/bluewave-labs/checkmate:backend-demo

docker/prod/nginx/conf.d/default.conf

@@ -40,8 +40,8 @@ server {
 
     server_name checkmate-demo.bluewavelabs.ca;
 
-    ssl_certificate /etc/nginx/ssl/live/demo.checkmate.so/fullchain.pem;
-    ssl_certificate_key /etc/nginx/ssl/live/demo.checkmate.so/privkey.pem;
+    ssl_certificate /etc/nginx/ssl/live/checkmate-demo.bluewavelabs.ca/fullchain.pem;
+    ssl_certificate_key /etc/nginx/ssl/live/checkmate-demo.bluewavelabs.ca/privkey.pem;
     
     location / {
         root   /usr/share/nginx/html;

docker/prod/server.Dockerfile

@@ -17,8 +17,6 @@ COPY ./server ./
 
 RUN npm run build
 
-RUN cp -r src/templates dist/templates
-
 EXPOSE 52345
 
 CMD ["node", "dist/index.js"]

docker/staging/build_images.bat

@@ -1,33 +0,0 @@
-@echo off
-setlocal enabledelayedexpansion
-
-REM Change directory to root Server directory for correct Docker Context
-cd /d "%~dp0"
-cd ../..
-
-REM Define service names and their corresponding Dockerfiles
-set services[0]=uptime_client
-set dockerfiles[0]=.\docker\staging\client.Dockerfile
-
-set services[1]=uptime_database_mongo
-set dockerfiles[1]=.\docker\staging\mongoDB.Dockerfile
-
-set services[2]=uptime_server
-set dockerfiles[2]=.\docker\staging\server.Dockerfile
-
-REM Loop through each service and build the corresponding image
-for /L %%i in (0,1,2) do (
-    set service=!services[%%i]!
-    set dockerfile=!dockerfiles[%%i]!
-
-    docker build -f "!dockerfile!" -t "!service!" .
-
-    REM Check if the build succeeded
-    if errorlevel 1 (
-        echo Error building !service! image. Exiting...
-        exit /b 1
-    )
-)
-
-echo All images built successfully
-exit /b 0

docker/staging/server.Dockerfile

@@ -17,8 +17,6 @@ COPY ./server ./
 
 RUN npm run build
 
-RUN cp -r src/templates dist/templates
-
 EXPOSE 52345
 
 CMD ["node", "dist/index.js"]

docker/unified/build_images.bat

@@ -1,33 +0,0 @@
-@echo off
-setlocal enabledelayedexpansion
-
-REM Change directory to root Server directory for correct Docker Context
-cd /d "%~dp0"
-cd ../..
-
-REM Define service names and their corresponding Dockerfiles
-set services[0]=uptime_client
-set dockerfiles[0]=.\docker\unified\client.Dockerfile
-
-set services[1]=uptime_database_mongo
-set dockerfiles[1]=.\docker\unified\mongoDB.Dockerfile
-
-set services[2]=uptime_server
-set dockerfiles[2]=.\docker\unified\server.Dockerfile
-
-REM Loop through each service and build the corresponding image
-for /L %%i in (0,1,2) do (
-    set service=!services[%%i]!
-    set dockerfile=!dockerfiles[%%i]!
-
-    docker build -f "!dockerfile!" -t "!service!" .
-
-    REM Check if the build succeeded
-    if errorlevel 1 (
-        echo Error building !service! image. Exiting...
-        exit /b 1
-    )
-)
-
-echo All images built successfully
-exit /b 0

docker/unified/build_images.sh

@@ -1,25 +0,0 @@
-#!/bin/bash
-
-# Change directory to root directory for correct Docker Context
-cd "$(dirname "$0")"
-cd ../../
-
-# Define an array of services and their Dockerfiles
-declare -A services=(
-  ["uptime_client"]="./docker/unified/client.Dockerfile"
-  ["uptime_database_mongo"]="./docker/unified/mongoDB.Dockerfile"
-  ["uptime_server"]="./docker/unified/server.Dockerfile"
-)
-
-# Loop through each service and build the corresponding image
-for service in "${!services[@]}"; do
-  docker build -f "${services[$service]}" -t "$service" .
-  
-  # Check if the build succeeded
-  if [ $? -ne 0 ]; then
-    echo "Error building $service image. Exiting..."
-    exit 1
-  fi
-done
-
-echo "All images built successfully"

docker/unified/certbot-compose.yaml

@@ -1,19 +0,0 @@
-version: "3"
-
-services:
-  webserver:
-    image: nginx:latest
-    ports:
-      - 80:80
-      - 443:443
-    restart: always
-    volumes:
-      - ./nginx/conf.d/:/etc/nginx/conf.d/:ro
-      - ./certbot/www/:/var/www/certbot/:ro
-  certbot:
-    image: certbot/certbot:latest
-    volumes:
-      - ./certbot/www/:/var/www/certbot/:rw
-      - ./certbot/conf/:/etc/letsencrypt/:rw
-    depends_on:
-      - webserver

docker/unified/client.Dockerfile

@@ -1,20 +0,0 @@
-FROM node:20-slim AS build
-
-ENV NODE_OPTIONS="--max-old-space-size=4096"
-
-WORKDIR /app
-
-COPY ./client/package*.json ./
-
-RUN npm install
-
-COPY ./client .
-
-RUN npm run build
-
-FROM nginx:1.27.1-alpine
-
-COPY --from=build /app/dist /usr/share/nginx/html
-COPY --from=build /app/env.sh /docker-entrypoint.d/env.sh
-RUN chmod +x /docker-entrypoint.d/env.sh
-CMD ["nginx", "-g", "daemon off;"]

docker/unified/docker-compose.yaml

@@ -1,114 +0,0 @@
-# sudo certbot certonly --standalone --http-01-port 8080
-# cerbot needs to run on 8080 since port 80 is used by the gateway
-
-services:
-  # Gateway (Single Entry Point)
-  gateway:
-    image: nginx:1.27.1-alpine
-    container_name: checkmate-gateway
-    restart: always
-    ports:
-      - "80:80"
-      - "443:443"
-    volumes:
-      - /etc/letsencrypt:/etc/nginx/ssl:ro
-      - ./gateway/nginx.conf:/etc/nginx/conf.d/default.conf:ro
-
-  # Production Stack ----- 
-  client-prod:
-    image: ghcr.io/bluewave-labs/checkmate:frontend-demo
-    container_name: client-prod
-    restart: always
-    environment:
-      UPTIME_APP_API_BASE_URL: "https://demo.checkmate.so/api/v1"
-      UPTIME_APP_CLIENT_HOST: "https://demo.checkmate.so"
-    expose:
-      - "80"
-    depends_on:
-      - server-prod
-    volumes:
-      - ./nginx/conf.d/prod.conf:/etc/nginx/conf.d/default.conf:ro
-
-  server-prod:
-    image: ghcr.io/bluewave-labs/checkmate:backend-demo
-    container_name: server-prod
-    restart: always
-    env_file:
-      - server-prod.env
-    depends_on:
-      - mongodb-prod
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock:ro
-
-  mongodb-prod:
-    image: ghcr.io/bluewave-labs/checkmate:mongo-demo
-    container_name: mongodb-prod
-    restart: always
-    command: [ "mongod", "--quiet", "--bind_ip_all" ]
-    volumes:
-      - ./mongo/data-prod:/data/db
-    env_file:
-      - mongo-prod.env
-    healthcheck:
-      test: [ "CMD", "mongosh", "--eval", "db.adminCommand('ping')", "--quiet" ]
-      interval: 5s
-      timeout: 30s
-      start_period: 0s
-      start_interval: 1s
-      retries: 30
-
-  # Staging Stack -----
-  client-staging:
-    image: ghcr.io/bluewave-labs/checkmate:frontend-staging
-    container_name: client-staging
-    restart: always
-    environment:
-      UPTIME_APP_API_BASE_URL: "https://staging.checkmate.so/api/v1"
-      UPTIME_APP_CLIENT_HOST: "https://staging.checkmate.so"
-    expose:
-      - "80"
-    depends_on:
-      - server-staging
-    volumes:
-      - ./nginx/conf.d/staging.conf:/etc/nginx/conf.d/default.conf:ro
-
-  server-staging:
-    image: ghcr.io/bluewave-labs/checkmate:backend-staging
-    container_name: server-staging
-    restart: always
-    env_file:
-      - server-staging.env
-    depends_on:
-      - mongodb-staging
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock:ro
-
-  mongodb-staging:
-    image: ghcr.io/bluewave-labs/checkmate:mongo-staging
-    container_name: mongodb-staging
-    restart: always
-    command: [ "mongod", "--quiet", "--bind_ip_all" ]
-    volumes:
-      - ./mongo/data-staging:/data/db
-    env_file:
-      - mongo-staging.env
-    healthcheck:
-      test: [ "CMD", "mongosh", "--eval", "db.adminCommand('ping')", "--quiet" ]
-      interval: 5s
-      timeout: 30s
-      start_period: 0s
-      start_interval: 1s
-      retries: 30
-
-  # Shared Utils
-  capture:
-    image: ghcr.io/bluewave-labs/capture:latest
-    container_name: capture
-    restart: unless-stopped
-    ports:
-      - "59232:59232"
-    environment:
-      - API_SECRET=my_secret
-      - GIN_MODE=release
-    volumes:
-      - /etc/os-release:/etc/os-release:ro

docker/unified/gateway/nginx.conf

@@ -1,55 +0,0 @@
-proxy_set_header Host $host;
-proxy_set_header X-Real-IP $remote_addr;
-proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-proxy_set_header X-Forwarded-Proto $scheme;
-
-
-server {
-    listen 80;
-    server_name demo.checkmate.so staging.checkmate.so;
-
-    location /.well-known/acme-challenge/ {
-        # Forward the challenge to Certbot listening on 8080
-        proxy_pass http://172.17.0.1:8080;
-    }
-
-    location / {
-        return 301 https://$host$request_uri;
-    }
-}
-
-
-# --- PRODUCTION: demo.checkmate.so ---
-server {
-    listen 443 ssl;
-    server_name demo.checkmate.so;
-
-    ssl_certificate     /etc/nginx/ssl/live/demo.checkmate.so/fullchain.pem;
-    ssl_certificate_key /etc/nginx/ssl/live/demo.checkmate.so/privkey.pem;
-
-    ssl_protocols       TLSv1.2 TLSv1.3;
-    ssl_ciphers         HIGH:!aNULL:!MD5;
-
-    location / {
-        # Passes traffic to the prod client on port 80
-        proxy_pass http://client-prod:80;
-    }
-}
-
-# --- STAGING: staging.checkmate.so ---
-
- server {
-     listen 443 ssl;
-     server_name staging.checkmate.so;
-
-     ssl_certificate     /etc/nginx/ssl/live/staging.checkmate.so/fullchain.pem;
-     ssl_certificate_key /etc/nginx/ssl/live/staging.checkmate.so/privkey.pem;
-
-     ssl_protocols       TLSv1.2 TLSv1.3;
-     ssl_ciphers         HIGH:!aNULL:!MD5;
-
-     location / {
-         # Passes traffic to the staging client on port 80
-         proxy_pass http://client-staging:80;
-     }
- }

docker/unified/mongoDB.Dockerfile

@@ -1,3 +0,0 @@
-FROM mongo
-EXPOSE 27017
-CMD ["mongod"]

docker/unified/nginx/conf.d/prod.conf

@@ -1,31 +0,0 @@
-server {
-    listen       80;
-    listen  [::]:80;
-
-    server_name _; 
-    server_tokens off;
-
-    location / {
-        root   /usr/share/nginx/html;
-        index  index.html index.htm;
-        try_files $uri $uri/ /index.html;
-    }
-    
-    location /api/ {
-        proxy_pass http://server-prod:52345/api/;
-        proxy_http_version 1.1;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-    }
-
-    location /api-docs/ {
-        proxy_pass http://server-prod:52345/api-docs/;
-        proxy_http_version 1.1;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-    }
-}

docker/unified/nginx/conf.d/staging.conf

@@ -1,31 +0,0 @@
-server {
-    listen       80;
-    listen  [::]:80;
-
-    server_name _; 
-    server_tokens off;
-
-    location / {
-        root   /usr/share/nginx/html;
-        index  index.html index.htm;
-        try_files $uri $uri/ /index.html;
-    }
-    
-    location /api/ {
-        proxy_pass http://server-staging:52345/api/;
-        proxy_http_version 1.1;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-    }
-
-    location /api-docs/ {
-        proxy_pass http://server-staging:52345/api-docs/;
-        proxy_http_version 1.1;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-    }
-}

docker/unified/server.Dockerfile

@@ -1,22 +0,0 @@
-FROM node:20-slim
-
-# Install ping
-RUN apt-get update \
-    && apt-get install -y iputils-ping \
-    && rm -rf /var/lib/apt/lists/*
-
-ENV NODE_OPTIONS="--max-old-space-size=2048"
-
-WORKDIR /app
-
-COPY ./server/package*.json ./
-
-RUN npm install
-
-COPY ./server ./
-
-RUN npm run build
-
-EXPOSE 52345
-
-CMD ["node", "dist/index.js"]

docs/i18n-contribution.md

@@ -1,31 +0,0 @@
-# Contributing Translations
-
-Checkmate supports multiple languages. This guide explains how to contribute translations.
-
-## How to Add a New Language
-
-1. Create a new JSON file in `client/src/locales/` named with the language code (e.g., `it.json` for Italian)
-
-2. Copy the structure from `en.json` and translate all values
-
-3. Add the language to the language selector in the UI
-
-## Translation Guidelines
-
-- en.json is the reference localization file, all keys should be declared here and mirrored in other localization files
-- Translate only the values
-- Use formal/informal tone consistently
-- Test your translations in the UI
-
-## File Structure
-client/src/locales/
-├── en.json      # Source language
-├── es.json      # Spanish
-├── de.json      # German
-└── [lang].json  # Your language
-## Testing Translations
-
-1. Start the development server: `npm run dev`
-2. Go to Settings → Language
-3. Select your language
-4. Verify all strings display correctly

server/README.md

@@ -8,7 +8,7 @@ Checkmate's backend is designed to be lightweight and scalable, ensuring reliabl
 
 ## Installation & documentation
 
-For setup instructions, configuration details, and deployment guidelines, please visit our official documentation at [docs.checkmate.so](https://checkmate.so/docs).
+For setup instructions, configuration details, and deployment guidelines, please visit our official documentation at [docs.checkmate.so](https://docs.checkmate.so).
 
 ## Related repositories
 

server/eslint.config.js

@@ -32,14 +32,11 @@ export default [
 		languageOptions: {
 			parser: tseslint.parser,
 			parserOptions: {
-				projectService: {
-					allowDefaultProject: ["jest.config.ts"],
-				},
+				projectService: true,
 				tsconfigRootDir: import.meta.dirname,
 			},
 		},
 		rules: {
-			"@typescript-eslint/no-unused-vars": ["error", { argsIgnorePattern: "^_" }], // Ignore unused variables that start with '_'
 			"@typescript-eslint/no-explicit-any": "warn", // Warn on 'any' types
 			"mocha/max-top-level-suites": "warn", // Warn if there are too many top-level suites instead of failing
 		},

server/jest.config.ts

@@ -9,7 +9,8 @@ const config: Config = {
 	},
 	moduleNameMapper: {
 		"^@/validation/(.*)\\.js$": "<rootDir>/src/validation/$1.js",
-		"^@/utils/(.*)\\.js$": "<rootDir>/src/utils/$1.ts",
+		"^@/utils/(AppError)\\.js$": "<rootDir>/src/utils/$1.ts",
+		"^@/utils/(.*)\\.js$": "<rootDir>/src/utils/$1.js",
 		"^@/(.*)\\.ts$": "<rootDir>/src/$1.ts",
 		"^@/(.*)\\.js$": "<rootDir>/src/$1.ts",
 		"^@/(.*)$": "<rootDir>/src/$1",

server/openapi.json

@@ -510,24 +510,42 @@
 				"summary": "Get monitors by team",
 				"description": "Get monitors filtered by team with optional parameters",
 				"parameters": [
+					{
+						"name": "status",
+						"in": "query",
+						"description": "Filter by monitor status (up/down)",
+						"schema": {
+							"type": "boolean"
+						}
+					},
 					{
 						"name": "type",
 						"in": "query",
 						"description": "Filter by monitor type",
 						"schema": {
-							"oneOf": [
-								{
-									"type": "string",
-									"enum": ["http", "ping", "pagespeed", "docker", "hardware", "port", "game", "grpc", "websocket"]
-								},
-								{
-									"type": "array",
-									"items": {
-										"type": "string",
-										"enum": ["http", "ping", "pagespeed", "docker", "hardware", "port", "game", "grpc", "websocket"]
-									}
-								}
-							]
+							"type": "string",
+							"enum": ["http", "ping", "pagespeed", "hardware", "docker", "port"]
+						}
+					},
+					{
+						"name": "page",
+						"in": "query",
+						"description": "Page number for pagination",
+						"schema": {
+							"type": "integer",
+							"minimum": 1,
+							"default": 1
+						}
+					},
+					{
+						"name": "rowsPerPage",
+						"in": "query",
+						"description": "Number of monitors per page",
+						"schema": {
+							"type": "integer",
+							"minimum": 1,
+							"maximum": 100,
+							"default": 10
 						}
 					},
 					{
@@ -537,6 +555,15 @@
 						"schema": {
 							"type": "string"
 						}
+					},
+					{
+						"name": "field",
+						"in": "query",
+						"description": "Field to filter on",
+						"schema": {
+							"type": "string",
+							"enum": ["name", "url", "description"]
+						}
 					}
 				],
 				"responses": {
@@ -729,7 +756,7 @@
 					}
 				]
 			},
-			"patch": {
+			"put": {
 				"tags": ["monitors"],
 				"summary": "Update monitor",
 				"description": "Update an existing monitor",
@@ -3541,19 +3568,22 @@
 			},
 			"CreateMonitorRequest": {
 				"type": "object",
-				"required": ["name", "type", "url"],
+				"required": ["name", "description", "type", "url", "interval"],
 				"properties": {
 					"name": {
 						"type": "string",
+						"minLength": 1,
+						"maxLength": 100,
 						"example": "My Website Monitor"
 					},
 					"description": {
 						"type": "string",
+						"maxLength": 500,
 						"example": "Monitors the main website homepage"
 					},
 					"type": {
 						"type": "string",
-						"enum": ["http", "ping", "pagespeed", "hardware", "docker", "port", "game", "grpc", "websocket"],
+						"enum": ["http", "ping", "pagespeed", "hardware", "docker", "port"],
 						"example": "http"
 					},
 					"url": {
@@ -3563,34 +3593,14 @@
 					},
 					"interval": {
 						"type": "integer",
+						"minimum": 30,
+						"maximum": 3600,
 						"example": 300,
 						"description": "Check interval in seconds"
 					},
-					"statusWindowSize": {
-						"type": "integer",
-						"minimum": 1,
-						"maximum": 20,
-						"default": 5
-					},
-					"statusWindowThreshold": {
-						"type": "integer",
-						"minimum": 1,
-						"maximum": 100,
-						"default": 60
-					},
 					"isActive": {
-						"type": "boolean"
-					},
-					"ignoreTlsErrors": {
 						"type": "boolean",
-						"default": false
-					},
-					"useAdvancedMatching": {
-						"type": "boolean",
-						"default": false
-					},
-					"port": {
-						"type": "integer"
+						"default": true
 					},
 					"notifications": {
 						"type": "array",
@@ -3599,62 +3609,51 @@
 						},
 						"description": "Array of notification IDs to associate with this monitor"
 					},
-					"secret": {
-						"type": "string"
-					},
-					"jsonPath": {
-						"type": "string"
-					},
-					"expectedValue": {
-						"type": "string"
-					},
-					"matchMethod": {
-						"type": "string",
-						"enum": ["equal", "include", "regex", ""]
-					},
-					"cpuAlertThreshold": {
-						"type": "number"
-					},
-					"memoryAlertThreshold": {
-						"type": "number"
-					},
-					"diskAlertThreshold": {
-						"type": "number"
-					},
-					"tempAlertThreshold": {
-						"type": "number"
-					},
-					"gameId": {
-						"type": "string"
-					},
-					"grpcServiceName": {
-						"type": "string",
-						"default": ""
-					},
-					"selectedDisks": {
-						"type": "array",
-						"items": {
-							"type": "string"
+					"httpOptions": {
+						"type": "object",
+						"properties": {
+							"method": {
+								"type": "string",
+								"enum": ["GET", "POST", "PUT", "DELETE", "HEAD"],
+								"default": "GET"
+							},
+							"headers": {
+								"type": "object",
+								"additionalProperties": {
+									"type": "string"
+								}
+							},
+							"body": {
+								"type": "string",
+								"description": "Request body for POST/PUT requests"
+							},
+							"timeout": {
+								"type": "integer",
+								"minimum": 1000,
+								"maximum": 30000,
+								"default": 5000,
+								"description": "Request timeout in milliseconds"
+							}
 						}
 					},
-					"group": {
-						"type": "string",
-						"nullable": true,
-						"maxLength": 50
-					},
-					"geoCheckEnabled": {
-						"type": "boolean"
-					},
-					"geoCheckLocations": {
+					"assertions": {
 						"type": "array",
 						"items": {
-							"type": "string",
-							"enum": ["northAmerica", "southAmerica", "europe", "asia", "africa", "oceania"]
+							"type": "object",
+							"properties": {
+								"type": {
+									"type": "string",
+									"enum": ["status-code", "response-time", "body-contains", "header-contains"]
+								},
+								"comparison": {
+									"type": "string",
+									"enum": ["equals", "not-equals", "greater-than", "less-than", "contains", "not-contains"]
+								},
+								"value": {
+									"type": "string"
+								}
+							}
 						}
-					},
-					"geoCheckInterval": {
-						"type": "integer",
-						"minimum": 300000
 					}
 				}
 			},
@@ -3662,32 +3661,21 @@
 				"type": "object",
 				"properties": {
 					"name": {
-						"type": "string"
-					},
-					"type": {
 						"type": "string",
-						"enum": ["http", "ping", "pagespeed", "hardware", "docker", "port", "game", "grpc", "websocket", "unknown"]
-					},
-					"url": {
-						"type": "string"
-					},
-					"statusWindowSize": {
-						"type": "integer",
-						"minimum": 1,
-						"maximum": 20,
-						"default": 5
-					},
-					"statusWindowThreshold": {
-						"type": "integer",
-						"minimum": 1,
-						"maximum": 100,
-						"default": 60
+						"minLength": 1,
+						"maxLength": 100
 					},
 					"description": {
-						"type": "string"
+						"type": "string",
+						"maxLength": 500
 					},
 					"interval": {
-						"type": "integer"
+						"type": "integer",
+						"minimum": 30,
+						"maximum": 3600
+					},
+					"isActive": {
+						"type": "boolean"
 					},
 					"notifications": {
 						"type": "array",
@@ -3695,72 +3683,47 @@
 							"type": "string"
 						}
 					},
-					"secret": {
-						"type": "string"
-					},
-					"ignoreTlsErrors": {
-						"type": "boolean"
-					},
-					"useAdvancedMatching": {
-						"type": "boolean"
-					},
-					"jsonPath": {
-						"type": "string"
-					},
-					"expectedValue": {
-						"type": "string"
-					},
-					"matchMethod": {
-						"type": "string",
-						"enum": ["equal", "include", "regex", ""]
-					},
-					"port": {
-						"type": "integer",
-						"minimum": 1,
-						"maximum": 65535
-					},
-					"cpuAlertThreshold": {
-						"type": "number"
-					},
-					"memoryAlertThreshold": {
-						"type": "number"
-					},
-					"diskAlertThreshold": {
-						"type": "number"
-					},
-					"tempAlertThreshold": {
-						"type": "number"
-					},
-					"gameId": {
-						"type": "string"
-					},
-					"grpcServiceName": {
-						"type": "string"
-					},
-					"selectedDisks": {
-						"type": "array",
-						"items": {
-							"type": "string"
+					"httpOptions": {
+						"type": "object",
+						"properties": {
+							"method": {
+								"type": "string",
+								"enum": ["GET", "POST", "PUT", "DELETE", "HEAD"]
+							},
+							"headers": {
+								"type": "object",
+								"additionalProperties": {
+									"type": "string"
+								}
+							},
+							"body": {
+								"type": "string"
+							},
+							"timeout": {
+								"type": "integer",
+								"minimum": 1000,
+								"maximum": 30000
+							}
 						}
 					},
-					"group": {
-						"type": "string",
-						"nullable": true,
-						"maxLength": 50
-					},
-					"geoCheckEnabled": {
-						"type": "boolean"
-					},
-					"geoCheckLocations": {
+					"assertions": {
 						"type": "array",
 						"items": {
-							"type": "string",
-							"enum": ["northAmerica", "southAmerica", "europe", "asia", "africa", "oceania"]
+							"type": "object",
+							"properties": {
+								"type": {
+									"type": "string",
+									"enum": ["status-code", "response-time", "body-contains", "header-contains"]
+								},
+								"comparison": {
+									"type": "string",
+									"enum": ["equals", "not-equals", "greater-than", "less-than", "contains", "not-contains"]
+								},
+								"value": {
+									"type": "string"
+								}
+							}
 						}
-					},
-					"geoCheckInterval": {
-						"type": "integer",
-						"minimum": 300000
 					}
 				}
 			},

server/package-lock.json

@@ -14,6 +14,7 @@
 				"@pulsecron/pulse": "1.6.8",
 				"axios": "^1.7.2",
 				"bcryptjs": "3.0.2",
+				"bullmq": "5.41.2",
 				"cacheable-lookup": "7.0.0",
 				"compression": "1.8.1",
 				"cookie-parser": "^1.4.7",
@@ -21,7 +22,7 @@
 				"dockerode": "4.0.6",
 				"dotenv": "^16.4.5",
 				"express": "^4.19.2",
-				"express-rate-limit": "8.3.2",
+				"express-rate-limit": "8.0.1",
 				"gamedig": "5.2.0",
 				"got": "14.4.7",
 				"handlebars": "^4.7.8",
@@ -35,11 +36,11 @@
 				"mjml": "^5.0.0-alpha.4",
 				"mongoose": "^8.3.3",
 				"multer": "^1.4.5-lts.1",
-				"nodemailer": "8.0.5",
+				"nodemailer": "8.0.1",
 				"ping": "0.4.4",
 				"sharp": "0.33.5",
 				"ssl-checker": "2.0.10",
-				"super-simple-scheduler": "1.9.1",
+				"super-simple-scheduler": "1.4.5",
 				"swagger-ui-express": "5.0.1",
 				"winston": "^3.13.0",
 				"ws": "^8.19.0",
@@ -66,6 +67,7 @@
 				"@types/ws": "^8.18.1",
 				"@typescript-eslint/eslint-plugin": "^8.56.1",
 				"@typescript-eslint/parser": "^8.56.1",
+				"c8": "10.1.3",
 				"eslint": "^9.17.0",
 				"eslint-plugin-mocha": "^10.5.0",
 				"esm": "3.2.25",
@@ -797,20 +799,40 @@
 			}
 		},
 		"node_modules/@aws-sdk/xml-builder": {
-			"version": "3.972.16",
-			"resolved": "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.972.16.tgz",
-			"integrity": "sha512-iu2pyvaqmeatIJLURLqx9D+4jKAdTH20ntzB6BFwjyN7V960r4jK32mx0Zf7YbtOYAbmbtQfDNuL60ONinyw7A==",
+			"version": "3.972.10",
+			"resolved": "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.972.10.tgz",
+			"integrity": "sha512-OnejAIVD+CxzyAUrVic7lG+3QRltyja9LoNqCE/1YVs8ichoTbJlVSaZ9iSMcnHLyzrSNtvaOGjSDRP+d/ouFA==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"dependencies": {
-				"@smithy/types": "^4.13.1",
-				"fast-xml-parser": "5.5.8",
+				"@smithy/types": "^4.13.0",
+				"fast-xml-parser": "5.4.1",
 				"tslib": "^2.6.2"
 			},
 			"engines": {
 				"node": ">=20.0.0"
 			}
 		},
+		"node_modules/@aws-sdk/xml-builder/node_modules/fast-xml-parser": {
+			"version": "5.4.1",
+			"resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.4.1.tgz",
+			"integrity": "sha512-BQ30U1mKkvXQXXkAGcuyUA/GA26oEB7NzOtsxCDtyu62sjGw5QraKFhx2Em3WQNjPw9PG6MQ9yuIIgkSDfGu5A==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/NaturalIntelligence"
+				}
+			],
+			"license": "MIT",
+			"dependencies": {
+				"fast-xml-builder": "^1.0.0",
+				"strnum": "^2.1.2"
+			},
+			"bin": {
+				"fxparser": "src/cli/cli.js"
+			}
+		},
 		"node_modules/@aws/lambda-invoke-store": {
 			"version": "0.2.3",
 			"resolved": "https://registry.npmjs.org/@aws/lambda-invoke-store/-/lambda-invoke-store-0.2.3.tgz",
@@ -851,7 +873,6 @@
 			"integrity": "sha512-H3mcG6ZDLTlYfaSNi0iOKkigqMFvkTKlGUYlD8GW7nNOYRrevuA46iTypPyv+06V3fEmvvazfntkBU34L0azAw==",
 			"dev": true,
 			"license": "MIT",
-			"peer": true,
 			"dependencies": {
 				"@babel/code-frame": "^7.28.6",
 				"@babel/generator": "^7.28.6",
@@ -1354,6 +1375,16 @@
 			"integrity": "sha512-wMue2Sy4GAVTk6Ic4tJVcnfdau+gx2EnG7S+uAEe+TWJFqE4YoWN4/H8MSLj4eYJKxGg26lZwboEniNiNwZQ6Q==",
 			"license": "Apache-2.0"
 		},
+		"node_modules/@bcoe/v8-coverage": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-1.0.2.tgz",
+			"integrity": "sha512-6zABk/ECA/QYSCQ1NGiVwwbQerUCZ+TQbp64Q3AgmfNvurHH0j8TtXa1qbShXA6qqkpAj4V5W8pP6mLe1mcMqA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=18"
+			}
+		},
 		"node_modules/@colors/colors": {
 			"version": "1.6.0",
 			"resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.6.0.tgz",
@@ -1471,7 +1502,6 @@
 				}
 			],
 			"license": "MIT",
-			"peer": true,
 			"engines": {
 				"node": ">=18"
 			},
@@ -1516,7 +1546,6 @@
 				}
 			],
 			"license": "MIT",
-			"peer": true,
 			"engines": {
 				"node": ">=18"
 			}
@@ -3166,6 +3195,84 @@
 				"sparse-bitfield": "^3.0.3"
 			}
 		},
+		"node_modules/@msgpackr-extract/msgpackr-extract-darwin-arm64": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-3.0.3.tgz",
+			"integrity": "sha512-QZHtlVgbAdy2zAqNA9Gu1UpIuI8Xvsd1v8ic6B2pZmeFnFcMWiPLfWXh7TVw4eGEZ/C9TH281KwhVoeQUKbyjw==",
+			"cpu": [
+				"arm64"
+			],
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"darwin"
+			]
+		},
+		"node_modules/@msgpackr-extract/msgpackr-extract-darwin-x64": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-3.0.3.tgz",
+			"integrity": "sha512-mdzd3AVzYKuUmiWOQ8GNhl64/IoFGol569zNRdkLReh6LRLHOXxU4U8eq0JwaD8iFHdVGqSy4IjFL4reoWCDFw==",
+			"cpu": [
+				"x64"
+			],
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"darwin"
+			]
+		},
+		"node_modules/@msgpackr-extract/msgpackr-extract-linux-arm": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-3.0.3.tgz",
+			"integrity": "sha512-fg0uy/dG/nZEXfYilKoRe7yALaNmHoYeIoJuJ7KJ+YyU2bvY8vPv27f7UKhGRpY6euFYqEVhxCFZgAUNQBM3nw==",
+			"cpu": [
+				"arm"
+			],
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			]
+		},
+		"node_modules/@msgpackr-extract/msgpackr-extract-linux-arm64": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-3.0.3.tgz",
+			"integrity": "sha512-YxQL+ax0XqBJDZiKimS2XQaf+2wDGVa1enVRGzEvLLVFeqa5kx2bWbtcSXgsxjQB7nRqqIGFIcLteF/sHeVtQg==",
+			"cpu": [
+				"arm64"
+			],
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			]
+		},
+		"node_modules/@msgpackr-extract/msgpackr-extract-linux-x64": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-3.0.3.tgz",
+			"integrity": "sha512-cvwNfbP07pKUfq1uH+S6KJ7dT9K8WOE4ZiAcsrSes+UY55E/0jLYc+vq+DO7jlmqRb5zAggExKm0H7O/CBaesg==",
+			"cpu": [
+				"x64"
+			],
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			]
+		},
+		"node_modules/@msgpackr-extract/msgpackr-extract-win32-x64": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-3.0.3.tgz",
+			"integrity": "sha512-x0fWaQtYp4E6sktbsdAqnehxDgEc/VwM7uLsRCYWaiGu0ykYdZPiS8zCWdnjHwyiumousxfBm4SO31eXqwEZhQ==",
+			"cpu": [
+				"x64"
+			],
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"win32"
+			]
+		},
 		"node_modules/@napi-rs/wasm-runtime": {
 			"version": "0.2.12",
 			"resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.12.tgz",
@@ -3743,9 +3850,9 @@
 			}
 		},
 		"node_modules/@smithy/types": {
-			"version": "4.13.1",
-			"resolved": "https://registry.npmjs.org/@smithy/types/-/types-4.13.1.tgz",
-			"integrity": "sha512-787F3yzE2UiJIQ+wYW1CVg2odHjmaWLGksnKQHUrK/lYZSEcy1msuLVvxaR/sI2/aDe9U+TBuLsXnr3vod1g0g==",
+			"version": "4.13.0",
+			"resolved": "https://registry.npmjs.org/@smithy/types/-/types-4.13.0.tgz",
+			"integrity": "sha512-COuLsZILbbQsdrwKQpkkpyep7lCsByxwj7m0Mg5v66/ZTyenlfBc40/QFQ5chO0YN/PNEH1Bi3fGtfXPnYNeDw==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"dependencies": {
@@ -4230,7 +4337,6 @@
 			"integrity": "sha512-wGA0NX93b19/dZC1J18tKWVIYWyyF2ZjT9vin/NRu0qzzvfVzWjs04iq2rQ3H65vCTQYlRqs3YHfY7zjdV+9Kw==",
 			"dev": true,
 			"license": "MIT",
-			"peer": true,
 			"dependencies": {
 				"@types/body-parser": "*",
 				"@types/express-serve-static-core": "^5.0.0",
@@ -4391,7 +4497,6 @@
 			"resolved": "https://registry.npmjs.org/@types/node/-/node-24.9.1.tgz",
 			"integrity": "sha512-QoiaXANRkSXK6p0Duvt56W208du4P9Uye9hWLWgGMDTEoKPhuenzNcC4vGUmrNkiOKTlIrBoyNQYNpSwfEZXSg==",
 			"license": "MIT",
-			"peer": true,
 			"dependencies": {
 				"undici-types": "~7.16.0"
 			}
@@ -4629,7 +4734,6 @@
 			"integrity": "sha512-klQbnPAAiGYFyI02+znpBRLyjL4/BrBd0nyWkdC0s/6xFLkXYQ8OoRrSkqacS1ddVxf/LDyODIKbQ5TgKAf/Fg==",
 			"dev": true,
 			"license": "MIT",
-			"peer": true,
 			"dependencies": {
 				"@typescript-eslint/scope-manager": "8.56.1",
 				"@typescript-eslint/types": "8.56.1",
@@ -4838,9 +4942,9 @@
 			}
 		},
 		"node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
-			"version": "5.0.5",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz",
-			"integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==",
+			"version": "5.0.4",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.4.tgz",
+			"integrity": "sha512-h+DEnpVvxmfVefa4jFbCf5HdH5YMDXRsmKflpf1pILZWRFlTbJpxeU55nJl4Smt5HQaGzg1o6RHFPJaOqnmBDg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5243,7 +5347,6 @@
 			"integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
 			"dev": true,
 			"license": "MIT",
-			"peer": true,
 			"bin": {
 				"acorn": "bin/acorn"
 			},
@@ -5441,14 +5544,14 @@
 			"license": "MIT"
 		},
 		"node_modules/axios": {
-			"version": "1.15.1",
-			"resolved": "https://registry.npmjs.org/axios/-/axios-1.15.1.tgz",
-			"integrity": "sha512-WOG+Jj8ZOvR0a3rAn+Tuf1UQJRxw5venr6DgdbJzngJE3qG7X0kL83CZGpdHMxEm+ZK3seAbvFsw4FfOfP9vxg==",
+			"version": "1.13.6",
+			"resolved": "https://registry.npmjs.org/axios/-/axios-1.13.6.tgz",
+			"integrity": "sha512-ChTCHMouEe2kn713WHbQGcuYrr6fXTBiu460OTwWrWob16g1bXn4vtz07Ope7ewMozJAnEquLk5lWQWtBig9DQ==",
 			"license": "MIT",
 			"dependencies": {
 				"follow-redirects": "^1.15.11",
 				"form-data": "^4.0.5",
-				"proxy-from-env": "^2.1.0"
+				"proxy-from-env": "^1.1.0"
 			}
 		},
 		"node_modules/babel-jest": {
@@ -5781,9 +5884,9 @@
 			"license": "MIT"
 		},
 		"node_modules/brace-expansion": {
-			"version": "1.1.13",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
-			"integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
+			"version": "1.1.12",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+			"integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5822,7 +5925,6 @@
 				}
 			],
 			"license": "MIT",
-			"peer": true,
 			"dependencies": {
 				"baseline-browser-mapping": "^2.8.19",
 				"caniuse-lite": "^1.0.30001751",
@@ -5914,6 +6016,21 @@
 				"node": ">=10.0.0"
 			}
 		},
+		"node_modules/bullmq": {
+			"version": "5.41.2",
+			"resolved": "https://registry.npmjs.org/bullmq/-/bullmq-5.41.2.tgz",
+			"integrity": "sha512-wqsUIHW2Td86mTKTepqQpKLLUtP4gmX89bUO1YL2fAorxwj3da1GYtroGZMCg/zgB/+zMRsbylL6DHyMUWX7fA==",
+			"license": "MIT",
+			"dependencies": {
+				"cron-parser": "^4.9.0",
+				"ioredis": "^5.4.1",
+				"msgpackr": "^1.11.2",
+				"node-abort-controller": "^3.1.1",
+				"semver": "^7.5.4",
+				"tslib": "^2.0.0",
+				"uuid": "^9.0.0"
+			}
+		},
 		"node_modules/busboy": {
 			"version": "1.6.0",
 			"resolved": "https://registry.npmjs.org/busboy/-/busboy-1.6.0.tgz",
@@ -5934,6 +6051,40 @@
 				"node": ">= 0.8"
 			}
 		},
+		"node_modules/c8": {
+			"version": "10.1.3",
+			"resolved": "https://registry.npmjs.org/c8/-/c8-10.1.3.tgz",
+			"integrity": "sha512-LvcyrOAaOnrrlMpW22n690PUvxiq4Uf9WMhQwNJ9vgagkL/ph1+D4uvjvDA5XCbykrc0sx+ay6pVi9YZ1GnhyA==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"@bcoe/v8-coverage": "^1.0.1",
+				"@istanbuljs/schema": "^0.1.3",
+				"find-up": "^5.0.0",
+				"foreground-child": "^3.1.1",
+				"istanbul-lib-coverage": "^3.2.0",
+				"istanbul-lib-report": "^3.0.1",
+				"istanbul-reports": "^3.1.6",
+				"test-exclude": "^7.0.1",
+				"v8-to-istanbul": "^9.0.0",
+				"yargs": "^17.7.2",
+				"yargs-parser": "^21.1.1"
+			},
+			"bin": {
+				"c8": "bin/c8.js"
+			},
+			"engines": {
+				"node": ">=18"
+			},
+			"peerDependencies": {
+				"monocart-coverage-reports": "^2"
+			},
+			"peerDependenciesMeta": {
+				"monocart-coverage-reports": {
+					"optional": true
+				}
+			}
+		},
 		"node_modules/cacheable-lookup": {
 			"version": "7.0.0",
 			"resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-7.0.0.tgz",
@@ -6716,7 +6867,6 @@
 			"resolved": "https://registry.npmjs.org/cssnano/-/cssnano-7.1.1.tgz",
 			"integrity": "sha512-fm4D8ti0dQmFPeF8DXSAA//btEmqCOgAc/9Oa3C1LW94h5usNrJEfrON7b4FkPZgnDEn6OUs5NdxiJZmAtGOpQ==",
 			"license": "MIT",
-			"peer": true,
 			"dependencies": {
 				"cssnano-preset-default": "^7.0.9",
 				"lilconfig": "^3.1.3"
@@ -7162,10 +7312,13 @@
 			}
 		},
 		"node_modules/dompurify": {
-			"version": "3.4.0",
-			"resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.4.0.tgz",
-			"integrity": "sha512-nolgK9JcaUXMSmW+j1yaSvaEaoXYHwWyGJlkoCTghc97KgGDDSnpoU/PlEnw63Ah+TGKFOyY+X5LnxaWbCSfXg==",
+			"version": "3.3.2",
+			"resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.3.2.tgz",
+			"integrity": "sha512-6obghkliLdmKa56xdbLOpUZ43pAR6xFy1uOrxBaIDjT+yaRuuybLjGS9eVBoSR/UPU5fq3OXClEHLJNGvbxKpQ==",
 			"license": "(MPL-2.0 OR Apache-2.0)",
+			"engines": {
+				"node": ">=20"
+			},
 			"optionalDependencies": {
 				"@types/trusted-types": "^2.0.7"
 			}
@@ -7481,7 +7634,6 @@
 			"integrity": "sha512-t5aPOpmtJcZcz5UJyY2GbvpDlsK5E8JqRqoKtfiKE3cNh437KIqfJr3A3AKf5k64NPx6d0G3dno6XDY05PqPtw==",
 			"dev": true,
 			"license": "MIT",
-			"peer": true,
 			"dependencies": {
 				"@eslint-community/eslint-utils": "^4.8.0",
 				"@eslint-community/regexpp": "^4.12.1",
@@ -7843,7 +7995,6 @@
 			"resolved": "https://registry.npmjs.org/express/-/express-4.22.1.tgz",
 			"integrity": "sha512-F2X8g9P1X7uCPZMA3MVf9wcTqlyNp7IhH5qPCI0izhaOIYXaW9L535tGA3qmjRzpH+bZczqq7hVKxTR4NWnu+g==",
 			"license": "MIT",
-			"peer": true,
 			"dependencies": {
 				"accepts": "~1.3.8",
 				"array-flatten": "1.1.1",
@@ -7886,12 +8037,12 @@
 			}
 		},
 		"node_modules/express-rate-limit": {
-			"version": "8.3.2",
-			"resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-8.3.2.tgz",
-			"integrity": "sha512-77VmFeJkO0/rvimEDuUC5H30oqUC4EyOhyGccfqoLebB0oiEYfM7nwPrsDsBL1gsTpwfzX8SFy2MT3TDyRq+bg==",
+			"version": "8.0.1",
+			"resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-8.0.1.tgz",
+			"integrity": "sha512-aZVCnybn7TVmxO4BtlmnvX+nuz8qHW124KKJ8dumsBsmv5ZLxE0pYu7S2nwyRBGHHCAzdmnGyrc5U/rksSPO7Q==",
 			"license": "MIT",
 			"dependencies": {
-				"ip-address": "10.1.0"
+				"ip-address": "10.0.1"
 			},
 			"engines": {
 				"node": ">= 16"
@@ -7976,9 +8127,9 @@
 			"license": "MIT"
 		},
 		"node_modules/fast-xml-builder": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/fast-xml-builder/-/fast-xml-builder-1.1.4.tgz",
-			"integrity": "sha512-f2jhpN4Eccy0/Uz9csxh3Nu6q4ErKxf0XIsasomfOihuSUa3/xw6w8dnOtCDgEItQFJG8KyXPzQXzcODDrrbOg==",
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/fast-xml-builder/-/fast-xml-builder-1.0.0.tgz",
+			"integrity": "sha512-fpZuDogrAgnyt9oDDz+5DBz0zgPdPZz6D4IR7iESxRXElrlGTRkHJ9eEt+SACRJwT0FNFrt71DFQIUFBJfX/uQ==",
 			"dev": true,
 			"funding": [
 				{
@@ -7986,31 +8137,7 @@
 					"url": "https://github.com/sponsors/NaturalIntelligence"
 				}
 			],
-			"license": "MIT",
-			"dependencies": {
-				"path-expression-matcher": "^1.1.3"
-			}
-		},
-		"node_modules/fast-xml-parser": {
-			"version": "5.5.8",
-			"resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.5.8.tgz",
-			"integrity": "sha512-Z7Fh2nVQSb2d+poDViM063ix2ZGt9jmY1nWhPfHBOK2Hgnb/OW3P4Et3P/81SEej0J7QbWtJqxO05h8QYfK7LQ==",
-			"dev": true,
-			"funding": [
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/NaturalIntelligence"
-				}
-			],
-			"license": "MIT",
-			"dependencies": {
-				"fast-xml-builder": "^1.1.4",
-				"path-expression-matcher": "^1.2.0",
-				"strnum": "^2.2.0"
-			},
-			"bin": {
-				"fxparser": "src/cli/cli.js"
-			}
+			"license": "MIT"
 		},
 		"node_modules/fastq": {
 			"version": "1.20.1",
@@ -8151,9 +8278,9 @@
 			}
 		},
 		"node_modules/flatted": {
-			"version": "3.4.2",
-			"resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.2.tgz",
-			"integrity": "sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==",
+			"version": "3.3.3",
+			"resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz",
+			"integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==",
 			"dev": true,
 			"license": "ISC"
 		},
@@ -8164,9 +8291,9 @@
 			"license": "MIT"
 		},
 		"node_modules/follow-redirects": {
-			"version": "1.16.0",
-			"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.16.0.tgz",
-			"integrity": "sha512-y5rN/uOsadFT/JfYwhxRS5R7Qce+g3zG97+JrtFZlC9klX/W5hD7iiLzScI4nZqUS7DNUdhPgw4xI8W2LuXlUw==",
+			"version": "1.15.11",
+			"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.11.tgz",
+			"integrity": "sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==",
 			"funding": [
 				{
 					"type": "individual",
@@ -8600,9 +8727,9 @@
 			}
 		},
 		"node_modules/glob/node_modules/brace-expansion": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.3.tgz",
-			"integrity": "sha512-MCV/fYJEbqx68aE58kv2cA/kiky1G8vux3OR6/jbS+jIMe/6fJWa0DTzJU7dqijOWYwHi1t29FlfYI9uytqlpA==",
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+			"integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
 			"license": "MIT",
 			"dependencies": {
 				"balanced-match": "^1.0.0"
@@ -8702,9 +8829,9 @@
 			"license": "ISC"
 		},
 		"node_modules/handlebars": {
-			"version": "4.7.9",
-			"resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.9.tgz",
-			"integrity": "sha512-4E71E0rpOaQuJR2A3xDZ+GM1HyWYv1clR58tC8emQNeQe3RH7MAzSbat+V0wG78LQBo6m6bzSG/L4pBuCsgnUQ==",
+			"version": "4.7.8",
+			"resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz",
+			"integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==",
 			"license": "MIT",
 			"dependencies": {
 				"minimist": "^1.2.5",
@@ -9083,9 +9210,9 @@
 			}
 		},
 		"node_modules/ip-address": {
-			"version": "10.1.0",
-			"resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.1.0.tgz",
-			"integrity": "sha512-XXADHxXmvT9+CRxhXg56LJovE+bmWnEWB78LB83VZTprKTmaC5QfruXocxzTZ2Kl0DNwKuBdlIhjL8LeY8Sf8Q==",
+			"version": "10.0.1",
+			"resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.0.1.tgz",
+			"integrity": "sha512-NWv9YLW4PoW2B7xtzaS3NCot75m6nK7Icdv0o3lfMceJVRfSoQwqD4wEH5rLwoKJwUiZ/rfpiVBhnaF0FK4HoA==",
 			"license": "MIT",
 			"engines": {
 				"node": ">= 12"
@@ -9512,7 +9639,6 @@
 			"integrity": "sha512-F26gjC0yWN8uAA5m5Ss8ZQf5nDHWGlN/xWZIh8S5SRbsEKBovwZhxGd6LJlbZYxBgCYOtreSUyb8hpXyGC5O4A==",
 			"dev": true,
 			"license": "MIT",
-			"peer": true,
 			"dependencies": {
 				"@jest/core": "30.2.0",
 				"@jest/types": "30.2.0",
@@ -10004,9 +10130,9 @@
 			}
 		},
 		"node_modules/jest-util/node_modules/picomatch": {
-			"version": "4.0.4",
-			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
-			"integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+			"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -10541,9 +10667,9 @@
 			}
 		},
 		"node_modules/lodash": {
-			"version": "4.18.1",
-			"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.18.1.tgz",
-			"integrity": "sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==",
+			"version": "4.17.23",
+			"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz",
+			"integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==",
 			"license": "MIT"
 		},
 		"node_modules/lodash.camelcase": {
@@ -11085,9 +11211,9 @@
 			}
 		},
 		"node_modules/mjml-cli/node_modules/brace-expansion": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.3.tgz",
-			"integrity": "sha512-MCV/fYJEbqx68aE58kv2cA/kiky1G8vux3OR6/jbS+jIMe/6fJWa0DTzJU7dqijOWYwHi1t29FlfYI9uytqlpA==",
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+			"integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
 			"license": "MIT",
 			"dependencies": {
 				"balanced-match": "^1.0.0"
@@ -11577,6 +11703,37 @@
 			"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
 			"license": "MIT"
 		},
+		"node_modules/msgpackr": {
+			"version": "1.11.5",
+			"resolved": "https://registry.npmjs.org/msgpackr/-/msgpackr-1.11.5.tgz",
+			"integrity": "sha512-UjkUHN0yqp9RWKy0Lplhh+wlpdt9oQBYgULZOiFhV3VclSF1JnSQWZ5r9gORQlNYaUKQoR8itv7g7z1xDDuACA==",
+			"license": "MIT",
+			"optionalDependencies": {
+				"msgpackr-extract": "^3.0.2"
+			}
+		},
+		"node_modules/msgpackr-extract": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-3.0.3.tgz",
+			"integrity": "sha512-P0efT1C9jIdVRefqjzOQ9Xml57zpOXnIuS+csaB4MdZbTdmGDLo8XhzBG1N7aO11gKDDkJvBLULeFTo46wwreA==",
+			"hasInstallScript": true,
+			"license": "MIT",
+			"optional": true,
+			"dependencies": {
+				"node-gyp-build-optional-packages": "5.2.2"
+			},
+			"bin": {
+				"download-msgpackr-prebuilds": "bin/download-prebuilds.js"
+			},
+			"optionalDependencies": {
+				"@msgpackr-extract/msgpackr-extract-darwin-arm64": "3.0.3",
+				"@msgpackr-extract/msgpackr-extract-darwin-x64": "3.0.3",
+				"@msgpackr-extract/msgpackr-extract-linux-arm": "3.0.3",
+				"@msgpackr-extract/msgpackr-extract-linux-arm64": "3.0.3",
+				"@msgpackr-extract/msgpackr-extract-linux-x64": "3.0.3",
+				"@msgpackr-extract/msgpackr-extract-win32-x64": "3.0.3"
+			}
+		},
 		"node_modules/multer": {
 			"version": "1.4.5-lts.2",
 			"resolved": "https://registry.npmjs.org/multer/-/multer-1.4.5-lts.2.tgz",
@@ -11686,6 +11843,12 @@
 			"integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
 			"license": "MIT"
 		},
+		"node_modules/node-abort-controller": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/node-abort-controller/-/node-abort-controller-3.1.1.tgz",
+			"integrity": "sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ==",
+			"license": "MIT"
+		},
 		"node_modules/node-domexception": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz",
@@ -11748,6 +11911,21 @@
 				"webidl-conversions": "^3.0.0"
 			}
 		},
+		"node_modules/node-gyp-build-optional-packages": {
+			"version": "5.2.2",
+			"resolved": "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.2.2.tgz",
+			"integrity": "sha512-s+w+rBWnpTMwSFbaE0UXsRlg7hU4FjekKU4eyAih5T8nJuNZT1nNsskXpxmeqSK9UzkBl6UgRlnKc8hz8IEqOw==",
+			"license": "MIT",
+			"optional": true,
+			"dependencies": {
+				"detect-libc": "^2.0.1"
+			},
+			"bin": {
+				"node-gyp-build-optional-packages": "bin.js",
+				"node-gyp-build-optional-packages-optional": "optional.js",
+				"node-gyp-build-optional-packages-test": "build-test.js"
+			}
+		},
 		"node_modules/node-int64": {
 			"version": "0.4.0",
 			"resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
@@ -11762,9 +11940,9 @@
 			"license": "MIT"
 		},
 		"node_modules/nodemailer": {
-			"version": "8.0.5",
-			"resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-8.0.5.tgz",
-			"integrity": "sha512-0PF8Yb1yZuQfQbq+5/pZJrtF6WQcjTd5/S4JOHs9PGFxuTqoB/icwuB44pOdURHJbRKX1PPoJZtY7R4VUoCC8w==",
+			"version": "8.0.1",
+			"resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-8.0.1.tgz",
+			"integrity": "sha512-5kcldIXmaEjZcHR6F28IKGSgpmZHaF1IXLWFTG+Xh3S+Cce4MiakLtWY+PlBU69fLbRa8HlaGIrC/QolUpHkhg==",
 			"license": "MIT-0",
 			"engines": {
 				"node": ">=6.0.0"
@@ -12129,22 +12307,6 @@
 				"node": ">=8"
 			}
 		},
-		"node_modules/path-expression-matcher": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/path-expression-matcher/-/path-expression-matcher-1.2.1.tgz",
-			"integrity": "sha512-d7gQQmLvAKXKXE2GeP9apIGbMYKz88zWdsn/BN2HRWVQsDFdUY36WSLTY0Jvd4HWi7Fb30gQ62oAOzdgJA6fZw==",
-			"dev": true,
-			"funding": [
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/NaturalIntelligence"
-				}
-			],
-			"license": "MIT",
-			"engines": {
-				"node": ">=14.0.0"
-			}
-		},
 		"node_modules/path-is-absolute": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
@@ -12181,9 +12343,9 @@
 			}
 		},
 		"node_modules/path-to-regexp": {
-			"version": "0.1.13",
-			"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.13.tgz",
-			"integrity": "sha512-A/AGNMFN3c8bOlvV9RreMdrv7jsmF9XIfDeCd87+I8RNg6s78BhJxMu69NEMHBSJFxKidViTEdruRwEk/WIKqA==",
+			"version": "0.1.12",
+			"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
+			"integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==",
 			"license": "MIT"
 		},
 		"node_modules/path-type": {
@@ -12203,9 +12365,9 @@
 			"license": "ISC"
 		},
 		"node_modules/picomatch": {
-			"version": "2.3.2",
-			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz",
-			"integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==",
+			"version": "2.3.1",
+			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+			"integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
 			"license": "MIT",
 			"engines": {
 				"node": ">=8.6"
@@ -12347,7 +12509,6 @@
 				}
 			],
 			"license": "MIT",
-			"peer": true,
 			"dependencies": {
 				"nanoid": "^3.3.11",
 				"picocolors": "^1.1.1",
@@ -13001,9 +13162,9 @@
 			"license": "MIT"
 		},
 		"node_modules/protobufjs": {
-			"version": "7.5.5",
-			"resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.5.5.tgz",
-			"integrity": "sha512-3wY1AxV+VBNW8Yypfd1yQY9pXnqTAN+KwQxL8iYm3/BjKYMNg4i0owhEe26PWDOMaIrzeeF98Lqd5NGz4omiIg==",
+			"version": "7.5.4",
+			"resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.5.4.tgz",
+			"integrity": "sha512-CvexbZtbov6jW2eXAvLukXjXUW1TzFaivC46BpWc/3BpcCysb5Vffu+B3XHMm8lVEuy2Mm4XGex8hBSg1yapPg==",
 			"hasInstallScript": true,
 			"license": "BSD-3-Clause",
 			"dependencies": {
@@ -13038,13 +13199,10 @@
 			}
 		},
 		"node_modules/proxy-from-env": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-2.1.0.tgz",
-			"integrity": "sha512-cJ+oHTW1VAEa8cJslgmUZrc+sjRKgAKl3Zyse6+PV38hZe/V6Z14TbCuXcan9F9ghlz4QrFr2c92TNF82UkYHA==",
-			"license": "MIT",
-			"engines": {
-				"node": ">=10"
-			}
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+			"integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
+			"license": "MIT"
 		},
 		"node_modules/pstree.remy": {
 			"version": "1.1.8",
@@ -14186,9 +14344,9 @@
 			}
 		},
 		"node_modules/strnum": {
-			"version": "2.2.2",
-			"resolved": "https://registry.npmjs.org/strnum/-/strnum-2.2.2.tgz",
-			"integrity": "sha512-DnR90I+jtXNSTXWdwrEy9FakW7UX+qUZg28gj5fk2vxxl7uS/3bpI4fjFYVmdK9etptYBPNkpahuQnEwhwECqA==",
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/strnum/-/strnum-2.2.0.tgz",
+			"integrity": "sha512-Y7Bj8XyJxnPAORMZj/xltsfo55uOiyHcU2tnAVzHUnSJR/KsEX+9RoDeXEnsXtl/CX4fAcrt64gZ13aGaWPeBg==",
 			"dev": true,
 			"funding": [
 				{
@@ -14215,12 +14373,25 @@
 			}
 		},
 		"node_modules/super-simple-scheduler": {
-			"version": "1.9.1",
-			"resolved": "https://registry.npmjs.org/super-simple-scheduler/-/super-simple-scheduler-1.9.1.tgz",
-			"integrity": "sha512-JSiEQLk7MsnlSkJ87uoyFKIseG2N27ikB0FSxlh25nnQHWC7R5Lrd0VcoLpwSBanyLzlAslhK4W2rQ0mCU8jCQ==",
+			"version": "1.4.5",
+			"resolved": "https://registry.npmjs.org/super-simple-scheduler/-/super-simple-scheduler-1.4.5.tgz",
+			"integrity": "sha512-xHR3a+pLywY7HtwjWj/+OaANdEwAieQhckC/i0s6OoHtVJQ4+VLO1VfkKUbxp+oSROGXcaZet8PTGONVdKNUUw==",
 			"license": "MIT",
 			"dependencies": {
-				"uuid": "11.1.0"
+				"uuid": "11.1.0",
+				"winston": "3.17.0"
+			}
+		},
+		"node_modules/super-simple-scheduler/node_modules/is-stream": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+			"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
 		"node_modules/super-simple-scheduler/node_modules/uuid": {
@@ -14236,6 +14407,28 @@
 				"uuid": "dist/esm/bin/uuid"
 			}
 		},
+		"node_modules/super-simple-scheduler/node_modules/winston": {
+			"version": "3.17.0",
+			"resolved": "https://registry.npmjs.org/winston/-/winston-3.17.0.tgz",
+			"integrity": "sha512-DLiFIXYC5fMPxaRg832S6F5mJYvePtmO5G9v9IgUFPhXm9/GkXarH/TUrBAVzhTCzAj9anE/+GjrgXp/54nOgw==",
+			"license": "MIT",
+			"dependencies": {
+				"@colors/colors": "^1.6.0",
+				"@dabh/diagnostics": "^2.0.2",
+				"async": "^3.2.3",
+				"is-stream": "^2.0.0",
+				"logform": "^2.7.0",
+				"one-time": "^1.0.0",
+				"readable-stream": "^3.4.0",
+				"safe-stable-stringify": "^2.3.1",
+				"stack-trace": "0.0.x",
+				"triple-beam": "^1.3.0",
+				"winston-transport": "^4.9.0"
+			},
+			"engines": {
+				"node": ">= 12.0.0"
+			}
+		},
 		"node_modules/supports-color": {
 			"version": "7.2.0",
 			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -14323,6 +14516,47 @@
 				"node": ">=6"
 			}
 		},
+		"node_modules/test-exclude": {
+			"version": "7.0.1",
+			"resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-7.0.1.tgz",
+			"integrity": "sha512-pFYqmTw68LXVjeWJMST4+borgQP2AyMNbg1BpZh9LbyhUeNkeaPF9gzfPGUAnSMV3qPYdWUwDIjjCLiSDOl7vg==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"@istanbuljs/schema": "^0.1.2",
+				"glob": "^10.4.1",
+				"minimatch": "^9.0.4"
+			},
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/test-exclude/node_modules/brace-expansion": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+			"integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"balanced-match": "^1.0.0"
+			}
+		},
+		"node_modules/test-exclude/node_modules/minimatch": {
+			"version": "9.0.9",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz",
+			"integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"brace-expansion": "^2.0.2"
+			},
+			"engines": {
+				"node": ">=16 || 14 >=14.17"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			}
+		},
 		"node_modules/text-hex": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz",
@@ -14365,12 +14599,11 @@
 			}
 		},
 		"node_modules/tinyglobby/node_modules/picomatch": {
-			"version": "4.0.4",
-			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
-			"integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+			"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
 			"dev": true,
 			"license": "MIT",
-			"peer": true,
 			"engines": {
 				"node": ">=12"
 			},
@@ -14539,7 +14772,6 @@
 			"integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==",
 			"dev": true,
 			"license": "MIT",
-			"peer": true,
 			"dependencies": {
 				"@cspotcode/source-map-support": "^0.8.0",
 				"@tsconfig/node10": "^1.0.7",
@@ -14614,7 +14846,6 @@
 			"version": "2.8.1",
 			"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
 			"integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
-			"devOptional": true,
 			"license": "0BSD"
 		},
 		"node_modules/tsx": {
@@ -14703,7 +14934,6 @@
 			"integrity": "sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==",
 			"devOptional": true,
 			"license": "Apache-2.0",
-			"peer": true,
 			"bin": {
 				"tsc": "bin/tsc",
 				"tsserver": "bin/tsserver"
@@ -14757,9 +14987,9 @@
 			"license": "MIT"
 		},
 		"node_modules/undici": {
-			"version": "6.24.1",
-			"resolved": "https://registry.npmjs.org/undici/-/undici-6.24.1.tgz",
-			"integrity": "sha512-sC+b0tB1whOCzbtlx20fx3WgCXwkW627p4EA9uM+/tNNPkSS+eSEld6pAs9nDv7WbY1UUljBMYPtu9BCOrCWKA==",
+			"version": "6.23.0",
+			"resolved": "https://registry.npmjs.org/undici/-/undici-6.23.0.tgz",
+			"integrity": "sha512-VfQPToRA5FZs/qJxLIinmU59u0r7LXqoJkCzinq3ckNJp3vKEh7jTWN589YQ5+aoAC/TGRLyJLCPKcLQbM8r9g==",
 			"license": "MIT",
 			"engines": {
 				"node": ">=18.17"
@@ -15427,9 +15657,9 @@
 			"license": "ISC"
 		},
 		"node_modules/yaml": {
-			"version": "2.8.3",
-			"resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.3.tgz",
-			"integrity": "sha512-AvbaCLOO2Otw/lW5bmh9d/WEdcDFdQp2Z2ZUH3pX9U2ihyUY0nvLv7J6TrWowklRGPYbB/IuIMfYgxaCPg5Bpg==",
+			"version": "2.8.2",
+			"resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.2.tgz",
+			"integrity": "sha512-mplynKqc1C2hTVYxd0PU2xQAc22TI1vShAYGksCCfxbn/dFwnHTNi1bvYsBTkhdUNtGIf5xNOg938rrSSYvS9A==",
 			"dev": true,
 			"license": "ISC",
 			"bin": {

server/package.json

@@ -5,13 +5,10 @@
 	"main": "index.js",
 	"type": "module",
 	"scripts": {
-		"test": "NODE_OPTIONS=--experimental-vm-modules jest --coverage",
-		"test:unit": "NODE_OPTIONS=--experimental-vm-modules jest --coverage --collectCoverageFrom='src/**/*.ts' test/unit",
-		"test:unit:services": "NODE_OPTIONS=--experimental-vm-modules jest --coverage --collectCoverageFrom='src/service/**/*.ts' test/unit/services test/unit/providers/network test/unit/providers/notifications",
-		"test:integration": "NODE_OPTIONS=--experimental-vm-modules jest --no-coverage test/integration",
+		"test": "NODE_OPTIONS=--experimental-vm-modules c8 jest --runInBand",
 		"dev": "nodemon --exec tsx src/index.js",
 		"start": "node --watch ./dist/index.js",
-		"build": "tsc && tsc-alias && cp -r src/templates dist/templates",
+		"build": "tsc && tsc-alias",
 		"lint": "eslint .",
 		"lint-fix": "eslint --fix .",
 		"format": "prettier --write .",
@@ -32,6 +29,7 @@
 		"@pulsecron/pulse": "1.6.8",
 		"axios": "^1.7.2",
 		"bcryptjs": "3.0.2",
+		"bullmq": "5.41.2",
 		"cacheable-lookup": "7.0.0",
 		"compression": "1.8.1",
 		"cookie-parser": "^1.4.7",
@@ -39,7 +37,7 @@
 		"dockerode": "4.0.6",
 		"dotenv": "^16.4.5",
 		"express": "^4.19.2",
-		"express-rate-limit": "8.3.2",
+		"express-rate-limit": "8.0.1",
 		"gamedig": "5.2.0",
 		"got": "14.4.7",
 		"handlebars": "^4.7.8",
@@ -53,11 +51,11 @@
 		"mjml": "^5.0.0-alpha.4",
 		"mongoose": "^8.3.3",
 		"multer": "^1.4.5-lts.1",
-		"nodemailer": "8.0.5",
+		"nodemailer": "8.0.1",
 		"ping": "0.4.4",
 		"sharp": "0.33.5",
 		"ssl-checker": "2.0.10",
-		"super-simple-scheduler": "1.9.1",
+		"super-simple-scheduler": "1.4.5",
 		"swagger-ui-express": "5.0.1",
 		"winston": "^3.13.0",
 		"ws": "^8.19.0",
@@ -84,6 +82,7 @@
 		"@types/ws": "^8.18.1",
 		"@typescript-eslint/eslint-plugin": "^8.56.1",
 		"@typescript-eslint/parser": "^8.56.1",
+		"c8": "10.1.3",
 		"eslint": "^9.17.0",
 		"eslint-plugin-mocha": "^10.5.0",
 		"esm": "3.2.25",

server/src/app.ts

@@ -4,7 +4,7 @@ import cors from "cors";
 import helmet from "helmet";
 import compression from "compression";
 import cookieParser from "cookie-parser";
-import swaggerUi, { type JsonObject } from "swagger-ui-express";
+import swaggerUi from "swagger-ui-express";
 import { handleErrors } from "@/middleware/handleErrors.js";
 import { generalApiLimiter } from "@/middleware/rateLimiter.js";
 import { sanitizeBody, sanitizeQuery } from "@/middleware/sanitization.js";
@@ -24,7 +24,7 @@ export const createApp = ({
 	controllers: InitializedControllers;
 	envSettings: EnvConfig;
 	frontendPath: string;
-	openApiSpec: JsonObject;
+	openApiSpec: any;
 }) => {
 	const allowedOrigin = envSettings.clientHost;
 	const app = express();

server/src/config/controllers.ts

@@ -31,7 +31,7 @@ export interface InitializedControllers {
 export const initializeControllers = (services: InitializedServices): InitializedControllers => {
 	return {
 		authController: new AuthController(services.userService),
-		monitorController: new MonitorController(services.monitorService, services.notificationsService),
+		monitorController: new MonitorController(services.monitorService),
 		settingsController: new SettingsController(services.settingsService, services.emailService),
 		checkController: new CheckController(services.checkService),
 		geoCheckController: new GeoCheckController(services.geoChecksService),

server/src/config/routes.ts

@@ -1,9 +1,6 @@
-import type { Application } from "express";
 import { createVerifyJWT } from "../middleware/verifyJWT.js";
 import { createVerifyStatusPageAccess } from "../middleware/verifyStatusPageAccess.js";
 import { authApiLimiter } from "../middleware/rateLimiter.js";
-import type { InitializedControllers } from "./controllers.js";
-import type { InitializedServices } from "./services.js";
 
 import AuthRoutes from "../routes/authRoute.js";
 import InviteRoutes from "../routes/inviteRoute.js";
@@ -20,7 +17,7 @@ import NotificationRoutes from "../routes/notificationRoute.js";
 
 import IncidentRoutes from "../routes/incidentRoute.js";
 
-export const setupRoutes = (app: Application, controllers: InitializedControllers, services: InitializedServices) => {
+export const setupRoutes = (app: any, controllers: Record<string, any>, services: Record<string, any>) => {
 	const verifyJWT = createVerifyJWT(services.settingsService);
 	const authRoutes = new AuthRoutes(controllers.authController, verifyJWT);
 	const monitorRoutes = new MonitorRoutes(controllers.monitorController);

server/src/config/services.ts

@@ -27,10 +27,6 @@ import {
 	DiscordProvider,
 	PagerDutyProvider,
 	MatrixProvider,
-	TeamsProvider,
-	TelegramProvider,
-	PushoverProvider,
-	TwilioProvider,
 	// Interfaces
 	INetworkService,
 	IEmailService,
@@ -49,7 +45,6 @@ import {
 	IIncidentService,
 	INotificationMessageBuilder,
 	ISettingsService,
-	SettingsService,
 	EnvConfig,
 } from "@/service/index.js";
 
@@ -96,10 +91,9 @@ import {
 	MongoInvitesRepository,
 	MongoRecoveryTokensRepository,
 	MongoNotificationsRepository,
-	MongoIncidentsRepository,
+	MongoIncidentRepository,
 	MongoTeamsRepository,
 	MongoMaintenanceWindowsRepository,
-	MongoSettingsRepository,
 	IMonitorsRepository,
 	IChecksRepository,
 	IGeoChecksRepository,
@@ -115,7 +109,6 @@ import {
 	IMaintenanceWindowsRepository,
 } from "@/repositories/index.js";
 import { ILogger } from "@/utils/logger.js";
-import { AppError } from "@/utils/AppError.js";
 
 export type InitializedServices = {
 	settingsService: ISettingsService;
@@ -158,63 +151,32 @@ export const initializeServices = async ({
 	logger,
 	envSettings,
 	settingsService,
+	settingsRepository,
 }: {
 	logger: ILogger;
 	envSettings: EnvConfig;
 	settingsService: ISettingsService;
+	settingsRepository: ISettingsRepository;
 }): Promise<InitializedServices> => {
 	// Create DB
 
-	const dbType = envSettings.dbType;
-
-	let db: IDb | null = null;
-
-	if (dbType === "mongodb") {
-		db = new MongoDB(logger, envSettings);
-	}
-
-	if (!db) {
-		throw new AppError({ message: "Unsupported database type", status: 500 });
-	}
+	const db = new MongoDB(logger, envSettings);
 
 	await db.connect();
 
-	let monitorsRepository: IMonitorsRepository;
-	let checksRepository: IChecksRepository;
-	let geoChecksRepository: IGeoChecksRepository;
-	let monitorStatsRepository: IMonitorStatsRepository;
-	let statusPagesRepository: IStatusPagesRepository;
-	let usersRepository: IUsersRepository;
-	let invitesRepository: IInvitesRepository;
-	let recoveryTokensRepository: IRecoveryTokensRepository;
-	let settingsRepository: ISettingsRepository;
-	let notificationsRepository: INotificationsRepository;
-	let incidentsRepository: IIncidentsRepository;
-	let teamsRepository: ITeamsRepository;
-	let maintenanceWindowsRepository: IMaintenanceWindowsRepository;
-
 	// Repositories
-
-	if (dbType === "mongodb") {
-		monitorsRepository = new MongoMonitorsRepository();
-		checksRepository = new MongoChecksRepository(logger);
-		geoChecksRepository = new MongoGeoChecksRepository(logger);
-		monitorStatsRepository = new MongoMonitorStatsRepository();
-		statusPagesRepository = new MongoStatusPagesRepository();
-		usersRepository = new MongoUsersRepository();
-		invitesRepository = new MongoInvitesRepository();
-		recoveryTokensRepository = new MongoRecoveryTokensRepository();
-		settingsRepository = new MongoSettingsRepository();
-		notificationsRepository = new MongoNotificationsRepository();
-		incidentsRepository = new MongoIncidentsRepository();
-		teamsRepository = new MongoTeamsRepository();
-		maintenanceWindowsRepository = new MongoMaintenanceWindowsRepository();
-	} else {
-		throw new AppError({ message: "Unsupported database type", status: 500 });
-	}
-
-	// Inject settings repository into settings service (now that DB is connected)
-	(settingsService as SettingsService).setRepository(settingsRepository);
+	const monitorsRepository = new MongoMonitorsRepository();
+	const checksRepository = new MongoChecksRepository(logger);
+	const geoChecksRepository = new MongoGeoChecksRepository(logger);
+	const monitorStatsRepository = new MongoMonitorStatsRepository();
+	const statusPagesRepository = new MongoStatusPagesRepository();
+	const usersRepository = new MongoUsersRepository();
+	const invitesRepository = new MongoInvitesRepository();
+	const recoveryTokensRepository = new MongoRecoveryTokensRepository();
+	const notificationsRepository = new MongoNotificationsRepository();
+	const incidentsRepository = new MongoIncidentRepository();
+	const teamsRepository = new MongoTeamsRepository();
+	const maintenanceWindowsRepository = new MongoMaintenanceWindowsRepository();
 
 	// Network providers
 	const pingProvider = new PingProvider(ping);
@@ -266,10 +228,6 @@ export const initializeServices = async ({
 	const discordProvider = new DiscordProvider(logger);
 	const pagerDutyProvider = new PagerDutyProvider(logger);
 	const matrixProvider = new MatrixProvider(logger);
-	const teamsProvider = new TeamsProvider(logger);
-	const telegramProvider = new TelegramProvider(logger);
-	const pushoverProvider = new PushoverProvider(logger);
-	const twilioProvider = new TwilioProvider(logger);
 
 	const notificationsService = new NotificationsService(
 		notificationsRepository,
@@ -280,10 +238,6 @@ export const initializeServices = async ({
 		discordProvider,
 		pagerDutyProvider,
 		matrixProvider,
-		teamsProvider,
-		telegramProvider,
-		pushoverProvider,
-		twilioProvider,
 		settingsService,
 		logger,
 		notificationMessageBuilder
@@ -295,7 +249,6 @@ export const initializeServices = async ({
 		statusService,
 		notificationsService,
 		checkService,
-		settingsService,
 		bufferService,
 		incidentService,
 		maintenanceWindowsRepository,
@@ -338,6 +291,7 @@ export const initializeServices = async ({
 	});
 	const monitorService = new MonitorService({
 		jobQueue: superSimpleQueue,
+		emailService,
 		logger,
 		games,
 		monitorsRepository,

server/src/controllers/authController.ts

@@ -1,6 +1,7 @@
 import { Request, Response, NextFunction } from "express";
 import { AppError } from "@/utils/AppError.js";
-import { requireTeamId, requireUserEmail, requireUserId, requireUserRoles } from "@/controllers/controllerUtils.js";
+import { requireTeamId, requireUserRoles } from "./controllerUtils.js";
+import type { UserRole } from "@/types/user.js";
 
 import {
 	registrationBodyValidation,
@@ -19,33 +20,15 @@ import {
 	editSuperadminUserByIdBodyValidation,
 	editUserPasswordByIdBodyValidation,
 } from "@/validation/userValidation.js";
-import { IUserService } from "@/service/index.js";
 
 const SERVICE_NAME = "authController";
 
-export interface IAuthController {
-	registerUser(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-	createUser(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-	loginUser(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-	editUser(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-	checkSuperadminExists(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-	requestRecovery(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-	validateRecovery(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-	resetPassword(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-	deleteUser(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-	deleteUserById(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-	getAllUsers(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-	getUserById(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-	editUserById(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-	editUserPasswordById(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-}
-
-class AuthController implements IAuthController {
+class AuthController {
 	static SERVICE_NAME = SERVICE_NAME;
 
-	private userService: IUserService;
+	private userService: any;
 
-	constructor(userService: IUserService) {
+	constructor(userService: any) {
 		this.userService = userService;
 	}
 
@@ -58,12 +41,11 @@ class AuthController implements IAuthController {
 			const newUser = req.body.user;
 			const newUserToken = req.body.token;
 			if (newUser?.email) {
-				const newUserEmail = requireUserEmail(newUser.email);
-				newUser.email = newUserEmail.toLowerCase();
+				newUser.email = newUser.email.toLowerCase();
 			}
-			const validatedBody = registrationBodyValidation.parse(newUser);
+			registrationBodyValidation.parse(newUser);
 
-			const { user, token } = await this.userService.registerUser(validatedBody, newUserToken, req?.file ?? null);
+			const { user, token } = await this.userService.registerUser(newUser, newUserToken, req.file);
 			res.status(200).json({
 				success: true,
 				msg: "User registered successfully",
@@ -80,11 +62,11 @@ class AuthController implements IAuthController {
 			if (userData?.email) {
 				userData.email = userData.email.toLowerCase();
 			}
-			const validatedBody = createUserBodyValidation.parse(userData);
+			createUserBodyValidation.parse(userData);
 
 			const teamId = requireTeamId(req.user?.teamId);
-			const actorRoles = requireUserRoles(req.user?.role);
-			const newUser = await this.userService.createUser(validatedBody, teamId, actorRoles, req?.file ?? null);
+			const actorRoles = requireUserRoles(req.user?.role) as UserRole[];
+			const newUser = await this.userService.createUser(userData, teamId, actorRoles, req.file);
 			res.status(201).json({
 				success: true,
 				msg: "User created successfully",
@@ -118,10 +100,8 @@ class AuthController implements IAuthController {
 
 	editUser = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedBody = editUserBodyValidation.parse(req.body);
-			const userId = requireUserId(req.user?.id);
-			const userEmail = requireUserEmail(req.user?.email);
-			const updatedUser = await this.userService.editUser(validatedBody, req?.file ?? null, userId, userEmail);
+			editUserBodyValidation.parse(req.body);
+			const updatedUser = await this.userService.editUser(req.body, req.file, req.user);
 
 			res.status(200).json({
 				success: true,
@@ -190,15 +170,7 @@ class AuthController implements IAuthController {
 
 	deleteUser = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const userId = requireUserId(req.user?.id);
-			const teamId = requireTeamId(req.user?.teamId);
-			const roles = requireUserRoles(req.user?.role);
-
-			await this.userService.deleteUser({
-				userId,
-				teamId,
-				roles,
-			});
+			await this.userService.deleteUser(req.user);
 			return res.status(200).json({
 				success: true,
 				msg: "User deleted successfully",
@@ -210,12 +182,9 @@ class AuthController implements IAuthController {
 
 	deleteUserById = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedParams = getUserByIdParamValidation.parse(req.params);
-			const targetUserId = validatedParams.userId;
-			const actorId = requireUserId(req.user?.id);
-			const actorTeamId = requireTeamId(req.user?.teamId);
-			const actorRoles = requireUserRoles(req.user?.role);
-			await this.userService.deleteUserById({ actorId, actorTeamId, actorRoles, targetUserId });
+			getUserByIdParamValidation.parse(req.params);
+			const targetUserId = req.params.userId;
+			await this.userService.deleteUserById(req.user, targetUserId);
 			return res.status(200).json({
 				success: true,
 				msg: "User removed successfully",
@@ -240,9 +209,19 @@ class AuthController implements IAuthController {
 
 	getUserById = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedParams = getUserByIdParamValidation.parse(req.params);
-			const actorRoles = requireUserRoles(req.user?.role);
-			const user = await this.userService.getUserById(actorRoles, validatedParams.userId);
+			getUserByIdParamValidation.parse(req.params);
+			const userId = req?.params?.userId;
+			const roles = req?.user?.role;
+
+			if (!userId) {
+				throw new Error("No user ID in request");
+			}
+
+			if (!roles || roles.length === 0) {
+				throw new Error("No roles in request");
+			}
+
+			const user = await this.userService.getUserById(roles, userId);
 
 			return res.status(200).json({ success: true, msg: "ok", data: user });
 		} catch (error) {
@@ -252,19 +231,24 @@ class AuthController implements IAuthController {
 
 	editUserById = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const actorRoles = requireUserRoles(req.user?.role);
-			const actorId = requireUserId(req.user?.id);
+			const roles = req?.user?.role;
 
-			if (!actorRoles.includes("superadmin")) {
+			if (!roles || !roles.includes("superadmin")) {
 				throw new AppError({ message: "Unauthorized", status: 403 });
 			}
 
-			const validatedParams = editUserByIdParamValidation.parse(req.params);
-			// If this is superadmin self edit, allow "superadmin" role
-			const validatedBody =
-				validatedParams.userId === actorId ? editSuperadminUserByIdBodyValidation.parse(req.body) : editUserByIdBodyValidation.parse(req.body);
+			const userId = req.params.userId as string;
+			const user = { ...req.body };
 
-			await this.userService.editUserById(validatedParams.userId, validatedBody);
+			editUserByIdParamValidation.parse(req.params);
+			// If this is superadmin self edit, allow "superadmin" role
+			if (userId === req.user?.id) {
+				editSuperadminUserByIdBodyValidation.parse(req.body);
+			} else {
+				editUserByIdBodyValidation.parse(req.body);
+			}
+
+			await this.userService.editUserById(userId, user);
 			return res.status(200).json({ success: true, msg: "ok" });
 		} catch (error) {
 			next(error);
@@ -273,14 +257,16 @@ class AuthController implements IAuthController {
 
 	editUserPasswordById = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const actorRoles = requireUserRoles(req.user?.role);
-			if (!actorRoles.includes("superadmin")) {
+			const roles = req?.user?.role;
+			if (!roles || !roles.includes("superadmin")) {
 				throw new AppError({ message: "Unauthorized", status: 403 });
 			}
 
-			const validatedParams = editUserByIdParamValidation.parse(req.params);
-			const validatedBody = editUserPasswordByIdBodyValidation.parse(req.body);
-			await this.userService.setPasswordByUserId(validatedParams.userId, validatedBody.password);
+			const userId = req.params.userId as string;
+			editUserByIdParamValidation.parse(req.params);
+			editUserPasswordByIdBodyValidation.parse(req.body);
+			const updatedPassword = req.body.password;
+			await this.userService.setPasswordByUserId(userId, updatedPassword);
 			return res.status(200).json({ success: true, msg: "Password reset successfully" });
 		} catch (error) {
 			next(error);

server/src/controllers/checkController.ts

@@ -4,28 +4,18 @@ import {
 	getChecksParamValidation,
 	getChecksQueryValidation,
 	getTeamChecksQueryValidation,
-	getChecksSummaryByTeamIdQueryValidation,
 	deleteChecksParamValidation,
+	deleteChecksByTeamIdParamValidation,
+	updateChecksTTLBodyValidation,
 } from "@/validation/checkValidation.js";
-import { ICheckService } from "@/service/index.js";
-import { requireTeamId } from "@/controllers/controllerUtils.js";
 
 const SERVICE_NAME = "checkController";
 
-export interface ICheckController {
-	serviceName: string;
-	getChecksByMonitor: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	getChecksByTeam: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	getChecksSummaryByTeamId: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	deleteChecks: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	deleteChecksByTeamId: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-}
-
-class CheckController implements ICheckController {
+class CheckController {
 	static SERVICE_NAME = SERVICE_NAME;
 
-	private checkService: ICheckService;
-	constructor(checkService: ICheckService) {
+	private checkService: any;
+	constructor(checkService: any) {
 		this.checkService = checkService;
 	}
 
@@ -35,20 +25,13 @@ class CheckController implements ICheckController {
 
 	getChecksByMonitor = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedParams = getChecksParamValidation.parse(req.params);
-			const validatedQuery = getChecksQueryValidation.parse(req.query);
-
-			const teamId = requireTeamId(req.user?.teamId);
+			getChecksParamValidation.parse(req.params);
+			getChecksQueryValidation.parse(req.query);
 
 			const result = await this.checkService.getChecksByMonitor({
-				monitorId: validatedParams.monitorId,
-				teamId,
-				sortOrder: validatedQuery.sortOrder,
-				dateRange: validatedQuery.dateRange,
-				filter: validatedQuery.filter,
-				page: validatedQuery.page,
-				rowsPerPage: validatedQuery.rowsPerPage,
-				status: validatedQuery.status,
+				monitorId: req?.params?.monitorId,
+				query: req?.query,
+				teamId: req?.user?.teamId,
 			});
 
 			return res.status(200).json({
@@ -63,16 +46,10 @@ class CheckController implements ICheckController {
 
 	getChecksByTeam = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedQuery = getTeamChecksQueryValidation.parse(req.query);
-			const teamId = requireTeamId(req.user?.teamId);
-
+			getTeamChecksQueryValidation.parse(req.query);
 			const checkData = await this.checkService.getChecksByTeam({
-				teamId,
-				sortOrder: validatedQuery.sortOrder,
-				dateRange: validatedQuery.dateRange,
-				page: validatedQuery.page,
-				rowsPerPage: validatedQuery.rowsPerPage,
-				filter: validatedQuery.filter,
+				teamId: req?.user?.teamId,
+				query: req?.query,
 			});
 			return res.status(200).json({
 				success: true,
@@ -86,11 +63,8 @@ class CheckController implements ICheckController {
 
 	getChecksSummaryByTeamId = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedQuery = getChecksSummaryByTeamIdQueryValidation.parse(req.query);
-			const teamId = requireTeamId(req.user?.teamId);
-			const dateRange = validatedQuery.dateRange ?? "hour";
-
-			const summary = await this.checkService.getChecksSummaryByTeamId({ teamId, dateRange });
+			const dateRange = req.query?.dateRange || "hour";
+			const summary = await this.checkService.getChecksSummaryByTeamId({ teamId: req?.user?.teamId, dateRange });
 			return res.status(200).json({
 				success: true,
 				msg: "Checks summary retrieved successfully",
@@ -103,12 +77,11 @@ class CheckController implements ICheckController {
 
 	deleteChecks = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedParams = deleteChecksParamValidation.parse(req.params);
-			const teamId = requireTeamId(req.user?.teamId);
+			deleteChecksParamValidation.parse(req.params);
 
 			const deletedCount = await this.checkService.deleteChecks({
-				monitorId: validatedParams.monitorId,
-				teamId,
+				monitorId: req.params.monitorId as string,
+				teamId: req?.user?.teamId,
 			});
 
 			return res.status(200).json({
@@ -123,9 +96,9 @@ class CheckController implements ICheckController {
 
 	deleteChecksByTeamId = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const teamId = requireTeamId(req.user?.teamId);
+			deleteChecksByTeamIdParamValidation.parse(req.params);
 
-			const deletedCount = await this.checkService.deleteChecksByTeamId({ teamId });
+			const deletedCount = await this.checkService.deleteChecksByTeamId({ teamId: req?.user?.teamId });
 
 			return res.status(200).json({
 				success: true,
@@ -136,6 +109,24 @@ class CheckController implements ICheckController {
 			next(error);
 		}
 	};
+
+	updateChecksTTL = async (req: Request, res: Response, next: NextFunction) => {
+		try {
+			updateChecksTTLBodyValidation.parse(req.body);
+
+			await this.checkService.updateChecksTTL({
+				teamId: req?.user?.teamId,
+				ttl: req?.body?.ttl,
+			});
+
+			return res.status(200).json({
+				success: true,
+				msg: "Checks TTL updated successfully",
+			});
+		} catch (error) {
+			next(error);
+		}
+	};
 }
 
 export default CheckController;

server/src/controllers/controllerUtils.ts

@@ -1,25 +1,24 @@
 import { AppError } from "@/utils/AppError.js";
-import { Monitor, type MonitorType, MonitorTypes, UserRole } from "@/types/index.js";
-import sslChecker, { SSLDetails } from "ssl-checker";
-type SSLCheckerType = typeof sslChecker;
+import { type MonitorType, MonitorTypes } from "@/types/index.js";
 
-export const fetchMonitorCertificate = async (checker: SSLCheckerType, monitor: Monitor): Promise<SSLDetails> => {
+const fetchMonitorCertificate = async (sslChecker: any, monitor: any): Promise<any> => {
 	const monitorUrl = new URL(monitor.url);
 	const hostname = monitorUrl.hostname;
-	const cert = await checker(hostname);
+	const cert = await sslChecker(hostname);
+	// Throw an error if no cert or if cert.validTo is not present
 	if (cert?.validTo === null || cert?.validTo === undefined) {
 		throw new Error("Certificate not found");
 	}
 	return cert;
 };
-export const requireString = (value: unknown, fieldName: string): string => {
+const requireString = (value: unknown, fieldName: string): string => {
 	if (typeof value === "string" && value.trim().length > 0) {
 		return value;
 	}
 	throw new AppError({ message: `${fieldName} is required`, status: 400 });
 };
 
-export const optionalString = (value: unknown, fieldName: string): string | undefined => {
+const optionalString = (value: unknown, fieldName: string): string | undefined => {
 	if (value === undefined) {
 		return undefined;
 	}
@@ -29,15 +28,7 @@ export const optionalString = (value: unknown, fieldName: string): string | unde
 	throw new AppError({ message: `${fieldName} must be a string`, status: 400 });
 };
 
-export const extractString = (value: unknown): string | undefined => {
-	const candidate = Array.isArray(value) ? value[0] : value;
-	if (typeof candidate !== "string" || candidate.length === 0) {
-		return undefined;
-	}
-	return candidate;
-};
-
-export const optionalNumber = (value: unknown, fieldName: string): number | undefined => {
+const optionalNumber = (value: unknown, fieldName: string): number | undefined => {
 	if (value === undefined) {
 		return undefined;
 	}
@@ -53,7 +44,7 @@ export const optionalNumber = (value: unknown, fieldName: string): number | unde
 	throw new AppError({ message: `${fieldName} must be a number`, status: 400 });
 };
 
-export const optionalBoolean = (value: unknown, fieldName: string): boolean | undefined => {
+const optionalBoolean = (value: unknown, fieldName: string): boolean | undefined => {
 	if (value === undefined) {
 		return undefined;
 	}
@@ -71,7 +62,7 @@ export const optionalBoolean = (value: unknown, fieldName: string): boolean | un
 	throw new AppError({ message: `${fieldName} must be a boolean`, status: 400 });
 };
 
-export const parseMonitorTypeFilter = (value: unknown): MonitorType | MonitorType[] | undefined => {
+const parseMonitorTypeFilter = (value: unknown): MonitorType | MonitorType[] | undefined => {
 	const parseSingle = (input: unknown): MonitorType => {
 		if (typeof input !== "string") {
 			throw new AppError({ message: "Monitor type must be a string", status: 400 });
@@ -91,7 +82,7 @@ export const parseMonitorTypeFilter = (value: unknown): MonitorType | MonitorTyp
 	return parseSingle(value);
 };
 
-export const parseSortOrder = (value: unknown): "asc" | "desc" | undefined => {
+const parseSortOrder = (value: unknown): "asc" | "desc" | undefined => {
 	if (value === undefined) {
 		return undefined;
 	}
@@ -101,36 +92,42 @@ export const parseSortOrder = (value: unknown): "asc" | "desc" | undefined => {
 	throw new AppError({ message: "order must be either 'asc' or 'desc'", status: 400 });
 };
 
-export const requireTeamId = (teamId?: string): string => {
+const requireTeamId = (teamId?: string): string => {
 	if (!teamId) {
 		throw new AppError({ message: "Team ID is required", status: 400 });
 	}
 	return teamId;
 };
 
-export const requireUserId = (userId?: string): string => {
+const requireUserId = (userId?: string): string => {
 	if (!userId) {
 		throw new AppError({ message: "User ID is required", status: 400 });
 	}
 	return userId;
 };
-export const requireUserEmail = (userEmail?: string): string => {
+const requireUserEmail = (userEmail?: string): string => {
 	if (!userEmail) {
 		throw new AppError({ message: "User email is required", status: 400 });
 	}
 	return userEmail;
 };
 
-export const requireFirstName = (firstName?: string): string => {
-	if (!firstName) {
-		throw new AppError({ message: "First name is required", status: 400 });
-	}
-	return firstName;
-};
-
-export const requireUserRoles = (userRoles?: UserRole[]): UserRole[] => {
+export const requireUserRoles = (userRoles?: string[]): string[] => {
 	if (!userRoles || userRoles.length === 0) {
 		throw new AppError({ message: "User roles are required", status: 400 });
 	}
 	return userRoles;
 };
+
+export {
+	fetchMonitorCertificate,
+	requireString,
+	optionalString,
+	optionalNumber,
+	optionalBoolean,
+	parseMonitorTypeFilter,
+	parseSortOrder,
+	requireTeamId,
+	requireUserId,
+	requireUserEmail,
+};

server/src/controllers/diagnosticController.ts

@@ -1,18 +1,12 @@
-import { IDiagnosticService } from "@/service/index.js";
 import { Request, Response, NextFunction } from "express";
 
 const SERVICE_NAME = "diagnosticController";
-
-export interface IDiagnosticController {
-	getSystemStats: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-}
-
-class DiagnosticController implements IDiagnosticController {
+class DiagnosticController {
 	static SERVICE_NAME = SERVICE_NAME;
 
-	private diagnosticService: IDiagnosticService;
+	private diagnosticService: any;
 
-	constructor(diagnosticService: IDiagnosticService) {
+	constructor(diagnosticService: any) {
 		this.diagnosticService = diagnosticService;
 	}
 

server/src/controllers/geoCheckController.ts

@@ -1,15 +1,10 @@
 import { Request, Response, NextFunction } from "express";
 import { getChecksParamValidation, getChecksQueryValidation } from "@/validation/checkValidation.js";
 import type { IGeoChecksService } from "@/service/business/geoChecksService.js";
-import { requireTeamId } from "./controllerUtils.js";
-import { AppError } from "@/utils/AppError.js";
 
 const SERVICE_NAME = "geoCheckController";
 
-export interface IGeoCheckController {
-	getGeoChecksByMonitor: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-}
-class GeoCheckController implements IGeoCheckController {
+class GeoCheckController {
 	static SERVICE_NAME = SERVICE_NAME;
 
 	private geoChecksService: IGeoChecksService;
@@ -23,19 +18,13 @@ class GeoCheckController implements IGeoCheckController {
 
 	getGeoChecksByMonitor = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedParams = getChecksParamValidation.parse(req.params);
-			const validatedQuery = getChecksQueryValidation.parse(req.query);
-
-			const teamId = requireTeamId(req.user?.teamId);
+			getChecksParamValidation.parse(req.params);
+			getChecksQueryValidation.parse(req.query);
 
 			const result = await this.geoChecksService.getGeoChecksByMonitor({
-				monitorId: validatedParams.monitorId,
-				teamId: teamId,
-				sortOrder: validatedQuery.sortOrder,
-				dateRange: validatedQuery.dateRange,
-				page: validatedQuery.page,
-				rowsPerPage: validatedQuery.rowsPerPage,
-				continent: validatedQuery.continent,
+				monitorId: req?.params?.monitorId as string,
+				query: req?.query,
+				teamId: req?.user?.teamId as string,
 			});
 
 			return res.status(200).json({

server/src/controllers/incidentController.ts

@@ -1,37 +1,35 @@
 import { AppError } from "@/utils/AppError.js";
 import { Request, Response, NextFunction } from "express";
-import { requireTeamId, requireUserId, requireUserEmail, extractString } from "./controllerUtils.js";
-import { IIncidentService } from "@/service/index.js";
-import { getIncidentsByTeamQueryValidation, getIncidentSummaryQueryValidation } from "@/validation/incidentValidation.js";
+import { requireTeamId, requireUserId, requireUserEmail } from "./controllerUtils.js";
 
-const SERVICE_NAME = "IncidentController";
+const SERVICE_NAME = "incidentController";
 
-export interface IIncidentController {
-	getIncidentsByTeam: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	getIncidentSummary: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	getIncidentById: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	resolveIncidentManually: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-}
-class IncidentController implements IIncidentController {
-	private incidentService: IIncidentService;
-	constructor(incidentService: IIncidentService) {
+class IncidentController {
+	static SERVICE_NAME = SERVICE_NAME;
+
+	private incidentService: any;
+	constructor(incidentService: any) {
 		this.incidentService = incidentService;
 	}
 
+	get serviceName() {
+		return IncidentController.SERVICE_NAME;
+	}
+
 	getIncidentsByTeam = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedQuery = getIncidentsByTeamQueryValidation.parse(req.query);
+			const { sortOrder, dateRange, page, rowsPerPage, status, monitorId, resolutionType } = req.query || {};
 
 			const teamId = requireTeamId(req.user?.teamId);
 			const result = await this.incidentService.getIncidentsByTeam(
 				teamId,
-				validatedQuery.sortOrder,
-				validatedQuery.dateRange,
-				validatedQuery.page,
-				validatedQuery.rowsPerPage,
-				validatedQuery.status,
-				validatedQuery.monitorId,
-				validatedQuery.resolutionType
+				sortOrder,
+				dateRange,
+				page,
+				rowsPerPage,
+				status,
+				monitorId,
+				resolutionType
 			);
 
 			return res.status(200).json({
@@ -47,9 +45,10 @@ class IncidentController implements IIncidentController {
 	getIncidentSummary = async (req: Request, res: Response, next: NextFunction) => {
 		try {
 			const teamId = requireTeamId(req.user?.teamId);
-			const validatedQuery = getIncidentSummaryQueryValidation.parse(req.query);
 
-			const summary = await this.incidentService.getIncidentSummary(teamId, validatedQuery.limit);
+			const limit = req.query.limit ? parseInt(req.query.limit as string, 10) : 10;
+
+			const summary = await this.incidentService.getIncidentSummary(teamId, limit);
 			return res.status(200).json({
 				success: true,
 				msg: "Incident summary retrieved successfully",
@@ -85,13 +84,12 @@ class IncidentController implements IIncidentController {
 			const teamId = requireTeamId(req.user?.teamId);
 			const userId = requireUserId(req.user?.id);
 			const userEmail = requireUserEmail(req.user?.email);
-			const incidentId = extractString(req.params?.incidentId);
+			const incidentId = req.params?.incidentId;
 			if (!incidentId) {
 				throw new AppError({ message: "Incident ID is required", service: SERVICE_NAME, status: 400 });
 			}
 
-			const comment = extractString(req.body?.comment);
-			const resolvedIncident = await this.incidentService.resolveIncident(incidentId, userId, teamId, comment, userEmail);
+			const resolvedIncident = await this.incidentService.resolveIncident(incidentId, userId, teamId, req?.body?.comment, userEmail);
 
 			return res.status(200).json({
 				success: true,

server/src/controllers/inviteController.ts

@@ -1,19 +1,12 @@
 import { Request, Response, NextFunction } from "express";
 import { inviteBodyValidation, inviteVerificationBodyValidation } from "@/validation/authValidation.js";
-import { requireFirstName, requireTeamId, requireUserRoles } from "@/controllers/controllerUtils.js";
-import { IInviteService } from "@/service/index.js";
+import { requireTeamId, requireUserRoles } from "@/controllers/controllerUtils.js";
 const SERVICE_NAME = "inviteController";
 
-export interface IInviteController {
-	getInviteToken: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	sendInviteEmail: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	verifyInviteToken: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-}
-
-class InviteController implements IInviteController {
+class InviteController {
 	static SERVICE_NAME = SERVICE_NAME;
-	private inviteService: IInviteService;
-	constructor(inviteService: IInviteService) {
+	private inviteService: any;
+	constructor(inviteService: any) {
 		this.inviteService = inviteService;
 	}
 
@@ -41,9 +34,8 @@ class InviteController implements IInviteController {
 
 	sendInviteEmail = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const teamId = requireTeamId(req.user?.teamId);
-			const userRoles = requireUserRoles(req.user?.role);
-			const firstName = requireFirstName(req.user?.firstName);
+			const teamId = requireTeamId(req?.user?.teamId);
+			const userRoles = requireUserRoles(req?.user?.role);
 
 			const inviteRequest = req.body;
 			inviteRequest.teamId = teamId;
@@ -51,7 +43,7 @@ class InviteController implements IInviteController {
 
 			const inviteToken = await this.inviteService.sendInviteEmail({
 				invite: inviteRequest,
-				firstName,
+				firstName: req?.user?.firstName,
 				userRoles,
 			});
 			return res.status(200).json({

server/src/controllers/logController.ts

@@ -1,16 +1,11 @@
-import { ILogger } from "@/utils/logger.js";
 import { Request, Response, NextFunction } from "express";
 
 const SERVICE_NAME = "LogController";
 
-export interface ILogController {
-	getLogs: (req: Request, res: Response, next: NextFunction) => Promise<void>;
-}
-
 class LogController {
 	static SERVICE_NAME = SERVICE_NAME;
-	private logger: ILogger;
-	constructor(logger: ILogger) {
+	private logger: any;
+	constructor(logger: any) {
 		this.logger = logger;
 	}
 	get serviceName() {
@@ -19,7 +14,7 @@ class LogController {
 
 	getLogs = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const logs = this.logger.getLogs();
+			const logs = await this.logger.getLogs();
 			res.status(200).json({
 				success: true,
 				msg: "Logs fetched successfully",