mirror of
https://github.com/varun-r-mallya/py-libp2p.git
synced 2025-12-31 20:36:24 +00:00
- Implemented full WSS support with TLS configuration - Added handshake timeout and connection state tracking - Created comprehensive test suite with 13+ WSS unit tests - Added Python-to-Python WebSocket peer-to-peer tests - Implemented multiaddr parsing for /ws, /wss, /tls/ws formats - Added connection state tracking and concurrent close handling - Created standalone WebSocket client for testing - Fixed circular import issues with multiaddr utilities - Added debug tools for WebSocket URL testing All WebSocket transport functionality is complete and working. Tests demonstrate WebSocket transport works correctly at the transport layer. Higher-level libp2p protocol compatibility issues remain (same as JS interop).
167 lines
6.2 KiB
Python
167 lines
6.2 KiB
Python
import logging
|
|
import ssl
|
|
|
|
from multiaddr import Multiaddr
|
|
import trio
|
|
|
|
from libp2p.abc import IListener, ITransport
|
|
from libp2p.custom_types import THandler
|
|
from libp2p.network.connection.raw_connection import RawConnection
|
|
from libp2p.transport.exceptions import OpenConnectionError
|
|
from libp2p.transport.upgrader import TransportUpgrader
|
|
from libp2p.transport.websocket.multiaddr_utils import parse_websocket_multiaddr
|
|
|
|
from .connection import P2PWebSocketConnection
|
|
from .listener import WebsocketListener
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
class WebsocketTransport(ITransport):
|
|
"""
|
|
Libp2p WebSocket transport: dial and listen on /ip4/.../tcp/.../ws and /wss
|
|
"""
|
|
|
|
def __init__(
|
|
self,
|
|
upgrader: TransportUpgrader,
|
|
tls_client_config: ssl.SSLContext | None = None,
|
|
tls_server_config: ssl.SSLContext | None = None,
|
|
handshake_timeout: float = 15.0,
|
|
):
|
|
self._upgrader = upgrader
|
|
self._tls_client_config = tls_client_config
|
|
self._tls_server_config = tls_server_config
|
|
self._handshake_timeout = handshake_timeout
|
|
|
|
async def dial(self, maddr: Multiaddr) -> RawConnection:
|
|
"""Dial a WebSocket connection to the given multiaddr."""
|
|
logger.debug(f"WebsocketTransport.dial called with {maddr}")
|
|
|
|
# Parse the WebSocket multiaddr to determine if it's secure
|
|
try:
|
|
parsed = parse_websocket_multiaddr(maddr)
|
|
except ValueError as e:
|
|
raise ValueError(f"Invalid WebSocket multiaddr: {e}") from e
|
|
|
|
# Extract host and port from the base multiaddr
|
|
host = (
|
|
parsed.rest_multiaddr.value_for_protocol("ip4")
|
|
or parsed.rest_multiaddr.value_for_protocol("ip6")
|
|
or parsed.rest_multiaddr.value_for_protocol("dns")
|
|
or parsed.rest_multiaddr.value_for_protocol("dns4")
|
|
or parsed.rest_multiaddr.value_for_protocol("dns6")
|
|
)
|
|
port_str = parsed.rest_multiaddr.value_for_protocol("tcp")
|
|
if port_str is None:
|
|
raise ValueError(f"No TCP port found in multiaddr: {maddr}")
|
|
port = int(port_str)
|
|
|
|
# Build WebSocket URL based on security
|
|
if parsed.is_wss:
|
|
ws_url = f"wss://{host}:{port}/"
|
|
else:
|
|
ws_url = f"ws://{host}:{port}/"
|
|
|
|
logger.debug(
|
|
f"WebsocketTransport.dial connecting to {ws_url} (secure={parsed.is_wss})"
|
|
)
|
|
|
|
try:
|
|
from trio_websocket import open_websocket_url
|
|
|
|
# Prepare SSL context for WSS connections
|
|
ssl_context = None
|
|
if parsed.is_wss:
|
|
if self._tls_client_config:
|
|
ssl_context = self._tls_client_config
|
|
else:
|
|
# Create default SSL context for client
|
|
ssl_context = ssl.create_default_context()
|
|
# Set SNI if available
|
|
if parsed.sni:
|
|
ssl_context.check_hostname = False
|
|
ssl_context.verify_mode = ssl.CERT_NONE
|
|
|
|
# Use the context manager but don't exit it immediately
|
|
# The connection will be closed when the RawConnection is closed
|
|
ws_context = open_websocket_url(ws_url, ssl_context=ssl_context)
|
|
|
|
# Apply handshake timeout
|
|
with trio.fail_after(self._handshake_timeout):
|
|
ws = await ws_context.__aenter__()
|
|
|
|
conn = P2PWebSocketConnection(ws, ws_context, is_secure=parsed.is_wss) # type: ignore[attr-defined]
|
|
return RawConnection(conn, initiator=True)
|
|
except trio.TooSlowError as e:
|
|
raise OpenConnectionError(
|
|
f"WebSocket handshake timeout after {self._handshake_timeout}s for {maddr}"
|
|
) from e
|
|
except Exception as e:
|
|
raise OpenConnectionError(f"Failed to dial WebSocket {maddr}: {e}") from e
|
|
|
|
def create_listener(self, handler: THandler) -> IListener: # type: ignore[override]
|
|
"""
|
|
The type checker is incorrectly reporting this as an inconsistent override.
|
|
"""
|
|
logger.debug("WebsocketTransport.create_listener called")
|
|
return WebsocketListener(
|
|
handler, self._upgrader, self._tls_server_config, self._handshake_timeout
|
|
)
|
|
|
|
def resolve(self, maddr: Multiaddr) -> list[Multiaddr]:
|
|
"""
|
|
Resolve a WebSocket multiaddr, automatically adding SNI for DNS names.
|
|
Similar to Go's Resolve() method.
|
|
|
|
:param maddr: The multiaddr to resolve
|
|
:return: List of resolved multiaddrs
|
|
"""
|
|
try:
|
|
parsed = parse_websocket_multiaddr(maddr)
|
|
except ValueError as e:
|
|
logger.debug(f"Invalid WebSocket multiaddr for resolution: {e}")
|
|
return [maddr] # Return original if not a valid WebSocket multiaddr
|
|
|
|
logger.debug(
|
|
f"Parsed multiaddr {maddr}: is_wss={parsed.is_wss}, sni={parsed.sni}"
|
|
)
|
|
|
|
if not parsed.is_wss:
|
|
# No /tls/ws component, this isn't a secure websocket multiaddr
|
|
return [maddr]
|
|
|
|
if parsed.sni is not None:
|
|
# Already has SNI, return as-is
|
|
return [maddr]
|
|
|
|
# Try to extract DNS name from the base multiaddr
|
|
dns_name = None
|
|
for protocol_name in ["dns", "dns4", "dns6"]:
|
|
try:
|
|
dns_name = parsed.rest_multiaddr.value_for_protocol(protocol_name)
|
|
break
|
|
except Exception:
|
|
continue
|
|
|
|
if dns_name is None:
|
|
# No DNS name found, return original
|
|
return [maddr]
|
|
|
|
# Create new multiaddr with SNI
|
|
# For /dns/example.com/tcp/8080/wss -> /dns/example.com/tcp/8080/tls/sni/example.com/ws
|
|
try:
|
|
# Remove /wss and add /tls/sni/example.com/ws
|
|
without_wss = maddr.decapsulate(Multiaddr("/wss"))
|
|
sni_component = Multiaddr(f"/sni/{dns_name}")
|
|
resolved = (
|
|
without_wss.encapsulate(Multiaddr("/tls"))
|
|
.encapsulate(sni_component)
|
|
.encapsulate(Multiaddr("/ws"))
|
|
)
|
|
logger.debug(f"Resolved {maddr} to {resolved}")
|
|
return [resolved]
|
|
except Exception as e:
|
|
logger.debug(f"Failed to resolve multiaddr {maddr}: {e}")
|
|
return [maddr]
|