mirror of
https://github.com/varun-r-mallya/py-libp2p.git
synced 2026-02-11 07:30:55 +00:00
ft. modernise py-libp2p (#618)
* fix pyproject.toml , add ruff * rm lock * make progress * add poetry lock ignore * fix type issues * fix tcp type errors * fix text example - type error - wrong args * add setuptools to dev * test ci * fix docs build * fix type issues for new_swarm & new_host * fix types in gossipsub * fix type issues in noise * wip: factories * revert factories * fix more type issues * more type fixes * fix: add null checks for noise protocol initialization and key handling * corrected argument-errors in peerId and Multiaddr in peer tests * fix: Noice - remove redundant type casts in BaseNoiseMsgReadWriter * fix: update test_notify.py to use SwarmFactory.create_batch_and_listen, fix type hints, and comment out ClosedStream assertions * Fix type checks for pubsub module Signed-off-by: sukhman <sukhmansinghsaluja@gmail.com> * Fix type checks for pubsub module-tests Signed-off-by: sukhman <sukhmansinghsaluja@gmail.com> * noise: add checks for uninitialized protocol and key states in PatternXX Signed-off-by: varun-r-mallya <varunrmallya@gmail.com> * pubsub: add None checks for optional fields in FloodSub and Pubsub Signed-off-by: varun-r-mallya <varunrmallya@gmail.com> * Fix type hints and improve testing Signed-off-by: varun-r-mallya <varunrmallya@gmail.com> * remove redundant checks Signed-off-by: varun-r-mallya <varunrmallya@gmail.com> * fix build issues * add optional to trio service * fix types * fix type errors * Fix type errors Signed-off-by: varun-r-mallya <varunrmallya@gmail.com> * fixed more-type checks in crypto and peer_data files * wip: factories * replaced union with optional * fix: type-error in interp-utils and peerinfo * replace pyright with pyrefly * add pyrefly.toml * wip: fix multiselect issues * try typecheck * base check * mcache test fixes , typecheck ci update * fix ci * will this work * minor fix * use poetry * fix wokflow * use cache,fix err * fix pyrefly.toml * fix pyrefly.toml * fix cache in ci * deploy commit * add main baseline * update to v5 * improve typecheck ci (#14) * fix typo * remove holepunching code (#16) * fix gossipsub typeerrors (#17) * fix: ensure initiator user includes remote peer id in handshake (#15) * fix ci (#19) * typefix: custom_types | core/peerinfo/test_peer_info | io/abc | pubsub/floodsub | protocol_muxer/multiselect (#18) * fix: Typefixes in PeerInfo (#21) * fix minor type issue (#22) * fix type errors in pubsub (#24) * fix: Minor typefixes in tests (#23) * Fix failing tests for type-fixed test/pubsub (#8) * move pyrefly & ruff to pyproject.toml & rm .project-template (#28) * move the async_context file to tests/core * move crypto test to crypto folder * fix: some typefixes (#25) * fix type errors * fix type issues * fix: update gRPC API usage in autonat_pb2_grpc.py (#31) * md: typecheck ci * rm comments * clean up : from review suggestions * use | None over Optional as per new python standards * drop supporto for py3.9 * newsfragments --------- Signed-off-by: sukhman <sukhmansinghsaluja@gmail.com> Signed-off-by: varun-r-mallya <varunrmallya@gmail.com> Co-authored-by: acul71 <luca.pisani@birdo.net> Co-authored-by: kaneki003 <sakshamchauhan707@gmail.com> Co-authored-by: sukhman <sukhmansinghsaluja@gmail.com> Co-authored-by: varun-r-mallya <varunrmallya@gmail.com> Co-authored-by: varunrmallya <100590632+varun-r-mallya@users.noreply.github.com> Co-authored-by: lla-dane <abhinavagarwalla6@gmail.com> Co-authored-by: Collins <ArtemisfowlX@protonmail.com> Co-authored-by: Abhinav Agarwalla <120122716+lla-dane@users.noreply.github.com> Co-authored-by: guha-rahul <52607971+guha-rahul@users.noreply.github.com> Co-authored-by: Sukhman Singh <63765293+sukhman-sukh@users.noreply.github.com> Co-authored-by: acul71 <34693171+acul71@users.noreply.github.com> Co-authored-by: pacrob <5199899+pacrob@users.noreply.github.com>
This commit is contained in:
Arush Kurundodi
@ -1,11 +1,9 @@
|
||||
from collections.abc import (
|
||||
Awaitable,
|
||||
Callable,
|
||||
Sequence,
|
||||
)
|
||||
import logging
|
||||
from typing import (
|
||||
Callable,
|
||||
)
|
||||
|
||||
from multiaddr import (
|
||||
Multiaddr,
|
||||
@ -44,7 +42,7 @@ class TCPListener(IListener):
|
||||
self.handler = handler_function
|
||||
|
||||
# TODO: Get rid of `nursery`?
|
||||
async def listen(self, maddr: Multiaddr, nursery: trio.Nursery) -> None:
|
||||
async def listen(self, maddr: Multiaddr, nursery: trio.Nursery) -> bool:
|
||||
"""
|
||||
Put listener in listening mode and wait for incoming connections.
|
||||
|
||||
@ -56,7 +54,7 @@ class TCPListener(IListener):
|
||||
handler: Callable[[trio.SocketStream], Awaitable[None]],
|
||||
port: int,
|
||||
host: str,
|
||||
task_status: TaskStatus[Sequence[trio.SocketListener]] = None,
|
||||
task_status: TaskStatus[Sequence[trio.SocketListener]],
|
||||
) -> None:
|
||||
"""Just a proxy function to add logging here."""
|
||||
logger.debug("serve_tcp %s %s", host, port)
|
||||
@ -67,18 +65,53 @@ class TCPListener(IListener):
|
||||
remote_port: int = 0
|
||||
try:
|
||||
tcp_stream = TrioTCPStream(stream)
|
||||
remote_host, remote_port = tcp_stream.get_remote_address()
|
||||
remote_tuple = tcp_stream.get_remote_address()
|
||||
|
||||
if remote_tuple is not None:
|
||||
remote_host, remote_port = remote_tuple
|
||||
|
||||
await self.handler(tcp_stream)
|
||||
except Exception:
|
||||
logger.debug(f"Connection from {remote_host}:{remote_port} failed.")
|
||||
|
||||
listeners = await nursery.start(
|
||||
tcp_port_str = maddr.value_for_protocol("tcp")
|
||||
if tcp_port_str is None:
|
||||
logger.error(f"Cannot listen: TCP port is missing in multiaddress {maddr}")
|
||||
return False
|
||||
|
||||
try:
|
||||
tcp_port = int(tcp_port_str)
|
||||
except ValueError:
|
||||
logger.error(
|
||||
f"Cannot listen: Invalid TCP port '{tcp_port_str}' "
|
||||
f"in multiaddress {maddr}"
|
||||
)
|
||||
return False
|
||||
|
||||
ip4_host_str = maddr.value_for_protocol("ip4")
|
||||
# For trio.serve_tcp, ip4_host_str (as host argument) can be None,
|
||||
# which typically means listen on all available interfaces.
|
||||
|
||||
started_listeners = await nursery.start(
|
||||
serve_tcp,
|
||||
handler,
|
||||
int(maddr.value_for_protocol("tcp")),
|
||||
maddr.value_for_protocol("ip4"),
|
||||
tcp_port,
|
||||
ip4_host_str,
|
||||
)
|
||||
self.listeners.extend(listeners)
|
||||
|
||||
if started_listeners is None:
|
||||
# This implies that task_status.started() was not called within serve_tcp,
|
||||
# likely because trio.serve_tcp itself failed to start (e.g., port in use).
|
||||
logger.error(
|
||||
f"Failed to start TCP listener for {maddr}: "
|
||||
f"`nursery.start` returned None. "
|
||||
"This might be due to issues like the port already "
|
||||
"being in use or invalid host."
|
||||
)
|
||||
return False
|
||||
|
||||
self.listeners.extend(started_listeners)
|
||||
return True
|
||||
|
||||
def get_addrs(self) -> tuple[Multiaddr, ...]:
|
||||
"""
|
||||
@ -105,15 +138,42 @@ class TCP(ITransport):
|
||||
: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"))
|
||||
host_str = maddr.value_for_protocol("ip4")
|
||||
port_str = maddr.value_for_protocol("tcp")
|
||||
|
||||
if host_str is None:
|
||||
raise OpenConnectionError(
|
||||
f"Failed to dial {maddr}: IP address not found in multiaddr."
|
||||
)
|
||||
|
||||
if port_str is None:
|
||||
raise OpenConnectionError(
|
||||
f"Failed to dial {maddr}: TCP port not found in multiaddr."
|
||||
)
|
||||
|
||||
try:
|
||||
stream = await trio.open_tcp_stream(self.host, self.port)
|
||||
except OSError as error:
|
||||
raise OpenConnectionError from error
|
||||
read_write_closer = TrioTCPStream(stream)
|
||||
port_int = int(port_str)
|
||||
except ValueError:
|
||||
raise OpenConnectionError(
|
||||
f"Failed to dial {maddr}: Invalid TCP port '{port_str}'."
|
||||
)
|
||||
|
||||
try:
|
||||
# trio.open_tcp_stream requires host to be str or bytes, not None.
|
||||
stream = await trio.open_tcp_stream(host_str, port_int)
|
||||
except OSError as error:
|
||||
# OSError is common for network issues like "Connection refused"
|
||||
# or "Host unreachable".
|
||||
raise OpenConnectionError(
|
||||
f"Failed to open TCP stream to {maddr}: {error}"
|
||||
) from error
|
||||
except Exception as error:
|
||||
# Catch other potential errors from trio.open_tcp_stream and wrap them.
|
||||
raise OpenConnectionError(
|
||||
f"An unexpected error occurred when dialing {maddr}: {error}"
|
||||
) from error
|
||||
|
||||
read_write_closer = TrioTCPStream(stream)
|
||||
return RawConnection(read_write_closer, True)
|
||||
|
||||
def create_listener(self, handler_function: THandler) -> TCPListener:
|
||||
|
||||
Reference in New Issue
Block a user