-
Notifications
You must be signed in to change notification settings - Fork 103
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
Add udp #327
Open
aratz-lasa
wants to merge
1
commit into
libp2p:main
Choose a base branch
from
aratz-lasa:add-udp
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Add udp #327
Changes from all commits
Commits
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,32 @@ | ||
from abc import ABC, abstractmethod | ||
from typing import Any | ||
|
||
|
||
class IStream(ABC): | ||
""" | ||
This is the common interface for both IStreamReader and IStreamWriter. | ||
In asyncio, just StreamWriter implements 'get_extra_info', however, | ||
it is more intuitive to be able to close it from any of them. | ||
|
||
This interface is not intended to be implemented directly by any class. | ||
""" | ||
|
||
@abstractmethod | ||
def get_extra_info(self, field: str) -> Any: | ||
pass | ||
|
||
@abstractmethod | ||
async def close(self) -> None: | ||
pass | ||
|
||
|
||
class IStreamReader(IStream): | ||
@abstractmethod | ||
async def read(self, n: int = -1) -> bytes: | ||
pass | ||
|
||
|
||
class IStreamWriter(IStream): | ||
@abstractmethod | ||
async def write(self, data: bytes) -> None: | ||
pass |
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,42 @@ | ||
from asyncio import StreamReader, StreamWriter | ||
from typing import Any, Tuple | ||
|
||
from libp2p.transport.stream_interface import IStream, IStreamReader, IStreamWriter | ||
|
||
|
||
class TCPStream(IStream): | ||
_write_stream: StreamWriter | ||
|
||
def __init__(self, write_stream: StreamWriter): | ||
self._write_stream = write_stream | ||
|
||
def get_extra_info(self, field: str) -> Any: | ||
return self._write_stream.get_extra_info(field) | ||
|
||
async def close(self) -> None: | ||
if not self._write_stream.is_closing(): | ||
self._write_stream.close() | ||
await self._write_stream.wait_closed() | ||
|
||
@classmethod | ||
def from_asyncio_streams( | ||
cls, read_stream: StreamReader, write_stream: StreamWriter | ||
) -> Tuple["TCPStreamReader", "TCPStreamWriter"]: | ||
return TCPStreamReader(read_stream, write_stream), TCPStreamWriter(write_stream) | ||
|
||
|
||
class TCPStreamReader(TCPStream, IStreamReader): | ||
_read_stream: StreamReader | ||
|
||
def __init__(self, read_stream: StreamReader, write_stream: StreamWriter): | ||
TCPStream.__init__(self, write_stream) | ||
self._read_stream = read_stream | ||
|
||
async def read(self, n: int = -1) -> bytes: | ||
return await self._read_stream.read(n) | ||
|
||
|
||
class TCPStreamWriter(TCPStream, IStreamWriter): | ||
async def write(self, data: bytes) -> None: | ||
self._write_stream.write(data) | ||
await self._write_stream.drain() |
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 |
---|---|---|
@@ -1,11 +1,11 @@ | ||
from asyncio import StreamReader, StreamWriter | ||
from typing import Awaitable, Callable, Mapping, Type | ||
|
||
from libp2p.security.secure_transport_interface import ISecureTransport | ||
from libp2p.stream_muxer.abc import IMuxedConn | ||
from libp2p.transport.stream_interface import IStreamReader, IStreamWriter | ||
from libp2p.typing import TProtocol | ||
|
||
THandler = Callable[[StreamReader, StreamWriter], Awaitable[None]] | ||
THandler = Callable[[IStreamReader, IStreamWriter], Awaitable[None]] | ||
TSecurityOptions = Mapping[TProtocol, ISecureTransport] | ||
TMuxerClass = Type[IMuxedConn] | ||
TMuxerOptions = Mapping[TProtocol, TMuxerClass] |
Empty file.
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,173 @@ | ||
import asyncio | ||
from typing import Any, Dict, List, Tuple | ||
|
||
from multiaddr import Multiaddr | ||
|
||
import asyncio_dgram | ||
from asyncio_dgram.aio import DatagramStream | ||
from libp2p.network.connection.raw_connection import RawConnection | ||
from libp2p.network.connection.raw_connection_interface import IRawConnection | ||
from libp2p.transport.exceptions import OpenConnectionError | ||
from libp2p.transport.listener_interface import IListener | ||
from libp2p.transport.stream_interface import IStreamReader, IStreamWriter | ||
from libp2p.transport.transport_interface import ITransport | ||
from libp2p.transport.typing import THandler | ||
from libp2p.transport.udp.udp_stream import ( | ||
UDPServerStreamReader, | ||
UDPServerStreamWriter, | ||
UDPStreamReader, | ||
UDPStreamWriter, | ||
) | ||
|
||
|
||
async def open_datagram_connection( | ||
host: str, port: int | ||
) -> Tuple[IStreamReader, IStreamWriter]: | ||
stream = await asyncio_dgram.connect((host, port)) | ||
reader, writer = UDPStreamReader(stream), UDPStreamWriter(stream) | ||
return reader, writer | ||
|
||
|
||
def start_udp_server(handler: THandler, host: str, port: int) -> "UDPServer": | ||
server = UDPServer(handler, host, port) | ||
asyncio.create_task(server.listen()) | ||
return server | ||
|
||
|
||
class UDPServer: | ||
_host: str | ||
_port: int | ||
_stream: DatagramStream | ||
_handler_queues: Dict[Any, asyncio.Queue[bytes]] | ||
_running_handlers: List[asyncio.Task[Any]] | ||
|
||
def __init__(self, handler: THandler, host: str, port: int): | ||
_handler: THandler # in class-level, MyPy raises error, because it treats like a method | ||
self._handler = handler | ||
self._host = host | ||
self._port = port | ||
self._handler_queues = {} | ||
self._running_handlers = [] | ||
|
||
async def listen(self) -> None: | ||
self._stream = await asyncio_dgram.bind((self._host, self._port)) | ||
while True: | ||
data, addr = await self._stream.recv() | ||
await self._deliver_data(addr, data) | ||
|
||
async def close(self) -> None: | ||
self._stream.close() | ||
# TODO: Correct way to destroy all handlers? | ||
for task in self._running_handlers: | ||
task.cancel() | ||
await asyncio.gather(task for task in self._running_handlers) | ||
|
||
def get_extra_info(self, field: str) -> Any: | ||
return self._stream.__getattribute__( | ||
field | ||
) # it is compatible with some TCP fields | ||
|
||
def close_handler_stream(self, addr: Any) -> None: | ||
""" | ||
Method called just by Streams used by handlers | ||
:param addr: socket address is connected to | ||
:return: | ||
""" | ||
if addr in self._running_handlers: | ||
del self._running_handlers[addr] | ||
|
||
async def _deliver_data(self, addr: Any, data: bytes) -> None: | ||
if addr in self._handler_queues: | ||
await self._handler_queues[addr].put(data) | ||
else: | ||
queue = await self._init_and_get_new_queue(addr, data) | ||
reader, writer = ( | ||
UDPServerStreamReader(self._stream, self, addr, queue), | ||
UDPServerStreamWriter(self._stream, self, addr), | ||
) | ||
await self._handler(reader, writer) | ||
|
||
async def _init_and_get_new_queue( | ||
self, addr: Any, data: bytes | ||
) -> asyncio.Queue[bytes]: | ||
queue: asyncio.Queue[bytes] | ||
queue = asyncio.Queue() | ||
self._handler_queues[addr] = queue | ||
await queue.put(data) | ||
return queue | ||
|
||
|
||
class UDPListener(IListener): | ||
multiaddrs: List[Multiaddr] | ||
server = None | ||
|
||
def __init__(self, handler_function: THandler) -> None: | ||
self.multiaddrs = [] | ||
self.server = None | ||
self.handler = handler_function | ||
|
||
async def listen(self, maddr: Multiaddr) -> bool: | ||
""" | ||
put listener in listening mode and wait for incoming connections | ||
:param maddr: maddr of peer | ||
:return: return True if successful | ||
""" | ||
self.server = start_udp_server( | ||
self.handler, | ||
maddr.value_for_protocol("ip4"), | ||
maddr.value_for_protocol("udp"), | ||
) | ||
self.multiaddrs.append( | ||
_multiaddr_from_socketname(self.server.get_extra_info("sockname")) | ||
) | ||
return True | ||
|
||
def get_addrs(self) -> List[Multiaddr]: | ||
""" | ||
retrieve list of addresses the listener is listening on | ||
:return: return list of addrs | ||
""" | ||
# TODO check if server is listening | ||
return self.multiaddrs | ||
|
||
async def close(self) -> None: | ||
""" | ||
close the listener such that no more connections | ||
can be open on this transport instance | ||
""" | ||
if self.server is None: | ||
return | ||
await self.server.close() | ||
self.server = None | ||
|
||
|
||
class UDP(ITransport): | ||
async def dial(self, maddr: Multiaddr) -> IRawConnection: | ||
""" | ||
dial a transport to peer listening on multiaddr | ||
:param maddr: multiaddr of peer | ||
:return: `RawConnection` if successful | ||
:raise OpenConnectionError: raised when failed to open connection | ||
""" | ||
self.host = maddr.value_for_protocol("ip4") | ||
self.port = int(maddr.value_for_protocol("tcp")) | ||
|
||
try: | ||
reader, writer = await open_datagram_connection(self.host, self.port) | ||
except (ConnectionAbortedError, ConnectionRefusedError) as error: | ||
raise OpenConnectionError(error) | ||
|
||
return RawConnection(reader, writer, True) | ||
|
||
def create_listener(self, handler_function: THandler) -> UDPListener: | ||
""" | ||
create listener on transport | ||
:param handler_function: a function called when a new connection is received | ||
that takes a connection as argument which implements interface-connection | ||
:return: a listener object that implements listener_interface.py | ||
""" | ||
return UDPListener(handler_function) | ||
|
||
|
||
def _multiaddr_from_socketname(socketname: Tuple[str, int]) -> Multiaddr: | ||
return Multiaddr(f"/ip4/{socketname[0]}/udp/{socketname[1]}") |
Oops, something went wrong.
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.
The proper pattern here according to the asyncio docs is:
This gives the loop the opportunity to inject the cancellation exception into the task so that it doesn't end up being reported as an unretrieved exception.
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.
Thanks! I missed it. And probably there are more bugs, I wrote it without much revising.