GNServer 0.0.0.0.27__py3-none-any.whl → 0.0.0.0.29__py3-none-any.whl

GNServer/_app.py

@@ -45,105 +45,115 @@ console = logging.StreamHandler()
 console.setLevel(logging.INFO)
 console.setFormatter(logging.Formatter("[GNServer] %(name)s: %(levelname)s: %(message)s"))
 
-
+PayloadType = Optional[Union[int, str, list, tuple, dict]]
 
 class _BaseEXception(Exception):
-    def __init__(self, code: str, message=""):
+    def __init__(self, code: str, name="", message: Optional[str] = None, payload: PayloadType = None):
         self._code = code
+        self._name = name
         self._message = message
+        self._payload = payload
 
     def assembly(self):
         """
         Собирает ошибку в ответ типа `GNResponse`
         """
-        return gn.GNResponse(f'gn:error:{self._code}', payload={'msg': self._message})
+        payload: dict = {'name': self._name}
+
+        if self._message is not None:
+            payload['message'] = self._message
+
+        if self._payload is not None:
+            payload['payload'] = self._payload
+
+        return gn.GNResponse(f'gn:error:{self._code}', payload=payload)
 
 
 class GNExceptions:
     class UnprocessableEntity(_BaseEXception):
-        def __init__(self):
+        def __init__(self, message: Optional[str] = None, payload: PayloadType = None):
             """
             # Некорректные данные
             """
-            super().__init__('422', "Unprocessable Entity")
+            super().__init__('422', "Unprocessable Entity", message=message, payload=payload)
 
     class BadRequest(_BaseEXception):
-        def __init__(self):
+        def __init__(self, message: Optional[str] = None, payload: PayloadType = None):
             """
             # неправильного синтаксис url или параметров
             """
-            super().__init__('400', "Bad Request")
+            super().__init__('400', "Bad Request", message=message, payload=payload)
 
     class Forbidden(_BaseEXception):
-        def __init__(self):
+        def __init__(self, message: Optional[str] = None, payload: PayloadType = None):
             """
             # Доступ запрещён, даже при наличии авторизации
             """
-            super().__init__('403', "Forbidden")
+            super().__init__('403', "Forbidden", message=message, payload=payload)
 
 
     class NotFound(_BaseEXception):
-        def __init__(self):
+        def __init__(self, message: Optional[str] = None, payload: PayloadType = None):
             """
             # Ресурс не найден
             """
-            super().__init__('404', "Not Found")
+            super().__init__('404', "Not Found", message=message, payload=payload)
 
 
     class MethodNotAllowed(_BaseEXception):
-        def __init__(self):
+        def __init__(self, message: Optional[str] = None, payload: PayloadType = None):
             """
             # Метод запроса не поддерживается данным ресурсом
             """
-            super().__init__('405', "Method Not Allowed")
+            super().__init__('405', "Method Not Allowed", message=message, payload=payload)
 
 
     class Conflict(_BaseEXception):
-        def __init__(self):
+        def __init__(self, message: Optional[str] = None, payload: PayloadType = None):
             """
             # Конфликт состояния ресурса (например, дубликат)
             """
-            super().__init__('409', "Conflict")
+            super().__init__('409', "Conflict", message=message, payload=payload)
 
 
     class InternalServerError(_BaseEXception):
-        def __init__(self):
+        def __init__(self, message: Optional[str] = None, payload: PayloadType = None):
             """
             # Внутренняя ошибка сервера
             """
-            super().__init__('500', "Internal Server Error")
+            super().__init__('500', "Internal Server Error", message=message, payload=payload)
 
 
     class NotImplemented(_BaseEXception):
-        def __init__(self):
+        def __init__(self, message: Optional[str] = None, payload: PayloadType = None):
             """
             # Метод или функционал ещё не реализован
             """
-            super().__init__('501', "Not Implemented")
+            super().__init__('501', "Not Implemented", message=message, payload=payload)
 
 
     class BadGateway(_BaseEXception):
-        def __init__(self):
+        def __init__(self, message: Optional[str] = None, payload: PayloadType = None):
             """
             # Ошибка шлюза или прокси при обращении к апстриму
             """
-            super().__init__('502', "Bad Gateway")
+            super().__init__('502', "Bad Gateway", message=message, payload=payload)
 
 
     class ServiceUnavailable(_BaseEXception):
