add config file for fnn-cli

Author: chenyukang

Cargo.lock

@@ -19,6 +19,7 @@ rustyline = { version = "15", features = ["derive"] }
 anyhow = "1.0"
 colored = "2"
 indicatif = "0.17"
+toml = "0.8"
 fiber-json-types = { path = "../fiber-json-types" , features = ["cch", "watchtower"]}
 ckb-jsonrpc-types = "1"
 ratatui = "0.29"

crates/fiber-cli/Cargo.toml

@@ -41,6 +41,37 @@ fnn-cli -u http://127.0.0.1:8227 --tui
 | `--color` | | `auto` | Color output: `auto`, `always`, or `never` |
 | `--no-banner` | | | Suppress the banner in interactive mode |
 | `--tui` | | | Launch the Terminal User Interface dashboard |
+| `--config` | | `~/.fnn/config.toml` | Path to config file |
+
+### Configuration Priority
+
+Configuration values are resolved in the following priority order (highest to lowest):
+
+```
+CLI flag > Environment variable > Config file > Default value
+```
+
+### Configuration File
+
+Create `~/.fnn/config.toml` to store default values:
+
+```toml
+url = "http://192.168.1.100:8227"
+auth_token = "your-token-here"
+output_format = "yaml"
+```
+
+Supported config options:
+- `url` - RPC endpoint URL (without `http://` prefix is also accepted)
+- `auth_token` - Bearer token for RPC authentication
+- `output_format` - Output format (`yaml` or `json`)
+
+### Environment Variables
+
+| Variable | Description |
+|----------|-------------|
+| `FNN_RPC_URL` | RPC endpoint URL |
+| `FNN_AUTH_TOKEN` | Bearer token for RPC authentication |
 
 The auth token can also be set via the `FNN_AUTH_TOKEN` environment variable.
 
@@ -89,7 +120,7 @@ FNN> exit
 
 Features:
 - **Tab completion** for commands, subcommands, and `--flags`
-- **Command history** persisted to `~/.fnn_cli_history`
+- **Command history** persisted to `~/.fnn/history`
 - **Colored output** with syntax highlighting for JSON/YAML responses
 - **Shell-like quoting** — supports single quotes, double quotes, and backslash escaping
 
@@ -246,7 +277,7 @@ The TUI provides a real-time overview of your Fiber node with 7 tabs:
 | 4 | **Peers** | List/connect/disconnect peers with search |
 | 5 | **Invoices** | Create/list/lookup/cancel/parse invoices |
 | 6 | **Graph** | Browse network graph nodes and channels |
-| 7 | **Logs** | Persistent activity log (saved to `~/.fnn-cli/tui.log`) |
+| 7 | **Logs** | Persistent activity log (saved to `~/.fnn/tui.log`) |
 
 ### Keyboard Shortcuts
 
@@ -287,7 +318,7 @@ The TUI provides a real-time overview of your Fiber node with 7 tabs:
 - **Flash messages** -- success/error feedback appears in the footer after mutations (open channel, send payment, etc.) and fades after 5 seconds.
 - **Detail popups** -- press `Enter` on any item to see full details with word-wrapped values. Press `y` inside the popup to copy individual fields.
 - **Confirmation dialogs** -- destructive actions (shutdown/abandon channel, disconnect peer) require confirmation.
-- **Persistent logs** -- all activity is logged to `~/.fnn-cli/tui.log` and survives across sessions (last 2000 entries).
+- **Persistent logs** -- all activity is logged to `~/.fnn/tui.log` and survives across sessions (last 2000 entries).
 - **Network topology** -- the Dashboard tab shows an adjacency-list view of your node's peer connections and channel states.
 
 ## Getting Help

crates/fiber-cli/README.md

@@ -34,6 +34,29 @@ use rustyline::{Context, Editor, Helper};
 const FNN_CLI_VERSION: &str = env!("CARGO_PKG_VERSION");
 const DEFAULT_RPC_URL: &str = "http://127.0.0.1:8227";
 
