GNServer 0.0.0.0.37__py3-none-any.whl → 0.0.0.0.38__py3-none-any.whl

GNServer/_client.py

@@ -80,12 +80,53 @@ from KeyisBTools.cryptography.sign import s2
 from KeyisBTools.cryptography import m1
 from KeyisBTools.cryptography.bytes import hash, userFriendly
 from KeyisBTools.models.serialization import serialize
+from KeyisBTools.ranges.positionRange import in_range
 from gnobjects.net.objects import GNRequest, GNResponse, Url
 
 from ._crt import crt_client
 
 
 
+_log_levels: dict[str, int] = {
+    "NOTSET": 0,
+    "DEBUG": 10,
+    "INFO": 20,
+    "WARNING": 30,
+    "ERROR": 40,
+    "CRITICAL": 50,
+    "notset": 0,
+    "debug": 10,
+    "info": 20,
+    "warning": 30,
+    "error": 40,
+    "critical": 50,
+}
+
+def devLog(request: GNRequest, point: str, level: int, log: str):
+    """
+- NOTSET	 0
+- DEBUG	     10
+- INFO	     20
+- WARNING	 30
+- ERROR	     40
+- CRITICAL   50
+    """
+    if request.transportObject.routeProtocol.dev:
+        if hasattr(request, '_devDataLog'):
+            if request._devDataLogLevel <= level:
+                if in_range(point, request._devDataRange):
+
+                    log = f'[{level}]({datetime.datetime.now()}): {log}'
+
+                    request._devDataLog.append(log)
+
+
+
+
+
+
+
+
 
 async def chain_async(first_item, rest: AsyncIterable) -> AsyncGenerator:
     yield first_item
@@ -219,16 +260,17 @@ class AsyncClient:
         self.__response_callbacks[name] = callback
 
   
-    async def connect(self, domain: str, restart_connection: bool = False, reconnect_wait: float = 10, keep_alive: bool = True) -> 'QuicClient':
-        print('Запрос подключения')
+    async def connect(self, request: GNRequest, restart_connection: bool = False, reconnect_wait: float = 10, keep_alive: bool = True) -> 'QuicClient':
+        domain = request.url.hostname
+        devLog(request, '1.2.1', 10, f'Connect to {domain}: restart_connection={restart_connection}, reconnect_wait={reconnect_wait}, keep_alive={keep_alive}')
         if not restart_connection and domain in self._active_connections:
             c = self._active_connections[domain]
-            print(f'Подключение уже было [{c.status}]')
+            devLog(request, '1.2.2', 10, f'Connection to {domain} found: status={c.status}')
             if c.status == 'connecting':
-                print('ждем поделючения')
+                devLog(request, '1.2.3', 10, f'Waiting for connection to {domain}...')
                 try:
                     await asyncio.wait_for(c.connect_future, reconnect_wait)
-                    print('дождались')
+                    devLog(request, '1.2.4', 10, f'Connected to {domain}: status={c.status}')
                     if c.status == 'active':
                         return c
                     elif c.status == 'connecting': # если очень долго подключаемся, то кидаем ошибку
@@ -237,7 +279,7 @@ class AsyncClient:
                     elif c.status == 'disconnect':
                         raise GNExceptions.ConnectionError.client.connection
                 except:
-                    print('Заново соеденяемся...')
+                    devLog(request, '1.2.5', 10, f'Connection to {domain} failed or timed out.')
                     await self.disconnect(domain)
                         
             else:
@@ -247,7 +289,9 @@ class AsyncClient:
         c.status = 'connecting'
         self._active_connections[domain] = c
 
+        devLog(request, '1.2.6', 10, f'Connecting to {domain}...')
         data = await self.getDNS(domain)
+        devLog(request, '1.2.7', 10, f'Got DNS for {domain}: {data}')
 
         data = data.split(':')
 
@@ -258,7 +302,7 @@ class AsyncClient:
 
         c._disconnect_signal = f # type: ignore
         c._domain = domain # type: ignore
-
+        devLog(request, '1.2.8', 10, f'Creating QuicClient for {domain}...')
         await c.connect(data[0], int(data[1]), keep_alive=keep_alive)
         await c.connect_future
 
@@ -274,13 +318,31 @@ class AsyncClient:
     def _return_token(self, bigToken: str, s: bool = True) -> str:
         return bigToken[:128] if s else bigToken[128:]
 
+    async def _resolve_requests_transport(self, request: GNRequest) -> GNRequest:
+        
+        if request.transportObject.routeProtocol.dev:
+            if request.cookies is not None:
+                data: Optional[dict] = request.cookies.get('gn', {}).get('request', {}).get('transport', {}).get('::dev')
+                if data is not None:
+                    data['params']['logs']['data'] = []
+                    data['params']['data']['data'] = {}
+                    request._devDataLog = data['params']['logs']['data']
+                    request._devDataLogLevel = _log_levels[data['params']['logs']['data']]
+                    request._devData = data['params']['data']['data']
+                    request._devDataRange = data['params']['range']
+
+        return request
 
     async def request(self, request: Union[GNRequest, AsyncGenerator[GNRequest, Any]], keep_alive: bool = True, restart_connection: bool = False, reconnect_wait: float = 10) -> GNResponse:
+        devLog(request, '1.1.1', 10, f'Request starting... {request}: keep_alive={keep_alive}, restart_connection={restart_connection}, reconnect_wait={reconnect_wait}')
+
         if isinstance(request, GNRequest):
