feat: endpoint for uplink connection status

uplink/src/base/mqtt/mod.rs

@@ -9,6 +9,7 @@ use tokio::{select, task};
 use std::fs::File;
 use std::io::Read;
 use std::path::Path;
+use std::sync::Mutex;
 
 use crate::{Action, Config};
 use rumqttc::{
@@ -58,13 +59,16 @@ pub struct Mqtt {
     /// Control handles
     ctrl_rx: Receiver<MqttShutdown>,
     ctrl_tx: Sender<MqttShutdown>,
+    /// True when network is connected
+    network_up: Arc<Mutex<bool>>,
 }
 
 impl Mqtt {
     pub fn new(
         config: Arc<Config>,
         actions_tx: Sender<Action>,
         metrics_tx: Sender<MqttMetrics>,
+        network_up: Arc<Mutex<bool>>,
     ) -> Mqtt {
         // create a new eventloop and reuse it during every reconnection
         let options = mqttoptions(&config);
@@ -81,6 +85,7 @@ impl Mqtt {
             metrics_tx,
             ctrl_tx,
             ctrl_rx,
+            network_up,
         }
     }
 
@@ -168,6 +173,7 @@ impl Mqtt {
                 event = self.eventloop.poll() => {
                     match event {
                         Ok(Event::Incoming(Incoming::ConnAck(connack))) => {
+                            *self.network_up.lock().unwrap() = true;
                             info!("Connected to broker. Session present = {}", connack.session_present);
                             let subscription = self.config.actions_subscription.clone();
                             let client = self.client();
@@ -213,6 +219,7 @@ impl Mqtt {
                             }
                         }
                         Err(e) => {
+                            *self.network_up.lock().unwrap() = false;
                             self.metrics.add_reconnection();
                             self.check_disconnection_metrics(e);
                             tokio::time::sleep(Duration::from_secs(3)).await;

uplink/src/base/serializer/mod.rs

@@ -224,7 +224,7 @@ impl StorageHandler {
 }
 
 /// The uplink Serializer is the component that deals with serializing, compressing and writing data onto disk or Network.
-/// In case of network issues, the Serializer enters various states depending on the severeness, managed by [`start()`].                                                                                       
+/// In case of network issues, the Serializer enters various states depending on the severeness, managed by [`start()`].
 ///
 /// The Serializer writes data directly to network in **normal mode** with the [`try_publish()`] method on the MQTT client.
 /// In case of the network being slow, this fails and we are forced into **slow mode**, where-in new data gets written into

uplink/src/console.rs

@@ -2,12 +2,13 @@ use std::sync::{Arc, Mutex};
 
 use axum::{
     extract::State,
-    http::StatusCode,
+    http::{response::Builder, StatusCode},
     response::IntoResponse,
-    routing::{post, put},
+    routing::{get, post, put},
     Router,
 };
 use log::info;
+use serde_json::json;
 use uplink::base::CtrlTx;
 
 use crate::ReloadHandle;
@@ -17,6 +18,7 @@ struct StateHandle {
     reload_handle: ReloadHandle,
     ctrl_tx: CtrlTx,
     downloader_disable: Arc<Mutex<bool>>,
+    network_up: Arc<Mutex<bool>>,
 }
 
 #[tokio::main]
@@ -25,15 +27,17 @@ pub async fn start(
     reload_handle: ReloadHandle,
     ctrl_tx: CtrlTx,
     downloader_disable: Arc<Mutex<bool>>,
+    network_up: Arc<Mutex<bool>>,
 ) {
     let address = format!("0.0.0.0:{port}");
     info!("Starting uplink console server: {address}");
-    let state = StateHandle { reload_handle, ctrl_tx, downloader_disable };
+    let state = StateHandle { reload_handle, ctrl_tx, downloader_disable, network_up };
     let app = Router::new()
         .route("/logs", post(reload_loglevel))
         .route("/shutdown", post(shutdown))
         .route("/disable_downloader", put(disable_downloader))
         .route("/enable_downloader", put(enable_downloader))
+        .route("/status", get(status))
         .with_state(state);
 
     axum::Server::bind(&address.parse().unwrap()).serve(app.into_make_service()).await.unwrap();
@@ -78,3 +82,15 @@ async fn enable_downloader(State(state): State<StateHandle>) -> impl IntoRespons
         StatusCode::ACCEPTED
     }
 }
+
+// Pushes uplink status as JSON text
+async fn status(State(state): State<StateHandle>) -> impl IntoResponse {
+    Builder::new()
+        .body(
+            json!({
+                "connected": *state.network_up.lock().unwrap(),
+            })
+            .to_string(),
+        )
+        .unwrap()
+}

uplink/src/lib.rs

@@ -133,11 +133,13 @@ impl Uplink {
         &mut self,
         mut bridge: Bridge,
         downloader_disable: Arc<Mutex<bool>>,
+        network_up: Arc<Mutex<bool>>,
     ) -> Result<CtrlTx, Error> {
         let (mqtt_metrics_tx, mqtt_metrics_rx) = bounded(10);
         let (ctrl_actions_lane, ctrl_data_lane) = bridge.ctrl_tx();
 
-        let mut mqtt = Mqtt::new(self.config.clone(), self.action_tx.clone(), mqtt_metrics_tx);
+        let mut mqtt =
+            Mqtt::new(self.config.clone(), self.action_tx.clone(), mqtt_metrics_tx, network_up);
         let mqtt_client = mqtt.client();
         let ctrl_mqtt = mqtt.ctrl_tx();
 

uplink/src/main.rs

@@ -21,7 +21,7 @@ pub type ReloadHandle =
 use uplink::config::{AppConfig, Config, StreamConfig, MAX_BATCH_SIZE};
 use uplink::{simulator, spawn_named_thread, TcpJson, Uplink};
 
-const DEFAULT_CONFIG: &str = r#"    
+const DEFAULT_CONFIG: &str = r#"
     [mqtt]
     max_packet_size = 256000
     max_inflight = 100
@@ -329,7 +329,8 @@ fn main() -> Result<(), Error> {
     };
 
     let downloader_disable = Arc::new(Mutex::new(false));
-    let ctrl_tx = uplink.spawn(bridge, downloader_disable.clone())?;
+    let network_up = Arc::new(Mutex::new(false));
+    let ctrl_tx = uplink.spawn(bridge, downloader_disable.clone(), network_up.clone())?;
 
     if let Some(config) = config.simulator.clone() {
         spawn_named_thread("Simulator", || {
@@ -341,7 +342,7 @@ fn main() -> Result<(), Error> {
         let port = config.console.port;
         let ctrl_tx = ctrl_tx.clone();
         spawn_named_thread("Uplink Console", move || {
-            console::start(port, reload_handle, ctrl_tx, downloader_disable)
+            console::start(port, reload_handle, ctrl_tx, downloader_disable, network_up)
         });
     }