feat: add js response content-type charset

Author: huanyu.why

src/resolve.rs

@@ -9,7 +9,7 @@ use std::{
 
 use futures_util::future::BoxFuture;
 use http::{header, HeaderValue, Method, Request};
-use mime_guess::MimeGuess;
+use mime_guess::{mime, Mime, MimeGuess};
 use tokio::fs::File;
 
 use crate::{
@@ -283,9 +283,9 @@ impl<O: FileOpener> Resolver<O> {
         accept_encoding: AcceptEncoding,
     ) -> IoResult<ResolveResult<O::File>> {
         // Determine MIME-type. This needs to happen before we resolve a pre-encoded file.
-        let mime = MimeGuess::from_path(&path)
+        let mimetype = MimeGuess::from_path(&path)
             .first()
-            .map(|mime| mime.to_string());
+            .map(|mimetype| set_charset(mimetype).to_string());
 
         // Resolve pre-encoded files.
         if accept_encoding.br {
@@ -295,7 +295,7 @@ impl<O: FileOpener> Resolver<O> {
                 return Ok(ResolveResult::Found(ResolvedFile::new(
                     file,
                     br_path.into(),
-                    mime,
+                    mimetype,
                     Some(Encoding::Br),
                 )));
             }
@@ -307,15 +307,15 @@ impl<O: FileOpener> Resolver<O> {
                 return Ok(ResolveResult::Found(ResolvedFile::new(
                     file,
                     gzip_path.into(),
-                    mime,
+                    mimetype,
                     Some(Encoding::Gzip),
                 )));
             }
         }
 
         // No pre-encoded file found, serve the original.
         Ok(ResolveResult::Found(ResolvedFile::new(
-            file, path, mime, None,
+            file, path, mimetype, None,
         )))
     }
 }
@@ -401,3 +401,13 @@ impl BitAnd for AcceptEncoding {
         }
     }
 }
+
+fn set_charset(mimetype: Mime) -> Mime {
+    if mimetype == mime::APPLICATION_JAVASCRIPT {
+        return mime::APPLICATION_JAVASCRIPT_UTF_8;
+    }
+    if mimetype == mime::TEXT_JAVASCRIPT {
+        return "text/javascript; charset=utf-8".parse().unwrap();
+    }
+    mimetype
+}

tests/static.rs

@@ -226,6 +226,19 @@ async fn changes_content_type_on_extension() {
     );
 }
 
+#[tokio::test]
+async fn changes_content_type_on_extension_js() {
+    let harness = Harness::new(vec![("file1.js", "this is file1")]);
+
+    let res = harness.get("/file1.js").await.unwrap();
+    assert_eq!(
+        res.headers().get(header::CONTENT_TYPE),
+        Some(&header::HeaderValue::from_static(
+            "text/javascript; charset=utf-8"
+        ))
+    );
+}
+
 #[tokio::test]
 async fn serves_file_with_old_if_modified_since() {
     let harness = Harness::new(vec![("file1.html", "this is file1")]);