@routstr/sdk 0.1.6 → 0.1.8

package/dist/client/index.mjs

@@ -127,6 +127,9 @@ var CashuSpender = class {
     return result;
   }
   async _getBalanceState() {
+    if (this.balanceManager) {
+      return this.balanceManager.getBalanceState();
+    }
     const mintBalances = await this.walletAdapter.getBalances();
     const units = this.walletAdapter.getMintUnits();
     let totalMintBalance = 0;
@@ -142,15 +145,16 @@ var CashuSpender = class {
     const providerBalances = {};
     let totalProviderBalance = 0;
     for (const pending of pendingDistribution) {
-      providerBalances[pending.baseUrl] = pending.amount;
+      providerBalances[pending.baseUrl] = (providerBalances[pending.baseUrl] || 0) + pending.amount;
       totalProviderBalance += pending.amount;
     }
     const apiKeys = this.storageAdapter.getAllApiKeys();
     for (const apiKey of apiKeys) {
       if (!providerBalances[apiKey.baseUrl]) {
-        providerBalances[apiKey.baseUrl] = apiKey.balance;
-        totalProviderBalance += apiKey.balance;
+        providerBalances[apiKey.baseUrl] = 0;
       }
+      providerBalances[apiKey.baseUrl] += apiKey.balance;
+      totalProviderBalance += apiKey.balance;
     }
     return {
       totalBalance: totalMintBalance + totalProviderBalance,
@@ -299,25 +303,12 @@ var CashuSpender = class {
         `[CashuSpender] _spendInternal: Could not reuse token, will create new token`
       );
     }
-    const balances = await this.walletAdapter.getBalances();
-    const units = this.walletAdapter.getMintUnits();
-    let totalBalance = 0;
-    for (const url in balances) {
-      const balance = balances[url];
-      const unit = units[url];
-      const balanceInSats = getBalanceInSats(balance, unit);
-      totalBalance += balanceInSats;
-    }
-    const pendingDistribution = this.storageAdapter.getCachedTokenDistribution();
-    const totalPending = pendingDistribution.reduce(
-      (sum, item) => sum + item.amount,
-      0
-    );
+    const balanceState = await this._getBalanceState();
+    const totalAvailableBalance = balanceState.totalBalance;
     this._log(
       "DEBUG",
-      `[CashuSpender] _spendInternal: totalBalance=${totalBalance}, totalPending=${totalPending}, adjustedAmount=${adjustedAmount}`
+      `[CashuSpender] _spendInternal: totalAvailableBalance=${totalAvailableBalance}, adjustedAmount=${adjustedAmount}`
     );
-    const totalAvailableBalance = totalBalance + totalPending;
     if (totalAvailableBalance < adjustedAmount) {
       this._log(
         "ERROR",
@@ -325,8 +316,7 @@ var CashuSpender = class {
       );
       return this._createInsufficientBalanceError(
         adjustedAmount,
-        balances,
-        units,
+        balanceState.mintBalances,
         totalAvailableBalance
       );
     }
@@ -346,8 +336,7 @@ var CashuSpender = class {
         if ((tokenResult.error || "").includes("Insufficient balance")) {
           return this._createInsufficientBalanceError(
             adjustedAmount,
-            balances,
-            units,
+            balanceState.mintBalances,
             totalAvailableBalance
           );
         }
@@ -392,6 +381,7 @@ var CashuSpender = class {
       "DEBUG",
       `[CashuSpender] _spendInternal: Successfully spent ${spentAmount}, returning token with balance=${spentAmount}`
     );
+    const units = this.walletAdapter.getMintUnits();
     return {
       token,
       status: "success",
@@ -529,13 +519,11 @@ var CashuSpender = class {
   /**
    * Create an insufficient balance error result
    */
-  _createInsufficientBalanceError(required, balances, units, availableBalance) {
+  _createInsufficientBalanceError(required, normalizedBalances, availableBalance) {
     let maxBalance = 0;
     let maxMintUrl = "";
-    for (const mintUrl in balances) {
-      const balance = balances[mintUrl];
-      const unit = units[mintUrl];
-      const balanceInSats = getBalanceInSats(balance, unit);
+    for (const mintUrl in normalizedBalances) {
+      const balanceInSats = normalizedBalances[mintUrl];
       if (balanceInSats > maxBalance) {
         maxBalance = balanceInSats;
         maxMintUrl = mintUrl;
@@ -596,6 +584,39 @@ var BalanceManager = class {
     }
   }
   cashuSpender;
+  async getBalanceState() {
+    const mintBalances = await this.walletAdapter.getBalances();
+    const units = this.walletAdapter.getMintUnits();
+    let totalMintBalance = 0;
+    const normalizedMintBalances = {};
+    for (const url in mintBalances) {
+      const balance = mintBalances[url];
+      const unit = units[url];
+      const balanceInSats = getBalanceInSats(balance, unit);
+      normalizedMintBalances[url] = balanceInSats;
+      totalMintBalance += balanceInSats;
+    }
+    const pendingDistribution = this.storageAdapter.getCachedTokenDistribution();
+    const providerBalances = {};
+    let totalProviderBalance = 0;
+    for (const pending of pendingDistribution) {
+      providerBalances[pending.baseUrl] = (providerBalances[pending.baseUrl] || 0) + pending.amount;
+      totalProviderBalance += pending.amount;
+    }
+    const apiKeys = this.storageAdapter.getAllApiKeys();
+    for (const apiKey of apiKeys) {
+      if (!providerBalances[apiKey.baseUrl]) {
+        providerBalances[apiKey.baseUrl] = 0;
+      }
+      providerBalances[apiKey.baseUrl] += apiKey.balance;
+      totalProviderBalance += apiKey.balance;
+    }
+    return {
+      totalBalance: totalMintBalance + totalProviderBalance,
+      providerBalances,
+      mintBalances: normalizedMintBalances
+    };
+  }
   /**
    * Unified refund - handles both NIP-60 and legacy wallet refunds
    */
@@ -825,17 +846,17 @@ var BalanceManager = class {
     if (!adjustedAmount || isNaN(adjustedAmount)) {
       return { success: false, error: "Invalid top up amount" };
     }
+    const balanceState = await this.getBalanceState();
     const balances = await this.walletAdapter.getBalances();
     const units = this.walletAdapter.getMintUnits();
-    let totalMintBalance = 0;
-    for (const url in balances) {
-      const unit = units[url];
-      const balanceInSats = getBalanceInSats(balances[url], unit);
-      totalMintBalance += balanceInSats;
-    }
-    const pendingDistribution = this.storageAdapter.getCachedTokenDistribution();
-    const refundablePending = pendingDistribution.filter((entry) => entry.baseUrl !== baseUrl).reduce((sum, entry) => sum + entry.amount, 0);
-    if (totalMintBalance < adjustedAmount && totalMintBalance + refundablePending >= adjustedAmount && retryCount < 1) {
+    const totalMintBalance = Object.values(balanceState.mintBalances).reduce(
+      (sum, value) => sum + value,
+      0
+    );
+    const refundableProviderBalance = Object.entries(
+      balanceState.providerBalances
+    ).filter(([providerBaseUrl]) => providerBaseUrl !== baseUrl).reduce((sum, [, value]) => sum + value, 0);
+    if (totalMintBalance < adjustedAmount && totalMintBalance + refundableProviderBalance >= adjustedAmount && retryCount < 1) {
       await this._refundOtherProvidersForTopUp(baseUrl, mintUrl);
       return this.createProviderToken({
         ...options,
@@ -957,10 +978,14 @@ var BalanceManager = class {
   }
   async _refundOtherProvidersForTopUp(baseUrl, mintUrl) {
     const pendingDistribution = this.storageAdapter.getCachedTokenDistribution();
+    const apiKeyDistribution = this.storageAdapter.getApiKeyDistribution();
     const toRefund = pendingDistribution.filter(
       (pending) => pending.baseUrl !== baseUrl
     );
-    const refundResults = await Promise.allSettled(
+    const apiKeysToRefund = apiKeyDistribution.filter(
+      (apiKey) => apiKey.baseUrl !== baseUrl && apiKey.amount > 0
+    );
+    const tokenRefundResults = await Promise.allSettled(
       toRefund.map(async (pending) => {
         const token = this.storageAdapter.getToken(pending.baseUrl);
         if (!token) {
@@ -978,11 +1003,32 @@ var BalanceManager = class {
         return { baseUrl: pending.baseUrl, success: result.success };
       })
     );
-    for (const result of refundResults) {
+    for (const result of tokenRefundResults) {
       if (result.status === "fulfilled" && result.value.success) {
         this.storageAdapter.removeToken(result.value.baseUrl);
       }
     }
+    const apiKeyRefundResults = await Promise.allSettled(
+      apiKeysToRefund.map(async (apiKeyEntry) => {
+        const fullApiKeyEntry = this.storageAdapter.getApiKey(
+          apiKeyEntry.baseUrl
+        );
+        if (!fullApiKeyEntry) {
+          return { baseUrl: apiKeyEntry.baseUrl, success: false };
+        }
+        const result = await this.refundApiKey({
+          mintUrl,
+          baseUrl: apiKeyEntry.baseUrl,
+          apiKey: fullApiKeyEntry.key
+        });
+        return { baseUrl: apiKeyEntry.baseUrl, success: result.success };
+      })
+    );
+    for (const result of apiKeyRefundResults) {
+      if (result.status === "fulfilled" && result.value.success) {
+        this.storageAdapter.updateApiKeyBalance(result.value.baseUrl, 0);
+      }
+    }
   }
   /**
    * Fetch refund token from provider API
@@ -1181,6 +1227,14 @@ var BalanceManager = class {
         console.log(response.status);
         const data = await response.json();
         console.log("FAILED ", data);
+        const isInvalidApiKey = response.status === 401 && data?.code === "invalid_api_key" && data?.message?.includes("proofs already spent");
+        return {
+          amount: -1,
+          reserved: data.reserved ?? 0,
+          unit: "msat",
+          apiKey: data.api_key,
+          isInvalidApiKey
+        };
       }
     } catch (error) {
       console.error("ERRORR IN RESTPONSE", error);
@@ -2073,7 +2127,8 @@ var RoutstrClient = class {
           response.status,
           requestId,
           this.mode === "xcashu" ? response.headers.get("x-cashu") ?? void 0 : void 0,
-          bodyText
+          bodyText,
+          params.retryCount ?? 0
         );
       }
       return response;
@@ -2082,8 +2137,12 @@ var RoutstrClient = class {
         return await this._handleErrorResponse(
           params,
           token,
-          -1
+          -1,
           // just for Network Error to skip all statuses
+          void 0,
+          void 0,
+          void 0,
+          params.retryCount ?? 0
         );
       }
       throw error;
@@ -2092,7 +2151,8 @@ var RoutstrClient = class {
   /**
    * Handle error responses with failover
    */
-  async _handleErrorResponse(params, token, status, requestId, xCashuRefundToken, responseBody) {
+  async _handleErrorResponse(params, token, status, requestId, xCashuRefundToken, responseBody, retryCount = 0) {
+    const MAX_RETRIES_PER_PROVIDER = 2;
     const { path, method, body, selectedModel, baseUrl, mintUrl } = params;
     let tryNextProvider = false;
     this._log(
@@ -2163,10 +2223,34 @@ var RoutstrClient = class {
       }
     }
     if (status === 402 && !tryNextProvider && (this.mode === "apikeys" || this.mode === "lazyrefund")) {
+      this.storageAdapter.getApiKey(baseUrl);
+      let topupAmount = params.requiredSats;
+      try {
+        let currentBalance = 0;
+        if (this.mode === "apikeys") {
+          const currentBalanceInfo = await this.balanceManager.getTokenBalance(
+            params.token,
+            baseUrl
+          );
+          currentBalance = currentBalanceInfo.unit === "msat" ? currentBalanceInfo.amount / 1e3 : currentBalanceInfo.amount;
+        } else if (this.mode === "lazyrefund") {
+          const distribution = this.storageAdapter.getCachedTokenDistribution();
+          const tokenEntry = distribution.find((t) => t.baseUrl === baseUrl);
+          currentBalance = tokenEntry?.amount ?? 0;
+        }
+        const shortfall = Math.max(0, params.requiredSats - currentBalance);
+        topupAmount = shortfall > 0 ? shortfall : params.requiredSats;
+      } catch (e) {
+        this._log(
+          "WARN",
+          "Could not get current token balance for topup calculation:",
+          e
+        );
+      }
       const topupResult = await this.balanceManager.topUp({
         mintUrl,
         baseUrl,
-        amount: params.requiredSats * TOPUP_MARGIN,
+        amount: topupAmount * TOPUP_MARGIN,
         token: params.token
       });
       this._log(
@@ -2198,12 +2282,26 @@ var RoutstrClient = class {
           `[RoutstrClient] _handleErrorResponse: Topup successful, will retry with new token`
         );
       }
-      if (!tryNextProvider)
-        return this._makeRequest({
-          ...params,
-          token: params.token,
-          headers: this._withAuthHeader(params.baseHeaders, params.token)
-        });
+      if (!tryNextProvider) {
+        if (retryCount < MAX_RETRIES_PER_PROVIDER) {
+          this._log(
+            "DEBUG",
+            `[RoutstrClient] _handleErrorResponse: Retrying 402 (attempt ${retryCount + 1}/${MAX_RETRIES_PER_PROVIDER})`
+          );
+          return this._makeRequest({
+            ...params,
+            token: params.token,
+            headers: this._withAuthHeader(params.baseHeaders, params.token),
+            retryCount: retryCount + 1
+          });
+        } else {
+          this._log(
+            "DEBUG",
+            `[RoutstrClient] _handleErrorResponse: 402 retry limit reached (${retryCount}/${MAX_RETRIES_PER_PROVIDER}), failing over to next provider`
+          );
+          tryNextProvider = true;
+        }
+      }
     }
     const isInsufficientBalance413 = status === 413 && responseBody?.includes("Insufficient balance");
     if (isInsufficientBalance413 && !tryNextProvider && this.mode === "apikeys") {
@@ -2213,19 +2311,31 @@ var RoutstrClient = class {
           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);
+        if (latestBalanceInfo.isInvalidApiKey) {
+          this._log(
+            "DEBUG",
+            `[RoutstrClient] _handleErrorResponse: Invalid API key (proofs already spent), removing for ${baseUrl}`
+          );
+          this.storageAdapter.removeApiKey(baseUrl);
+          tryNextProvider = true;
+        } else {
+          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);
             }
-            this.storageAdapter.setApiKey(baseUrl, latestBalanceInfo.apiKey);
+            retryToken = latestBalanceInfo.apiKey;
+          }
+          if (latestTokenBalance >= 0) {
+            this.storageAdapter.updateApiKeyBalance(
+              baseUrl,
+              latestTokenBalance
+            );
           }
-          retryToken = latestBalanceInfo.apiKey;
-        }
-        if (latestTokenBalance >= 0) {
-          this.storageAdapter.updateApiKeyBalance(baseUrl, latestTokenBalance);
         }
       } catch (error) {
         this._log(
@@ -2234,11 +2344,24 @@ var RoutstrClient = class {
           error
         );
       }
-      return this._makeRequest({
-        ...params,
-        token: retryToken,
-        headers: this._withAuthHeader(params.baseHeaders, retryToken)
-      });
+      if (retryCount < MAX_RETRIES_PER_PROVIDER) {
+        this._log(
+          "DEBUG",
+          `[RoutstrClient] _handleErrorResponse: Retrying 413 (attempt ${retryCount + 1}/${MAX_RETRIES_PER_PROVIDER})`
+        );
+        return this._makeRequest({
+          ...params,
+          token: retryToken,
+          headers: this._withAuthHeader(params.baseHeaders, retryToken),
+          retryCount: retryCount + 1
+        });
+      } else {
+        this._log(
+          "DEBUG",
+          `[RoutstrClient] _handleErrorResponse: 413 retry limit reached (${retryCount}/${MAX_RETRIES_PER_PROVIDER}), failing over to next provider`
+        );
+        tryNextProvider = true;
+      }
     }
     if ((status === 401 || status === 403 || status === 413 || status === 400 || status === 500 || status === 502 || status === 503 || status === 504 || status === 521) && !tryNextProvider) {
       this._log(
@@ -2354,7 +2477,8 @@ var RoutstrClient = class {
         selectedModel: newModel,
         token: spendResult.token,
         requiredSats: newRequiredSats,
-        headers: this._withAuthHeader(params.baseHeaders, spendResult.token)
+        headers: this._withAuthHeader(params.baseHeaders, spendResult.token),
+        retryCount: 0
       });
     }
     throw new FailoverError(baseUrl, Array.from(this.providerManager));