Merge pull request #3394 from bluewave-labs/develop

develop -> master 3.5.1 release

.gitignore

@@ -5,4 +5,6 @@
 mongo
 node_modules/
 docs/architecture
-docs/reviews
+docs/reviews
+docs/todo
+docs/frontend

README.md

@@ -42,7 +42,7 @@ Checkmate has been stress-tested with 1000+ active monitors without any particul
 
 ## Demo
 
-You can see the latest build of [Checkmate](https://checkmate-demo.bluewavelabs.ca/) in action. The username is uptimedemo@demo.com and the password is Demouser1! (just a note that we update the demo server from time to time, so if it doesn't work for you, please ping us on the Discussions channel).
+You can see the latest build of [Checkmate](https://checkmate-demo.bluewavelabs.ca/) in action. The username is demouser@demo.com and the password is Demouser1! (just a note that we update the demo server from time to time, so if it doesn't work for you, please ping us on the Discussions channel).
 
 ## User's guide
 

client/package.json

@@ -13,7 +13,7 @@
 		"format-check": "prettier --check ."
 	},
 	"lint-staged": {
-		"**/*": "npm run format"
+		"**/*": "prettier --write"
 	},
 	"dependencies": {
 		"@emotion/react": "^11.13.3",
@@ -25,6 +25,7 @@
 		"@mui/x-charts": "7.29.1",
 		"@mui/x-date-pickers": "7.29.4",
 		"@reduxjs/toolkit": "2.7.0",
+		"@types/maplibre-gl": "^1.13.2",
 		"axios": "^1.7.4",
 		"dayjs": "1.11.13",
 		"flag-icons": "7.3.2",
@@ -33,6 +34,7 @@
 		"i18next": "25.4.2",
 		"joi": "17.13.3",
 		"lucide-react": "^0.562.0",
+		"maplibre-gl": "^5.19.0",
 		"mui-color-input": "^7.0.0",
 		"pretty-bytes": "^7.1.0",
 		"pretty-ms": "^9.3.0",
@@ -41,6 +43,7 @@
 		"react-hook-form": "^7.63.0",
 		"react-i18next": "^15.4.0",
 		"react-icons": "5.5.0",
+		"react-map-gl": "^8.1.0",
 		"react-redux": "9.2.0",
 		"react-router": "^6.23.0",
 		"react-router-dom": "^6.23.1",
@@ -49,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",
@@ -63,6 +66,6 @@
 		"lint-staged": "^16.2.7",
 		"prettier": "^3.3.3",
 		"typescript": "5.9.3",
-		"vite": "6.3.6"
+		"vite": "6.4.1"
 	}
 }

client/src/App.tsx

@@ -4,39 +4,52 @@ import "react-toastify/dist/ReactToastify.css";
 import { ToastContainer } from "react-toastify";
 import { ThemeProvider } from "@emotion/react";
 import { CssBaseline, GlobalStyles } from "@mui/material";
+import { SWRConfig } from "swr";
 import { Routes } from "./Routes";
 import AppLayout from "@/Components/layout/AppLayout";
 import type { RootState } from "@/Types/state";
 import { lightTheme, darkTheme } from "@/Utils/Theme/Theme";
 
+const swrConfig = {
+	dedupingInterval: 5000,
+	revalidateOnFocus: false,
+	revalidateOnReconnect: true,
+	shouldRetryOnError: false,
+	errorRetryCount: 2,
+	errorRetryInterval: 1000,
+	focusThrottleInterval: 5000,
+};
+
 function App() {
 	const mode = useSelector((state: RootState) => state.ui.mode);
 	const theme = mode === "light" ? lightTheme : darkTheme;
 
 	return (
-		<ThemeProvider theme={theme}>
-			<CssBaseline />
-			<GlobalStyles
-				styles={{
-					body: {
-						backgroundColor: theme.palette.background.default,
-					},
-				}}
-			/>
-			<AppLayout>
-				<Routes />
-			</AppLayout>
-			<ToastContainer
-				newestOnTop={true}
-				theme={mode}
-				style={
-					{
-						"--toastify-color-progress-light": "#7C8BA1",
-						"--toastify-color-progress-dark": "#7C8BA1",
-					} as CSSProperties
-				}
-			/>
-		</ThemeProvider>
+		<SWRConfig value={swrConfig}>
+			<ThemeProvider theme={theme}>
+				<CssBaseline />
+				<GlobalStyles
+					styles={{
+						body: {
+							backgroundColor: theme.palette.background.default,
+						},
+					}}
+				/>
+				<AppLayout>
+					<Routes />
+				</AppLayout>
+				<ToastContainer
+					newestOnTop={true}
+					theme={mode}
+					style={
+						{
+							"--toastify-color-progress-light": "#7C8BA1",
+							"--toastify-color-progress-dark": "#7C8BA1",
+						} as CSSProperties
+					}
+				/>
+			</ThemeProvider>
+		</SWRConfig>
 	);
 }
 

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

