delete static file

HACKING.md

@@ -71,4 +71,12 @@ following command:
 make promote
 ```
 
-Look at curl commands in `tests/api.t/run.t` to design new tests.
+Look at curl commands in `tests/api.t/run.t` to design new tests.
+
+
+Hacks
+-----
+
+In vscode, install Ocaml extension to get the button to create sandboxed terminals.
+
+Install `ocp-indent` to format files

src/backend/main.ml

@@ -1,6 +1,13 @@
 
 (* This file is free software, part of FTW. See file "LICENSE" for more information *)
 
+(* Helper functions *)
+(* ************************************************************************* *)
+
+let rec loader _root path _request =
+  match Static.read path with
+  | None -> loader _root "index.html" _request
+  | Some asset -> Dream.respond asset
 
 (* Main entrypoint *)
 (* ************************************************************************* *)
@@ -18,8 +25,7 @@ let () =
   in
   (* Defaul routes to serve the clients files (pages, scripts and css) *)
   let default_routes = [
-    Dream.get "/static/**" @@ Dream.static options.static_path;
-    Dream.get "**" (Dream.from_filesystem options.static_path "index.html");
+    Dream.get "/**" (Dream.static ~loader "")
   ] in
   (* Setup the router with the base information for openapi *)
   let router =
@@ -47,11 +53,11 @@ let () =
         ("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE, OPTIONS");
         ("Access-Control-Allow-Headers", "Content-Type, Authorization");
       ] ~status:`No_Content ""
-      | _ ->
-        let%lwt response = handler request in
-        Dream.add_header response "Access-Control-Allow-Origin" "*";
-        Dream.add_header response "Access-Control-Allow-Headers" "Content-Type, Authorization";
-        Lwt.return response
+    | _ ->
+      let%lwt response = handler request in
+      Dream.add_header response "Access-Control-Allow-Origin" "*";
+      Dream.add_header response "Access-Control-Allow-Headers" "Content-Type, Authorization";
+      Lwt.return response
   in 
   (* Setup the dream server and run it *)
   Dream.run

src/backend/options.ml

@@ -9,11 +9,10 @@ open Cmdliner
 type t = {
   db_path : string;
   server_port : int;
-  static_path : string;
 }
 
-let mk db_path server_port static_path =
-  { db_path; server_port; static_path; }
+let mk db_path server_port =
+  { db_path; server_port; }
 
 (* Cmdliner term *)
 (* ************************************************************************* *)
@@ -27,9 +26,5 @@ let t =
     let doc = "Port to listen on" in
     Arg.(value & opt int 8080 & info ["p"; "port"] ~doc)
   in
-  let static_path =
-    let doc = "Static file path to serve" in
-    Arg.(value & opt string "src/backend/static" & info ["s"; "static"] ~doc)
-  in
-  Term.(const mk $ db_path $ port $ static_path)
+  Term.(const mk $ db_path $ port)
 

tests/api.t/run.t

@@ -6,7 +6,7 @@ Initialization
 
 Launch the FTW server in the background
 
-  $ ftw_backend --db=":memory" --static="../../src/backend/static" > /dev/null 2>&1 &
+  $ ftw_backend --db=":memory" > /dev/null 2>&1 &
 
 Sleep a bit to ensure that the server had had time to initialize and is ready
 to respond to requests