just use tower compression

Author: jakobhellermann

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!("uncompressed wasm output is {} large", pretty_size(output.wasm.len()));
 
     let rt = tokio::runtime::Runtime::new()?;
     rt.block_on(server::run_server(options, output))?;

src/server.rs

@@ -29,7 +29,7 @@ pub struct Options {
 }
 
 pub async fn run_server(options: Options, output: WasmBindgenOutput) -> Result<()> {
-    let WasmBindgenOutput { js, compressed_wasm, snippets, local_modules } = output;
+    let WasmBindgenOutput { js, wasm, snippets, local_modules } = output;
 
     let middleware_stack = ServiceBuilder::new()
         .layer(CompressionLayer::new())
@@ -58,9 +58,7 @@ pub async fn run_server(options: Options, output: WasmBindgenOutput) -> Result<(
     let serve_dir =
         get_service(ServeDir::new(options.directory)).handle_error(internal_server_error);
 
-    let serve_wasm = || async move {
-        ([("content-encoding", "br")], WithContentType("application/wasm", compressed_wasm))
-    };
+    let serve_wasm = || async move { WithContentType("application/wasm", wasm) };
 
     let app = Router::new()
         .route("/", get(move || async { Html(html) }))

src/wasm_bindgen.rs

@@ -1,13 +1,12 @@
 use crate::server::Options;
 use crate::Result;
-use anyhow::Context;
 use std::collections::HashMap;
 use std::path::Path;
 use tracing::debug;
 
 pub struct WasmBindgenOutput {
     pub js: String,
-    pub compressed_wasm: Vec<u8>,
+    pub wasm: Vec<u8>,
     pub snippets: HashMap<String, Vec<String>>,
     pub local_modules: HashMap<String, String>,
 }
@@ -35,22 +34,5 @@ pub fn generate(options: &Options, wasm_file: &Path) -> Result<WasmBindgenOutput
     let wasm = output.wasm_mut().emit_wasm();
     debug!("emitting wasm took {:?}", start.elapsed());
 
-    debug!("compressing wasm...");
-    let start = std::time::Instant::now();
-    let compressed_wasm = compress(&wasm).context("failed to compress wasm file")?;
-    debug!("compressing took {:?}", start.elapsed());
-
-    Ok(WasmBindgenOutput { js, compressed_wasm, snippets, local_modules })
-}
-
-fn 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()
-    })?;
-
-    Ok(output)
+    Ok(WasmBindgenOutput { js, wasm, snippets, local_modules })
 }