+            devLog(request, '1.1.2', 10, 'Request is GNRequest')
             
+            request = await self._resolve_requests_transport(request)
 
-            c = await self.connect(request.url.hostname, restart_connection, reconnect_wait, keep_alive=keep_alive)
-                
+            c = await self.connect(request, restart_connection, reconnect_wait, keep_alive=keep_alive)
+            devLog(request, '1.1.3', 10, f'Connected: {c.status}')
 
 
             for f in self.__request_callbacks.values():
@@ -294,6 +356,7 @@ class AsyncClient:
             return r
         
         else:
+
             c: Optional[QuicClient] = None
 
             async def wrapped(request) -> AsyncGenerator[GNRequest, None]:
@@ -307,7 +370,7 @@ class AsyncClient:
 
                     nonlocal c
                     if c is None:  # инициализируем при первом req
-                        c = await self.connect(request.url.hostname, restart_connection, reconnect_wait, keep_alive=keep_alive)
+                        c = await self.connect(request, restart_connection, reconnect_wait, keep_alive=keep_alive)
 
                     yield req
 
@@ -559,6 +622,7 @@ class RawQuicClient(QuicConnectionProtocol):
         if isinstance(request, GNRequest):
             blob = request.serialize(2)
             sid = self._quic.get_next_available_stream_id()
+            devLog(request, '1.3.1', 10, f'Sending request on stream {sid}')
             self._enqueue(sid, blob, True, False)
             self._schedule_flush()
 
@@ -719,7 +783,9 @@ class QuicClient:
             raise RuntimeError("Not connected")
         
         resp = await self._quik_core.request(request)
-        return GNResponse.deserialize(resp, 2)
+        r = GNResponse.deserialize(resp, 2)
+        devLog(request, '1.4.1', 10, f'Response received: {r}')
+        return r
 
     async def asyncRequestStream(self, request: Union[GNRequest, AsyncGenerator[GNRequest, Any]]) -> AsyncGenerator[GNResponse, None]:
         

{gnserver-0.0.0.0.37.dist-info → gnserver-0.0.0.0.38.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GNServer
-Version: 0.0.0.0.37
+Version: 0.0.0.0.38
 Summary: GNServer
 Home-page: https://github.com/KeyisB/libs/tree/main/GNServer
 Author: KeyisB

{gnserver-0.0.0.0.37.dist-info → gnserver-0.0.0.0.38.dist-info}/RECORD

@@ -1,13 +1,13 @@
 GNServer/__init__.py,sha256=RCYh6f0lwh-Xh-5fv0jZvbUE6x7l8xYJhbn-o8_ITlE,1551
 GNServer/_app.py,sha256=nvK_9w1YtZfE-Xh0K-ebkvVINAx4Fir3NSw7Lbwyaz4,18874
-GNServer/_client.py,sha256=agMg086HLcBibcA-qJdichtgEyc4c2Xjlx9rcR_pOfs,30274
+GNServer/_client.py,sha256=H209KSvCnoJ3qXQFTYuzQSecEV-3qQv5JcHeIfT0ypc,32911
 GNServer/_cors_resolver.py,sha256=U9IFGN7vpVsEM2smhuf5QGj8vYgs7HeFQwDdzWVVy9c,4832
 GNServer/_crt.py,sha256=SOmyX7zBiCY9EhVSekksQtBHgTIZVvdqNZ8Ni-E5Zow,1390
 GNServer/_func_params_validation.py,sha256=2Pkv4g8Ln5Csj_2LOjKmJO-Y7EdiyfXmM6iv7_Vlt9A,11359
 GNServer/_routes.py,sha256=bJnmQ8uEhPVQgy2tTqE5TEIM8aFXV-lVI7c2nG0rQwk,3384
 GNServer/_template_resolver.py,sha256=vdJYb_7PjIeTWq-Clr7jyj7QIvPBxplU7EqeOuMJ64c,1409
-gnserver-0.0.0.0.37.dist-info/licenses/LICENSE,sha256=WH_t7dKZyWJ5Ld07eYIkUG4Tv6zZWXtAdsUqYAUesn0,1084
-gnserver-0.0.0.0.37.dist-info/METADATA,sha256=5XTcYIVdU7Fy-JX2PIjDVHkF2X98yohUtOhNHRvqD74,830
-gnserver-0.0.0.0.37.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-gnserver-0.0.0.0.37.dist-info/top_level.txt,sha256=-UOUBuD4u7Qkb1o5PdcwyA3kx8xCH2lwy0tJHi26Wb4,9
-gnserver-0.0.0.0.37.dist-info/RECORD,,
+gnserver-0.0.0.0.38.dist-info/licenses/LICENSE,sha256=WH_t7dKZyWJ5Ld07eYIkUG4Tv6zZWXtAdsUqYAUesn0,1084
+gnserver-0.0.0.0.38.dist-info/METADATA,sha256=QHAzCX3qzluF85Y7Dy-0VCBgOFINcz0itGtalG0ipnU,830
+gnserver-0.0.0.0.38.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+gnserver-0.0.0.0.38.dist-info/top_level.txt,sha256=-UOUBuD4u7Qkb1o5PdcwyA3kx8xCH2lwy0tJHi26Wb4,9
+gnserver-0.0.0.0.38.dist-info/RECORD,,