Module management/ TRIBUTE webapp/ small gift fix/ backup selection in CLI
This commit is contained in:
Vladless
+22
-8
@@ -7,6 +7,11 @@ from aiogram import Router
|
||||
|
||||
from logger import logger
|
||||
|
||||
from .modules_manager import manager
|
||||
|
||||
|
||||
modules_hub = Router(name="modules_hub")
|
||||
|
||||
|
||||
def load_modules_from_folder(folder: str = "modules") -> list[Router]:
|
||||
routers = []
|
||||
@@ -17,11 +22,18 @@ def load_modules_from_folder(folder: str = "modules") -> list[Router]:
|
||||
return []
|
||||
|
||||
for _finder, name, _ispkg in pkgutil.iter_modules([str(base_path)]):
|
||||
if not manager.should_autostart(name):
|
||||
logger.info(f"[Modules] Пропуск автозапуска модуля '{name}' (отключён).")
|
||||
continue
|
||||
|
||||
module_path = f"{folder}.{name}.router"
|
||||
try:
|
||||
mod = importlib.import_module(module_path)
|
||||
if hasattr(mod, "router") and isinstance(mod.router, Router):
|
||||
routers.append(mod.router)
|
||||
router = getattr(mod, "router", None)
|
||||
if isinstance(router, Router):
|
||||
modules_hub.include_router(router)
|
||||
manager.adopt(name, router)
|
||||
routers.append(router)
|
||||
logger.info(f"[Modules] Загружен модуль: {module_path}")
|
||||
else:
|
||||
logger.warning(f"[Modules] В модуле {module_path} не найден router")
|
||||
@@ -33,12 +45,15 @@ def load_modules_from_folder(folder: str = "modules") -> list[Router]:
|
||||
def load_module_webhooks(folder: str = "modules") -> list[dict]:
|
||||
webhooks = []
|
||||
base_path = Path(folder)
|
||||
|
||||
if not base_path.exists():
|
||||
logger.warning(f"[Modules] Папка {folder} не найдена, пропускаем загрузку вебхуков.")
|
||||
return []
|
||||
|
||||
for _finder, name, _ispkg in pkgutil.iter_modules([str(base_path)]):
|
||||
if not manager.should_autostart(name):
|
||||
logger.info(f"[Modules] Пропуск вебхуков модуля '{name}' (отключён).")
|
||||
continue
|
||||
|
||||
module_path = f"{folder}.{name}"
|
||||
try:
|
||||
router_module = importlib.import_module(f"{module_path}.router")
|
||||
@@ -47,22 +62,23 @@ def load_module_webhooks(folder: str = "modules") -> list[dict]:
|
||||
if isinstance(webhook_data, dict) and "path" in webhook_data and "handler" in webhook_data:
|
||||
webhooks.append(webhook_data)
|
||||
logger.info(f"[Modules] Найден вебхук в модуле {name}: {webhook_data['path']}")
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"[Modules] Ошибка при загрузке вебхуков из {module_path}: {e}")
|
||||
|
||||
return webhooks
|
||||
|
||||
|
||||
def load_module_fast_flow_handlers(folder: str = "modules") -> dict:
|
||||
handlers = {}
|
||||
base_path = Path(folder)
|
||||
|
||||
if not base_path.exists():
|
||||
logger.warning(f"[Modules] Папка {folder} не найдена, пропускаем загрузку быстрого флоу.")
|
||||
return {}
|
||||
|
||||
for _finder, name, _ispkg in pkgutil.iter_modules([str(base_path)]):
|
||||
if not manager.should_autostart(name):
|
||||
logger.info(f"[Modules] Пропуск fast-flow модуля '{name}' (отключён).")
|
||||
continue
|
||||
|
||||
module_path = f"{folder}.{name}"
|
||||
try:
|
||||
router_module = importlib.import_module(f"{module_path}.router")
|
||||
@@ -80,8 +96,6 @@ def load_module_fast_flow_handlers(folder: str = "modules") -> dict:
|
||||
logger.info(f"[Modules] Найден обработчик быстрого флоу в модуле {name}: {payment_key}")
|
||||
elif fast_flow_data is None:
|
||||
logger.info(f"[Modules] Быстрое флоу отключено в модуле {name}")
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"[Modules] Ошибка при загрузке быстрого флоу из {module_path}: {e}")
|
||||
|
||||
return handlers
|
||||
|
||||
@@ -0,0 +1,159 @@
|
||||
import importlib
|
||||
import json
|
||||
import os
|
||||
import sys
|
||||
|
||||
from typing import Optional
|
||||
|
||||
from aiogram import Router
|
||||
|
||||
from hooks.hooks import unregister_module_hooks
|
||||
from logger import logger
|
||||
|
||||
|
||||
IGNORE_SUBMODULES = {"models", "schemas", "db"}
|
||||
STATE_FILE = os.getenv("MODULES_STATE_FILE", "storage/modules_state.json")
|
||||
|
||||
|
||||
class ModuleRecord:
|
||||
def __init__(self, name: str, pkg: str) -> None:
|
||||
self.name = name
|
||||
self.pkg = pkg
|
||||
self.router: Router | None = None
|
||||
self.enabled: bool = False
|
||||
|
||||
|
||||
class ModulesManager:
|
||||
def __init__(self, base: str = "modules") -> None:
|
||||
self.base = base
|
||||
self.registry: dict[str, ModuleRecord] = {}
|
||||
self.disabled: set[str] = set()
|
||||
self._load_state()
|
||||
|
||||
def pkg(self, name: str) -> str:
|
||||
return f"{self.base}.{name}"
|
||||
|
||||
def _load_state(self) -> None:
|
||||
try:
|
||||
if os.path.isfile(STATE_FILE):
|
||||
with open(STATE_FILE, encoding="utf-8") as f:
|
||||
data = json.load(f)
|
||||
self.disabled = set(data.get("disabled", []))
|
||||
else:
|
||||
os.makedirs(os.path.dirname(STATE_FILE), exist_ok=True)
|
||||
self._save_state()
|
||||
except Exception as e:
|
||||
logger.warning(f"[Modules] Не удалось загрузить состояние: {e}")
|
||||
|
||||
def _save_state(self) -> None:
|
||||
try:
|
||||
os.makedirs(os.path.dirname(STATE_FILE), exist_ok=True)
|
||||
with open(STATE_FILE, "w", encoding="utf-8") as f:
|
||||
json.dump({"disabled": sorted(self.disabled)}, f, ensure_ascii=False, indent=2)
|
||||
except Exception as e:
|
||||
logger.warning(f"[Modules] Не удалось сохранить состояние: {e}")
|
||||
|
||||
def adopt(self, name: str, router: Router):
|
||||
rec = self.registry.get(name) or ModuleRecord(name, self.pkg(name))
|
||||
rec.router = router
|
||||
rec.enabled = True
|
||||
self.registry[name] = rec
|
||||
|
||||
async def start(self, name: str) -> None:
|
||||
rec = self.registry.get(name) or ModuleRecord(name, self.pkg(name))
|
||||
if rec.enabled:
|
||||
logger.info(f"[Modules] {name} уже активен.")
|
||||
return
|
||||
|
||||
try:
|
||||
unregister_module_hooks(name)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
self.purge_selective(rec.pkg)
|
||||
|
||||
mod = importlib.import_module(f"{rec.pkg}.router")
|
||||
router = getattr(mod, "router", None)
|
||||
if not isinstance(router, Router):
|
||||
raise RuntimeError(f"[Modules] В модуле {name} не найден router")
|
||||
|
||||
from utils.modules_loader import modules_hub
|
||||
|
||||
modules_hub.include_router(router)
|
||||
|
||||
rec.router = router
|
||||
rec.enabled = True
|
||||
self.registry[name] = rec
|
||||
|
||||
if name in self.disabled:
|
||||
self.disabled.discard(name)
|
||||
self._save_state()
|
||||
|
||||
logger.info(f"[Modules] {name} запущен.")
|
||||
|
||||
async def stop(self, name: str) -> None:
|
||||
rec = self.registry.get(name)
|
||||
if not rec or not rec.enabled:
|
||||
logger.info(f"[Modules] {name} уже остановлен или не найден.")
|
||||
if name not in self.disabled:
|
||||
self.disabled.add(name)
|
||||
self._save_state()
|
||||
return
|
||||
|
||||
try:
|
||||
unregister_module_hooks(name)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
from utils.modules_loader import modules_hub
|
||||
|
||||
sub = getattr(modules_hub, "_sub_routers", None) or getattr(modules_hub, "sub_routers", None)
|
||||
if sub and rec.router in sub:
|
||||
sub.remove(rec.router)
|
||||
|
||||
rec.router = None
|
||||
rec.enabled = False
|
||||
|
||||
if name not in self.disabled:
|
||||
self.disabled.add(name)
|
||||
self._save_state()
|
||||
|
||||
logger.info(f"[Modules] {name} остановлен.")
|
||||
|
||||
async def restart(self, name: str) -> None:
|
||||
logger.info(f"[Modules] Перезапуск {name}...")
|
||||
await self.stop(name)
|
||||
await self.start(name)
|
||||
|
||||
def purge_selective(self, root_pkg: str) -> None:
|
||||
to_del = []
|
||||
for m in list(sys.modules):
|
||||
if m == root_pkg or m.startswith(root_pkg + "."):
|
||||
tail = m[len(root_pkg) :].lstrip(".")
|
||||
top = tail.split(".", 1)[0] if tail else ""
|
||||
if top and top in IGNORE_SUBMODULES:
|
||||
continue
|
||||
to_del.append(m)
|
||||
for m in to_del:
|
||||
sys.modules.pop(m, None)
|
||||
importlib.invalidate_caches()
|
||||
|
||||
def is_enabled(self, name: str) -> bool:
|
||||
rec = self.registry.get(name)
|
||||
if not rec or not rec.router:
|
||||
return False
|
||||
try:
|
||||
from utils.modules_loader import modules_hub
|
||||
except Exception:
|
||||
return bool(rec.enabled)
|
||||
sub = getattr(modules_hub, "_sub_routers", None) or getattr(modules_hub, "sub_routers", None)
|
||||
return bool(sub and rec.router in sub)
|
||||
|
||||
def is_disabled(self, name: str) -> bool:
|
||||
return name in self.disabled
|
||||
|
||||
def should_autostart(self, name: str) -> bool:
|
||||
return name not in self.disabled
|
||||
|
||||
|
||||
manager = ModulesManager()
|
||||
Reference in New Issue
Block a user