@routstr/sdk 0.1.4 → 0.1.6

package/dist/index.mjs

@@ -123,7 +123,7 @@ var ModelManager = class _ModelManager {
     const manager = new _ModelManager(adapter, config);
     const torMode = options.torMode ?? false;
     const forceRefresh = options.forceRefresh ?? false;
-    const providers = await manager.bootstrapProviders(torMode);
+    const providers = await manager.bootstrapProviders(torMode, forceRefresh);
     await manager.fetchModels(providers, forceRefresh);
     return manager;
   }
@@ -131,17 +131,20 @@ var ModelManager = class _ModelManager {
    * Bootstrap provider list from the provider directory
    * First tries to fetch from Nostr (kind 30421), falls back to HTTP
    * @param torMode Whether running in Tor context
+   * @param forceRefresh Ignore provider cache and refresh provider sources
    * @returns Array of provider base URLs
    * @throws ProviderBootstrapError if all providers fail to fetch
    */
-  async bootstrapProviders(torMode = false) {
-    const cachedUrls = this.adapter.getBaseUrlsList();
-    if (cachedUrls.length > 0) {
-      const lastUpdate = this.adapter.getBaseUrlsLastUpdate();
-      const cacheValid = lastUpdate && Date.now() - lastUpdate <= this.cacheTTL;
-      if (cacheValid) {
-        await this.fetchRoutstr21Models();
-        return this.filterBaseUrlsForTor(cachedUrls, torMode);
+  async bootstrapProviders(torMode = false, forceRefresh = false) {
+    if (!forceRefresh) {
+      const cachedUrls = this.adapter.getBaseUrlsList();
+      if (cachedUrls.length > 0) {
+        const lastUpdate = this.adapter.getBaseUrlsLastUpdate();
+        const cacheValid = lastUpdate && Date.now() - lastUpdate <= this.cacheTTL;
+        if (cacheValid) {
+          await this.fetchRoutstr21Models(forceRefresh);
+          return this.filterBaseUrlsForTor(cachedUrls, torMode);
+        }
       }
     }
     try {
@@ -150,13 +153,13 @@ var ModelManager = class _ModelManager {
         const filtered = this.filterBaseUrlsForTor(nostrProviders, torMode);
         this.adapter.setBaseUrlsList(filtered);
         this.adapter.setBaseUrlsLastUpdate(Date.now());
-        await this.fetchRoutstr21Models();
+        await this.fetchRoutstr21Models(forceRefresh);
         return filtered;
       }
     } catch (e) {
       console.warn("Nostr bootstrap failed, falling back to HTTP:", e);
     }
-    return this.bootstrapFromHttp(torMode);
+    return this.bootstrapFromHttp(torMode, forceRefresh);
   }
   /**
    * Bootstrap providers from Nostr network (kind 30421)
@@ -252,9 +255,10 @@ var ModelManager = class _ModelManager {
   /**
    * Bootstrap providers from HTTP endpoint
    * @param torMode Whether running in Tor context
+   * @param forceRefresh Ignore routstr21 cache and fetch fresh data
    * @returns Array of provider base URLs
    */
-  async bootstrapFromHttp(torMode) {
+  async bootstrapFromHttp(torMode, forceRefresh = false) {
     try {
       const res = await fetch(this.providerDirectoryUrl);
       if (!res.ok) {
@@ -282,7 +286,7 @@ var ModelManager = class _ModelManager {
       if (list.length > 0) {
         this.adapter.setBaseUrlsList(list);
         this.adapter.setBaseUrlsLastUpdate(Date.now());
-        await this.fetchRoutstr21Models();
+        await this.fetchRoutstr21Models(forceRefresh);
       }
       return list;
     } catch (e) {
@@ -1314,6 +1318,9 @@ var BalanceManager = class {
         fetchResult.token
       );
       const totalAmountMsat = receiveResult.unit === "msat" ? receiveResult.amount : receiveResult.amount * 1e3;
+      if (receiveResult.success) {
+        this.storageAdapter.removeApiKey(baseUrl);
+      }
       return {
         success: receiveResult.success,
         refundedAmount: totalAmountMsat,
@@ -2450,7 +2457,7 @@ var ProviderManager = class {
 };
 
 // client/RoutstrClient.ts
-var TOPUP_MARGIN = 0.7;
+var TOPUP_MARGIN = 1.2;
 var RoutstrClient = class {
   constructor(walletAdapter, storageAdapter, providerRegistry, alertLevel, mode = "xcashu") {
     this.walletAdapter = walletAdapter;
@@ -2850,8 +2857,7 @@ var RoutstrClient = class {
           );
       }
     }
-    if ((status === 402 || status === 413 && responseBody?.includes("Insufficient balance")) && !tryNextProvider && (this.mode === "apikeys" || this.mode === "lazyrefund")) {
-      console.log("RESPONSFE ", responseBody);
+    if (status === 402 && !tryNextProvider && (this.mode === "apikeys" || this.mode === "lazyrefund")) {
       const topupResult = await this.balanceManager.topUp({
         mintUrl,
         baseUrl,
@@ -2894,6 +2900,41 @@ var RoutstrClient = class {
           headers: this._withAuthHeader(params.baseHeaders, params.token)
         });
     }
+    const isInsufficientBalance413 = status === 413 && responseBody?.includes("Insufficient balance");
+    if (isInsufficientBalance413 && !tryNextProvider && this.mode === "apikeys") {
+      let retryToken = params.token;
+      try {
+        const latestBalanceInfo = await this.balanceManager.getTokenBalance(
+          params.token,
+          baseUrl
+        );
+        const latestTokenBalance = latestBalanceInfo.unit === "msat" ? latestBalanceInfo.amount / 1e3 : latestBalanceInfo.amount;
+        if (latestBalanceInfo.apiKey) {
+          const storedApiKeyEntry = this.storageAdapter.getApiKey(baseUrl);
+          if (storedApiKeyEntry?.key !== latestBalanceInfo.apiKey) {
+            if (storedApiKeyEntry) {
+              this.storageAdapter.removeApiKey(baseUrl);
+            }
+            this.storageAdapter.setApiKey(baseUrl, latestBalanceInfo.apiKey);
+          }
+          retryToken = latestBalanceInfo.apiKey;
+        }
+        if (latestTokenBalance >= 0) {
+          this.storageAdapter.updateApiKeyBalance(baseUrl, latestTokenBalance);
+        }
+      } catch (error) {
+        this._log(
+          "WARN",
+          `[RoutstrClient] _handleErrorResponse: Failed to refresh API key after 413 insufficient balance for ${baseUrl}`,
+          error
+        );
+      }
+      return this._makeRequest({
+        ...params,
+        token: retryToken,
+        headers: this._withAuthHeader(params.baseHeaders, retryToken)
+      });
+    }
     if ((status === 401 || status === 403 || status === 413 || status === 400 || status === 500 || status === 502 || status === 503 || status === 504 || status === 521) && !tryNextProvider) {
       this._log(
         "DEBUG",
@@ -2954,8 +2995,6 @@ var RoutstrClient = class {
             status,
             refundResult.message ?? "Unknown error"
           );
-        } else {
-          this.storageAdapter.removeApiKey(baseUrl);
         }
       }
     }
@@ -3054,7 +3093,11 @@ var RoutstrClient = class {
           baseUrl
         );
         const latestTokenBalance = latestBalanceInfo.unit === "msat" ? latestBalanceInfo.amount / 1e3 : latestBalanceInfo.amount;
-        this.storageAdapter.updateChildKeyBalance(baseUrl, latestTokenBalance);
+        const storedApiKeyEntry = this.storageAdapter.getApiKey(baseUrl);
+        if (storedApiKeyEntry?.key.startsWith("cashu") && latestBalanceInfo.apiKey) {
+          this.storageAdapter.removeApiKey(baseUrl);
+          this.storageAdapter.setApiKey(baseUrl, latestBalanceInfo.apiKey);
+        }
         this.storageAdapter.updateApiKeyBalance(baseUrl, latestTokenBalance);
         satsSpent = initialTokenBalance - latestTokenBalance;
       } catch (e) {