GNServer 0.0.0.0.33__tar.gz → 0.0.0.0.35__tar.gz

{gnserver-0.0.0.0.33 → gnserver-0.0.0.0.35}/GNServer/GNServer/__init__.py

@@ -36,7 +36,7 @@ DEALINGS IN THE SOFTWARE.
 from ._app import App
 
 from gnobjects.net.objects import Url, GNRequest, GNResponse, CommandObject, CORSObject, FileObject, TemplateObject, GNProtocol
-from gnobjects.net.objects import AllGNFastCommands as requests
+from gnobjects.net.objects import AllGNFastCommands as responses
 
 
 from ._client import AsyncClient

{gnserver-0.0.0.0.33 → gnserver-0.0.0.0.35}/GNServer/GNServer/_client.py

@@ -1,3 +1,4 @@
+import os
 import time
 import httpx
 import asyncio
@@ -75,13 +76,15 @@ class GNExceptions:
                     
 
 from KeyisBTools import TTLDict
-from KeyisBTools.cryptography.sign import S1
+from KeyisBTools.cryptography.sign import s2
+from KeyisBTools.cryptography import m1
+from KeyisBTools.cryptography.bytes import hash
+from KeyisBTools.models.serialization import serialize, deserialize
 from gnobjects.net.objects import GNRequest, GNResponse, Url
 
 from ._crt import crt_client
 
 
-s1 = S1()
 
 
 async def chain_async(first_item, rest: AsyncIterable) -> AsyncGenerator:
@@ -92,7 +95,7 @@ async def chain_async(first_item, rest: AsyncIterable) -> AsyncGenerator:
 
 
 class AsyncClient:
-    def __init__(self):
+    def __init__(self, server_key: Optional[Union[bytes, str]] = None):
         self.__dns_core__ipv4 = '51.250.85.38:52943'
         self.__dns_gn__ipv4: Optional[str] = None
 
@@ -105,11 +108,25 @@ class AsyncClient:
         self.__dns_client: Optional[AsyncClient] = None
         self._dns_cache: TTLDict = TTLDict()
 
-    async def getCoreDNS(self, domain: str, token: Optional[bytes] = None, use_cache: bool = True, keep_alive: bool = False) -> str:
+        if server_key:
+            if isinstance(server_key, bytes):
+                self.__server_key = server_key
+            else:
+                if not os.path.exists(server_key):
+                    raise Exception(f'Path not found: {server_key}')
+
+                self.__server_key = open(server_key, 'rb').read()
+        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
@@ -118,8 +135,10 @@ class AsyncClient:
             if self.__dns_client is None:
                 self.__dns_client = AsyncClient()
 
-            if token is not None:
-                payload = {'sign': {'alg': 'KeyisB-c-s-m1', 'data': s1.sign(token)}}
+            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}, 'data': data}
             else:
                 payload = None
 
@@ -144,7 +163,7 @@ class AsyncClient:
         except:
             raise GNExceptions.ConnectionError.dns.connection
 
-    async def getGNDNS(self, domain: str, token: Optional[bytes] = None, use_cache: bool = True, keep_alive: bool = False) -> str:
+    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:
@@ -160,8 +179,8 @@ class AsyncClient:
             if self.__dns_client is None:
                 self.__dns_client = AsyncClient()
             
-            if token is not None:
-                payload = {'sign': {'alg': 'KeyisB-c-s-m1', 'data': s1.sign(token)}}
+            if self.__server_key is not None:
+                payload = {'sign': {'alg': 'KeyisB-c-s-m1', 'data': s1.sign(self.__server_key)}}
             else:
                 payload = None
 
@@ -187,11 +206,11 @@ class AsyncClient:
         except:
             raise GNExceptions.ConnectionError.dns.connection
 
-    async def getDNS(self, domain: str, token: Optional[bytes] = None, use_cache: bool = True, keep_alive: bool = False):
+    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, token=token, use_cache=use_cache, keep_alive=keep_alive)
+            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

{gnserver-0.0.0.0.33 → gnserver-0.0.0.0.35}/GNServer/GNServer.egg-info/PKG-INFO

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

{gnserver-0.0.0.0.33 → gnserver-0.0.0.0.35}/PKG-INFO

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

{gnserver-0.0.0.0.33 → gnserver-0.0.0.0.35}/setup.py

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