mirror of
https://github.com/varun-r-mallya/py-libp2p.git
synced 2026-02-10 23:20:55 +00:00
feat: implement get_remote_address via delegation pattern
This commit is contained in:
@ -2,6 +2,9 @@ from abc import (
|
|||||||
ABC,
|
ABC,
|
||||||
abstractmethod,
|
abstractmethod,
|
||||||
)
|
)
|
||||||
|
from typing import (
|
||||||
|
Optional,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
class Closer(ABC):
|
class Closer(ABC):
|
||||||
@ -35,7 +38,14 @@ class ReadWriter(Reader, Writer):
|
|||||||
|
|
||||||
|
|
||||||
class ReadWriteCloser(Reader, Writer, Closer):
|
class ReadWriteCloser(Reader, Writer, Closer):
|
||||||
pass
|
@abstractmethod
|
||||||
|
def get_remote_address(self) -> Optional[tuple[str, int]]:
|
||||||
|
"""
|
||||||
|
Return the remote address of the connected peer.
|
||||||
|
|
||||||
|
:return: A tuple of (host, port) or None if not available
|
||||||
|
"""
|
||||||
|
...
|
||||||
|
|
||||||
|
|
||||||
class MsgReader(ABC):
|
class MsgReader(ABC):
|
||||||
@ -66,3 +76,9 @@ class Encrypter(ABC):
|
|||||||
|
|
||||||
class EncryptedMsgReadWriter(MsgReadWriteCloser, Encrypter):
|
class EncryptedMsgReadWriter(MsgReadWriteCloser, Encrypter):
|
||||||
"""Read/write message with encryption/decryption."""
|
"""Read/write message with encryption/decryption."""
|
||||||
|
|
||||||
|
def get_remote_address(self) -> Optional[tuple[str, int]]:
|
||||||
|
"""Get remote address if supported by the underlying connection."""
|
||||||
|
if hasattr(self, "conn") and hasattr(self.conn, "get_remote_address"):
|
||||||
|
return self.conn.get_remote_address()
|
||||||
|
return None
|
||||||
|
|||||||
@ -1,4 +1,7 @@
|
|||||||
import logging
|
import logging
|
||||||
|
from typing import (
|
||||||
|
Optional,
|
||||||
|
)
|
||||||
|
|
||||||
import trio
|
import trio
|
||||||
|
|
||||||
@ -42,3 +45,11 @@ class TrioTCPStream(ReadWriteCloser):
|
|||||||
|
|
||||||
async def close(self) -> None:
|
async def close(self) -> None:
|
||||||
await self.stream.aclose()
|
await self.stream.aclose()
|
||||||
|
|
||||||
|
def get_remote_address(self) -> Optional[tuple[str, int]]:
|
||||||
|
"""Return the remote address as (host, port) tuple."""
|
||||||
|
try:
|
||||||
|
return self.stream.socket.getpeername()
|
||||||
|
except (AttributeError, OSError) as e:
|
||||||
|
logger.error("Error getting remote address: %s", e)
|
||||||
|
return None
|
||||||
|
|||||||
@ -1,3 +1,7 @@
|
|||||||
|
from typing import (
|
||||||
|
Optional,
|
||||||
|
)
|
||||||
|
|
||||||
from libp2p.abc import (
|
from libp2p.abc import (
|
||||||
IRawConnection,
|
IRawConnection,
|
||||||
)
|
)
|
||||||
@ -42,3 +46,7 @@ class RawConnection(IRawConnection):
|
|||||||
|
|
||||||
async def close(self) -> None:
|
async def close(self) -> None:
|
||||||
await self.stream.close()
|
await self.stream.close()
|
||||||
|
|
||||||
|
def get_remote_address(self) -> Optional[tuple[str, int]]:
|
||||||
|
"""Delegate to the underlying stream's get_remote_address method."""
|
||||||
|
return self.stream.get_remote_address()
|
||||||
|
|||||||
@ -78,6 +78,10 @@ class NetStream(INetStream):
|
|||||||
async def reset(self) -> None:
|
async def reset(self) -> None:
|
||||||
await self.muxed_stream.reset()
|
await self.muxed_stream.reset()
|
||||||
|
|
||||||
|
def get_remote_address(self) -> Optional[tuple[str, int]]:
|
||||||
|
"""Delegate to the underlying muxed stream."""
|
||||||
|
return self.muxed_stream.get_remote_address()
|
||||||
|
|
||||||
# TODO: `remove`: Called by close and write when the stream is in specific states.
|
# TODO: `remove`: Called by close and write when the stream is in specific states.
|
||||||
# It notifies `ClosedStream` after `SwarmConn.remove_stream` is called.
|
# It notifies `ClosedStream` after `SwarmConn.remove_stream` is called.
|
||||||
# Reference: https://github.com/libp2p/go-libp2p-swarm/blob/99831444e78c8f23c9335c17d8f7c700ba25ca14/swarm_stream.go # noqa: E501
|
# Reference: https://github.com/libp2p/go-libp2p-swarm/blob/99831444e78c8f23c9335c17d8f7c700ba25ca14/swarm_stream.go # noqa: E501
|
||||||
|
|||||||
@ -1,3 +1,7 @@
|
|||||||
|
from typing import (
|
||||||
|
Optional,
|
||||||
|
)
|
||||||
|
|
||||||
from libp2p.abc import (
|
from libp2p.abc import (
|
||||||
IRawConnection,
|
IRawConnection,
|
||||||
ISecureConn,
|
ISecureConn,
|
||||||
@ -73,6 +77,12 @@ class InsecureSession(BaseSession):
|
|||||||
is_initiator=is_initiator,
|
is_initiator=is_initiator,
|
||||||
)
|
)
|
||||||
self.conn = conn
|
self.conn = conn
|
||||||
|
# Cache the remote address to avoid repeated lookups
|
||||||
|
# through the delegation chain
|
||||||
|
try:
|
||||||
|
self.remote_peer_addr = conn.get_remote_address()
|
||||||
|
except AttributeError:
|
||||||
|
self.remote_peer_addr = None
|
||||||
|
|
||||||
async def write(self, data: bytes) -> None:
|
async def write(self, data: bytes) -> None:
|
||||||
await self.conn.write(data)
|
await self.conn.write(data)
|
||||||
@ -83,6 +93,12 @@ class InsecureSession(BaseSession):
|
|||||||
async def close(self) -> None:
|
async def close(self) -> None:
|
||||||
await self.conn.close()
|
await self.conn.close()
|
||||||
|
|
||||||
|
def get_remote_address(self) -> Optional[tuple[str, int]]:
|
||||||
|
"""
|
||||||
|
Delegate to the underlying connection's get_remote_address method.
|
||||||
|
"""
|
||||||
|
return self.conn.get_remote_address()
|
||||||
|
|
||||||
|
|
||||||
async def run_handshake(
|
async def run_handshake(
|
||||||
local_peer: ID,
|
local_peer: ID,
|
||||||
|
|||||||
@ -1,4 +1,7 @@
|
|||||||
import io
|
import io
|
||||||
|
from typing import (
|
||||||
|
Optional,
|
||||||
|
)
|
||||||
|
|
||||||
from libp2p.crypto.keys import (
|
from libp2p.crypto.keys import (
|
||||||
PrivateKey,
|
PrivateKey,
|
||||||
@ -41,6 +44,10 @@ class SecureSession(BaseSession):
|
|||||||
|
|
||||||
self._reset_internal_buffer()
|
self._reset_internal_buffer()
|
||||||
|
|
||||||
|
def get_remote_address(self) -> Optional[tuple[str, int]]:
|
||||||
|
"""Delegate to the underlying connection's get_remote_address method."""
|
||||||
|
return self.conn.get_remote_address()
|
||||||
|
|
||||||
def _reset_internal_buffer(self) -> None:
|
def _reset_internal_buffer(self) -> None:
|
||||||
self.buf = io.BytesIO()
|
self.buf = io.BytesIO()
|
||||||
self.low_watermark = 0
|
self.low_watermark = 0
|
||||||
|
|||||||
@ -365,3 +365,7 @@ class Mplex(IMuxedConn):
|
|||||||
await send_channel.aclose()
|
await send_channel.aclose()
|
||||||
self.event_closed.set()
|
self.event_closed.set()
|
||||||
await self.new_stream_send_channel.aclose()
|
await self.new_stream_send_channel.aclose()
|
||||||
|
|
||||||
|
def get_remote_address(self) -> Optional[tuple[str, int]]:
|
||||||
|
"""Delegate to the underlying Mplex connection's secured_conn."""
|
||||||
|
return self.secured_conn.get_remote_address()
|
||||||
|
|||||||
@ -1,5 +1,6 @@
|
|||||||
from typing import (
|
from typing import (
|
||||||
TYPE_CHECKING,
|
TYPE_CHECKING,
|
||||||
|
Optional,
|
||||||
)
|
)
|
||||||
|
|
||||||
import trio
|
import trio
|
||||||
@ -252,3 +253,7 @@ class MplexStream(IMuxedStream):
|
|||||||
"""
|
"""
|
||||||
self.write_deadline = ttl
|
self.write_deadline = ttl
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
def get_remote_address(self) -> Optional[tuple[str, int]]:
|
||||||
|
"""Delegate to the parent Mplex connection."""
|
||||||
|
return self.muxed_conn.get_remote_address()
|
||||||
|
|||||||
Reference in New Issue
Block a user