GNServer 0.0.0.0.56__tar.gz → 0.0.0.0.58__tar.gz

{gnserver-0.0.0.0.56 → gnserver-0.0.0.0.58}/GNServer/GNServer/_app.py

@@ -35,17 +35,14 @@ except ImportError:
     print("uvloop не установлен")
 
 
-
-
-
 import logging
 
 logger = logging.getLogger("GNServer")
 logger.setLevel(logging.DEBUG)
 
-console = logging.StreamHandler()
+console = logging.StreamHandler(sys.stdout)
 console.setLevel(logging.DEBUG)
-console.setFormatter(logging.Formatter("[GNServer] %(name)s: %(levelname)s: %(message)s"))
+console.setFormatter(logging.Formatter("[%(name)s] %(levelname)s: %(message)s"))
 logger.addHandler(console)
 
 
@@ -230,8 +227,11 @@ class App:
             for qn, qvals in request.url.params.items():
                 if qn in kw:
                     continue
-                raw = qvals if len(qvals) > 1 else qvals[0]
-                kw[qn] = _convert_value(raw, _ann(qn), str)
+                if isinstance(qvals, int):
+                    kw[qn] = qvals
+                else:
+                    raw = qvals if len(qvals) > 1 else qvals[0]
+                    kw[qn] = _convert_value(raw, _ann(qn), str)
 
             
             params = set(sig.parameters.keys())
@@ -335,6 +335,8 @@ class App:
                     logger.debug(f'Пакет отклонен: mode пакета {mode}. Разрешен 1, 2, 4')
                     return
                 
+                stream_id = event.stream_id
+
                 if not stream: # если не стрим, то ждем конец quic стрима и запускаем обработку ответа
                     if event.end_stream:
                             
@@ -344,15 +346,21 @@ class App:
                             domain = None
                         
                         if buf is not None:
-                            request = GNRequest.deserialize(buf, mode)
-                            if domain is not None:
-                                request.client._data['domain'] = domain
+                            try:
+                                request = GNRequest.deserialize(buf, mode)
+                                if domain is not None:
+                                    request.client._data['domain'] = domain
+                            except:
+                                asyncio.create_task(self.sendRawResponse(stream_id, AllGNFastCommands.KDCDecryptRequestFailed().serialize(mode=mode)))
+                                self._buffer.pop(event.stream_id, None)
+                                return
+
                         else:
                             raise Exception('Не удалось расшифровать от KDC')
 
-                        request.stream_id = event.stream_id  # type: ignore
+                        request.stream_id = stream_id   # type: ignore
+                        logger.debug(f'Request: {request.method} {request.url}')
                         asyncio.create_task(self._handle_request(request, mode))
-                        logger.debug(f'Отправлена задача разрешения пакета {request} route -> {request.route}')
 
                         self._buffer.pop(event.stream_id, None)
                     return
@@ -394,7 +402,6 @@ class App:
                                 queue.put_nowait(None)
                                 self._buffer.pop(event.stream_id)
                                 self._streams.pop(event.stream_id)
-                                logger.debug(f'Закрываем стрим [{event.stream_id}]')
                                 return
 
                 queue.put_nowait(request)
@@ -436,12 +443,11 @@ class App:
                     return
 
                 await self.sendResponse(request, response, mode)
-                logger.debug(f'Отправлен на сервер ответ -> {response.command} {response.payload if response.payload and len(str(response.payload)) < 200 else ''}')
             except Exception as e:
                 if isinstance(e, (GNRequest, GNFastCommand)):
                     await self.sendResponse(request, e, mode)
                 else:
-                    logger.error('GNServer: error\n'  + traceback.format_exc())
+                    logger.error('InternalServerError:\n'  + traceback.format_exc())
 
                     await self.sendResponse(request, AllGNFastCommands.InternalServerError(), mode)
             
@@ -449,6 +455,9 @@ class App:
         
         async def sendResponse(self, request: GNRequest, response: GNResponse, mode: int, end_stream: bool = True):
             await response.assembly()
