added listing all running containers

WatcherAgent/Cargo.toml

@@ -19,8 +19,7 @@ nvml-wrapper = "0.11"
 nvml-wrapper-sys = "0.9.0"
 anyhow = "1.0.98"
 
-# Docker .env loading
-# config = "0.13"
+regex = "1.11.3"
 
 # Docker API access
 bollard = "0.19"

WatcherAgent/src/api.rs

@@ -2,7 +2,7 @@ use std::time::Duration;
 
 use crate::hardware::HardwareInfo;
 use crate::models::{HeartbeatDto, IdResponse, MetricDto, RegistrationDto, ServerMessage, Acknowledgment};
-use crate::serverclientcomm::handle_server_message;
+use crate::docker::serverclientcomm::handle_server_message;
 
 use anyhow::Result;
 use reqwest::{Client, StatusCode};

WatcherAgent/src/docker/container.rs

@@ -0,0 +1,97 @@
+use crate::models::DockerContainer;
+
+use bollard::query_parameters::{ListContainersOptions};
+use bollard::Docker;
+
+
+
+
+pub async fn get_available_container(docker: &Docker) -> Vec<DockerContainer> {
+    println!("=== DOCKER CONTAINER LIST ===");
+    
+    let options = Some(ListContainersOptions {
+        all: true,
+        ..Default::default()
+    });
+    
+    let containers_list = match docker.list_containers(options).await {
+        Ok(containers) => {
+            println!("Available containers ({}):", containers.len());
+            containers.into_iter()
+                .filter_map(|container| {
+                    container.id.as_ref()?; // Skip if no ID
+                    
+                    let id = container.id?;
+                    let short_id = if id.len() > 12 { &id[..12] } else { &id };
+                    
+                    let name = container.names
+                        .and_then(|names| names.into_iter().next())
+                        .map(|name| name.trim_start_matches('/').to_string())
+                        .unwrap_or_else(|| "unknown".to_string());
+                    
+                    let image = container.image
+                        .as_ref()
+                        .map(|img| img.to_string())
+                        .unwrap_or_else(|| "unknown".to_string());
+                    
+                    let status = container.status
+                        .as_ref()
+                        .map(|s| match s.to_lowercase().as_str() {
+                            s if s.contains("up") || s.contains("running") => "running".to_string(),
+                            s if s.contains("exited") || s.contains("stopped") => "stopped".to_string(),
+                            _ => s.to_string(),
+                        })
+                        .unwrap_or_else(|| "unknown".to_string());
+                    
+                    println!("  - ID: {}, Image: {:?}, Name: {}", short_id, container.image, name);
+                    
+                    Some(DockerContainer {
+                        ID: short_id.to_string(),
+                        image,
+                        Name: name,
+                        Status: status,
+                        _net_in: 0.0,
+                        _net_out: 0.0,
+                        _cpu_load: 0.0,
+                    })
+                })
+                .collect()
+        }
+        Err(e) => {
+            eprintln!("Failed to list containers: {}", e);
+            Vec::new()
+        }
+    };
+    
+    containers_list
+}
+
+pub fn extract_container_id(line: &str) -> Option<String> {
+    // Split by slashes and take the last part
+    if let Some(last_part) = line.split('/').last() {
+        let last_part = last_part.trim();
+        
+        // Remove common suffixes
+        let clean_id = last_part
+            .trim_end_matches(".scope")
+            .trim_start_matches("docker-")
+            .trim_start_matches("crio-")
+            .trim_start_matches("containerd-");
+        
+        // Check if it looks like a container ID (hex characters)
+        if clean_id.chars().all(|c| c.is_ascii_hexdigit()) && clean_id.len() >= 12 {
+            return Some(clean_id.to_string());
+        }
+        
+        // If it's not pure hex, try to extract hex sequence
+        let hex_part: String = clean_id.chars()
+            .take_while(|c| c.is_ascii_hexdigit())
+            .collect();
+            
+        if hex_part.len() >= 12 {
+            return Some(hex_part);
+        }
+    }
+    
+    None
+}

WatcherAgent/src/docker/mod.rs

