GNServer 0.0.0.0.22__py3-none-any.whl → 0.0.0.0.23__py3-none-any.whl

GNServer/_app.py

@@ -2,6 +2,7 @@
 
 
 import re
+import sys
 import uuid
 import anyio
 import decimal
@@ -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/tools/_models.py

@@ -1,5 +1,8 @@
 import time
-import threading
+import asyncio
+from typing import Optional
+
+
 
 class TTLDict:
     def __init__(self, default_ttl: int = 60, cleanup_interval: int = 300):
@@ -7,46 +10,38 @@ class TTLDict:
         :param default_ttl: TTL по умолчанию (сек), если при записи не указан
         :param cleanup_interval: периодическая очистка от просроченных ключей (сек), по умолчанию 5 мин
         """
+
         self._store = {}
-        self._lock = threading.Lock()
         self._default_ttl = default_ttl
         self._cleanup_interval = cleanup_interval
-        self._stop_event = threading.Event()
-
-        self._timer = threading.Thread(target=self._cleanup_worker, daemon=True)
-        self._timer.start()
+        self._task = None
 
-    def set(self, key, value, ttl: int = None):
-        """Установить значение с временем жизни (в секундах)."""
+    def set(self, key, value, ttl: Optional[int] = None):
         if ttl is None:
             ttl = self._default_ttl
         expire_at = time.monotonic() + ttl
-        with self._lock:
-            self._store[key] = (value, expire_at)
+        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):
-        """Получить значение или None, если ключ отсутствует/просрочен."""
         now = time.monotonic()
-        with self._lock:
-            item = self._store.get(key)
-            if not item:
-                return None
-
-            value, expire_at = item
-            if expire_at < now:
-                del self._store[key]
-                return None
+        item = self._store.get(key)
+        if not item:
+            return None
 
-            return value
+        value, expire_at = item
+        if expire_at < now:
+            del self._store[key]
+            return None
+        return value
 
     def __setitem__(self, key, value):
-        """
-        cache[key] = val         → TTL по умолчанию
-        """
         self.set(key, value, self._default_ttl)
 
     def __getitem__(self, key):
-        """cache[key] -> value | None"""
         return self.get(key)
 
     def __contains__(self, key):
@@ -58,20 +53,22 @@ class TTLDict:
     def __repr__(self):
         return f"<TTLDict size={len(self._store)}>"
 
-    def _cleanup_worker(self):
-        """Фоновый поток для периодической очистки."""
-        while not self._stop_event.wait(self._cleanup_interval):
+    async def _cleanup_worker(self):
+        while True:
+            await asyncio.sleep(self._cleanup_interval)
             self.cleanup()
 
     def cleanup(self):
-        """Удалить все просроченные ключи."""
+        """Удалить все просроченные ключи"""
         now = time.monotonic()
-        with self._lock:
-            expired = [k for k, (_, exp) in self._store.items() if exp < now]
-            for k in expired:
-                self._store.pop(k, None)
+        expired = [k for k, (_, exp) in self._store.items() if exp < now]
+        for k in expired:
+            self._store.pop(k, None)
 
-    def stop(self):
+    async def stop(self):
         """Остановить фон очистки"""
-        self._stop_event.set()
-        self._timer.join(timeout=1)
+        self._task.cancel()
+        try:
+            await self._task
+        except asyncio.CancelledError:
+            pass

{gnserver-0.0.0.0.22.dist-info → gnserver-0.0.0.0.23.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GNServer
-Version: 0.0.0.0.22
+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.23.dist-info/RECORD

@@ -0,0 +1,11 @@
+GNServer/___client.py,sha256=hmeUL2Vqp-BnwJeRcLZAaIfRNVxBrRRB_AFk9ofkei4,25459
+GNServer/__init__.py,sha256=V50sMYrrPdOGuI1iJm-SW7izhX-eggDH16AHvtIKjmM,1480
+GNServer/_app.py,sha256=w7v3z-E4VEINzeYScdVFpOzGxhuZk6VB7PFg3n1mMQQ,30689
+GNServer/_client.py,sha256=lwFGsNR2RullSNCuu7WXXdYfUbsV1_ZweMv-N-5Gpv0,27371
+GNServer/tools/__init__.py,sha256=itqkS5iBB2GEHqz8H-htqgd55rUi6utnuKVAzBBByCM,28
+GNServer/tools/_models.py,sha256=1V94cbNHQGAl5l9DJbGvvkm1gmsgTEMgkjzlnZk8ymw,2264
+gnserver-0.0.0.0.23.dist-info/licenses/LICENSE,sha256=WH_t7dKZyWJ5Ld07eYIkUG4Tv6zZWXtAdsUqYAUesn0,1084
+gnserver-0.0.0.0.23.dist-info/METADATA,sha256=jqN0cSl1gDDgjSACXbfpsDKv--dh0v6JFQY531SegmE,805
+gnserver-0.0.0.0.23.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+gnserver-0.0.0.0.23.dist-info/top_level.txt,sha256=-UOUBuD4u7Qkb1o5PdcwyA3kx8xCH2lwy0tJHi26Wb4,9
+gnserver-0.0.0.0.23.dist-info/RECORD,,

gnserver-0.0.0.0.22.dist-info/RECORD

@@ -1,11 +0,0 @@
-GNServer/___client.py,sha256=hmeUL2Vqp-BnwJeRcLZAaIfRNVxBrRRB_AFk9ofkei4,25459
-GNServer/__init__.py,sha256=V50sMYrrPdOGuI1iJm-SW7izhX-eggDH16AHvtIKjmM,1480
-GNServer/_app.py,sha256=Mtpuoj7CPjedW9m5wL6YzfAwCV9F-5a69ag2Dh2VwIk,29908
-GNServer/_client.py,sha256=lwFGsNR2RullSNCuu7WXXdYfUbsV1_ZweMv-N-5Gpv0,27371
-GNServer/tools/__init__.py,sha256=itqkS5iBB2GEHqz8H-htqgd55rUi6utnuKVAzBBByCM,28
-GNServer/tools/_models.py,sha256=tXWR255ASJLlpdDrgMXcmRqD_nIcCb4qKeESvAhxWpU,2742
-gnserver-0.0.0.0.22.dist-info/licenses/LICENSE,sha256=WH_t7dKZyWJ5Ld07eYIkUG4Tv6zZWXtAdsUqYAUesn0,1084
-gnserver-0.0.0.0.22.dist-info/METADATA,sha256=b0GuFIDOkuPhFhVj_Cm66zZsjpm1nvQLvzLjGZhZhFA,805
-gnserver-0.0.0.0.22.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-gnserver-0.0.0.0.22.dist-info/top_level.txt,sha256=-UOUBuD4u7Qkb1o5PdcwyA3kx8xCH2lwy0tJHi26Wb4,9
-gnserver-0.0.0.0.22.dist-info/RECORD,,