Move stuff around and minimize dependencies

Author: rklaehn

.gitignore

@@ -1,3 +1,7 @@
 target/
 *iroh-data
-*/.sendme*
+*/.sendme*
+
+# Added by cargo
+
+/target

Cargo.toml

@@ -0,0 +1,8 @@
+[package]
+name = "iroh-examples"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]

iroh-mainline-content-discovery/Cargo.lock

@@ -1,53 +1,25 @@
-[package]
-name = "iroh-mainline-content-discovery"
-version = "0.3.0"
-edition = "2021"
-description = "Content discovery for iroh, using the bittorrent mainline DHT"
-license = "MIT OR Apache-2.0"
+[workspace]
+members = [
+  "iroh-mainline-content-discovery",
+  "iroh-mainline-tracker",
+]
+resolver = "2"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[profile.release]
+debug = true
 
-[dependencies]
-anyhow = { version = "1", features = ["backtrace"] }
-bao-tree = { version = "0.9.1", features = ["tokio_fsm"], default-features = false, optional = true }
-bytes = "1"
-clap = { version = "4", features = ["derive"], optional = true }
-derive_more = { version = "1.0.0-beta.1", features = ["debug", "display", "from", "try_into"] }
-dirs-next = "2"
-ed25519-dalek = "2.1.0"
-futures = "0.3.25"
-hex = "0.4.3"
-humantime = "2.1.0"
-iroh-net = "0.12.0"
-iroh-bytes = "0.12.0"
-iroh-pkarr-node-discovery = { path = "../iroh-pkarr-node-discovery" }
-mainline = "1.0.0"
-pkarr = { version = "1.0.1", features = ["async"] }
-postcard = { version = "1", default-features = false, features = ["alloc", "use-std", "experimental-derive"] }
-quinn = "0.10"
-rand = "0.8"
-rcgen = "0.12.0"
-redb = "1.5.0"
-rustls = "0.21"
-serde = { version = "1", features = ["derive"] }
-serde_json = "1.0.107"
-simple-mdns = { version = "0.5.0", features = ["async-tokio"] }
-tempfile = "3.4"
-tokio = { version = "1", features = ["io-util", "rt"] }
-tokio-util = { version = "0.7", features = ["io-util", "io", "rt"] }
-toml = "0.7.3"
-tracing = "0.1"
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
-ttl_cache = "0.5.1"
-url = "2.5.0"
-flume = "0.11.0"
-genawaiter = { version = "0.99.1", features = ["futures03"] }
+[profile.optimized-release]
+inherits = 'release'
+debug = false
+lto = true
+debug-assertions = false
+opt-level = 3
+panic = 'abort'
+incremental = false
 
-[features]
-cli = ["clap", "tracker"]
-tracker = ["bao-tree"]
-default = ["cli"]
 
-[[bin]]
-name = "iroh-mainline-content-discovery"
-required-features = ["cli"]
+[workspace.lints.rust]
+missing_debug_implementations = "warn"
+
+[workspace.lints.clippy]
+unused-async = "warn"

iroh-mainline-content-discovery/Cargo.toml

@@ -1,11 +1,6 @@
-# Iroh content tracker
+# Iroh content discovery
 
-This is an example how to write a simple service using mostly iroh-net.
-The purpose of this service is to track providers of iroh content.
-
-You can *announce* to a tracker that you believe some host has some content.
-The tracker will then periodically *verify* that the content is present.
-Finally, you can *query* a tracker for hosts for a content.
+This library provides global content discovery for iroh.
 
 ## Building from source
 

iroh-mainline-content-discovery/README.md

@@ -0,0 +1,44 @@
+[package]
+name = "iroh-mainline-content-discovery"
+version = "0.3.0"
+edition = "2021"
+description = "Content discovery for iroh, using the bittorrent mainline DHT"
+license = "MIT OR Apache-2.0"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+# Required features for the protocol types
+iroh-net = "0.12.0"
+iroh-bytes = "0.12.0"
+serde = { version = "1", features = ["derive"] }
+
+# Optional features for the client
+tracing = { version = "0.1", optional = true }
+quinn = { version = "0.10", optional = true }
+iroh-pkarr-node-discovery = { path = "../../iroh-pkarr-node-discovery", optional = true }
+mainline = { version = "1.0.0", optional = true }
+pkarr = { version = "1.0.1", features = ["async"], optional = true }
+anyhow = { version = "1", features = ["backtrace"], optional = true }
+postcard = { version = "1", default-features = false, features = ["alloc", "use-std"], optional = true }
+ed25519-dalek = { version = "2.1.0", optional = true }
+futures = { version = "0.3.25", optional = true }
+rcgen = { version = "0.12.0", optional = true }
+rustls = { version = "0.21", optional = true }
+genawaiter = { version = "0.99.1", features = ["futures03"], optional = true }
+
+# Optional features for the cli
+clap = { version = "4", features = ["derive"], optional = true }
+tempfile = { version = "3.4", optional = true }
+derive_more = { version = "1.0.0-beta.1", features = ["debug", "display", "from", "try_into"], optional = true }
+tracing-subscriber = { version = "0.3", features = ["env-filter"], optional = true }
+tokio = { version = "1", features = ["io-util", "rt"], optional = true }
+
+[features]
+client = ["iroh-pkarr-node-discovery", "mainline", "pkarr", "quinn", "tracing", "anyhow", "rcgen", "genawaiter", "rustls", "futures", "postcard"]
+cli = ["client", "clap", "tempfile", "derive_more", "tracing-subscriber", "tokio"]
+default = []
+
+[[bin]]
+name = "iroh-mainline-content-discovery"
+required-features = ["cli"]

iroh-mainline-content-discovery/iroh-mainline-content-discovery/Cargo.toml

@@ -13,25 +13,10 @@ pub struct Args {
 
 #[derive(Subcommand, Debug)]
 pub enum Commands {
-    Server(ServerArgs),
     Announce(AnnounceArgs),
     Query(QueryArgs),
 }
 
-#[derive(Parser, Debug)]
-pub struct ServerArgs {
-    /// The port to listen on.
-    #[clap(long, default_value_t = 0xacacu16)]
-    pub magic_port: u16,
-
-    /// The quinn port to listen on.
-    #[clap(long, default_value_t = 0xbcbcu16)]
-    pub quinn_port: u16,
-
-    #[clap(long)]
-    pub quiet: bool,
-}
-
 /// Various ways to specify content.
 #[derive(Debug, Clone, derive_more::From)]
 pub enum ContentArg {