diff --git a/server/src/service/business/checkService.ts b/server/src/service/business/checkService.ts index fd7f07a55..2d2bf0e01 100644 --- a/server/src/service/business/checkService.ts +++ b/server/src/service/business/checkService.ts @@ -1,6 +1,6 @@ import { Types } from "mongoose"; import { IChecksRepository, IMonitorsRepository } from "@/repositories/index.js"; -import type { 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"; @@ -8,12 +8,23 @@ import { ILogger } from "@/utils/logger.js"; const SERVICE_NAME = "checkService"; -class CheckService { +export interface ICheckService { + createChecks(checks: Check[]): Promise; + buildCheck(statusResponse: MonitorStatusResponse): Partial | undefined; + getChecksByMonitor(params: { monitorId: string; query: Record; teamId: string }): Promise; + getChecksByTeam(params: { teamId: string; query: Record }): Promise; + getChecksSummaryByTeamId(params: { teamId: string; dateRange: string }): Promise; + deleteChecks(params: { monitorId: string; teamId: string }): Promise; + deleteChecksByTeamId(params: { teamId: string }): Promise; + updateChecksTTL(params: { teamId: string; ttl: string }): Promise; +} + +class CheckService implements ICheckService { static SERVICE_NAME = SERVICE_NAME; private monitorsRepository: IMonitorsRepository; private checksRepository: IChecksRepository; - private logger: any; + private logger: ILogger; constructor(monitorsRepository: IMonitorsRepository, logger: ILogger, checksRepository: IChecksRepository) { this.monitorsRepository = monitorsRepository; this.logger = logger; @@ -53,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; } @@ -102,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; teamId: string }) => { if (!monitorId) { throw new AppError({ message: "No monitor ID in request", service: SERVICE_NAME, method: "getChecksByMonitor", status: 400 }); } @@ -110,28 +120,34 @@ 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 || !filter || !page || !rowsPerPage) { + throw new AppError({ message: "Missing required query parameters", 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 }) => { + const { sortOrder, dateRange, filter, page, rowsPerPage } = query; + if (!sortOrder || !dateRange || !filter || !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; @@ -154,7 +170,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); @@ -170,7 +186,7 @@ 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 } }); }; } diff --git a/server/src/service/infrastructure/bufferService.ts b/server/src/service/infrastructure/bufferService.ts index a56ae4bd8..318fd35cd 100755 --- a/server/src/service/infrastructure/bufferService.ts +++ b/server/src/service/infrastructure/bufferService.ts @@ -3,6 +3,7 @@ import type { GeoCheck } from "@/types/index.js"; import type { IGeoChecksService } from "../business/geoChecksService.js"; import type { ILogger } from "@/utils/logger.js"; import type { ISettingsService } from "@/service/system/settingsService.js"; +import { ICheckService } from "../business/checkService.js"; const SERVICE_NAME = "BufferService"; export interface IBufferService { @@ -19,13 +20,13 @@ class BufferService implements IBufferService { private BUFFER_TIMEOUT: number; private logger: ILogger; private SERVICE_NAME: string; - private buffer: any[]; - private geoBuffer: any[]; + private buffer: Check[]; + private geoBuffer: GeoCheck[]; private bufferTimer: NodeJS.Timeout | null = null; - private checksService: any; + private checksService: ICheckService; private geoChecksService: IGeoChecksService; - constructor(logger: ILogger, checkService: any, geoChecksService: IGeoChecksService, settingsService: ISettingsService) { + constructor(logger: ILogger, checkService: ICheckService, geoChecksService: IGeoChecksService, settingsService: ISettingsService) { this.BUFFER_TIMEOUT = settingsService.getSettings().nodeEnv === "development" ? 10 : 1000 * 60 * 1; // 1 minute this.logger = logger; this.checksService = checkService; @@ -48,12 +49,12 @@ class BufferService implements IBufferService { addToBuffer(check: Check) { try { this.buffer.push(check); - } catch (error: any) { + } catch (error: unknown) { this.logger.error({ - message: error.message, + message: error instanceof Error ? error.message : "Unknown error", service: this.SERVICE_NAME, method: "addToBuffer", - stack: error.stack, + stack: error instanceof Error ? error.stack : undefined, }); } } @@ -61,12 +62,12 @@ class BufferService implements IBufferService { addGeoCheckToBuffer(geoCheck: GeoCheck) { try { this.geoBuffer.push(geoCheck); - } catch (error: any) { + } catch (error: unknown) { this.logger.error({ - message: error.message, + message: error instanceof Error ? error.message : "Unknown error", service: this.SERVICE_NAME, method: "addGeoCheckToBuffer", - stack: error.stack, + stack: error instanceof Error ? error.stack : undefined, }); } } @@ -98,12 +99,12 @@ class BufferService implements IBufferService { } return false; - } catch (error: any) { + } catch (error: unknown) { this.logger.error({ - message: error.message, + message: error instanceof Error ? error.message : "Unknown error", service: this.SERVICE_NAME, method: "removeCheckFromBuffer", - stack: error.stack, + stack: error instanceof Error ? error.stack : undefined, }); return false; } @@ -117,12 +118,12 @@ class BufferService implements IBufferService { try { await this.flushBuffer(); await this.flushGeoBuffer(); - } catch (error: any) { + } catch (error: unknown) { this.logger.error({ - message: `Error in flush cycle: ${error.message}`, + message: error instanceof Error ? error.message : "Unknown error", service: this.SERVICE_NAME, method: "scheduleNextFlush", - stack: error.stack, + stack: error instanceof Error ? error.stack : undefined, }); } finally { // Schedule the next flush only after the current one completes @@ -141,12 +142,12 @@ class BufferService implements IBufferService { await this.checksService.createChecks(this.buffer); this.buffer = []; } - } catch (error: any) { + } catch (error: unknown) { this.logger.error({ - message: `Error flushing checks buffer: ${error.message}`, + message: error instanceof Error ? error.message : "Unknown error", service: this.SERVICE_NAME, method: "flushBuffer", - stack: error.stack, + stack: error instanceof Error ? error.stack : undefined, }); // Clear buffer even on error to prevent infinite retry loops this.buffer = []; @@ -164,12 +165,12 @@ class BufferService implements IBufferService { await this.geoChecksService.createGeoChecks(this.geoBuffer); this.geoBuffer = []; } - } catch (error: any) { + } catch (error: unknown) { this.logger.error({ - message: `Error flushing geo checks buffer: ${error.message}`, + message: error instanceof Error ? error.message : "Unknown error", service: this.SERVICE_NAME, method: "flushGeoBuffer", - stack: error.stack, + stack: error instanceof Error ? error.stack : undefined, }); // Clear buffer even on error to prevent infinite retry loops this.geoBuffer = []; diff --git a/server/src/service/infrastructure/emailService.ts b/server/src/service/infrastructure/emailService.ts index 26e3e3e6d..9de3999a4 100755 --- a/server/src/service/infrastructure/emailService.ts +++ b/server/src/service/infrastructure/emailService.ts @@ -7,7 +7,13 @@ const __dirname = path.dirname(__filename); const SERVICE_NAME = "EmailService"; -class EmailService { +export interface IEmailService { + init(): void; + buildEmail(template: string, context: Record): Promise; + sendEmail(to: string, subject: string, html: string, transportConfig?: EmailTransportConfig): Promise; +} + +class EmailService implements IEmailService { static SERVICE_NAME = SERVICE_NAME; private settingsService: any; diff --git a/server/src/service/infrastructure/notificationMessageBuilder.ts b/server/src/service/infrastructure/notificationMessageBuilder.ts index d8235e263..3d16acf19 100644 --- a/server/src/service/infrastructure/notificationMessageBuilder.ts +++ b/server/src/service/infrastructure/notificationMessageBuilder.ts @@ -1,4 +1,4 @@ -import type { Monitor, MonitorStatusResponse } from "@/types/index.js"; +import type { HardwareStatusPayload, Monitor, MonitorStatusResponse } from "@/types/index.js"; import type { MonitorActionDecision } from "@/service/infrastructure/SuperSimpleQueue/SuperSimpleQueueHelper.js"; import type { NotificationMessage, @@ -30,8 +30,8 @@ export class NotificationMessageBuilder implements INotificationMessageBuilder { clientHost: string ): NotificationMessage { const type = this.determineNotificationType(decision, monitor); - const severity = this.determineSeverity(type, monitor.status); - const content = this.buildContent(type, monitor, monitorStatusResponse, decision, clientHost); + const severity = this.determineSeverity(type); + const content = this.buildContent(type, monitor, monitorStatusResponse); return { type, @@ -77,7 +77,7 @@ export class NotificationMessageBuilder implements INotificationMessageBuilder { return "monitor_up"; } - private determineSeverity(type: NotificationType, monitorStatus: string): NotificationSeverity { + private determineSeverity(type: NotificationType): NotificationSeverity { switch (type) { case "monitor_down": return "critical"; @@ -93,28 +93,22 @@ export class NotificationMessageBuilder implements INotificationMessageBuilder { } } - private buildContent( - type: NotificationType, - monitor: Monitor, - monitorStatusResponse: MonitorStatusResponse, - decision: MonitorActionDecision, - clientHost: string - ): NotificationContent { + private buildContent(type: NotificationType, monitor: Monitor, monitorStatusResponse: MonitorStatusResponse): NotificationContent { switch (type) { case "monitor_down": - return this.buildMonitorDownContent(monitor, monitorStatusResponse, clientHost); + return this.buildMonitorDownContent(monitor, monitorStatusResponse); case "monitor_up": - return this.buildMonitorUpContent(monitor, clientHost); + return this.buildMonitorUpContent(monitor); case "threshold_breach": - return this.buildThresholdBreachContent(monitor, monitorStatusResponse, decision, clientHost); + return this.buildThresholdBreachContent(monitor, monitorStatusResponse as MonitorStatusResponse); case "threshold_resolved": - return this.buildThresholdResolvedContent(monitor, clientHost); + return this.buildThresholdResolvedContent(monitor); default: - return this.buildDefaultContent(monitor, clientHost); + return this.buildDefaultContent(monitor); } } - private buildMonitorDownContent(monitor: Monitor, monitorStatusResponse: MonitorStatusResponse, clientHost: string): NotificationContent { + private buildMonitorDownContent(monitor: Monitor, monitorStatusResponse: MonitorStatusResponse): NotificationContent { const title = `Monitor Down: ${monitor.name}`; const summary = `Monitor "${monitor.name}" is currently down and unreachable.`; const details = [`URL: ${monitor.url}`, `Status: Down`, `Type: ${monitor.type}`]; @@ -137,7 +131,7 @@ export class NotificationMessageBuilder implements INotificationMessageBuilder { }; } - private buildMonitorUpContent(monitor: Monitor, clientHost: string): NotificationContent { + private buildMonitorUpContent(monitor: Monitor): NotificationContent { const title = `Monitor Recovered: ${monitor.name}`; const summary = `Monitor "${monitor.name}" is back up and operational.`; const details = [`URL: ${monitor.url}`, `Status: Up`, `Type: ${monitor.type}`]; @@ -150,12 +144,7 @@ export class NotificationMessageBuilder implements INotificationMessageBuilder { }; } - private buildThresholdBreachContent( - monitor: Monitor, - monitorStatusResponse: MonitorStatusResponse, - decision: MonitorActionDecision, - clientHost: string - ): NotificationContent { + private buildThresholdBreachContent(monitor: Monitor, monitorStatusResponse: MonitorStatusResponse): NotificationContent { const title = `Threshold Breach: ${monitor.name}`; const summary = `Monitor "${monitor.name}" has breached one or more thresholds.`; const details = [`URL: ${monitor.url}`, `Status: Breached`, `Type: ${monitor.type}`]; @@ -171,7 +160,7 @@ export class NotificationMessageBuilder implements INotificationMessageBuilder { }; } - private buildThresholdResolvedContent(monitor: Monitor, clientHost: string): NotificationContent { + private buildThresholdResolvedContent(monitor: Monitor): NotificationContent { const title = `Thresholds Resolved: ${monitor.name}`; const summary = `Monitor "${monitor.name}" thresholds have returned to normal.`; const details = [`URL: ${monitor.url}`, `Status: Up`, `Type: ${monitor.type}`]; @@ -184,7 +173,7 @@ export class NotificationMessageBuilder implements INotificationMessageBuilder { }; } - private buildDefaultContent(monitor: Monitor, clientHost: string): NotificationContent { + private buildDefaultContent(monitor: Monitor): NotificationContent { return { title: `Monitor: ${monitor.name}`, summary: `Status update for monitor "${monitor.name}".`, @@ -193,7 +182,7 @@ export class NotificationMessageBuilder implements INotificationMessageBuilder { }; } - public extractThresholdBreaches(monitor: Monitor, monitorStatusResponse: MonitorStatusResponse): ThresholdBreach[] { + public extractThresholdBreaches(monitor: Monitor, monitorStatusResponse: MonitorStatusResponse): ThresholdBreach[] { const breaches: ThresholdBreach[] = []; // Check if this is a hardware monitor with threshold data @@ -202,7 +191,7 @@ export class NotificationMessageBuilder implements INotificationMessageBuilder { } // Cast to HardwareStatusPayload type - const payload = monitorStatusResponse.payload as { data?: any }; + const payload = monitorStatusResponse.payload; const hardware = payload.data; if (!hardware) { diff --git a/server/src/service/infrastructure/notificationProviders/discord.ts b/server/src/service/infrastructure/notificationProviders/discord.ts index 2f0b07fe8..e630e4e86 100644 --- a/server/src/service/infrastructure/notificationProviders/discord.ts +++ b/server/src/service/infrastructure/notificationProviders/discord.ts @@ -1,14 +1,15 @@ const SERVICE_NAME = "DiscordProvider"; -import type { Notification } from "@/types/index.js"; +import type { AlertDiscordPayload, DiscordEmbedField, Notification } from "@/types/index.js"; import { INotificationProvider } from "@/service/index.js"; import { getTestMessage } from "@/service/infrastructure/notificationProviders/utils.js"; -import type { NotificationMessage } from "@/types/notificationMessage.js"; +import type { NotificationMessage, NotificationSeverity } from "@/types/notificationMessage.js"; import got from "got"; +import { ILogger } from "@/utils/logger.js"; export class DiscordProvider implements INotificationProvider { - private logger: any; + private logger: ILogger; - constructor(logger: any) { + constructor(logger: ILogger) { this.logger = logger; } @@ -36,9 +37,6 @@ export class DiscordProvider implements INotificationProvider { } }; - /** - * New unified message format implementation - */ async sendMessage(notification: Notification, message: NotificationMessage): Promise { if (!notification.address) { this.logger.warn({ @@ -71,18 +69,17 @@ export class DiscordProvider implements INotificationProvider { } } - private buildDiscordEmbed(message: NotificationMessage): any { - // Map severity to Discord embed colors - const colorMap: Record = { + private buildDiscordEmbed(message: NotificationMessage): AlertDiscordPayload { + const colorMap: Record = { critical: 0xdc2626, // red-600 warning: 0xf59e0b, // amber-500 info: 0x3b82f6, // blue-500 success: 0x10b981, // green-500 }; - const color = colorMap[message.severity] || colorMap.info; + const color = colorMap[message.severity] ?? colorMap.info; - const fields: Array<{ name: string; value: string; inline?: boolean }> = []; + const fields: Array = []; // Add monitor details fields.push({ diff --git a/server/src/service/infrastructure/notificationProviders/email.ts b/server/src/service/infrastructure/notificationProviders/email.ts index effd94946..c14d59a85 100644 --- a/server/src/service/infrastructure/notificationProviders/email.ts +++ b/server/src/service/infrastructure/notificationProviders/email.ts @@ -1,15 +1,15 @@ const SERVICE_NAME = "EmailProvider"; -import type { Monitor, Notification, MonitorStatusResponse } from "@/types/index.js"; +import type { Notification } from "@/types/index.js"; import { INotificationProvider } from "@/service/index.js"; -import type { MonitorActionDecision } from "@/service/infrastructure/SuperSimpleQueue/SuperSimpleQueueHelper.js"; import { buildTestEmail } from "@/service/infrastructure/notificationProviders/utils.js"; import type { NotificationMessage } from "@/types/notificationMessage.js"; - +import type { ILogger } from "@/utils/logger.js"; +import { IEmailService } from "@/service/infrastructure/emailService.js"; export class EmailProvider implements INotificationProvider { - private emailService: any; - private logger: any; + private emailService: IEmailService; + private logger: ILogger; - constructor(emailService: any, logger: any) { + constructor(emailService: IEmailService, logger: ILogger) { this.emailService = emailService; this.logger = logger; } @@ -18,6 +18,24 @@ export class EmailProvider implements INotificationProvider { const subject = "Test notification"; const html = await buildTestEmail(this.emailService); + if (!notification.address) { + this.logger.warn({ + message: "Missing address", + service: SERVICE_NAME, + method: "sendTestAlert", + }); + return false; + } + + if (!html) { + this.logger.warn({ + message: "Failed to build test email content", + service: SERVICE_NAME, + method: "sendTestAlert", + }); + return false; + } + const messageId = await this.emailService.sendEmail(notification.address, subject, html); if (!messageId) { this.logger.warn({ @@ -38,6 +56,15 @@ export class EmailProvider implements INotificationProvider { const subject = this.buildSubject(message); const html = await this.buildEmailFromMessage(message); + if (!html) { + this.logger.warn({ + message: "Failed to build email content", + service: SERVICE_NAME, + method: "sendMessage", + }); + return false; + } + const messageId = await this.emailService.sendEmail(notification.address, subject, html); if (!messageId) { this.logger.warn({ @@ -65,7 +92,7 @@ export class EmailProvider implements INotificationProvider { } } - private async buildEmailFromMessage(message: NotificationMessage): Promise { + private async buildEmailFromMessage(message: NotificationMessage): Promise { const context = { title: message.content.title, summary: message.content.summary, @@ -88,16 +115,6 @@ export class EmailProvider implements INotificationProvider { const html = await this.emailService.buildEmail("unifiedNotificationTemplate", context); - this.logger.info({ - message: "[DEBUG] Email HTML generated", - service: SERVICE_NAME, - method: "buildEmailFromMessage", - details: { - htmlLength: html?.length || 0, - htmlPreview: html?.substring(0, 200), - }, - }); - return html; } diff --git a/server/src/service/infrastructure/notificationProviders/matrix.ts b/server/src/service/infrastructure/notificationProviders/matrix.ts index 8d58e6ead..ce53215bd 100644 --- a/server/src/service/infrastructure/notificationProviders/matrix.ts +++ b/server/src/service/infrastructure/notificationProviders/matrix.ts @@ -1,14 +1,15 @@ const SERVICE_NAME = "MatrixProvider"; import got from "got"; import type { INotificationProvider } from "@/service/index.js"; -import type { Notification } from "@/types/index.js"; +import type { AlertMatrixPayload, Notification } from "@/types/index.js"; import type { NotificationMessage } from "@/types/notificationMessage.js"; import { getTestMessage } from "@/service/infrastructure/notificationProviders/utils.js"; +import { ILogger } from "@/utils/logger.js"; export class MatrixProvider implements INotificationProvider { - private logger: any; + private logger: ILogger; - constructor(logger: any) { + constructor(logger: ILogger) { this.logger = logger; } @@ -42,9 +43,6 @@ export class MatrixProvider implements INotificationProvider { } }; - /** - * New unified message format - builds Matrix HTML message from NotificationMessage - */ sendMessage = async (notification: Notification, message: NotificationMessage): Promise => { const { homeserverUrl, accessToken, roomId } = notification; @@ -87,7 +85,7 @@ export class MatrixProvider implements INotificationProvider { * Returns both plain text and HTML formatted versions * Matrix supports HTML subset for rich formatting */ - private buildMatrixMessage(message: NotificationMessage): { plainText: string; htmlText: string } { + private buildMatrixMessage(message: NotificationMessage): AlertMatrixPayload { const plainLines: string[] = []; const htmlLines: string[] = []; diff --git a/server/src/service/infrastructure/notificationProviders/pagerduty.ts b/server/src/service/infrastructure/notificationProviders/pagerduty.ts index f96ea6cc5..b15717878 100644 --- a/server/src/service/infrastructure/notificationProviders/pagerduty.ts +++ b/server/src/service/infrastructure/notificationProviders/pagerduty.ts @@ -1,15 +1,16 @@ const SERVICE_NAME = "PagerDutyProvider"; import got from "got"; -import type { Monitor, Notification, MonitorStatusResponse } from "@/types/index.js"; -import type { MonitorActionDecision } from "@/service/infrastructure/SuperSimpleQueue/SuperSimpleQueueHelper.js"; +import type { Notification } from "@/types/index.js"; import { INotificationProvider } from "@/service/index.js"; import type { NotificationMessage } from "@/types/notificationMessage.js"; import { getTestMessage } from "@/service/infrastructure/notificationProviders/utils.js"; +import { ILogger } from "@/utils/logger.js"; +import { AlertPagerDutyPayload } from "@/types/index.js"; export class PagerDutyProvider implements INotificationProvider { - private logger: any; + private logger: ILogger; - constructor(logger: any) { + constructor(logger: ILogger) { this.logger = logger; } @@ -77,7 +78,7 @@ export class PagerDutyProvider implements INotificationProvider { } } - private buildPagerDutyPayload(notification: Notification, message: NotificationMessage): any { + private buildPagerDutyPayload(notification: Notification, message: NotificationMessage): AlertPagerDutyPayload { // Map our notification type to PagerDuty event_action const eventAction = message.type === "monitor_up" || message.type === "threshold_resolved" ? "resolve" : "trigger"; @@ -106,7 +107,7 @@ export class PagerDutyProvider implements INotificationProvider { } // Build custom details - const customDetails: any = { + const customDetails: Record = { monitor_name: message.monitor.name, monitor_url: message.monitor.url, monitor_type: message.monitor.type, diff --git a/server/src/service/infrastructure/notificationProviders/slack.ts b/server/src/service/infrastructure/notificationProviders/slack.ts index a4cf0ed26..e13362669 100644 --- a/server/src/service/infrastructure/notificationProviders/slack.ts +++ b/server/src/service/infrastructure/notificationProviders/slack.ts @@ -1,15 +1,15 @@ const SERVICE_NAME = "SlackProvider"; -import type { Monitor, Notification, MonitorStatusResponse } from "@/types/index.js"; +import type { Notification } from "@/types/index.js"; import { INotificationProvider } from "@/service/index.js"; -import type { MonitorActionDecision } from "@/service/infrastructure/SuperSimpleQueue/SuperSimpleQueueHelper.js"; import type { NotificationMessage } from "@/types/notificationMessage.js"; import { getTestMessage } from "@/service/infrastructure/notificationProviders/utils.js"; import got, { HTTPError } from "got"; +import { ILogger } from "@/utils/logger.js"; export class SlackProvider implements INotificationProvider { - private logger: any; + private logger: ILogger; - constructor(logger: any) { + constructor(logger: ILogger) { this.logger = logger; } @@ -78,7 +78,7 @@ export class SlackProvider implements INotificationProvider { * Uses Slack's rich formatting with sections, fields, and context blocks */ private buildSlackPayload(message: NotificationMessage): object { - const blocks: any[] = []; + const blocks: unknown[] = []; // Determine color based on severity const colorMap = { diff --git a/server/src/service/infrastructure/notificationProviders/utils.ts b/server/src/service/infrastructure/notificationProviders/utils.ts index 874152413..454df1963 100644 --- a/server/src/service/infrastructure/notificationProviders/utils.ts +++ b/server/src/service/infrastructure/notificationProviders/utils.ts @@ -1,6 +1,5 @@ -import { Monitor, HardwareStatusPayload, MonitorStatusResponse } from "@/types/index.js"; -// Test notification helpers - used by all providers for test alerts -export const buildTestEmail = async (emailService: any) => { +import { IEmailService } from "@/service/infrastructure/emailService.js"; +export const buildTestEmail = async (emailService: IEmailService) => { const context = { testName: "Monitoring System" }; const html = await emailService.buildEmail("testEmailTemplate", context); return html; diff --git a/server/src/service/infrastructure/notificationProviders/webhook.ts b/server/src/service/infrastructure/notificationProviders/webhook.ts index 532714827..6a00f3f1e 100644 --- a/server/src/service/infrastructure/notificationProviders/webhook.ts +++ b/server/src/service/infrastructure/notificationProviders/webhook.ts @@ -1,15 +1,15 @@ const SERVICE_NAME = "WebhookProvider"; -import type { Monitor, Alert, Notification, MonitorStatusResponse } from "@/types/index.js"; +import type { Notification } from "@/types/index.js"; import { INotificationProvider } from "@/service/index.js"; -import type { MonitorActionDecision } from "@/service/infrastructure/SuperSimpleQueue/SuperSimpleQueueHelper.js"; import type { NotificationMessage } from "@/types/notificationMessage.js"; import { getTestMessage } from "@/service/infrastructure/notificationProviders/utils.js"; import got from "got"; +import { ILogger } from "@/utils/logger.js"; export class WebhookProvider implements INotificationProvider { - private logger: any; + private logger: ILogger; - constructor(logger: any) { + constructor(logger: ILogger) { this.logger = logger; } @@ -46,10 +46,6 @@ export class WebhookProvider implements INotificationProvider { } }; - /** - * Build webhook payload from NotificationMessage - * Format: { text: string, severity: string, monitor: object, details: object } - */ private buildWebhookPayload(message: NotificationMessage): object { const lines: string[] = []; diff --git a/server/src/service/infrastructure/notificationsService.ts b/server/src/service/infrastructure/notificationsService.ts index 4331c5ff0..1da308678 100644 --- a/server/src/service/infrastructure/notificationsService.ts +++ b/server/src/service/infrastructure/notificationsService.ts @@ -1,4 +1,4 @@ -import type { HardwareStatusPayload, Monitor, MonitorStatusResponse, Notification, MonitorStatus } from "@/types/index.js"; +import type { Monitor, MonitorStatusResponse, Notification } from "@/types/index.js"; import type { NotificationMessage } from "@/types/notificationMessage.js"; import { IMonitorsRepository, INotificationsRepository } from "@/repositories/index.js"; import { INotificationProvider } from "./notificationProviders/INotificationProvider.js"; diff --git a/server/src/service/infrastructure/statusService.ts b/server/src/service/infrastructure/statusService.ts index 12cd3a77f..badcf78ec 100755 --- a/server/src/service/infrastructure/statusService.ts +++ b/server/src/service/infrastructure/statusService.ts @@ -15,13 +15,15 @@ import type { GrpcStatusPayload, CheckSnapshot, MonitorStats, + CheckDiskInfo, } from "@/types/index.js"; +import { AppError } from "@/utils/AppError.js"; import { ILogger } from "@/utils/logger.js"; +import { IBufferService } from "./bufferService.js"; const SERVICE_NAME = "StatusService"; export interface IStatusService { - updateRunningStats({ monitor, networkResponse }: { monitor: Monitor; networkResponse: any }): Promise; - handleIncidentForCheck(check: any, monitor: Monitor, action: any, errorContext?: string): Promise; + updateRunningStats(monitor: Monitor, networkResponse: MonitorStatusResponse): Promise; updateMonitorStatus( statusResponse: MonitorStatusResponse< | PingStatusPayload @@ -40,15 +42,15 @@ export interface IStatusService { export class StatusService implements IStatusService { static SERVICE_NAME = SERVICE_NAME; - private logger: any; - private buffer: any; + private logger: ILogger; + private buffer: IBufferService; private monitorsRepository: IMonitorsRepository; private monitorStatsRepository: IMonitorStatsRepository; private checksRepository: IChecksRepository; constructor( logger: ILogger, - buffer: any, + buffer: IBufferService, monitorsRepository: IMonitorsRepository, monitorStatsRepository: IMonitorStatsRepository, checksRepository: IChecksRepository @@ -64,7 +66,7 @@ export class StatusService implements IStatusService { return StatusService.SERVICE_NAME; } - async updateRunningStats({ monitor, networkResponse }: { monitor: Monitor; networkResponse: MonitorStatusResponse }) { + async updateRunningStats(monitor: Monitor, networkResponse: MonitorStatusResponse) { try { const monitorId = monitor.id; const { responseTime, status } = networkResponse; @@ -164,62 +166,17 @@ export class StatusService implements IStatusService { } return true; - } catch (error: any) { + } catch (error: unknown) { this.logger.error({ service: SERVICE_NAME, - message: error.message, + message: error instanceof Error ? error.message : "Unknown error", method: "updateRunningStats", - stack: error.stack, + stack: error instanceof Error ? error.stack : undefined, }); return false; } } - handleIncidentForCheck = async (check: Check, monitor: Monitor, action: any, errorContext = "incident handling") => { - try { - let savedCheck: Check | null = null; - if (!check.id) { - try { - savedCheck = await this.checksRepository.create(check); - - this.buffer.removeCheckFromBuffer(check); - } catch (checkError: any) { - this.logger.error({ - service: SERVICE_NAME, - method: "handleIncidentForCheck", - message: `Failed to save check immediately for ${errorContext}: ${checkError.message}`, - monitorId: monitor.id, - stack: checkError.stack, - }); - savedCheck = null; - } - } - - if (savedCheck && savedCheck.id) { - try { - this.buffer.addIncidentToBuffer({ monitor, check: savedCheck, action }); - } catch (incidentError: any) { - this.logger.error({ - service: SERVICE_NAME, - method: "handleIncidentForCheck", - message: `Failed to add incident to buffer for ${errorContext}: ${incidentError.message}`, - monitorId: monitor.id, - action, - stack: incidentError.stack, - }); - } - } - } catch (error: any) { - this.logger.error({ - service: SERVICE_NAME, - method: "handleIncidentForCheck", - message: `Error in ${errorContext}: ${error.message}`, - monitorId: monitor?.id, - stack: error.stack, - }); - } - }; - updateMonitorStatus = async ( statusResponse: MonitorStatusResponse< | PingStatusPayload @@ -239,7 +196,7 @@ export class StatusService implements IStatusService { const monitor = await this.monitorsRepository.findById(monitorId, teamId); // Update running stats - this.updateRunningStats({ monitor, networkResponse: statusResponse }); + this.updateRunningStats(monitor, statusResponse); monitor.statusWindow = monitor.statusWindow || []; monitor.statusWindow.push(status); @@ -322,7 +279,8 @@ export class StatusService implements IStatusService { const memoryBreach = memoryUsage !== -1 && memoryUsage > monitor.memoryAlertThreshold / 100; const diskBreach = - metrics.disk?.some((d: any) => typeof d?.usage_percent === "number" && d.usage_percent > monitor.diskAlertThreshold / 100) ?? false; + metrics.disk?.some((d: CheckDiskInfo) => typeof d?.usage_percent === "number" && d.usage_percent > monitor.diskAlertThreshold / 100) ?? + false; const temps = metrics.cpu?.temperature ?? []; const tempBreach = temps.some((temp: number) => temp > monitor.tempAlertThreshold); @@ -400,10 +358,13 @@ export class StatusService implements IStatusService { timestamp: new Date().getTime(), thresholdBreaches, }; - } catch (error: any) { - error.service = SERVICE_NAME; - error.method = "updateStatus"; - throw error; + } catch (error: unknown) { + throw new AppError({ + message: `Failed to update monitor status: ${error instanceof Error ? error.message : "Unknown error"}`, + details: `Error updating status for monitor with id ${check.metadata.monitorId}`, + service: SERVICE_NAME, + method: "updateMonitorStatus", + }); } }; @@ -419,13 +380,13 @@ export class StatusService implements IStatusService { } this.buffer.addToBuffer(check); return true; - } catch (error: any) { + } catch (error: unknown) { this.logger.error({ - message: error.message, - service: error.service || SERVICE_NAME, - method: error.method || "insertCheck", - details: error.details || `Error inserting check for monitor: ${check?.metadata.monitorId}`, - stack: error.stack, + message: error instanceof Error ? error.message : "Unknown error", + service: SERVICE_NAME, + method: "insertCheck", + details: { msg: `Error inserting check for monitor: ${check?.metadata.monitorId}` }, + stack: error instanceof Error ? error.stack : undefined, }); } }; diff --git a/server/src/service/system/settingsService.ts b/server/src/service/system/settingsService.ts index 3390ba770..58c896dc6 100755 --- a/server/src/service/system/settingsService.ts +++ b/server/src/service/system/settingsService.ts @@ -22,7 +22,7 @@ export interface ISettingsService { } class SettingsService implements ISettingsService { - static SERVICE_NAME = "SettingsService"; + static SERVICE_NAME = SERVICE_NAME; private settings: EnvConfig; private settingsRepository: ISettingsRepository; diff --git a/server/src/types/alert.ts b/server/src/types/alert.ts index 4725ebee8..3cb9d7734 100644 --- a/server/src/types/alert.ts +++ b/server/src/types/alert.ts @@ -4,16 +4,29 @@ export interface AlertWebhookPayload { } export interface AlertPagerDutyPayload { - routingKey: string; - monitorUrl?: string; + routing_key?: string; + dedup_key?: string; + event_action?: "trigger" | "resolve"; + payload: Record; } export interface AlertMatrixPayload { - friendlyName?: string; - homeserverUrl: string; - accessToken: string; - roomId: string; - monitorName: string; + plainText: string; + htmlText: string; +} + +export interface DiscordEmbedField { + name: string; + value: string; + inline?: boolean; +} + +export interface AlertDiscordPayload { + title: string; + description: string; + color: number; + fields: DiscordEmbedField[]; + timestamp: string; } export interface Alert { diff --git a/server/src/types/express.d.ts b/server/src/types/express.d.ts index 66755659c..973d2d5b9 100644 --- a/server/src/types/express.d.ts +++ b/server/src/types/express.d.ts @@ -5,7 +5,7 @@ declare global { interface Request { file?: Multer.File; user?: User | undefined; - resource?: any; + resource?: unknown; } } } diff --git a/server/src/types/maintenanceWindow.ts b/server/src/types/maintenanceWindow.ts index 9e4b47959..bcbd075a1 100644 --- a/server/src/types/maintenanceWindow.ts +++ b/server/src/types/maintenanceWindow.ts @@ -2,7 +2,7 @@ export type DurationUnit = "seconds" | "minutes" | "hours" | "days"; export interface MaintenanceWindow { id: string; - monitorId: String; + monitorId: string; teamId: string; active: boolean; name: string;