GNServer 0.0.0.0.58__tar.gz → 0.0.0.0.60__tar.gz

{gnserver-0.0.0.0.58 → gnserver-0.0.0.0.60}/GNServer/GNServer/__init__.py

@@ -33,10 +33,26 @@ IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 """
 
+__all__ = [
+    'App',
+    'Url',
+    'GNRequest',
+    'GNResponse',
+    'CommandObject',
+    'CORSObject',
+    'FileObject',
+    'TemplateObject',
+    'GNTransportProtocol',
+    'AsyncClient',
+    'response'
+]
+
+
 from ._app import App
 
 from gnobjects.net.objects import Url, GNRequest, GNResponse, CommandObject, CORSObject, FileObject, TemplateObject, GNTransportProtocol
-from gnobjects.net.objects import AllGNFastCommands as responses
+from gnobjects.net.objects import AllGNFastCommands as response
 
+responses = response
 
 from ._client import AsyncClient

{gnserver-0.0.0.0.58 → gnserver-0.0.0.0.60}/GNServer/GNServer/_app.py

@@ -249,6 +249,8 @@ class App:
                 return r.handler(**kw)
 
             result = await r.handler(**kw)
+            if result is None:
+                result = AllGNFastCommands.ok()
             if isinstance(result, GNResponse):
                 if r.cors is None:
                     if result._cors is None:
@@ -359,7 +361,7 @@ class App:
                             raise Exception('Не удалось расшифровать от KDC')
 
                         request.stream_id = stream_id   # type: ignore
-                        logger.debug(f'Request: {request.method} {request.url}')
+                        logger.debug(f'[<] Request: {request.method} {request.url}')
                         asyncio.create_task(self._handle_request(request, mode))
 
                         self._buffer.pop(event.stream_id, None)
@@ -457,7 +459,7 @@ class App:
             await response.assembly()
 
             
-            logger.debug(f'Response: {request.method} {request.url} -> {response.command} {response.payload if len(str(response.payload)) < 256 else ''}')
+            logger.debug(f'[>] Response: {request.method} {request.url} -> {response.command} {response.payload if len(str(response.payload)) < 256 else ''}')
             
             blob = response.serialize(mode)
 
@@ -542,4 +544,4 @@ class App:
                 cert_path=cert_path,
                 key_path=key_path,
                 host=host
-            )
+            )

{gnserver-0.0.0.0.58 → gnserver-0.0.0.0.60}/GNServer/GNServer/_client.py

@@ -92,7 +92,7 @@ from .models import KDCObject
 
 import logging
 
-logger = logging.getLogger("GNAsyncClient")
+logger = logging.getLogger("GNClient")
 logger.setLevel(logging.DEBUG)
 
 console = logging.StreamHandler(sys.stdout)
@@ -138,7 +138,7 @@ def devLog(request: GNRequest, point: str, level: int, log: str):
 
 
 
-
+_sys_s_mode = 2
 
 async def chain_async(first_item, rest: AsyncIterable) -> AsyncGenerator:
     yield first_item
@@ -189,15 +189,11 @@ class AsyncClient:
   
     async def connect(self, request: GNRequest, restart_connection: bool = False, reconnect_wait: float = 10, keep_alive: bool = True) -> 'QuicClient':
         domain = request.url.hostname
-        devLog(request, '1.2.1', 10, f'Connect to {domain}: restart_connection={restart_connection}, reconnect_wait={reconnect_wait}, keep_alive={keep_alive}')
         if not restart_connection and domain in self._active_connections:
             c = self._active_connections[domain]
-            devLog(request, '1.2.2', 10, f'Connection to {domain} found: status={c.status}')
             if c.status == 'connecting':
-                devLog(request, '1.2.3', 10, f'Waiting for connection to {domain}...')
                 try:
                     await asyncio.wait_for(c.connect_future, reconnect_wait)
-                    devLog(request, '1.2.4', 10, f'Connected to {domain}: status={c.status}')
                     if c.status == 'active':
                         return c
                     elif c.status == 'connecting': # если очень долго подключаемся, то кидаем ошибку
@@ -206,7 +202,6 @@ class AsyncClient:
                     elif c.status == 'disconnect':
                         raise GNExceptions.ConnectionError.client.connection
                 except:
-                    devLog(request, '1.2.5', 10, f'Connection to {domain} failed or timed out.')
                     await self.disconnect(domain)
                         
             else:
@@ -216,9 +211,7 @@ class AsyncClient:
         c.status = 'connecting'
         self._active_connections[domain] = c
 
-        devLog(request, '1.2.6', 10, f'Connecting to {domain}...')
         data = await self.getDNS(domain, raise_errors=True)
-        devLog(request, '1.2.7', 10, f'Got DNS for {domain}: {data}')
 
         data = data.split(':')
 
@@ -229,7 +222,6 @@ class AsyncClient:
 
         c._disconnect_signal = f # type: ignore
         c._domain = domain # type: ignore
-        devLog(request, '1.2.8', 10, f'Creating QuicClient for {domain}...')
         await c.connect(data[0], int(data[1]), keep_alive=keep_alive)
         await c.connect_future
 
@@ -533,7 +525,7 @@ class RawQuicClient(QuicConnectionProtocol):
                     del buf[:lenght]
                         
                     
-                    r = GNResponse.deserialize(data, 2)
+                    r = GNResponse.deserialize(data, _sys_s_mode)
                     handler.put_nowait(r)
                     if event.end_stream:
                         handler.put_nowait(None)
@@ -606,7 +598,7 @@ class RawQuicClient(QuicConnectionProtocol):
         await self.ensure_sys_stream()
         if response:
             msg_id = next(self._sys_id_gen)
-            blob = request.serialize(2)
+            blob = request.serialize(_sys_s_mode)
             payload = (
                 msg_id.to_bytes(8, "little") + len(blob).to_bytes(4, "little") + blob
             )
@@ -622,7 +614,7 @@ class RawQuicClient(QuicConnectionProtocol):
 
     async def request(self, request: Union[GNRequest, AsyncGenerator[GNRequest, Any]]):
         if isinstance(request, GNRequest):
-            blob = request.serialize(2)
+            blob = request.serialize(_sys_s_mode)
 
             if self.quicClient._client._kdc is not None:
                 blob = self.quicClient._client._kdc.encode(request.url.hostname, blob)
@@ -640,7 +632,7 @@ class RawQuicClient(QuicConnectionProtocol):
                 data, domain = self.quicClient._client._kdc.decode(data)
 
             if data is not None:
-                r = GNResponse.deserialize(data, 2)
+                r = GNResponse.deserialize(data, _sys_s_mode)
                 return r
             else:
                 return GNResponse('gn:client:0')
@@ -653,7 +645,7 @@ class RawQuicClient(QuicConnectionProtocol):
                 _last = None
                 async for req in request:
                     _last = req
-                    blob = req.serialize(2)
+                    blob = req.serialize(_sys_s_mode)
                     self._enqueue(sid, blob, False, False)
 
 
@@ -664,7 +656,7 @@ class RawQuicClient(QuicConnectionProtocol):
 
                 _last.setPayload(None)
                 _last.setMethod('gn:end-stream')
-                blob = _last.serialize(2)
+                blob = _last.serialize(_sys_s_mode)
                 self._enqueue(sid, blob, True, False)
                 self._schedule_flush()
             
@@ -677,7 +669,7 @@ class RawQuicClient(QuicConnectionProtocol):
     
     async def requestStream(self, request: Union[GNRequest, AsyncGenerator[GNRequest, Any]]) -> asyncio.Queue[GNResponse]:
         if isinstance(request, GNRequest):
-            blob = request.serialize(2)
+            blob = request.serialize(_sys_s_mode)
             sid = self._quic.get_next_available_stream_id()
             self._enqueue(sid, blob, False, False)
             self._schedule_flush()
@@ -694,7 +686,7 @@ class RawQuicClient(QuicConnectionProtocol):
                 _last = None
                 async for req in request:
                     _last = req
-                    blob = req.serialize(2)
+                    blob = req.serialize(_sys_s_mode)
                     self._enqueue(sid, blob, False, False)
 
 
@@ -705,7 +697,7 @@ class RawQuicClient(QuicConnectionProtocol):
 
                 _last.setPayload(None)
                 _last.setMethod('gn:end-stream')
-                blob = _last.serialize(2)
+                blob = _last.serialize(_sys_s_mode)
                 self._enqueue(sid, blob, True, False)
                 self._schedule_flush()
             

{gnserver-0.0.0.0.58 → gnserver-0.0.0.0.60}/GNServer/GNServer/models.py

@@ -28,11 +28,11 @@ class KDCObject:
 
     async def init(self, servers_keys: Optional[Dict[str, bytes]] = None): # type: ignore
 
-
-        self._servers_keys[self._kdc_domain] = self._kdc_key
-        h = hash3(self._kdc_domain.encode())
-        self._servers_keys_hash_domain[h] = self._kdc_domain
-        self._servers_keys_domain_hash[self._kdc_domain] = h
+        if self._kdc_domain not in self._servers_keys:
+            self._servers_keys[self._kdc_domain] = self._kdc_key
+            h = hash3(self._kdc_domain.encode())
+            self._servers_keys_hash_domain[h] = self._kdc_domain
+            self._servers_keys_domain_hash[self._kdc_domain] = h
 
 
         if servers_keys is not None:
@@ -76,14 +76,15 @@ class KDCObject:
         return request[:8] + sig + self._domain_hash + data
 
     def decode(self, response: bytes):
+        r = response
         if len(response) < 8+164+64:
-            return response, None
+            return r, None
         h = response[:8]
         response = response[8:]
         sig, domain_h, data = response[:164], response[164:164+64], response[164+64:]
         if domain_h not in self._servers_keys_hash_domain:
             print(domain_h, 'not in', self._servers_keys_hash_domain)
-            return response, None
+            return r, None
         d = self._servers_keys_hash_domain[domain_h]
         key = self._servers_keys[d]
         if not s2.verify(key, sig):

{gnserver-0.0.0.0.58 → gnserver-0.0.0.0.60}/GNServer/GNServer.egg-info/PKG-INFO

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

{gnserver-0.0.0.0.58 → gnserver-0.0.0.0.60}/PKG-INFO

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

{gnserver-0.0.0.0.58 → gnserver-0.0.0.0.60}/setup.py

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