Merge pull request #1862 from Zentrik/brotli

Add brotli compression of static assets

Author: Kobzol

site/frontend/.parcelrc

@@ -0,0 +1,9 @@
+{
+    "extends": "@parcel/config-default",
+    "compressors": {
+        "*.{css,js}": [
+          "...",
+          "@parcel/compressor-brotli"
+        ]
+      }
+}

site/frontend/package-lock.json

@@ -12,6 +12,7 @@
   "license": "MIT",
   "devDependencies": {
     "@babel/types": "^7.21.4",
+    "@parcel/compressor-brotli": "^2.8.3",
     "@parcel/transformer-vue": "^2.8.3",
     "@types/highcharts": "^7.0.0",
     "@types/msgpack-lite": "^0.1.8",

site/frontend/package.json

@@ -17,6 +17,7 @@ struct StaticAssets;
 #[derive(RustEmbed)]
 #[folder = "frontend/dist"]
 #[include = "*.js"]
+#[include = "*.br"]
 #[include = "*.css"]
 struct StaticCompiledAssets;
 
@@ -26,6 +27,11 @@ struct StaticCompiledAssets;
 #[include = "*.html"]
 struct TemplateAssets;
 
+pub enum Payload {
+    Compressed(Vec<u8>),
+    Uncompressed(Vec<u8>),
+}
+
 pub struct ResourceResolver {
     tera: RwLock<Tera>,
 }
@@ -39,10 +45,19 @@ impl ResourceResolver {
         })
     }
 
-    pub fn get_static_asset(&self, path: &str) -> Option<Vec<u8>> {
+    pub fn get_static_asset(&self, path: &str, use_compression: bool) -> Option<Payload> {
+        if use_compression {
+            let compressed_path = path.to_owned() + ".br";
+            let data =
+                StaticCompiledAssets::get(compressed_path.as_str()).map(|file| file.data.to_vec());
+            if let Some(data) = data {
+                return Some(Payload::Compressed(data));
+            }
+        }
+
         StaticCompiledAssets::get(path)
             .or_else(|| StaticAssets::get(path))
-            .map(|file| file.data.to_vec())
+            .map(|file| Payload::Uncompressed(file.data.to_vec()))
     }
 
     pub async fn get_template(&self, path: &str) -> anyhow::Result<Vec<u8>> {

site/src/resources.rs

@@ -27,7 +27,7 @@ pub use crate::api::{
 use crate::db::{self, ArtifactId};
 use crate::load::{Config, SiteCtxt};
 use crate::request_handlers;
-use crate::resources::ResourceResolver;
+use crate::resources::{Payload, ResourceResolver};
 
 pub type Request = http::Request<hyper::Body>;
 pub type Response = http::Response<hyper::Body>;
@@ -357,7 +357,7 @@ async fn serve_req(server: Server, req: Request) -> Result<Response, ServerError
         None
     };
 
-    if let Some(response) = handle_fs_path(&req, path).await {
+    if let Some(response) = handle_fs_path(&req, path, allow_compression).await {
         return Ok(response);
     }
 
@@ -594,7 +594,11 @@ lazy_static::lazy_static! {
 }
 
 /// Handle the case where the path is to a static file
-async fn handle_fs_path(req: &Request, path: &str) -> Option<http::Response<hyper::Body>> {
+async fn handle_fs_path(
+    req: &Request,
+    path: &str,
+    use_compression: bool,
+) -> Option<http::Response<hyper::Body>> {
     if path.contains("./") | path.contains("../") {
         return Some(not_found());
     }
@@ -627,7 +631,16 @@ async fn handle_fs_path(req: &Request, path: &str) -> Option<http::Response<hype
         | "/detailed-query.html"
         | "/help.html"
         | "/status.html" => resolve_template(relative_path).await,
-        _ => TEMPLATES.get_static_asset(relative_path)?,
+        _ => match TEMPLATES.get_static_asset(relative_path, use_compression)? {
+            Payload::Compressed(data) => {
+                response = response.header(
+                    hyper::header::CONTENT_ENCODING,
+                    hyper::header::HeaderValue::from_static("br"),
+                );
+                data
+            }
+            Payload::Uncompressed(data) => data,
+        },
     };
 
     let p = Path::new(&path);