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>
93 lines
3.0 KiB
Python
93 lines
3.0 KiB
Python
from typing import (
|
|
Optional,
|
|
cast,
|
|
)
|
|
|
|
from noise.connection import NoiseConnection as NoiseState
|
|
|
|
from libp2p.abc import (
|
|
IRawConnection,
|
|
)
|
|
from libp2p.io.abc import (
|
|
EncryptedMsgReadWriter,
|
|
MsgReadWriteCloser,
|
|
ReadWriteCloser,
|
|
)
|
|
from libp2p.io.msgio import (
|
|
FixedSizeLenMsgReadWriter,
|
|
)
|
|
|
|
SIZE_NOISE_MESSAGE_LEN = 2
|
|
MAX_NOISE_MESSAGE_LEN = 2 ** (8 * SIZE_NOISE_MESSAGE_LEN) - 1
|
|
SIZE_NOISE_MESSAGE_BODY_LEN = 2
|
|
MAX_NOISE_MESSAGE_BODY_LEN = MAX_NOISE_MESSAGE_LEN - SIZE_NOISE_MESSAGE_BODY_LEN
|
|
BYTE_ORDER = "big"
|
|
|
|
# | Noise packet |
|
|
# < 2 bytes -><- 65535 ->
|
|
# | noise msg len | noise msg |
|
|
|
|
|
|
class NoisePacketReadWriter(FixedSizeLenMsgReadWriter):
|
|
size_len_bytes = SIZE_NOISE_MESSAGE_LEN
|
|
|
|
|
|
class BaseNoiseMsgReadWriter(EncryptedMsgReadWriter):
|
|
"""
|
|
The base implementation of noise message reader/writer.
|
|
|
|
`encrypt` and `decrypt` are not implemented here, which should be
|
|
implemented by the subclasses.
|
|
"""
|
|
|
|
read_writer: MsgReadWriteCloser
|
|
noise_state: NoiseState
|
|
|
|
# FIXME: This prefix is added in msg#3 in Go. Check whether it's a desired behavior.
|
|
prefix: bytes = b"\x00" * 32
|
|
|
|
def __init__(self, conn: IRawConnection, noise_state: NoiseState) -> None:
|
|
self.read_writer = NoisePacketReadWriter(cast(ReadWriteCloser, conn))
|
|
self.noise_state = noise_state
|
|
|
|
async def write_msg(self, data: bytes, prefix_encoded: bool = False) -> None:
|
|
data_encrypted = self.encrypt(data)
|
|
if prefix_encoded:
|
|
await self.read_writer.write_msg(self.prefix + data_encrypted)
|
|
else:
|
|
await self.read_writer.write_msg(data_encrypted)
|
|
|
|
async def read_msg(self, prefix_encoded: bool = False) -> bytes:
|
|
noise_msg_encrypted = await self.read_writer.read_msg()
|
|
if prefix_encoded:
|
|
return self.decrypt(noise_msg_encrypted[len(self.prefix) :])
|
|
else:
|
|
return self.decrypt(noise_msg_encrypted)
|
|
|
|
async def close(self) -> None:
|
|
await self.read_writer.close()
|
|
|
|
def get_remote_address(self) -> Optional[tuple[str, int]]:
|
|
# Delegate to the underlying connection if possible
|
|
if hasattr(self.read_writer, "read_write_closer") and hasattr(
|
|
self.read_writer.read_write_closer, "get_remote_address"
|
|
):
|
|
return self.read_writer.read_write_closer.get_remote_address()
|
|
return None
|
|
|
|
|
|
class NoiseHandshakeReadWriter(BaseNoiseMsgReadWriter):
|
|
def encrypt(self, data: bytes) -> bytes:
|
|
return self.noise_state.write_message(data)
|
|
|
|
def decrypt(self, data: bytes) -> bytes:
|
|
return bytes(self.noise_state.read_message(data))
|
|
|
|
|
|
class NoiseTransportReadWriter(BaseNoiseMsgReadWriter):
|
|
def encrypt(self, data: bytes) -> bytes:
|
|
return self.noise_state.encrypt(data)
|
|
|
|
def decrypt(self, data: bytes) -> bytes:
|
|
return self.noise_state.decrypt(data)
|