GNServer 0.0.0.0.5__py3-none-any.whl → 0.0.0.0.7__py3-none-any.whl

GNServer/__init__.py

@@ -30,7 +30,7 @@ DEALINGS IN THE SOFTWARE.
 """
 
 from ._app import App
-from KeyisBClient.gn import GNRequest, GNResponse
+from KeyisBClient.gn import GNRequest, GNResponse, CORSObject
 
 
 

GNServer/_app.py

@@ -44,6 +44,12 @@ console = logging.StreamHandler()
 console.setLevel(logging.INFO)
 console.setFormatter(logging.Formatter("[GNServer] %(name)s: %(levelname)s: %(message)s"))
 
+
+
+
+
+
+
 def guess_type(filename: str) -> str:
     """
     Возвращает актуальный MIME-тип по расширению файла.
@@ -112,6 +118,7 @@ class Route:
     param_types: dict[str, Callable[[str], Any]]
     handler: Callable[..., Any]
     name: str
+    cors: Optional[gn.CORSObject]
 
 _PARAM_REGEX: dict[str, str] = {
     "str":   r"[^/]+",
@@ -193,8 +200,9 @@ def _ensure_async(fn: Callable[..., Any]) -> Callable[..., Any]:
 class App:
     def __init__(self):
         self._routes: List[Route] = []
+        self._cors: Optional[gn.CORSObject] = None
 
-    def route(self, method: str, path: str, *, name: str | None = None):
+    def route(self, method: str, path: str, cors: Optional[gn.CORSObject] = None):
         def decorator(fn: Callable[..., Any]):
             regex, param_types = _compile_path(path)
             self._routes.append(
@@ -204,26 +212,29 @@ class App:
                     regex,
                     param_types,
                     _ensure_async(fn),
-                    name or fn.__name__,
+                    fn.__name__,
+                    cors
                 )
             )
             return fn
         return decorator
 
-    def get(self, path: str, *, name: str | None = None):
-        return self.route("GET", path, name=name)
+    def get(self, path: str, *, cors: Optional[gn.CORSObject] = None):
+        return self.route("GET", path, cors)
+
+    def post(self, path: str, *, cors: Optional[gn.CORSObject] = None):
+        return self.route("POST", path, cors)
 
-    def post(self, path: str, *, name: str | None = None):
-        return self.route("POST", path, name=name)
+    def put(self, path: str, *, cors: Optional[gn.CORSObject] = None):
+        return self.route("PUT", path, cors)
 
-    def put(self, path: str, *, name: str | None = None):
-        return self.route("PUT", path, name=name)
+    def delete(self, path: str, *, cors: Optional[gn.CORSObject] = None):
+        return self.route("DELETE", path, cors)
 
-    def delete(self, path: str, *, name: str | None = None):
-        return self.route("DELETE", path, name=name)
+    
+    def setRouteCors(self, cors: Optional[gn.CORSObject] = None):
+        self._cors = cors
 
