GNServer 0.0.0.0.12__py3-none-any.whl → 0.0.0.0.13__py3-none-any.whl

GNServer/_app.py

@@ -75,6 +75,7 @@ def guess_type(filename: str) -> str:
         "webp": "image/webp",
         "svg": "image/svg+xml",
         "avif": "image/avif",
+        "ico": "image/x-icon",
 
         # 🔹 Видео (современные форматы)
         "mp4": "video/mp4",
@@ -171,6 +172,14 @@ def resolve_cors(origin_url: str, rules: list[str]) -> bool:
       - "https://*.site.tld" -> с проверкой схемы
       - "!<regex>"         -> полное соответствие по regex к origin_url
     """
+
+    if origin_url == 'gn:proxy:sys':
+        return True
+
+
+
+
+
     origin = origin_url.rstrip("/")
     pu = urlparse(origin)
     scheme = (pu.scheme or "").lower()
@@ -430,7 +439,7 @@ class App:
                     return gn.GNResponse("gn:backend:801", {'error': 'Cors error. Route has cors but request has no origin url.'})
                 if not resolve_cors(request._origin, r.cors._allow_origins):
                     return gn.GNResponse("gn:backend:802", {'error': 'Cors error: origin'})
-                if request.method not in r.cors._allow_methods:
+                if request.method not in r.cors._allow_methods and '*' not in r.cors._allow_methods:
                     return gn.GNResponse("gn:backend:803", {'error': 'Cors error: method'})
 
             sig = inspect.signature(r.handler)
@@ -457,12 +466,14 @@ class App:
 
             result = await r.handler(**kw)
             if isinstance(result, gn.GNResponse):
+                if result._cors is None:
+                    result._cors = self._cors
                 if result._cors is not None and result._cors != r.cors:
                     if request._origin is None:
                         return gn.GNResponse("gn:backend:801", {'error': 'Cors error. Route has cors but request has no origin url.'})
-                    if not resolve_cors(request._origin, r.cors._allow_origins):
+                    if not resolve_cors(request._origin, result._cors._allow_origins):
                         return gn.GNResponse("gn:backend:802", {'error': 'Cors error: origin'})
-                    if request.method not in r.cors._allow_methods:
+                    if request.method not in result._cors._allow_methods and '*' not in result._cors._allow_methods:
                         return gn.GNResponse("gn:backend:803", {'error': 'Cors error: method'})
                 return result
             else:
@@ -542,7 +553,7 @@ class App:
                 
                 if not stream: # если не стрим, то ждем конец quic стрима и запускаем обработку ответа
                     if event.end_stream:
-                        request = gn.GNRequest.deserialize(buf, 2)
+                        request = gn.GNRequest.deserialize(buf, 1)
                         # request.stream_id = event.stream_id
                         # loop = asyncio.get_event_loop()
                         # request.fut = loop.create_future()
@@ -567,7 +578,7 @@ class App:
                 del buf[:lenght]
 
                 # формируем запрос
-                request = gn.GNRequest.deserialize(data, 2)
+                request = gn.GNRequest.deserialize(data, 1)
 
                 logger.debug(request, f'event.stream_id -> {event.stream_id}')
 
@@ -615,32 +626,29 @@ class App:
                     async for chunk in response:  # type: ignore[misc]
                         chunk._stream = True
                         chunk = await self.resolve_response(chunk)
-                        self._quic.send_stream_data(request.stream_id, chunk.serialize(3), end_stream=False)
+                        self._quic.send_stream_data(request.stream_id, chunk.serialize(1), end_stream=False)
                         self.transmit()
                         
                     l = gn.GNResponse('gn:end-stream')
                     l._stream = True
                     l = self.resolve_response(l)
-                    self._quic.send_stream_data(request.stream_id, l.serialize(3), end_stream=True)
+                    self._quic.send_stream_data(request.stream_id, l.serialize(1), end_stream=True)
                     self.transmit()
                     return
 
 
                 response = await self.resolve_response(response)
-                self._quic.send_stream_data(request.stream_id, response.serialize(3), end_stream=True)
+                self._quic.send_stream_data(request.stream_id, response.serialize(1), end_stream=True)
                 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())
 
                 response = gn.GNResponse('gn:backend:500')
-                self._quic.send_stream_data(request.stream_id, response.serialize(3), end_stream=True)
+                self._quic.send_stream_data(request.stream_id, response.serialize(1), end_stream=True)
                 self.transmit()
         
         async def resolve_response(self, response: gn.GNResponse) -> gn.GNResponse:
-            if response._cors is None:
-                response._cors = self._api._cors
-            
             await response.assembly()
 
             return response

{gnserver-0.0.0.0.12.dist-info → gnserver-0.0.0.0.13.dist-info}/METADATA

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

gnserver-0.0.0.0.13.dist-info/RECORD

@@ -0,0 +1,7 @@
+GNServer/__init__.py,sha256=GLKkKL03phIhxRLpl2X1ibwTw7BvnMMOwKgRD578RaU,1404
+GNServer/_app.py,sha256=NiINMe7Vv2F1H-m1G6ovOfbvGJgmGGQdTHCc8v_igJI,24201
+gnserver-0.0.0.0.13.dist-info/licenses/LICENSE,sha256=WH_t7dKZyWJ5Ld07eYIkUG4Tv6zZWXtAdsUqYAUesn0,1084
+gnserver-0.0.0.0.13.dist-info/METADATA,sha256=Eswpz48CSM0tezRIZGpkU_1Y7aEg1YDDFNNlQduVZJk,805
+gnserver-0.0.0.0.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+gnserver-0.0.0.0.13.dist-info/top_level.txt,sha256=-UOUBuD4u7Qkb1o5PdcwyA3kx8xCH2lwy0tJHi26Wb4,9
+gnserver-0.0.0.0.13.dist-info/RECORD,,

gnserver-0.0.0.0.12.dist-info/RECORD

@@ -1,7 +0,0 @@
-GNServer/__init__.py,sha256=GLKkKL03phIhxRLpl2X1ibwTw7BvnMMOwKgRD578RaU,1404
-GNServer/_app.py,sha256=t4h0RFttUAGufXm2moYsWLju52NnghisrK1d4RkSmHs,24029
-gnserver-0.0.0.0.12.dist-info/licenses/LICENSE,sha256=WH_t7dKZyWJ5Ld07eYIkUG4Tv6zZWXtAdsUqYAUesn0,1084
-gnserver-0.0.0.0.12.dist-info/METADATA,sha256=U17Yx7wt5IXf_sTaDuVLFXwcFHrHQdW2X_P7KpCfsU8,805
-gnserver-0.0.0.0.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-gnserver-0.0.0.0.12.dist-info/top_level.txt,sha256=-UOUBuD4u7Qkb1o5PdcwyA3kx8xCH2lwy0tJHi26Wb4,9
-gnserver-0.0.0.0.12.dist-info/RECORD,,