mirror of
https://github.com/varun-r-mallya/py-libp2p.git
synced 2025-12-31 20:36:24 +00:00
* feat: Replace mplex with yamux as default multiplexer in py-libp2p * Retain Mplex alongside Yamux in new_swarm with messaging that Yamux is preferred * moved !BBHII to a constant YAMUX_HEADER_FORMAT at the top of yamux.py with a comment explaining its structure * renamed the news fragment to 534.feature.rst and updated the description * renamed the news fragment to 534.feature.rst and updated the description * added a docstring to clarify that Yamux does not support deadlines natively * Remove the __main__ block entirely from test_yamux.py * Replaced the print statements in test_yamux.py with logging.debug * Added a comment linking to the spec for clarity * Raise NotImplementedError in YamuxStream.set_deadline per review * Add muxed_conn to YamuxStream and test deadline NotImplementedError * Fix Yamux implementation to meet libp2p spec * Fix None handling in YamuxStream.read and Yamux.read_stream * Fix test_connected_peers.py to correctly handle peer connections * fix: Ensure StreamReset is raised on read after local reset in yamux * fix: Map MuxedStreamError to StreamClosed in NetStream.write for Yamux * fix: Raise MuxedStreamReset in Yamux.read_stream for closed streams * fix: Correct Yamux stream read behavior for NetStream tests Fixed est_net_stream_read_after_remote_closed by updating NetStream.read to raise StreamEOF when the stream is remotely closed and no data is available, aligning with test expectations and Fixed est_net_stream_read_until_eof by modifying YamuxStream.read to block until the stream is closed ( ecv_closed=True) for =-1 reads, ensuring data is only returned after remote closure. * fix: Correct Yamux stream read behavior for NetStream tests Fixed est_net_stream_read_after_remote_closed by updating NetStream.read to raise StreamEOF when the stream is remotely closed and no data is available, aligning with test expectations and Fixed est_net_stream_read_until_eof by modifying YamuxStream.read to block until the stream is closed ( ecv_closed=True) for =-1 reads, ensuring data is only returned after remote closure. * fix: raise StreamEOF when reading from closed stream with empty buffer * fix: prioritize returning buffered data even after stream reset * fix: prioritize returning buffered data even after stream reset * fix: Ensure test_net_stream_read_after_remote_closed_and_reset passes in full suite * fix: Add __init__.py to yamux module to fix documentation build * fix: Add __init__.py to yamux module to fix documentation build * fix: Add libp2p.stream_muxer.yamux to libp2p.stream_muxer.rst toctree * fix: Correct title underline length in libp2p.stream_muxer.yamux.rst * fix: Add a = so that is matches the libp2p.stream\_muxer.yamux length * fix(tests): Resolve race condition in network notification test * fix: fixing failing tests and examples with yamux and noise * refactor: remove debug logging and improve x25519 tests * fix: Add functionality for users to choose between Yamux and Mplex * fix: increased trio sleep to 0.1 sec for slow environment * feat: Add test for switching between Yamux and mplex * refactor: move host fixtures to interop tests * chore: Update __init__.py removing unused import removed unused ```python import os import logging ``` * lint: fix import order * fix: Resolve conftest.py conflict by removing trio test support * fix: Resolve test skipping by keeping trio test support * Fix: add a newline at end of the file --------- Co-authored-by: acul71 <luca.pisani@birdo.net> Co-authored-by: acul71 <34693171+acul71@users.noreply.github.com>
150 lines
5.0 KiB
Python
150 lines
5.0 KiB
Python
import logging
|
|
from typing import (
|
|
TYPE_CHECKING,
|
|
)
|
|
|
|
import trio
|
|
|
|
from libp2p.abc import (
|
|
IMuxedConn,
|
|
IMuxedStream,
|
|
INetConn,
|
|
)
|
|
from libp2p.network.stream.net_stream import (
|
|
NetStream,
|
|
)
|
|
from libp2p.stream_muxer.exceptions import (
|
|
MuxedConnUnavailable,
|
|
)
|
|
|
|
if TYPE_CHECKING:
|
|
from libp2p.network.swarm import Swarm # noqa: F401
|
|
|
|
|
|
"""
|
|
Reference: https://github.com/libp2p/go-libp2p-swarm/blob/04c86bbdafd390651cb2ee14e334f7caeedad722/swarm_conn.go # noqa: E501
|
|
"""
|
|
|
|
|
|
class SwarmConn(INetConn):
|
|
muxed_conn: IMuxedConn
|
|
swarm: "Swarm"
|
|
streams: set[NetStream]
|
|
event_closed: trio.Event
|
|
|
|
def __init__(self, muxed_conn: IMuxedConn, swarm: "Swarm") -> None:
|
|
self.muxed_conn = muxed_conn
|
|
self.swarm = swarm
|
|
self.streams = set()
|
|
self.event_closed = trio.Event()
|
|
self.event_started = trio.Event()
|
|
if hasattr(muxed_conn, "on_close"):
|
|
logging.debug(f"Setting on_close for peer {muxed_conn.peer_id}")
|
|
muxed_conn.on_close = self._on_muxed_conn_closed
|
|
else:
|
|
logging.error(
|
|
f"muxed_conn for peer {muxed_conn.peer_id} has no on_close attribute"
|
|
)
|
|
|
|
@property
|
|
def is_closed(self) -> bool:
|
|
return self.event_closed.is_set()
|
|
|
|
async def _on_muxed_conn_closed(self) -> None:
|
|
"""Handle closure of the underlying muxed connection."""
|
|
peer_id = self.muxed_conn.peer_id
|
|
logging.debug(f"SwarmConn closing for peer {peer_id} due to muxed_conn closure")
|
|
# Only call close if we're not already closing
|
|
if not self.event_closed.is_set():
|
|
await self.close()
|
|
|
|
async def close(self) -> None:
|
|
if self.event_closed.is_set():
|
|
return
|
|
logging.debug(f"Closing SwarmConn for peer {self.muxed_conn.peer_id}")
|
|
self.event_closed.set()
|
|
|
|
# Close the muxed connection
|
|
try:
|
|
await self.muxed_conn.close()
|
|
except Exception as e:
|
|
logging.warning(f"Error while closing muxed connection: {e}")
|
|
|
|
# Perform proper cleanup of resources
|
|
await self._cleanup()
|
|
|
|
async def _cleanup(self) -> None:
|
|
# Remove the connection from swarm
|
|
logging.debug(f"Removing connection for peer {self.muxed_conn.peer_id}")
|
|
self.swarm.remove_conn(self)
|
|
|
|
# Only close the connection if it's not already closed
|
|
# Be defensive here to avoid exceptions during cleanup
|
|
try:
|
|
if not self.muxed_conn.is_closed:
|
|
await self.muxed_conn.close()
|
|
except Exception as e:
|
|
logging.warning(f"Error closing muxed connection: {e}")
|
|
|
|
# This is just for cleaning up state. The connection has already been closed.
|
|
# We *could* optimize this but it really isn't worth it.
|
|
logging.debug(f"Resetting streams for peer {self.muxed_conn.peer_id}")
|
|
for stream in self.streams.copy():
|
|
try:
|
|
await stream.reset()
|
|
except Exception as e:
|
|
logging.warning(f"Error resetting stream: {e}")
|
|
|
|
# Force context switch for stream handlers to process the stream reset event we
|
|
# just emit before we cancel the stream handler tasks.
|
|
await trio.sleep(0.1)
|
|
|
|
# Notify all listeners about the disconnection
|
|
logging.debug(f"Notifying disconnection for peer {self.muxed_conn.peer_id}")
|
|
await self._notify_disconnected()
|
|
|
|
async def _handle_new_streams(self) -> None:
|
|
self.event_started.set()
|
|
async with trio.open_nursery() as nursery:
|
|
while True:
|
|
try:
|
|
stream = await self.muxed_conn.accept_stream()
|
|
except MuxedConnUnavailable:
|
|
await self.close()
|
|
break
|
|
# Asynchronously handle the accepted stream, to avoid blocking
|
|
# the next stream.
|
|
nursery.start_soon(self._handle_muxed_stream, stream)
|
|
|
|
async def _handle_muxed_stream(self, muxed_stream: IMuxedStream) -> None:
|
|
net_stream = await self._add_stream(muxed_stream)
|
|
try:
|
|
await self.swarm.common_stream_handler(net_stream)
|
|
finally:
|
|
# As long as `common_stream_handler`, remove the stream.
|
|
self.remove_stream(net_stream)
|
|
|
|
async def _add_stream(self, muxed_stream: IMuxedStream) -> NetStream:
|
|
net_stream = NetStream(muxed_stream)
|
|
self.streams.add(net_stream)
|
|
await self.swarm.notify_opened_stream(net_stream)
|
|
return net_stream
|
|
|
|
async def _notify_disconnected(self) -> None:
|
|
await self.swarm.notify_disconnected(self)
|
|
|
|
async def start(self) -> None:
|
|
await self._handle_new_streams()
|
|
|
|
async def new_stream(self) -> NetStream:
|
|
muxed_stream = await self.muxed_conn.open_stream()
|
|
return await self._add_stream(muxed_stream)
|
|
|
|
def get_streams(self) -> tuple[NetStream, ...]:
|
|
return tuple(self.streams)
|
|
|
|
def remove_stream(self, stream: NetStream) -> None:
|
|
if stream not in self.streams:
|
|
return
|
|
self.streams.remove(stream)
|