@routstr/sdk 0.2.6 → 0.2.8

package/dist/wallet/index.mjs

@@ -1,3 +1,5 @@
+import { getDecodedToken } from '@cashu/cashu-ts';
+
 // core/errors.ts
 var InsufficientBalanceError = class extends Error {
   constructor(required, available, maxMintBalance = 0, maxMintUrl = "", customMessage) {
@@ -75,8 +77,6 @@ function selectMintWithBalance(balances, units, amount, excludeMints = []) {
   }
   return { selectedMintUrl: null, selectedMintBalance: 0 };
 }
-
-// wallet/CashuSpender.ts
 var CashuSpender = class {
   constructor(walletAdapter, storageAdapter, _providerRegistry, balanceManager) {
     this.walletAdapter = walletAdapter;
@@ -87,23 +87,43 @@ var CashuSpender = class {
   _isBusy = false;
   debugLevel = "WARN";
   async receiveToken(token) {
-    const result = await this.walletAdapter.receiveToken(token);
-    if (!result.success && result.message?.includes("Failed to fetch mint")) {
-      const cachedTokens = this.storageAdapter.getCachedReceiveTokens();
-      const existingIndex = cachedTokens.findIndex((t) => t.token === token);
-      if (existingIndex === -1) {
-        this.storageAdapter.setCachedReceiveTokens([
-          ...cachedTokens,
-          {
-            token,
-            amount: result.amount,
-            unit: result.unit,
-            createdAt: Date.now()
-          }
-        ]);
+    try {
+      const result = await this.walletAdapter.receiveToken(token);
+      return result;
+    } catch (error) {
+      const errorMessage = error instanceof Error ? error.message : String(error);
+      if (errorMessage.includes("Failed to fetch mint")) {
+        const cachedTokens = this.storageAdapter.getCachedReceiveTokens();
+        const existingIndex = cachedTokens.findIndex((t) => t.token === token);
+        if (existingIndex === -1) {
+          const { amount: amount2, unit: unit2 } = this._decodeTokenAmount(token);
+          this.storageAdapter.setCachedReceiveTokens([
+            ...cachedTokens,
+            {
+              token,
+              amount: amount2,
+              unit: unit2,
+              createdAt: Date.now()
+            }
+          ]);
+        }
       }
+      const { amount, unit } = this._decodeTokenAmount(token);
+      return { success: false, amount, unit, message: errorMessage };
+    }
+  }
+  _decodeTokenAmount(token) {
+    try {
+      const decoded = getDecodedToken(token);
+      const amount = decoded.proofs.reduce(
+        (acc, proof) => acc + proof.amount,
+        0
+      );
+      const unit = decoded.unit || "sat";
+      return { amount, unit };
+    } catch {
+      return { amount: 0, unit: "sat" };
     }
-    return result;
   }
   async _getBalanceState() {
     if (this.balanceManager) {
@@ -423,8 +443,9 @@ var CashuSpender = class {
     return null;
   }
   /**
-   * Refund all xcashu tokens from storage and increment tryCounts on failure.
-   * Reuses receiveToken from BalanceManager/CashuSpender for receiving refunds.
+   * Refund all xcashu tokens from storage by calling the provider's refund endpoint.
+   * The xcashu token acts as an API key to claim the refund, and the response contains
+   * the actual refunded Cashu token which is then received into the wallet.
    * @param mintUrl - The mint URL for receiving tokens
    * @param excludeBaseUrls - Base URLs to exclude from refund (optional)
    * @returns Results for each xcashu token refund attempt
@@ -437,7 +458,20 @@ var CashuSpender = class {
       if (excludedUrls.has(baseUrl)) continue;
       for (const xcashuToken of tokens) {
         try {
-          const receiveResult = await this.receiveToken(xcashuToken.token);
+          if (!this.balanceManager) {
+            throw new Error("BalanceManager not available for xcashu refund");
+          }
+          const fetchResult = await this.balanceManager.fetchRefundToken(
+            baseUrl,
+            xcashuToken.token,
+            true
+          );
+          if (!fetchResult.success || !fetchResult.token) {
+            throw new Error(
+              fetchResult.error || "Failed to fetch refund token from provider"
+            );
+          }
+          const receiveResult = await this.receiveToken(fetchResult.token);
           if (receiveResult.success) {
             this.storageAdapter.removeXcashuToken(baseUrl, xcashuToken.token);
             results.push({
@@ -452,7 +486,10 @@ var CashuSpender = class {
           } else {
             const currentTryCount = xcashuToken.tryCount ?? 0;
             const newTryCount = currentTryCount + 1;
-            this.storageAdapter.updateXcashuTokenTryCount(xcashuToken.token, newTryCount);
+            this.storageAdapter.updateXcashuTokenTryCount(
+              xcashuToken.token,
+              newTryCount
+            );
             results.push({
               baseUrl,
               token: xcashuToken.token,
@@ -461,13 +498,16 @@ var CashuSpender = class {
             });
             this._log(
               "DEBUG",
-              `[CashuSpender] refundXcashuTokens: Failed to refund xcashu token for ${baseUrl}, incremented tryCount to ${newTryCount}`
+              `[CashuSpender] refundXcashuTokens: Failed to receive refund token for ${baseUrl}, incremented tryCount to ${newTryCount}: ${receiveResult.message}`
             );
           }
         } catch (error) {
           const currentTryCount = xcashuToken.tryCount ?? 0;
           const newTryCount = currentTryCount + 1;
-          this.storageAdapter.updateXcashuTokenTryCount(xcashuToken.token, newTryCount);
+          this.storageAdapter.updateXcashuTokenTryCount(
+            xcashuToken.token,
+            newTryCount
+          );
           const errorMessage = error instanceof Error ? error.message : String(error);
           results.push({
             baseUrl,
@@ -504,7 +544,10 @@ var CashuSpender = class {
         if (refundResult.success) {
           this.storageAdapter.removeApiKey(apiKeyEntry.baseUrl);
         } else {
-          this.storageAdapter.updateApiKeyBalance(apiKeyEntry.baseUrl, apiKeyEntry.amount);
+          this.storageAdapter.updateApiKeyBalance(
+            apiKeyEntry.baseUrl,
+            apiKeyEntry.amount
+          );
         }
         results.push({
           baseUrl: apiKeyEntry.baseUrl,
@@ -642,7 +685,7 @@ var BalanceManager = class {
     }
     let fetchResult;
     try {
-      fetchResult = await this._fetchRefundTokenWithApiKey(baseUrl, apiKey);
+      fetchResult = await this.fetchRefundToken(baseUrl, apiKey);
       if (!fetchResult.success) {
         return {
           success: false,
@@ -670,6 +713,7 @@ var BalanceManager = class {
       return {
         success: receiveResult.success,
         refundedAmount: totalAmountMsat,
+        message: receiveResult.message,
         requestId: fetchResult.requestId
       };
     } catch (error) {
@@ -678,9 +722,9 @@ var BalanceManager = class {
     }
   }
   /**
-   * Fetch refund token from provider API using API key authentication
+   * Fetch refund token from provider API using API key (or xcashu token) authentication
    */
-  async _fetchRefundTokenWithApiKey(baseUrl, apiKey) {
+  async fetchRefundToken(baseUrl, apiKeyOrToken, xCashu = false) {
     if (!baseUrl) {
       return {
         success: false,
@@ -694,12 +738,17 @@ var BalanceManager = class {
       controller.abort();
     }, 6e4);
     try {
+      const headers = {
+        "Content-Type": "application/json"
+      };
+      if (xCashu) {
+        headers["X-Cashu"] = apiKeyOrToken;
+      } else {
+        headers["Authorization"] = `Bearer ${apiKeyOrToken}`;
+      }
       const response = await fetch(url, {
         method: "POST",
-        headers: {
-          Authorization: `Bearer ${apiKey}`,
-          "Content-Type": "application/json"
-        },
+        headers,
         signal: controller.signal
       });
       clearTimeout(timeoutId);
@@ -720,10 +769,7 @@ var BalanceManager = class {
       };
     } catch (error) {
       clearTimeout(timeoutId);
-      console.error(
-        "[BalanceManager._fetchRefundTokenWithApiKey] Fetch error",
-        error
-      );
+      console.error("[BalanceManager.fetchRefundToken] Fetch error", error);
       if (error instanceof Error) {
         if (error.name === "AbortError") {
           return {
@@ -770,11 +816,7 @@ var BalanceManager = class {
         };
       }
       cashuToken = tokenResult.token;
-      const topUpResult = await this._postTopUp(
-        baseUrl,
-        apiKey,
-        cashuToken
-      );
+      const topUpResult = await this._postTopUp(baseUrl, apiKey, cashuToken);
       requestId = topUpResult.requestId;
       console.log(topUpResult);
       if (!topUpResult.success) {
@@ -1140,7 +1182,7 @@ 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");
+        const isInvalidApiKey = response.status === 401 && data?.detail?.error?.code === "invalid_api_key" && data?.detail?.error?.message?.includes("proofs already spent");
         return {
           amount: -1,
           reserved: data.reserved ?? 0,