refactor: remove host from WebSocketCamera

Author: robgee86

src/arduino/app_peripherals/camera/camera.py

@@ -108,9 +108,8 @@ def __new__(
                 # WebSocket Camera - extract host and port from URL
                 from .websocket_camera import WebSocketCamera
 
-                host = parsed.hostname or "localhost"
                 port = parsed.port or 8080
-                return WebSocketCamera(host=host, port=port, resolution=resolution, fps=fps, adjustments=adjustments, **kwargs)
+                return WebSocketCamera(port=port, resolution=resolution, fps=fps, adjustments=adjustments, **kwargs)
             elif source.startswith("/dev/video") or source.startswith("/dev/v4l/by-id/") or source.startswith("/dev/v4l/by-path/"):
                 # V4L device path, by-id, or by-path
                 from .v4l_camera import V4LCamera

src/arduino/app_peripherals/camera/websocket_camera.py

@@ -46,7 +46,6 @@ class WebSocketCamera(BaseCamera):
 
     def __init__(
         self,
-        host: str = "0.0.0.0",
         port: int = 8080,
         timeout: int = 3,
         frame_format: Literal["binary", "base64", "json"] = "binary",
@@ -70,14 +69,15 @@ def __init__(
         super().__init__(resolution, fps, adjustments)
 
         self.protocol = "ws"
-        host_ip = os.getenv("HOST_IP")
-        self.host_ip = host_ip if host_ip is not None else host
-        self.host = host
         self.port = port
         self.timeout = timeout
         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._frame_queue = queue.Queue(1)
         self._server = None
         self._loop = None
@@ -89,7 +89,7 @@ def __init__(
     @property
     def address(self) -> str:
         """Return the WebSocket server address."""
-        return f"{self.protocol}://{self.host_ip}:{self.port}"
+        return f"{self.protocol}://{self._host_ip}:{self.port}"
 
     def _open_camera(self) -> None:
         """Start the WebSocket server."""
@@ -131,7 +131,7 @@ async def _start_server(self) -> None:
             self._server = await asyncio.wait_for(
                 websockets.serve(
                     self._ws_handler,
-                    self.host,
+                    self._host,
                     self.port,
                     open_timeout=self.timeout,
                     ping_timeout=self.timeout,

tests/arduino/app_peripherals/camera/test_camera.py

@@ -38,30 +38,30 @@ def test_camera_factory_with_https_url():
     assert camera.url == "https://192.168.1.100:8080/video"
 
 
+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.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.host == "0.0.0.0"
+    assert camera.address == "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.host == "192.168.1.100"
+    assert camera.address == "ws://0.0.0.0:9090"  # Host is always ignored
     assert camera.port == 9090
 
 
-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.host == "localhost"
-    assert camera.port == 8080  # Default port
-
-
 def test_camera_factory_with_ip_camera_kwargs():
     """Test Camera factory with IP camera specific kwargs."""
     camera = Camera("rtsp://192.168.1.100/stream", username="admin", password="secret", timeout=30)

tests/arduino/app_peripherals/camera/test_websocket_camera.py

@@ -54,8 +54,8 @@ def test_websocket_camera_init_default():
 
 def test_websocket_camera_init_custom():
     """Test WebSocketCamera initialization with custom parameters."""
-    camera = WebSocketCamera(host="127.0.0.1", port=9090, timeout=30, frame_format="json", resolution=(1920, 1080), fps=30)
-    assert camera.address == "ws://127.0.0.1:9090"
+    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.port == 9090
     assert camera.timeout == 30
     assert camera.frame_format == "json"