diff --git a/server/src/service/infrastructure/SuperSimpleQueue/SuperSimpleQueue.ts b/server/src/service/infrastructure/SuperSimpleQueue/SuperSimpleQueue.ts index d5a0fa12f..f4fd5b1e6 100644 --- a/server/src/service/infrastructure/SuperSimpleQueue/SuperSimpleQueue.ts +++ b/server/src/service/infrastructure/SuperSimpleQueue/SuperSimpleQueue.ts @@ -2,7 +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"; +import { Monitor, MonitorType, supportsGeoCheck } from "@/types/monitor.js"; const SERVICE_NAME = "JobQueue"; type QueueJobFailure = { @@ -42,11 +42,11 @@ type QueueJobSummary = { export interface ISuperSimpleQueue { readonly serviceName: string; init(): Promise; - addJob(monitorId: string, monitor: any): Promise; - deleteJob(monitor: any): Promise; - pauseJob(monitor: any): Promise; - resumeJob(monitor: any): Promise; - updateJob(monitor: any): Promise; + addJob(monitorId: string, monitor: Monitor): Promise; + deleteJob(monitor: Monitor): Promise; + pauseJob(monitor: Monitor): Promise; + resumeJob(monitor: Monitor): Promise; + updateJob(monitor: Monitor): Promise; shutdown(): Promise; getMetrics(): Promise; getJobs(): Promise; @@ -108,18 +108,17 @@ export class SuperSimpleQueue implements ISuperSimpleQueue { this.scheduler.addJob({ id: "cleanup-retention", template: "cleanup-retention-job", active: true, repeat: 24 * 60 * 60 * 1000 }); return true; - } catch (error: any) { + } catch (error: unknown) { this.logger.error({ - message: "Failed to initialize SuperSimpleQueue", + message: `Failed to initialize SuperSimpleQueue: ${error instanceof Error ? error.message : String(error)}`, service: SERVICE_NAME, method: "init", - details: error, }); return false; } }; - addJob = async (monitorId: string, monitor: any) => { + addJob = async (monitorId: string, monitor: Monitor) => { this.scheduler.addJob({ id: monitorId, template: "monitor-job", @@ -145,12 +144,12 @@ export class SuperSimpleQueue implements ISuperSimpleQueue { } }; - deleteJob = async (monitor: any) => { + deleteJob = async (monitor: Monitor) => { this.scheduler.removeJob(monitor.id); this.scheduler.removeJob(`${monitor.id}-geo`); }; - pauseJob = async (monitor: any) => { + pauseJob = async (monitor: Monitor) => { const result = await this.scheduler.pauseJob(monitor.id); if (result === false) { throw new Error("Failed to pause monitor"); @@ -163,7 +162,7 @@ export class SuperSimpleQueue implements ISuperSimpleQueue { }); }; - resumeJob = async (monitor: any) => { + resumeJob = async (monitor: Monitor) => { const result = await this.scheduler.resumeJob(monitor.id); if (result === false) { throw new Error("Failed to resume monitor"); @@ -178,7 +177,7 @@ export class SuperSimpleQueue implements ISuperSimpleQueue { }); }; - updateJob = async (monitor: any) => { + updateJob = async (monitor: Monitor) => { this.scheduler.updateJob(monitor.id, { repeat: monitor.interval, data: monitor }); // Handle geo check job lifecycle @@ -246,8 +245,8 @@ export class SuperSimpleQueue implements ISuperSimpleQueue { failingJobs: 0, jobsWithFailures: [] as Array<{ monitorId: string | number; - monitorUrl: any; - monitorType: any; + monitorUrl: string; + monitorType: MonitorType; failedAt: number | null; failCount: number; failReason: string | null;