refactor: Extract error handling logic to a separate function and fix tests

- Moved error handling logic to a handleError function to avoid code duplication.
- Updated the error handling to correctly check for e.cause.code or e.code existence.
- Fixed tests that were not previously updated to expect ResponseStatusCodeError.

Author: schaable

v-next/hardhat-utils/src/internal/request.ts

@@ -5,12 +5,16 @@ import type UndiciT from "undici";
 import path from "node:path";
 import url from "node:url";
 
+import { ensureError } from "../error.js";
 import { mkdir } from "../fs.js";
 import {
+  ConnectionRefusedError,
   DEFAULT_MAX_REDIRECTS,
   DEFAULT_TIMEOUT_IN_MILLISECONDS,
   DEFAULT_USER_AGENT,
   getDispatcher,
+  RequestTimeoutError,
+  ResponseStatusCodeError,
 } from "../request.js";
 
 export async function generateTempFilePath(filePath: string): Promise<string> {
@@ -135,3 +139,32 @@ export function sanitizeUrl(requestUrl: string): string {
   const parsedUrl = new URL(requestUrl);
   return url.format(parsedUrl, { auth: false, search: false, fragment: false });
 }
+
+export function handleError(
+  e: NodeJS.ErrnoException,
+  requestUrl: string,
+): void {
+  let causeCode;
+  if (e.cause !== undefined) {
+    ensureError<NodeJS.ErrnoException>(e.cause);
+    causeCode = e.cause.code;
+  }
+  const errorCode = e.code ?? causeCode;
+
+  if (errorCode === "ECONNREFUSED") {
+    throw new ConnectionRefusedError(requestUrl, e);
+  }
+
+  if (
+    errorCode === "UND_ERR_CONNECT_TIMEOUT" ||
+    errorCode === "UND_ERR_HEADERS_TIMEOUT" ||
+    errorCode === "UND_ERR_BODY_TIMEOUT"
+  ) {
+    throw new RequestTimeoutError(requestUrl, e);
+  }
+
+  if (errorCode === "UND_ERR_RESPONSE_STATUS_CODE") {
+    ensureError<UndiciT.errors.ResponseStatusCodeError>(e);
+    throw new ResponseStatusCodeError(requestUrl, e);
+  }
+}

v-next/hardhat-utils/src/request.ts

@@ -11,9 +11,6 @@ import {
   DownloadError,
   RequestError,
   DispatcherError,
-  RequestTimeoutError,
-  ConnectionRefusedError,
-  ResponseStatusCodeError,
 } from "./errors/request.js";
 import { move } from "./fs.js";
 import {
@@ -23,6 +20,7 @@ import {
   getBasicDispatcher,
   getPoolDispatcher,
   getProxyDispatcher,
+  handleError,
 } from "./internal/request.js";
 
 export const DEFAULT_TIMEOUT_IN_MILLISECONDS = 30_000;
@@ -95,22 +93,7 @@ export async function getRequest(
   } catch (e) {
     ensureError<NodeJS.ErrnoException>(e);
 
-    if (e.code === "ECONNREFUSED") {
-      throw new ConnectionRefusedError(url, e);
-    }
-
-    if (
-      e.code === "UND_ERR_CONNECT_TIMEOUT" ||
-      e.code === "UND_ERR_HEADERS_TIMEOUT" ||
-      e.code === "UND_ERR_BODY_TIMEOUT"
-    ) {
-      throw new RequestTimeoutError(url, e);
-    }
-
-    if (e.code === "UND_ERR_RESPONSE_STATUS_CODE") {
-      ensureError<UndiciT.errors.ResponseStatusCodeError>(e);
-      throw new ResponseStatusCodeError(url, e);
-    }
+    handleError(e, url);
 
     throw new RequestError(url, "GET", e);
   }
@@ -154,22 +137,7 @@ export async function postJsonRequest(
   } catch (e) {
     ensureError<NodeJS.ErrnoException>(e);
 
-    if (e.code === "ECONNREFUSED") {
-      throw new ConnectionRefusedError(url, e);
-    }
-
-    if (
-      e.code === "UND_ERR_CONNECT_TIMEOUT" ||
-      e.code === "UND_ERR_HEADERS_TIMEOUT" ||
-      e.code === "UND_ERR_BODY_TIMEOUT"
-    ) {
-      throw new RequestTimeoutError(url, e);
-    }
-
-    if (e.code === "UND_ERR_RESPONSE_STATUS_CODE") {
-      ensureError<UndiciT.errors.ResponseStatusCodeError>(e);
-      throw new ResponseStatusCodeError(url, e);
-    }
+    handleError(e, url);
 
     throw new RequestError(url, "POST", e);
   }
@@ -214,22 +182,7 @@ export async function postFormRequest(
   } catch (e) {
     ensureError<NodeJS.ErrnoException>(e);
 
-    if (e.code === "ECONNREFUSED") {
-      throw new ConnectionRefusedError(url, e);
-    }
-
-    if (
-      e.code === "UND_ERR_CONNECT_TIMEOUT" ||
-      e.code === "UND_ERR_HEADERS_TIMEOUT" ||
-      e.code === "UND_ERR_BODY_TIMEOUT"
-    ) {
-      throw new RequestTimeoutError(url, e);
-    }
-
-    if (e.code === "UND_ERR_RESPONSE_STATUS_CODE") {
-      ensureError<UndiciT.errors.ResponseStatusCodeError>(e);
-      throw new ResponseStatusCodeError(url, e);
-    }
+    handleError(e, url);
 
     throw new RequestError(url, "POST", e);
   }
@@ -274,22 +227,7 @@ export async function download(
   } catch (e) {
     ensureError<NodeJS.ErrnoException>(e);
 
-    if (e.code === "ECONNREFUSED") {
-      throw new ConnectionRefusedError(url, e);
-    }
-
-    if (
-      e.code === "UND_ERR_CONNECT_TIMEOUT" ||
-      e.code === "UND_ERR_HEADERS_TIMEOUT" ||
-      e.code === "UND_ERR_BODY_TIMEOUT"
-    ) {
-      throw new RequestTimeoutError(url, e);
-    }
-
-    if (e.code === "UND_ERR_RESPONSE_STATUS_CODE") {
-      ensureError<UndiciT.errors.ResponseStatusCodeError>(e);
-      throw new ResponseStatusCodeError(url, e);
-    }
+    handleError(e, url);
 
     throw new DownloadError(url, e);
   }

v-next/hardhat-utils/test/request.ts

@@ -309,8 +309,8 @@ describe("Requests util", () => {
         .reply(500, "Internal Server Error");
 
       await assert.rejects(getRequest(url, undefined, interceptor), {
-        name: "RequestError",
-        message: `Failed to make GET request to ${url}`,
+        name: "ResponseStatusCodeError",
+        message: `Received an unexpected status code from ${url}`,
       });
     });
   });
@@ -407,8 +407,8 @@ describe("Requests util", () => {
         .reply(500, "Internal Server Error");
 
       await assert.rejects(postJsonRequest(url, body, undefined, interceptor), {
-        name: "RequestError",
-        message: `Failed to make POST request to ${url}`,
+        name: "ResponseStatusCodeError",
+        message: `Received an unexpected status code from ${url}`,
       });
     });
   });
@@ -505,8 +505,8 @@ describe("Requests util", () => {
         .reply(500, "Internal Server Error");
 
       await assert.rejects(postFormRequest(url, body, undefined, interceptor), {
-        name: "RequestError",
-        message: `Failed to make POST request to ${url}`,
+        name: "ResponseStatusCodeError",
+        message: `Received an unexpected status code from ${url}`,
       });
     });
   });
@@ -539,8 +539,8 @@ describe("Requests util", () => {
         .reply(500, "Internal Server Error");
 
       await assert.rejects(download(url, destination, undefined, interceptor), {
-        name: "DownloadError",
-        message: `Failed to download file from ${url}`,
+        name: "ResponseStatusCodeError",
+        message: `Received an unexpected status code from ${url}`,
       });
     });
   });