GNServer 0.0.0.0.21__tar.gz → 0.0.0.0.23__tar.gz

{gnserver-0.0.0.0.21 → gnserver-0.0.0.0.23}/GNServer/GNServer/__init__.py

@@ -31,6 +31,7 @@ DEALINGS IN THE SOFTWARE.
 
 from ._app import App, GNExceptions
 from KeyisBClient.gn import GNRequest, GNResponse, CORSObject, FileObject, TemplateObject
+from KeyisBClient import Url
 
 
 

{gnserver-0.0.0.0.21 → gnserver-0.0.0.0.23}/GNServer/GNServer/_app.py

@@ -2,6 +2,7 @@
 
 
 import re
+import sys
 import uuid
 import anyio
 import decimal
@@ -770,7 +771,7 @@ class App:
 
         async def _handle_request(self, request: gn.GNRequest, mode: int):
 
-            request.client._data['remote_addr'] = self._quic._network_paths[0].addr[0]
+            request.client._data['remote_addr'] = self._quic._network_paths[0].addr
 
             try:
                 
@@ -829,6 +830,11 @@ class App:
         wait: bool = True,
         run: Optional[Callable] = None
     ):
+        """
+        # Запустить сервер
+
+        Запускает сервер в главном процессе asyncio.run()
+        """
 
         self.domain = domain
 
@@ -863,3 +869,27 @@ class App:
                 await asyncio.Event().wait()
 
         asyncio.run(_main())
+
+
+    def runByVMHost(self):
+        """
+        # Запусить через VM-host
+
+        Заупскает сервер через процесс vm-host
+        """
+        argv = sys.argv[1:]
+        command = argv[0]
+        if command == 'gn:vm-host:start':
+            domain = argv[1]
+            port = int(argv[2])
+            cert_path = argv[3]
+            key_path = argv[4]
+            host = argv[5]
+
+            self.run(
+                domain=domain,
+                port=port,
+                cert_path=cert_path,
+                key_path=key_path,
+                host=host
+            )

gnserver-0.0.0.0.23/GNServer/GNServer/tools/__init__.py

@@ -0,0 +1 @@
+from ._models import TTLDict

gnserver-0.0.0.0.23/GNServer/GNServer/tools/_models.py

@@ -0,0 +1,74 @@
+import time
+import asyncio
+from typing import Optional
+
+
+
+class TTLDict:
+    def __init__(self, default_ttl: int = 60, cleanup_interval: int = 300):
+        """
+        :param default_ttl: TTL по умолчанию (сек), если при записи не указан
+        :param cleanup_interval: периодическая очистка от просроченных ключей (сек), по умолчанию 5 мин
+        """
+
+        self._store = {}
+        self._default_ttl = default_ttl
+        self._cleanup_interval = cleanup_interval
+        self._task = None
+
+    def set(self, key, value, ttl: Optional[int] = None):
+        if ttl is None:
+            ttl = self._default_ttl
+        expire_at = time.monotonic() + ttl
+        self._store[key] = (value, expire_at)
+
+        if self._task is None:
+            loop = asyncio.get_running_loop()
+            self._task = loop.create_task(self._cleanup_worker())
+
+    def get(self, key):
+        now = time.monotonic()
+        item = self._store.get(key)
+        if not item:
+            return None
+
+        value, expire_at = item
+        if expire_at < now:
+            del self._store[key]
+            return None
+        return value
+
+    def __setitem__(self, key, value):
+        self.set(key, value, self._default_ttl)
+
+    def __getitem__(self, key):
+        return self.get(key)
+
+    def __contains__(self, key):
+        return self.get(key) is not None
+
+    def __len__(self):
+        return len(self._store)
+
+    def __repr__(self):
+        return f"<TTLDict size={len(self._store)}>"
+
+    async def _cleanup_worker(self):
+        while True:
+            await asyncio.sleep(self._cleanup_interval)
+            self.cleanup()
+
+    def cleanup(self):
+        """Удалить все просроченные ключи"""
+        now = time.monotonic()
+        expired = [k for k, (_, exp) in self._store.items() if exp < now]
+        for k in expired:
+            self._store.pop(k, None)
+
+    async def stop(self):
+        """Остановить фон очистки"""
+        self._task.cancel()
+        try:
+            await self._task
+        except asyncio.CancelledError:
+            pass

{gnserver-0.0.0.0.21 → gnserver-0.0.0.0.23}/GNServer/GNServer.egg-info/PKG-INFO

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

{gnserver-0.0.0.0.21 → gnserver-0.0.0.0.23}/GNServer/GNServer.egg-info/SOURCES.txt

@@ -11,4 +11,6 @@ GNServer/GNServer.egg-info/PKG-INFO
 GNServer/GNServer.egg-info/SOURCES.txt
 GNServer/GNServer.egg-info/dependency_links.txt
 GNServer/GNServer.egg-info/requires.txt
-GNServer/GNServer.egg-info/top_level.txt
+GNServer/GNServer.egg-info/top_level.txt
+GNServer/GNServer/tools/__init__.py
+GNServer/GNServer/tools/_models.py

{gnserver-0.0.0.0.21 → gnserver-0.0.0.0.23}/PKG-INFO

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

{gnserver-0.0.0.0.21 → gnserver-0.0.0.0.23}/setup.py

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