Merge pull request #24 from mikkelhegn/default_index

mikkelhegn · web-flow · commit 3cb129c942c1 · 2022-11-14T15:45:13.000+01:00
Support for index.html on root
diff --git a/hello-test.txt b/hello-test.txt
diff --git a/index.html b/index.html
@@ -0,0 +1,7 @@
+<html>
+
+<body>
+    This is index in root
+</body>
+
+</html>
diff --git a/spin.toml b/spin.toml
@@ -9,6 +9,8 @@ trigger = {type = "http", base = "/" }
 [[component]]
 source = "target/wasm32-wasi/release/spin_static_fs.wasm"
 id = "fs"
-files = ["content/**/*"]
+files = [{ source = "", destination = "/" }]
 [component.trigger]
 route = "/..."
+[component.build]
+command = "make"
diff --git a/src/lib.rs b/src/lib.rs
@@ -72,6 +72,11 @@ fn serve(req: Request) -> Result<Response> {
         .map(|h| h.to_str())
         .unwrap_or(Ok(""))?;
 
+    let path = match path {
+        "/" => "index.html",
+        _ => path,
+    };
+
     let body = match FileServer::read(path, &enc) {
         Ok(b) => Some(b),
         Err(e) => {
@@ -200,10 +205,7 @@ mod tests {
         let req = spin_http::Request {
             method: spin_http::Method::Get,
             uri: "http://thisistest.com".to_string(),
-            headers: vec![(
-                PATH_INFO_HEADER.to_string(),
-                "./content/hello-test.txt".to_string(),
-            )],
+            headers: vec![(PATH_INFO_HEADER.to_string(), "./hello-test.txt".to_string())],
             params: vec![],
             body: None,
         };
@@ -217,10 +219,7 @@ mod tests {
             method: spin_http::Method::Get,
             uri: "http://thisistest.com".to_string(),
             headers: vec![
-                (
-                    PATH_INFO_HEADER.to_string(),
-                    "./content/hello-test.txt".to_string(),
-                ),
+                (PATH_INFO_HEADER.to_string(), "./hello-test.txt".to_string()),
                 (
                     IF_NONE_MATCH.to_string(),
                     "13946318585003701156".to_string(),
@@ -239,10 +238,7 @@ mod tests {
             method: spin_http::Method::Get,
             uri: "http://thisistest.com".to_string(),
             headers: vec![
-                (
-                    PATH_INFO_HEADER.to_string(),
-                    "./content/hello-test.txt".to_string(),
-                ),
+                (PATH_INFO_HEADER.to_string(), "./hello-test.txt".to_string()),
                 (IF_NONE_MATCH.to_string(), "".to_string()),
             ],
             params: vec![],
@@ -267,4 +263,17 @@ mod tests {
         let rsp = <super::SpinHttp as spin_http::SpinHttp>::handle_http_request(req);
         assert_eq!(rsp.status, 404);
     }
+
+    #[test]
+    fn test_serve_index() {
+        let req = spin_http::Request {
+            method: spin_http::Method::Get,
+            uri: "http://thisistest.com".to_string(),
+            headers: vec![(PATH_INFO_HEADER.to_string(), "/".to_string())],
+            params: vec![],
+            body: None,
+        };
+        let rsp = <super::SpinHttp as spin_http::SpinHttp>::handle_http_request(req);
+        assert_eq!(rsp.status, 200);
+    }
 }

-Original file line number
+Diff line change
@@ @@ -0,0 +1,7 @@ @@
 +<html>
++
 +<body>
 +    This is index in root
 +</body>
++
 +</html>