feat: implement WebSocket transport with transport registry system - Add transport_registry.py for centralized transport management - Integrate WebSocket transport with new registry - Add comprehensive test suite for transport registry - Include WebSocket examples and demos - Update transport initialization and swarm integration

libp2p/transport/websocket/transport.py

@@ -1,3 +1,4 @@
+import logging
 from multiaddr import Multiaddr
 from trio_websocket import open_websocket_url
 
@@ -5,54 +6,51 @@ 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 .connection import P2PWebSocketConnection
 from .listener import WebsocketListener
 
+logger = logging.getLogger("libp2p.transport.websocket")
+
 
 class WebsocketTransport(ITransport):
     """
     Libp2p WebSocket transport: dial and listen on /ip4/.../tcp/.../ws
     """
 
+    def __init__(self, upgrader: TransportUpgrader):
+        self._upgrader = upgrader
+
     async def dial(self, maddr: Multiaddr) -> RawConnection:
-        # Handle addresses with /p2p/ PeerID suffix by truncating them at /ws
-        addr_text = str(maddr)
-        try:
-            ws_part_index = addr_text.index("/ws")
-            # Create a new Multiaddr containing only the transport part
-            transport_maddr = Multiaddr(addr_text[: ws_part_index + 3])
-        except ValueError:
-            raise ValueError(
-                f"WebsocketTransport requires a /ws protocol, not found in {maddr}"
-            ) from None
-
-        # Check for /wss, which is not supported yet
-        if str(transport_maddr).endswith("/wss"):
-            raise NotImplementedError("/wss (TLS) not yet supported")
-
+        """Dial a WebSocket connection to the given multiaddr."""
+        logger.debug(f"WebsocketTransport.dial called with {maddr}")
+        
+        # Extract host and port from multiaddr
         host = (
-            transport_maddr.value_for_protocol("ip4")
-            or transport_maddr.value_for_protocol("ip6")
-            or transport_maddr.value_for_protocol("dns")
-            or transport_maddr.value_for_protocol("dns4")
-            or transport_maddr.value_for_protocol("dns6")
+            maddr.value_for_protocol("ip4")
+            or maddr.value_for_protocol("ip6")
+            or maddr.value_for_protocol("dns")
+            or maddr.value_for_protocol("dns4")
+            or maddr.value_for_protocol("dns6")
         )
-        if host is None:
-            raise ValueError(f"No host protocol found in {transport_maddr}")
-
-        port_str = transport_maddr.value_for_protocol("tcp")
+        port_str = maddr.value_for_protocol("tcp")
         if port_str is None:
-            raise ValueError(f"No TCP port found in multiaddr: {transport_maddr}")
+            raise ValueError(f"No TCP port found in multiaddr: {maddr}")
         port = int(port_str)
 
-        host_str = f"[{host}]" if ":" in host else host
-        uri = f"ws://{host_str}:{port}"
+        # Build WebSocket URL
+        ws_url = f"ws://{host}:{port}/"
+        logger.debug(f"WebsocketTransport.dial connecting to {ws_url}")
 
         try:
-            async with open_websocket_url(uri, ssl_context=None) as ws:
-                conn = P2PWebSocketConnection(ws.stream)  # type: ignore[attr-defined]
-                return RawConnection(conn, initiator=True)
+            from trio_websocket import open_websocket_url
+            # 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)
+            ws = await ws_context.__aenter__()
+            conn = P2PWebSocketConnection(ws, ws_context)  # type: ignore[attr-defined]
+            return RawConnection(conn, initiator=True)
         except Exception as e:
             raise OpenConnectionError(f"Failed to dial WebSocket {maddr}: {e}") from e
 
@@ -60,4 +58,5 @@ class WebsocketTransport(ITransport):
         """
         The type checker is incorrectly reporting this as an inconsistent override.
         """
-        return WebsocketListener(handler)
+        logger.debug("WebsocketTransport.create_listener called")
+        return WebsocketListener(handler, self._upgrader)