diff --git a/client/src/Validation/validation.js b/client/src/Validation/validation.js index 26e390ff4..55141be3e 100644 --- a/client/src/Validation/validation.js +++ b/client/src/Validation/validation.js @@ -130,10 +130,12 @@ const monitorValidation = joi.object({ then: joi .string() .trim() - .regex(/^[a-z0-9]{64}$/) + .regex( + /^(\/+)?([a-zA-Z0-9][a-zA-Z0-9_.-]*[a-zA-Z0-9]|[a-zA-Z0-9]+|[a-f0-9]{12,64})$/ + ) .messages({ "string.empty": "This field is required.", - "string.pattern.base": "Please enter a valid 64-character Docker container ID.", + "string.pattern.base": "Please enter a valid container name or ID.", }), otherwise: joi .string() diff --git a/client/src/locales/en.json b/client/src/locales/en.json index 991f57d72..79a5ce4e8 100644 --- a/client/src/locales/en.json +++ b/client/src/locales/en.json @@ -440,7 +440,7 @@ "uptimeGeneralInstructions": { "http": "Enter the URL or IP to monitor (e.g., https://example.com/ or 192.168.1.100) and add a clear display name that appears on the dashboard.", "ping": "Enter the IP address or hostname to ping (e.g., 192.168.1.100 or example.com) and add a clear display name that appears on the dashboard.", - "docker": "Enter the Docker ID of your container. Docker IDs must be the full 64 char Docker ID. You can run docker inspect to get the full container ID.", + "docker": "Enter the Docker container name or ID. You can use either the container name (e.g., my-app) or the container ID (full 64-char ID or short ID).", "port": "Enter the URL or IP of the server, the port number and a clear display name that appears on the dashboard.", "game": "Enter the IP address or hostname and the port number to ping (e.g., 192.168.1.100 or example.com) and choose game type." }, @@ -1014,9 +1014,9 @@ }, "monitorType": { "docker": { - "label": "Container ID", + "label": "Container Name/ID", "namePlaceholder": "My Container", - "placeholder": "abcd1234" + "placeholder": "my-app or abcd1234" }, "http": { "label": "URL to monitor", diff --git a/server/src/service/infrastructure/networkService.js b/server/src/service/infrastructure/networkService.js index 72a117e74..d1a1ff108 100644 --- a/server/src/service/infrastructure/networkService.js +++ b/server/src/service/infrastructure/networkService.js @@ -253,24 +253,76 @@ class NetworkService { handleError: true, // Enable error handling }); - const containers = await docker.listContainers({ all: true }); - const containerExists = containers.some((c) => c.Id.startsWith(monitor.url)); - if (!containerExists) { - throw new Error(this.stringService.dockerNotFound); - } - - const container = docker.getContainer(monitor.url); - const { response, responseTime, error } = await this.timeRequest(() => container.inspect()); - const dockerResponse = { monitorId: monitor._id, type: monitor.type, - responseTime, - status: response?.State?.Status === "running" ? true : false, - code: 200, - message: "Docker container status fetched successfully", }; + const containers = await docker.listContainers({ all: true }); + + // Normalize input: strip leading slashes and convert to lowercase for comparison + const normalizedInput = monitor.url.replace(/^\/+/, "").toLowerCase(); + + // Priority-based matching to avoid ambiguity: + // 1. Exact full ID match (64-char) + let exactIdMatch = containers.find((c) => c.Id.toLowerCase() === normalizedInput); + + // 2. Exact container name match (case-insensitive) + let exactNameMatch = containers.find((c) => + c.Names.some((name) => { + const cleanName = name.replace(/^\/+/, "").toLowerCase(); + return cleanName === normalizedInput; + }) + ); + + // 3. Partial ID match (fallback for backwards compatibility) + let partialIdMatch = containers.find((c) => c.Id.toLowerCase().startsWith(normalizedInput)); + + // Select container based on priority + let targetContainer = exactIdMatch || exactNameMatch || partialIdMatch; + + // Return negative response if no container + if (!targetContainer) { + this.logger.warn({ + message: `No container found for "${monitor.url}".`, + service: this.SERVICE_NAME, + method: "requestDocker", + details: { url: monitor.url }, + }); + + dockerResponse.code = 404; + dockerResponse.status = false; + dockerResponse.message = this.stringService.dockerNotFound; + return dockerResponse; + } + + // Return negative response if ambiguous matches exist + const matchTypes = []; + if (exactIdMatch) matchTypes.push("exact ID"); + if (exactNameMatch) matchTypes.push("exact name"); + if (partialIdMatch && !exactIdMatch) matchTypes.push("partial ID"); + + if (matchTypes.length > 1) { + this.logger.warn({ + message: `Ambiguous container match for "${monitor.url}". Matched by: ${matchTypes.join(", ")}. Using ${exactIdMatch ? "exact ID" : exactNameMatch ? "exact name" : "partial ID"} match.`, + service: this.SERVICE_NAME, + method: "requestDocker", + details: { url: monitor.url }, + }); + dockerResponse.status = 404; + dockerResponse.status = false; + dockerResponse.message = `Ambiguous container match for "${monitor.url}". Matched by: ${matchTypes.join(", ")}. Using ${exactIdMatch ? "exact ID" : exactNameMatch ? "exact name" : "partial ID"} match.`; + return dockerResponse; + } + + const container = docker.getContainer(targetContainer.Id); + const { response, responseTime, error } = await this.timeRequest(() => container.inspect()); + + dockerResponse.responseTime = responseTime; + dockerResponse.status = response?.State?.Status === "running" ? true : false; + dockerResponse.code = 200; + dockerResponse.message = "Docker container status fetched successfully"; + if (error) { dockerResponse.status = false; dockerResponse.code = error.statusCode || this.NETWORK_ERROR;