feat: migrate web server to axum

.rustfmt.toml

@@ -1,3 +0,0 @@
-imports_granularity = "Crate"
-group_imports = "StdExternalCrate"
-use_field_init_shorthand = true

Cargo.lock

@@ -497,12 +497,6 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "error_reporter"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31ae425815400e5ed474178a7a22e275a9687086a12ca63ec793ff292d8fdae8"
-
 [[package]]
 name = "faster-hex"
 version = "0.9.0"
@@ -2634,7 +2628,6 @@ dependencies = [
  "crates-index",
  "derive_more",
  "dotenvy",
- "error_reporter",
  "font-awesome-as-a-crate",
  "futures-util",
  "gix",
@@ -2643,7 +2636,6 @@ dependencies = [
  "lru_time_cache",
  "maud",
  "once_cell",
- "parking_lot",
  "pulldown-cmark",
  "relative-path",
  "reqwest",

Cargo.toml

@@ -22,12 +22,10 @@ derive_more = "0.99"
 dotenvy = "0.15"
 font-awesome-as-a-crate = "0.3"
 futures-util = { version = "0.3", default-features = false, features = ["std"] }
-error_reporter = "1"
 indexmap = { version = "2", features = ["serde"] }
 lru_time_cache = "0.11"
 maud = "0.26"
 once_cell = "1"
-parking_lot = "0.12"
 pulldown-cmark = "0.11"
 relative-path = { version = "1", features = ["serde"] }
 reqwest = { version = "0.12", features = ["json"] }

build.rs

@@ -1,4 +1,6 @@
-use std::{env, fs, path::Path};
+use std::env;
+use std::fs;
+use std::path::Path;
 
 use sha1::{Digest, Sha1};
 

libs/badge/badge.rs

@@ -235,8 +235,8 @@ mod tests {
     #[test]
     #[ignore]
     fn test_to_svg() {
-        use std::{fs::File, io::Write as _};
+        use std::fs::File;
-
+        use std::io::Write;
         let mut file = File::create("test.svg").unwrap();
         let options = BadgeOptions {
             subject: "latest".to_owned(),

src/engine/fut/crawl.rs

@@ -2,12 +2,11 @@ use anyhow::Error;
 use futures_util::{future::BoxFuture, stream::FuturesOrdered, FutureExt as _, StreamExt as _};
 use relative_path::RelativePathBuf;
 
-use crate::{
+use crate::models::repo::RepoPath;
-    engine::{
+
+use crate::engine::{
     machines::crawler::{ManifestCrawler, ManifestCrawlerOutput},
     Engine,
-    },
-    models::repo::RepoPath,
 };
 
 pub async fn crawl_manifest(

src/engine/fut/mod.rs

@@ -1,4 +1,5 @@
 mod analyze;
 mod crawl;
 
-pub use self::{analyze::analyze_dependencies, crawl::crawl_manifest};
+pub use self::analyze::analyze_dependencies;
+pub use self::crawl::crawl_manifest;

src/engine/machines/analyzer.rs

@@ -101,9 +101,10 @@ impl DependencyAnalyzer {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
     use crate::models::crates::{CrateDep, CrateDeps, CrateRelease};
 
+    use super::*;
+
     #[test]
     fn tracks_latest_without_matching() {
         let mut deps = CrateDeps::default();

src/engine/machines/crawler.rs

@@ -4,10 +4,8 @@ use anyhow::Error;
 use indexmap::IndexMap;
 use relative_path::RelativePathBuf;
 
-use crate::{
+use crate::models::crates::{CrateDep, CrateDeps, CrateManifest, CrateName};
-    models::crates::{CrateDep, CrateDeps, CrateManifest, CrateName},
+use crate::parsers::manifest::parse_manifest_toml;
-    parsers::manifest::parse_manifest_toml,
-};
 
 pub struct ManifestCrawlerOutput {
     pub crates: IndexMap<CrateName, CrateDeps>,
@@ -120,9 +118,10 @@ mod tests {
     use relative_path::RelativePath;
     use semver::VersionReq;
 
-    use super::*;
     use crate::models::crates::CrateDep;
 
+    use super::*;
+
     #[test]
     fn simple_package_manifest() {
         let manifest = r#"

src/engine/mod.rs

@@ -7,6 +7,7 @@ use std::{
 
 use anyhow::{anyhow, Error};
 use cadence::{MetricSink, NopMetricSink, StatsdClient};
+
 use futures_util::{
     future::try_join_all,
     stream::{self, BoxStream},
@@ -18,20 +19,14 @@ use rustsec::database::Database;
 use semver::VersionReq;
 use tower::Service;
 
-use crate::{
+use crate::interactors::crates::{GetPopularCrates, QueryCrate};
-    interactors::{
+use crate::interactors::github::GetPopularRepos;
-        crates::{GetPopularCrates, QueryCrate},
+use crate::interactors::rustsec::FetchAdvisoryDatabase;
-        github::GetPopularRepos,
+use crate::interactors::RetrieveFileAtPath;
-        rustsec::FetchAdvisoryDatabase,
+use crate::models::crates::{AnalyzedDependencies, CrateName, CratePath, CrateRelease};
-        RetrieveFileAtPath,
+use crate::models::repo::{RepoPath, Repository};
-    },
+use crate::utils::cache::Cache;
-    models::{
+use crate::ManagedIndex;
-        crates::{AnalyzedDependencies, CrateName, CratePath, CrateRelease},
-        repo::{RepoPath, Repository},
-    },
-    utils::cache::Cache,
-    ManagedIndex,
-};
 
 mod fut;
 mod machines;

src/interactors/crates.rs

@@ -1,16 +1,14 @@
-use std::{
+use std::{fmt, str, task::Context, task::Poll};
-    fmt, str,
-    task::{Context, Poll},
-};
 
 use anyhow::{anyhow, Error};
 use crates_index::{Crate, DependencyKind};
 use futures_util::FutureExt as _;
 use semver::{Version, VersionReq};
 use serde::Deserialize;
-use tokio::task::spawn_blocking;
 use tower::Service;
 
+use tokio::task::spawn_blocking;
+
 use crate::{
     models::crates::{CrateDep, CrateDeps, CrateName, CratePath, CrateRelease},
     BoxFuture, ManagedIndex,

src/interactors/github.rs

@@ -4,6 +4,7 @@ use std::{
 };
 
 use anyhow::Error;
+
 use futures_util::FutureExt as _;
 use serde::Deserialize;
 use tower::Service;

src/interactors/rustsec.rs

@@ -1,8 +1,4 @@
-use std::{
+use std::{fmt, sync::Arc, task::Context, task::Poll};
-    fmt,
-    sync::Arc,
-    task::{Context, Poll},
-};
 
 use anyhow::Error;
 use futures_util::FutureExt as _;

src/main.rs

@@ -21,7 +21,9 @@ mod parsers;
 mod server;
 mod utils;
 
-use self::{engine::Engine, server::App, utils::index::ManagedIndex};
+use self::engine::Engine;
+use self::server::App;
+use self::utils::index::ManagedIndex;
 
 /// Future crate's BoxFuture without the explicit lifetime parameter.
 pub type BoxFuture<T> = Pin<Box<dyn Future<Output = T> + Send>>;

src/parsers/manifest.rs

@@ -135,9 +135,10 @@ pub fn parse_manifest_toml(input: &str) -> Result<CrateManifest, Error> {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
     use crate::models::crates::CrateManifest;
 
+    use super::*;
+
     #[test]
     fn parse_workspace_without_members_declaration() {
         let toml = r#"[package]

src/server/mod.rs

@@ -22,14 +22,10 @@ mod views;
 use self::assets::{
     STATIC_LINKS_JS_ETAG, STATIC_LINKS_JS_PATH, STATIC_STYLE_CSS_ETAG, STATIC_STYLE_CSS_PATH,
 };
-use crate::{
+use crate::engine::{AnalyzeDependenciesOutcome, Engine};
-    engine::{AnalyzeDependenciesOutcome, Engine},
+use crate::models::crates::{CrateName, CratePath};
-    models::{
+use crate::models::repo::RepoPath;
-        crates::{CrateName, CratePath},
+use crate::models::SubjectPath;
-        repo::RepoPath,
-        SubjectPath,
-    },
-};
 
 #[derive(Debug, Clone, Copy, PartialEq)]
 enum StatusFormat {

src/server/views/badge.rs

@@ -1,7 +1,10 @@
-use axum::{body::Body, http::header::CONTENT_TYPE, response::Response};
+use axum::body::Body;
+use axum::http::header::CONTENT_TYPE;
+use axum::response::Response;
 use badge::{Badge, BadgeOptions};
 
-use crate::{engine::AnalyzeDependenciesOutcome, server::ExtraConfig};
+use crate::engine::AnalyzeDependenciesOutcome;
+use crate::server::ExtraConfig;
 
 pub fn badge(
     analysis_outcome: Option<&AnalyzeDependenciesOutcome>,

src/server/views/html/index.rs

@@ -1,10 +1,10 @@
 use axum::{body::Body, response::Response};
 use maud::{html, Markup};
 
-use crate::{
+use crate::models::crates::CratePath;
-    models::{crates::CratePath, repo::Repository},
+use crate::models::repo::Repository;
-    server::assets::STATIC_LINKS_JS_PATH,
+
-};
+use crate::server::assets::STATIC_LINKS_JS_PATH;
 
 fn link_forms() -> Markup {
     html! {

src/server/views/html/mod.rs

@@ -1,13 +1,15 @@
 use std::time::Duration;
 
-use axum::{body::Body, http::header::CONTENT_TYPE, response::Response};
+use axum::http::header::CONTENT_TYPE;
+use axum::{body::Body, response::Response};
 use maud::{html, Markup, Render, DOCTYPE};
 
 pub mod error;
 pub mod index;
 pub mod status;
 
-use crate::server::{assets::STATIC_STYLE_CSS_PATH, SELF_BASE_URL};
+use crate::server::assets::STATIC_STYLE_CSS_PATH;
+use crate::server::SELF_BASE_URL;
 
 fn render_html<B: Render>(title: &str, body: B) -> Response<Body> {
     let rendered = html! {

src/server/views/html/status.rs

@@ -6,15 +6,12 @@ use pulldown_cmark::{html, Parser};
 use rustsec::advisory::Advisory;
 use semver::Version;
 
-use crate::{
+use crate::engine::AnalyzeDependenciesOutcome;
-    engine::AnalyzeDependenciesOutcome,
+use crate::models::crates::{AnalyzedDependencies, AnalyzedDependency, CrateName};
-    models::{
+use crate::models::repo::RepoSite;
-        crates::{AnalyzedDependencies, AnalyzedDependency, CrateName},
+use crate::models::SubjectPath;
-        repo::RepoSite,
+use crate::server::views::badge;
-        SubjectPath,
+use crate::server::ExtraConfig;
-    },
-    server::{views::badge, ExtraConfig},
-};
 
 fn get_crates_url(name: impl AsRef<str>) -> String {
     format!("https://crates.io/crates/{}", name.as_ref())

src/utils/index.rs

@@ -1,14 +1,13 @@
-use std::{sync::Arc, time::Duration};
+use std::sync::Arc;
-
+use std::sync::Mutex;
-use anyhow::Result;
+use std::time::Duration;
-use crates_index::{Crate, GitIndex};
-use parking_lot::Mutex;
-use tokio::{
-    task::spawn_blocking,
-    time::{self, MissedTickBehavior},
-};
 
 use crate::models::crates::CrateName;
+use anyhow::Result;
+use crates_index::Crate;
+use crates_index::GitIndex;
+use tokio::task::spawn_blocking;
+use tokio::time::{self, MissedTickBehavior};
 
 #[derive(Clone)]
 pub struct ManagedIndex {
@@ -24,7 +23,9 @@ impl ManagedIndex {
     }
 
     pub fn crate_(&self, crate_name: CrateName) -> Option<Crate> {
-        self.index.lock().crate_(crate_name.as_ref())
+        let index = self.index.lock().unwrap();
+
+        index.crate_(crate_name.as_ref())
     }
 
     pub async fn refresh_at_interval(&self, update_interval: Duration) {
@@ -34,21 +35,22 @@ impl ManagedIndex {
         loop {
             if let Err(err) = self.refresh().await {
                 tracing::error!(
-                    "failed refreshing the crates.io-index, the operation will be retried: {}",
+                    "failed refreshing the crates.io-index, the operation will be retried: {err}"
-                    error_reporter::Report::new(err),
                 );
             }
             update_interval.tick().await;
         }
     }
 
-    async fn refresh(&self) -> Result<(), crates_index::Error> {
+    async fn refresh(&self) -> Result<()> {
         let index = Arc::clone(&self.index);
 
-        spawn_blocking(move || index.lock().update())
+        spawn_blocking(move || {
-            .await
+            let mut index = index.lock().unwrap();
-            .expect("blocking index update task should never panic")?;
 
+            index.update()
+        })
+        .await??;
         Ok(())
     }
 }