GNServer 0.0.0.0.19__tar.gz → 0.0.0.0.21__tar.gz

{gnserver-0.0.0.0.19 → gnserver-0.0.0.0.21}/GNServer/GNServer/__init__.py

@@ -29,7 +29,7 @@ IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 """
 
-from ._app import App
+from ._app import App, GNExceptions
 from KeyisBClient.gn import GNRequest, GNResponse, CORSObject, FileObject, TemplateObject
 
 

{gnserver-0.0.0.0.19 → gnserver-0.0.0.0.21}/GNServer/GNServer/_app.py

@@ -46,9 +46,103 @@ 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):
+        """
+        Собирает ошибку в ответ типа `GNResponse`
+        """
+        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):
+            """
+            # неправильного синтаксис url или параметров
+            """
+            super().__init__('400', "Bad Request")
+
+    class Forbidden(_BaseEXception):
+        def __init__(self):
+            """
+            # Доступ запрещён, даже при наличии авторизации
+            """
+            super().__init__('403', "Forbidden")
+
+
+    class NotFound(_BaseEXception):
+        def __init__(self):
+            """
+            # Ресурс не найден
+            """
+            super().__init__('404', "Not Found")
+
+
+    class MethodNotAllowed(_BaseEXception):
+        def __init__(self):
+            """
+            # Метод запроса не поддерживается данным ресурсом
+            """
+            super().__init__('405', "Method Not Allowed")
+
+
+    class Conflict(_BaseEXception):
+        def __init__(self):
+            """
+            # Конфликт состояния ресурса (например, дубликат)
+            """
+            super().__init__('409', "Conflict")
+
+
+    class InternalServerError(_BaseEXception):
+        def __init__(self):
+            """
+            # Внутренняя ошибка сервера
+            """
+            super().__init__('500', "Internal Server Error")
+
+
+    class NotImplemented(_BaseEXception):
+        def __init__(self):
+            """
+            # Метод или функционал ещё не реализован
+            """
+            super().__init__('501', "Not Implemented")
+
+
+    class BadGateway(_BaseEXception):
+        def __init__(self):
+            """
+            # Ошибка шлюза или прокси при обращении к апстриму
+            """
+            super().__init__('502', "Bad Gateway")
+
+
+    class ServiceUnavailable(_BaseEXception):
+        def __init__(self):
+            """
+            # Сервис временно недоступен
+            """
+            super().__init__('503', "Service Unavailable")
+
+
+    class GatewayTimeout(_BaseEXception):
+        def __init__(self):
+            """
+            # Таймаут при обращении к апстриму
+            """
+            super().__init__('504', "Gateway Timeout")
 
 def guess_type(filename: str) -> str:
     """
@@ -169,7 +263,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 +485,7 @@ 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
 
@@ -430,8 +525,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
@@ -501,8 +630,8 @@ class App:
                 )
 
         if allowed:
-            return gn.GNResponse("gn:backend:405", {'error': 'Method Not Allowed'})
-        return gn.GNResponse("gn:backend:404", {'error': 'Not Found'})
+            raise GNExceptions.MethodNotAllowed()
+        raise GNExceptions.NotFound()
 
 
     def fastFile(self, path: str, file_path: str, cors: Optional[gn.CORSObject] = None, template: Optional[gn.TemplateObject] = None, payload: Optional[dict] = None):
@@ -513,7 +642,7 @@ class App:
                 file_path = file_path[:-1]
                 
             if not os.path.isfile(file_path):
-                return gn.GNResponse('gn:backend:404', cors=cors)
+                raise GNExceptions.NotFound()
 
             fileObject = gn.FileObject(file_path, template)
             return gn.GNResponse('ok', payload=payload, files=fileObject, cors=cors)
@@ -528,7 +657,7 @@ class App:
                 file_path = file_path[:-1]
                 
             if not os.path.isfile(file_path):
-                return gn.GNResponse('gn:backend:404', cors=cors)
+                raise GNExceptions.NotFound()
             
             fileObject = gn.FileObject(file_path, template)
             return gn.GNResponse('ok', payload=payload, files=fileObject, cors=cors)
@@ -540,8 +669,8 @@ class App:
         @self.post('/!gn-vm-host/ping', cors=gn.CORSObject(None))
         async def r_ping(request: gn.GNRequest):
             
-            if request._client_ip != '127.0.0.1':
-                return gn.GNResponse('gn:backend:403', {'error': 'Forbidden'})
+            if request.client.remote_addr != '127.0.0.1':
+                raise GNExceptions.Forbidden()
             return gn.GNResponse('ok', {'time': datetime.datetime.now(datetime.UTC).isoformat()})
 
 
@@ -641,7 +770,7 @@ class App:
 
         async def _handle_request(self, request: gn.GNRequest, mode: int):
 
-            request._client_ip = self._quic._network_paths[0].addr[0]
+            request.client._data['remote_addr'] = self._quic._network_paths[0].addr[0]
 
             try:
                 
@@ -667,12 +796,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()
 
@@ -707,6 +841,9 @@ class App:
         cfg.load_cert_chain(cert_path, key_path)
 
         async def _main():
+            
+            await self.dispatchEvent('before-run')
+
             await serve(
                 host,
                 port,
@@ -718,6 +855,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.19 → gnserver-0.0.0.0.21}/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.19 → gnserver-0.0.0.0.21}/GNServer/GNServer.egg-info/PKG-INFO

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

{gnserver-0.0.0.0.19 → gnserver-0.0.0.0.21}/PKG-INFO

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

{gnserver-0.0.0.0.19 → gnserver-0.0.0.0.21}/setup.py

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