@optionfactory/ful 1.0.16 → 1.1.0

package/dist/ful.mjs

@@ -135,7 +135,7 @@ class MediaType {
  */
 /**
  * @typedef HttpInterceptor
- * @property {function(Request,HttpInterceptorChain):Promise<Response>} intercept  
+ * @property {function(URL,RequestInit|undefined,HttpInterceptorChain):Promise<Response>} intercept  
  */
 
 class HttpClientError extends Failure {
@@ -212,11 +212,11 @@ class CsrfTokenInterceptor {
         this.#k = document.querySelector("meta[name='_csrf_header']")?.getAttribute("content");
         this.#v = document.querySelector("meta[name='_csrf']")?.getAttribute("content");
     }
-    async intercept(request, chain) {
+    async intercept(url, request, chain) {
         if (this.#k && this.#v) {
             request.headers.set(this.#k, this.#v);
         }
-        return await chain.proceed(request);
+        return await chain.proceed(url, request);
     }
 }
 /**
@@ -230,8 +230,8 @@ class RedirectOnUnauthorizedInterceptor {
     constructor(redirectUri) {
         this.#redirectUri = redirectUri;
     }
-    async intercept(request, chain) {
-        const response = await chain.proceed(request);
+    async intercept(url, request, chain) {
+        const response = await chain.proceed(url, request);
         if (response.status === 401) {
             window.location.href = this.#redirectUri;
         }
@@ -271,8 +271,8 @@ class HttpClientBuilder {
  * @implements {HttpInterceptor}
  */
 class HttpCall {
-    async intercept(request, chain) {
-        return await fetch(request);
+    async intercept(url, request, chain) {
+        return await fetch(new Request(url, request));
     }
 }
 
@@ -290,12 +290,13 @@ class HttpInterceptorChain {
     }
     /**
      * 
-     * @param {Request} request 
+     * @param {URL} url
+     * @param {RequestInit} request 
      * @returns {Promise<Response>} the response
      */
-    async proceed(request) {
+    async proceed(url, request) {
         const interceptor = this.#interceptors[this.#current];
-        return await interceptor.intercept(request, new HttpInterceptorChain(this.#interceptors, this.#current + 1));
+        return await interceptor.intercept(url, request, new HttpInterceptorChain(this.#interceptors, this.#current + 1));
     }
 }
 
@@ -326,7 +327,8 @@ class HttpClient {
     async exchange(uri, options, interceptors) {
         const is = [...this.#interceptors, ...interceptors || [], new HttpCall()];
         const chain = new HttpInterceptorChain(is, 0);
-        return await chain.proceed(new Request(uri, options));
+        const url = new URL(new Request(uri).url);
+        return await chain.proceed(url, options ?? {});
     }
     /**
      * Creates a request builder.
@@ -953,10 +955,10 @@ class AuthorizationCodeFlowInterceptor {
         this.#gracePeriodBefore = gracePeriodBefore || 2000;
         this.#gracePeriodAfter = gracePeriodAfter || 30000;
     }
-    async intercept(request, chain) {
+    async intercept(url, request, chain) {
         await this.#session.refreshIf(this.#gracePeriodBefore);
         request.headers.set("Authorization", this.#session.bearerToken());
-        const response = await chain.proceed(request);
+        const response = await chain.proceed(url, request);
         await this.#session.refreshIf(this.#gracePeriodAfter);
         return response;
     }