GNServer 0.0.0.0.39__py3-none-any.whl → 0.0.0.0.41__py3-none-any.whl

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/_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.dist-info → gnserver-0.0.0.0.41.dist-info}/METADATA

@@ -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.dist-info → gnserver-0.0.0.0.41.dist-info}/RECORD

@@ -1,13 +1,13 @@
 GNServer/__init__.py,sha256=6CMCZlkBO74PW8i8DAri5xz2fYM9EyPH8vdsLYBMmOo,1560
 GNServer/_app.py,sha256=nvK_9w1YtZfE-Xh0K-ebkvVINAx4Fir3NSw7Lbwyaz4,18874
-GNServer/_client.py,sha256=H209KSvCnoJ3qXQFTYuzQSecEV-3qQv5JcHeIfT0ypc,32911
+GNServer/_client.py,sha256=tXLY-K-G4grsHZDJsZ_EP8HArC7AoNEO4ZPS8Q_6h_A,32961
 GNServer/_cors_resolver.py,sha256=U9IFGN7vpVsEM2smhuf5QGj8vYgs7HeFQwDdzWVVy9c,4832
 GNServer/_crt.py,sha256=SOmyX7zBiCY9EhVSekksQtBHgTIZVvdqNZ8Ni-E5Zow,1390
-GNServer/_func_params_validation.py,sha256=2Pkv4g8Ln5Csj_2LOjKmJO-Y7EdiyfXmM6iv7_Vlt9A,11359
+GNServer/_func_params_validation.py,sha256=pDXRzPVTdPnDHFMMmKd014SConBjFOuaLeJTY0vldlM,11412
 GNServer/_routes.py,sha256=bJnmQ8uEhPVQgy2tTqE5TEIM8aFXV-lVI7c2nG0rQwk,3384
 GNServer/_template_resolver.py,sha256=vdJYb_7PjIeTWq-Clr7jyj7QIvPBxplU7EqeOuMJ64c,1409
-gnserver-0.0.0.0.39.dist-info/licenses/LICENSE,sha256=WH_t7dKZyWJ5Ld07eYIkUG4Tv6zZWXtAdsUqYAUesn0,1084
-gnserver-0.0.0.0.39.dist-info/METADATA,sha256=Ue1W90cZttBNM2BD8rLCKavHb5i9n5bzs1MOLDe4f5w,830
-gnserver-0.0.0.0.39.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-gnserver-0.0.0.0.39.dist-info/top_level.txt,sha256=-UOUBuD4u7Qkb1o5PdcwyA3kx8xCH2lwy0tJHi26Wb4,9
-gnserver-0.0.0.0.39.dist-info/RECORD,,
+gnserver-0.0.0.0.41.dist-info/licenses/LICENSE,sha256=WH_t7dKZyWJ5Ld07eYIkUG4Tv6zZWXtAdsUqYAUesn0,1084
+gnserver-0.0.0.0.41.dist-info/METADATA,sha256=8zSWXk_DeqshZElKzbbEL804XTYuELRj2CP4bJE7mxk,830
+gnserver-0.0.0.0.41.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+gnserver-0.0.0.0.41.dist-info/top_level.txt,sha256=-UOUBuD4u7Qkb1o5PdcwyA3kx8xCH2lwy0tJHi26Wb4,9
+gnserver-0.0.0.0.41.dist-info/RECORD,,