+
+            
+            logger.debug(f'Response: {request.method} {request.url} -> {response.command} {response.payload if len(str(response.payload)) < 256 else ''}')
             
             blob = response.serialize(mode)
 
@@ -456,7 +465,10 @@ class App:
             if self._api._kdc is not None:
                 blob = self._api._kdc.encode(request.client.domain, blob)
 
-            self._quic.send_stream_data(request.stream_id, blob, end_stream=end_stream) # type: ignore
+            await self.sendRawResponse(request.stream_id, blob=blob, end_stream=end_stream)
+
+        async def sendRawResponse(self, stream_id: int, blob: bytes, end_stream: bool = True):
+            self._quic.send_stream_data(stream_id, blob, end_stream=end_stream) # type: ignore
             self.transmit()
 
     def run(
@@ -502,7 +514,7 @@ class App:
             if run is not None:
                 await run()
 
-
+            logger.debug('Server startup completed')
             if wait:
                 await asyncio.Event().wait()
 

{gnserver-0.0.0.0.56 → gnserver-0.0.0.0.58}/GNServer/GNServer/_client.py

@@ -1,4 +1,5 @@
 import os
+import sys
 import time
 import httpx
 import asyncio
@@ -87,6 +88,21 @@ from ._crt import crt_client
 from .models import KDCObject
 
 
+
+
+import logging
+
+logger = logging.getLogger("GNAsyncClient")
+logger.setLevel(logging.DEBUG)
+
+console = logging.StreamHandler(sys.stdout)
+console.setLevel(logging.DEBUG)
+console.setFormatter(logging.Formatter("[%(name)s] %(levelname)s: %(message)s"))
+logger.addHandler(console)
+
+
+
+
 _log_levels: dict[str, int] = {
     "NOTSET": 0,
     "DEBUG": 10,
@@ -263,8 +279,9 @@ class AsyncClient:
 
             for f in self.__request_callbacks.values():
                 asyncio.create_task(f(request))
-
+            logger.debug(f'Request: {request.method} {request.url}')
             r = await c.asyncRequest(request)
+            logger.debug(f'Response: {request.method} {request.url} -> {r.command} {r.payload if len(str(r.payload)) < 256 else ''}')
 
             for f in self.__response_callbacks.values():
                 asyncio.create_task(f(r))
@@ -574,7 +591,6 @@ class RawQuicClient(QuicConnectionProtocol):
             if q is None:
                 break
             sid, blob, end_stream = q.popleft()
-            print(f'Отправка стрима {sid}')
             self._quic.send_stream_data(sid, blob, end_stream=end_stream)
         self.transmit()
         self._activity()

{gnserver-0.0.0.0.56 → gnserver-0.0.0.0.58}/GNServer/GNServer/models.py

@@ -39,18 +39,23 @@ class KDCObject:
             for i in self._requested_domains:
                 if i in servers_keys:
                     self._requested_domains.remove(i)
+        else:
+            servers_keys = {}
 
-                
+        if len(self._requested_domains) > 0:
             payload = self._requested_domains
             r = await self._client.request(GNRequest('GET', Url(f'gn://{self._kdc_domain}/api/sys/server/keys'), payload=payload))
 
             if not r.command.ok:
+                print(f'ERROR: {r.command} {r.payload}')
                 raise r
             
-            servers_keys = r.payload
-
             if servers_keys is None:
+                print(f'ERROR: {r.command} {r.payload}')
                 raise r
+            
+            servers_keys.update(r.payload)
+
 
         self._servers_keys.update(servers_keys)
 

{gnserver-0.0.0.0.56 → gnserver-0.0.0.0.58}/GNServer/GNServer.egg-info/PKG-INFO

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

{gnserver-0.0.0.0.56 → gnserver-0.0.0.0.58}/PKG-INFO

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

{gnserver-0.0.0.0.56 → gnserver-0.0.0.0.58}/setup.py

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