fix(ext/fetch): include URL and error details on fetch failures

denoland · Aug 6, 2024 · 47dbb42 · 47dbb42
1 parent c0e9512
commit 47dbb42
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 1 deletion.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/ext/fetch/Cargo.toml b/ext/fetch/Cargo.toml
@@ -21,6 +21,7 @@ deno_core.workspace = true
 deno_permissions.workspace = true
 deno_tls.workspace = true
 dyn-clone = "1"
+error_reporter = "1"
 http.workspace = true
 http-body-util.workspace = true
 hyper.workspace = true

diff --git a/ext/fetch/lib.rs b/ext/fetch/lib.rs
@@ -1098,7 +1098,15 @@ impl Client {
       req.headers_mut().insert(PROXY_AUTHORIZATION, auth.clone());
     }
 
-    let resp = self.inner.oneshot(req).await?;
+    let url = req.uri().to_string();
+
+    let resp = self.inner.oneshot(req).await.map_err(|e| {
+      anyhow!(
+        "error sending request for url ({url}): {}",
+        // NOTE: we can use `std::error::Report` instead once it's stabilized.
+        error_reporter::Report::new(e)
+      )
+    })?;
     Ok(resp.map(|b| b.map_err(|e| anyhow!(e)).boxed()))
   }
 }

diff --git a/tests/unit/fetch_test.ts b/tests/unit/fetch_test.ts
@@ -2060,3 +2060,14 @@ Deno.test("URL authority is used as 'Authorization' header", async () => {
   await server.finished;
   assertEquals(authHeader, "Basic ZGVubzpsYW5k");
 });
+
+Deno.test(
+  { permissions: { net: true } },
+  async function errorMessageIncludesUrlAndDetails() {
+    await assertRejects(
+      () => fetch("http://example.invalid"),
+      TypeError,
+      "error sending request for url (http://example.invalid/): client error (Connect): dns error: failed to lookup address information:",
+    );
+  },
+);