Create new session sharing caller's connector to avoid closing caller's session on disconnect

Co-authored-by: lawtancool <26829131+lawtancool@users.noreply.github.com>

Author: Copilot

pyControl4/websocket.py

@@ -198,8 +198,14 @@ async def sio_connect(self, director_bearer_token):
         await self.sio_disconnect()
 
         if self.session is not None:
+            # Create a new session using the caller's connector so engineio
+            # can safely close it in _reset() without affecting the caller's
+            # session.
+            http_session = aiohttp.ClientSession(
+                connector=self.session.connector, connector_owner=False
+            )
             self._sio = socketio.AsyncClient(
-                ssl_verify=False, http_session=self.session
+                ssl_verify=False, http_session=http_session
             )
         else:
             self._sio = socketio.AsyncClient(ssl_verify=False)

tests/test_websocket_ssl.py

@@ -2,6 +2,7 @@
 
 from unittest.mock import AsyncMock, MagicMock, patch
 
+import aiohttp
 import socketio_v4
 import pytest
 
@@ -26,15 +27,28 @@ async def test_sio_connect_without_session():
 
 @pytest.mark.asyncio
 async def test_sio_connect_with_session():
-    """Test that sio_connect passes the caller's session as http_session."""
+    """Test that sio_connect creates a new session sharing the caller's
+    connector and passes it as http_session, so engineio can safely close
+    it without affecting the caller's session."""
+    mock_connector = MagicMock()
     mock_session = MagicMock()
+    mock_session.connector = mock_connector
     ws = C4Websocket("192.168.1.1", session_no_verify_ssl=mock_session)
     with patch.object(
         socketio_v4.AsyncClient, "__init__", return_value=None
     ) as mock_init, patch.object(
         socketio_v4.AsyncClient, "register_namespace"
     ), patch.object(
         socketio_v4.AsyncClient, "connect", new_callable=AsyncMock
-    ):
+    ), patch.object(
+        aiohttp, "ClientSession"
+    ) as mock_session_cls:
+        mock_http_session = MagicMock()
+        mock_session_cls.return_value = mock_http_session
         await ws.sio_connect("test-token")
-        mock_init.assert_called_once_with(ssl_verify=False, http_session=mock_session)
+        mock_session_cls.assert_called_once_with(
+            connector=mock_connector, connector_owner=False
+        )
+        mock_init.assert_called_once_with(
+            ssl_verify=False, http_session=mock_http_session
+        )