ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2025-01-03 12:42:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

landscape: updated code to bind to all used prefixes

Browse Source
This commit is contained in:
Logan Allen 2020-05-27 18:00:40 -04:00
parent 7b0a587c4a
commit e2fad4bdd7
1 changed files with 87 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

155
pkg/arvo/app/landscape.hoon
View File

@ -6,10 +6,11 @@
$% state-zero
==
::
+$ serving (map url-base=path [clay-base=path public=?])
+$ state-zero
$: %0
=configuration
serving=(map url-base=path [clay-base=path public=?])
=serving
==
+$ configuration
$: url-prefix=(unit @t)
@ -26,8 +27,22 @@
::
++ on-init
^- (quip card _this)
:_ this(serving (~(put by serving) /'~landscape' [/app/landscape %.n]))
[%pass /index-bind %arvo %e %connect [~ /] %landscape]~
:_ %_ this
serving
%- ~(gas by *^serving)
%+ turn
^- (list path)
[/ /'~landscape' /'~chat' /'~link' /'~dojo' /'~groups' /'~publish' ~]
|=(pax=path [pax [/app/landscape %.n]])
==
:~ [%pass / %arvo %e %connect [~ /] %landscape]
[%pass /'~landscape' %arvo %e %connect [~ /'~landscape'] %landscape]
[%pass /'~chat' %arvo %e %connect [~ /'~chat'] %landscape]
[%pass /'~link' %arvo %e %connect [~ /'~link'] %landscape]
[%pass /'~dojo' %arvo %e %connect [~ /'~dojo'] %landscape]
[%pass /'~groups' %arvo %e %connect [~ /'~groups'] %landscape]
[%pass /'~publish' %arvo %e %connect [~ /'~publish'] %landscape]
==
::
++ on-save !>(state)
++ on-load
@ -40,9 +55,7 @@
^- (quip card _this)
|^
?+ mark (on-poke:def mark vase)
%landscape-action
(landscape-action !<(action vase))
::
%landscape-action (landscape-action !<(action vase))
%handle-http-request
=+ !<([id=@ta req=inbound-request:eyre] vase)
:_ this
@ -55,10 +68,11 @@
^- (quip card _this)
?- -.act
%serve-dir
?: (~(has by serving) url-base.act)
=* url-base url-base.act
?: (~(has by serving) url-base)
~|("url already bound to {<(~(got by serving) url-base.act)>}" !!)
:- ~
this(serving (~(put by serving) url-base.act [clay-base.act public.act]))
:- [%pass url-base %arvo %e %connect [~ url-base] %landscape]~
this(serving (~(put by serving) url-base [clay-base.act public.act]))
::
%unserve-dir
[~ this(serving (~(del by serving) url-base.act))]
@ -74,13 +88,13 @@
++ handle-http-request
|= =inbound-request:eyre
^- simple-payload:http
|^
=* req request.inbound-request
=* headers header-list.req
=/ req-line (parse-request-line url.req)
?. =(method.req %'GET')
not-found:gen
?. =(method.req %'GET') not-found:gen
=? req-line ?=(~ ext.req-line)
[[[~ %html] (snoc site.req-line 'index')] args.req-line]
[[[~ %html] ~['index']] args.req-line]
?> ?=(^ ext.req-line)
?~ site.req-line
not-found:gen
@ -97,63 +111,63 @@
(as-octt:mimes:html "window.ship = '{+:(scow %p our.bowl)}';")
::
=/ [payload=simple-payload:http public=?] (get-file req-line)
?: public
payload
?: public payload
(require-authorization-simple:app inbound-request payload)
::
::
++ get-clay-path
|= pax=path
^- (unit [path ?])
%- ~(rep by serving)
|= [[url-base=path clay-base=path public=?] out=(unit [path ?])]
?^ out
out
=/ suf (get-suffix url-base pax)
?~ suf ~
`[(weld clay-base u.suf) public]
::
++ get-suffix
|= [a=path b=path]
^- (unit path)
?: (gth (lent a) (lent b))
~
|-
?~ a
`b
?~ b
~
?. =(i.a i.b)
~
%= $
a t.a
b t.b
==
::
++ get-file
|= req-line=request-line
^- [simple-payload:http ?]
=/ pax=path (snoc site.req-line (need ext.req-line))
=/ clay-path=(unit [path ?]) (get-clay-path pax)
?~ clay-path
[not-found:gen %.n]
=/ scry-path
:* (scot %p our.bowl)
q.byk.bowl
(scot %da now.bowl)
-.u.clay-path
::
++ get-file
|= req-line=request-line
^- [simple-payload:http ?]
=/ pax=path (snoc site.req-line (need ext.req-line))
=/ clay-path=(unit [path ?]) (get-clay-path pax)
?~ clay-path [not-found:gen %.n]
=/ scry-path
:* (scot %p our.bowl)
q.byk.bowl
(scot %da now.bowl)
-.u.clay-path
==
?. .^(? %cu scry-path) [not-found:gen %.n]
=/ file (as-octs:mimes:html .^(@ %cx scry-path))
:_ +.u.clay-path
?+ ext.req-line not-found:gen
[~ %html] (html-response:gen file)
[~ %js] (js-response:gen file)
[~ %css] (css-response:gen file)
[~ %png] (png-response:gen file)
==
?. .^(? %cu scry-path)
[not-found:gen %.n]
=/ file (as-octs:mimes:html .^(@ %cx scry-path))
:_ +.u.clay-path
?+ ext.req-line not-found:gen
[~ %html] (html-response:gen file)
[~ %js] (js-response:gen file)
[~ %css] (css-response:gen file)
[~ %png] (png-response:gen file)
==
::
::
++ get-clay-path
|= pax=path
^- (unit [path ?])
=/ first-try (match-clay-path pax (~(del by serving) /))
?^ first-try first-try
=/ root (~(get by serving) /)
?~ root ~
(match-clay-path pax (~(gas by *^serving) [[/ u.root] ~]))
::
++ match-clay-path
|= [pax=path =^serving]
^- (unit [path ?])
%- ~(rep by serving)
|= [[url-base=path clay-base=path public=?] out=(unit [path ?])]
?^ out out
=/ suf (get-suffix url-base pax)
?~ suf ~
`[(weld clay-base u.suf) public]
::
++ get-suffix
|= [a=path b=path]
^- (unit path)
?: (gth (lent a) (lent b)) ~
|-
?~ a `b
?~ b ~
?. =(i.a i.b) ~
%= $
a t.a
b t.b
==
--
--
::
++ on-watch
@ -166,8 +180,13 @@
++ on-arvo
|= [=wire sign=sign-arvo]
^- (quip card _this)
~& [%hep -.sign]
~& [%lus +.sign]
?+ +<.sign (on-arvo:def wire sign)
%bound [~ this]
%bound
~& sign
:: TODO: upon nack, unbind and remove serving from state
[~ this]
==
::
++ on-leave on-leave:def