feat(iroh): add node wide default author for documents

iroh-cli/src/commands.rs

@@ -115,36 +115,44 @@ impl Cli {
 
         match self.command {
             Commands::Console => {
-                let env = ConsoleEnv::for_console(data_dir)?;
+                let data_dir_owned = data_dir.to_owned();
                 if self.start {
                     let config = NodeConfig::load(self.config.as_deref()).await?;
                     start::run_with_command(
                         &config,
                         data_dir,
                         RunType::SingleCommandNoAbort,
-                        |iroh| async move { console::run(&iroh, &env).await },
+                        |iroh| async move {
+                            let env = ConsoleEnv::for_console(data_dir_owned, &iroh).await?;
+                            console::run(&iroh, &env).await
+                        },
                     )
                     .await
                 } else {
                     crate::logging::init_terminal_logging()?;
                     let iroh = QuicIroh::connect(data_dir).await.context("rpc connect")?;
+                    let env = ConsoleEnv::for_console(data_dir_owned, &iroh).await?;
                     console::run(&iroh, &env).await
                 }
             }
             Commands::Rpc(command) => {
-                let env = ConsoleEnv::for_cli(data_dir)?;
+                let data_dir_owned = data_dir.to_owned();
                 if self.start {
                     let config = NodeConfig::load(self.config.as_deref()).await?;
                     start::run_with_command(
                         &config,
                         data_dir,
                         RunType::SingleCommandAbortable,
-                        |iroh| async move { command.run(&iroh, &env).await },
+                        move |iroh| async move {
+                            let env = ConsoleEnv::for_cli(data_dir_owned, &iroh).await?;
+                            command.run(&iroh, &env).await
+                        },
                     )
                     .await
                 } else {
                     crate::logging::init_terminal_logging()?;
                     let iroh = QuicIroh::connect(data_dir).await.context("rpc connect")?;
+                    let env = ConsoleEnv::for_cli(data_dir_owned, &iroh).await?;
                     command.run(&iroh, &env).await
                 }
             }

iroh-cli/src/commands/author.rs

@@ -26,6 +26,12 @@ pub enum AuthorCommands {
     Export { author: AuthorId },
     /// Import an author
     Import { author: String },
+    /// Print the default author for this node.
+    Default {
+        /// Switch to the default author (only in the Iroh console).
+        #[clap(long)]
+        switch: bool,
+    },
     /// List authors.
     #[clap(alias = "ls")]
     List,
@@ -47,6 +53,17 @@ impl AuthorCommands {
                     println!("{}", author_id);
                 }
             }
+            Self::Default { switch } => {
+                if switch && !env.is_console() {
+                    bail!("The --switch flag is only supported within the Iroh console.");
+                }
+                let author_id = iroh.authors.default().await?;
+                println!("{}", author_id);
+                if switch {
+                    env.set_author(author_id)?;
+                    println!("Active author is now {}", fmt_short(author_id.as_bytes()));
+                }
+            }
             Self::New { switch } => {
                 if switch && !env.is_console() {
                     bail!("The --switch flag is only supported within the Iroh console.");

iroh-cli/src/commands/console.rs

@@ -53,7 +53,7 @@ impl Repl {
     pub fn run(self) -> anyhow::Result<()> {
         let mut rl =
             DefaultEditor::with_config(Config::builder().check_cursor_position(true).build())?;
-        let history_path = ConsolePaths::History.with_root(self.env.iroh_data_dir());
+        let history_path = ConsolePaths::History.with_iroh_data_dir(self.env.iroh_data_dir());
         rl.load_history(&history_path).ok();
         loop {
             // prepare a channel to receive a signal from the main thread when a command completed
@@ -87,13 +87,12 @@ impl Repl {
 
     pub fn prompt(&self) -> String {
         let mut pwd = String::new();
-        if let Some(author) = &self.env.author(None).ok() {
-            pwd.push_str(&format!(
-                "{}{} ",
-                "author:".blue(),
-                fmt_short(author.as_bytes()).blue().bold(),
-            ));
-        }
+        let author = self.env.author();
+        pwd.push_str(&format!(
+            "{}{} ",
+            "author:".blue(),
+            fmt_short(author.as_bytes()).blue().bold(),
+        ));
         if let Some(doc) = &self.env.doc(None).ok() {
             pwd.push_str(&format!(
                 "{}{} ",

iroh-cli/src/commands/doc.rs

@@ -360,7 +360,7 @@ impl DocCommands {
                 value,
             } => {
                 let doc = get_doc(iroh, env, doc).await?;
-                let author = env.author(author)?;
+                let author = author.unwrap_or(env.author());
                 let key = key.as_bytes().to_vec();
                 let value = value.as_bytes().to_vec();
                 let hash = doc.set_bytes(author, key, value).await?;
@@ -372,7 +372,7 @@ impl DocCommands {
                 prefix,
             } => {
                 let doc = get_doc(iroh, env, doc).await?;
-                let author = env.author(author)?;
+                let author = author.unwrap_or(env.author());
                 let prompt =
                     format!("Deleting all entries whose key starts with {prefix}. Continue?");
                 if Confirm::new()
@@ -453,7 +453,7 @@ impl DocCommands {
                 no_prompt,
             } => {
                 let doc = get_doc(iroh, env, doc).await?;
-                let author = env.author(author)?;
+                let author = author.unwrap_or(env.author());
                 let mut prefix = prefix.unwrap_or_else(|| String::from(""));
 
                 if prefix.ends_with('/') {
@@ -979,7 +979,9 @@ mod tests {
         let author = client.authors.create().await.context("author create")?;
 
         // set up command, getting iroh node
-        let cli = ConsoleEnv::for_console(data_dir.path()).context("ConsoleEnv")?;
+        let cli = ConsoleEnv::for_console(data_dir.path().to_owned(), &node)
+            .await
+            .context("ConsoleEnv")?;
         let iroh = iroh::client::QuicIroh::connect(data_dir.path())
             .await
             .context("rpc connect")?;