Merge pull request #1178 from tonymushah/1045-use-errorwrapper-instead-of-error-on-graphql-queries

1045 use errorwrapper instead of error on graphql queries

Author: tonymushah

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "special-eureka"
-version = "0.2.2-2"
+version = "0.2.2-3"
 description = "a manga reader desktop app build with tauri"
 authors = ["tonymushah"]
 license = ""

src-tauri/core/Cargo.toml

@@ -1,4 +1,4 @@
-use std::{backtrace::Backtrace, ops::Deref};
+use std::backtrace::Backtrace;
 
 use async_graphql::ErrorExtensions;
 use uuid::Uuid;
@@ -146,6 +146,16 @@ pub enum Error {
     ChapterPageNotLoaded { page: u32, chapter: Uuid },
     #[error("the {} chapter pages data can't be read", .0)]
     CannotReadChapterPagesData(Uuid),
+    #[error("Object creator not found")]
+    ObjectCreatorNotFound,
+    #[error("Related manga not found")]
+    RelatedMangaNotFound,
+    #[error("Related user not found")]
+    RelatedUserNotFound,
+    #[error("Related cover_art not found")]
+    RelatedCoverArtNotFound,
+    #[error(transparent)]
+    RelationshipConversion(mangadex_api_types_rust::error::RelationshipConversionError),
 }
 
 impl Error {
@@ -216,28 +226,28 @@ impl ErrorExtensions for Error {
     }
 }
 
-#[derive(Debug, Clone)]
-pub struct ErrorWrapper(std::sync::Arc<Error>);
+#[derive(Debug)]
+pub struct ErrorWrapper(Error);
 
 impl<E> From<E> for ErrorWrapper
 where
     E: Into<Error>,
 {
     fn from(value: E) -> Self {
-        Self(std::sync::Arc::new(value.into()))
+        Self(value.into())
     }
 }
 
 impl AsRef<Error> for ErrorWrapper {
     fn as_ref(&self) -> &Error {
-        self.0.deref()
+        &self.0
     }
 }
 
 impl ErrorWrapper {
     #[cfg_attr(feature = "hotpath", hotpath::measure)]
-    pub fn into_inner(self) -> Option<Error> {
-        std::sync::Arc::into_inner(self.0)
+    pub fn into_inner(self) -> Error {
+        self.0
     }
 }
 
@@ -246,3 +256,7 @@ impl From<ErrorWrapper> for async_graphql::Error {
         value.0.extend()
     }
 }
+
+pub(crate) mod wrapped {
+    pub type Result<T, E = super::ErrorWrapper> = std::result::Result<T, E>;
+}

src-tauri/mangadex/src/error.rs

@@ -33,6 +33,7 @@ pub(crate) type Result<T, E = error::Error> = std::result::Result<T, E>;
 pub(crate) use plugin_setup::PluginSetupResult;
 
 pub use error::Error;
