static file caching/serving seems to work

src/fd_client.erl

@@ -224,12 +224,9 @@ handle_request(Sock, R = #request{method = M, path = P}) when M =/= undefined, P
 
 route(Sock, get, Route, Request) ->
     case Route of
-         <<"/">>                   -> home(Sock);
-         <<"/default.css">>        -> default_css(Sock);
-         <<"/chat.html">>          -> chat_html(Sock);
-         <<"/ws-test-echo.html">>  -> ws_test_echo_html(Sock);
-         <<"/ws/echo">>            -> ws_echo(Sock, Request);
-         _                         -> http_err(Sock, 404)
+         <<"/ws/echo">> -> ws_echo(Sock, Request);
+         <<"/">>        -> route_static(Sock, <<"/index.html">>);
+         _              -> route_static(Sock, Route)
     end;
 route(Sock, post, Route, Request) ->
     case Route of
@@ -240,6 +237,28 @@ route(Sock, _, _, _) ->
     http_err(Sock, 404).
 
 
+route_static(Sock, Route) ->
+    respond_static(Sock, fd_sfc:query(Route)).
+
+respond_static(Sock, {found, Entry}) ->
+    % -record(e, {fs_path       :: file:filename(),
+    %             last_modified :: file:date_time(),
+    %             mime_type     :: string(),
+    %             encoding      :: encoding(),
+    %             contents      :: binary()}).
+    Headers0 =
+        case fd_sfc_entry:encoding(Entry) of
+            gzip -> [{"content-encoding", "gzip"}];
+            none -> []
+        end,
+    Headers1 = [{"content-type", fd_sfc_entry:mime_type(Entry)} | Headers0],
+    Response = #response{headers = Headers1,
+                         body    = fd_sfc_entry:contents(Entry)},
+    respond(Sock, Response);
+respond_static(Sock, not_found) ->
+    http_err(Sock, 404).
+
+
 ws_echo(Sock, Request) ->
     try
         ws_echo2(Sock, Request)
@@ -279,59 +298,6 @@ ws_echo_loop(Sock, Frames, Received) ->
             error(Error)
     end.
 
-
-home(Sock) ->
-    %% fixme: cache
-    Path_IH = filename:join([zx:get_home(), "priv", "index.html"]),
-    case file:read_file(Path_IH) of
-        {ok, Body} ->
-            Resp = #response{headers = [{"content-type", "text/html"}],
-                             body    = Body},
-            respond(Sock, Resp);
-        Error ->
-            tell("error: ~p~n", [self(), Error]),
-            http_err(Sock, 500)
-    end.
-
-default_css(Sock) ->
-    %% fixme: cache
-    Path_IH = filename:join([zx:get_home(), "priv", "default.css"]),
-    case file:read_file(Path_IH) of
-        {ok, Body} ->
-            Resp = #response{headers = [{"content-type", "text/css"}],
-                             body    = Body},
-            respond(Sock, Resp);
-        Error ->
-            io:format("~p error: ~p~n", [self(), Error]),
-            http_err(Sock, 500)
-    end.
-
-ws_test_echo_html(Sock) ->
-    %% fixme: cache
-    Path_IH = filename:join([zx:get_home(), "priv", "ws-test-echo.html"]),
-    case file:read_file(Path_IH) of
-        {ok, Body} ->
-            Resp = #response{headers = [{"content-type", "text/html"}],
-                             body    = Body},
-            respond(Sock, Resp);
-        Error ->
-            io:format("~p error: ~p~n", [self(), Error]),
-            http_err(Sock, 500)
-    end.
-
-chat_html(Sock) ->
-    %% fixme: cache
-    Path_IH = filename:join([zx:get_home(), "priv", "chat.html"]),
-    case file:read_file(Path_IH) of
-        {ok, Body} ->
-            Resp = #response{headers = [{"content-type", "text/html"}],
-                             body    = Body},
-            respond(Sock, Resp);
-        Error ->
-            io:format("~p error: ~p~n", [self(), Error]),
-            http_err(Sock, 500)
-    end.
-
 wfcin(Sock, #request{enctype = json,
                      cookies = Cookies,
                      body = #{"wfcin" := Input}}) ->