Merge remote-tracking branch 'origin' into Network-tab-implementation-FE

server/src/config/services.js

@@ -31,6 +31,7 @@ const { compile } = pkg;
 import mjml2html from "mjml";
 import jwt from "jsonwebtoken";
 import crypto from "crypto";
+import { games } from "gamedig";
 
 import { fileURLToPath } from "url";
 import { ObjectId } from "mongodb";
@@ -201,6 +202,7 @@ export const initializeServices = async ({ logger, envSettings, settingsService
 		papaparse,
 		logger,
 		errorService,
+		games,
 	});
 
 	const services = {

server/src/controllers/monitorController.js

@@ -441,6 +441,17 @@ class MonitorController extends BaseController {
 		SERVICE_NAME,
 		"exportMonitorsToCSV"
 	);
+
+	getAllGames = this.asyncHandler(
+		async (req, res) => {
+			return res.success({
+				msg: "OK",
+				data: this.monitorService.getAllGames(),
+			});
+		},
+		SERVICE_NAME,
+		"getAllGames"
+	);
 }
 
 export default MonitorController;

server/src/db/models/Monitor.js

@@ -33,7 +33,7 @@ const MonitorSchema = mongoose.Schema(
 		type: {
 			type: String,
 			required: true,
-			enum: ["http", "ping", "pagespeed", "hardware", "docker", "port"],
+			enum: ["http", "ping", "pagespeed", "hardware", "docker", "port", "game"],
 		},
 		ignoreTlsErrors: {
 			type: Boolean,
@@ -115,6 +115,9 @@ const MonitorSchema = mongoose.Schema(
 				return this.alertThreshold;
 			},
 		},
+		gameId: {
+			type: String,
+		},
 	},
 	{
 		timestamps: true,

server/src/db/mongo/modules/checkModule.js

@@ -86,6 +86,7 @@ class CheckModule {
 				port: this.Check,
 				pagespeed: this.PageSpeedCheck,
 				hardware: this.HardwareCheck,
+				game: this.Check,
 			};
 
 			const Model = checkModels[type];

server/src/db/mongo/modules/monitorModule.js

@@ -310,7 +310,7 @@ class MonitorModule {
 				checks: this.processChecksForDisplay(this.NormalizeData, checksForDateRange, numToDisplay, normalize),
 			};
 
-			if (monitor.type === "http" || monitor.type === "ping" || monitor.type === "docker" || monitor.type === "port") {
+			if (monitor.type === "http" || monitor.type === "ping" || monitor.type === "docker" || monitor.type === "port" || monitor.type === "game") {
 				// HTTP/PING Specific stats
 				monitorStats.periodAvgResponseTime = this.getAverageResponseTime(checksForDateRange);
 				monitorStats.periodUptime = this.getUptimePercentage(checksForDateRange);

server/src/db/mongo/modules/monitorModuleQueries.js

@@ -932,7 +932,7 @@ const buildGetMonitorsByTeamIdPipeline = (req) => {
 								$switch: {
 									branches: [
 										{
-											case: { $in: ["$type", ["http", "ping", "docker", "port"]] },
+											case: { $in: ["$type", ["http", "ping", "docker", "port", "game"]] },
 											then: "$standardchecks",
 										},
 										{

server/src/routes/monitorRoute.js

@@ -44,6 +44,7 @@ class MonitorRoutes {
 		this.router.get("/export", isAllowed(["admin", "superadmin"]), this.monitorController.exportMonitorsToCSV);
 		this.router.post("/bulk", isAllowed(["admin", "superadmin"]), upload.single("csvFile"), this.monitorController.createBulkMonitors);
 		this.router.post("/test-email", isAllowed(["admin", "superadmin"]), this.monitorController.sendTestEmail);
+		this.router.get("/games", this.monitorController.getAllGames);
 
 		// Individual monitor CRUD routes
 		this.router.get("/:monitorId", this.monitorController.getMonitorById);

server/src/service/business/monitorService.js

@@ -4,7 +4,7 @@ const SERVICE_NAME = "MonitorService";
 class MonitorService {
 	static SERVICE_NAME = SERVICE_NAME;
 
-	constructor({ db, settingsService, jobQueue, stringService, emailService, papaparse, logger, errorService }) {
+	constructor({ db, settingsService, jobQueue, stringService, emailService, papaparse, logger, errorService, games }) {
 		this.db = db;
 		this.settingsService = settingsService;
 		this.jobQueue = jobQueue;
@@ -13,6 +13,7 @@ class MonitorService {
 		this.papaparse = papaparse;
 		this.logger = logger;
 		this.errorService = errorService;
+		this.games = games;
 	}
 
 	get serviceName() {
@@ -183,7 +184,8 @@ class MonitorService {
 	};
 
 	addDemoMonitors = async ({ userId, teamId }) => {
-		const demoMonitors = await this.db.monitorModuleaddDemoMonitors(userId, teamId);
+		const demoMonitors = await this.db.monitorModule.addDemoMonitors(userId, teamId);
+
 		await Promise.all(demoMonitors.map((monitor) => this.jobQueue.addJob(monitor._id, monitor)));
 		return demoMonitors;
 	};
@@ -261,6 +263,10 @@ class MonitorService {
 		const csv = this.papaparse.unparse(csvData);
 		return csv;
 	};
+
+	getAllGames = () => {
+		return this.games;
+	};
 }
 
 export default MonitorService;

server/src/service/infrastructure/bufferService.js

@@ -6,6 +6,7 @@ const TYPE_MAP = {
 	docker: "checks",
 	pagespeed: "pagespeedChecks",
 	hardware: "hardwareChecks",
+	game: "checks",
 };
 
 class BufferService {

server/src/service/infrastructure/networkService.js

@@ -1,5 +1,6 @@
 import jmespath from "jmespath";
 import https from "https";
+import { GameDig } from "gamedig";
 
 const SERVICE_NAME = "NetworkService";
 const UPROCK_ENDPOINT = "https://api.uprock.com/checkmate/push";
@@ -23,6 +24,7 @@ class NetworkService {
 		this.TYPE_HARDWARE = "hardware";
 		this.TYPE_DOCKER = "docker";
 		this.TYPE_PORT = "port";
+		this.TYPE_GAME = "game";
 		this.SERVICE_NAME = SERVICE_NAME;
 		this.NETWORK_ERROR = 5000;
 		this.PING_ERROR = 5001;
@@ -470,6 +472,62 @@ class NetworkService {
 		}
 	}
 
+	/**
+	 * Requests the status of a game monitor.
+	 *
+	 * @param {Object} monitor - The monitor object to request the status for.
+	 * @returns {Promise<Object>} The response from the game status request.
+	 * @throws {Error} Throws an error if the request fails or if the monitor is not configured correctly.
+	 * @property {string} monitorId - The ID of the monitor.
+	 * @property {string} type - The type of the monitor (should be "game").
+	 * @property {number} responseTime - The time taken for the request.
+	 * @property {Object|null} payload - The game state response or null if the request failed.
+	 * @property {boolean} status - Indicates if the request was successful (true) or not (false).
+	 * @property {number} code - The status code of the request (200 for success, NETWORK_ERROR for failure).
+	 * @property {string} message - A message indicating the result of the request.
+	 */
+	async requestGame(monitor) {
+		try {
+			const { url, port, gameId } = monitor;
+
+			const gameResponse = {
+				code: 200,
+				status: true,
+				message: "Success",
+				monitorId: monitor._id,
+				type: "game",
+			};
+
+			const state = await GameDig.query({
+				type: gameId,
+				host: url,
+				port: port,
+			}).catch((error) => {
+				this.logger.warn({
+					message: error.message,
+					service: this.SERVICE_NAME,
+					method: "requestGame",
+					details: { url, port, gameId },
+				});
+			});
+
+			if (!state) {
+				gameResponse.status = false;
+				gameResponse.code = this.NETWORK_ERROR;
+				gameResponse.message = "No response";
+				return gameResponse;
+			}
+
+			gameResponse.responseTime = state.ping;
+			gameResponse.payload = state;
+			return gameResponse;
+		} catch (error) {
+			error.service = this.SERVICE_NAME;
+			error.method = "requestPing";
+			throw error;
+		}
+	}
+
 	/**
 	 * Gets the status of a job based on its type and returns the appropriate response.
 	 *
@@ -494,6 +552,8 @@ class NetworkService {
 				return await this.requestDocker(monitor);
 			case this.TYPE_PORT:
 				return await this.requestPort(monitor);
+			case this.TYPE_GAME:
+				return await this.requestGame(monitor);
 			default:
 				return this.handleUnsupportedType(type);
 		}

server/src/validation/joi.js

@@ -124,8 +124,8 @@ const getMonitorsByTeamIdQueryValidation = joi.object({
 	type: joi
 		.alternatives()
 		.try(
-			joi.string().valid("http", "ping", "pagespeed", "docker", "hardware", "port"),
-			joi.array().items(joi.string().valid("http", "ping", "pagespeed", "docker", "hardware", "port"))
+			joi.string().valid("http", "ping", "pagespeed", "docker", "hardware", "port", "game"),
+			joi.array().items(joi.string().valid("http", "ping", "pagespeed", "docker", "hardware", "port", "game"))
 		),
 	page: joi.number(),
 	rowsPerPage: joi.number(),
@@ -171,6 +171,7 @@ const createMonitorBodyValidation = joi.object({
 	jsonPath: joi.string().allow(""),
 	expectedValue: joi.string().allow(""),
 	matchMethod: joi.string(),
+	gameId: joi.string().allow(""),
 });
 
 const createMonitorsBodyValidation = joi.array().items(
@@ -197,6 +198,7 @@ const editMonitorBodyValidation = joi.object({
 		usage_disk: joi.number(),
 		usage_temperature: joi.number(),
 	}),
+	gameId: joi.string(),
 });
 
 const pauseMonitorParamValidation = joi.object({
@@ -294,7 +296,7 @@ const getChecksParamValidation = joi.object({
 });
 
 const getChecksQueryValidation = joi.object({
-	type: joi.string().valid("http", "ping", "pagespeed", "hardware", "docker", "port"),
+	type: joi.string().valid("http", "ping", "pagespeed", "hardware", "docker", "port", "game"),
 	sortOrder: joi.string().valid("asc", "desc"),
 	limit: joi.number(),
 	dateRange: joi.string().valid("recent", "hour", "day", "week", "month", "all"),