aw-server: Make UUID part of ServerState

Author: johan-bjareholt

aw-client-rust/tests/test.rs

@@ -44,6 +44,7 @@ mod test {
         let state = ServerState {
             datastore: Mutex::new(aw_datastore::Datastore::new_in_memory(false)),
             asset_path: PathBuf::from("."), // webui won't be used, so it's invalidly set
+            device_id: "test_id".to_string(),
         };
         let mut aw_config = aw_server::config::AWConfig::default();
         aw_config.port = PORT;

aw-server/src/endpoints/mod.rs

@@ -1,15 +1,12 @@
-use std::fs;
 use std::path::PathBuf;
 use std::sync::Mutex;
 
 use gethostname::gethostname;
 use rocket::response::NamedFile;
 use rocket::State;
 use rocket_contrib::json::JsonValue;
-use uuid::Uuid;
 
 use crate::config::AWConfig;
-use crate::dirs;
 
 #[macro_export]
 macro_rules! endpoints_get_lock {
@@ -36,6 +33,7 @@ use aw_datastore::Datastore;
 pub struct ServerState {
     pub datastore: Mutex<Datastore>,
     pub asset_path: PathBuf,
+    pub device_id: String,
 }
 
 #[get("/")]
@@ -68,25 +66,8 @@ fn root_favicon(state: State<ServerState>) -> Option<NamedFile> {
     NamedFile::open(state.asset_path.join("favicon.ico")).ok()
 }
 
-/// Retrieves the device ID, if none exists it generates one (using UUID v4)
-fn get_device_id() -> String {
-    // TODO: Cache to avoid retrieving on every /info call
-    // TODO: How should these unwraps be removed?
-    //       Should this be propagated into a 500 Internal Server Error? How?
-    // I chose get_data_dir over get_config_dir since the latter isn't yet supported on Android.
-    let mut path = dirs::get_data_dir().unwrap();
-    path.push("device_id");
-    if path.exists() {
-        fs::read_to_string(path).unwrap()
-    } else {
-        let uuid = Uuid::new_v4().to_hyphenated().to_string();
-        fs::write(path, &uuid).unwrap();
-        uuid
-    }
-}
-
 #[get("/")]
-fn server_info(config: State<AWConfig>) -> JsonValue {
+fn server_info(config: State<AWConfig>, state: State<ServerState>) -> JsonValue {
     #[allow(clippy::or_fun_call)]
     let hostname = gethostname().into_string().unwrap_or("unknown".to_string());
     const VERSION: Option<&'static str> = option_env!("CARGO_PKG_VERSION");
@@ -95,7 +76,7 @@ fn server_info(config: State<AWConfig>) -> JsonValue {
         "hostname": hostname,
         "version": format!("v{} (rust)", VERSION.unwrap_or("(unknown)")),
         "testing": config.testing,
-        "device_id": get_device_id(),
+        "device_id": state.device_id,
     })
 }
 

aw-server/src/main.rs

@@ -4,7 +4,10 @@ extern crate getopts;
 
 use getopts::Options;
 use rocket::config::Environment;
+use uuid::Uuid;
+
 use std::env;
+use std::fs;
 
 use aw_server::*;
 
@@ -19,6 +22,20 @@ fn print_usage(program: &str, opts: Options) {
     print!("{}", opts.usage(&brief));
 }
 
+/// Retrieves the device ID, if none exists it generates one (using UUID v4)
+fn get_device_id() -> String {
+    // I chose get_data_dir over get_config_dir since the latter isn't yet supported on Android.
+    let mut path = dirs::get_data_dir().unwrap();
+    path.push("device_id");
+    if path.exists() {
+        fs::read_to_string(path).unwrap()
+    } else {
+        let uuid = Uuid::new_v4().to_hyphenated().to_string();
+        fs::write(path, &uuid).unwrap();
+        uuid
+    }
+}
+
 fn main() {
     use std::sync::Mutex;
 
@@ -67,6 +84,7 @@ fn main() {
         // it will not happen there
         datastore: Mutex::new(aw_datastore::Datastore::new(db_path, true)),
         asset_path,
+        device_id: get_device_id(),
     };
 
     endpoints::build_rocket(server_state, config).launch();

aw-server/tests/api.rs

@@ -26,6 +26,7 @@ mod api_tests {
         let state = endpoints::ServerState {
             datastore: Mutex::new(aw_datastore::Datastore::new_in_memory(false)),
             asset_path: PathBuf::from("aw-webui/dist"),
+            device_id: "test_id".to_string(),
         };
         let aw_config = config::AWConfig::default();
         endpoints::build_rocket(state, aw_config)