routstrd 0.3.6 → 0.3.7

package/bun.lock

@@ -5,7 +5,7 @@
       "name": "routstrd",
       "dependencies": {
         "@cashu/cashu-ts": "^4.3.0",
-        "@routstr/sdk": "^0.3.14",
+        "@routstr/sdk": "^0.3.15",
         "applesauce-core": "^5.1.0",
         "applesauce-relay": "^5.1.0",
         "applesauce-wallet-connect": "^6.0.0",
@@ -87,7 +87,7 @@
 
     "@panva/hpke-noble": ["@panva/hpke-noble@1.1.2", "", { "dependencies": { "@noble/ciphers": "^2.2.0", "@noble/curves": "^2.2.0", "@noble/hashes": "^2.2.0", "@noble/post-quantum": "^0.6.1" }, "peerDependencies": { "hpke": "^1.0.0" } }, "sha512-Gr/jKr/ErpRow8aHK+SAp0sAaWy7iJGHlFsXsdTjD8ULcN4vvsVVWR3fiD6Ogf+VoSB28XY/xWRDUEIGXw+9aA=="],
 
-    "@routstr/sdk": ["@routstr/sdk@0.3.14", "", { "dependencies": { "@cashu/cashu-ts": "^3.1.1", "applesauce-core": "^5.1.0", "applesauce-relay": "^5.1.0", "applesauce-sqlite": "^6.0.0", "ehbp": "^0.2.3", "rxjs": "^7.8.1", "tinfoil": "^1.1.6", "zustand": "^5.0.5" }, "optionalDependencies": { "better-sqlite3": "^12.10.0" }, "peerDependencies": { "typescript": ">=5.0.0" } }, "sha512-4YY4ILWMMFTibTgH4TUCf7DNn/Uac5TbsVUgdUEUq8sLQHX25Y2cfYUP43LUThBsgI2mhqW7ZhjDD2zkP0ciug=="],
+    "@routstr/sdk": ["@routstr/sdk@0.3.15", "", { "dependencies": { "@cashu/cashu-ts": "^3.1.1", "applesauce-core": "^5.1.0", "applesauce-relay": "^5.1.0", "applesauce-sqlite": "^6.0.0", "ehbp": "^0.2.3", "rxjs": "^7.8.1", "tinfoil": "^1.1.6", "zustand": "^5.0.5" }, "optionalDependencies": { "better-sqlite3": "^12.10.0" }, "peerDependencies": { "typescript": ">=5.0.0" } }, "sha512-Cz1SAoeyEE8rYeivw3MxybkN/i9Ye4/EKAkbjoWbLMZKX+ECFuGB1hHuDzda9Id5Y7n0Rn4PixVvIlxAWsk1IA=="],
 
     "@scure/base": ["@scure/base@2.2.0", "", {}, "sha512-b8XEupJibegiXV+tDUseI8oLQc8ei3d/4Jkb2RpbHh3MfE054ov3uIz2dhFkB3FI8iwYkEh0gGCApkrYggkPNg=="],
 

package/dist/daemon/index.js

@@ -85237,7 +85237,7 @@ function selectMintWithBalance(balances, units, amount, excludeMints = []) {
   }
   return { selectedMintUrl: null, selectedMintBalance: 0 };
 }
