vrchatapi-async 1.20.8.dev2__tar.gz → 1.20.8.post1__tar.gz

{vrchatapi_async-1.20.8.dev2 → vrchatapi_async-1.20.8.post1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vrchatapi-async
-Version: 1.20.8.dev2
+Version: 1.20.8.post1
 Summary: VRChat API Library for Python (async version)
 Home-page: https://github.com/hi94740/vrchatapi-python-async
 Author: hi94740

{vrchatapi_async-1.20.8.dev2 → vrchatapi_async-1.20.8.post1}/setup.py

@@ -170,7 +170,7 @@ from setuptools import setup, find_packages  # noqa: H301
 # prerequisite: setuptools
 # http://pypi.python.org/pypi/setuptools
 NAME = "vrchatapi-async"
-VERSION = "1.20.8dev2"
+VERSION = "1.20.8.post1"
 PYTHON_REQUIRES = ">= 3.10"
 REQUIRES = [
     "python-dateutil >= 2.8.2",

{vrchatapi_async-1.20.8.dev2 → vrchatapi_async-1.20.8.post1}/tests/test_async_sdk.py

@@ -15,6 +15,7 @@ the async conversion:
 
 import base64
 import json
+from unittest.mock import AsyncMock, Mock
 
 import aiohttp
 from multidict import CIMultiDict
@@ -277,6 +278,29 @@ async def test_request_timeout_maps_to_client_timeout():
     await rest_client.close()
 
 
+@pytest.mark.asyncio
+async def test_ssl_context_is_built_lazily_off_the_event_loop(monkeypatch):
+    from vrchatapi import rest as rest_module
+
+    config = Configuration(host="http://localhost")
+    build_context = Mock()
+    monkeypatch.setattr(rest_module.ssl, "create_default_context", build_context)
+    build_context.reset_mock()
+    rest_client = rest_module.RESTClientObject(config)
+
+    build_context.assert_not_called()
+
+    ssl_context = Mock()
+    to_thread = AsyncMock(return_value=ssl_context)
+    monkeypatch.setattr(rest_module.asyncio, "to_thread", to_thread)
+    monkeypatch.setattr(rest_client, "_create_pool_manager", Mock(return_value=Mock()))
+
+    await rest_client._ensure_session()
+
+    to_thread.assert_awaited_once_with(rest_client._build_ssl_context)
+    assert rest_client.ssl_context is ssl_context
+
+
 @pytest.mark.asyncio
 async def test_without_preload_content_returns_raw_response(server):
     config = Configuration(host=server.base_url)

{vrchatapi_async-1.20.8.dev2 → vrchatapi_async-1.20.8.post1}/tests/test_websocket.py

@@ -308,6 +308,20 @@ async def test_async_iterator_yields_events(pipeline_server):
     assert collected == ["friend-online", "notification"]
 
 
+@pytest.mark.asyncio
+async def test_async_iterator_stops_on_disconnect(pipeline_server):
+    pipeline_server.set_script(
+        0, [friend_online_frame(), notification_frame()], close_after_send=True
+    )
+    ws = make_ws(pipeline_server)
+    await ws.connect()
+
+    collected = []
+    async for event in ws:
+        collected.append(event.type)
+
+    assert collected == ["friend-online", "notification"]
+    assert not ws.is_connected
 # ---------------------------------------------------------------------------
 # Errors / lifecycle
 # ---------------------------------------------------------------------------

{vrchatapi_async-1.20.8.dev2 → vrchatapi_async-1.20.8.post1}/vrchatapi/__init__.py

@@ -14,7 +14,7 @@
 """  # noqa: E501
 
 
-__version__ = "1.20.8dev2"
+__version__ = "1.20.8.post1"
 
 # Define package exports
 __all__ = [

{vrchatapi_async-1.20.8.dev2 → vrchatapi_async-1.20.8.post1}/vrchatapi/rest.py

@@ -12,6 +12,7 @@
 """  # noqa: E501
 
 
+import asyncio
 import io
 import json
 import re
@@ -87,18 +88,7 @@ class RESTClientObject:
         # maxsize is number of requests to host that are allowed in parallel
         self.maxsize = configuration.connection_pool_maxsize
 
-        self.ssl_context = ssl.create_default_context(
-            cafile=configuration.ssl_ca_cert,
-            cadata=configuration.ca_cert_data,
-        )
-        if configuration.cert_file:
-            self.ssl_context.load_cert_chain(
-                configuration.cert_file, keyfile=configuration.key_file
-            )
-
-        if not configuration.verify_ssl:
-            self.ssl_context.check_hostname = False
-            self.ssl_context.verify_mode = ssl.CERT_NONE
+        self.ssl_context: Optional[ssl.SSLContext] = None
 
         self.proxy = configuration.proxy
         self.proxy_headers = configuration.proxy_headers
@@ -130,6 +120,30 @@ class RESTClientObject:
         if self.retry_client is not None:
             await self.retry_client.close()
 
+    def _build_ssl_context(self) -> ssl.SSLContext:
+        """Build the SSL context outside the event loop."""
+        context = ssl.create_default_context(
+            cafile=self.configuration.ssl_ca_cert,
+            cadata=self.configuration.ca_cert_data,
+        )
+        if self.configuration.cert_file:
+            context.load_cert_chain(
+                self.configuration.cert_file,
+                keyfile=self.configuration.key_file,
+            )
+        if not self.configuration.verify_ssl:
+            context.check_hostname = False
+            context.verify_mode = ssl.CERT_NONE
+        return context
+
+    async def _ensure_session(self) -> None:
+        """Create the HTTP session after building SSL state off the loop."""
+        if self.pool_manager is None:
+            if self.ssl_context is None:
+                self.ssl_context = await asyncio.to_thread(self._build_ssl_context)
+            if self.pool_manager is None:
+                self.pool_manager = self._create_pool_manager()
+
     def _create_connector(self) -> aiohttp.TCPConnector:
         """Build the TCPConnector used by the ClientSession.
 
@@ -278,7 +292,7 @@ class RESTClientObject:
 
         # https pool manager
         if self.pool_manager is None:
-            self.pool_manager = self._create_pool_manager()
+            await self._ensure_session()
         pool_manager = self.pool_manager
 
         if self._effective_retry_options is not None and method in ALLOW_RETRY_METHODS:

{vrchatapi_async-1.20.8.dev2 → vrchatapi_async-1.20.8.post1}/vrchatapi/websocket.py

@@ -506,6 +506,8 @@ class VRChatWebSocket:
             await self._fire(self._error_handlers, exc)
         finally:
             await self._fire(self._disconnect_handlers)
+            if not self._auto_reconnect:
+                self._put_end()
 
     async def _dispatch_message(self, raw: str) -> bool:
         """Decode and dispatch one text frame.

{vrchatapi_async-1.20.8.dev2 → vrchatapi_async-1.20.8.post1}/vrchatapi_async.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vrchatapi-async
-Version: 1.20.8.dev2
+Version: 1.20.8.post1
 Summary: VRChat API Library for Python (async version)
 Home-page: https://github.com/hi94740/vrchatapi-python-async
 Author: hi94740