Merge pull request #2883 from bluewave-labs/develop

develop -> master
2026-01-13 21:29:46 -06:00 · 2025-08-30 16:21:19 -07:00
parent 05dd5f7de2 32b54ddf11
commit b86fc5edb3
17 changed files with 491 additions and 358 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+.vscode
--- a/client/src/Components/Table/index.jsx
+++ b/client/src/Components/Table/index.jsx
@@ -7,6 +7,7 @@ import {
 	TableHead,
 	TableRow,
 } from "@mui/material";
+import Tooltip from "@mui/material/Tooltip";
 import SkeletonLayout from "./skeleton";
 import PropTypes from "prop-types";
 import { useTheme } from "@emotion/react";
@@ -41,6 +42,7 @@ const DataTable = ({
 	data = [],
 	config = {
 		emptyView: "No data",
+		tooltipContent: null,
 		onRowClick: () => {},
 	},
 }) => {
@@ -101,24 +103,54 @@ const DataTable = ({
 						data.map((row) => {
 							const key = row.id || row._id || Math.random();
 							return (
-								<TableRow
+								<Tooltip
 									key={key}
-									sx={config?.rowSX ?? {}}
-									onClick={config?.onRowClick ? () => config.onRowClick(row) : null}
+									followCursor
+									enterDelay={500}
+									enterNextDelay={500}
+									title={
+										typeof config.tooltipContent === "function"
+											? config.tooltipContent(row)
+											: config.tooltipContent
+									}
+									slotProps={{
+										tooltip: {
+											sx: {
+												background: "unset",
+											},
+										},
+										popper: {
+											modifiers: [
+												{
+													name: "offset",
+													options: {
+														offset: ({ popper }) => {
+															return [popper.width / 2 + 20, -popper.height / 8];
+														},
+													},
+												},
+											],
+										},
+									}}
 								>
-									{headers.map((header, index) => {
-										return (
-											<TableCell
-												align={index === 0 ? "left" : "center"}
-												key={header.id}
-												onClick={header.onClick ? (e) => header.onClick(e, row) : null}
-												sx={header.getCellSx ? header.getCellSx(row) : {}}
-											>
-												{header.render(row)}
-											</TableCell>
-										);
-									})}
-								</TableRow>
+									<TableRow
+										sx={config?.rowSX ?? {}}
+										onClick={config?.onRowClick ? () => config.onRowClick(row) : null}
+									>
+										{headers.map((header, index) => {
+											return (
+												<TableCell
+													align={index === 0 ? "left" : "center"}
+													key={header.id}
+													onClick={header.onClick ? (e) => header.onClick(e, row) : null}
+													sx={header.getCellSx ? header.getCellSx(row) : {}}
+												>
+													{header.render(row)}
+												</TableCell>
+											);
+										})}
+									</TableRow>
+								</Tooltip>
 							);
 						})
 					)}
--- a/client/src/Hooks/logHooks.js
+++ b/client/src/Hooks/logHooks.js
@@ -15,9 +15,6 @@ const useFetchLogs = () => {
 				setIsLoading(true);
 				const response = await networkService.getLogs();
 				setLogs(response.data.data);
-				createToast({
-					body: t("logsPage.toast.fetchLogsSuccess"),
-				});
 			} catch (error) {
 				setError(error);
 				createToast({
--- a/client/src/Pages/Incidents/Components/IncidentTable/index.jsx
+++ b/client/src/Pages/Incidents/Components/IncidentTable/index.jsx
@@ -1,5 +1,10 @@
 //Components
-import Table from "../../../../Components/Table";
+import Stack from "@mui/material/Stack";
+import DataTable from "../../../../Components/Table";
+import Table from "@mui/material/Table";
+import TableBody from "@mui/material/TableBody";
+import TableRow from "@mui/material/TableRow";
+import TableCell from "@mui/material/TableCell";
 import TableSkeleton from "../../../../Components/Table/skeleton";
 import Pagination from "../../../../Components/Table/TablePagination";
 import { StatusLabel } from "../../../../Components/Label";
@@ -16,7 +21,68 @@ import { useTranslation } from "react-i18next";
 import { useFetchChecksTeam } from "../../../../Hooks/checkHooks";
 import { useFetchChecksByMonitor } from "../../../../Hooks/checkHooks";
 import { useResolveIncident } from "../../../../Hooks/checkHooks";
-import { Button, Typography } from "@mui/material";
+import { Button, Typography, useTheme } from "@mui/material";
+import { lighten } from "@mui/material/styles";
+
+const GetTooltip = (row) => {
+	const theme = useTheme();
+	const phases = row?.timings?.phases;
+
+	const phaseKeyFormattingMap = {
+		firstByte: "first byte",
+	};
+	return (
+		<Stack
+			backgroundColor={lighten(theme.palette.primary.main, 0.1)}
+			border={`1px solid ${theme.palette.primary.lowContrast}`}
+			borderRadius={theme.shape.borderRadius}
+			py={theme.spacing(2)}
+			px={theme.spacing(4)}
+		>
+			<Typography
+				variant="body2"
+				color={theme.palette.primary.contrastText}
+			>{`Status code: ${row?.statusCode}`}</Typography>
+			<Typography
+				variant="body2"
+				color={theme.palette.primary.contrastText}
+			>{`Response time: ${row?.responseTime} ms`}</Typography>
+			{phases && (
+				<>
+					<Typography
+						variant="body2"
+						color={theme.palette.primary.contrastText}
+					>{`Request timing: `}</Typography>
+					<Table
+						size="small"
+						sx={{ ml: theme.spacing(2), mt: theme.spacing(2) }}
+					>
+						<TableBody>
+							{Object.keys(phases)?.map((phaseKey) => (
+								<TableRow key={phaseKey}>
+									<TableCell sx={{ border: "none", p: 0 }}>
+										<Typography
+											variant="body2"
+											color="success"
+										>
+											{`${phaseKeyFormattingMap[phaseKey] || phaseKey}:`}
+										</Typography>
+									</TableCell>
+									<TableCell sx={{ border: "none", p: 0 }}>
+										<Typography
+											color={theme.palette.primary.contrastText}
+											variant="body2"
+										>{`${phases[phaseKey]} ms`}</Typography>
+									</TableCell>
+								</TableRow>
+							))}
+						</TableBody>
+					</Table>
+				</>
+			)}
+		</Stack>
+	);
+};

 const IncidentTable = ({
 	isLoading,
@@ -167,9 +233,10 @@ const IncidentTable = ({

 	return (
 		<>
-			<Table
+			<DataTable
 				headers={headers}
 				data={checks}
+				config={{ tooltipContent: GetTooltip }}
 			/>
 			<Pagination
 				paginationLabel={t("incidentsTablePaginationLabel")}
--- a/client/src/Pages/Logs/Queue/components/JobTable/index.jsx
+++ b/client/src/Pages/Logs/Queue/components/JobTable/index.jsx
@@ -46,6 +46,11 @@ const JobTable = ({ jobs = [] }) => {
 			content: t("queuePage.jobTable.urlHeader"),
 			render: (row) => row.monitorUrl,
 		},
+		{
+			id: "interval",
+			content: t("queuePage.jobTable.intervalHeader"),
+			render: (row) => `${row.monitorInterval} ms`,
+		},
 		{
 			id: "type",
 			content: t("queuePage.jobTable.typeHeader"),
--- a/client/src/Validation/validation.js
+++ b/client/src/Validation/validation.js
@@ -130,10 +130,12 @@ const monitorValidation = joi.object({
 		then: joi
 			.string()
 			.trim()
-			.regex(/^[a-z0-9]{64}$/)
+			.regex(
+				/^(\/+)?([a-zA-Z0-9][a-zA-Z0-9_.-]*[a-zA-Z0-9]|[a-zA-Z0-9]+|[a-f0-9]{12,64})$/
+			)
 			.messages({
 				"string.empty": "This field is required.",
-				"string.pattern.base": "Please enter a valid 64-character Docker container ID.",
+				"string.pattern.base": "Please enter a valid container name or ID.",
 			}),
 		otherwise: joi
 			.string()
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -440,7 +440,7 @@
 	"uptimeGeneralInstructions": {
 		"http": "Enter the URL or IP to monitor (e.g., https://example.com/ or 192.168.1.100) and add a clear display name that appears on the dashboard.",
 		"ping": "Enter the IP address or hostname to ping (e.g., 192.168.1.100 or example.com) and add a clear display name that appears on the dashboard.",
-		"docker": "Enter the Docker ID of your container. Docker IDs must be the full 64 char Docker ID. You can run docker inspect <short_id> to get the full container ID.",
+		"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).",
 		"port": "Enter the URL or IP of the server, the port number and a clear display name that appears on the dashboard.",
 		"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."
 	},
@@ -740,6 +740,7 @@
 			"idHeader": "Monitor ID",
 			"urlHeader": "URL",
 			"typeHeader": "Type",
+			"intervalHeader": "Interval",
 			"activeHeader": "Active",
 			"lockedAtHeader": "Locked at",
 			"runCountHeader": "Run count",
@@ -1014,9 +1015,9 @@
 	},
 	"monitorType": {
 		"docker": {
-			"label": "Container ID",
+			"label": "Container Name/ID",
 			"namePlaceholder": "My Container",
-			"placeholder": "abcd1234"
+			"placeholder": "my-app or abcd1234"
 		},
 		"http": {
 			"label": "URL to monitor",
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -39,7 +39,7 @@
 				"ping": "0.4.4",
 				"sharp": "0.33.5",
 				"ssl-checker": "2.0.10",
-				"super-simple-scheduler": "1.3.0",
+				"super-simple-scheduler": "1.4.0",
 				"swagger-ui-express": "5.0.1",
 				"winston": "^3.13.0"
 			},
@@ -94,9 +94,9 @@
 			}
 		},
 		"node_modules/@babel/runtime": {
-			"version": "7.27.6",
-			"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.27.6.tgz",
-			"integrity": "sha512-vbavdySgbTTrmFE+EsiqUTzlOr5bzlnJtUv9PynGCAKvfQqjIXbvFdumPM/GxMDfyuGMJaJAU6TO4zc1Jf1i8Q==",
+			"version": "7.28.3",
+			"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.3.tgz",
+			"integrity": "sha512-9uIQ10o0WGdpP6GDhXcdOJPJuDgFtIDtN/9+ArJQ2NAfAmiuhTQdzkaTGR33v43GYS2UrSA0eX2pPPHoFVvpxA==",
 			"license": "MIT",
 			"engines": {
 				"node": ">=6.9.0"
@@ -128,9 +128,9 @@
 			}
 		},
 		"node_modules/@csstools/color-helpers": {
-			"version": "5.0.2",
-			"resolved": "https://registry.npmjs.org/@csstools/color-helpers/-/color-helpers-5.0.2.tgz",
-			"integrity": "sha512-JqWH1vsgdGcw2RR6VliXXdA0/59LttzlU8UlRT/iUUsEeWfYq8I+K0yhihEUTTHLRm1EXvpsCx3083EU15ecsA==",
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/@csstools/color-helpers/-/color-helpers-5.1.0.tgz",
+			"integrity": "sha512-S11EXWJyy0Mz5SYvRmY8nJYTFFd1LCNV+7cXyAgQtOOuzb4EsgfqDufL+9esx72/eLhsRdGZwaldu/h+E4t4BA==",
 			"funding": [
 				{
 					"type": "github",
@@ -170,9 +170,9 @@
 			}
 		},
 		"node_modules/@csstools/css-color-parser": {
-			"version": "3.0.10",
-			"resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-3.0.10.tgz",
-			"integrity": "sha512-TiJ5Ajr6WRd1r8HSiwJvZBiJOqtH86aHpUjq5aEKWHiII2Qfjqd/HCWKPOW8EP4vcspXbHnXrwIDlu5savQipg==",
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-3.1.0.tgz",
+			"integrity": "sha512-nbtKwh3a6xNVIp/VRuXV64yTKnb1IjTAEEh3irzS+HkKjAOYLTGNb9pmVNntZ8iVBHcWDA2Dof0QtPgFI1BaTA==",
 			"funding": [
 				{
 					"type": "github",
@@ -185,7 +185,7 @@
 			],
 			"license": "MIT",
 			"dependencies": {
-				"@csstools/color-helpers": "^5.0.2",
+				"@csstools/color-helpers": "^5.1.0",
 				"@csstools/css-calc": "^2.1.4"
 			},
 			"engines": {
@@ -249,9 +249,9 @@
 			}
 		},
 		"node_modules/@emnapi/runtime": {
-			"version": "1.4.5",
-			"resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.4.5.tgz",
-			"integrity": "sha512-++LApOtY0pEEz1zrd9vy1/zXVaVJJ/EbAF3u0fXIzPJEDtnITsBGbbK0EkM72amhl/R5b+5xx0Y/QhcVOpuulg==",
+			"version": "1.5.0",
+			"resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.5.0.tgz",
+			"integrity": "sha512-97/BJ3iXHww3djw6hYIfErCZFee7qCtrneuLa20UXFCOTCfBM2cvQHjWJ2EG0s0MtdNwInarqCTz35i4wWXHsQ==",
 			"license": "MIT",
 			"optional": true,
 			"dependencies": {
@@ -316,9 +316,9 @@
 			}
 		},
 		"node_modules/@eslint/config-helpers": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.3.0.tgz",
-			"integrity": "sha512-ViuymvFmcJi04qdZeDc2whTHryouGcDlaxPqarTD0ZE10ISpxGUVZGZDx4w01upyIynL3iu6IXH2bS1NhclQMw==",
+			"version": "0.3.1",
+			"resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.3.1.tgz",
+			"integrity": "sha512-xR93k9WhrDYpXHORXpxVL5oHj3Era7wo6k/Wd8/IsQNnZUTzkGS29lyn3nAT05v6ltUuTFVCCYDEGfy2Or/sPA==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"engines": {
@@ -326,9 +326,9 @@
 			}
 		},
 		"node_modules/@eslint/core": {
-			"version": "0.15.1",
-			"resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.15.1.tgz",
-			"integrity": "sha512-bkOp+iumZCCbt1K1CmWf0R9pM5yKpDv+ZXtvSyQpudrI9kuFLp+bM2WOPXImuD/ceQuaa8f5pj93Y7zyECIGNA==",
+			"version": "0.15.2",
+			"resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.15.2.tgz",
+			"integrity": "sha512-78Md3/Rrxh83gCxoUc0EiciuOHsIITzLy53m3d9UyiW8y9Dj2D29FeETqyKA+BRK76tnTp6RXWb3pCay8Oyomg==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"dependencies": {
@@ -376,9 +376,9 @@
 			}
 		},
 		"node_modules/@eslint/js": {
-			"version": "9.31.0",
-			"resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.31.0.tgz",
-			"integrity": "sha512-LOm5OVt7D4qiKCqoiPbA7LWmI+tbw1VbTUowBcUMgQSuM6poJufkFkYDcQpo5KfgD39TnNySV26QjOh7VFpSyw==",
+			"version": "9.34.0",
+			"resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.34.0.tgz",
+			"integrity": "sha512-EoyvqQnBNsV1CWaEJ559rxXL4c8V92gxirbawSmVUOWXlsRxxQXl6LmCpdUblgxgSkDIqKnhzba2SjRTI/A5Rw==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -399,13 +399,13 @@
 			}
 		},
 		"node_modules/@eslint/plugin-kit": {
-			"version": "0.3.4",
-			"resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.4.tgz",
-			"integrity": "sha512-Ul5l+lHEcw3L5+k8POx6r74mxEYKG5kOb6Xpy2gCRW6zweT6TEhAf8vhxGgjhqrd/VO/Dirhsb+1hNpD1ue9hw==",
+			"version": "0.3.5",
+			"resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.5.tgz",
+			"integrity": "sha512-Z5kJ+wU3oA7MMIqVR9tyZRtjYPr4OC004Q4Rw7pgOKUOKkJfZ3O24nz3WYfGRpMDNmcOi3TwQOmgm7B7Tpii0w==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"dependencies": {
-				"@eslint/core": "^0.15.1",
+				"@eslint/core": "^0.15.2",
 				"levn": "^0.4.1"
 			},
 			"engines": {
@@ -886,9 +886,9 @@
 			}
 		},
 		"node_modules/@ioredis/commands": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/@ioredis/commands/-/commands-1.2.0.tgz",
-			"integrity": "sha512-Sx1pU8EM64o2BrqNpEO1CNLtKQwyhuXuqyfH7oGKCk+1a33d2r5saW8zNwm3j6BTExtjrv2BxTgzzkMwts6vGg==",
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/@ioredis/commands/-/commands-1.3.1.tgz",
+			"integrity": "sha512-bYtU8avhGIcje3IhvF9aSjsa5URMZBHnwKtOvXsT4sfYy9gppW11gLPT/9oNqlJZD47yPKveQFTAFWpHjKvUoQ==",
 			"license": "MIT"
 		},
 		"node_modules/@isaacs/cliui": {
@@ -929,16 +929,16 @@
 			}
 		},
 		"node_modules/@jridgewell/sourcemap-codec": {
-			"version": "1.5.4",
-			"resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.4.tgz",
-			"integrity": "sha512-VT2+G1VQs/9oz078bLrYbecdZKs912zQlkelYpuf+SXF+QvZDYJlbx/LSx+meSAwdDFnF8FVXW92AVjjkVmgFw==",
+			"version": "1.5.5",
+			"resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
+			"integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/@jridgewell/trace-mapping": {
-			"version": "0.3.29",
-			"resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.29.tgz",
-			"integrity": "sha512-uw6guiW/gcAGPDhLmd77/6lW8QLeiV5RUTsAX46Db6oLhGaVj4lhnPwb184s1bkc8kdVg/+h988dro8GRDpmYQ==",
+			"version": "0.3.30",
+			"resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.30.tgz",
+			"integrity": "sha512-GQ7Nw5G2lTu/BtHTKfXhKHok2WGetd4XYcVKGx00SjAk8GMwgJM3zr6zORiPGuOE+/vkc90KtTosSSvaCjKb2Q==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1198,14 +1198,13 @@
 			}
 		},
 		"node_modules/@sinonjs/samsam": {
-			"version": "8.0.2",
-			"resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-8.0.2.tgz",
-			"integrity": "sha512-v46t/fwnhejRSFTGqbpn9u+LQ9xJDse10gNnPgAcxgdoCDMXj/G2asWAC/8Qs+BAZDicX+MNZouXT1A7c83kVw==",
+			"version": "8.0.3",
+			"resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-8.0.3.tgz",
+			"integrity": "sha512-hw6HbX+GyVZzmaYNh82Ecj1vdGZrqVIn/keDTg63IgAwiQPO+xCz99uG6Woqgb4tM0mUiFENKZ4cqd7IX94AXQ==",
 			"dev": true,
 			"license": "BSD-3-Clause",
 			"dependencies": {
 				"@sinonjs/commons": "^3.0.1",
-				"lodash.get": "^4.4.2",
 				"type-detect": "^4.1.0"
 			}
 		},
@@ -1266,12 +1265,12 @@
 			"license": "MIT"
 		},
 		"node_modules/@types/node": {
-			"version": "24.1.0",
-			"resolved": "https://registry.npmjs.org/@types/node/-/node-24.1.0.tgz",
-			"integrity": "sha512-ut5FthK5moxFKH2T1CUOC6ctR67rQRvvHdFLCD2Ql6KXmMuCrjsSsRI9UsLCm9M18BMwClv4pn327UvB7eeO1w==",
+			"version": "24.3.0",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-24.3.0.tgz",
+			"integrity": "sha512-aPTXCrfwnDLj4VvXrm+UUCQjNEvJgNA8s5F1cvwQU+3KNltTOkBm1j30uNLyqqPNe7gE3KFzImYoZEfLhp4Yow==",
 			"license": "MIT",
 			"dependencies": {
-				"undici-types": "~7.8.0"
+				"undici-types": "~7.10.0"
 			}
 		},
 		"node_modules/@types/triple-beam": {
@@ -1383,9 +1382,9 @@
 			}
 		},
 		"node_modules/ansi-regex": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
-			"integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+			"version": "6.2.0",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.0.tgz",
+			"integrity": "sha512-TKY5pyBkHyADOPYlRT9Lx6F544mPl0vS5Ew7BJ45hA08Q+t3GjbueLliBWN3sMICk6+y7HdyxSzC4bWS8baBdg==",
 			"license": "MIT",
 			"engines": {
 				"node": ">=12"
@@ -1503,12 +1502,6 @@
 				"readable-stream": "~1.0.2"
 			}
 		},
-		"node_modules/barse/node_modules/isarray": {
-			"version": "0.0.1",
-			"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-			"integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
-			"license": "MIT"
-		},
 		"node_modules/barse/node_modules/readable-stream": {
 			"version": "1.0.34",
 			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
@@ -1664,9 +1657,9 @@
 			"license": "ISC"
 		},
 		"node_modules/browserslist": {
-			"version": "4.25.1",
-			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.25.1.tgz",
-			"integrity": "sha512-KGj0KoOMXLpSNkkEI6Z6mShmQy0bc1I+T7K9N81k4WWMrfz+6fQ6es80B/YLAeRoKvjYE1YSHHOW1qe9xIVzHw==",
+			"version": "4.25.4",
+			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.25.4.tgz",
+			"integrity": "sha512-4jYpcjabC606xJ3kw2QwGEZKX0Aw7sgQdZCvIK9dhVSPh76BKo+C+btT1RRofH7B+8iNpEbgGNVWiLki5q93yg==",
 			"funding": [
 				{
 					"type": "opencollective",
@@ -1683,8 +1676,8 @@
 			],
 			"license": "MIT",
 			"dependencies": {
-				"caniuse-lite": "^1.0.30001726",
-				"electron-to-chromium": "^1.5.173",
+				"caniuse-lite": "^1.0.30001737",
+				"electron-to-chromium": "^1.5.211",
 				"node-releases": "^2.0.19",
 				"update-browserslist-db": "^1.1.3"
 			},
@@ -1909,9 +1902,9 @@
 			}
 		},
 		"node_modules/caniuse-lite": {
-			"version": "1.0.30001727",
-			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001727.tgz",
-			"integrity": "sha512-pB68nIHmbN6L/4C6MH1DokyR3bYqFwjaSs/sWDHGj4CTcFtQUQMuJftVwWkXq7mNWOybD3KhUv3oWHoGxgP14Q==",
+			"version": "1.0.30001737",
+			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001737.tgz",
+			"integrity": "sha512-BiloLiXtQNrY5UyF0+1nSJLXUENuhka2pzy2Fx5pGxqavdrxSCW4U6Pn/PoG3Efspi2frRbHpBV2XsrPE6EDlw==",
 			"funding": [
 				{
 					"type": "opencollective",
@@ -2303,6 +2296,12 @@
 				"typedarray": "^0.0.6"
 			}
 		},
+		"node_modules/concat-stream/node_modules/isarray": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+			"integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+			"license": "MIT"
+		},
 		"node_modules/concat-stream/node_modules/readable-stream": {
 			"version": "2.3.8",
 			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
@@ -2362,9 +2361,9 @@
 			"license": "MIT"
 		},
 		"node_modules/cookie": {
-			"version": "0.7.1",
-			"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz",
-			"integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==",
+			"version": "0.7.2",
+			"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz",
+			"integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==",
 			"license": "MIT",
 			"engines": {
 				"node": ">= 0.6"
@@ -2383,15 +2382,6 @@
 				"node": ">= 0.8.0"
 			}
 		},
-		"node_modules/cookie-parser/node_modules/cookie": {
-			"version": "0.7.2",
-			"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz",
-			"integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==",
-			"license": "MIT",
-			"engines": {
-				"node": ">= 0.6"
-			}
-		},
 		"node_modules/cookie-signature": {
 			"version": "1.0.6",
 			"resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
@@ -2511,6 +2501,19 @@
 				"url": "https://github.com/sponsors/fb55"
 			}
 		},
+		"node_modules/css-tree": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-3.1.0.tgz",
+			"integrity": "sha512-0eW44TGN5SQXU1mWSkKwFstI/22X2bG1nYzZTYMAWjylYURhse752YgbE4Cx46AC+bAvI+/dYTPRk1LqSUnu6w==",
+			"license": "MIT",
+			"dependencies": {
+				"mdn-data": "2.12.2",
+				"source-map-js": "^1.0.1"
+			},
+			"engines": {
+				"node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0"
+			}
+		},
 		"node_modules/css-what": {
 			"version": "6.2.2",
 			"resolved": "https://registry.npmjs.org/css-what/-/css-what-6.2.2.tgz",
@@ -2536,12 +2539,12 @@
 			}
 		},
 		"node_modules/cssnano": {
-			"version": "7.1.0",
-			"resolved": "https://registry.npmjs.org/cssnano/-/cssnano-7.1.0.tgz",
-			"integrity": "sha512-Pu3rlKkd0ZtlCUzBrKL1Z4YmhKppjC1H9jo7u1o4qaKqyhvixFgu5qLyNIAOjSTg9DjVPtUqdROq2EfpVMEe+w==",
+			"version": "7.1.1",
+			"resolved": "https://registry.npmjs.org/cssnano/-/cssnano-7.1.1.tgz",
+			"integrity": "sha512-fm4D8ti0dQmFPeF8DXSAA//btEmqCOgAc/9Oa3C1LW94h5usNrJEfrON7b4FkPZgnDEn6OUs5NdxiJZmAtGOpQ==",
 			"license": "MIT",
 			"dependencies": {
-				"cssnano-preset-default": "^7.0.8",
+				"cssnano-preset-default": "^7.0.9",
 				"lilconfig": "^3.1.3"
 			},
 			"engines": {
@@ -2556,9 +2559,9 @@
 			}
 		},
 		"node_modules/cssnano-preset-default": {
-			"version": "7.0.8",
-			"resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-7.0.8.tgz",
-			"integrity": "sha512-d+3R2qwrUV3g4LEMOjnndognKirBZISylDZAF/TPeCWVjEwlXS2e4eN4ICkoobRe7pD3H6lltinKVyS1AJhdjQ==",
+			"version": "7.0.9",
+			"resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-7.0.9.tgz",
+			"integrity": "sha512-tCD6AAFgYBOVpMBX41KjbvRh9c2uUjLXRyV7KHSIrwHiq5Z9o0TFfUCoM3TwVrRsRteN3sVXGNvjVNxYzkpTsA==",
 			"license": "MIT",
 			"dependencies": {
 				"browserslist": "^4.25.1",
@@ -2566,7 +2569,7 @@
 				"cssnano-utils": "^5.0.1",
 				"postcss-calc": "^10.1.1",
 				"postcss-colormin": "^7.0.4",
-				"postcss-convert-values": "^7.0.6",
+				"postcss-convert-values": "^7.0.7",
 				"postcss-discard-comments": "^7.0.4",
 				"postcss-discard-duplicates": "^7.0.2",
 				"postcss-discard-empty": "^7.0.1",
@@ -3012,9 +3015,9 @@
 			"license": "MIT"
 		},
 		"node_modules/electron-to-chromium": {
-			"version": "1.5.190",
-			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.190.tgz",
-			"integrity": "sha512-k4McmnB2091YIsdCgkS0fMVMPOJgxl93ltFzaryXqwip1AaxeDqKCGLxkXODDA5Ab/D+tV5EL5+aTx76RvLRxw==",
+			"version": "1.5.211",
+			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.211.tgz",
+			"integrity": "sha512-IGBvimJkotaLzFnwIVgW9/UD/AOJ2tByUmeOrtqBfACSbAw5b1G0XpvdaieKyc7ULmbwXVx+4e4Be8pOPBrYkw==",
 			"license": "ISC"
 		},
 		"node_modules/emitter-component": {
@@ -3196,20 +3199,20 @@
 			}
 		},
 		"node_modules/eslint": {
-			"version": "9.31.0",
-			"resolved": "https://registry.npmjs.org/eslint/-/eslint-9.31.0.tgz",
-			"integrity": "sha512-QldCVh/ztyKJJZLr4jXNUByx3gR+TDYZCRXEktiZoUR3PGy4qCmSbkxcIle8GEwGpb5JBZazlaJ/CxLidXdEbQ==",
+			"version": "9.34.0",
+			"resolved": "https://registry.npmjs.org/eslint/-/eslint-9.34.0.tgz",
+			"integrity": "sha512-RNCHRX5EwdrESy3Jc9o8ie8Bog+PeYvvSR8sDGoZxNFTvZ4dlxUB3WzQ3bQMztFrSRODGrLLj8g6OFuGY/aiQg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"@eslint-community/eslint-utils": "^4.2.0",
 				"@eslint-community/regexpp": "^4.12.1",
 				"@eslint/config-array": "^0.21.0",
-				"@eslint/config-helpers": "^0.3.0",
-				"@eslint/core": "^0.15.0",
+				"@eslint/config-helpers": "^0.3.1",
+				"@eslint/core": "^0.15.2",
 				"@eslint/eslintrc": "^3.3.1",
-				"@eslint/js": "9.31.0",
-				"@eslint/plugin-kit": "^0.3.1",
+				"@eslint/js": "9.34.0",
+				"@eslint/plugin-kit": "^0.3.5",
 				"@humanfs/node": "^0.16.6",
 				"@humanwhocodes/module-importer": "^1.0.1",
 				"@humanwhocodes/retry": "^0.4.2",
@@ -3290,6 +3293,19 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
+		"node_modules/eslint-plugin-mocha/node_modules/type-fest": {
+			"version": "0.20.2",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+			"integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+			"dev": true,
+			"license": "(MIT OR CC0-1.0)",
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
 		"node_modules/eslint-scope": {
 			"version": "8.4.0",
 			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.4.0.tgz",
@@ -3503,6 +3519,15 @@
 				"express": ">= 4.11"
 			}
 		},
+		"node_modules/express/node_modules/cookie": {
+			"version": "0.7.1",
+			"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz",
+			"integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==",
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
 		"node_modules/express/node_modules/debug": {
 			"version": "2.6.9",
 			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -3705,9 +3730,9 @@
 			"license": "MIT"
 		},
 		"node_modules/follow-redirects": {
-			"version": "1.15.9",
-			"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz",
-			"integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==",
+			"version": "1.15.11",
+			"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.11.tgz",
+			"integrity": "sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==",
 			"funding": [
 				{
 					"type": "individual",
@@ -3960,6 +3985,18 @@
 				"node": ">=14"
 			}
 		},
+		"node_modules/gaxios/node_modules/is-stream": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+			"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
 		"node_modules/gbxremote": {
 			"version": "0.2.1",
 			"resolved": "https://registry.npmjs.org/gbxremote/-/gbxremote-0.2.1.tgz",
@@ -4037,18 +4074,6 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/get-stream/node_modules/is-stream": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-4.0.1.tgz",
-			"integrity": "sha512-Dnz92NInDqYckGEUJv689RbRiTSEHCQ7wOVeALbkOz999YpqT46yMRIGtSNl2iCL1waAZSx40+h59NV/EwzV/A==",
-			"license": "MIT",
-			"engines": {
-				"node": ">=18"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
 		"node_modules/glob": {
 			"version": "10.4.5",
 			"resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
@@ -4156,18 +4181,6 @@
 				"url": "https://github.com/sindresorhus/got?sponsor=1"
 			}
 		},
-		"node_modules/got/node_modules/type-fest": {
-			"version": "4.41.0",
-			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.41.0.tgz",
-			"integrity": "sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==",
-			"license": "(MIT OR CC0-1.0)",
-			"engines": {
-				"node": ">=16"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
 		"node_modules/handlebars": {
 			"version": "4.7.8",
 			"resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz",
@@ -4493,12 +4506,12 @@
 			"license": "ISC"
 		},
 		"node_modules/ioredis": {
-			"version": "5.6.1",
-			"resolved": "https://registry.npmjs.org/ioredis/-/ioredis-5.6.1.tgz",
-			"integrity": "sha512-UxC0Yv1Y4WRJiGQxQkP0hfdL0/5/6YvdfOOClRgJ0qppSarkhneSa6UvkMkms0AkdGimSH3Ikqm+6mkMmX7vGA==",
+			"version": "5.7.0",
+			"resolved": "https://registry.npmjs.org/ioredis/-/ioredis-5.7.0.tgz",
+			"integrity": "sha512-NUcA93i1lukyXU+riqEyPtSEkyFq8tX90uL659J+qpCZ3rEdViB/APC58oAhIh3+bJln2hzdlZbBZsGNrlsR8g==",
 			"license": "MIT",
 			"dependencies": {
-				"@ioredis/commands": "^1.1.1",
+				"@ioredis/commands": "^1.3.0",
 				"cluster-key-slot": "^1.1.0",
 				"debug": "^4.3.4",
 				"denque": "^2.1.0",
@@ -4614,12 +4627,12 @@
 			"license": "MIT"
 		},
 		"node_modules/is-stream": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-			"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-4.0.1.tgz",
+			"integrity": "sha512-Dnz92NInDqYckGEUJv689RbRiTSEHCQ7wOVeALbkOz999YpqT46yMRIGtSNl2iCL1waAZSx40+h59NV/EwzV/A==",
 			"license": "MIT",
 			"engines": {
-				"node": ">=8"
+				"node": ">=18"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/sindresorhus"
@@ -4639,9 +4652,9 @@
 			}
 		},
 		"node_modules/isarray": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-			"integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+			"integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
 			"license": "MIT"
 		},
 		"node_modules/isexe": {
@@ -4717,9 +4730,9 @@
 			}
 		},
 		"node_modules/istanbul-reports": {
-			"version": "3.1.7",
-			"resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz",
-			"integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==",
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.2.0.tgz",
+			"integrity": "sha512-HGYWWS/ehqTV3xN10i23tkPkpH46MLCIMFNCaaKNavAXTF1RkqxawEPtnjnGZ6XKSInBKkiOA5BKS+aZiY3AvA==",
 			"dev": true,
 			"license": "BSD-3-Clause",
 			"dependencies": {
@@ -5066,14 +5079,6 @@
 			"integrity": "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==",
 			"license": "MIT"
 		},
-		"node_modules/lodash.get": {
-			"version": "4.4.2",
-			"resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
-			"integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==",
-			"deprecated": "This package is deprecated. Use the optional chaining (?.) operator instead.",
-			"dev": true,
-			"license": "MIT"
-		},
 		"node_modules/lodash.includes": {
 			"version": "4.3.0",
 			"resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz",
@@ -5182,9 +5187,9 @@
 			"license": "Apache-2.0"
 		},
 		"node_modules/loupe": {
-			"version": "3.1.4",
-			"resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.4.tgz",
-			"integrity": "sha512-wJzkKwJrheKtknCOKNEtDK4iqg/MxmZheEMtSTYvnzRdEYaZzmgH976nenp8WdJRdx5Vc1X/9MO0Oszl6ezeXg==",
+			"version": "3.2.1",
+			"resolved": "https://registry.npmjs.org/loupe/-/loupe-3.2.1.tgz",
+			"integrity": "sha512-CdzqowRJCeLU72bHvWqwRBBlLcMEtIvGrlvef74kMnV2AolS9Y8xUv1I0U/MNAWMhBlKIoyuEgoJ0t/bbwHbLQ==",
 			"dev": true,
 			"license": "MIT"
 		},
@@ -5251,6 +5256,12 @@
 				"node": ">= 0.4"
 			}
 		},
+		"node_modules/mdn-data": {
+			"version": "2.12.2",
+			"resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.12.2.tgz",
+			"integrity": "sha512-IEn+pegP1aManZuckezWCO+XZQDplx1366JoVhTpMpBB1sPey/SbveZQUosKiKiGYjg1wH4pMlNgXbCiYgihQA==",
+			"license": "CC0-1.0"
+		},
 		"node_modules/media-typer": {
 			"version": "0.3.0",
 			"resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
@@ -5919,9 +5930,9 @@
 			}
 		},
 		"node_modules/mongodb": {
-			"version": "6.18.0",
-			"resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.18.0.tgz",
-			"integrity": "sha512-fO5ttN9VC8P0F5fqtQmclAkgXZxbIkYRTUi1j8JO6IYwvamkhtYDilJr35jOPELR49zqCJgXZWwCtW7B+TM8vQ==",
+			"version": "6.19.0",
+			"resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.19.0.tgz",
+			"integrity": "sha512-H3GtYujOJdeKIMLKBT9PwlDhGrQfplABNF1G904w6r5ZXKWyv77aB0X9B+rhmaAwjtllHzaEkvi9mkGVZxs2Bw==",
 			"license": "Apache-2.0",
 			"dependencies": {
 				"@mongodb-js/saslprep": "^1.1.9",
@@ -5937,7 +5948,7 @@
 				"gcp-metadata": "^5.2.0",
 				"kerberos": "^2.0.1",
 				"mongodb-client-encryption": ">=6.0.0 <7",
-				"snappy": "^7.2.2",
+				"snappy": "^7.3.2",
 				"socks": "^2.7.1"
 			},
 			"peerDependenciesMeta": {
@@ -5975,14 +5986,14 @@
 			}
 		},
 		"node_modules/mongoose": {
-			"version": "8.16.4",
-			"resolved": "https://registry.npmjs.org/mongoose/-/mongoose-8.16.4.tgz",
-			"integrity": "sha512-jslgdQ8pY2vcNSKPv3Dbi5ogo/NT8zcvf6kPDyD8Sdsjsa1at3AFAF0F5PT+jySPGSPbvlNaQ49nT9h+Kx2UDA==",
+			"version": "8.18.0",
+			"resolved": "https://registry.npmjs.org/mongoose/-/mongoose-8.18.0.tgz",
+			"integrity": "sha512-3TixPihQKBdyaYDeJqRjzgb86KbilEH07JmzV8SoSjgoskNTpa6oTBmDxeoF9p8YnWQoz7shnCyPkSV/48y3yw==",
 			"license": "MIT",
 			"dependencies": {
 				"bson": "^6.10.4",
 				"kareem": "2.6.3",
-				"mongodb": "~6.17.0",
+				"mongodb": "~6.18.0",
 				"mpath": "0.9.0",
 				"mquery": "5.0.0",
 				"ms": "2.1.3",
@@ -5997,9 +6008,9 @@
 			}
 		},
 		"node_modules/mongoose/node_modules/mongodb": {
-			"version": "6.17.0",
-			"resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.17.0.tgz",
-			"integrity": "sha512-neerUzg/8U26cgruLysKEjJvoNSXhyID3RvzvdcpsIi2COYM3FS3o9nlH7fxFtefTb942dX3W9i37oPfCVj4wA==",
+			"version": "6.18.0",
+			"resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.18.0.tgz",
+			"integrity": "sha512-fO5ttN9VC8P0F5fqtQmclAkgXZxbIkYRTUi1j8JO6IYwvamkhtYDilJr35jOPELR49zqCJgXZWwCtW7B+TM8vQ==",
 			"license": "Apache-2.0",
 			"dependencies": {
 				"@mongodb-js/saslprep": "^1.1.9",
@@ -6751,9 +6762,9 @@
 			}
 		},
 		"node_modules/postcss-convert-values": {
-			"version": "7.0.6",
-			"resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-7.0.6.tgz",
-			"integrity": "sha512-MD/eb39Mr60hvgrqpXsgbiqluawYg/8K4nKsqRsuDX9f+xN1j6awZCUv/5tLH8ak3vYp/EMXwdcnXvfZYiejCQ==",
+			"version": "7.0.7",
+			"resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-7.0.7.tgz",
+			"integrity": "sha512-HR9DZLN04Xbe6xugRH6lS4ZQH2zm/bFh/ZyRkpedZozhvh+awAfbA0P36InO4fZfDhvYfNJeNvlTf1sjwGbw/A==",
 			"license": "MIT",
 			"dependencies": {
 				"browserslist": "^4.25.1",
@@ -7125,59 +7136,6 @@
 				"postcss": "^8.4.32"
 			}
 		},
-		"node_modules/postcss-svgo/node_modules/commander": {
-			"version": "11.1.0",
-			"resolved": "https://registry.npmjs.org/commander/-/commander-11.1.0.tgz",
-			"integrity": "sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==",
-			"license": "MIT",
-			"engines": {
-				"node": ">=16"
-			}
-		},
-		"node_modules/postcss-svgo/node_modules/css-tree": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-3.1.0.tgz",
-			"integrity": "sha512-0eW44TGN5SQXU1mWSkKwFstI/22X2bG1nYzZTYMAWjylYURhse752YgbE4Cx46AC+bAvI+/dYTPRk1LqSUnu6w==",
-			"license": "MIT",
-			"dependencies": {
-				"mdn-data": "2.12.2",
-				"source-map-js": "^1.0.1"
-			},
-			"engines": {
-				"node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0"
-			}
-		},
-		"node_modules/postcss-svgo/node_modules/mdn-data": {
-			"version": "2.12.2",
-			"resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.12.2.tgz",
-			"integrity": "sha512-IEn+pegP1aManZuckezWCO+XZQDplx1366JoVhTpMpBB1sPey/SbveZQUosKiKiGYjg1wH4pMlNgXbCiYgihQA==",
-			"license": "CC0-1.0"
-		},
-		"node_modules/postcss-svgo/node_modules/svgo": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/svgo/-/svgo-4.0.0.tgz",
-			"integrity": "sha512-VvrHQ+9uniE+Mvx3+C9IEe/lWasXCU0nXMY2kZeLrHNICuRiC8uMPyM14UEaMOFA5mhyQqEkB02VoQ16n3DLaw==",
-			"license": "MIT",
-			"dependencies": {
-				"commander": "^11.1.0",
-				"css-select": "^5.1.0",
-				"css-tree": "^3.0.1",
-				"css-what": "^6.1.0",
-				"csso": "^5.0.5",
-				"picocolors": "^1.1.1",
-				"sax": "^1.4.1"
-			},
-			"bin": {
-				"svgo": "bin/svgo.js"
-			},
-			"engines": {
-				"node": ">=16"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/svgo"
-			}
-		},
 		"node_modules/postcss-unique-selectors": {
 			"version": "7.0.4",
 			"resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-7.0.4.tgz",
@@ -7351,9 +7309,9 @@
 			"license": "MIT"
 		},
 		"node_modules/protobufjs": {
-			"version": "7.5.3",
-			"resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.5.3.tgz",
-			"integrity": "sha512-sildjKwVqOI2kmFDiXQ6aEB0fjYTafpEvIBs8tOR8qI4spuL9OPROLVu2qZqi/xgCfsHIwVqlaF8JBjWFHnKbw==",
+			"version": "7.5.4",
+			"resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.5.4.tgz",
+			"integrity": "sha512-CvexbZtbov6jW2eXAvLukXjXUW1TzFaivC46BpWc/3BpcCysb5Vffu+B3XHMm8lVEuy2Mm4XGex8hBSg1yapPg==",
 			"hasInstallScript": true,
 			"license": "BSD-3-Clause",
 			"dependencies": {
@@ -7995,9 +7953,9 @@
 			"license": "ISC"
 		},
 		"node_modules/ssh2": {
-			"version": "1.16.0",
-			"resolved": "https://registry.npmjs.org/ssh2/-/ssh2-1.16.0.tgz",
-			"integrity": "sha512-r1X4KsBGedJqo7h8F5c4Ybpcr5RjyP+aWIG007uBPRjmdQWfEiVLzSK71Zji1B9sKxwaCvD8y8cwSkYrlLiRRg==",
+			"version": "1.17.0",
+			"resolved": "https://registry.npmjs.org/ssh2/-/ssh2-1.17.0.tgz",
+			"integrity": "sha512-wPldCk3asibAjQ/kziWQQt1Wh3PgDFpC0XpwclzKcdT1vql6KeYxf5LIt4nlFkUeR8WuphYMKqUA56X4rjbfgQ==",
 			"hasInstallScript": true,
 			"dependencies": {
 				"asn1": "^0.2.6",
@@ -8008,7 +7966,7 @@
 			},
 			"optionalDependencies": {
 				"cpu-features": "~0.0.10",
-				"nan": "^2.20.0"
+				"nan": "^2.23.0"
 			}
 		},
 		"node_modules/ssl-checker": {
@@ -8077,6 +8035,12 @@
 				"readable-stream": "^2.1.0"
 			}
 		},
