@nimbleflux/fluxbase-sdk 2026.3.7-rc.8 → 2026.5.1

package/dist/index.cjs

@@ -71,9 +71,10 @@ var FluxbaseFetch = class {
     return this.requestInternal(path, options, false);
   }
   /**
-   * Internal request implementation with retry capability
+   * Full request implementation returning response with headers, status, and data.
+   * Used by both requestInternal and requestWithHeadersInternal.
    */
-  async requestInternal(path, options, isRetry) {
+  async requestFull(path, options, isRetry) {
     const url = `${this.baseUrl}${path}`;
     const headers = { ...this.defaultHeaders, ...options.headers };
     if (this.beforeRequestCallback) {
@@ -114,7 +115,7 @@ var FluxbaseFetch = class {
       if (response.status === 401 && !isRetry && !options.skipAutoRefresh && this.refreshTokenCallback) {
         const refreshSuccess = await this.handleTokenRefresh();
         if (refreshSuccess) {
-          return this.requestInternal(path, options, true);
+          return this.requestFull(path, options, true);
         }
       }
       if (!response.ok) {
@@ -125,7 +126,11 @@ var FluxbaseFetch = class {
         error.details = data;
         throw error;
       }
-      return data;
+      return {
+        data,
+        headers: response.headers,
+        status: response.status
+      };
     } catch (err) {
       clearTimeout(timeoutId);
       if (err instanceof Error) {
@@ -172,6 +177,19 @@ var FluxbaseFetch = class {
       return false;
     }
   }
+  /**
+   * Internal request implementation with retry capability
+   */
+  async requestInternal(path, options, isRetry) {
+    const { data } = await this.requestFull(path, options, isRetry);
+    return data;
+  }
+  /**
+   * Internal request implementation that returns response with headers
+   */
+  async requestWithHeadersInternal(path, options, isRetry) {
+    return this.requestFull(path, options, isRetry);
+  }
   /**
    * GET request
    */
@@ -200,79 +218,6 @@ var FluxbaseFetch = class {
   async requestWithHeaders(path, options) {
     return this.requestWithHeadersInternal(path, options, false);
   }
-  /**
-   * Internal request implementation that returns response with headers
-   */
-  async requestWithHeadersInternal(path, options, isRetry) {
-    const url = `${this.baseUrl}${path}`;
-    const headers = { ...this.defaultHeaders, ...options.headers };
-    if (this.beforeRequestCallback) {
-      this.beforeRequestCallback(headers);
-    }
-    const controller = new AbortController();
-    const timeoutId = setTimeout(
-      () => controller.abort(),
-      options.timeout ?? this.timeout
-    );
-    if (this.debug) {
-      console.log(`[Fluxbase SDK] ${options.method} ${url}`, options.body);
-    }
-    try {
-      const isFormData = options.body && (options.body.constructor?.name === "FormData" || options.body instanceof FormData);
-      const requestHeaders = isFormData ? Object.fromEntries(
-        Object.entries(headers).filter(
-          ([key]) => key.toLowerCase() !== "content-type"
-        )
-      ) : headers;
-      const response = await fetch(url, {
-        method: options.method,
-        headers: requestHeaders,
-        body: isFormData ? options.body : options.body ? JSON.stringify(options.body) : void 0,
-        signal: controller.signal
-      });
-      clearTimeout(timeoutId);
-      const contentType = response.headers.get("content-type");
-      let data;
-      if (contentType?.includes("application/json")) {
-        data = await response.json();
-      } else {
-        data = await response.text();
-      }
-      if (this.debug) {
-        console.log(`[Fluxbase SDK] Response:`, response.status, data);
-      }
-      if (response.status === 401 && !isRetry && !options.skipAutoRefresh && this.refreshTokenCallback) {
-        const refreshSuccess = await this.handleTokenRefresh();
-        if (refreshSuccess) {
-          return this.requestWithHeadersInternal(path, options, true);
-        }
-      }
-      if (!response.ok) {
-        const error = new Error(
-          typeof data === "object" && data && "error" in data ? String(data.error) : response.statusText
-        );
-        error.status = response.status;
-        error.details = data;
-        throw error;
-      }
-      return {
-        data,
-        headers: response.headers,
-        status: response.status
-      };
-    } catch (err) {
-      clearTimeout(timeoutId);
-      if (err instanceof Error) {
-        if (err.name === "AbortError") {
-          const timeoutError = new Error("Request timeout");
-          timeoutError.status = 408;
-          throw timeoutError;
-        }
-        throw err;
-      }
-      throw new Error("Unknown error occurred");
-    }
-  }
   /**
    * POST request
    */