feat: iroh-one

Cargo.toml

@@ -8,6 +8,7 @@ members = [
   "iroh-rpc-types",
   "iroh-gateway",
   "iroh-metrics",
+  "iroh-one",
   "iroh-p2p",
   "iroh-resolver",
   "iroh-store",

iroh-gateway/src/bad_bits.rs

@@ -194,7 +194,7 @@ mod tests {
         let gw_metrics = Metrics::new(&mut prom_registry);
         let rpc_addr = "grpc://0.0.0.0:0".parse().unwrap();
         let handler = crate::core::Core::new(
-            config,
+            Arc::new(config),
             rpc_addr,
             gw_metrics,
             &mut prom_registry,

iroh-gateway/src/cli.rs

@@ -0,0 +1,47 @@
+/// CLI arguments support.
+use clap::Parser;
+use std::collections::HashMap;
+use std::path::PathBuf;
+
+#[derive(Parser, Debug, Clone)]
+#[clap(author, version, about, long_about = None)]
+pub struct Args {
+    #[clap(short, long)]
+    port: Option<u16>,
+    #[clap(short, long)]
+    writeable: Option<bool>,
+    #[clap(short, long)]
+    fetch: Option<bool>,
+    #[clap(short, long)]
+    cache: Option<bool>,
+    #[clap(long)]
+    metrics: bool,
+    #[clap(long)]
+    tracing: bool,
+    #[clap(long)]
+    pub cfg: Option<PathBuf>,
+    #[clap(long)]
+    denylist: bool,
+}
+
+impl Args {
+    pub fn make_overrides_map(&self) -> HashMap<&str, String> {
+        let mut map: HashMap<&str, String> = HashMap::new();
+        if let Some(port) = self.port {
+            map.insert("port", port.to_string());
+        }
+        if let Some(writable) = self.writeable {
+            map.insert("writable", writable.to_string());
+        }
+        if let Some(fetch) = self.fetch {
+            map.insert("fetch", fetch.to_string());
+        }
+        if let Some(cache) = self.cache {
+            map.insert("cache", cache.to_string());
+        }
+        map.insert("denylist", self.denylist.to_string());
+        map.insert("metrics.collect", self.metrics.to_string());
+        map.insert("metrics.tracing", self.tracing.to_string());
+        map
+    }
+}

iroh-gateway/src/client.rs

@@ -20,7 +20,7 @@ use tokio_util::io::ReaderStream;
 use tracing::info;
 use tracing::warn;
 
-use crate::core::GetParams;
+use crate::handlers::GetParams;
 use crate::response::ResponseFormat;
 
 #[derive(Debug, Clone)]

iroh-gateway/src/config.rs

@@ -29,17 +29,17 @@ pub struct Config {
     pub cache: bool,
     /// default port to listen on
     pub port: u16,
+    /// flag to toggle whether the gateway should use denylist on requests
+    pub denylist: bool,
+    /// rpc addresses for the gateway & addresses for the rpc client to dial
+    pub rpc_client: RpcClientConfig,
+    /// metrics configuration
+    pub metrics: MetricsConfig,
     // NOTE: for toml to serialize properly, the "table" values must be serialized at the end, and
     // so much come at the end of the `Config` struct
     /// set of user provided headers to attach to all responses
     #[serde(with = "http_serde::header_map")]
     pub headers: HeaderMap,
-    /// rpc addresses for the gateway & addresses for the rpc client to dial
-    pub rpc_client: RpcClientConfig,
-    /// metrics configuration
-    pub metrics: MetricsConfig,
-    /// flag to toggle whether the gateway should use denylist on requests
-    pub denylist: bool,
 }
 
 impl Config {
@@ -167,6 +167,20 @@ impl Source for Config {
     }
 }
 
+impl crate::handlers::StateConfig for Config {
+    fn rpc_client(&self) -> &iroh_rpc_client::Config {
+        &self.rpc_client
+    }
+
+    fn port(&self) -> u16 {
+        self.port
+    }
+
+    fn user_headers(&self) -> &HeaderMap<HeaderValue> {
+        &self.headers
+    }
+}
+
 fn collect_headers(headers: &HeaderMap) -> Result<Map<String, Value>, ConfigError> {
     let mut map = Map::new();
     for (key, value) in headers.iter() {