refactor: rename address -> url

Author: robgee86

src/arduino/app_peripherals/camera/websocket_camera.py

@@ -74,9 +74,9 @@ def __init__(
         self.frame_format = frame_format
         self.logger = logger
 
-        self._host = "0.0.0.0"
         host_ip = os.getenv("HOST_IP")
-        self._host_ip = host_ip if host_ip is not None else self._host
+        self._bind_ip = "0.0.0.0"
+        self._external_ip = host_ip if host_ip is not None else self._bind_ip
 
         self._frame_queue = queue.Queue(1)
         self._server = None
@@ -87,9 +87,9 @@ def __init__(
         self._client_lock = asyncio.Lock()
 
     @property
-    def address(self) -> str:
+    def url(self) -> str:
         """Return the WebSocket server address."""
-        return f"{self.protocol}://{self._host_ip}:{self.port}"
+        return f"{self.protocol}://{self._external_ip}:{self.port}"
 
     def _open_camera(self) -> None:
         """Start the WebSocket server."""
@@ -101,15 +101,15 @@ def _open_camera(self) -> None:
         start_timeout = self.timeout
         while time.time() - start_time < start_timeout:
             if self._server is not None:
-                logger.info(f"WebSocket camera server started on {self.address}")
+                logger.info(f"WebSocket camera server started on {self.url}")
                 return
             time.sleep(0.1)
 
         # Cleanup server thread if it failed to start in time
         if self._server_thread.is_alive():
             self._server_thread.join(timeout=1.0)
 
-        raise CameraOpenError(f"Failed to start WebSocket server on {self.address}")
+        raise CameraOpenError(f"Failed to start WebSocket server on {self.url}")
 
     def _start_server_thread(self) -> None:
         """Run WebSocket server in its own thread with event loop."""
@@ -131,7 +131,7 @@ async def _start_server(self) -> None:
             self._server = await asyncio.wait_for(
                 websockets.serve(
                     self._ws_handler,
-                    self._host,
+                    self._bind_ip,
                     self.port,
                     open_timeout=self.timeout,
                     ping_timeout=self.timeout,

tests/arduino/app_peripherals/camera/test_camera.py

@@ -42,23 +42,23 @@ def test_camera_factory_with_ws_url_default_port():
     """Test Camera factory with WebSocket URL without port."""
     camera = Camera("ws://localhost")
     assert isinstance(camera, WebSocketCamera)
-    assert camera.address == "ws://0.0.0.0:8080"
+    assert camera.url == "ws://0.0.0.0:8080"
     assert camera.port == 8080  # Default port
 
 
 def test_camera_factory_with_ws_url():
     """Test Camera factory with WebSocket URL."""
     camera = Camera("ws://0.0.0.0:8080")
     assert isinstance(camera, WebSocketCamera)
-    assert camera.address == "ws://0.0.0.0:8080"
+    assert camera.url == "ws://0.0.0.0:8080"
     assert camera.port == 8080
 
 
 def test_camera_factory_with_wss_url():
     """Test Camera factory with secure WebSocket URL."""
     camera = Camera("wss://192.168.1.100:9090")
     assert isinstance(camera, WebSocketCamera)
-    assert camera.address == "ws://0.0.0.0:9090"  # Host is always ignored
+    assert camera.url == "ws://0.0.0.0:9090"  # IP is always ignored
     assert camera.port == 9090
 
 

tests/arduino/app_peripherals/camera/test_websocket_camera.py

@@ -43,7 +43,7 @@ def encoded_frame_json(encoded_frame_binary):
 def test_websocket_camera_init_default():
     """Test WebSocketCamera initialization with default parameters."""
     camera = WebSocketCamera()
-    assert camera.address == "ws://0.0.0.0:8080"
+    assert camera.url == "ws://0.0.0.0:8080"
     assert camera.port == 8080
     assert camera.timeout == 3
     assert camera.frame_format == "binary"
@@ -55,7 +55,7 @@ def test_websocket_camera_init_default():
 def test_websocket_camera_init_custom():
     """Test WebSocketCamera initialization with custom parameters."""
     camera = WebSocketCamera(port=9090, timeout=30, frame_format="json", resolution=(1920, 1080), fps=30)
-    assert camera.address == "ws://0.0.0.0:9090"  # No env var is set, so uses default host
+    assert camera.url == "ws://0.0.0.0:9090"  # No env var is set, so uses default host
     assert camera.port == 9090
     assert camera.timeout == 30
     assert camera.frame_format == "json"
@@ -167,7 +167,7 @@ def test_websocket_camera_read_frame_empty_queue():
 async def test_websocket_camera_capture_frame(encoded_frame_binary):
     """Test capturing frame from WebSocket camera."""
     with WebSocketCamera(port=0, frame_format="binary") as camera:
-        async with websockets.connect(camera.address) as ws:
+        async with websockets.connect(camera.url) as ws:
             # Skip welcome message
             await ws.recv()
 
@@ -189,15 +189,15 @@ async def test_websocket_camera_single_client():
 
     try:
         # Connect first client
-        async with websockets.connect(camera.address) as ws1:
+        async with websockets.connect(camera.url) as ws1:
             # First client should receive welcome message
             welcome = await ws1.recv()
             message = json.loads(welcome)
             assert message["status"] == "connected"
 
             # Try to connect second client while first is connected
             try:
-                async with websockets.connect(camera.address) as ws2:
+                async with websockets.connect(camera.url) as ws2:
                     # Second client should receive rejection message
                     rejection = await asyncio.wait_for(ws2.recv(), timeout=1.0)
                     message = json.loads(rejection)
@@ -213,7 +213,7 @@ async def test_websocket_camera_single_client():
 async def test_websocket_camera_welcome_message():
     """Test that welcome message is sent to connected client."""
     with WebSocketCamera(port=0) as camera:
-        async with websockets.connect(camera.address) as ws:
+        async with websockets.connect(camera.url) as ws:
             # Should receive welcome message
             welcome = await asyncio.wait_for(ws.recv(), timeout=1.0)
             message = json.loads(welcome)
@@ -226,7 +226,7 @@ async def test_websocket_camera_welcome_message():
 async def test_websocket_camera_receives_frames(encoded_frame_binary):
     """Test that server receives and queues frames from client."""
     with WebSocketCamera(port=0, frame_format="binary") as camera:
-        async with websockets.connect(camera.address) as ws:
+        async with websockets.connect(camera.url) as ws:
             # Skip welcome message
             await ws.recv()
 
@@ -247,7 +247,7 @@ async def test_websocket_camera_disconnects_client_on_stop():
     camera.start()
 
     try:
-        async with websockets.connect(camera.address) as ws:
+        async with websockets.connect(camera.url) as ws:
             # Client connected, receive welcome message
             welcome = await ws.recv()
             message = json.loads(welcome)
@@ -286,7 +286,7 @@ def test_websocket_camera_stop_without_client():
 async def test_websocket_camera_backpressure(sample_frame):
     """Test that old frames are dropped when new frames arrive faster than they're consumed."""
     with WebSocketCamera(port=0, frame_format="binary") as camera:
-        async with websockets.connect(camera.address) as ws:
+        async with websockets.connect(camera.url) as ws:
             await ws.recv()  # Skip welcome message
 
             _, buffer1 = cv2.imencode(".jpg", np.ones((480, 640, 3), dtype=np.uint8) * 1)
@@ -318,6 +318,7 @@ def adjustment(frame):
 
     # Capture uses adjustments
     frame = camera.capture()
+    assert frame is not None
 
     # The adjustment is applied in capture()
     expected = sample_frame + 50
@@ -355,7 +356,7 @@ def event_listener(event_type, data):
 
     # This should emit connection and disconnection events
     async def client_task():
-        async with websockets.connect(camera.address):
+        async with websockets.connect(camera.url):
             pass
 
     # Run client concurrently to properly test event handling
@@ -438,7 +439,7 @@ def event_listener(event_type, data):
 
     # This should emit a connection event but no disconnection event
     async def client_task():
-        async with websockets.connect(camera.address):
+        async with websockets.connect(camera.url):
             pass
         await can_close.wait()