Merge pull request #3431 from bluewave-labs/fix/infra-services

fix: infra services

server/src/controllers/maintenanceWindowController.ts

@@ -24,7 +24,7 @@ class MaintenanceWindowController {
 
 			const monitorIDs = validatedBody.monitors;
 			const name = validatedBody.name;
-			const active = validatedBody.active ? validatedBody.active : true;
+			const active = validatedBody.active ?? true;
 			const duration = validatedBody.duration;
 			const durationUnit = validatedBody.durationUnit;
 			const repeat = validatedBody.repeat;

server/src/service/infrastructure/network/AdvancedMatcher.ts

@@ -2,7 +2,11 @@ import { Monitor } from "@/types/monitor.js";
 import jmespath from "jmespath";
 type JmesPath = typeof jmespath;
 
-export class AdvancedMatcher {
+export interface IAdvancedMatcher {
+	validate<T>(payload: T, monitor: Monitor): { ok: boolean; message: string; extracted?: T | undefined };
+}
+
+export class AdvancedMatcher implements IAdvancedMatcher {
 	constructor(private jmespath: JmesPath) {}
 
 	private compare(actual: unknown, expected: string, method?: string): boolean {
@@ -12,7 +16,7 @@ export class AdvancedMatcher {
 		return String(actual) === expected; // Default
 	}
 
-	validate<T>(payload: T, monitor: Monitor): { ok: boolean; message: string; extracted?: any } {
+	validate<T>(payload: T, monitor: Monitor): { ok: boolean; message: string; extracted?: T | undefined } {
 		const { useAdvancedMatching, jsonPath, matchMethod, expectedValue } = monitor;
 		if (!useAdvancedMatching) return { ok: true, message: "Success" };
 
@@ -35,10 +39,10 @@ export class AdvancedMatcher {
 			};
 		}
 
-		const isFalsey = dataToValidate === false || dataToValidate === "false" || dataToValidate === undefined || dataToValidate === null;
+		const isFalsy = dataToValidate === false || dataToValidate === "false" || dataToValidate === undefined || dataToValidate === null;
 		return {
-			ok: !isFalsey,
-			message: !isFalsey ? "Success" : "Extracted value is falsey",
+			ok: !isFalsy,
+			message: !isFalsy ? "Success" : "Extracted value is falsy",
 			extracted: dataToValidate,
 		};
 	}

server/src/service/infrastructure/network/HttpProvider.ts

@@ -1,5 +1,5 @@
 import { type Got, HTTPError, RequestError } from "got";
-import { AdvancedMatcher } from "@/service/infrastructure/network/AdvancedMatcher.js";
+import { IAdvancedMatcher } from "@/service/infrastructure/network/AdvancedMatcher.js";
 import { IStatusProvider } from "@/service/infrastructure/network/IStatusProvider.js";
 import { HttpStatusPayload } from "@/types/network.js";
 import { MonitorStatusResponse } from "@/types/network.js";
@@ -13,7 +13,7 @@ export class HttpProvider implements IStatusProvider<HttpStatusPayload> {
 
 	constructor(
 		private got: Got,
-		private advancedMatcher: AdvancedMatcher
+		private advancedMatcher: IAdvancedMatcher
 	) {
 		const cacheable = new CacheableLookup({ maxTtl: 300, errorTtl: 30 });
 		this.got = got.extend({