diff --git a/Cargo.lock b/Cargo.lock index 57076f80..85980a07 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -872,9 +872,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] @@ -1620,9 +1620,9 @@ dependencies = [ [[package]] name = "idna" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -2161,9 +2161,9 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pin-project" @@ -2565,6 +2565,7 @@ dependencies = [ "tracing-logfmt", "tracing-subscriber", "ureq", + "url", ] [[package]] @@ -3734,9 +3735,9 @@ dependencies = [ [[package]] name = "url" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", "idna", diff --git a/radicle-httpd/Cargo.toml b/radicle-httpd/Cargo.toml index 93825e6c..491c013d 100644 --- a/radicle-httpd/Cargo.toml +++ b/radicle-httpd/Cargo.toml @@ -38,6 +38,7 @@ tracing = { version = "0.1.37", default-features = false, features = ["std", "lo tracing-logfmt = { version = "0.2", optional = true } tracing-subscriber = { version = "0.3", default-features = false, features = ["std", "ansi", "fmt"] } ureq = { version = "2.9", default-features = false, features = ["json"] } +url = { version = "2.5.0" } [dependencies.radicle] path = "../radicle" diff --git a/radicle-httpd/src/commands/web.rs b/radicle-httpd/src/commands/web.rs index 952cc53c..dc12ab67 100644 --- a/radicle-httpd/src/commands/web.rs +++ b/radicle-httpd/src/commands/web.rs @@ -1,7 +1,12 @@ use std::ffi::OsString; +use std::net::{IpAddr, Ipv4Addr, SocketAddr}; +use std::process::Command; +use std::thread::sleep; +use std::time::Duration; -use anyhow::anyhow; +use anyhow::{anyhow, Context}; use serde::{Deserialize, Serialize}; +use url::Url; use radicle::crypto::{PublicKey, Signature, Signer}; @@ -10,19 +15,20 @@ use radicle_cli::terminal::args::{Args, Error, Help}; pub const HELP: Help = Help { name: "web", - description: "Connect web with node", + description: "Start HTTP API server and connect the web explorer to it", version: env!("CARGO_PKG_VERSION"), usage: r#" Usage - rad web [