-var CashuSpender = class {
+var CashuSpender = class _CashuSpender {
   constructor(walletAdapter, storageAdapter, _discoveryAdapter, balanceManager, logger3) {
     this.walletAdapter = walletAdapter;
     this.storageAdapter = storageAdapter;
@@ -85252,6 +85252,9 @@ var CashuSpender = class {
   _isBusy = false;
   debugLevel = "WARN";
   logger;
+  static MAX_REFUND_RETRIES = 3;
+  static REFUND_RETRY_INTERVAL_MS = 120000;
+  _refundRetryInterval = null;
   async receiveToken(token) {
     try {
       const result = await this.walletAdapter.receiveToken(token);
@@ -85550,6 +85553,35 @@ var CashuSpender = class {
             throw new Error("BalanceManager not available for xcashu refund");
           }
           const fetchResult = await this.balanceManager.fetchRefundToken(baseUrl, xcashuToken.token, true);
+          if (!fetchResult.success && fetchResult.status === 425) {
+            results.push({
+              baseUrl,
+              token: xcashuToken.token,
+              success: false,
+              error: fetchResult.error
+            });
+            this._log("WARN", `[CashuSpender] refundXcashuTokens: 425 "Refund is pending" for ${baseUrl}; leaving token in store, tryCount untouched`);
+            continue;
+          }
+          if (!fetchResult.success && fetchResult.status === 404 && (fetchResult.error || "").includes("Refund not found")) {
+            const currentTryCount = xcashuToken.tryCount ?? 0;
+            const newTryCount = currentTryCount + 1;
+            if (newTryCount >= _CashuSpender.MAX_REFUND_RETRIES) {
+              this.storageAdapter.removeXcashuToken(baseUrl, xcashuToken.token);
+              this._log("WARN", `[CashuSpender] refundXcashuTokens: 404 "Refund not found" for ${baseUrl} after ${newTryCount} retries; removing unrefundable xcashu token from store`);
+            } else {
+              this.storageAdapter.updateXcashuTokenTryCount(xcashuToken.token, newTryCount);
+              this._log("WARN", `[CashuSpender] refundXcashuTokens: 404 "Refund not found" for ${baseUrl}; tryCount=${newTryCount}/${_CashuSpender.MAX_REFUND_RETRIES}, will retry in ${_CashuSpender.REFUND_RETRY_INTERVAL_MS / 1000}s`);
+              this._startRefundRetryInterval(mintUrl);
+            }
+            results.push({
+              baseUrl,
+              token: xcashuToken.token,
+              success: false,
+              error: fetchResult.error
+            });
+            continue;
+          }
           if (!fetchResult.success || !fetchResult.token) {
             throw new Error(fetchResult.error || "Failed to fetch refund token from provider");
           }
@@ -85591,6 +85623,31 @@ var CashuSpender = class {
     }
     return results;
   }
+  _startRefundRetryInterval(mintUrl) {
+    if (this._refundRetryInterval)
+      return;
+    this._log("DEBUG", `[CashuSpender] Starting refund retry interval (every ${_CashuSpender.REFUND_RETRY_INTERVAL_MS / 1000}s)`);
+    this._refundRetryInterval = setInterval(async () => {
+      const remainingTokens = this.storageAdapter.getXcashuTokens();
+      const hasTokens = Object.values(remainingTokens).some((tokens) => tokens.length > 0);
+      if (!hasTokens) {
+        this._stopRefundRetryInterval();
+        return;
+      }
+      try {
+        await this.refundXcashuTokens(mintUrl);
+      } catch (error53) {
+        this._log("ERROR", `[CashuSpender] Refund retry interval error: ${error53 instanceof Error ? error53.message : String(error53)}`);
+      }
+    }, _CashuSpender.REFUND_RETRY_INTERVAL_MS);
+  }
+  _stopRefundRetryInterval() {
+    if (this._refundRetryInterval) {
+      clearInterval(this._refundRetryInterval);
+      this._refundRetryInterval = null;
+      this._log("DEBUG", `[CashuSpender] Stopped refund retry interval`);
+    }
+  }
   async refundProviders(mintUrl, forceRefund) {
     const results = [];
     const apiKeyDistribution = this.storageAdapter.getApiKeyDistribution();
@@ -85898,6 +85955,7 @@ var BalanceManager = class _BalanceManager {
         return {
           success: false,
           requestId,
+          status: response.status,
           error: `API key refund failed: ${errorData?.detail || responseBody || response.statusText}`
         };
       }
@@ -88755,7 +88813,12 @@ var RoutstrClient = class {
         });
         this._log("DEBUG", `[RoutstrClient] _handleErrorResponse: API key refund result: success=${refundResult.success}, message=${refundResult.message}`);
         if (!refundResult.success && latestBalanceInfo.amount > 0 && !latestBalanceInfo.balanceUnknown) {
-          throw new ProviderError(baseUrl, status, refundResult.message ?? "Unknown error");
+          if (this._isTransientRefundError(refundResult.message)) {
+            this._log("WARN", `[RoutstrClient] _handleErrorResponse: Refund skipped for ${baseUrl} (transient: ${refundResult.message}); failing over to next provider`);
+            tryNextProvider = true;
+          } else {
+            throw new ProviderError(baseUrl, status, refundResult.message ?? "Unknown error");
+          }
         }
       }
     }
@@ -88803,6 +88866,12 @@ var RoutstrClient = class {
     }
     throw new FailoverError(baseUrl, Array.from(this.providerManager.getFailedProviders()));
   }
+  _isTransientRefundError(message) {
+    if (!message)
+      return false;
+    const lower = message.toLowerCase();
+    return lower.includes("ongoing requests for this api key") || lower.includes("cannot refund key");
+  }
   async _handlePostResponseBalanceUpdate(params) {
     const {
       token,

package/dist/index.js

@@ -15596,7 +15596,7 @@ async function isCocodInstalled(cocodPath) {
 // package.json
 var package_default = {
   name: "routstrd",
-  version: "0.3.6",
+  version: "0.3.7",
   module: "src/index.ts",
   type: "module",
   private: false,
@@ -15620,7 +15620,7 @@ var package_default = {
   },
   dependencies: {
     "@cashu/cashu-ts": "^4.3.0",
-    "@routstr/sdk": "^0.3.14",
+    "@routstr/sdk": "^0.3.15",
     "applesauce-core": "^5.1.0",
     "applesauce-relay": "^5.1.0",
     "applesauce-wallet-connect": "^6.0.0",
@@ -15667,6 +15667,108 @@ async function installCocodOrExit() {
   }
   console.log("cocod installed successfully.");
 }
+async function restartDaemonsAfterUpdate() {
+  const config = await loadConfig();
+  const isRemote = !!config.daemonUrl;
+  const failures = [];
+  if (isRemote) {
+    console.log(`
+Using remote daemon \u2014 skipping routstrd daemon restart.`);
+  } else {
+    try {
+      const wasRunning = await isDaemonRunning();
+      if (!wasRunning) {
+        console.log(`
+routstrd daemon was not running \u2014 skipping restart.`);
+      } else {
+        console.log(`
+Restarting routstrd daemon...`);
+        await callDaemon("/stop", { method: "POST" });
+        for (let i2 = 0;i2 < 50; i2++) {
+          await new Promise((resolve) => setTimeout(resolve, 100));
+          if (!await isDaemonRunning())
+            break;
+        }
+        if (await isDaemonRunning()) {
+          throw new Error("routstrd did not stop within 5 seconds");
+        }
+        console.log("routstrd daemon stopped.");
+        console.log("Starting routstrd daemon...");
+        await startDaemon({
+          port: String(config.port || 8008),
+          provider: config.provider || undefined
+        });
+        console.log("routstrd daemon restarted.");
+      }
+    } catch (error) {
+      const msg = error instanceof Error ? error.message : String(error);
+      failures.push(`routstrd daemon: ${msg}`);
+    }
+  }
+  try {
+    const cocodExecutable = resolveCocodExecutable(config.cocodPath);
+    const pingProc = Bun.spawn([cocodExecutable, "ping"], {
+      stdout: "ignore",
+      stderr: "ignore"
+    });
+    const cocodWasRunning = await pingProc.exited === 0;
+    if (!cocodWasRunning) {
+      console.log(`
+cocod daemon was not running \u2014 skipping restart.`);
+    } else {
+      console.log(`
+Restarting cocod daemon...`);
+      const stopProc = Bun.spawn([cocodExecutable, "stop"], {
+        stdout: "inherit",
+        stderr: "inherit"
+      });
+      const stopCode = await stopProc.exited;
+      if (stopCode !== 0) {
+        throw new Error(`cocod stop exited with code ${stopCode}`);
+      }
+      console.log("cocod daemon stopped.");
+      const env = { ...process.env };
+      const startProc = Bun.spawn([cocodExecutable, "daemon"], {
+        stdout: "ignore",
+        stderr: "ignore",
+        stdin: "ignore",
+        detached: true,
+        env
+      });
+      startProc.unref?.();
+      let started = false;
+      for (let i2 = 0;i2 < 100; i2++) {
+        await new Promise((resolve) => setTimeout(resolve, 100));
+        const poll = Bun.spawn([cocodExecutable, "ping"], {
+          stdout: "ignore",
+          stderr: "ignore"
+        });
+        if (await poll.exited === 0) {
+          started = true;
+          break;
+        }
+      }
+      if (!started) {
+        throw new Error("cocod did not come back up within 10 seconds");
+      }
+      console.log("cocod daemon restarted.");
+    }
+  } catch (error) {
+    const msg = error instanceof Error ? error.message : String(error);
+    failures.push(`cocod daemon: ${msg}`);
+  }
+  if (failures.length > 0) {
+    console.error(`
+\u26A0 Some daemons failed to restart:`);
+    for (const f of failures) {
+      console.error(`  - ${f}`);
+    }
+    console.error("The update was applied but may not take effect until daemons are manually restarted.");
+    process.exit(1);
+  }
+  console.log(`
+\u2713 All daemons restarted successfully.`);
+}
 async function requireLocalDaemon() {
   const config = await loadConfig();
   if (config.daemonUrl) {
@@ -15787,6 +15889,7 @@ program.command("update").description("Update routstrd and cocod to the latest v
   console.log(`cocod updated successfully.
 `);
   console.log("Both routstrd and cocod have been updated!");
+  await restartDaemonsAfterUpdate();
 });
 program.command("refund").description("Refund pending tokens and API keys to a specified mint").option("-m, --mint-url <mintUrl>", "Mint URL to refund to (defaults to first mint in wallet)").option("-y, --yes", "Skip confirmation prompt", false).option("--xcashu", "Refund xcashu tokens only (uses refundXcashuTokens)", false).action(async (options) => {
   await ensureDaemonRunning();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "routstrd",
-  "version": "0.3.6",
+  "version": "0.3.7",
   "module": "src/index.ts",
   "type": "module",
   "private": false,
@@ -24,7 +24,7 @@
   },
   "dependencies": {
     "@cashu/cashu-ts": "^4.3.0",
-    "@routstr/sdk": "^0.3.14",
+    "@routstr/sdk": "^0.3.15",
     "applesauce-core": "^5.1.0",
     "applesauce-relay": "^5.1.0",
     "applesauce-wallet-connect": "^6.0.0",

package/src/cli.ts

@@ -103,6 +103,130 @@ async function installCocodOrExit(): Promise<void> {
   console.log("cocod installed successfully.");
 }
 
+/**
+ * Restart the routstrd and cocod daemons after an update so the new
+ * binaries take effect immediately.  Failures are collected and reported
+ * but never roll back the update itself.
+ */
+async function restartDaemonsAfterUpdate(): Promise<void> {
+  const config = await loadConfig();
+  const isRemote = !!config.daemonUrl;
+  const failures: string[] = [];
+
+  // --- routstrd daemon ---
+  if (isRemote) {
+    console.log("\nUsing remote daemon — skipping routstrd daemon restart.");
+  } else {
+    try {
+      const wasRunning = await isDaemonRunning();
+      if (!wasRunning) {
+        console.log("\nroutstrd daemon was not running — skipping restart.");
+      } else {
+        console.log("\nRestarting routstrd daemon...");
+
+        // Graceful stop — the /stop endpoint closes the HTTP server
+        // (draining active connections) then exits.
+        await callDaemon("/stop", { method: "POST" });
+
+        for (let i = 0; i < 50; i++) {
+          await new Promise((resolve) => setTimeout(resolve, 100));
+          if (!(await isDaemonRunning())) break;
+        }
+
+        if (await isDaemonRunning()) {
+          throw new Error("routstrd did not stop within 5 seconds");
+        }
+        console.log("routstrd daemon stopped.");
+
+        console.log("Starting routstrd daemon...");
+        await startDaemon({
+          port: String(config.port || 8008),
+          provider: config.provider || undefined,
+        });
+        console.log("routstrd daemon restarted.");
+      }
+    } catch (error) {
+      const msg = error instanceof Error ? error.message : String(error);
+      failures.push(`routstrd daemon: ${msg}`);
+    }
+  }
+
+  // --- cocod daemon ---
+  try {
+    const cocodExecutable = resolveCocodExecutable(config.cocodPath);
+
+    // Check whether cocod is currently running.
+    const pingProc = Bun.spawn([cocodExecutable, "ping"], {
+      stdout: "ignore",
+      stderr: "ignore",
+    });
+    const cocodWasRunning = (await pingProc.exited) === 0;
+
+    if (!cocodWasRunning) {
+      console.log("\ncocod daemon was not running — skipping restart.");
+    } else {
+      console.log("\nRestarting cocod daemon...");
+
+      const stopProc = Bun.spawn([cocodExecutable, "stop"], {
+        stdout: "inherit",
+        stderr: "inherit",
+      });
+      const stopCode = await stopProc.exited;
+      if (stopCode !== 0) {
+        throw new Error(`cocod stop exited with code ${stopCode}`);
+      }
+      console.log("cocod daemon stopped.");
+
+      // Start cocod in the background (detached, like the wallet client does).
+      const env = { ...process.env };
+      const startProc = Bun.spawn([cocodExecutable, "daemon"], {
+        stdout: "ignore",
+        stderr: "ignore",
+        stdin: "ignore",
+        detached: true,
+        env,
+      });
+      startProc.unref?.();
+
+      // Poll until cocod responds to ping (max ~10 s).
+      let started = false;
+      for (let i = 0; i < 100; i++) {
+        await new Promise((resolve) => setTimeout(resolve, 100));
+        const poll = Bun.spawn([cocodExecutable, "ping"], {
+          stdout: "ignore",
+          stderr: "ignore",
+        });
+        if ((await poll.exited) === 0) {
+          started = true;
+          break;
+        }
+      }
+
+      if (!started) {
+        throw new Error("cocod did not come back up within 10 seconds");
+      }
+      console.log("cocod daemon restarted.");
+    }
+  } catch (error) {
+    const msg = error instanceof Error ? error.message : String(error);
+    failures.push(`cocod daemon: ${msg}`);
+  }
+
+  // --- report ---
+  if (failures.length > 0) {
+    console.error("\n⚠ Some daemons failed to restart:");
+    for (const f of failures) {
+      console.error(`  - ${f}`);
+    }
+    console.error(
+      "The update was applied but may not take effect until daemons are manually restarted.",
+    );
+    process.exit(1);
+  }
+
+  console.log("\n✓ All daemons restarted successfully.");
+}
+
 async function requireLocalDaemon(): Promise<void> {
   const config = await loadConfig();
   if (config.daemonUrl) {
@@ -264,6 +388,9 @@ program
     console.log("cocod updated successfully.\n");
 
     console.log("Both routstrd and cocod have been updated!");
+
+    // Restart daemons so the new binaries take effect immediately.
+    await restartDaemonsAfterUpdate();
   });
 
 program