fix: handle not_found and static_routes

nomasystems · Oct 9, 2024 · 96afea1 · 96afea1
1 parent 179e2df
commit 96afea1
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 6 deletions.
diff --git a/src/erf.erl b/src/erf.erl
@@ -209,7 +209,7 @@ reload_conf(Name, NewConf) ->
 
     case build_router(SpecPath, SpecParser, Callback, StaticRoutes, SwaggerUI) of
         {ok, RouterMod, Router, API} ->
-            RoutePatterns = route_patterns(API),
+            RoutePatterns = route_patterns(API, StaticRoutes, SwaggerUI),
             erf_conf:set(Name, Conf#{
                 route_patterns => RoutePatterns,
                 router_mod => RouterMod,
@@ -243,7 +243,7 @@ init([Name, RawConf]) ->
 
     case build_router(SpecPath, SpecParser, Callback, StaticRoutes, SwaggerUI) of
         {ok, RouterMod, Router, API} ->
-            RoutePatterns = route_patterns(API),
+            RoutePatterns = route_patterns(API, StaticRoutes, SwaggerUI),
             ErfConf = RawErfConf#{
                 route_patterns => RoutePatterns,
                 router_mod => RouterMod,
@@ -395,12 +395,35 @@ match_route_(RawPath, [{Route, RouteRegEx} | Routes]) ->
             {ok, Route}
     end.
 
--spec route_patterns(API) -> RoutePatterns when
+-spec route_patterns(API, StaticRoutes, SwaggerUI) -> RoutePatterns when
     API :: api(),
+    StaticRoutes :: [static_route()],
+    SwaggerUI :: boolean(),
     RoutePatterns :: route_patterns().
-route_patterns(API) ->
+route_patterns(API, StaticRoutes, SwaggerUI) ->
+    Acc =
+        lists:map(
+            fun
+                ({Path, {file, _ResourcePath}}) ->
+                    {Path, <<"^", Path/binary, "$">>};
+                ({Path, {dir, _ResourcePath}}) ->
+                    {Path, <<"^", Path/binary>>}
+            end,
+            StaticRoutes
+        ),
+    Acc1 =
+        case SwaggerUI of
+            true ->
+                [
+                    {<<"/swagger">>, <<"^/swagger$">>},
+                    {<<"/swagger/spec.json">>, <<"^/swagger/spec.json$">>}
+                    | Acc
+                ];
+            _false ->
+                Acc
+        end,
     RawRoutes = [maps:get(path, Endpoint) || Endpoint <- maps:get(endpoints, API)],
-    route_patterns(RawRoutes, []).
+    route_patterns(RawRoutes, Acc1).
 
 -spec route_patterns(RawRoutes, Acc) -> RoutePatterns when
     RawRoutes :: [binary()],

diff --git a/src/erf_http_server/erf_http_server_elli.erl b/src/erf_http_server/erf_http_server_elli.erl
@@ -176,7 +176,13 @@ preprocess(Name, Req) ->
                 ElliBody
         end,
     JoinPath = erlang:list_to_binary([<<"/">> | lists:join(<<"/">>, Path)]),
-    {ok, Route} = erf:match_route(Name, JoinPath),
+    Route = 
+        case erf:match_route(Name, JoinPath) of
+            {ok, R} ->
+                R;
+            {error, not_found} ->
+                JoinPath
+        end,
     #{
         scheme => Scheme,
         host => Host,

diff --git a/test/erf_SUITE.erl b/test/erf_SUITE.erl
@@ -120,6 +120,16 @@ foo(_Conf) ->
         )
     ),
 
+    ?assertMatch(
+        {ok, {{"HTTP/1.1", 404, "Not Found"}, _Result3Headers, <<>>}},
+        httpc:request(
+            get,
+            {"http://localhost:8789/1/not_found", []},
+            [],
+            [{body_format, binary}]
+        )
+    ),
+
     ok = erf:stop(erf_server),
 
     meck:unload(erf_callback),