Merge branch 'next/minor' of github.com:Start9Labs/start-os into next/major

core/models/Cargo.toml

@@ -24,7 +24,8 @@ patch-db = { version = "*", path = "../../patch-db/patch-db", features = [
 rand = "0.8.5"
 regex = "1.10.2"
 reqwest = "0.12"
-rpc-toolkit = { git = "https://github.com/Start9Labs/rpc-toolkit.git", branch = "refactor/no-dyn-ctx" }
+rpc-toolkit = { git = "https://github.com/Start9Labs/rpc-toolkit.git", branch = "master" }
+rustls = "0.23"
 serde = { version = "1.0", features = ["derive", "rc"] }
 serde_json = "1.0"
 sqlx = { version = "0.7.2", features = [
@@ -39,3 +40,4 @@ tokio = { version = "1", features = ["full"] }
 torut = { git = "https://github.com/Start9Labs/torut.git", branch = "update/dependencies" }
 tracing = "0.1.39"
 yasi = "0.1.5"
+zbus = "5"

core/models/src/data_url.rs

@@ -168,6 +168,6 @@ fn doesnt_reallocate() {
             mime: InternedString::intern("png"),
             data: Cow::Borrowed(&random[..i]),
         };
-        assert_eq!(dbg!(icon.to_string()).capacity(), icon.data_url_len());
+        assert_eq!(icon.to_string().capacity(), icon.data_url_len());
     }
 }

core/models/src/errors.rs

@@ -45,7 +45,7 @@ pub enum ErrorKind {
     ConfigGen = 27,
     ParseNumber = 28,
     Database = 29,
-    InvalidPackageId = 30,
+    InvalidId = 30,
     InvalidSignature = 31,
     Backup = 32,
     Restore = 33,
@@ -90,6 +90,7 @@ pub enum ErrorKind {
     Lxc = 72,
     Cancelled = 73,
     Git = 74,
+    DBus = 75,
 }
 impl ErrorKind {
     pub fn as_str(&self) -> &'static str {
@@ -124,7 +125,7 @@ impl ErrorKind {
             ConfigGen => "Config Generation Error",
             ParseNumber => "Number Parsing Error",
             Database => "Database Error",
-            InvalidPackageId => "Invalid Package ID",
+            InvalidId => "Invalid ID",
             InvalidSignature => "Invalid Signature",
             Backup => "Backup Error",
             Restore => "Restore Error",
@@ -169,6 +170,7 @@ impl ErrorKind {
             Lxc => "LXC Error",
             Cancelled => "Cancelled",
             Git => "Git Error",
+            DBus => "DBus Error",
         }
     }
 }
@@ -224,7 +226,7 @@ impl From<std::convert::Infallible> for Error {
 }
 impl From<InvalidId> for Error {
     fn from(err: InvalidId) -> Self {
-        Error::new(err, ErrorKind::InvalidPackageId)
+        Error::new(err, ErrorKind::InvalidId)
     }
 }
 impl From<std::io::Error> for Error {
@@ -327,6 +329,16 @@ impl From<torut::onion::OnionAddressParseError> for Error {
         Error::new(e, ErrorKind::Tor)
     }
 }
+impl From<zbus::Error> for Error {
+    fn from(e: zbus::Error) -> Self {
+        Error::new(e, ErrorKind::DBus)
+    }
+}
+impl From<rustls::Error> for Error {
+    fn from(e: rustls::Error) -> Self {
+        Error::new(e, ErrorKind::OpenSsl)
+    }
+}
 impl From<patch_db::value::Error> for Error {
     fn from(value: patch_db::value::Error) -> Self {
         match value.kind {

core/models/src/id/invalid_id.rs

@@ -1,3 +1,5 @@
+use yasi::InternedString;
+
 #[derive(Debug, thiserror::Error)]
-#[error("Invalid ID")]
-pub struct InvalidId;
+#[error("Invalid ID: {0}")]
+pub struct InvalidId(pub(super) InternedString);

core/models/src/id/mod.rs

@@ -43,7 +43,7 @@ impl TryFrom<InternedString> for Id {
         if ID_REGEX.is_match(&value) {
             Ok(Id(value))
         } else {
-            Err(InvalidId)
+            Err(InvalidId(value))
         }
     }
 }
@@ -53,7 +53,7 @@ impl TryFrom<String> for Id {
         if ID_REGEX.is_match(&value) {
             Ok(Id(InternedString::intern(value)))
         } else {
-            Err(InvalidId)
+            Err(InvalidId(InternedString::intern(value)))
         }
     }
 }
@@ -63,7 +63,7 @@ impl TryFrom<&str> for Id {
         if ID_REGEX.is_match(value) {
             Ok(Id(InternedString::intern(value)))
         } else {
-            Err(InvalidId)
+            Err(InvalidId(InternedString::intern(value)))
         }
     }
 }