diff --git a/Cargo.lock b/Cargo.lock index b589208..656c109 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -178,6 +178,9 @@ version = "0.0.1" dependencies = [ "arboard", "clap", + "tracing", + "tracing-error", + "tracing-subscriber", ] [[package]] @@ -373,6 +376,12 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + [[package]] name = "libc" version = "0.2.142" @@ -413,6 +422,15 @@ dependencies = [ "libc", ] +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata", +] + [[package]] name = "memoffset" version = "0.6.5" @@ -444,6 +462,16 @@ dependencies = [ "memoffset", ] +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + [[package]] name = "num-integer" version = "0.1.45" @@ -509,6 +537,12 @@ version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + [[package]] name = "parking_lot" version = "0.12.1" @@ -532,6 +566,12 @@ dependencies = [ "windows-sys 0.45.0", ] +[[package]] +name = "pin-project-lite" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" + [[package]] name = "png" version = "0.17.8" @@ -572,6 +612,36 @@ dependencies = [ "bitflags", ] +[[package]] +name = "regex" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370" +dependencies = [ + "regex-syntax 0.7.1", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "regex-syntax" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c" + [[package]] name = "rustix" version = "0.37.19" @@ -592,6 +662,15 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +[[package]] +name = "sharded-slab" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +dependencies = [ + "lazy_static", +] + [[package]] name = "simd-adler32" version = "0.3.5" @@ -647,6 +726,16 @@ dependencies = [ "syn", ] +[[package]] +name = "thread_local" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +dependencies = [ + "cfg-if", + "once_cell", +] + [[package]] name = "tiff" version = "0.8.1" @@ -658,6 +747,78 @@ dependencies = [ "weezl", ] +[[package]] +name = "tracing" +version = "0.1.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +dependencies = [ + "cfg-if", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tracing-core" +version = "0.1.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-error" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e" +dependencies = [ + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "tracing-log" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +dependencies = [ + "lazy_static", + "log", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", +] + [[package]] name = "unicode-ident" version = "1.0.8" @@ -670,6 +831,12 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + [[package]] name = "weezl" version = "0.1.7" diff --git a/Cargo.toml b/Cargo.toml index 84db0a8..067c1f4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,3 +6,6 @@ edition = "2021" [dependencies] arboard = "3.2.0" clap = { version = "4.2.7", features = ["derive"] } +tracing = "0.1.37" +tracing-error = "0.2.0" +tracing-subscriber = { version = "0.3.17", features = ["env-filter"] } diff --git a/src/main.rs b/src/main.rs index 3ac543f..5ec16b9 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,5 +1,6 @@ use std::{ collections::hash_map::DefaultHasher, + error::Error, hash::{Hash, Hasher}, io::{self, Read, Write}, mem, @@ -11,6 +12,9 @@ use std::{ use arboard::{Clipboard, Error as ClipboardError}; use clap::{command, Parser}; +use tracing::{debug, error_span, instrument, metadata::LevelFilter, trace}; +use tracing_error::{ErrorLayer, InstrumentResult}; +use tracing_subscriber::{fmt, layer::SubscriberExt, util::SubscriberInitExt, EnvFilter}; const HANDSHAKE: &[u8; 9] = b"clipshare"; @@ -21,25 +25,39 @@ struct Cli { clipboard: Option, } -fn main() -> io::Result<()> { +fn main() -> Result<(), Box> { + tracing_subscriber::registry() + .with(fmt::layer()) + .with( + EnvFilter::builder() + .with_default_directive(LevelFilter::ERROR.into()) + .from_env_lossy(), + ) + .with(ErrorLayer::default()) + .init(); + match Cli::parse().clipboard { Some(port) => start_client(port), None => start_server(), } } -fn start_server() -> io::Result<()> { +#[instrument] +fn start_server() -> Result<(), Box> { let socket = UdpSocket::bind("0.0.0.0:0")?; let port = socket.local_addr()?.port(); thread::spawn(move || { + let span = error_span!("Port publishing", port).entered(); socket.set_broadcast(true)?; loop { if socket.send_to(HANDSHAKE, ("255.255.255.255", port))? == 0 { + debug!("Failed to send UDP packet"); break; } sleep(Duration::from_secs(3)); } + span.exit(); io::Result::Ok(()) }); @@ -47,19 +65,25 @@ fn start_server() -> io::Result<()> { eprintln!("Run `clipshare {port}` on another machine of your network"); for stream in listener.incoming() { + trace!("New connection arrived"); thread::spawn(move || { - let reader = stream?; - let writer = reader.try_clone()?; + let reader = stream.in_current_span()?; + let ip = reader.peer_addr()?.ip(); + let span = error_span!("Connection", %ip).entered(); + let writer = reader.try_clone().in_current_span()?; thread::spawn(move || send_clipboard(writer)); recv_clipboard(reader)?; - io::Result::Ok(()) + trace!("Finishing server connection"); + span.exit(); + Ok::<_, Box>(()) }); } Ok(()) } -fn start_client(clipboard_port: u16) -> io::Result<()> { +#[instrument] +fn start_client(clipboard_port: u16) -> Result<(), Box> { let socket = UdpSocket::bind(("0.0.0.0", clipboard_port))?; socket.set_read_timeout(Some(Duration::from_secs(5)))?; eprintln!("Connecting to clipboard {clipboard_port}..."); @@ -69,11 +93,16 @@ fn start_client(clipboard_port: u16) -> io::Result<()> { exit(1); }; if &buf == HANDSHAKE { - let reader = TcpStream::connect(addr)?; - let writer = reader.try_clone()?; + trace!("Begin client connection"); + let reader = TcpStream::connect(addr).in_current_span()?; + let ip = reader.peer_addr()?.ip(); + let span = error_span!("Connection", %ip).entered(); + let writer = reader.try_clone().in_current_span()?; eprintln!("Clipboards connected"); thread::spawn(move || send_clipboard(writer)); recv_clipboard(reader)?; + trace!("Finish client connection"); + span.exit(); eprintln!("Clipboard closed"); Ok(()) } else { @@ -82,7 +111,8 @@ fn start_client(clipboard_port: u16) -> io::Result<()> { } } -fn send_clipboard(mut stream: impl Write) -> io::Result<()> { +#[instrument(skip(stream))] +fn send_clipboard(mut stream: impl Write) -> Result<(), Box> { let mut clipboard = Clipboard::new().unwrap(); let mut curr_paste = hash(&clipboard.get_text().unwrap_or_default()); loop { @@ -92,7 +122,9 @@ fn send_clipboard(mut stream: impl Write) -> io::Result<()> { if !paste.is_empty() { let text = paste.as_bytes(); let buf = [&text.len().to_be_bytes(), text].concat(); - if stream.write(&buf)? == 0 { + trace!(text = paste, "Sent text"); + if stream.write(&buf).in_current_span()? == 0 { + trace!("Stream closed"); break Ok(()); } } @@ -102,18 +134,21 @@ fn send_clipboard(mut stream: impl Write) -> io::Result<()> { } } -fn recv_clipboard(mut stream: impl Read) -> io::Result<()> { +#[instrument(skip(stream))] +fn recv_clipboard(mut stream: impl Read) -> Result<(), Box> { let mut clipboard = Clipboard::new().unwrap(); loop { let mut buf = [0; mem::size_of::()]; if stream.read(&mut buf)? == 0 { + trace!("Stream closed"); break Ok(()); } let len = usize::from_be_bytes(buf); let mut buf = vec![0; len]; - stream.read_exact(&mut buf)?; + stream.read_exact(&mut buf).in_current_span()?; if let Ok(text) = std::str::from_utf8(&buf) { + trace!(text = text, "Received text"); while let Err(ClipboardError::ClipboardOccupied) = clipboard.set_text(text) { sleep(Duration::from_secs(1)); }