remove rtt

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

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

client/src/Types/Monitor.ts

@@ -16,6 +16,15 @@ export const MonitorTypes = [
 ] 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",

server/src/service/business/geoChecksService.ts

@@ -76,7 +76,6 @@ export class GeoChecksService implements IGeoChecksService {
 					message: "Skipping geo check due to API unavailability",
 					service: SERVICE_NAME,
 					method: "buildGeoCheck",
-					details: { monitorId: monitor.id },
 				});
 				return null;
 			}
@@ -90,7 +89,6 @@ export class GeoChecksService implements IGeoChecksService {
 					message: "No successful geo check results",
 					service: SERVICE_NAME,
 					method: "buildGeoCheck",
-					details: { monitorId: monitor.id, measurementId },
 				});
 				return null;
 			}
@@ -102,17 +100,16 @@ export class GeoChecksService implements IGeoChecksService {
 				message: `Geo check completed for monitor ${monitor.id}`,
 				service: SERVICE_NAME,
 				method: "buildGeoCheck",
-				details: { monitorId: monitor.id, resultsCount: results.length },
 			});
 
 			return geoCheck;
-		} catch (error: any) {
+		} catch (error: unknown) {
 			this.logger.error({
 				message: "Error executing geo check",
 				service: SERVICE_NAME,
 				method: "buildGeoCheck",
-				details: { monitorId: monitor.id, error: error.message },
-				stack: error.stack,
+				details: { monitorId: monitor.id, error: error instanceof Error ? error.message : "Unknown error" },
+				stack: error instanceof Error ? error.stack : undefined,
 			});
 			return null;
 		}
@@ -172,19 +169,9 @@ export class GeoChecksService implements IGeoChecksService {
 
 		const { sortOrder, dateRange, page, rowsPerPage, continent } = query;
 		const continents = continent ? (Array.isArray(continent) ? continent : [continent]) : undefined;
-
-		this.logger.debug({
-			message: "getGeoChecksByMonitor query params",
-			service: SERVICE_NAME,
-			method: "getGeoChecksByMonitor",
-			details: { continent, continents, query },
-		});
-
 		const parsedPage = page ? parseInt(page) : page;
 		const parsedRowsPerPage = rowsPerPage ? parseInt(rowsPerPage) : rowsPerPage;
-
 		const result = await this.geoChecksRepository.findByMonitorId(monitorId, sortOrder, dateRange, parsedPage, parsedRowsPerPage, continents);
-
 		return result;
 	};
 }

server/src/service/business/monitorService.ts

@@ -8,6 +8,7 @@ import type {
 	PageSpeedDetailsResult,
 	GamesMap,
 } from "@/types/monitor.js";
