ton-provider-system 0.1.5 → 0.1.7

package/dist/index.cjs

@@ -1318,6 +1318,8 @@ var TokenBucketRateLimiter = class {
       if (this.currentBackoff > 0) {
         this.logger.debug(`Applying backoff: ${this.currentBackoff}ms`);
         await sleep(this.currentBackoff);
+        this.lastRefill = Date.now();
+        this.currentBackoff = 0;
       }
       while (this.tokens <= 0) {
         if (Date.now() - startTime > timeoutMs) {
@@ -2557,16 +2559,42 @@ async function getTonClient(manager) {
 async function getTonClientWithRateLimit(manager) {
   const adapter = new NodeAdapter(manager);
   const client = await adapter.getClient();
-  const withRateLimit = async (fn) => {
-    await manager.getEndpointWithRateLimit();
-    try {
-      const result = await fn();
-      manager.reportSuccess();
-      return result;
-    } catch (error) {
-      manager.reportError(error);
-      throw error;
+  const withRateLimit = async (fn, maxRetries = 3) => {
+    let lastError;
+    for (let attempt = 0; attempt <= maxRetries; attempt++) {
+      try {
+        await manager.getEndpointWithRateLimit(6e4);
+        const result = await fn();
+        manager.reportSuccess();
+        return result;
+      } catch (error) {
+        lastError = error;
+        const errorMsg = error?.message || String(error) || "";
+        const is429 = errorMsg.includes("429") || errorMsg.includes("rate limit") || error?.status === 429 || error?.response?.status === 429;
+        if (is429 && attempt < maxRetries) {
+          manager.reportError(error);
+          const managerState = manager.getState();
+          const provider = manager.getActiveProvider();
+          let backoff = 1e3;
+          if (provider && managerState.providers) {
+            const providerState = managerState.providers.get(provider.id);
+            if (providerState?.rateLimit?.currentBackoff) {
+              backoff = providerState.rateLimit.currentBackoff;
+            }
+          }
+          const additionalDelay = Math.min(attempt * 500, 2e3);
+          const waitTime = backoff + additionalDelay;
+          console.warn(
+            `[ProviderSystem] Rate limit error (429), retrying in ${waitTime}ms (attempt ${attempt + 1}/${maxRetries + 1})`
+          );
+          await sleep(waitTime);
+          continue;
+        }
+        manager.reportError(error);
+        throw error;
+      }
     }
+    throw lastError || new Error("Rate limit retries exhausted");
   };
   return { client, withRateLimit };
 }