GNServer 0.0.0.0.28__py3-none-any.whl → 0.0.0.0.30__py3-none-any.whl

GNServer/_app.py

@@ -45,105 +45,121 @@ console = logging.StreamHandler()
 console.setLevel(logging.INFO)
 console.setFormatter(logging.Formatter("[GNServer] %(name)s: %(levelname)s: %(message)s"))
 
-
+PayloadType = Optional[Union[int, str, list, tuple, dict]]
 
 class _BaseEXception(Exception):
-    def __init__(self, code: str, message=""):
+    def __init__(self, code: str, name="", message: Optional[str] = None, payload: PayloadType = None):
         self._code = code
+        self._name = name
         self._message = message
+        self._payload = payload
 
     def assembly(self):
         """
         Собирает ошибку в ответ типа `GNResponse`
         """
-        return gn.GNResponse(f'gn:error:{self._code}', payload={'msg': self._message})
+        payload: dict = {'name': self._name}
+
+        if self._message is not None:
+            payload['message'] = self._message
+
+        if self._payload is not None:
+            payload['payload'] = self._payload
+
+        return gn.GNResponse(f'gn:error:{self._code}', payload=payload)
 
 
 class GNExceptions:
     class UnprocessableEntity(_BaseEXception):
-        def __init__(self):
+        def __init__(self, message: Optional[str] = None, payload: PayloadType = None):
             """
             # Некорректные данные
             """
-            super().__init__('422', "Unprocessable Entity")
+            super().__init__('422', "Unprocessable Entity", message=message, payload=payload)
 
     class BadRequest(_BaseEXception):
-        def __init__(self):
+        def __init__(self, message: Optional[str] = None, payload: PayloadType = None):
             """
             # неправильного синтаксис url или параметров
             """
-            super().__init__('400', "Bad Request")
+            super().__init__('400', "Bad Request", message=message, payload=payload)
 
     class Forbidden(_BaseEXception):
-        def __init__(self):
+        def __init__(self, message: Optional[str] = None, payload: PayloadType = None):
             """
             # Доступ запрещён, даже при наличии авторизации
             """
-            super().__init__('403', "Forbidden")
-
+            super().__init__('403', "Forbidden", message=message, payload=payload)
+    
+    class Unauthorized(_BaseEXception):
+        def __init__(self, message: Optional[str] = None, payload: PayloadType = None):
+            """
+            # Требуется авторизация
+            """
+            super().__init__('401', "Unauthorized", message=message, payload=payload)
 
     class NotFound(_BaseEXception):
-        def __init__(self):
+        def __init__(self, message: Optional[str] = None, payload: PayloadType = None):
             """
             # Ресурс не найден
             """
-            super().__init__('404', "Not Found")
+            super().__init__('404', "Not Found", message=message, payload=payload)
 
 
     class MethodNotAllowed(_BaseEXception):
-        def __init__(self):
+        def __init__(self, message: Optional[str] = None, payload: PayloadType = None):
             """
             # Метод запроса не поддерживается данным ресурсом
             """
-            super().__init__('405', "Method Not Allowed")
+            super().__init__('405', "Method Not Allowed", message=message, payload=payload)
 
 
     class Conflict(_BaseEXception):
-        def __init__(self):
+        def __init__(self, message: Optional[str] = None, payload: PayloadType = None):
             """
             # Конфликт состояния ресурса (например, дубликат)
             """
-            super().__init__('409', "Conflict")
+            super().__init__('409', "Conflict", message=message, payload=payload)
 
 
     class InternalServerError(_BaseEXception):
-        def __init__(self):
+        def __init__(self, message: Optional[str] = None, payload: PayloadType = None):
             """
             # Внутренняя ошибка сервера
             """
-            super().__init__('500', "Internal Server Error")
+            super().__init__('500', "Internal Server Error", message=message, payload=payload)
 
 
     class NotImplemented(_BaseEXception):
-        def __init__(self):
+        def __init__(self, message: Optional[str] = None, payload: PayloadType = None):
             """
             # Метод или функционал ещё не реализован
             """
