update serialization

common/src/lib.rs

@@ -8,7 +8,7 @@ pub mod metrics;
 pub const MQTT_TOPIC: &str = "system/metrics";
 pub const MQTT_SEND_INTERVAL: u64 = 5;
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct StatusMessage {
     pub agent: String,
     pub metrics: Metrics,
@@ -36,3 +36,9 @@ impl<'a> TryFrom<&'a [u8]> for StatusMessage {
         serde_json::from_slice(value)
     }
 }
+
+impl From<StatusMessage> for String {
+    fn from(msg: StatusMessage) -> String {
+        serde_json::to_string(&msg).unwrap_or_else(|_| String::new())
+    }
+}

common/src/metrics.rs

@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct Metrics {
     pub system_info: SystemInfo,
     pub cpu: CPU,
@@ -9,7 +9,7 @@ pub struct Metrics {
     pub network: Network,
 }
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct SystemInfo {
     pub uptime: u64,
     pub host: Option<String>,
@@ -18,14 +18,14 @@ pub struct SystemInfo {
     pub os_version: Option<String>,
 }
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct CPU {
     pub usage: f32,
     pub threads: usize,
     pub breakdown: CPUBreakdown,
 }
 
-#[derive(Debug, Serialize, Deserialize, Default)]
+#[derive(Debug, Clone, Serialize, Deserialize, Default)]
 pub struct CPUBreakdown {
     pub system: f32,
     pub user: f32,
@@ -34,13 +34,13 @@ pub struct CPUBreakdown {
     pub iowait: f32,
 }
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct Disk {
     pub free: u64,
     pub total: u64,
 }
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct Memory {
     pub used: u64,
     pub total: u64,
@@ -48,7 +48,7 @@ pub struct Memory {
     pub swap_total: u64,
 }
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct Network {
     pub down: u64,
     pub up: u64,

server/src/bridge.rs

@@ -1,7 +1,8 @@
+use common::StatusMessage;
 use tokio::sync::{mpsc::Sender, Mutex};
 
 pub struct ClientManager {
-    clients: Mutex<Vec<Sender<String>>>,
+    clients: Mutex<Vec<Sender<StatusMessage>>>,
 }
 
 impl ClientManager {
@@ -11,12 +12,12 @@ impl ClientManager {
         }
     }
 
-    pub async fn add_client(&self, client: Sender<String>) {
+    pub async fn add_client(&self, client: Sender<StatusMessage>) {
         let mut clients = self.clients.lock().await;
         clients.push(client);
     }
 
-    pub async fn broadcast(&self, message: String) {
+    pub async fn broadcast(&self, message: &StatusMessage) {
         let mut clients = self.clients.lock().await;
 
         clients.retain(|client| {

server/src/broker/subscriber.rs

@@ -27,8 +27,7 @@ impl MqttSubscriber {
             if let Notification::Forward(forward) = notification.unwrap() {
                 let payload = StatusMessage::try_from(&forward.publish.payload[..])?;
 
-                if let Ok(payload_str) = payload.to_string() {
+                self.clients.broadcast(&payload).await;
-                    self.clients.broadcast(payload_str).await;
 
                     if let Err(e) = self.storage.record_message(&payload.agent).await {
                         eprintln!("failed to record message for {}: {}", &payload.agent, e);

server/src/server/websocket.rs

@@ -26,7 +26,7 @@ impl WebsocketRoutes {
 
     async fn handle_ws_connection(websocket: WebSocket, clients: Arc<ClientManager>) {
         let (mut ws_tx, _) = websocket.split();
-        let (tx, mut rx) = channel::<String>(100);
+        let (tx, mut rx) = channel::<StatusMessage>(100);
 
         clients.add_client(tx).await;