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

GNServer/_client.py

@@ -101,7 +101,7 @@ class GNExceptions:
 
 
 from KeyisBClient.gn import GNRequest, GNResponse
-
+from .tools import TTLDict
 
 
 
@@ -117,9 +117,17 @@ class AsyncClient:
         self._active_connections: Dict[str, QuicClient] = {}
 
         self.__dns_client: Optional[AsyncClient] = None
+        self._dns_cache: TTLDict = TTLDict()
 
     
-    async def getCoreDNS(self, domain: str) -> str:
+    async def getCoreDNS(self, domain: str, 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
@@ -128,14 +136,18 @@ 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=False)
+            r1 = await self.__dns_client.request(GNRequest('GET', Url(f'gn://{self.__dns_core__ipv4}/getIp?d={domain}')), keep_alive=keep_alive)
 
             if r1.command != 'ok':
                 raise GNExceptions.ConnectionError.dns.data
 
             r1_data = r1.payload
 
-            return r1_data['ip'] + ':' + str(r1_data['port'])
+            result = r1_data['ip'] + ':' + str(r1_data['port'])
+
+            self._dns_cache.set(domain, result, r1_data.get('ttl'))
+
+            return result
 
         except httpx.TimeoutException:
             raise GNExceptions.ConnectionError.dns.timeout
@@ -144,7 +156,15 @@ class AsyncClient:
 
     
 
-    async def getGNDNS(self, domain: str, token: Optional[str] = None) -> str:
+    async def getGNDNS(self, domain: str, token: Optional[str] = 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
@@ -163,14 +183,18 @@ class AsyncClient:
             else:
                 payload = None
 
-            r1 = await self.__dns_client.request(GNRequest('GET', Url(f'gn://{self.__dns_gn__ipv4}/getIp?d={domain}'), payload=payload))
+            r1 = await self.__dns_client.request(GNRequest('GET', Url(f'gn://{self.__dns_gn__ipv4}/getIp?d={domain}'), payload=payload), keep_alive=keep_alive)
 
             if r1.command != 'ok':
                 raise GNExceptions.ConnectionError.dns.data
 
             r1_data = r1.payload
 
-            return r1_data['ip'] + ':' + str(r1_data['port'])
+            result = r1_data['ip'] + ':' + str(r1_data['port'])
+
+            self._dns_cache.set(domain, result, r1_data.get('ttl'))
+
+            return result
 
         except httpx.TimeoutException:
             raise GNExceptions.ConnectionError.dns.timeout

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

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

{gnserver-0.0.0.0.24.dist-info → gnserver-0.0.0.0.25.dist-info}/RECORD

@@ -1,11 +1,11 @@
 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=9zw3DbkVHjNr-DNhlLV92r2sNJ-VY9Ahc4QjP1sUCII,28443
+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.24.dist-info/licenses/LICENSE,sha256=WH_t7dKZyWJ5Ld07eYIkUG4Tv6zZWXtAdsUqYAUesn0,1084
-gnserver-0.0.0.0.24.dist-info/METADATA,sha256=kVi7DeXW2P6Zgk8y3ZcUuDNFiS_gRvrsR8exkZPJ3vM,805
-gnserver-0.0.0.0.24.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-gnserver-0.0.0.0.24.dist-info/top_level.txt,sha256=-UOUBuD4u7Qkb1o5PdcwyA3kx8xCH2lwy0tJHi26Wb4,9
-gnserver-0.0.0.0.24.dist-info/RECORD,,
+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,,