diff --git a/server/src/controllers/monitorController.ts b/server/src/controllers/monitorController.ts index e66af1306..9a2b7b774 100644 --- a/server/src/controllers/monitorController.ts +++ b/server/src/controllers/monitorController.ts @@ -17,7 +17,6 @@ import { } from "@/validation/monitorValidation.js"; import sslChecker from "ssl-checker"; import { fetchMonitorCertificate, requireTeamId, requireUserId } from "./controllerUtils.js"; -import { AppError } from "@/utils/AppError.js"; import { IMonitorService } from "@/service/index.js"; const SERVICE_NAME = "monitorController"; @@ -60,7 +59,6 @@ class MonitorController { const monitorId = validatedParams.monitorId; const dateRange = validatedQuery.dateRange; - const normalize = validatedQuery.normalize; const teamId = requireTeamId(req.user?.teamId); @@ -68,7 +66,6 @@ class MonitorController { teamId, monitorId, dateRange, - normalize, }); return res.status(200).json({ success: true, @@ -324,7 +321,6 @@ class MonitorController { try { const validatedQuery = getMonitorsWithChecksQueryValidation.parse(req.query); - const explain = validatedQuery.explain; const limit = validatedQuery.limit; const page = validatedQuery.page; const rowsPerPage = validatedQuery.rowsPerPage; @@ -343,7 +339,6 @@ class MonitorController { filter, field, order, - explain, }); return res.status(200).json({ diff --git a/server/src/service/business/monitorService.ts b/server/src/service/business/monitorService.ts index 936044908..8d56fae20 100644 --- a/server/src/service/business/monitorService.ts +++ b/server/src/service/business/monitorService.ts @@ -7,6 +7,7 @@ import type { HardwareDetailsResult, PageSpeedDetailsResult, GamesMap, + GroupedGeoCheckResult, } from "@/types/monitor.js"; import { supportsGeoCheck } from "@/types/monitor.js"; import type { GeoContinent } from "@/types/geoCheck.js"; @@ -20,7 +21,10 @@ import type { } from "@/repositories/index.js"; import demoMonitorsData from "@/utils/demoMonitors.json" with { type: "json" }; import { AppError } from "@/utils/AppError.js"; +import type { ImportedMonitor } from "@/validation/monitorValidation.js"; import { ISuperSimpleQueue } from "../infrastructure/SuperSimpleQueue/SuperSimpleQueue.js"; +import { IEmailService } from "../infrastructure/emailService.js"; +import { ILogger } from "@/utils/logger.js"; const SERVICE_NAME = "MonitorService"; type DateRangeKey = "recent" | "day" | "week" | "month" | "all"; @@ -30,14 +34,19 @@ export interface IMonitorService { // create createMonitor(teamId: string, userId: string, body: Partial): Promise; - createMonitors(monitors: Array, userId: string, teamId: string): Promise; + createMonitors(monitors: Array): Promise; addDemoMonitors(args: { userId: string; teamId: string }): Promise; // read - getUptimeDetailsById(args: { teamId: string; monitorId: string; dateRange: string; normalize?: boolean }): Promise; + getUptimeDetailsById(args: { teamId: string; monitorId: string; dateRange: string }): Promise; getHardwareDetailsById(args: { teamId: string; monitorId: string; dateRange: string }): Promise; getPageSpeedDetailsById(args: { teamId: string; monitorId: string; dateRange: string }): Promise; - getGeoChecksByMonitorId(args: { teamId: string; monitorId: string; dateRange: string; continents?: GeoContinent[] }): Promise; + getGeoChecksByMonitorId(args: { + teamId: string; + monitorId: string; + dateRange: string; + continents?: GeoContinent[]; + }): Promise; getMonitorById(args: { teamId: string; monitorId: string }): Promise; getMonitorsByTeamId(args: { teamId: string; @@ -58,7 +67,6 @@ export interface IMonitorService { filter?: string; field?: string; order?: "asc" | "desc"; - explain?: boolean; }): Promise; getAllGames(): GamesMap; getGroupsByTeamId(args: { teamId: string }): Promise; @@ -73,16 +81,16 @@ export interface IMonitorService { // other exportMonitorsToJSON(args: { teamId: string }): Promise; - importMonitorsFromJSON(args: { teamId: string; userId: string; monitors: any[] }): Promise<{ imported: number; errors: string[] }>; + importMonitorsFromJSON(args: { teamId: string; userId: string; monitors: ImportedMonitor[] }): Promise<{ imported: number; errors: string[] }>; } export class MonitorService implements IMonitorService { static SERVICE_NAME = SERVICE_NAME; private jobQueue: ISuperSimpleQueue; - private emailService: any; - private logger: any; - private games: any; + private emailService: IEmailService; + private logger: ILogger; + private games: GamesMap; private monitorsRepository: IMonitorsRepository; private checksRepository: IChecksRepository; private geoChecksRepository: IGeoChecksRepository; @@ -103,9 +111,9 @@ export class MonitorService implements IMonitorService { incidentsRepository, }: { jobQueue: ISuperSimpleQueue; - emailService: any; - logger: any; - games: any; + emailService: IEmailService; + logger: ILogger; + games: GamesMap; monitorsRepository: IMonitorsRepository; checksRepository: IChecksRepository; geoChecksRepository: IGeoChecksRepository; @@ -163,7 +171,7 @@ export class MonitorService implements IMonitorService { this.jobQueue.addJob(monitor.id, monitor); }; - createMonitors = async (monitors: Array, userId: string, teamId: string): Promise => { + createMonitors = async (monitors: Array): Promise => { const createdMonitors = await this.monitorsRepository.createMonitors(monitors); if (!monitors || monitors.length === 0) { throw new AppError({ message: "Failed to create monitors", status: 500, service: SERVICE_NAME, method: "createMonitors" }); @@ -173,7 +181,7 @@ export class MonitorService implements IMonitorService { return createdMonitors; }; - addDemoMonitors = async ({ userId, teamId }: { userId: string; teamId: string }): Promise => { + addDemoMonitors = async ({ userId, teamId }: { userId: string; teamId: string }): Promise => { const demoData = demoMonitorsData; const monitors = demoData.map((monitor) => ({ userId, @@ -194,12 +202,10 @@ export class MonitorService implements IMonitorService { teamId, monitorId, dateRange, - normalize, }: { teamId: string; monitorId: string; dateRange: string; - normalize?: boolean; }): Promise => { const monitor = await this.monitorsRepository.findById(monitorId, teamId); if (!monitor) { @@ -327,7 +333,7 @@ export class MonitorService implements IMonitorService { monitorId: string; dateRange: string; continents?: GeoContinent[]; - }): Promise => { + }): Promise => { const monitor = await this.monitorsRepository.findById(monitorId, teamId); if (!monitor) { throw new AppError({ message: `Monitor with ID ${monitorId} not found.`, status: 404 }); @@ -380,7 +386,6 @@ export class MonitorService implements IMonitorService { filter, field, order, - explain, }: { teamId: string; limit?: number; @@ -390,7 +395,6 @@ export class MonitorService implements IMonitorService { filter?: string; field?: string; order?: "asc" | "desc"; - explain?: boolean; }): Promise => { const summary = await this.monitorsRepository.findMonitorsSummaryByTeamId(teamId, { type }); const count = await this.monitorsRepository.findMonitorCountByTeamIdAndType(teamId, { type, filter }); @@ -437,47 +441,51 @@ export class MonitorService implements IMonitorService { pauseMonitor = async ({ teamId, monitorId }: { teamId: string; monitorId: string }): Promise => { const monitor = await this.monitorsRepository.togglePauseById(monitorId, teamId); - monitor.isActive === true ? await this.jobQueue.resumeJob(monitor) : await this.jobQueue.pauseJob(monitor); + if (monitor.isActive) { + await this.jobQueue.resumeJob(monitor); + } else { + await this.jobQueue.pauseJob(monitor); + } return monitor; }; deleteMonitor = async ({ teamId, monitorId }: { teamId: string; monitorId: string }): Promise => { const monitor = await this.monitorsRepository.deleteById(monitorId, teamId); - await this.monitorStatsRepository.deleteByMonitorId(monitor.id).catch((err: any) => { + await this.monitorStatsRepository.deleteByMonitorId(monitor.id).catch((err: unknown) => { this.logger.warn({ message: `Error deleting monitor stats for monitor ${monitor.id} with name ${monitor.name}`, service: SERVICE_NAME, - stack: err.stack, + stack: err instanceof Error ? err.stack : undefined, }); }); - await this.checksRepository.deleteByMonitorId(monitor.id).catch((err: any) => { + await this.checksRepository.deleteByMonitorId(monitor.id).catch((err: unknown) => { this.logger.warn({ message: `Error deleting checks for monitor ${monitor.id} with name ${monitor.name}`, service: SERVICE_NAME, - stack: err.stack, + stack: err instanceof Error ? err.stack : undefined, }); }); - await this.statusPagesRepository.removeMonitorFromStatusPages(monitor.id).catch((err: any) => { + await this.statusPagesRepository.removeMonitorFromStatusPages(monitor.id).catch((err: unknown) => { this.logger.warn({ message: `Error removing monitor ${monitor.id} with name ${monitor.name} from status pages`, service: SERVICE_NAME, - stack: err.stack, + stack: err instanceof Error ? err.stack : undefined, }); }); - await this.incidentsRepository.deleteByMonitorId(monitor.id, teamId).catch((err: any) => { + await this.incidentsRepository.deleteByMonitorId(monitor.id, teamId).catch((err: unknown) => { this.logger.warn({ message: `Error deleting incidents for monitor ${monitor.id} with name ${monitor.name}`, service: SERVICE_NAME, - stack: err.stack, + stack: err instanceof Error ? err.stack : undefined, }); }); - await this.geoChecksRepository.deleteByMonitorId(monitor.id).catch((err: any) => { + await this.geoChecksRepository.deleteByMonitorId(monitor.id).catch((err: unknown) => { this.logger.warn({ message: `Error deleting geo checks for monitor ${monitor.id} with name ${monitor.name}`, service: SERVICE_NAME, - stack: err.stack, + stack: err instanceof Error ? err.stack : undefined, }); }); @@ -495,12 +503,12 @@ export class MonitorService implements IMonitorService { await this.geoChecksRepository.deleteByMonitorId(monitor.id); await this.statusPagesRepository.removeMonitorFromStatusPages(monitor.id); await this.monitorStatsRepository.deleteByMonitorId(monitor.id); - } catch (error: any) { + } catch (error: unknown) { this.logger.warn({ message: `Error deleting associated records for monitor ${monitor.id} with name ${monitor.name}`, service: SERVICE_NAME, method: "deleteAllMonitors", - stack: error.stack, + stack: error instanceof Error ? error.stack : undefined, }); } }) @@ -508,7 +516,7 @@ export class MonitorService implements IMonitorService { return deletedCount; }; - exportMonitorsToJSON = async ({ teamId }: { teamId: string }): Promise => { + exportMonitorsToJSON = async ({ teamId }: { teamId: string }): Promise => { const monitors = await this.monitorsRepository.findByTeamId(teamId, {}); if (!monitors || monitors.length === 0) { @@ -525,23 +533,21 @@ export class MonitorService implements IMonitorService { }: { teamId: string; userId: string; - monitors: any[]; + monitors: ImportedMonitor[]; }): Promise<{ imported: number; errors: string[] }> => { const errors: string[] = []; - const cleanedMonitors = monitors.map((monitor) => { - const cleanData = { ...monitor }; - delete cleanData.id; - delete cleanData._id; - delete cleanData.createdAt; - delete cleanData.updatedAt; - delete cleanData.recentChecks; - // Monitors must belong to current team - cleanData.teamId = teamId; - return cleanData; - }); + const cleanedMonitors: Monitor[] = monitors.map((monitor) => ({ + ...monitor, + id: "", + teamId, + userId, + recentChecks: [], + createdAt: "", + updatedAt: "", + })); - const createdMonitors = await this.createMonitors(cleanedMonitors, userId, teamId); + const createdMonitors = await this.createMonitors(cleanedMonitors); if (!createdMonitors || createdMonitors.length === 0) { throw new AppError({ diff --git a/server/src/types/monitor.ts b/server/src/types/monitor.ts index bac2313f5..f29ce75d7 100644 --- a/server/src/types/monitor.ts +++ b/server/src/types/monitor.ts @@ -1,6 +1,6 @@ import type { CheckSnapshot } from "@/types/check.js"; export type { CheckSnapshot } from "@/types/check.js"; -import type { GeoContinent } from "@/types/geoCheck.js"; +import type { GeoContinent, GroupedGeoCheck } from "@/types/geoCheck.js"; export type { GeoContinent } from "@/types/geoCheck.js"; export const MonitorTypes = ["http", "ping", "pagespeed", "hardware", "docker", "port", "game", "grpc", "websocket", "unknown"] as const; @@ -74,6 +74,10 @@ export interface MonitorsWithChecksByTeamIdResult { monitors: Monitor[]; } +export interface GroupedGeoCheckResult { + groupedGeoChecks: GroupedGeoCheck[]; +} + export interface UptimeDetailsResult { monitorData: { monitor: Monitor; diff --git a/server/src/validation/monitorValidation.ts b/server/src/validation/monitorValidation.ts index 783f1a029..df000ecef 100644 --- a/server/src/validation/monitorValidation.ts +++ b/server/src/validation/monitorValidation.ts @@ -128,39 +128,38 @@ const importedMonitorSchema = z.object({ teamId: z.string().optional(), name: z.string().min(1, "Name is required"), description: z.union([z.string(), z.literal("")]).optional(), - status: z.enum(["up", "down", "paused", "initializing", "maintenance", "breached"]).optional(), - statusWindow: z.array(z.boolean()).optional(), - statusWindowSize: z.number().optional(), - statusWindowThreshold: z.number().optional(), + status: z.enum(["up", "down", "paused", "initializing", "maintenance", "breached"]).default("initializing"), + statusWindow: z.array(z.boolean()).default([]), + statusWindowSize: z.number().min(1).max(20).default(5), + statusWindowThreshold: z.number().min(1).max(100).default(60), type: z.enum(MonitorTypes, "Invalid monitor type"), - ignoreTlsErrors: z.boolean().optional(), - useAdvancedMatching: z.boolean().optional(), + ignoreTlsErrors: z.boolean().default(false), + useAdvancedMatching: z.boolean().default(false), jsonPath: z.union([z.string(), z.literal("")]).optional(), expectedValue: z.union([z.string(), z.literal("")]).optional(), matchMethod: z.union([z.enum(MonitorMatchMethods), z.literal("")]).optional(), url: z.string().min(1, "URL is required"), port: z.number().optional(), - isActive: z.boolean().optional(), - interval: z.number().optional(), + isActive: z.boolean().default(true), + interval: z.number().default(60000), uptimePercentage: z.number().optional(), - notifications: z.array(z.string()).optional(), + notifications: z.array(z.string()).default([]), secret: z.string().optional(), - cpuAlertThreshold: z.number().optional(), - cpuAlertCounter: z.number().optional(), - memoryAlertThreshold: z.number().optional(), - memoryAlertCounter: z.number().optional(), - diskAlertThreshold: z.number().optional(), - diskAlertCounter: z.number().optional(), - tempAlertThreshold: z.number().optional(), - tempAlertCounter: z.number().optional(), - selectedDisks: z.array(z.string()).optional(), + cpuAlertThreshold: z.number().default(100), + cpuAlertCounter: z.number().default(5), + memoryAlertThreshold: z.number().default(100), + memoryAlertCounter: z.number().default(5), + diskAlertThreshold: z.number().default(100), + diskAlertCounter: z.number().default(5), + tempAlertThreshold: z.number().default(100), + tempAlertCounter: z.number().default(5), + selectedDisks: z.array(z.string()).default([]), gameId: z.union([z.string(), z.literal("")]).optional(), - grpcServiceName: z.union([z.string(), z.literal("")]).optional(), - group: z.union([z.string(), z.null()]).optional(), - geoCheckEnabled: z.boolean().optional(), - geoCheckLocations: z.array(z.enum(GeoContinents)).optional(), - geoCheckInterval: z.number().optional(), - recentChecks: z.array(z.unknown()).optional(), + grpcServiceName: z.union([z.string(), z.literal("")]).default(""), + group: z.union([z.string().max(50).trim(), z.null()]).default(null), + geoCheckEnabled: z.boolean().default(false), + geoCheckLocations: z.array(z.enum(GeoContinents)).default([]), + geoCheckInterval: z.number().min(300000).default(300000), createdAt: z.string().optional(), updatedAt: z.string().optional(), }); @@ -169,6 +168,8 @@ export const importMonitorsBodyValidation = z.object({ monitors: z.array(importedMonitorSchema).min(1, "At least one monitor is required"), }); +export type ImportedMonitor = z.output; + export const getHardwareDetailsByIdParamValidation = z.object({ monitorId: z.string().min(1, "Monitor ID is required"), });