+import { supportsGeoCheck } from "@/types/monitor.js";
 import type { GeoContinent } from "@/types/geoCheck.js";
 import type {
 	IChecksRepository,
@@ -340,7 +341,7 @@ export class MonitorService implements IMonitorService {
 			throw new AppError({ message: `Monitor with ID ${monitorId} not found.`, status: 404 });
 		}
 
-		if ((monitor.type !== "http" && monitor.type !== "ping") || !monitor.geoCheckEnabled) {
+		if (!supportsGeoCheck(monitor.type) || !monitor.geoCheckEnabled) {
 			return { groupedGeoChecks: [] };
 		}
 

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

@@ -2,6 +2,7 @@ import { IMonitorsRepository } from "@/repositories/index.js";
 import { ILogger } from "@/utils/logger.js";
 import Scheduler from "super-simple-scheduler";
 import { ISuperSimpleQueueHelper } from "@/service/infrastructure/SuperSimpleQueue/SuperSimpleQueueHelper.js";
+import { supportsGeoCheck } from "@/types/monitor.js";
 const SERVICE_NAME = "JobQueue";
 
 type QueueJobFailure = {
@@ -126,7 +127,7 @@ export class SuperSimpleQueue implements ISuperSimpleQueue {
 		});
 
 		// Return early if we don't need geo checks
-		if (monitor.type !== "http" && monitor.type !== "ping") {
+		if (!supportsGeoCheck(monitor.type)) {
 			return;
 		}
 
@@ -180,7 +181,7 @@ export class SuperSimpleQueue implements ISuperSimpleQueue {
 
 		// Handle geo check job lifecycle
 		const geoJobId = `${monitor.id}-geo`;
-		if (monitor.geoCheckEnabled && (monitor.type === "http" || monitor.type === "ping")) {
+		if (monitor.geoCheckEnabled && supportsGeoCheck(monitor.type)) {
 			// Check if geo job exists
 			const existingGeoJob = await this.scheduler.getJob(geoJobId);
 			if (existingGeoJob) {

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

@@ -1,5 +1,6 @@
 const SERVICE_NAME = "JobQueueHelper";
 import type { Monitor } from "@/types/monitor.js";
+import { supportsGeoCheck } from "@/types/monitor.js";
 import { AppError } from "@/utils/AppError.js";
 import { INetworkService, INotificationsService, IStatusService, IncidentService, type IGeoChecksService } from "@/service/index.js";
 import type { StatusChangeResult } from "@/types/index.js";
@@ -283,9 +284,9 @@ export class SuperSimpleQueueHelper implements ISuperSimpleQueueHelper {
 				if (!monitor.geoCheckEnabled) {
 					return;
 				}
-				if (monitor.type !== "http" && monitor.type !== "ping") {
+				if (!supportsGeoCheck(monitor.type)) {
 					this.logger.debug({
-						message: `Monitor ${monitorId} is not HTTP or Ping type, skipping geo check`,
+						message: `Monitor ${monitorId} type does not support geo checks, skipping`,
 						service: SERVICE_NAME,
 						method: "getGeoCheckJob",
 					});

server/src/service/infrastructure/globalPingService.ts

@@ -1,4 +1,5 @@
 import type { GeoContinent, GeoCheckResult, GeoCheckTimings, GeoCheckLocation } from "@/types/geoCheck.js";
+import { supportsGeoCheck } from "@/types/monitor.js";
 import { MonitorType } from "@/types/index.js";
 import type { ILogger } from "@/utils/logger.js";
 import got from "got";
@@ -9,7 +10,7 @@ const POLL_INTERVAL_MS = 2000;
 const MAX_POLL_TIMEOUT_MS = 30000;
 
 interface GlobalPingMeasurementRequest {
-	type: "http" | "ping";
+	type: MonitorType;
 	target: string;
 	locations: Array<{ continent: GeoContinent }>;
 	limit: number;
@@ -79,7 +80,7 @@ export class GlobalPingService implements IGlobalPingService {
 
 	async createMeasurement(monitorType: MonitorType, url: string, locations: GeoContinent[]): Promise<string | null> {
 		try {
-			if (monitorType !== "http" && monitorType !== "ping") {
+			if (!supportsGeoCheck(monitorType)) {
 				throw new Error(`Unsupported monitor type for GlobalPing: ${monitorType}`);
 			}
 			// GlobalPing API expects target without protocol (http:// or https://)

server/src/types/monitor.ts

@@ -6,6 +6,9 @@ export type { GeoContinent } from "@/types/geoCheck.js";
 export const MonitorTypes = ["http", "ping", "pagespeed", "hardware", "docker", "port", "game", "grpc", "unknown"] as const;
 export type MonitorType = (typeof MonitorTypes)[number];
 
+export const GeoCheckSupportedTypes: readonly MonitorType[] = ["http", "ping"] as const;
+export const supportsGeoCheck = (type: MonitorType): boolean => GeoCheckSupportedTypes.includes(type);
+
 export const MonitorStatuses = ["up", "down", "paused", "initializing", "maintenance", "breached"] as const;
 export type MonitorStatus = (typeof MonitorStatuses)[number];