+pub(crate) use error::ErrorWrapper;
 
 pub fn init<R: Runtime>() -> MizukiPlugin<R, Q, M, S> {
     mizuki::Builder::new(

src-tauri/mangadex/src/lib.rs

@@ -5,7 +5,7 @@ use mangadex_api_input_types::api_client::{
 use mangadex_api_schema_rust::{ApiObjectNoRelationships, v5::ApiClientAttributes};
 use uuid::Uuid;
 
-use crate::Result;
+use crate::error::wrapped::Result;
 use crate::{
     objects::api_client::ApiClient,
     utils::{

src-tauri/mangadex/src/mutation/api_client.rs

@@ -3,7 +3,7 @@ use mangadex_api_input_types::author::{create::AuthorCreateParams, edit::AuthorE
 use mangadex_api_schema_rust::{ApiObjectNoRelationships, v5::AuthorAttributes};
 use uuid::Uuid;
 
-use crate::Result;
+use crate::error::wrapped::Result;
 use crate::utils::traits_utils::{MangadexAsyncGraphQLContextExt, MangadexTauriManagerExt};
 use crate::{
     objects::author::Author,

src-tauri/mangadex/src/mutation/author.rs

@@ -1,4 +1,4 @@
-use crate::Result;
+use crate::error::wrapped::Result;
 use async_graphql::{Context, Object};
 use mangadex_api_input_types::captcha::solve::CaptchaSolveParams;
 

src-tauri/mangadex/src/mutation/captcha.rs

@@ -1,8 +1,8 @@
 pub mod pages;
 
 use crate::{
-    Result,
     error::Error,
+    error::wrapped::Result,
     query::download_state::DownloadStateQueries,
     store::{
         TauriManagerMangadexStoreExtractor, types::enums::chapter_quality::ChapterQualityStore,
@@ -85,7 +85,10 @@ impl ChapterMutations {
         ins_handle::add_in_queue(&tauri_handle, id)?;
 
         let res = download_chapter(&tauri_handle, id, quality.into()).await;
-        let state = DownloadStateQueries.chapter(ctx, id).await?;
+        let state = DownloadStateQueries
+            .chapter(ctx, id)
+            .await
+            .map_err(|e| e.into_inner())?;
         if let Err(_err) = res {
             ins_handle::add_in_failed(&tauri_handle, id)?;
             Ok(state)

src-tauri/mangadex/src/mutation/chapter.rs

@@ -1,6 +1,7 @@
 use async_graphql::{Context, Object};
 use uuid::Uuid;
 
+use crate::error::wrapped::Result;
 use crate::{
     store::types::enums::chapter_quality::DownloadMode,
     utils::traits_utils::{MangadexAsyncGraphQLContextExt, MangadexTauriManagerExt},
@@ -14,7 +15,7 @@ pub struct ChapterPagesStoreMutation {
 #[Object]
 #[cfg_attr(feature = "hotpath", hotpath::measure_all)]
 impl ChapterPagesStoreMutation {
-    pub async fn fetch_metadata(&self, ctx: &Context<'_>) -> crate::Result<bool> {
+    pub async fn fetch_metadata(&self, ctx: &Context<'_>) -> Result<bool> {
         let app = ctx.get_app_handle::<tauri::Wry>()?;
         let store = app.get_chapter_pages_store();
         if let Ok(store_read) = store.read() {
@@ -27,7 +28,7 @@ impl ChapterPagesStoreMutation {
             Ok(false)
         }
     }
-    pub async fn start_caching(&self, ctx: &Context<'_>) -> crate::Result<bool> {
+    pub async fn start_caching(&self, ctx: &Context<'_>) -> Result<bool> {
         let app = ctx.get_app_handle::<tauri::Wry>()?;
         let store = app.get_chapter_pages_store();
         if let Ok(store_read) = store.read() {
@@ -40,7 +41,7 @@ impl ChapterPagesStoreMutation {
             Ok(false)
         }
     }
-    pub async fn refetch_page(&self, ctx: &Context<'_>, page: u32) -> crate::Result<bool> {
+    pub async fn refetch_page(&self, ctx: &Context<'_>, page: u32) -> Result<bool> {
         let app = ctx.get_app_handle::<tauri::Wry>()?;
         let store = app.get_chapter_pages_store();
         if let Ok(store_read) = store.read() {
@@ -53,7 +54,7 @@ impl ChapterPagesStoreMutation {
             Ok(false)
         }
     }
-    pub async fn resend_page(&self, ctx: &Context<'_>, page: u32) -> crate::Result<bool> {
+    pub async fn resend_page(&self, ctx: &Context<'_>, page: u32) -> Result<bool> {
         let app = ctx.get_app_handle::<tauri::Wry>()?;
         let store = app.get_chapter_pages_store();
         if let Ok(store_read) = store.read() {
@@ -66,7 +67,7 @@ impl ChapterPagesStoreMutation {
             Ok(false)
         }
     }
-    pub async fn resend_all(&self, ctx: &Context<'_>) -> crate::Result<bool> {
+    pub async fn resend_all(&self, ctx: &Context<'_>) -> Result<bool> {
         let app = ctx.get_app_handle::<tauri::Wry>()?;
         let store = app.get_chapter_pages_store();
         if let Ok(store_read) = store.read() {
@@ -79,7 +80,7 @@ impl ChapterPagesStoreMutation {
             Ok(false)
         }
     }
-    pub async fn refetch_incompletes(&self, ctx: &Context<'_>) -> crate::Result<bool> {
+    pub async fn refetch_incompletes(&self, ctx: &Context<'_>) -> Result<bool> {
         let app = ctx.get_app_handle::<tauri::Wry>()?;
         let store = app.get_chapter_pages_store();
         if let Ok(store_read) = store.read() {
@@ -98,7 +99,7 @@ impl ChapterPagesStoreMutation {
         export_path: String,
         page: u32,
         defer: Option<bool>,
-    ) -> crate::Result<Option<String>> {
+    ) -> Result<Option<String>> {
         let app = ctx.get_app_handle::<tauri::Wry>()?;
         let store = app.get_chapter_pages_store();
         let handle = {

src-tauri/mangadex/src/mutation/chapter/pages.rs

@@ -15,8 +15,8 @@ use mangadex_api_schema_rust::{ApiObjectNoRelationships, v5::CoverAttributes};
 use uuid::Uuid;
 
 use crate::{
-    Result,
     error::Error,
+    error::wrapped::Result,
     query::download_state::DownloadStateQueries,
     utils::{download::cover::cover_download, traits_utils::MangadexAsyncGraphQLContextExt},
 };
@@ -77,7 +77,10 @@ impl CoverMutations {
     pub async fn download(&self, ctx: &Context<'_>, id: Uuid) -> Result<DownloadState> {
         let app = ctx.get_app_handle::<tauri::Wry>()?;
         let res = cover_download(app, id).await;
-        let state = DownloadStateQueries.cover(ctx, id).await?;
+        let state = DownloadStateQueries
+            .cover(ctx, id)
+            .await
+            .map_err(|e| e.into_inner())?;
         res?;
         Ok(state)
     }