unicex 0.13.4__py3-none-any.whl → 0.13.6__py3-none-any.whl

unicex/_base/websocket.py

@@ -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:
         """Перезапускает вебсокет."""
@@ -184,11 +179,29 @@ class Websocket:
 
     async def _after_disconnect(self) -> None:
         """Вызывается после отключения от вебсокета."""
+        current_task = asyncio.current_task()
+
+        # Останавливаем воркеров, исключая задачу, которая уже выполняет остановку
+        tasks_to_wait: list[asyncio.Task] = []
         for task in self._tasks:
+            if task is current_task:
+                continue
+
             task.cancel()
+            tasks_to_wait.append(task)
+
+        # Дожидаемся завершения задач (в т.ч. воркеров)
+        if tasks_to_wait:
+            results = await asyncio.gather(*tasks_to_wait, return_exceptions=True)
+            for task_result in results:
+                if isinstance(task_result, asyncio.CancelledError):
+                    continue
+                if isinstance(task_result, Exception):
+                    self._logger.warning(f"Worker raised during shutdown: {task_result}")
+
         self._tasks.clear()
 
-        # Очистить очередь
+        # Очистить очередь уже безопасно, после остановки воркеров
         self._queue = asyncio.Queue()
 
     async def _send_subscribe_messages(self, conn: ClientConnection) -> None:

{unicex-0.13.4.dist-info → unicex-0.13.6.dist-info}/METADATA

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

{unicex-0.13.4.dist-info → unicex-0.13.6.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=QMUXpQemmL5I-mE2j6i5SUL_pu8ZxUcQWduSSZ8nppE,11768
+unicex/_base/websocket.py,sha256=haSV3dSgkT352n8knpLm_iI4ZlUGWWKFCB3k5Ua2esU,12542
 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.4.dist-info/licenses/LICENSE,sha256=lNNK4Vqak9cXm6qVJLhbqS7iR_BMj6k7fd7XQ6l1k54,1507
-unicex-0.13.4.dist-info/METADATA,sha256=JJ9HinBsvn_N73vdORc00UshzpIHa0HWojl3ooMjO14,11752
-unicex-0.13.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-unicex-0.13.4.dist-info/top_level.txt,sha256=_7rar-0OENIg4KRy6cgjWiebFYAJhjKEcMggAocGWG4,7
-unicex-0.13.4.dist-info/RECORD,,
+unicex-0.13.6.dist-info/licenses/LICENSE,sha256=lNNK4Vqak9cXm6qVJLhbqS7iR_BMj6k7fd7XQ6l1k54,1507
+unicex-0.13.6.dist-info/METADATA,sha256=0ZJmTSp8QjP6ONVvrs7B-q9kITzIUPIZOwxJBwrP3EE,11752
+unicex-0.13.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+unicex-0.13.6.dist-info/top_level.txt,sha256=_7rar-0OENIg4KRy6cgjWiebFYAJhjKEcMggAocGWG4,7
+unicex-0.13.6.dist-info/RECORD,,