GNServer 0.0.0.0.41__tar.gz → 0.0.0.0.43__tar.gz

{gnserver-0.0.0.0.41 → gnserver-0.0.0.0.43}/GNServer/GNServer/_client.py

@@ -5,7 +5,7 @@ import asyncio
 import datetime
 from itertools import count
 from collections import deque
-from typing import Any, Dict, Deque, Tuple, Union, Optional, AsyncGenerator, Callable, Literal, AsyncIterable
+from typing import Any, Dict, Deque, Tuple, Union, Optional, AsyncGenerator, Callable, Literal, AsyncIterable, overload
 from aioquic.quic.events import QuicEvent, StreamDataReceived, StreamReset, ConnectionTerminated
 from aioquic.quic.configuration import QuicConfiguration
 from aioquic.asyncio.client import connect
@@ -162,98 +162,6 @@ class AsyncClient:
         else:
             self.__server_key = None
 
-    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 domain == 'api.dns.core':
-            return self.__dns_core__ipv4
-
-        if ':' in domain and domain.split('.')[-1].split(':')[0].isdigit() and domain.split(':')[-1].isdigit():
-            return domain
-
-        try:
-            if self.__dns_client is None:
-                self.__dns_client = AsyncClient()
-
-            if self.__server_key is not None:
-                s = s2.sign(self.__server_key)
-                data = m1.encrypt(s, domain.encode(), serialize({'domain': domain}), hash(self.__server_key))
-                payload = {'sign': {'alg': 'KeyisB-c-s-m1', 'data': s, 'domain': self.__domain}, 'data': data}
-            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 not r1.command:
-                raise r1
-
-            if r1.payload is None:
-                raise GNExceptions.ConnectionError.dns.data
-
-            r1_data = r1.payload
-
-            result = r1_data['ip'] + ':' + str(r1_data['port']) # type: ignore
-
-            self._dns_cache.set(domain, result, r1_data.get('ttl')) # type: ignore
-
-            return result
-
-        except httpx.TimeoutException:
-            raise GNExceptions.ConnectionError.dns.timeout
-        except:
-            raise GNExceptions.ConnectionError.dns.connection
-
-    async def getGNDNS(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
-
-        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 self.__server_key is not None:
-                payload = {'sign': {'alg': 'KeyisB-c-s-m1', 'data': s1.sign(self.__server_key)}}
-            else:
-                payload = None
-
-            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
-
-            
-            if r1.payload is None:
-                raise GNExceptions.ConnectionError.dns.data
-            
-            r1_data = r1.payload
-
-            result = r1_data['ip'] + ':' + str(r1_data['port']) # type: ignore
-
-            self._dns_cache.set(domain, result, r1_data.get('ttl')) # type: ignore
-
-            return result
-
-        except httpx.TimeoutException:
-            raise GNExceptions.ConnectionError.dns.timeout
-        except:
-            raise GNExceptions.ConnectionError.dns.connection
-
-    async def getDNS(self, domain: str, 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, use_cache=use_cache, keep_alive=keep_alive)
 
     def addRequestCallback(self, callback: Callable, name: str):
         self.__request_callbacks[name] = callback
@@ -292,7 +200,7 @@ class AsyncClient:
         self._active_connections[domain] = c
 
         devLog(request, '1.2.6', 10, f'Connecting to {domain}...')
-        data = await self.getDNS(domain)
+        data = await self.getDNS(domain, raise_errors=True)
         devLog(request, '1.2.7', 10, f'Got DNS for {domain}: {data}')
 
         data = data.split(':')
@@ -390,6 +298,76 @@ class AsyncClient:
             return r
 
 
+
+    def isDNSCore(self, domain: str) -> bool:
+        return domain.endswith(('.core', '.gw', '.gn', '.cdn', '.sys', '.gwis', '.abs'))
+
+    @overload
+    async def getDNS(self, domain: str, use_cache: bool = True, keep_alive: bool = False, raise_errors: Literal[False] = False) -> GNResponse: ...
+    @overload
+    async def getDNS(self, domain: str, use_cache: bool = True, keep_alive: bool = False, raise_errors: Literal[True] = True) -> str: ...
+
+    async def getDNS(self, domain: str, use_cache: bool = True, keep_alive: bool = False, raise_errors: bool = False) -> Union[str, GNResponse]:
+        if use_cache:
+            resuilt = self._dns_cache.get(domain)
+            if resuilt is not None:
+                if raise_errors:
+                    r1_data = resuilt.payload
+                    result = r1_data['ip'] + ':' + str(r1_data['port']) # type: ignore
+                else:
+                    result = resuilt
+                return result
+            
+
+        if ':' in domain and domain.split('.')[-1].split(':')[0].isdigit() and domain.split(':')[-1].isdigit():
+            return domain
+        
+        if domain == 'api.dns.core':
+            return self.__dns_core__ipv4
+        
+        is_dns_core = self.isDNSCore(domain)
+        if not is_dns_core:
+            if self.__dns_gn__ipv4 is None:
+                self.__dns_gn__ipv4 = await self.getDNS('api.dns.gn', raise_errors=True)
+
+        if self.__dns_client is None:
+            self.__dns_client = AsyncClient()
+
+        if self.__server_key is not None:
+            s = s2.sign(self.__server_key)
+            data = m1.encrypt(s, domain.encode(), serialize({'domain': domain}), hash(self.__server_key))
+            payload = {'sign': {'alg': 'KeyisB-c-s-m1', 'data': s, 'domain': self.__domain}, 'data': data}
+        else:
+            payload = None
+        
+        if is_dns_core:
+            ip_dns = self.__dns_core__ipv4
+        else:
+            ip_dns = self.__dns_gn__ipv4
+
+        r1 = await self.__dns_client.request(GNRequest('GET', Url(f'gn://{ip_dns}/getIp?d={domain}'), payload=payload), keep_alive=keep_alive)
+
+        if not r1.command:
+            if raise_errors:
+                raise r1
+            else:
+                return r1
+
+        self._dns_cache.set(domain, r1, r1.payload.get('ttl', 60)) # type: ignore
+
+        if raise_errors:
+            r1_data = r1.payload
+            result = r1_data['ip'] + ':' + str(r1_data['port']) # type: ignore
+        else:
+            result = r1
+        return result
+
+    
+
+
+
+
+
     # async def requestStream(self, request: Union[GNRequest, AsyncGenerator[GNRequest, Any]]) -> AsyncGenerator[GNResponse, None]:
     #     """
     #     Build and send a async request.
@@ -800,6 +778,4 @@ class QuicClient:
             chunk = await queue.get()
             if chunk is None or chunk.command == 'gn:end-stream':
                 break
-            yield chunk
-
-
+            yield chunk

{gnserver-0.0.0.0.41 → gnserver-0.0.0.0.43}/GNServer/GNServer.egg-info/PKG-INFO

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

gnserver-0.0.0.0.43/LICENSE

@@ -0,0 +1,29 @@
+
+Copyright (C) 2024 KeyisB. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to use the Software exclusively for
+projects related to the MMB or GW systems, including personal,
+educational, and commercial purposes, subject to the following
+conditions:
+
+1. Copying, modification, merging, publishing, distribution,
+sublicensing, and/or selling copies of the Software are
+strictly prohibited.
+2. The licensee may use the Software only in its original,
+unmodified form.
+3. All copies or substantial portions of the Software must
+remain unaltered and include this copyright notice and these terms of use.
+4. Use of the Software for projects not related to GW or
+MMB systems is strictly prohibited.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR
+A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. IN NO EVENT
+SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES, OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT, OR OTHERWISE, ARISING FROM, OUT OF, OR
+IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.

{gnserver-0.0.0.0.41 → gnserver-0.0.0.0.43}/PKG-INFO

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

{gnserver-0.0.0.0.41 → gnserver-0.0.0.0.43}/setup.py

@@ -5,7 +5,7 @@ filesName = 'GNServer'
 
 setup(
     name=name,
-    version='0.0.0.0.41',
+    version='0.0.0.0.43',
     author="KeyisB",
     author_email="keyisb.pip@gmail.com",
     description=name,

gnserver-0.0.0.0.41/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2024 KeyisB
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.