websocket connect wip

Author: j-ackyao

software/tracksight/rust_backend/Cargo.lock

@@ -8,6 +8,8 @@ serialport = "4.0"
 ctrlc = "3.5"
 tokio = { version = "1", features = ["full"] }
 tokio-serial = "5"
+tokio-tungstenite = "0.28.0"
+axum = { version = "0.8.8", features = ["ws"] }
 influxdb2 = "0.5"
 dotenv = "0.15"
 crc = "3.0.0"

software/tracksight/rust_backend/Cargo.toml

@@ -10,6 +10,7 @@ todo for backend
 [x] verify that serial messages can be processed
 [x] processing jsoncan to read metadata - deserialize bytes
 [ ] implementing client subscription map, socket server for clients to serve data
+[ ] switch to tokio serial
 [ ] interfacing with influxdb and pushing data through
 [ ] ensure proper error handling in backend and logging
 [ ] implementing api endpoints

software/tracksight/rust_backend/README.md

@@ -11,6 +11,7 @@ pub struct Config {
     pub influxdb_bucket: String,
     pub influxdb_measurement: String,
     pub jsoncan_config_path: String,
+    pub backend_port: u32,
 }
 
 pub static CONFIG: LazyLock<Config> = LazyLock::new(|| load_env_file());
@@ -22,28 +23,22 @@ fn load_env_file() -> Config {
     from_filename(DEFAULT_BACKEND_ENV_FILE)
         .expect(&format!("{} file not found, could not load env file!", DEFAULT_BACKEND_ENV_FILE));
 
-    let serial_port: String = var("SERIAL_PORT")
-        .expect("SERIAL_PORT is missing!");
+    let serial_port: String = get_var::<String>("SERIAL_PORT");
 
-    let influxdb_url: String = var("INFLUXDB_URL")
-        .expect("INFLUXDB_URL is missing!");
+    let influxdb_url: String = get_var::<String>("INFLUXDB_URL");
 
-    let influxdb_org: String = var("INFLUXDB_ORG")
-        .expect("INFLUXDB_ORG is missing!");
+    let influxdb_org: String = get_var::<String>("INFLUXDB_ORG");
 
-    let influxdb_token: String = var("INFLUXDB_TOKEN")
-    .expect("INFLUXDB_TOKEN is missing!");
+    let influxdb_token: String = get_var::<String>("INFLUXDB_TOKEN");
 
-    let influxdb_bucket: String = var("INFLUXDB_BUCKET")
-        .expect("INFLUXDB_BUCKET is missing!");
+    let influxdb_bucket: String = get_var::<String>("INFLUXDB_BUCKET");
 
-    let car_name = format!(
-        "{}_live", 
-        var("CAR_NAME").expect("CAR_NAME is missing!")
-    );
+    let car_name = get_var::<String>("CAR_NAME");
 
     let influxdb_measurement: String = format!("{car_name}_live");
 
+    let backend_port: u32 = get_var::<u32>("BACKEND_PORT");
+
     return Config {
         serial_port: serial_port,
         serial_baud_rate: 57600, // hardcoded baudrate, probably wont ever change this
@@ -53,5 +48,13 @@ fn load_env_file() -> Config {
         influxdb_bucket: influxdb_bucket,
         influxdb_measurement: influxdb_measurement,
         jsoncan_config_path: format!("../../../can_bus/{car_name}"), // i love hardcoding
+        backend_port: backend_port
     }
+}
+
+fn get_var<T: std::str::FromStr>(env_key: &str) -> T {
+    return var(env_key)
+        .expect(&format!("{} is missing!", env_key))
+        .parse::<T>()
+        .ok().unwrap();
 }

software/tracksight/rust_backend/src/config.rs

@@ -12,6 +12,8 @@ use tasks::client_api::subscriptions::Subscriptions;
 use tasks::serial_handler::run_serial_task;
 use tasks::can_data_handler::run_can_data_handler;
 
+use crate::tasks::api_handler::run_api_handler;
+
 #[tokio::main]
 async fn main() {
     // shutdown signal for threads
@@ -42,8 +44,9 @@ async fn main() {
     let subscriptions = RwLock::new(Subscriptions::new());
 
     // start tasks
-    tasks.spawn(run_can_data_handler(shutdown_rx.resubscribe(), can_queue_rx, subscriptions));
-    tasks.spawn(run_serial_task(shutdown_rx.resubscribe(), can_queue_tx));
+    tasks.spawn(run_api_handler(shutdown_rx.resubscribe()));
+    // tasks.spawn(run_can_data_handler(shutdown_rx.resubscribe(), can_queue_rx, subscriptions));
+    // tasks.spawn(run_serial_task(shutdown_rx.resubscribe(), can_queue_tx));
 
     // wait for tasks to clean up
     while let Some(res) = tasks.join_next().await {