@insforge/sdk 1.2.8-dev.0 → 1.2.8-dev.1

package/dist/index.js

@@ -434,8 +434,8 @@ var HttpClient = class {
     const jitter = base * (0.85 + Math.random() * 0.3);
     return Math.round(jitter);
   }
-  shouldRefreshAccessToken(statusCode, errorCode, options = {}) {
-    return statusCode === 401 && errorCode === REFRESHABLE_AUTH_ERROR_CODE && !(this.config.isServerMode ?? !!this.config.edgeFunctionToken) && !options.skipAuthRefresh && this.userToken !== null;
+  shouldRefreshAccessToken(statusCode, errorCode, authToken, options = {}) {
+    return statusCode === 401 && errorCode === REFRESHABLE_AUTH_ERROR_CODE && !this.config.isServerMode && !this.config.edgeFunctionToken && !options.skipAuthRefresh && authToken !== null;
   }
   async fetchWithRetry(args) {
     const {
@@ -554,7 +554,7 @@ var HttpClient = class {
    * @returns Parsed response data.
    * @throws {InsForgeError} On timeout, network failure, or HTTP error responses.
    */
-  async handleRequest(method, path, options = {}) {
+  async handleRequest(method, path, options = {}, tokenOverride) {
     const {
       params,
       headers = {},
@@ -570,21 +570,32 @@ var HttpClient = class {
     const requestHeaders = {
       ...this.defaultHeaders
     };
-    const authToken = this.userToken || this.anonKey;
+    const authToken = tokenOverride ?? this.userToken ?? this.anonKey;
     if (authToken) {
       requestHeaders["Authorization"] = `Bearer ${authToken}`;
     }
     const processedBody = serializeBody(method, body, requestHeaders);
+    const setRequestHeader = (key, value) => {
+      if (key.toLowerCase() === "authorization") {
+        delete requestHeaders["Authorization"];
+        delete requestHeaders["authorization"];
+        requestHeaders["Authorization"] = value;
+        return;
+      }
+      requestHeaders[key] = value;
+    };
     if (headers instanceof Headers) {
       headers.forEach((value, key) => {
-        requestHeaders[key] = value;
+        setRequestHeader(key, value);
       });
     } else if (Array.isArray(headers)) {
       headers.forEach(([key, value]) => {
-        requestHeaders[key] = value;
+        setRequestHeader(key, value);
       });
     } else {
-      Object.assign(requestHeaders, headers);
+      Object.entries(headers).forEach(([key, value]) => {
+        setRequestHeader(key, value);
+      });
     }
     this.logger.logRequest(method, url, requestHeaders, processedBody);
     const response = await this.fetchWithRetry({
@@ -621,19 +632,47 @@ var HttpClient = class {
     return data;
   }
   async request(method, path, options = {}) {
+    const tokenUsed = this.userToken;
     try {
-      return await this.handleRequest(method, path, { ...options });
+      return await this.handleRequest(
+        method,
+        path,
+        { ...options },
+        tokenUsed
+      );
     } catch (error) {
-      if (error instanceof InsForgeError && this.shouldRefreshAccessToken(error.statusCode, error.error, options)) {
-        try {
-          await this.refreshAndSaveSession();
-        } catch (error2) {
-          this.clearAuthSession();
-          throw error2;
+      if (!(error instanceof InsForgeError) || !this.shouldRefreshAccessToken(
+        error.statusCode,
+        error.error,
+        tokenUsed,
+        options
+      )) {
+        throw error;
+      }
+      if (tokenUsed !== this.userToken) {
+        if (this.userToken === null) {
+          throw error;
         }
-        return await this.handleRequest(method, path, { ...options });
+        return await this.handleRequest(
+          method,
+          path,
+          {
+            ...options,
+            skipAuthRefresh: true
+          },
+          this.userToken
+        );
       }
-      throw error;
+      try {
+        await this.refreshAndSaveSession();
+      } catch (error2) {
+        this.clearAuthSession();
+        throw error2;
+      }
+      return await this.handleRequest(method, path, {
+        ...options,
+        skipAuthRefresh: true
+      });
     }
   }
   /**
@@ -653,7 +692,14 @@ var HttpClient = class {
     const method = initMethod ?? request?.method ?? "GET";
     const url = request?.url ?? input.toString();
     const startTime = Date.now();
-    const headers = new Headers(this.getHeaders());
+    const tokenUsed = this.userToken;
+    const headers = new Headers({
+      ...this.defaultHeaders
+    });
+    const authToken = tokenUsed ?? this.anonKey;
+    if (authToken) {
+      headers.set("Authorization", `Bearer ${authToken}`);
+    }
     request?.headers.forEach((value, key) => {
       headers.set(key, value);
     });
@@ -664,7 +710,13 @@ var HttpClient = class {
     headers.forEach((value, key) => {
       requestHeaders[key] = value;
     });
-    const body = initBody ?? request?.body ?? void 0;
+    const sourceBody = initBody ?? request?.body ?? void 0;
+    let body = sourceBody;
+    let retryInit = init;
+    if (typeof ReadableStream !== "undefined" && sourceBody instanceof ReadableStream) {
+      body = await new Response(sourceBody).arrayBuffer();
+      retryInit = { ...init ?? {}, body };
+    }
     const callerSignal = initSignal ?? request?.signal;
     const maxAttempts = IDEMPOTENT_METHODS.has(method.toUpperCase()) ? this.retryCount : 0;
     this.logger.logRequest(method, url, requestHeaders, body);
@@ -696,9 +748,26 @@ var HttpClient = class {
       } catch {
       }
     }
-    if (!this.shouldRefreshAccessToken(response.status, errorCode, options)) {
+    if (!this.shouldRefreshAccessToken(
+      response.status,
+      errorCode,
+      tokenUsed,
+      options
+    )) {
       return response;
     }
+    if (tokenUsed !== this.userToken) {
+      if (this.userToken === null) {
+        return response;
+      }
+      const retryHeaders2 = new Headers(initHeaders);
+      retryHeaders2.set("Authorization", `Bearer ${this.userToken}`);
+      return await this.rawFetch(
+        input,
+        { ...retryInit, headers: retryHeaders2 },
+        { skipAuthRefresh: true }
+      );
+    }
     let newTokenData;
     try {
       newTokenData = await this.refreshAndSaveSession();
@@ -710,7 +779,7 @@ var HttpClient = class {
     retryHeaders.set("Authorization", `Bearer ${newTokenData.accessToken}`);
     return await this.rawFetch(
       input,
-      { ...init, headers: retryHeaders },
+      { ...retryInit, headers: retryHeaders },
       { skipAuthRefresh: true }
     );
   }