GNServer 0.0.0.0.25__py3-none-any.whl → 0.0.0.0.27__py3-none-any.whl

GNServer/_client.py

@@ -101,7 +101,11 @@ class GNExceptions:
 
 
 from KeyisBClient.gn import GNRequest, GNResponse
-from .tools import TTLDict
+from KeyisBTools import TTLDict
+
+from KeyisBTools.cryptography.sign import M1
+
+m1 = M1()
 
 
 
@@ -119,16 +123,12 @@ class AsyncClient:
         self.__dns_client: Optional[AsyncClient] = None
         self._dns_cache: TTLDict = TTLDict()
 
-    
-    async def getCoreDNS(self, domain: str, use_cache: bool = True, keep_alive: bool = False) -> str:
-        
+    async def getCoreDNS(self, domain: str, token: Optional[bytes] = None, use_cache: bool = True, keep_alive: bool = False) -> str:
         if use_cache:
             resuilt = self._dns_cache.get(domain)
             if resuilt is not None:
                 return resuilt
 
-
-
         if ':' in domain and domain.split('.')[-1].split(':')[0].isdigit() and domain.split(':')[-1].isdigit():
             return domain
 
@@ -136,7 +136,12 @@ class AsyncClient:
             if self.__dns_client is None:
                 self.__dns_client = AsyncClient()
 
-            r1 = await self.__dns_client.request(GNRequest('GET', Url(f'gn://{self.__dns_core__ipv4}/getIp?d={domain}')), keep_alive=keep_alive)
+            if token is not None:
+                payload = {'sign': {'alg': 'KeyisB-c-s-m1', 'data': m1.sign(token)}}
+            else:
+                payload = None
+
+            r1 = await self.__dns_client.request(GNRequest('GET', Url(f'gn://{self.__dns_core__ipv4}/getIp?d={domain}'), payload=payload), keep_alive=keep_alive)
 
             if r1.command != 'ok':
                 raise GNExceptions.ConnectionError.dns.data
@@ -154,32 +159,24 @@ class AsyncClient:
         except:
             raise GNExceptions.ConnectionError.dns.connection
 
-    
-
-    async def getGNDNS(self, domain: str, token: Optional[str] = None, use_cache: bool = True, keep_alive: bool = False) -> str:
-
-        
+    async def getGNDNS(self, domain: str, token: Optional[bytes] = None, use_cache: bool = True, keep_alive: bool = False) -> str:
         if use_cache:
             resuilt = self._dns_cache.get(domain)
             if resuilt is not None:
                 return resuilt
 
-
-        
         if ':' in domain and domain.split('.')[-1].split(':')[0].isdigit() and domain.split(':')[-1].isdigit():
             return domain
 
-
         if self.__dns_gn__ipv4 is None:
             self.__dns_gn__ipv4 = await self.getCoreDNS('dns.gn')
 
-
         try:
             if self.__dns_client is None:
                 self.__dns_client = AsyncClient()
             
             if token is not None:
-                payload = {'token': token}
+                payload = {'sign': {'alg': 'KeyisB-c-s-m1', 'data': m1.sign(token)}}
             else:
                 payload = None
 
@@ -201,8 +198,11 @@ 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):
+        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:
+            return await self.getGNDNS(domain=domain, token=token, use_cache=use_cache, keep_alive=keep_alive)
 
     def addRequestCallback(self, callback: Callable, name: str):
         self.__request_callbacks[name] = callback
@@ -223,7 +223,7 @@ class AsyncClient:
                     print('дождались')
                     if c.status == 'active':
                         return c
-                    elif c.status == 'connecting': # если очень дого подключаемся, то кидаем ошибку
+                    elif c.status == 'connecting': # если очень долго подключаемся, то кидаем ошибку
                         await self.disconnect(domain)
                         raise GNExceptions.ConnectionError.client.timeout
                     elif c.status == 'disconnect':
@@ -239,7 +239,7 @@ class AsyncClient:
         c.status = 'connecting'
         self._active_connections[domain] = c
 
-        data = await self.getCoreDNS(domain)
+        data = await self.getDNS(domain)
 
         data = data.split(':')
 
@@ -251,7 +251,7 @@ class AsyncClient:
         c._disconnect_signal = f
         c._domain = domain
 
-        await c.connect(data['ip'], data['port'], keep_alive=keep_alive)
+        await c.connect(data[0], data[1], keep_alive=keep_alive)
         await c.connect_future
 
         return c

{gnserver-0.0.0.0.25.dist-info → gnserver-0.0.0.0.27.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GNServer
-Version: 0.0.0.0.25
+Version: 0.0.0.0.27
 Summary: GNServer
 Home-page: https://github.com/KeyisB/libs/tree/main/GNServer
 Author: KeyisB
@@ -14,6 +14,7 @@ License-File: LICENSE
 Requires-Dist: aioquic
 Requires-Dist: anyio
 Requires-Dist: KeyisBClient
+Requires-Dist: KeyisBTools
 Requires-Dist: aiofiles
 Requires-Dist: uvloop
 Dynamic: author

gnserver-0.0.0.0.27.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=WYK16u-G6TDEMBa3MVaJP3-HzTh4NIcmzsyOdxaSsm0,30664
+GNServer/_client.py,sha256=uF5h5pu0noJ1uNWSdC-kxGvBUwUUmyyAQTt_altNJ_g,29861
+gnserver-0.0.0.0.27.dist-info/licenses/LICENSE,sha256=WH_t7dKZyWJ5Ld07eYIkUG4Tv6zZWXtAdsUqYAUesn0,1084
+gnserver-0.0.0.0.27.dist-info/METADATA,sha256=8pB4A-duYiWVMfoKmSEE7zUs1rfo8gaF5fe1yszZfXE,833
+gnserver-0.0.0.0.27.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+gnserver-0.0.0.0.27.dist-info/top_level.txt,sha256=-UOUBuD4u7Qkb1o5PdcwyA3kx8xCH2lwy0tJHi26Wb4,9
+gnserver-0.0.0.0.27.dist-info/RECORD,,

GNServer/tools/__init__.py

@@ -1 +0,0 @@
-from ._models import TTLDict

GNServer/tools/_models.py

@@ -1,74 +0,0 @@
-import time
-import asyncio
-from typing import Optional
-
-
-
-class TTLDict:
-    def __init__(self, default_ttl: int = 60, cleanup_interval: int = 300):
-        """
-        :param default_ttl: TTL по умолчанию (сек), если при записи не указан
-        :param cleanup_interval: периодическая очистка от просроченных ключей (сек), по умолчанию 5 мин
-        """
-
-        self._store = {}
-        self._default_ttl = default_ttl
-        self._cleanup_interval = cleanup_interval
-        self._task = None
-
-    def set(self, key, value, ttl: Optional[int] = None):
-        if ttl is None:
-            ttl = self._default_ttl
-        expire_at = time.monotonic() + ttl
-        self._store[key] = (value, expire_at)
-
-        if self._task is None:
-            loop = asyncio.get_running_loop()
-            self._task = loop.create_task(self._cleanup_worker())
-
-    def get(self, key):
-        now = time.monotonic()
-        item = self._store.get(key)
-        if not item:
-            return None
-
-        value, expire_at = item
-        if expire_at < now:
-            del self._store[key]
-            return None
-        return value
-
-    def __setitem__(self, key, value):
-        self.set(key, value, self._default_ttl)
-
-    def __getitem__(self, key):
-        return self.get(key)
-
-    def __contains__(self, key):
-        return self.get(key) is not None
-
-    def __len__(self):
-        return len(self._store)
-
-    def __repr__(self):
-        return f"<TTLDict size={len(self._store)}>"
-
-    async def _cleanup_worker(self):
-        while True:
-            await asyncio.sleep(self._cleanup_interval)
-            self.cleanup()
-
-    def cleanup(self):
-        """Удалить все просроченные ключи"""
-        now = time.monotonic()
-        expired = [k for k, (_, exp) in self._store.items() if exp < now]
-        for k in expired:
-            self._store.pop(k, None)
-
-    async def stop(self):
-        """Остановить фон очистки"""
-        self._task.cancel()
-        try:
-            await self._task
-        except asyncio.CancelledError:
-            pass

gnserver-0.0.0.0.25.dist-info/RECORD

@@ -1,11 +0,0 @@
-GNServer/___client.py,sha256=hmeUL2Vqp-BnwJeRcLZAaIfRNVxBrRRB_AFk9ofkei4,25459
-GNServer/__init__.py,sha256=V50sMYrrPdOGuI1iJm-SW7izhX-eggDH16AHvtIKjmM,1480
-GNServer/_app.py,sha256=WYK16u-G6TDEMBa3MVaJP3-HzTh4NIcmzsyOdxaSsm0,30664
-GNServer/_client.py,sha256=0Dy2n5FN6_nKm8n5XLCXkimKkKdIrhQpIY0Sk1UkNMk,29163
-GNServer/tools/__init__.py,sha256=itqkS5iBB2GEHqz8H-htqgd55rUi6utnuKVAzBBByCM,28
-GNServer/tools/_models.py,sha256=1V94cbNHQGAl5l9DJbGvvkm1gmsgTEMgkjzlnZk8ymw,2264
-gnserver-0.0.0.0.25.dist-info/licenses/LICENSE,sha256=WH_t7dKZyWJ5Ld07eYIkUG4Tv6zZWXtAdsUqYAUesn0,1084
-gnserver-0.0.0.0.25.dist-info/METADATA,sha256=A_iTQQjqw9z2p3UrvkiqvYnRceT7nqpjT0EzQj6RezA,805
-gnserver-0.0.0.0.25.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-gnserver-0.0.0.0.25.dist-info/top_level.txt,sha256=-UOUBuD4u7Qkb1o5PdcwyA3kx8xCH2lwy0tJHi26Wb4,9
-gnserver-0.0.0.0.25.dist-info/RECORD,,