GNServer 0.0.0.0.39__tar.gz → 0.0.0.0.41__tar.gz

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

@@ -136,7 +136,7 @@ async def chain_async(first_item, rest: AsyncIterable) -> AsyncGenerator:
 
 
 class AsyncClient:
-    def __init__(self, server_key: Optional[Union[bytes, str]] = None):
+    def __init__(self, domain: Optional[str] = None, server_key: Optional[Union[bytes, str]] = None):
         self.__dns_core__ipv4 = '51.250.85.38:52943'
         self.__dns_gn__ipv4: Optional[str] = None
 
@@ -149,6 +149,8 @@ class AsyncClient:
         self.__dns_client: Optional[AsyncClient] = None
         self._dns_cache: TTLDict = TTLDict()
 
+        self.__domain = domain
+
         if server_key:
             if isinstance(server_key, bytes):
                 self.__server_key = server_key
@@ -179,14 +181,14 @@ class 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}, 'data': data}
+                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 r1.command != 'ok':
-                raise GNExceptions.ConnectionError.dns.data
+            if not r1.command:
+                raise r1
 
             if r1.payload is None:
                 raise GNExceptions.ConnectionError.dns.data

{gnserver-0.0.0.0.39 → gnserver-0.0.0.0.41}/GNServer/GNServer/_func_params_validation.py

@@ -185,6 +185,8 @@ def _build_schema_from_params(func_params) -> Schema:
     names = set()
     has_kwargs = False
     for name, p in pmap.items():
+        if name == "request":
+            continue
         if p.kind == Parameter.VAR_KEYWORD:
             has_kwargs = True; continue
         if p.kind == Parameter.VAR_POSITIONAL:

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

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

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

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

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

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