-            super().__init__('501', "Not Implemented")
+            super().__init__('501', "Not Implemented", message=message, payload=payload)
 
 
     class BadGateway(_BaseEXception):
-        def __init__(self):
+        def __init__(self, message: Optional[str] = None, payload: PayloadType = None):
             """
             # Ошибка шлюза или прокси при обращении к апстриму
             """
-            super().__init__('502', "Bad Gateway")
+            super().__init__('502', "Bad Gateway", message=message, payload=payload)
 
 
     class ServiceUnavailable(_BaseEXception):
-        def __init__(self):
+        def __init__(self, message: Optional[str] = None, payload: PayloadType = None):
             """
             # Сервис временно недоступен
             """
-            super().__init__('503', "Service Unavailable")
+            super().__init__('503', "Service Unavailable", message=message, payload=payload)
 
 
     class GatewayTimeout(_BaseEXception):
-        def __init__(self):
+        def __init__(self, message: Optional[str] = None, payload: PayloadType = None):
             """
             # Таймаут при обращении к апстриму
             """
-            super().__init__('504', "Gateway Timeout")
+            super().__init__('504', "Gateway Timeout", message=message, payload=payload)
 
 def guess_type(filename: str) -> str:
     """

GNServer/_client.py

@@ -1,34 +1,36 @@
-
-import os
 import httpx
 import asyncio
-import typing as _typing
 import logging as logging2
 from typing import Union, List, Dict, Tuple, Optional
 import datetime
 logging2.basicConfig(level=logging2.INFO)
-
 from KeyisBLogging import logging
-from typing import Dict, List, Tuple, Optional, cast, AsyncGenerator, Callable, Literal
+from typing import Dict, List, Tuple, Optional, AsyncGenerator, Callable, Literal, AsyncIterable
 from itertools import count
 from aioquic.asyncio.client import connect
 from aioquic.asyncio.protocol import QuicConnectionProtocol
-from aioquic.h3.connection import H3_ALPN, H3Connection
-from aioquic.h3.events import DataReceived, DatagramReceived, H3Event, HeadersReceived
 from aioquic.quic.configuration import QuicConfiguration
 from aioquic.quic.events import QuicEvent
+from aioquic.asyncio.protocol import QuicConnectionProtocol
+from aioquic.quic.events import QuicEvent, StreamDataReceived, StreamReset
+import asyncio
+from collections import deque
+from typing import Dict, Deque, Tuple, Optional
+
+import asyncio
+import time
+from collections import deque
+from itertools import count
+from typing import Deque, Dict, Optional, Tuple, Union
+
+from aioquic.quic.configuration import QuicConfiguration
+from aioquic.quic.events import QuicEvent, StreamDataReceived, StreamReset, ConnectionTerminated
 
 
 import time
-import json, ssl, asyncio, struct, base64, hashlib
 from typing import Any, Dict, Optional
-import websockets
 
-from cryptography.hazmat.primitives.ciphers.aead import AESGCM
-import os
-import msgpack
 import logging
-from httpx import Request, Headers, URL
 logging.basicConfig(level=logging.DEBUG)
 logging.getLogger("websockets").setLevel(logging.DEBUG)
 
@@ -103,9 +105,15 @@ class GNExceptions:
 from KeyisBClient.gn import GNRequest, GNResponse
 from KeyisBTools import TTLDict
 
-from KeyisBTools.cryptography.sign import M1
+from KeyisBTools.cryptography.sign import S1
+
+s1 = S1()
 
-m1 = M1()
+
+async def chain_async(first_item, rest: AsyncIterable) -> AsyncGenerator:
+    yield first_item
+    async for x in rest:
+        yield x
 
 
 
@@ -137,7 +145,7 @@ class AsyncClient:
                 self.__dns_client = AsyncClient()
 
             if token is not None:
-                payload = {'sign': {'alg': 'KeyisB-c-s-m1', 'data': m1.sign(token)}}
+                payload = {'sign': {'alg': 'KeyisB-c-s-m1', 'data': s1.sign(token)}}
             else:
                 payload = None
 
@@ -146,6 +154,9 @@ class AsyncClient:
             if r1.command != 'ok':
                 raise GNExceptions.ConnectionError.dns.data
 
+            if r1.payload is None:
+                raise GNExceptions.ConnectionError.dns.data
+
             r1_data = r1.payload
 
             result = r1_data['ip'] + ':' + str(r1_data['port'])
@@ -176,7 +187,7 @@ class AsyncClient:
                 self.__dns_client = AsyncClient()
             
             if token is not None:
-                payload = {'sign': {'alg': 'KeyisB-c-s-m1', 'data': m1.sign(token)}}
+                payload = {'sign': {'alg': 'KeyisB-c-s-m1', 'data': s1.sign(token)}}
             else:
                 payload = None
 
@@ -185,6 +196,10 @@ class AsyncClient:
             if r1.command != 'ok':
                 raise GNExceptions.ConnectionError.dns.data
 
+            
+            if r1.payload is None:
+                raise GNExceptions.ConnectionError.dns.data
+            
             r1_data = r1.payload
 
             result = r1_data['ip'] + ':' + str(r1_data['port'])
@@ -198,7 +213,7 @@ class AsyncClient:
         except:
             raise GNExceptions.ConnectionError.dns.connection
 
-    async def getDNS(self, domain: str, token: Optional[str] = None, use_cache: bool = True, keep_alive: bool = False):
+    async def getDNS(self, domain: str, token: Optional[bytes] = None, use_cache: bool = True, keep_alive: bool = False):
         if domain.endswith(('.core', '.gw', '.gn', '.cdn', '.sys', '.gwis', '.abs')):
             return await self.getCoreDNS(domain=domain, use_cache=use_cache, keep_alive=keep_alive)
         else:
@@ -248,10 +263,10 @@ class AsyncClient:
         def f(domain):
             self._active_connections.pop(domain)
 
-        c._disconnect_signal = f
-        c._domain = domain
+        c._disconnect_signal = f # type: ignore
+        c._domain = domain # type: ignore
 
-        await c.connect(data[0], data[1], keep_alive=keep_alive)
+        await c.connect(data[0], int(data[1]), keep_alive=keep_alive)
         await c.connect_future
 
         return c
@@ -285,23 +300,37 @@ class AsyncClient:
 
             return r
         
-        # else:
-        #     async def wrapped(request) -> AsyncGenerator[GNRequest, None]:
-        #         async for req in request:
-        #             if req.gn_protocol is None:
-        #                 req.setGNProtocol(self.__current_session['protocols'][0])
-        #             req._stream = True
-                    
-        #             for f in self.__request_callbacks.values():
-        #                 asyncio.create_task(f(req))
-                        
-        #             yield req
-        #     r = await self.client.asyncRequest(wrapped(request))
-        
-        #     for f in self.__response_callbacks.values():
-        #         asyncio.create_task(f(r))
-                
-        #     return r
+        else:
+            c: Optional[QuicClient] = None
+
+            async def wrapped(request) -> AsyncGenerator[GNRequest, None]:
+                async for req in request:
+                    if req.gn_protocol is None:
+                        req.setGNProtocol(self.__current_session['protocols'][0])
+                    req._stream = True
+
+                    for f in self.__request_callbacks.values():
+                        asyncio.create_task(f(req))
+
+                    nonlocal c
+                    if c is None:  # инициализируем при первом req
+                        c = await self.connect(request.url.hostname, restart_connection, reconnect_wait, keep_alive=keep_alive)
+
+                    yield req
+
+            gen = wrapped(request)
+            first_req = await gen.__anext__()
+
+            if c is None:
+                raise GNExceptions.ConnectionError.client.data
+
+            r = await c.asyncRequest(chain_async(first_req, gen))
+
+            for f in self.__response_callbacks.values():
+                asyncio.create_task(f(r))
+
+            return r
+
 
     async def requestStream(self, request: Union[GNRequest, AsyncGenerator[GNRequest, Any]]) -> AsyncGenerator[GNResponse, None]:
         """
@@ -338,24 +367,6 @@ class AsyncClient:
 
                 yield response
 
-from aioquic.asyncio.protocol import QuicConnectionProtocol
-from aioquic.quic.events import QuicEvent, StreamDataReceived, StreamReset
-from aioquic.quic.connection import END_STATES
-import asyncio
-from collections import deque
-from typing import Dict, Deque, Tuple, Optional, List
-
-import asyncio
-import time
-from collections import deque
-from dataclasses import dataclass
-from itertools import count
-from typing import Deque, Dict, Optional, Tuple, Union
-
-from aioquic.quic.configuration import QuicConfiguration
-from aioquic.quic.events import QuicEvent, StreamDataReceived, StreamReset, ConnectionTerminated
-
-
 class RawQuicClient(QuicConnectionProtocol):
 
     SYS_RATIO_NUM = 9  # SYS 9/10

{gnserver-0.0.0.0.28.dist-info → gnserver-0.0.0.0.30.dist-info}/METADATA

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

gnserver-0.0.0.0.30.dist-info/RECORD

@@ -0,0 +1,9 @@
+GNServer/___client.py,sha256=hmeUL2Vqp-BnwJeRcLZAaIfRNVxBrRRB_AFk9ofkei4,25459
+GNServer/__init__.py,sha256=V50sMYrrPdOGuI1iJm-SW7izhX-eggDH16AHvtIKjmM,1480
+GNServer/_app.py,sha256=lP2YEChUHDWB8Ig3711hgsccwKTko8a3nlgT2EFmpwY,32494
+GNServer/_client.py,sha256=7D4JVgjjUqFN7RVzcOltMN_KyqV6Zfhe7F0Hz3OCIPk,30182
+gnserver-0.0.0.0.30.dist-info/licenses/LICENSE,sha256=WH_t7dKZyWJ5Ld07eYIkUG4Tv6zZWXtAdsUqYAUesn0,1084
+gnserver-0.0.0.0.30.dist-info/METADATA,sha256=8KCKYQXhaFF2d_P8Y-QK1dFDLjnus723FehM0b4N4r8,833
+gnserver-0.0.0.0.30.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+gnserver-0.0.0.0.30.dist-info/top_level.txt,sha256=-UOUBuD4u7Qkb1o5PdcwyA3kx8xCH2lwy0tJHi26Wb4,9
+gnserver-0.0.0.0.30.dist-info/RECORD,,

gnserver-0.0.0.0.28.dist-info/RECORD

@@ -1,9 +0,0 @@
-GNServer/___client.py,sha256=hmeUL2Vqp-BnwJeRcLZAaIfRNVxBrRRB_AFk9ofkei4,25459
-GNServer/__init__.py,sha256=V50sMYrrPdOGuI1iJm-SW7izhX-eggDH16AHvtIKjmM,1480
-GNServer/_app.py,sha256=CZQ1EM-m0FsMTOVyjNIMeDvS0B1MtZMsGV0O1deMyTc,30778
-GNServer/_client.py,sha256=uF5h5pu0noJ1uNWSdC-kxGvBUwUUmyyAQTt_altNJ_g,29861
-gnserver-0.0.0.0.28.dist-info/licenses/LICENSE,sha256=WH_t7dKZyWJ5Ld07eYIkUG4Tv6zZWXtAdsUqYAUesn0,1084
-gnserver-0.0.0.0.28.dist-info/METADATA,sha256=lrvZv_aAc4ggrW0gIWvQerVUexDwivGvyVsNWoDr-cQ,833
-gnserver-0.0.0.0.28.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-gnserver-0.0.0.0.28.dist-info/top_level.txt,sha256=-UOUBuD4u7Qkb1o5PdcwyA3kx8xCH2lwy0tJHi26Wb4,9
-gnserver-0.0.0.0.28.dist-info/RECORD,,