@routstr/sdk 0.2.7 → 0.2.8

package/dist/index.js

@@ -3,6 +3,7 @@
 var applesauceRelay = require('applesauce-relay');
 var applesauceCore = require('applesauce-core');
 var rxjs = require('rxjs');
+var cashuTs = require('@cashu/cashu-ts');
 var vanilla = require('zustand/vanilla');
 var stream = require('stream');
 
@@ -735,8 +736,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;
@@ -747,23 +746,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 = cashuTs.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) {
@@ -1138,7 +1157,7 @@ var CashuSpender = class {
             });
             this._log(
               "DEBUG",
-              `[CashuSpender] refundXcashuTokens: Failed to receive refund token for ${baseUrl}, incremented tryCount to ${newTryCount}`
+              `[CashuSpender] refundXcashuTokens: Failed to receive refund token for ${baseUrl}, incremented tryCount to ${newTryCount}: ${receiveResult.message}`
             );
           }
         } catch (error) {
@@ -1353,6 +1372,7 @@ var BalanceManager = class {
       return {
         success: receiveResult.success,
         refundedAmount: totalAmountMsat,
+        message: receiveResult.message,
         requestId: fetchResult.requestId
       };
     } catch (error) {
@@ -4983,19 +5003,19 @@ var RoutstrClient = class {
       `[RoutstrClient] _handleErrorResponse: Attempting to receive/restore token for ${baseUrl}`
     );
     if (params.token.startsWith("cashu")) {
-      const tryReceiveTokenResult = await this.cashuSpender.receiveToken(
+      const receiveResult = await this.cashuSpender.receiveToken(
         params.token
       );
-      if (tryReceiveTokenResult.success) {
+      if (receiveResult.success) {
         this._log(
           "DEBUG",
-          `[RoutstrClient] _handleErrorResponse: Token restored successfully, amount=${tryReceiveTokenResult.amount}`
+          `[RoutstrClient] _handleErrorResponse: Token restored successfully, amount=${receiveResult.amount}`
         );
         tryNextProvider = true;
       } else {
         this._log(
           "DEBUG",
-          `[RoutstrClient] _handleErrorResponse: Failed to receive token. `
+          `[RoutstrClient] _handleErrorResponse: Failed to receive token: ${receiveResult.message}`
         );
       }
     }
@@ -5005,23 +5025,18 @@ var RoutstrClient = class {
           "DEBUG",
           `[RoutstrClient] _handleErrorResponse: Attempting to receive xcashu refund token, preview=${xCashuRefundToken.substring(0, 20)}...`
         );
-        try {
-          const receiveResult = await this.cashuSpender.receiveToken(xCashuRefundToken);
-          if (receiveResult.success) {
-            this._log(
-              "DEBUG",
-              `[RoutstrClient] _handleErrorResponse: xcashu refund received, amount=${receiveResult.amount}`
-            );
-            tryNextProvider = true;
-          } else
-            throw new ProviderError(
-              baseUrl,
-              status,
-              "xcashu refund failed",
-              requestId
-            );
-        } catch (error) {
-          this._log("ERROR", "[xcashu] Failed to receive refund token:", error);
+        const receiveResult = await this.cashuSpender.receiveToken(xCashuRefundToken);
+        if (receiveResult.success) {
+          this._log(
+            "DEBUG",
+            `[RoutstrClient] _handleErrorResponse: xcashu refund received, amount=${receiveResult.amount}`
+          );
+          tryNextProvider = true;
+        } else {
+          this._log(
+            "ERROR",
+            `[xcashu] Failed to receive refund token: ${receiveResult.message}`
+          );
           throw new ProviderError(
             baseUrl,
             status,
@@ -5314,14 +5329,15 @@ var RoutstrClient = class {
     if (this.mode === "xcashu" && response) {
       const refundToken = response.headers.get("x-cashu") ?? void 0;
       if (refundToken) {
-        try {
-          const receiveResult = await this.cashuSpender.receiveToken(refundToken);
-          if (receiveResult.success) {
-            this.storageAdapter.removeXcashuToken(baseUrl, token);
-            satsSpent = initialTokenBalance - receiveResult.amount * (receiveResult.unit == "sat" ? 1 : 1e3);
-          }
-        } catch (error) {
-          this._log("ERROR", "[xcashu] Failed to receive refund token:", error);
+        const receiveResult = await this.cashuSpender.receiveToken(refundToken);
+        if (receiveResult.success) {
+          this.storageAdapter.removeXcashuToken(baseUrl, token);
+          satsSpent = initialTokenBalance - receiveResult.amount * (receiveResult.unit == "sat" ? 1 : 1e3);
+        } else {
+          this._log(
+            "ERROR",
+            `[xcashu] Failed to receive refund token: ${receiveResult.message}`
+          );
         }
       }
     } else if (this.mode === "apikeys") {
@@ -5573,18 +5589,18 @@ var RoutstrClient = class {
           this.storageAdapter.setApiKey(baseUrl, spendResult2.token);
         } catch (error) {
           if (error instanceof Error && error.message.includes("ApiKey already exists")) {
-            const tryReceiveTokenResult = await this.cashuSpender.receiveToken(
+            const receiveResult = await this.cashuSpender.receiveToken(
               spendResult2.token
             );
-            if (tryReceiveTokenResult.success) {
+            if (receiveResult.success) {
               this._log(
                 "DEBUG",
-                `[RoutstrClient] _handleErrorResponse: Token restored successfully, amount=${tryReceiveTokenResult.amount}`
+                `[RoutstrClient] _handleErrorResponse: Token restored successfully, amount=${receiveResult.amount}`
               );
             } else {
               this._log(
                 "DEBUG",
-                `[RoutstrClient] _handleErrorResponse: Token restore failed or not needed`
+                `[RoutstrClient] _handleErrorResponse: Token restore failed: ${receiveResult.message}`
               );
             }
             this._log(