Fix missing server timing in some cases

- Updated response handling to use a builder pattern for better clarity and consistency.
- Enhanced server timing format to include microseconds in the output.
- Added a new test for server timing in redirect responses to ensure proper header inclusion.

Author: lovasoa

src/render.rs

@@ -243,8 +243,7 @@ impl HeaderContext {
         let link = get_object_str(data, "link")
             .with_context(|| "The redirect component requires a 'link' property")?;
         self.response.insert_header((header::LOCATION, link));
-        let response = self.response.body(());
-        Ok(response)
+        Ok(self.into_response_builder().body(()))
     }
 
     /// Answers to the HTTP request with a single json object
@@ -257,7 +256,9 @@ impl HeaderContext {
             } else {
                 serde_json::to_vec(contents)?
             };
-            Ok(PageContext::Close(self.response.body(json_response)))
+            Ok(PageContext::Close(
+                self.into_response_builder().body(json_response),
+            ))
         } else {
             let body_type = get_object_str(data, "type");
             let json_renderer = match body_type {
@@ -314,21 +315,20 @@ impl HeaderContext {
         }
         log::debug!("Authentication failed");
         // The authentication failed
-        let http_response: HttpResponse = if let Some(link) = get_object_str(&data, "link") {
+        if let Some(link) = get_object_str(&data, "link") {
             self.response
                 .status(StatusCode::FOUND)
-                .insert_header((header::LOCATION, link))
-                .body(
-                    "Sorry, but you are not authorized to access this page. \
-                    Redirecting to the login page...",
-                )
+                .insert_header((header::LOCATION, link));
+            self.has_status = true;
+            Ok(PageContext::Close(self.into_response_builder().body(
+                "Sorry, but you are not authorized to access this page. \
+                Redirecting to the login page...",
+            )))
         } else {
             anyhow::bail!(ErrorWithStatus {
                 status: StatusCode::UNAUTHORIZED
             })
-        };
-        self.has_status = true;
-        Ok(PageContext::Close(http_response))
+        }
     }
 
     fn download(mut self, options: &JsonValue) -> anyhow::Result<PageContext> {
@@ -359,7 +359,7 @@ impl HeaderContext {
                 .insert_header((header::CONTENT_TYPE, content_type));
         }
         Ok(PageContext::Close(
-            self.response.body(body_bytes.into_owned()),
+            self.into_response_builder().body(body_bytes.into_owned()),
         ))
     }
 
@@ -374,6 +374,11 @@ impl HeaderContext {
         }
     }
 
+    fn into_response_builder(mut self) -> HttpResponseBuilder {
+        self.add_server_timing_header();
+        self.response
+    }
+
     async fn start_body(mut self, data: JsonValue) -> anyhow::Result<PageContext> {
         self.add_server_timing_header();
         let html_renderer =
@@ -388,9 +393,8 @@ impl HeaderContext {
         })
     }
 
-    pub fn close(mut self) -> HttpResponse {
-        self.add_server_timing_header();
-        self.response.finish()
+    pub fn close(self) -> HttpResponse {
+        self.into_response_builder().finish()
     }
 }
 

src/webserver/server_timing.rs

@@ -61,8 +61,10 @@ impl ServerTiming {
             if i > 0 {
                 s.push_str(", ");
             }
-            let millis = time.saturating_duration_since(last).as_millis();
-            write!(&mut s, "{name};dur={millis}").ok()?;
+            let micros = time.saturating_duration_since(last).as_micros();
+            let millis = micros / 1000;
+            let micros = micros % 1000;
+            write!(&mut s, "{name};dur={millis}.{micros:03}").ok()?;
             last = *time;
         }
         Some(s)

tests/server_timing/mod.rs

@@ -98,3 +98,38 @@ async fn test_server_timing_format() -> actix_web::Result<()> {
 
     Ok(())
 }
+
+#[actix_web::test]
+async fn test_server_timing_in_redirect() -> actix_web::Result<()> {
+    let mut config = test_config();
+    config.environment = sqlpage::app_config::DevOrProd::Development;
+    let app_data = make_app_data_from_config(config).await;
+
+    let req =
+        crate::common::get_request_to_with_data("/tests/server_timing/redirect_test.sql", app_data)
+            .await?
+            .to_srv_request();
+    let resp = main_handler(req).await?;
+
+    assert_eq!(
+        resp.status(),
+        StatusCode::FOUND,
+        "Response should be a redirect"
+    );
+    let server_timing_header = resp
+        .headers()
+        .get("Server-Timing")
+        .expect("Server-Timing header should be present in redirect responses");
+    let header_value = server_timing_header.to_str().unwrap();
+
+    assert!(
+        !header_value.is_empty(),
+        "Server-Timing header should not be empty: {header_value}"
+    );
+    assert!(
+        header_value.contains(";dur="),
+        "Server-Timing header should contain timing events: {header_value}"
+    );
+
+    Ok(())
+}

tests/server_timing/redirect_test.sql

@@ -0,0 +1,2 @@
+select 'redirect' as component, '/destination.sql' as link;
+