refactor: Implement log and authentication as tower::Layer

Cargo.toml

@@ -53,6 +53,7 @@ prost = "0.12.6"
 async-channel = "2.3.1"
 tower = "0.4.13"
 async-trait = "0.1.81"
+pin-project = "1.1.5"
 
 [dependencies.web-sys]
 version = "0.3.63"
@@ -65,6 +66,7 @@ features = [
 ]
 
 [dev-dependencies]
+futures-util = "0.3.30"
 mockito = "1.4.0"
 test-case = "3.3.1"
 tokio = { version = "1.39.1", features = ["macros"]}

src/app.rs

@@ -9,6 +9,7 @@
     Router,
 };
 use http::StatusCode;
+use time::OffsetDateTime;
 use url::Url;
 
 use crate::{package, pyoci::PyOciError, templates, PyOci};
@@ -50,24 +51,32 @@
             "/:registry/:namespace/",
             post(publish_package).layer(DefaultBodyLimit::max(50 * 1024 * 1024)),
         )
-        .layer(axum::middleware::from_fn(trace_middleware))
+        .layer(axum::middleware::from_fn(accesslog_middleware))
 }
 
 /// Log incoming requests
-async fn trace_middleware(
+async fn accesslog_middleware(
     method: axum::http::Method,
     uri: axum::http::Uri,
     headers: axum::http::HeaderMap,
     request: axum::extract::Request,
     next: axum::middleware::Next,
 ) -> axum::response::Response {
+    let start = OffsetDateTime::now_utc();
     let response = next.run(request).await;
 
     let status: u16 = response.status().into();
     let user_agent = headers
         .get("user-agent")
         .map(|ua| ua.to_str().unwrap_or(""));
-    tracing::info!(method = %method, status, path = %uri.path(), user_agent, "type" = "request");
+    tracing::info!(
+        elapsed_ms = (OffsetDateTime::now_utc() - start).whole_milliseconds(),
+        method = method.to_string(),
+        status,
+        path = uri.path(),
+        user_agent,
+        "type" = "request"
+    );
     response
 }
 
@@ -90,7 +99,7 @@
 
     let package: package::Info = path_params.0.try_into()?;
 
-    let client = PyOci::new(package.registry.clone(), auth);
+    let mut client = PyOci::new(package.registry.clone(), auth)?;
     // Fetch at most 45 packages
     // https://developers.cloudflare.com/workers/platform/limits/#account-plan-limits
     let files = client.list_package_files(&package, 45).await?;
@@ -101,7 +110,7 @@
 }
 
 /// Download package request handler
-// #[debug_handler]
+#[debug_handler]
 // Mark the handler as Send when building a wasm target
 //  JsFuture, and most other JS objects are !Send
 //  Because the cloudflare worker runtime is single-threaded, we can safely mark this as Send
@@ -117,15 +126,14 @@
     };
     let package: package::Info = path_params.0.try_into()?;
 
-    let client = PyOci::new(package.registry.clone(), auth);
+    let mut client = PyOci::new(package.registry.clone(), auth)?;
     let data = client
         .download_package_file(&package)
         .await?
         .bytes()
         .await
         .expect("valid bytes");
 
-    // TODO: With some trickery we could stream the data directly to the response
     Ok((
         [(
             header::CONTENT_DISPOSITION,
@@ -138,7 +146,7 @@
 /// Publish package request handler
 ///
 /// ref: https://warehouse.pypa.io/api-reference/legacy.html#upload-api
-// #[debug_handler]
+#[debug_handler]
 // Mark the handler as Send when building a wasm target
 //  JsFuture, and most other JS objects are !Send
 //  Because the cloudflare worker runtime is single-threaded, we can safely mark this as Send
@@ -156,7 +164,7 @@
         None => None,
     };
     let package: package::Info = (registry, namespace, None, form_data.filename).try_into()?;
-    let client = PyOci::new(package.registry.clone(), auth);
+    let mut client = PyOci::new(package.registry.clone(), auth)?;
 
     client
         .publish_package_file(&package, form_data.content)

src/lib.rs

@@ -14,6 +14,8 @@ mod pyoci;
 mod templates;
 // HTTP Transport
 mod transport;
+// Services
+mod service;
 // Re-export the PyOci client
 pub use pyoci::PyOci;
 

src/otlp.rs

@@ -214,7 +214,7 @@
 
     fn on_close(&self, id: tracing_core::span::Id, ctx: Context<'_, S>) {
         let span = ctx.span(&id).expect("span not found");
-        if !span.parent().is_none() {
+        if span.parent().is_some() {
             // This is a sub-span, we'll flush all messages when the root span is closed
             return;
         }