Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Ensure H2 state is only accessed by the connection, not per-stream. #628

Merged
merged 2 commits into from
Dec 12, 2019
Merged

Ensure H2 state is only accessed by the connection, not per-stream. #628

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6fa93a1
Ensure H2 state is only accessed by the connection, not per-stream
tomchristie Dec 11, 2019
6970ce7
Formatting tweak
tomchristie Dec 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 33 additions & 20 deletions httpx/dispatch/http2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ async def send(self, request: Request, timeout: Timeout = None) -> Response:
await self.init_complete.wait()
stream_id = self.state.get_next_available_stream_id()

stream = HTTP2Stream(stream_id=stream_id, connection=self, state=self.state)
stream = HTTP2Stream(stream_id=stream_id, connection=self)
self.streams[stream_id] = stream
self.events[stream_id] = []
return await stream.send(request, timeout)
Expand Down Expand Up @@ -158,10 +158,32 @@ async def receive_events(self, timeout: Timeout) -> None:
data_to_send = self.state.data_to_send()
await self.socket.write(data_to_send, timeout)

async def send_outgoing_data(self, timeout: Timeout) -> None:
async def send_headers(
self,
stream_id: int,
headers: typing.List[typing.Tuple[bytes, bytes]],
timeout: Timeout,
) -> None:
self.state.send_headers(stream_id, headers)
data_to_send = self.state.data_to_send()
await self.socket.write(data_to_send, timeout)

async def send_data(self, stream_id: int, chunk: bytes, timeout: Timeout) -> None:
self.state.send_data(stream_id, chunk)
data_to_send = self.state.data_to_send()
await self.socket.write(data_to_send, timeout)

async def end_stream(self, stream_id: int, timeout: Timeout) -> None:
self.state.end_stream(stream_id)
data_to_send = self.state.data_to_send()
if data_to_send:
await self.socket.write(data_to_send, timeout)
await self.socket.write(data_to_send, timeout)

async def acknowledge_received_data(
self, stream_id: int, amount: int, timeout: Timeout
) -> None:
self.state.acknowledge_received_data(amount, stream_id)
data_to_send = self.state.data_to_send()
await self.socket.write(data_to_send, timeout)

async def close_stream(self, stream_id: int) -> None:
del self.streams[stream_id]
Expand All @@ -172,15 +194,9 @@ async def close_stream(self, stream_id: int) -> None:


class HTTP2Stream:
def __init__(
self,
stream_id: int,
connection: HTTP2Connection,
state: h2.connection.H2Connection,
) -> None:
def __init__(self, stream_id: int, connection: HTTP2Connection) -> None:
self.stream_id = stream_id
self.connection = connection
self.state = state

async def send(self, request: Request, timeout: Timeout) -> Response:
# Send the request.
Expand Down Expand Up @@ -214,8 +230,7 @@ async def send_headers(self, request: Request, timeout: Timeout) -> None:
f"target={request.url.full_path!r} "
f"headers={headers!r}"
)
self.state.send_headers(self.stream_id, headers)
await self.connection.send_outgoing_data(timeout)
await self.connection.send_headers(self.stream_id, headers, timeout)

async def send_body(self, request: Request, timeout: Timeout) -> None:
logger.trace(f"send_body stream_id={self.stream_id}")
Expand All @@ -226,11 +241,9 @@ async def send_body(self, request: Request, timeout: Timeout) -> None:
)
chunk_size = min(len(data), max_flow)
chunk, data = data[:chunk_size], data[chunk_size:]
self.state.send_data(self.stream_id, chunk)
await self.connection.send_outgoing_data(timeout)
await self.connection.send_data(self.stream_id, chunk, timeout)

self.state.end_stream(self.stream_id)
await self.connection.send_outgoing_data(timeout)
await self.connection.end_stream(self.stream_id, timeout)

async def receive_response(
self, timeout: Timeout
Expand All @@ -257,10 +270,10 @@ async def body_iter(self, timeout: Timeout) -> typing.AsyncIterator[bytes]:
while True:
event = await self.connection.wait_for_event(self.stream_id, timeout)
if isinstance(event, h2.events.DataReceived):
self.state.acknowledge_received_data(
event.flow_controlled_length, self.stream_id
amount = event.flow_controlled_length
await self.connection.acknowledge_received_data(
self.stream_id, amount, timeout
)
await self.connection.send_outgoing_data(timeout)
yield event.data
elif isinstance(event, (h2.events.StreamEnded, h2.events.StreamReset)):
break
Expand Down