-        def __init__(self):
+        def __init__(self, message: Optional[str] = None, payload: PayloadType = None):
             """
             # Сервис временно недоступен
             """
-            super().__init__('503', "Service Unavailable")
+            super().__init__('503', "Service Unavailable", message=message, payload=payload)
 
 
     class GatewayTimeout(_BaseEXception):
-        def __init__(self):
+        def __init__(self, message: Optional[str] = None, payload: PayloadType = None):
             """
             # Таймаут при обращении к апстриму
             """
-            super().__init__('504', "Gateway Timeout")
+            super().__init__('504', "Gateway Timeout", message=message, payload=payload)
 
 def guess_type(filename: str) -> str:
     """
@@ -605,6 +615,9 @@ class App:
 
             if "request" in sig.parameters:
                 kw["request"] = request
+            
+            params = set(sig.parameters.keys())
+            kw = {k: v for k, v in kw.items() if k in params}
 
             if inspect.isasyncgenfunction(r.handler):
                 return r.handler(**kw)
@@ -671,7 +684,7 @@ class App:
         @self.post('/!gn-vm-host/ping', cors=gn.CORSObject(None))
         async def r_ping(request: gn.GNRequest):
             
-            if request.client.remote_addr != '127.0.0.1':
+            if request.client.ip != '127.0.0.1':
                 raise GNExceptions.Forbidden()
             return gn.GNResponse('ok', {'time': datetime.datetime.now(datetime.UTC).isoformat()})
 

{gnserver-0.0.0.0.27.dist-info → gnserver-0.0.0.0.29.dist-info}/METADATA

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

gnserver-0.0.0.0.29.dist-info/RECORD

@@ -0,0 +1,9 @@
+GNServer/___client.py,sha256=hmeUL2Vqp-BnwJeRcLZAaIfRNVxBrRRB_AFk9ofkei4,25459
+GNServer/__init__.py,sha256=V50sMYrrPdOGuI1iJm-SW7izhX-eggDH16AHvtIKjmM,1480
+GNServer/_app.py,sha256=FygOu5nl2A7bO5yUA-dAJeczPdfst3clCyOjJ23KSPw,32188
+GNServer/_client.py,sha256=uF5h5pu0noJ1uNWSdC-kxGvBUwUUmyyAQTt_altNJ_g,29861
+gnserver-0.0.0.0.29.dist-info/licenses/LICENSE,sha256=WH_t7dKZyWJ5Ld07eYIkUG4Tv6zZWXtAdsUqYAUesn0,1084
+gnserver-0.0.0.0.29.dist-info/METADATA,sha256=5q7zb4_0MdV4_COCwy-HiIm-SRu84GikJtjM6nauAOE,833
+gnserver-0.0.0.0.29.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+gnserver-0.0.0.0.29.dist-info/top_level.txt,sha256=-UOUBuD4u7Qkb1o5PdcwyA3kx8xCH2lwy0tJHi26Wb4,9
+gnserver-0.0.0.0.29.dist-info/RECORD,,

gnserver-0.0.0.0.27.dist-info/RECORD

@@ -1,9 +0,0 @@
-GNServer/___client.py,sha256=hmeUL2Vqp-BnwJeRcLZAaIfRNVxBrRRB_AFk9ofkei4,25459
-GNServer/__init__.py,sha256=V50sMYrrPdOGuI1iJm-SW7izhX-eggDH16AHvtIKjmM,1480
-GNServer/_app.py,sha256=WYK16u-G6TDEMBa3MVaJP3-HzTh4NIcmzsyOdxaSsm0,30664
-GNServer/_client.py,sha256=uF5h5pu0noJ1uNWSdC-kxGvBUwUUmyyAQTt_altNJ_g,29861
-gnserver-0.0.0.0.27.dist-info/licenses/LICENSE,sha256=WH_t7dKZyWJ5Ld07eYIkUG4Tv6zZWXtAdsUqYAUesn0,1084
-gnserver-0.0.0.0.27.dist-info/METADATA,sha256=8pB4A-duYiWVMfoKmSEE7zUs1rfo8gaF5fe1yszZfXE,833
-gnserver-0.0.0.0.27.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-gnserver-0.0.0.0.27.dist-info/top_level.txt,sha256=-UOUBuD4u7Qkb1o5PdcwyA3kx8xCH2lwy0tJHi26Wb4,9
-gnserver-0.0.0.0.27.dist-info/RECORD,,