cleanup services
This commit is contained in:
1 parent
0718e63e2f
commit
bd32854c7a
19 files changed
+221
-120
No files matched your search
@@ -19,7 +19,7 @@ export interface ICheckService {
|
||||
updateChecksTTL(params: { teamId: string; ttl: string }): Promise<void>;
|
||||
}
|
||||
|
||||
class CheckService implements ICheckService {
|
||||
export class CheckService implements ICheckService {
|
||||
static SERVICE_NAME = SERVICE_NAME;
|
||||
|
||||
private monitorsRepository: IMonitorsRepository;
|
||||
@@ -195,4 +195,3 @@ class CheckService implements ICheckService {
|
||||
};
|
||||
}
|
||||
|
||||
export default CheckService;
|
||||
@@ -3,15 +3,19 @@ import os from "os";
|
||||
|
||||
const SERVICE_NAME = "diagnosticService";
|
||||
|
||||
interface MemoryUsageMetrics {
|
||||
rss: number;
|
||||
heapTotal: number;
|
||||
heapUsed: number;
|
||||
external: number;
|
||||
arrayBuffers: number;
|
||||
export interface IDiagnosticService {
|
||||
getCPUUsage(): Promise<{ userUsageMs: number; systemUsageMs: number; usagePercentage: number }>;
|
||||
getSystemStats(): Promise<{
|
||||
osStats: { freeMemoryBytes: number; totalMemoryBytes: number };
|
||||
memoryUsage: Record<keyof NodeJS.MemoryUsage, number>;
|
||||
cpuUsage: { userUsageMs: number; systemUsageMs: number; usagePercentage: number };
|
||||
v8HeapStats: { totalHeapSizeBytes: number; usedHeapSizeBytes: number; heapSizeLimitBytes: number };
|
||||
eventLoopDelayMs: number;
|
||||
uptimeMs: number;
|
||||
}>;
|
||||
}
|
||||
|
||||
class DiagnosticService {
|
||||
export class DiagnosticService implements IDiagnosticService {
|
||||
static SERVICE_NAME = SERVICE_NAME;
|
||||
|
||||
constructor() {
|
||||
@@ -104,4 +108,3 @@ class DiagnosticService {
|
||||
};
|
||||
}
|
||||
|
||||
export default DiagnosticService;
|
||||
@@ -16,7 +16,7 @@ export interface IGeoChecksService {
|
||||
getGeoChecksByMonitor(args: { monitorId: string; query: any; teamId: string }): Promise<any>;
|
||||
}
|
||||
|
||||
class GeoChecksService implements IGeoChecksService {
|
||||
export class GeoChecksService implements IGeoChecksService {
|
||||
static SERVICE_NAME = SERVICE_NAME;
|
||||
|
||||
private logger: ILogger;
|
||||
@@ -189,4 +189,3 @@ class GeoChecksService implements IGeoChecksService {
|
||||
};
|
||||
}
|
||||
|
||||
export default GeoChecksService;
|
||||
@@ -5,12 +5,34 @@ import { AppError } from "@/utils/AppError.js";
|
||||
import { ParseBoolean } from "@/utils/utils.js";
|
||||
import { getDateForRange } from "@/utils/dataUtils.js";
|
||||
import type { IIncidentsRepository, IMonitorsRepository, IUsersRepository } from "@/repositories/index.js";
|
||||
import type { Incident } from "@/types/index.js";
|
||||
import type { Incident, IncidentSummary, User } from "@/types/index.js";
|
||||
import type { MonitorActionDecision } from "@/service/infrastructure/SuperSimpleQueue/SuperSimpleQueueHelper.js";
|
||||
import type { INotificationMessageBuilder } from "@/service/infrastructure/notificationMessageBuilder.js";
|
||||
import type { ILogger } from "@/utils/logger.js";
|
||||
|
||||
class IncidentService {
|
||||
export interface IIncidentService {
|
||||
handleIncident(
|
||||
monitor: Monitor,
|
||||
code: number,
|
||||
decision: MonitorActionDecision,
|
||||
monitorStatusResponse?: MonitorStatusResponse
|
||||
): Promise<Incident | null>;
|
||||
resolveIncident(incidentId: string, userId: string, teamId: string, comment?: string, userEmail?: string): Promise<Incident>;
|
||||
getIncidentsByTeam(
|
||||
teamId: string,
|
||||
sortOrder: string,
|
||||
dateRange: string,
|
||||
page: string,
|
||||
rowsPerPage: string,
|
||||
status: string,
|
||||
monitorId: string,
|
||||
resolutionType: string
|
||||
): Promise<{ incidents: Incident[]; count: number }>;
|
||||
getIncidentSummary(teamId: string, limit?: string): Promise<IncidentSummary>;
|
||||
getIncidentById(incidentId: string, teamId: string): Promise<{ incident: Incident; monitor: Monitor; user: User | null }>;
|
||||
}
|
||||
|
||||
export class IncidentService implements IIncidentService {
|
||||
static SERVICE_NAME = SERVICE_NAME;
|
||||
|
||||
private logger: ILogger;
|
||||
@@ -245,4 +267,3 @@ class IncidentService {
|
||||
};
|
||||
}
|
||||
|
||||
export default IncidentService;
|
||||
@@ -5,7 +5,13 @@ import { AppError } from "@/utils/AppError.js";
|
||||
|
||||
const SERVICE_NAME = "inviteService";
|
||||
|
||||
class InviteService {
|
||||
export interface IInviteService {
|
||||
getInviteToken(params: { invite: Partial<Invite>; teamId: string; userRoles: UserRole[] }): Promise<Invite>;
|
||||
sendInviteEmail(params: { invite: Partial<Invite>; firstName: string; userRoles: UserRole[] }): Promise<void>;
|
||||
verifyInviteToken(params: { inviteToken: string }): Promise<Invite>;
|
||||
}
|
||||
|
||||
export class InviteService implements IInviteService {
|
||||
static SERVICE_NAME = SERVICE_NAME;
|
||||
|
||||
private settingsService: any;
|
||||
@@ -89,4 +95,3 @@ class InviteService {
|
||||
};
|
||||
}
|
||||
|
||||
export default InviteService;
|
||||
@@ -1,10 +1,23 @@
|
||||
import { IMaintenanceWindowsRepository, IMonitorsRepository } from "@/repositories/index.js";
|
||||
import type { MaintenanceWindow } from "@/types/index.js";
|
||||
import { ParseBoolean } from "@/utils/utils.js";
|
||||
import { AppError } from "@/utils/AppError.js";
|
||||
|
||||
const SERVICE_NAME = "maintenanceWindowService";
|
||||
|
||||
class MaintenanceWindowService {
|
||||
export interface IMaintenanceWindowService {
|
||||
createMaintenanceWindow(params: { teamId: string; body: Partial<MaintenanceWindow> & { monitors: string[] } }): Promise<void>;
|
||||
getMaintenanceWindowById(params: { id: string; teamId: string }): Promise<MaintenanceWindow>;
|
||||
getMaintenanceWindowsByTeamId(params: {
|
||||
teamId: string;
|
||||
query: Record<string, string>;
|
||||
}): Promise<{ maintenanceWindows: MaintenanceWindow[]; maintenanceWindowCount: number }>;
|
||||
getMaintenanceWindowsByMonitorId(params: { monitorId: string; teamId: string }): Promise<MaintenanceWindow[]>;
|
||||
deleteMaintenanceWindow(params: { id: string; teamId: string }): Promise<MaintenanceWindow>;
|
||||
editMaintenanceWindow(params: { id: string; teamId: string; body: Partial<MaintenanceWindow> }): Promise<MaintenanceWindow>;
|
||||
}
|
||||
|
||||
export class MaintenanceWindowService implements IMaintenanceWindowService {
|
||||
static SERVICE_NAME = SERVICE_NAME;
|
||||
private monitorsRepository: IMonitorsRepository;
|
||||
private maintenanceWindowsRepository: IMaintenanceWindowsRepository;
|
||||
@@ -84,4 +97,3 @@ class MaintenanceWindowService {
|
||||
};
|
||||
}
|
||||
|
||||
export default MaintenanceWindowService;
|
||||
@@ -11,10 +11,31 @@ import { canManageRole, type UserRole } from "@/types/user.js";
|
||||
import bcrypt from "bcryptjs";
|
||||
import { AppError } from "@/utils/AppError.js";
|
||||
import { ISuperSimpleQueue } from "@/service/infrastructure/SuperSimpleQueue/SuperSimpleQueue.js";
|
||||
|
||||
import { IEmailService } from "@/service/infrastructure/emailService.js";
|
||||
import { ISettingsService } from "@/service/system/settingsService.js";
|
||||
import { ILogger } from "@/utils/logger.js";
|
||||
import jwt from "jsonwebtoken";
|
||||
type JwtType = typeof jwt;
|
||||
const SERVICE_NAME = "userService";
|
||||
|
||||
class UserService {
|
||||
export interface IUserService {
|
||||
issueToken(payload: Partial<User>, appSettings: { jwtTTL?: string; jwtSecret?: string }): string;
|
||||
registerUser(user: Partial<User>, inviteToken: string, file: unknown): Promise<{ user: User; token: string }>;
|
||||
createUser(userData: Partial<User>, teamId: string, actorRoles: UserRole[], file: unknown): Promise<User>;
|
||||
loginUser(email: string, password: string): Promise<{ user: User; token: string }>;
|
||||
editUser(updates: Partial<User & { newPassword?: string }>, file: unknown, currentUser: User): Promise<User>;
|
||||
checkSuperadminExists(): Promise<boolean>;
|
||||
requestRecovery(email: string): Promise<string | false | undefined>;
|
||||
validateRecovery(recoveryToken: string): Promise<void>;
|
||||
resetPassword(password: string, recoveryToken: string): Promise<{ user: User; token: string }>;
|
||||
deleteUser(user: User): Promise<void>;
|
||||
getAllUsers(): Promise<User[]>;
|
||||
getUserById(roles: UserRole[], userId: string): Promise<User>;
|
||||
editUserById(userId: string, patch: Partial<User>): Promise<void>;
|
||||
setPasswordByUserId(userId: string, password: string): Promise<User>;
|
||||
}
|
||||
|
||||
export class UserService implements IUserService {
|
||||
static SERVICE_NAME = SERVICE_NAME;
|
||||
|
||||
private hashPassword = (password: string): string => {
|
||||
@@ -22,10 +43,10 @@ class UserService {
|
||||
return bcrypt.hashSync(password, salt);
|
||||
};
|
||||
|
||||
private emailService: any;
|
||||
private settingsService: any;
|
||||
private logger: any;
|
||||
private jwt: any;
|
||||
private emailService: IEmailService;
|
||||
private settingsService: ISettingsService;
|
||||
private logger: ILogger;
|
||||
private jwt: JwtType;
|
||||
private jobQueue: ISuperSimpleQueue;
|
||||
private crypto: any;
|
||||
private monitorsRepository: IMonitorsRepository;
|
||||
@@ -50,10 +71,10 @@ class UserService {
|
||||
teamsRepository,
|
||||
}: {
|
||||
crypto: any;
|
||||
emailService: any;
|
||||
settingsService: any;
|
||||
logger: any;
|
||||
jwt: any;
|
||||
emailService: IEmailService;
|
||||
settingsService: ISettingsService;
|
||||
logger: ILogger;
|
||||
jwt: JwtType;
|
||||
jobQueue: ISuperSimpleQueue;
|
||||
monitorsRepository: IMonitorsRepository;
|
||||
usersRepository: IUsersRepository;
|
||||
@@ -134,20 +155,23 @@ class UserService {
|
||||
const html = await this.emailService.buildEmail("welcomeEmailTemplate", {
|
||||
name: newUser.firstName,
|
||||
});
|
||||
this.emailService.sendEmail(newUser.email, "Welcome to Uptime Monitor", html).catch((error: any) => {
|
||||
if (!html) {
|
||||
throw new Error("Failed to build welcome email HTML");
|
||||
}
|
||||
this.emailService.sendEmail(newUser.email, "Welcome to Uptime Monitor", html).catch((error: unknown) => {
|
||||
this.logger.warn({
|
||||
message: error.message,
|
||||
message: error instanceof Error ? error.message : "Unknown error",
|
||||
service: SERVICE_NAME,
|
||||
method: "registerUser",
|
||||
stack: error.stack,
|
||||
stack: error instanceof Error ? error.stack : undefined,
|
||||
});
|
||||
});
|
||||
} catch (error: any) {
|
||||
} catch (error: unknown) {
|
||||
this.logger.warn({
|
||||
message: error.message,
|
||||
message: error instanceof Error ? error.message : "Unknown error",
|
||||
service: SERVICE_NAME,
|
||||
method: "registerUser",
|
||||
stack: error.stack,
|
||||
stack: error instanceof Error ? error.stack : undefined,
|
||||
});
|
||||
}
|
||||
|
||||
@@ -313,13 +337,13 @@ class UserService {
|
||||
|
||||
if (roles.includes("superadmin")) {
|
||||
// 2. Remove all jobs, delete checks and alerts
|
||||
res &&
|
||||
res?.length > 0 &&
|
||||
(await Promise.all(
|
||||
if (res && res.length > 0) {
|
||||
await Promise.all(
|
||||
res.map(async (monitor) => {
|
||||
await this.jobQueue.deleteJob(monitor.id);
|
||||
})
|
||||
));
|
||||
);
|
||||
}
|
||||
}
|
||||
// 6. Delete the user by id
|
||||
await this.usersRepository.deleteById(userId);
|
||||
@@ -348,4 +372,3 @@ class UserService {
|
||||
return updatedUser;
|
||||
};
|
||||
}
|
||||
export default UserService;
|
||||
@@ -1,14 +1,33 @@
|
||||
// Business services
|
||||
export * from "@/service/business/checkService.js";
|
||||
export * from "@/service/business/diagnosticService.js";
|
||||
export * from "@/service/business/geoChecksService.js";
|
||||
export * from "@/service/business/incidentService.js";
|
||||
export * from "@/service/business/inviteService.js";
|
||||
export * from "@/service/business/maintenanceWindowService.js";
|
||||
export * from "@/service/business/monitorService.js";
|
||||
export * from "@/service/business/statusPageService.js";
|
||||
export * from "@/service/business/userService.js";
|
||||
|
||||
// Infrastructure services
|
||||
export * from "@/service/infrastructure/SuperSimpleQueue/SuperSimpleQueue.js";
|
||||
export * from "@/service/infrastructure/SuperSimpleQueue/SuperSimpleQueueHelper.js";
|
||||
export * from "@/service/infrastructure/notificationMessageBuilder.js";
|
||||
export * from "@/service/infrastructure/bufferService.js";
|
||||
export * from "@/service/infrastructure/emailService.js";
|
||||
export * from "@/service/infrastructure/globalPingService.js";
|
||||
export * from "@/service/infrastructure/networkService.js";
|
||||
export * from "@/service/infrastructure/notificationsService.js";
|
||||
export * from "@/service/infrastructure/statusService.js";
|
||||
|
||||
// Notification providers
|
||||
export * from "@/service/infrastructure/notificationProviders/discord.js";
|
||||
export * from "@/service/infrastructure/notificationProviders/email.js";
|
||||
export * from "@/service/infrastructure/notificationProviders/INotificationProvider.js";
|
||||
export * from "@/service/infrastructure/notificationProviders/pagerduty.js";
|
||||
export * from "@/service/infrastructure/notificationProviders/matrix.js";
|
||||
export * from "@/service/infrastructure/notificationProviders/pagerduty.js";
|
||||
export * from "@/service/infrastructure/notificationProviders/slack.js";
|
||||
export * from "@/service/infrastructure/notificationProviders/webhook.js";
|
||||
export * from "@/service/infrastructure/notificationsService.js";
|
||||
export * from "@/service/infrastructure/statusService.js";
|
||||
export * from "@/service/infrastructure/notificationProviders/webhook.js";
|
||||
export * from "@/service/infrastructure/notificationProviders/matrix.js";
|
||||
export * from "@/service/business/statusPageService.js";
|
||||
|
||||
// System services
|
||||
export * from "@/service/system/settingsService.js";
|
||||
@@ -53,7 +53,7 @@ export interface ISuperSimpleQueue {
|
||||
obliterate(): Promise<void>;
|
||||
}
|
||||
|
||||
class SuperSimpleQueue implements ISuperSimpleQueue {
|
||||
export class SuperSimpleQueue implements ISuperSimpleQueue {
|
||||
static SERVICE_NAME = SERVICE_NAME;
|
||||
|
||||
private logger: ILogger;
|
||||
@@ -290,4 +290,3 @@ class SuperSimpleQueue implements ISuperSimpleQueue {
|
||||
};
|
||||
}
|
||||
|
||||
export default SuperSimpleQueue;
|
||||
@@ -1,10 +1,8 @@
|
||||
const SERVICE_NAME = "JobQueueHelper";
|
||||
import type { Monitor } from "@/types/monitor.js";
|
||||
import { AppError } from "@/utils/AppError.js";
|
||||
import { INetworkService, INotificationsService, IStatusService } from "@/service/index.js";
|
||||
import { INetworkService, INotificationsService, IStatusService, IncidentService, type IGeoChecksService } from "@/service/index.js";
|
||||
import type { StatusChangeResult } from "@/types/index.js";
|
||||
import IncidentService from "@/service/business/incidentService.js";
|
||||
import type { IGeoChecksService } from "@/service/business/geoChecksService.js";
|
||||
import {
|
||||
IMaintenanceWindowsRepository,
|
||||
IMonitorsRepository,
|
||||
@@ -15,7 +13,7 @@ import {
|
||||
IGeoChecksRepository,
|
||||
} from "@/repositories/index.js";
|
||||
import { ILogger } from "@/utils/logger.js";
|
||||
import { IBufferService } from "../bufferService.js";
|
||||
import { IBufferService } from "@/service/index.js";
|
||||
|
||||
export interface ISuperSimpleQueueHelper {
|
||||
readonly serviceName: string;
|
||||
@@ -39,7 +37,7 @@ export interface MonitorActionDecision {
|
||||
};
|
||||
}
|
||||
|
||||
class SuperSimpleQueueHelper implements ISuperSimpleQueueHelper {
|
||||
export class SuperSimpleQueueHelper implements ISuperSimpleQueueHelper {
|
||||
static SERVICE_NAME = SERVICE_NAME;
|
||||
|
||||
private logger: any;
|
||||
@@ -415,4 +413,3 @@ class SuperSimpleQueueHelper implements ISuperSimpleQueueHelper {
|
||||
}
|
||||
}
|
||||
|
||||
export default SuperSimpleQueueHelper;
|
||||
@@ -15,7 +15,7 @@ export interface IBufferService {
|
||||
flushGeoBuffer(): Promise<void>;
|
||||
}
|
||||
|
||||
class BufferService implements IBufferService {
|
||||
export class BufferService implements IBufferService {
|
||||
static SERVICE_NAME = SERVICE_NAME;
|
||||
private BUFFER_TIMEOUT: number;
|
||||
private logger: ILogger;
|
||||
@@ -178,4 +178,3 @@ class BufferService implements IBufferService {
|
||||
}
|
||||
}
|
||||
|
||||
export default BufferService;
|
||||
@@ -23,7 +23,7 @@ export interface IEmailService {
|
||||
sendEmail(to: string, subject: string, html: string, transportConfig?: EmailTransportConfig): Promise<string | false | undefined>;
|
||||
}
|
||||
|
||||
class EmailService implements IEmailService {
|
||||
export class EmailService implements IEmailService {
|
||||
static SERVICE_NAME = SERVICE_NAME;
|
||||
|
||||
private settingsService: ISettingsService;
|
||||
@@ -179,4 +179,3 @@ class EmailService implements IEmailService {
|
||||
};
|
||||
}
|
||||
|
||||
export default EmailService;
|
||||
@@ -54,7 +54,7 @@ export interface IGlobalPingService {
|
||||
pollForResults(measurementId: string, timeoutMs?: number): Promise<GeoCheckResult[]>;
|
||||
}
|
||||
|
||||
class GlobalPingService implements IGlobalPingService {
|
||||
export class GlobalPingService implements IGlobalPingService {
|
||||
static SERVICE_NAME = SERVICE_NAME;
|
||||
|
||||
private logger: ILogger;
|
||||
@@ -207,4 +207,3 @@ class GlobalPingService implements IGlobalPingService {
|
||||
}
|
||||
}
|
||||
|
||||
export default GlobalPingService;
|
||||
@@ -23,7 +23,7 @@ export interface INetworkService {
|
||||
}>;
|
||||
}
|
||||
|
||||
class NetworkService implements INetworkService {
|
||||
export class NetworkService implements INetworkService {
|
||||
static SERVICE_NAME = SERVICE_NAME;
|
||||
|
||||
private axios: AxiosStatic;
|
||||
@@ -198,4 +198,3 @@ class NetworkService implements INetworkService {
|
||||
}
|
||||
}
|
||||
|
||||
export default NetworkService;
|
||||
@@ -21,7 +21,7 @@ export interface ISettingsService {
|
||||
getDBSettings(): Promise<Settings>;
|
||||
}
|
||||
|
||||
class SettingsService implements ISettingsService {
|
||||
export class SettingsService implements ISettingsService {
|
||||
static SERVICE_NAME = SERVICE_NAME;
|
||||
private settings: EnvConfig;
|
||||
private settingsRepository: ISettingsRepository;
|
||||
@@ -75,4 +75,3 @@ class SettingsService implements ISettingsService {
|
||||
};
|
||||
}
|
||||
|
||||
export default SettingsService;
|
||||
Reference in new issue
Block a user