-    def custom(self, method: str, path: str, *, name: str | None = None):
-        return self.route(method, path, name=name)
 
 
     async def dispatch(
@@ -277,18 +288,38 @@ class App:
         return gn.GNResponse("gn:backend:404", {'error': 'Not Found'})
 
 
-    def static(self, path: str, dir_path: str):
+    def fastFile(self, path: str, file_path: str, cors: Optional[gn.CORSObject] = None):
+        @self.get(path)
+        async def r_static(path: str):
+            nonlocal file_path
+            if file_path.endswith('/'):
+                file_path = file_path[:-1]
+                
+            if not os.path.isfile(file_path):
+                return gn.GNResponse('gn:backend:404', cors=cors)
+
+            mime_type = guess_type(file_path.split('/')[-1])
+            async with aiofiles.open(file_path, "rb") as f:
+                data = await f.read()
+
+            return gn.GNResponse('ok', {'files': [{'mime-type': mime_type, 'data': data}]}, cors=cors)
+
+    def static(self, path: str, dir_path: str, cors: Optional[gn.CORSObject] = None):
         @self.get(f"{path}/{{_path:path}}")
         async def r_static(_path: str):
             file_path = os.path.join(dir_path, _path)
+            
+            if file_path.endswith('/'):
+                file_path = file_path[:-1]
+                
             if not os.path.isfile(file_path):
-                return gn.GNResponse('gn:backend:404')
+                return gn.GNResponse('gn:backend:404', cors=cors)
 
             mime_type = guess_type(file_path.split('/')[-1])
             async with aiofiles.open(file_path, "rb") as f:
-                data = f.read()
+                data = await f.read()
 
-            return gn.GNResponse('ok', {'files': [{'mime-type': mime_type, 'data': data}]})
+            return gn.GNResponse('ok', {'files': [{'mime-type': mime_type, 'data': data}]}, cors=cors)
 
 
 
@@ -397,6 +428,7 @@ class App:
             try:
                 
                 response = await self._api.dispatch(request)
+
                 
                 response = await self.resolve_extra_response(response)
 
@@ -404,18 +436,21 @@ class App:
                 if inspect.isasyncgen(response):
                     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.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.transmit()
                     return
 
 
+                response = await self.resolve_response(response)
                 self._quic.send_stream_data(request.stream_id, response.serialize(3), end_stream=True)
-                logger.debug(f'Отправлен на сервер ответ -> {response.command()} {response.payload if response.payload and len((response.payload)) < 200 else ''}')
+                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())
@@ -424,6 +459,13 @@ class App:
                 self._quic.send_stream_data(request.stream_id, response.serialize(3), 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
+            
+            return response
+
+        
         async def resolve_extra_response(self, response: Union[gn.GNResponse, AsyncGenerator[gn.GNResponse, None]]) -> Union[gn.GNResponse, AsyncGenerator[gn.GNResponse, None]]:
 
             file_types = (

GNServer/models.py

@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

{gnserver-0.0.0.0.5.dist-info → gnserver-0.0.0.0.7.dist-info}/METADATA

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

gnserver-0.0.0.0.7.dist-info/RECORD

@@ -0,0 +1,8 @@
+GNServer/__init__.py,sha256=l9B6gZZ2gTkWvNdla--J15_Bj0BtP8RyPsrMI6amgDo,1376
+GNServer/_app.py,sha256=w2rK4nrDWVZ_f0c3tC2cVckvkb8gY4Xudajiajw6yqQ,18534
+GNServer/models.py,sha256=3HTbPgXMcltK3hh3RWii0z6X2qYitXmPWzud8pOc4Rk,50
+gnserver-0.0.0.0.7.dist-info/licenses/LICENSE,sha256=WH_t7dKZyWJ5Ld07eYIkUG4Tv6zZWXtAdsUqYAUesn0,1084
+gnserver-0.0.0.0.7.dist-info/METADATA,sha256=bqObiR6rIxTCq4Lg_GU9oRyYbw6B1wg2NggJV2qrg5c,804
+gnserver-0.0.0.0.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+gnserver-0.0.0.0.7.dist-info/top_level.txt,sha256=-UOUBuD4u7Qkb1o5PdcwyA3kx8xCH2lwy0tJHi26Wb4,9
+gnserver-0.0.0.0.7.dist-info/RECORD,,

gnserver-0.0.0.0.5.dist-info/RECORD

@@ -1,7 +0,0 @@
-GNServer/__init__.py,sha256=T6kT6WoJpmIXashMSHfuafb9DSePUIzw192h27j9a4M,1364
-GNServer/_app.py,sha256=sLQwfXmEbMCpRulSVVqUGC5-4jdSQmtDD5JWWhsgXQs,17169
-gnserver-0.0.0.0.5.dist-info/licenses/LICENSE,sha256=WH_t7dKZyWJ5Ld07eYIkUG4Tv6zZWXtAdsUqYAUesn0,1084
-gnserver-0.0.0.0.5.dist-info/METADATA,sha256=uEYN3KzhtTxDmRKKNFMo2LYVIZu4O5BnL8BEPubn9KQ,804
-gnserver-0.0.0.0.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-gnserver-0.0.0.0.5.dist-info/top_level.txt,sha256=-UOUBuD4u7Qkb1o5PdcwyA3kx8xCH2lwy0tJHi26Wb4,9
-gnserver-0.0.0.0.5.dist-info/RECORD,,