remove dead check

fix: Incident Controller/Service typing

README.md

@@ -46,11 +46,11 @@ You can see the latest build of [Checkmate](https://checkmate-demo.bluewavelabs.
 
 ## User's guide
 
-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! :)
+Usage instructions can be found [here](https://checkmate.so/docs). 
 
 ## Installation
 
-See installation instructions in [Checkmate documentation portal](https://docs.checkmate.so/checkmate-2.1/users-guide/quickstart). 
+See installation instructions in [Checkmate documentation portal](https://checkmate.so/docs). 
 
 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.
 
@@ -157,12 +157,11 @@ 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. 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).
+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).
 
 <a href="https://github.com/bluewave-labs/checkmate/graphs/contributors">
   <img src="https://contrib.rocks/image?repo=bluewave-labs/checkmate" />
@@ -175,9 +174,3 @@ Here's how you can contribute:
 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

@@ -44,7 +44,7 @@
 				"redux-persist": "6.0.0",
 				"swr": "^2.3.6",
 				"vite-plugin-svgr": "^4.2.0",
-				"zod": "^4.1.11"
+				"zod": "^4.3.6"
 			},
 			"devDependencies": {
 				"@types/node": "24.5.2",
@@ -7359,6 +7359,8 @@
 		},
 		"node_modules/zod": {
 			"version": "4.3.6",
+			"resolved": "https://registry.npmjs.org/zod/-/zod-4.3.6.tgz",
+			"integrity": "sha512-rftlrkhHZOcjDwkGlnUtZZkvaPHCsDATp4pGpuOOMDaTdDDXF91wuVDJoWoPsKX/3YPQ5fHuF3STjcYyKr+Qhg==",
 			"license": "MIT",
 			"funding": {
 				"url": "https://github.com/sponsors/colinhacks"

client/package.json

@@ -13,7 +13,7 @@
 		"format-check": "prettier --check ."
 	},
 	"lint-staged": {
-		"**/*": "npm run format"
+		"**/*": "prettier --write"
 	},
 	"dependencies": {
 		"@emotion/react": "^11.13.3",
@@ -52,7 +52,7 @@
 		"redux-persist": "6.0.0",
 		"swr": "^2.3.6",
 		"vite-plugin-svgr": "^4.2.0",
-		"zod": "^4.1.11"
+		"zod": "^4.3.6"
 	},
 	"devDependencies": {
 		"@types/node": "24.5.2",

client/src/Components/inputs/Slider.tsx

@@ -11,20 +11,26 @@ 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, ...props }, ref) => {
+	({ sx, showValue = false, formatDisplayValue, ...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>{props.value}</Typography>}
+				{showValue && <Typography>{displayValue}</Typography>}
 				<Slider
 					{...props}
 					ref={ref}
@@ -63,12 +69,21 @@ 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, value, sliderMaxWidth = "100%", ...props },
+		{
+			fieldLabel,
+			required,
+			showValue = true,
+			formatDisplayValue,
+			value,
+			sliderMaxWidth = "100%",
+			...props
+		},
 		ref
 	) => {
 		const theme = useTheme();
@@ -82,6 +97,7 @@ export const SliderWithLabel = forwardRef<HTMLSpanElement, SliderWithLabelProps>
 					<SliderInput
 						{...props}
 						showValue={showValue}
+						formatDisplayValue={formatDisplayValue}
 						value={value}
 						ref={ref}
 					/>

client/src/Components/layout/AppLayout.tsx

@@ -1,9 +1,6 @@
 import Box from "@mui/material/Box";
 import { useState, useEffect, useRef } from "react";
 import { useTheme } from "@mui/material/styles";
-import { useSelector } from "react-redux";
-import BackgroundSVG from "@/assets/Images/background.svg";
-import type { RootState } from "@/Types/state";
 import { OfflineBanner } from "@/Components/design-elements";
 import { setServerUnreachableCallback, get } from "@/Utils/ApiClient";
 
@@ -13,7 +10,6 @@ interface AppLayoutProps {
 
 const AppLayout = ({ children }: AppLayoutProps) => {
 	const theme = useTheme();
-	const mode = useSelector((state: RootState) => state.ui.mode);
 	const [serverUnreachable, setServerUnreachable] = useState(false);
 	const retryIntervalRef = useRef<number | null>(null);
 
@@ -47,10 +43,6 @@ const AppLayout = ({ children }: AppLayoutProps) => {
 			sx={{
 				minHeight: "100vh",
 				backgroundColor: theme.palette.background.default,
-				backgroundImage: mode === "dark" ? `url("${BackgroundSVG}")` : "none",
-				backgroundSize: "100% 100%",
-				backgroundPosition: "center",
-				backgroundRepeat: "no-repeat",
 			}}
 		>
 			<OfflineBanner visible={serverUnreachable} />

client/src/Components/monitors/ControlsFilter.tsx

@@ -7,7 +7,7 @@ import type { MonitorType } from "@/Types/Monitor";
 import { Typography, useTheme } from "@mui/material";
 import { useTranslation } from "react-i18next";
 
-const types = ["http", "ping", "port", "docker", "game", "grpc"];
+const types = ["http", "ping", "port", "docker", "game", "grpc", "websocket"];
 const typeDisplayNames: Record<string, string> = {
 	http: "HTTP",
 	ping: "Ping",
@@ -15,6 +15,7 @@ const typeDisplayNames: Record<string, string> = {
 	docker: "Docker",
 	game: "Game",
 	grpc: "gRPC",
+	websocket: "WebSocket",
 };
 const statuses = ["up", "down"];
 const states = ["active", "paused"];

client/src/Hooks/useMonitorForm.ts

@@ -103,6 +103,14 @@ export const useMonitorForm = ({
 					selectedDisks: data?.selectedDisks || [],
 				};
 				break;
+			case "websocket":
+				defaults = {
+					...base,
+					type: "websocket",
+					url: data?.url || "",
+					ignoreTlsErrors: data?.ignoreTlsErrors || false,
+				};
+				break;
 			default:
 				defaults = {
 					...base,

client/src/Pages/Account/EditUser/index.tsx

@@ -11,12 +11,17 @@ import { ConfigBox, BasePage } from "@/Components/design-elements";
 import { UserRoles } from "@/Types/User";
 import { useTranslation } from "react-i18next";
 import type { UserRole, User } from "@/Types/User";
-import { useParams } from "react-router-dom";
+import { useParams, useNavigate } from "react-router-dom";
 import { useTheme } from "@mui/material";
 import { useEditUserForm } from "@/Hooks/useEditUserForm";
-import { useGet, usePatch } from "@/Hooks/UseApi";
+import { useGet, usePatch, useDelete } from "@/Hooks/UseApi";
 import type { EditUserFormData } from "@/Validation/editUser";
-import { useEffect } from "react";
+import { useEffect, useState } from "react";
+import { DialogInput } from "@/Components/inputs/Dialog";
+import { useSelector } from "react-redux";
+import type { RootState } from "@/Types/state";
+import { LAYOUT } from "@/Utils/Theme/constants";
+import { useIsAdmin, useIsSuperAdmin } from "@/Hooks/useIsAdmin";
 
 interface RoleOption {
 	id: UserRole;
@@ -29,6 +34,12 @@ const EditUserPage = () => {
 	const { userId } = useParams<{ userId: string }>();
 	const { resolver, defaults } = useEditUserForm();
 	const { patch, loading: isSaving } = usePatch();
+	const { deleteFn, loading: isDeleting } = useDelete();
+	const navigate = useNavigate();
+	const [showDeleteDialog, setShowDeleteDialog] = useState(false);
+	const currentUser = useSelector((state: RootState) => state.auth.user);
+	const isSuperAdmin = useIsSuperAdmin();
+	const isAdmin = useIsAdmin();
 
 	const { data: user, isLoading } = useGet<User>(`/auth/users/${userId}`);
 
@@ -60,6 +71,20 @@ const EditUserPage = () => {
 		setValue("role", newRoles, { shouldValidate: true });
 	};
 
+	const canDeleteUser =
+		isAdmin &&
+		userId !== currentUser?.id &&
+		!user?.role?.includes("demo") &&
+		(isSuperAdmin || user?.role?.every((r) => r !== "admin" && r !== "superadmin"));
+
+	const handleDeleteUser = async () => {
+		const result = await deleteFn(`/auth/users/${userId}`);
+		setShowDeleteDialog(false);
+		if (result) {
+			navigate("/account", { state: { tab: "team" } });
+		}
+	};
+
 	const onSubmit = async (data: EditUserFormData) => {
 		await patch(`/auth/users/${userId}`, data);
 	};
@@ -165,17 +190,45 @@ const EditUserPage = () => {
 							</Stack>
 						}
 					/>
-					<Button
-						type="submit"
-						variant="contained"
-						color="primary"
-						loading={isSaving}
-						sx={{ alignSelf: "flex-end", minWidth: 100 }}
+					<Stack
+						gap={LAYOUT.XS}
+						direction="row"
+						justifyContent={"flex-end"}
+						width="100%"
 					>
-						{t("common.buttons.save")}
-					</Button>
+						{canDeleteUser && (
+							<Button
+								variant="contained"
+								color="error"
+								onClick={() => setShowDeleteDialog(true)}
+								sx={{ minWidth: 100 }}
+							>
+								{t("common.buttons.removeUser")}
+							</Button>
+						)}
+						<Button
+							type="submit"
+							variant="contained"
+							color="primary"
+							loading={isSaving}
+							sx={{ minWidth: 100 }}
+						>
+							{t("common.buttons.save")}
+						</Button>
+					</Stack>
 				</Stack>
 			</form>
+			<DialogInput
+				open={showDeleteDialog}
+				title={t("pages.editUser.dialog.removeUser.title")}
+				content={t("pages.editUser.dialog.removeUser.content", {
+					name: `${user?.firstName} ${user?.lastName}`,
+				})}
+				onCancel={() => setShowDeleteDialog(false)}
+				onConfirm={handleDeleteUser}
+				confirmText={t("common.buttons.removeUser")}
+				loading={isDeleting}
+			/>
 		</BasePage>
 	);
 };

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

@@ -3,7 +3,7 @@ import { useNavigate } from "react-router-dom";
 import { useTranslation } from "react-i18next";
 import { Table } from "@/Components/design-elements";
 import type { Header } from "@/Components/design-elements/Table";
-import { useIsSuperAdmin } from "@/Hooks/useIsAdmin";
+import { useIsAdmin } from "@/Hooks/useIsAdmin";
 import type { User } from "@/Types/User";
 
 interface TeamTableProps {
@@ -13,7 +13,7 @@ interface TeamTableProps {
 export const TeamTable = ({ users }: TeamTableProps) => {
 	const { t } = useTranslation();
 	const navigate = useNavigate();
-	const isSuperAdmin = useIsSuperAdmin();
+	const isAdmin = useIsAdmin();
 
 	const headers: Header<User>[] = [
 		{
@@ -45,7 +45,7 @@ export const TeamTable = ({ users }: TeamTableProps) => {
 	];
 
 	const handleRowClick = (row: User) => {
-		if (isSuperAdmin) {
+		if (isAdmin) {
 			navigate(`/account/team/${row.id}`);
 		}
 	};
@@ -54,7 +54,7 @@ export const TeamTable = ({ users }: TeamTableProps) => {
 		<Table
 			headers={headers}
 			data={users}
-			onRowClick={isSuperAdmin ? handleRowClick : undefined}
+			onRowClick={isAdmin ? handleRowClick : undefined}
 		/>
 	);
 };

client/src/Pages/CreateMonitor/index.tsx

@@ -32,7 +32,12 @@ import {
 import { SPACING, LAYOUT } from "@/Utils/Theme/constants";
 import { useGet, usePost, usePatch, useDelete } from "@/Hooks/UseApi";
 import { useMonitorForm } from "@/Hooks/useMonitorForm";
-import type { Monitor, MonitorType, GamesMap } from "@/Types/Monitor";
+import {
+	type Monitor,
+	type MonitorType,
+	type GamesMap,
+	supportsGeoCheck,
+} from "@/Types/Monitor";
 import type { Notification } from "@/Types/Notification";
 import type { MonitorFormData } from "@/Validation/monitor";
 
@@ -141,6 +146,17 @@ const getGeneralSettingsConfig = (
 			showGrpcServiceName: false,
 			showIgnoreTls: false,
 		},
+		websocket: {
+			urlLabel: t("pages.createMonitor.form.general.option.wsUrl.label"),
+			urlPlaceholder: t("pages.createMonitor.form.general.option.wsUrl.placeholder"),
+			namePlaceholder: t("pages.createMonitor.form.general.option.name.placeholder"),
+			showUrl: true,
+			showPort: false,
+			showGameSelect: false,
+			showSecret: false,
+			showGrpcServiceName: false,
+			showIgnoreTls: true,
+		},
 	};
 	return configs[type] || configs.http;
 };
@@ -326,6 +342,13 @@ const CreateMonitorPage = () => {
 												"pages.createMonitor.form.type.optionGrpcDescription"
 											)}
 										/>
+										<RadioWithDescription
+											value="websocket"
+											label={t("pages.createMonitor.form.type.optionWebSocket")}
+											description={t(
+												"pages.createMonitor.form.type.optionWebSocketDescription"
+											)}
+										/>
 									</RadioGroup>
 								</FormControl>
 							)}
@@ -742,7 +765,9 @@ const CreateMonitorPage = () => {
 				}
 			/>
 
-			{(watchedType === "http" || watchedType === "grpc") && (
+			{(watchedType === "http" ||
+				watchedType === "grpc" ||
+				watchedType === "websocket") && (
 				<ConfigBox
 					title={t("pages.createMonitor.form.ignoreTls.title")}
 					subtitle={t("pages.createMonitor.form.ignoreTls.description")}
@@ -885,7 +910,7 @@ const CreateMonitorPage = () => {
 				/>
 			)}
 
-			{watchedType === "http" && (
+			{supportsGeoCheck(watchedType) && (
 				<ConfigBox
 					title={t("pages.createMonitor.form.geoChecks.title")}
 					subtitle={t("pages.createMonitor.form.geoChecks.description")}

client/src/Pages/Settings/index.tsx

@@ -37,6 +37,7 @@ 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;
@@ -462,6 +463,43 @@ 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/Uptime/Details/index.tsx

@@ -20,7 +20,7 @@ import { useState, useMemo } from "react";
 import { useParams } from "react-router-dom";
 import { useSelector } from "react-redux";
 import { useGet } from "@/Hooks/UseApi";
-import type { MonitorDetailsResponse } from "@/Types/Monitor";
+import { type MonitorDetailsResponse, supportsGeoCheck } from "@/Types/Monitor";
 import type { ChecksResponse } from "@/Types/Check";
 import type {
 	GeoChecksResult,
@@ -122,7 +122,7 @@ const UptimeDetailsPage = () => {
 	);
 
 	const geoChecksUrl = useMemo(() => {
-		if (!monitorId || monitor?.type !== "http" || !monitor?.geoCheckEnabled) {
+		if (!monitorId || !supportsGeoCheck(monitor?.type) || !monitor?.geoCheckEnabled) {
 			return null;
 		}
 		const params = new URLSearchParams();
@@ -141,7 +141,7 @@ const UptimeDetailsPage = () => {
 
 	// Fetch paginated geo checks for the table
 	const geoChecksTableUrl = useMemo(() => {
-		if (!monitorId || monitor?.type !== "http" || !monitor?.geoCheckEnabled) {
+		if (!monitorId || !supportsGeoCheck(monitor?.type) || !monitor?.geoCheckEnabled) {
 			return null;
 		}
 		const params = new URLSearchParams();

client/src/Pages/Uptime/Monitors/index.tsx

@@ -70,7 +70,7 @@ const UptimeMonitorsPage = () => {
 	const effectiveTypes =
 		selectedTypes.length > 0
 			? selectedTypes
-			: ["http", "ping", "docker", "port", "game", "grpc"];
+			: ["http", "ping", "docker", "port", "game", "grpc", "websocket"];
 
 	// Build URL for monitors with checks
 	const monitorsWithChecksUrl = useMemo(() => {

client/src/Types/Check.ts

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

client/src/Types/Monitor.ts

@@ -12,10 +12,20 @@ export const MonitorTypes = [
 	"port",
 	"game",
 	"grpc",
+	"websocket",
 	"unknown",
 ] as const;
 export type MonitorType = (typeof MonitorTypes)[number];
 
+export const GeoCheckSupportedTypes: readonly MonitorType[] = ["http", "ping"] as const;
+
+export const supportsGeoCheck = (type: MonitorType | undefined): boolean => {
+	if (!type) {
+		return false;
+	}
+	return GeoCheckSupportedTypes.includes(type);
+};
+
 export const MonitorStatuses = [
 	"up",
 	"down",

client/src/Types/Notification.ts

@@ -5,6 +5,7 @@ export const NotificationChannels = [
 	"webhook",
 	"pager_duty",
 	"matrix",
+	"teams",
 ] as const;
 export type NotificationChannel = (typeof NotificationChannels)[number];
 

client/src/Utils/MonitorUtils.ts

@@ -9,6 +9,7 @@ export const getMonitorPath = (type: MonitorType): string => {
 		ping: "uptime",
 		game: "uptime",
 		grpc: "uptime",
+		websocket: "uptime",
 		unknown: "uptime",
 		docker: "uptime",
 		hardware: "infrastructure",

client/src/Utils/Theme/Palette.ts

@@ -12,6 +12,8 @@ export const typographyLevels = {
 export const colors = {
 	gray200: "#EFEFEF",
 	gray700: "#313131",
+	gray900: "#151518",
+	gray850: "#1c1c21",
 	blueBlueWave: "#1570EF",
 };
 
@@ -31,4 +33,8 @@ export const darkPalette = {
 	secondary: {
 		main: colors.gray700,
 	},
+	background: {
+		default: colors.gray900,
+		paper: colors.gray850,
+	},
 };

client/src/Validation/monitor.ts

@@ -115,6 +115,13 @@ const hardwareSchema = baseSchema.extend({
 	selectedDisks: z.array(z.string()),
 });
 
+// WebSocket monitor schema
+const websocketSchema = baseSchema.extend({
+	type: z.literal("websocket"),
+	url: z.string().min(1, "WebSocket URL is required"),
+	ignoreTlsErrors: z.boolean(),
+});
+
 // Discriminated union of all monitor types
 export const monitorSchema = z.discriminatedUnion("type", [
 	httpSchema,
@@ -125,6 +132,7 @@ export const monitorSchema = z.discriminatedUnion("type", [
 	grpcSchema,
 	pagespeedSchema,
 	hardwareSchema,
+	websocketSchema,
 ]);
 
 export type MonitorFormData = z.infer<typeof monitorSchema>;
@@ -139,4 +147,5 @@ export {
 	grpcSchema,
 	pagespeedSchema,
 	hardwareSchema,
+	websocketSchema,
 };

client/src/Validation/notifications.ts

@@ -45,6 +45,11 @@ 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"),
+});
+
 export const notificationSchema = z.discriminatedUnion("type", [
 	emailSchema,
 	slackSchema,
@@ -52,6 +57,7 @@ export const notificationSchema = z.discriminatedUnion("type", [
 	webhookSchema,
 	pagerDutySchema,
 	matrixSchema,
+	teamsSchema,
 ]);
 
 export type NotificationFormData = z.infer<typeof notificationSchema>;

client/src/Validation/settings.ts

@@ -1,3 +1,4 @@
+import { CHECK_TTL_SENTINEL } from "@/Types/Check";
 import { z } from "zod";
 
 export const settingsSchema = z.object({
@@ -11,7 +12,11 @@ export const settingsSchema = z.object({
 	systemEmailSecure: z.boolean().optional(),
 	systemEmailPool: z.boolean().optional(),
 	showURL: z.boolean().optional(),
-	checkTTL: z.number().int().min(1, "Please enter a value").max(365, "Maximum 365 days"),
+	checkTTL: z
+		.number()
+		.int()
+		.min(1, "Please enter a value")
+		.max(CHECK_TTL_SENTINEL, `Maximum ${CHECK_TTL_SENTINEL}`),
 	pagespeedApiKey: z
 		.string()
 		.transform((val) => (val.trim() === "" ? undefined : val.trim()))

client/src/locales/en.json

@@ -46,7 +46,8 @@
 			"sendTestEmail": "Send test email",
 			"exportToJSON": "Export to JSON",
 			"importFromJSON": "Import from JSON",
-			"clearFilters": "Clear filters"
+			"clearFilters": "Clear filters",
+			"removeUser": "Remove user"
 		},
 		"charts": {
 			"labels": {
@@ -487,6 +488,10 @@
 						"grpcServiceName": {
 							"label": "Service name",
 							"placeholder": "e.g. my.service.v1 (leave empty for overall health)"
+						},
+						"wsUrl": {
+							"label": "WebSocket URL",
+							"placeholder": "wss://example.com/socket"
 						}
 					},
 					"title": "General settings",
@@ -498,6 +503,7 @@
 						"game": "Enter the IP address or hostname and the port number to ping (e.g., 192.168.1.100 or example.com) and choose game type.",
 						"pagespeed": "Track page load performance, Core Web Vitals, and optimization scores for your website.",
 						"grpc": "Enter the hostname and port of the gRPC server, optionally specify a service name for the health check, and add a display name.",
+						"websocket": "Enter the WebSocket URL to monitor (e.g., wss://example.com/socket) and add a display name.",
 						"hardware": "Monitor CPU, memory, disk usage, and temperature for your infrastructure."
 					}
 				},
@@ -534,6 +540,8 @@
 					"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",
@@ -619,6 +627,12 @@
 					"title": "Roles",
 					"description": "Assign roles to the user. Multiple roles can be selected."
 				}
+			},
+			"dialog": {
+				"removeUser": {
+					"title": "Remove user",
+					"content": "Are you sure you want to remove {{name}} from your team? This action cannot be undone."
+				}
 			}
 		},
 		"incidents": {
@@ -1027,7 +1041,7 @@
 				},
 				"stats": {
 					"title": "Monitor history",
-					"description": "Define how long you want to retain historical data. You can also clear all existing data.",
+					"description": "Clear all monitoring history and statistics for your team. This action is irreversible.",
 					"option": {
 						"clear": {
 							"label": "Clear all stats. This is irreversible."
@@ -1038,6 +1052,16 @@
 						"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.",

client/vite.config.ts

@@ -7,7 +7,7 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
 export default defineConfig(({}) => {
-	let version = "3.5.0";
+	let version = "3.5.1";
 
 	return {
 		base: "/",

server/package-lock.json

@@ -43,6 +43,7 @@
 				"super-simple-scheduler": "1.4.5",
 				"swagger-ui-express": "5.0.1",
 				"winston": "^3.13.0",
+				"ws": "^8.19.0",
 				"zod": "^4.3.6"
 			},
 			"devDependencies": {
@@ -63,6 +64,7 @@
 				"@types/papaparse": "^5.5.2",
 				"@types/ping": "0.4.4",
 				"@types/swagger-ui-express": "4.1.8",
+				"@types/ws": "^8.18.1",
 				"@typescript-eslint/eslint-plugin": "^8.56.1",
 				"@typescript-eslint/parser": "^8.56.1",
 				"c8": "10.1.3",
@@ -871,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",
@@ -1501,7 +1502,6 @@
 				}
 			],
 			"license": "MIT",
-			"peer": true,
 			"engines": {
 				"node": ">=18"
 			},
@@ -1546,7 +1546,6 @@
 				}
 			],
 			"license": "MIT",
-			"peer": true,
 			"engines": {
 				"node": ">=18"
 			}
@@ -4338,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",
@@ -4499,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"
 			}
@@ -4665,6 +4662,16 @@
 				"@types/webidl-conversions": "*"
 			}
 		},
+		"node_modules/@types/ws": {
+			"version": "8.18.1",
+			"resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.18.1.tgz",
+			"integrity": "sha512-ThVF6DCVhA8kUGy+aazFQ4kXQ7E1Ty7A3ypFOe0IcJV8O/M511G99AW24irKrW56Wt44yG9+ij8FaqoBGkuBXg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@types/node": "*"
+			}
+		},
 		"node_modules/@types/yargs": {
 			"version": "17.0.35",
 			"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.35.tgz",
@@ -4727,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",
@@ -5341,7 +5347,6 @@
 			"integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
 			"dev": true,
 			"license": "MIT",
-			"peer": true,
 			"bin": {
 				"acorn": "bin/acorn"
 			},
@@ -5920,7 +5925,6 @@
 				}
 			],
 			"license": "MIT",
-			"peer": true,
 			"dependencies": {
 				"baseline-browser-mapping": "^2.8.19",
 				"caniuse-lite": "^1.0.30001751",
@@ -6863,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"
@@ -7631,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",
@@ -7993,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",
@@ -9638,7 +9639,6 @@
 			"integrity": "sha512-F26gjC0yWN8uAA5m5Ss8ZQf5nDHWGlN/xWZIh8S5SRbsEKBovwZhxGd6LJlbZYxBgCYOtreSUyb8hpXyGC5O4A==",
 			"dev": true,
 			"license": "MIT",
-			"peer": true,
 			"dependencies": {
 				"@jest/core": "30.2.0",
 				"@jest/types": "30.2.0",
@@ -12509,7 +12509,6 @@
 				}
 			],
 			"license": "MIT",
-			"peer": true,
 			"dependencies": {
 				"nanoid": "^3.3.11",
 				"picocolors": "^1.1.1",
@@ -14443,63 +14442,6 @@
 				"node": ">=8"
 			}
 		},
-		"node_modules/svgo": {
-			"version": "3.3.3",
-			"resolved": "https://registry.npmjs.org/svgo/-/svgo-3.3.3.tgz",
-			"integrity": "sha512-+wn7I4p7YgJhHs38k2TNjy1vCfPIfLIJWR5MnCStsN8WuuTcBnRKcMHQLMM2ijxGZmDoZwNv8ipl5aTTen62ng==",
-			"license": "MIT",
-			"optional": true,
-			"dependencies": {
-				"commander": "^7.2.0",
-				"css-select": "^5.1.0",
-				"css-tree": "^2.3.1",
-				"css-what": "^6.1.0",
-				"csso": "^5.0.5",
-				"picocolors": "^1.0.0",
-				"sax": "^1.5.0"
-			},
-			"bin": {
-				"svgo": "bin/svgo"
-			},
-			"engines": {
-				"node": ">=14.0.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/svgo"
-			}
-		},
-		"node_modules/svgo/node_modules/commander": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-			"integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
-			"license": "MIT",
-			"optional": true,
-			"engines": {
-				"node": ">= 10"
-			}
-		},
-		"node_modules/svgo/node_modules/css-tree": {
-			"version": "2.3.1",
-			"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.3.1.tgz",
-			"integrity": "sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==",
-			"license": "MIT",
-			"optional": true,
-			"dependencies": {
-				"mdn-data": "2.0.30",
-				"source-map-js": "^1.0.1"
-			},
-			"engines": {
-				"node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0"
-			}
-		},
-		"node_modules/svgo/node_modules/mdn-data": {
-			"version": "2.0.30",
-			"resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.30.tgz",
-			"integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==",
-			"license": "CC0-1.0",
-			"optional": true
-		},
 		"node_modules/swagger-ui-dist": {
 			"version": "5.30.0",
 			"resolved": "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-5.30.0.tgz",
@@ -14662,7 +14604,6 @@
 			"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
 			"dev": true,
 			"license": "MIT",
-			"peer": true,
 			"engines": {
 				"node": ">=12"
 			},
@@ -14831,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",
@@ -14994,7 +14934,6 @@
 			"integrity": "sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==",
 			"devOptional": true,
 			"license": "Apache-2.0",
-			"peer": true,
 			"bin": {
 				"tsc": "bin/tsc",
 				"tsserver": "bin/tsserver"
@@ -15628,9 +15567,9 @@
 			}
 		},
 		"node_modules/ws": {
-			"version": "8.18.3",
-			"resolved": "https://registry.npmjs.org/ws/-/ws-8.18.3.tgz",
-			"integrity": "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==",
+			"version": "8.19.0",
+			"resolved": "https://registry.npmjs.org/ws/-/ws-8.19.0.tgz",
+			"integrity": "sha512-blAT2mjOEIi0ZzruJfIhb3nps74PRWTCz1IjglWEEpQl5XS/UNama6u2/rjFkDDouqr4L67ry+1aGIALViWjDg==",
 			"license": "MIT",
 			"engines": {
 				"node": ">=10.0.0"

server/package.json

@@ -15,7 +15,7 @@
 		"format-check": "prettier --check ."
 	},
 	"lint-staged": {
-		"**/*": "npm run format"
+		"**/*": "prettier --write"
 	},
 	"keywords": [],
 	"author": "",
@@ -58,6 +58,7 @@
 		"super-simple-scheduler": "1.4.5",
 		"swagger-ui-express": "5.0.1",
 		"winston": "^3.13.0",
+		"ws": "^8.19.0",
 		"zod": "^4.3.6"
 	},
 	"devDependencies": {
@@ -78,6 +79,7 @@
 		"@types/papaparse": "^5.5.2",
 		"@types/ping": "0.4.4",
 		"@types/swagger-ui-express": "4.1.8",
+		"@types/ws": "^8.18.1",
 		"@typescript-eslint/eslint-plugin": "^8.56.1",
 		"@typescript-eslint/parser": "^8.56.1",
 		"c8": "10.1.3",

server/src/config/services.ts

@@ -1,31 +1,67 @@
 import MongoDB from "../db/MongoDB.js";
-import NetworkService from "../service/infrastructure/networkService.js";
-import EmailService from "../service/infrastructure/emailService.js";
-import BufferService from "../service/infrastructure/bufferService.js";
+import { IDb } from "@/db/IDb.js";
 import {
+	// Service classes
+	NetworkService,
+	EmailService,
+	BufferService,
+	GlobalPingService,
+	SuperSimpleQueue,
+	SuperSimpleQueueHelper,
 	NotificationsService,
 	StatusService,
+	NotificationMessageBuilder,
+	MonitorService,
+	StatusPageService,
+	UserService,
+	CheckService,
+	GeoChecksService,
+	DiagnosticService,
+	InviteService,
+	MaintenanceWindowService,
+	IncidentService,
+	// Notification providers
 	WebhookProvider,
 	SlackProvider,
 	EmailProvider,
 	DiscordProvider,
 	PagerDutyProvider,
 	MatrixProvider,
+	TeamsProvider,
+	// Interfaces
+	INetworkService,
+	IEmailService,
+	IBufferService,
+	ISuperSimpleQueue,
 	INotificationsService,
+	IStatusService,
+	IMonitorService,
+	IUserService,
+	ICheckService,
+	IGeoChecksService,
+	IDiagnosticService,
+	IInviteService,
+	IMaintenanceWindowService,
+	IStatusPageService,
+	IIncidentService,
+	INotificationMessageBuilder,
+	ISettingsService,
+	EnvConfig,
 } from "@/service/index.js";
-import SuperSimpleQueueHelper from "../service/infrastructure/SuperSimpleQueue/SuperSimpleQueueHelper.js";
-import SuperSimpleQueue from "../service/infrastructure/SuperSimpleQueue/SuperSimpleQueue.js";
-import UserService from "../service/business/userService.js";
-import CheckService from "../service/business/checkService.js";
-import GeoChecksService from "../service/business/geoChecksService.js";
-import GlobalPingService from "../service/infrastructure/globalPingService.js";
-import DiagnosticService from "../service/business/diagnosticService.js";
-import InviteService from "../service/business/inviteService.js";
-import MaintenanceWindowService from "../service/business/maintenanceWindowService.js";
-import { MonitorService } from "@/service/index.js";
-import { StatusPageService, IStatusPageService } from "../service/business/statusPageService.js";
-import IncidentService from "../service/business/incidentService.js";
-import { NotificationMessageBuilder, INotificationMessageBuilder } from "../service/infrastructure/notificationMessageBuilder.js";
+
+// Network providers
+import { PingProvider } from "@/service/infrastructure/network/PingProvider.js";
+import { HttpProvider } from "@/service/infrastructure/network/HttpProvider.js";
+import { AdvancedMatcher } from "@/service/infrastructure/network/AdvancedMatcher.js";
+import { PageSpeedProvider } from "@/service/infrastructure/network/PageSpeedProvider.js";
+import { HardwareProvider } from "@/service/infrastructure/network/HardwareProvider.js";
+import { DockerProvider } from "@/service/infrastructure/network/DockerProvider.js";
+import { PortProvider } from "@/service/infrastructure/network/PortProvider.js";
+import { GameProvider } from "@/service/infrastructure/network/GameProvider.js";
+import { GrpcProvider } from "@/service/infrastructure/network/GrpcProvider.js";
+import { WebSocketProvider } from "@/service/infrastructure/network/WebSocketProvider.js";
+
+// Third-party
 import axios from "axios";
 import got from "got";
 import ping from "ping";
@@ -43,8 +79,9 @@ import { games, GameDig } from "gamedig";
 import jmespath from "jmespath";
 import * as grpc from "@grpc/grpc-js";
 import * as protoLoader from "@grpc/proto-loader";
+import WebSocket from "ws";
 
-// repositories
+// Repositories
 import {
 	MongoMonitorsRepository,
 	MongoChecksRepository,
@@ -73,33 +110,23 @@ import {
 	IMaintenanceWindowsRepository,
 } from "@/repositories/index.js";
 import { ILogger } from "@/utils/logger.js";
-import { EnvConfig } from "@/service/system/settingsService.js";
-import { PingProvider } from "@/service/infrastructure/network/PingProvider.js";
-import { HttpProvider } from "@/service/infrastructure/network/HttpProvider.js";
-import { AdvancedMatcher } from "@/service/infrastructure/network/AdvancedMatcher.js";
-import { PageSpeedProvider } from "@/service/infrastructure/network/PageSpeedProvider.js";
-import { HardwareProvider } from "@/service/infrastructure/network/HardwareProvider.js";
-import { DockerProvider } from "@/service/infrastructure/network/DockerProvider.js";
-import { PortProvider } from "@/service/infrastructure/network/PortProvider.js";
-import { GameProvider } from "@/service/infrastructure/network/GameProvider.js";
-import { GrpcProvider } from "@/service/infrastructure/network/GrpcProvider.js";
 
 export type InitializedServices = {
-	settingsService: any;
-	db: any;
-	networkService: any;
-	emailService: any;
-	bufferService: any;
-	statusService: any;
-	jobQueue: any;
-	userService: any;
-	checkService: any;
-	geoChecksService: any;
-	diagnosticService: any;
-	inviteService: any;
-	maintenanceWindowService: any;
-	monitorService: any;
-	incidentService: any;
+	settingsService: ISettingsService;
+	db: IDb;
+	networkService: INetworkService;
+	emailService: IEmailService;
+	bufferService: IBufferService;
+	statusService: IStatusService;
+	jobQueue: ISuperSimpleQueue;
+	userService: IUserService;
+	checkService: ICheckService;
+	geoChecksService: IGeoChecksService;
+	diagnosticService: IDiagnosticService;
+	inviteService: IInviteService;
+	maintenanceWindowService: IMaintenanceWindowService;
+	monitorService: IMonitorService;
+	incidentService: IIncidentService;
 	logger: ILogger;
 	notificationsService: INotificationsService;
 	statusPageService: IStatusPageService;
@@ -129,7 +156,7 @@ export const initializeServices = async ({
 }: {
 	logger: ILogger;
 	envSettings: EnvConfig;
-	settingsService: any;
+	settingsService: ISettingsService;
 	settingsRepository: ISettingsRepository;
 }): Promise<InitializedServices> => {
 	// Create DB
@@ -152,8 +179,7 @@ export const initializeServices = async ({
 	const teamsRepository = new MongoTeamsRepository();
 	const maintenanceWindowsRepository = new MongoMaintenanceWindowsRepository();
 
-	// Providers
-
+	// Network providers
 	const pingProvider = new PingProvider(ping);
 	const httpProvider = new HttpProvider(got, new AdvancedMatcher(jmespath));
 	const pageSpeedProvider = new PageSpeedProvider(httpProvider, settingsService, logger);
@@ -162,10 +188,9 @@ export const initializeServices = async ({
 	const portProvider = new PortProvider(net);
 	const gameProvider = new GameProvider(logger, GameDig);
 	const grpcProvider = new GrpcProvider(grpc, protoLoader);
+	const webSocketProvider = new WebSocketProvider(WebSocket);
 
-	const networkService = new NetworkService(
-		axios,
-		logger,
+	const networkService = new NetworkService(axios, logger, [
 		pingProvider,
 		httpProvider,
 		pageSpeedProvider,
@@ -173,8 +198,9 @@ export const initializeServices = async ({
 		dockerProvider,
 		portProvider,
 		gameProvider,
-		grpcProvider
-	);
+		grpcProvider,
+		webSocketProvider,
+	]);
 	const emailService = new EmailService(settingsService, fs, path, compile, mjml2html, nodemailer, logger);
 
 	const notificationMessageBuilder = new NotificationMessageBuilder();
@@ -196,12 +222,14 @@ export const initializeServices = async ({
 
 	const statusService = new StatusService(logger, bufferService, monitorsRepository, monitorStatsRepository, checksRepository);
 
+	// Notification providers
 	const webhookProvider = new WebhookProvider(logger);
 	const slackProvider = new SlackProvider(logger);
 	const emailProvider = new EmailProvider(emailService, logger);
 	const discordProvider = new DiscordProvider(logger);
 	const pagerDutyProvider = new PagerDutyProvider(logger);
 	const matrixProvider = new MatrixProvider(logger);
+	const teamsProvider = new TeamsProvider(logger);
 
 	const notificationsService = new NotificationsService(
 		notificationsRepository,
@@ -212,6 +240,7 @@ export const initializeServices = async ({
 		discordProvider,
 		pagerDutyProvider,
 		matrixProvider,
+		teamsProvider,
 		settingsService,
 		logger,
 		notificationMessageBuilder
@@ -223,6 +252,7 @@ export const initializeServices = async ({
 		statusService,
 		notificationsService,
 		checkService,
+		settingsService,
 		bufferService,
 		incidentService,
 		maintenanceWindowsRepository,
@@ -279,7 +309,6 @@ export const initializeServices = async ({
 	const statusPageService = new StatusPageService(statusPagesRepository);
 
 	const services = {
-		//v1
 		settingsService,
 		db,
 		networkService,

server/src/controllers/authController.ts

@@ -1,7 +1,6 @@
 import { Request, Response, NextFunction } from "express";
 import { AppError } from "@/utils/AppError.js";
-import { requireTeamId, requireUserRoles } from "./controllerUtils.js";
-import type { UserRole } from "@/types/user.js";
+import { requireTeamId, requireUserEmail, requireUserId, requireUserRoles } from "@/controllers/controllerUtils.js";
 
 import {
 	registrationBodyValidation,
@@ -20,15 +19,16 @@ import {
 	editSuperadminUserByIdBodyValidation,
 	editUserPasswordByIdBodyValidation,
 } from "@/validation/userValidation.js";
+import { IUserService } from "@/service/index.js";
 
 const SERVICE_NAME = "authController";
 
 class AuthController {
 	static SERVICE_NAME = SERVICE_NAME;
 
-	private userService: any;
+	private userService: IUserService;
 
-	constructor(userService: any) {
+	constructor(userService: IUserService) {
 		this.userService = userService;
 	}
 
@@ -41,11 +41,12 @@ class AuthController {
 			const newUser = req.body.user;
 			const newUserToken = req.body.token;
 			if (newUser?.email) {
-				newUser.email = newUser.email.toLowerCase();
+				const newUserEmail = requireUserEmail(newUser.email);
+				newUser.email = newUserEmail.toLowerCase();
 			}
-			registrationBodyValidation.parse(newUser);
+			const validatedBody = registrationBodyValidation.parse(newUser);
 
-			const { user, token } = await this.userService.registerUser(newUser, newUserToken, req.file);
+			const { user, token } = await this.userService.registerUser(validatedBody, newUserToken, req?.file ?? null);
 			res.status(200).json({
 				success: true,
 				msg: "User registered successfully",
@@ -62,11 +63,11 @@ class AuthController {
 			if (userData?.email) {
 				userData.email = userData.email.toLowerCase();
 			}
-			createUserBodyValidation.parse(userData);
+			const validatedBody = createUserBodyValidation.parse(userData);
 
 			const teamId = requireTeamId(req.user?.teamId);
-			const actorRoles = requireUserRoles(req.user?.role) as UserRole[];
-			const newUser = await this.userService.createUser(userData, teamId, actorRoles, req.file);
+			const actorRoles = requireUserRoles(req.user?.role);
+			const newUser = await this.userService.createUser(validatedBody, teamId, actorRoles, req?.file ?? null);
 			res.status(201).json({
 				success: true,
 				msg: "User created successfully",
@@ -100,8 +101,10 @@ class AuthController {
 
 	editUser = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			editUserBodyValidation.parse(req.body);
-			const updatedUser = await this.userService.editUser(req.body, req.file, req.user);
+			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);
 
 			res.status(200).json({
 				success: true,
@@ -170,7 +173,15 @@ class AuthController {
 
 	deleteUser = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			await this.userService.deleteUser(req.user);
+			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,
+			});
 			return res.status(200).json({
 				success: true,
 				msg: "User deleted successfully",
@@ -180,6 +191,23 @@ class AuthController {
 		}
 	};
 
+	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 });
+			return res.status(200).json({
+				success: true,
+				msg: "User removed successfully",
+			});
+		} catch (error) {
+			next(error);
+		}
+	};
+
 	getAllUsers = async (req: Request, res: Response, next: NextFunction) => {
 		try {
 			const allUsers = await this.userService.getAllUsers();
@@ -195,19 +223,9 @@ class AuthController {
 
 	getUserById = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			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);
+			const validatedParams = getUserByIdParamValidation.parse(req.params);
+			const actorRoles = requireUserRoles(req.user?.role);
+			const user = await this.userService.getUserById(actorRoles, validatedParams.userId);
 
 			return res.status(200).json({ success: true, msg: "ok", data: user });
 		} catch (error) {
@@ -217,24 +235,19 @@ class AuthController {
 
 	editUserById = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const roles = req?.user?.role;
+			const actorRoles = requireUserRoles(req.user?.role);
+			const actorId = requireUserId(req.user?.id);
 
-			if (!roles || !roles.includes("superadmin")) {
+			if (!actorRoles.includes("superadmin")) {
 				throw new AppError({ message: "Unauthorized", status: 403 });
 			}
 
-			const userId = req.params.userId as string;
-			const user = { ...req.body };
-
-			editUserByIdParamValidation.parse(req.params);
+			const validatedParams = 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);
-			}
+			const validatedBody =
+				validatedParams.userId === actorId ? editSuperadminUserByIdBodyValidation.parse(req.body) : editUserByIdBodyValidation.parse(req.body);
 
-			await this.userService.editUserById(userId, user);
+			await this.userService.editUserById(validatedParams.userId, validatedBody);
 			return res.status(200).json({ success: true, msg: "ok" });
 		} catch (error) {
 			next(error);
@@ -243,16 +256,14 @@ class AuthController {
 
 	editUserPasswordById = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const roles = req?.user?.role;
-			if (!roles || !roles.includes("superadmin")) {
+			const actorRoles = requireUserRoles(req.user?.role);
+			if (!actorRoles.includes("superadmin")) {
 				throw new AppError({ message: "Unauthorized", status: 403 });
 			}
 
-			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);
+			const validatedParams = editUserByIdParamValidation.parse(req.params);
+			const validatedBody = editUserPasswordByIdBodyValidation.parse(req.body);
+			await this.userService.setPasswordByUserId(validatedParams.userId, validatedBody.password);
 			return res.status(200).json({ success: true, msg: "Password reset successfully" });
 		} catch (error) {
 			next(error);

server/src/controllers/checkController.ts

@@ -4,18 +4,19 @@ 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";
 
 class CheckController {
 	static SERVICE_NAME = SERVICE_NAME;
 
-	private checkService: any;
-	constructor(checkService: any) {
+	private checkService: ICheckService;
+	constructor(checkService: ICheckService) {
 		this.checkService = checkService;
 	}
 
@@ -25,13 +26,20 @@ class CheckController {
 
 	getChecksByMonitor = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			getChecksParamValidation.parse(req.params);
-			getChecksQueryValidation.parse(req.query);
+			const validatedParams = getChecksParamValidation.parse(req.params);
+			const validatedQuery = getChecksQueryValidation.parse(req.query);
+
+			const teamId = requireTeamId(req.user?.teamId);
 
 			const result = await this.checkService.getChecksByMonitor({
-				monitorId: req?.params?.monitorId,
-				query: req?.query,
-				teamId: req?.user?.teamId,
+				monitorId: validatedParams.monitorId,
+				teamId,
+				sortOrder: validatedQuery.sortOrder,
+				dateRange: validatedQuery.dateRange,
+				filter: validatedQuery.filter,
+				page: validatedQuery.page,
+				rowsPerPage: validatedQuery.rowsPerPage,
+				status: validatedQuery.status,
 			});
 
 			return res.status(200).json({
@@ -46,10 +54,16 @@ class CheckController {
 
 	getChecksByTeam = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			getTeamChecksQueryValidation.parse(req.query);
+			const validatedQuery = getTeamChecksQueryValidation.parse(req.query);
+			const teamId = requireTeamId(req.user?.teamId);
+
 			const checkData = await this.checkService.getChecksByTeam({
-				teamId: req?.user?.teamId,
-				query: req?.query,
+				teamId,
+				sortOrder: validatedQuery.sortOrder,
+				dateRange: validatedQuery.dateRange,
+				page: validatedQuery.page,
+				rowsPerPage: validatedQuery.rowsPerPage,
+				filter: validatedQuery.filter,
 			});
 			return res.status(200).json({
 				success: true,
@@ -63,8 +77,11 @@ class CheckController {
 
 	getChecksSummaryByTeamId = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const dateRange = req.query?.dateRange || "hour";
-			const summary = await this.checkService.getChecksSummaryByTeamId({ teamId: req?.user?.teamId, dateRange });
+			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 });
 			return res.status(200).json({
 				success: true,
 				msg: "Checks summary retrieved successfully",
@@ -77,11 +94,12 @@ class CheckController {
 
 	deleteChecks = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			deleteChecksParamValidation.parse(req.params);
+			const validatedParams = deleteChecksParamValidation.parse(req.params);
+			const teamId = requireTeamId(req.user?.teamId);
 
 			const deletedCount = await this.checkService.deleteChecks({
-				monitorId: req.params.monitorId as string,
-				teamId: req?.user?.teamId,
+				monitorId: validatedParams.monitorId,
+				teamId,
 			});
 
 			return res.status(200).json({
@@ -96,9 +114,9 @@ class CheckController {
 
 	deleteChecksByTeamId = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			deleteChecksByTeamIdParamValidation.parse(req.params);
+			const teamId = requireTeamId(req.user?.teamId);
 
-			const deletedCount = await this.checkService.deleteChecksByTeamId({ teamId: req?.user?.teamId });
+			const deletedCount = await this.checkService.deleteChecksByTeamId({ teamId });
 
 			return res.status(200).json({
 				success: true,
@@ -109,24 +127,6 @@ class CheckController {
 			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,24 +1,25 @@
 import { AppError } from "@/utils/AppError.js";
-import { type MonitorType, MonitorTypes } from "@/types/index.js";
+import { Monitor, type MonitorType, MonitorTypes, UserRole } from "@/types/index.js";
+import sslChecker, { SSLDetails } from "ssl-checker";
+type SSLCheckerType = typeof sslChecker;
 
-const fetchMonitorCertificate = async (sslChecker: any, monitor: any): Promise<any> => {
+export const fetchMonitorCertificate = async (checker: SSLCheckerType, monitor: Monitor): Promise<SSLDetails> => {
 	const monitorUrl = new URL(monitor.url);
 	const hostname = monitorUrl.hostname;
-	const cert = await sslChecker(hostname);
-	// Throw an error if no cert or if cert.validTo is not present
+	const cert = await checker(hostname);
 	if (cert?.validTo === null || cert?.validTo === undefined) {
 		throw new Error("Certificate not found");
 	}
 	return cert;
 };
-const requireString = (value: unknown, fieldName: string): string => {
+export 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 });
 };
 
-const optionalString = (value: unknown, fieldName: string): string | undefined => {
+export const optionalString = (value: unknown, fieldName: string): string | undefined => {
 	if (value === undefined) {
 		return undefined;
 	}
@@ -28,7 +29,7 @@ const optionalString = (value: unknown, fieldName: string): string | undefined =
 	throw new AppError({ message: `${fieldName} must be a string`, status: 400 });
 };
 
-const optionalNumber = (value: unknown, fieldName: string): number | undefined => {
+export const optionalNumber = (value: unknown, fieldName: string): number | undefined => {
 	if (value === undefined) {
 		return undefined;
 	}
@@ -44,7 +45,7 @@ const optionalNumber = (value: unknown, fieldName: string): number | undefined =
 	throw new AppError({ message: `${fieldName} must be a number`, status: 400 });
 };
 
-const optionalBoolean = (value: unknown, fieldName: string): boolean | undefined => {
+export const optionalBoolean = (value: unknown, fieldName: string): boolean | undefined => {
 	if (value === undefined) {
 		return undefined;
 	}
@@ -62,7 +63,7 @@ const optionalBoolean = (value: unknown, fieldName: string): boolean | undefined
 	throw new AppError({ message: `${fieldName} must be a boolean`, status: 400 });
 };
 
-const parseMonitorTypeFilter = (value: unknown): MonitorType | MonitorType[] | undefined => {
+export 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 });
@@ -82,7 +83,7 @@ const parseMonitorTypeFilter = (value: unknown): MonitorType | MonitorType[] | u
 	return parseSingle(value);
 };
 
-const parseSortOrder = (value: unknown): "asc" | "desc" | undefined => {
+export const parseSortOrder = (value: unknown): "asc" | "desc" | undefined => {
 	if (value === undefined) {
 		return undefined;
 	}
@@ -92,42 +93,36 @@ const parseSortOrder = (value: unknown): "asc" | "desc" | undefined => {
 	throw new AppError({ message: "order must be either 'asc' or 'desc'", status: 400 });
 };
 
-const requireTeamId = (teamId?: string): string => {
+export const requireTeamId = (teamId?: string): string => {
 	if (!teamId) {
 		throw new AppError({ message: "Team ID is required", status: 400 });
 	}
 	return teamId;
 };
 
-const requireUserId = (userId?: string): string => {
+export const requireUserId = (userId?: string): string => {
 	if (!userId) {
 		throw new AppError({ message: "User ID is required", status: 400 });
 	}
 	return userId;
 };
-const requireUserEmail = (userEmail?: string): string => {
+export const requireUserEmail = (userEmail?: string): string => {
 	if (!userEmail) {
 		throw new AppError({ message: "User email is required", status: 400 });
 	}
 	return userEmail;
 };
 
-export const requireUserRoles = (userRoles?: string[]): string[] => {
+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[] => {
 	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,12 +1,13 @@
+import { IDiagnosticService } from "@/service/index.js";
 import { Request, Response, NextFunction } from "express";
 
 const SERVICE_NAME = "diagnosticController";
 class DiagnosticController {
 	static SERVICE_NAME = SERVICE_NAME;
 
-	private diagnosticService: any;
+	private diagnosticService: IDiagnosticService;
 
-	constructor(diagnosticService: any) {
+	constructor(diagnosticService: IDiagnosticService) {
 		this.diagnosticService = diagnosticService;
 	}
 

server/src/controllers/incidentController.ts

@@ -1,35 +1,30 @@
 import { AppError } from "@/utils/AppError.js";
 import { Request, Response, NextFunction } from "express";
 import { requireTeamId, requireUserId, requireUserEmail } from "./controllerUtils.js";
+import { IIncidentService } from "@/service/index.js";
+import { getIncidentsByTeamQueryValidation, getIncidentSummaryQueryValidation } from "@/validation/incidentValidation.js";
 
-const SERVICE_NAME = "incidentController";
-
+const SERVICE_NAME = "IncidentController";
 class IncidentController {
-	static SERVICE_NAME = SERVICE_NAME;
-
-	private incidentService: any;
-	constructor(incidentService: any) {
+	private incidentService: IIncidentService;
+	constructor(incidentService: IIncidentService) {
 		this.incidentService = incidentService;
 	}
 
-	get serviceName() {
-		return IncidentController.SERVICE_NAME;
-	}
-
 	getIncidentsByTeam = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const { sortOrder, dateRange, page, rowsPerPage, status, monitorId, resolutionType } = req.query || {};
+			const validatedQuery = getIncidentsByTeamQueryValidation.parse(req.query);
 
 			const teamId = requireTeamId(req.user?.teamId);
 			const result = await this.incidentService.getIncidentsByTeam(
 				teamId,
-				sortOrder,
-				dateRange,
-				page,
-				rowsPerPage,
-				status,
-				monitorId,
-				resolutionType
+				validatedQuery.sortOrder,
+				validatedQuery.dateRange,
+				validatedQuery.page,
+				validatedQuery.rowsPerPage,
+				validatedQuery.status,
+				validatedQuery.monitorId,
+				validatedQuery.resolutionType
 			);
 
 			return res.status(200).json({
@@ -45,10 +40,9 @@ class IncidentController {
 	getIncidentSummary = async (req: Request, res: Response, next: NextFunction) => {
 		try {
 			const teamId = requireTeamId(req.user?.teamId);
+			const validatedQuery = getIncidentSummaryQueryValidation.parse(req.query);
 
-			const limit = req.query.limit ? parseInt(req.query.limit as string, 10) : 10;
-
-			const summary = await this.incidentService.getIncidentSummary(teamId, limit);
+			const summary = await this.incidentService.getIncidentSummary(teamId, validatedQuery.limit);
 			return res.status(200).json({
 				success: true,
 				msg: "Incident summary retrieved successfully",

server/src/controllers/inviteController.ts

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

server/src/controllers/logController.ts

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

server/src/controllers/maintenanceWindowController.ts

@@ -9,26 +9,19 @@ import {
 	deleteMaintenanceWindowByIdParamValidation,
 } from "@/validation/maintenanceWindowValidation.js";
 import { requireTeamId } from "@/controllers/controllerUtils.js";
-
-const SERVICE_NAME = "maintenanceWindowController";
+import { IMaintenanceWindowService } from "@/service/index.js";
 
 class MaintenanceWindowController {
-	static SERVICE_NAME = SERVICE_NAME;
-	private maintenanceWindowService: any;
-	constructor(maintenanceWindowService: any) {
+	private maintenanceWindowService: IMaintenanceWindowService;
+	constructor(maintenanceWindowService: IMaintenanceWindowService) {
 		this.maintenanceWindowService = maintenanceWindowService;
 	}
 
-	get serviceName() {
-		return MaintenanceWindowController.SERVICE_NAME;
-	}
-
 	createMaintenanceWindows = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			createMaintenanceWindowBodyValidation.parse(req.body);
+			const validatedBody = createMaintenanceWindowBodyValidation.parse(req.body);
 			const teamId = requireTeamId(req?.user?.teamId);
-
-			await this.maintenanceWindowService.createMaintenanceWindow({ teamId, body: req.body });
+			await this.maintenanceWindowService.createMaintenanceWindow({ teamId, body: validatedBody });
 
 			return res.status(200).json({
 				success: true,
@@ -40,11 +33,11 @@ class MaintenanceWindowController {
 	};
 	getMaintenanceWindowById = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			getMaintenanceWindowByIdParamValidation.parse(req.params);
+			const validatedParams = getMaintenanceWindowByIdParamValidation.parse(req.params);
 
 			const teamId = requireTeamId(req.user?.teamId);
 
-			const maintenanceWindow = await this.maintenanceWindowService.getMaintenanceWindowById({ id: req.params.id as string, teamId });
+			const maintenanceWindow = await this.maintenanceWindowService.getMaintenanceWindowById({ id: validatedParams.id, teamId });
 
 			return res.status(200).json({
 				success: true,
@@ -58,11 +51,18 @@ class MaintenanceWindowController {
 
 	getMaintenanceWindowsByTeamId = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			getMaintenanceWindowsByTeamIdQueryValidation.parse(req.query);
+			const validatedQuery = getMaintenanceWindowsByTeamIdQueryValidation.parse(req.query);
 
 			const teamId = requireTeamId(req?.user?.teamId);
 
-			const maintenanceWindows = await this.maintenanceWindowService.getMaintenanceWindowsByTeamId({ teamId, query: req.query });
+			const maintenanceWindows = await this.maintenanceWindowService.getMaintenanceWindowsByTeamId({
+				teamId,
+				active: validatedQuery.active,
+				page: validatedQuery.page,
+				rowsPerPage: validatedQuery.rowsPerPage,
+				field: validatedQuery.field,
+				order: validatedQuery.order,
+			});
 
 			return res.status(200).json({
 				success: true,
@@ -76,12 +76,12 @@ class MaintenanceWindowController {
 
 	getMaintenanceWindowsByMonitorId = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			getMaintenanceWindowsByMonitorIdParamValidation.parse(req.params);
+			const validatedParams = getMaintenanceWindowsByMonitorIdParamValidation.parse(req.params);
 
 			const teamId = requireTeamId(req?.user?.teamId);
 
 			const maintenanceWindows = await this.maintenanceWindowService.getMaintenanceWindowsByMonitorId({
-				monitorId: req.params.monitorId as string,
+				monitorId: validatedParams.monitorId,
 				teamId,
 			});
 
@@ -96,11 +96,11 @@ class MaintenanceWindowController {
 	};
 	deleteMaintenanceWindow = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			deleteMaintenanceWindowByIdParamValidation.parse(req.params);
+			const validatedParams = deleteMaintenanceWindowByIdParamValidation.parse(req.params);
 
 			const teamId = requireTeamId(req?.user?.teamId);
 
-			await this.maintenanceWindowService.deleteMaintenanceWindow({ id: req.params.id as string, teamId });
+			await this.maintenanceWindowService.deleteMaintenanceWindow({ id: validatedParams.id, teamId });
 
 			return res.status(200).json({
 				success: true,
@@ -113,14 +113,14 @@ class MaintenanceWindowController {
 
 	editMaintenanceWindow = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			editMaintenanceWindowByIdParamValidation.parse(req.params);
-			editMaintenanceByIdWindowBodyValidation.parse(req.body);
+			const validatedParams = editMaintenanceWindowByIdParamValidation.parse(req.params);
+			const validatedBody = editMaintenanceByIdWindowBodyValidation.parse(req.body);
 
 			const teamId = requireTeamId(req.user?.teamId);
 
 			const editedMaintenanceWindow = await this.maintenanceWindowService.editMaintenanceWindow({
-				id: req.params.id as string,
-				body: req.body,
+				id: validatedParams.id,
+				body: validatedBody,
 				teamId,
 			});
 			return res.status(200).json({

server/src/controllers/monitorController.ts

@@ -3,7 +3,6 @@ import { Request, Response, NextFunction } from "express";
 import {
 	getMonitorByIdParamValidation,
 	getMonitorByIdQueryValidation,
-	getMonitorsByTeamIdParamValidation,
 	getMonitorsByTeamIdQueryValidation,
 	getMonitorsWithChecksQueryValidation,
 	createMonitorBodyValidation,
@@ -12,22 +11,14 @@ import {
 	getCertificateParamValidation,
 	getHardwareDetailsByIdParamValidation,
 	getHardwareDetailsByIdQueryValidation,
+	getUptimeDetailsByIdParamValidation,
+	getUptimeDetailsByIdQueryValidation,
+	importMonitorsBodyValidation,
 } from "@/validation/monitorValidation.js";
 import sslChecker from "ssl-checker";
-import {
-	fetchMonitorCertificate,
-	requireString,
-	optionalString,
-	optionalNumber,
-	optionalBoolean,
-	parseMonitorTypeFilter,
-	parseSortOrder,
-	requireTeamId,
-	requireUserId,
-} from "./controllerUtils.js";
+import { fetchMonitorCertificate, requireTeamId, requireUserId } from "./controllerUtils.js";
 import { AppError } from "@/utils/AppError.js";
 import { IMonitorService } from "@/service/index.js";
-import { GeoContinent } from "@/types/geoCheck.js";
 
 const SERVICE_NAME = "monitorController";
 class MonitorController {
@@ -45,10 +36,9 @@ class MonitorController {
 
 	getMonitorCertificate = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			getCertificateParamValidation.parse(req.params);
-			const teamId = requireTeamId(req?.user?.teamId);
-			const monitorId = requireString(req.params?.monitorId, "Monitor ID");
-			const monitor = await this.monitorService.getMonitorById({ teamId, monitorId });
+			const validatedParams = getCertificateParamValidation.parse(req.params);
+			const teamId = requireTeamId(req.user?.teamId);
+			const monitor = await this.monitorService.getMonitorById({ teamId, monitorId: validatedParams.monitorId });
 			const certificate = await fetchMonitorCertificate(sslChecker, monitor);
 
 			return res.status(200).json({
@@ -65,10 +55,14 @@ class MonitorController {
 
 	getUptimeDetailsById = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const monitorId = requireString(req?.params?.monitorId, "Monitor ID");
-			const dateRange = requireString(req?.query?.dateRange, "dateRange");
-			const normalize = optionalBoolean(req?.query?.normalize, "normalize");
-			const teamId = requireTeamId(req?.user?.teamId);
+			const validatedParams = getUptimeDetailsByIdParamValidation.parse(req.params);
+			const validatedQuery = getUptimeDetailsByIdQueryValidation.parse(req.query);
+
+			const monitorId = validatedParams.monitorId;
+			const dateRange = validatedQuery.dateRange;
+			const normalize = validatedQuery.normalize;
+
+			const teamId = requireTeamId(req.user?.teamId);
 
 			const data = await this.monitorService.getUptimeDetailsById({
 				teamId,
@@ -88,12 +82,12 @@ class MonitorController {
 
 	getHardwareDetailsById = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			getHardwareDetailsByIdParamValidation.parse(req.params);
-			getHardwareDetailsByIdQueryValidation.parse(req.query);
+			const validatedParams = getHardwareDetailsByIdParamValidation.parse(req.params);
+			const validatedQuery = getHardwareDetailsByIdQueryValidation.parse(req.query);
 
-			const monitorId = requireString(req?.params?.monitorId, "Monitor ID");
-			const dateRange = optionalString(req?.query?.dateRange, "dateRange") || "recent";
-			const teamId = requireTeamId(req?.user?.teamId);
+			const monitorId = validatedParams.monitorId;
+			const dateRange = validatedQuery.dateRange || "recent";
+			const teamId = requireTeamId(req.user?.teamId);
 
 			const data = await this.monitorService.getHardwareDetailsById({
 				teamId,
@@ -112,12 +106,12 @@ class MonitorController {
 	};
 	getPageSpeedDetailsById = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			getHardwareDetailsByIdParamValidation.parse(req.params);
-			getHardwareDetailsByIdQueryValidation.parse(req.query);
+			const validatedParams = getHardwareDetailsByIdParamValidation.parse(req.params);
+			const validatedQuery = getHardwareDetailsByIdQueryValidation.parse(req.query);
 
-			const monitorId = requireString(req?.params?.monitorId, "Monitor ID");
-			const dateRange = requireString(req?.query?.dateRange, "dateRange");
-			const teamId = requireTeamId(req?.user?.teamId);
+			const monitorId = validatedParams.monitorId;
+			const dateRange = validatedQuery.dateRange || "recent";
+			const teamId = requireTeamId(req.user?.teamId);
 
 			const data = await this.monitorService.getPageSpeedDetailsById({
 				teamId,
@@ -137,18 +131,14 @@ class MonitorController {
 
 	getGeoChecksByMonitorId = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			getMonitorByIdParamValidation.parse(req.params);
-			getMonitorByIdQueryValidation.parse(req.query);
+			const validatedParams = getMonitorByIdParamValidation.parse(req.params);
+			const validatedQuery = getMonitorByIdQueryValidation.parse(req.query);
 
-			const monitorId = requireString(req?.params?.monitorId, "Monitor ID");
-			const dateRange = requireString(req?.query?.dateRange, "dateRange");
-			const continentParam = req?.query?.continent;
-			const continents = continentParam
-				? Array.isArray(continentParam)
-					? (continentParam as GeoContinent[])
-					: [continentParam as GeoContinent]
-				: undefined;
-			const teamId = requireTeamId(req?.user?.teamId);
+			const monitorId = validatedParams.monitorId;
+			const dateRange = validatedQuery.dateRange || "recent";
+			const continentParam = validatedQuery.continent;
+			const continents = continentParam ? (Array.isArray(continentParam) ? continentParam : [continentParam]) : undefined;
+			const teamId = requireTeamId(req.user?.teamId);
 
 			const data = await this.monitorService.getGeoChecksByMonitorId({
 				teamId,
@@ -169,11 +159,10 @@ class MonitorController {
 
 	getMonitorById = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			getMonitorByIdParamValidation.parse(req.params);
-			getMonitorByIdQueryValidation.parse(req.query);
+			const validatedParams = getMonitorByIdParamValidation.parse(req.params);
 
-			const teamId = requireTeamId(req?.user?.teamId);
-			const monitorId = requireString(req?.params?.monitorId, "Monitor ID");
+			const teamId = requireTeamId(req.user?.teamId);
+			const monitorId = validatedParams.monitorId;
 
 			const monitor = await this.monitorService.getMonitorById({ teamId, monitorId });
 
@@ -189,12 +178,12 @@ class MonitorController {
 
 	createMonitor = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			createMonitorBodyValidation.parse(req.body);
+			const validatedBody = createMonitorBodyValidation.parse(req.body);
 
-			const userId = requireString(req?.user?.id, "User ID");
-			const teamId = requireTeamId(req?.user?.teamId);
+			const userId = requireUserId(req.user?.id);
+			const teamId = requireTeamId(req.user?.teamId);
 
-			const monitor = await this.monitorService.createMonitor(teamId, userId, req.body);
+			const monitor = await this.monitorService.createMonitor(teamId, userId, validatedBody);
 
 			return res.status(200).json({
 				success: true,
@@ -208,14 +197,10 @@ class MonitorController {
 
 	importMonitorsFromJSON = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const teamId = requireTeamId(req?.user?.teamId);
-			const userId = requireUserId(req?.user?.id);
-
-			const { monitors } = req.body;
-
-			if (!monitors || !Array.isArray(monitors)) {
-				throw new AppError({ message: "Invalid request: monitors array is required", status: 400 });
-			}
+			const teamId = requireTeamId(req.user?.teamId);
+			const userId = requireUserId(req.user?.id);
+			const validatedBody = importMonitorsBodyValidation.parse(req.body);
+			const monitors = validatedBody.monitors;
 
 			const result = await this.monitorService.importMonitorsFromJSON({ teamId, userId, monitors });
 
@@ -231,9 +216,9 @@ class MonitorController {
 
 	deleteMonitor = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			getMonitorByIdParamValidation.parse(req.params);
-			const monitorId = requireString(req?.params?.monitorId, "Monitor ID");
-			const teamId = requireTeamId(req?.user?.teamId);
+			const validatedParams = getMonitorByIdParamValidation.parse(req.params);
+			const teamId = requireTeamId(req.user?.teamId);
+			const monitorId = validatedParams.monitorId;
 
 			const deletedMonitor = await this.monitorService.deleteMonitor({ teamId, monitorId });
 
@@ -249,8 +234,7 @@ class MonitorController {
 
 	deleteAllMonitors = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const teamId = requireTeamId(req?.user?.teamId);
-
+			const teamId = requireTeamId(req.user?.teamId);
 			const deletedCount = await this.monitorService.deleteAllMonitors({ teamId });
 
 			return res.status(200).json({
@@ -264,12 +248,12 @@ class MonitorController {
 
 	editMonitor = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			getMonitorByIdParamValidation.parse(req.params);
-			editMonitorBodyValidation.parse(req.body);
-			const monitorId = requireString(req?.params?.monitorId, "Monitor ID");
-			const teamId = requireTeamId(req?.user?.teamId);
+			const validatedParams = getMonitorByIdParamValidation.parse(req.params);
+			const validatedBody = editMonitorBodyValidation.parse(req.body);
+			const monitorId = validatedParams.monitorId;
+			const teamId = requireTeamId(req.user?.teamId);
 
-			const editedMonitor = await this.monitorService.editMonitor({ teamId, monitorId, body: req.body });
+			const editedMonitor = await this.monitorService.editMonitor({ teamId, monitorId, body: validatedBody });
 
 			return res.status(200).json({
 				success: true,
@@ -283,10 +267,10 @@ class MonitorController {
 
 	pauseMonitor = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			pauseMonitorParamValidation.parse(req.params);
+			const validatedParams = pauseMonitorParamValidation.parse(req.params);
 
-			const monitorId = requireString(req?.params?.monitorId, "Monitor ID");
-			const teamId = requireTeamId(req?.user?.teamId);
+			const monitorId = validatedParams.monitorId;
+			const teamId = requireTeamId(req.user?.teamId);
 
 			const monitor = await this.monitorService.pauseMonitor({ teamId, monitorId });
 
@@ -302,8 +286,8 @@ class MonitorController {
 
 	addDemoMonitors = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const id = requireString(req?.user?.id, "User ID");
-			const teamId = requireTeamId(req?.user?.teamId);
+			const id = requireUserId(req.user?.id);
+			const teamId = requireTeamId(req.user?.teamId);
 			const demoMonitors = await this.monitorService.addDemoMonitors({ userId: id, teamId });
 
 			return res.status(200).json({
@@ -316,32 +300,13 @@ class MonitorController {
 		}
 	};
 
-	sendTestEmail = async (req: Request, res: Response, next: NextFunction) => {
-		try {
-			const { to } = req.body;
-			if (!to || typeof to !== "string") {
-				throw new AppError({ message: "Invalid 'to' email address", status: 400 });
-			}
-
-			const messageId = await this.monitorService.sendTestEmail({ to });
-			return res.status(200).json({
-				success: true,
-				msg: "Test email sent successfully",
-				data: { messageId },
-			});
-		} catch (error) {
-			next(error);
-		}
-	};
-
 	getMonitorsByTeamId = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			getMonitorsByTeamIdParamValidation.parse(req.params);
-			getMonitorsByTeamIdQueryValidation.parse(req.query);
+			const validatedQuery = getMonitorsByTeamIdQueryValidation.parse(req.query);
 
-			const teamId = requireTeamId(req?.user?.teamId);
-			const type = parseMonitorTypeFilter(req.query?.type);
-			const filter = optionalString(req.query?.filter, "filter");
+			const teamId = requireTeamId(req.user?.teamId);
+			const type = validatedQuery.type;
+			const filter = validatedQuery.filter;
 
 			const monitors = await this.monitorService.getMonitorsByTeamId({ teamId, type, filter });
 
@@ -357,17 +322,17 @@ class MonitorController {
 
 	getMonitorsWithChecksByTeamId = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			getMonitorsByTeamIdParamValidation.parse(req.params);
-			getMonitorsWithChecksQueryValidation.parse(req.query);
-			const explain = optionalBoolean(req?.query?.explain, "explain");
-			const limit = optionalNumber(req?.query?.limit, "limit");
-			const page = optionalNumber(req?.query?.page, "page");
-			const rowsPerPage = optionalNumber(req?.query?.rowsPerPage, "rowsPerPage");
-			const filter = optionalString(req?.query?.filter, "filter");
-			const field = optionalString(req?.query?.field, "field");
-			const order = parseSortOrder(req?.query?.order);
-			const type = parseMonitorTypeFilter(req?.query?.type);
-			const teamId = requireTeamId(req?.user?.teamId);
+			const validatedQuery = getMonitorsWithChecksQueryValidation.parse(req.query);
+
+			const explain = validatedQuery.explain;
+			const limit = validatedQuery.limit;
+			const page = validatedQuery.page;
+			const rowsPerPage = validatedQuery.rowsPerPage;
+			const filter = validatedQuery.filter;
+			const field = validatedQuery.field;
+			const order = validatedQuery.order;
+			const type = validatedQuery.type;
+			const teamId = requireTeamId(req.user?.teamId);
 
 			const monitors = await this.monitorService.getMonitorsWithChecksByTeamId({
 				teamId,
@@ -392,11 +357,7 @@ class MonitorController {
 
 	exportMonitorsToJSON = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const teamId = req?.user?.teamId;
-			if (!teamId) {
-				throw new AppError({ message: "Team ID is required", status: 400 });
-			}
-
+			const teamId = requireTeamId(req.user?.teamId);
 			const json = await this.monitorService.exportMonitorsToJSON({ teamId });
 
 			return res.status(200).json({
@@ -424,11 +385,7 @@ class MonitorController {
 
 	getGroupsByTeamId = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const teamId = req?.user?.teamId;
-			if (!teamId) {
-				throw new AppError({ message: "Team ID is required", status: 400 });
-			}
-
+			const teamId = requireTeamId(req.user?.teamId);
 			const groups = await this.monitorService.getGroupsByTeamId({ teamId });
 
 			return res.status(200).json({

server/src/controllers/notificationController.ts

@@ -1,16 +1,21 @@
 import { Request, Response, NextFunction } from "express";
 
-import { Notification } from "@/types/index.js";
-import { createNotificationBodyValidation } from "@/validation/notificationValidation.js";
+import {
+	createNotificationBodyValidation,
+	deleteNotificationParamValidation,
+	getNotificationByIdParamValidation,
+	testNotificationBodyValidation,
+	editNotificationParamValidation,
+	testAllNotificationsBodyValidation,
+} from "@/validation/notificationValidation.js";
 import { AppError } from "@/utils/AppError.js";
 import { IMonitorsRepository } from "@/repositories/index.js";
 import { INotificationsService } from "@/service/index.js";
-import { requireTeamId } from "./controllerUtils.js";
+import { requireTeamId, requireUserId } from "./controllerUtils.js";
 
 const SERVICE_NAME = "NotificationController";
 
 class NotificationController {
-	static SERVICE_NAME = SERVICE_NAME;
 	private notificationsService: INotificationsService;
 	private monitorsRepository: IMonitorsRepository;
 	constructor(notificationsService: INotificationsService, monitorsRepository: IMonitorsRepository) {
@@ -18,13 +23,9 @@ class NotificationController {
 		this.monitorsRepository = monitorsRepository;
 	}
 
-	get serviceName() {
-		return NotificationController.SERVICE_NAME;
-	}
-
 	testNotification = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const notification: Notification = req.body;
+			const notification = testNotificationBodyValidation.parse(req.body);
 			const success = await this.notificationsService.sendTestNotification(notification);
 
 			if (!success) {
@@ -34,6 +35,7 @@ class NotificationController {
 			return res.status(200).json({
 				success: true,
 				msg: "Notification sent successfully",
+				details: { service: SERVICE_NAME },
 			});
 		} catch (error) {
 			next(error);
@@ -42,23 +44,12 @@ class NotificationController {
 
 	createNotification = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			createNotificationBodyValidation.parse(req.body);
+			const validatedBody = createNotificationBodyValidation.parse(req.body);
 
-			const body = req.body;
+			const teamId = requireTeamId(req.user?.teamId);
+			const userId = requireUserId(req.user?.id);
 
-			const teamId = req?.user?.teamId;
-			if (!teamId) {
-				throw new AppError({ message: "Team ID is required", status: 400 });
-			}
-
-			const userId = req?.user?.id;
-			if (!userId) {
-				throw new AppError({ message: "User ID is required", status: 400 });
-			}
-			body.userId = userId;
-			body.teamId = teamId;
-
-			const notification = await this.notificationsService.createNotification(body);
+			const notification = await this.notificationsService.createNotification(validatedBody, userId, teamId);
 			return res.status(200).json({
 				success: true,
 				msg: "Notification created successfully",
@@ -71,11 +62,7 @@ class NotificationController {
 
 	getNotificationsByTeamId = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const teamId = req?.user?.teamId;
-			if (!teamId) {
-				throw new AppError({ message: "Team ID is required", status: 400 });
-			}
-
+			const teamId = requireTeamId(req.user?.teamId);
 			const notifications = await this.notificationsService.findNotificationsByTeamId(teamId);
 
 			return res.status(200).json({
@@ -90,17 +77,10 @@ class NotificationController {
 
 	deleteNotification = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const teamId = req?.user?.teamId;
-			if (!teamId) {
-				throw new AppError({ message: "Team ID is required", status: 400 });
-			}
+			const teamId = requireTeamId(req.user?.teamId);
+			const validatedParams = deleteNotificationParamValidation.parse(req.params);
 
-			const notificationId = req.params.id as string;
-			if (!notificationId) {
-				throw new AppError({ message: "Notification ID is required", status: 400 });
-			}
-
-			await this.notificationsService.deleteById(notificationId, teamId);
+			await this.notificationsService.deleteById(validatedParams.id, teamId);
 			return res.status(200).json({
 				success: true,
 				msg: "Notification deleted successfully",
@@ -113,12 +93,9 @@ class NotificationController {
 	getNotificationById = async (req: Request, res: Response, next: NextFunction) => {
 		try {
 			const teamId = requireTeamId(req.user?.teamId);
-			const notificationId = req.params.id as string;
-			if (!notificationId) {
-				throw new AppError({ message: "Notification ID is required", status: 400 });
-			}
+			const validatedParams = getNotificationByIdParamValidation.parse(req.params);
 
-			const notification = await this.notificationsService.findById(notificationId, teamId);
+			const notification = await this.notificationsService.findById(validatedParams.id, teamId);
 
 			return res.status(200).json({
 				success: true,
@@ -132,14 +109,13 @@ class NotificationController {
 
 	editNotification = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			createNotificationBodyValidation.parse(req.body);
+			const validatedBody = createNotificationBodyValidation.parse(req.body);
+			const validatedParams = editNotificationParamValidation.parse(req.params);
 
 			const teamId = requireTeamId(req.user?.teamId);
-			const notificationId = req.params.id as string;
-			if (!notificationId) {
-				throw new AppError({ message: "Notification ID is required", status: 400 });
-			}
-			const editedNotification = await this.notificationsService.updateById(notificationId, teamId, req.body);
+			const notificationId = validatedParams.id;
+
+			const editedNotification = await this.notificationsService.updateById(notificationId, teamId, validatedBody);
 			return res.status(200).json({
 				success: true,
 				msg: "Notification updated successfully",
@@ -152,13 +128,11 @@ class NotificationController {
 
 	testAllNotifications = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const monitorId = req.body.monitorId;
-			const teamId = req?.user?.teamId;
-			if (!teamId) {
-				throw new AppError({ message: "Team ID is required", status: 400 });
-			}
+			const validatedBody = testAllNotificationsBodyValidation.parse(req.body);
 
-			const monitor = await this.monitorsRepository.findById(monitorId, teamId);
+			const teamId = requireTeamId(req.user?.teamId);
+
+			const monitor = await this.monitorsRepository.findById(validatedBody.monitorId, teamId);
 
 			const notifications = monitor.notifications;
 			if (notifications.length === 0) {

server/src/db/IDb.ts

@@ -0,0 +1,4 @@
+export interface IDb {
+	connect(): Promise<void>;
+	disconnect(): Promise<void>;
+}

server/src/db/MongoDB.ts

@@ -1,10 +1,12 @@
 import mongoose from "mongoose";
-import AppSettings from "./models/AppSettings.js";
-import { runMigrations } from "./migration/index.js";
+import AppSettings from "@/db/models/AppSettings.js";
+import { runMigrations } from "@/db/migration/index.js";
 import { ILogger } from "@/utils/logger.js";
 import { EnvConfig } from "@/service/system/settingsService.js";
 const SERVICE_NAME = "MongoDB";
-class MongoDB {
+import { IDb } from "@/db/IDb.js";
+
+class MongoDB implements IDb {
 	static SERVICE_NAME = SERVICE_NAME;
 
 	private logger: ILogger;
@@ -46,12 +48,12 @@ class MongoDB {
 			});
 
 			await runMigrations();
-		} catch (error: any) {
+		} catch (error: unknown) {
 			this.logger.error({
-				message: error.message,
+				message: error instanceof Error ? error.message : "Unknown error",
 				service: SERVICE_NAME,
 				method: "connect",
-				stack: error.stack,
+				stack: error instanceof Error ? error.stack : undefined,
 			});
 			throw error;
 		}
@@ -63,12 +65,12 @@ class MongoDB {
 			await mongoose.disconnect();
 			this.logger.info({ message: "Disconnected from MongoDB", service: SERVICE_NAME, method: "disconnect" });
 			return;
-		} catch (error: any) {
+		} catch (error: unknown) {
 			this.logger.error({
-				message: error.message,
+				message: error instanceof Error ? error.message : "Unknown error",
 				service: SERVICE_NAME,
 				method: "disconnect",
-				stack: error.stack,
+				stack: error instanceof Error ? error.stack : undefined,
 			});
 		}
 	};

server/src/db/models/Check.ts

@@ -21,13 +21,10 @@ type CheckMetadataDocument = Omit<CheckMetadata, "monitorId" | "teamId"> & {
 	type: MonitorType;
 };
 
-type CheckDocumentBase = Omit<Check, "id" | "metadata" | "expiry" | "ackAt" | "createdAt" | "updatedAt"> & {
+type CheckDocumentBase = Omit<Check, "id" | "metadata" | "createdAt" | "updatedAt"> & {
 	metadata: CheckMetadataDocument;
-	expiry: Date;
-	ackAt?: Date | null;
 	createdAt: Date;
 	updatedAt: Date;
-	__v: number;
 };
 
 interface CheckDocument extends CheckDocumentBase {
@@ -225,18 +222,7 @@ const CheckSchema = new Schema<CheckDocument>(
 		message: {
 			type: String,
 		},
-		expiry: {
-			type: Date,
-			default: Date.now,
-		},
-		ack: {
-			type: Boolean,
-			default: false,
-		},
-		ackAt: {
-			type: Date,
-			default: undefined,
-		},
+
 		cpu: {
 			type: cpuSchema,
 			default: () => ({}),

server/src/db/models/Notification.ts

@@ -25,7 +25,7 @@ const NotificationSchema = new Schema<NotificationDocument>(
 		},
 		type: {
 			type: String,
-			enum: ["email", "slack", "discord", "webhook", "pager_duty", "matrix"] as NotificationChannel[],
+			enum: ["email", "slack", "discord", "webhook", "pager_duty", "matrix", "teams"] as NotificationChannel[],
 			required: true,
 		},
 		notificationName: {

server/src/index.ts

@@ -9,7 +9,7 @@ import fs from "fs";
 import { runMigrations } from "./db/migration/index.js";
 
 import Logger, { ILogger } from "@/utils/logger.js";
-import SettingsService from "@/service/system/settingsService.js";
+import { SettingsService } from "@/service/index.js";
 import { MongoSettingsRepository } from "./repositories/index.js";
 
 const SERVICE_NAME = "Server";
@@ -50,9 +50,8 @@ const startApp = async () => {
 		openApiSpec,
 	});
 
-	const port = 52345;
-	const server = app.listen(port, () => {
-		logger.info({ message: `Server started on port:${port}` });
+	const server = app.listen(env.PORT, () => {
+		logger.info({ message: `Server started on port:${env.PORT}` });
 	});
 
 	initShutdownListener(server, services);

server/src/repositories/checks/IChecksRepository.ts

@@ -47,4 +47,5 @@ export interface IChecksRepository {
 	deleteByMonitorId(monitorId: string): Promise<number>;
 	deleteByTeamId(teamId: string): Promise<number>;
 	deleteByMonitorIdsNotIn(monitorIds: string[]): Promise<number>;
+	deleteOlderThan(date: Date): Promise<number>;
 }

server/src/repositories/checks/MongoChecksRepistory.ts

@@ -13,9 +13,10 @@ import type {
 	GotTimings,
 	MonitorType,
 } from "@/types/index.js";
-import { CheckModel, MonitorModel, type CheckDocument } from "@/db/models/index.js";
+import { CheckModel, type CheckDocument } from "@/db/models/index.js";
 import mongoose from "mongoose";
 import { getDateForRange } from "@/utils/dataUtils.js";
+import { ILogger } from "@/utils/logger.js";
 
 const SERVICE_NAME = "StatusService";
 
@@ -26,8 +27,8 @@ type HardwareUpChecks = { totalChecks: number };
 class MongoChecksRepository implements IChecksRepository {
 	static SERVICE_NAME = SERVICE_NAME;
 
-	private logger: any;
-	constructor(logger: any) {
+	private logger: ILogger;
+	constructor(logger: ILogger) {
 		this.logger = logger;
 	}
 
@@ -46,13 +47,6 @@ class MongoChecksRepository implements IChecksRepository {
 			return value instanceof Date ? value.toISOString() : new Date(value).toISOString();
 		};
 
-		const toOptionalDateString = (value?: Date | string | null): string | undefined => {
-			if (!value) {
-				return undefined;
-			}
-			return toDateString(value);
-		};
-
 		const mapTimings = (timings?: GotTimings): GotTimings => {
 			const phases = timings?.phases ?? {
 				wait: 0,
@@ -171,9 +165,6 @@ class MongoChecksRepository implements IChecksRepository {
 			timings: mapTimings(doc.timings),
 			statusCode: doc.statusCode ?? 0,
 			message: doc.message ?? "",
-			ack: doc.ack ?? false,
-			ackAt: toOptionalDateString(doc.ackAt),
-			expiry: toDateString(doc.expiry),
 			cpu: mapCpu(doc.cpu),
 			memory: mapMemory(doc.memory),
 			disk: mapDisks(doc.disk),
@@ -186,7 +177,6 @@ class MongoChecksRepository implements IChecksRepository {
 			seo: doc.seo,
 			performance: doc.performance,
 			audits: mapAudits(doc.audits),
-			__v: doc.__v ?? 0,
 			createdAt: toDateString(doc.createdAt),
 			updatedAt: toDateString(doc.updatedAt),
 		};
@@ -237,7 +227,7 @@ class MongoChecksRepository implements IChecksRepository {
 		status: boolean | undefined
 	) => {
 		// Match
-		const matchStage: Record<string, any> = {
+		const matchStage: Record<string, unknown> = {
 			"metadata.monitorId": new mongoose.Types.ObjectId(monitorId),
 			...(typeof status !== "undefined" && { status }),
 			...(getDateForRange(dateRange) && {
@@ -289,7 +279,7 @@ class MongoChecksRepository implements IChecksRepository {
 	};
 
 	findByTeamId = async (sortOrder: string, dateRange: string, filter: string, page: number, rowsPerPage: number, teamId: string) => {
-		const matchStage: Record<string, any> = {
+		const matchStage: Record<string, unknown> = {
 			"metadata.teamId": new mongoose.Types.ObjectId(teamId),
 			...(getDateForRange(dateRange) && {
 				createdAt: {
@@ -358,7 +348,7 @@ class MongoChecksRepository implements IChecksRepository {
 		);
 
 		const mapped = results.reduce<LatestChecksMap>((acc, { monitorId, docs }) => {
-			acc[monitorId] = docs.map((doc: any) => this.toEntity(doc as CheckDocument));
+			acc[monitorId] = docs.map((doc: CheckDocument) => this.toEntity(doc));
 			return acc;
 		}, {});
 		return mapped;
@@ -412,6 +402,31 @@ class MongoChecksRepository implements IChecksRepository {
 		return result.deletedCount ?? 0;
 	};
 
+	deleteOlderThan = async (cutoffDate: Date, batchDays: number = 30): Promise<number> => {
+		// Find the oldest check that is older than the cutoff
+		const oldest = await CheckModel.findOne({ createdAt: { $lt: cutoffDate } })
+			.sort({ createdAt: 1 })
+			.select({ createdAt: 1 });
+		if (!oldest?.createdAt) return 0;
+
+		let totalDeleted = 0;
+		let batchStart = new Date(oldest.createdAt);
+		const batchMs = batchDays * 24 * 60 * 60 * 1000;
+
+		// Delete in 30 day chunks until we reach the cutoff
+		while (batchStart < cutoffDate) {
+			// Advance startTime by batchMs to get to the end of last batch
+			const nextStart = batchStart.getTime() + batchMs;
+			const batchEnd = new Date(Math.min(nextStart, cutoffDate.getTime()));
+			const result = await CheckModel.deleteMany({
+				createdAt: { $gte: batchStart, $lt: batchEnd },
+			});
+			totalDeleted += result.deletedCount ?? 0;
+			batchStart = batchEnd;
+		}
+
+		return totalDeleted;
+	};
 	private findUptimeDateRangeChecks = async (
 		monitorType: Exclude<MonitorType, "hardware" | "pagespeed">,
 		monitorObjectId: mongoose.Types.ObjectId,

server/src/repositories/geo-checks/MongoGeoChecksRepository.ts

@@ -1,17 +1,18 @@
 import { IGeoChecksRepository } from "./IGeoChecksRepository.js";
 import type { GeoCheck, GeoCheckMetadata, GeoCheckResult, GroupedGeoCheck, GeoContinent, FlatGeoCheck } from "@/types/geoCheck.js";
-import type { GeoChecksQueryResult, FlatGeoChecksQueryResult } from "./IGeoChecksRepository.js";
+import type { FlatGeoChecksQueryResult } from "./IGeoChecksRepository.js";
 import { GeoCheckModel, type GeoCheckDocument } from "@/db/models/index.js";
 import mongoose from "mongoose";
 import { getDateForRange } from "@/utils/dataUtils.js";
+import { ILogger } from "@/utils/logger.js";
 
 const SERVICE_NAME = "GeoChecksRepository";
 
 class MongoGeoChecksRepository implements IGeoChecksRepository {
 	static SERVICE_NAME = SERVICE_NAME;
 
-	private logger: any;
-	constructor(logger: any) {
+	private logger: ILogger;
+	constructor(logger: ILogger) {
 		this.logger = logger;
 	}
 

server/src/repositories/maintenance-windows/IMaintenanceWindowsRepository.ts

@@ -5,12 +5,12 @@ export interface IMaintenanceWindowsRepository {
 	// fetch
 	findById(id: string, teamId: string): Promise<MaintenanceWindow>;
 	findByMonitorId(monitorId: string, teamId: string): Promise<MaintenanceWindow[]>;
-	findByTeamId(teamId: string, active: boolean, page: number, rowsPerPage: number, field: string, order: string): Promise<MaintenanceWindow[]>;
+	findByTeamId(teamId: string, page: number, rowsPerPage: number, field?: string, order?: string, active?: boolean): Promise<MaintenanceWindow[]>;
 
 	// update
 	updateById(id: string, teamId: string, data: Partial<MaintenanceWindow>): Promise<MaintenanceWindow>;
 	// delete
 	deleteById(id: string, teamId: string): Promise<MaintenanceWindow>;
 	// other
-	countByTeamId(teamId: string, active: boolean): Promise<number>;
+	countByTeamId(teamId: string, active?: boolean): Promise<number>;
 }

server/src/repositories/maintenance-windows/MongoMaintenanceWindowsRepository.ts

@@ -75,11 +75,11 @@ class MongoMaintenanceWindowsRepository implements IMaintenanceWindowsRepository
 
 	findByTeamId = async (
 		teamId: string,
-		active: boolean,
 		page: number,
 		rowsPerPage: number,
-		field: string,
-		order: string
+		field?: string,
+		order?: string,
+		active?: boolean
 	): Promise<MaintenanceWindow[]> => {
 		const maintenanceQuery: Record<string, any> = { teamId };
 
@@ -126,7 +126,7 @@ class MongoMaintenanceWindowsRepository implements IMaintenanceWindowsRepository
 		}
 		return this.toEntity(deleted);
 	};
-	countByTeamId = async (teamId: string, active: boolean) => {
+	countByTeamId = async (teamId: string, active?: boolean) => {
 		const maintenanceQuery: Record<string, any> = { teamId };
 
 		if (active !== undefined) maintenanceQuery.active = active;

server/src/routes/authRoute.ts

@@ -26,9 +26,10 @@ class AuthRoutes {
 
 		this.router.get("/users", verifyJWT, isAllowed(["admin", "superadmin"]), this.authController.getAllUsers);
 		this.router.post("/users", verifyJWT, isAllowed(["superadmin"]), upload.single("profileImage"), this.authController.createUser);
-		this.router.get("/users/:userId", verifyJWT, isAllowed(["superadmin"]), this.authController.getUserById);
+		this.router.get("/users/:userId", verifyJWT, isAllowed(["admin", "superadmin"]), this.authController.getUserById);
 		this.router.patch("/users/:userId", verifyJWT, isAllowed(["superadmin"]), this.authController.editUserById);
 		this.router.patch("/users/:userId/password", verifyJWT, isAllowed(["superadmin"]), this.authController.editUserPasswordById);
+		this.router.delete("/users/:userId", verifyJWT, isAllowed(["admin", "superadmin"]), this.authController.deleteUserById);
 
 		this.router.patch("/user", verifyJWT, upload.single("profileImage"), this.authController.editUser);
 		this.router.delete("/user", verifyJWT, this.authController.deleteUser);

server/src/routes/checkRoute.ts

@@ -15,7 +15,6 @@ class CheckRoutes {
 	initRoutes() {
 		this.router.get("/team/summary", this.checkController.getChecksSummaryByTeamId);
 		this.router.get("/team", this.checkController.getChecksByTeam);
-		this.router.put("/team/ttl", isAllowed(["admin", "superadmin"]), this.checkController.updateChecksTTL);
 		this.router.delete("/team", isAllowed(["admin", "superadmin"]), this.checkController.deleteChecksByTeamId);
 		this.router.get("/:monitorId", this.checkController.getChecksByMonitor);
 		this.router.delete("/:monitorId", this.checkController.deleteChecks);

server/src/routes/monitorRoute.ts

@@ -50,7 +50,6 @@ class MonitorRoutes {
 		this.router.get("/export/json", isAllowed(["admin", "superadmin"]), this.monitorController.exportMonitorsToJSON);
 		this.router.post("/import/json", isAllowed(["admin", "superadmin"]), this.monitorController.importMonitorsFromJSON);
 
-		this.router.post("/test-email", isAllowed(["admin", "superadmin"]), this.monitorController.sendTestEmail);
 		this.router.get("/games", this.monitorController.getAllGames);
 
 		// Individual monitor CRUD routes

server/src/service/business/checkService.ts

@@ -1,25 +1,48 @@
 import { Types } from "mongoose";
 import { IChecksRepository, IMonitorsRepository } from "@/repositories/index.js";
-import type { MonitorStatusResponse, CheckErrorInfo, Check, ILighthouseAudit, ChecksQueryResult, ChecksSummary } from "@/types/index.js";
+import type {
+	MonitorStatusResponse,
+	CheckErrorInfo,
+	Check,
+	ILighthouseAudit,
+	ChecksQueryResult,
+	ChecksSummary,
+	MonitorPayloadMap,
+} from "@/types/index.js";
 import type { HardwareStatusPayload, PageSpeedStatusPayload } from "@/types/network.js";
 import { AppError } from "@/utils/AppError.js";
-import { ParseBoolean } from "@/utils/utils.js";
 import { ILogger } from "@/utils/logger.js";
 
 const SERVICE_NAME = "checkService";
 
 export interface ICheckService {
 	createChecks(checks: Check[]): Promise<Check[]>;
-	buildCheck(statusResponse: MonitorStatusResponse<PageSpeedStatusPayload | HardwareStatusPayload | undefined>): Partial<Check> | undefined;
-	getChecksByMonitor(params: { monitorId: string; query: Record<string, string>; teamId: string }): Promise<ChecksQueryResult>;
-	getChecksByTeam(params: { teamId: string; query: Record<string, string> }): Promise<ChecksQueryResult>;
+	buildCheck(statusResponse: MonitorStatusResponse<MonitorPayloadMap[keyof MonitorPayloadMap]>): Check | undefined;
+	getChecksByMonitor(params: {
+		monitorId: string;
+		teamId: string;
+		sortOrder: string;
+		dateRange: string;
+		page: number;
+		rowsPerPage: number;
+		filter?: string;
+		status?: boolean;
+	}): Promise<ChecksQueryResult>;
+	getChecksByTeam(params: {
+		teamId: string;
+		sortOrder: string;
+		dateRange: string;
+		page: number;
+		rowsPerPage: number;
+		filter?: string;
+	}): Promise<ChecksQueryResult>;
 	getChecksSummaryByTeamId(params: { teamId: string; dateRange: string }): Promise<ChecksSummary>;
 	deleteChecks(params: { monitorId: string; teamId: string }): Promise<number>;
 	deleteChecksByTeamId(params: { teamId: string }): Promise<number>;
-	updateChecksTTL(params: { teamId: string; ttl: string }): Promise<void>;
+	deleteOlderThan(date: Date): Promise<number>;
 }
 
-class CheckService implements ICheckService {
+export class CheckService implements ICheckService {
 	static SERVICE_NAME = SERVICE_NAME;
 
 	private monitorsRepository: IMonitorsRepository;
@@ -39,12 +62,14 @@ class CheckService implements ICheckService {
 		return this.checksRepository.createChecks(checks);
 	};
 
-	buildCheck = (statusResponse: MonitorStatusResponse<PageSpeedStatusPayload | HardwareStatusPayload | undefined>) => {
+	buildCheck = (statusResponse: MonitorStatusResponse<MonitorPayloadMap[keyof MonitorPayloadMap]>): Check | undefined => {
 		const { monitorId, teamId, type, status, responseTime, code, message, payload, timings } = statusResponse;
 
-		const check: Partial<Check> = {
+		const now = new Date().toISOString();
+		const check: Check = {
 			id: new Types.ObjectId().toString(),
-			createdAt: new Date().toISOString(),
+			createdAt: now,
+			updatedAt: now,
 			metadata: {
 				monitorId,
 				teamId,
@@ -112,7 +137,25 @@ class CheckService implements ICheckService {
 		return check;
 	};
 
-	getChecksByMonitor = async ({ monitorId, query, teamId }: { monitorId: string; query: Record<string, string>; teamId: string }) => {
+	getChecksByMonitor = async ({
+		monitorId,
+		teamId,
+		sortOrder,
+		dateRange,
+		filter,
+		page,
+		rowsPerPage,
+		status,
+	}: {
+		monitorId: string;
+		teamId: string;
+		sortOrder: string;
+		dateRange: string;
+		page: number;
+		rowsPerPage: number;
+		status?: boolean;
+		filter?: string;
+	}) => {
 		if (!monitorId) {
 			throw new AppError({ message: "No monitor ID in request", service: SERVICE_NAME, method: "getChecksByMonitor", status: 400 });
 		}
@@ -123,76 +166,54 @@ class CheckService implements ICheckService {
 		// For verification, throws an error if monitor doesn't belong to team
 		await this.monitorsRepository.findById(monitorId, teamId);
 
-		const { sortOrder, dateRange, filter, page, rowsPerPage, status } = query;
-		if (!sortOrder || !dateRange || !page || !rowsPerPage) {
-			throw new AppError({
-				message: `Missing required query parameters sortOrder: ${sortOrder}, dateRange: ${dateRange}, filter: ${filter}, page: ${page}, rowsPerPage: ${rowsPerPage}`,
-				service: SERVICE_NAME,
-				method: "getChecksByMonitor",
-				status: 400,
-			});
-		}
-		const parsedStatus = typeof status === "undefined" ? status : ParseBoolean(status);
-		const parsedPage = page ? parseInt(page) : 0;
-		const parsedRowsPerPage = rowsPerPage ? parseInt(rowsPerPage) : 5;
+		const parsedPage = page ?? 0;
+		const parsedRowsPerPage = rowsPerPage ?? 5;
 
-		const result = await this.checksRepository.findByMonitorId(monitorId, sortOrder, dateRange, filter, parsedPage, parsedRowsPerPage, parsedStatus);
+		const result = await this.checksRepository.findByMonitorId(monitorId, sortOrder, dateRange, filter, parsedPage, parsedRowsPerPage, status);
 
 		return result;
 	};
 
-	getChecksByTeam = async ({ teamId, query }: { teamId: string; query: Record<string, string> }) => {
-		const { sortOrder, dateRange, filter, page, rowsPerPage } = query;
-		if (!sortOrder || !dateRange || !page || !rowsPerPage) {
-			throw new AppError({ message: "Missing required query parameters", service: SERVICE_NAME, method: "getChecksByTeam", status: 400 });
-		}
-
-		if (!teamId) {
-			throw new AppError({ message: "No team ID in request", service: SERVICE_NAME, method: "getChecksByTeam", status: 400 });
-		}
-
-		const parsedPage = page ? parseInt(page) : 0;
-		const parsedRowsPerPage = rowsPerPage ? parseInt(rowsPerPage) : 5;
+	getChecksByTeam = async ({
+		teamId,
+		sortOrder,
+		dateRange,
+		filter,
+		page,
+		rowsPerPage,
+	}: {
+		teamId: string;
+		sortOrder: string;
+		dateRange: string;
+		page: number;
+		rowsPerPage: number;
+		filter?: string;
+	}) => {
+		const parsedPage = page ?? 0;
+		const parsedRowsPerPage = rowsPerPage ?? 5;
 
 		const checkData = await this.checksRepository.findByTeamId(sortOrder, dateRange, filter, parsedPage, parsedRowsPerPage, teamId);
 		return checkData;
 	};
 
 	getChecksSummaryByTeamId = async ({ teamId, dateRange }: { teamId: string; dateRange: string }) => {
-		if (!teamId) {
-			throw new AppError({ message: "No team ID in request", service: SERVICE_NAME, method: "getChecksSummaryByTeamId", status: 400 });
-		}
 		const summary = await this.checksRepository.findSummaryByTeamId(teamId, dateRange);
 		return summary;
 	};
 
 	deleteChecks = async ({ monitorId, teamId }: { monitorId: string; teamId: string }) => {
-		if (!monitorId) {
-			throw new AppError({ message: "No monitor ID in request", service: SERVICE_NAME, method: "deleteChecks", status: 400 });
-		}
-
-		if (!teamId) {
-			throw new AppError({ message: "No team ID in request", service: SERVICE_NAME, method: "deleteChecks", status: 400 });
-		}
-
-		// For verification, throws an error if monitor doesn't belong to team
 		await this.monitorsRepository.findById(monitorId, teamId);
 
 		const deletedCount = await this.checksRepository.deleteByMonitorId(monitorId);
 		return deletedCount;
 	};
 	deleteChecksByTeamId = async ({ teamId }: { teamId: string }) => {
-		if (!teamId) {
-			throw new AppError({ message: "No team ID in request", service: SERVICE_NAME, method: "deleteChecksByTeamId", status: 400 });
-		}
-
 		const deletedCount = await this.checksRepository.deleteByTeamId(teamId);
 		return deletedCount;
 	};
 
-	updateChecksTTL = async ({ teamId, ttl }: { teamId: string; ttl: string }) => {
-		throw new AppError({ message: "Not implemented", service: SERVICE_NAME, method: "updateChecksTTL", status: 500, details: { teamId, ttl } });
+	deleteOlderThan = async (date: Date) => {
+		const deletedCount = await this.checksRepository.deleteOlderThan(date);
+		return deletedCount;
 	};
 }
-
-export default CheckService;

server/src/service/business/diagnosticService.ts

@@ -3,15 +3,19 @@ import os from "os";
 
 const SERVICE_NAME = "diagnosticService";
 
-interface MemoryUsageMetrics {
-	rss: number;
-	heapTotal: number;
-	heapUsed: number;
-	external: number;
-	arrayBuffers: number;
+export interface IDiagnosticService {
+	getCPUUsage(): Promise<{ userUsageMs: number; systemUsageMs: number; usagePercentage: number }>;
+	getSystemStats(): Promise<{
+		osStats: { freeMemoryBytes: number; totalMemoryBytes: number };
+		memoryUsage: Record<keyof NodeJS.MemoryUsage, number>;
+		cpuUsage: { userUsageMs: number; systemUsageMs: number; usagePercentage: number };
+		v8HeapStats: { totalHeapSizeBytes: number; usedHeapSizeBytes: number; heapSizeLimitBytes: number };
+		eventLoopDelayMs: number;
+		uptimeMs: number;
+	}>;
 }
 
-class DiagnosticService {
+export class DiagnosticService implements IDiagnosticService {
 	static SERVICE_NAME = SERVICE_NAME;
 
 	constructor() {
@@ -103,5 +107,3 @@ class DiagnosticService {
 		return diagnostics;
 	};
 }
-
-export default DiagnosticService;

server/src/service/business/geoChecksService.ts

@@ -16,7 +16,7 @@ export interface IGeoChecksService {
 	getGeoChecksByMonitor(args: { monitorId: string; query: any; teamId: string }): Promise<any>;
 }
 
-class GeoChecksService implements IGeoChecksService {
+export class GeoChecksService implements IGeoChecksService {
 	static SERVICE_NAME = SERVICE_NAME;
 
 	private logger: ILogger;
@@ -68,7 +68,7 @@ class GeoChecksService implements IGeoChecksService {
 			}
 
 			// Step 1: Create measurement request
-			const measurementId = await this.globalPingService.createMeasurement(monitor.url, monitor.geoCheckLocations);
+			const measurementId = await this.globalPingService.createMeasurement(monitor.type, monitor.url, monitor.geoCheckLocations);
 
 			if (!measurementId) {
 				// GlobalPing API is down, skip this check
@@ -76,7 +76,6 @@ class GeoChecksService implements IGeoChecksService {
 					message: "Skipping geo check due to API unavailability",
 					service: SERVICE_NAME,
 					method: "buildGeoCheck",
-					details: { monitorId: monitor.id },
 				});
 				return null;
 			}
@@ -90,7 +89,6 @@ class GeoChecksService implements IGeoChecksService {
 					message: "No successful geo check results",
 					service: SERVICE_NAME,
 					method: "buildGeoCheck",
-					details: { monitorId: monitor.id, measurementId },
 				});
 				return null;
 			}
@@ -102,17 +100,16 @@ class GeoChecksService implements IGeoChecksService {
 				message: `Geo check completed for monitor ${monitor.id}`,
 				service: SERVICE_NAME,
 				method: "buildGeoCheck",
-				details: { monitorId: monitor.id, resultsCount: results.length },
 			});
 
 			return geoCheck;
-		} catch (error: any) {
+		} catch (error: unknown) {
 			this.logger.error({
 				message: "Error executing geo check",
 				service: SERVICE_NAME,
 				method: "buildGeoCheck",
-				details: { monitorId: monitor.id, error: error.message },
-				stack: error.stack,
+				details: { monitorId: monitor.id, error: error instanceof Error ? error.message : "Unknown error" },
+				stack: error instanceof Error ? error.stack : undefined,
 			});
 			return null;
 		}
@@ -172,21 +169,9 @@ class GeoChecksService implements IGeoChecksService {
 
 		const { sortOrder, dateRange, page, rowsPerPage, continent } = query;
 		const continents = continent ? (Array.isArray(continent) ? continent : [continent]) : undefined;
-
-		this.logger.debug({
-			message: "getGeoChecksByMonitor query params",
-			service: SERVICE_NAME,
-			method: "getGeoChecksByMonitor",
-			details: { continent, continents, query },
-		});
-
 		const parsedPage = page ? parseInt(page) : page;
 		const parsedRowsPerPage = rowsPerPage ? parseInt(rowsPerPage) : rowsPerPage;
-
 		const result = await this.geoChecksRepository.findByMonitorId(monitorId, sortOrder, dateRange, parsedPage, parsedRowsPerPage, continents);
-
 		return result;
 	};
 }
-
-export default GeoChecksService;

server/src/service/business/incidentService.ts

@@ -2,15 +2,36 @@ const SERVICE_NAME = "incidentService";
 import type { Monitor } from "@/types/monitor.js";
 import type { MonitorStatusResponse } from "@/types/network.js";
 import { AppError } from "@/utils/AppError.js";
-import { ParseBoolean } from "@/utils/utils.js";
 import { getDateForRange } from "@/utils/dataUtils.js";
 import type { IIncidentsRepository, IMonitorsRepository, IUsersRepository } from "@/repositories/index.js";
-import type { Incident } from "@/types/index.js";
+import type { Incident, IncidentSummary, User } from "@/types/index.js";
 import type { MonitorActionDecision } from "@/service/infrastructure/SuperSimpleQueue/SuperSimpleQueueHelper.js";
 import type { INotificationMessageBuilder } from "@/service/infrastructure/notificationMessageBuilder.js";
 import type { ILogger } from "@/utils/logger.js";
 
-class IncidentService {
+export interface IIncidentService {
+	handleIncident(
+		monitor: Monitor,
+		code: number,
+		decision: MonitorActionDecision,
+		monitorStatusResponse?: MonitorStatusResponse
+	): Promise<Incident | null>;
+	resolveIncident(incidentId: string, userId: string, teamId: string, comment?: string, userEmail?: string): Promise<Incident>;
+	getIncidentsByTeam(
+		teamId: string,
+		sortOrder: string,
+		dateRange: string,
+		page: number,
+		rowsPerPage: number,
+		status: boolean | undefined,
+		monitorId: string | undefined,
+		resolutionType: string | undefined
+	): Promise<{ incidents: Incident[]; count: number }>;
+	getIncidentSummary(teamId: string, limit?: number): Promise<IncidentSummary>;
+	getIncidentById(incidentId: string, teamId: string): Promise<{ incident: Incident; monitor: Monitor; user: User | null }>;
+}
+
+export class IncidentService implements IIncidentService {
 	static SERVICE_NAME = SERVICE_NAME;
 
 	private logger: ILogger;
@@ -142,13 +163,13 @@ class IncidentService {
 			});
 
 			return resolvedIncident;
-		} catch (error: any) {
+		} catch (error: unknown) {
 			this.logger.error({
 				service: SERVICE_NAME,
 				method: "resolveIncident",
-				message: error.message,
+				message: error instanceof Error ? error.message : "Unknown error",
 				details: { id: incidentId },
-				stack: error.stack,
+				stack: error instanceof Error ? error.stack : undefined,
 			});
 			throw error;
 		}
@@ -158,11 +179,11 @@ class IncidentService {
 		teamId: string,
 		sortOrder: string,
 		dateRange: string,
-		page: string,
-		rowsPerPage: string,
-		status: string,
-		monitorId: string,
-		resolutionType: string
+		page: number,
+		rowsPerPage: number,
+		status: boolean | undefined,
+		monitorId: string | undefined,
+		resolutionType: string | undefined
 	) => {
 		try {
 			if (!teamId) {
@@ -171,9 +192,8 @@ class IncidentService {
 
 			const startDate = getDateForRange(dateRange);
 
-			const parsedPage = Number.isFinite(parseInt(page)) ? parseInt(page) : 0;
-			const parsedRowsPerPage = Number.isFinite(parseInt(rowsPerPage)) ? parseInt(rowsPerPage) : 20;
-			const parsedStatus = typeof status === "undefined" ? undefined : ParseBoolean(status);
+			const parsedPage = page ?? 0;
+			const parsedRowsPerPage = rowsPerPage ?? 20;
 
 			const incidents = await this.incidentsRepository.findByTeamId(
 				teamId,
@@ -181,43 +201,43 @@ class IncidentService {
 				parsedPage,
 				parsedRowsPerPage,
 				sortOrder,
-				parsedStatus,
+				status,
 				monitorId,
 				resolutionType
 			);
 
-			const count = await this.incidentsRepository.countByTeamId(teamId, startDate, parsedStatus, monitorId, resolutionType);
+			const count = await this.incidentsRepository.countByTeamId(teamId, startDate, status, monitorId, resolutionType);
 
 			return { incidents, count };
-		} catch (error: any) {
+		} catch (error: unknown) {
 			this.logger.error({
 				service: SERVICE_NAME,
 				method: "getIncidentsByTeam",
-				message: error.message,
+				message: error instanceof Error ? error.message : "Unknown error",
 				details: { teamId },
-				stack: error.stack,
+				stack: error instanceof Error ? error.stack : undefined,
 			});
 			throw error;
 		}
 	};
 
-	getIncidentSummary = async (teamId: string, limit?: string) => {
+	getIncidentSummary = async (teamId: string, limit?: number) => {
 		try {
 			if (!teamId) {
 				throw new AppError({ message: "No team ID in request", service: SERVICE_NAME, method: "getIncidentSummary", status: 400 });
 			}
 
-			const parsedLimit = limit && Number.isFinite(parseInt(limit, 10)) ? parseInt(limit, 10) : 10;
+			const parsedLimit = limit ?? 10;
 			const summary = await this.incidentsRepository.findSummaryByTeamId(teamId, parsedLimit);
 
 			return summary;
-		} catch (error: any) {
+		} catch (error: unknown) {
 			this.logger.error({
 				service: SERVICE_NAME,
 				method: "getIncidentSummary",
-				message: error.message,
+				message: error instanceof Error ? error.message : "Unknown error",
 				details: { teamId },
-				stack: error.stack,
+				stack: error instanceof Error ? error.stack : undefined,
 			});
 			throw error;
 		}
@@ -232,17 +252,15 @@ class IncidentService {
 				user = await this.usersRepository.findById(incident.resolvedBy);
 			}
 			return { incident, monitor, user };
-		} catch (error: any) {
+		} catch (error: unknown) {
 			this.logger.error({
 				service: SERVICE_NAME,
 				method: "getIncidentById",
-				message: error.message,
+				message: error instanceof Error ? error.message : "Unknown error",
 				details: { incidentId },
-				stack: error.stack,
+				stack: error instanceof Error ? error.stack : undefined,
 			});
 			throw error;
 		}
 	};
 }
-
-export default IncidentService;

server/src/service/business/inviteService.ts

@@ -5,7 +5,13 @@ import { AppError } from "@/utils/AppError.js";
 
 const SERVICE_NAME = "inviteService";
 
-class InviteService {
+export interface IInviteService {
+	getInviteToken(params: { invite: Partial<Invite>; teamId: string; userRoles: UserRole[] }): Promise<Invite>;
+	sendInviteEmail(params: { invite: Partial<Invite>; firstName: string; userRoles: UserRole[] }): Promise<void>;
+	verifyInviteToken(params: { inviteToken: string }): Promise<Invite>;
+}
+
+export class InviteService implements IInviteService {
 	static SERVICE_NAME = SERVICE_NAME;
 
 	private settingsService: any;
@@ -88,5 +94,3 @@ class InviteService {
 		return await this.invitesRepository.findByToken(inviteToken);
 	};
 }
-
-export default InviteService;

server/src/service/business/maintenanceWindowService.ts

@@ -1,10 +1,26 @@
 import { IMaintenanceWindowsRepository, IMonitorsRepository } from "@/repositories/index.js";
-import { ParseBoolean } from "@/utils/utils.js";
+import type { MaintenanceWindow } from "@/types/index.js";
 import { AppError } from "@/utils/AppError.js";
 
 const SERVICE_NAME = "maintenanceWindowService";
 
-class MaintenanceWindowService {
+export interface IMaintenanceWindowService {
+	createMaintenanceWindow(params: { teamId: string; body: Partial<MaintenanceWindow> & { monitors: string[] } }): Promise<void>;
+	getMaintenanceWindowById(params: { id: string; teamId: string }): Promise<MaintenanceWindow>;
+	getMaintenanceWindowsByTeamId(params: {
+		teamId: string;
+		active?: boolean;
+		page?: number;
+		rowsPerPage?: number;
+		field?: string;
+		order?: string;
+	}): Promise<{ maintenanceWindows: MaintenanceWindow[]; maintenanceWindowCount: number }>;
+	getMaintenanceWindowsByMonitorId(params: { monitorId: string; teamId: string }): Promise<MaintenanceWindow[]>;
+	deleteMaintenanceWindow(params: { id: string; teamId: string }): Promise<MaintenanceWindow>;
+	editMaintenanceWindow(params: { id: string; teamId: string; body: Partial<MaintenanceWindow> }): Promise<MaintenanceWindow>;
+}
+
+export class MaintenanceWindowService implements IMaintenanceWindowService {
 	static SERVICE_NAME = SERVICE_NAME;
 	private monitorsRepository: IMonitorsRepository;
 	private maintenanceWindowsRepository: IMaintenanceWindowsRepository;
@@ -59,14 +75,25 @@ class MaintenanceWindowService {
 		return await this.maintenanceWindowsRepository.findById(id, teamId);
 	};
 
-	getMaintenanceWindowsByTeamId = async ({ teamId, query }: { teamId: string; query: any }) => {
-		let { active, page, rowsPerPage, field, order } = query || {};
+	getMaintenanceWindowsByTeamId = async ({
+		teamId,
+		active,
+		page,
+		rowsPerPage,
+		field,
+		order,
+	}: {
+		teamId: string;
+		active?: boolean;
+		page?: number;
+		rowsPerPage?: number;
+		field?: string;
+		order?: string;
+	}) => {
+		page = page ?? 0;
+		rowsPerPage = rowsPerPage ?? 10;
 
-		active = typeof active === "undefined" ? undefined : ParseBoolean(active);
-		page = parseInt(page) || 0;
-		rowsPerPage = parseInt(rowsPerPage) || 10;
-
-		const maintenanceWindows = await this.maintenanceWindowsRepository.findByTeamId(teamId, active, page, rowsPerPage, field, order);
+		const maintenanceWindows = await this.maintenanceWindowsRepository.findByTeamId(teamId, page, rowsPerPage, field, order, active);
 		const maintenanceWindowCount = await this.maintenanceWindowsRepository.countByTeamId(teamId, active);
 		return { maintenanceWindows, maintenanceWindowCount };
 	};
@@ -83,5 +110,3 @@ class MaintenanceWindowService {
 		return await this.maintenanceWindowsRepository.updateById(id, teamId, body);
 	};
 }
-
-export default MaintenanceWindowService;

server/src/service/business/monitorService.ts

@@ -8,6 +8,7 @@ import type {
 	PageSpeedDetailsResult,
 	GamesMap,
 } from "@/types/monitor.js";
+import { supportsGeoCheck } from "@/types/monitor.js";
 import type { GeoContinent } from "@/types/geoCheck.js";
 import type {
 	IChecksRepository,
@@ -17,9 +18,7 @@ import type {
 	IMonitorStatsRepository,
 	IStatusPagesRepository,
 } from "@/repositories/index.js";
-import fs from "fs";
-import { fileURLToPath } from "url";
-import path from "path";
+import demoMonitorsData from "@/utils/demoMonitors.json" with { type: "json" };
 import { AppError } from "@/utils/AppError.js";
 import { ISuperSimpleQueue } from "../infrastructure/SuperSimpleQueue/SuperSimpleQueue.js";
 
@@ -30,7 +29,7 @@ export interface IMonitorService {
 	readonly serviceName: string;
 
 	// create
-	createMonitor(teamId: string, userId: string, body: Monitor): Promise<void>;
+	createMonitor(teamId: string, userId: string, body: Partial<Monitor>): Promise<void>;
 	createMonitors(monitors: Array<Monitor>, userId: string, teamId: string): Promise<Monitor[] | null>;
 	addDemoMonitors(args: { userId: string; teamId: string }): Promise<Monitor[]>;
 
@@ -65,7 +64,7 @@ export interface IMonitorService {
 	getGroupsByTeamId(args: { teamId: string }): Promise<string[]>;
 
 	// update
-	editMonitor(args: { teamId: string; monitorId: string; body: Monitor }): Promise<Monitor>;
+	editMonitor(args: { teamId: string; monitorId: string; body: Partial<Monitor> }): Promise<Monitor>;
 	pauseMonitor(args: { teamId: string; monitorId: string }): Promise<Monitor>;
 
 	// delete
@@ -73,7 +72,6 @@ export interface IMonitorService {
 	deleteAllMonitors(args: { teamId: string }): Promise<number>;
 
 	// other
-	sendTestEmail(args: { to: string }): Promise<string>;
 	exportMonitorsToJSON(args: { teamId: string }): Promise<Monitor[]>;
 	importMonitorsFromJSON(args: { teamId: string; userId: string; monitors: any[] }): Promise<{ imported: number; errors: string[] }>;
 }
@@ -176,23 +174,17 @@ export class MonitorService implements IMonitorService {
 	};
 
 	addDemoMonitors = async ({ userId, teamId }: { userId: string; teamId: string }): Promise<any[]> => {
-		const __filename = fileURLToPath(import.meta.url);
-		const __dirname = path.dirname(__filename);
-		const demoMonitorsPath = path.resolve(__dirname, "../../utils/demoMonitors.json");
-
-		const demoData = JSON.parse(fs.readFileSync(demoMonitorsPath, "utf8"));
-		const monitors: Monitor[] = demoData.map((monitor: Monitor) => {
-			return {
-				userId,
-				teamId,
-				name: monitor.name,
-				description: monitor.name,
-				type: "http",
-				url: monitor.url,
-				interval: 60000,
-			};
-		});
-		const demoMonitors = await this.monitorsRepository.createMonitors(monitors);
+		const demoData = demoMonitorsData;
+		const monitors = demoData.map((monitor) => ({
+			userId,
+			teamId,
+			name: monitor.name,
+			description: monitor.name,
+			type: "http" as const,
+			url: monitor.url,
+			interval: 60000,
+		}));
+		const demoMonitors = await this.monitorsRepository.createMonitors(monitors as unknown as Monitor[]);
 
 		await Promise.all(demoMonitors.map((monitor) => this.jobQueue.addJob(monitor.id, monitor)));
 		return demoMonitors;
@@ -226,7 +218,8 @@ export class MonitorService implements IMonitorService {
 			checksData.monitorType !== "docker" &&
 			checksData.monitorType !== "port" &&
 			checksData.monitorType !== "game" &&
-			checksData.monitorType !== "grpc"
+			checksData.monitorType !== "grpc" &&
+			checksData.monitorType !== "websocket"
 		) {
 			throw new AppError({ message: `${monitor.type} monitors are not supported for uptime details`, status: 400 });
 		}
@@ -340,7 +333,7 @@ export class MonitorService implements IMonitorService {
 			throw new AppError({ message: `Monitor with ID ${monitorId} not found.`, status: 404 });
 		}
 
-		if (monitor.type !== "http" || !monitor.geoCheckEnabled) {
+		if (!supportsGeoCheck(monitor.type) || !monitor.geoCheckEnabled) {
 			return { groupedGeoChecks: [] };
 		}
 
@@ -436,7 +429,7 @@ export class MonitorService implements IMonitorService {
 		return groups;
 	};
 
-	editMonitor = async ({ teamId, monitorId, body }: { teamId: string; monitorId: string; body: Monitor }) => {
+	editMonitor = async ({ teamId, monitorId, body }: { teamId: string; monitorId: string; body: Partial<Monitor> }) => {
 		const editedMonitor = await this.monitorsRepository.updateById(monitorId, teamId, body);
 		await this.jobQueue.updateJob(editedMonitor);
 		return editedMonitor;
@@ -515,20 +508,6 @@ export class MonitorService implements IMonitorService {
 		return deletedCount;
 	};
 
-	sendTestEmail = async ({ to }: { to: string }): Promise<string> => {
-		const subject = "Test email from Checkmate";
-		const context = { testName: "Monitoring System" };
-
-		const html = await this.emailService.buildEmail("testEmailTemplate", context);
-		const messageId = await this.emailService.sendEmail(to, subject, html);
-
-		if (!messageId) {
-			throw new AppError({ message: "Failed to send test email.", service: SERVICE_NAME, method: "sendTestEmail", status: 500 });
-		}
-
-		return messageId;
-	};
-
 	exportMonitorsToJSON = async ({ teamId }: { teamId: string }): Promise<any[]> => {
 		const monitors = await this.monitorsRepository.findByTeamId(teamId, {});
 

server/src/service/business/userService.ts

@@ -11,10 +11,39 @@ import { canManageRole, type UserRole } from "@/types/user.js";
 import bcrypt from "bcryptjs";
 import { AppError } from "@/utils/AppError.js";
 import { ISuperSimpleQueue } from "@/service/infrastructure/SuperSimpleQueue/SuperSimpleQueue.js";
-
+import { IEmailService } from "@/service/infrastructure/emailService.js";
+import { EnvConfig, ISettingsService } from "@/service/system/settingsService.js";
+import { ILogger } from "@/utils/logger.js";
+import jwt from "jsonwebtoken";
+import crypto from "crypto";
+type CryptoType = typeof crypto;
+type JwtType = typeof jwt;
 const SERVICE_NAME = "userService";
 
-class UserService {
+export interface IUserService {
+	issueToken(payload: Partial<User>, appSettings: EnvConfig): string;
+	registerUser(user: Partial<User>, inviteToken: string, file: Express.Multer.File | null): Promise<{ user: User; token: string }>;
+	createUser(userData: Partial<User>, teamId: string, actorRoles: UserRole[], file: Express.Multer.File | null): Promise<User>;
+	loginUser(email: string, password: string): Promise<{ user: User; token: string }>;
+	editUser(
+		updates: Partial<User & { newPassword?: string }>,
+		file: Express.Multer.File | null,
+		currentUserId: string,
+		currentUserEmail: string
+	): Promise<User>;
+	checkSuperadminExists(): Promise<boolean>;
+	requestRecovery(email: string): Promise<string | false | undefined>;
+	validateRecovery(recoveryToken: string): Promise<void>;
+	resetPassword(password: string, recoveryToken: string): Promise<{ user: User; token: string }>;
+	deleteUser(params: { userId: string; teamId: string; roles: UserRole[] }): Promise<void>;
+	deleteUserById(params: { actorId: string; actorTeamId: string; actorRoles: UserRole[]; targetUserId: string }): Promise<void>;
+	getAllUsers(): Promise<User[]>;
+	getUserById(roles: UserRole[], userId: string): Promise<User>;
+	editUserById(userId: string, patch: Partial<User>): Promise<void>;
+	setPasswordByUserId(userId: string, password: string): Promise<User>;
+}
+
+export class UserService implements IUserService {
 	static SERVICE_NAME = SERVICE_NAME;
 
 	private hashPassword = (password: string): string => {
@@ -22,12 +51,12 @@ class UserService {
 		return bcrypt.hashSync(password, salt);
 	};
 
-	private emailService: any;
-	private settingsService: any;
-	private logger: any;
-	private jwt: any;
+	private emailService: IEmailService;
+	private settingsService: ISettingsService;
+	private logger: ILogger;
+	private jwt: JwtType;
 	private jobQueue: ISuperSimpleQueue;
-	private crypto: any;
+	private crypto: CryptoType;
 	private monitorsRepository: IMonitorsRepository;
 	private usersRepository: IUsersRepository;
 	private invitesRepository: IInvitesRepository;
@@ -49,11 +78,11 @@ class UserService {
 		settingsRepository,
 		teamsRepository,
 	}: {
-		crypto: any;
-		emailService: any;
-		settingsService: any;
-		logger: any;
-		jwt: any;
+		crypto: CryptoType;
+		emailService: IEmailService;
+		settingsService: ISettingsService;
+		logger: ILogger;
+		jwt: JwtType;
 		jobQueue: ISuperSimpleQueue;
 		monitorsRepository: IMonitorsRepository;
 		usersRepository: IUsersRepository;
@@ -80,14 +109,14 @@ class UserService {
 		return UserService.SERVICE_NAME;
 	}
 
-	issueToken = (payload: any, appSettings: any) => {
+	issueToken = (payload: Partial<User>, appSettings: EnvConfig) => {
 		const tokenTTL = appSettings?.jwtTTL ?? "2h";
 		const tokenSecret = appSettings?.jwtSecret;
 		const payloadData = payload;
 		return this.jwt.sign(payloadData, tokenSecret, { expiresIn: tokenTTL });
 	};
 
-	registerUser = async (user: Partial<User>, inviteToken: string, file: any) => {
+	registerUser = async (user: Partial<User>, inviteToken: string, file: Express.Multer.File | null) => {
 		// Create a new user
 		// If superAdmin exists, a token should be attached to all further register requests
 		const superAdminExists = await this.usersRepository.findSuperAdmin();
@@ -120,7 +149,7 @@ class UserService {
 			message: "New user created",
 			service: SERVICE_NAME,
 			method: "registerUser",
-			details: newUser.id,
+			details: { userId: newUser.id },
 		});
 
 		delete newUser.profileImage;
@@ -134,27 +163,30 @@ class UserService {
 			const html = await this.emailService.buildEmail("welcomeEmailTemplate", {
 				name: newUser.firstName,
 			});
-			this.emailService.sendEmail(newUser.email, "Welcome to Uptime Monitor", html).catch((error: any) => {
+			if (!html) {
+				throw new Error("Failed to build welcome email HTML");
+			}
+			this.emailService.sendEmail(newUser.email, "Welcome to Uptime Monitor", html).catch((error: unknown) => {
 				this.logger.warn({
-					message: error.message,
+					message: error instanceof Error ? error.message : "Unknown error",
 					service: SERVICE_NAME,
 					method: "registerUser",
-					stack: error.stack,
+					stack: error instanceof Error ? error.stack : undefined,
 				});
 			});
-		} catch (error: any) {
+		} catch (error: unknown) {
 			this.logger.warn({
-				message: error.message,
+				message: error instanceof Error ? error.message : "Unknown error",
 				service: SERVICE_NAME,
 				method: "registerUser",
-				stack: error.stack,
+				stack: error instanceof Error ? error.stack : undefined,
 			});
 		}
 
 		return { user: newUser, token };
 	};
 
-	createUser = async (userData: Partial<User>, teamId: string, actorRoles: UserRole[], file: any) => {
+	createUser = async (userData: Partial<User>, teamId: string, actorRoles: UserRole[], file: Express.Multer.File | null) => {
 		// Validate that the creator can assign the requested roles
 		const targetRoles = userData.role ?? [];
 		for (const targetRole of targetRoles) {
@@ -181,7 +213,7 @@ class UserService {
 			message: "New user created by superadmin",
 			service: SERVICE_NAME,
 			method: "createUser",
-			details: newUser.id,
+			details: { userId: newUser.id },
 		});
 
 		newUser.profileImage = undefined;
@@ -214,14 +246,19 @@ class UserService {
 		return { user: userWithoutPassword, token };
 	};
 
-	editUser = async (updates: Partial<User & { newPassword?: string }>, file: any, currentUser: any) => {
+	editUser = async (
+		updates: Partial<User & { newPassword?: string }>,
+		file: Express.Multer.File | null,
+		currentUserId: string,
+		currentUserEmail: string
+	) => {
 		// Change Password check
 		if (updates?.password && updates?.newPassword) {
 			// Get user's email
 			// Add user email to body for DB operation
-			updates.email = currentUser.email;
+			updates.email = currentUserEmail;
 			// Get user
-			const user = await this.usersRepository.findByEmail(currentUser.email);
+			const user = await this.usersRepository.findByEmail(currentUserEmail);
 			// Compare passwords
 			const match = await bcrypt.compare(updates?.password, user.password);
 			// If not a match, throw a 403
@@ -234,7 +271,7 @@ class UserService {
 			delete updates.newPassword;
 		}
 
-		return await this.usersRepository.updateById(currentUser.id, updates, file);
+		return await this.usersRepository.updateById(currentUserId, updates, file);
 	};
 
 	checkSuperadminExists = async () => {
@@ -248,14 +285,22 @@ class UserService {
 		await this.recoveryTokensRepository.deleteManyByEmail(email);
 		const recoveryToken = await this.recoveryTokensRepository.create(email);
 		const name = user.firstName;
-		const { clientHost } = this.settingsService.getSettings();
-		const url = `${clientHost}/set-new-password/${recoveryToken.token}`;
+		const settings = this.settingsService.getSettings();
+		const url = `${settings.clientHost!}/set-new-password/${recoveryToken.token}`;
 
 		const html = await this.emailService.buildEmail("passwordResetTemplate", {
 			name,
 			email,
 			url,
 		});
+		if (!html) {
+			throw new AppError({
+				message: "Failed to build password reset email HTML",
+				service: SERVICE_NAME,
+				method: "requestRecovery",
+				status: 500,
+			});
+		}
 		const msgId = await this.emailService.sendEmail(email, "Checkmate Password Reset", html);
 		return msgId;
 	};
@@ -286,24 +331,7 @@ class UserService {
 		return { user: existingUser, token };
 	};
 
-	deleteUser = async (user: User) => {
-		const email = user?.email;
-		if (!email) {
-			throw new AppError({ message: "No email in request", service: SERVICE_NAME, method: "deleteUser", status: 400 });
-		}
-
-		const teamId = user?.teamId;
-		const userId = user?.id;
-
-		if (!teamId) {
-			throw new AppError({ message: "No team ID in request", service: SERVICE_NAME, method: "deleteUser", status: 400 });
-		}
-
-		if (!userId) {
-			throw new AppError({ message: "No user ID in request", service: SERVICE_NAME, method: "deleteUser", status: 400 });
-		}
-
-		const roles = user?.role;
+	deleteUser = async ({ userId, teamId, roles }: { userId: string; teamId: string; roles: UserRole[] }) => {
 		if (roles.includes("demo")) {
 			throw new AppError({ message: "Demo user cannot be deleted", service: SERVICE_NAME, method: "deleteUser", status: 400 });
 		}
@@ -313,39 +341,87 @@ class UserService {
 
 		if (roles.includes("superadmin")) {
 			// 2.  Remove all jobs, delete checks and alerts
-			res &&
-				res?.length > 0 &&
-				(await Promise.all(
+			if (res && res.length > 0) {
+				await Promise.all(
 					res.map(async (monitor) => {
-						await this.jobQueue.deleteJob(monitor.id);
+						await this.jobQueue.deleteJob(monitor);
 					})
-				));
+				);
+			}
 		}
 		// 6. Delete the user by id
 		await this.usersRepository.deleteById(userId);
 	};
 
+	deleteUserById = async ({
+		actorId,
+		actorRoles,
+		actorTeamId,
+		targetUserId,
+	}: {
+		actorId: string;
+		actorTeamId: string;
+		actorRoles: UserRole[];
+		targetUserId: string;
+	}) => {
+		if (actorId === targetUserId) {
+			throw new AppError({ message: "Cannot delete your own account from here", service: SERVICE_NAME, method: "deleteUserById", status: 400 });
+		}
+
+		const targetUser = await this.usersRepository.findById(targetUserId);
+
+		if (targetUser.teamId !== actorTeamId) {
+			throw new AppError({ message: "User is not on your team", service: SERVICE_NAME, method: "deleteUserById", status: 403 });
+		}
+
+		if (targetUser.role.includes("demo")) {
+			throw new AppError({ message: "Demo user cannot be deleted", service: SERVICE_NAME, method: "deleteUserById", status: 400 });
+		}
+
+		const targetRoles = targetUser.role;
+
+		// Check actor can manage all of target's roles
+		for (const targetRole of targetRoles) {
+			const canManage = actorRoles.some((actorRole) => canManageRole(actorRole, targetRole));
+			if (!canManage) {
+				throw new AppError({
+					message: "You do not have permission to remove this user",
+					service: SERVICE_NAME,
+					method: "deleteUserById",
+					status: 403,
+				});
+			}
+		}
+
+		await this.usersRepository.deleteById(targetUserId);
+
+		this.logger.info({
+			message: `User ${targetUserId} deleted by ${actorId}`,
+			service: SERVICE_NAME,
+			method: "deleteUserById",
+		});
+	};
+
 	getAllUsers = async () => {
 		return await this.usersRepository.findAll();
 	};
 
-	getUserById = async (roles: any, userId: any) => {
-		if (!roles.includes("superadmin")) {
-			throw new AppError({ message: "User is not a superadmin", service: SERVICE_NAME, status: 403 });
+	getUserById = async (roles: UserRole[], userId: string) => {
+		if (!roles.includes("superadmin") && !roles.includes("admin")) {
+			throw new AppError({ message: "Insufficient permissions", service: SERVICE_NAME, status: 403 });
 		}
 		const user = await this.usersRepository.findById(userId);
 
 		return user;
 	};
 
-	editUserById = async (userId: any, patch: Partial<User>) => {
+	editUserById = async (userId: string, patch: Partial<User>) => {
 		await this.usersRepository.updateById(userId, patch, null);
 	};
 
-	setPasswordByUserId = async (userId: any, password: string) => {
+	setPasswordByUserId = async (userId: string, password: string) => {
 		const hashedPassword = this.hashPassword(password);
 		const updatedUser = await this.usersRepository.updateById(userId, { password: hashedPassword }, null);
 		return updatedUser;
 	};
 }
-export default UserService;

server/src/service/index.ts

@@ -1,14 +1,34 @@
+// Business services
+export * from "@/service/business/checkService.js";
+export * from "@/service/business/diagnosticService.js";
+export * from "@/service/business/geoChecksService.js";
+export * from "@/service/business/incidentService.js";
+export * from "@/service/business/inviteService.js";
+export * from "@/service/business/maintenanceWindowService.js";
 export * from "@/service/business/monitorService.js";
+export * from "@/service/business/statusPageService.js";
+export * from "@/service/business/userService.js";
+
+// Infrastructure services
+export * from "@/service/infrastructure/SuperSimpleQueue/SuperSimpleQueue.js";
+export * from "@/service/infrastructure/SuperSimpleQueue/SuperSimpleQueueHelper.js";
+export * from "@/service/infrastructure/notificationMessageBuilder.js";
+export * from "@/service/infrastructure/bufferService.js";
+export * from "@/service/infrastructure/emailService.js";
+export * from "@/service/infrastructure/globalPingService.js";
 export * from "@/service/infrastructure/networkService.js";
+export * from "@/service/infrastructure/notificationsService.js";
+export * from "@/service/infrastructure/statusService.js";
+
+// Notification providers
 export * from "@/service/infrastructure/notificationProviders/discord.js";
 export * from "@/service/infrastructure/notificationProviders/email.js";
 export * from "@/service/infrastructure/notificationProviders/INotificationProvider.js";
+export * from "@/service/infrastructure/notificationProviders/matrix.js";
 export * from "@/service/infrastructure/notificationProviders/pagerduty.js";
-export * from "@/service/infrastructure/notificationProviders/matrix.js";
 export * from "@/service/infrastructure/notificationProviders/slack.js";
+export * from "@/service/infrastructure/notificationProviders/teams.js";
 export * from "@/service/infrastructure/notificationProviders/webhook.js";
-export * from "@/service/infrastructure/notificationsService.js";
-export * from "@/service/infrastructure/statusService.js";
-export * from "@/service/infrastructure/notificationProviders/webhook.js";
-export * from "@/service/infrastructure/notificationProviders/matrix.js";
-export * from "@/service/business/statusPageService.js";
+
+// System services
+export * from "@/service/system/settingsService.js";

server/src/service/infrastructure/SuperSimpleQueue/SuperSimpleQueue.ts

@@ -2,6 +2,7 @@ import { IMonitorsRepository } from "@/repositories/index.js";
 import { ILogger } from "@/utils/logger.js";
 import Scheduler from "super-simple-scheduler";
 import { ISuperSimpleQueueHelper } from "@/service/infrastructure/SuperSimpleQueue/SuperSimpleQueueHelper.js";
+import { Monitor, MonitorType, supportsGeoCheck } from "@/types/monitor.js";
 const SERVICE_NAME = "JobQueue";
 
 type QueueJobFailure = {
@@ -41,11 +42,11 @@ type QueueJobSummary = {
 export interface ISuperSimpleQueue {
 	readonly serviceName: string;
 	init(): Promise<boolean>;
-	addJob(monitorId: string, monitor: any): Promise<void>;
-	deleteJob(monitor: any): Promise<void>;
-	pauseJob(monitor: any): Promise<void>;
-	resumeJob(monitor: any): Promise<void>;
-	updateJob(monitor: any): Promise<void>;
+	addJob(monitorId: string, monitor: Monitor): Promise<void>;
+	deleteJob(monitor: Monitor): Promise<void>;
+	pauseJob(monitor: Monitor): Promise<void>;
+	resumeJob(monitor: Monitor): Promise<void>;
+	updateJob(monitor: Monitor): Promise<void>;
 	shutdown(): Promise<void>;
 	getMetrics(): Promise<QueueMetrics>;
 	getJobs(): Promise<QueueJobSummary[]>;
@@ -53,7 +54,7 @@ export interface ISuperSimpleQueue {
 	obliterate(): Promise<void>;
 }
 
-class SuperSimpleQueue implements ISuperSimpleQueue {
+export class SuperSimpleQueue implements ISuperSimpleQueue {
 	static SERVICE_NAME = SERVICE_NAME;
 
 	private logger: ILogger;
@@ -88,9 +89,10 @@ class SuperSimpleQueue implements ISuperSimpleQueue {
 		try {
 			this.scheduler.start();
 
-			this.scheduler.addTemplate("monitor-job", this.helper.getMonitorJob());
-			this.scheduler.addTemplate("geo-check-job", this.helper.getGeoCheckJob());
+			this.scheduler.addTemplate("monitor-job", this.helper.getHeartbeatJob());
+			this.scheduler.addTemplate("geo-check-job", this.helper.getHeartbeatGeoJob());
 			this.scheduler.addTemplate("cleanup-orphaned", this.helper.getCleanupOrphanedJob());
+			this.scheduler.addTemplate("cleanup-retention-job", this.helper.getCleanupRetentionJob());
 			const monitors = await this.monitorsRepository.findAll();
 			if (!monitors) {
 				return true;
@@ -103,20 +105,20 @@ class SuperSimpleQueue implements ISuperSimpleQueue {
 			}
 
 			this.scheduler.addJob({ id: "cleanup-orphaned", template: "cleanup-orphaned", active: true });
+			this.scheduler.addJob({ id: "cleanup-retention", template: "cleanup-retention-job", active: true, repeat: 24 * 60 * 60 * 1000 });
 
 			return true;
-		} catch (error: any) {
+		} catch (error: unknown) {
 			this.logger.error({
-				message: "Failed to initialize SuperSimpleQueue",
+				message: `Failed to initialize SuperSimpleQueue: ${error instanceof Error ? error.message : String(error)}`,
 				service: SERVICE_NAME,
 				method: "init",
-				details: error,
 			});
 			return false;
 		}
 	};
 
-	addJob = async (monitorId: string, monitor: any) => {
+	addJob = async (monitorId: string, monitor: Monitor) => {
 		this.scheduler.addJob({
 			id: monitorId,
 			template: "monitor-job",
@@ -125,8 +127,13 @@ class SuperSimpleQueue implements ISuperSimpleQueue {
 			data: monitor,
 		});
 
+		// Return early if we don't need geo checks
+		if (!supportsGeoCheck(monitor.type)) {
+			return;
+		}
+
 		// Add geo check job if enabled for HTTP monitors
-		if (monitor.geoCheckEnabled && monitor.type === "http") {
+		if (monitor.geoCheckEnabled) {
 			this.scheduler.addJob({
 				id: `${monitorId}-geo`,
 				template: "geo-check-job",
@@ -137,12 +144,12 @@ class SuperSimpleQueue implements ISuperSimpleQueue {
 		}
 	};
 
-	deleteJob = async (monitor: any) => {
+	deleteJob = async (monitor: Monitor) => {
 		this.scheduler.removeJob(monitor.id);
 		this.scheduler.removeJob(`${monitor.id}-geo`);
 	};
 
-	pauseJob = async (monitor: any) => {
+	pauseJob = async (monitor: Monitor) => {
 		const result = await this.scheduler.pauseJob(monitor.id);
 		if (result === false) {
 			throw new Error("Failed to pause monitor");
@@ -155,7 +162,7 @@ class SuperSimpleQueue implements ISuperSimpleQueue {
 		});
 	};
 
-	resumeJob = async (monitor: any) => {
+	resumeJob = async (monitor: Monitor) => {
 		const result = await this.scheduler.resumeJob(monitor.id);
 		if (result === false) {
 			throw new Error("Failed to resume monitor");
@@ -170,12 +177,12 @@ class SuperSimpleQueue implements ISuperSimpleQueue {
 		});
 	};
 
-	updateJob = async (monitor: any) => {
+	updateJob = async (monitor: Monitor) => {
 		this.scheduler.updateJob(monitor.id, { repeat: monitor.interval, data: monitor });
 
 		// Handle geo check job lifecycle
 		const geoJobId = `${monitor.id}-geo`;
-		if (monitor.geoCheckEnabled && monitor.type === "http") {
+		if (monitor.geoCheckEnabled && supportsGeoCheck(monitor.type)) {
 			// Check if geo job exists
 			const existingGeoJob = await this.scheduler.getJob(geoJobId);
 			if (existingGeoJob) {
@@ -238,8 +245,8 @@ class SuperSimpleQueue implements ISuperSimpleQueue {
 				failingJobs: 0,
 				jobsWithFailures: [] as Array<{
 					monitorId: string | number;
-					monitorUrl: any;
-					monitorType: any;
+					monitorUrl: string;
+					monitorType: MonitorType;
 					failedAt: number | null;
 					failCount: number;
 					failReason: string | null;
@@ -289,5 +296,3 @@ class SuperSimpleQueue implements ISuperSimpleQueue {
 		});
 	};
 }
-
-export default SuperSimpleQueue;

server/src/service/infrastructure/SuperSimpleQueue/SuperSimpleQueueHelper.ts

@@ -1,10 +1,17 @@
 const SERVICE_NAME = "JobQueueHelper";
 import type { Monitor } from "@/types/monitor.js";
+import { supportsGeoCheck } from "@/types/monitor.js";
 import { AppError } from "@/utils/AppError.js";
-import { INetworkService, INotificationsService, IStatusService } from "@/service/index.js";
-import type { StatusChangeResult } from "@/types/index.js";
-import IncidentService from "@/service/business/incidentService.js";
-import type { IGeoChecksService } from "@/service/business/geoChecksService.js";
+import {
+	ICheckService,
+	INetworkService,
+	INotificationsService,
+	ISettingsService,
+	IStatusService,
+	IncidentService,
+	type IGeoChecksService,
+} from "@/service/index.js";
+import { CHECK_TTL_SENTINEL, type MaintenanceWindow, type StatusChangeResult } from "@/types/index.js";
 import {
 	IMaintenanceWindowsRepository,
 	IMonitorsRepository,
@@ -15,13 +22,14 @@ import {
 	IGeoChecksRepository,
 } from "@/repositories/index.js";
 import { ILogger } from "@/utils/logger.js";
-import { IBufferService } from "../bufferService.js";
+import { IBufferService } from "@/service/index.js";
 
 export interface ISuperSimpleQueueHelper {
 	readonly serviceName: string;
-	getMonitorJob(): (monitor: Monitor) => Promise<void>;
+	getHeartbeatJob(): (monitor: Monitor) => Promise<void>;
+	getHeartbeatGeoJob(): (monitor: Monitor) => Promise<void>;
 	getCleanupOrphanedJob(): () => Promise<void>;
-	getGeoCheckJob(): (monitor: Monitor) => Promise<void>;
+	getCleanupRetentionJob(): () => Promise<void>;
 	isInMaintenanceWindow(monitorId: string, teamId: string): Promise<boolean>;
 }
 
@@ -39,14 +47,15 @@ export interface MonitorActionDecision {
 	};
 }
 
-class SuperSimpleQueueHelper implements ISuperSimpleQueueHelper {
+export class SuperSimpleQueueHelper implements ISuperSimpleQueueHelper {
 	static SERVICE_NAME = SERVICE_NAME;
 
-	private logger: any;
+	private logger: ILogger;
 	private networkService: INetworkService;
 	private statusService: IStatusService;
 	private notificationsService: INotificationsService;
-	private checkService: any;
+	private checkService: ICheckService;
+	private settingsService: ISettingsService;
 	private buffer: IBufferService;
 	private incidentService: IncidentService;
 	private maintenanceWindowsRepository: IMaintenanceWindowsRepository;
@@ -63,7 +72,8 @@ class SuperSimpleQueueHelper implements ISuperSimpleQueueHelper {
 		networkService: INetworkService,
 		statusService: IStatusService,
 		notificationsService: INotificationsService,
-		checkService: any,
+		checkService: ICheckService,
+		settingsService: ISettingsService,
 		buffer: IBufferService,
 		incidentService: IncidentService,
 		maintenanceWindowsRepository: IMaintenanceWindowsRepository,
@@ -79,6 +89,7 @@ class SuperSimpleQueueHelper implements ISuperSimpleQueueHelper {
 		this.networkService = networkService;
 		this.statusService = statusService;
 		this.checkService = checkService;
+		this.settingsService = settingsService;
 		this.buffer = buffer;
 		this.notificationsService = notificationsService;
 		this.incidentService = incidentService;
@@ -96,7 +107,7 @@ class SuperSimpleQueueHelper implements ISuperSimpleQueueHelper {
 		return SuperSimpleQueueHelper.SERVICE_NAME;
 	}
 
-	getMonitorJob = () => {
+	getHeartbeatJob = () => {
 		return async (monitor: Monitor) => {
 			try {
 				const monitorId = monitor.id;
@@ -127,7 +138,7 @@ class SuperSimpleQueueHelper implements ISuperSimpleQueueHelper {
 				}
 
 				// Step 3.  Build check
-				const check = await this.checkService.buildCheck(status);
+				const check = this.checkService.buildCheck(status);
 				if (!check) {
 					this.logger.warn({
 						message: `No check could be built for monitor ${monitorId}`,
@@ -147,33 +158,31 @@ class SuperSimpleQueueHelper implements ISuperSimpleQueueHelper {
 
 				// Step 6. Handle notifications (best effort, continue even in event of failure, don't wait)
 				if (decision.shouldSendNotification) {
-					this.notificationsService.handleNotifications(statusChangeResult.monitor, status, decision).catch((error: any) => {
+					this.notificationsService.handleNotifications(statusChangeResult.monitor, status, decision).catch((error: unknown) => {
 						this.logger.error({
-							message: error.message,
+							message: `Error sending notifications for job ${statusChangeResult.monitor.id}: ${error instanceof Error ? error.message : "Unknown error"}`,
 							service: SERVICE_NAME,
 							method: "getMonitorJob",
-							details: `Error sending notifications for job ${statusChangeResult.monitor.id}: ${error.message}`,
-							stack: error.stack,
+							stack: error instanceof Error ? error.stack : undefined,
 						});
 					});
 				}
 
 				// Step 7. Handle incidents (best effort, don't wait)
-				this.incidentService.handleIncident(statusChangeResult.monitor, statusChangeResult.code, decision, status).catch((error: any) => {
+				this.incidentService.handleIncident(statusChangeResult.monitor, statusChangeResult.code, decision, status).catch((error: unknown) => {
 					this.logger.warn({
-						message: error.message,
+						message: `Error handling incident for job ${monitor.id}: ${error instanceof Error ? error.message : "Unknown error"}`,
 						service: SERVICE_NAME,
 						method: "getMonitorJob",
-						details: `Error handling incident for job ${monitor.id}: ${error.message}`,
-						stack: error.stack,
+						stack: error instanceof Error ? error.stack : undefined,
 					});
 				});
-			} catch (error: any) {
+			} catch (error: unknown) {
 				this.logger.warn({
-					message: error.message,
-					service: error.service || SERVICE_NAME,
-					method: error.method || "getMonitorJob",
-					stack: error.stack,
+					message: error instanceof Error ? error.message : "Unknown error",
+					service: SERVICE_NAME,
+					method: "getMonitorJob",
+					stack: error instanceof Error ? error.stack : undefined,
 				});
 				throw error;
 			}
@@ -259,19 +268,19 @@ class SuperSimpleQueueHelper implements ISuperSimpleQueueHelper {
 					service: SERVICE_NAME,
 					method: "getCleanupOrphanedJob",
 				});
-			} catch (error: any) {
+			} catch (error: unknown) {
 				this.logger.warn({
-					message: error.message,
+					message: error instanceof Error ? error.message : "Unknown error",
 					service: SERVICE_NAME,
 					method: "getCleanupOrphanedJob",
-					stack: error.stack,
+					stack: error instanceof Error ? error.stack : undefined,
 				});
 				throw error;
 			}
 		};
 	};
 
-	getGeoCheckJob = () => {
+	getHeartbeatGeoJob = () => {
 		return async (monitor: Monitor) => {
 			try {
 				const monitorId = monitor.id;
@@ -279,27 +288,26 @@ class SuperSimpleQueueHelper implements ISuperSimpleQueueHelper {
 
 				// Step 1: Validate monitor eligibility
 				if (!monitorId) {
-					throw new AppError({ message: "No monitor id", service: SERVICE_NAME, method: "getGeoCheckJob" });
-				}
-
-				if (monitor.type !== "http") {
-					this.logger.debug({
-						message: `Monitor ${monitorId} is not HTTP type, skipping geo check`,
-						service: SERVICE_NAME,
-						method: "getGeoCheckJob",
-					});
-					return;
+					throw new AppError({ message: "No monitor id", service: SERVICE_NAME, method: "getHeartbeatGeoJob" });
 				}
 
 				if (!monitor.geoCheckEnabled) {
 					return;
 				}
+				if (!supportsGeoCheck(monitor.type)) {
+					this.logger.debug({
+						message: `Monitor ${monitorId} type does not support geo checks, skipping`,
+						service: SERVICE_NAME,
+						method: "getHeartbeatGeoJob",
+					});
+					return;
+				}
 
 				if (!monitor.geoCheckLocations || monitor.geoCheckLocations.length === 0) {
 					this.logger.warn({
 						message: `No geo check locations configured for monitor ${monitorId}`,
 						service: SERVICE_NAME,
-						method: "getGeoCheckJob",
+						method: "getHeartbeatGeoJob",
 					});
 					return;
 				}
@@ -310,7 +318,7 @@ class SuperSimpleQueueHelper implements ISuperSimpleQueueHelper {
 					this.logger.debug({
 						message: `Monitor ${monitorId} is in maintenance window, skipping geo check`,
 						service: SERVICE_NAME,
-						method: "getGeoCheckJob",
+						method: "getHeartbeatGeoJob",
 					});
 					return;
 				}
@@ -321,7 +329,7 @@ class SuperSimpleQueueHelper implements ISuperSimpleQueueHelper {
 					this.logger.warn({
 						message: `No geo check could be built for monitor ${monitorId}`,
 						service: SERVICE_NAME,
-						method: "getGeoCheckJob",
+						method: "getHeartbeatGeoJob",
 					});
 					return;
 				}
@@ -332,14 +340,14 @@ class SuperSimpleQueueHelper implements ISuperSimpleQueueHelper {
 				this.logger.debug({
 					message: `Geo check job executed for monitor ${monitorId}`,
 					service: SERVICE_NAME,
-					method: "getGeoCheckJob",
+					method: "getHeartbeatGeoJob",
 				});
-			} catch (error: any) {
+			} catch (error: unknown) {
 				this.logger.error({
-					message: error.message,
+					message: error instanceof Error ? error.message : "Unknown error",
 					service: SERVICE_NAME,
-					method: "getGeoCheckJob",
-					stack: error.stack,
+					method: "getHeartbeatGeoJob",
+					stack: error instanceof Error ? error.stack : undefined,
 				});
 				// Don't throw - geo check failures shouldn't crash the job scheduler
 			}
@@ -349,7 +357,7 @@ class SuperSimpleQueueHelper implements ISuperSimpleQueueHelper {
 	async isInMaintenanceWindow(monitorId: string, teamId: string) {
 		const maintenanceWindows = await this.maintenanceWindowsRepository.findByMonitorId(monitorId, teamId);
 		// Check for active maintenance window:
-		const maintenanceWindowIsActive = maintenanceWindows.reduce((acc: any, window: any) => {
+		const maintenanceWindowIsActive = maintenanceWindows.reduce((acc: boolean, window: MaintenanceWindow) => {
 			if (window.active) {
 				const start = new Date(window.start);
 				const end = new Date(window.end);
@@ -376,6 +384,40 @@ class SuperSimpleQueueHelper implements ISuperSimpleQueueHelper {
 		return maintenanceWindowIsActive;
 	}
 
+	getCleanupRetentionJob = () => {
+		return async () => {
+			try {
+				const settings = await this.settingsService.getDBSettings();
+
+				const checkTTL = settings.checkTTL; // Check TTL is in DAYS, not MS
+
+				if (checkTTL === CHECK_TTL_SENTINEL) {
+					this.logger.info({
+						message: `Check TTL is set to unlimited, skipping cleanup`,
+						service: SERVICE_NAME,
+						method: "getCleanupRetentionJob",
+					});
+					return;
+				}
+				const checkTTLInMs = checkTTL * 24 * 60 * 60 * 1000;
+				const cutoffDate = new Date(Date.now() - checkTTLInMs);
+				const deleteCount = await this.checkService.deleteOlderThan(cutoffDate);
+				this.logger.info({
+					message: `Deleted ${deleteCount} checks older than ${cutoffDate.toISOString()}`,
+					service: SERVICE_NAME,
+					method: "getCleanupRetentionJob",
+				});
+			} catch (error: unknown) {
+				this.logger.error({
+					message: error instanceof Error ? error.message : "Unknown error",
+					service: SERVICE_NAME,
+					method: "getCleanupRetentionJob",
+					stack: error instanceof Error ? error.stack : undefined,
+				});
+			}
+		};
+	};
+
 	private evaluateMonitorAction(statusChangeResult: StatusChangeResult): MonitorActionDecision {
 		const { monitor, statusChanged, prevStatus } = statusChangeResult;
 
@@ -414,5 +456,3 @@ class SuperSimpleQueueHelper implements ISuperSimpleQueueHelper {
 		return decision;
 	}
 }
-
-export default SuperSimpleQueueHelper;

server/src/service/infrastructure/bufferService.ts

@@ -15,7 +15,7 @@ export interface IBufferService {
 	flushGeoBuffer(): Promise<void>;
 }
 
-class BufferService implements IBufferService {
+export class BufferService implements IBufferService {
 	static SERVICE_NAME = SERVICE_NAME;
 	private BUFFER_TIMEOUT: number;
 	private logger: ILogger;
@@ -177,5 +177,3 @@ class BufferService implements IBufferService {
 		}
 	}
 }
-
-export default BufferService;

server/src/service/infrastructure/emailService.ts

@@ -23,7 +23,7 @@ export interface IEmailService {
 	sendEmail(to: string, subject: string, html: string, transportConfig?: EmailTransportConfig): Promise<string | false | undefined>;
 }
 
-class EmailService implements IEmailService {
+export class EmailService implements IEmailService {
 	static SERVICE_NAME = SERVICE_NAME;
 
 	private settingsService: ISettingsService;
@@ -178,5 +178,3 @@ class EmailService implements IEmailService {
 		}
 	};
 }
-
-export default EmailService;

server/src/service/infrastructure/globalPingService.ts

@@ -1,4 +1,6 @@
 import type { GeoContinent, GeoCheckResult, GeoCheckTimings, GeoCheckLocation } from "@/types/geoCheck.js";
+import { supportsGeoCheck } from "@/types/monitor.js";
+import { MonitorType } from "@/types/index.js";
 import type { ILogger } from "@/utils/logger.js";
 import got from "got";
 
@@ -8,7 +10,7 @@ const POLL_INTERVAL_MS = 2000;
 const MAX_POLL_TIMEOUT_MS = 30000;
 
 interface GlobalPingMeasurementRequest {
-	type: "http";
+	type: MonitorType;
 	target: string;
 	locations: Array<{ continent: GeoContinent }>;
 	limit: number;
@@ -44,17 +46,26 @@ interface GlobalPingProbeResult {
 			firstByte: number;
 			download: number;
 		};
+		stats?: {
+			min: number;
+			max: number;
+			avg: number;
+			total: number;
+			loss: number;
+			rcv: number;
+			drop: number;
+		};
 		rawOutput?: string;
 	};
 }
 
 export interface IGlobalPingService {
 	readonly serviceName: string;
-	createMeasurement(url: string, locations: GeoContinent[]): Promise<string | null>;
+	createMeasurement(monitorType: MonitorType, url: string, locations: GeoContinent[]): Promise<string | null>;
 	pollForResults(measurementId: string, timeoutMs?: number): Promise<GeoCheckResult[]>;
 }
 
-class GlobalPingService implements IGlobalPingService {
+export class GlobalPingService implements IGlobalPingService {
 	static SERVICE_NAME = SERVICE_NAME;
 
 	private logger: ILogger;
@@ -67,13 +78,16 @@ class GlobalPingService implements IGlobalPingService {
 		return GlobalPingService.SERVICE_NAME;
 	}
 
-	async createMeasurement(url: string, locations: GeoContinent[]): Promise<string | null> {
+	async createMeasurement(monitorType: MonitorType, url: string, locations: GeoContinent[]): Promise<string | null> {
 		try {
+			if (!supportsGeoCheck(monitorType)) {
+				throw new Error(`Unsupported monitor type for GlobalPing: ${monitorType}`);
+			}
 			// GlobalPing API expects target without protocol (http:// or https://)
 			const cleanTarget = url.replace(/^https?:\/\//, "");
 
 			const requestBody: GlobalPingMeasurementRequest = {
-				type: "http",
+				type: monitorType,
 				target: cleanTarget,
 				locations: locations.map((continent) => ({ continent })),
 				limit: locations.length,
@@ -88,10 +102,9 @@ class GlobalPingService implements IGlobalPingService {
 			const measurementId = response.body.id;
 
 			this.logger.debug({
-				message: `Created GlobalPing measurement: ${measurementId}`,
+				message: `Created GlobalPing measurement: ${measurementId} for target: ${cleanTarget}`,
 				service: SERVICE_NAME,
 				method: "createMeasurement",
-				details: { measurementId, url, locations },
 			});
 
 			return measurementId;
@@ -165,8 +178,7 @@ class GlobalPingService implements IGlobalPingService {
 		const successfulResults: GeoCheckResult[] = [];
 
 		for (const probeResult of probeResults) {
-			// Skip failed or timeout results
-			if (probeResult.result.status !== "finished" || !probeResult.result.statusCode || !probeResult.result.timings) {
+			if (probeResult.result.status !== "finished") {
 				continue;
 			}
 
@@ -180,23 +192,38 @@ class GlobalPingService implements IGlobalPingService {
 				latitude: probeResult.probe.latitude,
 			};
 
-			const timings: GeoCheckTimings = {
-				total: probeResult.result.timings.total,
-				dns: probeResult.result.timings.dns,
-				tcp: probeResult.result.timings.tcp,
-				tls: probeResult.result.timings.tls,
-				firstByte: probeResult.result.timings.firstByte,
-				download: probeResult.result.timings.download,
-			};
+			// HTTP results have statusCode and timings, ping results have stats
+			if (probeResult.result.statusCode && probeResult.result.timings) {
+				const timings: GeoCheckTimings = {
+					total: probeResult.result.timings.total,
+					dns: probeResult.result.timings.dns,
+					tcp: probeResult.result.timings.tcp,
+					tls: probeResult.result.timings.tls,
+					firstByte: probeResult.result.timings.firstByte,
+					download: probeResult.result.timings.download,
+				};
 
-			const result: GeoCheckResult = {
-				location,
-				status: probeResult.result.statusCode >= 200 && probeResult.result.statusCode < 300,
-				statusCode: probeResult.result.statusCode,
-				timings,
-			};
-
-			successfulResults.push(result);
+				successfulResults.push({
+					location,
+					status: probeResult.result.statusCode >= 200 && probeResult.result.statusCode < 300,
+					statusCode: probeResult.result.statusCode,
+					timings,
+				});
+			} else if (probeResult.result.stats) {
+				successfulResults.push({
+					location,
+					status: probeResult.result.stats.loss === 0,
+					statusCode: probeResult.result.stats.loss === 0 ? 200 : 5000,
+					timings: {
+						total: probeResult.result.stats.avg,
+						dns: 0,
+						tcp: 0,
+						tls: 0,
+						firstByte: 0,
+						download: 0,
+					},
+				});
+			}
 		}
 
 		return successfulResults;
@@ -206,5 +233,3 @@ class GlobalPingService implements IGlobalPingService {
 		return new Promise((resolve) => setTimeout(resolve, ms));
 	}
 }
-
-export default GlobalPingService;

server/src/service/infrastructure/network/HttpProvider.ts

@@ -15,7 +15,7 @@ export class HttpProvider implements IStatusProvider<HttpStatusPayload> {
 		private got: Got,
 		private advancedMatcher: AdvancedMatcher
 	) {
-		const cacheable = new CacheableLookup();
+		const cacheable = new CacheableLookup({ maxTtl: 300, errorTtl: 30 });
 		this.got = got.extend({
 			dnsCache: cacheable,
 			timeout: {

server/src/service/infrastructure/network/PingProvider.ts

@@ -4,7 +4,7 @@ import { MonitorType, Monitor } from "@/types/monitor.js";
 import { MonitorStatusResponse } from "@/types/network.js";
 import { AppError } from "@/utils/AppError.js";
 import ping from "ping";
-import { buildStatusResponse, timeRequest } from "@/service/infrastructure/network/utils.js";
+import { timeRequest } from "@/service/infrastructure/network/utils.js";
 const SERVICE_NAME = "PingProvider";
 
 type Ping = typeof ping;
@@ -33,7 +33,7 @@ export class PingProvider implements IStatusProvider<PingStatusPayload> {
 
 			const sanitizedHost = this.sanitizeHost(monitor.url);
 			const { response, error } = await timeRequest<PingStatusPayload>(() => this.ping.promise.probe(sanitizedHost));
-			const safeTime = typeof response?.time === "number" ? response.time : parseFloat(String(response?.time)) || 0;
+
 			if (error) {
 				throw error;
 			}
@@ -42,16 +42,18 @@ export class PingProvider implements IStatusProvider<PingStatusPayload> {
 				throw new Error(`No response from ping for host: ${sanitizedHost}`);
 			}
 
-			return buildStatusResponse<PingStatusPayload>({
-				monitor,
+			const responseTime = typeof response.time === "number" ? response.time : parseFloat(String(response.time)) || 0;
+
+			return {
+				monitorId: monitor.id,
+				teamId: monitor.teamId,
+				type: monitor.type,
+				status: response.alive ?? false,
+				code: response.alive ? 200 : 5000,
+				message: response.alive ? "Success" : "Ping failed",
+				responseTime,
 				payload: response,
-				overrides: {
-					status: response.alive ?? false,
-					code: 200,
-					message: "Success",
-					responseTime: safeTime,
-				},
-			});
+			};
 		} catch (err: unknown) {
 			const message = err instanceof Error ? err.message : String(err);
 			throw new AppError({

server/src/service/infrastructure/network/PortProvider.ts

@@ -51,7 +51,6 @@ export class PortProvider implements IStatusProvider<PortStatusPayload> {
 				});
 			});
 			if (error) {
-				console.log(error);
 				const errorMessage = error instanceof Error ? error.message : "Port check failed";
 				return {
 					monitorId: monitor.id,

server/src/service/infrastructure/network/WebSocketProvider.ts

@@ -0,0 +1,94 @@
+import { IStatusProvider } from "@/service/infrastructure/network/IStatusProvider.js";
+import { WebSocketStatusPayload, MonitorStatusResponse } from "@/types/network.js";
+import { Monitor, MonitorType } from "@/types/monitor.js";
+import { AppError } from "@/utils/AppError.js";
+import { NETWORK_ERROR, timeRequest } from "@/service/infrastructure/network/utils.js";
+import type WebSocket from "ws";
+
+type WebSocketConstructor = typeof WebSocket;
+
+const SERVICE_NAME = "WebSocketProvider";
+const TIMEOUT_MS = 10000;
+
+export class WebSocketProvider implements IStatusProvider<WebSocketStatusPayload> {
+	readonly type = "websocket";
+
+	constructor(private WS: WebSocketConstructor) {}
+
+	supports(type: MonitorType): boolean {
+		return type === "websocket";
+	}
+
+	async handle(monitor: Monitor): Promise<MonitorStatusResponse<WebSocketStatusPayload>> {
+		try {
+			const { url } = monitor;
+			if (!url) {
+				throw new Error("URL is required for WebSocket monitoring");
+			}
+
+			const { responseTime, error } = await timeRequest(async () => {
+				return new Promise<{ connected: boolean }>((resolve, reject) => {
+					const options: WebSocket.ClientOptions = {};
+					if (monitor.ignoreTlsErrors) {
+						options.rejectUnauthorized = false;
+					}
+
+					const ws = new this.WS(url, options);
+
+					const timeout = setTimeout(() => {
+						ws.close();
+						reject(new Error("WebSocket connection timeout"));
+					}, TIMEOUT_MS);
+
+					ws.on("open", () => {
+						clearTimeout(timeout);
+						ws.close();
+						resolve({ connected: true });
+					});
+
+					ws.on("error", (err: unknown) => {
+						clearTimeout(timeout);
+						ws.close();
+						reject(err);
+					});
+				});
+			});
+
+			if (error) {
+				const errorMessage = error instanceof Error ? error.message : "WebSocket check failed";
+				return {
+					monitorId: monitor.id,
+					teamId: monitor.teamId,
+					type: monitor.type,
+					status: false,
+					code: NETWORK_ERROR,
+					message: errorMessage,
+					responseTime: responseTime,
+					timings: undefined,
+					payload: { connected: false },
+				};
+			}
+
+			return {
+				monitorId: monitor.id,
+				teamId: monitor.teamId,
+				type: monitor.type,
+				status: true,
+				code: 200,
+				message: "WebSocket check successful",
+				responseTime: responseTime,
+				timings: undefined,
+				payload: { connected: true },
+			};
+		} catch (err: unknown) {
+			const originalMessage = err instanceof Error ? err.message : String(err);
+			throw new AppError({
+				message: originalMessage || "Error performing WebSocket check",
+				status: 500,
+				service: SERVICE_NAME,
+				method: "handle",
+				details: { url: monitor.url },
+			});
+		}
+	}
+}

server/src/service/infrastructure/network/utils.ts

@@ -1,8 +1,3 @@
-import { HTTPError, RequestError } from "got";
-import type { Response } from "got";
-import type { Monitor } from "@/types/monitor.js";
-import { MonitorStatusResponse, MonitorStatusResponseOverrides } from "@/types/network.js";
-
 export const timeRequest = async <T>(operation: () => Promise<T>): Promise<{ response: T | null; responseTime: number; error: unknown }> => {
 	const start = process.hrtime.bigint();
 	try {
@@ -17,69 +12,3 @@ export const timeRequest = async <T>(operation: () => Promise<T>): Promise<{ res
 
 export const NETWORK_ERROR = 5000;
 export const PING_ERROR = 5001;
-
-interface BuildStatusResponseArgs<T> {
-	monitor: Monitor;
-	response?: Response<T> | null;
-	error?: Error | RequestError | HTTPError | null;
-	payload?: T | null;
-	jsonPath?: string;
-	matchMethod?: MonitorStatusResponse["matchMethod"];
-	expectedValue?: string;
-	extracted?: unknown;
-	overrides?: MonitorStatusResponseOverrides<T>;
-}
-
-export const buildStatusResponse = <T>({
-	monitor,
-	response,
-	error,
-	payload,
-	jsonPath,
-	matchMethod,
-	expectedValue,
-	extracted,
-	overrides,
-}: BuildStatusResponseArgs<T>): MonitorStatusResponse<T> => {
-	if (error) {
-		const statusResponse: MonitorStatusResponse<T> = {
-			monitorId: monitor.id,
-			teamId: monitor.teamId,
-			type: monitor.type,
-			status: false,
-			code: NETWORK_ERROR,
-			message: error.message ?? "Network error",
-			responseTime: 0,
-			timings: undefined,
-			jsonPath,
-			matchMethod,
-			expectedValue,
-			extracted,
-			payload,
-		};
-
-		if (error instanceof HTTPError || error instanceof RequestError) {
-			statusResponse.code = error?.response?.statusCode ?? NETWORK_ERROR;
-			statusResponse.message = error.message;
-			statusResponse.responseTime = error.timings?.phases?.total ?? 0;
-			statusResponse.timings = error.timings;
-		}
-		return { ...statusResponse, ...(overrides ?? {}) };
-	}
-
-	return {
-		monitorId: monitor.id,
-		teamId: monitor.teamId,
-		type: monitor.type,
-		status: response?.ok ?? false,
-		code: response?.statusCode ?? NETWORK_ERROR,
-		message: response?.statusMessage ?? "",
-		responseTime: response?.timings?.phases?.total ?? 0,
-		timings: response?.timings,
-		payload: payload ?? response?.body,
-		jsonPath,
-		matchMethod,
-		expectedValue,
-		extracted,
-	};
-};

server/src/service/infrastructure/networkService.ts

@@ -1,38 +1,14 @@
-import type {
-	Monitor,
-	MonitorStatusResponse,
-	GrpcStatusPayload,
-	PageSpeedStatusPayload,
-	HttpStatusPayload,
-	HardwareStatusPayload,
-	PingStatusPayload,
-	DockerStatusPayload,
-	PortStatusPayload,
-	GameStatusPayload,
-} from "@/types/index.js";
+import type { Monitor, MonitorStatusResponse, MonitorPayloadMap, MonitorType } from "@/types/index.js";
 import type { AxiosStatic } from "axios";
 import { AppError } from "@/utils/AppError.js";
-
+import { NETWORK_ERROR } from "@/service/infrastructure/network/utils.js";
 import { ILogger } from "@/utils/logger.js";
 import { IStatusProvider } from "./network/IStatusProvider.js";
 const SERVICE_NAME = "NetworkService";
 
 export interface INetworkService {
 	readonly serviceName: string;
-	requestStatus(
-		monitor: Monitor
-	): Promise<
-		MonitorStatusResponse<
-			| PingStatusPayload
-			| HttpStatusPayload
-			| PageSpeedStatusPayload
-			| HardwareStatusPayload
-			| DockerStatusPayload
-			| PortStatusPayload
-			| GameStatusPayload
-			| GrpcStatusPayload
-		>
-	>;
+	requestStatus<T extends MonitorType>(monitor: Monitor & { type: T }): Promise<MonitorStatusResponse<MonitorPayloadMap[T]>>;
 	requestWebhook(
 		type: string,
 		url: string,
@@ -47,66 +23,19 @@ export interface INetworkService {
 	}>;
 }
 
-class NetworkService implements INetworkService {
+export class NetworkService implements INetworkService {
 	static SERVICE_NAME = SERVICE_NAME;
 
-	private TYPE_PING: string;
-	private TYPE_HTTP: string;
-	private TYPE_PAGESPEED: string;
-	private TYPE_HARDWARE: string;
-	private TYPE_DOCKER: string;
-	private TYPE_PORT: string;
-	private TYPE_GAME: string;
-	private TYPE_GRPC: string;
-	private SERVICE_NAME: string;
-	private NETWORK_ERROR: number;
-	private PING_ERROR: number;
-
 	private axios: AxiosStatic;
 	private logger: ILogger;
-	private pingProvider;
-	private httpProvider;
-	private pageSpeedProvider;
-	private hardwareProvider;
-	private dockerProvider;
-	private portProvider;
-	private gameProvider;
-	private grpcProvider;
 
 	constructor(
 		axios: AxiosStatic,
 		logger: ILogger,
-		pingProvider: IStatusProvider<PingStatusPayload>,
-		httpProvider: IStatusProvider<HttpStatusPayload>,
-		pagespeedProvider: IStatusProvider<PageSpeedStatusPayload>,
-		hardwareProvider: IStatusProvider<HardwareStatusPayload>,
-		dockerProvider: IStatusProvider<DockerStatusPayload>,
-		portProvider: IStatusProvider<PortStatusPayload>,
-		gameProvider: IStatusProvider<GameStatusPayload>,
-		grpcProvider: IStatusProvider<GrpcStatusPayload>
+		private providers: IStatusProvider<unknown>[]
 	) {
-		this.TYPE_PING = "ping";
-		this.TYPE_HTTP = "http";
-		this.TYPE_PAGESPEED = "pagespeed";
-		this.TYPE_HARDWARE = "hardware";
-		this.TYPE_DOCKER = "docker";
-		this.TYPE_PORT = "port";
-		this.TYPE_GAME = "game";
-		this.TYPE_GRPC = "grpc";
-		this.SERVICE_NAME = SERVICE_NAME;
-		this.NETWORK_ERROR = 5000;
-		this.PING_ERROR = 5001;
 		this.axios = axios;
 		this.logger = logger;
-
-		this.pingProvider = pingProvider;
-		this.httpProvider = httpProvider;
-		this.pageSpeedProvider = pagespeedProvider;
-		this.hardwareProvider = hardwareProvider;
-		this.dockerProvider = dockerProvider;
-		this.portProvider = portProvider;
-		this.gameProvider = gameProvider;
-		this.grpcProvider = grpcProvider;
 	}
 
 	get serviceName(): string {
@@ -114,41 +43,12 @@ class NetworkService implements INetworkService {
 	}
 
 	// Main entry point
-	async requestStatus(
-		monitor: Monitor
-	): Promise<
-		MonitorStatusResponse<
-			| PingStatusPayload
-			| HttpStatusPayload
-			| PageSpeedStatusPayload
-			| HardwareStatusPayload
-			| DockerStatusPayload
-			| PortStatusPayload
-			| GameStatusPayload
-			| GrpcStatusPayload
-		>
-	> {
-		const type = monitor?.type || "unknown";
-		switch (type) {
-			case this.TYPE_PING:
-				return await this.pingProvider.handle(monitor);
-			case this.TYPE_HTTP:
-				return await this.httpProvider.handle(monitor);
-			case this.TYPE_PAGESPEED:
-				return await this.pageSpeedProvider.handle(monitor);
-			case this.TYPE_HARDWARE:
-				return await this.hardwareProvider.handle(monitor);
-			case this.TYPE_DOCKER:
-				return await this.dockerProvider.handle(monitor);
-			case this.TYPE_PORT:
-				return await this.portProvider.handle(monitor);
-			case this.TYPE_GAME:
-				return await this.gameProvider.handle(monitor);
-			case this.TYPE_GRPC:
-				return await this.grpcProvider.handle(monitor);
-			default:
-				return this.handleUnsupportedType(type);
+	async requestStatus<T extends MonitorType>(monitor: Monitor & { type: T }): Promise<MonitorStatusResponse<MonitorPayloadMap[T]>> {
+		const provider = this.providers.find((p) => p.supports(monitor.type));
+		if (!provider) {
+			return this.handleUnsupportedType(monitor.type) as Promise<MonitorStatusResponse<MonitorPayloadMap[T]>>;
 		}
+		return provider.handle(monitor) as Promise<MonitorStatusResponse<MonitorPayloadMap[T]>>;
 	}
 
 	private async handleUnsupportedType(type: string): Promise<MonitorStatusResponse> {
@@ -157,7 +57,7 @@ class NetworkService implements INetworkService {
 			teamId: "unknown",
 			type: "unknown",
 			status: false,
-			code: this.NETWORK_ERROR,
+			code: NETWORK_ERROR,
 			message: `Unsupported type: ${type}`,
 		};
 	}
@@ -181,7 +81,7 @@ class NetworkService implements INetworkService {
 		} catch (err: unknown) {
 			this.logger.warn({
 				message: err instanceof Error ? err.message : String(err),
-				service: this.SERVICE_NAME,
+				service: SERVICE_NAME,
 				method: "requestWebhook",
 			});
 
@@ -190,7 +90,7 @@ class NetworkService implements INetworkService {
 				return {
 					type: "webhook",
 					status: false,
-					code: axiosError.response?.status ?? this.NETWORK_ERROR,
+					code: axiosError.response?.status ?? NETWORK_ERROR,
 					message: `Failed to send ${type} notification`,
 					payload: axiosError.response?.data,
 				};
@@ -199,7 +99,7 @@ class NetworkService implements INetworkService {
 			return {
 				type: "webhook",
 				status: false,
-				code: this.NETWORK_ERROR,
+				code: NETWORK_ERROR,
 				message: `Failed to send ${type} notification`,
 			};
 		}
@@ -225,7 +125,7 @@ class NetworkService implements INetworkService {
 
 			throw new AppError({
 				message: originalMessage || "Error sending PagerDuty notification",
-				service: this.SERVICE_NAME,
+				service: SERVICE_NAME,
 				method: "requestPagerDuty",
 				details: {
 					responseData: err && typeof err === "object" && "response" in err ? (err as { response?: { data?: unknown } }).response?.data : undefined,
@@ -268,7 +168,7 @@ class NetworkService implements INetworkService {
 			if (err instanceof Error) {
 				this.logger.warn({
 					message: err.message,
-					service: this.SERVICE_NAME,
+					service: SERVICE_NAME,
 					method: "requestMatrix",
 				});
 
@@ -276,7 +176,7 @@ class NetworkService implements INetworkService {
 					const axiosError = err as { response?: { status?: number; data?: unknown } };
 					return {
 						status: false,
-						code: axiosError.response?.status || this.NETWORK_ERROR,
+						code: axiosError.response?.status || NETWORK_ERROR,
 						message: "Failed to send Matrix notification",
 						payload: axiosError.response?.data,
 					};
@@ -285,17 +185,15 @@ class NetworkService implements INetworkService {
 
 			this.logger.warn({
 				message: String(err),
-				service: this.SERVICE_NAME,
+				service: SERVICE_NAME,
 				method: "requestMatrix",
 			});
 
 			return {
 				status: false,
-				code: this.NETWORK_ERROR,
+				code: NETWORK_ERROR,
 				message: "Failed to send Matrix notification",
 			};
 		}
 	}
 }
-
-export default NetworkService;

server/src/service/infrastructure/notificationProviders/INotificationProvider.ts

@@ -3,5 +3,5 @@ import type { NotificationMessage } from "@/types/notificationMessage.js";
 
 export interface INotificationProvider {
 	sendMessage: (notification: Notification, message: NotificationMessage) => Promise<boolean>;
-	sendTestAlert(notification: Notification): Promise<boolean>;
+	sendTestAlert(notification: Partial<Notification>): Promise<boolean>;
 }

server/src/service/infrastructure/notificationProviders/discord.ts

@@ -13,7 +13,7 @@ export class DiscordProvider implements INotificationProvider {
 		this.logger = logger;
 	}
 
-	sendTestAlert = async (notification: Notification) => {
+	sendTestAlert = async (notification: Partial<Notification>) => {
 		if (!notification.address) {
 			return false;
 		}

server/src/service/infrastructure/notificationProviders/email.ts

@@ -14,7 +14,7 @@ export class EmailProvider implements INotificationProvider {
 		this.logger = logger;
 	}
 
-	async sendTestAlert(notification: Notification): Promise<boolean> {
+	async sendTestAlert(notification: Partial<Notification>): Promise<boolean> {
 		const subject = "Test notification";
 		const html = await buildTestEmail(this.emailService);
 

server/src/service/infrastructure/notificationProviders/matrix.ts

@@ -13,7 +13,7 @@ export class MatrixProvider implements INotificationProvider {
 		this.logger = logger;
 	}
 
-	sendTestAlert = async (notification: Notification) => {
+	sendTestAlert = async (notification: Partial<Notification>) => {
 		const { homeserverUrl, accessToken, roomId } = notification;
 		if (!homeserverUrl || !accessToken || !roomId) {
 			return false;

server/src/service/infrastructure/notificationProviders/pagerduty.ts

@@ -14,7 +14,7 @@ export class PagerDutyProvider implements INotificationProvider {
 		this.logger = logger;
 	}
 
-	async sendTestAlert(notification: Notification): Promise<boolean> {
+	async sendTestAlert(notification: Partial<Notification>): Promise<boolean> {
 		try {
 			await got.post("https://events.pagerduty.com/v2/enqueue", {
 				json: {

server/src/service/infrastructure/notificationProviders/slack.ts

@@ -13,7 +13,7 @@ export class SlackProvider implements INotificationProvider {
 		this.logger = logger;
 	}
 
-	async sendTestAlert(notification: Notification): Promise<boolean> {
+	async sendTestAlert(notification: Partial<Notification>): Promise<boolean> {
 		if (!notification.address) {
 			return false;
 		}

server/src/service/infrastructure/notificationProviders/teams.ts

@@ -0,0 +1,274 @@
+const SERVICE_NAME = "TeamsProvider";
+import type { Notification } from "@/types/index.js";
+import { INotificationProvider } from "@/service/index.js";
+import type { NotificationMessage } from "@/types/notificationMessage.js";
+import { getTestMessage } from "@/service/infrastructure/notificationProviders/utils.js";
+import type { ILogger } from "@/utils/logger.js";
+import got, { HTTPError } from "got";
+
+// Types for Adaptive Card elements
+type TextBlock = {
+	type: "TextBlock";
+	text: string;
+	weight?: "Bolder" | "Normal" | "Lighter";
+	size?: "Small" | "Medium" | "Large" | "ExtraLarge";
+	color?: "Default" | "Dark" | "Light" | "Accent" | "Good" | "Warning" | "Attention";
+	wrap?: boolean;
+	spacing?: "None" | "Small" | "Medium" | "Large" | "ExtraLarge" | "Auto";
+	isSubtle?: boolean;
+};
+
+type ColumnSet = {
+	type: "ColumnSet";
+	separator?: boolean;
+	spacing?: "None" | "Small" | "Medium" | "Large" | "ExtraLarge" | "Auto";
+	columns: unknown[];
+};
+
+type Fact = {
+	title: string;
+	value: string;
+};
+
+type FactSet = {
+	type: "FactSet";
+	facts: Fact[];
+};
+
+type Action = {
+	type: string;
+	title: string;
+	url?: string;
+};
+
+type AdaptiveCard = {
+	type: "AdaptiveCard";
+	$schema: "http://adaptivecards.io/schemas/adaptive-card.json";
+	version: "1.4";
+	body: (TextBlock | ColumnSet | FactSet)[];
+	actions?: Action[];
+};
+
+type TeamsMessage = {
+	type: "message";
+	attachments: Array<{
+		contentType: "application/vnd.microsoft.card.adaptive";
+		contentUrl: null;
+		content: AdaptiveCard;
+	}>;
+};
+
+export class TeamsProvider implements INotificationProvider {
+	private logger: ILogger;
+
+	constructor(logger: ILogger) {
+		this.logger = logger;
+	}
+
+	async sendTestAlert(notification: Partial<Notification>): Promise<boolean> {
+		if (!notification.address) {
+			return false;
+		}
+
+		try {
+			const payload = this.wrapAdaptiveCard({
+				type: "AdaptiveCard",
+				$schema: "http://adaptivecards.io/schemas/adaptive-card.json",
+				version: "1.4",
+				body: [
+					{
+						type: "TextBlock",
+						text: getTestMessage(),
+						weight: "Bolder",
+						size: "Medium",
+					},
+				],
+			});
+
+			await got.post(notification.address, {
+				json: payload,
+				headers: {
+					"Content-Type": "application/json",
+				},
+			});
+			return true;
+		} catch (error) {
+			const err = error as HTTPError;
+			this.logger.warn({
+				message: "Teams test alert failed",
+				service: SERVICE_NAME,
+				method: "sendTestAlert",
+				stack: err?.stack,
+			});
+			return false;
+		}
+	}
+
+	async sendMessage(notification: Notification, message: NotificationMessage): Promise<boolean> {
+		if (!notification.address) {
+			return false;
+		}
+
+		const payload = this.wrapAdaptiveCard(this.buildAdaptiveCard(message));
+
+		try {
+			await got.post(notification.address, {
+				json: payload,
+				headers: {
+					"Content-Type": "application/json",
+				},
+			});
+			this.logger.info({
+				message: "Teams notification sent via sendMessage",
+				service: SERVICE_NAME,
+				method: "sendMessage",
+			});
+			return true;
+		} catch (error) {
+			const err = error as HTTPError;
+			this.logger.warn({
+				message: "Teams alert failed via sendMessage",
+				service: SERVICE_NAME,
+				method: "sendMessage",
+				stack: err?.stack,
+			});
+			return false;
+		}
+	}
+
+	/**
+	 * Wrap an Adaptive Card in the Teams webhook envelope format
+	 */
+	private wrapAdaptiveCard(card: AdaptiveCard): TeamsMessage {
+		return {
+			type: "message",
+			attachments: [
+				{
+					contentType: "application/vnd.microsoft.card.adaptive",
+					contentUrl: null,
+					content: card,
+				},
+			],
+		};
+	}
+
+	/**
+	 * Build an Adaptive Card from NotificationMessage
+	 */
+	private buildAdaptiveCard(message: NotificationMessage): AdaptiveCard {
+		const colorMap: Record<string, string> = {
+			critical: "attention",
+			warning: "warning",
+			success: "good",
+			info: "accent",
+		};
+		const color = (colorMap[message.severity] || "default") as "Default" | "Dark" | "Light" | "Accent" | "Good" | "Warning" | "Attention" | undefined;
+
+		const body: (TextBlock | ColumnSet | FactSet)[] = [];
+
+		// Header with colored status indicator
+		body.push({
+			type: "TextBlock",
+			text: message.content.title,
+			weight: "Bolder",
+			size: "Large",
+			color,
+			wrap: true,
+		});
+
+		// Summary
+		body.push({
+			type: "TextBlock",
+			text: message.content.summary,
+			wrap: true,
+			spacing: "Small",
+		});
+
+		// Separator
+		body.push({
+			type: "ColumnSet",
+			separator: true,
+			spacing: "Medium",
+			columns: [],
+		});
+
+		// Monitor details as a FactSet
+		body.push({
+			type: "FactSet",
+			facts: [
+				{ title: "Name", value: message.monitor.name },
+				{ title: "Type", value: message.monitor.type },
+				{ title: "Status", value: message.monitor.status },
+				{ title: "URL", value: message.monitor.url },
+			],
+		});
+
+		// Threshold breaches
+		if (message.content.thresholds && message.content.thresholds.length > 0) {
+			body.push({
+				type: "TextBlock",
+				text: "**Threshold Breaches**",
+				weight: "Bolder",
+				spacing: "Medium",
+				wrap: true,
+			});
+
+			for (const breach of message.content.thresholds) {
+				body.push({
+					type: "TextBlock",
+					text: `• **${breach.metric.toUpperCase()}**: ${breach.formattedValue} (threshold: ${breach.threshold}${breach.unit})`,
+					wrap: true,
+					spacing: "Small",
+				});
+			}
+		}
+
+		// Additional details
+		if (message.content.details && message.content.details.length > 0) {
+			body.push({
+				type: "TextBlock",
+				text: "**Additional Information**",
+				weight: "Bolder",
+				spacing: "Medium",
+				wrap: true,
+			});
+
+			for (const detail of message.content.details) {
+				body.push({
+					type: "TextBlock",
+					text: `• ${detail}`,
+					wrap: true,
+					spacing: "Small",
+				});
+			}
+		}
+
+		// Timestamp footer
+		body.push({
+			type: "TextBlock",
+			text: `Checkmate | ${new Date(message.content.timestamp).toUTCString()}`,
+			size: "Small",
+			isSubtle: true,
+			spacing: "Medium",
+			wrap: true,
+		});
+
+		// Actions (incident link)
+		const actions: Action[] = [];
+		if (message.content.incident) {
+			actions.push({
+				type: "Action.OpenUrl",
+				title: "View Incident",
+				url: `${message.clientHost}/incidents/${message.content.incident.id}`,
+			});
+		}
+
+		return {
+			type: "AdaptiveCard",
+			$schema: "http://adaptivecards.io/schemas/adaptive-card.json",
+			version: "1.4",
+			body,
+			...(actions.length > 0 ? { actions } : {}),
+		};
+	}
+}

server/src/service/infrastructure/notificationProviders/webhook.ts

@@ -98,7 +98,7 @@ export class WebhookProvider implements INotificationProvider {
 		};
 	}
 
-	sendTestAlert = async (notification: Notification) => {
+	sendTestAlert = async (notification: Partial<Notification>) => {
 		if (!notification.address) {
 			return false;
 		}

server/src/service/infrastructure/notificationsService.ts

@@ -8,14 +8,14 @@ import { ILogger } from "@/utils/logger.js";
 import type { INotificationMessageBuilder } from "@/service/infrastructure/notificationMessageBuilder.js";
 
 export interface INotificationsService {
-	createNotification: (notificationData: Partial<Notification>) => Promise<Notification>;
+	createNotification: (notificationData: Partial<Notification>, userId: string, teamId: string) => Promise<Notification>;
 	findById: (id: string, teamId: string) => Promise<Notification>;
 	findNotificationsByTeamId: (teamId: string) => Promise<Notification[]>;
 	updateById(id: string, teamId: string, updateData: Partial<Notification>): Promise<Notification>;
 	deleteById: (id: string, teamId: string) => Promise<Notification>;
 	handleNotifications: (monitor: Monitor, monitorStatusResponse: MonitorStatusResponse, decision: MonitorActionDecision) => Promise<boolean>;
 
-	sendTestNotification: (notification: Notification) => Promise<boolean>;
+	sendTestNotification: (notification: Partial<Notification>) => Promise<boolean>;
 	testAllNotifications: (notificationIds: string[]) => Promise<boolean>;
 }
 
@@ -32,6 +32,7 @@ export class NotificationsService implements INotificationsService {
 	private discordProvider: INotificationProvider;
 	private pagerDutyProvider: INotificationProvider;
 	private matrixProvider: INotificationProvider;
+	private teamsProvider: INotificationProvider;
 	private logger: ILogger;
 	private settingsService: ISettingsService;
 	private notificationMessageBuilder: INotificationMessageBuilder;
@@ -45,6 +46,7 @@ export class NotificationsService implements INotificationsService {
 		discordProvider: INotificationProvider,
 		pagerDutyProvider: INotificationProvider,
 		matrixProvider: INotificationProvider,
+		teamsProvider: INotificationProvider,
 		settingsService: ISettingsService,
 		logger: ILogger,
 		notificationMessageBuilder: INotificationMessageBuilder
@@ -57,6 +59,7 @@ export class NotificationsService implements INotificationsService {
 		this.discordProvider = discordProvider;
 		this.pagerDutyProvider = pagerDutyProvider;
 		this.matrixProvider = matrixProvider;
+		this.teamsProvider = teamsProvider;
 		this.settingsService = settingsService;
 		this.logger = logger;
 		this.notificationMessageBuilder = notificationMessageBuilder;
@@ -92,6 +95,8 @@ export class NotificationsService implements INotificationsService {
 				return await this.discordProvider.sendMessage!(notification, notificationMessage);
 			case "email":
 				return await this.emailProvider.sendMessage!(notification, notificationMessage);
+			case "teams":
+				return await this.teamsProvider.sendMessage!(notification, notificationMessage);
 			default:
 				this.logger.warn({
 					message: `Unknown notification type: ${notification.type}`,
@@ -136,7 +141,7 @@ export class NotificationsService implements INotificationsService {
 		return await this.sendNotifications(monitor, monitorStatusResponse, decision);
 	};
 
-	sendTestNotification = async (notification: Notification) => {
+	sendTestNotification = async (notification: Partial<Notification>) => {
 		switch (notification.type) {
 			case "email":
 				return await this.emailProvider.sendTestAlert(notification);
@@ -150,6 +155,8 @@ export class NotificationsService implements INotificationsService {
 				return await this.matrixProvider.sendTestAlert(notification);
 			case "webhook":
 				return await this.webhookProvider.sendTestAlert(notification);
+			case "teams":
+				return await this.teamsProvider.sendTestAlert(notification);
 			default:
 				return false;
 		}
@@ -167,7 +174,9 @@ export class NotificationsService implements INotificationsService {
 		return true;
 	};
 
-	createNotification = async (notificationData: Partial<Notification>): Promise<Notification> => {
+	createNotification = async (notificationData: Partial<Notification>, userId: string, teamId: string): Promise<Notification> => {
+		notificationData.userId = userId;
+		notificationData.teamId = teamId;
 		return await this.notificationsRepository.create(notificationData);
 	};
 

server/src/service/system/settingsService.ts

@@ -2,12 +2,12 @@ import { ISettingsRepository } from "@/repositories/index.js";
 import { Settings } from "@/types/index.js";
 import { AppError } from "@/utils/AppError.js";
 import { ValidatedEnv } from "@/validation/envValidation.js";
-
+import type { StringValue } from "ms";
 const SERVICE_NAME = "SettingsService";
 
 export type EnvConfig = {
 	jwtSecret: string;
-	jwtTTL: string;
+	jwtTTL: StringValue;
 	nodeEnv: string;
 	logLevel: string;
 	clientHost: string;
@@ -21,7 +21,7 @@ export interface ISettingsService {
 	getDBSettings(): Promise<Settings>;
 }
 
-class SettingsService implements ISettingsService {
+export class SettingsService implements ISettingsService {
 	static SERVICE_NAME = SERVICE_NAME;
 	private settings: EnvConfig;
 	private settingsRepository: ISettingsRepository;
@@ -30,7 +30,7 @@ class SettingsService implements ISettingsService {
 		this.settingsRepository = settingsRepository;
 		this.settings = {
 			jwtSecret: env.JWT_SECRET,
-			jwtTTL: env.TOKEN_TTL,
+			jwtTTL: env.TOKEN_TTL as StringValue,
 			nodeEnv: env.NODE_ENV,
 			logLevel: env.LOG_LEVEL,
 			clientHost: env.CLIENT_HOST,
@@ -74,5 +74,3 @@ class SettingsService implements ISettingsService {
 		return settings;
 	};
 }
-
-export default SettingsService;

server/src/types/check.ts

@@ -1,5 +1,8 @@
 import type { MonitorType } from "@/types/index.js";
 import type { Response } from "got";
+
+export const CHECK_TTL_SENTINEL = 366;
+
 export type GotTimings = Response["timings"];
 
 export interface CheckMetadata {
@@ -98,9 +101,6 @@ export interface Check {
 	timings?: GotTimings;
 	statusCode: number;
 	message: string;
-	ack: boolean;
-	ackAt?: string | null;
-	expiry: string;
 	cpu?: CheckCpuInfo;
 	memory?: CheckMemoryInfo;
 	disk?: CheckDiskInfo[];
@@ -113,7 +113,6 @@ export interface Check {
 	seo?: number;
 	performance?: number;
 	audits?: CheckAudits;
-	__v: number;
 	createdAt: string;
 	updatedAt: string;
 }
@@ -205,4 +204,4 @@ export type NormalizedUptimeCheck<T extends GroupedCheck = GroupedCheck> = T & {
 	originalAvgResponseTime: number;
 };
 
-export type CheckSnapshot = Omit<Check, "metadata" | "ack" | "ackAt" | "expiry" | "__v" | "updatedAt">;
+export type CheckSnapshot = Omit<Check, "metadata" | "updatedAt">;

server/src/types/monitor.ts

@@ -3,13 +3,17 @@ export type { CheckSnapshot } from "@/types/check.js";
 import type { GeoContinent } from "@/types/geoCheck.js";
 export type { GeoContinent } from "@/types/geoCheck.js";
 
-export const MonitorTypes = ["http", "ping", "pagespeed", "hardware", "docker", "port", "game", "grpc", "unknown"] as const;
+export const MonitorTypes = ["http", "ping", "pagespeed", "hardware", "docker", "port", "game", "grpc", "websocket", "unknown"] as const;
 export type MonitorType = (typeof MonitorTypes)[number];
 
+export const GeoCheckSupportedTypes: readonly MonitorType[] = ["http", "ping"] as const;
+export const supportsGeoCheck = (type: MonitorType): boolean => GeoCheckSupportedTypes.includes(type);
+
 export const MonitorStatuses = ["up", "down", "paused", "initializing", "maintenance", "breached"] as const;
 export type MonitorStatus = (typeof MonitorStatuses)[number];
 
-export type MonitorMatchMethod = "equal" | "include" | "regex" | "";
+export const MonitorMatchMethods = ["equal", "include", "regex"] as const;
+export type MonitorMatchMethod = (typeof MonitorMatchMethods)[number] | "";
 
 export interface Monitor {
 	id: string;

server/src/types/network.ts

@@ -24,7 +24,8 @@ export interface MonitorStatusResponse<
 		| HardwareStatusPayload
 		| DockerStatusPayload
 		| GameStatusPayload
-		| GrpcStatusPayload,
+		| GrpcStatusPayload
+		| WebSocketStatusPayload,
 > {
 	monitorId: string;
 	teamId: string;
@@ -111,6 +112,10 @@ export interface GrpcStatusPayload {
 	servingStatus: string;
 }
 
+export interface WebSocketStatusPayload {
+	connected: boolean;
+}
+
 export interface MonitorPayloadMap {
 	ping: PingStatusPayload;
 	http: HttpStatusPayload;
@@ -120,7 +125,8 @@ export interface MonitorPayloadMap {
 	port: PortStatusPayload;
 	game: GameStatusPayload;
 	grpc: GrpcStatusPayload;
-	default: unknown;
+	websocket: WebSocketStatusPayload;
+	unknown: unknown;
 }
 
 export type StatusChangeResult = {

server/src/types/notification.ts

@@ -1,4 +1,4 @@
-export const NotificationChannels = ["email", "slack", "discord", "webhook", "pager_duty", "matrix"] as const;
+export const NotificationChannels = ["email", "slack", "discord", "webhook", "pager_duty", "matrix", "teams"] as const;
 export type NotificationChannel = (typeof NotificationChannels)[number];
 
 export interface Notification {

server/src/types/ssl-checker.d.ts

@@ -0,0 +1,24 @@
+declare module "ssl-checker" {
+	import { Agent } from "https";
+
+	export interface SSLDetails {
+		daysRemaining: number;
+		valid: boolean;
+		validFrom: string;
+		validTo: string;
+		validFor: string[];
+	}
+
+	export interface SSLOptions {
+		method?: "GET" | "HEAD";
+		port?: number;
+		agent?: Agent;
+		rejectUnauthorized?: boolean;
+		validateSubjectAltName?: boolean;
+	}
+
+	function sslChecker(hostname: string, options?: SSLOptions): Promise<SSLDetails>;
+
+	// Change 'export default' to 'export =' to allow it to be callable
+	export = sslChecker;
+}

server/src/validation/checkValidation.ts

@@ -11,34 +11,32 @@ export const getChecksParamValidation = z.object({
 });
 
 export const getChecksQueryValidation = z.object({
-	type: z.enum(["http", "ping", "pagespeed", "hardware", "docker", "port", "game", "grpc"]).optional(),
-	sortOrder: z.enum(["asc", "desc"]).optional(),
+	type: z.enum(["http", "ping", "pagespeed", "hardware", "docker", "port", "game", "grpc", "websocket"]).optional(),
+	sortOrder: z.enum(["asc", "desc"]),
 	limit: z.coerce.number().optional(),
-	dateRange: z.enum(["recent", "hour", "day", "week", "month", "all"]).optional(),
+	dateRange: z.enum(["recent", "hour", "day", "week", "month", "all"]),
 	filter: z.enum(["all", "up", "down", "resolve"]).optional(),
 	ack: booleanCoercion.optional(),
-	page: z.coerce.number().optional(),
-	rowsPerPage: z.coerce.number().optional(),
+	page: z.coerce.number(),
+	rowsPerPage: z.coerce.number(),
 	status: booleanCoercion.optional(),
 	continent: z.union([z.enum(GeoContinents), z.array(z.enum(GeoContinents))]).optional(),
 });
 
 export const getTeamChecksQueryValidation = z.object({
-	sortOrder: z.enum(["asc", "desc"]).optional(),
+	sortOrder: z.enum(["asc", "desc"]),
 	limit: z.coerce.number().optional(),
-	dateRange: z.enum(["recent", "hour", "day", "week", "month", "all"]).optional(),
+	dateRange: z.enum(["recent", "hour", "day", "week", "month", "all"]),
 	filter: z.enum(["all", "up", "down", "resolve"]).optional(),
 	ack: booleanCoercion.optional(),
-	page: z.coerce.number().optional(),
-	rowsPerPage: z.coerce.number().optional(),
+	page: z.coerce.number(),
+	rowsPerPage: z.coerce.number(),
 });
 
 export const deleteChecksParamValidation = z.object({
 	monitorId: z.string().min(1, "Monitor ID is required"),
 });
 
-export const deleteChecksByTeamIdParamValidation = z.object({});
-
-export const updateChecksTTLBodyValidation = z.object({
-	ttl: z.number().min(1, "TTL is required"),
+export const getChecksSummaryByTeamIdQueryValidation = z.object({
+	dateRange: z.enum(["recent", "hour", "day", "week", "month", "all"]).optional(),
 });

server/src/validation/envValidation.ts

@@ -2,6 +2,7 @@ import { z } from "zod";
 
 const envSchema = z.object({
 	// Server Configuration
+	PORT: z.string().default("52345"),
 	NODE_ENV: z.enum(["development", "production", "test"]).default("development"),
 	LOG_LEVEL: z.enum(["error", "warn", "info", "debug"]).default("debug"),
 

server/src/validation/incidentValidation.ts

@@ -0,0 +1,20 @@
+import { z } from "zod";
+import { booleanCoercion } from "./shared.js";
+
+//****************************************
+// Incident Validations
+//****************************************
+
+export const getIncidentsByTeamQueryValidation = z.object({
+	sortOrder: z.enum(["asc", "desc"]),
+	dateRange: z.enum(["recent", "hour", "day", "week", "month", "all"]),
+	page: z.coerce.number().int().min(0),
+	rowsPerPage: z.coerce.number().int().min(1),
+	status: booleanCoercion.optional(),
+	monitorId: z.string().optional(),
+	resolutionType: z.enum(["manual", "automatic"]).optional(),
+});
+
+export const getIncidentSummaryQueryValidation = z.object({
+	limit: z.coerce.number().int().min(1).optional(),
+});

server/src/validation/index.ts

@@ -20,3 +20,4 @@ export * from "./settingsValidation.js";
 export * from "./statusPageValidation.js";
 export * from "./notificationValidation.js";
 export * from "./userValidation.js";
+export * from "./incidentValidation.js";

server/src/validation/maintenanceWindowValidation.ts

@@ -1,6 +1,8 @@
 import { z } from "zod";
 import { booleanCoercion } from "./shared.js";
 
+const dateToString = z.coerce.date().transform((d) => d.toISOString());
+
 //****************************************
 // Maintenance Window Validations
 //****************************************
@@ -11,10 +13,10 @@ export const createMaintenanceWindowBodyValidation = z.object({
 	active: z.boolean().optional(),
 	duration: z.number().min(1, "Duration is required"),
 	durationUnit: z.enum(["seconds", "minutes", "hours", "days"]),
-	start: z.coerce.date(),
-	end: z.coerce.date(),
+	start: dateToString,
+	end: dateToString,
 	repeat: z.number().min(0, "Repeat must be a non-negative number"),
-	expiry: z.coerce.date().optional(),
+	expiry: dateToString.optional(),
 });
 
 export const getMaintenanceWindowByIdParamValidation = z.object({
@@ -45,10 +47,10 @@ export const editMaintenanceByIdWindowBodyValidation = z.object({
 	active: z.boolean().optional(),
 	name: z.string().optional(),
 	repeat: z.number().optional(),
-	start: z.coerce.date().optional(),
-	end: z.coerce.date().optional(),
-	expiry: z.coerce.date().optional(),
-	monitors: z.array(z.unknown()).optional(),
+	start: dateToString.optional(),
+	end: dateToString.optional(),
+	expiry: dateToString.optional(),
+	monitors: z.array(z.string()).optional(),
 	duration: z.number().optional(),
 	durationUnit: z.enum(["seconds", "minutes", "hours", "days"]).optional(),
 });

server/src/validation/monitorValidation.ts

@@ -1,6 +1,7 @@
 import { z } from "zod";
 import { booleanCoercion } from "./shared.js";
 import { GeoContinents } from "@/types/geoCheck.js";
+import { MonitorMatchMethods, MonitorTypes } from "@/types/monitor.js";
 
 export const getMonitorByIdParamValidation = z.object({
 	monitorId: z.string().min(1, "Monitor ID is required"),
@@ -13,7 +14,7 @@ export const getMonitorByIdQueryValidation = z.object({
 	dateRange: z.enum(["recent", "hour", "day", "week", "month", "all"]).optional(),
 	numToDisplay: z.coerce.number().optional(),
 	normalize: booleanCoercion.optional(),
-	continent: z.enum(GeoContinents).optional(),
+	continent: z.union([z.enum(GeoContinents), z.array(z.enum(GeoContinents))]).optional(),
 });
 
 export const getMonitorsByTeamIdParamValidation = z.object({});
@@ -21,24 +22,24 @@ export const getMonitorsByTeamIdParamValidation = z.object({});
 export const getMonitorsByTeamIdQueryValidation = z.object({
 	type: z
 		.union([
-			z.enum(["http", "ping", "pagespeed", "docker", "hardware", "port", "game", "grpc"]),
-			z.array(z.enum(["http", "ping", "pagespeed", "docker", "hardware", "port", "game", "grpc"])),
+			z.enum(["http", "ping", "pagespeed", "docker", "hardware", "port", "game", "grpc", "websocket"]),
+			z.array(z.enum(["http", "ping", "pagespeed", "docker", "hardware", "port", "game", "grpc", "websocket"])),
 		])
 		.optional(),
-	filter: z.union([z.string(), z.literal(""), z.null()]).optional(),
+	filter: z.union([z.string(), z.literal("")]).optional(),
 });
 
 export const getMonitorsWithChecksQueryValidation = z.object({
 	limit: z.coerce.number().int().min(1).max(100).optional(),
 	page: z.coerce.number().int().min(0).optional(),
 	rowsPerPage: z.coerce.number().int().min(1).max(100).optional(),
-	filter: z.union([z.string(), z.literal(""), z.null()]).optional(),
+	filter: z.union([z.string(), z.literal("")]).optional(),
 	field: z.string().optional(),
 	order: z.enum(["asc", "desc"]).optional(),
 	type: z
 		.union([
-			z.enum(["http", "ping", "pagespeed", "docker", "hardware", "port", "game", "grpc"]),
-			z.array(z.enum(["http", "ping", "pagespeed", "docker", "hardware", "port", "game", "grpc"])),
+			z.enum(["http", "ping", "pagespeed", "docker", "hardware", "port", "game", "grpc", "websocket"]),
+			z.array(z.enum(["http", "ping", "pagespeed", "docker", "hardware", "port", "game", "grpc", "websocket"])),
 		])
 		.optional(),
 	explain: booleanCoercion.optional(),
@@ -51,8 +52,8 @@ export const getCertificateParamValidation = z.object({
 export const createMonitorBodyValidation = z.object({
 	_id: z.string().optional(),
 	name: z.string().min(1, "Name is required"),
-	description: z.union([z.string(), z.null(), z.literal("")]).optional(),
-	type: z.string().min(1, "Type is required"),
+	description: z.union([z.string(), z.literal("")]).optional(),
+	type: z.enum(MonitorTypes, "Invalid monitor type"),
 	statusWindowSize: z.number().min(1).max(20).default(5),
 	statusWindowThreshold: z.number().min(1).max(100).default(60),
 	url: z.string().min(1, "URL is required"),
@@ -69,7 +70,7 @@ export const createMonitorBodyValidation = z.object({
 	secret: z.string().optional(),
 	jsonPath: z.union([z.string(), z.literal("")]).optional(),
 	expectedValue: z.union([z.string(), z.literal("")]).optional(),
-	matchMethod: z.union([z.string(), z.null(), z.literal("")]).optional(),
+	matchMethod: z.union([z.enum(MonitorMatchMethods), z.literal("")]).optional(),
 	gameId: z.union([z.string(), z.literal("")]).optional(),
 	grpcServiceName: z.union([z.string(), z.literal("")]).default(""),
 	selectedDisks: z.array(z.string()).optional(),
@@ -81,11 +82,11 @@ export const createMonitorBodyValidation = z.object({
 
 export const editMonitorBodyValidation = z.object({
 	name: z.string().optional(),
-	type: z.string().optional(),
+	type: z.enum(MonitorTypes).optional(),
 	url: z.string().optional(),
 	statusWindowSize: z.number().min(1).max(20).default(5),
 	statusWindowThreshold: z.number().min(1).max(100).default(60),
-	description: z.union([z.string(), z.null(), z.literal("")]).optional(),
+	description: z.union([z.string(), z.literal("")]).optional(),
 	interval: z.number().optional(),
 	notifications: z.array(z.string()).optional(),
 	secret: z.string().optional(),
@@ -93,7 +94,7 @@ export const editMonitorBodyValidation = z.object({
 	useAdvancedMatching: z.boolean().optional(),
 	jsonPath: z.union([z.string(), z.literal("")]).optional(),
 	expectedValue: z.union([z.string(), z.literal("")]).optional(),
-	matchMethod: z.union([z.string(), z.null(), z.literal("")]).optional(),
+	matchMethod: z.union([z.enum(MonitorMatchMethods), z.literal("")]).optional(),
 	port: z.number().min(1).max(65535).optional(),
 	cpuAlertThreshold: z.number().optional(),
 	memoryAlertThreshold: z.number().optional(),
@@ -112,6 +113,62 @@ export const pauseMonitorParamValidation = z.object({
 	monitorId: z.string().min(1, "Monitor ID is required"),
 });
 
+export const getUptimeDetailsByIdParamValidation = z.object({
+	monitorId: z.string().min(1, "Monitor ID is required"),
+});
+
+export const getUptimeDetailsByIdQueryValidation = z.object({
+	dateRange: z.enum(["recent", "hour", "day", "week", "month", "all"]),
+	normalize: booleanCoercion.optional(),
+});
+
+const importedMonitorSchema = z.object({
+	id: z.string().optional(),
+	userId: z.string().optional(),
+	teamId: z.string().optional(),
+	name: z.string().min(1, "Name is required"),
+	description: z.union([z.string(), z.literal("")]).optional(),
+	status: z.enum(["up", "down", "paused", "initializing", "maintenance", "breached"]).optional(),
+	statusWindow: z.array(z.boolean()).optional(),
+	statusWindowSize: z.number().optional(),
+	statusWindowThreshold: z.number().optional(),
+	type: z.enum(MonitorTypes, "Invalid monitor type"),
+	ignoreTlsErrors: z.boolean().optional(),
+	useAdvancedMatching: z.boolean().optional(),
+	jsonPath: z.union([z.string(), z.literal("")]).optional(),
+	expectedValue: z.union([z.string(), z.literal("")]).optional(),
+	matchMethod: z.union([z.enum(MonitorMatchMethods), z.literal("")]).optional(),
+	url: z.string().min(1, "URL is required"),
+	port: z.number().optional(),
+	isActive: z.boolean().optional(),
+	interval: z.number().optional(),
+	uptimePercentage: z.number().optional(),
+	notifications: z.array(z.string()).optional(),
+	secret: z.string().optional(),
+	cpuAlertThreshold: z.number().optional(),
+	cpuAlertCounter: z.number().optional(),
+	memoryAlertThreshold: z.number().optional(),
+	memoryAlertCounter: z.number().optional(),
+	diskAlertThreshold: z.number().optional(),
+	diskAlertCounter: z.number().optional(),
+	tempAlertThreshold: z.number().optional(),
+	tempAlertCounter: z.number().optional(),
+	selectedDisks: z.array(z.string()).optional(),
+	gameId: z.union([z.string(), z.literal("")]).optional(),
+	grpcServiceName: z.union([z.string(), z.literal("")]).optional(),
+	group: z.union([z.string(), z.null()]).optional(),
+	geoCheckEnabled: z.boolean().optional(),
+	geoCheckLocations: z.array(z.enum(GeoContinents)).optional(),
+	geoCheckInterval: z.number().optional(),
+	recentChecks: z.array(z.unknown()).optional(),
+	createdAt: z.string().optional(),
+	updatedAt: z.string().optional(),
+});
+
+export const importMonitorsBodyValidation = z.object({
+	monitors: z.array(importedMonitorSchema).min(1, "At least one monitor is required"),
+});
+
 export const getHardwareDetailsByIdParamValidation = z.object({
 	monitorId: z.string().min(1, "Monitor ID is required"),
 });

server/src/validation/notificationValidation.ts

@@ -18,7 +18,7 @@ export const createNotificationBodyValidation = z.discriminatedUnion("type", [
 	z.object({
 		notificationName: z.string().min(1, "Notification name is required"),
 		type: z.literal("webhook"),
-		address: z.string().url("Please enter a valid Webhook URL"),
+		address: z.url({ message: "Please enter a valid Webhook URL" }),
 		homeserverUrl: z.union([z.string(), z.literal("")]).optional(),
 		roomId: z.union([z.string(), z.literal("")]).optional(),
 		accessToken: z.union([z.string(), z.literal("")]).optional(),
@@ -27,7 +27,7 @@ export const createNotificationBodyValidation = z.discriminatedUnion("type", [
 	z.object({
 		notificationName: z.string().min(1, "Notification name is required"),
 		type: z.literal("slack"),
-		address: z.string().url("Please enter a valid Webhook URL"),
+		address: z.url({ message: "Please enter a valid Webhook URL" }),
 		homeserverUrl: z.union([z.string(), z.literal("")]).optional(),
 		roomId: z.union([z.string(), z.literal("")]).optional(),
 		accessToken: z.union([z.string(), z.literal("")]).optional(),
@@ -36,7 +36,7 @@ export const createNotificationBodyValidation = z.discriminatedUnion("type", [
 	z.object({
 		notificationName: z.string().min(1, "Notification name is required"),
 		type: z.literal("discord"),
-		address: z.string().url("Please enter a valid Webhook URL"),
+		address: z.url({ message: "Please enter a valid Webhook URL" }),
 		homeserverUrl: z.union([z.string(), z.literal("")]).optional(),
 		roomId: z.union([z.string(), z.literal("")]).optional(),
 		accessToken: z.union([z.string(), z.literal("")]).optional(),
@@ -55,12 +55,34 @@ export const createNotificationBodyValidation = z.discriminatedUnion("type", [
 		notificationName: z.string().min(1, "Notification name is required"),
 		type: z.literal("matrix"),
 		address: z.union([z.string(), z.literal("")]).optional(),
-		homeserverUrl: z.string().url("Please enter a valid Homeserver URL"),
+		homeserverUrl: z.url({ message: "Please enter a valid Homeserver URL" }),
 		roomId: z.string().min(1, "Room ID is required"),
 		accessToken: z.string().min(1, "Access Token is required"),
 	}),
+	// Teams notification
+	z.object({
+		notificationName: z.string().min(1, "Notification name is required"),
+		type: z.literal("teams"),
+		address: z.url({ message: "Please enter a valid Webhook URL" }),
+	}),
 ]);
 
+export const testNotificationBodyValidation = createNotificationBodyValidation;
+
+export const deleteNotificationParamValidation = z.object({
+	id: z.string().min(1, "Notification ID is required"),
+});
+export const getNotificationByIdParamValidation = z.object({
+	id: z.string().min(1, "Notification ID is required"),
+});
+export const editNotificationParamValidation = z.object({
+	id: z.string().min(1, "Notification ID is required"),
+});
+
+export const testAllNotificationsBodyValidation = z.object({
+	monitorId: z.string().min(1, "Monitor ID is required"),
+});
+
 export const sendTestEmailBodyValidation = z.object({
 	to: z.string().min(1, "To field is required"),
 	systemEmailHost: z.string().optional(),

server/src/validation/settingsValidation.ts

@@ -1,3 +1,4 @@
+import { CHECK_TTL_SENTINEL } from "@/types/check.js";
 import { z } from "zod";
 
 //****************************************
@@ -6,9 +7,8 @@ import { z } from "zod";
 
 export const updateAppSettingsBodyValidation = z
 	.object({
-		checkTTL: z.union([z.number(), z.literal("")]).optional(),
+		checkTTL: z.union([z.number().int().min(1).max(CHECK_TTL_SENTINEL), z.literal("")]).optional(),
 		systemEmailPort: z.union([z.number(), z.literal("")]).optional(),
-
 		pagespeedApiKey: z.union([z.string(), z.literal("")]).optional(),
 		language: z.union([z.string(), z.literal("")]).optional(),
 		timezone: z.union([z.string(), z.literal("")]).optional(),

server/test/teamsProvider.test.ts

@@ -0,0 +1,267 @@
+import { describe, expect, it, jest, beforeEach } from "@jest/globals";
+import { TeamsProvider } from "../src/service/infrastructure/notificationProviders/teams.ts";
+import type { Notification } from "../src/types/notification.ts";
+import type { NotificationMessage } from "../src/types/notificationMessage.ts";
+
+// Mock got
+jest.unstable_mockModule("got", () => ({
+	default: { post: jest.fn() },
+}));
+
+const createLogger = () => ({
+	info: jest.fn(),
+	warn: jest.fn(),
+	error: jest.fn(),
+	debug: jest.fn(),
+});
+
+const createNotification = (overrides?: Partial<Notification>): Notification => ({
+	id: "notif-1",
+	userId: "user-1",
+	teamId: "team-1",
+	type: "teams",
+	notificationName: "Teams Alert",
+	address: "https://xxxxx.webhook.office.com/webhookb2/test",
+	createdAt: new Date().toISOString(),
+	updatedAt: new Date().toISOString(),
+	...overrides,
+});
+
+const createMessage = (overrides?: Partial<NotificationMessage>): NotificationMessage => ({
+	type: "monitor_down",
+	severity: "critical",
+	monitor: {
+		id: "mon-1",
+		name: "API Server",
+		url: "https://api.example.com",
+		type: "http",
+		status: "down",
+	},
+	content: {
+		title: "🔴 Monitor Down",
+		summary: "API Server is not responding",
+		details: ["Response timeout after 30s"],
+		thresholds: [],
+		incident: {
+			id: "inc-1",
+			url: "https://app.example.com/incidents/inc-1",
+			createdAt: new Date(),
+		},
+		timestamp: new Date("2026-01-15T12:00:00Z"),
+	},
+	clientHost: "https://app.example.com",
+	metadata: {
+		teamId: "team-1",
+		notificationReason: "monitor_down",
+	},
+	...overrides,
+});
+
+describe("TeamsProvider", () => {
+	let provider: TeamsProvider;
+	let logger: ReturnType<typeof createLogger>;
+	let gotPost: jest.Mock;
+
+	beforeEach(async () => {
+		logger = createLogger();
+		provider = new TeamsProvider(logger);
+		const got = await import("got");
+		gotPost = got.default.post as jest.Mock;
+		gotPost.mockReset();
+		gotPost.mockResolvedValue({});
+	});
+
+	describe("sendTestAlert", () => {
+		it("returns false when address is missing", async () => {
+			const notification = createNotification({ address: undefined });
+			const result = await provider.sendTestAlert(notification);
+			expect(result).toBe(false);
+			expect(gotPost).not.toHaveBeenCalled();
+		});
+
+		it("sends an Adaptive Card test message and returns true on success", async () => {
+			const notification = createNotification();
+			const result = await provider.sendTestAlert(notification);
+			expect(result).toBe(true);
+			expect(gotPost).toHaveBeenCalledTimes(1);
+
+			const [url, options] = gotPost.mock.calls[0] as [string, { json: any; headers: any }];
+			expect(url).toBe(notification.address);
+			expect(options.headers["Content-Type"]).toBe("application/json");
+
+			// Verify Teams webhook envelope
+			const payload = options.json;
+			expect(payload.type).toBe("message");
+			expect(payload.attachments).toHaveLength(1);
+			expect(payload.attachments[0].contentType).toBe("application/vnd.microsoft.card.adaptive");
+
+			// Verify Adaptive Card structure
+			const card = payload.attachments[0].content;
+			expect(card.type).toBe("AdaptiveCard");
+			expect(card.version).toBe("1.4");
+			expect(card.body[0].type).toBe("TextBlock");
+			expect(card.body[0].text).toContain("test notification");
+		});
+
+		it("returns false and logs warning on HTTP error", async () => {
+			gotPost.mockRejectedValue(new Error("Network error"));
+			const notification = createNotification();
+			const result = await provider.sendTestAlert(notification);
+			expect(result).toBe(false);
+			expect(logger.warn).toHaveBeenCalledWith(
+				expect.objectContaining({
+					message: "Teams test alert failed",
+					service: "TeamsProvider",
+				})
+			);
+		});
+	});
+
+	describe("sendMessage", () => {
+		it("returns false when address is missing", async () => {
+			const notification = createNotification({ address: undefined });
+			const result = await provider.sendMessage(notification, createMessage());
+			expect(result).toBe(false);
+			expect(gotPost).not.toHaveBeenCalled();
+		});
+
+		it("sends a well-formed Adaptive Card and returns true", async () => {
+			const notification = createNotification();
+			const message = createMessage();
+			const result = await provider.sendMessage(notification, message);
+
+			expect(result).toBe(true);
+			expect(gotPost).toHaveBeenCalledTimes(1);
+
+			const [url, options] = gotPost.mock.calls[0] as [string, { json: any }];
+			expect(url).toBe(notification.address);
+
+			const payload = options.json;
+			expect(payload.type).toBe("message");
+
+			const card = payload.attachments[0].content;
+			expect(card.type).toBe("AdaptiveCard");
+			expect(card.version).toBe("1.4");
+
+			// Verify body contains expected elements
+			const textBlocks = card.body.filter((b: any) => b.type === "TextBlock");
+			const factSets = card.body.filter((b: any) => b.type === "FactSet");
+
+			// Title block
+			expect(textBlocks[0].text).toBe(message.content.title);
+			expect(textBlocks[0].color).toBe("attention"); // critical -> attention
+
+			// Summary block
+			expect(textBlocks[1].text).toBe(message.content.summary);
+
+			// FactSet with monitor details
+			expect(factSets).toHaveLength(1);
+			const facts = factSets[0].facts;
+			expect(facts).toEqual(
+				expect.arrayContaining([
+					expect.objectContaining({ title: "Name", value: "API Server" }),
+					expect.objectContaining({ title: "URL", value: "https://api.example.com" }),
+					expect.objectContaining({ title: "Status", value: "down" }),
+				])
+			);
+
+			// Incident action button
+			expect(card.actions).toHaveLength(1);
+			expect(card.actions[0].type).toBe("Action.OpenUrl");
+			expect(card.actions[0].title).toBe("View Incident");
+			expect(card.actions[0].url).toContain("/infrastructure/mon-1");
+		});
+
+		it("omits actions when no incident is present", async () => {
+			const notification = createNotification();
+			const message = createMessage({
+				content: {
+					title: "Test",
+					summary: "Summary",
+					timestamp: new Date(),
+				},
+			});
+			const result = await provider.sendMessage(notification, message);
+			expect(result).toBe(true);
+
+			const [, options] = gotPost.mock.calls[0] as [string, { json: any }];
+			const card = options.json.attachments[0].content;
+			expect(card.actions).toBeUndefined();
+		});
+
+		it("includes threshold breaches when present", async () => {
+			const notification = createNotification();
+			const message = createMessage({
+				type: "threshold_breach",
+				severity: "warning",
+				content: {
+					title: "Threshold Breach",
+					summary: "CPU usage exceeded",
+					thresholds: [
+						{
+							metric: "cpu",
+							currentValue: 95,
+							threshold: 80,
+							unit: "%",
+							formattedValue: "95%",
+						},
+					],
+					timestamp: new Date(),
+				},
+			});
+
+			await provider.sendMessage(notification, message);
+
+			const [, options] = gotPost.mock.calls[0] as [string, { json: any }];
+			const card = options.json.attachments[0].content;
+
+			// Title should use "warning" color
+			expect(card.body[0].color).toBe("warning");
+
+			// Find threshold text blocks
+			const thresholdHeader = card.body.find((b: any) => b.type === "TextBlock" && b.text === "**Threshold Breaches**");
+			expect(thresholdHeader).toBeDefined();
+
+			const cpuBlock = card.body.find((b: any) => b.type === "TextBlock" && b.text?.includes("CPU"));
+			expect(cpuBlock).toBeDefined();
+			expect(cpuBlock.text).toContain("95%");
+			expect(cpuBlock.text).toContain("threshold: 80%");
+		});
+
+		it("maps severity to correct Adaptive Card colors", async () => {
+			const notification = createNotification();
+
+			const severityMap = [
+				{ severity: "critical", expected: "attention" },
+				{ severity: "warning", expected: "warning" },
+				{ severity: "success", expected: "good" },
+				{ severity: "info", expected: "accent" },
+			] as const;
+
+			for (const { severity, expected } of severityMap) {
+				gotPost.mockReset();
+				gotPost.mockResolvedValue({});
+
+				const message = createMessage({ severity });
+				await provider.sendMessage(notification, message);
+
+				const [, options] = gotPost.mock.calls[0] as [string, { json: any }];
+				const card = options.json.attachments[0].content;
+				expect(card.body[0].color).toBe(expected);
+			}
+		});
+
+		it("returns false and logs warning on HTTP error", async () => {
+			gotPost.mockRejectedValue(new Error("502 Bad Gateway"));
+			const notification = createNotification();
+			const result = await provider.sendMessage(notification, createMessage());
+			expect(result).toBe(false);
+			expect(logger.warn).toHaveBeenCalledWith(
+				expect.objectContaining({
+					message: "Teams alert failed via sendMessage",
+					service: "TeamsProvider",
+				})
+			);
+		});
+	});
+});

server/tsconfig.json

@@ -14,7 +14,8 @@
 		"moduleResolution": "nodenext",
 		"skipLibCheck": true,
 		"noUncheckedIndexedAccess": true,
-		"isolatedModules": true
+		"isolatedModules": true,
+		"resolveJsonModule": true
 	},
 	"include": ["src"],
 	"exclude": ["tests", "dist", "node_modules"]