Guard non-interactive send CLI output

Author: bruceblink

src/bin/sendmer.rs

@@ -14,6 +14,7 @@ use sendmer::core::args::{
 use sendmer::core::cli_helper::CliEventEmitter;
 use sendmer::core::{receiver, sender};
 use sendmer::{AppHandle, ReceiveOptions, SendOptions};
+use std::io::IsTerminal;
 use std::sync::Arc;
 
 #[tokio::main]
@@ -83,7 +84,7 @@ async fn send(args: SendArgs) -> anyhow::Result<()> {
     println!("to get this data, use");
     println!("sendmer receive {}", res.ticket);
     #[cfg(feature = "clipboard")]
-    handle_key_press(args.clipboard, res.ticket.to_string());
+    maybe_handle_key_press(args.clipboard, res.ticket.to_string());
     tokio::signal::ctrl_c().await?;
     res.shutdown().await
 }
@@ -157,6 +158,14 @@ fn maybe_show_secret(common: &CommonArgs) -> anyhow::Result<()> {
     Ok(())
 }
 
+#[cfg(feature = "clipboard")]
+fn maybe_handle_key_press(set_clipboard: bool, ticket: String) {
+    if !(std::io::stdin().is_terminal() && std::io::stdout().is_terminal()) {
+        return;
+    }
+    handle_key_press(set_clipboard, ticket);
+}
+
 #[cfg(feature = "clipboard")]
 fn handle_key_press(set_clipboard: bool, ticket: String) {
     #[cfg(any(unix, windows))]

tests/cli.rs

@@ -68,30 +68,48 @@ impl RunningSend {
             .current_dir(cwd)
             .env_remove("RUST_LOG")
             .stdout(Stdio::piped())
-            .stderr(Stdio::null())
+            .stderr(Stdio::piped())
             .spawn()?;
         Ok(Self { child })
     }
 
     fn read_ticket(&mut self) -> BlobTicket {
         let stdout = self.child.stdout.as_mut().expect("send stdout");
-        for _ in 0..8 {
+        let mut seen_output = String::new();
+        for _ in 0..32 {
             let output = read_ascii_lines(1, stdout).expect("send output line");
+            if output.is_empty() {
+                let status = self.child.try_wait().expect("send status check");
+                let stderr = self.read_stderr();
+                panic!(
+                    "send exited before printing a valid ticket; status={status:?}, stdout={seen_output:?}, stderr={stderr:?}"
+                );
+            }
             let output = String::from_utf8(output).expect("utf-8 send output");
+            seen_output.push_str(&output);
             if let Some(ticket) = output
                 .split_ascii_whitespace()
                 .find_map(|token| BlobTicket::from_str(token).ok())
             {
                 return ticket;
             }
         }
-        panic!("valid ticket not found in send output");
+        let stderr = self.read_stderr();
+        panic!("valid ticket not found in send output; stdout={seen_output:?}, stderr={stderr:?}");
     }
 
     fn cleanup(&mut self) {
         let _ = self.child.kill();
         let _ = self.child.wait();
     }
+
+    fn read_stderr(&mut self) -> String {
+        let mut stderr = String::new();
+        if let Some(mut pipe) = self.child.stderr.take() {
+            let _ = pipe.read_to_string(&mut stderr);
+        }
+        stderr
+    }
 }
 
 impl Drop for RunningSend {