Merge commit '7fa442fb28a2b9156690ff147206275163e7aec8' into beta

packages/app-lib/src/error.rs

@@ -3,8 +3,17 @@ use std::sync::Arc;
 
 use crate::{profile, util};
 use data_url::DataUrlError;
+use derive_more::Display;
+use serde::{Deserialize, Serialize};
 use tracing_error::InstrumentError;
 
+#[derive(Serialize, Deserialize, Debug, Display)]
+#[display("{description}")]
+pub struct LabrinthError {
+    pub error: String,
+    pub description: String,
+}
+
 #[derive(thiserror::Error, Debug)]
 pub enum ErrorKind {
     #[error("Filesystem error: {0}")]
@@ -56,6 +65,9 @@ pub enum ErrorKind {
     #[error("Error fetching URL: {0}")]
     FetchError(#[from] reqwest::Error),
 
+    #[error("{0}")]
+    LabrinthError(LabrinthError),
+
     #[error("Websocket error: {0}")]
     WSError(#[from] async_tungstenite::tungstenite::Error),
 
@@ -186,6 +198,18 @@ pub enum ErrorKind {
     ParseError {
         reason: String,
     },
+    #[error("RPC error: {0}")]
+    RpcError(String),
+
+    #[cfg(windows)]
+    #[error("Windows error: {0}")]
+    WindowsError(#[from] windows_core::Error),
+
+    #[error("zbus error: {0}")]
+    ZbusError(#[from] zbus::Error),
+
+    #[error("Deserialization error: {0}")]
+    DeserializationError(#[from] serde::de::value::Error),
 }
 
 #[derive(Debug)]