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

Make WebsocketImplProtocol async iterable #2490

Merged
merged 12 commits into from
Sep 20, 2022
Merged

Make WebsocketImplProtocol async iterable #2490

Changes from 5 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
35bb2bc
Make WebsocketImplProtocol async iterable
ChihweiLHBird Jun 30, 2022
404a365
Merge branch 'main' into zhiwei/ws-async-iterator
ChihweiLHBird Jul 1, 2022
f7f8f91
Remove `__anext__`
ChihweiLHBird Jul 1, 2022
0fce3d7
Ignore `ConnectionClosedOK` by using `contextlib.suppress`
ChihweiLHBird Jul 1, 2022
ba0d558
Merge branch 'main' into zhiwei/ws-async-iterator
ChihweiLHBird Jul 26, 2022
e4023d6
Test cases
ChihweiLHBird Jul 26, 2022
7b73765
Better naming of websocket handlers in tests
ChihweiLHBird Jul 26, 2022
ecb566d
Fix
ChihweiLHBird Aug 29, 2022
8d30a54
Merge branch 'main' into zhiwei/ws-async-iterator
ChihweiLHBird Aug 29, 2022
b4565a0
Merge branch 'main' into zhiwei/ws-async-iterator
ChihweiLHBird Sep 16, 2022
765d4c6
Requires latest sanic-testing
ChihweiLHBird Sep 20, 2022
66a9389
Merge branch 'main' into zhiwei/ws-async-iterator
ChihweiLHBird Sep 20, 2022
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
12 changes: 11 additions & 1 deletion sanic/server/websockets/impl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import random
import struct

from contextlib import suppress
from typing import (
AsyncIterator,
Dict,
Expand All @@ -13,7 +14,11 @@
)

from websockets.connection import CLOSED, CLOSING, OPEN, Event
from websockets.exceptions import ConnectionClosed, ConnectionClosedError
from websockets.exceptions import (
ConnectionClosed,
ConnectionClosedError,
ConnectionClosedOK,
)
from websockets.frames import Frame, Opcode
from websockets.server import ServerConnection
from websockets.typing import Data
Expand Down Expand Up @@ -840,3 +845,8 @@ def connection_lost(self, exc):
self.abort_pings()
if self.connection_lost_waiter:
self.connection_lost_waiter.set_result(None)

async def __aiter__(self):
with suppress(ConnectionClosedOK):
while True:
yield await self.recv()
ChihweiLHBird marked this conversation as resolved.
Show resolved Hide resolved