Authentication (#37)

* Initial authentication implementation

* Store user info in the database, improve encapsulation in profiles

* Add user list, remove unused dependencies, add spantraces

* Implement user remove, update UUID crate

* Add user set-default

* Revert submodule macro usage

* Make tracing significantly less verbose

theseus/src/state/profiles.rs

@@ -12,8 +12,7 @@ use tokio::fs;
 const PROFILE_JSON_PATH: &str = "profile.json";
 const PROFILE_SUBTREE: &[u8] = b"profiles";
 
-#[derive(Debug)]
-pub struct Profiles(pub HashMap<PathBuf, Option<Profile>>);
+pub(crate) struct Profiles(pub HashMap<PathBuf, Option<Profile>>);
 
 // TODO: possibly add defaults to some of these values
 pub const CURRENT_FORMAT_VERSION: u32 = 1;
@@ -84,15 +83,17 @@ pub struct JavaSettings {
 }
 
 impl Profile {
+    #[tracing::instrument]
     pub async fn new(
         name: String,
         version: String,
         path: PathBuf,
     ) -> crate::Result<Self> {
         if name.trim().is_empty() {
-            return Err(crate::Error::InputError(String::from(
+            return Err(crate::ErrorKind::InputError(String::from(
                 "Empty name for instance!",
-            )));
+            ))
+            .into());
         }
 
         Ok(Self {
@@ -114,11 +115,13 @@ impl Profile {
 
     // TODO: deduplicate these builder methods
     // They are flat like this in order to allow builder-style usage
+    #[tracing::instrument]
     pub fn with_name(&mut self, name: String) -> &mut Self {
         self.metadata.name = name;
         self
     }
 
+    #[tracing::instrument]
     pub async fn with_icon<'a>(
         &'a mut self,
         icon: &'a Path,
@@ -136,17 +139,20 @@ impl Profile {
 
             Ok(self)
         } else {
-            Err(crate::Error::InputError(format!(
+            Err(crate::ErrorKind::InputError(format!(
                 "Unsupported image type: {ext}"
-            )))
+            ))
+            .into())
         }
     }
 
+    #[tracing::instrument]
     pub fn with_game_version(&mut self, version: String) -> &mut Self {
         self.metadata.game_version = version;
         self
     }
 
+    #[tracing::instrument]
     pub fn with_loader(
         &mut self,
         loader: ModLoader,
@@ -157,6 +163,7 @@ impl Profile {
         self
     }
 
+    #[tracing::instrument]
     pub fn with_java_settings(
         &mut self,
         settings: Option<JavaSettings>,
@@ -165,6 +172,7 @@ impl Profile {
         self
     }
 
+    #[tracing::instrument]
     pub fn with_memory(
         &mut self,
         settings: Option<MemorySettings>,
@@ -173,6 +181,7 @@ impl Profile {
         self
     }
 
+    #[tracing::instrument]
     pub fn with_resolution(
         &mut self,
         resolution: Option<WindowSize>,
@@ -181,6 +190,7 @@ impl Profile {
         self
     }
 
+    #[tracing::instrument]
     pub fn with_hooks(&mut self, hooks: Option<Hooks>) -> &mut Self {
         self.hooks = hooks;
         self
@@ -188,6 +198,7 @@ impl Profile {
 }
 
 impl Profiles {
+    #[tracing::instrument(skip(db))]
     pub async fn init(db: &sled::Db) -> crate::Result<Self> {
         let profile_db = db.get(PROFILE_SUBTREE)?.map_or(
             Ok(Default::default()),
@@ -218,19 +229,23 @@ impl Profiles {
         Ok(Self(profiles))
     }
 
+    #[tracing::instrument(skip(self))]
     pub fn insert(&mut self, profile: Profile) -> crate::Result<&Self> {
         self.0.insert(
             profile
                 .path
                 .canonicalize()?
                 .to_str()
-                .ok_or(crate::Error::UTFError(profile.path.clone()))?
+                .ok_or(
+                    crate::ErrorKind::UTFError(profile.path.clone()).as_error(),
+                )?
                 .into(),
             Some(profile),
         );
         Ok(self)
     }
 
+    #[tracing::instrument(skip(self))]
     pub async fn insert_from<'a>(
         &'a mut self,
         path: &'a Path,
@@ -238,12 +253,14 @@ impl Profiles {
         self.insert(Self::read_profile_from_dir(&path.canonicalize()?).await?)
     }
 
+    #[tracing::instrument(skip(self))]
     pub fn remove(&mut self, path: &Path) -> crate::Result<&Self> {
         let path = PathBuf::from(path.canonicalize()?.to_str().unwrap());
         self.0.remove(&path);
         Ok(self)
     }
 
+    #[tracing::instrument(skip_all)]
     pub async fn sync<'a>(
         &'a self,
         batch: &'a mut sled::Batch,