misc sdk changes (#2934)

* misc sdk changes

* delete the store ☠️

* port comments

* fix build

* fix removing

* fix tests

* beta.20

---------

Co-authored-by: Matt Hill <mattnine@protonmail.com>

core/models/src/errors.rs

@@ -10,6 +10,7 @@ use rpc_toolkit::yajrc::{
     RpcError, INVALID_PARAMS_ERROR, INVALID_REQUEST_ERROR, METHOD_NOT_FOUND_ERROR, PARSE_ERROR,
 };
 use serde::{Deserialize, Serialize};
+use tokio::task::JoinHandle;
 
 use crate::InvalidId;
 
@@ -189,6 +190,7 @@ pub struct Error {
     pub source: color_eyre::eyre::Error,
     pub kind: ErrorKind,
     pub revision: Option<Revision>,
+    pub task: Option<JoinHandle<()>>,
 }
 
 impl Display for Error {
@@ -202,6 +204,7 @@ impl Error {
             source: source.into(),
             kind,
             revision: None,
+            task: None,
         }
     }
     pub fn clone_output(&self) -> Self {
@@ -213,8 +216,20 @@ impl Error {
             .into(),
             kind: self.kind,
             revision: self.revision.clone(),
+            task: None,
         }
     }
+    pub fn with_task(mut self, task: JoinHandle<()>) -> Self {
+        self.task = Some(task);
+        self
+    }
+    pub async fn wait(mut self) -> Self {
+        if let Some(task) = &mut self.task {
+            task.await.log_err();
+        }
+        self.task.take();
+        self
+    }
 }
 impl axum::response::IntoResponse for Error {
     fn into_response(self) -> axum::response::Response {
@@ -530,6 +545,7 @@ where
             source: e.into(),
             kind,
             revision: None,
+            task: None,
         })
     }
 
@@ -543,6 +559,7 @@ where
                 kind,
                 source,
                 revision: None,
+                task: None,
             }
         })
     }
@@ -565,6 +582,7 @@ impl<T> ResultExt<T, Error> for Result<T, Error> {
             source: e.source,
             kind,
             revision: e.revision,
+            task: e.task,
         })
     }
 
@@ -578,6 +596,7 @@ impl<T> ResultExt<T, Error> for Result<T, Error> {
                 kind,
                 source,
                 revision: e.revision,
+                task: e.task,
             }
         })
     }

core/models/src/id/volume.rs

@@ -1,10 +1,11 @@
 use std::borrow::Borrow;
 use std::path::Path;
+use std::str::FromStr;
 
 use serde::{Deserialize, Deserializer, Serialize};
 use ts_rs::TS;
 
-use crate::Id;
+use crate::{Id, InvalidId};
 
 #[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, TS)]
 #[ts(type = "string")]
@@ -12,6 +13,15 @@ pub enum VolumeId {
     Backup,
     Custom(Id),
 }
+impl FromStr for VolumeId {
+    type Err = InvalidId;
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        Ok(match s {
+            "BACKUP" => VolumeId::Backup,
+            s => VolumeId::Custom(Id::try_from(s.to_owned())?),
+        })
+    }
+}
 impl std::fmt::Display for VolumeId {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {