GNServer 0.0.0.0.57__py3-none-any.whl → 0.0.0.0.59__py3-none-any.whl

GNServer/__init__.py

@@ -33,10 +33,26 @@ IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 """
 
+__all__ = [
+    'App',
+    'Url',
+    'GNRequest',
+    'GNResponse',
+    'CommandObject',
+    'CORSObject',
+    'FileObject',
+    'TemplateObject',
+    'GNTransportProtocol',
+    'AsyncClient',
+    'response'
+]
+
+
 from ._app import App
 
 from gnobjects.net.objects import Url, GNRequest, GNResponse, CommandObject, CORSObject, FileObject, TemplateObject, GNTransportProtocol
-from gnobjects.net.objects import AllGNFastCommands as responses
+from gnobjects.net.objects import AllGNFastCommands as response
 
+responses = response
 
 from ._client import AsyncClient

GNServer/_app.py

@@ -42,7 +42,7 @@ logger.setLevel(logging.DEBUG)
 
 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)
 
 
@@ -227,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())
@@ -349,13 +352,15 @@ class App:
                                     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 = 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
@@ -397,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)
@@ -439,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)
             
@@ -452,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)
 
@@ -508,7 +514,7 @@ class App:
             if run is not None:
                 await run()
 
-
+            logger.debug('Server startup completed')
             if wait:
                 await asyncio.Event().wait()
 

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("GNClient")
+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,
@@ -122,7 +138,7 @@ def devLog(request: GNRequest, point: str, level: int, log: str):
 
 
 
-
+_sys_s_mode = 2
 
 async def chain_async(first_item, rest: AsyncIterable) -> AsyncGenerator:
     yield first_item
@@ -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))
@@ -516,7 +533,7 @@ class RawQuicClient(QuicConnectionProtocol):
                     del buf[:lenght]
                         
                     
-                    r = GNResponse.deserialize(data, 2)
+                    r = GNResponse.deserialize(data, _sys_s_mode)
                     handler.put_nowait(r)
                     if event.end_stream:
                         handler.put_nowait(None)
@@ -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()
@@ -590,7 +606,7 @@ class RawQuicClient(QuicConnectionProtocol):
         await self.ensure_sys_stream()
         if response:
             msg_id = next(self._sys_id_gen)
-            blob = request.serialize(2)
+            blob = request.serialize(_sys_s_mode)
             payload = (
                 msg_id.to_bytes(8, "little") + len(blob).to_bytes(4, "little") + blob
             )
@@ -606,7 +622,7 @@ class RawQuicClient(QuicConnectionProtocol):
 
     async def request(self, request: Union[GNRequest, AsyncGenerator[GNRequest, Any]]):
         if isinstance(request, GNRequest):
-            blob = request.serialize(2)
+            blob = request.serialize(_sys_s_mode)
 
             if self.quicClient._client._kdc is not None:
                 blob = self.quicClient._client._kdc.encode(request.url.hostname, blob)
@@ -624,7 +640,7 @@ class RawQuicClient(QuicConnectionProtocol):
                 data, domain = self.quicClient._client._kdc.decode(data)
 
             if data is not None:
-                r = GNResponse.deserialize(data, 2)
+                r = GNResponse.deserialize(data, _sys_s_mode)
                 return r
             else:
                 return GNResponse('gn:client:0')
@@ -637,7 +653,7 @@ class RawQuicClient(QuicConnectionProtocol):
                 _last = None
                 async for req in request:
                     _last = req
-                    blob = req.serialize(2)
+                    blob = req.serialize(_sys_s_mode)
                     self._enqueue(sid, blob, False, False)
 
 
@@ -648,7 +664,7 @@ class RawQuicClient(QuicConnectionProtocol):
 
                 _last.setPayload(None)
                 _last.setMethod('gn:end-stream')
-                blob = _last.serialize(2)
+                blob = _last.serialize(_sys_s_mode)
                 self._enqueue(sid, blob, True, False)
                 self._schedule_flush()
             
@@ -661,7 +677,7 @@ class RawQuicClient(QuicConnectionProtocol):
     
     async def requestStream(self, request: Union[GNRequest, AsyncGenerator[GNRequest, Any]]) -> asyncio.Queue[GNResponse]:
         if isinstance(request, GNRequest):
-            blob = request.serialize(2)
+            blob = request.serialize(_sys_s_mode)
             sid = self._quic.get_next_available_stream_id()
             self._enqueue(sid, blob, False, False)
             self._schedule_flush()
@@ -678,7 +694,7 @@ class RawQuicClient(QuicConnectionProtocol):
                 _last = None
                 async for req in request:
                     _last = req
-                    blob = req.serialize(2)
+                    blob = req.serialize(_sys_s_mode)
                     self._enqueue(sid, blob, False, False)
 
 
@@ -689,7 +705,7 @@ class RawQuicClient(QuicConnectionProtocol):
 
                 _last.setPayload(None)
                 _last.setMethod('gn:end-stream')
-                blob = _last.serialize(2)
+                blob = _last.serialize(_sys_s_mode)
                 self._enqueue(sid, blob, True, False)
                 self._schedule_flush()
             

GNServer/models.py

@@ -39,6 +39,8 @@ 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
@@ -48,11 +50,12 @@ class KDCObject:
                 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.57.dist-info → gnserver-0.0.0.0.59.dist-info}/METADATA

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

gnserver-0.0.0.0.59.dist-info/RECORD

@@ -0,0 +1,14 @@
+GNServer/__init__.py,sha256=QmvIIE5RWIv040_l216aWtYuiIPtLasdsFbH0Fya2SI,1793
+GNServer/_app.py,sha256=bf5sXwimwgsSq51bK3YVq0e46p-0Hr9NY5wME2Okh54,19328
+GNServer/_client.py,sha256=MDAVnMGc5QNweOt8Tbas7OF9d_0Z3upxtrA7PmIttVs,33163
+GNServer/_cors_resolver.py,sha256=aDxk4ItaEK-6vlDbkno8FJZEjczGEe8vkOui6_kz5-Y,5950
+GNServer/_crt.py,sha256=SOmyX7zBiCY9EhVSekksQtBHgTIZVvdqNZ8Ni-E5Zow,1390
+GNServer/_func_params_validation.py,sha256=pDXRzPVTdPnDHFMMmKd014SConBjFOuaLeJTY0vldlM,11412
+GNServer/_routes.py,sha256=bJnmQ8uEhPVQgy2tTqE5TEIM8aFXV-lVI7c2nG0rQwk,3384
+GNServer/_template_resolver.py,sha256=vdJYb_7PjIeTWq-Clr7jyj7QIvPBxplU7EqeOuMJ64c,1409
+GNServer/models.py,sha256=CXBJR_g3clIKKaMJ_zsUFLEG0EBa3g_Ik10te7whd30,3211
+gnserver-0.0.0.0.59.dist-info/licenses/LICENSE,sha256=_rN-sb3LemR3cKsEqjJRdXkdt7mME1mkW1BwWEn-zAw,1309
+gnserver-0.0.0.0.59.dist-info/METADATA,sha256=8x6eFAgjqAlpnOR29WUGyFwtj78jLfU0UARWXZMqTwM,830
+gnserver-0.0.0.0.59.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+gnserver-0.0.0.0.59.dist-info/top_level.txt,sha256=-UOUBuD4u7Qkb1o5PdcwyA3kx8xCH2lwy0tJHi26Wb4,9
+gnserver-0.0.0.0.59.dist-info/RECORD,,

gnserver-0.0.0.0.57.dist-info/RECORD

@@ -1,14 +0,0 @@
-GNServer/__init__.py,sha256=6CMCZlkBO74PW8i8DAri5xz2fYM9EyPH8vdsLYBMmOo,1560
-GNServer/_app.py,sha256=fXPrxk-YiprBvjYQckAj3oSHLdWlAENPZ6WkqC8bFZ8,19242
-GNServer/_client.py,sha256=IEzben2zZfgpU9DhcnjB9uQLCInllZhdoLTZyM72ldA,32610
-GNServer/_cors_resolver.py,sha256=aDxk4ItaEK-6vlDbkno8FJZEjczGEe8vkOui6_kz5-Y,5950
-GNServer/_crt.py,sha256=SOmyX7zBiCY9EhVSekksQtBHgTIZVvdqNZ8Ni-E5Zow,1390
-GNServer/_func_params_validation.py,sha256=pDXRzPVTdPnDHFMMmKd014SConBjFOuaLeJTY0vldlM,11412
-GNServer/_routes.py,sha256=bJnmQ8uEhPVQgy2tTqE5TEIM8aFXV-lVI7c2nG0rQwk,3384
-GNServer/_template_resolver.py,sha256=vdJYb_7PjIeTWq-Clr7jyj7QIvPBxplU7EqeOuMJ64c,1409
-GNServer/models.py,sha256=Te9Fyw-EsMnEZt0TPE9H0Zc_atjq2X94VsLSQH_k1Kk,3145
-gnserver-0.0.0.0.57.dist-info/licenses/LICENSE,sha256=_rN-sb3LemR3cKsEqjJRdXkdt7mME1mkW1BwWEn-zAw,1309
-gnserver-0.0.0.0.57.dist-info/METADATA,sha256=0-K5kQ60Cyj5nwSYGxHYCa5FvGDJZxU6-PQwaTaE4ks,830
-gnserver-0.0.0.0.57.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-gnserver-0.0.0.0.57.dist-info/top_level.txt,sha256=-UOUBuD4u7Qkb1o5PdcwyA3kx8xCH2lwy0tJHi26Wb4,9
-gnserver-0.0.0.0.57.dist-info/RECORD,,