🏭 Add url property to WretchError

Solves #157
elbywan · Dec 12, 2022 · a1f6ac6 · a1f6ac6
1 parent d18ef68
commit a1f6ac6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/src/resolver.ts b/src/resolver.ts
@@ -10,6 +10,7 @@ import { FETCH_ERROR } from "./constants.js"
 export class WretchError extends Error implements WretchErrorType {
   status: number
   response: WretchResponse
+  url: string
   text?: string
   json?: any
 }
@@ -29,7 +30,11 @@ export const resolver = <T, Chain, R>(wretch: T & Wretch<T, Chain, R>) => {
   const finalOptions = mix(config.options, opts)
   addons.forEach(addon => addon.beforeRequest && addon.beforeRequest(wretch, finalOptions))
   // The generated fetch request
-  const _fetchReq = middlewareHelper(middlewares)(config.polyfill("fetch"))(url, finalOptions)
+  let finalUrl = url
+  const _fetchReq = middlewareHelper(middlewares)((url, options) => {
+    finalUrl = url
+    return config.polyfill("fetch")(url, options)
+  })(url, finalOptions)
   // Throws on an http error
   const referenceError = new Error()
   const throwingPromise: Promise<void | WretchResponse> = _fetchReq
@@ -43,6 +48,7 @@ export const resolver = <T, Chain, R>(wretch: T & Wretch<T, Chain, R>) => {
         err["cause"] = referenceError
         err.stack = err.stack + "\nCAUSE: " + referenceError.stack
         err.response = response
+        err.url = finalUrl
         if (response.type === "opaque") {
           throw err
         }

diff --git a/src/types.ts b/src/types.ts
@@ -724,7 +724,7 @@ export type WretchOptions = Record<string, any>
 /**
  * An Error enhanced with status, text and body.
  */
-export interface WretchError extends Error { status: number, response: WretchResponse, text?: string, json?: any }
+export interface WretchError extends Error { status: number, response: WretchResponse, url: string, text?: string, json?: any }
 /**
  * Callback provided to catchers on error. Contains the original wretch instance used to perform the request.
  */

diff --git a/test/node/wretch.spec.ts b/test/node/wretch.spec.ts
@@ -451,6 +451,7 @@ describe("Wretch", function () {
         .res(_ => fail("Authenticated route should not respond without credentials."))
     } catch (e) {
       expect(e.status).toBe(401)
+      expect(e.url).toBe(_URL + "/basicauth")
     }
 
     const res = await wretch(_URL + "/basicauth")