fix standalone version (and avoid a compiler crash)

2 files changed, 21 insertions, 8 deletions

diff --git a/server/src/assets.rs b/server/src/assets.rs
index 068bc0c..bdd7ef9 100644
--- a/server/src/assets.rs
+++ b/server/src/assets.rs
@@ -1,7 +1,7 @@
 #[cfg(not(feature = "standalone"))]
 #[macro_export]
 macro_rules! s_file {
-    ($path: literal) => {
+    ($path: literal, $content_type: literal) => {
         warp::fs::file($path)
     };
 }
@@ -17,8 +17,14 @@ macro_rules! s_asset_dir {
 #[cfg(feature = "standalone")]
 #[macro_export]
 macro_rules! s_file {
-    ($path: literal) => {
-        warp::get().map(|| include_str!(concat!("../../", $path)))
+    ($path: literal, $content_type: literal) => {
+        warp::any().map(|| {
+            warp::reply::with_header(
+                include_str!(concat!("../../", $path)),
+                "content-type",
+                $content_type,
+            )
+        })
     };
 }
 
@@ -29,8 +35,15 @@ macro_rules! s_asset_dir {
         use include_dir::{include_dir, Dir};
         const DIR: Dir = include_dir!("$CARGO_MANIFEST_DIR/../client-web/public/assets");
         warp::path::tail().and_then(|t: warp::path::Tail| async move {
-            DIR.get_file(t.as_str())
-                .map(|f| f.contents_utf8().unwrap())
+            let path = t.as_str();
+            let content_type = match &path {
+                _ if path.ends_with(".wasm") => "application/wasm",
+                _ if path.ends_with(".js") => "application/javascript",
+                _ if path.ends_with(".css") => "text/css",
+                _ => "application/octet-stream",
+            };
+            DIR.get_file(path)
+                .map(|f| warp::reply::with_header(f.contents(), "content-type", content_type))
                 .ok_or(warp::reject::not_found())
         })
     }};
diff --git a/server/src/main.rs b/server/src/main.rs
index 518ea99..c818eb5 100644
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -42,10 +42,10 @@ async fn run() {
         .and(warp::ws())
         .map(signaling_connect);
 
-    let index: _ = warp::path!().and(s_file!("client-web/public/start.html"));
-    let room: _ = warp::path!("room").and(s_file!("client-web/public/app.html"));
+    let index: _ = warp::path!().and(s_file!("client-web/public/start.html", "text/html"));
+    let room: _ = warp::path!("room").and(s_file!("client-web/public/app.html", "text/html"));
     let assets: _ = warp::path("assets").and(s_asset_dir!());
-    let sw_script: _ = warp::path("sw.js").and(s_file!("client-web/public/assets/sw.js"));
+    let sw_script: _ = warp::path("sw.js").and(s_file!("client-web/public/assets/sw.js", "application/javascript"));
     let favicon: _ = warp::path!("favicon.ico").map(|| "");
     let old_format_redirect: _ = warp::path!("room" / String).map(|rsecret| {
         reply::with_header(