+		"node_modules/string-to-stream/node_modules/isarray": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+			"integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+			"license": "MIT"
+		},
 		"node_modules/string-to-stream/node_modules/readable-stream": {
 			"version": "2.3.8",
 			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
@@ -8245,86 +8209,15 @@
 			}
 		},
 		"node_modules/super-simple-scheduler": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/super-simple-scheduler/-/super-simple-scheduler-1.3.0.tgz",
-			"integrity": "sha512-iEGZ+a9Xv7pIaA+XhVuHSGaasQg2T6/afTRlQhosQiiU/7ykpZBsiZB/L2Hqfem5YUrbr3Q8tzrjjXCXKMg81A==",
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/super-simple-scheduler/-/super-simple-scheduler-1.4.0.tgz",
+			"integrity": "sha512-DO8HTrrx+23Cz2RPCuniPZ9IhHx2lgtF8ZJiBV4JfUhqDqxuJ2leQ+l3gZ+vniy4DfpMki7s6bZwM3u8norQEA==",
 			"license": "MIT",
 			"dependencies": {
-				"human-interval": "2.0.1",
-				"ioredis": "5.6.1",
-				"mongoose": "8.16.1",
 				"uuid": "11.1.0",
 				"winston": "3.17.0"
 			}
 		},
-		"node_modules/super-simple-scheduler/node_modules/mongodb": {
-			"version": "6.17.0",
-			"resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.17.0.tgz",
-			"integrity": "sha512-neerUzg/8U26cgruLysKEjJvoNSXhyID3RvzvdcpsIi2COYM3FS3o9nlH7fxFtefTb942dX3W9i37oPfCVj4wA==",
-			"license": "Apache-2.0",
-			"dependencies": {
-				"@mongodb-js/saslprep": "^1.1.9",
-				"bson": "^6.10.4",
-				"mongodb-connection-string-url": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=16.20.1"
-			},
-			"peerDependencies": {
-				"@aws-sdk/credential-providers": "^3.188.0",
-				"@mongodb-js/zstd": "^1.1.0 || ^2.0.0",
-				"gcp-metadata": "^5.2.0",
-				"kerberos": "^2.0.1",
-				"mongodb-client-encryption": ">=6.0.0 <7",
-				"snappy": "^7.2.2",
-				"socks": "^2.7.1"
-			},
-			"peerDependenciesMeta": {
-				"@aws-sdk/credential-providers": {
-					"optional": true
-				},
-				"@mongodb-js/zstd": {
-					"optional": true
-				},
-				"gcp-metadata": {
-					"optional": true
-				},
-				"kerberos": {
-					"optional": true
-				},
-				"mongodb-client-encryption": {
-					"optional": true
-				},
-				"snappy": {
-					"optional": true
-				},
-				"socks": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/super-simple-scheduler/node_modules/mongoose": {
-			"version": "8.16.1",
-			"resolved": "https://registry.npmjs.org/mongoose/-/mongoose-8.16.1.tgz",
-			"integrity": "sha512-Q+0TC+KLdY4SYE+u9gk9pdW1tWu/pl0jusyEkMGTgBoAbvwQdfy4f9IM8dmvCwb/blSfp7IfLkob7v76x6ZGpQ==",
-			"license": "MIT",
-			"dependencies": {
-				"bson": "^6.10.4",
-				"kareem": "2.6.3",
-				"mongodb": "~6.17.0",
-				"mpath": "0.9.0",
-				"mquery": "5.0.0",
-				"ms": "2.1.3",
-				"sift": "17.1.3"
-			},
-			"engines": {
-				"node": ">=16.20.1"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/mongoose"
-			}
-		},
 		"node_modules/super-simple-scheduler/node_modules/uuid": {
 			"version": "11.1.0",
 			"resolved": "https://registry.npmjs.org/uuid/-/uuid-11.1.0.tgz",
@@ -8351,10 +8244,44 @@
 				"node": ">=8"
 			}
 		},
