Radish alpha
h
heartwood
Radicle Heartwood Protocol & Stack
Radicle
Git (anonymous pull)
Log in to clone via SSH
Commits ›
httpd: Serve a local web client from httpd
✗ CI failure Sebastian Martinez committed 2 years ago
commit e10b85ce436d6165c2efe1277b022ff8e4671653
parent 574ac3566bd465d5306cd58d17ff9c87a5118ddd
1 failed (1 total) View logs
3 files changed +87 -20
modified Cargo.lock
@@ -1471,18 +1471,24 @@ dependencies = [


[[package]]

name = "http-body-util"
- 
version = "0.1.0"
+ 
version = "0.1.1"

source = "registry+https://github.com/rust-lang/crates.io-index"
- 
checksum = "41cb79eb393015dadd30fc252023adb0b2400a0caee0fa2a077e6e21a551e840"
+ 
checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d"

dependencies = [

 "bytes",
- 
 "futures-util",
+ 
 "futures-core",

 "http",

 "http-body",

 "pin-project-lite",

]



[[package]]
+ 
name = "http-range-header"
+ 
version = "0.4.0"
+ 
source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
checksum = "3ce4ef31cda248bbdb6e6820603b82dfcd9e833db65a43e997a0ccec777d11fe"
+
+ 
[[package]]

name = "httparse"

version = "1.8.0"

source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1806,6 +1812,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"



[[package]]
+ 
name = "mime_guess"
+ 
version = "2.0.4"
+ 
source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef"
+ 
dependencies = [
+ 
 "mime",
+ 
 "unicase",
+ 
]
+
+ 
[[package]]

name = "miniz_oxide"

version = "0.7.1"

source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2475,6 +2491,7 @@ dependencies = [
 "chrono",

 "fastrand",

 "flate2",
+ 
 "http-body-util",

 "hyper",

 "lexopt",

 "lru",
@@ -3334,10 +3351,18 @@ checksum = "0da193277a4e2c33e59e09b5861580c33dd0a637c3883d0fa74ba40c0374af2e"
dependencies = [

 "bitflags 2.4.2",

 "bytes",
+ 
 "futures-util",

 "http",

 "http-body",

 "http-body-util",
+ 
 "http-range-header",
+ 
 "httpdate",
+ 
 "mime",
+ 
 "mime_guess",
+ 
 "percent-encoding",

 "pin-project-lite",
+ 
 "tokio",
+ 
 "tokio-util",

 "tower-layer",

 "tower-service",

 "tracing",
@@ -3570,6 +3595,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"



[[package]]
+ 
name = "unicase"
+ 
version = "2.7.0"
+ 
source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89"
+ 
dependencies = [
+ 
 "version_check",
+ 
]
+
+ 
[[package]]

name = "unicode-bidi"

version = "0.3.15"

source = "registry+https://github.com/rust-lang/crates.io-index"
modified radicle-httpd/Cargo.toml
@@ -11,10 +11,7 @@ build = "build.rs"


[features]

default = []
- 
logfmt = [
- 
  "tracing-logfmt",
- 
  "tracing-subscriber/env-filter"
- 
]
+ 
logfmt = ["tracing-logfmt", "tracing-subscriber/env-filter"]



[[bin]]

name = "radicle-httpd"
@@ -26,8 +23,15 @@ path = "src/bin/rad-web.rs"


[dependencies]

anyhow = { version = "1" }
- 
axum = { version = "0.7.2", default-features = false, features = ["json", "query", "tokio", "http1"] }
- 
axum-auth = { version= "0.7.0", default-features = false, features = ["auth-bearer"] }
+ 
axum = { version = "0.7.2", default-features = false, features = [
+ 
  "json",
+ 
  "query",
+ 
  "tokio",
+ 
  "http1",
+ 
] }
+ 
axum-auth = { version = "0.7.0", default-features = false, features = [
+ 
  "auth-bearer",
+ 
] }

axum-server = { version = "0.6.0", default-features = false }

base64 = "0.21.3"

chrono = { version = "0.4.22", default-features = false, features = ["clock"] }
@@ -37,16 +41,34 @@ hyper = { version = "1.0.1", default-features = false }
lexopt = { version = "0.3.0" }

lru = { version = "0.12.0" }

nonempty = { version = "0.9.0", features = ["serialize"] }
- 
radicle-surf = { version = "0.19.0", default-features = false, features = ["serde"] }
+ 
radicle-surf = { version = "0.19.0", default-features = false, features = [
+ 
  "serde",
+ 
] }

serde = { version = "1", features = ["derive"] }

serde_json = { version = "1", features = ["preserve_order"] }

thiserror = { version = "1" }

time = { version = "0.3.17", features = ["parsing", "serde"] }
- 
tokio = { version = "1.21", default-features = false, features = ["macros", "rt-multi-thread"] }
- 
tower-http = { version = "0.5", default-features = false, features = ["trace", "cors", "set-header"] }
- 
tracing = { version = "0.1.37", default-features = false, features = ["std", "log"] }
+ 
tokio = { version = "1.21", default-features = false, features = [
+ 
  "macros",
+ 
  "rt-multi-thread",
+ 
] }
+ 
http-body-util = "0.1.1"
+ 
tower-http = { version = "0.5", default-features = false, features = [
+ 
  "trace",
+ 
  "fs",
+ 
  "cors",
+ 
  "set-header",
+ 
] }
+ 
tracing = { version = "0.1.37", default-features = false, features = [
+ 
  "std",
+ 
  "log",
+ 
] }

tracing-logfmt = { version = "0.3", optional = true }
- 
tracing-subscriber = { version = "0.3", default-features = false, features = ["std", "ansi", "fmt"] }
+ 
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" }
modified radicle-httpd/src/lib.rs
@@ -18,6 +18,7 @@ use axum::http::{Request, Response};
use axum::middleware;

use axum::Router;

use tokio::net::TcpListener;
+ 
use tower_http::services::{ServeDir, ServeFile};

use tower_http::trace::TraceLayer;

use tracing::Span;
@@ -110,15 +111,25 @@ pub async fn run(options: Options) -> anyhow::Result<()> {
fn router(options: Options, profile: Profile) -> anyhow::Result<Router> {

    let profile = Arc::new(profile);

    let ctx = api::Context::new(profile.clone(), &options);
+ 
    let path = profile.path();
+ 
    let local_ui = std::env::var("SERVE_LOCAL_UI").unwrap_or("0".to_string());



    let api_router = api::router(ctx);

    let git_router = git::router(profile.clone(), options.aliases);
- 
    let raw_router = raw::router(profile);
-
- 
    let app = Router::new()
- 
        .merge(git_router)
- 
        .nest("/api", api_router)
- 
        .nest("/raw", raw_router);
+ 
    let raw_router = raw::router(profile.clone());
+
+ 
    let mut app = Router::new();
+ 
    app = app.nest("/api", api_router).nest("/raw", raw_router);
+
+ 
    if local_ui == "1" {
+ 
        app = app.nest_service(
+ 
            "/",
+ 
            ServeDir::new(path.join("ui/latest"))
+ 
                .not_found_service(ServeFile::new(path.join("ui/latest/index.html"))),
+ 
        );
+ 
    } else {
+ 
        app = app.merge(git_router);
+ 
    }



    Ok(app)

}