-
Notifications
You must be signed in to change notification settings - Fork 69
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
send partial bodies #55
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| -module(double_body_handler). | ||
|
|
||
| -include_lib("chatterbox/include/http2.hrl"). | ||
|
|
||
| -behaviour(http2_stream). | ||
|
|
||
| -export([ | ||
| init/2, | ||
| on_receive_request_headers/2, | ||
| on_send_push_promise/2, | ||
| on_receive_request_data/2, | ||
| on_request_end_stream/1 | ||
| ]). | ||
|
|
||
| -record(state, {conn_pid :: pid(), | ||
| stream_id :: integer() | ||
| }). | ||
|
|
||
| -spec init(pid(), integer()) -> {ok, any()}. | ||
| init(ConnPid, StreamId) -> {ok, #state{conn_pid=ConnPid, | ||
| stream_id=StreamId}}. | ||
|
|
||
| -spec on_receive_request_headers( | ||
| Headers :: hpack:headers(), | ||
| CallbackState :: any()) -> {ok, NewState :: any()}. | ||
| on_receive_request_headers(_Headers, State) -> {ok, State}. | ||
|
|
||
| -spec on_send_push_promise( | ||
| Headers :: hpack:headers(), | ||
| CallbackState :: any()) -> {ok, NewState :: any()}. | ||
| on_send_push_promise(_Headers, State) -> {ok, State}. | ||
|
|
||
| -spec on_receive_request_data( | ||
| iodata(), | ||
| CallbackState :: any())-> {ok, NewState :: any()}. | ||
| on_receive_request_data(_Data, State) -> {ok, State}. | ||
|
|
||
| -spec on_request_end_stream( | ||
| CallbackState :: any()) -> | ||
| {ok, NewState :: any()}. | ||
| on_request_end_stream(State=#state{conn_pid=ConnPid, | ||
| stream_id=StreamId}) -> | ||
| ResponseHeaders = [ | ||
| {<<":status">>,<<"200">>} | ||
| ], | ||
| http2_connection:send_headers(ConnPid, StreamId, ResponseHeaders), | ||
| http2_connection:send_body(ConnPid, StreamId, <<"BodyPart1\n">>, | ||
| [{send_end_stream, false}]), | ||
| http2_connection:send_body(ConnPid, StreamId, <<"BodyPart2">>), | ||
| {ok, State}. | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| -module(flow_control_handler). | ||
|
|
||
| -include_lib("chatterbox/include/http2.hrl"). | ||
|
|
||
| -define(SEND_BYTES, 68). | ||
|
|
||
| -behaviour(http2_stream). | ||
|
|
||
| -export([ | ||
| init/2, | ||
| on_receive_request_headers/2, | ||
| on_send_push_promise/2, | ||
| on_receive_request_data/2, | ||
| on_request_end_stream/1 | ||
| ]). | ||
|
|
||
| -record(state, {conn_pid :: pid(), | ||
| stream_id :: integer() | ||
| }). | ||
|
|
||
| -spec init(pid(), integer()) -> {ok, any()}. | ||
| init(ConnPid, StreamId) -> | ||
| {ok, #state{conn_pid=ConnPid, | ||
| stream_id=StreamId}}. | ||
|
|
||
| -spec on_receive_request_headers( | ||
| Headers :: hpack:headers(), | ||
| CallbackState :: any()) -> {ok, NewState :: any()}. | ||
| on_receive_request_headers(_Headers, State) -> {ok, State}. | ||
|
|
||
| -spec on_send_push_promise( | ||
| Headers :: hpack:headers(), | ||
| CallbackState :: any()) -> {ok, NewState :: any()}. | ||
| on_send_push_promise(_Headers, State) -> {ok, State}. | ||
|
|
||
| -spec on_receive_request_data( | ||
| iodata(), | ||
| CallbackState :: any())-> {ok, NewState :: any()}. | ||
| on_receive_request_data(_Data, State) -> {ok, State}. | ||
|
|
||
| -spec on_request_end_stream( | ||
| CallbackState :: any()) -> | ||
| {ok, NewState :: any()}. | ||
| on_request_end_stream(State=#state{conn_pid=ConnPid, | ||
| stream_id=StreamId}) -> | ||
| ResponseHeaders = [ | ||
| {<<":status">>,<<"200">>} | ||
| ], | ||
| http2_connection:send_headers(ConnPid, StreamId, ResponseHeaders), | ||
| http2_connection:send_body(ConnPid, StreamId, crypto:rand_bytes(?SEND_BYTES), | ||
| [{send_end_stream, false}]), | ||
| timer:sleep(200), | ||
| http2_connection:send_body(ConnPid, StreamId, crypto:rand_bytes(?SEND_BYTES)), | ||
| {ok, State}. | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There's a better way to test this using
http2c. It will allow you to inspect the response as a series of frames. You can then assert that the response is made of two data frames, and that they're broken up correctly.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think that's a level of abstraction lower than we need to test. as a user I don't care how you send my data, just that you do as fast as possible.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's not really doing that though. For better or worse, this test would pass if the server held back all the response body until it was ready to send it all.
It might mean that we have to add some kind of streaming functionality to the
http2_client, so that we can see the response coming in pieces. We might have to add some kind of timer delay to thedouble_body_handlerto take advantage of that.