GNServer 0.0.0.0.6__py3-none-any.whl → 0.0.0.0.8__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

@@ -110,6 +110,59 @@ def guess_type(filename: str) -> str:
     return mime_map.get(ext, "application/octet-stream")
 
 
+import re
+from typing import List
+
+# regex для !{var}, поддерживает вложенность через точку
+TPL_VAR_RE = re.compile(r'(?<!\\)!\{([A-Za-z_][A-Za-z0-9_\.]*)\}')
+
+# список mime, которые считаем текстовыми
+TEXTUAL_MIME_PREFIXES = [
+    "text/",                       # text/html, text/css, text/plain
+]
+TEXTUAL_MIME_EXACT = {
+    "application/javascript",
+    "application/json",
+    "application/xml",
+    "application/xhtml+xml"
+}
+TEXTUAL_MIME_SUFFIXES = (
+    "+xml",  # например application/rss+xml
+    "+json", # application/ld+json
+)
+
+def extract_template_vars(filedata: bytes, mime: str) -> List[str]:
+    """
+    Ищет все !{var} в тексте, если MIME относится к текстовым.
+    """
+    mime = (mime or "").lower().strip()
+
+    # определяем, текстовый ли mime
+    is_textual = (
+        mime.startswith(tuple(TEXTUAL_MIME_PREFIXES))
+        or mime in TEXTUAL_MIME_EXACT
+        or mime.endswith(TEXTUAL_MIME_SUFFIXES)
+        or "javascript" in mime
+        or "json" in mime
+        or "xml" in mime
+    )
+
+    if not is_textual:
+        return []
+
+    try:
+        text = filedata.decode("utf-8", errors="ignore")
+    except Exception:
+        return []
+
+    return list(set(m.group(1) for m in TPL_VAR_RE.finditer(text)))
+
+
+
+
+
+
+
 @dataclass
 class Route:
     method: str
@@ -230,6 +283,7 @@ class App:
 
     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
@@ -287,7 +341,23 @@ 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():
+            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)
@@ -296,13 +366,13 @@ class App:
                 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 = 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)
 
 
 
@@ -412,14 +482,10 @@ class App:
                 
                 response = await self._api.dispatch(request)
 
-                
-                response = await self.resolve_extra_response(response)
-
-
                 if inspect.isasyncgen(response):
                     async for chunk in response:  # type: ignore[misc]
                         chunk._stream = True
-                        chunk = self.resolve_response(chunk)
+                        chunk = await self.resolve_response(chunk)
                         self._quic.send_stream_data(request.stream_id, chunk.serialize(3), end_stream=False)
                         self.transmit()
                         
@@ -431,14 +497,14 @@ class App:
                     return
 
 
-                response = self.resolve_response(response)
+                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 ''}')
                 self.transmit()
             except Exception as e:
                 logger.error('GNServer: error\n'  + traceback.format_exc())
 
-                response = gn.GNResponse('gn:backend:500:Internal Server Error')
+                response = gn.GNResponse('gn:backend:500')
                 self._quic.send_stream_data(request.stream_id, response.serialize(3), end_stream=True)
                 self.transmit()
         
@@ -446,36 +512,12 @@ class App:
             if response._cors is None:
                 response._cors = self._api._cors
             
+            await response.assembly()
+
             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 = (
-                'html',
-                'css',
-                'js',
-                'svg'
-            )
-
-            if isinstance(response, gn.GNResponse):
-                payload = response.payload
-                if payload is not None:
-                    for ext_file in file_types:
-                        ext_file_ = payload.get(ext_file)
-                        if ext_file_ is not None:
-                            if isinstance(ext_file_, str):
-                                if ext_file_.startswith('/') or ext_file_.startswith('./'):
-                                    try:
-                                        async with await anyio.open_file(ext_file_, mode="rb") as file:
-                                            data = await file.read()
-                                    
-                                        payload.pop(ext_file)
-                                        payload['files'] = [{'mime-type': guess_type(ext_file_.split('/')[-1]), 'data': data}]
-                                    except Exception as e:
-                                        payload[ext_file] = f'GNServer error: {e}'
-                                        logger.debug(f'error resolving extra response -> {traceback.format_exc()}')
-            return response
+ 
 
 
 

{gnserver-0.0.0.0.6.dist-info → gnserver-0.0.0.0.8.dist-info}/METADATA

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

gnserver-0.0.0.0.8.dist-info/RECORD

@@ -0,0 +1,7 @@
+GNServer/__init__.py,sha256=l9B6gZZ2gTkWvNdla--J15_Bj0BtP8RyPsrMI6amgDo,1376
+GNServer/_app.py,sha256=WM7gJqSzgUl7fHNPLhzGeyfJOSC4yj4dUZxowSSbWms,18340
+gnserver-0.0.0.0.8.dist-info/licenses/LICENSE,sha256=WH_t7dKZyWJ5Ld07eYIkUG4Tv6zZWXtAdsUqYAUesn0,1084
+gnserver-0.0.0.0.8.dist-info/METADATA,sha256=WCL7mc5UxeFicgVe2tLAw0oyCqKlgpGJ0uPg-bygirU,804
+gnserver-0.0.0.0.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+gnserver-0.0.0.0.8.dist-info/top_level.txt,sha256=-UOUBuD4u7Qkb1o5PdcwyA3kx8xCH2lwy0tJHi26Wb4,9
+gnserver-0.0.0.0.8.dist-info/RECORD,,

GNServer/models.py

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

gnserver-0.0.0.0.6.dist-info/RECORD

@@ -1,8 +0,0 @@
-GNServer/__init__.py,sha256=T6kT6WoJpmIXashMSHfuafb9DSePUIzw192h27j9a4M,1364
-GNServer/_app.py,sha256=8JcVzozjtdLtQjPThi-wR2OaAYNvYfaIqDReCmmFmrg,17801
-GNServer/models.py,sha256=3HTbPgXMcltK3hh3RWii0z6X2qYitXmPWzud8pOc4Rk,50
-gnserver-0.0.0.0.6.dist-info/licenses/LICENSE,sha256=WH_t7dKZyWJ5Ld07eYIkUG4Tv6zZWXtAdsUqYAUesn0,1084
-gnserver-0.0.0.0.6.dist-info/METADATA,sha256=S5wZWPijiIAS9Kd8BkMeKs7PJtY0CMeMVvp149dQyhI,804
-gnserver-0.0.0.0.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-gnserver-0.0.0.0.6.dist-info/top_level.txt,sha256=-UOUBuD4u7Qkb1o5PdcwyA3kx8xCH2lwy0tJHi26Wb4,9
-gnserver-0.0.0.0.6.dist-info/RECORD,,