From 070cfceb2ed7721349203967d932f287d1fcea9a Mon Sep 17 00:00:00 2001
From: Liam Fitzgerald <liam.fitzgerald@tlon.io>
Date: Tue, 6 Jul 2021 15:37:31 +1000
Subject: [PATCH] file-server: improve SPA 404 behaviour

If the %cu scries return false, then we fallback to requesting the
index.html from the mount point.

Fixes urbit/landscape#837
---
 pkg/arvo/app/file-server.hoon | 36 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/pkg/arvo/app/file-server.hoon b/pkg/arvo/app/file-server.hoon
index 6a8072ba10..84bf14d552 100644
--- a/pkg/arvo/app/file-server.hoon
+++ b/pkg/arvo/app/file-server.hoon
@@ -219,30 +219,35 @@
         ?~  ext.req-line  site.req-line
         (snoc site.req-line u.ext.req-line)
       =/  content=(unit [=content suffix=path public=?])
-        (get-content pax is-file)
+        (match-content-path pax is-file)
       ?~  content  [not-found:gen %.n]
       ?-  -.content.u.content
           %clay
-        =/  scry-path=path
+        =/  scry-start=path
           :*  (scot %p our.bowl)
               q.byk.bowl
               (scot %da now.bowl)
-              (lowercase (weld path.content.u.content suffix.u.content))
+              path.content.u.content
           ==
+        =/  scry-path=path
+          (weld scry-start (lowercase suffix.u.content))
+        =?  scry-path  !.^(? %cu scry-path)
+          (weld scry-start /index/html)
         ?.  .^(? %cu scry-path)  [not-found:gen %.n]
         ?:  ?=([~ %woff2] ext.req-line)
           :_  public.u.content
           [[200 [['content-type' '/font/woff2'] ~]] `.^(octs %cx scry-path)]
         =/  file  (as-octs:mimes:html .^(@ %cx scry-path))
         :_  public.u.content
-        ?+  ext.req-line  not-found:gen
-            [~ %js]    (js-response:gen file)
-            [~ %css]   (css-response:gen file)
-            [~ %png]   (png-response:gen file)
-            [~ %svg]   (svg-response:gen file)
-            [~ %ico]   (ico-response:gen file)
+        =/  ext  (rear scry-path)
+        ?+  ext  not-found:gen
+            %js    (js-response:gen file)
+            %css   (css-response:gen file)
+            %png   (png-response:gen file)
+            %svg   (svg-response:gen file)
+            %ico   (ico-response:gen file)
           ::
-              [~ %html]
+              %html
             %.  file
             %*    .   html-response:gen
                 cache
@@ -276,17 +281,8 @@
         char
       (add char ^~((sub 'a' 'A')))
     ::
-    ++  get-content
-      |=  [pax=path is-file=?]
-      ^-  (unit [content path ?])
-      =/  first-try  (match-content-path pax (~(del by serving) /) is-file)
-      ?^  first-try  first-try
-      =/  root  (~(get by serving) /)
-      ?~  root  ~
-      (match-content-path pax (~(gas by *^serving) [[/ u.root] ~]) is-file)
-    ::
     ++  match-content-path
-      |=  [pax=path =^serving is-file=?]
+      |=  [pax=path is-file=?]
       ^-  (unit [content path ?])
       %+  roll
         %+  sort  ~(tap by serving)