unicex 0.13.3__py3-none-any.whl → 0.13.5__py3-none-any.whl

unicex/_base/websocket.py

@@ -17,7 +17,7 @@ from unicex.types import LoggerLike
 class Websocket:
     """Базовый класс асинхронного вебсокета."""
 
-    MAX_QUEUE_SIZE: int = 100
+    MAX_QUEUE_SIZE: int = 500
     """Максимальная длина очереди."""
 
     class _DecoderProtocol(Protocol):
@@ -95,12 +95,7 @@ class Websocket:
     async def stop(self) -> None:
         """Останавливает вебсокет и рабочие задачи."""
         self._running = False
-        for task in self._tasks:
-            task.cancel()
-        self._tasks.clear()
-
-        # Очистка очереди
-        self._queue = asyncio.Queue()
+        await self._after_disconnect()
 
     async def restart(self) -> None:
         """Перезапускает вебсокет."""
@@ -111,25 +106,27 @@ class Websocket:
     async def _connect(self) -> None:
         """Подключается к вебсокету и настраивает соединение."""
         self._logger.debug(f"Establishing connection with {self._url}")
-        while self._running:
-            async with websockets.connect(uri=self._url, **self._generate_ws_kwargs()) as conn:
-                try:
-                    self._logger.info(f"Websocket connection was established to {self._url}")
-                    await self._after_connect(conn)
-
-                    # Цикл получения сообщений
-                    while self._running:
-                        message = await conn.recv()
-                        await self._handle_message(message)
-
-                except websockets.exceptions.ConnectionClosed as e:
-                    self._logger.error(f"Websocket connection was closed unexpectedly: {e}")
-                except Exception as e:
-                    self._logger.error(f"Unexpected error in websosocket connection: {e}")
-                finally:
-                    if self._running:
-                        await asyncio.sleep(self._reconnect_timeout)
-                        await self._after_disconnect()
+        async for conn in websockets.connect(uri=self._url, **self._generate_ws_kwargs()):
+            try:
+                self._logger.info(f"Websocket connection was established to {self._url}")
+                await self._after_connect(conn)
+
+                # Цикл получения сообщений
+                while self._running:
+                    message = await conn.recv()
+                    await self._handle_message(message)
+
+            except websockets.exceptions.ConnectionClosed as e:
+                self._logger.error(f"Websocket connection was closed unexpectedly: {e}")
+            except Exception as e:
+                self._logger.error(f"Unexpected error in websosocket connection: {e}")
+            finally:
+                # Делаем реконнект только если вебсокет активен, иначе выходим из итератора
+                if self._running:
+                    await asyncio.sleep(self._reconnect_timeout)
+                    await self._after_disconnect()
+                else:
+                    return  # Выходим из итератора, если вебсокет уже выключен
 
     async def _handle_message(self, message: str | bytes) -> None:
         """Обрабатывает входящее сообщение вебсокета."""
@@ -182,11 +179,22 @@ class Websocket:
 
     async def _after_disconnect(self) -> None:
         """Вызывается после отключения от вебсокета."""
+        # Останавливаем воркеров
         for task in self._tasks:
             task.cancel()
+
+        # Дожидаемся завершения задач (в т.ч. воркеров)
+        for task in self._tasks:
+            try:
+                await task
+            except asyncio.CancelledError:
+                pass
+            except Exception as e:
+                self._logger.warning(f"Worker raised during shutdown: {e}")
+
         self._tasks.clear()
 
-        # Очистить очередь
+        # Очистить очередь уже безопасно, после остановки воркеров
         self._queue = asyncio.Queue()
 
     async def _send_subscribe_messages(self, conn: ClientConnection) -> None:

{unicex-0.13.3.dist-info → unicex-0.13.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: unicex
-Version: 0.13.3
+Version: 0.13.5
 Summary: Unified Crypto Exchange API 
 Author-email: LoveBloodAndDiamonds <ayazshakirzyanov27@gmail.com>
 License: BSD 3-Clause License

{unicex-0.13.3.dist-info → unicex-0.13.5.dist-info}/RECORD

@@ -11,7 +11,7 @@ unicex/_abc/uni_client.py,sha256=ZjxK8aqCGLUUYy1UQTM9EvWn1IXwMkH2Db8sZrs1e_I,137
 unicex/_abc/uni_websocket_manager.py,sha256=yYKypPkIe3rKfWBuTsS8rkwIPljpd1588CYDkeTOYqE,9905
 unicex/_base/__init__.py,sha256=0TmevATGnRB3qow6tkCR8dQKNZCWKeib6YQjNJ4a1b0,236
 unicex/_base/client.py,sha256=asIIQLZlRwwmUDvxveSv7aCvth54iiSRJdz19bxGorI,8904
-unicex/_base/websocket.py,sha256=8bihWB54E3LNNgkmTlKflD_p5NBWPOLNYEFCoi5Hxhw,11565
+unicex/_base/websocket.py,sha256=Q7kbBEOAlPHL8S3y1KZmQghxMGq4hkjZ3ZepZqm47oA,12115
 unicex/binance/__init__.py,sha256=sDk4ZjakRdpFMaMSpOCfqjf6ZPfAS9tlrt4WlDHtDkw,932
 unicex/binance/adapter.py,sha256=JbUFyjnDAFtyuYYrh90YeOvQOZQ6faim0nWS6U0NxXw,8799
 unicex/binance/client.py,sha256=1qPx0uRT4prC6saLBQ55pXDWcWTCKhYEwVIysiihPgU,60984
@@ -86,8 +86,8 @@ unicex/okx/uni_client.py,sha256=E_Wod0JSGt1K6k1mAIWnOv350pELbv-nic7g1KgOuos,8694
 unicex/okx/uni_websocket_manager.py,sha256=b4f_QjA64DJmENQdIGb5IOVc7kvit7KMCdWeCmRbxGY,9326
 unicex/okx/user_websocket.py,sha256=8c9kpm-xVa729pW93OKUGLHaE9MY0uzEpjIgNIFRF80,126
 unicex/okx/websocket_manager.py,sha256=wROXTUDqKzOE-wDnCtXso_MC4SzfPuPols5aPg_Z3y4,26027
-unicex-0.13.3.dist-info/licenses/LICENSE,sha256=lNNK4Vqak9cXm6qVJLhbqS7iR_BMj6k7fd7XQ6l1k54,1507
-unicex-0.13.3.dist-info/METADATA,sha256=dZlyDRzk7KpasPB58YyMzPGcr8p50fu2yRBKpb9EylE,11752
-unicex-0.13.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-unicex-0.13.3.dist-info/top_level.txt,sha256=_7rar-0OENIg4KRy6cgjWiebFYAJhjKEcMggAocGWG4,7
-unicex-0.13.3.dist-info/RECORD,,
+unicex-0.13.5.dist-info/licenses/LICENSE,sha256=lNNK4Vqak9cXm6qVJLhbqS7iR_BMj6k7fd7XQ6l1k54,1507
+unicex-0.13.5.dist-info/METADATA,sha256=faWjzNhcaHx7lkzBFI-SSmH_35Dd1pGumzi87UCtMNQ,11752
+unicex-0.13.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+unicex-0.13.5.dist-info/top_level.txt,sha256=_7rar-0OENIg4KRy6cgjWiebFYAJhjKEcMggAocGWG4,7
+unicex-0.13.5.dist-info/RECORD,,