Wait for payment settlement, LNURL support, --no-wait flag

- `pay` now waits for settlement via SSE (like `invoice create`)
- `pay` accepts LNURL targets alongside Lightning addresses and BOLT11 invoices
- Add `--no-wait` flag to both `pay` and `invoice create` to return immediately
- `invoice create --json` now waits for settlement by default (use --no-wait to skip)
- Upgrade go-sdk to v0.3.0
- Bump version to 0.3.0

Made-with: Cursor

Author: realbub

cmd/invoice.go

@@ -26,6 +26,7 @@ func init() {
 	invoiceCreateCmd.Flags().Int64("amount", 0, "amount in sats (required)")
 	invoiceCreateCmd.MarkFlagRequired("amount")
 	invoiceCreateCmd.Flags().String("memo", "", "short description attached to the invoice")
+	invoiceCreateCmd.Flags().Bool("no-wait", false, "return immediately without waiting for payment")
 
 	invoiceListCmd.Flags().Int("limit", 20, "max number of results")
 	invoiceListCmd.Flags().Int("after", 0, "show results after this invoice number (for pagination)")
@@ -39,11 +40,12 @@ var invoiceCreateCmd = &cobra.Command{
 	Short: "Create a Lightning invoice to receive sats",
 	Long: `Create a new Lightning invoice for the given amount.
 
-Prints the BOLT11 string, renders a QR code in the terminal, and
-automatically waits for the payment to settle via SSE. Press Ctrl+C
-to stop waiting — the invoice remains valid until it expires.`,
+Prints the BOLT11 string and automatically waits for the payment to
+settle via SSE. Use --no-wait to return immediately. The invoice
+remains valid until it expires.`,
 	Example: `  lnbot invoice create --amount 1000
   lnbot invoice create --amount 5000 --memo "for coffee"
+  lnbot invoice create --amount 100 --no-wait
   lnbot invoice create --amount 100 --json`,
 	RunE: func(cmd *cobra.Command, args []string) error {
 		if err := requireConfig(); err != nil {
@@ -73,8 +75,27 @@ to stop waiting — the invoice remains valid until it expires.`,
 			return apiError("creating invoice", err)
 		}
 
+		noWait, _ := cmd.Flags().GetBool("no-wait")
+
 		if jsonFlag {
-			return json.NewEncoder(os.Stdout).Encode(invoice)
+			if noWait {
+				return json.NewEncoder(os.Stdout).Encode(invoice)
+			}
+			events, errs := ln.Invoices.Watch(ctx, invoice.Number, nil)
+			for {
+				select {
+				case ev, ok := <-events:
+					if !ok {
+						return json.NewEncoder(os.Stdout).Encode(invoice)
+					}
+					return json.NewEncoder(os.Stdout).Encode(ev.Data)
+				case err, ok := <-errs:
+					if ok && err != nil {
+						return json.NewEncoder(os.Stdout).Encode(invoice)
+					}
+					return json.NewEncoder(os.Stdout).Encode(invoice)
+				}
+			}
 		}
 
 		fmt.Printf("  amount:  %s\n", format.Sats(invoice.Amount))
@@ -83,6 +104,10 @@ to stop waiting — the invoice remains valid until it expires.`,
 		fmt.Printf("  %s\n", invoice.Bolt11)
 		fmt.Println()
 
+		if noWait {
+			return nil
+		}
+
 		fmt.Print("  Waiting for payment... (Ctrl+C to stop)")
 
 		watchCtx, cancel := context.WithCancel(ctx)

cmd/pay.go

@@ -16,20 +16,28 @@ import (
 )
 
 var payCmd = &cobra.Command{
-	Use:   "pay <address-or-bolt11>",
-	Short: "Send sats to a Lightning address or BOLT11 invoice",
+	Use:   "pay <target>",
+	Short: "Send sats to a Lightning address, LNURL, or BOLT11 invoice",
 	Long: `Send sats via the Lightning Network. The target can be:
 
   - A Lightning address (user@domain) — requires --amount
+  - An LNURL (lnurl1...) — requires --amount
   - A BOLT11 invoice (starts with lnbc/lntb/lnbs) — amount is encoded
 
-A confirmation prompt is shown before sending. Use --yes to skip it.`,
+A confirmation prompt is shown before sending. Use --yes to skip it.
+The CLI waits for settlement via SSE. Use --no-wait to return immediately.`,
 	Example: `  # Pay a Lightning address
   lnbot pay alice@ln.bot --amount 1000
 
   # Pay a BOLT11 invoice (amount is in the invoice)
   lnbot pay lnbc10u1pj9x...
 
+  # Pay an LNURL
+  lnbot pay lnurl1dp68gurn8ghj7... --amount 500
+
+  # Return immediately without waiting for settlement
+  lnbot pay alice@ln.bot --amount 500 --no-wait
+
   # Skip the confirmation prompt
   lnbot pay alice@ln.bot --amount 500 --yes`,
 	Args: cobra.ExactArgs(1),
@@ -46,22 +54,23 @@ A confirmation prompt is shown before sending. Use --yes to skip it.`,
 			strings.HasPrefix(lower, "lntb") ||
 			strings.HasPrefix(lower, "lnbs")
 		isAddress := strings.Contains(target, "@")
+		isLNURL := strings.HasPrefix(lower, "lnurl")
 
 		amount, _ := cmd.Flags().GetInt64("amount")
 		maxFee, _ := cmd.Flags().GetInt64("max-fee")
 
 		if amount > 0 {
 			params.Amount = lnbot.Ptr(amount)
-		} else if isAddress {
-			return fmt.Errorf("--amount is required when paying a Lightning address\n\n  lnbot pay %s --amount <sats>", target)
+		} else if isAddress || isLNURL {
+			return fmt.Errorf("--amount is required when paying a Lightning address or LNURL\n\n  lnbot pay %s --amount <sats>", format.Truncate(target, 40))
 		}
 
 		if maxFee > 0 {
 			params.MaxFee = lnbot.Ptr(maxFee)
 		}
 
-		if !isBolt11 && !isAddress {
-			return fmt.Errorf("unrecognized target: %s\n\nTarget must be a Lightning address (user@domain) or BOLT11 invoice (lnbc...)", format.Truncate(target, 40))
+		if !isBolt11 && !isAddress && !isLNURL {
+			return fmt.Errorf("unrecognized target: %s\n\nTarget must be a Lightning address (user@domain), LNURL (lnurl1...), or BOLT11 invoice (lnbc...)", format.Truncate(target, 40))
 		}
 
 		ln, _, _, err := cfg.Client(walletFlag)
@@ -84,47 +93,110 @@ A confirmation prompt is shown before sending. Use --yes to skip it.`,
 			}
 		}
 
