xn-client 0.0.3.dev3__tar.gz → 0.0.3.dev4__tar.gz

{xn_client-0.0.3.dev3/xn_client.egg-info → xn_client-0.0.3.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xn-client
-Version: 0.0.3.dev3
+Version: 0.0.3.dev4
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 License: MIT
 Project-URL: Homepage, https://github.com/XyncNet/x-client

{xn_client-0.0.3.dev3 → xn_client-0.0.3.dev4}/x_client/aiohttp.py

@@ -1,3 +1,5 @@
+import asyncio
+
 from aiohttp import ClientSession, ClientResponse
 from aiohttp.http_exceptions import HttpProcessingError
 
@@ -22,7 +24,8 @@ class Client:
         return {}
 
     async def _get(self, url: str, params: dict = None):
-        resp: ClientResponse = await self.session.get(url, params=params, headers=self._prehook(params))
+        asyncio.get_running_loop()
+        resp = await self.session.get(url, params=params, headers=self._prehook(params))
         return await self._proc(resp)
 
     async def _post(self, url: str, data: dict = None):
@@ -34,11 +37,16 @@ class Client:
         resp: ClientResponse = await self.session.delete(url, params=params, headers=self._prehook(params))
         return await self._proc(resp)
 
-    async def _proc(self, resp: ClientResponse, data=None) -> dict | str:
+    async def _proc(self, resp: ClientResponse, data_key: str = None, body=None) -> dict | str:
         if not str(resp.status).startswith("2"):
             if resp.status == 404:
                 raise HttpNotFound()
             raise HttpProcessingError(code=resp.status, message=await resp.text())
         if resp.content_type.endswith("/json"):
-            return await resp.json()
+            data = await resp.json()
+            if data_key:
+                if res := data.get(data_key):
+                    return res
+                raise HttpProcessingError()
+            return data
         return await resp.text()

{xn_client-0.0.3.dev3 → xn_client-0.0.3.dev4}/x_client/http.py

@@ -31,9 +31,12 @@ class Client:
         return self.__resp()
 
     def __resp(self) -> dict:
-        resp = self.cn.getresponse()
-        body = brotli.decompress(resp.read())
-        return loads(body)
+        resp = self.cn.getresponse().read()
+        try:
+            body = loads(resp)
+        except Exception:
+            body = brotli.decompress(resp)
+        return body
 
     def close(self):
         self.cn.close()

{xn_client-0.0.3.dev3 → xn_client-0.0.3.dev4/xn_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xn-client
-Version: 0.0.3.dev3
+Version: 0.0.3.dev4
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 License: MIT
 Project-URL: Homepage, https://github.com/XyncNet/x-client