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

[WebTransport server] Make server-initiated bidirectional streams work #30795

Merged
merged 2 commits into from Sep 17, 2021
Merged

[WebTransport server] Make server-initiated bidirectional streams work #30795

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43f2799
WebTransport: Add workaround for server-initiated streams
bashi Sep 15, 2021
c0aeff9
Merge branch 'web-platform-tests:master' into webtransport-server-wor…
bashi Sep 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 8 additions & 1 deletion tools/webtransport/h3/webtransport_h3_server.py
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@
# TODO(bashi): Remove import check suppressions once aioquic dependency is resolved.
from aioquic.asyncio import QuicConnectionProtocol, serve # type: ignore
from aioquic.asyncio.client import connect # type: ignore
from aioquic.h3.connection import H3_ALPN, H3Connection # type: ignore
from aioquic.h3.connection import H3_ALPN, FrameType, H3Connection # type: ignore
from aioquic.h3.events import H3Event, HeadersReceived, WebTransportStreamDataReceived, DatagramReceived # type: ignore
from aioquic.quic.configuration import QuicConfiguration # type: ignore
from aioquic.quic.connection import stream_is_unidirectional # type: ignore
Expand Down Expand Up @@ -187,6 +187,13 @@ def create_bidirectional_stream(self) -> int:
"""
stream_id = self._http.create_webtransport_stream(
session_id=self.session_id, is_unidirectional=False)
# TODO(bashi): Remove this workaround when aioquic supports receiving
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will be broken when the bug is fixed on aioquic. How about guarding the block with

if stream.frame_type is None:

or

if stream.frame_type is None and stream.session_id is None:

?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I slightly prefer to assert because these asserts force us to remove these workarounds when we update aioquic.

# data on server-initiated bidirectional streams.
stream = self._http._get_or_create_stream(stream_id)
assert stream.frame_type is None
assert stream.session_id is None
stream.frame_type = FrameType.WEBTRANSPORT_STREAM
stream.session_id = self.session_id
return stream_id

def send_stream_data(self,
Expand Down