GNServer 0.0.0.0.29__py3-none-any.whl → 0.0.0.0.31__py3-none-any.whl

GNServer/_client.py

@@ -1,40 +1,16 @@
-
-import os
+import time
 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 itertools import count
+from collections import deque
+from typing import Any, Dict, Deque, Tuple, Union, Optional, AsyncGenerator, Callable, Literal, AsyncIterable
+from aioquic.quic.events import QuicEvent, StreamDataReceived, StreamReset, ConnectionTerminated
+from aioquic.quic.configuration import QuicConfiguration
 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
 
 
-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)
-
-import KeyisBClient
-from KeyisBClient import Url
-httpxAsyncClient = httpx.AsyncClient(verify=KeyisBClient.ssl_gw_crt_path, timeout=200)
 
 class GNExceptions:
     class ConnectionError:
@@ -98,14 +74,20 @@ class GNExceptions:
                     super().__init__(message)
                     
 
+from KeyisBTools import TTLDict
+from KeyisBTools.cryptography.sign import S1
+from gnobjects.net.objects import GNRequest, GNResponse, Url
 
+from ._crt import crt_client
 
-from KeyisBClient.gn import GNRequest, GNResponse
-from KeyisBTools import TTLDict
 
-from KeyisBTools.cryptography.sign import M1
+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 +119,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,11 +128,14 @@ 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'])
+            result = r1_data['ip'] + ':' + str(r1_data['port']) # type: ignore
 
-            self._dns_cache.set(domain, result, r1_data.get('ttl'))
+            self._dns_cache.set(domain, result, r1_data.get('ttl')) # type: ignore
 
             return result
 
@@ -176,7 +161,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,11 +170,15 @@ 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'])
+            result = r1_data['ip'] + ':' + str(r1_data['port']) # type: ignore
 
-            self._dns_cache.set(domain, result, r1_data.get('ttl'))
+            self._dns_cache.set(domain, result, r1_data.get('ttl')) # type: ignore
 
             return result
 
@@ -198,7 +187,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 +237,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,76 +274,72 @@ 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
-
-    async def requestStream(self, request: Union[GNRequest, AsyncGenerator[GNRequest, Any]]) -> AsyncGenerator[GNResponse, None]:
-        """
-        Build and send a async request.
-        """
-        if isinstance(request, GNRequest):
-            if request.gn_protocol is None:
-                request.setGNProtocol(self.__current_session['protocols'][0])
-                
-            for f in self.__request_callbacks.values():
-                asyncio.create_task(f(request))
-
-            async for response in self.client.asyncRequestStream(request):
-                    
-                for f in self.__response_callbacks.values():
-                    asyncio.create_task(f(response))
-
-                yield response
         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))
-                        
-                    req._stream = True
+
+                    nonlocal c
+                    if c is None:  # инициализируем при первом req
+                        c = await self.connect(request.url.hostname, restart_connection, reconnect_wait, keep_alive=keep_alive)
+
                     yield req
-            async for response in self.client.asyncRequestStream(wrapped(request)):
-                
-                for f in self.__response_callbacks.values():
-                    asyncio.create_task(f(response))
 
-                yield response
+            gen = wrapped(request)
+            first_req = await gen.__anext__()
 
-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
+            if c is None:
+                raise GNExceptions.ConnectionError.client.data
 
-import asyncio
-import time
-from collections import deque
-from dataclasses import dataclass
-from itertools import count
-from typing import Deque, Dict, Optional, Tuple, Union
+            r = await c.asyncRequest(chain_async(first_req, gen))
 
-from aioquic.quic.configuration import QuicConfiguration
-from aioquic.quic.events import QuicEvent, StreamDataReceived, StreamReset, ConnectionTerminated
+            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]:
+    #     """
+    #     Build and send a async request.
+    #     """
+    #     if isinstance(request, GNRequest):
+    #         if request.gn_protocol is None:
+    #             request.setGNProtocol(self.__current_session['protocols'][0])
+                
+    #         for f in self.__request_callbacks.values():
+    #             asyncio.create_task(f(request))
+
+    #         async for response in self.client.asyncRequestStream(request):
+                    
+    #             for f in self.__response_callbacks.values():
+    #                 asyncio.create_task(f(response))
+
+    #             yield response
+    #     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])
+                            
+    #                 for f in self.__request_callbacks.values():
+    #                     asyncio.create_task(f(req))
+                        
+    #                 req._stream = True
+    #                 yield req
+    #         async for response in self.client.asyncRequestStream(wrapped(request)):
+                
+    #             for f in self.__response_callbacks.values():
+    #                 asyncio.create_task(f(response))
 
+    #             yield response
 
 class RawQuicClient(QuicConnectionProtocol):
 
@@ -367,9 +352,9 @@ class RawQuicClient(QuicConnectionProtocol):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
-        self.quicClient: QuicClient = None
+        self.quicClient: QuicClient = None # type: ignore
 
-        self._sys_stream_id: Optional[int] = None
+        self._sys_stream_id: int = None # type: ignore
         self._queue_sys: Deque[Tuple[int, bytes, bool]] = deque()
         self._queue_user: Deque[Tuple[int, bytes, bool]] = deque()
 
@@ -648,13 +633,13 @@ class QuicClient:
         self.status: Literal['active', 'connecting', 'disconnect']
 
         self.connect_future = asyncio.get_event_loop().create_future()
-        self.connection_time: datetime.datetime = None
+        self.connection_time: datetime.datetime = None # type: ignore
 
     async def connect(self, ip: str, port: int, keep_alive: bool = True):
         self.status = 'connecting'
         self.connection_time = datetime.datetime.now()
         cfg = QuicConfiguration(is_client=True, alpn_protocols=["gn:backend"])
-        cfg.load_verify_locations(KeyisBClient.ssl_gw_crt_path)
+        cfg.load_verify_locations(cadata=crt_client)
         cfg.idle_timeout = 40
 
         self._client_cm = connect(
@@ -667,7 +652,7 @@ class QuicClient:
 
 
         try:
-            self._quik_core = await self._client_cm.__aenter__()
+            self._quik_core = await self._client_cm.__aenter__() # type: ignore
             self._quik_core.quicClient = self
 
             if keep_alive:

GNServer/_crt.py

@@ -0,0 +1,26 @@
+
+
+crt_client = b"""
+-----BEGIN CERTIFICATE-----
+MIIDszCCApugAwIBAgIUIEUvi2bdBH5yNb2Qi75IqGqMd7wwDQYJKoZIhvcNAQEL
+BQAwYTELMAkGA1UEBhMCVVMxDjAMBgNVBAgMBVN0YXRlMQ0wCwYDVQQHDARDaXR5
+MRUwEwYDVQQKDAxPcmdhbml6YXRpb24xDTALBgNVBAsMBFVuaXQxDTALBgNVBAMM
+BE15Q0EwHhcNMjUwNTA1MDEwMTExWhcNMzUwNTAzMDEwMTExWjBhMQswCQYDVQQG
+EwJVUzEOMAwGA1UECAwFU3RhdGUxDTALBgNVBAcMBENpdHkxFTATBgNVBAoMDE9y
+Z2FuaXphdGlvbjENMAsGA1UECwwEVW5pdDENMAsGA1UEAwwETXlDQTCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbDdWyR5n3qKaYkZvkiXtVJ7DekJn6Q
+eJA+kvje4KzxBlD+SkdkYMQxuTVU2yuNYXX88LhSbPygrzFSU7q3HG9dNwonWwP6
+05XFAvYZ5LDNI7DrjRecE/+JvpgXaAwcv3IJRpuJU1e+JL2K3Z9wwhxYEJM+N/aN
+pP8Zyr5ktXJgEKhWOVtpj2LSXno33SI04B0LWVlbiZX/yWtK3X/BJPlXaMn+r76n
+6L3JDNSjtuBGqSI7FHDQEPd3dcsdK6SbP6ORndp72EZfLcJbyXLtYdHgjJS9DrD4
+0f5Laq2SQ2oo/B3MKNNF/Y8e1USX1tIe+lePmqzjJJk2oB1GSBiaX00CAwEAAaNj
+MGEwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFM8O
+S2OUe3Xkh7XkQ95s+MZTCtsuMB8GA1UdIwQYMBaAFM8OS2OUe3Xkh7XkQ95s+MZT
+CtsuMA0GCSqGSIb3DQEBCwUAA4IBAQA3OwR0e9rPAgQ3nIHJrs+Tm7xr5DFAigd0
+V13Klncrl7SPD0HrqQ88qNhHZcXJqy8Y6y3sUIknisud+9cnzYo/rNgpSG702ZAo
+D/+ILHV51D8OZssoBaAWTfMA/NchPRXGDGJ5vBG/nXgvdpVdRnDepspKY1rYYTV0
+JYZ99+nSa3eyDQxyMmYSzK0hQmKHdJEMkb8Es2/hRlAktL31irlXW15Fr3li5pmj
+jRIER3q1T4WNyIuBRdNKYi03Eh342RWgl6C5Yjs1WBXsSXMhKpEw3Hlkc973CWb0
+oKCo/cPl0mNfdrj5ER3njUOvItIpPAOajqVN9RsALSc0jC9M8pWJ
+-----END CERTIFICATE-----
+"""

{gnserver-0.0.0.0.29.dist-info → gnserver-0.0.0.0.31.dist-info}/METADATA

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

gnserver-0.0.0.0.31.dist-info/RECORD

@@ -0,0 +1,9 @@
+GNServer/__init__.py,sha256=V50sMYrrPdOGuI1iJm-SW7izhX-eggDH16AHvtIKjmM,1480
+GNServer/_app.py,sha256=77g8nGa1-5faslltJeffpU585T9xZKf7D7wm8EjBMyU,27610
+GNServer/_client.py,sha256=5kPQF1M6YriCKaCsleoasAaoZrf9YI428iG1RhCoufY,29474
+GNServer/_crt.py,sha256=SOmyX7zBiCY9EhVSekksQtBHgTIZVvdqNZ8Ni-E5Zow,1390
+gnserver-0.0.0.0.31.dist-info/licenses/LICENSE,sha256=WH_t7dKZyWJ5Ld07eYIkUG4Tv6zZWXtAdsUqYAUesn0,1084
+gnserver-0.0.0.0.31.dist-info/METADATA,sha256=WVL7KBS8pzeXrDxZhSLQBuNR9eri_UJCKcD7bISB3pE,833
+gnserver-0.0.0.0.31.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+gnserver-0.0.0.0.31.dist-info/top_level.txt,sha256=-UOUBuD4u7Qkb1o5PdcwyA3kx8xCH2lwy0tJHi26Wb4,9
+gnserver-0.0.0.0.31.dist-info/RECORD,,