cleaup code

server/src/broker/manager.rs

@@ -0,0 +1,40 @@
+use rumqttd::{Broker, Config};
+use std::sync::Arc;
+
+use crate::bridge::ClientManager;
+use super::subscriber::MqttSubscriber;
+
+pub struct MqttBroker {
+    broker: &'static mut Broker,
+    clients: Arc<ClientManager>,
+}
+
+impl MqttBroker {
+    pub async fn new(cfg: Config) -> Self {
+        let clients = Arc::new(ClientManager::new());
+        let broker: &'static mut Broker = Box::leak(Box::new(Broker::new(cfg)));
+
+        Self {
+            broker,
+            clients,
+        }
+    }
+
+    pub fn clients(&self) -> Arc<ClientManager> {
+        self.clients.clone()
+    }
+
+    pub async fn run(self) -> anyhow::Result<()> {
+        let mut subscriber = MqttSubscriber::new(&self.broker, self.clients);
+
+        println!("starting mqtt broker on specified port");
+
+        tokio::spawn(async move {
+            if let Err(e) = self.broker.start() {
+                eprintln!("broker exited with error: {}", e);
+            }
+        });
+
+        subscriber.run().await
+    }
+}

server/src/broker/mod.rs

@@ -0,0 +1,2 @@
+pub mod manager;
+pub mod subscriber;

server/src/broker/subscriber.rs

@@ -0,0 +1,36 @@
+use rumqttd::{local::LinkRx, Broker, Notification};
+use common::{StatusMessage, MQTT_TOPIC};
+use std::sync::Arc;
+
+use crate::bridge::ClientManager;
+
+pub struct MqttSubscriber {
+    link_rx: LinkRx,
+    clients: Arc<ClientManager>,
+}
+
+impl MqttSubscriber {
+    pub fn new(broker: &Broker, clients: Arc<ClientManager>) -> Self {
+        let (mut link_tx, link_rx) = broker.link("internal-subscriber").unwrap();
+        link_tx.subscribe(MQTT_TOPIC).unwrap();
+
+        Self {
+            link_rx,
+            clients,
+        }
+    }
+
+    pub async fn run(&mut self) -> anyhow::Result<()> {
+        while let Ok(notification) = self.link_rx.next().await {
+            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_str).await;
+                }
+            }
+        }
+
+        Ok(())
+    }
+}