GNServer 0.0.0.0.18__tar.gz → 0.0.0.0.20__tar.gz

{gnserver-0.0.0.0.18 → gnserver-0.0.0.0.20}/GNServer/GNServer/_app.py

@@ -46,7 +46,23 @@ console.setFormatter(logging.Formatter("[GNServer] %(name)s: %(levelname)s: %(me
 
 
 
+class _BaseEXception(Exception):
+    def __init__(self, code: str, message=""):
+        self._code = code
+        self._message = message
 
+    def assembly(self):
+        return gn.GNResponse(f'gn:error:{self._code}', payload={'msg': self._message})
+
+
+class GNExceptions:
+    class UnprocessableEntity(_BaseEXception):
+        def __init__(self):
+            super().__init__('422', "Unprocessable Entity")
+
+    class BadRequest(_BaseEXception):
+        def __init__(self):
+            super().__init__('400', "Bad Request")
 
 
 
@@ -169,7 +185,7 @@ def resolve_cors(origin_url: str, rules: list[str]) -> bool:
       - "*.example.com"    -> wildcard (одна метка)
       - "**.example.com"   -> globstar (0+ меток)
       - "pages.*.core.gn"  -> смешанное
-      - "https://*.site.tld" -> с проверкой схемы
+      - "gn://*.site.tld" -> с проверкой схемы
       - "!<regex>"         -> полное соответствие по regex к origin_url
     """
 
@@ -391,6 +407,9 @@ class App:
     def __init__(self):
         self._routes: List[Route] = []
         self._cors: Optional[gn.CORSObject] = None
+        self._events: Dict[str, Dict[str, Union[str, Callable]]] = {}
+
+        self.domain: str = None
 
     def route(self, method: str, path: str, cors: Optional[gn.CORSObject] = None):
         if path == '/':
@@ -428,8 +447,42 @@ class App:
         self._cors = cors
 
 
+    def addEventListener(self, name: str):
+        def decorator(fn: Callable[Optional[dict], Any]):
+            events = self._events.get(name, [])
+            events.append({
+                'func': fn,
+                'async': inspect.iscoroutinefunction(fn),
+                'parameters': inspect.signature(fn).parameters
+                })
+            
+            return fn
+        return decorator
+    
+    async def dispatchEvent(self, name: str, payload: Optional[str] = None) -> None:
+        data_list = self._events.get(name, None)
+        if data_list:
+            for data in data_list:
+                func: Callable = data['func']
+                is_async = data['async']
+
+                if not is_async:
+                    if payload in data['parameters']:
+                        func(payload=payload)
+                    else:
+                        func()
+                else:
+                    if payload in data['parameters']:
+                        await func(payload=payload)
+                    else:
+                        await func()
+
+        
+    
+    
+
 
-    async def dispatch(
+    async def dispatchRequest(
         self, request: gn.GNRequest
     ) -> Union[gn.GNResponse, AsyncGenerator[gn.GNResponse, None]]:
         path    = request.url.path
@@ -665,12 +718,17 @@ class App:
                 logger.debug(f'Отправлен на сервер ответ -> {response.command} {response.payload if response.payload and len((response.payload)) < 200 else ''}')
                 self.transmit()
             except Exception as e:
-                logger.error('GNServer: error\n'  + traceback.format_exc())
+                if e.__qualname__.startswith("GNExceptions."):
+                    e: GNExceptions.UnprocessableEntity = e
+                    r = e.assembly()
+                    return r
+                else:
+                    logger.error('GNServer: error\n'  + traceback.format_exc())
 
-                response = gn.GNResponse('gn:backend:500')
-                self._quic.send_stream_data(request.stream_id, response.serialize(mode), end_stream=True)
-                self.transmit()
-        
+                    response = gn.GNResponse('gn:backend:500')
+                    self._quic.send_stream_data(request.stream_id, response.serialize(mode), end_stream=True)
+                    self.transmit()
+            
         async def resolve_response(self, response: gn.GNResponse) -> gn.GNResponse:
             await response.assembly()
 
@@ -683,16 +741,20 @@ class App:
 
     def run(
         self,
-        host: str,
+        domain: str,
         port: int,
         cert_path: str,
         key_path: str,
         *,
+        host: Optional[str] = '0.0.0.0',
         idle_timeout: float = 20.0,
         wait: bool = True,
         run: Optional[Callable] = None
     ):
 
+        self.domain = domain
+
+
         self._init_sys_routes()
 
         cfg = QuicConfiguration(
@@ -701,6 +763,9 @@ class App:
         cfg.load_cert_chain(cert_path, key_path)
 
         async def _main():
+            
+            await self.dispatchEvent('before-run')
+
             await serve(
                 host,
                 port,
@@ -712,6 +777,9 @@ class App:
             if run is not None:
                 await run()
 
+            await self.dispatchEvent('run')
+            
+
 
             if wait:
                 await asyncio.Event().wait()

{gnserver-0.0.0.0.18 → gnserver-0.0.0.0.20}/GNServer/GNServer/_client.py

@@ -110,7 +110,6 @@ class AsyncClient:
         self.__dns_core__ipv4 = '51.250.85.38:52943'
         self.__dns_gn__ipv4 = None
 
-        self.__user = {}
         self.__current_session = {}
         self.__request_callbacks = {}
         self.__response_callbacks = {}

{gnserver-0.0.0.0.18 → gnserver-0.0.0.0.20}/GNServer/GNServer.egg-info/PKG-INFO

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

{gnserver-0.0.0.0.18 → gnserver-0.0.0.0.20}/PKG-INFO

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

{gnserver-0.0.0.0.18 → gnserver-0.0.0.0.20}/setup.py

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