@@ -0,0 +1,19 @@
+pub mod container;
+pub mod serverclientcomm;
+
+use std::error::Error;
+use crate::models::DockerContainer;
+
+#[derive(Debug, Clone)]
+pub struct DockerInfo {
+    pub number: Option<u16>,
+    pub net_in_total: Option<f64>,
+    pub net_out_total: Option<f64>,
+    pub dockers: Option<Vec<DockerContainer>>,
+}
+
+impl DockerInfo {
+    pub async fn collect() -> Result<Self, Box<dyn Error + Send + Sync>> {
+        Ok(Self { number: None, net_in_total: None, net_out_total: None, dockers: None })
+    }
+}

WatcherAgent/src/docker/serverclientcomm.rs

@@ -1,7 +1,7 @@
-use crate::models::{ServerMessage};
+use crate::models::ServerMessage;
+use crate::docker::container::{extract_container_id, get_available_container};
 
 use std::error::Error;
-
 use bollard::Docker;
 use bollard::query_parameters::{CreateImageOptions, RestartContainerOptions, InspectContainerOptions};
 use futures_util::StreamExt;
@@ -75,24 +75,59 @@ pub async fn update_docker_image(docker: &Docker, image: &str) -> Result<(), Box
 }
 
 pub async fn get_current_image(docker: &Docker) -> Result<Option<String>, Box<dyn Error + Send + Sync>> {
-    // Try multiple methods to get container ID
-    let container_id = get_container_id().await;
+    // First, let's debug the environment
+    get_available_container(docker).await;
     
-    let container_id = match container_id {
-        Some(id) => {
-            println!("Found container ID: {}", id);
-            id
+    // Get the current container ID from /proc/self/cgroup
+    let container_id = match std::fs::read_to_string("/proc/self/cgroup") {
+        Ok(content) => {
+            let mut found_id = None;
+            println!("Searching cgroup for container ID...");
+            
+            for line in content.lines() {
+                println!("Checking line: {}", line);
+                
+                // Look for container runtime indicators
+                if line.contains("docker") || line.contains("crio") || line.contains("containerd") {
+                    if let Some(id) = extract_container_id(line) {
+                        println!("Found potential container ID: {}", id);
+                        found_id = Some(id);
+                        break;
+                    }
+                }
+            }
+            found_id
         }
-        None => {
-            eprintln!("Could not determine container ID");
+        Err(e) => {
+            eprintln!("Error reading cgroup file: {}", e);
             return Ok(None);
         }
     };
 
-    // Inspect the current container to get its image
+    let container_id = match container_id {
+        Some(id) if !id.is_empty() => {
+            println!("Using container ID: '{}'", id);
+            id
+        }
+        _ => {
+            eprintln!("Could not find valid container ID in cgroup");
+            return Ok(None);
+        }
+    };
+
+    // Try to inspect the container
+    println!("Attempting to inspect container with ID: '{}'", container_id);
+    
     match docker.inspect_container(&container_id, None::<InspectContainerOptions>).await {
         Ok(container_info) => {
-            Ok(container_info.config.map(|config| config.image.unwrap_or_else(|| "unknown".to_string())))
+            if let Some(config) = container_info.config {
+                if let Some(image) = config.image {
+                    println!("Successfully found image: {}", image);
+                    return Ok(Some(image));
+                }
+            }
+            eprintln!("Container inspected but no image found in config");
+            Ok(Some("unknown".to_string()))
         }
         Err(e) => {
             eprintln!("Error inspecting container: {}", e);
@@ -101,74 +136,6 @@ pub async fn get_current_image(docker: &Docker) -> Result<Option<String>, Box<dy
     }
 }
 
-async fn get_container_id() -> Option<String> {
-    // Method 1: Try /proc/self/cgroup with various patterns
-    if let Ok(content) = std::fs::read_to_string("/proc/self/cgroup") {
-        for line in content.lines() {
-            // Try different container runtime identifiers
-            let patterns = ["docker", "crio", "containerd", "kubepods"];
-            if patterns.iter().any(|&p| line.contains(p)) {
-                if let Some(id) = extract_container_id(line) {
-                    return Some(id);
-                }
-            }
-        }
-    }
-    
-    // Method 2: Try /proc/self/mountinfo
-    if let Ok(content) = std::fs::read_to_string("/proc/self/mountinfo") {
-        for line in content.lines() {
-            if line.contains("/docker/containers/") {
-                if let Some(start) = line.find("/docker/containers/") {
-                    let rest = &line[start + 18..]; // 18 = len("/docker/containers/")
-                    if let Some(end) = rest.find('/') {
-                        return Some(rest[..end].to_string());
-                    }
-                }
-            }
-        }
-    }
-    
-    // Method 3: Try hostname (works if container ID is used as hostname)
-    if let Ok(hostname) = std::fs::read_to_string("/etc/hostname") {
-        let hostname = hostname.trim();
-        // Container IDs are typically 64-character hex strings
-        if hostname.len() == 64 && hostname.chars().all(|c| c.is_ascii_hexdigit()) {
-            return Some(hostname.to_string());
-        }
-    }
-    
-    None
-}
-
-fn extract_container_id(line: &str) -> Option<String> {
-    let parts: Vec<&str> = line.split('/').collect();
-    
-    if let Some(last_part) = parts.last() {
-        let last_part = last_part.trim();
-        
-        // Pattern 1: docker-<id>.scope
-        if last_part.starts_with("docker-") && last_part.ends_with(".scope") {
-            return Some(last_part
-                .trim_start_matches("docker-")
-                .trim_end_matches(".scope")
-                .to_string());
-        }
-        
-        // Pattern 2: <id> (64-character hex)
-        if last_part.len() == 64 && last_part.chars().all(|c| c.is_ascii_hexdigit()) {
-            return Some(last_part.to_string());
-        }
-        
-        // Pattern 3: Just take the last part as fallback
-        if !last_part.is_empty() {
-            return Some(last_part.to_string());
-        }
-    }
-    
-    None
-}
-
 pub async fn restart_container(docker: &Docker) -> Result<(), Box<dyn Error + Send + Sync>> {
     if let Ok(container_id) = std::env::var("HOSTNAME") {
         println!("Restarting container {}", container_id);

WatcherAgent/src/hardware/disk.rs

@@ -37,28 +37,12 @@ pub async fn get_disk_info() -> Result<DiskInfo, Box<dyn std::error::Error + Sen
             component_disk_label: String::new(),
             component_disk_temperature: 0.0,
         });
-        
-        println!(
-            "Disk_Name: {:?}:\n---- Disk_Kind: {},\n---- Total: {},\n---- Available: {},\n---- Used: {}, \n---- Mount_Point: {:?}",
-            disk.name(),
-            disk.kind(),
-            disk.total_space(),
-            disk.available_space(),
-            disk_used,
-            disk.mount_point()
-        );
     }
     
     // Get component temperatures
     let components = Components::new_with_refreshed_list();
     for component in &components {
         if let Some(temperature) = component.temperature() {
-            println!(
-                "Component_Label: {}, Temperature: {}°C",
-                component.label(),
-                temperature
-            );
-            
             // Update detailed info with temperature data if it matches a disk component
             for disk_info in &mut detailed_info {
                 if component.label().contains(&disk_info.disk_name) {

WatcherAgent/src/main.rs

@@ -5,7 +5,7 @@ pub mod api;
 pub mod hardware;
 pub mod metrics;
 pub mod models;
-pub mod serverclientcomm;
+pub mod docker;
 
 use std::env;
 use std::error::Error;
@@ -15,8 +15,6 @@ use std::result::Result;
 use tokio::task::JoinHandle;
 use bollard::Docker;
 
-use crate::serverclientcomm::{get_current_image};
-
 async fn flatten<T>(
     handle: JoinHandle<Result<T, Box<dyn Error + Send + Sync>>>,
 ) -> Result<T, Box<dyn Error + Send + Sync>> {
@@ -34,7 +32,7 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
         .map_err(|e| format!("Failed to connect to Docker: {}", e))?;
 
     // Get current image version
-    let client_version = match get_current_image(&docker).await {
+    let client_version = match docker::serverclientcomm::get_current_image(&docker).await {
         Ok(Some(version)) => version,
         Ok(None) => {
             eprintln!("Warning: No image version found");

WatcherAgent/src/models.rs

@@ -99,3 +99,14 @@ pub struct Acknowledgment {
     pub status: String, // "success" or "error"
     pub details: String,
 }
+
+#[derive(Debug, Serialize, Clone)]
+pub struct DockerContainer {
+    pub ID: String,
+    pub image: String,
+    pub Name: String,
+    pub Status: String, // "running";"stopped";others
+    pub _net_in: f64,
+    pub _net_out: f64,
+    pub _cpu_load: f64,
+}