ton-provider-system 0.1.7 → 0.1.9

package/dist/index.cjs

@@ -950,14 +950,25 @@ var HealthChecker = class {
   markDegraded(providerId, network, error) {
     const key = this.getResultKey(providerId, network);
     const existing = this.results.get(key);
-    if (existing) {
-      this.results.set(key, {
-        ...existing,
-        status: "degraded",
-        error: error || "Marked as degraded",
-        lastTested: /* @__PURE__ */ new Date()
-      });
-    }
+    const result = existing ? {
+      ...existing,
+      success: false,
+      // CRITICAL: Always set success: false for degraded providers
+      status: "degraded",
+      error: error || "Marked as degraded",
+      lastTested: /* @__PURE__ */ new Date()
+    } : {
+      id: providerId,
+      network,
+      success: false,
+      status: "degraded",
+      latencyMs: null,
+      seqno: null,
+      blocksBehind: 0,
+      lastTested: /* @__PURE__ */ new Date(),
+      error: error || "Marked as degraded"
+    };
+    this.results.set(key, result);
   }
   /**
    * Mark a provider as offline
@@ -965,14 +976,25 @@ var HealthChecker = class {
   markOffline(providerId, network, error) {
     const key = this.getResultKey(providerId, network);
     const existing = this.results.get(key);
-    if (existing) {
-      this.results.set(key, {
-        ...existing,
-        status: "offline",
-        error: error || "Marked as offline",
-        lastTested: /* @__PURE__ */ new Date()
-      });
-    }
+    const result = existing ? {
+      ...existing,
+      status: "offline",
+      success: false,
+      // Ensure success is false for offline providers
+      error: error || "Marked as offline",
+      lastTested: /* @__PURE__ */ new Date()
+    } : {
+      id: providerId,
+      network,
+      success: false,
+      status: "offline",
+      latencyMs: null,
+      seqno: null,
+      blocksBehind: 0,
+      lastTested: /* @__PURE__ */ new Date(),
+      error: error || "Marked as offline"
+    };
+    this.results.set(key, result);
   }
   // ========================================================================
   // Private Methods