+		ctx := context.Background()
 		start := time.Now()
-		payment, err := ln.Payments.Create(context.Background(), params)
+		payment, err := ln.Payments.Create(ctx, params)
 		if err != nil {
 			return apiError("sending payment", err)
 		}
-		elapsed := time.Since(start)
+
+		noWait, _ := cmd.Flags().GetBool("no-wait")
 
 		if jsonFlag {
+			if !noWait && (payment.Status == "pending" || payment.Status == "processing") {
+				payment, err = waitForPaymentJSON(ctx, ln, payment)
+				if err != nil {
+					return json.NewEncoder(os.Stdout).Encode(payment)
+				}
+			}
 			return json.NewEncoder(os.Stdout).Encode(payment)
 		}
 
-		switch payment.Status {
-		case "settled":
-			if elapsed < 100*time.Millisecond {
-				printSuccess("Sent! Settled instantly")
-			} else {
-				printSuccess(fmt.Sprintf("Sent! Settled in %dms", elapsed.Milliseconds()))
-			}
-			fmt.Printf("  amount:  %s\n", format.Sats(payment.Amount))
-			if payment.ActualFee != nil && *payment.ActualFee > 0 {
-				fmt.Printf("  fee:     %s\n", format.Sats(*payment.ActualFee))
+		if noWait {
+			fmt.Printf("  status: %s\n", payment.Status)
+			fmt.Printf("  number: %d\n", payment.Number)
+			return nil
+		}
+
+		return printPaymentResult(ctx, ln, payment, start)
+	},
+}
+
+func printPaymentResult(ctx context.Context, ln *lnbot.Client, payment *lnbot.Payment, start time.Time) error {
+	switch payment.Status {
+	case "settled":
+		elapsed := time.Since(start)
+		if elapsed < 100*time.Millisecond {
+			printSuccess("Sent! Settled instantly")
+		} else {
+			printSuccess(fmt.Sprintf("Sent! Settled in %dms", elapsed.Milliseconds()))
+		}
+		fmt.Printf("  amount:  %s\n", format.Sats(payment.Amount))
+		if payment.ActualFee != nil && *payment.ActualFee > 0 {
+			fmt.Printf("  fee:     %s\n", format.Sats(*payment.ActualFee))
+		}
+		w, err := ln.Wallets.Current(ctx)
+		if err == nil {
+			fmt.Printf("  balance: %s\n", format.Sats(w.Available))
+		}
+	case "failed":
+		reason := "unknown"
+		if payment.FailureReason != nil {
+			reason = *payment.FailureReason
+		}
+		fmt.Fprintf(os.Stderr, "✗ Payment failed: %s\n", reason)
+		fmt.Fprintln(os.Stderr, "  No sats were deducted.")
+	default:
+		fmt.Print("  Waiting for settlement... (Ctrl+C to stop)")
+
+		watchCtx, cancel := context.WithCancel(ctx)
+		defer cancel()
+
+		events, errs := ln.Payments.Watch(watchCtx, payment.Number, nil)
+		for {
+			select {
+			case ev, ok := <-events:
+				if !ok {
+					fmt.Println()
+					return nil
+				}
+				fmt.Println()
+				return printPaymentResult(ctx, ln, &ev.Data, start)
+			case err, ok := <-errs:
+				if ok && err != nil {
+					fmt.Println()
+					return err
+				}
+				return nil
 			}
-			w, err := ln.Wallets.Current(context.Background())
-			if err == nil {
-				fmt.Printf("  balance: %s\n", format.Sats(w.Available))
+		}
+	}
+	return nil
+}
+
+func waitForPaymentJSON(ctx context.Context, ln *lnbot.Client, payment *lnbot.Payment) (*lnbot.Payment, error) {
+	watchCtx, cancel := context.WithCancel(ctx)
+	defer cancel()
+
+	events, errs := ln.Payments.Watch(watchCtx, payment.Number, nil)
+	for {
+		select {
+		case ev, ok := <-events:
+			if !ok {
+				return payment, nil
 			}
-		case "failed":
-			reason := "unknown"
-			if payment.FailureReason != nil {
-				reason = *payment.FailureReason
+			return &ev.Data, nil
+		case err, ok := <-errs:
+			if ok && err != nil {
+				return payment, err
 			}
-			fmt.Fprintf(os.Stderr, "✗ Payment failed: %s\n", reason)
-			fmt.Fprintln(os.Stderr, "  No sats were deducted.")
-		default:
-			fmt.Printf("  status: %s\n", payment.Status)
+			return payment, nil
 		}
-		return nil
-	},
+	}
 }
 
 func init() {
-	payCmd.Flags().Int64("amount", 0, "amount in sats (required for Lightning addresses)")
+	payCmd.Flags().Int64("amount", 0, "amount in sats (required for Lightning addresses and LNURLs)")
 	payCmd.Flags().Int64("max-fee", 0, "maximum routing fee in sats")
+	payCmd.Flags().Bool("no-wait", false, "return immediately without waiting for settlement")
 }

cmd/root.go

@@ -22,7 +22,7 @@ var (
 	cfg *config.Config
 )
 
-const version = "0.2.0"
+const version = "0.3.0"
 
 var rootCmd = &cobra.Command{
 	Use:   "lnbot",

go.mod

@@ -3,7 +3,7 @@ module github.com/lnbotdev/cli
 go 1.21
 
 require (
-	github.com/lnbotdev/go-sdk v0.1.0
+	github.com/lnbotdev/go-sdk v0.3.0
 	github.com/spf13/cobra v1.10.2
 )
 

go.sum

@@ -1,8 +1,8 @@
 github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
-github.com/lnbotdev/go-sdk v0.1.0 h1:oRZXC+XBagb7peWVeT7MxSWL6IYDfMvy+Sc7JMjtcL4=
-github.com/lnbotdev/go-sdk v0.1.0/go.mod h1:YoerG407chXePT+92bunp4bQWF65T4UvueRI1RVueWg=
+github.com/lnbotdev/go-sdk v0.3.0 h1:gcZnoOHpeSzJWUsYw4UZBO8YM9WFirCwubw+RlnbmAE=
+github.com/lnbotdev/go-sdk v0.3.0/go.mod h1:YoerG407chXePT+92bunp4bQWF65T4UvueRI1RVueWg=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/spf13/cobra v1.10.2 h1:DMTTonx5m65Ic0GOoRY2c16WCbHxOOw6xxezuLaBpcU=
 github.com/spf13/cobra v1.10.2/go.mod h1:7C1pvHqHw5A4vrJfjNwvOdzYu0Gml16OCs2GRiTUUS4=