mirror of
https://github.com/ilyakooo0/urbit.git
synced 2024-12-15 01:52:42 +03:00
Multiple event downloading passes tests.
This commit is contained in:
Elliot Glaysher
parent
37f978dba3
commit
6cd52154c9
@ -110,6 +110,12 @@
|
||||
:: remaining-retries: number of times to retry the request
|
||||
::
|
||||
remaining-retries=@ud
|
||||
:: response-headers: the response headers from the %start packet
|
||||
::
|
||||
:: We send the response headers with each %http-progress, so we must
|
||||
:: save them.
|
||||
::
|
||||
response-headers=(unit http-response-header)
|
||||
:: chunks: a list of partial results returned from unix
|
||||
::
|
||||
:: This list of octs must be flopped before it is composed as the
|
||||
@ -297,6 +303,15 @@
|
||||
:: utilities
|
||||
::
|
||||
|%
|
||||
:: +combine-octs: combine multiple octs into one
|
||||
::
|
||||
++ combine-octs
|
||||
|= a=(list octs)
|
||||
^- octs
|
||||
:- %+ roll a
|
||||
|= [=octs sum=@ud]
|
||||
(add sum p.octs)
|
||||
(can 3 a)
|
||||
:: +prune-events: removes all items from the front of the queue up to :id
|
||||
::
|
||||
++ prune-events
|
||||
@ -688,7 +703,7 @@
|
||||
=. connection-by-id.state
|
||||
%+ ~(put by connection-by-id.state) id
|
||||
=, outbound-config
|
||||
[duct [redirects retries ~ 0 ~]]
|
||||
[duct [redirects retries ~ ~ 0 ~]]
|
||||
:: start the download
|
||||
::
|
||||
:: the original eyre keeps track of the duct on %born and then sends a
|
||||
@ -721,42 +736,11 @@
|
||||
:: TODO: Handle redirects and retries here, before we start dispatching
|
||||
:: back to the application.
|
||||
::
|
||||
:: if this is a %start and is :complete, only send a single
|
||||
:: %http-finished back to
|
||||
::
|
||||
?: complete.raw-http-response
|
||||
:: TODO: the entire handling of mime types in this system is nuts and
|
||||
:: we should replace it with plain @t.
|
||||
::
|
||||
=/ mime=@t
|
||||
?~ mime-type=(get-header 'content-type' headers.raw-http-response)
|
||||
'application/octet-stream'
|
||||
u.mime-type
|
||||
:- :~ ^- move
|
||||
:* duct.u.connection
|
||||
%give
|
||||
%http-finished
|
||||
^- http-response-header
|
||||
[status-code headers]:raw-http-response
|
||||
::
|
||||
?~ data.raw-http-response
|
||||
~
|
||||
[~ `mime-data`[mime u.data.raw-http-response]]
|
||||
== ==
|
||||
state(connection-by-id (~(del by connection-by-id.state) id))
|
||||
:: this is the initial packet of an incomplete request.
|
||||
:: record data from the http response that only comes from %start
|
||||
::
|
||||
=. connection-by-id.state
|
||||
%+ ~(jab by connection-by-id.state) id
|
||||
|= [duct=^duct =in-progress-http-request:client]
|
||||
:: record the data chunk, if it exists
|
||||
::
|
||||
=? chunks.in-progress-http-request
|
||||
?=(^ data.raw-http-response)
|
||||
[u.data.raw-http-response chunks.in-progress-http-request]
|
||||
=? bytes-read.in-progress-http-request
|
||||
?=(^ data.raw-http-response)
|
||||
(add bytes-read.in-progress-http-request p.u.data.raw-http-response)
|
||||
::
|
||||
=. expected-size.in-progress-http-request
|
||||
?~ str=(get-header 'content-length' headers.raw-http-response)
|
||||
@ -764,27 +748,89 @@
|
||||
::
|
||||
(rush u.str dum:ag)
|
||||
::
|
||||
=. response-headers.in-progress-http-request
|
||||
`[status-code headers]:raw-http-response
|
||||
::
|
||||
[duct in-progress-http-request]
|
||||
::
|
||||
=/ connection (~(got by connection-by-id.state) id)
|
||||
:_ state
|
||||
:_ ~
|
||||
:* duct.connection
|
||||
%give
|
||||
%http-progress
|
||||
[status-code headers]:raw-http-response
|
||||
bytes-read.in-progress-http-request.connection
|
||||
expected-size.in-progress-http-request.connection
|
||||
data.raw-http-response
|
||||
==
|
||||
?: complete.raw-http-response
|
||||
(send-finished id data.raw-http-response)
|
||||
::
|
||||
(record-and-send-progress id data.raw-http-response)
|
||||
::
|
||||
%continue
|
||||
[~ state]
|
||||
?: complete.raw-http-response
|
||||
(send-finished id data.raw-http-response)
|
||||
::
|
||||
(record-and-send-progress id data.raw-http-response)
|
||||
::
|
||||
%cancel
|
||||
~& [%eyre-received-cancel id]
|
||||
[~ state]
|
||||
==
|
||||
:: +record-and-send-progress: save incoming data and send progress report
|
||||
::
|
||||
++ record-and-send-progress
|
||||
|= [id=@ud data=(unit octs)]
|
||||
^- [(list move) state:client]
|
||||
::
|
||||
=. connection-by-id.state
|
||||
%+ ~(jab by connection-by-id.state) id
|
||||
|= [duct=^duct =in-progress-http-request:client]
|
||||
:: record the data chunk and size, if it exists
|
||||
::
|
||||
=? chunks.in-progress-http-request
|
||||
?=(^ data)
|
||||
[u.data chunks.in-progress-http-request]
|
||||
=? bytes-read.in-progress-http-request
|
||||
?=(^ data)
|
||||
(add bytes-read.in-progress-http-request p.u.data)
|
||||
::
|
||||
[duct in-progress-http-request]
|
||||
::
|
||||
=/ connection (~(got by connection-by-id.state) id)
|
||||
:_ state
|
||||
^- (list move)
|
||||
:_ ~
|
||||
:* duct.connection
|
||||
%give
|
||||
%http-progress
|
||||
(need response-headers.in-progress-http-request.connection)
|
||||
bytes-read.in-progress-http-request.connection
|
||||
expected-size.in-progress-http-request.connection
|
||||
data
|
||||
==
|
||||
:: +send-finished: sends the %finished, cleans up the session state
|
||||
::
|
||||
++ send-finished
|
||||
|= [id=@ud data=(unit octs)]
|
||||
^- [(list move) state:client]
|
||||
::
|
||||
=/ connection (~(got by connection-by-id.state) id)
|
||||
:: reassemble the octs that we've received into their final form
|
||||
::
|
||||
=/ data=octs
|
||||
%- combine-octs
|
||||
%- flop
|
||||
::
|
||||
?~ data
|
||||
chunks.in-progress-http-request.connection
|
||||
[u.data chunks.in-progress-http-request.connection]
|
||||
::
|
||||
=/ response-headers=http-response-header
|
||||
(need response-headers.in-progress-http-request.connection)
|
||||
::
|
||||
=/ mime=@t
|
||||
?~ mime-type=(get-header 'content-type' headers.response-headers)
|
||||
'application/octet-stream'
|
||||
u.mime-type
|
||||
:- :~ :* duct.connection
|
||||
%give
|
||||
%http-finished
|
||||
response-headers
|
||||
?:(=(0 p.data) ~ `[mime data])
|
||||
== ==
|
||||
state(connection-by-id (~(del by connection-by-id.state) id))
|
||||
--
|
||||
:: +per-server-event: per-event server core
|
||||
::
|
||||
|
||||
@ -1267,9 +1267,9 @@
|
||||
results8
|
||||
results9
|
||||
==
|
||||
:: +test-basic-fetch: tests a single request, single reply style http request
|
||||
:: +test-fetch-basic: tests a single request, single reply style http request
|
||||
::
|
||||
++ test-basic-fetch
|
||||
++ test-fetch-basic
|
||||
:: send a %born event to use /initial-born-duct for requests
|
||||
::
|
||||
=^ results1 light-gate
|
||||
@ -1325,7 +1325,7 @@
|
||||
=^ results3 light-gate
|
||||
%- light-call :*
|
||||
light-gate
|
||||
now=(add ~1111.1.1 ~s1)
|
||||
now=(add ~1111.1.1 ~s2)
|
||||
scry=*sley
|
||||
^= call-args
|
||||
:+ duct=~[/initial-born-duct] ~
|
||||
@ -1371,6 +1371,170 @@
|
||||
results2
|
||||
results3
|
||||
==
|
||||
:: +test-fetch-multiple-cards: tests when complete=%.n
|
||||
::
|
||||
++ test-fetch-multiple-cards
|
||||
:: send a %born event to use /initial-born-duct for requests
|
||||
::
|
||||
=^ results1 light-gate
|
||||
%- light-call :*
|
||||
light-gate
|
||||
now=~1111.1.1
|
||||
scry=*sley
|
||||
^= call-args
|
||||
:* duct=~[/initial-born-duct] ~
|
||||
%born
|
||||
[[%.n .192.168.1.1] ~]
|
||||
==
|
||||
^= expected-moves
|
||||
:~ :* duct=~[/initial-born-duct]
|
||||
%give
|
||||
%form
|
||||
*http-config:light
|
||||
== == ==
|
||||
::
|
||||
=/ request=http-request:light
|
||||
:* %'GET'
|
||||
'http://www.example.com'
|
||||
~
|
||||
~
|
||||
==
|
||||
:: opens the http channel
|
||||
::
|
||||
=^ results2 light-gate
|
||||
%- light-call :*
|
||||
light-gate
|
||||
now=(add ~1111.1.1 ~s1)
|
||||
scry=*sley
|
||||
^= call-args
|
||||
:* duct=~[/http-get-request] ~
|
||||
%fetch
|
||||
request
|
||||
*outbound-config:light
|
||||
==
|
||||
^= expected-moves
|
||||
^- (list move:light-gate)
|
||||
:~ :* duct=~[/initial-born-duct]
|
||||
%give
|
||||
%http-request
|
||||
id=0
|
||||
~
|
||||
method=%'GET'
|
||||
url='http://www.example.com'
|
||||
~
|
||||
~
|
||||
== == ==
|
||||
:: returns the first 1/3 of the payload in the first response
|
||||
::
|
||||
=^ results3 light-gate
|
||||
%- light-call :*
|
||||
light-gate
|
||||
now=(add ~1111.1.1 ~s2)
|
||||
scry=*sley
|
||||
^= call-args
|
||||
:+ duct=~[/initial-born-duct] ~
|
||||
^- task:able:light
|
||||
:* %receive
|
||||
id=0
|
||||
^- raw-http-response:light
|
||||
:* %start
|
||||
200
|
||||
:~ ['content-type' 'text/html']
|
||||
['content-length' '34']
|
||||
==
|
||||
[~ (as-octs:mimes:html '<html><body>')]
|
||||
complete=%.n
|
||||
== ==
|
||||
^= expected-moves
|
||||
^- (list move:light-gate)
|
||||
:~ :* duct=~[/http-get-request]
|
||||
%give
|
||||
%http-progress
|
||||
::
|
||||
:- 200
|
||||
:~ ['content-type' 'text/html']
|
||||
['content-length' '34']
|
||||
==
|
||||
::
|
||||
bytes-read=12
|
||||
expected-size=`34
|
||||
[~ (as-octs:mimes:html '<html><body>')]
|
||||
== == ==
|
||||
:: returns the second 1/3 of the payload
|
||||
::
|
||||
=^ results4 light-gate
|
||||
%- light-call :*
|
||||
light-gate
|
||||
now=(add ~1111.1.1 ~s3)
|
||||
scry=*sley
|
||||
^= call-args
|
||||
:+ duct=~[/initial-born-duct] ~
|
||||
^- task:able:light
|
||||
:* %receive
|
||||
id=0
|
||||
^- raw-http-response:light
|
||||
:* %continue
|
||||
[~ (as-octs:mimes:html 'Response')]
|
||||
complete=%.n
|
||||
== ==
|
||||
^= expected-moves
|
||||
^- (list move:light-gate)
|
||||
:~ :* duct=~[/http-get-request]
|
||||
%give
|
||||
%http-progress
|
||||
::
|
||||
:- 200
|
||||
:~ ['content-type' 'text/html']
|
||||
['content-length' '34']
|
||||
==
|
||||
::
|
||||
bytes-read=20
|
||||
expected-size=`34
|
||||
[~ (as-octs:mimes:html 'Response')]
|
||||
== == ==
|
||||
:: returns the last part
|
||||
::
|
||||
=^ results5 light-gate
|
||||
%- light-call :*
|
||||
light-gate
|
||||
now=(add ~1111.1.1 ~s4)
|
||||
scry=*sley
|
||||
^= call-args
|
||||
:+ duct=~[/initial-born-duct] ~
|
||||
^- task:able:light
|
||||
:* %receive
|
||||
id=0
|
||||
^- raw-http-response:light
|
||||
:* %continue
|
||||
[~ (as-octs:mimes:html '</body></html>')]
|
||||
complete=%.y
|
||||
== ==
|
||||
^= expected-moves
|
||||
^- (list move:light-gate)
|
||||
:~ :* duct=~[/http-get-request]
|
||||
%give
|
||||
%http-finished
|
||||
::
|
||||
:- 200
|
||||
:~ ['content-type' 'text/html']
|
||||
['content-length' '34']
|
||||
==
|
||||
::
|
||||
:- ~
|
||||
:- 'text/html'
|
||||
%- as-octs:mimes:html
|
||||
'''
|
||||
<html><body>Response</body></html>
|
||||
'''
|
||||
== == ==
|
||||
::
|
||||
;: weld
|
||||
results1
|
||||
results2
|
||||
results3
|
||||
results4
|
||||
results5
|
||||
==
|
||||
::
|
||||
++ light-call
|
||||
|= $: light-gate=_light-gate
|
||||
|
||||
Loading…
Reference in New Issue
Block a user