diff --git a/site/src/request_handlers/self_profile.rs b/site/src/request_handlers/self_profile.rs index c01f92c1b..80bd7ca8a 100644 --- a/site/src/request_handlers/self_profile.rs +++ b/site/src/request_handlers/self_profile.rs @@ -3,6 +3,7 @@ use std::io::Read; use std::sync::Arc; use std::time::Instant; +use brotli::enc::BrotliEncoderParams; use bytes::Buf; use database::selector; use database::ArtifactId; @@ -14,11 +15,14 @@ use crate::api::self_profile::ArtifactSizeDelta; use crate::api::{self_profile, self_profile_processed, self_profile_raw, ServerResult}; use crate::load::SiteCtxt; use crate::self_profile::{get_or_download_self_profile, get_self_profile_raw_data}; +use crate::server::maybe_compressed_response; use crate::server::{Response, ResponseHeaders}; pub async fn handle_self_profile_processed_download( body: self_profile_processed::Request, ctxt: &SiteCtxt, + // compression: &Option, + allow_compression: bool, ) -> http::Response { log::info!("handle_self_profile_processed_download({:?})", body); let mut params = body.params.clone(); @@ -148,7 +152,19 @@ pub async fn handle_self_profile_processed_download( hyper::header::HeaderValue::from_static("https://profiler.firefox.com"), ); - builder.body(hyper::Body::from(output.data)).unwrap() + if output.filename.starts_with("json") && allow_compression { + // maybe_compressed_response(builder, output.data, compression) + maybe_compressed_response( + builder, + output.data, + &Some(BrotliEncoderParams { + quality: 5, + ..Default::default() + }), + ) + } else { + builder.body(hyper::Body::from(output.data)).unwrap() + } } // Add query data entries to `profile` for any queries in `base_profile` which are not present in diff --git a/site/src/server.rs b/site/src/server.rs index 602fe6640..dc298c2bb 100644 --- a/site/src/server.rs +++ b/site/src/server.rs @@ -342,7 +342,10 @@ async fn serve_req(server: Server, req: Request) -> Result Result { let ctxt: Arc = server.ctxt.read().as_ref().unwrap().clone(); let req = check!(parse_query_string(req.uri())); - return Ok(request_handlers::handle_self_profile_processed_download(req, &ctxt).await); + return Ok(request_handlers::handle_self_profile_processed_download( + req, + &ctxt, + allow_compression, + ) + .await); } _ if req.method() == http::Method::GET => return Ok(not_found()), _ => {} @@ -730,7 +738,7 @@ where } } -fn maybe_compressed_response( +pub fn maybe_compressed_response( response: http::response::Builder, body: Vec, compression: &Option,