@@ -1552,6 +1574,8 @@ var ProviderSelector = class {
     this.autoSelect = true;
     this.customEndpoint = null;
     this.bestProviderByNetwork = /* @__PURE__ */ new Map();
+    // Track currently active provider per network (the one actually being used)
+    this.activeProviderByNetwork = /* @__PURE__ */ new Map();
     this.registry = registry;
     this.healthChecker = healthChecker;
     this.config = { ...DEFAULT_CONFIG2, ...config };
@@ -1570,6 +1594,7 @@ var ProviderSelector = class {
     if (!this.autoSelect && this.selectedProviderId) {
       const provider = this.registry.getProvider(this.selectedProviderId);
       if (provider && provider.network === network) {
+        this.activeProviderByNetwork.set(network, provider.id);
         return provider;
       }
       this.logger.warn(
@@ -1580,8 +1605,13 @@ var ProviderSelector = class {
     if (cachedBestId) {
       const cached = this.registry.getProvider(cachedBestId);
       const health = this.healthChecker.getResult(cachedBestId, network);
-      if (cached && health && health.success !== false && this.config.minStatus.includes(health.status)) {
+      if (cached && health && health.success !== false && health.success !== void 0 && // Explicitly check for undefined
+      this.config.minStatus.includes(health.status)) {
+        this.activeProviderByNetwork.set(network, cachedBestId);
         return cached;
+      } else {
+        this.bestProviderByNetwork.delete(network);
+        this.activeProviderByNetwork.delete(network);
       }
     }
     return this.findBestProvider(network);
@@ -1603,10 +1633,17 @@ var ProviderSelector = class {
       const defaults = this.registry.getDefaultOrderForNetwork(network);
       for (const defaultProvider of defaults) {
         const health = this.healthChecker.getResult(defaultProvider.id, network);
-        if (!health || health.status === "untested" || health.success === true) {
+        if (!health || health.status === "untested") {
+          this.logger.warn(
+            `No healthy providers for ${network}, using untested default: ${defaultProvider.id}`
+          );
+          this.activeProviderByNetwork.set(network, defaultProvider.id);
+          return defaultProvider;
+        } else if (health.success === true) {
           this.logger.warn(
             `No healthy providers for ${network}, using default: ${defaultProvider.id}`
           );
+          this.activeProviderByNetwork.set(network, defaultProvider.id);
           return defaultProvider;
         }
       }
@@ -1616,6 +1653,7 @@ var ProviderSelector = class {
           this.logger.warn(
             `No tested healthy providers for ${network}, using untested: ${provider.id}`
           );
+          this.activeProviderByNetwork.set(network, provider.id);
           return provider;
         }
       }
@@ -1626,10 +1664,12 @@ var ProviderSelector = class {
     const bestHealth = this.healthChecker.getResult(best.id, network);
     if (bestHealth && bestHealth.success === true) {
       this.bestProviderByNetwork.set(network, best.id);
+      this.activeProviderByNetwork.set(network, best.id);
       this.logger.debug(
         `Best provider for ${network}: ${best.id} (score: ${scored[0].score.toFixed(2)})`
       );
     } else {
+      this.activeProviderByNetwork.set(network, best.id);
       this.logger.debug(
         `Best provider for ${network}: ${best.id} (score: ${scored[0].score.toFixed(2)}, untested)`
       );
@@ -1769,9 +1809,16 @@ var ProviderSelector = class {
   }
   /**
    * Clear cached best providers (forces recalculation)
+   * @param network - Optional network to clear cache for. If not provided, clears all networks.
    */
-  clearCache() {
-    this.bestProviderByNetwork.clear();
+  clearCache(network) {
+    if (network) {
+      this.bestProviderByNetwork.delete(network);
+      this.activeProviderByNetwork.delete(network);
+    } else {
+      this.bestProviderByNetwork.clear();
+      this.activeProviderByNetwork.clear();
+    }
   }
   /**
    * Update best provider after health check
@@ -1786,8 +1833,16 @@ var ProviderSelector = class {
     if (this.bestProviderByNetwork.get(network) === providerId) {
       this.bestProviderByNetwork.delete(network);
     }
+    this.activeProviderByNetwork.delete(network);
     return this.getNextProvider(network, [providerId]);
   }
+  /**
+   * Get the currently active provider ID for a network
+   * (the one that was last selected and is being used)
+   */
+  getActiveProviderId(network) {
+    return this.activeProviderByNetwork.get(network) || null;
+  }
   // ========================================================================
   // Info
   // ========================================================================
@@ -2024,6 +2079,7 @@ var _ProviderManager = class _ProviderManager {
       this.options.logger.warn("No providers available, using fallback");
       return this.getFallbackEndpoint();
     }
+    this.selector.getActiveProviderId(this.network) || this.selector.getBestProvider(this.network);
     if (provider.isDynamic && provider.type === "orbs") {
       try {
         const { getHttpEndpoint } = await import('@orbs-network/ton-access');
@@ -2039,9 +2095,14 @@ var _ProviderManager = class _ProviderManager {
    * Get endpoint with rate limiting
    *
    * Waits for rate limit token before returning endpoint.
+   * 
+   * @param forceRefresh - If true, clears cache and forces re-selection
    */
-  async getEndpointWithRateLimit(timeoutMs) {
+  async getEndpointWithRateLimit(timeoutMs, forceRefresh = false) {
     this.ensureInitialized();
+    if (forceRefresh) {
+      this.selector.clearCache(this.network);
+    }
     const provider = this.selector.getBestProvider(this.network);
     if (!provider) {
       return this.getFallbackEndpoint();
@@ -2093,15 +2154,33 @@ var _ProviderManager = class _ProviderManager {
    */
   reportError(error) {
     if (!this.initialized || !this.network) return;
-    const provider = this.selector.getBestProvider(this.network);
+    const activeProviderId = this.selector.getActiveProviderId(this.network);
+    let provider = null;
+    if (activeProviderId) {
+      provider = this.registry.getProvider(activeProviderId) || null;
+    }
+    if (!provider) {
+      provider = this.selector.getBestProvider(this.network);
+    }
     if (!provider) return;
-    const errorMsg = error instanceof Error ? error.message : error;
-    if (isRateLimitError(error)) {
+    const errorMsg = error instanceof Error ? error.message : String(error);
+    const errorMsgLower = errorMsg.toLowerCase();
+    const is429 = errorMsgLower.includes("429") || errorMsgLower.includes("rate limit");
+    const is503 = errorMsgLower.includes("503") || errorMsgLower.includes("service unavailable");
+    const is502 = errorMsgLower.includes("502") || errorMsgLower.includes("bad gateway");
+    const is404 = errorMsgLower.includes("404") || errorMsgLower.includes("not found");
+    const isTimeout = errorMsgLower.includes("timeout") || errorMsgLower.includes("abort");
+    if (isRateLimitError(error) || is429) {
       this.rateLimiter.reportRateLimitError(provider.id);
       this.healthChecker.markDegraded(provider.id, this.network, errorMsg);
+    } else if (is503 || is502 || is404 || isTimeout) {
+      this.rateLimiter.reportError(provider.id);
+      this.healthChecker.markOffline(provider.id, this.network, errorMsg);
     } else {
       this.rateLimiter.reportError(provider.id);
+      this.healthChecker.markDegraded(provider.id, this.network, errorMsg);
     }
+    this.selector.clearCache(this.network);
     this.selector.handleProviderFailure(provider.id, this.network);
     this.notifyListeners();
   }