@routstr/sdk 0.1.6 → 0.1.7

package/dist/index.mjs

@@ -1820,6 +1820,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);
@@ -2768,7 +2776,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;
@@ -2777,8 +2786,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;
@@ -2787,7 +2800,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(
@@ -2893,12 +2907,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") {
@@ -2908,19 +2936,28 @@ 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(
@@ -2929,11 +2966,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(
@@ -3049,7 +3099,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));
@@ -3684,7 +3735,7 @@ var SDK_STORAGE_KEYS = {
 
 // storage/store.ts
 var normalizeBaseUrl = (baseUrl) => baseUrl.endsWith("/") ? baseUrl : `${baseUrl}/`;
-var getTokenBalance = (token) => {
+var getCashuTokenBalance = (token) => {
   try {
     const decoded = getDecodedToken(token);
     const unitDivisor = decoded.unit === "msat" ? 1e3 : 1;
@@ -3777,7 +3828,7 @@ var createSdkStore = async ({
   const cachedTokens = rawCachedTokens.map((entry) => ({
     ...entry,
     baseUrl: normalizeBaseUrl(entry.baseUrl),
-    balance: typeof entry.balance === "number" ? entry.balance : getTokenBalance(entry.token),
+    balance: typeof entry.balance === "number" ? entry.balance : getCashuTokenBalance(entry.token),
     lastUsed: entry.lastUsed ?? null
   }));
   const apiKeys = rawApiKeys.map((entry) => ({
@@ -3881,7 +3932,7 @@ var createSdkStore = async ({
         const normalized = updates.map((entry) => ({
           ...entry,
           baseUrl: normalizeBaseUrl(entry.baseUrl),
-          balance: typeof entry.balance === "number" ? entry.balance : getTokenBalance(entry.token),
+          balance: typeof entry.balance === "number" ? entry.balance : getCashuTokenBalance(entry.token),
           lastUsed: entry.lastUsed ?? null
         }));
         void driver.setItem(SDK_STORAGE_KEYS.LOCAL_CASHU_TOKENS, normalized);
@@ -3980,7 +4031,7 @@ var createStorageAdapterFromStore = (store) => ({
   setToken: (baseUrl, token) => {
     const normalized = normalizeBaseUrl(baseUrl);
     const tokens = store.getState().cachedTokens;
-    const balance = getTokenBalance(token);
+    const balance = getCashuTokenBalance(token);
     const existingIndex = tokens.findIndex(
       (entry) => entry.baseUrl === normalized
     );