mitra-interactions-sdk 1.0.60-beta.28 → 1.0.60-beta.29

package/dist/index.js

@@ -354,20 +354,23 @@ async function handleResponse(response) {
   }
   return data;
 }
+function withFreshAuth(init) {
+  const config = getConfig();
+  const headers = { ...init.headers };
+  if (config.token) headers["Authorization"] = formatToken(config.token);
+  return { ...init, headers };
+}
 async function fetchWithRefresh(url, init) {
   const fetchFn = getFetch2();
+  if (isTokenExpiring()) {
+    const refreshed = await tryRefreshToken();
+    if (refreshed) init = withFreshAuth(init);
+  }
   const response = await fetchFn(url, init);
   if (response.status === 401) {
     const refreshed = await tryRefreshToken();
     if (refreshed) {
-      const newHeaders = { ...buildHeaders() };
-      const oldHeaders = init.headers;
-      if (oldHeaders) {
-        for (const [k, v] of Object.entries(oldHeaders)) {
-          if (k !== "Authorization") newHeaders[k] = v;
-        }
-      }
-      const retryResponse = await fetchFn(url, { ...init, headers: newHeaders });
+      const retryResponse = await fetchFn(url, withFreshAuth(init));
       return handleResponse(retryResponse);
     }
   }
@@ -658,8 +661,25 @@ var AgentTaskSession = class {
     if (!this._taskId) {
       return Promise.reject(new Error("AgentTaskSession: sem taskId \u2014 task ainda n\xE3o criada."));
     }
-    const url = getTaskWsUrl(this._taskId);
-    this._wsConnectPromise = new Promise((resolve, reject) => {
+    this._wsConnectPromise = (async () => {
+      try {
+        if (isTokenExpiring()) await tryRefreshToken();
+        try {
+          return await this._connectWs(this._taskId);
+        } catch (err) {
+          const refreshed = await tryRefreshToken();
+          if (!refreshed) throw err;
+          return await this._connectWs(this._taskId);
+        }
+      } finally {
+        this._wsConnectPromise = null;
+      }
+    })();
+    return this._wsConnectPromise;
+  }
+  _connectWs(taskId) {
+    const url = getTaskWsUrl(taskId);
+    return new Promise((resolve, reject) => {
       const socket = new WebSocket(url);
       let opened = false;
       const timer = setTimeout(() => {
@@ -668,7 +688,6 @@ var AgentTaskSession = class {
             socket.close();
           } catch (e) {
           }
-          this._wsConnectPromise = null;
           reject(new Error("Agent Chat: timeout ao conectar no WebSocket da task"));
         }
       }, 15e3);
@@ -676,13 +695,11 @@ var AgentTaskSession = class {
         opened = true;
         clearTimeout(timer);
         this._ws = socket;
-        this._wsConnectPromise = null;
         resolve(socket);
       };
       socket.onerror = () => {
         if (!opened) {
           clearTimeout(timer);
-          this._wsConnectPromise = null;
           reject(new Error("Agent Chat: erro ao conectar no WebSocket da task"));
         }
       };
@@ -699,7 +716,6 @@ var AgentTaskSession = class {
         this._handleWsEvent(msg);
       };
     });
-    return this._wsConnectPromise;
   }
   // ── Eventos do stream (WsOutboundMessage { type, payload, timestamp }) ──
   _handleWsEvent(msg) {
@@ -1063,20 +1079,22 @@ function createMitraInstance(initialConfig) {
       return false;
     }
   }
+  function withFreshAuth2(init) {
+    const headers = { ...init.headers };
+    if (_config.token) headers["Authorization"] = formatToken2(_config.token);
+    return { ...init, headers };
+  }
   async function fetchWithRefresh2(url, init) {
     const fetchFn = getFetch3();
+    if (isTokenExpiring(_config.token)) {
+      const refreshed = await tryRefreshToken2();
+      if (refreshed) init = withFreshAuth2(init);
+    }
     const response = await fetchFn(url, init);
     if (response.status === 401) {
       const refreshed = await tryRefreshToken2();
       if (refreshed) {
-        const newHeaders = { ...authHeaders() };
-        const oldHeaders = init.headers;
-        if (oldHeaders) {
-          for (const [k, v] of Object.entries(oldHeaders)) {
-            if (k !== "Authorization") newHeaders[k] = v;
-          }
-        }
-        const retryResponse = await fetchFn(url, { ...init, headers: newHeaders });
+        const retryResponse = await fetchFn(url, withFreshAuth2(init));
         return handleResponse2(retryResponse);
       }
     }
@@ -1292,6 +1310,14 @@ function hasAppScope(token) {
   if (!payload) return true;
   return typeof payload.app_id === "string" && payload.app_id.length > 0;
 }
+function isTokenExpiring(token, skewMs = 3e4) {
+  const t = token != null ? token : globalConfig == null ? void 0 : globalConfig.token;
+  if (!t) return false;
+  const payload = decodeJwtPayload(t);
+  const exp = payload == null ? void 0 : payload.exp;
+  if (typeof exp !== "number") return false;
+  return exp * 1e3 - Date.now() < skewMs;
+}
 function clearRefreshToken() {
   if (globalConfig) {
     const { refreshToken: _drop, ...rest } = globalConfig;