mirror of
https://github.com/urbit/shrub.git
synced 2024-11-29 06:45:42 +03:00
Server side events sorta work.
This commit is contained in:
Elliot Glaysher
parent
b659bba171
commit
75d1c7225e
175
app/server.hoon
175
app/server.hoon
@ -6,14 +6,9 @@
|
||||
::
|
||||
+$ card
|
||||
$% [%connect wire [(unit @t) (list @t)] %server]
|
||||
[%wait wire @da]
|
||||
[%http-response =raw-http-response:light]
|
||||
==
|
||||
::
|
||||
+$ state
|
||||
$: :: count: sends back the count value
|
||||
::
|
||||
count=(map bone @ud)
|
||||
==
|
||||
--
|
||||
:: utilities:
|
||||
::
|
||||
@ -39,48 +34,66 @@
|
||||
;h1:"Hello, {<(trip name)>}"
|
||||
==
|
||||
==
|
||||
:: :: helper library that lets an app handle an EventSource.
|
||||
:: ::
|
||||
:: ++ event-source
|
||||
:: |_ m=(map session=@ud [last-id=@ud])
|
||||
:: ++ abet m
|
||||
:: :: +start-session: called by app to start a session and send first event
|
||||
:: ::
|
||||
:: :: This creates a new session where we
|
||||
:: ::
|
||||
:: ++ start-session
|
||||
:: |= [session=@ud =bone data=wall]
|
||||
:: ^- [(list move) +>.$]
|
||||
:: :- :~ :* bone %http-response
|
||||
:: %start 200
|
||||
:: :~ ['content-type' 'text/event-stream']
|
||||
:: ['cache-control' 'no-cache']
|
||||
:: ==
|
||||
|
||||
:: complete=%.n
|
||||
:: == ==
|
||||
:: %_ +>.$
|
||||
:: :: +reconnect-session: reconnect an old session to a new http pipe
|
||||
:: ::
|
||||
:: :: HTTP sessions can be killed
|
||||
:: ::
|
||||
:: ++ reconnect-session
|
||||
:: |= [session=@ud =bone last-seen=@ud]
|
||||
|
||||
:: :: +confirm-
|
||||
:: ::
|
||||
:: ++ confirm-
|
||||
|
||||
|
||||
:: :: :: +end-session: called in response to an http pipe being closed
|
||||
:: :: ::
|
||||
:: :: ++ end-session
|
||||
|
||||
:: :: ++ send-message
|
||||
:: :: |= [=bone ]
|
||||
:: --
|
||||
:: helper library that lets an app handle an EventSource.
|
||||
::
|
||||
++ event-source
|
||||
|_ m=(map session=@ud [=bone last-id=@ud])
|
||||
++ abet m
|
||||
:: +start-session: called by app to start a session and send first event
|
||||
::
|
||||
:: This creates a new session where we
|
||||
::
|
||||
++ start-session
|
||||
|= [session=@ud =bone data=wall]
|
||||
^- [(list move) _m]
|
||||
::
|
||||
=/ lines=tape
|
||||
::
|
||||
:- :~ :* bone %http-response
|
||||
%start 200
|
||||
:~ ['content-type' 'text/event-stream']
|
||||
['cache-control' 'no-cache']
|
||||
==
|
||||
(wall-to-output data)
|
||||
complete=%.n
|
||||
== ==
|
||||
m
|
||||
:: %_ +>.$
|
||||
:: :: +reconnect-session: reconnect an old session to a new http pipe
|
||||
:: ::
|
||||
:: :: HTTP sessions can be killed
|
||||
:: ::
|
||||
:: ++ reconnect-session
|
||||
:: |= [session=@ud =bone last-seen=@ud]
|
||||
|
||||
:: :: +confirm-
|
||||
:: ::
|
||||
:: ++ confirm-
|
||||
|
||||
++ send-message
|
||||
|= [=bone data=wall]
|
||||
^- [(list move) _m]
|
||||
:- :~ :* bone %http-response
|
||||
%continue
|
||||
(wall-to-output data)
|
||||
== ==
|
||||
m
|
||||
::
|
||||
++ wall-to-output
|
||||
|= =wall
|
||||
^- (unit octs)
|
||||
:- ~
|
||||
%- as-octs:mimes:html
|
||||
%- crip
|
||||
%- zing
|
||||
%+ weld
|
||||
%+ turn data
|
||||
|= t=tape
|
||||
"data: {t}\0a"
|
||||
::
|
||||
[`tape`['\0a' ~] ~]
|
||||
--
|
||||
::
|
||||
++ part1
|
||||
^- octs
|
||||
%- as-octs:mimes:html
|
||||
@ -96,7 +109,28 @@
|
||||
(trip name)
|
||||
""</title></head><body><h1>Hello, ""
|
||||
(trip name)
|
||||
""</h1></body></html>"
|
||||
""</h1>"
|
||||
"<p>Time is <span id=time></span></p>"
|
||||
::
|
||||
%- trip
|
||||
'''
|
||||
<script>
|
||||
var evtSource = new EventSource("/~server/stream", { withCredentials: true } );
|
||||
|
||||
evtSource.onmessage = function(e) {
|
||||
var message = document.getElementById("time");
|
||||
message.innerHTML = e.data;
|
||||
}
|
||||
</script>
|
||||
'''
|
||||
::
|
||||
"</body></html>"
|
||||
==
|
||||
--
|
||||
|%
|
||||
::
|
||||
+$ state
|
||||
$: events=(map session=@ud [=bone last-id=@ud])
|
||||
==
|
||||
--
|
||||
::
|
||||
@ -119,6 +153,37 @@
|
||||
~& [%bound success]
|
||||
[~ this]
|
||||
::
|
||||
:: TODO: Before we can actually add EventSource()s, we need to have %thud
|
||||
:: handling working.
|
||||
::
|
||||
++ handle-start-stream
|
||||
|= req=http-request:light
|
||||
^- (quip move _this)
|
||||
:: Start a session sending the current time
|
||||
::
|
||||
=^ moves events
|
||||
(~(start-session event-source events) 0 ost.bow ["{<now.bow>}" ~])
|
||||
::
|
||||
:_ this
|
||||
:- ^- move
|
||||
[ost.bow %wait /timer (add now.bow ~s1)]
|
||||
::
|
||||
moves
|
||||
:: +wake: responds to a %wait send from +handle-start-stream
|
||||
::
|
||||
++ wake
|
||||
|= [wir=wire ~]
|
||||
^- (quip move _this)
|
||||
~& [%tick wir now.bow]
|
||||
::
|
||||
=^ moves events
|
||||
(~(send-message event-source events) ost.bow ["{<now.bow>}" ~])
|
||||
::
|
||||
:_ this
|
||||
:- ^- move
|
||||
[ost.bow %wait /timer (add now.bow ~s1)]
|
||||
moves
|
||||
::
|
||||
:: received when we have a
|
||||
::
|
||||
++ poke-handle-http-request
|
||||
@ -132,19 +197,21 @@
|
||||
?~ back-path
|
||||
'World'
|
||||
i.back-path
|
||||
?: =(name 'stream')
|
||||
(handle-start-stream req)
|
||||
~& [%name name]
|
||||
::
|
||||
:_ this
|
||||
:~ ^- move
|
||||
:- ost.bow
|
||||
:* %http-response
|
||||
[%start 200 ['content-type' 'text/html']~ [~ part1] %.y]
|
||||
[%start 200 ['content-type' 'text/html']~ [~ part1] %.n]
|
||||
==
|
||||
::
|
||||
^- move
|
||||
:- ost.bow
|
||||
:* %http-response
|
||||
[%continue [~ (part2 name)] %.y]
|
||||
==
|
||||
:: ::
|
||||
:: ^- move
|
||||
:: :- ost.bow
|
||||
:: :* %http-response
|
||||
:: [%continue [~ (part2 name)] %.y]
|
||||
:: ==
|
||||
==
|
||||
--
|
||||
|
||||
@ -371,6 +371,14 @@
|
||||
%login-handler
|
||||
(handle-request:authentication secure address http-request)
|
||||
==
|
||||
:: +cancel-request: handles a request being externally aborted
|
||||
::
|
||||
++ cancel-request
|
||||
^- [(list move) server-state]
|
||||
:: TODO: Timer stuff is currently commented out at the C layer.
|
||||
::
|
||||
~& [%cancel-request duct]
|
||||
[~ state]
|
||||
:: +return-static-data-on-duct: returns one piece of data all at once
|
||||
::
|
||||
++ return-static-data-on-duct
|
||||
@ -801,6 +809,14 @@
|
||||
=^ moves server-state.ax
|
||||
(request +.task)
|
||||
[moves light-gate]
|
||||
::
|
||||
::
|
||||
::
|
||||
%cancel-inbound-request
|
||||
=/ event-args [[(need ship.ax) eny duct now scry-gate] server-state.ax]
|
||||
=/ cancel-request cancel-request:(per-server-event event-args)
|
||||
=^ moves server-state.ax cancel-request
|
||||
[moves light-gate]
|
||||
::
|
||||
:: %connect / %serve
|
||||
::
|
||||
|
||||
@ -2235,6 +2235,9 @@
|
||||
:: starts handling an inbound http request
|
||||
::
|
||||
[%inbound-request secure=? =address =http-request]
|
||||
:: cancels a previous request
|
||||
::
|
||||
[%cancel-inbound-request ~]
|
||||
:: connects a binding to an app
|
||||
::
|
||||
[%connect =binding app=term]
|
||||
|
||||
Loading…
Reference in New Issue
Block a user