@@ -32,7 +32,7 @@ export const HeatmapResponseTime = ({
 
 	if (!checks || checks.length === 0) return null;
 
-	const latestChecks = checks.slice(-25).reverse();
+	const latestChecks = checks.slice(-25);
 
 	let data: Array<CheckSnapshot | PlaceholderCheck>;
 	if (latestChecks.length !== 25) {

client/src/Components/design-elements/BaseChart.tsx

@@ -2,6 +2,7 @@ import { BaseBox } from ".";
 import Stack from "@mui/material/Stack";
 import Box from "@mui/material/Box";
 import Typography from "@mui/material/Typography";
+import { LAYOUT } from "@/Utils/Theme/constants";
 import type { ResponsiveStyleValue } from "@mui/system";
 
 import { useTheme } from "@mui/material/styles";
@@ -26,7 +27,7 @@ export const BaseChart = ({
 	return (
 		<BaseBox
 			sx={{
-				padding: padding ?? theme.spacing(8),
+				padding: padding ?? theme.spacing(LAYOUT.MD),
 				display: "flex",
 				flex: 1,
 				width: width,
@@ -34,13 +35,13 @@ export const BaseChart = ({
 			}}
 		>
 			<Stack
-				gap={theme.spacing(8)}
+				gap={theme.spacing(LAYOUT.MD)}
 				flex={1}
 			>
 				<Stack
 					direction="row"
 					alignItems={"center"}
-					gap={theme.spacing(4)}
+					gap={theme.spacing(LAYOUT.XS)}
 				>
 					{icon && (
 						<BaseBox

client/src/Components/design-elements/BasePage.tsx

@@ -3,6 +3,7 @@ import Stack from "@mui/material/Stack";
 import Box from "@mui/material/Box";
 import Alert from "@mui/material/Alert";
 import Link from "@mui/material/Link";
+import { LAYOUT, SPACING } from "@/Utils/Theme/constants";
 import {
 	ErrorFallback,
 	EmptyFallback,
@@ -91,7 +92,7 @@ export const BasePage = ({
 
 	return (
 		<Stack
-			spacing={theme.spacing(10)}
+			spacing={theme.spacing(LAYOUT.LG)}
 			{...props}
 		>
 			<Breadcrumb breadcrumbOverride={breadcrumbOverride} />
@@ -220,7 +221,7 @@ export const BaseAuthPage = ({
 	return (
 		<BasePage
 			breadcrumbOverride={[]}
-			gap={theme.spacing(8)}
+			gap={theme.spacing(LAYOUT.MD)}
 			alignItems={"center"}
 			justifyContent={"center"}
 			minHeight="100vh"
@@ -229,7 +230,7 @@ export const BaseAuthPage = ({
 		>
 			<HeaderAuthControls
 				hideLogo
-				py={theme.spacing(4)}
+				py={theme.spacing(LAYOUT.XS)}
 				position={"absolute"}
 				top={0}
 				left={0}
@@ -243,14 +244,14 @@ export const BaseAuthPage = ({
 			<Stack alignItems={"center"}>
 				<Typography
 					variant="h1"
-					mb={theme.spacing(2)}
+					mb={theme.spacing(SPACING.LG)}
 				>
 					{title}
 				</Typography>
 				<Typography variant="h2">{subtitle}</Typography>
 			</Stack>
 			<Stack
-				gap={theme.spacing(8)}
+				gap={theme.spacing(LAYOUT.MD)}
 				width={{
 					xs: "80%",
 					md: "25%",

client/src/Components/design-elements/BulletPointCheck.tsx

@@ -2,6 +2,7 @@ import Stack from "@mui/material/Stack";
 import Typography from "@mui/material/Typography";
 import { Check } from "lucide-react";
 import { useTheme } from "@mui/material/styles";
+import { LAYOUT } from "@/Utils/Theme/constants";
 
 export const BulletPointCheck = ({
 	text,
@@ -21,7 +22,7 @@ export const BulletPointCheck = ({
 	return (
 		<Stack
 			direction="row"
-			gap={theme.spacing(6)}
+			gap={theme.spacing(LAYOUT.SM)}
 			alignItems="center"
 		>
 			<Check

client/src/Components/design-elements/Fallback.tsx

@@ -2,6 +2,7 @@ import Stack from "@mui/material/Stack";
 import Typography from "@mui/material/Typography";
 import { BulletPointCheck, SkeletonCard } from "@/Components/design-elements";
 import { Button } from "@/Components/inputs";
+import { SPACING, LAYOUT } from "@/Utils/Theme/constants";
 
 import { useNavigate } from "react-router";
 import useMediaQuery from "@mui/material/useMediaQuery";
@@ -27,7 +28,7 @@ export const BaseFallback = ({ children, ...props }: BaseFallbackProps) => {
 				lg: "50%",
 				xl: "40%",
 			}}
-			padding={{ xs: theme.spacing(8), md: theme.spacing(16) }}
+			padding={{ xs: theme.spacing(LAYOUT.MD), md: theme.spacing(LAYOUT.XXL) }}
 			bgcolor={theme.palette.background.paper}
 			border={1}
 			borderColor={theme.palette.divider}
@@ -55,7 +56,7 @@ export const ErrorFallback = ({
 		<BaseFallback>
 			<Typography
 				variant="h1"
-				marginY={theme.spacing(4)}
+				marginY={theme.spacing(LAYOUT.XS)}
 				color={theme.palette.text.secondary}
 			>
 				{title}
@@ -81,7 +82,7 @@ export const EmptyFallback = ({
 	return (
 		<BaseFallback>
 			<Stack
-				gap={theme.spacing(10)}
+				gap={theme.spacing(LAYOUT.MD)}
 				zIndex={1}
 				alignItems="center"
 			>
@@ -89,7 +90,7 @@ export const EmptyFallback = ({
 				<Stack
 					sx={{
 						flexWrap: "wrap",
-						gap: theme.spacing(2),
+						gap: theme.spacing(SPACING.MD),
 						maxWidth: "1100px",
 						width: "100%",
 					}}
@@ -134,7 +135,7 @@ export const EmptyMonitorFallback = ({
 	return (
 		<BaseFallback>
 			<Stack
-				gap={theme.spacing(10)}
+				gap={theme.spacing(LAYOUT.MD)}
 				zIndex={1}
 				alignItems="center"
 			>
@@ -147,7 +148,7 @@ export const EmptyMonitorFallback = ({
 				<Stack
 					sx={{
 						flexWrap: "wrap",
-						gap: theme.spacing(2),
+						gap: theme.spacing(SPACING.MD),
 						maxWidth: "1100px",
 						width: "100%",
 					}}

client/src/Components/design-elements/SplitBox.tsx

@@ -3,6 +3,7 @@ import Box from "@mui/material/Box";
 import Typography from "@mui/material/Typography";
 import { useTheme } from "@mui/material/styles";
 import useMediaQuery from "@mui/material/useMediaQuery";
+import { LAYOUT } from "@/Utils/Theme/constants";
 export const SplitBox = ({
 	left,
 	right,
@@ -18,10 +19,10 @@ export const SplitBox = ({
 			bgcolor={theme.palette.background.paper}
 			border={1}
 			borderColor={theme.palette.divider}
-			borderRadius={theme.spacing(2)}
+			borderRadius={theme.shape.borderRadius}
 		>
 			<Box
-				padding={theme.spacing(15)}
+				padding={theme.spacing(LAYOUT.XXL)}
 				borderRight={isSmall ? 0 : 1}
 				borderBottom={isSmall ? 1 : 0}
 				borderColor={theme.palette.divider}
@@ -37,7 +38,7 @@ export const SplitBox = ({
 			</Box>
 			<Box
 				flex={1}
-				padding={theme.spacing(15)}
+				padding={theme.spacing(LAYOUT.XXL)}
 			>
 				{right}
 			</Box>
@@ -60,7 +61,7 @@ export const ConfigBox = ({
 	return (
 		<SplitBox
 			left={
-				<Stack spacing={theme.spacing(4)}>
+				<Stack spacing={theme.spacing(LAYOUT.XS)}>
 					<Typography
 						textTransform={"capitalize"}
 						component="h2"

client/src/Components/design-elements/Table.tsx

@@ -29,6 +29,7 @@ import type { TablePaginationOwnProps } from "@mui/material/TablePagination";
 import { useTranslation } from "react-i18next";
 import { useState, Fragment, useEffect } from "react";
 import { useTheme } from "@mui/material/styles";
+import { SPACING, LAYOUT } from "@/Utils/Theme/constants";
 import type { SxProps, Theme } from "@mui/material/styles";
 import useMediaQuery from "@mui/material/useMediaQuery";
 
@@ -90,20 +91,20 @@ export function DataTable<
 	// Return stack of cards for small screens
 	if (isSmall && cardsOnSmallScreens) {
 		return (
-			<Stack spacing={theme.spacing(4)}>
+			<Stack spacing={theme.spacing(LAYOUT.XS)}>
 				{data.map((row) => {
 					const key = row.id || row._id || Math.random();
 					keys.push(key);
 					return (
 						<Stack
 							onClick={() => (onRowClick ? onRowClick(row) : null)}
-							spacing={theme.spacing(4)}
+							spacing={theme.spacing(LAYOUT.XS)}
 							sx={{
 								borderStyle: "solid",
 								borderWidth: 1,
 								borderColor: theme.palette.divider,
 								borderRadius: theme.shape.borderRadius,
-								padding: theme.spacing(4),
+								padding: theme.spacing(LAYOUT.XS),
 								cursor: onRowClick ? "pointer" : "default",
 							}}
 							key={key}
@@ -155,7 +156,7 @@ export function DataTable<
 			<Table
 				sx={{
 					"&.MuiTable-root  :is(.MuiTableHead-root, .MuiTableBody-root) :is(th, td)": {
-						paddingLeft: theme.spacing(8),
+						paddingLeft: theme.spacing(LAYOUT.MD),
 					},
 					"& .MuiTableCell-root": {
 						borderBottom: `1px solid ${theme.palette.divider}`,
@@ -168,13 +169,13 @@ export function DataTable<
 						color: theme.palette.text.secondary,
 						fontWeight: 500,
 						textTransform: "uppercase",
-						padding: `${theme.spacing(2)} ${theme.spacing(8)}`,
+						padding: `${theme.spacing(SPACING.LG)} ${theme.spacing(LAYOUT.MD)}`,
 						fontSize: theme.typography.fontSize,
 					},
 					"& :is(td)": {
 						backgroundColor: theme.palette.background.paper,
 						color: theme.palette.text.secondary,
-						padding: `${theme.spacing(7)} ${theme.spacing(8)}`,
+						padding: `${theme.spacing(LAYOUT.MD)} ${theme.spacing(LAYOUT.MD)}`,
 						fontSize: theme.typography.fontSize,
 						overflowX: "hidden",
 					},
@@ -514,7 +515,7 @@ export const Pagination = ({ ...props }: PaginationProps) => {
 							display: "grid",
 							gridTemplateColumns: "1fr 1fr",
 							gridAutoRows: "auto",
-							rowGap: theme.spacing(1),
+							rowGap: theme.spacing(SPACING.SM),
 							alignItems: "center",
 							justifyItems: "center",
 							paddingLeft: 0,
@@ -556,8 +557,8 @@ const EmptyView = ({ text, positive }: { text?: string; positive?: boolean }) =>
 			alignItems={"center"}
 			justifyContent={"center"}
 			sx={{
-				py: theme.spacing(12),
-				px: theme.spacing(4),
+				py: theme.spacing(LAYOUT.XL),
+				px: theme.spacing(LAYOUT.XS),
 				borderWidth: 1,
 				borderStyle: "solid",
 				borderColor: theme.palette.divider,
@@ -574,7 +575,7 @@ const EmptyView = ({ text, positive }: { text?: string; positive?: boolean }) =>
 					display: "flex",
 					alignItems: "center",
 					justifyContent: "center",
-					mb: theme.spacing(2),
+					mb: theme.spacing(SPACING.LG),
 				}}
 			>
 				<Icon

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

@@ -5,8 +5,18 @@ import useMediaQuery from "@mui/material/useMediaQuery";
 
 import type { MonitorType } from "@/Types/Monitor";
 import { Typography, useTheme } from "@mui/material";
+import { useTranslation } from "react-i18next";
 
-const types = ["http", "ping", "port", "docker", "game"];
+const types = ["http", "ping", "port", "docker", "game", "grpc", "websocket"];
+const typeDisplayNames: Record<string, string> = {
+	http: "HTTP",
+	ping: "Ping",
+	port: "Port",
+	docker: "Docker",
+	game: "Game",
+	grpc: "gRPC",
+	websocket: "WebSocket",
+};
 const statuses = ["up", "down"];
 const states = ["active", "paused"];
 
@@ -30,6 +40,7 @@ export const ControlsFilter = ({
 	onClearFilters: () => void;
 }) => {
 	const theme = useTheme();
+	const { t } = useTranslation();
 	const isSmall = useMediaQuery(theme.breakpoints.down("md"));
 	const isFilterActive =
 		(selectedTypes?.length ?? 0) > 0 || selectedStatus !== "" || selectedState !== "";
@@ -50,7 +61,7 @@ export const ControlsFilter = ({
 							key={type}
 							value={type}
 						>
-							<Typography textTransform={"capitalize"}>{type}</Typography>
+							<Typography>{typeDisplayNames[type] ?? type}</Typography>
 						</MenuItem>
 					))}
 				</Select>
@@ -88,7 +99,7 @@ export const ControlsFilter = ({
 					variant="contained"
 					onClick={onClearFilters}
 				>
-					Clear Filters
+					{t("common.buttons.clearFilters")}
 				</Button>
 			)}
 		</Stack>

client/src/Components/monitors/GeoChecksMap.tsx

@@ -0,0 +1,203 @@
+import { useRef, useEffect, useState } from "react";
+import { Box, Typography, Stack, useTheme, GlobalStyles } from "@mui/material";
+import Map, { Marker, Popup } from "react-map-gl/maplibre";
+import type { MapRef } from "react-map-gl/maplibre";
+import type { FlatGeoCheck } from "@/Types/GeoCheck";
+import "maplibre-gl/dist/maplibre-gl.css";
+
+interface GeoChecksMapProps {
+	geoChecks: FlatGeoCheck[];
+}
+
+export const GeoChecksMap = ({ geoChecks }: GeoChecksMapProps) => {
+	const mapRef = useRef<MapRef>(null);
+	const [selectedCheck, setSelectedCheck] = useState<FlatGeoCheck | null>(null);
+	const theme = useTheme();
+	const isDarkMode = theme.palette.mode === "dark";
+
+	const mapPopupStyles = (
+		<GlobalStyles
+			styles={{
+				".maplibregl-popup-content": {
+					background: "transparent !important",
+					padding: "0 !important",
+					boxShadow: "none !important",
+				},
+				".maplibregl-popup-tip": {
+					display: "none",
+				},
+				".maplibregl-ctrl-attrib": {
+					display: "none",
+				},
+				".maplibregl-ctrl-logo": {
+					display: "none",
+				},
+				".maplibregl-popup-close-button": {
+					color: theme.palette.text.primary,
+					background: "transparent",
+					fontSize: "20px",
+					padding: "4px",
+					"&:hover": {
+						backgroundColor: theme.palette.action.hover,
+					},
+				},
+			}}
+		/>
+	);
+
+	useEffect(() => {
+		if (geoChecks.length === 0 || !mapRef.current) return;
+
+		const bounds = geoChecks.reduce(
+			(acc, check) => {
+				return {
+					minLng: Math.min(acc.minLng, check.location.longitude),
+					maxLng: Math.max(acc.maxLng, check.location.longitude),
+					minLat: Math.min(acc.minLat, check.location.latitude),
+					maxLat: Math.max(acc.maxLat, check.location.latitude),
+				};
+			},
+			{
+				minLng: Infinity,
+				maxLng: -Infinity,
+				minLat: Infinity,
+				maxLat: -Infinity,
+			}
+		);
+
+		if (bounds.minLng !== Infinity) {
+			mapRef.current.fitBounds(
+				[
+					[bounds.minLng, bounds.minLat],
+					[bounds.maxLng, bounds.maxLat],
+				],
+				{ padding: 50, duration: 1000 }
+			);
+		}
+	}, [geoChecks]);
+
+	const getMarkerColor = (status: boolean): string => {
+		return status ? theme.palette.success.main : theme.palette.error.main;
+	};
+
+	const formatResponseTime = (timing: number): string => {
+		return `${timing.toFixed(0)}ms`;
+	};
+
+	return (
+		<>
+			{mapPopupStyles}
+			<Box
+				height={500}
+				width={"100%"}
+				borderRadius={theme.shape.borderRadius}
+				overflow={"hidden"}
+			>
+				<Map
+					ref={mapRef}
+					initialViewState={{
+						longitude: 0,
+						latitude: 20,
+						zoom: 1.5,
+					}}
+					style={{ height: "100%", width: "100%" }}
+					mapStyle={
+						isDarkMode
+							? "https://basemaps.cartocdn.com/gl/dark-matter-gl-style/style.json"
+							: "https://basemaps.cartocdn.com/gl/positron-gl-style/style.json"
+					}
+				>
+					{geoChecks.map((check, index) => (
+						<Marker
+							key={`${check.id}-${index}`}
+							longitude={check.location.longitude}
+							latitude={check.location.latitude}
+							anchor="bottom"
+							onClick={(e: any) => {
+								e.originalEvent.stopPropagation();
+								setSelectedCheck(check);
+							}}
+						>
+							<div
+								style={{
+									width: "10px",
+									height: "10px",
+									borderRadius: "50%",
+									backgroundColor: getMarkerColor(check.status),
+									boxShadow: "0 2px 4px rgba(0,0,0,0.3)",
+									cursor: "pointer",
+								}}
+							/>
+						</Marker>
+					))}
+
+					{selectedCheck && (
+						<Popup
+							longitude={selectedCheck.location.longitude}
+							latitude={selectedCheck.location.latitude}
+							anchor="top"
+							onClose={() => setSelectedCheck(null)}
+							closeOnClick={false}
+						>
+							<Box
+								sx={{
+									minWidth: 200,
+									p: theme.spacing(4),
+									bgcolor: theme.palette.background.paper,
+									borderWidth: 1,
+									borderStyle: "solid",
+									borderColor: theme.palette.divider,
+									borderRadius: 1,
+								}}
+							>
+								<Typography
+									variant="subtitle1"
+									fontWeight="bold"
+									gutterBottom
+								>
+									{selectedCheck.location.city}, {selectedCheck.location.country}
+								</Typography>
+								<Stack spacing={0.5}>
+									<Typography variant="body2">
+										<Typography
+											component="span"
+											fontWeight="medium"
+										>
+											Status:
+										</Typography>{" "}
+										{selectedCheck.status ? "Up" : "Down"}
+									</Typography>
+									<Typography variant="body2">
+										<Typography
+											component="span"
+											fontWeight="medium"
+										>
+											Status Code:
+										</Typography>{" "}
+										{selectedCheck.statusCode}
+									</Typography>
+									<Typography variant="body2">
+										<Typography
+											component="span"
+											fontWeight="medium"
+										>
+											Response Time:
+										</Typography>{" "}
+										{formatResponseTime(selectedCheck.timings.total)}
+									</Typography>
+									<Typography
+										variant="caption"
+										color="text.secondary"
+										sx={{ mt: 0.5 }}
+									>
+										{new Date(selectedCheck.createdAt).toLocaleString()}
+									</Typography>
+								</Stack>
+							</Box>
+						</Popup>
+					)}
+				</Map>
+			</Box>
+		</>
+	);
+};

client/src/Components/monitors/HeaderGeoTabs.tsx

@@ -0,0 +1,54 @@
+import Stack from "@mui/material/Stack";
+import { Tabs, Tab } from "@/Components/design-elements";
+import { useTheme } from "@mui/material/styles";
+import { useTranslation } from "react-i18next";
+import type { GeoContinent } from "@/Types/GeoCheck";
+
+interface HeaderGeoTabsProps {
+	geoCheckEnabled: boolean;
+	locations: GeoContinent[] | undefined;
+	selectedLocation: GeoContinent;
+	onLocationChange: (location: GeoContinent) => void;
+}
+
+export const HeaderGeoTabs = ({
+	geoCheckEnabled,
+	locations,
+	selectedLocation,
+	onLocationChange,
+}: HeaderGeoTabsProps) => {
+	const { t } = useTranslation();
+	const theme = useTheme();
+
+	if (!geoCheckEnabled || !locations || locations.length === 0) {
+		return null;
+	}
+
+	const handleChange = (_event: React.SyntheticEvent, newValue: GeoContinent) => {
+		onLocationChange(newValue);
+	};
+
+	return (
+		<Stack
+			spacing={{ xs: theme.spacing(8), md: 0 }}
+			direction={{ xs: "column", md: "row" }}
+			alignItems={"center"}
+			justifyContent={"flex-start"}
+		>
+			<Tabs
+				value={selectedLocation}
+				onChange={handleChange}
+			>
+				{locations.map((location) => (
+					<Tab
+						key={location}
+						label={t(
+							`pages.createMonitor.form.geoChecks.option.locations.options.${location}`
+						)}
+						value={location}
+					/>
+				))}
+			</Tabs>
+		</Stack>
+	);
+};

client/src/Components/monitors/charts/HistogramPageSpeedDetailsTooltip.tsx

@@ -2,6 +2,7 @@ import Box from "@mui/material/Box";
 import Stack from "@mui/material/Stack";
 import Typography from "@mui/material/Typography";
 import { useTheme } from "@mui/material/styles";
+import { SPACING, LAYOUT } from "@/Utils/Theme/constants";
 import { formatDateWithTz } from "@/Utils/TimeUtils";
 import type { ConfigItem } from "@/Components/monitors";
 import type { TooltipProps } from "recharts";
@@ -30,8 +31,8 @@ export const HistogramPageSpeedScoresTooltip = ({
 					border: 1,
 					borderColor: theme.palette.divider,
 					borderRadius: theme.shape.borderRadius,
-					py: theme.spacing(2),
-					px: theme.spacing(4),
+					py: theme.spacing(SPACING.LG),
+					px: theme.spacing(LAYOUT.XS),
 				}}
 			>
 				<Typography
@@ -54,12 +55,12 @@ export const HistogramPageSpeedScoresTooltip = ({
 								key={`${key}-tooltip`}
 								direction="row"
 								alignItems="center"
-								gap={theme.spacing(3)}
-								mt={theme.spacing(1)}
+								gap={theme.spacing(SPACING.XXL)}
+								mt={theme.spacing(SPACING.SM)}
 							>
 								<Box
-									width={theme.spacing(4)}
-									height={theme.spacing(4)}
+									width={theme.spacing(LAYOUT.XS)}
+									height={theme.spacing(LAYOUT.XS)}
 									sx={{ borderRadius: "50%", backgroundColor: dotColor }}
 								/>
 								<Typography

client/src/Components/monitors/index.tsx

@@ -1,6 +1,8 @@
 export * from "./ControlsFilter";
 export * from "./MonitorStatBoxes";
 export * from "./HeaderMonitorControls";
+export * from "./HeaderGeoTabs";
+export * from "./GeoChecksMap";
 export * from "./charts/HistogramStatus";
 export * from "./charts/RadialAvgResponse";
 export * from "./charts/HistogramDetails";

client/src/Components/sidebar/Authfooter.tsx

@@ -5,6 +5,7 @@ import IconButton from "@mui/material/IconButton";
 import Menu from "@mui/material/Menu";
 import MenuItem from "@mui/material/MenuItem";
 import { useTheme } from "@mui/material";
+import { SPACING, LAYOUT } from "@/Utils/Theme/constants";
 import { useSelector, useDispatch } from "react-redux";
 import { useTranslation } from "react-i18next";
 import { useState } from "react";
@@ -64,9 +65,9 @@ export const AuthFooter = ({ collapsed, accountMenuItems }: AuthFooterProps) =>
 	});
 
 	const menuItemSx = {
-		gap: theme.spacing(2),
+		gap: theme.spacing(LAYOUT.MD),
 		borderRadius: theme.shape.borderRadius,
-		pl: theme.spacing(4),
+		pl: theme.spacing(LAYOUT.XS),
 		"& svg": { stroke: theme.palette.text.secondary },
 	};
 
@@ -74,9 +75,9 @@ export const AuthFooter = ({ collapsed, accountMenuItems }: AuthFooterProps) =>
 		<Stack
 			direction="row"
 			alignItems="center"
-			py={theme.spacing(4)}
-			px={theme.spacing(8)}
-			gap={theme.spacing(4)}
+			py={theme.spacing(LAYOUT.XS)}
+			px={theme.spacing(LAYOUT.MD)}
+			gap={theme.spacing(LAYOUT.MD)}
 		>
 			<Avatar
 				small
@@ -88,7 +89,7 @@ export const AuthFooter = ({ collapsed, accountMenuItems }: AuthFooterProps) =>
 				<Stack
 					direction="row"
 					alignItems="center"
-					gap={theme.spacing(2)}
+					gap={theme.spacing(SPACING.MD)}
 					minWidth={0}
 					flex={1}
 				>
@@ -132,10 +133,15 @@ export const AuthFooter = ({ collapsed, accountMenuItems }: AuthFooterProps) =>
 				disableScrollLock
 				anchorOrigin={{ vertical: "top", horizontal: "right" }}
 				slotProps={{
-					paper: { sx: { mt: theme.spacing(-4), ml: collapsed ? theme.spacing(2) : 0 } },
+					paper: {
+						sx: {
+							mt: theme.spacing(-LAYOUT.XS),
+							ml: collapsed ? theme.spacing(SPACING.LG) : 0,
+						},
+					},
 				}}
 				MenuListProps={{ sx: { p: 2, "& li": { m: 0 } } }}
-				sx={{ ml: theme.spacing(4) }}
+				sx={{ ml: theme.spacing(LAYOUT.XS) }}
 			>
 				{collapsed && (
 					<Box

client/src/Components/sidebar/StarPrompt.tsx

@@ -1,6 +1,7 @@
 import { Typography, IconButton, Stack, Box } from "@mui/material";
 import { Icon } from "@/Components/design-elements";
 import { X } from "lucide-react";
+import { SPACING, LAYOUT } from "@/Utils/Theme/constants";
 
 import { useTheme } from "@mui/material";
 import { useSelector, useDispatch } from "react-redux";
@@ -34,25 +35,22 @@ export const StarPrompt = ({
 	return (
 		<Stack
 			direction="column"
-			sx={{
-				width: "100%",
-				padding: `${theme.spacing(6)} ${theme.spacing(6)}`,
-				borderTop: `1px solid ${theme.palette.divider}`,
-				borderBottom: `1px solid ${theme.palette.divider}`,
-				borderRadius: 0,
-				gap: theme.spacing(1.5),
-			}}
+			gap={theme.spacing(LAYOUT.MD)}
+			padding={theme.spacing(LAYOUT.SM)}
+			width={"100%"}
+			borderTop={`1px solid ${theme.palette.divider}`}
+			borderBottom={`1px solid ${theme.palette.divider}`}
 		>
 			<Stack
 				direction="row"
 				justifyContent="space-between"
 				alignItems="center"
 				width="100%"
-				pl={theme.spacing(4)}
+				pl={theme.spacing(LAYOUT.XS)}
 			>
 				<Typography
 					variant="subtitle2"
-					mt={theme.spacing(3)}
+					mt={theme.spacing(SPACING.XXL)}
 				>
 					{t("components.sidebar.starPrompt.title")}
 				</Typography>
@@ -78,7 +76,7 @@ export const StarPrompt = ({
 			<Typography
 				sx={{
 					mb: 1,
-					px: theme.spacing(4),
+					px: theme.spacing(LAYOUT.XS),
 				}}
 			>
 				{t("components.sidebar.starPrompt.description")}
@@ -96,7 +94,7 @@ export const StarPrompt = ({
 					"&:hover": {
 						opacity: 0.8,
 					},
-					pl: theme.spacing(4),
+					pl: theme.spacing(LAYOUT.XS),
 					filter: mode === "dark" ? "invert(1)" : "none",
 				}}
 			/>

client/src/Components/sidebar/index.tsx

@@ -3,6 +3,7 @@ import Backdrop from "@mui/material/Backdrop";
 import Stack from "@mui/material/Stack";
 import List from "@mui/material/List";
 import Divider from "@mui/material/Divider";
+import { LAYOUT } from "@/Utils/Theme/constants";
 import { useSidebar } from "@/Hooks/useSidebar.js";
 import { Logo } from "@/Components/sidebar/Logo";
 import { getMenu, getBottomMenu, getAccountMenu } from "@/Components/sidebar/Menu";
@@ -65,9 +66,9 @@ export const Sidebar = () => {
 				left={0}
 				minHeight={"100vh"}
 				maxHeight={"100vh"}
-				paddingTop={theme.spacing(6)}
-				paddingBottom={theme.spacing(6)}
-				gap={theme.spacing(6)}
+				paddingTop={theme.spacing(LAYOUT.SM)}
+				paddingBottom={theme.spacing(LAYOUT.SM)}
+				gap={theme.spacing(LAYOUT.SM)}
 				borderRight={`1px solid ${theme.palette.divider}`}
 				width={width}
 				sx={{
@@ -81,13 +82,13 @@ export const Sidebar = () => {
 					component="nav"
 					disablePadding
 					sx={{
-						px: theme.spacing(6),
+						px: theme.spacing(LAYOUT.SM),
 						flex: 1,
 					}}
 				>
 					<Logo
-						pt={theme.spacing(8)}
-						pb={theme.spacing(10)}
+						pt={theme.spacing(LAYOUT.MD)}
+						pb={theme.spacing(LAYOUT.MD)}
 					/>
 					{menu.map((item) => {
 						const selected = location.pathname.startsWith(`/${item.path}`);
@@ -105,7 +106,7 @@ export const Sidebar = () => {
 				<List
 					component="nav"
 					disablePadding
-					sx={{ px: theme.spacing(6) }}
+					sx={{ px: theme.spacing(LAYOUT.SM) }}
 				>
 					{bottomMenu.map((item) => {
 						const selected = location.pathname.startsWith(`/${item.path}`);

client/src/Hooks/UseApi.ts

@@ -4,6 +4,7 @@ import type { AxiosRequestConfig } from "axios";
 import { get, patch, post, put, deleteOp } from "@/Utils/ApiClient";
 import { useState } from "react";
 import { useToast } from "@/Hooks/UseToast";
+import { logger } from "@/Utils/logger";
 
 interface ApiResponse<T> {
 	success: boolean;
@@ -17,7 +18,7 @@ const fetcher = async <T>(url: string, config?: AxiosRequestConfig) => {
 };
 
 export const useGet = <T>(
-	url: string | null,
+	url: string | null | undefined,
 	axiosConfig?: AxiosRequestConfig,
 	swrConfig?: SWRConfiguration
 ) => {
@@ -61,7 +62,7 @@ export const usePost = <B = any, R = any>() => {
 			return res.data;
 		} catch (err: any) {
 			const errMsg = err?.response?.data?.msg || err.message || "An error occurred";
-			console.error(err);
+			logger.error("POST request failed", err, { endpoint, body });
 			toastError(errMsg);
 			setError(errMsg);
 			return null;
@@ -96,7 +97,7 @@ export const usePatch = <B = any, R = any>() => {
 			toastSuccess(res.data?.msg || "Operation successful");
 			return res.data;
 		} catch (err: any) {
-			console.error(err);
+			logger.error("PATCH request failed", err, { endpoint, body });
 			const errMsg = err?.response?.data?.msg || err.message || "An error occurred";
 			toastError(errMsg);
 			setError(errMsg);
@@ -132,7 +133,7 @@ export const usePut = <B = any, R = any>() => {
 			toastSuccess(res.data?.msg || "Operation successful");
 			return res.data;
 		} catch (err: any) {
-			console.error(err);
+			logger.error("PUT request failed", err, { endpoint, body });
 			const errMsg = err?.response?.data?.msg || err.message || "An error occurred";
 			toastError(errMsg);
 			setError(errMsg);
@@ -167,7 +168,7 @@ export const useDelete = <R = any>() => {
 			toastSuccess(res.data?.msg || "Operation successful");
 			return res.data;
 		} catch (err: any) {
-			console.error(err);
+			logger.error("DELETE request failed", err, { endpoint });
 			const errMsg = err?.response?.data?.message || err.message || "An error occurred";
 			toastError(errMsg);
 			setError(errMsg);
@@ -201,7 +202,7 @@ export const useLazyGet = <R = any>() => {
 			});
 			return res.data;
 		} catch (err: any) {
-			console.error(err);
+			logger.error("GET request failed", err, { endpoint });
 			const errMsg = err?.response?.data?.msg || err.message || "An error occurred";
 			toastError(errMsg);
 			setError(errMsg);

client/src/Hooks/useMonitorForm.ts

@@ -14,7 +14,7 @@ const getBaseDefaults = (data?: Monitor | null) => ({
 	notifications: data?.notifications || [],
 	statusWindowSize: data?.statusWindowSize || 5,
 	statusWindowThreshold: data?.statusWindowThreshold || 60,
-	geoCheckEnabled: data?.geoCheckEnabled || false,
+	geoCheckEnabled: data?.geoCheckEnabled ?? false,
 	geoCheckLocations: data?.geoCheckLocations || [],
 	geoCheckInterval: data?.geoCheckInterval || 300000,
 });
@@ -73,6 +73,16 @@ export const useMonitorForm = ({
 					gameId: data?.gameId || "",
 				};
 				break;
+			case "grpc":
+				defaults = {
+					...base,
+					type: "grpc",
+					url: data?.url || "",
+					port: data?.port || 50051,
+					grpcServiceName: data?.grpcServiceName || "",
+					ignoreTlsErrors: data?.ignoreTlsErrors || false,
+				};
+				break;
 			case "pagespeed":
 				defaults = {
 					...base,
@@ -93,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/Hooks/useSettingsForm.ts

@@ -22,10 +22,22 @@ export const useSettingsForm = ({ data = null }: UseSettingsFormOptions = {}) =>
 			systemEmailTLSServername: data?.systemEmailTLSServername || "",
 			systemEmailPort: data?.systemEmailPort,
 			globalThresholds: {
-				cpu: data?.globalThresholds?.cpu ?? 0,
-				memory: data?.globalThresholds?.memory ?? 0,
-				disk: data?.globalThresholds?.disk ?? 0,
-				temperature: data?.globalThresholds?.temperature ?? 0,
+				cpu:
+					data?.globalThresholds?.cpu && data.globalThresholds.cpu >= 1
+						? data.globalThresholds.cpu
+						: 80,
+				memory:
+					data?.globalThresholds?.memory && data.globalThresholds.memory >= 1
+						? data.globalThresholds.memory
+						: 80,
+				disk:
+					data?.globalThresholds?.disk && data.globalThresholds.disk >= 1
+						? data.globalThresholds.disk
+						: 80,
+				temperature:
+					data?.globalThresholds?.temperature && data.globalThresholds.temperature >= 1
+						? data.globalThresholds.temperature
+						: 80,
 			},
 			checkTTL: data?.checkTTL ?? 30,
 			pagespeedApiKey: "",

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/Checks/Components/ChecksTable.tsx

@@ -5,7 +5,6 @@ import type { Monitor } from "@/Types/Monitor";
 
 import { useTranslation } from "react-i18next";
 import { formatDateWithTz } from "@/Utils/TimeUtils";
-import { useNavigate } from "react-router";
 import type { Check } from "@/Types/Check";
 import type { RootState } from "@/Types/state";
 import { useSelector } from "react-redux";
@@ -29,7 +28,6 @@ export const ChecksTable = ({
 }) => {
 	const { t } = useTranslation();
 	const uiTimezone = useSelector((state: RootState) => state.ui.timezone);
-	const navigate = useNavigate();
 
 	const getHeaders = (t: Function, uiTimezone: string) => {
 		const headers: Header<Check>[] = [
@@ -109,9 +107,6 @@ export const ChecksTable = ({
 			<Table
 				headers={headers}
 				data={checks}
-				onRowClick={(row) => {
-					navigate(`/checks/${row.id}`);
-				}}
 				emptyViewText={t("pages.checks.table.empty")}
 			/>
 			<Pagination

client/src/Pages/CreateMonitor/index.tsx

@@ -1,5 +1,6 @@
 import { useMemo, useState } from "react";
 import { useEffect } from "react";
+import { logger } from "@/Utils/logger";
 import { useParams, useLocation, useNavigate } from "react-router";
 import { useForm, Controller } from "react-hook-form";
 import { zodResolver } from "@hookform/resolvers/zod";
@@ -15,6 +16,7 @@ import Divider from "@mui/material/Divider";
 import IconButton from "@mui/material/IconButton";
 import { Trash2 } from "lucide-react";
 import { HeaderDeleteControls } from "@/Components/monitors";
+import { GeoContinents } from "@/Types/GeoCheck";
 
 import { BasePage, ConfigBox } from "@/Components/design-elements";
 import {
@@ -27,10 +29,15 @@ import {
 	SliderWithLabel,
 	Dialog,
 } from "@/Components/inputs";
+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 { GeoCheckLocations } 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";
 
@@ -42,6 +49,8 @@ interface GeneralSettingsConfig {
 	showPort: boolean;
 	showGameSelect: boolean;
 	showSecret: boolean;
+	showGrpcServiceName: boolean;
+	showIgnoreTls: boolean;
 }
 
 const getGeneralSettingsConfig = (
@@ -57,6 +66,8 @@ const getGeneralSettingsConfig = (
 			showPort: false,
 			showGameSelect: false,
 			showSecret: false,
+			showGrpcServiceName: false,
+			showIgnoreTls: false,
 		},
 		ping: {
 			urlLabel: t("pages.createMonitor.form.general.option.host.label"),
@@ -66,6 +77,8 @@ const getGeneralSettingsConfig = (
 			showPort: false,
 			showGameSelect: false,
 			showSecret: false,
+			showGrpcServiceName: false,
+			showIgnoreTls: false,
 		},
 		docker: {
 			urlLabel: t("pages.createMonitor.form.general.option.container.label"),
@@ -75,6 +88,8 @@ const getGeneralSettingsConfig = (
 			showPort: false,
 			showGameSelect: false,
 			showSecret: false,
+			showGrpcServiceName: false,
+			showIgnoreTls: false,
 		},
 		port: {
 			urlLabel: t("pages.createMonitor.form.general.option.url.label"),
@@ -84,6 +99,8 @@ const getGeneralSettingsConfig = (
 			showPort: true,
 			showGameSelect: false,
 			showSecret: false,
+			showGrpcServiceName: false,
+			showIgnoreTls: false,
 		},
 		game: {
 			urlLabel: t("pages.createMonitor.form.general.option.url.label"),
@@ -93,6 +110,19 @@ const getGeneralSettingsConfig = (
 			showPort: true,
 			showGameSelect: true,
 			showSecret: false,
+			showGrpcServiceName: false,
+			showIgnoreTls: false,
+		},
+		grpc: {
+			urlLabel: t("pages.createMonitor.form.general.option.host.label"),
+			urlPlaceholder: t("pages.createMonitor.form.general.option.host.placeholder"),
+			namePlaceholder: t("pages.createMonitor.form.general.option.name.placeholder"),
+			showUrl: true,
+			showPort: true,
+			showGameSelect: false,
+			showSecret: false,
+			showGrpcServiceName: true,
+			showIgnoreTls: true,
 		},
 		pagespeed: {
 			urlLabel: t("pages.createMonitor.form.general.option.url.label"),
@@ -102,6 +132,8 @@ const getGeneralSettingsConfig = (
 			showPort: false,
 			showGameSelect: false,
 			showSecret: false,
+			showGrpcServiceName: false,
+			showIgnoreTls: false,
 		},
 		hardware: {
 			urlLabel: t("pages.createMonitor.form.general.option.url.label"),
@@ -111,6 +143,19 @@ const getGeneralSettingsConfig = (
 			showPort: false,
 			showGameSelect: false,
 			showSecret: true,
+			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;
@@ -226,7 +271,7 @@ const CreateMonitorPage = () => {
 	};
 
 	const onError = (errors: unknown) => {
-		console.log(errors);
+		logger.debug("Monitor creation validation errors", errors);
 	};
 
 	return (
@@ -253,7 +298,7 @@ const CreateMonitorPage = () => {
 								<FormControl error={!!fieldState.error}>
 									<RadioGroup
 										{...field}
-										sx={{ gap: theme.spacing(6) }}
+										sx={{ gap: theme.spacing(LAYOUT.MD) }}
 									>
 										<RadioWithDescription
 											value="http"
@@ -290,6 +335,20 @@ const CreateMonitorPage = () => {
 												"pages.createMonitor.form.type.optionGameDescription"
 											)}
 										/>
+										<RadioWithDescription
+											value="grpc"
+											label={t("pages.createMonitor.form.type.optionGrpc")}
+											description={t(
+												"pages.createMonitor.form.type.optionGrpcDescription"
+											)}
+										/>
+										<RadioWithDescription
+											value="websocket"
+											label={t("pages.createMonitor.form.type.optionWebSocket")}
+											description={t(
+												"pages.createMonitor.form.type.optionWebSocketDescription"
+											)}
+										/>
 									</RadioGroup>
 								</FormControl>
 							)}
@@ -302,7 +361,7 @@ const CreateMonitorPage = () => {
 				title={t("pages.createMonitor.form.general.title")}
 				subtitle={t(`pages.createMonitor.form.general.description.${watchedType}`)}
 				rightContent={
-					<Stack spacing={theme.spacing(8)}>
+					<Stack spacing={theme.spacing(LAYOUT.MD)}>
 						{/* URL/Host/Container field - not shown for hardware */}
 						{generalSettingsConfig.showUrl && (
 							<Controller
@@ -378,6 +437,30 @@ const CreateMonitorPage = () => {
 							/>
 						)}
 
+						{/* gRPC Service Name field - only for grpc type */}
+						{generalSettingsConfig.showGrpcServiceName && (
+							<Controller
+								name="grpcServiceName"
+								control={control}
+								render={({ field, fieldState }) => (
+									<TextField
+										{...field}
+										value={field.value ?? ""}
+										type="text"
+										fieldLabel={t(
+											"pages.createMonitor.form.general.option.grpcServiceName.label"
+										)}
+										placeholder={t(
+											"pages.createMonitor.form.general.option.grpcServiceName.placeholder"
+										)}
+										fullWidth
+										error={!!fieldState.error}
+										helperText={fieldState.error?.message ?? ""}
+									/>
+								)}
+							/>
+						)}
+
 						{/* Secret field - only for hardware type */}
 						{generalSettingsConfig.showSecret && (
 							<Controller
@@ -497,7 +580,7 @@ const CreateMonitorPage = () => {
 					title={t("pages.createMonitor.form.thresholds.title")}
 					subtitle={t("pages.createMonitor.form.thresholds.description")}
 					rightContent={
-						<Stack spacing={theme.spacing(8)}>
+						<Stack spacing={theme.spacing(LAYOUT.MD)}>
 							<Controller
 								name="cpuAlertThreshold"
 								control={control}
@@ -579,7 +662,7 @@ const CreateMonitorPage = () => {
 				title={t("pages.createMonitor.form.incidents.title")}
 				subtitle={t("pages.createMonitor.form.incidents.description")}
 				rightContent={
-					<Stack spacing={theme.spacing(12)}>
+					<Stack spacing={theme.spacing(LAYOUT.MD)}>
 						<Controller
 							name="statusWindowSize"
 							control={control}
@@ -631,7 +714,7 @@ const CreateMonitorPage = () => {
 								(field.value ?? []).includes(n.id)
 							);
 							return (
-								<Stack spacing={theme.spacing(4)}>
+								<Stack spacing={theme.spacing(LAYOUT.MD)}>
 									<Autocomplete
 										multiple
 										options={notificationOptions}
@@ -682,7 +765,9 @@ const CreateMonitorPage = () => {
 				}
 			/>
 
-			{watchedType === "http" && (
+			{(watchedType === "http" ||
+				watchedType === "grpc" ||
+				watchedType === "websocket") && (
 				<ConfigBox
 					title={t("pages.createMonitor.form.ignoreTls.title")}
 					subtitle={t("pages.createMonitor.form.ignoreTls.description")}
@@ -694,7 +779,7 @@ const CreateMonitorPage = () => {
 								<Stack
 									direction="row"
 									alignItems="center"
-									spacing={theme.spacing(2)}
+									spacing={theme.spacing(SPACING.LG)}
 								>
 									<Switch
 										checked={field.value ?? false}
@@ -715,7 +800,7 @@ const CreateMonitorPage = () => {
 					title={t("pages.createMonitor.form.advanced.title")}
 					subtitle={t("pages.createMonitor.form.advanced.description")}
 					rightContent={
-						<Stack spacing={theme.spacing(8)}>
+						<Stack spacing={theme.spacing(LAYOUT.MD)}>
 							<Controller
 								name="useAdvancedMatching"
 								control={control}
@@ -723,7 +808,7 @@ const CreateMonitorPage = () => {
 									<Stack
 										direction="row"
 										alignItems="center"
-										spacing={theme.spacing(2)}
+										spacing={theme.spacing(SPACING.LG)}
 									>
 										<Switch
 											checked={field.value ?? false}
@@ -738,7 +823,7 @@ const CreateMonitorPage = () => {
 								)}
 							/>
 							{watchedUseAdvancedMatching && (
-								<Stack spacing={theme.spacing(8)}>
+								<Stack spacing={theme.spacing(LAYOUT.MD)}>
 									<Controller
 										name="matchMethod"
 										control={control}
@@ -825,13 +910,12 @@ const CreateMonitorPage = () => {
 				/>
 			)}
 
-			{/* Geo-distributed Checks Configuration */}
-			{watchedType === "http" && (
+			{supportsGeoCheck(watchedType) && (
 				<ConfigBox
 					title={t("pages.createMonitor.form.geoChecks.title")}
 					subtitle={t("pages.createMonitor.form.geoChecks.description")}
 					rightContent={
-						<Stack spacing={theme.spacing(8)}>
+						<Stack spacing={theme.spacing(LAYOUT.MD)}>
 							<Controller
 								name="geoCheckEnabled"
 								control={control}
@@ -839,7 +923,7 @@ const CreateMonitorPage = () => {
 									<Stack
 										direction="row"
 										alignItems="center"
-										spacing={theme.spacing(2)}
+										spacing={theme.spacing(SPACING.LG)}
 									>
 										<Switch
 											checked={field.value ?? false}
@@ -852,34 +936,70 @@ const CreateMonitorPage = () => {
 								)}
 							/>
 							{watchGeoCheckEnabled && (
-								<Stack spacing={theme.spacing(8)}>
+								<Stack spacing={theme.spacing(LAYOUT.MD)}>
 									<Controller
 										name="geoCheckLocations"
 										control={control}
 										render={({ field }) => {
-											const locationOptions = GeoCheckLocations.map((loc) => ({
-												id: loc,
+											// Map continents to have 'name' property for Autocomplete
+											const locationOptions = GeoContinents.map((continent) => ({
+												id: continent,
 												name: t(
-													`pages.createMonitor.form.geoChecks.option.locations.options.${loc}`
+													`pages.createMonitor.form.geoChecks.option.locations.options.${continent}`
 												),
 											}));
 											const selectedLocations = locationOptions.filter((loc) =>
 												(field.value ?? []).includes(loc.id)
 											);
 											return (
-												<Autocomplete
-													multiple={true}
-													options={locationOptions}
-													value={selectedLocations}
-													getOptionLabel={(option) => option.name}
-													onChange={(_, newValue: typeof locationOptions) => {
-														field.onChange(newValue.map((loc) => loc.id));
-													}}
-													isOptionEqualToValue={(option, value) => option.id === value.id}
-													fieldLabel={t(
-														"pages.createMonitor.form.geoChecks.option.locations.label"
+												<Stack spacing={theme.spacing(LAYOUT.MD)}>
+													<Autocomplete
+														multiple
+														options={locationOptions}
+														value={selectedLocations}
+														getOptionLabel={(option) => option.name}
+														onChange={(_: unknown, newValue: typeof locationOptions) => {
+															field.onChange(newValue.map((loc) => loc.id));
+														}}
+														isOptionEqualToValue={(option, value) =>
+															option.id === value.id
+														}
+														fieldLabel={t(
+															"pages.createMonitor.form.geoChecks.option.locations.label"
+														)}
+													/>
+													{selectedLocations.length > 0 && (
+														<Stack
+															flex={1}
+															width="100%"
+														>
+															{selectedLocations.map((location, index) => (
+																<Stack
+																	direction="row"
+																	alignItems="center"
+																	key={location.id}
+																	width="100%"
+																>
+																	<Typography flexGrow={1}>{location.name}</Typography>
+																	<IconButton
+																		size="small"
+																		onClick={() => {
+																			field.onChange(
+																				(field.value ?? []).filter(
+																					(id: string) => id !== location.id
+																				)
+																			);
+																		}}
+																		aria-label="Remove location"
+																	>
+																		<Trash2 size={16} />
+																	</IconButton>
+																	{index < selectedLocations.length - 1 && <Divider />}
+																</Stack>
+															))}
+														</Stack>
 													)}
-												/>
+												</Stack>
 											);
 										}}
 									/>
@@ -888,16 +1008,32 @@ const CreateMonitorPage = () => {
 										control={control}
 										render={({ field }) => (
 											<Select
+												{...field}
 												value={field.value ?? 300000}
-												onChange={(e) => field.onChange(Number(e.target.value))}
 												fieldLabel={t(
 													"pages.createMonitor.form.geoChecks.option.interval.label"
 												)}
 											>
-												<MenuItem value={300000}>5 min</MenuItem>
-												<MenuItem value={600000}>10 min</MenuItem>
-												<MenuItem value={900000}>15 min</MenuItem>
-												<MenuItem value={1800000}>30 min</MenuItem>
+												<MenuItem value={300000}>
+													{t(
+														"pages.createMonitor.form.geoChecks.option.interval.value.fiveMinutes"
+													)}
+												</MenuItem>
+												<MenuItem value={600000}>
+													{t(
+														"pages.createMonitor.form.geoChecks.option.interval.value.tenMinutes"
+													)}
+												</MenuItem>
+												<MenuItem value={900000}>
+													{t(
+														"pages.createMonitor.form.geoChecks.option.interval.value.fifteenMinutes"
+													)}
+												</MenuItem>
+												<MenuItem value={1800000}>
+													{t(
+														"pages.createMonitor.form.geoChecks.option.interval.value.thirtyMinutes"
+													)}
+												</MenuItem>
 											</Select>
 										)}
 									/>

client/src/Pages/Incidents/Components/CardDetails.tsx

@@ -3,6 +3,7 @@ import Grid from "@mui/material/Grid";
 import Divider from "@mui/material/Divider";
 import Typography from "@mui/material/Typography";
 import { BaseBox, ValueLabel } from "@/Components/design-elements";
+import { LAYOUT } from "@/Utils/Theme/constants";
 
 import { useTranslation } from "react-i18next";
 import type { Incident } from "@/Types/Incident";
@@ -29,14 +30,14 @@ export const CardDetails = ({ incident, monitor, sx }: CardDetailsProps) => {
 	}
 	return (
 		<Stack
-			gap={theme.spacing(4)}
+			gap={theme.spacing(LAYOUT.MD)}
 			sx={sx}
 		>
 			<Typography textTransform={"uppercase"}>
 				{t("pages.incidents.dialog.details.title")}
 			</Typography>
-			<BaseBox padding={8}>
-				<Stack gap={theme.spacing(4)}>
+			<BaseBox padding={LAYOUT.MD}>
+				<Stack gap={theme.spacing(LAYOUT.MD)}>
 					<Typography textTransform={"uppercase"}>
 						{t("pages.incidents.dialog.details.overview")}
 					</Typography>
@@ -44,7 +45,7 @@ export const CardDetails = ({ incident, monitor, sx }: CardDetailsProps) => {
 
 					<Grid
 						container
-						spacing={theme.spacing(4)}
+						spacing={theme.spacing(LAYOUT.MD)}
 						alignItems="center"
 					>
 						<Grid size={2}>{t("pages.incidents.dialog.details.status")}</Grid>
@@ -75,15 +76,15 @@ export const CardDetails = ({ incident, monitor, sx }: CardDetailsProps) => {
 					</Grid>
 				</Stack>
 			</BaseBox>
-			<BaseBox padding={8}>
-				<Stack gap={theme.spacing(4)}>
+			<BaseBox padding={LAYOUT.MD}>
+				<Stack gap={theme.spacing(LAYOUT.MD)}>
 					<Typography textTransform={"uppercase"}>
 						{t("pages.incidents.dialog.details.analysis")}
 					</Typography>
 					<Divider />
 					<Grid
 						container
-						spacing={theme.spacing(2)}
+						spacing={theme.spacing(LAYOUT.MD)}
 					>
 						<Grid size={6}>
 							<Typography>{t("pages.incidents.dialog.details.timeline")}</Typography>
@@ -127,15 +128,15 @@ export const CardDetails = ({ incident, monitor, sx }: CardDetailsProps) => {
 				</Stack>
 			</BaseBox>
 			{!incident.status && (
-				<BaseBox padding={8}>
-					<Stack gap={theme.spacing(4)}>
+				<BaseBox padding={LAYOUT.MD}>
+					<Stack gap={theme.spacing(LAYOUT.XS)}>
 						<Typography textTransform={"uppercase"}>
 							{t("pages.incidents.dialog.details.resolutionDetails")}
 						</Typography>
 						<Divider />
 						<Grid
 							container
-							spacing={theme.spacing(2)}
+							spacing={theme.spacing(LAYOUT.MD)}
 							alignItems="center"
 						>
 							<Grid size={2}>

client/src/Pages/Logs/index.tsx

@@ -8,7 +8,7 @@ import { useTranslation } from "react-i18next";
 
 const LogsPage = () => {
 	const { t } = useTranslation();
-	const [activeTab, setActiveTab] = useState<number>(2);
+	const [activeTab, setActiveTab] = useState<number>(1);
 	return (
 		<BasePage>
 			<Tabs

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

@@ -1,7 +1,9 @@
 import Stack from "@mui/material/Stack";
 import MenuItem from "@mui/material/MenuItem";
+import { logger } from "@/Utils/logger";
 import Typography from "@mui/material/Typography";
 import IconButton from "@mui/material/IconButton";
+import { SPACING, LAYOUT } from "@/Utils/Theme/constants";
 import { BasePage, ConfigBox } from "@/Components/design-elements";
 import {
 	TextField,
@@ -108,7 +110,7 @@ const CreateMaintenanceWindowPage = () => {
 	const isLoading = isPosting || isPatching;
 
 	const onError = (errors: any) => {
-		console.error("Form submission errors:", errors);
+		logger.error("Maintenance form submission failed", undefined, { errors });
 	};
 
 	return (
@@ -120,7 +122,7 @@ const CreateMaintenanceWindowPage = () => {
 				title={t("pages.maintenanceWindow.form.general.title")}
 				subtitle={t("pages.maintenanceWindow.form.general.description")}
 				rightContent={
-					<Stack spacing={theme.spacing(8)}>
+					<Stack spacing={theme.spacing(LAYOUT.MD)}>
 						<Controller
 							name="name"
 							control={control}
@@ -170,7 +172,7 @@ const CreateMaintenanceWindowPage = () => {
 				title={t("pages.maintenanceWindow.form.startDate.title")}
 				subtitle={t("pages.maintenanceWindow.form.startDate.description")}
 				rightContent={
-					<Stack spacing={theme.spacing(8)}>
+					<Stack spacing={theme.spacing(LAYOUT.MD)}>
 						<Controller
 							name="startDate"
 							control={control}
@@ -197,7 +199,7 @@ const CreateMaintenanceWindowPage = () => {
 				title={t("pages.maintenanceWindow.form.startTime.title")}
 				subtitle={t("pages.maintenanceWindow.form.startTime.description")}
 				rightContent={
-					<Stack spacing={theme.spacing(8)}>
+					<Stack spacing={theme.spacing(LAYOUT.MD)}>
 						<Controller
 							name="startTime"
 							control={control}
@@ -218,7 +220,7 @@ const CreateMaintenanceWindowPage = () => {
 						<Stack
 							direction="row"
 							alignItems="flex-start"
-							spacing={theme.spacing(4)}
+							spacing={theme.spacing(LAYOUT.MD)}
 						>
 							<Controller
 								name="duration"
@@ -283,7 +285,7 @@ const CreateMaintenanceWindowPage = () => {
 								.filter((m): m is Monitor => m !== undefined);
 
 							return (
-								<Stack spacing={theme.spacing(4)}>
+								<Stack spacing={theme.spacing(LAYOUT.MD)}>
 									<Autocomplete
 										multiple
 										options={monitorsList}
@@ -317,9 +319,8 @@ const CreateMaintenanceWindowPage = () => {
 													key={monitor.id}
 													direction="row"
 													alignItems="center"
-													spacing={theme.spacing(4)}
-													padding={theme.spacing(4)}
-													marginTop={theme.spacing(2)}
+													padding={theme.spacing(LAYOUT.XS)}
+													marginTop={theme.spacing(SPACING.LG)}
 													borderRadius={1}
 													sx={{
 														border: `1px solid ${theme.palette.divider}`,
@@ -350,7 +351,7 @@ const CreateMaintenanceWindowPage = () => {
 			<Stack
 				direction="row"
 				justifyContent="flex-end"
-				spacing={theme.spacing(2)}
+				spacing={theme.spacing(SPACING.LG)}
 			>
 				<Button
 					loading={isLoading}

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

@@ -8,7 +8,7 @@ import { PageSpeedMonitorsTable } from "@/Pages/PageSpeed/Monitors/Components/Pa
 import type { Monitor } from "@/Types/Monitor";
 
 import { useTranslation } from "react-i18next";
-import { useState } from "react";
+import { useMemo, useState } from "react";
 import { useIsAdmin } from "@/Hooks/useIsAdmin";
 import { useGet, useDelete } from "@/Hooks/UseApi";
 import type { MonitorsWithChecksResponse } from "@/Types/Monitor";
@@ -20,14 +20,6 @@ const PageSpeedMonitorsPage = () => {
 	const isAdmin = useIsAdmin();
 	const { deleteFn, loading: isDeleting } = useDelete();
 
-	const monitorsUrl = "/monitors/team/with-checks?type=pagespeed&limit=10";
-	const {
-		data: monitorsData,
-		isLoading: monitorsIsLoading,
-		error: monitorsError,
-		refetch,
-	} = useGet<MonitorsWithChecksResponse>(monitorsUrl, {}, { refreshInterval: 30000 });
-
 	const settingsUrl = "/settings";
 	const {
 		data: settingsData,
@@ -42,6 +34,28 @@ const PageSpeedMonitorsPage = () => {
 	const [page, setPage] = useState(0);
 	const [rowsPerPage, setRowsPerPage] = useState(10);
 
+	const monitorsWithChecksUrl = useMemo(() => {
+		const params = new URLSearchParams();
+		params.append("type", "pagespeed");
+		params.append("limit", "25");
+		if (page !== undefined) params.append("page", String(page));
+		if (rowsPerPage) params.append("rowsPerPage", String(rowsPerPage));
+		if (sortField) params.append("field", sortField);
+		if (sortOrder) params.append("order", sortOrder);
+		return `/monitors/team/with-checks?${params.toString()}`;
+	}, [page, rowsPerPage, sortField, sortOrder]);
+
+	const {
+		data: monitorsData,
+		isLoading: monitorsIsLoading,
+		error: monitorsError,
+		refetch,
+	} = useGet<MonitorsWithChecksResponse>(
+		monitorsWithChecksUrl,
+		{},
+		{ refreshInterval: 30000 }
+	);
+
 	const monitors = monitorsData?.monitors;
 	const monitorsCount = monitorsData?.count ?? 0;
 	const summary = monitorsData?.summary ?? null;

client/src/Pages/Settings/index.tsx

@@ -1,6 +1,15 @@
 import { BasePage, ConfigBox, TextLink } from "@/Components/design-elements";
 import { Autocomplete, Select, Dialog, SwitchComponent } from "@/Components/inputs";
-import { Stack, useTheme, MenuItem, Link, type SelectChangeEvent } from "@mui/material";
+import { logger } from "@/Utils/logger";
+import { LAYOUT } from "@/Utils/Theme/constants";
+import {
+	Stack,
+	useTheme,
+	MenuItem,
+	Link,
+	Alert,
+	type SelectChangeEvent,
+} from "@mui/material";
 import { useEffect } from "react";
 import { useForm } from "react-hook-form";
 import { zodResolver } from "@hookform/resolvers/zod";
@@ -14,7 +23,7 @@ import { useIsAdmin } from "@/Hooks/useIsAdmin.js";
 import type { SettingsFormData } from "@/Validation/settings";
 import { useState } from "react";
 import { Controller } from "react-hook-form";
-import { TextField, Button, FieldLabel } from "@/Components/inputs";
+import { TextField, Button, FieldLabel, SliderWithLabel } from "@/Components/inputs";
 import { Box, Typography } from "@mui/material";
 import { useDelete } from "@/Hooks/UseApi";
 
@@ -257,8 +266,7 @@ export const SettingsPage = () => {
 				(acc as any)[typedKey] = Object.entries(value).reduce(
 					(nested, [nestedKey, nestedValue]) => ({
 						...nested,
-						[nestedKey]:
-							nestedValue === undefined || nestedValue === 0 ? "" : nestedValue,
+						[nestedKey]: nestedValue === undefined ? "" : nestedValue,
 					}),
 					{}
 				);
@@ -282,7 +290,7 @@ export const SettingsPage = () => {
 	};
 
 	const onError = (errors: unknown) => {
-		console.log("Form validation errors:", errors);
+		logger.debug("Form validation errors", errors);
 	};
 
 	const languages = Object.keys(i18n.options.resources || {});
@@ -292,7 +300,7 @@ export const SettingsPage = () => {
 			component="form"
 			onSubmit={form.handleSubmit(onSubmit, onError)}
 		>
-			<Stack gap={theme.spacing(8)}>
+			<Stack gap={theme.spacing(LAYOUT.MD)}>
 				<ConfigBox
 					title={t("pages.settings.form.timezone.title")}
 					subtitle={t("pages.settings.form.timezone.description")}
@@ -315,7 +323,7 @@ export const SettingsPage = () => {
 					title={t("pages.settings.form.ui.title")}
 					subtitle={t("pages.settings.form.ui.description")}
 					rightContent={
-						<Stack gap={theme.spacing(8)}>
+						<Stack gap={theme.spacing(LAYOUT.MD)}>
 							<Select
 								value={mode}
 								onChange={handleModeChange}
@@ -465,24 +473,16 @@ export const SettingsPage = () => {
 									name="globalThresholds.cpu"
 									control={form.control}
 									defaultValue={defaults.globalThresholds?.cpu}
-									render={({ field, fieldState }) => (
-										<TextField
+									render={({ field }) => (
+										<SliderWithLabel
 											{...field}
-											value={
-												field.value === undefined || field.value === 0 ? "" : field.value
-											}
-											onChange={(e) => {
-												const val = e.target.value;
-												field.onChange(val === "" ? 0 : Number(val));
-											}}
 											fieldLabel={t("pages.settings.form.thresholds.option.cpu.label")}
-											type="number"
-											inputProps={{ min: 0 }}
-											placeholder={t(
-												"pages.settings.form.thresholds.option.cpu.placeholder"
-											)}
-											error={!!fieldState.error}
-											helperText={fieldState.error?.message}
+											min={1}
+											max={100}
+											sliderMaxWidth={{ xs: "100%", md: "50%" }}
+											value={field.value || 1}
+											onChange={(_, value) => field.onChange(value)}
+											valueLabelDisplay="auto"
 										/>
 									)}
 								/>
@@ -490,24 +490,16 @@ export const SettingsPage = () => {
 									name="globalThresholds.memory"
 									control={form.control}
 									defaultValue={defaults.globalThresholds?.memory}
-									render={({ field, fieldState }) => (
-										<TextField
+									render={({ field }) => (
+										<SliderWithLabel
 											{...field}
-											value={
-												field.value === undefined || field.value === 0 ? "" : field.value
-											}
-											onChange={(e) => {
-												const val = e.target.value;
-												field.onChange(val === "" ? 0 : Number(val));
-											}}
 											fieldLabel={t("pages.settings.form.thresholds.option.memory.label")}
-											type="number"
-											inputProps={{ min: 0 }}
-											placeholder={t(
-												"pages.settings.form.thresholds.option.memory.placeholder"
-											)}
-											error={!!fieldState.error}
-											helperText={fieldState.error?.message}
+											min={1}
+											max={100}
+											sliderMaxWidth={{ xs: "100%", md: "50%" }}
+											value={field.value || 1}
+											onChange={(_, value) => field.onChange(value)}
+											valueLabelDisplay="auto"
 										/>
 									)}
 								/>
@@ -515,24 +507,16 @@ export const SettingsPage = () => {
 									name="globalThresholds.disk"
 									control={form.control}
 									defaultValue={defaults.globalThresholds?.disk}
-									render={({ field, fieldState }) => (
-										<TextField
+									render={({ field }) => (
+										<SliderWithLabel
 											{...field}
-											value={
-												field.value === undefined || field.value === 0 ? "" : field.value
-											}
-											onChange={(e) => {
-												const val = e.target.value;
-												field.onChange(val === "" ? 0 : Number(val));
-											}}
 											fieldLabel={t("pages.settings.form.thresholds.option.disk.label")}
-											type="number"
-											inputProps={{ min: 0 }}
-											placeholder={t(
-												"pages.settings.form.thresholds.option.disk.placeholder"
-											)}
-											error={!!fieldState.error}
-											helperText={fieldState.error?.message}
+											min={1}
+											max={100}
+											sliderMaxWidth={{ xs: "100%", md: "50%" }}
+											value={field.value || 1}
+											onChange={(_, value) => field.onChange(value)}
+											valueLabelDisplay="auto"
 										/>
 									)}
 								/>
@@ -540,26 +524,18 @@ export const SettingsPage = () => {
 									name="globalThresholds.temperature"
 									control={form.control}
 									defaultValue={defaults.globalThresholds?.temperature}
-									render={({ field, fieldState }) => (
-										<TextField
+									render={({ field }) => (
+										<SliderWithLabel
 											{...field}
-											value={
-												field.value === undefined || field.value === 0 ? "" : field.value
-											}
-											onChange={(e) => {
-												const val = e.target.value;
-												field.onChange(val === "" ? 0 : Number(val));
-											}}
 											fieldLabel={t(
 												"pages.settings.form.thresholds.option.temperature.label"
 											)}
-											type="number"
-											inputProps={{ min: 0 }}
-											placeholder={t(
-												"pages.settings.form.thresholds.option.temperature.placeholder"
-											)}
-											error={!!fieldState.error}
-											helperText={fieldState.error?.message}
+											min={1}
+											max={150}
+											sliderMaxWidth={{ xs: "100%", md: "50%" }}
+											value={field.value || 1}
+											onChange={(_, value) => field.onChange(value)}
+											valueLabelDisplay="auto"
 										/>
 									)}
 								/>
@@ -575,7 +551,7 @@ export const SettingsPage = () => {
 					title={t("pages.settings.form.email.title")}
 					subtitle={t("pages.settings.form.email.description")}
 					leftContent={
-						<Stack gap={theme.spacing(8)}>
+						<Stack gap={theme.spacing(LAYOUT.MD)}>
 							<TextLink
 								text={t("pages.settings.form.email.descriptionTransport")}
 								linkText={t("pages.settings.form.email.descriptionTransportLink")}
@@ -623,7 +599,7 @@ export const SettingsPage = () => {
 						</Stack>
 					}
 					rightContent={
-						<Stack gap={theme.spacing(10)}>
+						<Stack gap={theme.spacing(LAYOUT.MD)}>
 							{/* Email Host */}
 							<Controller
 								name="systemEmailHost"
@@ -710,7 +686,7 @@ export const SettingsPage = () => {
 									<Stack
 										direction="row"
 										alignItems="center"
-										gap={theme.spacing(4)}
+										gap={theme.spacing(LAYOUT.XS)}
 									>
 										<Button
 											variant="contained"
@@ -785,7 +761,7 @@ export const SettingsPage = () => {
 								sx={{
 									display: "flex",
 									flexDirection: "column",
-									gap: theme.spacing(4),
+									gap: theme.spacing(LAYOUT.XS),
 								}}
 							>
 								{[
@@ -904,7 +880,7 @@ export const SettingsPage = () => {
 					subtitle={t("pages.settings.form.importExportMonitors.description")}
 					rightContent={
 						<Stack
-							gap={theme.spacing(4)}
+							gap={theme.spacing(LAYOUT.MD)}
 							direction={"row"}
 						>
 							<input
@@ -990,13 +966,46 @@ export const SettingsPage = () => {
 					bottom: 0,
 					backgroundColor: theme.palette.background.paper,
 					borderTop: `1px solid ${theme.palette.divider}`,
-					padding: theme.spacing(8),
-					marginLeft: theme.spacing(-8),
-					marginRight: theme.spacing(-8),
-					marginBottom: theme.spacing(-8),
+					padding: theme.spacing(LAYOUT.MD),
+					marginLeft: theme.spacing(-LAYOUT.MD),
+					marginRight: theme.spacing(-LAYOUT.MD),
+					marginBottom: theme.spacing(-LAYOUT.MD),
 					zIndex: 1000,
 				}}
 			>
+				{/* Validation Error Display */}
+				{Object.keys(form.formState.errors).length > 0 && (
+					<Alert
+						severity="error"
+						sx={{ mb: 2, flexGrow: 1, mr: 2 }}
+					>
+						<Typography
+							variant="body2"
+							sx={{ fontWeight: 600, mb: 1 }}
+						>
+							{t("pages.settings.form.validation.errorMessage")}
+						</Typography>
+						<Box
+							component="ul"
+							sx={{ m: 0, pl: 2 }}
+						>
+							{Object.entries(form.formState.errors).map(([field, error]) => {
+								const message =
+									typeof error === "object" && error?.message
+										? error.message
+										: "Invalid value";
+								return (
+									<li key={field}>
+										<Typography variant="body2">
+											<strong>{field}:</strong> {message}
+										</Typography>
+									</li>
+								);
+							})}
+						</Box>
+					</Alert>
+				)}
+
 				<Button
 					loading={isSaving}
 					type="submit"

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

@@ -1,5 +1,7 @@
 import { BasePage, ConfigBox } from "@/Components/design-elements";
 import Stack from "@mui/material/Stack";
+import { logger } from "@/Utils/logger";
+import { SPACING, LAYOUT } from "@/Utils/Theme/constants";
 import Typography from "@mui/material/Typography";
 import IconButton from "@mui/material/IconButton";
 import FormControlLabel from "@mui/material/FormControlLabel";
@@ -80,7 +82,7 @@ const CreateStatusPage = () => {
 	}, [defaults, reset]);
 
 	const onError = (errors: any) => {
-		console.log(errors);
+		logger.debug("Status page validation errors", errors);
 	};
 
 	const handleDeleteClick = () => {
@@ -128,7 +130,7 @@ const CreateStatusPage = () => {
 					fd.append("logo", imageResult.data);
 					URL.revokeObjectURL(data.logo.data);
 				} catch (e) {
-					console.error("Error fetching logo blob:", e);
+					logger.error("Failed to fetch logo blob", e instanceof Error ? e : undefined);
 				}
 			}
 		}
@@ -165,7 +167,7 @@ const CreateStatusPage = () => {
 					<Stack
 						direction="row"
 						alignItems="center"
-						spacing={theme.spacing(2)}
+						spacing={theme.spacing(SPACING.MD)}
 					>
 						<Controller
 							name="isPublished"
@@ -187,7 +189,7 @@ const CreateStatusPage = () => {
 				title={t("pages.statusPages.form.basicInfo.title")}
 				subtitle={t("pages.statusPages.form.basicInfo.description")}
 				rightContent={
-					<Stack spacing={theme.spacing(6)}>
+					<Stack spacing={theme.spacing(LAYOUT.MD)}>
 						<Controller
 							name="companyName"
 							control={control}
@@ -242,7 +244,7 @@ const CreateStatusPage = () => {
 							};
 
 							return (
-								<Stack spacing={theme.spacing(4)}>
+								<Stack spacing={theme.spacing(LAYOUT.MD)}>
 									<Autocomplete
 										multiple
 										options={monitors}
@@ -290,9 +292,9 @@ const CreateStatusPage = () => {
 																		{...provided.dragHandleProps}
 																		direction="row"
 																		alignItems="center"
-																		spacing={theme.spacing(4)}
-																		padding={theme.spacing(4)}
-																		marginTop={theme.spacing(2)}
+																		spacing={theme.spacing(LAYOUT.XS)}
+																		padding={theme.spacing(LAYOUT.XS)}
+																		marginTop={theme.spacing(SPACING.LG)}
 																		borderRadius={1}
 																		sx={{
 																			border: `1px solid ${theme.palette.divider}`,
@@ -366,7 +368,7 @@ const CreateStatusPage = () => {
 				title={t("pages.statusPages.form.appearance.title")}
 				subtitle={t("pages.statusPages.form.appearance.description")}
 				rightContent={
-					<Stack spacing={theme.spacing(8)}>
+					<Stack spacing={theme.spacing(LAYOUT.MD)}>
 						<Stack alignItems={"center"}>
 							<Controller
 								name="logo"
@@ -407,7 +409,7 @@ const CreateStatusPage = () => {
 				title={t("pages.statusPages.form.features.title")}
 				subtitle={t("pages.statusPages.form.features.description")}
 				rightContent={
-					<Stack spacing={theme.spacing(2)}>
+					<Stack spacing={theme.spacing(LAYOUT.MD)}>
 						<Controller
 							name="showCharts"
 							control={control}

client/src/Pages/Uptime/Details/Components/ChecksTable.tsx

@@ -20,7 +20,7 @@ const getHeaders = (t: Function, uiTimezone: string) => {
 		},
 		{
 			id: "date",
-			content: t("pages.checks.table.headers.dateTime"),
+			content: t("common.table.headers.dateTime"),
 			render: (row) => {
 				return formatDateWithTz(row.createdAt, "ddd, MMMM D, YYYY, HH:mm A", uiTimezone);
 			},

client/src/Pages/Uptime/Details/Components/GeoChecksTable.tsx

@@ -0,0 +1,107 @@
+import { Table, Pagination, StatusLabel } from "@/Components/design-elements";
+import Box from "@mui/material/Box";
+import type { Header } from "@/Components/design-elements";
+import type { FlatGeoCheck } from "@/Types/GeoCheck";
+import { useTranslation } from "react-i18next";
+import { formatDateWithTz } from "@/Utils/TimeUtils";
+import type { RootState } from "@/Types/state";
+import { useSelector } from "react-redux";
+import prettyMilliseconds from "pretty-ms";
+
+const getHeaders = (t: Function, uiTimezone: string) => {
+	const headers: Header<FlatGeoCheck>[] = [
+		{
+			id: "status",
+			content: t("common.table.headers.status"),
+			render: (row) => {
+				const status = row.status ? "up" : "down";
+				return <StatusLabel status={status} />;
+			},
+		},
+		{
+			id: "date",
+			content: t("common.table.headers.dateTime"),
+			render: (row) => {
+				return formatDateWithTz(row.createdAt, "ddd, MMMM D, YYYY, HH:mm A", uiTimezone);
+			},
+		},
+		{
+			id: "statusCode",
+			content: t("pages.checks.table.headers.statusCode"),
+			render: (row) => {
+				return row.statusCode || "N/A";
+			},
+		},
+		{
+			id: "location",
+			content: t("pages.checks.table.headers.location"),
+			render: (row) => {
+				const location = row.location;
+				if (!location) return "N/A";
+				const { continent, country, city } = location;
+				return `${continent} - ${country}, ${city}`;
+			},
+		},
+		{
+			id: "responseTime",
+			content: t("common.table.headers.responseTime"),
+			render: (row) => {
+				if (!row.timings?.total) return "N/A";
+				return prettyMilliseconds(row.timings.total, { compact: true });
+			},
+		},
+	];
+	return headers;
+};
+
+export const GeoChecksTable = ({
+	geoChecks,
+	count,
+	page,
+	setPage,
+	rowsPerPage,
+	setRowsPerPage,
+}: {
+	geoChecks: FlatGeoCheck[];
+	count: number;
+	page: number;
+	setPage: (page: number) => void;
+	rowsPerPage: number;
+	setRowsPerPage: (rowsPerPage: number) => void;
+}) => {
+	const { t } = useTranslation();
+	const uiTimezone = useSelector((state: RootState) => state.ui.timezone);
+	const headers = getHeaders(t, uiTimezone);
+
+	const handlePageChange = (
+		_e: React.MouseEvent<HTMLButtonElement> | null,
+		newPage: number
+	) => {
+		setPage(newPage);
+	};
+
+	const handleRowsPerPageChange = (
+		e: React.ChangeEvent<HTMLTextAreaElement | HTMLInputElement>
+	) => {
+		const value = Number(e.target.value);
+		setPage(0);
+		setRowsPerPage(value);
+	};
+
+	return (
+		<Box>
+			<Table
+				headers={headers}
+				data={geoChecks}
+			/>
+			<Pagination
+				component="div"
+				count={count}
+				page={page}
+				rowsPerPage={rowsPerPage}
+				onPageChange={handlePageChange}
+				onRowsPerPageChange={handleRowsPerPageChange}
+			/>
+		</Box>
+	);
+};

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

@@ -6,9 +6,12 @@ import {
 	RadialAvgResponse,
 	HistogramDetails,
 	HeaderMonitorControls,
+	HeaderGeoTabs,
+	GeoChecksMap,
 } from "@/Components/monitors";
 import { TrendingUp, AlertTriangle } from "lucide-react";
 import { ChecksTable } from "@/Pages/Uptime/Details/Components/ChecksTable";
+import { GeoChecksTable } from "@/Pages/Uptime/Details/Components/GeoChecksTable";
 import { MonitorStatBoxes } from "@/Components/monitors";
 
 import { useTheme } from "@mui/material/styles";
@@ -17,11 +20,17 @@ 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,
+	FlatGeoChecksResponse,
+	GeoContinent,
+} from "@/Types/GeoCheck";
 import type { RootState } from "@/Types/state";
 import { formatDateWithTz } from "@/Utils/TimeUtils";
 import { t } from "i18next";
+import { Typography } from "@mui/material";
 
 const certificateDateFormat = "MMM D, YYYY h A";
 
@@ -37,7 +46,10 @@ const UptimeDetailsPage = () => {
 
 	const [page, setPage] = useState<number>(0);
 	const [rowsPerPage, setRowsPerPage] = useState<number>(5);
+	const [geoPage, setGeoPage] = useState<number>(0);
+	const [geoRowsPerPage, setGeoRowsPerPage] = useState<number>(5);
 	const [dateRange, setDateRange] = useState<string>("recent");
+	const [selectedLocation, setSelectedLocation] = useState<GeoContinent>("NA");
 
 	const monitorDetailsUrl = useMemo(() => {
 		if (!monitorId) {
@@ -56,7 +68,7 @@ const UptimeDetailsPage = () => {
 	} = useGet<MonitorDetailsResponse>(
 		monitorDetailsUrl,
 		{},
-		{ refreshInterval: 10000, keepPreviousData: true }
+		{ refreshInterval: 10000, keepPreviousData: true, revalidateOnFocus: false }
 	);
 
 	const monitorData = monitorDetailsData?.monitorData;
@@ -71,7 +83,11 @@ const UptimeDetailsPage = () => {
 		return `/monitors/certificate/${monitorId}`;
 	}, [monitorId, monitor?.type]);
 
-	const { data: certificateData } = useGet<CertificateResponse>(certificateUrl);
+	const { data: certificateData } = useGet<CertificateResponse>(
+		certificateUrl,
+		{},
+		{ revalidateOnFocus: false }
+	);
 
 	const certificateExpiry = useMemo(() => {
 		if (!certificateData?.certificateDate) {
@@ -102,9 +118,58 @@ const UptimeDetailsPage = () => {
 	const { data: checksData, isLoading: checksIsLoading } = useGet<ChecksResponse>(
 		checksUrl,
 		{},
-		{ keepPreviousData: true }
+		{ keepPreviousData: true, revalidateOnFocus: false }
 	);
 
+	const geoChecksUrl = useMemo(() => {
+		if (!monitorId || !supportsGeoCheck(monitor?.type) || !monitor?.geoCheckEnabled) {
+			return null;
+		}
+		const params = new URLSearchParams();
+		params.append("dateRange", dateRange);
+		params.append("continent", selectedLocation);
+		return `/monitors/${monitorId}/geo-checks?${params.toString()}`;
+	}, [monitorId, monitor?.type, monitor?.geoCheckEnabled, dateRange, selectedLocation]);
+
+	const { data: geoGroupedData } = useGet<GeoChecksResult>(
+		geoChecksUrl,
+		{},
+		{ keepPreviousData: true, revalidateOnFocus: false }
+	);
+
+	const geoGroupedChecks = geoGroupedData?.groupedGeoChecks ?? [];
+
+	// Fetch paginated geo checks for the table
+	const geoChecksTableUrl = useMemo(() => {
+		if (!monitorId || !supportsGeoCheck(monitor?.type) || !monitor?.geoCheckEnabled) {
+			return null;
+		}
+		const params = new URLSearchParams();
+		params.append("sortOrder", "desc");
+		params.append("dateRange", dateRange);
+		params.append("page", String(geoPage));
+		params.append("rowsPerPage", String(geoRowsPerPage));
+		return `/geo-checks/${monitorId}?${params.toString()}`;
+	}, [
+		monitorId,
+		monitor?.type,
+		monitor?.geoCheckEnabled,
+		dateRange,
+		geoPage,
+		geoRowsPerPage,
+	]);
+
+	const { data: geoChecksTableData } = useGet<FlatGeoChecksResponse>(
+		geoChecksTableUrl,
+		{},
+		{ keepPreviousData: true, revalidateOnFocus: false }
+	);
+
+	const geoChecksForTable = geoChecksTableData?.geoChecks ?? [];
+	const geoChecksCount = geoChecksTableData?.geoChecksCount ?? 0;
+
+	const geoLocations = monitor?.geoCheckLocations;
+
 	const checks = checksData?.checks ?? [];
 	const checksCount = checksData?.checksCount ?? 0;
 
@@ -127,6 +192,7 @@ const UptimeDetailsPage = () => {
 				dateRange={dateRange}
 				setDateRange={setDateRange}
 			/>
+
 			<Stack
 				direction={{ xs: "column", md: "row" }}
 				gap={theme.spacing(8)}
@@ -160,6 +226,31 @@ const UptimeDetailsPage = () => {
 				rowsPerPage={rowsPerPage}
 				setRowsPerPage={setRowsPerPage}
 			/>
+
+			{monitor?.geoCheckEnabled && (
+				<>
+					<Typography variant="h1">Location breakdown</Typography>
+					<HeaderGeoTabs
+						geoCheckEnabled={monitor?.geoCheckEnabled ?? false}
+						locations={geoLocations}
+						selectedLocation={selectedLocation}
+						onLocationChange={setSelectedLocation}
+					/>
+					<HistogramDetails
+						checks={geoGroupedChecks}
+						range={dateRange}
+					/>
+					<GeoChecksTable
+						geoChecks={geoChecksForTable}
+						count={geoChecksCount}
+						page={geoPage}
+						setPage={setGeoPage}
+						rowsPerPage={geoRowsPerPage}
+						setRowsPerPage={setGeoRowsPerPage}
+					/>
+					<GeoChecksMap geoChecks={geoChecksForTable} />
+				</>
+			)}
 		</BasePage>
 	);
 };

client/src/Pages/Uptime/Monitors/Components/UptimeMonitorsTable.tsx

@@ -181,6 +181,7 @@ export const MonitorTable = ({
 						onClick={(e) => handleSort(e, "status")}
 						sx={{ cursor: "pointer" }}
 					>
+						<Box width={theme.spacing(8)} />
 						{t("common.table.headers.status")}
 						{renderSortIcon(sortField === "status")}
 					</Stack>
@@ -211,6 +212,7 @@ export const MonitorTable = ({
 						onClick={(e) => handleSort(e, "type")}
 						sx={{ cursor: "pointer" }}
 					>
+						<Box width={theme.spacing(8)} />
 						{t("common.table.headers.type")}
 						{renderSortIcon(sortField === "type")}
 					</Stack>

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

@@ -42,11 +42,11 @@ const UptimeMonitorsPage = () => {
 	const debouncedSearch = useDebounce<string>(search, 300);
 
 	// Convert filter selections to API filter values
-	// Status: "up" -> true, "down" -> false
+	// Status: pass "up"/"down" directly to the API
 	// State: "active" -> true, "paused" -> false
 	const toFilterStatus = useMemo(() => {
-		if (selectedStatus === "up") return "true";
-		if (selectedStatus === "down") return "false";
+		if (selectedStatus === "up") return "up";
+		if (selectedStatus === "down") return "down";
 		return undefined;
 	}, [selectedStatus]);
 
@@ -68,7 +68,9 @@ const UptimeMonitorsPage = () => {
 
 	// Default to all types when none selected
 	const effectiveTypes =
-		selectedTypes.length > 0 ? selectedTypes : ["http", "ping", "docker", "port", "game"];
+		selectedTypes.length > 0
+			? selectedTypes
+			: ["http", "ping", "docker", "port", "game", "grpc", "websocket"];
 
 	// Build URL for monitors with checks
 	const monitorsWithChecksUrl = useMemo(() => {

client/src/Types/Check.ts

@@ -160,14 +160,6 @@ export interface PageSpeedGroupedCheck {
 	totalChecks: number;
 }
 
-export interface GroupedGeoCheck {
-	bucketDate: string;
-	continent: string;
-	avgResponseTime: number;
-	totalChecks: number;
-	uptimePercentage: number;
-}
-
 export interface LatestCheck {
 	status: boolean;
 	responseTime: number;
@@ -244,7 +236,6 @@ export interface UptimeChecksResult {
 	groupedDownChecks: GroupedCheck[];
 	uptimePercentage: number;
 	avgResponseTime: number;
-	groupedGeoChecks?: GroupedGeoCheck[];
 }
 
 export interface ChecksSummary {

client/src/Types/GeoCheck.ts

@@ -0,0 +1,80 @@
+export const GeoContinents = ["EU", "NA", "AS", "SA", "AF", "OC"] as const;
+export type GeoContinent = (typeof GeoContinents)[number];
+
+export interface GeoCheckMetadata {
+	monitorId: string;
+	teamId: string;
+	type: string;
+}
+
+export interface GeoCheckTimings {
+	total: number;
+	dns: number;
+	tcp: number;
+	tls: number;
+	firstByte: number;
+	download: number;
+}
+
+export interface GeoCheckLocation {
+	continent: GeoContinent;
+	region: string;
+	country: string;
+	state: string;
+	city: string;
+	longitude: number;
+	latitude: number;
+}
+
+export interface GeoCheckResult {
+	location: GeoCheckLocation;
+	status: boolean;
+	statusCode: number;
+	timings: GeoCheckTimings;
+}
+
+export interface GeoCheck {
+	id: string;
+	metadata: GeoCheckMetadata;
+	results: GeoCheckResult[];
+	expiry: string;
+	__v: number;
+	createdAt: string;
+	updatedAt: string;
+}
+
+export interface FlatGeoCheck {
+	id: string;
+	monitorId: string;
+	teamId: string;
+	type: string;
+	location: GeoCheckLocation;
+	status: boolean;
+	statusCode: number;
+	timings: GeoCheckTimings;
+	createdAt: string;
+	updatedAt: string;
+}
+
+export interface GroupedGeoCheck {
+	bucketDate: string;
+	continent: GeoContinent;
+	avgResponseTime: number;
+	totalChecks: number;
+	uptimePercentage: number;
+}
+
+export interface GeoChecksResult {
+	monitorType: string;
+	groupedGeoChecks: GroupedGeoCheck[];
+}
+
+export interface GeoChecksResponse {
+	geoChecks: GeoCheck[];
+	geoChecksCount: number;
+}
+
+export interface FlatGeoChecksResponse {
+	geoChecks: FlatGeoCheck[];
+	geoChecksCount: number;
+}

client/src/Types/Monitor.ts

@@ -1,5 +1,7 @@
 import type { GroupedCheck, CheckSnapshot } from "@/Types/Check";
 import type { PageSpeedGroupedCheck } from "@/Types/Check";
+import type { GeoContinent } from "@/Types/GeoCheck";
+export type { GeoContinent } from "@/Types/GeoCheck";
 
 export const MonitorTypes = [
 	"http",
@@ -9,10 +11,21 @@ export const MonitorTypes = [
 	"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 | undefined): boolean => {
+	if (!type) {
+		return false;
+	}
+	return GeoCheckSupportedTypes.includes(type);
+};
+
 export const MonitorStatuses = [
 	"up",
 	"down",
@@ -25,9 +38,6 @@ export type MonitorStatus = (typeof MonitorStatuses)[number];
 
 export type MonitorMatchMethod = "equal" | "include" | "regex" | "";
 
-export const GeoCheckLocations = ["EU", "NA", "AS", "SA", "AF", "OC"] as const;
-export type GeoCheckLocation = (typeof GeoCheckLocations)[number];
-
 export interface Monitor {
 	id: string;
 	userId: string;
@@ -61,9 +71,10 @@ export interface Monitor {
 	tempAlertCounter: number;
 	selectedDisks: string[];
 	gameId?: string;
+	grpcServiceName?: string;
 	group: string | null;
 	geoCheckEnabled?: boolean;
-	geoCheckLocations?: GeoCheckLocation[];
+	geoCheckLocations?: GeoContinent[];
 	geoCheckInterval?: number;
 	recentChecks: CheckSnapshot[];
 	createdAt: string;

client/src/Types/env.d.ts

@@ -4,6 +4,7 @@ declare const __APP_VERSION__: string;
 
 interface ImportMetaEnv {
 	readonly VITE_APP_API_V2_BASE_URL?: string;
+	readonly VITE_APP_LOG_LEVEL?: "debug" | "info" | "warn" | "error";
 }
 
 interface ImportMeta {
@@ -17,3 +18,8 @@ declare module "*.svg?react" {
 	>;
 	export default ReactComponent;
 }
+
+declare module "*.css" {
+	const content: string;
+	export default content;
+}

client/src/Utils/MonitorUtils.ts

@@ -8,6 +8,8 @@ export const getMonitorPath = (type: MonitorType): string => {
 		port: "uptime",
 		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/Utils/Theme/constants.ts

@@ -0,0 +1,17 @@
+export const SPACING = {
+	XS: 0.5,
+	SM: 1,
+	MD: 1.5,
+	LG: 2,
+	XL: 2.5,
+	XXL: 3,
+} as const;
+
+export const LAYOUT = {
+	XS: 4,
+	SM: 6,
+	MD: 8,
+	LG: 10,
+	XL: 12,
+	XXL: 16,
+} as const;

client/src/Utils/logger.ts

@@ -0,0 +1,137 @@
+import type { LogLevel } from "@/Types/Log";
+
+interface LogContext {
+	[key: string]: any;
+}
+
+const LOG_LEVEL_PRIORITY: Record<LogLevel, number> = {
+	debug: 0,
+	info: 1,
+	warn: 2,
+	error: 3,
+};
+
+interface ErrorLogData {
+	timestamp: string;
+	level: LogLevel;
+	message: string;
+	error?: {
+		message: string;
+		name: string;
+		stack?: string;
+	};
+	context?: LogContext;
+	url: string;
+	userAgent: string;
+}
+
+const configuredLevel: LogLevel = import.meta.env.VITE_APP_LOG_LEVEL || "error";
+const configuredPriority = LOG_LEVEL_PRIORITY[configuredLevel];
+
+const shouldLog = (level: LogLevel): boolean => {
+	return LOG_LEVEL_PRIORITY[level] >= configuredPriority;
+};
+
+const formatError = (error?: Error) => {
+	if (!error) return undefined;
+
+	return {
+		message: error.message,
+		name: error.name,
+		stack: error.stack,
+	};
+};
+
+const createLogData = (
+	level: LogLevel,
+	message: string,
+	error?: Error,
+	context?: LogContext
+): ErrorLogData => {
+	return {
+		timestamp: new Date().toISOString(),
+		level,
+		message,
+		error: formatError(error),
+		context,
+		url: window.location.href,
+		userAgent: navigator.userAgent,
+	};
+};
+
+const error = (message: string, error?: Error, context?: LogContext): void => {
+	if (!shouldLog("error")) return;
+
+	const logData = createLogData("error", message, error, context);
+
+	if (configuredLevel === "debug") {
+		console.group(`ERROR: ${message}`);
+		if (error) {
+			console.error("Error:", error);
+		}
+		if (context && Object.keys(context).length > 0) {
+			console.log("Context:", context);
+		}
+		console.log("URL:", logData.url);
+		console.log("Timestamp:", logData.timestamp);
+		console.groupEnd();
+	} else {
+		console.error(JSON.stringify(logData));
+	}
+};
+
+const warn = (message: string, context?: LogContext): void => {
+	if (!shouldLog("warn")) return;
+
+	const logData = createLogData("warn", message, undefined, context);
+
+	if (configuredLevel === "debug") {
+		console.group(`WARN: ${message}`);
+		if (context && Object.keys(context).length > 0) {
+			console.log("Context:", context);
+		}
+		console.groupEnd();
+	} else {
+		console.warn(JSON.stringify(logData));
+	}
+};
+
+const debug = (message: string, data?: any): void => {
+	if (!shouldLog("debug")) return;
+
+	console.group(`DEBUG: ${message}`);
+	if (data !== undefined) {
+		console.log(data);
+	}
+	console.groupEnd();
+};
+
+const info = (message: string, data?: any): void => {
+	if (!shouldLog("info")) return;
+
+	if (configuredLevel === "debug") {
+		console.log(`INFO: ${message}`, data);
+	} else {
+		const logData = {
+			timestamp: new Date().toISOString(),
+			level: "info" as LogLevel,
+			message,
+			data,
+		};
+		console.log(JSON.stringify(logData));
+	}
+};
+
+export interface ILogger {
+	error(message: string, error?: Error, context?: LogContext): void;
+	warn(message: string, context?: LogContext): void;
+	debug(message: string, data?: any): void;
+	info(message: string, data?: any): void;
+}
+
+export const logger: ILogger = {
+	error,
+	warn,
+	debug,
+	info,
+};

client/src/Validation/monitor.ts

@@ -1,4 +1,5 @@
 import { z } from "zod";
+import { GeoContinents } from "@/Types/GeoCheck";
 
 // URL schema with custom error message
 const urlSchema = z.url({ message: "Please enter a valid URL" });
@@ -21,8 +22,11 @@ const baseSchema = z.object({
 		.min(1, "Incident percentage must be at least 1")
 		.max(100, "Incident percentage must be at most 100"),
 	geoCheckEnabled: z.boolean().optional(),
-	geoCheckLocations: z.array(z.enum(["EU", "NA", "AS", "SA", "AF", "OC"])).optional(),
-	geoCheckInterval: z.number().min(5, "Interval must be at least 5 minutes").optional(),
+	geoCheckLocations: z.array(z.enum(GeoContinents)).optional(),
+	geoCheckInterval: z
+		.number()
+		.min(300000, "Interval must be at least 5 minutes")
+		.optional(),
 });
 
 // HTTP monitor schema
@@ -69,6 +73,18 @@ const gameSchema = baseSchema.extend({
 	gameId: z.string().min(1, "Game type is required"),
 });
 
+// gRPC monitor schema
+const grpcSchema = baseSchema.extend({
+	type: z.literal("grpc"),
+	url: z.string().min(1, "Host is required"),
+	port: z
+		.number()
+		.min(1, "Port must be at least 1")
+		.max(65535, "Port must be at most 65535"),
+	grpcServiceName: z.string().optional(),
+	ignoreTlsErrors: z.boolean(),
+});
+
 // PageSpeed monitor schema
 const pagespeedSchema = baseSchema.extend({
 	type: z.literal("pagespeed"),
@@ -99,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,
@@ -106,8 +129,10 @@ export const monitorSchema = z.discriminatedUnion("type", [
 	portSchema,
 	dockerSchema,
 	gameSchema,
+	grpcSchema,
 	pagespeedSchema,
 	hardwareSchema,
+	websocketSchema,
 ]);
 
 export type MonitorFormData = z.infer<typeof monitorSchema>;
@@ -119,6 +144,8 @@ export {
 	portSchema,
 	dockerSchema,
 	gameSchema,
+	grpcSchema,
 	pagespeedSchema,
 	hardwareSchema,
+	websocketSchema,
 };

client/src/Validation/settings.ts

@@ -40,34 +40,12 @@ export const settingsSchema = z.object({
 		.string()
 		.transform((val) => (val.trim() === "" ? undefined : val.trim()))
 		.optional(),
-	globalThresholds: z
-		.object({
-			cpu: z
-				.number()
-				.int()
-				.min(1, "Please enter a valid value")
-				.max(100, "Maximum value is 100")
-				.optional(),
-			memory: z
-				.number()
-				.int()
-				.min(1, "Please enter a valid value")
-				.max(100, "Maximum value is 100")
-				.optional(),
-			disk: z
-				.number()
-				.int()
-				.min(1, "Please enter a valid value")
-				.max(100, "Maximum value is 100")
-				.optional(),
-			temperature: z
-				.number()
-				.int()
-				.min(1, "Please enter a valid value")
-				.max(150, "Maximum value is 150")
-				.optional(),
-		})
-		.optional(),
+	globalThresholds: z.object({
+		cpu: z.number().int().min(1).max(100),
+		memory: z.number().int().min(1).max(100),
+		disk: z.number().int().min(1).max(100),
+		temperature: z.number().int().min(1).max(150),
+	}),
 });
 
 export type SettingsFormData = z.infer<typeof settingsSchema>;

client/src/locales/en.json

@@ -45,7 +45,9 @@
 			"removeMonitors": "Remove monitors",
 			"sendTestEmail": "Send test email",
 			"exportToJSON": "Export to JSON",
-			"importFromJSON": "Import from JSON"
+			"importFromJSON": "Import from JSON",
+			"clearFilters": "Clear filters",
+			"removeUser": "Remove user"
 		},
 		"charts": {
 			"labels": {
@@ -115,7 +117,8 @@
 				"type": "Type",
 				"url": "Url",
 				"interval": "Interval",
-				"active": "Active"
+				"active": "Active",
+				"responseTime": "Response time"
 			}
 		}
 	},
@@ -372,8 +375,8 @@
 			"table": {
 				"empty": "No down checks in this time range",
 				"headers": {
-					"dateTime": "Date & time",
-					"statusCode": "Status code"
+					"statusCode": "Status code",
+					"location": "Location"
 				}
 			}
 		},
@@ -431,31 +434,6 @@
 					},
 					"title": "Advanced settings"
 				},
-				"geoChecks": {
-					"title": "Geo-distributed checks",
-					"description": "Run checks from multiple geographic locations to monitor global availability and performance.",
-					"option": {
-						"enabled": {
-							"label": "Enable geo-distributed checks"
-						},
-						"locations": {
-							"label": "Locations",
-							"placeholder": "Select locations",
-							"options": {
-								"EU": "Europe",
-								"NA": "North America",
-								"AS": "Asia",
-								"SA": "South America",
-								"AF": "Africa",
-								"OC": "Oceania"
-							}
-						},
-						"interval": {
-							"label": "Check interval (minutes)",
-							"helper": "Minimum 5 minutes between geo checks"
-						}
-					}
-				},
 				"frequency": {
 					"description": "How often do you want to check the status of this monitor?",
 					"option": {
@@ -506,6 +484,14 @@
 						"port": {
 							"label": "Port to monitor",
 							"placeholder": 80
+						},
+						"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",
@@ -516,6 +502,8 @@
 						"docker": "Enter the Docker container name or ID. You can use either the container name (e.g., my-app) or the container ID (full 64-char ID or short ID).",
 						"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."
 					}
 				},
@@ -550,6 +538,10 @@
 					"optionDockerDescription": "Use Docker to monitor if a container is running.",
 					"optionGame": "Game",
 					"optionGameDescription": "Monitor if a specific game server is online.",
+					"optionGrpc": "gRPC",
+					"optionGrpcDescription": "Monitor gRPC services using the standard Health Checking Protocol.",
+					"optionWebSocket": "WebSocket",
+					"optionWebSocketDescription": "Monitor WebSocket endpoints for connection health and response time.",
 					"optionHttp": "HTTP(S)",
 					"optionHttpDescription": "Use HTTP(S) to monitor your website or API endpoint.",
 					"optionPing": "Ping",
@@ -576,6 +568,36 @@
 						}
 					}
 				},
+				"geoChecks": {
+					"title": "Geo-Distributed Checks",
+					"description": "Run checks from multiple geographic locations to monitor global availability and performance.",
+					"option": {
+						"enabled": {
+							"label": "Enable geo-distributed checks"
+						},
+						"locations": {
+							"label": "Locations",
+							"placeholder": "Select locations",
+							"options": {
+								"EU": "Europe",
+								"NA": "North America",
+								"AS": "Asia",
+								"SA": "South America",
+								"AF": "Africa",
+								"OC": "Oceania"
+							}
+						},
+						"interval": {
+							"label": "Check interval",
+							"value": {
+								"fiveMinutes": "5 minutes",
+								"tenMinutes": "10 minutes",
+								"fifteenMinutes": "15 minutes",
+								"thirtyMinutes": "30 minutes"
+							}
+						}
+					}
+				},
 				"url": {
 					"title": "Monitor IP/URL on Status Page",
 					"description": "Display the IP address or URL of monitor on the public Status page. If it's disabled, only the monitor name will be shown to protect sensitive information.",
@@ -605,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": {
@@ -645,7 +673,6 @@
 			},
 			"filters": {
 				"allMonitors": "All monitors",
-				"clearFilters": "Clear filters",
 				"monitor": "Monitor",
 				"resolutionType": "Resolution type",
 				"resolutionTypes": {
@@ -1121,6 +1148,9 @@
 				"about": {
 					"title": "About",
 					"developedBy": "Developed by Bluewave Labs"
+				},
+				"validation": {
+					"errorMessage": "Please fix the following validation errors:"
 				}
 			}
 		},

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.4.0";
+	let version = "3.5.1";
 
 	return {
 		base: "/",

server/.env.example

@@ -0,0 +1,26 @@
+# ==============================================
+# Checkmate Server Configuration
+# ==============================================
+# Copy this file to .env and fill in your values
+
+# Server Configuration
+# --------------------
+NODE_ENV=development
+LOG_LEVEL=debug
+
+# Database
+# --------
+DB_CONNECTION_STRING=mongodb://localhost:27017/uptime_db
+
+# JWT Authentication
+# ------------------
+JWT_SECRET=my_secret
+TOKEN_TTL=99d
+
+# Client Configuration
+# --------------------
+CLIENT_HOST=http://localhost:5173
+
+# Optional Configuration
+# ----------------------
+ORIGIN=localhost

server/eslint.config.js

@@ -1,6 +1,7 @@
 import globals from "globals";
 import pluginJs from "@eslint/js";
 import mochaPlugin from "eslint-plugin-mocha";
+import tseslint from "typescript-eslint";
 
 /*
 Please do not forget to look at the latest eslint configurations and rules.
@@ -10,6 +11,9 @@ ESlint v9 configuration is different than v8.
 
 /** @type {import('eslint').Linter.Config[]} */
 export default [
+	{
+		ignores: ["dist/**", "node_modules/**", "coverage/**", "test/**"],
+	},
 	{
 		languageOptions: {
 			globals: {
@@ -21,9 +25,19 @@ export default [
 		},
 	},
 	pluginJs.configs.recommended, // Core JS rules
+	...tseslint.configs.recommended, // TypeScript recommended rules
 	mochaPlugin.configs.flat.recommended, // Mocha rules
 	{
+		files: ["**/*.ts", "**/*.tsx"],
+		languageOptions: {
+			parser: tseslint.parser,
+			parserOptions: {
+				projectService: true,
+				tsconfigRootDir: import.meta.dirname,
+			},
+		},
 		rules: {
+			"@typescript-eslint/no-explicit-any": "warn", // Warn on 'any' types
 			"mocha/max-top-level-suites": "warn", // Warn if there are too many top-level suites instead of failing
 		},
 	},

server/openapi.json

@@ -432,46 +432,6 @@
 			}
 		},
 		"/monitors": {
-			"get": {
-				"tags": ["monitors"],
-				"summary": "Get all monitors",
-				"description": "Retrieve all monitors for the authenticated user",
-				"responses": {
-					"200": {
-						"description": "Monitors retrieved successfully",
-						"content": {
-							"application/json": {
-								"schema": {
-									"allOf": [
-										{
-											"$ref": "#/components/schemas/SuccessResponse"
-										},
-										{
-											"type": "object",
-											"properties": {
-												"data": {
-													"type": "array",
-													"items": {
-														"$ref": "#/components/schemas/Monitor"
-													}
-												}
-											}
-										}
-									]
-								}
-							}
-						}
-					},
-					"500": {
-						"$ref": "#/components/responses/InternalServerError"
-					}
-				},
-				"security": [
-					{
-						"bearerAuth": []
-					}
-				]
-			},
 			"post": {
 				"tags": ["monitors"],
 				"summary": "Create monitor",

server/package.json

@@ -15,7 +15,7 @@
 		"format-check": "prettier --check ."
 	},
 	"lint-staged": {
-		"**/*": "npm run format"
+		"**/*": "prettier --write"
 	},
 	"keywords": [],
 	"author": "",
@@ -24,6 +24,8 @@
 		"node": ">=20"
 	},
 	"dependencies": {
+		"@grpc/grpc-js": "^1.14.3",
+		"@grpc/proto-loader": "^0.8.0",
 		"@pulsecron/pulse": "1.6.8",
 		"axios": "^1.7.2",
 		"bcryptjs": "3.0.2",
@@ -36,27 +38,28 @@
 		"dotenv": "^16.4.5",
 		"express": "^4.19.2",
 		"express-rate-limit": "8.0.1",
-		"gamedig": "^5.3.1",
+		"gamedig": "5.2.0",
 		"got": "14.4.7",
 		"handlebars": "^4.7.8",
 		"helmet": "^8.0.0",
 		"ioredis": "^5.4.2",
 		"isomorphic-dompurify": "^2.26.0",
 		"jmespath": "^0.16.0",
-		"joi": "^17.13.1",
 		"jsdom": "^26.1.0",
 		"jsonwebtoken": "9.0.2",
 		"mailersend": "^2.2.0",
 		"mjml": "^5.0.0-alpha.4",
 		"mongoose": "^8.3.3",
 		"multer": "^1.4.5-lts.1",
-		"nodemailer": "^6.9.14",
+		"nodemailer": "8.0.1",
 		"ping": "0.4.4",
 		"sharp": "0.33.5",
 		"ssl-checker": "2.0.10",
 		"super-simple-scheduler": "1.4.5",
 		"swagger-ui-express": "5.0.1",
-		"winston": "^3.13.0"
+		"winston": "^3.13.0",
+		"ws": "^8.19.0",
+		"zod": "^4.3.6"
 	},
 	"devDependencies": {
 		"@eslint/js": "^9.17.0",
@@ -76,6 +79,9 @@
 		"@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",
 		"eslint": "^9.17.0",
 		"eslint-plugin-mocha": "^10.5.0",
@@ -89,6 +95,7 @@
 		"ts-node": "^10.9.2",
 		"tsc-alias": "1.8.16",
 		"tsx": "4.20.5",
-		"typescript": "5.9.2"
+		"typescript": "5.9.2",
+		"typescript-eslint": "^8.56.1"
 	}
 }

server/scripts/generate-checks.js

@@ -3,8 +3,6 @@ import { MonitorModel } from "../dist/db/models/Monitor.js";
 import { CheckModel } from "../dist/db/models/Check.js";
 
 const DEFAULT_MONITOR_ID = "000000000000000000000001";
-const DEFAULT_TEAM_ID = "0000000000000000000000aa";
-const DEFAULT_USER_ID = "0000000000000000000000bb";
 const DEFAULT_MONITOR_TYPE = "http";
 const DEFAULT_TOTAL = 1_000_000;
 const DEFAULT_BATCH_SIZE = 5_000;
@@ -12,7 +10,7 @@ const DEFAULT_BATCH_SIZE = 5_000;
 const parseObjectId = (value, fallback) => {
 	try {
 		return new mongoose.Types.ObjectId(value || fallback);
-	} catch (error) {
+	} catch {
 		console.warn(`Invalid ObjectId '${value}', falling back to '${fallback}'.`);
 		return new mongoose.Types.ObjectId(fallback);
 	}

server/src/app.ts

@@ -74,8 +74,22 @@ export const createApp = ({
 			},
 		})
 	);
-	// Swagger UI
-	app.use("/api-docs", swaggerUi.serve, swaggerUi.setup(openApiSpec));
+	// Swagger UI — dynamically set server URL from request
+	app.use("/api-docs", swaggerUi.serve, (req: express.Request, res: express.Response, next: express.NextFunction) => {
+		const protocol = req.protocol;
+		const host = req.get("host");
+		const dynamicSpec = {
+			...openApiSpec,
+			servers: [
+				{
+					url: `${protocol}://${host}/api/v1`,
+					description: "Current Server",
+				},
+				...openApiSpec.servers,
+			],
+		};
+		swaggerUi.setup(dynamicSpec)(req, res, next);
+	});
 
 	app.use("/api/v1/health", (req, res) => {
 		res.json({

server/src/config/controllers.ts

@@ -2,6 +2,7 @@ import MonitorController from "../controllers/monitorController.js";
 import AuthController from "../controllers/authController.js";
 import SettingsController from "../controllers/settingsController.js";
 import CheckController from "../controllers/checkController.js";
+import GeoCheckController from "../controllers/geoCheckController.js";
 import InviteController from "../controllers/inviteController.js";
 import MaintenanceWindowController from "../controllers/maintenanceWindowController.js";
 import QueueController from "../controllers/queueController.js";
@@ -17,6 +18,7 @@ export interface InitializedControllers {
 	monitorController: MonitorController;
 	settingsController: SettingsController;
 	checkController: CheckController;
+	geoCheckController: GeoCheckController;
 	inviteController: InviteController;
 	maintenanceWindowController: MaintenanceWindowController;
 	queueController: QueueController;
@@ -32,6 +34,7 @@ export const initializeControllers = (services: InitializedServices): Initialize
 		monitorController: new MonitorController(services.monitorService),
 		settingsController: new SettingsController(services.settingsService, services.emailService),
 		checkController: new CheckController(services.checkService),
+		geoCheckController: new GeoCheckController(services.geoChecksService),
 		inviteController: new InviteController(services.inviteService),
 		maintenanceWindowController: new MaintenanceWindowController(services.maintenanceWindowService),
 		queueController: new QueueController(services.jobQueue),

server/src/config/routes.ts

@@ -6,6 +6,7 @@ import AuthRoutes from "../routes/authRoute.js";
 import InviteRoutes from "../routes/inviteRoute.js";
 import MonitorRoutes from "../routes/monitorRoute.js";
 import CheckRoutes from "../routes/checkRoute.js";
+import GeoCheckRoutes from "../routes/geoCheckRoutes.js";
 import SettingsRoutes from "../routes/settingsRoute.js";
 import MaintenanceWindowRoutes from "../routes/maintenanceWindowRoute.js";
 import StatusPageRoutes from "../routes/statusPageRoute.js";
@@ -22,6 +23,7 @@ export const setupRoutes = (app: any, controllers: Record<string, any>, services
 	const monitorRoutes = new MonitorRoutes(controllers.monitorController);
 	const settingsRoutes = new SettingsRoutes(controllers.settingsController);
 	const checkRoutes = new CheckRoutes(controllers.checkController);
+	const geoCheckRoutes = new GeoCheckRoutes(controllers.geoCheckController);
 	const inviteRoutes = new InviteRoutes(controllers.inviteController, verifyJWT);
 	const maintenanceWindowRoutes = new MaintenanceWindowRoutes(controllers.maintenanceWindowController);
 	const queueRoutes = new QueueRoutes(controllers.queueController);
@@ -36,6 +38,7 @@ export const setupRoutes = (app: any, controllers: Record<string, any>, services
 	app.use("/api/v1/monitors", verifyJWT, monitorRoutes.getRouter());
 	app.use("/api/v1/settings", verifyJWT, settingsRoutes.getRouter());
 	app.use("/api/v1/checks", verifyJWT, checkRoutes.getRouter());
+	app.use("/api/v1/geo-checks", verifyJWT, geoCheckRoutes.getRouter());
 	app.use("/api/v1/invite", inviteRoutes.getRouter());
 	app.use("/api/v1/maintenance-window", verifyJWT, maintenanceWindowRoutes.getRouter());
 	app.use("/api/v1/queue", verifyJWT, queueRoutes.getRouter());

server/src/config/services.ts

@@ -1,34 +1,69 @@
 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,
+	// 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 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";
-import http from "http";
-import https from "https";
 import Docker from "dockerode";
 import net from "net";
 import fs from "fs";
@@ -41,11 +76,15 @@ import jwt from "jsonwebtoken";
 import crypto from "crypto";
 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,
+	MongoGeoChecksRepository,
 	MongoMonitorStatsRepository,
 	MongoStatusPagesRepository,
 	MongoUsersRepository,
@@ -57,6 +96,7 @@ import {
 	MongoMaintenanceWindowsRepository,
 	IMonitorsRepository,
 	IChecksRepository,
+	IGeoChecksRepository,
 	IMonitorStatsRepository,
 	IStatusPagesRepository,
 	IUsersRepository,
@@ -69,24 +109,24 @@ import {
 	IMaintenanceWindowsRepository,
 } from "@/repositories/index.js";
 import { ILogger } from "@/utils/logger.js";
-import { EnvConfig } from "@/service/system/settingsService.js";
 
 export type InitializedServices = {
-	settingsService: any;
-	db: any;
-	networkService: any;
-	emailService: any;
-	bufferService: any;
-	statusService: any;
-	jobQueue: any;
-	userService: any;
-	checkService: any;
-	diagnosticService: any;
-	inviteService: any;
-	maintenanceWindowService: any;
-	monitorService: any;
-	incidentService: any;
-	logger: 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;
 	notificationMessageBuilder: INotificationMessageBuilder;
@@ -94,6 +134,7 @@ export type InitializedServices = {
 	// Repositories
 	monitorsRepository: IMonitorsRepository;
 	checksRepository: IChecksRepository;
+	geoChecksRepository: IGeoChecksRepository;
 	monitorStatsRepository: IMonitorStatsRepository;
 	statusPagesRepository: IStatusPagesRepository;
 	usersRepository: IUsersRepository;
@@ -114,7 +155,7 @@ export const initializeServices = async ({
 }: {
 	logger: ILogger;
 	envSettings: EnvConfig;
-	settingsService: any;
+	settingsService: ISettingsService;
 	settingsRepository: ISettingsRepository;
 }): Promise<InitializedServices> => {
 	// Create DB
@@ -126,6 +167,7 @@ export const initializeServices = async ({
 	// Repositories
 	const monitorsRepository = new MongoMonitorsRepository();
 	const checksRepository = new MongoChecksRepository(logger);
+	const geoChecksRepository = new MongoGeoChecksRepository(logger);
 	const monitorStatsRepository = new MongoMonitorStatsRepository();
 	const statusPagesRepository = new MongoStatusPagesRepository();
 	const usersRepository = new MongoUsersRepository();
@@ -136,41 +178,50 @@ export const initializeServices = async ({
 	const teamsRepository = new MongoTeamsRepository();
 	const maintenanceWindowsRepository = new MongoMaintenanceWindowsRepository();
 
-	const networkService = new NetworkService({
-		axios,
-		got,
-		https,
-		jmespath,
-		GameDig,
-		ping,
-		logger,
-		http,
-		Docker,
-		net,
-		settingsService,
-	});
+	// Network providers
+	const pingProvider = new PingProvider(ping);
+	const httpProvider = new HttpProvider(got, new AdvancedMatcher(jmespath));
+	const pageSpeedProvider = new PageSpeedProvider(httpProvider, settingsService, logger);
+	const hardwareProvider = new HardwareProvider(httpProvider);
+	const dockerProvider = new DockerProvider(logger, Docker);
+	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, [
+		pingProvider,
+		httpProvider,
+		pageSpeedProvider,
+		hardwareProvider,
+		dockerProvider,
+		portProvider,
+		gameProvider,
+		grpcProvider,
+		webSocketProvider,
+	]);
 	const emailService = new EmailService(settingsService, fs, path, compile, mjml2html, nodemailer, logger);
 
 	const notificationMessageBuilder = new NotificationMessageBuilder();
 
-	const incidentService = new IncidentService({
+	const incidentService = new IncidentService(logger, incidentsRepository, monitorsRepository, usersRepository, notificationMessageBuilder);
+
+	const checkService = new CheckService(monitorsRepository, logger, checksRepository);
+
+	const globalPingService = new GlobalPingService(logger);
+
+	const geoChecksService = new GeoChecksService({
 		logger,
-		incidentsRepository,
+		geoChecksRepository,
+		globalPingService,
 		monitorsRepository,
-		usersRepository,
-		notificationMessageBuilder,
 	});
 
-	const checkService = new CheckService({
-		monitorsRepository,
-		logger,
-		checksRepository,
-	});
-
-	const bufferService = new BufferService({ logger, checkService, settingsService });
+	const bufferService = new BufferService(logger, checkService, geoChecksService, settingsService);
 
 	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);
@@ -192,13 +243,13 @@ export const initializeServices = async ({
 		notificationMessageBuilder
 	);
 
-	const superSimpleQueueHelper = new SuperSimpleQueueHelper({
+	const superSimpleQueueHelper = new SuperSimpleQueueHelper(
 		logger,
 		networkService,
 		statusService,
 		notificationsService,
 		checkService,
-		buffer: bufferService,
+		bufferService,
 		incidentService,
 		maintenanceWindowsRepository,
 		monitorsRepository,
@@ -206,13 +257,11 @@ export const initializeServices = async ({
 		monitorStatsRepository,
 		checksRepository,
 		incidentsRepository,
-	});
+		geoChecksService,
+		geoChecksRepository
+	);
 
-	const superSimpleQueue = await SuperSimpleQueue.create({
-		logger,
-		helper: superSimpleQueueHelper,
-		monitorsRepository,
-	});
+	const superSimpleQueue = await SuperSimpleQueue.create(logger, superSimpleQueueHelper, monitorsRepository);
 
 	// Business services
 	const userService = new UserService({
@@ -247,6 +296,7 @@ export const initializeServices = async ({
 		games,
 		monitorsRepository,
 		checksRepository,
+		geoChecksRepository,
 		monitorStatsRepository,
 		statusPagesRepository,
 		incidentsRepository,
@@ -255,7 +305,6 @@ export const initializeServices = async ({
 	const statusPageService = new StatusPageService(statusPagesRepository);
 
 	const services = {
-		//v1
 		settingsService,
 		db,
 		networkService,
@@ -265,6 +314,7 @@ export const initializeServices = async ({
 		jobQueue: superSimpleQueue,
 		userService,
 		checkService,
+		geoChecksService,
 		diagnosticService,
 		inviteService,
 		maintenanceWindowService,
@@ -278,6 +328,7 @@ export const initializeServices = async ({
 		// Repositories
 		monitorsRepository,
 		checksRepository,
+		geoChecksRepository,
 		monitorStatsRepository,
 		statusPagesRepository,
 		usersRepository,

server/src/controllers/authController.ts

@@ -6,17 +6,20 @@ import type { UserRole } from "@/types/user.js";
 import {
 	registrationBodyValidation,
 	loginValidation,
-	editUserBodyValidation,
-	createUserBodyValidation,
 	recoveryValidation,
 	recoveryTokenBodyValidation,
 	newPasswordValidation,
+} from "@/validation/authValidation.js";
+
+import {
+	editUserBodyValidation,
+	createUserBodyValidation,
 	getUserByIdParamValidation,
 	editUserByIdParamValidation,
 	editUserByIdBodyValidation,
 	editSuperadminUserByIdBodyValidation,
 	editUserPasswordByIdBodyValidation,
-} from "@/validation/joi.js";
+} from "@/validation/userValidation.js";
 
 const SERVICE_NAME = "authController";
 
@@ -40,7 +43,7 @@ class AuthController {
 			if (newUser?.email) {
 				newUser.email = newUser.email.toLowerCase();
 			}
-			await registrationBodyValidation.validateAsync(newUser);
+			registrationBodyValidation.parse(newUser);
 
 			const { user, token } = await this.userService.registerUser(newUser, newUserToken, req.file);
 			res.status(200).json({
@@ -59,7 +62,7 @@ class AuthController {
 			if (userData?.email) {
 				userData.email = userData.email.toLowerCase();
 			}
-			await createUserBodyValidation.validateAsync(userData);
+			createUserBodyValidation.parse(userData);
 
 			const teamId = requireTeamId(req.user?.teamId);
 			const actorRoles = requireUserRoles(req.user?.role) as UserRole[];
@@ -79,7 +82,7 @@ class AuthController {
 			if (req.body?.email) {
 				req.body.email = req.body.email?.toLowerCase();
 			}
-			await loginValidation.validateAsync(req.body);
+			loginValidation.parse(req.body);
 			const { user, token } = await this.userService.loginUser(req.body.email, req.body.password);
 
 			return res.status(200).json({
@@ -97,7 +100,7 @@ class AuthController {
 
 	editUser = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			await editUserBodyValidation.validateAsync(req.body);
+			editUserBodyValidation.parse(req.body);
 			const updatedUser = await this.userService.editUser(req.body, req.file, req.user);
 
 			res.status(200).json({
@@ -125,7 +128,7 @@ class AuthController {
 
 	requestRecovery = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			await recoveryValidation.validateAsync(req.body);
+			recoveryValidation.parse(req.body);
 			const email = req?.body?.email;
 			const msgId = await this.userService.requestRecovery(email);
 			return res.status(200).json({
@@ -140,7 +143,7 @@ class AuthController {
 
 	validateRecovery = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			await recoveryTokenBodyValidation.validateAsync(req.body);
+			recoveryTokenBodyValidation.parse(req.body);
 			await this.userService.validateRecovery(req.body.recoveryToken);
 			return res.status(200).json({
 				success: true,
@@ -153,7 +156,7 @@ class AuthController {
 
 	resetPassword = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			await newPasswordValidation.validateAsync(req.body);
+			newPasswordValidation.parse(req.body);
 			const { user, token } = await this.userService.resetPassword(req.body.password, req.body.recoveryToken);
 			return res.status(200).json({
 				success: true,
@@ -177,6 +180,20 @@ class AuthController {
 		}
 	};
 
+	deleteUserById = async (req: Request, res: Response, next: NextFunction) => {
+		try {
+			getUserByIdParamValidation.parse(req.params);
+			const targetUserId = req.params.userId;
+			await this.userService.deleteUserById(req.user, targetUserId);
+			return res.status(200).json({
+				success: true,
+				msg: "User removed successfully",
+			});
+		} catch (error) {
+			next(error);
+		}
+	};
+
 	getAllUsers = async (req: Request, res: Response, next: NextFunction) => {
 		try {
 			const allUsers = await this.userService.getAllUsers();
@@ -192,7 +209,7 @@ class AuthController {
 
 	getUserById = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			await getUserByIdParamValidation.validateAsync(req.params);
+			getUserByIdParamValidation.parse(req.params);
 			const userId = req?.params?.userId;
 			const roles = req?.user?.role;
 
@@ -223,12 +240,12 @@ class AuthController {
 			const userId = req.params.userId as string;
 			const user = { ...req.body };
 
-			await editUserByIdParamValidation.validateAsync(req.params);
+			editUserByIdParamValidation.parse(req.params);
 			// If this is superadmin self edit, allow "superadmin" role
 			if (userId === req.user?.id) {
-				await editSuperadminUserByIdBodyValidation.validateAsync(req.body);
+				editSuperadminUserByIdBodyValidation.parse(req.body);
 			} else {
-				await editUserByIdBodyValidation.validateAsync(req.body);
+				editUserByIdBodyValidation.parse(req.body);
 			}
 
 			await this.userService.editUserById(userId, user);
@@ -246,8 +263,8 @@ class AuthController {
 			}
 
 			const userId = req.params.userId as string;
-			await editUserByIdParamValidation.validateAsync(req.params);
-			await editUserPasswordByIdBodyValidation.validateAsync(req.body);
+			editUserByIdParamValidation.parse(req.params);
+			editUserPasswordByIdBodyValidation.parse(req.body);
 			const updatedPassword = req.body.password;
 			await this.userService.setPasswordByUserId(userId, updatedPassword);
 			return res.status(200).json({ success: true, msg: "Password reset successfully" });

server/src/controllers/checkController.ts

@@ -7,10 +7,7 @@ import {
 	deleteChecksParamValidation,
 	deleteChecksByTeamIdParamValidation,
 	updateChecksTTLBodyValidation,
-	ackCheckBodyValidation,
-	ackAllChecksParamValidation,
-	ackAllChecksBodyValidation,
-} from "@/validation/joi.js";
+} from "@/validation/checkValidation.js";
 
 const SERVICE_NAME = "checkController";
 
@@ -28,8 +25,8 @@ class CheckController {
 
 	getChecksByMonitor = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			await getChecksParamValidation.validateAsync(req.params);
-			await getChecksQueryValidation.validateAsync(req.query);
+			getChecksParamValidation.parse(req.params);
+			getChecksQueryValidation.parse(req.query);
 
 			const result = await this.checkService.getChecksByMonitor({
 				monitorId: req?.params?.monitorId,
@@ -49,7 +46,7 @@ class CheckController {
 
 	getChecksByTeam = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			await getTeamChecksQueryValidation.validateAsync(req.query);
+			getTeamChecksQueryValidation.parse(req.query);
 			const checkData = await this.checkService.getChecksByTeam({
 				teamId: req?.user?.teamId,
 				query: req?.query,
@@ -80,7 +77,7 @@ class CheckController {
 
 	deleteChecks = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			await deleteChecksParamValidation.validateAsync(req.params);
+			deleteChecksParamValidation.parse(req.params);
 
 			const deletedCount = await this.checkService.deleteChecks({
 				monitorId: req.params.monitorId as string,
@@ -99,7 +96,7 @@ class CheckController {
 
 	deleteChecksByTeamId = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			await deleteChecksByTeamIdParamValidation.validateAsync(req.params);
+			deleteChecksByTeamIdParamValidation.parse(req.params);
 
 			const deletedCount = await this.checkService.deleteChecksByTeamId({ teamId: req?.user?.teamId });
 
@@ -115,7 +112,7 @@ class CheckController {
 
 	updateChecksTTL = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			await updateChecksTTLBodyValidation.validateAsync(req.body);
+			updateChecksTTLBodyValidation.parse(req.body);
 
 			await this.checkService.updateChecksTTL({
 				teamId: req?.user?.teamId,

server/src/controllers/geoCheckController.ts

@@ -0,0 +1,41 @@
+import { Request, Response, NextFunction } from "express";
+import { getChecksParamValidation, getChecksQueryValidation } from "@/validation/checkValidation.js";
+import type { IGeoChecksService } from "@/service/business/geoChecksService.js";
+
+const SERVICE_NAME = "geoCheckController";
+
+class GeoCheckController {
+	static SERVICE_NAME = SERVICE_NAME;
+
+	private geoChecksService: IGeoChecksService;
+	constructor(geoChecksService: IGeoChecksService) {
+		this.geoChecksService = geoChecksService;
+	}
+
+	get serviceName() {
+		return GeoCheckController.SERVICE_NAME;
+	}
+
+	getGeoChecksByMonitor = async (req: Request, res: Response, next: NextFunction) => {
+		try {
+			getChecksParamValidation.parse(req.params);
+			getChecksQueryValidation.parse(req.query);
+
+			const result = await this.geoChecksService.getGeoChecksByMonitor({
+				monitorId: req?.params?.monitorId as string,
+				query: req?.query,
+				teamId: req?.user?.teamId as string,
+			});
+
+			return res.status(200).json({
+				success: true,
+				msg: "Geo checks retrieved successfully",
+				data: result,
+			});
+		} catch (error) {
+			next(error);
+		}
+	};
+}
+
+export default GeoCheckController;

server/src/controllers/inviteController.ts

@@ -1,5 +1,5 @@
 import { Request, Response, NextFunction } from "express";
-import { inviteBodyValidation, inviteVerificationBodyValidation } from "@/validation/joi.js";
+import { inviteBodyValidation, inviteVerificationBodyValidation } from "@/validation/authValidation.js";
 import { requireTeamId, requireUserRoles } from "@/controllers/controllerUtils.js";
 const SERVICE_NAME = "inviteController";
 
@@ -20,7 +20,7 @@ class InviteController {
 			const userRoles = requireUserRoles(req.user?.role);
 			const invite = req.body;
 			invite.teamId = teamId;
-			await inviteBodyValidation.validateAsync(invite);
+			inviteBodyValidation.parse(invite);
 			const inviteToken = await this.inviteService.getInviteToken({ invite, teamId, userRoles });
 			return res.status(200).json({
 				success: true,
@@ -39,7 +39,7 @@ class InviteController {
 
 			const inviteRequest = req.body;
 			inviteRequest.teamId = teamId;
-			await inviteBodyValidation.validateAsync(inviteRequest);
+			inviteBodyValidation.parse(inviteRequest);
 
 			const inviteToken = await this.inviteService.sendInviteEmail({
 				invite: inviteRequest,
@@ -58,7 +58,7 @@ class InviteController {
 
 	verifyInviteToken = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			await inviteVerificationBodyValidation.validateAsync(req.body);
+			inviteVerificationBodyValidation.parse(req.body);
 			const invite = await this.inviteService.verifyInviteToken({ inviteToken: req?.body?.token });
 			return res.status(200).json({
 				success: true,

server/src/controllers/maintenanceWindowController.ts

@@ -7,7 +7,7 @@ import {
 	getMaintenanceWindowsByMonitorIdParamValidation,
 	getMaintenanceWindowsByTeamIdQueryValidation,
 	deleteMaintenanceWindowByIdParamValidation,
-} from "@/validation/joi.js";
+} from "@/validation/maintenanceWindowValidation.js";
 import { requireTeamId } from "@/controllers/controllerUtils.js";
 
 const SERVICE_NAME = "maintenanceWindowController";
@@ -25,7 +25,7 @@ class MaintenanceWindowController {
 
 	createMaintenanceWindows = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			await createMaintenanceWindowBodyValidation.validateAsync(req.body);
+			createMaintenanceWindowBodyValidation.parse(req.body);
 			const teamId = requireTeamId(req?.user?.teamId);
 
 			await this.maintenanceWindowService.createMaintenanceWindow({ teamId, body: req.body });
@@ -40,7 +40,7 @@ class MaintenanceWindowController {
 	};
 	getMaintenanceWindowById = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			await getMaintenanceWindowByIdParamValidation.validateAsync(req.params);
+			getMaintenanceWindowByIdParamValidation.parse(req.params);
 
 			const teamId = requireTeamId(req.user?.teamId);
 
@@ -58,7 +58,7 @@ class MaintenanceWindowController {
 
 	getMaintenanceWindowsByTeamId = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			await getMaintenanceWindowsByTeamIdQueryValidation.validateAsync(req.query);
+			getMaintenanceWindowsByTeamIdQueryValidation.parse(req.query);
 
 			const teamId = requireTeamId(req?.user?.teamId);
 
@@ -76,7 +76,7 @@ class MaintenanceWindowController {
 
 	getMaintenanceWindowsByMonitorId = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			await getMaintenanceWindowsByMonitorIdParamValidation.validateAsync(req.params);
+			getMaintenanceWindowsByMonitorIdParamValidation.parse(req.params);
 
 			const teamId = requireTeamId(req?.user?.teamId);
 
@@ -96,7 +96,7 @@ class MaintenanceWindowController {
 	};
 	deleteMaintenanceWindow = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			await deleteMaintenanceWindowByIdParamValidation.validateAsync(req.params);
+			deleteMaintenanceWindowByIdParamValidation.parse(req.params);
 
 			const teamId = requireTeamId(req?.user?.teamId);
 
@@ -113,8 +113,8 @@ class MaintenanceWindowController {
 
 	editMaintenanceWindow = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			await editMaintenanceWindowByIdParamValidation.validateAsync(req.params);
-			await editMaintenanceByIdWindowBodyValidation.validateAsync(req.body);
+			editMaintenanceWindowByIdParamValidation.parse(req.params);
+			editMaintenanceByIdWindowBodyValidation.parse(req.body);
 
 			const teamId = requireTeamId(req.user?.teamId);
 

server/src/controllers/monitorController.ts

@@ -12,7 +12,7 @@ import {
 	getCertificateParamValidation,
 	getHardwareDetailsByIdParamValidation,
 	getHardwareDetailsByIdQueryValidation,
-} from "@/validation/joi.js";
+} from "@/validation/monitorValidation.js";
 import sslChecker from "ssl-checker";
 import {
 	fetchMonitorCertificate,
@@ -27,6 +27,7 @@ import {
 } 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 {
@@ -44,7 +45,7 @@ class MonitorController {
 
 	getMonitorCertificate = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			await getCertificateParamValidation.validateAsync(req.params);
+			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 });
@@ -87,8 +88,8 @@ class MonitorController {
 
 	getHardwareDetailsById = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			await getHardwareDetailsByIdParamValidation.validateAsync(req.params);
-			await getHardwareDetailsByIdQueryValidation.validateAsync(req.query);
+			getHardwareDetailsByIdParamValidation.parse(req.params);
+			getHardwareDetailsByIdQueryValidation.parse(req.query);
 
 			const monitorId = requireString(req?.params?.monitorId, "Monitor ID");
 			const dateRange = optionalString(req?.query?.dateRange, "dateRange") || "recent";
@@ -111,8 +112,8 @@ class MonitorController {
 	};
 	getPageSpeedDetailsById = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			await getHardwareDetailsByIdParamValidation.validateAsync(req.params);
-			await getHardwareDetailsByIdQueryValidation.validateAsync(req.query);
+			getHardwareDetailsByIdParamValidation.parse(req.params);
+			getHardwareDetailsByIdQueryValidation.parse(req.query);
 
 			const monitorId = requireString(req?.params?.monitorId, "Monitor ID");
 			const dateRange = requireString(req?.query?.dateRange, "dateRange");
@@ -134,10 +135,42 @@ class MonitorController {
 		}
 	};
 
+	getGeoChecksByMonitorId = async (req: Request, res: Response, next: NextFunction) => {
+		try {
+			getMonitorByIdParamValidation.parse(req.params);
+			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 data = await this.monitorService.getGeoChecksByMonitorId({
+				teamId,
+				monitorId,
+				dateRange,
+				continents,
+			});
+
+			return res.status(200).json({
+				success: true,
+				msg: "Geo checks retrieved successfully",
+				data,
+			});
+		} catch (error) {
+			next(error);
+		}
+	};
+
 	getMonitorById = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			await getMonitorByIdParamValidation.validateAsync(req.params);
-			await getMonitorByIdQueryValidation.validateAsync(req.query);
+			getMonitorByIdParamValidation.parse(req.params);
+			getMonitorByIdQueryValidation.parse(req.query);
 
 			const teamId = requireTeamId(req?.user?.teamId);
 			const monitorId = requireString(req?.params?.monitorId, "Monitor ID");
@@ -156,7 +189,7 @@ class MonitorController {
 
 	createMonitor = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			await createMonitorBodyValidation.validateAsync(req.body);
+			createMonitorBodyValidation.parse(req.body);
 
 			const userId = requireString(req?.user?.id, "User ID");
 			const teamId = requireTeamId(req?.user?.teamId);
@@ -198,7 +231,7 @@ class MonitorController {
 
 	deleteMonitor = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			await getMonitorByIdParamValidation.validateAsync(req.params);
+			getMonitorByIdParamValidation.parse(req.params);
 			const monitorId = requireString(req?.params?.monitorId, "Monitor ID");
 			const teamId = requireTeamId(req?.user?.teamId);
 
@@ -231,8 +264,8 @@ class MonitorController {
 
 	editMonitor = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			await getMonitorByIdParamValidation.validateAsync(req.params);
-			await editMonitorBodyValidation.validateAsync(req.body);
+			getMonitorByIdParamValidation.parse(req.params);
+			editMonitorBodyValidation.parse(req.body);
 			const monitorId = requireString(req?.params?.monitorId, "Monitor ID");
 			const teamId = requireTeamId(req?.user?.teamId);
 
@@ -250,7 +283,7 @@ class MonitorController {
 
 	pauseMonitor = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			await pauseMonitorParamValidation.validateAsync(req.params);
+			pauseMonitorParamValidation.parse(req.params);
 
 			const monitorId = requireString(req?.params?.monitorId, "Monitor ID");
 			const teamId = requireTeamId(req?.user?.teamId);
@@ -303,8 +336,8 @@ class MonitorController {
 
 	getMonitorsByTeamId = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			await getMonitorsByTeamIdParamValidation.validateAsync(req.params);
-			await getMonitorsByTeamIdQueryValidation.validateAsync(req.query);
+			getMonitorsByTeamIdParamValidation.parse(req.params);
+			getMonitorsByTeamIdQueryValidation.parse(req.query);
 
 			const teamId = requireTeamId(req?.user?.teamId);
 			const type = parseMonitorTypeFilter(req.query?.type);
@@ -324,8 +357,8 @@ class MonitorController {
 
 	getMonitorsWithChecksByTeamId = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			await getMonitorsByTeamIdParamValidation.validateAsync(req.params);
-			await getMonitorsWithChecksQueryValidation.validateAsync(req.query);
+			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");

server/src/controllers/notificationController.ts

@@ -1,7 +1,7 @@
 import { Request, Response, NextFunction } from "express";
 
 import { Notification } from "@/types/index.js";
-import { createNotificationBodyValidation } from "@/validation/joi.js";
+import { createNotificationBodyValidation } from "@/validation/notificationValidation.js";
 import { AppError } from "@/utils/AppError.js";
 import { IMonitorsRepository } from "@/repositories/index.js";
 import { INotificationsService } from "@/service/index.js";
@@ -42,9 +42,7 @@ class NotificationController {
 
 	createNotification = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			await createNotificationBodyValidation.validateAsync(req.body, {
-				abortEarly: false,
-			});
+			createNotificationBodyValidation.parse(req.body);
 
 			const body = req.body;
 
@@ -134,9 +132,7 @@ class NotificationController {
 
 	editNotification = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			await createNotificationBodyValidation.validateAsync(req.body, {
-				abortEarly: false,
-			});
+			createNotificationBodyValidation.parse(req.body);
 
 			const teamId = requireTeamId(req.user?.teamId);
 			const notificationId = req.params.id as string;

server/src/controllers/settingsController.ts

@@ -1,5 +1,6 @@
 import { Request, Response, NextFunction } from "express";
-import { sendTestEmailBodyValidation, updateAppSettingsBodyValidation } from "@/validation/joi.js";
+import { updateAppSettingsBodyValidation } from "@/validation/settingsValidation.js";
+import { sendTestEmailBodyValidation } from "@/validation/notificationValidation.js";
 import { AppError } from "@/utils/AppError.js";
 
 const SERVICE_NAME = "SettingsController";
@@ -55,20 +56,24 @@ class SettingsController {
 	};
 
 	updateAppSettings = async (req: Request, res: Response, next: NextFunction) => {
-		await updateAppSettingsBodyValidation.validateAsync(req.body);
+		try {
+			updateAppSettingsBodyValidation.parse(req.body);
 
-		const updatedSettings = await this.settingsService.updateDbSettings(req.body);
-		const returnSettings = this.buildAppSettings(updatedSettings);
-		return res.status(200).json({
-			success: true,
-			msg: "App settings updated successfully",
-			data: returnSettings,
-		});
+			const updatedSettings = await this.settingsService.updateDbSettings(req.body);
+			const returnSettings = this.buildAppSettings(updatedSettings);
+			return res.status(200).json({
+				success: true,
+				msg: "App settings updated successfully",
+				data: returnSettings,
+			});
+		} catch (error) {
+			next(error);
+		}
 	};
 
 	sendTestEmail = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			await sendTestEmailBodyValidation.validateAsync(req.body);
+			sendTestEmailBodyValidation.parse(req.body);
 
 			const {
 				to,

server/src/controllers/statusPageController.ts

@@ -1,12 +1,16 @@
 import { Request, Response, NextFunction } from "express";
 
-import { createStatusPageBodyValidation, getStatusPageParamValidation, getStatusPageQueryValidation, imageValidation } from "@/validation/joi.js";
+import {
+	createStatusPageBodyValidation,
+	getStatusPageParamValidation,
+	getStatusPageQueryValidation,
+	imageValidation,
+} from "@/validation/statusPageValidation.js";
 import { AppError } from "@/utils/AppError.js";
 import { requireTeamId, requireUserId } from "@/controllers/controllerUtils.js";
 import { IStatusPageService } from "@/service/business/statusPageService.js";
 import { IMonitorsRepository } from "@/repositories/index.js";
 import { ISettingsService } from "@/service/system/settingsService.js";
-import { ParseBoolean } from "@/utils/utils.js";
 import { NormalizeData } from "@/utils/dataUtils.js";
 
 const SERVICE_NAME = "statusPageController";
@@ -28,8 +32,10 @@ class StatusPageController {
 
 	createStatusPage = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			await createStatusPageBodyValidation.validateAsync(req.body);
-			await imageValidation.validateAsync(req.file);
+			createStatusPageBodyValidation.parse(req.body);
+			if (req.file) {
+				imageValidation.parse(req.file);
+			}
 
 			const teamId = requireTeamId(req?.user?.teamId);
 			const userId = requireUserId(req?.user?.id);
@@ -47,8 +53,10 @@ class StatusPageController {
 
 	updateStatusPage = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			await createStatusPageBodyValidation.validateAsync(req.body);
-			await imageValidation.validateAsync(req.file);
+			createStatusPageBodyValidation.parse(req.body);
+			if (req.file) {
+				imageValidation.parse(req.file);
+			}
 			const teamId = requireTeamId(req?.user?.teamId);
 			const statusPageId = req.params.id as string;
 			if (!statusPageId) {
@@ -70,8 +78,8 @@ class StatusPageController {
 
 	getStatusPageByUrl = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			await getStatusPageParamValidation.validateAsync(req.params);
-			await getStatusPageQueryValidation.validateAsync(req.query);
+			getStatusPageParamValidation.parse(req.params);
+			getStatusPageQueryValidation.parse(req.query);
 
 			if (!req.params.url) {
 				throw new AppError({ message: "Status page URL is required", status: 400 });
@@ -101,6 +109,7 @@ class StatusPageController {
 			const normalizedMonitors = sortedMonitors.map((monitor) => {
 				const normalizedChecks = NormalizeData(monitor.recentChecks, 10, 100);
 				if (!showURL) {
+					// eslint-disable-next-line @typescript-eslint/no-unused-vars
 					const { url, port, secret, notifications, ...rest } = monitor;
 					return { ...rest, checks: normalizedChecks };
 				}

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/migration/0004_fixInfrastructureThresholds.ts

@@ -0,0 +1,60 @@
+import { MonitorModel } from "../models/Monitor.js";
+import { logger } from "@/utils/logger.js";
+
+/**
+ * Fix infrastructure monitors that had thresholds incorrectly set to 0 or 5
+ * due to the old default value. Updates them to 100 (disabled).
+ */
+export async function fixInfrastructureThresholds(): Promise<void> {
+	const SERVICE_NAME = "Migration:FixInfrastructureThresholds";
+
+	try {
+		logger.info({ service: SERVICE_NAME, message: "Starting infrastructure threshold fix" });
+
+		const thresholdFields = ["cpuAlertThreshold", "memoryAlertThreshold", "diskAlertThreshold", "tempAlertThreshold"];
+
+		// Find hardware monitors with any threshold set to 0 or 5
+		const filter = {
+			type: "hardware",
+			$or: thresholdFields.flatMap((field) => [{ [field]: 0 }, { [field]: 5 }]),
+		};
+
+		const monitors = await MonitorModel.find(filter);
+
+		if (monitors.length === 0) {
+			logger.info({ service: SERVICE_NAME, message: "No monitors with threshold value of 0 or 5 found" });
+			return;
+		}
+
+		logger.info({
+			service: SERVICE_NAME,
+			message: `Found ${monitors.length} monitors with threshold value of 0 or 5`,
+		});
+
+		let updatedCount = 0;
+
+		for (const monitor of monitors) {
+			const update: Record<string, number> = {};
+
+			for (const field of thresholdFields) {
+				if ((monitor as any)[field] === 0 || (monitor as any)[field] === 5) {
+					update[field] = 100;
+				}
+			}
+
+			if (Object.keys(update).length > 0) {
+				await MonitorModel.updateOne({ _id: monitor._id }, { $set: update });
+				updatedCount++;
+			}
+		}
+
+		logger.info({
+			service: SERVICE_NAME,
+			message: `Fixed ${updatedCount} monitors — thresholds updated from 0/5 to 100`,
+		});
+	} catch (error) {
+		const errorMessage = error instanceof Error ? error.message : String(error);
+		logger.error({ service: SERVICE_NAME, message: `Error fixing thresholds: ${errorMessage}` });
+		throw error;
+	}
+}

server/src/db/migration/index.ts

@@ -1,6 +1,7 @@
 import { migrateStatusWindowThreshold } from "./0001_migrateStatusWindowThreshold.js";
 import { convertChecksToTimeSeries } from "./0002_convertChecksToTimeSeries.js";
 import { cleanupDuplicateMonitorStats } from "./0003_cleanupDuplicateMonitorStats.js";
+import { fixInfrastructureThresholds } from "./0004_fixInfrastructureThresholds.js";
 import MigrationModel from "../models/Migration.js";
 
 type MigrationEntry = {
@@ -12,6 +13,7 @@ const migrations: MigrationEntry[] = [
 	{ name: "0001_migrateStatusWindowThreshold", execute: migrateStatusWindowThreshold },
 	{ name: "0002_convertChecksToTimeSeries", execute: convertChecksToTimeSeries },
 	{ name: "0003_cleanupDuplicateMonitorStats", execute: cleanupDuplicateMonitorStats },
+	{ name: "0004_fixInfrastructureThresholds", execute: fixInfrastructureThresholds },
 ];
 
 const runMigrations = async (logger?: { info: Function; error: Function }) => {

server/src/db/models/Check.ts

@@ -11,8 +11,6 @@ import type {
 	CheckMemoryInfo,
 	CheckMetadata,
 	CheckNetworkInterfaceInfo,
-	GeoCheckResult,
-	GeoCheckTimings,
 	GotTimings,
 	ILighthouseAudit,
 } from "@/types/check.js";
@@ -177,34 +175,6 @@ const auditsSchema = new Schema<CheckAudits>(
 	{ _id: false }
 );
 
-const geoCheckTimingsSchema = new Schema<GeoCheckTimings>(
-	{
-		total: { type: Number, required: true },
-		dns: { type: Number },
-		tcp: { type: Number },
-		tls: { type: Number },
-		firstByte: { type: Number },
-		download: { type: Number },
-	},
-	{ _id: false }
-);
-
-const geoCheckResultSchema = new Schema<GeoCheckResult>(
-	{
-		continent: { type: String, required: true },
-		region: { type: String },
-		country: { type: String, required: true },
-		state: { type: String },
-		city: { type: String, required: true },
-		longitude: { type: Number, required: true },
-		latitude: { type: Number, required: true },
-		status: { type: Boolean, required: true },
-		statusCode: { type: Number, required: true },
-		timings: { type: geoCheckTimingsSchema, required: true },
-	},
-	{ _id: false }
-);
-
 const metadataSchema = new Schema<CheckMetadataDocument>(
 	{
 		monitorId: {
@@ -311,10 +281,6 @@ const CheckSchema = new Schema<CheckDocument>(
 			type: auditsSchema,
 			default: undefined,
 		},
-		geoResults: {
-			type: [geoCheckResultSchema],
-			default: undefined,
-		},
 	},
 	{
 		timestamps: true,

server/src/db/models/GeoCheck.ts

@@ -0,0 +1,116 @@
+import { Schema, model, Types } from "mongoose";
+import { MonitorTypes, type MonitorType } from "@/types/monitor.js";
+import type { GeoCheck, GeoCheckLocation, GeoCheckMetadata, GeoCheckResult, GeoCheckTimings } from "@/types/geoCheck.js";
+
+type GeoCheckMetadataDocument = Omit<GeoCheckMetadata, "monitorId" | "teamId"> & {
+	monitorId: Types.ObjectId;
+	teamId: Types.ObjectId;
+	type: MonitorType;
+};
+
+type GeoCheckDocumentBase = Omit<GeoCheck, "id" | "metadata" | "expiry" | "createdAt" | "updatedAt" | "results"> & {
+	metadata: GeoCheckMetadataDocument;
+	results: GeoCheckResult[];
+	expiry: Date;
+	createdAt: Date;
+	updatedAt: Date;
+	__v: number;
+};
+
+export interface GeoCheckDocument extends GeoCheckDocumentBase {
+	_id: Types.ObjectId;
+}
+
+const geoCheckMetadataSchema = new Schema<GeoCheckMetadataDocument>(
+	{
+		monitorId: { type: Schema.Types.ObjectId, required: true, index: true },
+		teamId: { type: Schema.Types.ObjectId, required: true, index: true },
+		type: { type: String, required: true, enum: MonitorTypes },
+	},
+	{ _id: false }
+);
+
+const geoCheckTimingsSchema = new Schema<GeoCheckTimings>(
+	{
+		total: { type: Number, default: 0 },
+		dns: { type: Number, default: 0 },
+		tcp: { type: Number, default: 0 },
+		tls: { type: Number, default: 0 },
+		firstByte: { type: Number, default: 0 },
+		download: { type: Number, default: 0 },
+	},
+	{ _id: false }
+);
+
+const geoCheckLocationSchema = new Schema<GeoCheckLocation>(
+	{
+		continent: { type: String, required: true },
+		region: { type: String, default: "" },
+		country: { type: String, default: "" },
+		state: { type: String, default: "" },
+		city: { type: String, default: "" },
+		longitude: { type: Number, default: 0 },
+		latitude: { type: Number, default: 0 },
+	},
+	{ _id: false }
+);
+
+const geoCheckResultSchema = new Schema<GeoCheckResult>(
+	{
+		location: {
+			type: geoCheckLocationSchema,
+			required: true,
+		},
+		status: {
+			type: Boolean,
+			required: true,
+		},
+		statusCode: {
+			type: Number,
+			required: true,
+		},
+		timings: {
+			type: geoCheckTimingsSchema,
+			required: true,
+		},
+	},
+	{ _id: false }
+);
+
+const GeoCheckSchema = new Schema<GeoCheckDocument>(
+	{
+		metadata: {
+			type: geoCheckMetadataSchema,
+			required: true,
+		},
+		results: {
+			type: [geoCheckResultSchema],
+			required: true,
+			default: [],
+		},
+		expiry: {
+			type: Date,
+			default: Date.now,
+		},
+	},
+	{
+		timestamps: true,
+		strict: false,
+		timeseries: {
+			timeField: "createdAt",
+			metaField: "metadata",
+			granularity: "seconds",
+		},
+	}
+);
+
+GeoCheckSchema.index({ "metadata.monitorId": 1, createdAt: -1 });
+GeoCheckSchema.index({ "metadata.monitorId": 1, createdAt: 1 });
+GeoCheckSchema.index({ "metadata.teamId": 1, createdAt: -1 });
+GeoCheckSchema.index({ createdAt: 1 });
+
+const GeoCheckModel = model<GeoCheckDocument>("GeoCheck", GeoCheckSchema);
+
+export type { GeoCheckMetadataDocument };
+export { GeoCheckModel };
+export default GeoCheckModel;

server/src/db/models/Monitor.ts

@@ -1,6 +1,6 @@
-import { Schema, model, Types } from "mongoose";
+import { Schema, model, Types, type UpdateQuery } from "mongoose";
 import type { Monitor, MonitorMatchMethod, CheckSnapshot } from "@/types/monitor.js";
-import { MonitorTypes, MonitorStatuses, GeoCheckLocations } from "@/types/monitor.js";
+import { MonitorTypes, MonitorStatuses } from "@/types/monitor.js";
 
 type CheckSnapshotDocument = Omit<CheckSnapshot, "createdAt"> & { createdAt: Date };
 
@@ -160,6 +160,10 @@ const MonitorSchema = new Schema<MonitorDocument>(
 		gameId: {
 			type: String,
 		},
+		grpcServiceName: {
+			type: String,
+			default: "",
+		},
 		group: {
 			type: String,
 			trim: true,
@@ -175,7 +179,6 @@ const MonitorSchema = new Schema<MonitorDocument>(
 		},
 		geoCheckLocations: {
 			type: [String],
-			enum: GeoCheckLocations,
 			default: [],
 		},
 		geoCheckInterval: {

server/src/db/models/index.ts

@@ -33,3 +33,6 @@ export { default as TeamModel } from "@/db/models/Team.js";
 
 export * from "@/db/models/MaintenanceWindow.js";
 export { default as MaintenanceWindowModel } from "@/db/models/MaintenanceWindow.js";
+
+export * from "@/db/models/GeoCheck.js";
+export { default as GeoCheckModel } from "@/db/models/GeoCheck.js";

server/src/index.ts

@@ -2,19 +2,23 @@ import { initializeServices } from "./config/services.js";
 import { initializeControllers } from "./config/controllers.js";
 import { createApp } from "./app.js";
 import { initShutdownListener } from "./shutdown.js";
+import { validateEnv } from "./validation/envValidation.js";
 import { fileURLToPath } from "url";
 import path from "path";
 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";
 let logger: ILogger;
 
 const startApp = async () => {
+	// Validate environment variables first
+	const env = validateEnv();
+
 	// FE path
 	const __filename = fileURLToPath(import.meta.url);
 	const __dirname = path.dirname(__filename);
@@ -23,7 +27,7 @@ const startApp = async () => {
 
 	// Create services
 	const settingsRepository = new MongoSettingsRepository();
-	const settingsService = new SettingsService(settingsRepository);
+	const settingsService = new SettingsService(settingsRepository, env);
 
 	const envSettings = settingsService.loadSettings();
 
@@ -46,9 +50,8 @@ const startApp = async () => {
 		openApiSpec,
 	});
 
-	const port = envSettings.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

@@ -20,12 +20,19 @@ export interface IChecksRepository {
 		monitorId: string,
 		sortOrder: string,
 		dateRange: string,
-		filter: string,
+		filter: string | undefined,
 		page: number,
 		rowsPerPage: number,
 		status: boolean | undefined
 	): Promise<ChecksQueryResult>;
-	findByTeamId(sortOrder: string, dateRange: string, filter: string, page: number, rowsPerPage: number, teamId: string): Promise<ChecksQueryResult>;
+	findByTeamId(
+		sortOrder: string,
+		dateRange: string,
+		filter: string | undefined,
+		page: number,
+		rowsPerPage: number,
+		teamId: string
+	): Promise<ChecksQueryResult>;
 	findLatestByMonitorIds(monitorIds: string[], options?: { limitPerMonitor?: number }): Promise<LatestChecksMap>;
 	findByDateRangeAndMonitorId(
 		monitorId: string,

server/src/repositories/checks/MongoChecksRepistory.ts

@@ -10,25 +10,15 @@ import type {
 	CheckMemoryInfo,
 	CheckMetadata,
 	CheckNetworkInterfaceInfo,
-	GeoCheckResult,
-	GeoCheckTimings,
 	GotTimings,
 	MonitorType,
 } from "@/types/index.js";
 import { CheckModel, MonitorModel, type CheckDocument } from "@/db/models/index.js";
 import mongoose from "mongoose";
+import { getDateForRange } from "@/utils/dataUtils.js";
 
 const SERVICE_NAME = "StatusService";
 
-const dateRangeLookup: Record<string, Date | undefined> = {
-	recent: new Date(new Date().setHours(new Date().getHours() - 2)),
-	hour: new Date(new Date().setHours(new Date().getHours() - 1)),
-	day: new Date(new Date().setDate(new Date().getDate() - 1)),
-	week: new Date(new Date().setDate(new Date().getDate() - 7)),
-	month: new Date(new Date().setMonth(new Date().getMonth() - 1)),
-	all: undefined,
-};
-
 export type LatestChecksMap = Record<string, Check[]>;
 type DateRange = { start: Date; end: Date };
 type HardwareUpChecks = { totalChecks: number };
@@ -167,33 +157,6 @@ class MongoChecksRepository implements IChecksRepository {
 			};
 		};
 
-		const mapGeoTimings = (timings?: GeoCheckTimings): GeoCheckTimings => ({
-			total: timings?.total ?? 0,
-			dns: timings?.dns,
-			tcp: timings?.tcp,
-			tls: timings?.tls,
-			firstByte: timings?.firstByte,
-			download: timings?.download,
-		});
-
-		const mapGeoResults = (geoResults?: GeoCheckResult[]): GeoCheckResult[] | undefined => {
-			if (!geoResults?.length) {
-				return undefined;
-			}
-			return geoResults.map((result) => ({
-				continent: result.continent ?? "",
-				region: result.region,
-				country: result.country ?? "",
-				state: result.state,
-				city: result.city ?? "",
-				longitude: result.longitude ?? 0,
-				latitude: result.latitude ?? 0,
-				status: result.status ?? false,
-				statusCode: result.statusCode ?? 0,
-				timings: mapGeoTimings(result.timings),
-			}));
-		};
-
 		const mapMetadata = (metadata: CheckDocument["metadata"]): CheckMetadata => ({
 			monitorId: toStringId(metadata.monitorId),
 			teamId: toStringId(metadata.teamId),
@@ -223,7 +186,6 @@ class MongoChecksRepository implements IChecksRepository {
 			seo: doc.seo,
 			performance: doc.performance,
 			audits: mapAudits(doc.audits),
-			geoResults: mapGeoResults(doc.geoResults),
 			__v: doc.__v ?? 0,
 			createdAt: toDateString(doc.createdAt),
 			updatedAt: toDateString(doc.updatedAt),
@@ -269,7 +231,7 @@ class MongoChecksRepository implements IChecksRepository {
 		monitorId: string,
 		sortOrder: string,
 		dateRange: string,
-		filter: string,
+		filter: string | undefined,
 		page: number,
 		rowsPerPage: number,
 		status: boolean | undefined
@@ -278,9 +240,9 @@ class MongoChecksRepository implements IChecksRepository {
 		const matchStage: Record<string, any> = {
 			"metadata.monitorId": new mongoose.Types.ObjectId(monitorId),
 			...(typeof status !== "undefined" && { status }),
-			...(dateRangeLookup[dateRange] && {
+			...(getDateForRange(dateRange) && {
 				createdAt: {
-					$gte: dateRangeLookup[dateRange],
+					$gte: getDateForRange(dateRange),
 				},
 			}),
 		};
@@ -329,9 +291,9 @@ class MongoChecksRepository implements IChecksRepository {
 	findByTeamId = async (sortOrder: string, dateRange: string, filter: string, page: number, rowsPerPage: number, teamId: string) => {
 		const matchStage: Record<string, any> = {
 			"metadata.teamId": new mongoose.Types.ObjectId(teamId),
-			...(dateRangeLookup[dateRange] && {
+			...(getDateForRange(dateRange) && {
 				createdAt: {
-					$gte: dateRangeLookup[dateRange],
+					$gte: getDateForRange(dateRange),
 				},
 			}),
 		};
@@ -416,9 +378,9 @@ class MongoChecksRepository implements IChecksRepository {
 	findSummaryByTeamId = async (teamId: string, dateRange: string) => {
 		const baseMatch = {
 			"metadata.teamId": new mongoose.Types.ObjectId(teamId),
-			...(dateRangeLookup[dateRange] && {
+			...(getDateForRange(dateRange) && {
 				createdAt: {
-					$gte: dateRangeLookup[dateRange],
+					$gte: getDateForRange(dateRange),
 				},
 			}),
 		};
@@ -457,131 +419,85 @@ class MongoChecksRepository implements IChecksRepository {
 		endDate: Date,
 		dateString: string
 	) => {
-		// Match stage for primary checks (exclude geo checks)
-		const primaryCheckMatchStage = {
+		const matchStage = {
 			"metadata.monitorId": monitorObjectId,
 			createdAt: { $gte: startDate, $lte: endDate },
-			geoResults: { $exists: false },
 		};
-
-		// Match stage for geo checks only
-		const geoCheckMatchStage = {
-			"metadata.monitorId": monitorObjectId,
-			createdAt: { $gte: startDate, $lte: endDate },
-			geoResults: { $exists: true, $ne: null },
-		};
-
-		// Run two separate aggregations - one for primary checks, one for geo checks
-		// TODO, only do this if the monitor has geochecks enabled, otherwise we only need one aggregation
-		const [primaryResult, geoResults] = await Promise.all([
-			CheckModel.aggregate([
-				{ $match: primaryCheckMatchStage },
-				{ $sort: { createdAt: 1 } },
-				{
-					$facet: {
-						uptimePercentage: [
-							{
-								$group: {
-									_id: null,
-									upChecks: { $sum: { $cond: [{ $eq: ["$status", true] }, 1, 0] } },
-									totalChecks: { $sum: 1 },
-								},
+		const [result] = await CheckModel.aggregate([
+			{ $match: matchStage },
+			{ $sort: { createdAt: 1 } },
+			{
+				$facet: {
+					uptimePercentage: [
+						{
+							$group: {
+								_id: null,
+								upChecks: { $sum: { $cond: [{ $eq: ["$status", true] }, 1, 0] } },
+								totalChecks: { $sum: 1 },
 							},
-							{
-								$project: {
-									_id: 0,
-									percentage: {
-										$cond: [{ $eq: ["$totalChecks", 0] }, 0, { $divide: ["$upChecks", "$totalChecks"] }],
-									},
-								},
-							},
-						],
-						groupedAvgResponseTime: [
-							{
-								$group: {
-									_id: null,
-									avgResponseTime: { $avg: "$responseTime" },
-								},
-							},
-						],
-						groupedChecks: [
-							{
-								$group: {
-									_id: {
-										$dateToString: { format: dateString, date: "$createdAt" },
-									},
-									avgResponseTime: { $avg: "$responseTime" },
-									totalChecks: { $sum: 1 },
-								},
-							},
-							{ $sort: { _id: 1 } },
-							{ $project: { bucketDate: "$_id", avgResponseTime: 1, totalChecks: 1, _id: 0 } },
-						],
-						groupedUpChecks: [
-							{ $match: { status: true } },
-							{
-								$group: {
-									_id: {
-										$dateToString: { format: dateString, date: "$createdAt" },
-									},
-									totalChecks: { $sum: 1 },
-									avgResponseTime: { $avg: "$responseTime" },
-								},
-							},
-							{ $sort: { _id: 1 } },
-							{ $project: { bucketDate: "$_id", avgResponseTime: 1, totalChecks: 1, _id: 0 } },
-						],
-						groupedDownChecks: [
-							{ $match: { status: false } },
-							{
-								$group: {
-									_id: {
-										$dateToString: { format: dateString, date: "$createdAt" },
-									},
-									totalChecks: { $sum: 1 },
-									avgResponseTime: { $avg: "$responseTime" },
-								},
-							},
-							{ $sort: { _id: 1 } },
-							{ $project: { bucketDate: "$_id", avgResponseTime: 1, totalChecks: 1, _id: 0 } },
-						],
-					},
-				},
-			]),
-			CheckModel.aggregate([
-				{ $match: geoCheckMatchStage },
-				{ $sort: { createdAt: 1 } },
-				{ $unwind: "$geoResults" },
-				{
-					$group: {
-						_id: {
-							date: { $dateToString: { format: dateString, date: "$createdAt" } },
-							continent: "$geoResults.continent",
 						},
-						avgResponseTime: { $avg: "$geoResults.timings.total" },
-						totalChecks: { $sum: 1 },
-						upChecks: { $sum: { $cond: [{ $eq: ["$geoResults.status", true] }, 1, 0] } },
-					},
-				},
-				{
-					$project: {
-						_id: 0,
-						bucketDate: "$_id.date",
-						continent: "$_id.continent",
-						avgResponseTime: 1,
-						totalChecks: 1,
-						uptimePercentage: {
-							$cond: [{ $eq: ["$totalChecks", 0] }, 0, { $divide: ["$upChecks", "$totalChecks"] }],
+						{
+							$project: {
+								_id: 0,
+								percentage: {
+									$cond: [{ $eq: ["$totalChecks", 0] }, 0, { $divide: ["$upChecks", "$totalChecks"] }],
+								},
+							},
 						},
-					},
+					],
+					groupedAvgResponseTime: [
+						{
+							$group: {
+								_id: null,
+								avgResponseTime: { $avg: "$responseTime" },
+							},
+						},
+					],
+					groupedChecks: [
+						{
+							$group: {
+								_id: {
+									$dateToString: { format: dateString, date: "$createdAt" },
+								},
+								avgResponseTime: { $avg: "$responseTime" },
+								totalChecks: { $sum: 1 },
+							},
+						},
+						{ $sort: { _id: 1 } },
+						{ $project: { bucketDate: "$_id", avgResponseTime: 1, totalChecks: 1, _id: 0 } },
+					],
+					groupedUpChecks: [
+						{ $match: { status: true } },
+						{
+							$group: {
+								_id: {
+									$dateToString: { format: dateString, date: "$createdAt" },
+								},
+								totalChecks: { $sum: 1 },
+								avgResponseTime: { $avg: "$responseTime" },
+							},
+						},
+						{ $sort: { _id: 1 } },
+						{ $project: { bucketDate: "$_id", avgResponseTime: 1, totalChecks: 1, _id: 0 } },
+					],
+					groupedDownChecks: [
+						{ $match: { status: false } },
+						{
+							$group: {
+								_id: {
+									$dateToString: { format: dateString, date: "$createdAt" },
+								},
+								totalChecks: { $sum: 1 },
+								avgResponseTime: { $avg: "$responseTime" },
+							},
+						},
+						{ $sort: { _id: 1 } },
+						{ $project: { bucketDate: "$_id", avgResponseTime: 1, totalChecks: 1, _id: 0 } },
+					],
 				},
-				{ $sort: { bucketDate: 1, continent: 1 } },
-			]),
+			},
 		]);
 
-		const [result] = primaryResult;
-		const groupedGeoChecks = geoResults ?? [];
-
 		const uptimePercentage = result?.uptimePercentage?.[0]?.percentage ?? 0;
 		const avgResponseTime = result?.groupedAvgResponseTime?.[0]?.avgResponseTime ?? 0;
 
@@ -592,7 +508,6 @@ class MongoChecksRepository implements IChecksRepository {
 			groupedDownChecks: result?.groupedDownChecks ?? [],
 			uptimePercentage,
 			avgResponseTime,
-			groupedGeoChecks,
 		};
 	};
 

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

@@ -0,0 +1,35 @@
+import type { GeoCheck, GroupedGeoCheck } from "@/types/geoCheck.js";
+import type { GeoContinent, FlatGeoCheck } from "@/types/geoCheck.js";
+
+export interface GeoChecksQueryResult {
+	geoChecksCount: number;
+	geoChecks: GeoCheck[];
+}
+
+export interface FlatGeoChecksQueryResult {
+	geoChecksCount: number;
+	geoChecks: FlatGeoCheck[];
+}
+
+export interface IGeoChecksRepository {
+	createGeoChecks(geoChecks: Omit<GeoCheck, "id" | "__v" | "createdAt" | "updatedAt">[]): Promise<GeoCheck[]>;
+	findByMonitorId(
+		monitorId: string,
+		sortOrder: string,
+		dateRange: string,
+		page: number,
+		rowsPerPage: number,
+		continents?: GeoContinent[]
+	): Promise<FlatGeoChecksQueryResult>;
+	findByMonitorIdAndDateRange(monitorId: string, startDate: Date, endDate: Date): Promise<GeoCheck[]>;
+	findGroupedByMonitorIdAndDateRange(
+		monitorId: string,
+		startDate: Date,
+		endDate: Date,
+		dateFormat: string,
+		continents?: GeoContinent[]
+	): Promise<GroupedGeoCheck[]>;
+	deleteByMonitorId(monitorId: string): Promise<number>;
+	deleteByTeamId(teamId: string): Promise<number>;
+	deleteByMonitorIdsNotIn(monitorIds: string[]): Promise<number>;
+}

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

@@ -0,0 +1,387 @@
+import { IGeoChecksRepository } from "./IGeoChecksRepository.js";
+import type { GeoCheck, GeoCheckMetadata, GeoCheckResult, GroupedGeoCheck, GeoContinent, FlatGeoCheck } from "@/types/geoCheck.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: ILogger;
+	constructor(logger: ILogger) {
+		this.logger = logger;
+	}
+
+	private toEntity = (doc: GeoCheckDocument): GeoCheck => {
+		const toStringId = (value: mongoose.Types.ObjectId | string | undefined | null): string => {
+			if (!value) {
+				return "";
+			}
+			return value instanceof mongoose.Types.ObjectId ? value.toString() : String(value);
+		};
+
+		const toDateString = (value?: Date | string | null): string => {
+			if (!value) {
+				return new Date(0).toISOString();
+			}
+			return value instanceof Date ? value.toISOString() : new Date(value).toISOString();
+		};
+
+		const mapMetadata = (metadata: any): GeoCheckMetadata => ({
+			monitorId: toStringId(metadata.monitorId),
+			teamId: toStringId(metadata.teamId),
+			type: metadata.type,
+		});
+
+		const mapResults = (results: any[]): GeoCheckResult[] => {
+			if (!results || !Array.isArray(results)) {
+				return [];
+			}
+			return results.map((result) => ({
+				location: {
+					continent: result.location?.continent ?? "",
+					region: result.location?.region ?? "",
+					country: result.location?.country ?? "",
+					state: result.location?.state ?? "",
+					city: result.location?.city ?? "",
+					longitude: result.location?.longitude ?? 0,
+					latitude: result.location?.latitude ?? 0,
+				},
+				status: result.status ?? false,
+				statusCode: result.statusCode ?? 0,
+				timings: {
+					total: result.timings?.total ?? 0,
+					dns: result.timings?.dns ?? 0,
+					tcp: result.timings?.tcp ?? 0,
+					tls: result.timings?.tls ?? 0,
+					firstByte: result.timings?.firstByte ?? 0,
+					download: result.timings?.download ?? 0,
+				},
+			}));
+		};
+
+		return {
+			id: toStringId(doc._id),
+			metadata: mapMetadata(doc.metadata),
+			results: mapResults(doc.results),
+			expiry: toDateString(doc.expiry),
+			__v: doc.__v ?? 0,
+			createdAt: toDateString(doc.createdAt),
+			updatedAt: toDateString(doc.updatedAt),
+		};
+	};
+
+	createGeoChecks = async (geoChecks: Omit<GeoCheck, "id" | "__v" | "createdAt" | "updatedAt">[]): Promise<GeoCheck[]> => {
+		try {
+			const docs = await GeoCheckModel.insertMany(
+				geoChecks.map((geoCheck) => ({
+					metadata: {
+						monitorId: new mongoose.Types.ObjectId(geoCheck.metadata.monitorId),
+						teamId: new mongoose.Types.ObjectId(geoCheck.metadata.teamId),
+						type: geoCheck.metadata.type,
+					},
+					results: geoCheck.results,
+					expiry: new Date(geoCheck.expiry),
+				}))
+			);
+			return docs.map((doc) => this.toEntity(doc));
+		} catch (error: any) {
+			this.logger.error({
+				message: `Failed to createGeoChecks: ${error.message}`,
+				service: SERVICE_NAME,
+				method: "createGeoChecks",
+				stack: error.stack,
+			});
+			throw error;
+		}
+	};
+
+	findByMonitorId = async (
+		monitorId: string,
+		sortOrder: string,
+		dateRange: string,
+		page: number,
+		rowsPerPage: number,
+		continents?: GeoContinent[]
+	): Promise<FlatGeoChecksQueryResult> => {
+		try {
+			const matchStage: Record<string, any> = {
+				"metadata.monitorId": new mongoose.Types.ObjectId(monitorId),
+				...(getDateForRange(dateRange) && {
+					createdAt: {
+						$gte: getDateForRange(dateRange),
+					},
+				}),
+			};
+
+			const convertedSortOrder = sortOrder === "asc" ? 1 : -1;
+
+			let skip = 0;
+			if (page && rowsPerPage) {
+				skip = page * rowsPerPage;
+			}
+
+			if (continents && continents.length > 0) {
+				const pipeline: any[] = [
+					{ $match: matchStage },
+					{ $unwind: "$results" },
+					{
+						$match: {
+							"results.location.continent": { $in: continents },
+						},
+					},
+				];
+			} else {
+				const pipeline: any[] = [{ $match: matchStage }, { $unwind: "$results" }];
+			}
+
+			// Common pipeline stages for both paths
+			const pipeline: any[] = [
+				{ $match: matchStage },
+				{ $unwind: "$results" },
+				// Filter by continent if specified
+				...(continents && continents.length > 0
+					? [
+							{
+								$match: {
+									"results.location.continent": { $in: continents },
+								},
+							},
+						]
+					: []),
+				// Project to flat structure
+				{
+					$project: {
+						_id: 0,
+						monitorId: "$metadata.monitorId",
+						teamId: "$metadata.teamId",
+						type: "$metadata.type",
+						location: "$results.location",
+						status: "$results.status",
+						statusCode: "$results.statusCode",
+						timings: "$results.timings",
+						createdAt: 1,
+						updatedAt: 1,
+					},
+				},
+				{ $sort: { createdAt: convertedSortOrder } },
+				{ $skip: skip },
+				{ $limit: rowsPerPage },
+			];
+
+			// Count pipeline
+			const countPipeline: any[] = [
+				{ $match: matchStage },
+				{ $unwind: "$results" },
+				...(continents && continents.length > 0
+					? [
+							{
+								$match: {
+									"results.location.continent": { $in: continents },
+								},
+							},
+						]
+					: []),
+				{ $count: "count" },
+			];
+
+			const [countResult, dataResults] = await Promise.all([GeoCheckModel.aggregate(countPipeline), GeoCheckModel.aggregate(pipeline)]);
+
+			const geoChecksCount = countResult[0]?.count || 0;
+			const geoChecks: FlatGeoCheck[] = dataResults.map((doc) => ({
+				id: `${doc.monitorId.toString()}-${new Date(doc.createdAt).getTime()}-${doc.location.continent}-${doc.location.city}-${Math.random().toString(36).substring(2, 15)}`,
+				monitorId: doc.monitorId.toString(),
+				teamId: doc.teamId.toString(),
+				type: doc.type,
+				location: doc.location,
+				status: doc.status,
+				statusCode: doc.statusCode,
+				timings: doc.timings,
+				createdAt: new Date(doc.createdAt).toISOString(),
+				updatedAt: new Date(doc.updatedAt).toISOString(),
+			}));
+
+			return { geoChecksCount, geoChecks };
+		} catch (error: any) {
+			this.logger.error({
+				message: `Error finding geo checks by monitor ID: ${error.message}`,
+				service: SERVICE_NAME,
+				method: "findByMonitorId",
+				stack: error.stack,
+			});
+			throw error;
+		}
+	};
+
+	findByMonitorIdAndDateRange = async (monitorId: string, startDate: Date, endDate: Date): Promise<GeoCheck[]> => {
+		try {
+			const docs = await GeoCheckModel.find({
+				"metadata.monitorId": new mongoose.Types.ObjectId(monitorId),
+				createdAt: {
+					$gte: startDate,
+					$lte: endDate,
+				},
+			}).sort({ createdAt: -1 });
+			return docs.map(this.toEntity);
+		} catch (error: any) {
+			this.logger.error({
+				message: `Error finding geo checks by monitor ID and date range: ${error.message}`,
+				service: SERVICE_NAME,
+				method: "findByMonitorIdAndDateRange",
+			});
+			throw error;
+		}
+	};
+
+	findGroupedByMonitorIdAndDateRange = async (
+		monitorId: string,
+		startDate: Date,
+		endDate: Date,
+		dateFormat: string,
+		continents?: GeoContinent[]
+	): Promise<GroupedGeoCheck[]> => {
+		try {
+			const pipeline: any[] = [
+				// Match geo checks for this monitor in date range
+				{
+					$match: {
+						"metadata.monitorId": new mongoose.Types.ObjectId(monitorId),
+						createdAt: {
+							$gte: startDate,
+							$lte: endDate,
+						},
+					},
+				},
+				// Unwind the results array to process each location separately
+				{
+					$unwind: "$results",
+				},
+				// Filter by continent if specified
+				...(continents && continents.length > 0
+					? [
+							{
+								$match: {
+									"results.location.continent": { $in: continents },
+								},
+							},
+						]
+					: []),
+				// Group by date bucket and continent
+				{
+					$group: {
+						_id: {
+							bucketDate: {
+								$dateToString: {
+									format: dateFormat,
+									date: "$createdAt",
+								},
+							},
+							continent: "$results.location.continent",
+						},
+						avgResponseTime: { $avg: "$results.timings.total" },
+						totalChecks: { $sum: 1 },
+						upChecks: {
+							$sum: {
+								$cond: ["$results.status", 1, 0],
+							},
+						},
+					},
+				},
+				// Calculate uptime percentage
+				{
+					$project: {
+						_id: 0,
+						bucketDate: "$_id.bucketDate",
+						continent: "$_id.continent",
+						avgResponseTime: { $round: ["$avgResponseTime", 2] },
+						totalChecks: 1,
+						uptimePercentage: {
+							$round: [
+								{
+									$multiply: [
+										{
+											$divide: ["$upChecks", "$totalChecks"],
+										},
+										100,
+									],
+								},
+								2,
+							],
+						},
+					},
+				},
+				// Sort by date and continent
+				{
+					$sort: {
+						bucketDate: 1,
+						continent: 1,
+					},
+				},
+			];
+
+			const results = await GeoCheckModel.aggregate(pipeline);
+			return results as GroupedGeoCheck[];
+		} catch (error: any) {
+			this.logger.error({
+				message: `Error finding grouped geo checks: ${error.message}`,
+				service: SERVICE_NAME,
+				method: "findGroupedByMonitorIdAndDateRange",
+			});
+			throw error;
+		}
+	};
+
+	deleteByMonitorId = async (monitorId: string): Promise<number> => {
+		try {
+			const result = await GeoCheckModel.deleteMany({
+				"metadata.monitorId": new mongoose.Types.ObjectId(monitorId),
+			});
+			return result.deletedCount || 0;
+		} catch (error: any) {
+			this.logger.error({
+				message: `Error deleting geo checks by monitor ID: ${error.message}`,
+				service: SERVICE_NAME,
+				method: "deleteByMonitorId",
+			});
+			throw error;
+		}
+	};
+
+	deleteByTeamId = async (teamId: string): Promise<number> => {
+		try {
+			const result = await GeoCheckModel.deleteMany({
+				"metadata.teamId": new mongoose.Types.ObjectId(teamId),
+			});
+			return result.deletedCount || 0;
+		} catch (error: any) {
+			this.logger.error({
+				message: `Error deleting geo checks by team ID: ${error.message}`,
+				service: SERVICE_NAME,
+				method: "deleteByTeamId",
+			});
+			throw error;
+		}
+	};
+
+	deleteByMonitorIdsNotIn = async (monitorIds: string[]): Promise<number> => {
+		try {
+			const objectIds = monitorIds.map((id) => new mongoose.Types.ObjectId(id));
+			const result = await GeoCheckModel.deleteMany({ "metadata.monitorId": { $nin: objectIds } });
+			return result.deletedCount || 0;
+		} catch (error: any) {
+			this.logger.error({
+				message: `Error deleting orphaned geo checks: ${error.message}`,
+				service: SERVICE_NAME,
+				method: "deleteByMonitorIdsNotIn",
+			});
+			throw error;
+		}
+	};
+}
+
+export { MongoGeoChecksRepository };
+export default MongoGeoChecksRepository;

server/src/repositories/index.ts

@@ -33,3 +33,6 @@ export { default as MongoTeamsRepository } from "@/repositories/teams/MongoTeams
 
 export * from "@/repositories/maintenance-windows/IMaintenanceWindowsRepository.js";
 export { default as MongoMaintenanceWindowsRepository } from "@/repositories/maintenance-windows/MongoMaintenanceWindowsRepository.js";
+
+export * from "@/repositories/geo-checks/IGeoChecksRepository.js";
+export { default as MongoGeoChecksRepository } from "@/repositories/geo-checks/MongoGeoChecksRepository.js";

server/src/repositories/invites/MongoInviteRepository.ts

@@ -36,7 +36,7 @@ class MongoInvitesRepository implements IInvitesRepository {
 	create = async (invite: Partial<Invite>) => {
 		await InviteModel.deleteMany({ email: invite.email });
 		invite.token = crypto.randomBytes(32).toString("hex");
-		let inviteToken = await InviteModel.create(invite);
+		const inviteToken = await InviteModel.create(invite);
 		return this.toEntity(inviteToken);
 	};
 

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

@@ -92,7 +92,7 @@ class MongoMaintenanceWindowsRepository implements IMaintenanceWindowsRepository
 		}
 
 		// Sorting
-		let sort: Record<string, any> = {};
+		const sort: Record<string, any> = {};
 		if (field !== undefined && order !== undefined) {
 			sort[field] = order === "asc" ? 1 : -1;
 		}

server/src/repositories/monitors/MongoMonitorsRepository.ts

@@ -352,11 +352,12 @@ class MongoMonitorsRepository implements IMonitorsRepository {
 			tempAlertCounter: doc.tempAlertCounter,
 			selectedDisks: doc.selectedDisks ?? [],
 			gameId: doc.gameId ?? undefined,
+			grpcServiceName: doc.grpcServiceName ?? undefined,
 			group: doc.group ?? null,
+			recentChecks: (doc.recentChecks ?? []).map((check: any) => this.toCheckSnapshot(check)),
 			geoCheckEnabled: doc.geoCheckEnabled ?? false,
 			geoCheckLocations: doc.geoCheckLocations ?? [],
-			geoCheckInterval: doc.geoCheckInterval ?? 5,
-			recentChecks: (doc.recentChecks ?? []).map((check: any) => this.toCheckSnapshot(check)),
+			geoCheckInterval: doc.geoCheckInterval ?? 300000,
 			createdAt: toDateString(doc.createdAt),
 			updatedAt: toDateString(doc.updatedAt),
 		};
@@ -410,11 +411,12 @@ class MongoMonitorsRepository implements IMonitorsRepository {
 			tempAlertCounter: doc.tempAlertCounter,
 			selectedDisks: doc.selectedDisks ?? [],
 			gameId: doc.gameId ?? undefined,
+			grpcServiceName: doc.grpcServiceName ?? undefined,
 			group: doc.group ?? null,
+			recentChecks: (doc.recentChecks ?? []).map((check: any) => this.toCheckSnapshot(check)),
 			geoCheckEnabled: doc.geoCheckEnabled ?? false,
 			geoCheckLocations: doc.geoCheckLocations ?? [],
-			geoCheckInterval: doc.geoCheckInterval ?? 5,
-			recentChecks: (doc.recentChecks ?? []).map((check: any) => this.toCheckSnapshot(check)),
+			geoCheckInterval: doc.geoCheckInterval ?? 300000,
 			createdAt: toDateString(doc.createdAt),
 			updatedAt: toDateString(doc.updatedAt),
 		};

server/src/repositories/notifications/MongoNotificationsRepository.ts

@@ -3,7 +3,6 @@ import { NotificationModel, type NotificationDocument } from "@/db/models/index.
 import { INotificationsRepository } from "@/repositories/index.js";
 import type { Notification } from "@/types/index.js";
 import { AppError } from "@/utils/AppError.js";
-import { not } from "joi";
 
 class MongoNotificationsRepository implements INotificationsRepository {
 	private mapDocuments = (documents: NotificationDocument[]): Notification[] => {

server/src/repositories/settings/MongoSettingsRepository.ts

@@ -52,7 +52,7 @@ class MongoSettingsRepository implements ISettingsRepository {
 	};
 
 	findSingleton = async () => {
-		let settings = await AppSettingsModel.findOne({ singleton: true }).select("-__v -_id -createdAt -updatedAt -singleton").lean();
+		const settings = await AppSettingsModel.findOne({ singleton: true }).select("-__v -_id -createdAt -updatedAt -singleton").lean();
 		if (!settings) {
 			return null;
 		}

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/geoCheckRoutes.ts

@@ -0,0 +1,22 @@
+import { Router } from "express";
+
+class GeoCheckRoutes {
+	private router: Router;
+	private geoCheckController: any;
+
+	constructor(geoCheckController: any) {
+		this.router = Router();
+		this.geoCheckController = geoCheckController;
+		this.initRoutes();
+	}
+
+	initRoutes() {
+		this.router.get("/:monitorId", this.geoCheckController.getGeoChecksByMonitor);
+	}
+
+	getRouter() {
+		return this.router;
+	}
+}
+
+export default GeoCheckRoutes;

server/src/routes/monitorRoute.ts

@@ -30,6 +30,9 @@ class MonitorRoutes {
 		// PageSpeed routes
 		this.router.get("/pagespeed/details/:monitorId", this.monitorController.getPageSpeedDetailsById);
 
+		// Geo checks routes
+		this.router.get("/:monitorId/geo-checks", this.monitorController.getGeoChecksByMonitorId);
+
 		// General monitor routes
 		this.router.post("/pause/:monitorId", isAllowed(["admin", "superadmin"]), this.monitorController.pauseMonitor);
 

server/src/service/business/checkService.ts

@@ -1,28 +1,31 @@
-import { requireTeamId } from "@/controllers/controllerUtils.js";
 import { Types } from "mongoose";
 import { IChecksRepository, IMonitorsRepository } from "@/repositories/index.js";
-import type { MonitorType, MonitorStatusResponse, CheckErrorInfo, Check } from "@/types/index.js";
+import type { MonitorStatusResponse, CheckErrorInfo, Check, ILighthouseAudit, ChecksQueryResult, ChecksSummary } 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";
 
-class 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>;
+	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>;
+}
+
+export class CheckService implements ICheckService {
 	static SERVICE_NAME = SERVICE_NAME;
 
 	private monitorsRepository: IMonitorsRepository;
 	private checksRepository: IChecksRepository;
-	private logger: any;
-	constructor({
-		monitorsRepository,
-		logger,
-		checksRepository,
-	}: {
-		monitorsRepository: IMonitorsRepository;
-		logger: any;
-		checksRepository: IChecksRepository;
-	}) {
+	private logger: ILogger;
+	constructor(monitorsRepository: IMonitorsRepository, logger: ILogger, checksRepository: IChecksRepository) {
 		this.monitorsRepository = monitorsRepository;
 		this.logger = logger;
 		this.checksRepository = checksRepository;
@@ -61,13 +64,12 @@ class CheckService {
 					message: "Failed to build check",
 					service: SERVICE_NAME,
 					method: "buildCheck",
-					details: "empty payload",
 				});
 				return undefined;
 			}
 			const categories = pageSpeedPayload.lighthouseResult?.categories ?? {};
 			const audits = pageSpeedPayload.lighthouseResult?.audits ?? {};
-			const mapAudit = (audit: any) => {
+			const mapAudit = (audit: ILighthouseAudit | undefined) => {
 				if (!audit || typeof audit !== "object") {
 					return undefined;
 				}
@@ -110,7 +112,7 @@ class CheckService {
 		return check;
 	};
 
-	getChecksByMonitor = async ({ monitorId, query, teamId }: { monitorId: string; query: any; teamId: string }) => {
+	getChecksByMonitor = async ({ monitorId, query, teamId }: { monitorId: string; query: Record<string, string>; teamId: string }) => {
 		if (!monitorId) {
 			throw new AppError({ message: "No monitor ID in request", service: SERVICE_NAME, method: "getChecksByMonitor", status: 400 });
 		}
@@ -118,28 +120,39 @@ class CheckService {
 			throw new AppError({ message: "No team ID in request", service: SERVICE_NAME, method: "getChecksByMonitor", status: 400 });
 		}
 
-		// For verificaiton, throws an error if monitor doesn't belong to team
+		// For verification, throws an error if monitor doesn't belong to team
 		await this.monitorsRepository.findById(monitorId, teamId);
 
-		let { sortOrder, dateRange, filter, page, rowsPerPage, status } = query;
+		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) : page;
-		const parsedRowsPerPage = rowsPerPage ? parseInt(rowsPerPage) : rowsPerPage;
+		const parsedPage = page ? parseInt(page) : 0;
+		const parsedRowsPerPage = rowsPerPage ? parseInt(rowsPerPage) : 5;
 
 		const result = await this.checksRepository.findByMonitorId(monitorId, sortOrder, dateRange, filter, parsedPage, parsedRowsPerPage, parsedStatus);
 
 		return result;
 	};
 
-	getChecksByTeam = async ({ teamId, query }: { teamId: string; query: any }) => {
-		let { sortOrder, dateRange, filter, page, rowsPerPage } = query;
+	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) : page;
-		const parsedRowsPerPage = rowsPerPage ? parseInt(rowsPerPage) : rowsPerPage;
+		const parsedPage = page ? parseInt(page) : 0;
+		const parsedRowsPerPage = rowsPerPage ? parseInt(rowsPerPage) : 5;
 
 		const checkData = await this.checksRepository.findByTeamId(sortOrder, dateRange, filter, parsedPage, parsedRowsPerPage, teamId);
 		return checkData;
@@ -162,7 +175,7 @@ class CheckService {
 			throw new AppError({ message: "No team ID in request", service: SERVICE_NAME, method: "deleteChecks", status: 400 });
 		}
 
-		// For verificaiton, throws an error if monitor doesn't belong to team
+		// 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);
@@ -178,8 +191,6 @@ class CheckService {
 	};
 
 	updateChecksTTL = async ({ teamId, ttl }: { teamId: string; ttl: string }) => {
-		throw new AppError({ message: "Not implemented", service: SERVICE_NAME, method: "updateChecksTTL", status: 500 });
+		throw new AppError({ message: "Not implemented", service: SERVICE_NAME, method: "updateChecksTTL", status: 500, details: { teamId, ttl } });
 	};
 }
-
-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

@@ -0,0 +1,177 @@
+import type { Monitor, GeoCheck } from "@/types/index.js";
+import type { GeoCheckResult } from "@/types/geoCheck.js";
+import { Types } from "mongoose";
+import type { IGeoChecksRepository } from "@/repositories/index.js";
+import type { IMonitorsRepository } from "@/repositories/index.js";
+import type { IGlobalPingService } from "@/service/infrastructure/globalPingService.js";
+import type { ILogger } from "@/utils/logger.js";
+import { AppError } from "@/utils/AppError.js";
+
+const SERVICE_NAME = "GeoChecksService";
+
+export interface IGeoChecksService {
+	readonly serviceName: string;
+	buildGeoCheck(monitor: Monitor): Promise<GeoCheck | null>;
+	createGeoChecks(geoChecks: GeoCheck[]): Promise<GeoCheck[]>;
+	getGeoChecksByMonitor(args: { monitorId: string; query: any; teamId: string }): Promise<any>;
+}
+
+export class GeoChecksService implements IGeoChecksService {
+	static SERVICE_NAME = SERVICE_NAME;
+
+	private logger: ILogger;
+	private geoChecksRepository: IGeoChecksRepository;
+	private globalPingService: IGlobalPingService;
+	private monitorsRepository: IMonitorsRepository;
+
+	constructor({
+		logger,
+		geoChecksRepository,
+		globalPingService,
+		monitorsRepository,
+	}: {
+		logger: ILogger;
+		geoChecksRepository: IGeoChecksRepository;
+		globalPingService: IGlobalPingService;
+		monitorsRepository: IMonitorsRepository;
+	}) {
+		this.logger = logger;
+		this.geoChecksRepository = geoChecksRepository;
+		this.globalPingService = globalPingService;
+		this.monitorsRepository = monitorsRepository;
+	}
+
+	get serviceName() {
+		return GeoChecksService.SERVICE_NAME;
+	}
+
+	async buildGeoCheck(monitor: Monitor): Promise<GeoCheck | null> {
+		try {
+			if (!monitor.url) {
+				this.logger.warn({
+					message: "Monitor missing URL for geo check",
+					service: SERVICE_NAME,
+					method: "buildGeoCheck",
+					details: { monitorId: monitor.id },
+				});
+				return null;
+			}
+
+			if (!monitor.geoCheckLocations || monitor.geoCheckLocations.length === 0) {
+				this.logger.warn({
+					message: "Monitor missing geo check locations",
+					service: SERVICE_NAME,
+					method: "buildGeoCheck",
+					details: { monitorId: monitor.id },
+				});
+				return null;
+			}
+
+			// Step 1: Create measurement request
+			const measurementId = await this.globalPingService.createMeasurement(monitor.type, monitor.url, monitor.geoCheckLocations);
+
+			if (!measurementId) {
+				// GlobalPing API is down, skip this check
+				this.logger.debug({
+					message: "Skipping geo check due to API unavailability",
+					service: SERVICE_NAME,
+					method: "buildGeoCheck",
+				});
+				return null;
+			}
+
+			// Step 2: Poll for results
+			const results = await this.globalPingService.pollForResults(measurementId);
+
+			if (results.length === 0) {
+				// No successful results (all locations timed out or failed)
+				this.logger.debug({
+					message: "No successful geo check results",
+					service: SERVICE_NAME,
+					method: "buildGeoCheck",
+				});
+				return null;
+			}
+
+			// Step 3: Build GeoCheck document
+			const geoCheck = this.createGeoCheckDocument(monitor, results);
+
+			this.logger.debug({
+				message: `Geo check completed for monitor ${monitor.id}`,
+				service: SERVICE_NAME,
+				method: "buildGeoCheck",
+			});
+
+			return geoCheck;
+		} catch (error: unknown) {
+			this.logger.error({
+				message: "Error executing geo check",
+				service: SERVICE_NAME,
+				method: "buildGeoCheck",
+				details: { monitorId: monitor.id, error: error instanceof Error ? error.message : "Unknown error" },
+				stack: error instanceof Error ? error.stack : undefined,
+			});
+			return null;
+		}
+	}
+
+	private createGeoCheckDocument(monitor: Monitor, results: GeoCheckResult[]): GeoCheck {
+		const now = new Date();
+		const ttl = 90 * 24 * 60 * 60 * 1000; // 90 days in ms
+		const expiryDate = new Date(now.getTime() + ttl);
+
+		return {
+			id: new Types.ObjectId().toString(),
+			metadata: {
+				monitorId: monitor.id,
+				teamId: monitor.teamId,
+				type: monitor.type,
+			},
+			results,
+			expiry: expiryDate.toISOString(),
+			__v: 0,
+			createdAt: now.toISOString(),
+			updatedAt: now.toISOString(),
+		};
+	}
+
+	createGeoChecks = async (geoChecks: GeoCheck[]) => {
+		return this.geoChecksRepository.createGeoChecks(geoChecks);
+	};
+
+	getGeoChecksByMonitor = async ({ monitorId, query, teamId }: { monitorId: string; query: any; teamId: string }) => {
+		if (!monitorId) {
+			throw new AppError({
+				message: "No monitor ID in request",
+				service: SERVICE_NAME,
+				method: "getGeoChecksByMonitor",
+				status: 400,
+			});
+		}
+		if (!teamId) {
+			throw new AppError({
+				message: "No team ID in request",
+				service: SERVICE_NAME,
+				method: "getGeoChecksByMonitor",
+				status: 400,
+			});
+		}
+
+		const monitor = await this.monitorsRepository.findById(monitorId, teamId);
+		if (!monitor) {
+			throw new AppError({
+				message: `Monitor with ID ${monitorId} not found.`,
+				service: SERVICE_NAME,
+				method: "getGeoChecksByMonitor",
+				status: 404,
+			});
+		}
+
+		const { sortOrder, dateRange, page, rowsPerPage, continent } = query;
+		const continents = continent ? (Array.isArray(continent) ? continent : [continent]) : undefined;
+		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;
+	};
+}

server/src/service/business/incidentService.ts

@@ -3,42 +3,51 @@ 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";
 
-const dateRangeLookup: Record<string, Date | undefined> = {
-	recent: new Date(new Date().setHours(new Date().getHours() - 2)),
-	hour: new Date(new Date().setHours(new Date().getHours() - 1)),
-	day: new Date(new Date().setDate(new Date().getDate() - 1)),
-	week: new Date(new Date().setDate(new Date().getDate() - 7)),
-	month: new Date(new Date().setMonth(new Date().getMonth() - 1)),
-	all: undefined,
-};
+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: string,
+		rowsPerPage: string,
+		status: string,
+		monitorId: string,
+		resolutionType: string
+	): Promise<{ incidents: Incident[]; count: number }>;
+	getIncidentSummary(teamId: string, limit?: string): Promise<IncidentSummary>;
+	getIncidentById(incidentId: string, teamId: string): Promise<{ incident: Incident; monitor: Monitor; user: User | null }>;
+}
 
-class IncidentService {
+export class IncidentService implements IIncidentService {
 	static SERVICE_NAME = SERVICE_NAME;
 
-	private logger: any;
+	private logger: ILogger;
 	private incidentsRepository: IIncidentsRepository;
 	private monitorsRepository: IMonitorsRepository;
 	private usersRepository: IUsersRepository;
 	private notificationMessageBuilder: INotificationMessageBuilder;
 
-	constructor({
-		logger,
-		incidentsRepository,
-		monitorsRepository,
-		usersRepository,
-		notificationMessageBuilder,
-	}: {
-		logger: any;
-		incidentsRepository: IIncidentsRepository;
-		monitorsRepository: IMonitorsRepository;
-		usersRepository: IUsersRepository;
-		notificationMessageBuilder: INotificationMessageBuilder;
-	}) {
+	constructor(
+		logger: ILogger,
+		incidentsRepository: IIncidentsRepository,
+		monitorsRepository: IMonitorsRepository,
+		usersRepository: IUsersRepository,
+		notificationMessageBuilder: INotificationMessageBuilder
+	) {
 		this.logger = logger;
 		this.incidentsRepository = incidentsRepository;
 		this.monitorsRepository = monitorsRepository;
@@ -151,7 +160,7 @@ class IncidentService {
 				service: SERVICE_NAME,
 				method: "resolveIncidentManually",
 				message: `Incident manually resolved by user`,
-				details: resolvedIncident.id,
+				details: { incidentId: resolvedIncident.id },
 			});
 
 			return resolvedIncident;
@@ -160,7 +169,7 @@ class IncidentService {
 				service: SERVICE_NAME,
 				method: "resolveIncident",
 				message: error.message,
-				details: incidentId,
+				details: { id: incidentId },
 				stack: error.stack,
 			});
 			throw error;
@@ -182,7 +191,7 @@ class IncidentService {
 				throw new AppError({ message: "No team ID in request", service: SERVICE_NAME, method: "getIncidentsByTeam", status: 400 });
 			}
 
-			const startDate = dateRangeLookup[dateRange];
+			const startDate = getDateForRange(dateRange);
 
 			const parsedPage = Number.isFinite(parseInt(page)) ? parseInt(page) : 0;
 			const parsedRowsPerPage = Number.isFinite(parseInt(rowsPerPage)) ? parseInt(rowsPerPage) : 20;
@@ -207,7 +216,7 @@ class IncidentService {
 				service: SERVICE_NAME,
 				method: "getIncidentsByTeam",
 				message: error.message,
-				details: teamId,
+				details: { teamId },
 				stack: error.stack,
 			});
 			throw error;
@@ -229,7 +238,7 @@ class IncidentService {
 				service: SERVICE_NAME,
 				method: "getIncidentSummary",
 				message: error.message,
-				details: teamId,
+				details: { teamId },
 				stack: error.stack,
 			});
 			throw error;
@@ -250,12 +259,10 @@ class IncidentService {
 				service: SERVICE_NAME,
 				method: "getIncidentById",
 				message: error.message,
-				details: incidentId,
+				details: { incidentId },
 				stack: error.stack,
 			});
 			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,23 @@
 import { IMaintenanceWindowsRepository, IMonitorsRepository } from "@/repositories/index.js";
+import type { MaintenanceWindow } from "@/types/index.js";
 import { ParseBoolean } from "@/utils/utils.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;
+		query: Record<string, 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;
@@ -83,5 +96,3 @@ class MaintenanceWindowService {
 		return await this.maintenanceWindowsRepository.updateById(id, teamId, body);
 	};
 }
-
-export default MaintenanceWindowService;

server/src/service/business/monitorService.ts

@@ -8,8 +8,11 @@ import type {
 	PageSpeedDetailsResult,
 	GamesMap,
 } from "@/types/monitor.js";
+import { supportsGeoCheck } from "@/types/monitor.js";
+import type { GeoContinent } from "@/types/geoCheck.js";
 import type {
 	IChecksRepository,
+	IGeoChecksRepository,
 	IIncidentsRepository,
 	IMonitorsRepository,
 	IMonitorStatsRepository,
@@ -36,6 +39,7 @@ export interface IMonitorService {
 	getUptimeDetailsById(args: { teamId: string; monitorId: string; dateRange: string; normalize?: boolean }): Promise<UptimeDetailsResult>;
 	getHardwareDetailsById(args: { teamId: string; monitorId: string; dateRange: string }): Promise<HardwareDetailsResult>;
 	getPageSpeedDetailsById(args: { teamId: string; monitorId: string; dateRange: string }): Promise<PageSpeedDetailsResult>;
+	getGeoChecksByMonitorId(args: { teamId: string; monitorId: string; dateRange: string; continents?: GeoContinent[] }): Promise<any>;
 	getMonitorById(args: { teamId: string; monitorId: string }): Promise<Monitor>;
 	getMonitorsByTeamId(args: {
 		teamId: string;
@@ -84,6 +88,7 @@ export class MonitorService implements IMonitorService {
 	private games: any;
 	private monitorsRepository: IMonitorsRepository;
 	private checksRepository: IChecksRepository;
+	private geoChecksRepository: IGeoChecksRepository;
 	private monitorStatsRepository: IMonitorStatsRepository;
 	private statusPagesRepository: IStatusPagesRepository;
 	private incidentsRepository: IIncidentsRepository;
@@ -95,6 +100,7 @@ export class MonitorService implements IMonitorService {
 		games,
 		monitorsRepository,
 		checksRepository,
+		geoChecksRepository,
 		monitorStatsRepository,
 		statusPagesRepository,
 		incidentsRepository,
@@ -105,6 +111,7 @@ export class MonitorService implements IMonitorService {
 		games: any;
 		monitorsRepository: IMonitorsRepository;
 		checksRepository: IChecksRepository;
+		geoChecksRepository: IGeoChecksRepository;
 		monitorStatsRepository: IMonitorStatsRepository;
 		statusPagesRepository: IStatusPagesRepository;
 		incidentsRepository: IIncidentsRepository;
@@ -115,6 +122,7 @@ export class MonitorService implements IMonitorService {
 		this.games = games;
 		this.monitorsRepository = monitorsRepository;
 		this.checksRepository = checksRepository;
+		this.geoChecksRepository = geoChecksRepository;
 		this.monitorStatsRepository = monitorStatsRepository;
 		this.statusPagesRepository = statusPagesRepository;
 		this.incidentsRepository = incidentsRepository;
@@ -218,7 +226,9 @@ export class MonitorService implements IMonitorService {
 			checksData.monitorType !== "ping" &&
 			checksData.monitorType !== "docker" &&
 			checksData.monitorType !== "port" &&
-			checksData.monitorType !== "game"
+			checksData.monitorType !== "game" &&
+			checksData.monitorType !== "grpc" &&
+			checksData.monitorType !== "websocket"
 		) {
 			throw new AppError({ message: `${monitor.type} monitors are not supported for uptime details`, status: 400 });
 		}
@@ -315,6 +325,40 @@ export class MonitorService implements IMonitorService {
 			monitorStats,
 		};
 	};
+
+	getGeoChecksByMonitorId = async ({
+		teamId,
+		monitorId,
+		dateRange,
+		continents,
+	}: {
+		teamId: string;
+		monitorId: string;
+		dateRange: string;
+		continents?: GeoContinent[];
+	}): Promise<any> => {
+		const monitor = await this.monitorsRepository.findById(monitorId, teamId);
+		if (!monitor) {
+			throw new AppError({ message: `Monitor with ID ${monitorId} not found.`, status: 404 });
+		}
+
+		if (!supportsGeoCheck(monitor.type) || !monitor.geoCheckEnabled) {
+			return { groupedGeoChecks: [] };
+		}
+
+		const rangeKey = (dateRange as DateRangeKey) ?? "recent";
+		const { start, end } = this.getDateRange(rangeKey);
+		const groupedGeoChecks = await this.geoChecksRepository.findGroupedByMonitorIdAndDateRange(
+			monitor.id,
+			start,
+			end,
+			this.getDateFormat(rangeKey),
+			continents
+		);
+
+		return { groupedGeoChecks };
+	};
+
 	getMonitorById = async ({ teamId, monitorId }: { teamId: string; monitorId: string }): Promise<Monitor> => {
 		const monitor = await this.monitorsRepository.findById(monitorId, teamId);
 		return monitor;
@@ -438,6 +482,14 @@ export class MonitorService implements IMonitorService {
 			});
 		});
 
+		await this.geoChecksRepository.deleteByMonitorId(monitor.id).catch((err: any) => {
+			this.logger.warn({
+				message: `Error deleting geo checks for monitor ${monitor.id} with name ${monitor.name}`,
+				service: SERVICE_NAME,
+				stack: err.stack,
+			});
+		});
+
 		await this.jobQueue.deleteJob(monitor);
 		return monitor;
 	};
@@ -449,6 +501,7 @@ export class MonitorService implements IMonitorService {
 				try {
 					await this.jobQueue.deleteJob(monitor);
 					await this.checksRepository.deleteByMonitorId(monitor.id);
+					await this.geoChecksRepository.deleteByMonitorId(monitor.id);
 					await this.statusPagesRepository.removeMonitorFromStatusPages(monitor.id);
 					await this.monitorStatsRepository.deleteByMonitorId(monitor.id);
 				} catch (error: any) {

server/src/service/business/userService.ts

@@ -11,10 +11,32 @@ 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 { ISettingsService } from "@/service/system/settingsService.js";
+import { ILogger } from "@/utils/logger.js";
+import jwt from "jsonwebtoken";
+type JwtType = typeof jwt;
 const SERVICE_NAME = "userService";
 
-class UserService {
+export interface IUserService {
+	issueToken(payload: Partial<User>, appSettings: { jwtTTL?: string; jwtSecret?: string }): string;
+	registerUser(user: Partial<User>, inviteToken: string, file: unknown): Promise<{ user: User; token: string }>;
+	createUser(userData: Partial<User>, teamId: string, actorRoles: UserRole[], file: unknown): Promise<User>;
+	loginUser(email: string, password: string): Promise<{ user: User; token: string }>;
+	editUser(updates: Partial<User & { newPassword?: string }>, file: unknown, currentUser: User): 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(user: User): Promise<void>;
+	deleteUserById(actor: User, 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,10 +44,10 @@ 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 monitorsRepository: IMonitorsRepository;
@@ -50,10 +72,10 @@ class UserService {
 		teamsRepository,
 	}: {
 		crypto: any;
-		emailService: any;
-		settingsService: any;
-		logger: any;
-		jwt: any;
+		emailService: IEmailService;
+		settingsService: ISettingsService;
+		logger: ILogger;
+		jwt: JwtType;
 		jobQueue: ISuperSimpleQueue;
 		monitorsRepository: IMonitorsRepository;
 		usersRepository: IUsersRepository;
@@ -120,7 +142,7 @@ class UserService {
 			message: "New user created",
 			service: SERVICE_NAME,
 			method: "registerUser",
-			details: newUser.id,
+			details: { userId: newUser.id },
 		});
 
 		delete newUser.profileImage;
@@ -134,20 +156,23 @@ 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,
 			});
 		}
 
@@ -181,7 +206,7 @@ class UserService {
 			message: "New user created by superadmin",
 			service: SERVICE_NAME,
 			method: "createUser",
-			details: newUser.id,
+			details: { userId: newUser.id },
 		});
 
 		newUser.profileImage = undefined;
@@ -256,6 +281,14 @@ class UserService {
 			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;
 	};
@@ -313,25 +346,65 @@ 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);
 					})
-				));
+				);
+			}
 		}
 		// 6. Delete the user by id
 		await this.usersRepository.deleteById(userId);
 	};
 
+	deleteUserById = async (actor: User, targetUserId: string) => {
+		if (actor.id === 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 !== actor.teamId) {
+			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 actorRoles = actor.role;
+		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 ${actor.id}`,
+			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 });
+		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);
 
@@ -348,4 +421,3 @@ class UserService {
 		return updatedUser;
 	};
 }
-export default UserService;