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

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
@@ -288,9 +341,9 @@ class App:
         return gn.GNResponse("gn:backend:404", {'error': 'Not Found'})
 
 
-    def fastFile(self, path: str, file_path: str, cors: Optional[gn.CORSObject] = None):
+    def fastFile(self, path: str, file_path: str, cors: Optional[gn.CORSObject] = None, template: Optional[gn.TemplateObject] = None, payload: Optional[dict] = None):
         @self.get(path)
-        async def r_static(path: str):
+        async def r_static():
             nonlocal file_path
             if file_path.endswith('/'):
                 file_path = file_path[:-1]
@@ -298,13 +351,11 @@ class App:
             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()
+            fileObject = gn.FileObject(file_path, template)
+            return gn.GNResponse('ok', payload=payload, files=fileObject, cors=cors)
 
-            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):
+    def static(self, path: str, dir_path: str, cors: Optional[gn.CORSObject] = None, template: Optional[gn.TemplateObject] = None, payload: Optional[dict] = None):
         @self.get(f"{path}/{{_path:path}}")
         async def r_static(_path: str):
             file_path = os.path.join(dir_path, _path)
@@ -314,12 +365,9 @@ class App:
                 
             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)
+            
+            fileObject = gn.FileObject(file_path, template)
+            return gn.GNResponse('ok', payload=payload, files=fileObject, cors=cors)
 
 
 
@@ -429,10 +477,6 @@ 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
@@ -455,7 +499,7 @@ class App:
             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()
         
@@ -463,36 +507,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.7.dist-info → gnserver-0.0.0.0.9.dist-info}/METADATA

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

gnserver-0.0.0.0.9.dist-info/RECORD

@@ -0,0 +1,7 @@
+GNServer/__init__.py,sha256=l9B6gZZ2gTkWvNdla--J15_Bj0BtP8RyPsrMI6amgDo,1376
+GNServer/_app.py,sha256=dKgGAFVwDMGOt7i4HGF2TrVz0XSGjE0TV2hRJHfUnxA,18273
+gnserver-0.0.0.0.9.dist-info/licenses/LICENSE,sha256=WH_t7dKZyWJ5Ld07eYIkUG4Tv6zZWXtAdsUqYAUesn0,1084
+gnserver-0.0.0.0.9.dist-info/METADATA,sha256=Y7bXZtN9rVDJFkIuyoEIWVUWPRVYpVjvvMaVZxnRwds,804
+gnserver-0.0.0.0.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+gnserver-0.0.0.0.9.dist-info/top_level.txt,sha256=-UOUBuD4u7Qkb1o5PdcwyA3kx8xCH2lwy0tJHi26Wb4,9
+gnserver-0.0.0.0.9.dist-info/RECORD,,

GNServer/models.py

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

gnserver-0.0.0.0.7.dist-info/RECORD

@@ -1,8 +0,0 @@
-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,,