From 0b30e23783da4147de84f7971310aac1b43748d4 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Wed, 4 Mar 2026 17:50:27 +0000 Subject: [PATCH] globalPing --- server/scripts/generate-checks.js | 4 +--- server/src/config/services.ts | 1 - server/src/controllers/statusPageController.ts | 2 +- server/src/repositories/invites/MongoInviteRepository.ts | 2 +- .../MongoMaintenanceWindowsRepository.ts | 2 +- .../src/repositories/settings/MongoSettingsRepository.ts | 2 +- server/src/service/business/geoChecksService.ts | 2 +- server/src/service/infrastructure/globalPingService.ts | 8 ++++---- 8 files changed, 10 insertions(+), 13 deletions(-) diff --git a/server/scripts/generate-checks.js b/server/scripts/generate-checks.js index 544770bb6..2e336274c 100644 --- a/server/scripts/generate-checks.js +++ b/server/scripts/generate-checks.js @@ -3,8 +3,6 @@ import { MonitorModel } from "../dist/db/models/Monitor.js"; import { CheckModel } from "../dist/db/models/Check.js"; const DEFAULT_MONITOR_ID = "000000000000000000000001"; -const DEFAULT_TEAM_ID = "0000000000000000000000aa"; -const DEFAULT_USER_ID = "0000000000000000000000bb"; const DEFAULT_MONITOR_TYPE = "http"; const DEFAULT_TOTAL = 1_000_000; const DEFAULT_BATCH_SIZE = 5_000; @@ -12,7 +10,7 @@ const DEFAULT_BATCH_SIZE = 5_000; const parseObjectId = (value, fallback) => { try { return new mongoose.Types.ObjectId(value || fallback); - } catch (error) { + } catch { console.warn(`Invalid ObjectId '${value}', falling back to '${fallback}'.`); return new mongoose.Types.ObjectId(fallback); } diff --git a/server/src/config/services.ts b/server/src/config/services.ts index 664f9b2c5..56aef2f19 100644 --- a/server/src/config/services.ts +++ b/server/src/config/services.ts @@ -29,7 +29,6 @@ import { NotificationMessageBuilder, INotificationMessageBuilder } from "../serv import axios from "axios"; import got from "got"; import ping from "ping"; -import http from "http"; import https from "https"; import Docker from "dockerode"; import net from "net"; diff --git a/server/src/controllers/statusPageController.ts b/server/src/controllers/statusPageController.ts index fa6cd3288..8593cd53f 100644 --- a/server/src/controllers/statusPageController.ts +++ b/server/src/controllers/statusPageController.ts @@ -11,7 +11,6 @@ import { requireTeamId, requireUserId } from "@/controllers/controllerUtils.js"; import { IStatusPageService } from "@/service/business/statusPageService.js"; import { IMonitorsRepository } from "@/repositories/index.js"; import { ISettingsService } from "@/service/system/settingsService.js"; -import { ParseBoolean } from "@/utils/utils.js"; import { NormalizeData } from "@/utils/dataUtils.js"; const SERVICE_NAME = "statusPageController"; @@ -110,6 +109,7 @@ class StatusPageController { const normalizedMonitors = sortedMonitors.map((monitor) => { const normalizedChecks = NormalizeData(monitor.recentChecks, 10, 100); if (!showURL) { + // eslint-disable-next-line @typescript-eslint/no-unused-vars const { url, port, secret, notifications, ...rest } = monitor; return { ...rest, checks: normalizedChecks }; } diff --git a/server/src/repositories/invites/MongoInviteRepository.ts b/server/src/repositories/invites/MongoInviteRepository.ts index e9243e96e..a8187d09a 100644 --- a/server/src/repositories/invites/MongoInviteRepository.ts +++ b/server/src/repositories/invites/MongoInviteRepository.ts @@ -36,7 +36,7 @@ class MongoInvitesRepository implements IInvitesRepository { create = async (invite: Partial) => { await InviteModel.deleteMany({ email: invite.email }); invite.token = crypto.randomBytes(32).toString("hex"); - let inviteToken = await InviteModel.create(invite); + const inviteToken = await InviteModel.create(invite); return this.toEntity(inviteToken); }; diff --git a/server/src/repositories/maintenance-windows/MongoMaintenanceWindowsRepository.ts b/server/src/repositories/maintenance-windows/MongoMaintenanceWindowsRepository.ts index a8910d0df..4aadf9cc2 100644 --- a/server/src/repositories/maintenance-windows/MongoMaintenanceWindowsRepository.ts +++ b/server/src/repositories/maintenance-windows/MongoMaintenanceWindowsRepository.ts @@ -92,7 +92,7 @@ class MongoMaintenanceWindowsRepository implements IMaintenanceWindowsRepository } // Sorting - let sort: Record = {}; + const sort: Record = {}; if (field !== undefined && order !== undefined) { sort[field] = order === "asc" ? 1 : -1; } diff --git a/server/src/repositories/settings/MongoSettingsRepository.ts b/server/src/repositories/settings/MongoSettingsRepository.ts index 91a087423..f803ae6a9 100644 --- a/server/src/repositories/settings/MongoSettingsRepository.ts +++ b/server/src/repositories/settings/MongoSettingsRepository.ts @@ -52,7 +52,7 @@ class MongoSettingsRepository implements ISettingsRepository { }; findSingleton = async () => { - let settings = await AppSettingsModel.findOne({ singleton: true }).select("-__v -_id -createdAt -updatedAt -singleton").lean(); + const settings = await AppSettingsModel.findOne({ singleton: true }).select("-__v -_id -createdAt -updatedAt -singleton").lean(); if (!settings) { return null; } diff --git a/server/src/service/business/geoChecksService.ts b/server/src/service/business/geoChecksService.ts index c2fabdcfa..1e5720656 100644 --- a/server/src/service/business/geoChecksService.ts +++ b/server/src/service/business/geoChecksService.ts @@ -170,7 +170,7 @@ class GeoChecksService implements IGeoChecksService { }); } - let { sortOrder, dateRange, page, rowsPerPage, continent } = query; + const { sortOrder, dateRange, page, rowsPerPage, continent } = query; const continents = continent ? (Array.isArray(continent) ? continent : [continent]) : undefined; this.logger.debug({ diff --git a/server/src/service/infrastructure/globalPingService.ts b/server/src/service/infrastructure/globalPingService.ts index 1d49c6679..883b9f76b 100644 --- a/server/src/service/infrastructure/globalPingService.ts +++ b/server/src/service/infrastructure/globalPingService.ts @@ -95,12 +95,12 @@ class GlobalPingService implements IGlobalPingService { }); return measurementId; - } catch (error: any) { + } catch (error: unknown) { this.logger.error({ message: "GlobalPing API unavailable, skipping geo check", service: SERVICE_NAME, method: "createMeasurement", - details: error, + stack: error instanceof Error ? error.stack : undefined, }); return null; } @@ -140,12 +140,12 @@ class GlobalPingService implements IGlobalPingService { // Still in-progress, wait and poll again await this.sleep(POLL_INTERVAL_MS); - } catch (error: any) { + } catch (error: unknown) { this.logger.error({ message: "Error polling GlobalPing API", service: SERVICE_NAME, method: "pollForResults", - details: error.message, + stack: error instanceof Error ? error.stack : undefined, }); return []; }