Updates based on PR comments

Author: heisencoder

src/main.rs

@@ -38,7 +38,7 @@ fn main() -> Result<(), anyhow::Error> {
 
     let output = wasm_bindgen::generate(&options, &wasm_file)?;
 
-    info!("compressed wasm output is {} large", pretty_size(output.compressed_wasm.len()));
+    info!("compressed wasm output is {} large", pretty_size(output.br_compressed_wasm.len()));
 
     let rt = tokio::runtime::Runtime::new()?;
     rt.block_on(server::run_server(options, output))?;

src/server.rs

@@ -61,7 +61,7 @@ pub async fn run_server(options: Options, output: WasmBindgenOutput) -> Result<(
 }
 
 fn get_router(options: &Options, output: WasmBindgenOutput) -> Router {
-    let WasmBindgenOutput { js, compressed_wasm, gzip_compressed_wasm, snippets, local_modules } =
+    let WasmBindgenOutput { js, br_compressed_wasm, gzip_compressed_wasm, snippets, local_modules } =
         output;
 
     let middleware_stack = ServiceBuilder::new()
@@ -89,26 +89,22 @@ fn get_router(options: &Options, output: WasmBindgenOutput) -> Router {
         get_service(ServeDir::new(options.directory.clone())).handle_error(internal_server_error);
 
     let serve_wasm = |headers: HeaderMap| async move {
-        println!(" request headers: {:?}", headers);
         if let Some(accept_encoding) = headers.get(ACCEPT_ENCODING) {
             match from_utf8(accept_encoding.as_bytes()) {
                 Ok(encodings) => {
                     let split_encodings: Vec<&str> = encodings.split(",").map(str::trim).collect();
-                    println!("split_encodings: {:?}", split_encodings);
                     if split_encodings.contains(&"br") {
-                        println!("serving br compressed wasm");
                         Ok((
                             [("content-encoding", "br")],
-                            WithContentType("application/wasm", compressed_wasm),
+                            WithContentType("application/wasm", br_compressed_wasm),
                         ))
                     } else if split_encodings.contains(&"gzip") {
-                        println!("serving gzip compressed wasm");
                         Ok((
                             [("content-encoding", "gzip")],
                             WithContentType("application/wasm", gzip_compressed_wasm),
                         ))
                     } else {
-                        println!("No support for requested encoding!");
+                        tracing::warn!("Unsupported encoding in request for wasm.wasm");
                         Err((
                             StatusCode::BAD_REQUEST,
                             format!("Unsupported encoding(s): {:?}", split_encodings),
@@ -229,7 +225,7 @@ mod tests {
     fn fake_wasm_bindgen_output() -> WasmBindgenOutput {
         WasmBindgenOutput {
             js: "fake js".to_string(),
-            compressed_wasm: FAKE_BR_COMPRESSED_WASM.to_vec(),
+            br_compressed_wasm: FAKE_BR_COMPRESSED_WASM.to_vec(),
             gzip_compressed_wasm: FAKE_GZIP_COMPRESSED_WASM.to_vec(),
             snippets: HashMap::<String, Vec<String>>::new(),
             local_modules: HashMap::<String, String>::new(),
@@ -248,11 +244,8 @@ mod tests {
         let client = make_test_client();
 
         // Test without any supported compression
-        let mut res =
-            client.get("/api/wasm.wasm").header("accept-encoding", "deflate").send().await;
+        let res = client.get("/api/wasm.wasm").header("accept-encoding", "deflate").send().await;
         assert_eq!(res.status(), StatusCode::BAD_REQUEST);
-        let result = res.chunk().await.unwrap();
-        println!("Bad Request result: {:?}", result);
     }
 
     #[tokio::test]

src/wasm_bindgen.rs

@@ -9,7 +9,7 @@ const COMPRESSION_LEVEL: u32 = 2;
 
 pub struct WasmBindgenOutput {
     pub js: String,
-    pub compressed_wasm: Vec<u8>,
+    pub br_compressed_wasm: Vec<u8>,
     pub gzip_compressed_wasm: Vec<u8>,
     pub snippets: HashMap<String, Vec<String>>,
     pub local_modules: HashMap<String, String>,
@@ -40,25 +40,29 @@ pub fn generate(options: &Options, wasm_file: &Path) -> Result<WasmBindgenOutput
 
     debug!("br compressing wasm...");
     let start = std::time::Instant::now();
-    let compressed_wasm = br_compress(&wasm).context("failed to compress wasm file")?;
+    let br_compressed_wasm = br_compress(&wasm).context("failed to compress wasm file")?;
     debug!("compressing took {:?}", start.elapsed());
 
     debug!("gzip compressing wasm...");
     let start = std::time::Instant::now();
     let gzip_compressed_wasm = gzip_compress(&wasm).context("failed to compress wasm file")?;
     debug!("compressing took {:?}", start.elapsed());
 
-    Ok(WasmBindgenOutput { js, compressed_wasm, gzip_compressed_wasm, snippets, local_modules })
+    Ok(WasmBindgenOutput { js, br_compressed_wasm, gzip_compressed_wasm, snippets, local_modules })
 }
 
 fn br_compress(mut bytes: &[u8]) -> Result<Vec<u8>, std::io::Error> {
     use brotli::enc::{self, BrotliEncoderParams};
 
     let mut output = Vec::new();
-    enc::BrotliCompress(&mut bytes, &mut output, &BrotliEncoderParams {
-        quality: 5, // https://github.com/jakobhellermann/wasm-server-runner/pull/22#issuecomment-1235804905
-        ..Default::default()
-    })?;
+    enc::BrotliCompress(
+        &mut bytes,
+        &mut output,
+        &BrotliEncoderParams {
+            quality: 5, // https://github.com/jakobhellermann/wasm-server-runner/pull/22#issuecomment-1235804905
+            ..Default::default()
+        },
+    )?;
 
     Ok(output)
 }