+		"node_modules/svgo": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/svgo/-/svgo-4.0.0.tgz",
+			"integrity": "sha512-VvrHQ+9uniE+Mvx3+C9IEe/lWasXCU0nXMY2kZeLrHNICuRiC8uMPyM14UEaMOFA5mhyQqEkB02VoQ16n3DLaw==",
+			"license": "MIT",
+			"dependencies": {
+				"commander": "^11.1.0",
+				"css-select": "^5.1.0",
+				"css-tree": "^3.0.1",
+				"css-what": "^6.1.0",
+				"csso": "^5.0.5",
+				"picocolors": "^1.1.1",
+				"sax": "^1.4.1"
+			},
+			"bin": {
+				"svgo": "bin/svgo.js"
+			},
+			"engines": {
+				"node": ">=16"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/svgo"
+			}
+		},
+		"node_modules/svgo/node_modules/commander": {
+			"version": "11.1.0",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-11.1.0.tgz",
+			"integrity": "sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=16"
+			}
+		},
 		"node_modules/swagger-ui-dist": {
-			"version": "5.27.0",
-			"resolved": "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-5.27.0.tgz",
-			"integrity": "sha512-tS6LRyBhY6yAqxrfsA9IYpGWPUJOri6sclySa7TdC7XQfGLvTwDY531KLgfQwHEtQsn+sT4JlUspbeQDBVGWig==",
+			"version": "5.28.0",
+			"resolved": "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-5.28.0.tgz",
+			"integrity": "sha512-I9ibQtr77BPzT28WFWMVktzQOtWzoSS2J99L0Att8gDar1atl1YTRI7NUFSr4kj8VvWICgylanYHIoHjITc7iA==",
 			"license": "Apache-2.0",
 			"dependencies": {
 				"@scarf/scarf": "=1.4.0"
@@ -8588,13 +8515,12 @@
 			}
 		},
 		"node_modules/type-fest": {
-			"version": "0.20.2",
-			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-			"integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-			"dev": true,
+			"version": "4.41.0",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.41.0.tgz",
+			"integrity": "sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==",
 			"license": "(MIT OR CC0-1.0)",
 			"engines": {
-				"node": ">=10"
+				"node": ">=16"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/sindresorhus"
@@ -8640,18 +8566,18 @@
 			"license": "MIT"
 		},
 		"node_modules/undici": {
-			"version": "7.12.0",
-			"resolved": "https://registry.npmjs.org/undici/-/undici-7.12.0.tgz",
-			"integrity": "sha512-GrKEsc3ughskmGA9jevVlIOPMiiAHJ4OFUtaAH+NhfTUSiZ1wMPIQqQvAJUrJspFXJt3EBWgpAeoHEDVT1IBug==",
+			"version": "7.15.0",
+			"resolved": "https://registry.npmjs.org/undici/-/undici-7.15.0.tgz",
+			"integrity": "sha512-7oZJCPvvMvTd0OlqWsIxTuItTpJBpU1tcbVl24FMn3xt3+VSunwUasmfPJRE57oNO1KsZ4PgA1xTdAX4hq8NyQ==",
 			"license": "MIT",
 			"engines": {
 				"node": ">=20.18.1"
 			}
 		},
 		"node_modules/undici-types": {
-			"version": "7.8.0",
-			"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.8.0.tgz",
-			"integrity": "sha512-9UJ2xGDvQ43tYyVMpuHlsgApydB8ZKfVYTsLDhXkFL/6gfkp+U8xTGdh8pMJv1SpZna0zxG1DwsKZsreLbXBxw==",
+			"version": "7.10.0",
+			"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.10.0.tgz",
+			"integrity": "sha512-t5Fy/nfn+14LuOc2KNYg75vZqClpAiqscVvMygNnlsHBFpSXdJaYtXMcdNLpl/Qvc3P2cB3s6lOV51nqsFq4ag==",
 			"license": "MIT"
 		},
 		"node_modules/unfetch": {
@@ -9031,6 +8957,18 @@
 				"node": ">= 12.0.0"
 			}
 		},
