@getalby/cli 0.4.1 → 0.5.0

package/README.md

@@ -123,13 +123,13 @@ npx @getalby/cli get-budget
 npx @getalby/cli sign-message --message "Hello, World!"
 
 # Fetch a payment-protected resource (auto-detects L402, X402, MPP)
-npx @getalby/cli fetch --url "https://example.com/api"
+npx @getalby/cli fetch "https://example.com/api"
 
 # Fetch with custom method, headers, and body
-npx @getalby/cli fetch --url "https://example.com/api" --method POST --body '{"query":"hello"}' --headers '{"Accept":"application/json"}'
+npx @getalby/cli fetch "https://example.com/api" --method POST --body '{"query":"hello"}' --headers '{"Accept":"application/json"}'
 
 # Fetch with a custom max amount (default: 5000 sats, 0 = no limit)
-npx @getalby/cli fetch --url "https://example.com/api" --max-amount 1000
+npx @getalby/cli fetch "https://example.com/api" --max-amount 1000
 
 # Wait for a payment notification
 npx @getalby/cli wait-for-payment --payment-hash "abc123..."

package/build/commands/fetch.js

@@ -4,16 +4,16 @@ export function registerFetch402Command(program) {
     program
         .command("fetch")
         .description("Fetch a payment-protected resource (auto-detects L402, X402, MPP)")
-        .requiredOption("-u, --url <url>", "URL to fetch")
+        .argument("<url>", "URL to fetch")
         .option("-m, --method <method>", "HTTP method (GET, POST, etc.)")
         .option("-b, --body <json>", "Request body (JSON string)")
         .option("-H, --headers <json>", "Additional headers (JSON string)")
         .option("--max-amount <sats>", "Maximum amount in sats to pay per request. Aborts if the endpoint requests more. (default: 5000, 0 = no limit)", parseInt)
-        .action(async (options) => {
+        .action(async (url, options) => {
         await handleError(async () => {
             const client = await getClient(program);
             const result = await fetch402(client, {
-                url: options.url,
+                url: url,
                 method: options.method,
                 body: options.body,
                 headers: options.headers ? JSON.parse(options.headers) : undefined,

package/build/index.js

@@ -32,7 +32,7 @@ program
     '    $ npx @getalby/cli connect "nostr+walletconnect://..."\n' +
     "    $ npx @getalby/cli get-balance\n" +
     "    $ npx @getalby/cli pay-invoice --invoice lnbc...")
-    .version("0.4.1")
+    .version("0.5.0")
     .option("-w, --wallet-name <name>", "Use a named wallet's connection secret (~/.alby-cli/connection-secret-<name>.key)")
     .option("-c, --connection-secret <string>", "NWC connection secret (nostr+walletconnect://...) or path to file containing it (preferred)")
     .option("-v, --verbose", "Print status messages to stderr")

package/build/utils.js

@@ -95,6 +95,17 @@ export async function getClient(program) {
     if (!connectionSecret && !walletName) {
         connectionSecret = process.env.NWC_URL;
     }
+    // Check for pending connections BEFORE reading the existing connection file.
+    // When `auth --force` is used, the old connection-secret.key still exists.
+    // If we read it first, we'd skip the pending connection and silently use
+    // the old connection instead of completing the new one.
+    if (!connectionSecret && existsSync(pendingPath)) {
+        if (opts.verbose) {
+            console.error("Pending connection found. Waiting for wallet approval...");
+        }
+        const pendingRelayPath = getPendingConnectionRelayPath(walletName);
+        return await completePendingConnection(pendingPath, connectionPath, undefined, opts.verbose, pendingRelayPath);
+    }
     if (!connectionSecret) {
         try {
             connectionSecret = readFileSync(connectionPath, "utf-8").trim();
@@ -105,13 +116,6 @@ export async function getClient(program) {
                 throw err;
         }
     }
-    if (!connectionSecret && existsSync(pendingPath)) {
-        if (opts.verbose) {
-            console.error("Pending connection found. Waiting for wallet approval...");
-        }
-        const pendingRelayPath = getPendingConnectionRelayPath(walletName);
-        return await completePendingConnection(pendingPath, connectionPath, undefined, opts.verbose, pendingRelayPath);
-    }
     if (!connectionSecret) {
         throw new Error("No connection secret provided. Pass -c <secret or file path>, set NWC_URL, use --wallet-name <name>, or create ~/.alby-cli/connection-secret.key");
     }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@getalby/cli",
   "description": "CLI for Nostr Wallet Connect (NIP-47) with a few additional useful lightning tools",
   "repository": "https://github.com/getAlby/cli.git",
-  "version": "0.4.1",
+  "version": "0.5.0",
   "type": "module",
   "main": "build/index.js",
   "bin": {