+#[derive(Debug, Default, serde::Deserialize)]
+struct ConfigFile {
+    url: Option<String>,
+    auth_token: Option<String>,
+    output_format: Option<String>,
+}
+
+fn default_config_dir() -> std::path::PathBuf {
+    dirs_home_inner()
+        .map(|h| h.join(".fnn"))
+        .unwrap_or_else(|| std::path::PathBuf::from(".fnn"))
+}
+
+fn default_config_path() -> std::path::PathBuf {
+    default_config_dir().join("config.toml")
+}
+
+fn load_config_file(path: &std::path::Path) -> Result<ConfigFile, anyhow::Error> {
+    let content = std::fs::read_to_string(path)?;
+    let config: ConfigFile = toml::from_str(&content)?;
+    Ok(config)
+}
+
 const BANNER_LINES: &[&str] = &[
     r"  ╔═╗╦╔╗ ╔═╗╦═╗  ╔╗╔╔═╗╔╦╗╦ ╦╔═╗╦═╗╦╔═ ",
     r"  ╠╣ ║╠╩╗║╣ ╠╦╝  ║║║║╣  ║ ║║║║ ║╠╦╝╠╩╗ ",
@@ -56,13 +79,19 @@ fn build_cli() -> Command {
         .about("Fiber Network Node CLI - interactive command-line interface for FNN")
         .version(FNN_CLI_VERSION)
         .styles(cli_styles())
+        .arg(
+            Arg::new("config")
+                .long("config")
+                .global(true)
+                .value_name("FILE")
+                .help("Path to config file (default: ~/.fnn/config.toml)"),
+        )
         .arg(
             Arg::new("url")
                 .long("url")
                 .short('u')
                 .global(true)
-                .default_value(DEFAULT_RPC_URL)
-                .help("The RPC endpoint URL"),
+                .help("The RPC endpoint URL (default: http://127.0.0.1:8227, can also set via FNN_RPC_URL env or config file)"),
         )
         .arg(
             Arg::new("raw_data")
@@ -76,8 +105,7 @@ fn build_cli() -> Command {
                 .long("output-format")
                 .short('o')
                 .global(true)
-                .default_value("yaml")
-                .help("Output format: json or yaml"),
+                .help("Output format: json or yaml (default: yaml, can also set via config file)"),
         )
         .arg(
             Arg::new("no_banner")
@@ -404,7 +432,7 @@ async fn run_interactive(
         .build();
     let mut rl = Editor::with_config(config)?;
     rl.set_helper(Some(helper));
-    let history_path = dirs_home().join(".fnn_cli_history");
+    let history_path = default_config_dir().join("history");
     let _ = rl.load_history(&history_path);
 
     loop {
@@ -513,10 +541,6 @@ fn shell_words(input: &str) -> Result<Vec<String>> {
     Ok(words)
 }
 
-fn dirs_home() -> std::path::PathBuf {
-    dirs_home_inner().unwrap_or_else(|| std::path::PathBuf::from("."))
-}
-
 fn dirs_home_inner() -> Option<std::path::PathBuf> {
     #[cfg(target_os = "windows")]
     {
@@ -533,14 +557,61 @@ async fn main() -> Result<()> {
     let cli = build_cli();
     let matches = cli.get_matches();
 
-    let url = matches.get_one::<String>("url").unwrap().clone();
+    // Load config file if exists (default: ~/.fnn/config.toml)
+    // Priority: CLI arg > env > config file > default
+    let config_file_path = matches
+        .get_one::<String>("config")
+        .map(std::path::PathBuf::from)
+        .unwrap_or_else(default_config_path);
+
+    let config_file = match load_config_file(&config_file_path) {
+        Ok(cfg) => Some(cfg),
+        Err(e)
+            if e.downcast_ref::<std::io::Error>()
+                .map(|e| e.kind() == std::io::ErrorKind::NotFound)
+                .unwrap_or(false) =>
+        {
+            // Config file not found - this is fine, use defaults
+            None
+        }
+        Err(e) => {
+            eprintln!("[config] Failed to load from {:?}: {}", config_file_path, e);
+            None
+        }
+    };
+
+    // Resolve URL: CLI > env > config file > default
+    let url = matches
+        .get_one::<String>("url")
+        .cloned()
+        .or_else(|| std::env::var("FNN_RPC_URL").ok())
+        .or_else(|| config_file.as_ref()?.url.clone())
+        .unwrap_or_else(|| DEFAULT_RPC_URL.to_string());
+
+    // Ensure URL has http:// prefix
+    let url = if url.starts_with("http://") || url.starts_with("https://") {
+        url
+    } else {
+        format!("http://{}", url)
+    };
+
     let raw_data = matches.get_flag("raw_data");
-    let output_format = matches.get_one::<String>("output_format").unwrap().clone();
+
+    // Resolve output_format: CLI > config file > default
+    let output_format = matches
+        .get_one::<String>("output_format")
+        .cloned()
+        .or_else(|| config_file.as_ref().and_then(|c| c.output_format.clone()))
+        .unwrap_or_else(|| "yaml".to_string());
+
     let no_banner = matches.get_flag("no_banner");
-    let color_mode = matches.get_one::<String>("color").unwrap().clone();
+    let color_mode = matches.get_one::<String>("color").cloned().unwrap();
 
-    // Resolve auth token: --auth-token > --auth-token-file > FNN_AUTH_TOKEN env
-    let auth_token = match matches.get_one::<String>("auth_token").cloned() {
+    // Resolve auth token: CLI > env > config file
+    // Priority: --auth-token > --auth-token-file > FNN_AUTH_TOKEN env > config file
+    let auth_token_from_cli = matches.get_one::<String>("auth_token").cloned();
+    let auth_token_from_file = config_file.as_ref().and_then(|c| c.auth_token.clone());
+    let auth_token = match auth_token_from_cli {
         Some(token) => Some(token),
         None => match matches.get_one::<String>("auth_token_file") {
             Some(path) => {
@@ -549,7 +620,7 @@ async fn main() -> Result<()> {
                 })?;
                 Some(content)
             }
-            None => None,
+            None => auth_token_from_file,
         },
     };
 

crates/fiber-cli/src/main.rs

@@ -71,13 +71,13 @@ impl LogsTab {
         tab
     }
 
-    /// Resolve the log file path: `~/.fnn-cli/tui.log`.
+    /// Resolve the log file path: `~/.fnn/tui.log`.
     fn resolve_log_path() -> Option<PathBuf> {
         let home = std::env::var("HOME")
             .ok()
             .map(PathBuf::from)
             .or_else(|| std::env::var("USERPROFILE").ok().map(PathBuf::from))?;
-        let dir = home.join(".fnn-cli");
+        let dir = home.join(".fnn");
         if !dir.exists() {
             fs::create_dir_all(&dir).ok()?;
         }