refactor(ext/fetch): use concrete error types (#26220)

denoland · Oct 19, 2024 · 6c4ef11 · 6c4ef11
1 parent d1cd1fa
commit 6c4ef11
Show file tree

Hide file tree

Showing 6 changed files with 255 additions and 134 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/ext/fetch/Cargo.toml b/ext/fetch/Cargo.toml
@@ -32,6 +32,7 @@ percent-encoding.workspace = true
 rustls-webpki.workspace = true
 serde.workspace = true
 serde_json.workspace = true
+thiserror.workspace = true
 tokio.workspace = true
 tokio-rustls.workspace = true
 tokio-socks.workspace = true

diff --git a/ext/fetch/fs_fetch_handler.rs b/ext/fetch/fs_fetch_handler.rs
@@ -4,7 +4,6 @@ use crate::CancelHandle;
 use crate::CancelableResponseFuture;
 use crate::FetchHandler;
 
-use deno_core::error::type_error;
 use deno_core::futures::FutureExt;
 use deno_core::futures::TryFutureExt;
 use deno_core::futures::TryStreamExt;
@@ -42,9 +41,7 @@ impl FetchHandler for FsFetchHandler {
         .map_err(|_| ())?;
       Ok::<_, ()>(response)
     }
-    .map_err(move |_| {
-      type_error("NetworkError when attempting to fetch resource")
-    })
+    .map_err(move |_| super::FetchError::NetworkError)
     .or_cancel(&cancel_handle)
     .boxed_local();