GNServer 0.0.0.0.4__tar.gz → 0.0.0.0.6__tar.gz

{gnserver-0.0.0.0.4 → gnserver-0.0.0.0.6}/GNServer/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,28 @@ 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, *, name: str | None = None):
-        return self.route("POST", path, name=name)
+    def post(self, path: str, *, cors: Optional[gn.CORSObject] = None):
+        return self.route("POST", path, cors)
 
-    def put(self, path: str, *, name: str | None = None):
-        return self.route("PUT", path, name=name)
+    def put(self, path: str, *, cors: Optional[gn.CORSObject] = None):
+        return self.route("PUT", path, cors)
 
-    def delete(self, path: str, *, name: str | None = None):
-        return self.route("DELETE", path, name=name)
+    def delete(self, path: str, *, cors: Optional[gn.CORSObject] = None):
+        return self.route("DELETE", path, cors)
+    
+    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(
@@ -278,15 +288,19 @@ class App:
 
 
     def static(self, path: str, dir_path: str):
-        @self.get(f"/{path}/{{_path:path}}")
+        @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')
 
             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}]})
 
@@ -397,6 +411,7 @@ class App:
             try:
                 
                 response = await self._api.dispatch(request)
+
                 
                 response = await self.resolve_extra_response(response)
 
@@ -404,18 +419,21 @@ class App:
                 if inspect.isasyncgen(response):
                     async for chunk in response:  # type: ignore[misc]
                         chunk._stream = True
+                        chunk = 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 = 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 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 +442,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-0.0.0.0.6/GNServer/GNServer/models.py

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

{gnserver-0.0.0.0.4 → gnserver-0.0.0.0.6}/GNServer/GNServer.egg-info/PKG-INFO

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

{gnserver-0.0.0.0.4 → gnserver-0.0.0.0.6}/GNServer/GNServer.egg-info/SOURCES.txt

@@ -5,6 +5,7 @@ GNServer/LICENSE
 GNServer/mmbConfig.json
 GNServer/GNServer/__init__.py
 GNServer/GNServer/_app.py
+GNServer/GNServer/models.py
 GNServer/GNServer.egg-info/PKG-INFO
 GNServer/GNServer.egg-info/SOURCES.txt
 GNServer/GNServer.egg-info/dependency_links.txt

{gnserver-0.0.0.0.4 → gnserver-0.0.0.0.6}/GNServer/LICENSE

@@ -1,15 +1,15 @@
 Copyright (C) 2024 KeyisB. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
+obtaining a copy of this software and associated 
+1. Copying, modification, merging, publishing, distribution,
+sublicensing, and/or selling copies of the Software are
+strictly prohibited.documentation
 files (the "Software"), to use the Software exclusively for
 projects related to the GN or GW systems, including personal,
 educational, and commercial purposes, subject to the following
 conditions:
 
-1. Copying, modification, merging, publishing, distribution,
-sublicensing, and/or selling copies of the Software are
-strictly prohibited.
 2. The licensee may use the Software only in its original,
 unmodified form.
 3. All copies or substantial portions of the Software must

{gnserver-0.0.0.0.4 → gnserver-0.0.0.0.6}/PKG-INFO

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

{gnserver-0.0.0.0.4 → gnserver-0.0.0.0.6}/setup.py

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