+		"node_modules/winston/node_modules/is-stream": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+			"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
 		"node_modules/word-wrap": {
 			"version": "1.2.5",
 			"resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
--- a/server/package.json
+++ b/server/package.json
@@ -46,7 +46,7 @@
 		"ping": "0.4.4",
 		"sharp": "0.33.5",
 		"ssl-checker": "2.0.10",
-		"super-simple-scheduler": "1.3.0",
+		"super-simple-scheduler": "1.4.0",
 		"swagger-ui-express": "5.0.1",
 		"winston": "^3.13.0"
 	},
--- a/server/src/controllers/statusPageController.js
+++ b/server/src/controllers/statusPageController.js
@@ -95,7 +95,7 @@ class StatusPageController extends BaseController {

 	deleteStatusPage = this.asyncHandler(
 		async (req, res) => {
-			await this.db.deleteStatusPage(req.params.url);
+			await this.db.statusPageModule.deleteStatusPage(req.params.url);
 			return res.success({
 				msg: this.stringService.statusPageDelete,
 			});
--- a/server/src/db/models/Monitor.js
+++ b/server/src/db/models/Monitor.js
@@ -38,7 +38,7 @@ const MonitorSchema = mongoose.Schema(
 		},
 		statusWindowThreshold: {
 			type: Number,
-			default: 0.6,
+			default: 60,
 		},
 		type: {
 			type: String,
--- a/server/src/db/mongo/MongoDB.js
+++ b/server/src/db/mongo/MongoDB.js
@@ -1,6 +1,6 @@
 import mongoose from "mongoose";
 import AppSettings from "../models/AppSettings.js";
-
+import { runMigrations } from "./migration/index.js";
 class MongoDB {
 	static SERVICE_NAME = "MongoDB";

@@ -65,6 +65,8 @@ class MongoDB {
 				service: this.SERVICE_NAME,
 				method: "connect",
 			});
+
+			await runMigrations();
 		} catch (error) {
 			this.logger.error({
 				message: error.message,
--- a/server/src/db/mongo/migration/0001_migrateStatusWindowThreshold.js
+++ b/server/src/db/mongo/migration/0001_migrateStatusWindowThreshold.js
@@ -0,0 +1,18 @@
+import Monitor from "../../models/Monitor.js";
+async function migrateStatusWindowThreshold() {
+	try {
+		const monitors = await Monitor.find({ statusWindowThreshold: { $lt: 1 } });
+		for (const monitor of monitors) {
+			monitor.statusWindowThreshold = monitor.statusWindowThreshold * 100;
+			await monitor.save();
+			console.log(`Migrated monitor ${monitor._id}: statusWindowThreshold set to ${monitor.statusWindowThreshold}`);
+		}
+		console.log("StatusWindowThreshold migration complete.");
+		return true;
+	} catch (err) {
+		console.error("Migration error:", err);
+		return false;
+	}
+}
+
+export { migrateStatusWindowThreshold };
--- a/server/src/db/mongo/migration/index.js
+++ b/server/src/db/mongo/migration/index.js
@@ -0,0 +1,7 @@
+import { migrateStatusWindowThreshold } from "./0001_migrateStatusWindowThreshold.js";
+
+const runMigrations = async () => {
+	await migrateStatusWindowThreshold();
+};
+
+export { runMigrations };
--- a/server/src/service/infrastructure/SuperSimpleQueue/SuperSimpleQueue.js
+++ b/server/src/service/infrastructure/SuperSimpleQueue/SuperSimpleQueue.js
@@ -88,7 +88,7 @@ class SuperSimpleQueue {
 	};

 	updateJob = async (monitor) => {
-		this.scheduler.updateJob(monitor._id.toString(), monitor.interval);
+		this.scheduler.updateJob(monitor._id.toString(), { repeat: monitor.interval, data: monitor.toObject() });
 	};

 	shutdown = async () => {
@@ -141,6 +141,7 @@ class SuperSimpleQueue {
 				monitorId: job.id,
 				monitorUrl: job?.data?.url || null,
 				monitorType: job?.data?.type || null,
+				monitorInterval: job?.data?.interval || null,
 				active: job.active,
 				lockedAt: job.lockedAt,
 				runCount: job.runCount || 0,
--- a/server/src/service/infrastructure/networkService.js
+++ b/server/src/service/infrastructure/networkService.js
@@ -1,3 +1,5 @@
+import { match } from "assert";
+
 const SERVICE_NAME = "NetworkService";

 class NetworkService {
@@ -147,16 +149,24 @@ class NetworkService {
 			httpResponse.payload = payload;
 			httpResponse.timings = response.timings || {};

-			if (!expectedValue) {
+			if (!expectedValue && !jsonPath) {
 				return httpResponse;
 			}

-			this.logger.info({
-				service: this.SERVICE_NAME,
-				method: "requestHttp",
-				message: `Job: [${name}](${_id}) match result with expected value`,
-				details: { expectedValue, payload, jsonPath, matchMethod },
-			});
+			if (expectedValue) {
+				let ok = false;
+				if (matchMethod === "equal") ok = payload === expectedValue;
+				if (matchMethod === "include") ok = payload.includes(expectedValue);
+				if (matchMethod === "regex") ok = new RegExp(expectedValue).test(payload);
+
+				if (ok === true) {
+					return httpResponse;
+				} else {
+					httpResponse.code = 500;
+					httpResponse.status = false;
+					return httpResponse;
+				}
+			}

 			if (jsonPath) {
 				const contentType = response.headers["content-type"];
@@ -243,24 +253,76 @@ class NetworkService {
 				handleError: true, // Enable error handling
 			});

-			const containers = await docker.listContainers({ all: true });
-			const containerExists = containers.some((c) => c.Id.startsWith(monitor.url));
-			if (!containerExists) {
-				throw new Error(this.stringService.dockerNotFound);
-			}
-
-			const container = docker.getContainer(monitor.url);
-			const { response, responseTime, error } = await this.timeRequest(() => container.inspect());
-
 			const dockerResponse = {
 				monitorId: monitor._id,
 				type: monitor.type,
-				responseTime,
-				status: response?.State?.Status === "running" ? true : false,
-				code: 200,
-				message: "Docker container status fetched successfully",
 			};

+			const containers = await docker.listContainers({ all: true });
+
+			// Normalize input: strip leading slashes and convert to lowercase for comparison
+			const normalizedInput = monitor.url.replace(/^\/+/, "").toLowerCase();
+
+			// Priority-based matching to avoid ambiguity:
+			// 1. Exact full ID match (64-char)
+			let exactIdMatch = containers.find((c) => c.Id.toLowerCase() === normalizedInput);
+
+			// 2. Exact container name match (case-insensitive)
+			let exactNameMatch = containers.find((c) =>
+				c.Names.some((name) => {
+					const cleanName = name.replace(/^\/+/, "").toLowerCase();
+					return cleanName === normalizedInput;
+				})
+			);
+
+			// 3. Partial ID match (fallback for backwards compatibility)
+			let partialIdMatch = containers.find((c) => c.Id.toLowerCase().startsWith(normalizedInput));
+
+			// Select container based on priority
+			let targetContainer = exactIdMatch || exactNameMatch || partialIdMatch;
+
+			// Return negative response if no container
+			if (!targetContainer) {
+				this.logger.warn({
+					message: `No container found for "${monitor.url}".`,
+					service: this.SERVICE_NAME,
+					method: "requestDocker",
+					details: { url: monitor.url },
+				});
+
+				dockerResponse.code = 404;
+				dockerResponse.status = false;
+				dockerResponse.message = this.stringService.dockerNotFound;
+				return dockerResponse;
+			}
+
+			// Return negative response if ambiguous matches exist
+			const matchTypes = [];
+			if (exactIdMatch) matchTypes.push("exact ID");
+			if (exactNameMatch) matchTypes.push("exact name");
+			if (partialIdMatch && !exactIdMatch) matchTypes.push("partial ID");
+
+			if (matchTypes.length > 1) {
+				this.logger.warn({
+					message: `Ambiguous container match for "${monitor.url}". Matched by: ${matchTypes.join(", ")}. Using ${exactIdMatch ? "exact ID" : exactNameMatch ? "exact name" : "partial ID"} match.`,
+					service: this.SERVICE_NAME,
+					method: "requestDocker",
+					details: { url: monitor.url },
+				});
+				dockerResponse.status = 404;
+				dockerResponse.status = false;
+				dockerResponse.message = `Ambiguous container match for "${monitor.url}". Matched by: ${matchTypes.join(", ")}. Using ${exactIdMatch ? "exact ID" : exactNameMatch ? "exact name" : "partial ID"} match.`;
+				return dockerResponse;
+			}
+
+			const container = docker.getContainer(targetContainer.Id);
+			const { response, responseTime, error } = await this.timeRequest(() => container.inspect());
+
+			dockerResponse.responseTime = responseTime;
+			dockerResponse.status = response?.State?.Status === "running" ? true : false;
+			dockerResponse.code = 200;
+			dockerResponse.message = "Docker container status fetched successfully";
+
 			if (error) {
 				dockerResponse.status = false;
 				dockerResponse.code = error.statusCode || this.NETWORK_ERROR;
--- a/server/src/service/infrastructure/statusService.js
+++ b/server/src/service/infrastructure/statusService.js
@@ -158,7 +158,7 @@ class StatusService {
 				statusChanged = true;
 			}
 			// If the failure rate is below the threshold and the monitor is down, recover:
-			else if (failureRate <= monitor.statusWindowThreshold && monitor.status === false) {
+			else if (failureRate < monitor.statusWindowThreshold && monitor.status === false) {
 				newStatus = true;
 				statusChanged = true;
 			}