GNServer 0.0.0.0.36__tar.gz → 0.0.0.0.38__tar.gz

{gnserver-0.0.0.0.36 → gnserver-0.0.0.0.38}/GNServer/GNServer/_app.py

@@ -44,9 +44,9 @@ logger = logging.getLogger("GNServer")
 logger.setLevel(logging.DEBUG)
 
 console = logging.StreamHandler()
-console.setLevel(logging.INFO)
+console.setLevel(logging.DEBUG)
 console.setFormatter(logging.Formatter("[GNServer] %(name)s: %(levelname)s: %(message)s"))
-
+logger.addHandler(console)
 
 
 def guess_type(filename: str) -> str:
@@ -238,8 +238,6 @@ class App:
                 raw = qvals if len(qvals) > 1 else qvals[0]
                 kw[qn] = _convert_value(raw, _ann(qn), str)
 
-            if "request" in sig.parameters:
-                kw["request"] = request
             
             params = set(sig.parameters.keys())
             kw = {k: v for k, v in kw.items() if k in params}
@@ -247,8 +245,10 @@ class App:
             
             rv = validate_params_by_key(kw, r.handler)
             if rv is not None:
-                AllGNFastCommands.UnprocessableEntity({'dev_error': rv, 'user_error': f'Server request error {self.domain}'})
+                raise AllGNFastCommands.UnprocessableEntity({'dev_error': rv, 'user_error': f'Server request error {self.domain}'})
 
+            if "request" in sig.parameters:
+                kw["request"] = request
 
             if inspect.isasyncgenfunction(r.handler):
                 return r.handler(**kw)

{gnserver-0.0.0.0.36 → gnserver-0.0.0.0.38}/GNServer/GNServer/_client.py

@@ -78,14 +78,55 @@ class GNExceptions:
 from KeyisBTools import TTLDict
 from KeyisBTools.cryptography.sign import s2
 from KeyisBTools.cryptography import m1
-from KeyisBTools.cryptography.bytes import hash
-from KeyisBTools.models.serialization import serialize, deserialize
+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
@@ -112,10 +153,10 @@ class AsyncClient:
             if isinstance(server_key, bytes):
                 self.__server_key = server_key
             else:
-                if not os.path.exists(server_key):
-                    raise Exception(f'Path not found: {server_key}')
-
-                self.__server_key = open(server_key, 'rb').read()
+                if os.path.exists(server_key):
+                    self.__server_key = open(server_key, 'rb').read()
+                else:
+                    self.__server_key = userFriendly.decode(server_key)
         else:
             self.__server_key = None
 
@@ -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.36 → gnserver-0.0.0.0.38}/GNServer/GNServer/_func_params_validation.py

@@ -2,7 +2,6 @@
 import inspect, datetime, functools, threading
 from inspect import Parameter, _empty
 from typing import Any, Union, get_origin, get_args
-
 _NoneType = type(None)
 _KEYTYPES = (str, bytes, int)
 

{gnserver-0.0.0.0.36 → gnserver-0.0.0.0.38}/GNServer/GNServer.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GNServer
-Version: 0.0.0.0.36
+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.36 → gnserver-0.0.0.0.38}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GNServer
-Version: 0.0.0.0.36
+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.36 → gnserver-0.0.0.0.38}/setup.py

@@ -5,7 +5,7 @@ filesName = 'GNServer'
 
 setup(
     name=name,
-    version='0.0.0.0.36',
+    version='0.0.0.0.38',
     author="KeyisB",
     author_email="keyisb.pip@gmail.com",
     description=name,