Started to integrate the webinterface

src/main.rs

@@ -4,14 +4,26 @@ mod rotor;
 
 use anyhow::Result;
 use fern::colors::{Color, ColoredLevelConfig};
-use log::{debug, error, info, warn};
-use std::io;
+use log::{debug, error, info, warn, Level};
+use serde_json::{json, Value};
+use std::{borrow::Borrow, io};
 use tokio::{
     self,
     io::{AsyncBufReadExt, AsyncWriteExt, BufStream},
     net::{TcpListener, TcpStream},
-    sync::{self, mpsc, watch},
-    time,
+    sync::{mpsc, watch},
+    task::JoinSet,
+};
+
+use axum::{
+    extract::State,
+    http::StatusCode,
+    routing::{get, post},
+    Json, Router,
+};
+use tower_http::{
+    services::{ServeDir, ServeFile},
+    trace::TraceLayer,
 };
 
 use logger::setup_logger;
@@ -72,27 +84,67 @@ async fn process_socket(
     }
 }
 
+#[derive(Clone)]
+struct AxumAppState {
+    pos_rx: watch::Receiver<(f32, f32)>,
+}
+
 #[tokio::main]
 async fn main() -> Result<()> {
     setup_logger()?;
 
     let (cmd_tx, cmd_rx) = mpsc::channel::<Command>(16);
-
     let (pos_tx, pos_rx) = watch::channel::<(f32, f32)>((0.0, 0.0));
 
-    tokio::spawn(async move {
-        control_rotor(cmd_rx, pos_tx).await;
+    let mut tasks = JoinSet::new();
+
+    tasks.spawn(async move { control_rotor(cmd_rx, pos_tx).await });
+
+    let state = AxumAppState {
+        pos_rx: pos_rx.clone(),
+    };
+
+    tasks.spawn(async move {
+        let app = Router::new()
+            .route_service("/", ServeFile::new("assets/index.html"))
+            .route("/state", get(get_state))
+            .with_state(state)
+            .layer(TraceLayer::new_for_http());
+
+        let listener = tokio::net::TcpListener::bind("0.0.0.0:8000").await?;
+        axum::serve(listener, app).await?;
+
+        Ok(())
     });
 
-    let listener = TcpListener::bind("127.0.0.1:1337").await?;
+    tasks.spawn(async move {
+        let listener = TcpListener::bind("127.0.0.1:1337").await?;
 
-    loop {
-        let (socket, _) = listener.accept().await?;
+        loop {
+            let (socket, _) = listener.accept().await?;
 
-        let cmd_tx = cmd_tx.clone();
-        let pos_rx = pos_rx.clone();
-        tokio::spawn(async move {
-            process_socket(socket, cmd_tx, pos_rx).await;
-        });
+            let cmd_tx = cmd_tx.clone();
+            let pos_rx = pos_rx.clone();
+            tokio::spawn(async move {
+                process_socket(socket, cmd_tx, pos_rx).await;
+            });
+        }
+    });
+
+    while let Some(res) = tasks.join_next().await {
+        res.unwrap();
     }
+
+    Ok(())
+}
+
+async fn get_state(State(state): State<AxumAppState>) -> Json<Value> {
+    let (az, el) = state.pos_rx.borrow().clone();
+
+    Json(json!({
+        "position" : {
+            "az": az,
+            "el": el
+        }
+    }))
 }