ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-11-29 23:12:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

file-server: improve SPA 404 behaviour

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

Fixes urbit/landscape#837
This commit is contained in:
Liam Fitzgerald 2021-07-06 15:37:31 +10:00
parent b1b78bce5e
commit 070cfceb2e
No known key found for this signature in database
GPG Key ID: D390E12C61D1CFFB
1 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
pkg/arvo/app/file-server.hoon
View File

@ -219,30 +219,35 @@
?~ ext.req-line site.req-line ?~ ext.req-line site.req-line
(snoc site.req-line u.ext.req-line) (snoc site.req-line u.ext.req-line)
=/ content=(unit [=content suffix=path public=?]) =/ content=(unit [=content suffix=path public=?])
(get-content pax is-file) (match-content-path pax is-file)
?~ content [not-found:gen %.n] ?~ content [not-found:gen %.n]
?- -.content.u.content ?- -.content.u.content
%clay %clay
=/ scry-path=path =/ scry-start=path
:* (scot %p our.bowl) :* (scot %p our.bowl)
q.byk.bowl q.byk.bowl
(scot %da now.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] ?. .^(? %cu scry-path) [not-found:gen %.n]
?: ?=([~ %woff2] ext.req-line) ?: ?=([~ %woff2] ext.req-line)
:_ public.u.content :_ public.u.content
[[200 [['content-type' '/font/woff2'] ~]] `.^(octs %cx scry-path)] [[200 [['content-type' '/font/woff2'] ~]] `.^(octs %cx scry-path)]
=/ file (as-octs:mimes:html .^(@ %cx scry-path)) =/ file (as-octs:mimes:html .^(@ %cx scry-path))
:_ public.u.content :_ public.u.content
?+ ext.req-line not-found:gen =/ ext (rear scry-path)
[~ %js] (js-response:gen file) ?+ ext not-found:gen
[~ %css] (css-response:gen file) %js (js-response:gen file)
[~ %png] (png-response:gen file) %css (css-response:gen file)
[~ %svg] (svg-response:gen file) %png (png-response:gen file)
[~ %ico] (ico-response:gen file) %svg (svg-response:gen file)
%ico (ico-response:gen file)
:: ::
[~ %html] %html
%. file %. file
%* . html-response:gen %* . html-response:gen
cache cache
@ -276,17 +281,8 @@
char char
(add char ^~((sub 'a' 'A'))) (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 ++ match-content-path
|= [pax=path =^serving is-file=?] |= [pax=path is-file=?]
^- (unit [content path ?]) ^- (unit [content path ?])
%+ roll %+ roll
%+ sort ~(tap by serving) %+ sort ~(tap by serving)