version 4.0

Рефакторинг и оптимизация обработки подписок

.gitignore

@@ -54,5 +54,7 @@ scripts
 models.py
 Dockerfile
 .csv
-
-setup.py
+/logs
+setup.py
+.ruff_cache
+.github/workflows/

.python-version

@@ -0,0 +1 @@
+3.12

Makefile

@@ -1,6 +1,7 @@
 formatting:
-	@echo "Running Ruff..." && ruff check . --fix
-	@echo "Running Ruff format..." && ruff format .
+	@echo "Running Ruff format..." && ruff format . --config pyproject.toml --exclude main.py,handlers/payments
+
+	@echo "Running Ruff..." && ruff check . --config pyproject.toml --exclude main.py,handlers/payments --fix
 
 lint:
-	@echo "Running Ruff checks..." && ruff check .
+	@echo "Running Ruff checks..." && ruff check . --config pyproject.toml --exclude main.py,handlers/payments

README.md

@@ -2,153 +2,105 @@
 
 **SoloBot** — ваш идеальный помощник для управления API 3x-UI VPN на протоколе VLESS.
 
-Три версии — море возможностей:
+<img src="./img/preview.gif" alt="SoloBot" width="1600">
 
-- [v1.4](https://github.com/Vladless/Solo_bot/releases/tag/v1.4) — бот для продажи ключей VLESS:
+# Описание
+Бот, предоставляющий инструменты под различные реализации. Хорошая кастомизация и подстройка под свой бренд.
 
-![](preview.jpg)
+# Основные возможности
 
-- [v2.3.1](https://github.com/Vladless/Solo_bot/releases/tag/v2.3.1) — стабильная версия подписок вместо ключей с
-  кнопками автодобавления в приложение:
+**SoloBot** реализует множество функций, включая:
 
-![](preview_v_2.jpg)
+### Управление подписками
+- Выдача подписок на различные периоды (**1 месяц, 3 месяца, полгода, год**).
+- Использование **тестового периода** подписки.
+- Продление ключей на указанные периоды.
 
-- [v3.1](https://github.com/Vladless/Solo_bot/releases/tag/v3.1) — версия бота со значительным расширением возможностей.
+### Полный контроль клиента над своими ключами
+- Просмотр информации о ключе (**сервер, оставшееся время, сам ключ**).
+- Продление ключей.
+- Удаление ключей.
+- Просмотр полной информации вплоть до минут истечения
+- Смена локации (**перемещение ключа между серверами**).
+- Поддержка **нескольких ключей и устройств** для одного клиента.
 
-[Последние актуальные релизы.](https://github.com/Vladless/Solo_bot/releases)
-Если вам не хватает функций — направьте их в [issue](https://github.com/Vladless/Solo_bot/issues), мы реализуем.
+### Реферальная программа
+- Уникальная ссылка для приглашений.
+- Инлайн режим или обычные сообщения
 
-## 📋 Оглавление
+### Интеграция платёжных систем
+В боте реализована интеграция касс как для физических лиц, так и для самозанятых и ИП:
+- **Юкасса** (Самозанятость и ИП)
+- **Юмани** (Физические Лица) (TrackLine)
+- **Robokassa** (Физические Лица)
+- **Cryptobot** (Криптовалюта) (izzzzzi)
+- **Звезды Telegram**
 
-1. [Описание](#-описание)
-2. [Стек технологий](#-стек-технологий)
-3. [Установка](#-установка)
-4. [Конфигурация](#-конфигурация)
-5. [Запуск](#-запуск)
-6. [Контакты](#-solobot-в-telegram-и-полная-версия)
+### Безопасность и стабильность
+- **Периодические бэкапы** базы данных клиентов и их восстановление.
+- **Смена домена** в случае переезда.
 
----
+### Уведомления
+- **Произвольные сообщения** через панель администратора.
+- Уведомления о **неиспользованных пробниках**.
+- Уведомления об **истекающих ключах** (_за сутки, за 6 часов и в момент истечения_).
+- **Воронка продаж**. Если клиент не взял пробник предлагаются более выгодные условия.
+- **Рассылка лично или всем.** С сохранением форматирования и отправкой картинок
 
-## 📖 Описание
+### Серверы
+- **Мультисерверность** — добавление сервера прямо в админке.
+- **Проверка на доступность** — бот следит за серверами и их откликом.
+- **Балансировка** — бот выдает подписку на наименее загруженный сервер.
+- **Сихронизация** — перемещайте клиентов на другие сервера бесшовно.
 
-SoloBot реализует множество функций, включая:
+### Удобная админ-панель
+- **Поиск клиента** — по айди, нику или ключу.
+- **Управление подпиской клиента** — перевыпуск, изменение баланса и остальное.
+- **Управление ботом** — перезагрузка, списки банов, смена домена.
+- *А также рассылки, создание купонов, просмотр детальной статистики и многое другое*
 
-- **Выдача подписок на различные периоды** (1 месяц, 3 месяца, полгода, год).
-- **Использование тестового периода подписки.**
-- **Продление ключей** на указанные периоды.
-- **Полный контроль** клиента над своими ключами:
-    - **Просмотр** информации о ключе (сервер, оставшееся время, сам ключ).
-    - **Продление** ключей.
-    - **Удаление** ключей.
-- **Смена локации** (перемещение ключа между серверами).
-- **Поддержка нескольких ключей и устройств** для одного клиента.
-- **Реферальная программа** с уникальной ссылкой для приглашений.
-- Доступ к **инструкциям** для подключения к сервису.
-- Пополнение баланса:
-    * **Юкасса** (Самозанятость и ИП)
-    * **Юмани** (Физические Лица) ([TrackLine](https://github.com/TrackLine))
-    * **FreeKassa** (Физические Лица)
-    * **Robokassa** (Физические Лица)
-    * **Cryptobot** (Криптовалюта) ([izzzzzi](https://github.com/izzzzzi))
-    * **Звезды Telegram**
-- Периодические **бэкапы базы данных клиентов**.
-- Уведомления:
-    - Произвольные сообщения через панель администратора.
-    - Уведомления о неиспользованных пробниках.
-    - Уведомления об истекающих ключах (за сутки, за 6 часов и в момент истечения).
-- **Чат поддержки** и канал для связи.
-- **Автоматическое продление ключа** при наличии достаточного баланса.
-- **Удобная панель администратора прямо в боте**
-- Серверы:
-    - **Мультисерверность** — добавление сервера прямо в админке
-    - **Проверка на доступность** — бот следит за серверами и их откликом
-    - **Балансировка** — бот выдает подписку на наименее загруженный сервер
 
----
+<img src="./img/preview_2.gif" alt="SoloBot" width="1600">
 
-## 💻 Стек технологий
+### Кастомизация
+- **Пробник** — Сами решаете будет или нет. Количество дней пробника также кастомизируется.
+- **Реферальная программа** — процент с каждого пополнения или фиксированная сумма.
+- **Все меню** — меняйте все меню как вам захочется, описания и тексты.
+- **Кешбэк** — начисляйте кэшбек за пополнения, если хотите.
+- **Настройки** — капча, подписка на канал, купоны и прочее.
+- **Автоматика** — удалять ли ключи после продления, продлевать ли их и остальное.
 
-Основные технологии, используемые в проекте:
+### *Настраивайте как вам удобно!*
 
-- **Python** версии 3.10 (3.12, для последних версий).
-- **PostgreSQL** — для хранения данных.
-- **aiogram** — для взаимодействия с Telegram API.
-- **aiohttp** — для API запросов к панелям.
 
-Проект полностью асинхронный, что обеспечивает высокую скорость работы.
+## Список версий
 
----
+#### Бот постоянно развивается, обрастая новыми возможностями.
+#### Для полного рассмотрения каждой версии ознакомьтесь с [**релизами**](https://github.com/Vladless/Solo_bot/releases).
 
-## ⚙️ Установка
 
-### 1️⃣ Шаг 1: Клонирование репозитория
-
-Клонируйте репозиторий и перейдите в его директорию:
-
-```bash
-git clone https://github.com/Vladless/Solo_bot.git
-cd solo_bot
-```
-
-### 2️⃣ Шаг 2: Создание и подключение виртуального окружения
-
-Создайте виртуальное окружение **Python** и перейдите в сессию:
-
-```
-python3 -m venv venv
-source venv/bin/activate
-```
-
-### 3️⃣ Шаг 3: Установка зависимостей
-
-Установите зависимости:
-
-```
-pip install -r requirements.txt
-```
-
-### 🛠️ Конфигурация
-
-Для правильной работы вам нужно:
-
-* Установить и запустить **PostgreSQL**, создать пользователя для работы с базой данных и выдать ему права
-* Настроить ваш сервер для работы с ботом, выпустить SSL сертификат для домена
-* Настроить вебхуки и указать пути до них через любой веб-сервер, например **nginx**
-
-* Создать файл config.py в корневой папке проекта с вашими данными:
-
-```
-API_TOKEN = "токен вашего бота телеграм"
-
-ADMIN_USERNAME = "логин от вашей панели x-ray"
-ADMIN_PASSWORD = "пароль от вашей панели x-ray"
-ADD_CLIENT_URL = f"{API_URL}/panel/api/inbounds/addClient"
-GET_INBOUNDS_URL = f"{API_URL}/panel/api/inbounds/list/"
-AUTH_URL = f"{API_URL}/login/"
-```
-
-**Мы высылаем детальный гайд и недостающие файлы в поддержке бота!**
-
-### 🚀 Запуск
-
-Введите команду из виртуального окружения `venv/bin/activate`
-
-```
-python3 main.py
-```
-
-### 🔗 SoloBot в Telegram и Полная версия
+## 🔗 SoloBot в Telegram и Полная версия
 
 #### Наш [**➡ сайт**](https://pocomacho.ru/solonetbot/):
 
 Всегда актуальные гайды по установке, файлы для запуска и ссылка на общий чат:
-![image](https://github.com/user-attachments/assets/737fbc21-e4b1-4c69-9323-71284d34e454)
+![image](https://github.com/user-attachments/assets/28f317f0-6b26-4d86-a501-df9800646131)
+
 
 Попробовать SoloBot прямо сейчас в Telegram [**➡ Попробовать**](https://t.me/SoloNetVPN_bot).
 
+#### Отзывы пользователей:
+SoloBot уже помог сотням пользователей в нашем сообществе:
+![image](https://github.com/user-attachments/assets/fe13a00f-94d3-419c-afd0-d1c1efec5179)
+
+
+ **Читать** [**➡ Отзывы**](https://pocomacho.ru/solonetbot/reviews/)
+
 Связаться с нами через [**➡ поддержку**](https://t.me/solonet_sup). Там вы сможете купить полную версию и получить логин
-и пароль от сайта, а также задать необходимые вопросы!
+и пароль от сайта, получить доступ в наш чат сообщества, а также задать необходимые вопросы!
 
 ## Права на использование
 
-[Этот проект использует лицензию CC BY-NC 4.0](LICENSE)
+#### Перепродажа кода запрещена, ознакомьтесь с лицензией
+
+[Этот проект использует лицензию CC BY-NC 4.0](LICENSE)

assets/schema.sql

@@ -99,4 +99,16 @@ CREATE TABLE IF NOT EXISTS gifts
     recipient_tg_id BIGINT,                            
     CONSTRAINT fk_sender FOREIGN KEY (sender_tg_id) REFERENCES users (tg_id),  
     CONSTRAINT fk_recipient FOREIGN KEY (recipient_tg_id) REFERENCES users (tg_id)
-);
+);
+
+CREATE TABLE IF NOT EXISTS temporary_data (
+    tg_id BIGINT PRIMARY KEY NOT NULL,
+    state TEXT NOT NULL,
+    data JSONB NOT NULL,
+    updated_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP
+);
+
+CREATE TABLE IF NOT EXISTS blocked_users (
+    tg_id BIGINT PRIMARY KEY,
+    blocked_at TIMESTAMP DEFAULT NOW()
+);

backup.py

@@ -1,100 +1,164 @@
 import os
 import subprocess
-from datetime import datetime
+from datetime import datetime, timedelta
+from pathlib import Path
+from typing import Optional, Tuple, Union
 
+import aiofiles
 from aiogram.types import BufferedInputFile
 
-from config import ADMIN_ID, BACK_DIR, DB_NAME, DB_PASSWORD, DB_USER
+from bot import bot
+from config import ADMIN_ID, BACK_DIR, DB_NAME, DB_PASSWORD, DB_USER, PG_HOST, PG_PORT
 from logger import logger
 
 
-async def backup_database():
-    from bot import bot
+async def backup_database() -> Exception | None:
+    """
+    Создает резервную копию базы данных и отправляет ее администраторам.
+
+    Returns:
+        Optional[Exception]: Исключение в случае ошибки или None при успешном выполнении
+    """
+    backup_file_path, exception = _create_database_backup()
+
+    if exception:
+        logger.error(f"Ошибка при создании бэкапа базы данных: {exception}")
+        return exception
 
     try:
-        if backup_file_path := _create_database_backup():
-            await _send_backup_to_admin(bot, backup_file_path)
-            _cleanup_old_backups()
+        await _send_backup_to_admins(backup_file_path)
+        exception = _cleanup_old_backups()
+
+        if exception:
+            logger.error(f"Ошибка при удалении старых бэкапов базы данных: {exception}")
+            return exception
+
+        return None
     except Exception as e:
-        logger.error(f"Ошибка при создании или отправке бэкапа: {e}")
+        logger.error(f"Ошибка при отправке бэкапа базы данных: {e}")
+        return e
 
 
-def _create_database_backup():
-    USER = DB_USER
-    HOST = "localhost"
-    BACKUP_DIR = BACK_DIR
-    DATE = datetime.now().strftime("%Y-%m-%d-%H%M%S")
-    BACKUP_FILE = f"{BACKUP_DIR}/{DB_NAME}-backup-{DATE}.sql"
+def _create_database_backup() -> tuple[str | None, Exception | None]:
+    """
+    Создает резервную копию базы данных PostgreSQL.
 
-    os.environ["PGPASSWORD"] = DB_PASSWORD
+    Returns:
+        Tuple[Optional[str], Optional[Exception]]: Путь к файлу бэкапа и исключение (если произошла ошибка)
+    """
+    date_formatted = datetime.now().strftime("%Y-%m-%d-%H%M%S")
+
+    # Создаем директорию для бэкапов, если она не существует
+    backup_dir = Path(BACK_DIR)
+    backup_dir.mkdir(parents=True, exist_ok=True)
+
+    filename = backup_dir / f"{DB_NAME}-backup-{date_formatted}.sql"
 
     try:
+        # Устанавливаем пароль PostgreSQL через переменную окружения
+        os.environ["PGPASSWORD"] = DB_PASSWORD
+
+        # Запускаем pg_dump для создания бэкапа
         subprocess.run(
             [
                 "pg_dump",
                 "-U",
-                USER,
+                DB_USER,
                 "-h",
-                HOST,
+                PG_HOST,
+                "-p",
+                PG_PORT,
                 "-F",
                 "c",
                 "-f",
-                BACKUP_FILE,
+                str(filename),
                 DB_NAME,
             ],
             check=True,
+            capture_output=True,
+            text=True,
         )
-        logger.info(f"Бэкап базы данных создан: {BACKUP_FILE}")
-        return BACKUP_FILE
+        logger.info(f"Бэкап базы данных создан: {filename}")
+        return str(filename), None
     except subprocess.CalledProcessError as e:
-        logger.error(f"Ошибка при создании бэкапа базы данных: {e}")
-        return None
+        logger.error(f"Ошибка при выполнении pg_dump: {e.stderr}")
+        return None, e
+    except Exception as e:
+        logger.error(f"Непредвиденная ошибка при создании бэкапа: {e}")
+        return None, e
     finally:
-        del os.environ["PGPASSWORD"]
+        # Удаляем переменную окружения с паролем
+        if "PGPASSWORD" in os.environ:
+            del os.environ["PGPASSWORD"]
 
 
-async def _send_backup_to_admin(bot, backup_file_path):
+def _cleanup_old_backups() -> Exception | None:
+    """
+    Удаляет бэкапы старше 3 дней.
+
+    Returns:
+        Optional[Exception]: Исключение в случае ошибки или None при успешном выполнении
+    """
     try:
-        with open(backup_file_path, "rb") as backup_file:
-            backup_input_file = BufferedInputFile(
-                backup_file.read(), filename=os.path.basename(backup_file_path)
-            )
-            admin_ids: int | list[int] = ADMIN_ID
-            if isinstance(admin_ids, list):
-                for id in admin_ids:
-                    await bot.send_document(id, backup_input_file)
-                    logger.info(f"Бэкап базы данных отправлен админу: {id}")
-            else:
-                await bot.send_document(admin_ids, backup_input_file)
-                logger.info(f"Бэкап базы данных отправлен админу: {ADMIN_ID}")
+        backup_dir = Path(BACK_DIR)
+        if not backup_dir.exists():
+            return None
+
+        # Вычисляем дату, старше которой нужно удалить файлы
+        cutoff_date = datetime.now() - timedelta(days=3)
+
+        # Находим и удаляем старые файлы бэкапов
+        for backup_file in backup_dir.glob("*.sql"):
+            if backup_file.is_file():
+                file_mtime = datetime.fromtimestamp(backup_file.stat().st_mtime)
+                if file_mtime < cutoff_date:
+                    backup_file.unlink()
+                    logger.info(f"Удален старый бэкап: {backup_file}")
+
+        logger.info("Очистка старых бэкапов завершена")
+        return None
+    except Exception as e:
+        logger.error(f"Ошибка при удалении старых бэкапов: {e}")
+        return e
+
+
+async def create_backup_and_send_to_admins(client) -> None:
+    """
+    Создает бэкап и отправляет администраторам через переданный клиент.
+
+    Args:
+        client: Клиент для работы с базой данных
+    """
+    await client.login()
+    await client.database.export()
+
+
+async def _send_backup_to_admins(backup_file_path: str) -> None:
+    """
+    Отправляет файл бэкапа всем администраторам через Telegram.
+
+    Args:
+        backup_file_path: Путь к файлу бэкапа
+
+    Raises:
+        Exception: При ошибке отправки файла
+    """
+    if not backup_file_path or not os.path.exists(backup_file_path):
+        raise FileNotFoundError(f"Файл бэкапа не найден: {backup_file_path}")
+
+    try:
+        async with aiofiles.open(backup_file_path, "rb") as backup_file:
+            backup_data = await backup_file.read()
+            filename = os.path.basename(backup_file_path)
+            backup_input_file = BufferedInputFile(file=backup_data, filename=filename)
+
+            # Отправляем файл каждому администратору
+            for admin_id in ADMIN_ID:
+                try:
+                    await bot.send_document(chat_id=admin_id, document=backup_input_file)
+                    logger.info(f"Бэкап базы данных отправлен админу: {admin_id}")
+                except Exception as e:
+                    logger.error(f"Не удалось отправить бэкап админу {admin_id}: {e}")
     except Exception as e:
         logger.error(f"Ошибка при отправке бэкапа в Telegram: {e}")
-
-
-def _cleanup_old_backups():
-    try:
-        subprocess.run(
-            [
-                "find",
-                BACK_DIR,
-                "-type",
-                "f",
-                "-name",
-                "*.sql",
-                "-mtime",
-                "+3",
-                "-exec",
-                "rm",
-                "{}",
-                ";",
-            ],
-            check=True,
-        )
-        logger.info("Старые бэкапы удалены.")
-    except subprocess.CalledProcessError as e:
-        logger.error(f"Ошибка при удалении старых бэкапов: {e}")
-
-
-async def create_backup_and_send_to_admins(xui):
-    await xui.login()
-    await xui.database.export()
+        raise

bot.py

@@ -3,42 +3,89 @@ import traceback
 from aiogram import Bot, Dispatcher
 from aiogram.client.default import DefaultBotProperties
 from aiogram.enums import ParseMode
+from aiogram.exceptions import TelegramBadRequest, TelegramForbiddenError
+from aiogram.filters import ExceptionTypeFilter
 from aiogram.fsm.storage.memory import MemoryStorage
-from aiogram.types import ErrorEvent
+from aiogram.types import BufferedInputFile, ErrorEvent
+from aiogram.utils.markdown import hbold
 
-from config import API_TOKEN
+from config import ADMIN_ID, API_TOKEN
+from filters.private import IsPrivateFilter
 from logger import logger
-from middlewares.admin import AdminMiddleware
-from middlewares.database import DatabaseMiddleware
-from middlewares.delete import DeleteMessageMiddleware
-from middlewares.logging import LoggingMiddleware
-from middlewares.user import UserMiddleware
+from middlewares import register_middleware
 
 bot = Bot(token=API_TOKEN, default=DefaultBotProperties(parse_mode=ParseMode.HTML))
 storage = MemoryStorage()
 dp = Dispatcher(bot=bot, storage=storage)
 
-dp.message.middleware(LoggingMiddleware())
-dp.callback_query.middleware(LoggingMiddleware())
+version = "4.0"
 
-dp.message.middleware(AdminMiddleware())
-dp.callback_query.middleware(AdminMiddleware())
-dp.message.middleware(UserMiddleware())
-dp.callback_query.middleware(UserMiddleware())
+register_middleware(dp)
 
-dp.message.middleware(DatabaseMiddleware())
-dp.callback_query.middleware(DatabaseMiddleware())
-
-dp.message.outer_middleware(DeleteMessageMiddleware())
-dp.callback_query.outer_middleware(DeleteMessageMiddleware())
+dp.message.filter(IsPrivateFilter())
+dp.callback_query.filter(IsPrivateFilter())
 
 
-@dp.error()
-async def error_handler(event: ErrorEvent):
-    logger.error(
-        "Ошибка в боте:\n"
-        f"Исключение: {event.exception}\n"
-        f"Тип: {type(event.exception)}\n"
-        f"Update: {event.update}\n"
-        f"Трассировка:\n{traceback.format_exc()}"
-    )
+@dp.errors(ExceptionTypeFilter(Exception))
+async def errors_handler(
+    event: ErrorEvent,
+    bot: Bot,
+) -> bool:
+    if isinstance(event.exception, TelegramForbiddenError):
+        logger.info(f"User {event.update.message.from_user.id} заблокировал бота.")
+        return True
+
+    if isinstance(event.exception, TelegramBadRequest):
+        error_message = str(event.exception)
+
+        if (
+            "query is too old and response timeout expired or query ID is invalid" in error_message
+            or "message can't be deleted for everyone" in error_message
+            or "message to delete not found" in error_message
+        ):
+            logger.warning("Отправляем стартовое меню.")
+
+            try:
+                from handlers.start import handle_start_callback_query, start_command
+
+                if event.update.message:
+                    await start_command(
+                        event.update.message, state=dp.storage, session=None, admin=False, captcha=False
+                    )
+                elif event.update.callback_query:
+                    await handle_start_callback_query(
+                        event.update.callback_query, state=dp.storage, session=None, admin=False, captcha=False
+                    )
+            except Exception as e:
+                logger.error(f"Ошибка при показе стартового меню после ошибки: {e}")
+
+            return True
+    logger.exception(f"Update: {event.update}\nException: {event.exception}")
+    if not ADMIN_ID:
+        return True
+    try:
+        for admin_id in ADMIN_ID:
+            await bot.send_document(
+                chat_id=admin_id,
+                document=BufferedInputFile(
+                    traceback.format_exc().encode(),
+                    filename=f"error_{event.update.update_id}.txt",
+                ),
+                caption=f"{hbold(type(event.exception).__name__)}: {str(event.exception)[:1021]}...",
+            )
+        try:
+            from handlers.start import handle_start_callback_query, start_command
+
+            if event.update.message:
+                await start_command(event.update.message, state=dp.storage, session=None, admin=False, captcha=False)
+            elif event.update.callback_query:
+                await handle_start_callback_query(
+                    event.update.callback_query, state=dp.storage, session=None, admin=False, captcha=False
+                )
+        except Exception as e:
+            logger.error(f"Ошибка при показе стартового меню после ошибки: {e}")
+    except TelegramBadRequest as exception:
+        logger.warning(f"Failed to send error details: {exception}")
+    except Exception as exception:
+        logger.error(f"Unexpected error in error handler: {exception}")
+    return True

client.py

@@ -1,76 +1,106 @@
+from dataclasses import dataclass
+from typing import Any
+
 import py3xui
 
-from config import LIMIT_IP
+from config import LIMIT_IP, SUPERNODE
 from logger import logger
 
 
-async def add_client(
-    xui,
-    client_id: str,
-    email: str,
-    tg_id: str,
-    limit_ip: int,
-    total_gb: int,
-    expiry_time: int,
-    enable: bool,
-    flow: str,
-    inbound_id: int,
-):
+@dataclass
+class ClientConfig:
+    """Конфигурация клиента для добавления/обновления."""
+
+    client_id: str
+    email: str
+    tg_id: str
+    limit_ip: int
+    total_gb: int
+    expiry_time: int
+    enable: bool
+    flow: str
+    inbound_id: int
+    sub_id: str
+
+
+async def add_client(xui: py3xui.AsyncApi, config: ClientConfig) -> dict[str, Any]:
     """
-    Adds a client to the server via 3x-ui.
+    Добавляет клиента на сервер через 3x-ui.
+
+    Args:
+        xui: Экземпляр API клиента
+        config: Конфигурация клиента
+
+    Returns:
+        Dict[str, Any]: Результат операции в формате
+            {'status': 'success'|'failed'|'duplicate', 'error': str, 'email': str}
     """
     try:
         await xui.login()
 
         client = py3xui.Client(
-            id=client_id,
-            email=email.lower(),
-            limit_ip=limit_ip,
-            total_gb=total_gb,
-            expiry_time=expiry_time,
-            enable=enable,
-            tg_id=tg_id,
-            sub_id=email,
-            flow=flow,
+            id=config.client_id,
+            email=config.email.lower(),
+            limit_ip=config.limit_ip,
+            total_gb=config.total_gb,
+            expiry_time=config.expiry_time,
+            enable=config.enable,
+            tg_id=config.tg_id,
+            sub_id=config.sub_id,
+            flow=config.flow,
         )
 
-        response = await xui.client.add(inbound_id, [client])
-
-        logger.info(f"Клиент {email} успешно добавлен с ID {client_id}.")
+        response = await xui.client.add(config.inbound_id, [client])
+        logger.info(f"Клиент {config.email} успешно добавлен с ID {config.client_id}")
 
         return response if response else {"status": "failed"}
 
     except Exception as e:
-        logger.error(f"Ошибка при добавлении клиента {email}: {e}")
-        return {"status": "failed", "error": str(e)}
+        error_message = str(e)
+        if "Duplicate email" in error_message:
+            logger.warning(f"Дублированный email: {config.email}. Пропуск. Сообщение: {error_message}")
+            return {"status": "duplicate", "email": config.email}
+
+        logger.error(f"Ошибка при добавлении клиента {config.email}: {error_message}")
+        return {"status": "failed", "error": error_message}
 
 
 async def extend_client_key(
-    xui, inbound_id, email: str, new_expiry_time: int, client_id: str, total_gb: int
-):
+    xui: py3xui.AsyncApi, inbound_id: int, email: str, new_expiry_time: int, client_id: str, total_gb: int, sub_id: str
+) -> bool | None:
     """
-    Функция для обновления срока действия ключа клиента по email.
+    Обновляет срок действия ключа клиента.
+
+    Args:
+        xui: Экземпляр API клиента
+        inbound_id: ID входящего соединения
+        email: Email клиента
+        new_expiry_time: Новое время истечения
+        client_id: ID клиента
+        total_gb: Общий объем трафика
+        sub_id: ID подписки
+
+    Returns:
+        Optional[bool]: True если успешно, False если ошибка, None если клиент не найден
     """
-    await xui.login()
     try:
+        await xui.login()
         client = await xui.client.get_by_email(email)
 
         if not client:
-            logger.warning(f"Клиент с email {email} не найден.")
-            return
+            logger.warning(f"Клиент с email {email} не найден")
+            return None
 
         if not client.id:
-            logger.warning(f"Ошибка: клиент {email} не имеет действительного ID.")
-            return
+            logger.warning(f"Ошибка: клиент {email} не имеет действительного ID")
+            return None
 
-        logger.info(
-            f"Обновление ключа клиента {client.email} с ID {client.id} до нового времени: {new_expiry_time}"
-        )
+        logger.info(f"Обновление ключа клиента {email} с ID {client.id} до {new_expiry_time}")
 
         client.id = client_id
         client.expiry_time = new_expiry_time
         client.flow = "xtls-rprx-vision"
-        client.sub_id = email
+        client.sub_id = sub_id
         client.total_gb = total_gb
         client.enable = True
         client.limit_ip = LIMIT_IP
@@ -78,38 +108,120 @@ async def extend_client_key(
 
         await xui.client.update(client.id, client)
         await xui.client.reset_stats(inbound_id, email)
-        logger.info(
-            f"Ключ клиента {client.email} успешно продлён до {new_expiry_time}."
-        )
+        logger.info(f"Ключ клиента {email} успешно продлён до {new_expiry_time}")
+        return True
 
     except Exception as e:
         logger.error(f"Ошибка при обновлении клиента с email {email}: {e}")
+        return False
 
 
 async def delete_client(
-    xui,
+    xui: py3xui.AsyncApi,
     inbound_id: int,
     email: str,
     client_id: str,
 ) -> bool:
     """
-    Функция для удаления клиента с сервера 3x-ui.
-    Возвращает True при успешном удалении, иначе False.
+    Удаляет клиента с сервера 3x-ui.
+
+    Args:
+        xui: Экземпляр API клиента
+        inbound_id: ID входящего соединения
+        email: Email клиента
+        client_id: ID клиента
+
+    Returns:
+        bool: True если удаление успешно, False в противном случае
     """
-    await xui.login()
     try:
+        await xui.login()
+
+        if SUPERNODE:
+            await xui.client.delete(inbound_id, client_id)
+            logger.info(f"Клиент с ID {client_id} был удален успешно (SUPERNODE)")
+            return True
+
+        client = await xui.client.get_by_email(email)
+        if not client:
+            logger.warning(f"Клиент с email {email} и ID {client_id} не найден")
+            return False
+
+        client.id = client_id
+        await xui.client.delete(inbound_id, client.id)
+        logger.info(f"Клиент с ID {client_id} был удален успешно")
+        return True
+
+    except Exception as e:
+        logger.error(f"Ошибка при удалении клиента с ID {client_id}: {e}")
+        return False
+
+
+async def get_client_traffic(xui: py3xui.AsyncApi, client_id: str) -> dict[str, Any]:
+    """
+    Получает информацию о трафике пользователя по client_id.
+
+    Args:
+        xui: Экземпляр API клиента
+        client_id: UUID клиента
+
+    Returns:
+        dict[str, Any]: Информация о трафике пользователя или ошибка
+    """
+    try:
+        await xui.login()
+        traffic_data = await xui.client.get_traffic_by_id(client_id)
+
+        if not traffic_data:
+            logger.warning(f"Трафик для клиента {client_id} не найден.")
+            return {"status": "not_found", "client_id": client_id}
+
+        logger.info(f"Трафик для клиента {client_id} успешно получен.")
+        return {"status": "success", "client_id": client_id, "traffic": traffic_data}
+
+    except Exception as e:
+        logger.error(f"Ошибка при получении трафика клиента {client_id}: {e}")
+        return {"status": "error", "error": str(e)}
+
+
+async def toggle_client(xui: py3xui.AsyncApi, inbound_id: int, email: str, client_id: str, enable: bool = True) -> bool:
+    """
+    Функция для включения/отключения клиента на сервере 3x-ui.
+
+    Args:
+        xui: Экземпляр API клиента
+        inbound_id: ID инбаунда
+        email: Email клиента
+        client_id: UUID клиента
+        enable: True для включения, False для отключения
+
+    Returns:
+        bool: True при успешном выполнении, False при ошибке
+    """
+    try:
+        await xui.login()
+
+        # Получаем клиента по email
         client = await xui.client.get_by_email(email)
 
         if not client:
             logger.warning(f"Клиент с email {email} и ID {client_id} не найден.")
             return False
 
+        # Обновляем параметры клиента
+        client.enable = enable
         client.id = client_id
+        client.flow = "xtls-rprx-vision"
+        client.limit_ip = LIMIT_IP
+        client.inbound_id = inbound_id
 
-        await xui.client.delete(inbound_id, client.id)
-        logger.info(f"Клиент с ID {client_id} был удален успешно.")
+        # Обновляем клиента
+        await xui.client.update(client.id, client)
+        status = "включен" if enable else "отключен"
+        logger.info(f"Клиент с email {email} и ID {client_id} успешно {status}.")
         return True
 
     except Exception as e:
-        logger.error(f"Ошибка при удалении клиента с ID {client_id}: {e}")
+        status = "включении" if enable else "отключении"
+        logger.error(f"Ошибка при {status} клиента с email {email} и ID {client_id}: {e}")
         return False

filters/admin.py

@@ -1,4 +1,3 @@
-
 from aiogram.filters import BaseFilter
 from aiogram.types import Message
 
@@ -8,9 +7,6 @@ from config import ADMIN_ID
 class IsAdminFilter(BaseFilter):
     async def __call__(self, message: Message) -> bool:
         try:
-            admin_ids: int | list[int] = ADMIN_ID
-            if isinstance(admin_ids, list):
-                return message.from_user.id in admin_ids
-            return message.from_user.id == admin_ids
+            return message.from_user.id in ADMIN_ID
         except Exception:
             return False

filters/private.py

@@ -0,0 +1,8 @@
+from aiogram.enums import ChatType
+from aiogram.filters import BaseFilter
+from aiogram.types import Chat, TelegramObject
+
+
+class IsPrivateFilter(BaseFilter):
+    async def __call__(self, event: TelegramObject, event_chat: Chat) -> bool:
+        return event_chat.type == ChatType.PRIVATE

handlers/__init__.py

@@ -3,6 +3,7 @@ __all__ = ("router",)
 from aiogram import Router
 
 from .admin import router as admin_router
+from .captcha import router as captcha_router
 from .coupons import router as coupons_router
 from .donate import router as donate_router
 from .instructions import router as instructions_router
@@ -17,6 +18,7 @@ router = Router(name="handlers_main_router")
 
 router.include_routers(
     start_router,
+    captcha_router,
     profile_router,
     pay_router,
     donate_router,

handlers/admin/__init__.py

@@ -2,16 +2,26 @@ __all__ = ("router",)
 
 from aiogram import Router
 
+from .admin_backups import router as backups_router
+from .admin_bans import router as bans_router
 from .admin_coupons import router as coupons_router
 from .admin_panel import router as panel_router
+from .admin_restart import router as restart_router
+from .admin_sender import router as sender_router
 from .admin_servers import router as servers_router
-from .admin_user_editor import router as user_editor_router
+from .admin_stats import router as stats_router
+from .admin_users import router as users_router
 
 router = Router(name="admins_main_router")
 
 router.include_routers(
     panel_router,
     servers_router,
+    users_router,
+    stats_router,
+    backups_router,
+    sender_router,
     coupons_router,
-    user_editor_router,
+    restart_router,
+    bans_router,
 )

handlers/admin/admin_backups.py

@@ -0,0 +1,29 @@
+from aiogram import F, Router
+from aiogram.types import CallbackQuery
+
+from backup import backup_database
+from filters.admin import IsAdminFilter
+from keyboards.admin.panel_kb import AdminPanelCallback, build_admin_back_kb
+
+router = Router()
+
+
+@router.callback_query(
+    AdminPanelCallback.filter(F.action == "backups"),
+    IsAdminFilter(),
+)
+async def handle_backups(callback_query: CallbackQuery):
+    kb = build_admin_back_kb("management")
+
+    await callback_query.message.edit_text(
+        text="💾 Инициализация резервного копирования базы данных...", reply_markup=kb
+    )
+
+    exception = await backup_database()
+
+    if exception:
+        text = f"❌ Ошибка при создании резервной копии: {exception}"
+    else:
+        text = "✅ Резервная копия успешно создана и отправлена администраторам."
+
+    await callback_query.message.edit_text(text=text, reply_markup=kb)

handlers/admin/admin_bans.py

@@ -0,0 +1,92 @@
+from typing import Any
+
+from aiogram import F, Router
+from aiogram.types import BufferedInputFile, CallbackQuery
+
+from database import delete_user_data
+from filters.admin import IsAdminFilter
+from keyboards.admin.bans_kb import build_bans_kb
+from keyboards.admin.panel_kb import AdminPanelCallback, build_admin_back_kb
+
+router = Router()
+
+
+@router.callback_query(
+    AdminPanelCallback.filter(F.action == "bans"),
+    IsAdminFilter(),
+)
+async def handle_bans(callback_query: CallbackQuery):
+    text = "🚫 Заблокировавшие бота\n\nЗдесь можно просматривать и удалять пользователей, которые забанили вашего бота!"
+
+    await callback_query.message.edit_text(
+        text=text,
+        reply_markup=build_bans_kb(),
+    )
+
+
+@router.callback_query(
+    AdminPanelCallback.filter(F.action == "bans_export"),
+    IsAdminFilter(),
+)
+async def handle_bans_export(callback_query: CallbackQuery, session: Any):
+    kb = build_admin_back_kb("management")
+
+    try:
+        banned_users = await session.fetch("SELECT tg_id, blocked_at FROM blocked_users")
+
+        import csv
+        import io
+
+        csv_output = io.StringIO()
+        writer = csv.writer(csv_output)
+        writer.writerow(["tg_id", "blocked_at"])
+        for user in banned_users:
+            writer.writerow([user["tg_id"], user["blocked_at"]])
+
+        csv_output.seek(0)
+
+        document = BufferedInputFile(file=csv_output.getvalue().encode("utf-8"), filename="banned_users.csv")
+
+        await callback_query.message.answer_document(
+            document=document,
+            caption="📥 Экспорт пользователей, заблокировавших бота в CSV",
+        )
+    except Exception as e:
+        await callback_query.message.answer(
+            text=f"❗ Произошла ошибка при экспорте: {e}",
+            reply_markup=kb,
+        )
+
+
+@router.callback_query(
+    AdminPanelCallback.filter(F.action == "bans_delete_banned"),
+    IsAdminFilter(),
+)
+async def handle_bans_delete_banned(callback_query: CallbackQuery, session: Any):
+    kb = build_admin_back_kb("bans")
+
+    try:
+        blocked_users = await session.fetch("SELECT tg_id FROM blocked_users")
+        blocked_ids = [record["tg_id"] for record in blocked_users]
+
+        if not blocked_ids:
+            await callback_query.message.answer(
+                text="📂 Нет заблокировавших пользователей для удаления.",
+                reply_markup=kb,
+            )
+            return
+
+        for tg_id in blocked_ids:
+            await delete_user_data(session, tg_id)
+
+        await session.execute("DELETE FROM blocked_users WHERE tg_id = ANY($1)", blocked_ids)
+
+        await callback_query.message.answer(
+            text=f"🗑️ Удалены данные о {len(blocked_ids)} пользователях и связанных записях.",
+            reply_markup=kb,
+        )
+    except Exception as e:
+        await callback_query.message.answer(
+            text=f"❗ Произошла ошибка при удалении записей: {e}",
+            reply_markup=kb,
+        )

handlers/admin/admin_coupons.py

@@ -3,131 +3,67 @@ from typing import Any
 from aiogram import F, Router, types
 from aiogram.fsm.context import FSMContext
 from aiogram.fsm.state import State, StatesGroup
-from aiogram.types import InlineKeyboardButton
-from aiogram.utils.keyboard import InlineKeyboardBuilder
+from aiogram.types import CallbackQuery, Message
 
-from database import create_coupon, delete_coupon_from_db, get_all_coupons
+from config import USERNAME_BOT
+from database import create_coupon, delete_coupon, get_all_coupons
 from filters.admin import IsAdminFilter
+from keyboards.admin.coupons_kb import AdminCouponDeleteCallback, build_coupons_kb, build_coupons_list_kb
+from keyboards.admin.panel_kb import AdminPanelCallback, build_admin_back_kb
 from logger import logger
 
+router = Router()
+
 
 class AdminCouponsState(StatesGroup):
     waiting_for_coupon_data = State()
 
 
-router = Router()
-
-
-@router.callback_query(F.data == "coupons_editor", IsAdminFilter())
-async def show_coupon_management_menu(
-    callback_query: types.CallbackQuery, state: FSMContext
+@router.callback_query(
+    AdminPanelCallback.filter(F.action == "coupons"),
+    IsAdminFilter(),
+)
+async def handle_coupons(
+    callback_query: CallbackQuery,
 ):
-    await state.clear()
-    builder = InlineKeyboardBuilder()
-    builder.row(
-        InlineKeyboardButton(text="➕ Создать купон", callback_data="create_coupon")
-    )
-    builder.row(InlineKeyboardButton(text="Купоны", callback_data="coupons"))
-    builder.row(InlineKeyboardButton(text="🔙 Назад", callback_data="admin"))
-    await callback_query.message.answer(
-        "🛠 Меню управления купонами:", reply_markup=builder.as_markup()
-    )
+    await callback_query.message.edit_text(text="🛠 Меню управления купонами:", reply_markup=build_coupons_kb())
 
 
-@router.callback_query(F.data == "coupons", IsAdminFilter())
-async def show_coupon_list(callback_query: types.CallbackQuery, session: Any):
-    try:
-        coupons = await get_all_coupons(session)
-
-        if not coupons:
-            builder = InlineKeyboardBuilder()
-            builder.row(
-                InlineKeyboardButton(text="🔙 Назад", callback_data="coupons_editor")
-            )
-
-            await callback_query.message.answer(
-                "❌ На данный момент нет доступных купонов. 🚫\nВы можете вернуться в меню управления. 🔙",
-                reply_markup=builder.as_markup(),
-            )
-            return
-
-        coupon_list = "📜 Список всех купонов:\n\n"
-        builder = InlineKeyboardBuilder()
-
-        for coupon in coupons:
-            coupon_list += (
-                f"🏷️ <b>Код:</b> {coupon['code']}\n"
-                f"💰 <b>Сумма:</b> {coupon['amount']} рублей\n"
-                f"🔢 <b>Лимит использования:</b> {coupon['usage_limit']} раз\n"
-                f"✅ <b>Использовано:</b> {coupon['usage_count']} раз\n\n"
-            )
-
-            builder.row(
-                InlineKeyboardButton(
-                    text=f"❌ Удалить {coupon['code']}",
-                    callback_data=f"delete_coupon_{coupon['code']}",
-                )
-            )
-
-        builder.row(
-            InlineKeyboardButton(text="🔙 Назад", callback_data="coupons_editor")
-        )
-        await callback_query.message.answer(
-            coupon_list, reply_markup=builder.as_markup()
-        )
-
-    except Exception as e:
-        logger.error(f"Ошибка при получении списка купонов: {e}")
-
-
-@router.callback_query(F.data.startswith("delete_coupon_"), IsAdminFilter())
-async def handle_delete_coupon(callback_query: types.CallbackQuery, session: Any):
-    coupon_code = callback_query.data[len("delete_coupon_") :]
-
-    try:
-        result = await delete_coupon_from_db(coupon_code, session)
-
-        if result:
-            await show_coupon_list(callback_query, session)
-        else:
-            await callback_query.message.answer(
-                f"❌ Купон с кодом <b>{coupon_code}</b> не найден.",
-            )
-            await show_coupon_list(callback_query, session)
-
-    except Exception as e:
-        logger.error(f"Ошибка при удалении купона: {e}")
-
-
-@router.callback_query(F.data == "create_coupon", IsAdminFilter())
-async def handle_create_coupon(callback_query: types.CallbackQuery, state: FSMContext):
-    builder = InlineKeyboardBuilder()
-    builder.row(InlineKeyboardButton(text="🔙 Назад", callback_data="coupons_editor"))
-
-    await callback_query.message.answer(
+@router.callback_query(
+    AdminPanelCallback.filter(F.action == "coupons_create"),
+    IsAdminFilter(),
+)
+async def handle_coupons_create(callback_query: CallbackQuery, state: FSMContext):
+    text = (
         "🎫 <b>Введите данные для создания купона в формате:</b>\n\n"
         "📝 <i>код</i> 💰 <i>сумма</i> 🔢 <i>лимит</i>\n\n"
-        "Пример: <b>'COUPON1 50 5'</b> 👈\n\n",
-        reply_markup=builder.as_markup(),
+        "Пример: <b>'COUPON1 50 5'</b> 👈\n\n"
+    )
+
+    await callback_query.message.edit_text(
+        text=text,
+        reply_markup=build_admin_back_kb("coupons"),
     )
     await state.set_state(AdminCouponsState.waiting_for_coupon_data)
 
 
 @router.message(AdminCouponsState.waiting_for_coupon_data, IsAdminFilter())
-async def process_coupon_data(message: types.Message, state: FSMContext, session: Any):
+async def handle_coupon_data_input(message: Message, state: FSMContext, session: Any):
     text = message.text.strip()
-
     parts = text.split()
 
-    builder = InlineKeyboardBuilder()
-    builder.row(InlineKeyboardButton(text="🔙 Назад", callback_data="coupons_editor"))
+    kb = build_admin_back_kb("coupons")
 
     if len(parts) != 3:
-        await message.answer(
+        text = (
             "❌ <b>Некорректный формат!</b> 📝 Пожалуйста, введите данные в формате:\n"
             "🏷️ <b>код</b> 💰 <b>сумма</b> 🔢 <b>лимит</b>\n"
-            "Пример: <b>'COUPON1 50 5'</b> 👈",
-            reply_markup=builder.as_markup(),
+            "Пример: <b>'COUPON1 50 5'</b> 👈"
+        )
+
+        await message.answer(
+            text=text,
+            reply_markup=kb,
         )
         return
 
@@ -136,29 +72,101 @@ async def process_coupon_data(message: types.Message, state: FSMContext, session
         coupon_amount = float(parts[1])
         usage_limit = int(parts[2])
     except ValueError:
+        text = "⚠️ <b>Проверьте правильность введенных данных!</b>\n💱 Сумма должна быть числом, а лимит — целым числом."
+
         await message.answer(
-            "⚠️ <b>Проверьте правильность введенных данных!</b>\n"
-            "💱 Сумма должна быть числом, 🔢 а лимит — целым числом.",
-            reply_markup=builder.as_markup(),
+            text=text,
+            reply_markup=kb,
         )
         return
 
     try:
         await create_coupon(coupon_code, coupon_amount, usage_limit, session)
 
-        result_message = (
-            f"✅ Купон с кодом <b>{coupon_code}</b> успешно создан! 🎉\n"
-            f"Сумма: <b>{coupon_amount} рублей</b> 💰\n"
-            f"Лимит использования: <b>{usage_limit} раз</b> 🔢."
+        text = (
+            f"✅ Купон с кодом <b>{coupon_code}</b> успешно создан!\n"
+            f"💰 Сумма: <b>{coupon_amount} рублей</b> \n"
+            f"🔢 Лимит использования: <b>{usage_limit} раз</b>\n"
+            f"🔗 <b>Ссылка:</b> <code>https://t.me/{USERNAME_BOT}?start=coupons_{coupon_code}</code>\n"
         )
 
-        builder = InlineKeyboardBuilder()
-        builder.row(
-            InlineKeyboardButton(text="🔙 Назад", callback_data="coupons_editor")
-        )
-
-        await message.answer(result_message, reply_markup=builder.as_markup())
+        await message.answer(text=text, reply_markup=kb)
         await state.clear()
 
     except Exception as e:
         logger.error(f"Ошибка при создании купона: {e}")
+
+
+@router.callback_query(
+    AdminPanelCallback.filter(F.action == "coupons_list"),
+    IsAdminFilter(),
+)
+async def handle_coupons_list(callback_query: CallbackQuery, session: Any):
+    try:
+        data = AdminPanelCallback.unpack(callback_query.data)
+        page = data.page if data.page is not None else 1
+        per_page = 10
+        result = await get_all_coupons(session, page, per_page)
+        coupons = result["coupons"]
+
+        if not coupons:
+            await callback_query.message.edit_text(
+                text="❌ На данный момент нет доступных купонов!",
+                reply_markup=build_admin_back_kb("coupons"),
+            )
+            return
+
+        kb = build_coupons_list_kb(coupons, result["current_page"], result["pages"])
+        coupon_list = "📜 Список всех купонов:\n\n"
+        for coupon in coupons:
+            coupon_list += (
+                f"🏷️ <b>Код:</b> {coupon['code']}\n"
+                f"💰 <b>Сумма:</b> {coupon['amount']} рублей\n"
+                f"🔢 <b>Лимит использования:</b> {coupon['usage_limit']} раз\n"
+                f"✅ <b>Использовано:</b> {coupon['usage_count']} раз\n"
+                f"🔗 <b>Ссылка:</b> <code>https://t.me/{USERNAME_BOT}?start=coupons_{coupon['code']}</code>\n"
+            )
+        await callback_query.message.edit_text(text=coupon_list, reply_markup=kb)
+    except Exception as e:
+        logger.error(f"Ошибка при получении списка купонов: {e}")
+        await callback_query.message.answer("Произошла ошибка при получении списка купонов.")
+
+
+@router.callback_query(AdminCouponDeleteCallback.filter(), IsAdminFilter())
+async def handle_coupon_delete(callback_query: CallbackQuery, callback_data: AdminCouponDeleteCallback, session: Any):
+    coupon_code = callback_data.coupon_code
+    try:
+        result = await delete_coupon(coupon_code, session)
+        if result:
+            await callback_query.message.edit_text(f"Купон {coupon_code} удалён!")
+        else:
+            await callback_query.message.edit_text(f"❌ Купон с кодом {coupon_code} не найден.", show_alert=True)
+        await update_coupons_list(callback_query.message, session)
+    except Exception as e:
+        logger.error(f"Ошибка при удалении купона: {e}")
+        await callback_query.message.edit_text("Произошла ошибка при удалении купона.", show_alert=True)
+
+
+async def update_coupons_list(message, session: Any, page: int = 1):
+    per_page = 10
+    result = await get_all_coupons(session, page, per_page)
+    coupons = result["coupons"]
+
+    if not coupons:
+        await message.edit_text(
+            text="❌ На данный момент нет доступных купонов!",
+            reply_markup=build_admin_back_kb("coupons"),
+        )
+        return
+
+    kb = build_coupons_list_kb(coupons, result["current_page"], result["pages"])
+    coupon_list = "📜 Список всех купонов:\n\n"
+    for coupon in coupons:
+        coupon_list += (
+            f"🏷️ <b>Код:</b> {coupon['code']}\n"
+            f"💰 <b>Сумма:</b> {coupon['amount']} рублей\n"
+            f"🔢 <b>Лимит использования:</b> {coupon['usage_limit']} раз\n"
+            f"✅ <b>Использовано:</b> {coupon['usage_count']} раз\n"
+            f"🔗 <b>Ссылка:</b> <code>https://t.me/{USERNAME_BOT}?start=coupons_{coupon['code']}</code>\n"
+        )
+    await message.edit_text(text=coupon_list, reply_markup=kb)

handlers/admin/admin_panel.py

@@ -1,28 +1,30 @@
-import subprocess
-from datetime import datetime
-from io import BytesIO
-from typing import Any
-
-from aiogram import F, Router, types
+from aiogram import F, Router
 from aiogram.filters import Command
 from aiogram.fsm.context import FSMContext
-from aiogram.fsm.state import State, StatesGroup
-from aiogram.types import BufferedInputFile, CallbackQuery, InlineKeyboardButton
-from aiogram.utils.keyboard import InlineKeyboardBuilder
+from aiogram.types import CallbackQuery, Message
 
-from backup import backup_database
-from bot import bot
+from bot import version
 from filters.admin import IsAdminFilter
-from logger import logger
+from keyboards.admin.panel_kb import AdminPanelCallback, build_management_kb, build_panel_kb
 
 router = Router()
 
 
-class UserEditorState(StatesGroup):
-    waiting_for_tg_id = State()
-    displaying_user_info = State()
-    waiting_for_restart_confirmation = State()
-    waiting_for_message = State()
+@router.callback_query(AdminPanelCallback.filter(F.action == "admin"), IsAdminFilter())
+async def handle_admin_callback_query(callback_query: CallbackQuery, state: FSMContext):
+    text = f"🤖 Панель администратора\n📌 Версия бота: {version}"
+
+    await state.clear()
+
+    if callback_query.message.text:
+        await callback_query.message.edit_text(text=text, reply_markup=build_panel_kb())
+    else:
+        try:
+            await callback_query.message.delete()
+        except Exception as e:
+            print(f"Ошибка при удалении сообщения: {e}")
+
+        await callback_query.message.answer(text=text, reply_markup=build_panel_kb())
 
 
 @router.callback_query(F.data == "admin", IsAdminFilter())
@@ -30,362 +32,17 @@ async def handle_admin_callback_query(callback_query: CallbackQuery, state: FSMC
     await handle_admin_message(callback_query.message, state)
 
 
-@router.message(Command("admin"), F.data == "admin", IsAdminFilter())
-async def handle_admin_message(message: types.Message, state: FSMContext):
-    await state.clear()
-
-    BOT_VERSION = "3.2.4-beta"  # Укажите текущую версию бота
-
-    builder = InlineKeyboardBuilder()
-    builder.row(
-        InlineKeyboardButton(
-            text="📊 Статистика пользователей", callback_data="user_stats"
-        )
-    )
-    builder.row(
-        InlineKeyboardButton(
-            text="👥 Управление пользователями", callback_data="user_editor"
-        )
-    )
-    builder.row(
-        InlineKeyboardButton(
-            text="🖥️ Управление серверами", callback_data="servers_editor"
-        )
-    )
-    builder.row(
-        InlineKeyboardButton(
-            text="🎟️ Управление купонами", callback_data="coupons_editor"
-        )
-    )
-    builder.row(
-        InlineKeyboardButton(text="📢 Массовая рассылка", callback_data="send_to_alls")
-    )
-    builder.row(
-        InlineKeyboardButton(
-            text="🤖 Управление Ботом", callback_data="bot_management"
-        )
-    )
-    builder.row(
-        InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile")
-    )
-    await message.answer(
-        f"🤖 Панель администратора\n\nВерсия бота: <b>{BOT_VERSION}</b>",
-        reply_markup=builder.as_markup(),
-        parse_mode="HTML"
-    )
-
-
-@router.callback_query(F.data == "bot_management")
-async def handle_bot_management(callback_query: types.CallbackQuery):
-    builder = InlineKeyboardBuilder()
-    builder.row(
-        InlineKeyboardButton(text="💾 Создать резервную копию", callback_data="backups")
-    )
-    builder.row(
-        InlineKeyboardButton(text="🔄 Перезагрузить бота", callback_data="restart_bot")
-    )
-    builder.row(
-        InlineKeyboardButton(text="⬅️ Назад", callback_data="admin")
-    )
-    await callback_query.message.answer(
-        "🤖 Управление ботом",
-        reply_markup=builder.as_markup(),
-    )
-
-
-@router.callback_query(F.data == "user_stats", IsAdminFilter())
-async def user_stats_menu(callback_query: CallbackQuery, session: Any):
-    try:
-        total_users = await session.fetchval("SELECT COUNT(*) FROM connections")
-        total_keys = await session.fetchval("SELECT COUNT(*) FROM keys")
-        total_referrals = await session.fetchval("SELECT COUNT(*) FROM referrals")
-
-        total_payments_today = await session.fetchval(
-            "SELECT COALESCE(SUM(amount), 0) FROM payments WHERE created_at >= CURRENT_DATE"
-        )
-        total_payments_week = await session.fetchval(
-            "SELECT COALESCE(SUM(amount), 0) FROM payments WHERE created_at >= date_trunc('week', CURRENT_DATE)"
-        )
-        total_payments_month = await session.fetchval(
-            "SELECT COALESCE(SUM(amount), 0) FROM payments WHERE created_at >= date_trunc('month', CURRENT_DATE)"
-        )
-        total_payments_all_time = await session.fetchval(
-            "SELECT COALESCE(SUM(amount), 0) FROM payments"
-        )
-
-        active_keys = await session.fetchval(
-            "SELECT COUNT(*) FROM keys WHERE expiry_time > $1",
-            int(datetime.utcnow().timestamp() * 1000),
-        )
-        expired_keys = total_keys - active_keys
-
-        stats_message = (
-            f"📊 <b>Подробная статистика проекта:</b>\n\n"
-            f"👥 Пользователи:\n"
-            f"   🌐 Зарегистрировано: <b>{total_users}</b>\n"
-            f"   🤝 Привлеченных рефералов: <b>{total_referrals}</b>\n\n"
-            f"🔑 Ключи:\n"
-            f"   🌈 Всего сгенерировано: <b>{total_keys}</b>\n"
-            f"   ✅ Действующих: <b>{active_keys}</b>\n"
-            f"   ❌ Просроченных: <b>{expired_keys}</b>\n\n"
-            f"💰 Финансовая статистика:\n"
-            f"   📅 За день: <b>{total_payments_today} ₽</b>\n"
-            f"   📆 За неделю: <b>{total_payments_week} ₽</b>\n"
-            f"   📆 За месяц: <b>{total_payments_month} ₽</b>\n"
-            f"   🏦 За все время: <b>{total_payments_all_time} ₽</b>\n"
-        )
-
-        builder = InlineKeyboardBuilder()
-        builder.row(
-            InlineKeyboardButton(text="🔄 Обновить", callback_data="user_stats")
-        )
-        builder.row(
-            InlineKeyboardButton(
-                text="📥 Выгрузить пользователей в CSV",
-                callback_data="export_users_csv",
-            )
-        )
-        builder.row(
-            InlineKeyboardButton(
-                text="📥 Выгрузить оплаты в CSV", callback_data="export_payments_csv"
-            )
-        )
-        builder.row(
-            InlineKeyboardButton(text="🔙 Вернуться в меню", callback_data="admin")
-        )
-
-        await callback_query.message.answer(
-            stats_message, reply_markup=builder.as_markup()
-        )
-    except Exception as e:
-        logger.error(f"Error in user_stats_menu: {e}")
-
-
-@router.callback_query(F.data == "export_users_csv", IsAdminFilter())
-async def export_users_csv(callback_query: CallbackQuery, session: Any):
-    builder = InlineKeyboardBuilder()
-    builder.row(InlineKeyboardButton(text="🔙 Назад", callback_data="user_stats"))
-    try:
-        users = await session.fetch(
-            """
-            SELECT 
-                u.tg_id, 
-                u.username, 
-                u.first_name, 
-                u.last_name, 
-                u.language_code, 
-                u.is_bot, 
-                c.balance, 
-                c.trial 
-            FROM users u
-            LEFT JOIN connections c ON u.tg_id = c.tg_id
-        """
-        )
-
-        if not users:
-            await callback_query.message.answer(
-                "📭 Нет пользователей для экспорта.", reply_markup=builder.as_markup()
-            )
-            return
-
-        csv_data = "tg_id,username,first_name,last_name,language_code,is_bot,balance,trial\n"
-        for user in users:
-            csv_data += f"{user['tg_id']},{user['username']},{user['first_name']},{user['last_name']},{user['language_code']},{user['is_bot']},{user['balance']},{user['trial']}\n"
-
-        file_name = BytesIO(csv_data.encode("utf-8-sig"))
-        file_name.seek(0)
-
-        file = BufferedInputFile(file_name.getvalue(), filename="users_export.csv")
-
-        await callback_query.message.answer_document(
-            file,
-            caption="📥 Экспорт пользователей в CSV",
-            reply_markup=builder.as_markup(),
-        )
-        file_name.close()
-
-    except Exception as e:
-        logger.error(f"Ошибка при экспорте пользователей в CSV: {e}")
-        await callback_query.message.answer(
-            "❗ Произошла ошибка при экспорте пользователей.",
-            reply_markup=builder.as_markup(),
-        )
-
-
-@router.callback_query(F.data == "export_payments_csv", IsAdminFilter())
-async def export_payments_csv(callback_query: CallbackQuery, session: Any):
-    builder = InlineKeyboardBuilder()
-    builder.row(InlineKeyboardButton(text="🔙 Назад", callback_data="user_stats"))
-    try:
-        payments = await session.fetch(
-            """
-            SELECT 
-                u.tg_id, 
-                u.username, 
-                u.first_name, 
-                u.last_name, 
-                p.amount, 
-                p.payment_system,
-                p.status,
-                p.created_at 
-            FROM users u
-            JOIN payments p ON u.tg_id = p.tg_id
-        """
-        )
-
-        if not payments:
-            await callback_query.message.answer(
-                "📭 Нет платежей для экспорта.", reply_markup=builder.as_markup()
-            )
-            return
-
-        csv_data = "tg_id,username,first_name,last_name,amount,payment_system,status,created_at\n"  # Заголовки CSV
-        for payment in payments:
-            csv_data += f"{payment['tg_id']},{payment['username']},{payment['first_name']},{payment['last_name']},{payment['amount']},{payment['payment_system']},{payment['status']},{payment['created_at']}\n"
-
-        file_name = BytesIO(csv_data.encode("utf-8-sig"))
-        file_name.seek(0)
-
-        file = BufferedInputFile(file_name.getvalue(), filename="payments_export.csv")
-
-        await callback_query.message.answer_document(
-            file, caption="📥 Экспорт платежей в CSV", reply_markup=builder.as_markup()
-        )
-        file_name.close()
-
-    except Exception as e:
-        logger.error(f"Ошибка при экспорте платежей в CSV: {e}")
-        await callback_query.message.answer(
-            "❗ Произошла ошибка при экспорте платежей.",
-            reply_markup=builder.as_markup(),
-        )
-
-
-@router.callback_query(F.data == "send_to_alls", IsAdminFilter())
-async def handle_send_to_all(callback_query: CallbackQuery, state: FSMContext):
-    builder = InlineKeyboardBuilder()
-    builder.row(InlineKeyboardButton(text="🔙 Назад", callback_data="admin"))
-    await callback_query.message.answer(
-        "✍️ Введите текст сообщения, который вы хотите отправить всем клиентам 📢🌐:",
-        reply_markup=builder.as_markup(),
-    )
-    await state.set_state(UserEditorState.waiting_for_message)
-
-
-@router.message(UserEditorState.waiting_for_message, IsAdminFilter())
-async def process_message_to_all(
-    message: types.Message, state: FSMContext, session: Any
-):
-    text_message = message.text
-
-    try:
-        tg_ids = await session.fetch("SELECT tg_id FROM connections")
-
-        total_users = len(tg_ids)
-        success_count = 0
-        error_count = 0
-
-        for record in tg_ids:
-            tg_id = record["tg_id"]
-            try:
-                await bot.send_message(chat_id=tg_id, text=text_message)
-                success_count += 1
-            except Exception as e:
-                error_count += 1
-                logger.error(
-                    f"❌ Ошибка при отправке сообщения пользователю {tg_id}: {e}"
-                )
-
-        await message.answer(
-            f"📤 Рассылка завершена:\n"
-            f"👥 Всего пользователей: {total_users}\n"
-            f"✅ Успешно отправлено: {success_count}\n"
-            f"❌ Не доставлено: {error_count}"
-        )
-    except Exception as e:
-        logger.error(f"❗ Ошибка при подключении к базе данных: {e}")
+@router.message(Command("admin"), IsAdminFilter())
+async def handle_admin_message(message: Message, state: FSMContext):
+    text = f"🤖 Панель администратора\n📌 Версия бота: {version}"
 
     await state.clear()
+    await message.answer(text=text, reply_markup=build_panel_kb())
 
 
-@router.callback_query(F.data == "backups", IsAdminFilter())
-async def handle_backup(callback_query: CallbackQuery, state: FSMContext):
-    await callback_query.message.answer(
-        "💾 Инициализация резервного копирования базы данных..."
-    )
-    await backup_database()
-    await callback_query.message.answer(
-        "✅ Резервная копия успешно создана и отправлена администратору."
-    )
-
-
-@router.callback_query(F.data == "restart_bot", IsAdminFilter())
-async def handle_restart(callback_query: CallbackQuery, state: FSMContext):
-    await state.set_state(UserEditorState.waiting_for_restart_confirmation)
-    builder = InlineKeyboardBuilder()
-    builder.row(
-        InlineKeyboardButton(
-            text="✅ Да, перезапустить", callback_data="confirm_restart"
-        ),
-        InlineKeyboardButton(text="❌ Нет, отмена", callback_data="admin"),
-    )
-    builder.row(InlineKeyboardButton(text="🔙 Вернуться в меню", callback_data="admin"))
-    await callback_query.message.answer(
-        "🤔 Вы уверены, что хотите перезапустить бота?",
-        reply_markup=builder.as_markup(),
-    )
-
-
-@router.callback_query(
-    F.data == "confirm_restart",
-    UserEditorState.waiting_for_restart_confirmation,
-    IsAdminFilter(),
-)
-async def confirm_restart_bot(callback_query: CallbackQuery, state: FSMContext):
-    builder = InlineKeyboardBuilder()
-    builder.row(InlineKeyboardButton(text="🔙 Вернуться в меню", callback_data="admin"))
-    try:
-        subprocess.run(
-            ["sudo", "systemctl", "restart", "bot.service"],
-            check=True,
-            capture_output=True,
-            text=True,
-        )
-        await state.clear()
-        await callback_query.message.answer(
-            "🔄 Бот успешно перезапущен.", reply_markup=builder.as_markup()
-        )
-    except subprocess.CalledProcessError:
-        await callback_query.message.answer(
-            "🔄 Бот успешно перезапущен.", reply_markup=builder.as_markup()
-        )
-    except Exception as e:
-        await callback_query.message.answer(
-            f"⚠️ Ошибка при перезагрузке бота: {e.stderr}",
-            reply_markup=builder.as_markup(),
-        )
-
-
-@router.callback_query(F.data == "user_editor", IsAdminFilter())
-async def user_editor_menu(callback_query: CallbackQuery):
-    builder = InlineKeyboardBuilder()
-    builder.row(
-        InlineKeyboardButton(
-            text="🔍 Поиск по названию ключа",
-            callback_data="search_by_key_name",
-        )
-    )
-    builder.row(
-        InlineKeyboardButton(
-            text="🆔 Поиск по Telegram ID", callback_data="search_by_tg_id"
-        )
-    )
-    builder.row(
-        InlineKeyboardButton(
-            text="🌐 Поиск по Username", callback_data="search_by_username"
-        )
-    )
-    builder.row(InlineKeyboardButton(text="🔙 Вернуться назад", callback_data="admin"))
-    await callback_query.message.answer(
-        "👇 Выберите способ поиска пользователя:", reply_markup=builder.as_markup()
+@router.callback_query(AdminPanelCallback.filter(F.action == "management"), IsAdminFilter())
+async def handle_management(callback_query: CallbackQuery):
+    await callback_query.message.edit_text(
+        text="🤖 Управление ботом",
+        reply_markup=build_management_kb(),
     )

handlers/admin/admin_restart.py

@@ -0,0 +1,40 @@
+import subprocess
+
+from aiogram import F, Router
+from aiogram.types import CallbackQuery
+
+from filters.admin import IsAdminFilter
+from keyboards.admin.panel_kb import AdminPanelCallback, build_admin_back_kb, build_restart_kb
+
+router = Router()
+
+
+@router.callback_query(
+    AdminPanelCallback.filter(F.action == "restart"),
+    IsAdminFilter(),
+)
+async def handle_restart(callback_query: CallbackQuery):
+    await callback_query.message.edit_text(
+        text="🤔 Вы уверены, что хотите перезагрузить бота?",
+        reply_markup=build_restart_kb(),
+    )
+
+
+@router.callback_query(
+    AdminPanelCallback.filter(F.action == "restart_confirm"),
+    IsAdminFilter(),
+)
+async def handle_restart_confirm(callback_query: CallbackQuery):
+    kb = build_admin_back_kb()
+    try:
+        subprocess.run(
+            ["sudo", "systemctl", "restart", "bot.service"],
+            check=True,
+            capture_output=True,
+            text=True,
+        )
+        await callback_query.message.edit_text(text="🔄 Бот успешно перезагружен!", reply_markup=kb)
+    except subprocess.CalledProcessError:
+        await callback_query.message.edit_text(text="🔄 Бот успешно перезагружен!", reply_markup=kb)
+    except Exception as e:
+        await callback_query.message.edit_text(text=f"⚠️ Ошибка при перезагрузке бота: {e.stderr}", reply_markup=kb)

handlers/admin/admin_sender.py

@@ -0,0 +1,140 @@
+from datetime import datetime
+from typing import Any
+
+from aiogram import F, Router
+from aiogram.fsm.context import FSMContext
+from aiogram.fsm.state import State, StatesGroup
+from aiogram.types import CallbackQuery, Message
+
+from filters.admin import IsAdminFilter
+from keyboards.admin.panel_kb import AdminPanelCallback, build_admin_back_kb
+from keyboards.admin.sender_kb import AdminSenderCallback, build_clusters_kb, build_sender_kb
+from logger import logger
+
+router = Router()
+
+
+class AdminSender(StatesGroup):
+    waiting_for_message = State()
+
+
+@router.callback_query(
+    AdminPanelCallback.filter(F.action == "sender"),
+    IsAdminFilter(),
+)
+async def handle_sender(callback_query: CallbackQuery):
+    await callback_query.message.edit_text(
+        text="✍️ Выберите группу пользователей для рассылки:",
+        reply_markup=build_sender_kb(),
+    )
+
+
+@router.callback_query(
+    AdminSenderCallback.filter(F.type != "cluster-select"),
+    IsAdminFilter(),
+)
+async def handle_sender_callback_text(
+    callback_query: CallbackQuery, callback_data: AdminSenderCallback, state: FSMContext
+):
+    await callback_query.message.edit_text(
+        text="✍️ Введите текст сообщения для рассылки:",
+        reply_markup=build_admin_back_kb("sender"),
+    )
+    await state.update_data(type=callback_data.type, cluster_name=callback_data.data)
+    await state.set_state(AdminSender.waiting_for_message)
+
+
+@router.callback_query(
+    AdminSenderCallback.filter(F.type == "cluster-select"),
+    IsAdminFilter(),
+)
+async def handle_sender_callback(callback_query: CallbackQuery, session: Any):
+    clusters = await session.fetch("SELECT DISTINCT cluster_name FROM servers")
+    await callback_query.message.answer(
+        "✍️ Выберите кластер для рассылки сообщений:",
+        reply_markup=build_clusters_kb(clusters),
+    )
+
+
+@router.message(AdminSender.waiting_for_message, IsAdminFilter())
+async def handle_message_input(message: Message, state: FSMContext, session: Any):
+    """
+    Обрабатывает ввод сообщения для рассылки (поддержка текста + фото).
+    """
+    text_message = message.html_text if message.text else None
+    photo = message.photo[-1].file_id if message.photo else None
+    photo_url = message.caption if message.photo and message.caption and message.caption.startswith("http") else None
+
+    if not text_message and message.caption:
+        text_message = message.caption
+
+    if not text_message and not photo and not photo_url:
+        await message.answer("⚠ Ошибка! Отправьте текст или изображение для рассылки.")
+        return
+
+    state_data = await state.get_data()
+    send_to = state_data.get("type", "all")
+
+    if send_to == "subscribed":
+        tg_ids = await session.fetch(
+            """
+            SELECT DISTINCT c.tg_id 
+            FROM connections c
+            JOIN keys k ON c.tg_id = k.tg_id
+            WHERE k.expiry_time > $1
+            """,
+            int(datetime.utcnow().timestamp() * 1000),
+        )
+    elif send_to == "unsubscribed":
+        tg_ids = await session.fetch(
+            """
+            SELECT c.tg_id 
+            FROM connections c
+            LEFT JOIN keys k ON c.tg_id = k.tg_id
+            GROUP BY c.tg_id
+            HAVING COUNT(k.tg_id) = 0 OR MAX(k.expiry_time) <= $1
+            """,
+            int(datetime.utcnow().timestamp() * 1000),
+        )
+    elif send_to == "cluster":
+        cluster_name = state_data.get("cluster_name")
+        tg_ids = await session.fetch(
+            """
+            SELECT DISTINCT c.tg_id
+            FROM connections c
+            JOIN keys k ON c.tg_id = k.tg_id
+            JOIN servers s ON k.server_id = s.cluster_name
+            WHERE s.cluster_name = $1
+            """,
+            cluster_name,
+        )
+    else:
+        tg_ids = await session.fetch("SELECT DISTINCT tg_id FROM connections")
+
+    total_users = len(tg_ids)
+    success_count = 0
+
+    for record in tg_ids:
+        tg_id = record["tg_id"]
+        try:
+            if photo or photo_url:
+                await message.bot.send_photo(
+                    chat_id=tg_id, photo=photo if photo else photo_url, caption=text_message, parse_mode="HTML"
+                )
+            else:
+                await message.bot.send_message(chat_id=tg_id, text=text_message, parse_mode="HTML")
+
+            success_count += 1
+        except Exception as e:
+            logger.error(f"❌ Ошибка отправки пользователю {tg_id}: {e}")
+
+    text = (
+        f"📤 <b>Рассылка завершена!</b>\n\n"
+        f"👥 <b>Всего пользователей:</b> {total_users}\n"
+        f"✅ <b>Доставлено:</b> {success_count}\n"
+        f"❌ <b>Не доставлено:</b> {total_users - success_count}"
+    )
+
+    await message.answer(text=text, reply_markup=build_admin_back_kb("stats"), parse_mode="HTML")
+
+    await state.clear()

handlers/admin/admin_servers.py

@@ -1,258 +1,214 @@
+import asyncio
+from typing import Any
+
 import asyncpg
 from aiogram import F, Router, types
 from aiogram.fsm.context import FSMContext
 from aiogram.fsm.state import State, StatesGroup
-from aiogram.types import InlineKeyboardButton
-from aiogram.utils.keyboard import InlineKeyboardBuilder
+from aiogram.types import CallbackQuery, Message
 from py3xui import AsyncApi
 
 from backup import create_backup_and_send_to_admins
 from config import ADMIN_PASSWORD, ADMIN_USERNAME, DATABASE_URL
-from database import check_unique_server_name, get_servers_from_db
+from database import check_unique_server_name, delete_server, get_servers
 from filters.admin import IsAdminFilter
+from handlers.keys.key_utils import create_key_on_cluster
+from keyboards.admin.panel_kb import AdminPanelCallback, build_admin_back_kb
+from keyboards.admin.servers_kb import (
+    AdminServerEditorCallback,
+    build_clusters_editor_kb,
+    build_delete_server_kb,
+    build_manage_cluster_kb,
+    build_manage_server_kb,
+)
+from logger import logger
 
 router = Router()
 
 
-class UserEditorState(StatesGroup):
+class AdminServersEditor(StatesGroup):
     waiting_for_cluster_name = State()
     waiting_for_api_url = State()
     waiting_for_inbound_id = State()
     waiting_for_server_name = State()
     waiting_for_subscription_url = State()
+    waiting_for_new_domain = State()
 
 
-@router.callback_query(F.data == "servers_editor", IsAdminFilter())
-async def handle_servers_editor(callback_query: types.CallbackQuery):
-    servers = await get_servers_from_db()
+@router.callback_query(
+    AdminPanelCallback.filter(F.action == "servers"),
+    IsAdminFilter(),
+)
+async def handle_servers(callback_query: CallbackQuery):
+    servers = await get_servers()
 
-    builder = InlineKeyboardBuilder()
-
-    for cluster_name, cluster_servers in servers.items():
-        builder.row(
-            InlineKeyboardButton(
-                text=f"⚙️ {cluster_name}", callback_data=f"manage_cluster|{cluster_name}"
-            )
-        )
-
-    builder.row(
-        InlineKeyboardButton(text="➕ Добавить кластер", callback_data="add_cluster")
-    )
-    builder.row(InlineKeyboardButton(text="🔙 Назад в админку", callback_data="admin"))
-
-    await callback_query.message.answer(
+    text = (
         "<b>🔧 Управление кластерами</b>\n\n"
         "<i>📌 Здесь вы можете добавить новый кластер.</i>\n\n"
         "<i>🌐 <b>Кластеры</b> — это пространство серверов, в пределах которого создается подписка.</i>\n"
         "💡 Если вы хотите выдавать по 1 серверу, то добавьте всего 1 сервер в кластер.\n\n"
-        "<i>⚠️ <b>Важно:</b> Кластеры удаляются автоматически, если удалить все серверы внутри них.</i>\n\n",
-        parse_mode="HTML",
-        reply_markup=builder.as_markup(),
+        "<i>⚠️ <b>Важно:</b> Кластеры удаляются автоматически, если удалить все серверы внутри них.</i>\n\n"
+    )
+
+    await callback_query.message.edit_text(
+        text=text,
+        reply_markup=build_clusters_editor_kb(servers),
     )
 
 
-@router.callback_query(F.data == "add_cluster", IsAdminFilter())
-async def handle_add_cluster(callback_query: types.CallbackQuery, state: FSMContext):
-    await callback_query.message.answer(
+@router.callback_query(
+    AdminPanelCallback.filter(F.action == "clusters_add"),
+    IsAdminFilter(),
+)
+async def handle_clusters_add(callback_query: CallbackQuery, state: FSMContext):
+    text = (
         "🔧 <b>Введите имя нового кластера:</b>\n\n"
-        "<b>Имя кластера должно быть уникальным и на английском языке.</b>\n"
-        "<i>Пример:</i> <code>cluster2</code> или <code>us_east_1</code>",
-        parse_mode="HTML",
+        "<b>Имя кластера должно быть уникальным!</b>\n"
+        "<i>Пример:</i> <code>cluster1</code> или <code>us_east_1</code>"
     )
 
-    await state.set_state(UserEditorState.waiting_for_cluster_name)
+    await callback_query.message.edit_text(text=text, reply_markup=build_admin_back_kb("servers"))
+
+    await state.set_state(AdminServersEditor.waiting_for_cluster_name)
 
 
-@router.message(UserEditorState.waiting_for_cluster_name, IsAdminFilter())
-async def handle_cluster_name_input(message: types.Message, state: FSMContext):
-    cluster_name = message.text.strip()
-
-    if cluster_name == "❌ Отменить":
-        await state.clear()
-        builder = InlineKeyboardBuilder()
-        builder.row(
-            InlineKeyboardButton(
-                text="🔧 Управление кластерами", callback_data="servers_editor"
-            )
-        )
+@router.message(AdminServersEditor.waiting_for_cluster_name, IsAdminFilter())
+async def handle_cluster_name_input(message: Message, state: FSMContext):
+    if not message.text:
         await message.answer(
-            "Процесс создания кластера отменен. Вы вернулись в меню управления серверами.",
-            reply_markup=builder.as_markup(),
+            text="❌ Имя кластера не может быть пустым. Попробуйте снова.", reply_markup=build_admin_back_kb("servers")
         )
         return
 
-    if not cluster_name:
-        await message.answer("❌ Имя кластера не может быть пустым. Попробуйте снова.")
-        return
-
+    cluster_name = message.text.strip()
     await state.update_data(cluster_name=cluster_name)
 
-    builder = InlineKeyboardBuilder()
-    builder.row(
-        InlineKeyboardButton(text="❌ Отменить", callback_data="servers_editor")
+    text = (
+        f"<b>Введите имя сервера для кластера {cluster_name}:</b>\n\n"
+        "Рекомендуется указать локацию и номер сервера в имени.\n\n"
+        "<i>Пример:</i> <code>de1</code>, <code>fra1</code>, <code>fi2</code>"
     )
 
     await message.answer(
-        f"<b>Введите имя сервера для кластера {cluster_name}:</b>\n\n"
-        "Рекомендуется указать локацию сервера в имени.\n\n"
-        "<i>Пример:</i> <code>server-asia</code>, <code>server-europe</code>",
-        parse_mode="HTML",
-        reply_markup=builder.as_markup(),
+        text=text,
+        reply_markup=build_admin_back_kb("servers"),
     )
-    await state.set_state(UserEditorState.waiting_for_server_name)
+
+    await state.set_state(AdminServersEditor.waiting_for_server_name)
 
 
-@router.message(UserEditorState.waiting_for_server_name, IsAdminFilter())
-async def handle_server_name_input(message: types.Message, state: FSMContext):
+@router.message(AdminServersEditor.waiting_for_server_name, IsAdminFilter())
+async def handle_server_name_input(message: Message, state: FSMContext, session: Any):
+    if not message.text:
+        await message.answer(
+            text="❌ Имя сервера не может быть пустым. Попробуйте снова.", reply_markup=build_admin_back_kb("servers")
+        )
+        return
+
     server_name = message.text.strip()
 
-    if server_name == "❌ Отменить":
-        await state.clear()
-        builder = InlineKeyboardBuilder()
-        builder.row(
-            InlineKeyboardButton(
-                text="🔧 Управление кластерами", callback_data="servers_editor"
-            )
-        )
+    if len(server_name) > 14:
         await message.answer(
-            "Процесс создания кластера был отменен. Вы вернулись в меню управления серверами.",
-            reply_markup=builder.as_markup(),
-        )
-        return
-
-    if not server_name:
-        await message.answer("❌ Имя сервера не может быть пустым. Попробуйте снова.")
-        return
-
-    server_unique = await check_unique_server_name(server_name)
-    if not server_unique:
-        await message.answer(
-            "❌ Сервер с таким именем уже существует. Пожалуйста, выберите другое имя."
+            text="❌ Имя сервера не должно превышать 10 символов. Попробуйте снова.",
+            reply_markup=build_admin_back_kb("servers"),
         )
         return
 
     user_data = await state.get_data()
     cluster_name = user_data.get("cluster_name")
+
+    if not await check_unique_server_name(server_name, session, cluster_name):
+        await message.answer(
+            text="❌ Сервер с таким именем уже существует. Пожалуйста, выберите другое имя.",
+            reply_markup=build_admin_back_kb("servers"),
+        )
+        return
+
     await state.update_data(server_name=server_name)
 
-    builder = InlineKeyboardBuilder()
-    builder.row(
-        InlineKeyboardButton(text="❌ Отменить", callback_data="servers_editor")
-    )
-
-    await message.answer(
+    text = (
         f"<b>Введите API URL для сервера {server_name} в кластере {cluster_name}:</b>\n\n"
         "API URL должен быть в следующем формате:\n\n"
         "<code>https://your_domain:port/panel_path</code>\n\n"
-        "URL должен быть без слэша на конце!\n",
-        parse_mode="HTML",
-        reply_markup=builder.as_markup(),
+        "URL должен быть без слэша на конце!\n"
     )
-    await state.set_state(UserEditorState.waiting_for_api_url)
+
+    await message.answer(
+        text=text,
+        reply_markup=build_admin_back_kb("servers"),
+    )
+
+    await state.set_state(AdminServersEditor.waiting_for_api_url)
 
 
-@router.message(UserEditorState.waiting_for_api_url, IsAdminFilter())
-async def handle_api_url_input(message: types.Message, state: FSMContext):
-    api_url = message.text.strip()
-
-    if api_url == "❌ Отменить":
-        await state.clear()
-        builder = InlineKeyboardBuilder()
-        builder.row(
-            InlineKeyboardButton(
-                text="🔧 Управление кластерами", callback_data="servers_editor"
-            )
-        )
+@router.message(AdminServersEditor.waiting_for_api_url, IsAdminFilter())
+async def handle_api_url_input(message: Message, state: FSMContext, session: Any):
+    if not message.text or not message.text.strip().startswith("https://"):
         await message.answer(
-            "Процесс создания кластера был отменен. Вы вернулись в меню управления серверами.",
-            reply_markup=builder.as_markup(),
+            text="❌ API URL должен начинаться с <code>https://</code>. Попробуйте снова.",
+            reply_markup=build_admin_back_kb("servers"),
         )
         return
 
-    if not api_url.startswith("https://"):
-        await message.answer(
-            "❌ API URL должен начинаться с <code>https://</code>. Попробуйте снова.",
-            parse_mode="HTML",
-        )
-        return
-
-    api_url = api_url.rstrip("/")
+    api_url = message.text.strip().rstrip("/")
 
     user_data = await state.get_data()
     cluster_name = user_data.get("cluster_name")
     server_name = user_data.get("server_name")
     await state.update_data(api_url=api_url)
 
-    builder = InlineKeyboardBuilder()
-    builder.row(
-        InlineKeyboardButton(text="❌ Отменить", callback_data="servers_editor")
-    )
-
-    await message.answer(
+    text = (
         f"<b>Введите subscription_url для сервера {server_name} в кластере {cluster_name}:</b>\n\n"
         "Subscription URL должен быть в следующем формате:\n\n"
         "<code>https://your_domain:port_sub/sub_path</code>\n\n"
         "URL должен быть без слэша и имени клиента на конце!\n"
-        "Его можно увидеть в панели 3x-ui в информации о клиенте.",
-        parse_mode="HTML",
-        reply_markup=builder.as_markup(),
+        "Его можно увидеть в панели 3x-ui в информации о клиенте."
     )
-    await state.set_state(UserEditorState.waiting_for_subscription_url)
+
+    await message.answer(
+        text=text,
+        reply_markup=build_admin_back_kb("servers"),
+    )
+
+    await state.set_state(AdminServersEditor.waiting_for_subscription_url)
 
 
-@router.message(UserEditorState.waiting_for_subscription_url, IsAdminFilter())
-async def handle_subscription_url_input(message: types.Message, state: FSMContext):
-    subscription_url = message.text.strip()
-
-    if subscription_url == "❌ Отменить":
-        await state.clear()
-        builder = InlineKeyboardBuilder()
-        builder.row(
-            InlineKeyboardButton(
-                text="🔧 Управление кластерами", callback_data="servers_editor"
-            )
-        )
+@router.message(AdminServersEditor.waiting_for_subscription_url, IsAdminFilter())
+async def handle_subscription_url_input(message: Message, state: FSMContext):
+    if not message.text or not message.text.strip().startswith("https://"):
         await message.answer(
-            "Процесс создания кластера был отменен. Вы вернулись в меню управления серверами.",
-            reply_markup=builder.as_markup(),
+            text="❌ subscription_url должен начинаться с <code>https://</code>. Попробуйте снова.",
+            reply_markup=build_admin_back_kb("servers"),
         )
         return
 
-    if not subscription_url.startswith("https://"):
-        await message.answer(
-            "❌ subscription_url должен начинаться с <code>https://</code>. Попробуйте снова.",
-            parse_mode="HTML",
-        )
-        return
-
-    subscription_url = subscription_url.rstrip("/")
+    subscription_url = message.text.strip().rstrip("/")
 
     user_data = await state.get_data()
     cluster_name = user_data.get("cluster_name")
     server_name = user_data.get("server_name")
     await state.update_data(subscription_url=subscription_url)
 
-    builder = InlineKeyboardBuilder()
-    builder.row(
-        InlineKeyboardButton(text="❌ Отменить", callback_data="servers_editor")
+    text = (
+        f"<b>Введите inbound_id для сервера {server_name} в кластере {cluster_name}:</b>\n\n"
+        "Это номер подключения vless в вашей панели 3x-ui. Обычно это <b>1</b> при чистой настройке по гайду.\n\n"
     )
 
     await message.answer(
-        f"<b>Введите inbound_id для сервера {server_name} в кластере {cluster_name}:</b>\n\n"
-        "Это номер подключения vless в вашей панели 3x-ui. Обычно это <b>1</b> при чистой настройке по гайду.\n\n",
-        parse_mode="HTML",
-        reply_markup=builder.as_markup(),
+        text=text,
+        reply_markup=build_admin_back_kb("servers"),
     )
-    await state.set_state(UserEditorState.waiting_for_inbound_id)
+    await state.set_state(AdminServersEditor.waiting_for_inbound_id)
 
 
-@router.message(UserEditorState.waiting_for_inbound_id, IsAdminFilter())
-async def handle_inbound_id_input(message: types.Message, state: FSMContext):
+@router.message(AdminServersEditor.waiting_for_inbound_id, IsAdminFilter())
+async def handle_inbound_id_input(message: Message, state: FSMContext):
     inbound_id = message.text.strip()
 
     if not inbound_id.isdigit():
         await message.answer(
-            "❌ inbound_id должен быть числовым значением. Попробуйте снова."
+            text="❌ inbound_id должен быть числовым значением. Попробуйте снова.",
+            reply_markup=build_admin_back_kb("servers"),
         )
         return
 
@@ -276,239 +232,150 @@ async def handle_inbound_id_input(message: types.Message, state: FSMContext):
     )
     await conn.close()
 
-    builder = InlineKeyboardBuilder()
-    builder.row(
-        InlineKeyboardButton(
-            text="🔙 Назад к кластерам", callback_data="servers_editor"
-        )
-    )
-
     await message.answer(
-        f"✅ Кластер {cluster_name} и сервер {server_name} успешно добавлены!",
-        reply_markup=builder.as_markup(),
+        text=f"✅ Кластер {cluster_name} и сервер {server_name} успешно добавлены!",
+        reply_markup=build_admin_back_kb("servers"),
     )
 
     await state.clear()
 
 
-@router.callback_query(F.data.startswith("manage_cluster|"), IsAdminFilter())
-async def handle_manage_cluster(callback_query: types.CallbackQuery, state: FSMContext):
-    cluster_name = callback_query.data.split("|")[1]
+@router.callback_query(AdminServerEditorCallback.filter(F.action == "clusters_manage"), IsAdminFilter())
+async def handle_clusters_manage(
+    callback_query: types.CallbackQuery, callback_data: AdminServerEditorCallback, session: Any
+):
+    cluster_name = callback_data.data
 
-    servers = await get_servers_from_db()
+    servers = await get_servers(session)
     cluster_servers = servers.get(cluster_name, [])
 
-    builder = InlineKeyboardBuilder()
-
-    for server in cluster_servers:
-        builder.row(
-            InlineKeyboardButton(
-                text=f"🌍 {server['server_name']}",
-                callback_data=f"manage_server|{server['server_name']}",
-            )
-        )
-
-    builder.row(
-        InlineKeyboardButton(
-            text="➕ Добавить сервер", callback_data=f"add_server|{cluster_name}"
-        )
-    )
-
-    builder.row(
-        InlineKeyboardButton(
-            text="🌐 Доступность серверов",
-            callback_data=f"server_availability|{cluster_name}",
-        )
-    )
-
-    builder.row(
-        InlineKeyboardButton(
-            text="💾 Создать бэкап кластера",
-            callback_data=f"backup_cluster|{cluster_name}",
-        )
-    )
-
-    builder.row(
-        InlineKeyboardButton(
-            text="🔙 Назад в управление кластерами", callback_data="servers_editor"
-        )
-    )
-
-    await callback_query.message.answer(
-        f"🔧 Управление серверами для кластера {cluster_name}",
-        reply_markup=builder.as_markup(),
+    await callback_query.message.edit_text(
+        text=f"🔧 Управление серверами для кластера {cluster_name}",
+        reply_markup=build_manage_cluster_kb(cluster_servers, cluster_name),
     )
 
 
-@router.callback_query(F.data.startswith("server_availability|"), IsAdminFilter())
-async def handle_check_server_availability(callback_query: types.CallbackQuery):
-    cluster_name = callback_query.data.split("|")[1]
+@router.callback_query(AdminServerEditorCallback.filter(F.action == "servers_availability"), IsAdminFilter())
+async def handle_servers_availability(
+    callback_query: types.CallbackQuery, callback_data: AdminServerEditorCallback, session: Any
+):
+    cluster_name = callback_data.data
 
-    servers = await get_servers_from_db()
+    servers = await get_servers(session)
     cluster_servers = servers.get(cluster_name, [])
 
     if not cluster_servers:
-        await callback_query.answer(f"Кластер '{cluster_name}' не содержит серверов.")
+        await callback_query.message.edit_text(text=f"Кластер '{cluster_name}' не содержит серверов.")
         return
 
-    in_progress_message = await callback_query.message.answer(
+    text = (
         f"🖥️ Проверка доступности серверов для кластера {cluster_name}.\n\n"
         "Это может занять до 1 минуты, пожалуйста, подождите..."
     )
 
-    availability_message = (
-        f"🖥️ Проверка доступности серверов для кластера {cluster_name} завершена:\n\n"
-    )
+    await callback_query.message.edit_text(text=text)
+
+    result_text = f"🖥️ Проверка доступности серверов для кластера {cluster_name} завершена:\n\n"
+    total_online_users = 0
 
     for server in cluster_servers:
-        xui = AsyncApi(
-            server["api_url"], username=ADMIN_USERNAME, password=ADMIN_PASSWORD
-        )
+        xui = AsyncApi(server["api_url"], username=ADMIN_USERNAME, password=ADMIN_PASSWORD)
 
         try:
             await xui.login()
-
             online_users = len(await xui.client.online())
-            availability_message += (
-                f"🌍 {server['server_name']}: {online_users} активных пользователей.\n"
-            )
+            total_online_users += online_users
+            result_text += f"🌍 {server['server_name']}: {online_users} активных пользователей.\n"
 
         except Exception as e:
-            availability_message += f"❌ {server['server_name']}: Не удалось получить информацию. Ошибка: {e}\n"
+            result_text += f"❌ {server['server_name']}: Не удалось получить информацию. Ошибка: {e}\n"
 
-    builder = InlineKeyboardBuilder()
-    builder.row(
-        InlineKeyboardButton(
-            text="🔙 Назад", callback_data=f"manage_cluster|{cluster_name}"
-        )
+    result_text += f"\n👥 Общее количество активных пользователей в кластере: {total_online_users}."
+
+    await callback_query.message.edit_text(text=result_text, reply_markup=build_admin_back_kb("servers"))
+
+
+@router.callback_query(AdminServerEditorCallback.filter(F.action == "servers_manage"), IsAdminFilter())
+async def handle_servers_manage(callback_query: CallbackQuery, callback_data: AdminServerEditorCallback):
+    server_name = callback_data.data
+    servers = await get_servers()
+
+    cluster_name, server = next(
+        ((c, s) for c, cs in servers.items() for s in cs if s["server_name"] == server_name), (None, None)
     )
 
-    await in_progress_message.edit_text(
-        availability_message, reply_markup=builder.as_markup()
-    )
-
-    await callback_query.answer()
-
-
-@router.callback_query(F.data.startswith("manage_server|"), IsAdminFilter())
-async def handle_manage_server(callback_query: types.CallbackQuery, state: FSMContext):
-    server_name = callback_query.data.split("|")[1]
-
-    servers = await get_servers_from_db()
-
-    server = None
-    cluster_name = None
-    for cluster, cluster_servers in servers.items():
-        server = next(
-            (s for s in cluster_servers if s["server_name"] == server_name), None
-        )
-        if server:
-            cluster_name = cluster
-            break
-
     if server:
         api_url = server["api_url"]
         subscription_url = server["subscription_url"]
         inbound_id = server["inbound_id"]
 
-        builder = InlineKeyboardBuilder()
-        builder.row(
-            InlineKeyboardButton(
-                text="🗑️ Удалить", callback_data=f"delete_server|{server_name}"
-            )
-        )
-        builder.row(
-            InlineKeyboardButton(
-                text="🔙 Назад", callback_data=f"manage_cluster|{cluster_name}"
-            )
-        )
-
-        await callback_query.message.answer(
+        text = (
             f"<b>🔧 Информация о сервере {server_name}:</b>\n\n"
             f"<b>📡 API URL:</b> {api_url}\n"
             f"<b>🌐 Subscription URL:</b> {subscription_url}\n"
-            f"<b>🔑 Inbound ID:</b> {inbound_id}",
-            parse_mode="HTML",
-            reply_markup=builder.as_markup(),
+            f"<b>🔑 Inbound ID:</b> {inbound_id}"
+        )
+
+        await callback_query.message.edit_text(
+            text=text,
+            reply_markup=build_manage_server_kb(server_name, cluster_name),
         )
     else:
-        await callback_query.message.answer("❌ Сервер не найден.")
+        await callback_query.message.edit_text(text="❌ Сервер не найден.")
 
 
-@router.callback_query(F.data.startswith("delete_server|"), IsAdminFilter())
-async def handle_delete_server(callback_query: types.CallbackQuery, state: FSMContext):
-    server_name = callback_query.data.split("|")[1]
+@router.callback_query(AdminServerEditorCallback.filter(F.action == "servers_delete"), IsAdminFilter())
+async def handle_servers_delete(callback_query: CallbackQuery, callback_data: AdminServerEditorCallback):
+    server_name = callback_data.data
 
-    builder = InlineKeyboardBuilder()
-    builder.row(
-        InlineKeyboardButton(
-            text="✅ Да", callback_data=f"confirm_delete_server|{server_name}"
-        ),
-        InlineKeyboardButton(
-            text="❌ Нет", callback_data=f"manage_server|{server_name}"
-        ),
-    )
-
-    await callback_query.message.answer(
-        f"🗑️ Вы уверены, что хотите удалить сервер {server_name}?",
-        reply_markup=builder.as_markup(),
+    await callback_query.message.edit_text(
+        text=f"🗑️ Вы уверены, что хотите удалить сервер {server_name}?",
+        reply_markup=build_delete_server_kb(server_name),
     )
 
 
-@router.callback_query(F.data.startswith("confirm_delete_server|"), IsAdminFilter())
-async def handle_confirm_delete_server(
-    callback_query: types.CallbackQuery, state: FSMContext
+@router.callback_query(AdminServerEditorCallback.filter(F.action == "servers_delete_confirm"), IsAdminFilter())
+async def handle_servers_delete_confirm(
+    callback_query: types.CallbackQuery, callback_data: AdminServerEditorCallback, session: Any
 ):
-    server_name = callback_query.data.split("|")[1]
+    server_name = callback_data.data
 
-    conn = await asyncpg.connect(DATABASE_URL)
-    await conn.execute(
-        """
-        DELETE FROM servers WHERE server_name = $1
-        """,
-        server_name,
-    )
-    await conn.close()
+    await delete_server(server_name, session)
 
-    builder = InlineKeyboardBuilder()
-    builder.row(
-        InlineKeyboardButton(
-            text="🔙 Назад в управление кластерами", callback_data="servers_editor"
-        )
-    )
-
-    await callback_query.message.answer(
-        f"🗑️ Сервер {server_name} успешно удален.", reply_markup=builder.as_markup()
+    await callback_query.message.edit_text(
+        text=f"🗑️ Сервер {server_name} успешно удален.", reply_markup=build_admin_back_kb("servers")
     )
 
 
-@router.callback_query(F.data.startswith("add_server|"), IsAdminFilter())
-async def handle_add_server(callback_query: types.CallbackQuery, state: FSMContext):
-    cluster_name = callback_query.data.split("|")[1]
+@router.callback_query(AdminServerEditorCallback.filter(F.action == "servers_add"), IsAdminFilter())
+async def handle_servers_add(
+    callback_query: types.CallbackQuery, callback_data: AdminServerEditorCallback, state: FSMContext
+):
+    cluster_name = callback_data.data
 
     await state.update_data(cluster_name=cluster_name)
 
-    builder = InlineKeyboardBuilder()
-    builder.row(
-        InlineKeyboardButton(text="❌ Отменить", callback_data="servers_editor")
-    )
-
-    await callback_query.message.answer(
+    text = (
         f"<b>Введите имя сервера для кластера {cluster_name}:</b>\n\n"
         "Рекомендуется указать локацию сервера в имени.\n\n"
-        "<i>Пример:</i> <code>server-asia</code>, <code>server-europe</code>",
-        parse_mode="HTML",
-        reply_markup=builder.as_markup(),
+        "<i>Пример:</i> <code>server-asia</code>, <code>server-europe</code>"
     )
 
-    await state.set_state(UserEditorState.waiting_for_server_name)
+    await callback_query.message.edit_text(
+        text=text,
+        reply_markup=build_admin_back_kb("servers"),
+    )
+
+    await state.set_state(AdminServersEditor.waiting_for_server_name)
 
 
-@router.callback_query(F.data.startswith("backup_cluster|"), IsAdminFilter())
-async def handle_backup_cluster(callback_query: types.CallbackQuery):
-    cluster_name = callback_query.data.split("|")[1]
+@router.callback_query(AdminServerEditorCallback.filter(F.action == "clusters_backup"), IsAdminFilter())
+async def handle_clusters_backup(
+    callback_query: types.CallbackQuery, callback_data: AdminServerEditorCallback, session: Any
+):
+    cluster_name = callback_data.data
 
-    servers = await get_servers_from_db()
+    servers = await get_servers(session)
     cluster_servers = servers.get(cluster_name, [])
 
     for server in cluster_servers:
@@ -519,13 +386,106 @@ async def handle_backup_cluster(callback_query: types.CallbackQuery):
         )
         await create_backup_and_send_to_admins(xui)
 
-    builder = InlineKeyboardBuilder()
-    builder.row(InlineKeyboardButton(text="🔙 Назад", callback_data="servers_editor"))
-
-    await callback_query.message.answer(
+    text = (
         f"<b>Бэкап для кластера {cluster_name} был успешно создан и отправлен администраторам!</b>\n\n"
-        f"🔔 <i>Бэкапы отправлены в боты панелей.</i>",
-        parse_mode="HTML",
-        reply_markup=builder.as_markup(),
+        f"🔔 <i>Бэкапы отправлены в боты панелей.</i>"
     )
-    await callback_query.answer()
+
+    await callback_query.message.edit_text(
+        text=text,
+        reply_markup=build_admin_back_kb("servers"),
+    )
+
+
+@router.callback_query(AdminServerEditorCallback.filter(F.action == "clusters_sync"), IsAdminFilter())
+async def handle_clusters_sync(
+    callback_query: types.CallbackQuery, callback_data: AdminServerEditorCallback, session: Any
+):
+    cluster_name = callback_data.data
+
+    try:
+        query_keys = """
+                SELECT tg_id, client_id, email, expiry_time
+                FROM keys
+                WHERE server_id = $1
+            """
+        keys_to_sync = await session.fetch(query_keys, cluster_name)
+
+        if not keys_to_sync:
+            await callback_query.message.answer(
+                text=f"❌ Нет ключей для синхронизации в кластере {cluster_name}.",
+                reply_markup=build_admin_back_kb("servers"),
+            )
+            return
+
+        for key in keys_to_sync:
+            try:
+                await create_key_on_cluster(
+                    cluster_name,
+                    key["tg_id"],
+                    key["client_id"],
+                    key["email"],
+                    key["expiry_time"],
+                )
+                await asyncio.sleep(0.6)
+            except Exception as e:
+                logger.error(f"Ошибка при добавлении ключа {key['client_id']} в кластер {cluster_name}: {e}")
+
+        await callback_query.message.answer(
+            text=f"✅ Ключи успешно синхронизированы для кластера {cluster_name}",
+            reply_markup=build_admin_back_kb("servers"),
+        )
+    except Exception as e:
+        logger.error(f"Ошибка синхронизации ключей в кластере {cluster_name}: {e}")
+        await callback_query.message.answer(
+            text=f"❌ Произошла ошибка при синхронизации: {e}", reply_markup=build_admin_back_kb("servers")
+        )
+
+
+@router.callback_query(AdminPanelCallback.filter(F.action == "change_domain"), IsAdminFilter())
+async def request_new_domain(callback_query: CallbackQuery, state: FSMContext):
+    """Запрашивает у администратора новый домен."""
+    await state.set_state(AdminServersEditor.waiting_for_new_domain)
+    await callback_query.message.edit_text(
+        text="🌐 Введите новый домен (без https://):\nПример: pocomachodomen.ru",
+    )
+
+
+@router.message(AdminServersEditor.waiting_for_new_domain)
+async def process_new_domain(message: Message, state: FSMContext, session: asyncpg.Connection):
+    """Обновляет домен в таблице keys."""
+    new_domain = message.text.strip()
+    logger.info(f"[DomainChange] Новый домен, введённый администратором: '{new_domain}'")
+
+    if not new_domain or " " in new_domain or not new_domain.replace(".", "").isalnum():
+        logger.warning("[DomainChange] Некорректный домен")
+        await message.answer(
+            "🚫 Некорректный домен! Введите домен без http:// и без пробелов.",
+            reply_markup=build_admin_back_kb("admin"),
+        )
+        return
+
+    new_domain_url = f"https://{new_domain}"
+    logger.info(f"[DomainChange] Новый домен с протоколом: '{new_domain_url}'")
+
+    query = """
+        UPDATE keys
+        SET key = regexp_replace(key, '^https://[^/]+', $1::TEXT)
+        WHERE key NOT LIKE $1 || '%'
+    """
+    try:
+        await session.execute(query, new_domain_url)
+        logger.info("[DomainChange] Запрос на обновление домена выполнен успешно.")
+    except Exception as e:
+        logger.error(f"[DomainChange] Ошибка при выполнении запроса: {e}")
+        await message.answer(f"❌ Ошибка при обновлении домена: {e}", reply_markup=build_admin_back_kb("admin"))
+        return
+
+    try:
+        sample = await session.fetchrow("SELECT key FROM keys LIMIT 1")
+        logger.info(f"[DomainChange] Пример обновленной записи: {sample}")
+    except Exception as e:
+        logger.error(f"[DomainChange] Ошибка при выборке обновленной записи: {e}")
+
+    await message.answer(f"✅ Домен успешно изменен на {new_domain}!", reply_markup=build_admin_back_kb("admin"))
+    await state.clear()

handlers/admin/admin_stats.py

@@ -0,0 +1,120 @@
+from datetime import datetime
+from typing import Any
+
+import pytz
+from aiogram import F, Router
+from aiogram.exceptions import TelegramBadRequest
+from aiogram.types import CallbackQuery
+
+from filters.admin import IsAdminFilter
+from keyboards.admin.panel_kb import AdminPanelCallback, build_admin_back_kb
+from keyboards.admin.stats_kb import build_stats_kb
+from logger import logger
+from utils.csv_export import export_payments_csv, export_users_csv
+
+router = Router()
+
+
+@router.callback_query(
+    AdminPanelCallback.filter(F.action == "stats"),
+    IsAdminFilter(),
+)
+async def handle_stats(callback_query: CallbackQuery, session: Any):
+    try:
+        total_users = await session.fetchval("SELECT COUNT(*) FROM users")
+        total_keys = await session.fetchval("SELECT COUNT(*) FROM keys")
+        total_referrals = await session.fetchval("SELECT COUNT(*) FROM referrals")
+
+        total_payments_today = int(
+            await session.fetchval("SELECT COALESCE(SUM(amount), 0) FROM payments WHERE created_at >= CURRENT_DATE")
+        )
+        total_payments_week = int(
+            await session.fetchval(
+                "SELECT COALESCE(SUM(amount), 0) FROM payments WHERE created_at >= date_trunc('week', CURRENT_DATE)"
+            )
+        )
+        total_payments_month = int(
+            await session.fetchval(
+                "SELECT COALESCE(SUM(amount), 0) FROM payments WHERE created_at >= date_trunc('month', CURRENT_DATE)"
+            )
+        )
+        total_payments_all_time = int(await session.fetchval("SELECT COALESCE(SUM(amount), 0) FROM payments"))
+
+        registrations_today = await session.fetchval("SELECT COUNT(*) FROM users WHERE created_at >= CURRENT_DATE")
+        registrations_week = await session.fetchval(
+            "SELECT COUNT(*) FROM users WHERE created_at >= date_trunc('week', CURRENT_DATE)"
+        )
+        registrations_month = await session.fetchval(
+            "SELECT COUNT(*) FROM users WHERE created_at >= date_trunc('month', CURRENT_DATE)"
+        )
+
+        users_updated_today = await session.fetchval("SELECT COUNT(*) FROM users WHERE updated_at >= CURRENT_DATE")
+
+        active_keys = await session.fetchval(
+            "SELECT COUNT(*) FROM keys WHERE expiry_time > $1",
+            int(datetime.utcnow().timestamp() * 1000),
+        )
+        expired_keys = total_keys - active_keys
+        moscow_tz = pytz.timezone("Europe/Moscow")
+        update_time = datetime.now(moscow_tz).strftime("%d.%m.%y %H:%M:%S")
+
+        stats_message = (
+            f"📊 <b>Подробная статистика проекта:</b>\n\n"
+            f"👥 Пользователи:\n"
+            f"   📅 За день: <b>{registrations_today}</b>\n"
+            f"   📆 За неделю: <b>{registrations_week}</b>\n"
+            f"   📆 За месяц: <b>{registrations_month}</b>\n"
+            f"   🌐 За все время: <b>{total_users}</b>\n\n"
+            f"🌟 Активные пользователи:\n"
+            f"   🌟 Активных сегодня: <b>{users_updated_today}</b>\n\n"
+            f"👥 Рефералы:\n"
+            f"   🤝 Всего привлечено: <b>{total_referrals}</b>\n\n"
+            f"🔑 Ключи:\n"
+            f"   🌈 Всего сгенерировано: <b>{total_keys}</b>\n"
+            f"   ✅ Действующих: <b>{active_keys}</b>\n"
+            f"   ❌ Просроченных: <b>{expired_keys}</b>\n\n"
+            f"💰 Финансовая статистика:\n"
+            f"   📅 За день: <b>{total_payments_today} ₽</b>\n"
+            f"   📆 За неделю: <b>{total_payments_week} ₽</b>\n"
+            f"   📆 За месяц: <b>{total_payments_month} ₽</b>\n"
+            f"   🏦 За все время: <b>{total_payments_all_time} ₽</b>\n\n"
+            f" ⏳ Последнее обновление: {update_time}"
+        )
+
+        await callback_query.message.edit_text(text=stats_message, reply_markup=build_stats_kb())
+    except TelegramBadRequest as e:
+        if "message is not modified" not in str(e):  # skip when Telegram message is not modified
+            logger.error(f"Error in user_stats_menu: {e}")
+    except Exception as e:
+        logger.error(f"Error in user_stats_menu: {e}")
+
+
+@router.callback_query(
+    AdminPanelCallback.filter(F.action == "stats_export_users_csv"),
+    IsAdminFilter(),
+)
+async def handle_export_users_csv(callback_query: CallbackQuery, session: Any):
+    kb = build_admin_back_kb("stats")
+
+    try:
+        export = await export_users_csv(session)
+        await callback_query.message.answer_document(document=export, caption="📥 Экспорт пользователей в CSV")
+    except Exception as e:
+        logger.error(f"Ошибка при экспорте пользователей в CSV: {e}")
+        await callback_query.message.edit_text(text=f"❗ Произошла ошибка при экспорте: {e}", reply_markup=kb)
+
+
+@router.callback_query(
+    AdminPanelCallback.filter(F.action == "stats_export_payments_csv"),
+    IsAdminFilter(),
+)
+async def handle_export_payments_csv(callback_query: CallbackQuery, session: Any):
+    kb = build_admin_back_kb("stats")
+
+    try:
+        export = await export_payments_csv(session)
+        await callback_query.message.answer_document(document=export, caption="📥 Экспорт платежей в CSV")
+
+    except Exception as e:
+        logger.error(f"Ошибка при экспорте платежей в CSV: {e}")
+        await callback_query.message.edit_text(text=f"❗ Произошла ошибка при экспорте: {e}", reply_markup=kb)

handlers/admin/admin_user_editor.py

@@ -1,712 +0,0 @@
-import asyncio
-from datetime import datetime
-from typing import Any
-
-from aiogram import Bot, F, Router, types
-from aiogram.fsm.context import FSMContext
-from aiogram.fsm.state import State, StatesGroup
-from aiogram.types import CallbackQuery, InlineKeyboardButton, InlineKeyboardMarkup
-from aiogram.utils.keyboard import InlineKeyboardBuilder
-
-from config import TOTAL_GB
-from database import delete_user_data, get_client_id_by_email, get_servers_from_db, restore_trial, update_key_expiry
-from filters.admin import IsAdminFilter
-from handlers.keys.key_utils import (
-    delete_key_from_cluster,
-    delete_key_from_db,
-    renew_key_in_cluster,
-)
-from handlers.utils import sanitize_key_name
-from logger import logger
-
-router = Router()
-
-
-class UserEditorState(StatesGroup):
-    waiting_for_tg_id = State()
-    waiting_for_username = State()
-    displaying_user_info = State()
-    waiting_for_new_balance = State()
-    waiting_for_key_name = State()
-    waiting_for_expiry_time = State()
-    waiting_for_message_text = State()
-
-
-@router.callback_query(F.data == "search_by_tg_id", IsAdminFilter())
-async def prompt_tg_id(callback_query: CallbackQuery, state: FSMContext):
-    builder = InlineKeyboardBuilder()
-    builder.row(InlineKeyboardButton(text="🔙 Назад", callback_data="user_editor"))
-    await callback_query.message.answer(
-        "🔍 Введите Telegram ID клиента:", reply_markup=builder.as_markup()
-    )
-    await state.set_state(UserEditorState.waiting_for_tg_id)
-
-
-@router.callback_query(F.data == "search_by_username", IsAdminFilter())
-async def prompt_username(callback_query: CallbackQuery, state: FSMContext):
-    builder = InlineKeyboardBuilder()
-    builder.row(InlineKeyboardButton(text="🔙 Назад", callback_data="user_editor"))
-    await callback_query.message.answer(
-        "🔍 Введите Username клиента:", reply_markup=builder.as_markup()
-    )
-    await state.set_state(UserEditorState.waiting_for_username)
-
-
-@router.message(UserEditorState.waiting_for_username, IsAdminFilter())
-async def handle_username_input(
-    message: types.Message, state: FSMContext, session: Any
-):
-    # Extract the username from a message text by removing leading '@' and the Telegram URL prefix
-    username = message.text.strip().lstrip('@').replace('https://t.me/', '')
-    user_record = await session.fetchrow(
-        "SELECT tg_id FROM users WHERE username = $1", username
-    )
-
-    if not user_record:
-        builder = InlineKeyboardBuilder()
-        builder.row(InlineKeyboardButton(text="🔙 Назад", callback_data="user_editor"))
-        await message.answer(
-            "🔍 Пользователь с указанным username не найден. 🚫",
-            reply_markup=builder.as_markup(),
-        )
-        await state.clear()
-        return
-
-    tg_id = user_record["tg_id"]
-    username = await session.fetchval(
-        "SELECT username FROM users WHERE tg_id = $1", tg_id
-    )
-    balance = await session.fetchval(
-        "SELECT balance FROM connections WHERE tg_id = $1", tg_id
-    )
-    key_records = await session.fetch("SELECT email FROM keys WHERE tg_id = $1", tg_id)
-    referral_count = await session.fetchval(
-        "SELECT COUNT(*) FROM referrals WHERE referrer_tg_id = $1", tg_id
-    )
-
-    if balance is None:
-        builder = InlineKeyboardBuilder()
-        builder.row(InlineKeyboardButton(text="🔙 Назад", callback_data="user_editor"))
-        await message.answer(
-            "🚫 Пользователь с указанным tg_id не найден. 🔍",
-            reply_markup=builder.as_markup(),
-        )
-        await state.clear()
-        return
-
-    builder = InlineKeyboardBuilder()
-
-    for (email,) in key_records:
-        builder.row(
-            InlineKeyboardButton(text=f"🔑 {email}", callback_data=f"edit_key_{email}")
-        )
-
-    builder.row(
-        InlineKeyboardButton(
-            text="📝 Изменить баланс",
-            callback_data=f"change_balance_{tg_id}",
-        )
-    )
-
-    builder.row(
-        InlineKeyboardButton(
-            text="🔄 Восстановить пробник",
-            callback_data=f"restore_trial_{tg_id}",
-        )
-    )
-    builder.row(InlineKeyboardButton(text="❌ Удалить клиента", callback_data=f"confirm_delete_user_{tg_id}"))
-    builder.row(
-        InlineKeyboardButton(
-            text="✉️ Отправить сообщение",
-            callback_data=f"send_message_{tg_id}"
-        )
-    )
-    builder.row(InlineKeyboardButton(text="🔙 Назад", callback_data="user_editor"))
-
-    user_info = (
-        f"📊 Информация о пользователе:\n\n"
-        f"🆔 ID пользователя: <b>{tg_id}</b>\n"
-        f"👤 Логин пользователя: <b>@{username}</b>\n"
-        f"💰 Баланс: <b>{balance}</b>\n"
-        f"👥 Количество рефералов: <b>{referral_count}</b>\n"
-        f"🔑 Ключи (для редактирования нажмите на ключ):"
-    )
-    await message.answer(user_info, reply_markup=builder.as_markup())
-    await state.set_state(UserEditorState.displaying_user_info)
-
-
-@router.callback_query(F.data.startswith("send_message_"))
-async def handle_send_message(callback_query: types.CallbackQuery, state: FSMContext):
-    tg_id = callback_query.data.split("_")[2]
-    await state.update_data(target_tg_id=tg_id)
-    await callback_query.message.answer(
-        "✉️ Введите текст сообщения, которое вы хотите отправить пользователю."
-    )
-    await state.set_state(UserEditorState.waiting_for_message_text)
-
-
-@router.message(UserEditorState.waiting_for_message_text, IsAdminFilter())
-async def process_send_message(message: types.Message, state: FSMContext, bot: Bot):
-    data = await state.get_data()
-    target_tg_id = data.get("target_tg_id")
-
-    if not target_tg_id:
-        await message.answer("🚫 Ошибка: ID пользователя не найден.")
-        await state.clear()
-        return
-
-    try:
-        await bot.send_message(chat_id=target_tg_id, text=message.text)
-        await message.answer("✅ Сообщение успешно отправлено.")
-    except Exception as e:
-        await message.answer(f"❌ Не удалось отправить сообщение: {e}")
-
-    await state.clear()
-
-
-@router.message(UserEditorState.waiting_for_tg_id, F.text.isdigit(), IsAdminFilter())
-async def handle_tg_id_input(message: types.Message, state: FSMContext, session: Any):
-    tg_id = int(message.text)
-    username = await session.fetchval(
-        "SELECT username FROM users WHERE tg_id = $1", tg_id
-    )
-    balance = await session.fetchval(
-        "SELECT balance FROM connections WHERE tg_id = $1", tg_id
-    )
-    key_records = await session.fetch("SELECT email FROM keys WHERE tg_id = $1", tg_id)
-    referral_count = await session.fetchval(
-        "SELECT COUNT(*) FROM referrals WHERE referrer_tg_id = $1", tg_id
-    )
-
-    if balance is None:
-        builder = InlineKeyboardBuilder()
-        builder.row(InlineKeyboardButton(text="🔙 Назад", callback_data="user_editor"))
-        await message.answer(
-            "❌ Пользователь с указанным tg_id не найден. 🔍",
-            reply_markup=builder.as_markup(),
-        )
-        await state.clear()
-        return
-
-    builder = InlineKeyboardBuilder()
-
-    for (email,) in key_records:
-        builder.row(
-            InlineKeyboardButton(text=f"🔑 {email}", callback_data=f"edit_key_{email}")
-        )
-
-    builder.row(
-        InlineKeyboardButton(
-            text="📝 Изменить баланс",
-            callback_data=f"change_balance_{tg_id}",
-        )
-    )
-    builder.row(InlineKeyboardButton(text="❌ Удалить клиента", callback_data=f"confirm_delete_user_{tg_id}"))
-    builder.row(
-        InlineKeyboardButton(
-            text="🔄 Восстановить пробник",
-            callback_data=f"restore_trial_{tg_id}",
-        )
-    )
-    builder.row(
-        InlineKeyboardButton(
-            text="✉️ Отправить сообщение",
-            callback_data=f"send_message_{tg_id}"
-        )
-    )
-
-    builder.row(InlineKeyboardButton(text="🔙 Назад", callback_data="user_editor"))
-
-    user_info = (
-        f"📊 Информация о пользователе:\n\n"
-        f"🆔 ID пользователя: <b>{tg_id}</b>\n"
-        f"👤 Логин пользователя: <b>@{username}</b>\n"
-        f"💰 Баланс: <b>{balance}</b>\n"
-        f"👥 Количество рефералов: <b>{referral_count}</b>\n"
-        f"🔑 Ключи (для редактирования нажмите на ключ):"
-    )
-    await message.answer(user_info, reply_markup=builder.as_markup())
-    await state.set_state(UserEditorState.displaying_user_info)
-
-
-@router.callback_query(F.data.startswith("restore_trial_"), IsAdminFilter())
-async def handle_restore_trial(callback_query: types.CallbackQuery, session: Any):
-    tg_id = int(callback_query.data.split("_")[2])
-
-    await restore_trial(tg_id, session)
-
-    builder = InlineKeyboardBuilder()
-    builder.row(
-        InlineKeyboardButton(
-            text="🔙 Назад в меню администратора", callback_data="admin"
-        )
-    )
-
-    await callback_query.message.answer(
-        "✅ Триал успешно восстановлен.", reply_markup=builder.as_markup()
-    )
-
-
-@router.callback_query(F.data.startswith("change_balance_"), IsAdminFilter())
-async def process_balance_change(callback_query: CallbackQuery, state: FSMContext):
-    tg_id = int(callback_query.data.split("_")[2])
-    await state.update_data(tg_id=tg_id)
-    builder = InlineKeyboardBuilder()
-    builder.row(InlineKeyboardButton(text="🔙 Назад", callback_data="user_editor"))
-    await callback_query.message.answer(
-        "💸 Введите новую сумму баланса:", reply_markup=builder.as_markup()
-    )
-    await state.set_state(UserEditorState.waiting_for_new_balance)
-
-
-@router.message(UserEditorState.waiting_for_new_balance, IsAdminFilter())
-async def handle_new_balance_input(
-    message: types.Message, state: FSMContext, session: Any
-):
-    if not message.text.isdigit() or int(message.text) < 0:
-        builder = InlineKeyboardBuilder()
-        builder.row(InlineKeyboardButton(text="🔙 Назад", callback_data="user_editor"))
-        await message.answer(
-            "❌ Пожалуйста, введите корректную сумму для изменения баланса.",
-            reply_markup=builder.as_markup(),
-        )
-        return
-
-    new_balance = int(message.text)
-    user_data = await state.get_data()
-    tg_id = user_data.get("tg_id")
-
-    await session.execute(
-        "UPDATE connections SET balance = $1 WHERE tg_id = $2",
-        new_balance,
-        tg_id,
-    )
-
-    response_message = f"✅ Баланс успешно изменен на <b>{new_balance}</b>."
-
-    builder = InlineKeyboardBuilder()
-    builder.row(
-        InlineKeyboardButton(
-            text="🔙 Назад в меню администратора",
-            callback_data="admin",
-        )
-    )
-    await message.answer(response_message, reply_markup=builder.as_markup())
-    await state.clear()
-
-
-async def get_key_details(email, session):
-    record = await session.fetchrow(
-        """
-        SELECT k.key, k.expiry_time, k.server_id, c.tg_id, c.balance
-        FROM keys k
-        JOIN connections c ON k.tg_id = c.tg_id
-        WHERE k.email = $1
-        """,
-        email,
-    )
-
-    if not record:
-        return None
-
-    servers = await get_servers_from_db()
-
-    cluster_name = "Неизвестный кластер"
-    for cluster_name, cluster_servers in servers.items():
-        if any(
-            server["inbound_id"] == record["server_id"] for server in cluster_servers
-        ):
-            cluster_name = cluster_name
-            break
-
-    expiry_date = datetime.utcfromtimestamp(record["expiry_time"] / 1000)
-    current_date = datetime.utcnow()
-    time_left = expiry_date - current_date
-
-    if time_left.total_seconds() <= 0:
-        days_left_message = "<b>Ключ истек.</b>"
-    elif time_left.days > 0:
-        days_left_message = f"Осталось дней: <b>{time_left.days}</b>"
-    else:
-        hours_left = time_left.seconds // 3600
-        days_left_message = f"Осталось часов: <b>{hours_left}</b>"
-
-    return {
-        "key": record["key"],
-        "expiry_date": expiry_date.strftime("%d %B %Y года"),
-        "days_left_message": days_left_message,
-        "server_name": cluster_name,
-        "balance": record["balance"],
-        "tg_id": record["tg_id"],
-    }
-
-
-@router.callback_query(F.data.startswith("edit_key_"), IsAdminFilter())
-async def process_key_edit(callback_query: CallbackQuery, session: Any):
-    email = callback_query.data.split("_", 2)[2]
-    key_details = await get_key_details(email, session)
-
-    if not key_details:
-        builder = InlineKeyboardBuilder()
-        builder.row(InlineKeyboardButton(text="🔙 Назад", callback_data="user_editor"))
-        await callback_query.message.answer(
-            "🔍 <b>Информация о ключе не найдена.</b> 🚫",
-            reply_markup=builder.as_markup(),
-        )
-        return
-
-    response_message = (
-        f"🔑 Ключ: <code>{key_details['key']}</code>\n"
-        f"⏰ Дата истечения: <b>{key_details['expiry_date']}</b>\n"
-        f"💰 Баланс пользователя: <b>{key_details['balance']}</b>\n"
-        f"🌐 Кластер: <b>{key_details['server_name']}</b>"
-    )
-
-    builder = InlineKeyboardBuilder()
-    builder.row(
-        InlineKeyboardButton(
-            text="ℹ️ Получить информацию о юзере",
-            callback_data=f"user_info|{key_details['tg_id']}",
-        )
-    )
-    builder.row(
-        InlineKeyboardButton(
-            text="⏳ Изменить время истечения",
-            callback_data=f"change_expiry|{email}",
-        )
-    )
-    builder.row(
-        InlineKeyboardButton(
-            text="❌ Удалить ключ",
-            callback_data=f"delete_key_admin|{email}",
-        )
-    )
-    builder.row(InlineKeyboardButton(text="🔙 Назад", callback_data="user_editor"))
-
-    await callback_query.message.answer(
-        response_message, reply_markup=builder.as_markup()
-    )
-
-
-@router.callback_query(F.data == "search_by_key_name", IsAdminFilter())
-async def prompt_key_name(callback_query: CallbackQuery, state: FSMContext):
-    builder = InlineKeyboardBuilder()
-    builder.row(InlineKeyboardButton(text="🔙 Назад", callback_data="user_editor"))
-    await callback_query.message.answer(
-        "🔑 Введите имя ключа:", reply_markup=builder.as_markup()
-    )
-    await state.set_state(UserEditorState.waiting_for_key_name)
-
-
-@router.message(UserEditorState.waiting_for_key_name, IsAdminFilter())
-async def handle_key_name_input(
-    message: types.Message, state: FSMContext, session: Any
-):
-    key_name = sanitize_key_name(message.text)
-    key_details = await get_key_details(key_name, session)
-
-    if not key_details:
-        builder = InlineKeyboardBuilder()
-        builder.row(InlineKeyboardButton(text="🔙 Назад", callback_data="user_editor"))
-        await message.answer(
-            "🚫 Пользователь с указанным именем ключа не найден.",
-            reply_markup=builder.as_markup(),
-        )
-        await state.clear()
-        return
-
-    response_message = (
-        f"🔑 Ключ: <code>{key_details['key']}</code>\n"
-        f"⏰ Дата истечения: <b>{key_details['expiry_date']}</b>\n"
-        f"💰 Баланс пользователя: <b>{key_details['balance']}</b>\n"
-        f"🌐 Сервер: <b>{key_details['server_name']}</b>"
-    )
-
-    key_buttons = InlineKeyboardBuilder()
-    key_buttons.row(
-        InlineKeyboardButton(
-            text="ℹ️ Получить информацию о юзере",
-            callback_data=f"user_info|{key_details['tg_id']}",
-        )
-    )
-    key_buttons.row(
-        InlineKeyboardButton(
-            text="⏳ Изменить время истечения",
-            callback_data=f"change_expiry|{key_name}",
-        )
-    )
-    key_buttons.row(
-        InlineKeyboardButton(
-            text="❌ Удалить ключ",
-            callback_data=f"delete_key_admin|{key_name}",
-        )
-    )
-    key_buttons.row(InlineKeyboardButton(text="🔙 Назад", callback_data="user_editor"))
-
-    await message.answer(response_message, reply_markup=key_buttons.as_markup())
-    await state.clear()
-
-
-@router.callback_query(F.data.startswith("change_expiry|"), IsAdminFilter())
-async def prompt_expiry_change(callback_query: CallbackQuery, state: FSMContext):
-    email = callback_query.data.split("|")[1]
-    await callback_query.message.answer(
-        f"⏳ Введите новое время истечения для ключа <b>{email}</b> в формате <code>YYYY-MM-DD HH:MM:SS</code>:"
-    )
-    await state.update_data(email=email)
-    await state.set_state(UserEditorState.waiting_for_expiry_time)
-
-
-@router.message(UserEditorState.waiting_for_expiry_time, IsAdminFilter())
-async def handle_expiry_time_input(
-    message: types.Message, state: FSMContext, session: Any
-):
-    user_data = await state.get_data()
-    email = user_data.get("email")
-
-    if not email:
-        builder = InlineKeyboardBuilder()
-        builder.row(InlineKeyboardButton(text="🔙 Назад", callback_data="user_editor"))
-        await message.answer(
-            "📧 Email не найден в состоянии. 🚫", reply_markup=builder.as_markup()
-        )
-        await state.clear()
-        return
-
-    try:
-        expiry_time_str = message.text
-        expiry_time = int(
-            datetime.strptime(expiry_time_str, "%Y-%m-%d %H:%M:%S").timestamp() * 1000
-        )
-
-        client_id = await get_client_id_by_email(email)
-        if client_id is None:
-            builder = InlineKeyboardBuilder()
-            builder.row(
-                InlineKeyboardButton(text="🔙 Назад", callback_data="user_editor")
-            )
-            await message.answer(
-                f"🚫 Клиент с email {email} не найден. 🔍",
-                reply_markup=builder.as_markup(),
-            )
-            await state.clear()
-            return
-
-        record = await session.fetchrow(
-            "SELECT server_id FROM keys WHERE client_id = $1", client_id
-        )
-        if not record:
-            builder = InlineKeyboardBuilder()
-            builder.row(
-                InlineKeyboardButton(text="🔙 Назад", callback_data="user_editor")
-            )
-            await message.answer(
-                "🚫 Клиент не найден в базе данных. 🔍",
-                reply_markup=builder.as_markup(),
-            )
-            await state.clear()
-            return
-
-        clusters = await get_servers_from_db()
-
-        async def update_key_on_all_servers():
-            tasks = []
-            for cluster_name, cluster_servers in clusters.items():
-                for server in cluster_servers:
-                    tasks.append(
-                        asyncio.create_task(
-                            renew_key_in_cluster(
-                                cluster_name,
-                                email,
-                                client_id,
-                                expiry_time,
-                                total_gb=TOTAL_GB,
-                            )
-                        )
-                    )
-            await asyncio.gather(*tasks)
-
-        await update_key_on_all_servers()
-
-        await update_key_expiry(client_id, expiry_time)
-
-        response_message = f"✅ Время истечения ключа для клиента {client_id} ({email}) успешно обновлено на всех серверах."
-
-        builder = InlineKeyboardBuilder()
-        builder.row(InlineKeyboardButton(text="🔙 Назад", callback_data="admin"))
-        await message.answer(response_message, reply_markup=builder.as_markup())
-    except ValueError:
-        builder = InlineKeyboardBuilder()
-        builder.row(InlineKeyboardButton(text="🔙 Назад", callback_data="user_editor"))
-        await message.answer(
-            "❌ Пожалуйста, используйте формат: YYYY-MM-DD HH:MM:SS.",
-            reply_markup=builder.as_markup(),
-        )
-    except Exception as e:
-        logger.error(e)
-    await state.clear()
-
-
-@router.callback_query(F.data.startswith("delete_key_admin|"), IsAdminFilter())
-async def process_callback_delete_key(
-    callback_query: types.CallbackQuery, session: Any
-):
-    email = callback_query.data.split("|")[1]
-    client_id = await session.fetchval(
-        "SELECT client_id FROM keys WHERE email = $1", email
-    )
-
-    if client_id is None:
-        builder = InlineKeyboardBuilder()
-        builder.row(InlineKeyboardButton(text="🔙 Назад", callback_data="user_editor"))
-        await callback_query.message.answer(
-            "🔍 Ключ не найден. 🚫", reply_markup=builder.as_markup()
-        )
-        return
-
-    builder = InlineKeyboardBuilder()
-    builder.row(
-        types.InlineKeyboardButton(
-            text="✅ Да, удалить",
-            callback_data=f"confirm_delete_admin|{client_id}",
-        )
-    )
-    builder.row(
-        types.InlineKeyboardButton(text="❌ Нет, отменить", callback_data="user_editor")
-    )
-    await callback_query.message.answer(
-        "<b>❓ Вы уверены, что хотите удалить ключ?</b>",
-        reply_markup=builder.as_markup(),
-    )
-
-
-@router.callback_query(F.data.startswith("confirm_delete_admin|"), IsAdminFilter())
-async def process_callback_confirm_delete(
-    callback_query: types.CallbackQuery, session: Any
-):
-    client_id = callback_query.data.split("|")[1]
-    record = await session.fetchrow(
-        "SELECT email FROM keys WHERE client_id = $1", client_id
-    )
-
-    if record:
-        email = record["email"]
-        response_message = "✅ Ключ успешно удален."
-        builder = InlineKeyboardBuilder()
-        builder.row(InlineKeyboardButton(text="⬅️ Назад", callback_data="view_keys"))
-
-        clusters = await get_servers_from_db()
-
-        async def delete_key_from_servers(email, client_id):
-            tasks = []
-            for cluster_name, cluster_servers in clusters.items():
-                for server in cluster_servers:
-                    tasks.append(
-                        delete_key_from_cluster(cluster_name, email, client_id)
-                    )
-            await asyncio.gather(*tasks)
-
-        await delete_key_from_servers(email, client_id)
-        await delete_key_from_db(client_id, session)
-
-        await callback_query.message.answer(
-            response_message, reply_markup=builder.as_markup()
-        )
-    else:
-        response_message = "🚫 Ключ не найден или уже удален."
-        builder = InlineKeyboardBuilder()
-        builder.row(InlineKeyboardButton(text="⬅️ Назад", callback_data="view_keys"))
-        await callback_query.message.answer(
-            response_message, reply_markup=builder.as_markup()
-        )
-
-
-@router.callback_query(F.data.startswith("user_info|"), IsAdminFilter())
-async def handle_user_info(
-    callback_query: types.CallbackQuery, state: FSMContext, session: Any
-):
-    tg_id = int(callback_query.data.split("|")[1])
-    username = await session.fetchval(
-        "SELECT username FROM users WHERE tg_id = $1", tg_id
-    )
-    balance = await session.fetchval(
-        "SELECT balance FROM connections WHERE tg_id = $1", tg_id
-    )
-    key_records = await session.fetch("SELECT email FROM keys WHERE tg_id = $1", tg_id)
-    referral_count = await session.fetchval(
-        "SELECT COUNT(*) FROM referrals WHERE referrer_tg_id = $1", tg_id
-    )
-
-    builder = InlineKeyboardBuilder()
-
-    for (email,) in key_records:
-        builder.row(
-            InlineKeyboardButton(text=f"🔑 {email}", callback_data=f"edit_key_{email}")
-        )
-
-    builder.row(InlineKeyboardButton(text="📝 Изменить баланс", callback_data=f"change_balance_{tg_id}"))
-    builder.row(InlineKeyboardButton(text="🔄 Восстановить пробник", callback_data=f"restore_trial_{tg_id}"))
-    builder.row(InlineKeyboardButton(text="❌ Удалить клиента", callback_data=f"confirm_delete_user_{tg_id}"))
-    builder.row(InlineKeyboardButton(text="🔙 Назад", callback_data="user_editor"))
-
-    user_info = (
-        f"📊 Информация о пользователе:\n\n"
-        f"🆔 ID пользователя: <b>{tg_id}</b>\n"
-        f"👤 Логин пользователя: <b>@{username}</b>\n"
-        f"💰 Баланс: <b>{balance}</b>\n"
-        f"👥 Количество рефералов: <b>{referral_count}</b>\n"
-        f"🔑 Ключи (для редактирования нажмите на ключ):"
-    )
-
-    await callback_query.message.answer(user_info, reply_markup=builder.as_markup())
-    await state.set_state(UserEditorState.displaying_user_info)
-
-
-@router.callback_query(F.data.startswith("confirm_delete_user_"), IsAdminFilter())
-async def confirm_delete_user(callback_query: types.CallbackQuery, state: FSMContext, session: Any):
-    tg_id = int(callback_query.data.split("_")[3])
-
-    confirmation_markup = InlineKeyboardMarkup(
-        row_width=2,
-        inline_keyboard=[
-            [InlineKeyboardButton(text="✅ Подтвердить", callback_data=f"delete_user_{tg_id}")],
-            [InlineKeyboardButton(text="❌ Отменить", callback_data="user_editor")],
-        ],
-    )
-
-    await callback_query.message.answer(
-        f"Вы уверены, что хотите удалить пользователя с ID {tg_id}?", reply_markup=confirmation_markup
-    )
-
-
-@router.callback_query(F.data.startswith("delete_user_"), IsAdminFilter())
-async def delete_user(callback_query: types.CallbackQuery, session: Any):
-    tg_id = int(callback_query.data.split("_")[2])
-
-    key_records = await session.fetch("SELECT email, client_id FROM keys WHERE tg_id = $1", tg_id)
-
-    async def delete_keys_from_servers():
-        try:
-            tasks = []
-            for email, client_id in key_records:
-                servers = await get_servers_from_db()
-                for cluster_id, cluster in servers.items():
-                    tasks.append(delete_key_from_cluster(cluster_id, email, client_id))
-            await asyncio.gather(*tasks)
-        except Exception as e:
-            logger.error(f"Ошибка при удалении ключей с серверов для пользователя {tg_id}: {e}")
-
-    await delete_keys_from_servers()
-
-    try:
-        await delete_user_data(session, tg_id)
-
-        back_button = InlineKeyboardButton(text="🔙 Назад", callback_data="user_editor")
-        keyboard = InlineKeyboardMarkup(inline_keyboard=[[back_button]])
-
-        await callback_query.message.answer(f"🗑️ Пользователь с ID {tg_id} был удален.", reply_markup=keyboard)
-    except Exception as e:
-        logger.error(f"Ошибка при удалении данных из базы данных для пользователя {tg_id}: {e}")
-        await callback_query.message.answer(
-            f"❌ Произошла ошибка при удалении пользователя с ID {tg_id}. Попробуйте снова."
-        )

handlers/admin/admin_users.py

@@ -0,0 +1,717 @@
+import asyncio
+from datetime import datetime, timedelta, timezone
+from typing import Any
+
+import pytz
+from aiogram import F, Router, types
+from aiogram.exceptions import TelegramBadRequest
+from aiogram.fsm.context import FSMContext
+from aiogram.fsm.state import State, StatesGroup
+from aiogram.types import CallbackQuery, Message
+
+from config import TOTAL_GB
+from database import (
+    delete_key,
+    delete_user_data,
+    get_balance,
+    get_client_id_by_email,
+    get_servers,
+    update_balance,
+    update_key_expiry,
+    update_trial,
+)
+from filters.admin import IsAdminFilter
+from handlers.keys.key_utils import delete_key_from_cluster, get_user_traffic, renew_key_in_cluster, update_subscription
+from handlers.utils import sanitize_key_name
+from keyboards.admin.panel_kb import AdminPanelCallback, build_admin_back_kb
+from keyboards.admin.users_kb import (
+    AdminUserEditorCallback,
+    AdminUserKeyEditorCallback,
+    build_editor_kb,
+    build_key_delete_kb,
+    build_key_edit_kb,
+    build_user_delete_kb,
+    build_user_edit_kb,
+    build_user_key_kb,
+    build_users_balance_change_kb,
+    build_users_balance_kb,
+    build_users_key_expiry_kb,
+    build_users_key_show_kb,
+)
+from logger import logger
+
+MOSCOW_TZ = pytz.timezone("Europe/Moscow")
+
+router = Router()
+
+
+class UserEditorState(StatesGroup):
+    # search
+    waiting_for_user_data = State()
+    waiting_for_key_name = State()
+    # updating data
+    waiting_for_balance = State()
+    waiting_for_expiry_time = State()
+    waiting_for_message_text = State()
+
+
+@router.callback_query(
+    AdminPanelCallback.filter(F.action == "search_user"),
+    IsAdminFilter(),
+)
+async def handle_search_user(callback_query: CallbackQuery, state: FSMContext):
+    text = (
+        "<b>🔍 Поиск пользователя</b>"
+        "\n\n📌 Введите ID, Username или перешлите сообщение пользователя."
+        "\n\n🆔 ID - числовой айди"
+        "\n📝 Username - юзернейм пользователя"
+        "\n\n<i>✉️ Для поиска, вы можете просто переслать сообщение от пользователя.</i>"
+    )
+
+    await state.set_state(UserEditorState.waiting_for_user_data)
+    await callback_query.message.edit_text(text=text, reply_markup=build_admin_back_kb())
+
+
+@router.callback_query(
+    AdminPanelCallback.filter(F.action == "search_key"),
+    IsAdminFilter(),
+)
+async def handle_search_key(callback_query: CallbackQuery, state: FSMContext):
+    await state.set_state(UserEditorState.waiting_for_key_name)
+    await callback_query.message.edit_text(text="🔑 Введите имя ключа для поиска:", reply_markup=build_admin_back_kb())
+
+
+@router.message(UserEditorState.waiting_for_user_data, IsAdminFilter())
+async def handle_user_data_input(message: Message, state: FSMContext, session: Any):
+    kb = build_admin_back_kb()
+
+    if message.forward_from:
+        tg_id = message.forward_from.id
+        await process_user_search(message, state, session, tg_id)
+        return
+
+    if not message.text:
+        await message.answer(text="🚫 Пожалуйста, отправьте текстовое сообщение.", reply_markup=kb)
+        return
+
+    if message.text.isdigit():
+        tg_id = int(message.text)
+    else:
+        # Удаление '@' символа в начале сообщения
+        username = message.text.strip().lstrip("@")
+        # Удаление начала ссылки на профиль
+        username = username.replace("https://t.me/", "")
+
+        user = await session.fetchrow("SELECT tg_id FROM users WHERE username = $1", username)
+
+        if not user:
+            await message.answer(
+                text="🚫 Пользователь с указанным Username не найден!",
+                reply_markup=kb,
+            )
+            return
+
+        tg_id = user["tg_id"]
+
+    await process_user_search(message, state, session, tg_id)
+
+
+@router.message(UserEditorState.waiting_for_key_name, IsAdminFilter())
+async def handle_key_name_input(message: Message, state: FSMContext, session: Any):
+    kb = build_admin_back_kb()
+
+    if not message.text:
+        await message.answer(text="🚫 Пожалуйста, отправьте текстовое сообщение.", reply_markup=kb)
+        return
+
+    key_name = sanitize_key_name(message.text)
+    key_details = await get_key_details(key_name, session)
+
+    if not key_details:
+        await message.answer(text="🚫 Пользователь с указанным именем ключа не найден.", reply_markup=kb)
+        return
+
+    await process_user_search(message, state, session, key_details["tg_id"])
+
+
+@router.callback_query(
+    AdminUserEditorCallback.filter(F.action == "users_send_message"),
+    IsAdminFilter(),
+)
+async def handle_send_message(
+    callback_query: types.CallbackQuery, callback_data: AdminUserEditorCallback, state: FSMContext
+):
+    tg_id = callback_data.tg_id
+
+    await callback_query.message.edit_text(
+        text="✉️ Введите текст сообщения, которое вы хотите отправить пользователю:", reply_markup=build_editor_kb(tg_id)
+    )
+
+    await state.update_data(tg_id=tg_id)
+    await state.set_state(UserEditorState.waiting_for_message_text)
+
+
+@router.message(UserEditorState.waiting_for_message_text, IsAdminFilter())
+async def handle_message_text_input(message: Message, state: FSMContext):
+    data = await state.get_data()
+    tg_id = data.get("tg_id")
+
+    try:
+        await message.bot.send_message(chat_id=tg_id, text=message.text)
+        await message.answer(text="✅ Сообщение успешно отправлено.", reply_markup=build_editor_kb(tg_id))
+    except Exception as e:
+        await message.answer(text=f"❌ Не удалось отправить сообщение: {e}", reply_markup=build_editor_kb(tg_id))
+
+    await state.clear()
+
+
+@router.callback_query(
+    AdminUserEditorCallback.filter(F.action == "users_trial_restore"),
+    IsAdminFilter(),
+)
+async def handle_trial_restore(
+    callback_query: types.CallbackQuery, callback_data: AdminUserEditorCallback, session: Any
+):
+    tg_id = callback_data.tg_id
+
+    await update_trial(tg_id, 0, session)
+    await callback_query.message.edit_text(text="✅ Триал успешно восстановлен!", reply_markup=build_editor_kb(tg_id))
+
+
+@router.callback_query(AdminUserEditorCallback.filter(F.action == "users_balance_edit"), IsAdminFilter())
+async def handle_balance_change(callback_query: CallbackQuery, callback_data: AdminUserEditorCallback, session: Any):
+    tg_id = callback_data.tg_id
+
+    records = await session.fetch(
+        """
+       SELECT amount, payment_system, status, created_at
+       FROM payments
+       WHERE tg_id = $1
+       ORDER BY created_at DESC
+       LIMIT 5
+       """,
+        tg_id,
+    )
+
+    balance = await get_balance(tg_id)
+
+    balance = int(balance)
+
+    text = (
+        f"<b>💵 Изменение баланса</b>"
+        f"\n\n🆔 ID: <b>{tg_id}</b>"
+        f"\n💰 Баланс: <b>{balance}Р</b>"
+        f"\n📊 Последние операции (5):"
+    )
+
+    if records:
+        for record in records:
+            amount = record["amount"]
+            payment_system = record["payment_system"]
+            status = record["status"]
+            date = record["created_at"].strftime("%Y-%m-%d %H:%M:%S")
+            text += (
+                f"\n<blockquote>💸 Сумма: {amount} | {payment_system}"
+                f"\n📌 Статус: {status}"
+                f"\n⏳ Дата: {date}</blockquote>"
+            )
+    else:
+        text += "\n <i>🚫 Отсутствуют</i>"
+
+    await callback_query.message.edit_text(text=text, reply_markup=build_users_balance_kb(tg_id))
+
+
+@router.callback_query(AdminUserEditorCallback.filter(F.action == "users_balance_add"), IsAdminFilter())
+async def handle_balance_add(
+    callback_query: CallbackQuery, callback_data: AdminUserEditorCallback, state: FSMContext, session: Any
+):
+    tg_id = callback_data.tg_id
+    amount = callback_data.data
+
+    if amount:
+        await update_balance(tg_id, int(amount), session, is_admin=True)
+        await handle_balance_change(callback_query, callback_data, session)
+        return
+
+    await state.update_data(tg_id=tg_id, op_type="add")
+    await state.set_state(UserEditorState.waiting_for_balance)
+
+    await callback_query.message.edit_text(
+        text="✍️ Введите сумму, которую хотите добавить на баланс пользователя:",
+        reply_markup=build_users_balance_change_kb(tg_id),
+    )
+
+
+@router.callback_query(AdminUserEditorCallback.filter(F.action == "users_balance_take"), IsAdminFilter())
+async def handle_balance_take(callback_query: CallbackQuery, callback_data: AdminUserEditorCallback, state: FSMContext):
+    tg_id = callback_data.tg_id
+
+    await state.update_data(tg_id=tg_id, op_type="take")
+    await state.set_state(UserEditorState.waiting_for_balance)
+
+    await callback_query.message.edit_text(
+        text="✍️ Введите сумму, которую хотите вычесть из баланса пользователя:",
+        reply_markup=build_users_balance_change_kb(tg_id),
+    )
+
+
+@router.callback_query(AdminUserEditorCallback.filter(F.action == "users_balance_set"), IsAdminFilter())
+async def handle_balance_set(callback_query: CallbackQuery, callback_data: AdminUserEditorCallback, state: FSMContext):
+    tg_id = callback_data.tg_id
+
+    await state.update_data(tg_id=tg_id, op_type="set")
+    await state.set_state(UserEditorState.waiting_for_balance)
+
+    await callback_query.message.edit_text(
+        text="✍️ Введите баланс, который хотите установить пользователю:",
+        reply_markup=build_users_balance_change_kb(tg_id),
+    )
+
+
+@router.message(UserEditorState.waiting_for_balance, IsAdminFilter())
+async def handle_balance_input(message: Message, state: FSMContext, session: Any):
+    data = await state.get_data()
+    tg_id = data.get("tg_id")
+    op_type = data.get("op_type")
+
+    if not message.text.isdigit() or int(message.text) < 0:
+        await message.answer(
+            text="🚫 Пожалуйста, введите корректную сумму!", reply_markup=build_users_balance_change_kb(tg_id)
+        )
+        return
+
+    amount = int(message.text)
+
+    if op_type == "add":
+        text = f"✅ К балансу пользователя добавлено <b>{amount}Р</b>"
+        await update_balance(tg_id, amount, session)
+    elif op_type == "take":
+        text = f"✅ Из баланса пользователя было вычтено <b>{amount}Р</b>"
+        await update_balance(tg_id, -amount, session)
+    else:
+        text = f"✅ Баланс пользователя изменен на <b>{amount}Р</b>"
+        await set_user_balance(tg_id, amount, session)
+
+    await message.answer(text=text, reply_markup=build_users_balance_change_kb(tg_id))
+
+
+@router.callback_query(AdminUserEditorCallback.filter(F.action == "users_key_edit"), IsAdminFilter())
+async def handle_key_edit(
+    callback_query: CallbackQuery,
+    callback_data: AdminUserEditorCallback | AdminUserKeyEditorCallback,
+    session: Any,
+    update: bool = False,
+):
+    email = callback_data.data
+    key_details = await get_key_details(email, session)
+
+    if not key_details:
+        await callback_query.message.edit_text(
+            text="🚫 Информация о ключе не найдена.",
+            reply_markup=build_editor_kb(callback_data.tg_id),
+        )
+        return
+
+    text = (
+        f"<b>🔑 Информация о ключе</b>"
+        f"\n\n<code>{key_details['key']}</code>"
+        f"\n\n⏰ Дата истечения: <b>{key_details['expiry_date']} (UTC)</b>"
+        f"\n🌐 Кластер: <b>{key_details['cluster_name']}</b>"
+        f"\n🆔 ID клиента: <b>{key_details['tg_id']}</b>"
+    )
+
+    if not update or not callback_data.edit:
+        await callback_query.message.edit_text(text=text, reply_markup=build_key_edit_kb(key_details, email))
+    else:
+        await callback_query.message.edit_text(
+            text=text, reply_markup=build_users_key_expiry_kb(callback_data.tg_id, email)
+        )
+
+
+@router.callback_query(AdminUserEditorCallback.filter(F.action == "users_expiry_edit"), IsAdminFilter())
+async def handle_change_expiry(callback_query: CallbackQuery, callback_data: AdminUserEditorCallback):
+    tg_id = callback_data.tg_id
+    email = callback_data.data
+
+    await callback_query.message.edit_reply_markup(reply_markup=build_users_key_expiry_kb(tg_id, email))
+
+
+@router.callback_query(AdminUserKeyEditorCallback.filter(F.action == "add"), IsAdminFilter())
+async def handle_expiry_add(
+    callback_query: CallbackQuery, callback_data: AdminUserKeyEditorCallback, state: FSMContext, session: Any
+):
+    tg_id = callback_data.tg_id
+    email = callback_data.data
+    month = callback_data.month
+
+    key_details = await get_key_details(email, session)
+
+    if not key_details:
+        await callback_query.message.edit_text(
+            text="🚫 Информация о ключе не найдена.",
+            reply_markup=build_editor_kb(tg_id),
+        )
+        return
+
+    if month:
+        await change_expiry_time(key_details["expiry_time"] + month * 30 * 24 * 3600 * 1000, email, session)
+        await handle_key_edit(callback_query, callback_data, session, True)
+        return
+
+    await state.update_data(tg_id=tg_id, email=email, op_type="add")
+    await state.set_state(UserEditorState.waiting_for_expiry_time)
+
+    await callback_query.message.edit_text(
+        text="✍️ Введите количество дней, которое хотите добавить к времени действия ключа:",
+        reply_markup=build_users_key_show_kb(tg_id, email),
+    )
+
+
+@router.callback_query(AdminUserKeyEditorCallback.filter(F.action == "take"), IsAdminFilter())
+async def handle_expiry_take(
+    callback_query: CallbackQuery, callback_data: AdminUserKeyEditorCallback, state: FSMContext
+):
+    tg_id = callback_data.tg_id
+    email = callback_data.data
+
+    await state.update_data(tg_id=tg_id, email=email, op_type="take")
+    await state.set_state(UserEditorState.waiting_for_expiry_time)
+
+    await callback_query.message.edit_text(
+        text="✍️ Введите количество дней, которое хотите вычесть из времени действия ключа:",
+        reply_markup=build_users_key_show_kb(tg_id, email),
+    )
+
+
+@router.callback_query(AdminUserKeyEditorCallback.filter(F.action == "set"), IsAdminFilter())
+async def handle_expiry_set(
+    callback_query: CallbackQuery, callback_data: AdminUserKeyEditorCallback, state: FSMContext, session: Any
+):
+    tg_id = callback_data.tg_id
+    email = callback_data.data
+
+    key_details = await get_key_details(email, session)
+
+    if not key_details:
+        await callback_query.message.edit_text(
+            text="🚫 Информация о ключе не найдена.",
+            reply_markup=build_editor_kb(tg_id),
+        )
+        return
+
+    await state.update_data(tg_id=tg_id, email=email, op_type="set")
+    await state.set_state(UserEditorState.waiting_for_expiry_time)
+
+    text = (
+        "✍️ Введите новое время действия ключа:"
+        "\n\n📌 Формат: <b>год-месяц-день час:минута</b>"
+        f"\n\n📄 Текущая дата: {datetime.fromtimestamp(key_details['expiry_time'] / 1000).strftime('%Y-%m-%d %H:%M')}"
+    )
+
+    await callback_query.message.edit_text(text=text, reply_markup=build_users_key_show_kb(tg_id, email))
+
+
+@router.message(UserEditorState.waiting_for_expiry_time, IsAdminFilter())
+async def handle_expiry_time_input(message: Message, state: FSMContext, session: Any):
+    data = await state.get_data()
+    tg_id = data.get("tg_id")
+    email = data.get("email")
+    op_type = data.get("op_type")
+
+    if op_type != "set" and (not message.text.isdigit() or int(message.text) < 0):
+        await message.answer(
+            text="🚫 Пожалуйста, введите корректное количество дней!",
+            reply_markup=build_users_key_show_kb(tg_id, email),
+        )
+        return
+
+    key_details = await get_key_details(email, session)
+
+    if not key_details:
+        await message.answer(
+            text="🚫 Информация о ключе не найдена.",
+            reply_markup=build_editor_kb(tg_id),
+        )
+        return
+
+    try:
+        current_expiry_time = datetime.fromtimestamp(key_details["expiry_time"] / 1000, tz=MOSCOW_TZ)
+
+        if op_type == "add":
+            days = int(message.text)
+            new_expiry_time = current_expiry_time + timedelta(days=days)
+            text = f"✅ Ко времени действия ключа добавлено <b>{days} дн.</b>"
+
+        elif op_type == "take":
+            days = int(message.text)
+            new_expiry_time = current_expiry_time - timedelta(days=days)
+            text = f"✅ Из времени действия ключа вычтено <b>{days} дн.</b>"
+
+        else:
+            new_expiry_time = datetime.strptime(message.text, "%Y-%m-%d %H:%M")
+            new_expiry_time = MOSCOW_TZ.localize(new_expiry_time)
+            text = f"✅ Время действия ключа изменено на <b>{message.text} (МСК)</b>"
+
+        new_expiry_timestamp = int(new_expiry_time.timestamp() * 1000)
+        await change_expiry_time(new_expiry_timestamp, email, session)
+
+    except ValueError:
+        text = "🚫 Пожалуйста, используйте корректный формат даты (ГГГГ-ММ-ДД ЧЧ:ММ)!"
+    except Exception as e:
+        text = f"❗ Произошла ошибка во время изменения времени действия ключа: {e}"
+
+    await message.answer(text=text, reply_markup=build_users_key_show_kb(tg_id, email))
+
+
+@router.callback_query(AdminUserEditorCallback.filter(F.action == "users_update_key"), IsAdminFilter())
+async def handle_update_key(callback_query: CallbackQuery, callback_data: AdminUserEditorCallback, session: Any):
+    tg_id = callback_data.tg_id
+    email = callback_data.data
+
+    try:
+        await update_subscription(tg_id, email, session)
+        await handle_key_edit(callback_query, callback_data, session, True)
+    except TelegramBadRequest:
+        pass
+    except Exception as e:
+        logger.error(f"Ошибка при обновлении ключа {email} администратором: {e}")
+        await callback_query.message.answer(
+            text=f"❗ Произошла ошибка при обновлении ключа: {e}", reply_markup=build_user_key_kb(tg_id, email)
+        )
+
+
+@router.callback_query(AdminUserEditorCallback.filter(F.action == "users_delete_key"), IsAdminFilter())
+async def handle_delete_key(callback_query: CallbackQuery, callback_data: AdminUserEditorCallback, session: Any):
+    email = callback_data.data
+    client_id = await session.fetchval("SELECT client_id FROM keys WHERE email = $1", email)
+
+    if client_id is None:
+        await callback_query.message.edit_text(
+            text="🚫 Ключ не найден!", reply_markup=build_editor_kb(callback_data.tg_id)
+        )
+        return
+
+    await callback_query.message.edit_text(
+        text="❓ Вы уверены, что хотите удалить ключ?", reply_markup=build_key_delete_kb(callback_data.tg_id, email)
+    )
+
+
+@router.callback_query(AdminUserEditorCallback.filter(F.action == "users_delete_key_confirm"), IsAdminFilter())
+async def handle_delete_key_confirm(
+    callback_query: types.CallbackQuery, callback_data: AdminUserEditorCallback, session: Any
+):
+    email = callback_data.data
+    record = await session.fetchrow("SELECT client_id FROM keys WHERE email = $1", email)
+
+    kb = build_editor_kb(callback_data.tg_id)
+
+    if record:
+        client_id = record["client_id"]
+        clusters = await get_servers()
+
+        async def delete_key_from_servers():
+            tasks = []
+            for cluster_name, cluster_servers in clusters.items():
+                for _ in cluster_servers:
+                    tasks.append(delete_key_from_cluster(cluster_name, email, client_id))
+            await asyncio.gather(*tasks)
+
+        await delete_key_from_servers()
+        await delete_key(client_id, session)
+
+        await callback_query.message.edit_text(text="✅ Ключ успешно удален.", reply_markup=kb)
+    else:
+        await callback_query.message.edit_text(text="🚫 Ключ не найден или уже удален.", reply_markup=kb)
+
+
+@router.callback_query(AdminUserEditorCallback.filter(F.action == "users_delete_user"), IsAdminFilter())
+async def handle_delete_user(callback_query: CallbackQuery, callback_data: AdminUserEditorCallback):
+    tg_id = callback_data.tg_id
+    await callback_query.message.edit_text(
+        text=f"❗️ Вы уверены, что хотите удалить пользователя с ID {tg_id}?", reply_markup=build_user_delete_kb(tg_id)
+    )
+
+
+@router.callback_query(AdminUserEditorCallback.filter(F.action == "users_delete_user_confirm"), IsAdminFilter())
+async def handle_delete_user_confirm(
+    callback_query: types.CallbackQuery, callback_data: AdminUserEditorCallback, session: Any
+):
+    tg_id = callback_data.tg_id
+    key_records = await session.fetch("SELECT email, client_id FROM keys WHERE tg_id = $1", tg_id)
+
+    async def delete_keys_from_servers():
+        try:
+            tasks = []
+            for email, client_id in key_records:
+                servers = await get_servers()
+                for cluster_id, _cluster in servers.items():
+                    tasks.append(delete_key_from_cluster(cluster_id, email, client_id))
+            await asyncio.gather(*tasks)
+        except Exception as e:
+            logger.error(f"Ошибка при удалении ключей с серверов для пользователя {tg_id}: {e}")
+
+    await delete_keys_from_servers()
+
+    try:
+        await delete_user_data(session, tg_id)
+        await callback_query.message.edit_text(
+            text=f"🗑️ Пользователь с ID {tg_id} был удален.", reply_markup=build_editor_kb(callback_data.tg_id)
+        )
+    except Exception as e:
+        logger.error(f"Ошибка при удалении данных из базы данных для пользователя {tg_id}: {e}")
+        await callback_query.message.edit_text(
+            text=f"❌ Произошла ошибка при удалении пользователя с ID {tg_id}. Попробуйте снова."
+        )
+
+
+@router.callback_query(AdminUserEditorCallback.filter(F.action == "users_editor"), IsAdminFilter())
+async def handle_editor(
+    callback_query: types.CallbackQuery, callback_data: AdminUserEditorCallback, state: FSMContext, session: Any
+):
+    await process_user_search(callback_query.message, state, session, callback_data.tg_id, callback_data.edit)
+
+
+async def process_user_search(
+    message: types.Message, state: FSMContext, session: Any, tg_id: int, edit: bool = False
+) -> None:
+    await state.clear()
+
+    balance = await session.fetchval("SELECT balance FROM connections WHERE tg_id = $1", tg_id)
+
+    if balance is None:
+        await message.answer(
+            text="🚫 Пользователь с указанным ID не найден!",
+            reply_markup=build_admin_back_kb(),
+        )
+        return
+
+    balance = int(balance)
+
+    username = await session.fetchval("SELECT username FROM users WHERE tg_id = $1", tg_id)
+    key_records = await session.fetch("SELECT email, expiry_time FROM keys WHERE tg_id = $1", tg_id)
+    referral_count = await session.fetchval("SELECT COUNT(*) FROM referrals WHERE referrer_tg_id = $1", tg_id)
+
+    text = (
+        f"<b>📊 Информация о пользователе</b>"
+        f"\n\n🆔 ID: <b>{tg_id}</b>"
+        f"\n📄 Логин: <b>@{username}</b>"
+        f"\n💰 Баланс: <b>{balance}</b>"
+        f"\n👥 Количество рефералов: <b>{referral_count}</b>"
+    )
+
+    kb = build_user_edit_kb(tg_id, key_records)
+
+    if edit:
+        try:
+            await message.edit_text(text=text, reply_markup=kb)
+        except TelegramBadRequest:
+            pass
+    else:
+        await message.answer(text=text, reply_markup=kb)
+
+
+async def get_key_details(email, session):
+    record = await session.fetchrow(
+        """
+        SELECT k.client_id, k.key, k.expiry_time, k.server_id, c.tg_id, c.balance
+        FROM keys k
+        JOIN connections c ON k.tg_id = c.tg_id
+        WHERE k.email = $1
+        """,
+        email,
+    )
+
+    if not record:
+        return None
+
+    cluster_name = record["server_id"]
+    expiry_date = datetime.fromtimestamp(record["expiry_time"] / 1000, tz=timezone.utc)
+
+    return {
+        "client_id": record["client_id"],
+        "balance": record["balance"],
+        "tg_id": record["tg_id"],
+        "key": record["key"],
+        "cluster_name": cluster_name,
+        "expiry_time": record["expiry_time"],
+        "expiry_date": expiry_date.strftime("%d %B %Y года %H:%M"),
+    }
+
+
+async def change_expiry_time(expiry_time: int, email: str, session: Any) -> Exception | None:
+    client_id = await get_client_id_by_email(email)
+
+    if client_id is None:
+        return ValueError(f"User with email {email} was not found")
+
+    server_id = await session.fetchrow("SELECT server_id FROM keys WHERE client_id = $1", client_id)
+
+    if not server_id:
+        return ValueError(f"User with client_id {server_id} was not found")
+
+    clusters = await get_servers()
+
+    async def update_key_on_all_servers():
+        tasks = [
+            asyncio.create_task(
+                renew_key_in_cluster(
+                    cluster_name,
+                    email,
+                    client_id,
+                    expiry_time,
+                    total_gb=TOTAL_GB,
+                )
+            )
+            for cluster_name in clusters
+        ]
+
+        await asyncio.gather(*tasks)
+
+    await update_key_on_all_servers()
+    await update_key_expiry(client_id, expiry_time, session)
+
+
+async def set_user_balance(tg_id: int, balance: int, session: Any) -> None:
+    try:
+        await session.execute(
+            "UPDATE connections SET balance = $1 WHERE tg_id = $2",
+            balance,
+            tg_id,
+        )
+    except Exception as e:
+        logger.error(f"Ошибка при установке баланса для пользователя {tg_id}: {e}")
+
+
+@router.callback_query(AdminUserEditorCallback.filter(F.action == "users_traffic"), IsAdminFilter())
+async def handle_user_traffic(
+    callback_query: types.CallbackQuery, callback_data: AdminUserEditorCallback, session: Any
+):
+    """
+    Обработчик кнопки "📊 Трафик".
+    Получает трафик пользователя и отправляет администратору.
+    """
+    tg_id = callback_data.tg_id
+    email = callback_data.data
+
+    await callback_query.message.edit_text("⏳ Получаем данные о трафике, пожалуйста, подождите...")
+
+    traffic_data = await get_user_traffic(session, tg_id, email)
+
+    if traffic_data["status"] == "error":
+        await callback_query.message.edit_text(traffic_data["message"], reply_markup=build_editor_kb(tg_id, True))
+        return
+
+    total_traffic = 0
+
+    result_text = f"📊 <b>Трафик подписки {email}:</b>\n\n"
+
+    for server, traffic in traffic_data["traffic"].items():
+        if isinstance(traffic, str):
+            result_text += f"❌ {server}: {traffic}\n"
+        else:
+            result_text += f"🌍 {server}: <b>{traffic} ГБ</b>\n"
+            total_traffic += traffic
+
+    result_text += f"\n🔢 <b>Общий трафик:</b> {total_traffic:.2f} ГБ"
+
+    await callback_query.message.edit_text(result_text, reply_markup=build_editor_kb(tg_id, True))

handlers/buttons/add_subscribe.py

@@ -0,0 +1,6 @@
+DOWNLOAD_IOS_BUTTON = "🍏 Скачать iOS"
+DOWNLOAD_ANDROID_BUTTON = "🤖 Скачать Android"
+IMPORT_IOS = "🍏 Подключить"
+IMPORT_ANDROID = "🤖 Подключить"
+PC_BUTTON = "💻 Компьютеры"
+TV_BUTTON = "📺 Андроид TV"

handlers/buttons/gifts.py

@@ -1,5 +1,9 @@
 GIFT = "🎁 Подарить подписку"
 MY_GIFTS = "🎁 Мои подарки"
 PROFILE = "👤 Личный кабинет"
-BACK = "🔙 Назад"
+BACK = "В меню подарков"
 GIFTS_ABOUT = "<b>Дарите подарки и следите, чтобы они дошли до адресата! 🎄</b>"
+SHARE_GIFT = "🎁 Поделиться подарком"
+APPLY = "✅ Подтвердить"
+CANCEL = "❌ Отмена"
+NO_GIFTS = "У вас нет подарков."

handlers/buttons/notification.py

@@ -0,0 +1,3 @@
+RENEW_KEY = "🔄 Продлить подписку"
+ADD_KEY = "➕ Добавить подписку"
+PROFILE = "👤 Личный кабинет"

handlers/buttons/profile.py

@@ -1,5 +1,7 @@
-ADD_SUB = "➕ Устройство"
-MY_SUBS = "📱 Мои устройства"
+ADD_SUB = "➕ Подписка"
+MY_SUBS = "📱 Мои подписки"
+BALANCE = "💰 Баланс"
+BALANCE_HISTORY = "📊 История пополнения"
 PAYMENT = "💳 Пополнить баланс"
 INVITE = "👥 Пригласить"
 GIFTS = "🎁 Подарить"

handlers/buttons/yookassa.py

@@ -1,3 +1,12 @@
 PAY = "Пополнить"
+PAY_2 = "Оплатить"
 BACK = "⬅️ Назад"
 CUSTOM_SUM = "💰 Ввести свою сумму"
+PROFILE = "👤 Личный кабинет"
+KEY_CREATION_PAYMENT_MESSAGE = (
+    "Вы выбрали пополнение на {amount} рублей для создания нового ключа. Перейдите по ссылке для оплаты:"
+)
+KEY_RENEWAL_PAYMENT_MESSAGE = (
+    "Вы выбрали пополнение на {amount} рублей для продления ключа. Перейдите по ссылке для оплаты:"
+)
+DEFAULT_PAYMENT_MESSAGE = "Вы выбрали пополнение на {amount} рублей. Перейдите по ссылке для оплаты:"

handlers/captcha.py

@@ -0,0 +1,75 @@
+import random
+import secrets
+from typing import Any
+
+from aiogram import F, Router
+from aiogram.fsm.context import FSMContext
+from aiogram.types import CallbackQuery, Message
+from aiogram.utils.keyboard import InlineKeyboardBuilder
+
+from config import CAPTCHA_EMOJIS
+from logger import logger
+
+from .utils import edit_or_send_message
+
+router = Router()
+
+
+async def generate_captcha(message: Message, state: FSMContext):
+    correct_emoji, correct_text = secrets.choice(list(CAPTCHA_EMOJIS.items()))
+    wrong_emojis = random.sample([e for e in CAPTCHA_EMOJIS.keys() if e != correct_emoji], 3)
+
+    all_emojis = [correct_emoji] + wrong_emojis
+    random.shuffle(all_emojis)
+
+    await state.update_data(
+        correct_emoji=correct_emoji,
+        message_id=message.message_id,
+        chat_id=message.chat.id,
+        original_text=message.text,
+    )
+
+    builder = InlineKeyboardBuilder()
+    for emoji in all_emojis:
+        builder.button(text=emoji, callback_data=f"captcha_{emoji}")
+    builder.adjust(2, 2)
+
+    return {
+        "text": f"🔒 Для подтверждения, что вы не робот, выберите кнопку с {correct_text}",
+        "markup": builder.as_markup(),
+    }
+
+
+@router.callback_query(F.data.startswith("captcha_"))
+async def check_captcha(callback: CallbackQuery, state: FSMContext, session: Any, admin: bool):
+    from handlers.start import start_command
+
+    selected_emoji = callback.data.split("captcha_")[1]
+    state_data = await state.get_data()
+    correct_emoji = state_data.get("correct_emoji")
+    message_id = state_data.get("message_id")
+    chat_id = state_data.get("chat_id")
+
+    if not message_id or not chat_id:
+        target_message = callback.message
+    else:
+        try:
+            target_message = await callback.bot.edit_message_text(
+                chat_id=chat_id,
+                message_id=message_id,
+                text=callback.message.text,
+            )
+        except Exception:
+            target_message = callback.message
+
+    if selected_emoji == correct_emoji:
+        logger.info(f"Пользователь {callback.message.chat.id} успешно прошел капчу")
+        await start_command(target_message, state, session, admin, captcha=False)
+    else:
+        logger.warning(f"Пользователь {callback.message.chat.id} неверно ответил на капчу")
+        captcha = await generate_captcha(target_message, state)
+        await edit_or_send_message(
+            target_message=target_message,
+            text=captcha["text"],
+            reply_markup=captcha["markup"],
+        )

handlers/coupons.py

@@ -1,13 +1,20 @@
-from datetime import datetime
 from typing import Any
 
-from aiogram import F, Router, types
+from aiogram import F, Router
 from aiogram.fsm.context import FSMContext
 from aiogram.fsm.state import State, StatesGroup
-from aiogram.types import InlineKeyboardButton
+from aiogram.types import CallbackQuery, InlineKeyboardButton, Message
 from aiogram.utils.keyboard import InlineKeyboardBuilder
 
-from database import update_balance
+from database import (
+    check_coupon_usage,
+    create_coupon_usage,
+    get_coupon_by_code,
+    update_balance,
+    update_coupon_usage_count,
+)
+
+from .utils import edit_or_send_message
 
 
 class CouponActivationState(StatesGroup):
@@ -18,80 +25,53 @@ router = Router()
 
 
 @router.callback_query(F.data == "activate_coupon")
-async def handle_activate_coupon(
-    callback_query: types.CallbackQuery, state: FSMContext
-):
+@router.message(F.text == "/activate_coupon")
+async def handle_activate_coupon(callback_query_or_message: Message | CallbackQuery, state: FSMContext):
     builder = InlineKeyboardBuilder()
     builder.row(InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile"))
 
-    await callback_query.message.answer(
-        "<b>🎫 Введите код купона:</b>\n\n"
+    if isinstance(callback_query_or_message, CallbackQuery):
+        target_message = callback_query_or_message.message
+    else:
+        target_message = callback_query_or_message
+
+    await edit_or_send_message(
+        target_message=target_message,
+        text="<b>🎫 Введите код купона:</b>\n\n"
         "📝 Пожалуйста, введите действующий код купона, который вы хотите активировать. 🔑",
         reply_markup=builder.as_markup(),
+        media_path=None,
     )
     await state.set_state(CouponActivationState.waiting_for_coupon_code)
 
 
 @router.message(CouponActivationState.waiting_for_coupon_code)
-async def process_coupon_code(message: types.Message, state: FSMContext, session: Any):
+async def process_coupon_code(message: Message, state: FSMContext, session: Any):
     coupon_code = message.text.strip()
     activation_result = await activate_coupon(message.chat.id, coupon_code, session)
 
     builder = InlineKeyboardBuilder()
     builder.row(InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile"))
 
-    await message.answer(
-        activation_result, reply_markup=builder.as_markup(), parse_mode="HTML"
-    )
+    await message.answer(activation_result, reply_markup=builder.as_markup())
     await state.clear()
 
 
 async def activate_coupon(user_id: int, coupon_code: str, session: Any):
-    coupon_record = await session.fetchrow(
-        """
-        SELECT id, usage_limit, usage_count, is_used, amount
-        FROM coupons
-        WHERE code = $1 AND (usage_count < usage_limit OR usage_limit = 0) AND is_used = FALSE
-    """,
-        coupon_code,
-    )
+    coupon_record = await get_coupon_by_code(coupon_code, session)
 
     if not coupon_record:
         return "<b>❌ Купон не найден</b> 🚫 или его использование ограничено. 🔒 Пожалуйста, проверьте код и попробуйте снова. 🔍"
 
-    usage_exists = await session.fetchrow(
-        """
-        SELECT 1 FROM coupon_usages WHERE coupon_id = $1 AND user_id = $2
-    """,
-        coupon_record["id"],
-        user_id,
-    )
+    usage_exists = await check_coupon_usage(coupon_record["id"], user_id, session)
 
     if usage_exists:
         return "<b>❌ Вы уже активировали этот купон.</b> 🚫 Купоны могут быть активированы только один раз. 🔒"
 
     coupon_amount = coupon_record["amount"]
 
-    async with session.transaction():
-        await session.execute(
-            """
-            UPDATE coupons
-            SET usage_count = usage_count + 1,
-                is_used = CASE WHEN usage_count + 1 >= usage_limit AND usage_limit > 0 THEN TRUE ELSE FALSE END
-            WHERE id = $1
-        """,
-            coupon_record["id"],
-        )
+    await update_coupon_usage_count(coupon_record["id"], session)
+    await create_coupon_usage(coupon_record["id"], user_id, session)
 
-        await session.execute(
-            """
-            INSERT INTO coupon_usages (coupon_id, user_id, used_at)
-            VALUES ($1, $2, $3)
-        """,
-            coupon_record["id"],
-            user_id,
-            datetime.utcnow(),
-        )
-
-    await update_balance(user_id, coupon_amount)
+    await update_balance(user_id, coupon_amount, session)
     return f"<b>✅ Купон успешно активирован! 🎉</b>\n\nНа ваш баланс добавлено <b>{coupon_amount} рублей</b> 💰."

handlers/donate.py

@@ -1,12 +1,14 @@
-from aiogram import F, Router, types
+from aiogram import F, Router
 from aiogram.fsm.context import FSMContext
 from aiogram.fsm.state import State, StatesGroup
-from aiogram.types import InlineKeyboardButton, LabeledPrice, PreCheckoutQuery
+from aiogram.types import CallbackQuery, InlineKeyboardButton, LabeledPrice, Message, PreCheckoutQuery
 from aiogram.utils.keyboard import InlineKeyboardBuilder
 
 from config import RUB_TO_XTR
 from logger import logger
 
+from .utils import edit_or_send_message
+
 
 class DonateState(StatesGroup):
     entering_donate_amount = State()
@@ -18,15 +20,11 @@ router = Router()
 
 
 @router.callback_query(F.data == "donate")
-async def process_donate(callback_query: types.CallbackQuery, state: FSMContext):
+async def process_donate(callback_query: CallbackQuery, state: FSMContext):
     await state.clear()
 
     builder = InlineKeyboardBuilder()
-    builder.row(
-        InlineKeyboardButton(
-            text="🤖 Бот для покупки звезд", url="https://t.me/PremiumBot"
-        )
-    )
+    builder.row(InlineKeyboardButton(text="🤖 Бот для покупки звезд", url="https://t.me/PremiumBot"))
     builder.row(
         InlineKeyboardButton(
             text="💰 Ввести сумму доната",
@@ -35,34 +33,40 @@ async def process_donate(callback_query: types.CallbackQuery, state: FSMContext)
     )
     builder.row(InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile"))
 
-    await callback_query.message.answer(
-        text="🌟 Поддержите наш проект! 💪\n\n"
+    text = (
+        "🌟 Поддержите наш проект! 💪\n\n"
         "💖 Каждый донат помогает развивать и улучшать сервис. "
-        "🤝 Мы ценим вашу поддержку и работаем над тем, чтобы сделать наш продукт еще лучше. 🚀💡",
+        "🤝 Мы ценим вашу поддержку и работаем над тем, чтобы сделать наш продукт еще лучше. 🚀💡"
+    )
+
+    await edit_or_send_message(
+        target_message=callback_query.message,
+        text=text,
         reply_markup=builder.as_markup(),
     )
 
 
 @router.callback_query(F.data == "enter_custom_donate_amount")
-async def process_enter_donate_amount(
-    callback_query: types.CallbackQuery, state: FSMContext
-):
+async def process_enter_donate_amount(callback_query: CallbackQuery, state: FSMContext):
     builder = InlineKeyboardBuilder()
     builder.row(InlineKeyboardButton(text="⬅️ Назад", callback_data="donate"))
-    await callback_query.message.answer(
-        "💸 Введите сумму доната в рублях:", reply_markup=builder.as_markup()
+    text = "💸 Введите сумму доната в рублях:"
+
+    await edit_or_send_message(
+        target_message=callback_query.message,
+        text=text,
+        reply_markup=builder.as_markup(),
     )
+
     await state.set_state(DonateState.entering_donate_amount)
 
 
 @router.message(DonateState.entering_donate_amount)
-async def process_donate_amount_input(message: types.Message, state: FSMContext):
+async def process_donate_amount_input(message: Message, state: FSMContext):
     if message.text.isdigit():
         amount = int(message.text)
         if amount // RUB_TO_XTR <= 0:
-            await message.answer(
-                f"Сумма доната должна быть больше {RUB_TO_XTR}. Пожалуйста, введите сумму еще раз:"
-            )
+            await message.answer(f"Сумма доната должна быть больше {RUB_TO_XTR}. Пожалуйста, введите сумму еще раз:")
             return
 
         await state.update_data(amount=amount)
@@ -95,13 +99,11 @@ async def on_pre_checkout_query(pre_checkout_query: PreCheckoutQuery):
 
 
 @router.message(F.successful_payment, DonateState.waiting_for_donate_payment)
-async def on_successful_donate(message: types.Message, state: FSMContext):
+async def on_successful_donate(message: Message, state: FSMContext):
     try:
         amount = float(message.successful_payment.invoice_payload.split("_")[0])
         builder = InlineKeyboardBuilder()
-        builder.row(
-            InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile")
-        )
+        builder.row(InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile"))
         await message.answer(
             text=f"🙏 Спасибо за донат {amount} рублей! Ваша поддержка очень важна для нас. 💖",
             reply_markup=builder.as_markup(),

handlers/instructions/instructions.py

@@ -1,157 +1,118 @@
 import os
 from typing import Any
 
-import asyncpg
 from aiogram import F, Router, types
-from aiogram.types import BufferedInputFile, InlineKeyboardButton
+from aiogram.types import (
+    CallbackQuery,
+    InlineKeyboardButton,
+    Message,
+)
 from aiogram.utils.keyboard import InlineKeyboardBuilder
 
-from config import CONNECT_MACOS, CONNECT_WINDOWS, DATABASE_URL, SUPPORT_CHAT_URL
-from handlers.texts import CONNECT_TV_TEXT, INSTRUCTION_PC, INSTRUCTIONS, KEY_MESSAGE, SUBSCRIPTION_DETAILS_TEXT
+from config import CONNECT_MACOS, CONNECT_WINDOWS, SUPPORT_CHAT_URL
+from database import get_key_details
+from handlers.texts import (
+    CONNECT_TV_TEXT,
+    INSTRUCTION_PC,
+    INSTRUCTIONS,
+    KEY_MESSAGE,
+    SUBSCRIPTION_DETAILS_TEXT,
+)
+from handlers.utils import edit_or_send_message
 
 router = Router()
 
 
 @router.callback_query(F.data == "instructions")
 @router.message(F.text == "/instructions")
-async def send_instructions(callback_query_or_message: types.CallbackQuery | types.Message):
+async def send_instructions(callback_query_or_message: CallbackQuery | Message):
     instructions_message = INSTRUCTIONS
     image_path = os.path.join("img", "instructions.jpg")
 
-    if not os.path.isfile(image_path):
-        if isinstance(callback_query_or_message, types.CallbackQuery):
-            await callback_query_or_message.message.answer("Файл изображения не найден.")
-        else:
-            await callback_query_or_message.answer("Файл изображения не найден.")
-        return
-
     builder = InlineKeyboardBuilder()
     builder.row(InlineKeyboardButton(text="💬 Поддержка", url=SUPPORT_CHAT_URL))
-    builder.row(
-        InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile"),
-    )
+    builder.row(InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile"))
 
-    if isinstance(callback_query_or_message, types.CallbackQuery):
-        send_photo = callback_query_or_message.message.answer_photo
+    if isinstance(callback_query_or_message, CallbackQuery):
+        target_message = callback_query_or_message.message
     else:
-        send_photo = callback_query_or_message.answer_photo
-
-    with open(image_path, "rb") as image_from_buffer:
-        await send_photo(
-            BufferedInputFile(image_from_buffer.read(), filename="instructions.jpg"),
-            caption=instructions_message,
-            reply_markup=builder.as_markup(),
-        )
+        target_message = callback_query_or_message
 
+    await edit_or_send_message(
+        target_message=target_message,
+        text=instructions_message,
+        reply_markup=builder.as_markup(),
+        media_path=image_path,
+    )
 
 
 @router.callback_query(F.data.startswith("connect_pc|"))
-async def process_connect_pc(callback_query: types.CallbackQuery, session: Any):
-    tg_id = callback_query.message.chat.id
+async def process_connect_pc(callback_query: CallbackQuery, session: Any):
     key_name = callback_query.data.split("|")[1]
-
-    record = await session.fetchrow(
-        """
-        SELECT k.key
-        FROM keys k
-        WHERE k.tg_id = $1 AND k.email = $2
-        """,
-        tg_id,
-        key_name,
-    )
-
+    record = await get_key_details(key_name, session)
     if not record:
-        await callback_query.message.answer(
-            "❌ <b>Ключ не найден. Проверьте имя ключа.</b> 🔍"
+        builder = InlineKeyboardBuilder()
+        builder.row(InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile"))
+        await edit_or_send_message(
+            target_message=callback_query.message,
+            text="❌ <b>Ключ не найден. Проверьте имя ключа.</b> 🔍",
+            reply_markup=builder.as_markup(),
+            media_path=None,
         )
         return
 
     key = record["key"]
-    key_message = KEY_MESSAGE.format(key)
-    instruction_message = f"{key_message}{INSTRUCTION_PC}"
+    key_message_text = KEY_MESSAGE.format(key)
+    instruction_message = f"{key_message_text}{INSTRUCTION_PC}"
 
     builder = InlineKeyboardBuilder()
-    builder.row(
-        InlineKeyboardButton(
-            text="💻 Подключить Windows", url=f"{CONNECT_WINDOWS}{key}"
-        )
-    )
-    builder.row(
-        InlineKeyboardButton(text="💻 Подключить MacOS", url=f"{CONNECT_MACOS}{key}")
-    )
-    builder.row(InlineKeyboardButton(text="🆘 Поддержка", url=f"{SUPPORT_CHAT_URL}"))
+    builder.row(InlineKeyboardButton(text="💻 Подключить Windows", url=f"{CONNECT_WINDOWS}{key}"))
+    builder.row(InlineKeyboardButton(text="💻 Подключить MacOS", url=f"{CONNECT_MACOS}{key}"))
+    builder.row(InlineKeyboardButton(text="🆘 Поддержка", url=SUPPORT_CHAT_URL))
+    builder.row(InlineKeyboardButton(text="⬅️ Назад", callback_data=f"view_key|{key_name}"))
     builder.row(InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile"))
 
-    await callback_query.message.answer(
-        instruction_message,
+    await edit_or_send_message(
+        target_message=callback_query.message,
+        text=instruction_message,
         reply_markup=builder.as_markup(),
-        parse_mode="HTML",
+        media_path=None,
+    )
+
+
+
+@router.callback_query(F.data.startswith("connect_tv|"))
+async def process_connect_tv(callback_query: CallbackQuery):
+    key_name = callback_query.data.split("|")[1]
+
+    builder = InlineKeyboardBuilder()
+    builder.row(InlineKeyboardButton(text="▶ Продолжить", callback_data=f"continue_tv|{key_name}"))
+    builder.row(InlineKeyboardButton(text="⬅️ Назад", callback_data=f"view_key|{key_name}"))
+    builder.row(InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile"))
+
+    await edit_or_send_message(
+        target_message=callback_query.message,
+        text=CONNECT_TV_TEXT,
+        reply_markup=builder.as_markup(),
+        media_path=None,
         disable_web_page_preview=True,
     )
 
 
-@router.callback_query(F.data.startswith("connect_tv|"))
-async def process_connect_tv(callback_query: types.CallbackQuery):
-    key_name = callback_query.data.split("|")[1]
-
-    builder = InlineKeyboardBuilder()
-    builder.row(
-        InlineKeyboardButton(
-            text="▶ Продолжить", callback_data=f"continue_tv|{key_name}"
-        )
-    )
-    builder.row(
-        InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile")
-    )
-
-    await callback_query.message.answer(
-        text=CONNECT_TV_TEXT,
-        reply_markup=builder.as_markup(),
-        parse_mode="HTML",
-        disable_web_page_preview=True
-    )
-
-
 @router.callback_query(F.data.startswith("continue_tv|"))
-async def process_continue_tv(callback_query: types.CallbackQuery):
+async def process_continue_tv(callback_query: CallbackQuery, session: Any):
     key_name = callback_query.data.split("|")[1]
     tg_id = callback_query.from_user.id
 
-    print(f"tg_id: {tg_id}, key_name: {key_name}")  # Отладочный вывод
-
-    conn = await asyncpg.connect(DATABASE_URL)
-    try:
-        record = await conn.fetchrow(
-            """
-            SELECT k.key
-            FROM keys k
-            WHERE k.tg_id = $1 AND k.email = $2
-            """,
-            tg_id,
-            key_name,
-        )
-
-        print(f"Query result: {record}")  # Отладочный вывод результата
-    finally:
-        await conn.close()
-
-
-    subscription_link = record['key']
-
+    record = await get_key_details(key_name, session)
+    subscription_link = record["key"]
     message_text = SUBSCRIPTION_DETAILS_TEXT.format(subscription_link=subscription_link)
 
     builder = InlineKeyboardBuilder()
-    builder.row(
-        InlineKeyboardButton(
-            text="📖 Полная инструкция", url="https://vpn4tv.com/quick-guide.html"
-        )
-    )
-    builder.row(
-        InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile")
-    )
+    builder.row(InlineKeyboardButton(text="📖 Полная инструкция", url="https://vpn4tv.com/quick-guide.html"))
+    builder.row(InlineKeyboardButton(text="⬅️ Назад", callback_data=f"connect_tv|{key_name}"))
+    builder.row(InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile"))
 
-    await callback_query.message.answer(
-        text=message_text,
-        reply_markup=builder.as_markup(),
-        parse_mode="HTML"
+    await edit_or_send_message(
+        target_message=callback_query.message, text=message_text, reply_markup=builder.as_markup(), media_path=None
     )

handlers/keys/key_management.py

@@ -3,137 +3,249 @@ import uuid
 from datetime import datetime, timedelta
 from typing import Any
 
+import pytz
 from aiogram import F, Router
 from aiogram.fsm.context import FSMContext
-from aiogram.fsm.state import State, StatesGroup
 from aiogram.types import CallbackQuery, InlineKeyboardButton, Message
 from aiogram.utils.keyboard import InlineKeyboardBuilder
+from py3xui import AsyncApi
 
+from bot import bot
+from client import delete_client
 from config import (
+    ADMIN_PASSWORD,
+    ADMIN_USERNAME,
     CONNECT_ANDROID,
     CONNECT_IOS,
+    CONNECT_PHONE_BUTTON,
     DOWNLOAD_ANDROID,
     DOWNLOAD_IOS,
+    NOTIFY_EXTRA_DAYS,
     PUBLIC_LINK,
     RENEWAL_PRICES,
     SUPPORT_CHAT_URL,
     TRIAL_TIME,
+    TRIAL_TIME_DISABLE,
+    USE_COUNTRY_SELECTION,
+    USE_NEW_PAYMENT_FLOW,
 )
-from database import get_balance, get_trial, store_key, update_balance
-from handlers.keys.key_utils import create_key_on_cluster
+from database import (
+    add_connection,
+    check_connection_exists,
+    create_temporary_data,
+    get_balance,
+    get_key_details,
+    get_trial,
+    store_key,
+    update_balance,
+    update_trial,
+)
+from handlers.buttons.add_subscribe import (
+    DOWNLOAD_ANDROID_BUTTON,
+    DOWNLOAD_IOS_BUTTON,
+    IMPORT_ANDROID,
+    IMPORT_IOS,
+    PC_BUTTON,
+    TV_BUTTON,
+)
+from handlers.keys.key_utils import create_client_on_server, create_key_on_cluster
+from handlers.payments.robokassa_pay import handle_custom_amount_input
+from handlers.payments.yookassa_pay import process_custom_amount_input
 from handlers.texts import DISCOUNTS, key_message_success
-from handlers.utils import generate_random_email, get_least_loaded_cluster
+from handlers.utils import edit_or_send_message, generate_random_email, get_least_loaded_cluster
 from logger import logger
 
 router = Router()
 
+moscow_tz = pytz.timezone("Europe/Moscow")
 
-class Form(StatesGroup):
-    waiting_for_server_selection = State()
-    waiting_for_key_name = State()
-    viewing_profile = State()
-    waiting_for_message = State()
+
+class Form(FSMContext):
+    waiting_for_server_selection = "waiting_for_server_selection"
+    waiting_for_key_name = "waiting_for_key_name"
+    viewing_profile = "viewing_profile"
+    waiting_for_message = "waiting_for_message"
 
 
 @router.callback_query(F.data == "create_key")
 async def confirm_create_new_key(callback_query: CallbackQuery, state: FSMContext, session: Any):
     tg_id = callback_query.message.chat.id
-
-    logger.info(f"User {tg_id} confirmed creation of a new key.")
-
-    logger.info(f"Balance for user {tg_id} is sufficient. Proceeding with key creation.")
-
     await handle_key_creation(tg_id, state, session, callback_query)
 
 
 async def handle_key_creation(
-    tg_id: int, state: FSMContext, session: Any, message_or_query: Message | CallbackQuery
+    tg_id: int,
+    state: FSMContext,
+    session: Any,
+    message_or_query: Message | CallbackQuery,
 ):
     """Создание ключа с учётом выбора тарифного плана."""
-    current_time = datetime.utcnow()
-    trial_status = await get_trial(tg_id, session)
+    current_time = datetime.now(moscow_tz)
 
-    if trial_status == 0:
-        expiry_time = current_time + timedelta(days=TRIAL_TIME)
-        logger.info(f"Assigned 1-day trial to user {tg_id}.")
-
-        await session.execute("UPDATE connections SET trial = 1 WHERE tg_id = $1", tg_id)
-        await create_key(tg_id, expiry_time, state, session, message_or_query)
-    else:
-        builder = InlineKeyboardBuilder()
-
-        for index, (plan_id, price) in enumerate(RENEWAL_PRICES.items()):
-            discount_text = ""
-
-            if plan_id in DISCOUNTS:
-                discount_percentage = DISCOUNTS[plan_id]
-                discount_text = f" ({discount_percentage}% скидка)"
-
-                if index == len(RENEWAL_PRICES) - 1:
-                    discount_text = f" ({discount_percentage}% 🔥)"
-
-            builder.row(
-                InlineKeyboardButton(
-                    text=f"📅 {plan_id} мес. - {price}₽{discount_text}", callback_data=f"select_plan_{plan_id}"
+    if not TRIAL_TIME_DISABLE:
+        trial_status = await get_trial(tg_id, session)
+        if trial_status in [0, -1]:
+            extra_days = NOTIFY_EXTRA_DAYS if trial_status == -1 else 0
+            expiry_time = current_time + timedelta(days=TRIAL_TIME + extra_days)
+            logger.info(f"Доступен {TRIAL_TIME + extra_days}-дневный пробный период пользователю {tg_id}.")
+            updated = await update_trial(tg_id, 1, session)
+            if updated:
+                await edit_or_send_message(
+                    target_message=message_or_query if isinstance(message_or_query, Message) else message_or_query.message,
+                    text="⏳ Пожалуйста, подождите, создаем вам подключение...",
+                    reply_markup=None,  
                 )
+
+                await create_key(tg_id, expiry_time, state, session, message_or_query)
+                return
+            else:
+                logger.error(f"Не удалось обновить статус триального периода для пользователя {tg_id}.")
+
+    builder = InlineKeyboardBuilder()
+    for index, (plan_id, price) in enumerate(RENEWAL_PRICES.items()):
+        discount_text = ""
+        if plan_id in DISCOUNTS:
+            discount_percentage = DISCOUNTS[plan_id]
+            discount_text = f" ({discount_percentage}% скидка)"
+            if index == len(RENEWAL_PRICES) - 1:
+                discount_text = f" ({discount_percentage}% 🔥)"
+        builder.row(
+            InlineKeyboardButton(
+                text=f"📅 {plan_id} мес. - {price}₽{discount_text}",
+                callback_data=f"select_plan_{plan_id}",
             )
-
-        builder.row(InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile"))
-
-        await message_or_query.message.answer(
-            "💳 Выберите тарифный план для создания нового ключа:", reply_markup=builder.as_markup()
         )
-        await state.update_data(tg_id=tg_id)
-        await state.set_state(Form.waiting_for_server_selection)
+    builder.row(InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile"))
+
+    if isinstance(message_or_query, CallbackQuery):
+        target_message = message_or_query.message
+    else:
+        target_message = message_or_query
+
+    await edit_or_send_message(
+        target_message=target_message,
+        text="💳 Выберите тарифный план для создания нового ключа:",
+        reply_markup=builder.as_markup(),
+        media_path=None,
+    )
+
+    await state.update_data(tg_id=tg_id)
+    await state.set_state(Form.waiting_for_server_selection)
 
 
 @router.callback_query(F.data.startswith("select_plan_"))
-async def select_tariff_plan(callback_query: CallbackQuery, state: FSMContext, session: Any):
+async def select_tariff_plan(callback_query: CallbackQuery, session: Any):
     tg_id = callback_query.message.chat.id
     plan_id = callback_query.data.split("_")[-1]
     plan_price = RENEWAL_PRICES.get(plan_id)
-
     if plan_price is None:
         await callback_query.message.answer("🚫 Неверный тарифный план.")
         return
-
     duration_days = int(plan_id) * 30
-
     balance = await get_balance(tg_id)
     if balance < plan_price:
-        builder = InlineKeyboardBuilder()
-        builder.row(InlineKeyboardButton(text="💳 Пополнить баланс", callback_data="pay"))
-        builder.row(InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile"))
-        await callback_query.message.answer(
-            "💳 Недостаточно средств для создания подписки. Пополните баланс в личном кабинете.",
-            reply_markup=builder.as_markup(),
+        required_amount = plan_price - balance
+        await create_temporary_data(
+            session,
+            tg_id,
+            "waiting_for_payment",
+            {
+                "plan_id": plan_id,
+                "plan_price": plan_price,
+                "duration_days": duration_days,
+                "required_amount": required_amount,
+            },
         )
-        await state.clear()
+        if USE_NEW_PAYMENT_FLOW == "YOOKASSA":
+            await process_custom_amount_input(callback_query, session)
+        elif USE_NEW_PAYMENT_FLOW == "ROBOKASSA":
+            await handle_custom_amount_input(callback_query, session)
+        else:
+            builder = InlineKeyboardBuilder()
+            builder.row(InlineKeyboardButton(text="💳 Пополнить баланс", callback_data="pay"))
+            builder.row(InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile"))
+            await edit_or_send_message(
+                target_message=callback_query.message,
+                text=f"💳 Недостаточно средств. Для продолжения необходимо пополнить баланс на {required_amount}₽.",
+                reply_markup=builder.as_markup(),
+                media_path=None,
+            )
         return
+    builder = InlineKeyboardBuilder()
+    builder.row(InlineKeyboardButton(text="⏳ Подождите...", callback_data="creating_key"))
 
-    await update_balance(tg_id, -plan_price)
+    await edit_or_send_message(
+        target_message=callback_query.message,
+        text="⏳ Подождите, создаем вам подключение...",
+        reply_markup=builder.as_markup(),
+    )
 
-    expiry_time = datetime.utcnow() + timedelta(days=duration_days)
-
-    await create_key(tg_id, expiry_time, state, session, callback_query)
+    expiry_time = datetime.now(moscow_tz) + timedelta(days=duration_days)
+    await create_key(tg_id, expiry_time, None, session, callback_query, None, plan_id)
+    await update_balance(tg_id, -plan_price, session)
 
 
 async def create_key(
-    tg_id: int, expiry_time: datetime, state: FSMContext, session: Any, message_or_query: Message | CallbackQuery
+    tg_id: int,
+    expiry_time: datetime,
+    state: FSMContext | None,
+    session: Any,
+    message_or_query: Message | CallbackQuery | None = None,
+    old_key_name: str = None,
+    plan: int = None,
 ):
     """Создаёт ключ с заданным сроком действия."""
+
+    target_message = message_or_query.message if isinstance(message_or_query, CallbackQuery) else message_or_query
+    if not await check_connection_exists(tg_id):
+        await add_connection(tg_id, balance=0.0, trial=0, session=session)
+        logger.info(f"[Connection] Подключение создано для пользователя {tg_id}")
+
+    if USE_COUNTRY_SELECTION:
+        logger.info("[Country Selection] USE_COUNTRY_SELECTION включен. Получение наименее загруженного кластера")
+        least_loaded_cluster = await get_least_loaded_cluster()
+        logger.info(
+            f"[Country Selection] Наименее загруженный кластер: {least_loaded_cluster}. Получаем список серверов"
+        )
+        servers = await session.fetch(
+            "SELECT server_name FROM servers WHERE cluster_name = $1",
+            least_loaded_cluster,
+        )
+        countries = [server["server_name"] for server in servers]
+        logger.info(f"[Country Selection] Список серверов: {countries}")
+
+        builder = InlineKeyboardBuilder()
+        ts = int(expiry_time.timestamp())
+        for country in countries:
+            if old_key_name:
+                callback_data = f"select_country|{country}|{ts}|{old_key_name}"
+            else:
+                callback_data = f"select_country|{country}|{ts}"
+            builder.row(InlineKeyboardButton(text=country, callback_data=callback_data))
+        builder.row(InlineKeyboardButton(text="⬅️ Назад", callback_data="profile"))
+
+        if target_message:
+            await edit_or_send_message(
+                target_message=target_message,
+                text="🌍 Пожалуйста, выберите страну для вашего ключа:",
+                reply_markup=builder.as_markup(),
+                media_path=None,
+            )
+        else:
+            await bot.send_message(
+                chat_id=tg_id,
+                text="🌍 Пожалуйста, выберите страну для вашего ключа:",
+                reply_markup=builder.as_markup(),
+            )
+        return
+
     while True:
         key_name = generate_random_email()
-        logger.info(f"Generated random key name for user {tg_id}: {key_name}")
-
-        existing_key = await session.fetchrow(
-            "SELECT * FROM keys WHERE email = $1 AND tg_id = $2",
-            key_name,
-            tg_id,
-        )
+        logger.info(f"[Key Generation] Сгенерировано имя ключа: {key_name} для пользователя {tg_id}")
+        existing_key = await get_key_details(key_name, session)
         if not existing_key:
             break
-        logger.warning(f"Key name '{key_name}' already exists for user {tg_id}. Generating a new one.")
+        logger.warning(f"[Key Generation] Имя ключа {key_name} уже существует. Генерация нового.")
 
     client_id = str(uuid.uuid4())
     email = key_name.lower()
@@ -142,55 +254,285 @@ async def create_key(
 
     try:
         least_loaded_cluster = await get_least_loaded_cluster()
-
         tasks = [
             asyncio.create_task(
-                create_key_on_cluster(
-                    least_loaded_cluster,
-                    tg_id,
-                    client_id,
-                    email,
-                    expiry_timestamp,
-                )
+                create_key_on_cluster(least_loaded_cluster, tg_id, client_id, email, expiry_timestamp, plan)
             )
         ]
-
         await asyncio.gather(*tasks)
-        logger.info(f"Key created on cluster {least_loaded_cluster} for user {tg_id}.")
-
-        await store_key(tg_id, client_id, email, expiry_timestamp, public_link, least_loaded_cluster, session)
-
+        logger.info(f"[Key Creation] Ключ создан на кластере {least_loaded_cluster} для пользователя {tg_id}")
+        await store_key(
+            tg_id,
+            client_id,
+            email,
+            expiry_timestamp,
+            public_link,
+            least_loaded_cluster,
+            session,
+        )
+        await update_trial(tg_id, 1, session)
+        logger.info(f"[Database] Ключ сохранён в базе данных для пользователя {tg_id}")
     except Exception as e:
-        logger.error(f"Error while creating the key for user {tg_id} on cluster: {e}")
-
-        if isinstance(message_or_query, Message):
-            await message_or_query.answer("❌ Произошла ошибка при создании ключа. Пожалуйста, попробуйте снова.")
-        elif isinstance(message_or_query, CallbackQuery):
-            await message_or_query.message.answer(
-                "❌ Произошла ошибка при создании ключа. Пожалуйста, попробуйте снова."
+        logger.error(f"[Error] Ошибка при создании ключа для пользователя {tg_id}: {e}")
+        error_message = "❌ Произошла ошибка при создании подписки. Пожалуйста, попробуйте снова."
+        if target_message:
+            await edit_or_send_message(
+                target_message=target_message, text=error_message, reply_markup=None, media_path=None
             )
+        else:
+            await bot.send_message(chat_id=tg_id, text=error_message)
         return
 
     builder = InlineKeyboardBuilder()
     builder.row(InlineKeyboardButton(text="💬 Поддержка", url=SUPPORT_CHAT_URL))
+    if CONNECT_PHONE_BUTTON:
+        builder.row(InlineKeyboardButton(text="📱 Подключить телефон", callback_data=f"connect_phone|{key_name}"))
+    else:
+        builder.row(
+            InlineKeyboardButton(text=DOWNLOAD_IOS_BUTTON, url=DOWNLOAD_IOS),
+            InlineKeyboardButton(text=DOWNLOAD_ANDROID_BUTTON, url=DOWNLOAD_ANDROID),
+        )
+        builder.row(
+            InlineKeyboardButton(text=IMPORT_IOS, url=f"{CONNECT_IOS}{public_link}"),
+            InlineKeyboardButton(text=IMPORT_ANDROID, url=f"{CONNECT_ANDROID}{public_link}"),
+        )
     builder.row(
-        InlineKeyboardButton(text="🍏 Скачать для iOS", url=DOWNLOAD_IOS),
-        InlineKeyboardButton(text="🤖 Скачать для Android", url=DOWNLOAD_ANDROID),
+        InlineKeyboardButton(text=PC_BUTTON, callback_data=f"connect_pc|{email}"),
+        InlineKeyboardButton(text=TV_BUTTON, callback_data=f"connect_tv|{email}"),
     )
-    builder.row(
-        InlineKeyboardButton(text="🍏 Подключить на iOS", url=f"{CONNECT_IOS}{public_link}"),
-        InlineKeyboardButton(text="🤖 Подключить на Android", url=f"{CONNECT_ANDROID}{public_link}"),
-    )
-    builder.row(InlineKeyboardButton(text="💻 Windows/Linux/MacOS", callback_data=f"connect_pc|{email}"))
     builder.row(InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile"))
 
-    remaining_time = expiry_time - datetime.utcnow()
+    expiry_time_local = expiry_time.replace(tzinfo=None).astimezone(moscow_tz)
+    remaining_time = expiry_time_local - datetime.now(moscow_tz)
     days = remaining_time.days
-    key_message = key_message_success(public_link, f"⏳ Осталось дней: {days} 📅")
+    key_message_text = key_message_success(public_link, f"⏳ Осталось дней: {days} 📅")
 
-    if isinstance(message_or_query, Message):
-        await message_or_query.answer(key_message, reply_markup=builder.as_markup())
-    elif isinstance(message_or_query, CallbackQuery):
-        await message_or_query.message.answer(key_message, reply_markup=builder.as_markup())
+    if target_message:
+        await edit_or_send_message(
+            target_message=target_message, text=key_message_text, reply_markup=builder.as_markup(), media_path=None
+        )
+    else:
+        await bot.send_message(
+            chat_id=tg_id,
+            text=key_message_text,
+            reply_markup=builder.as_markup(),
+        )
 
-    await state.clear()
+    if state:
+        await state.clear()
+
+
+@router.callback_query(F.data.startswith("change_location|"))
+async def change_location_callback(callback_query: CallbackQuery, session: Any):
+    try:
+        data = callback_query.data.split("|")
+        if len(data) < 2:
+            await callback_query.answer("❌ Некорректные данные", show_alert=True)
+            return
+
+        old_key_name = data[1]
+        record = await get_key_details(old_key_name, session)
+        if not record:
+            await callback_query.answer("❌ Ключ не найден", show_alert=True)
+            return
+
+        expiry_timestamp = record["expiry_time"]
+        ts = int(expiry_timestamp / 1000)
+
+        servers = await session.fetch("SELECT server_name FROM servers")
+        countries = [row["server_name"] for row in servers]
+        logger.info(f"Доступные страны для смены локации: {countries}")
+
+        builder = InlineKeyboardBuilder()
+        for country in countries:
+            callback_data = f"select_country|{country}|{ts}|{old_key_name}"
+            builder.row(InlineKeyboardButton(text=country, callback_data=callback_data))
+        builder.row(InlineKeyboardButton(text="⬅️ Назад", callback_data=f"view_key|{old_key_name}"))
+
+        await edit_or_send_message(
+            target_message=callback_query.message,
+            text="🌍 Пожалуйста, выберите новую локацию для вашей подписки:",
+            reply_markup=builder.as_markup(),
+            media_path=None,
+        )
+    except Exception as e:
+        logger.error(f"Ошибка при смене локации для пользователя {callback_query.from_user.id}: {e}")
+        await callback_query.answer("❌ Ошибка смены локации. Попробуйте снова.", show_alert=True)
+
+
+@router.callback_query(F.data.startswith("select_country|"))
+async def handle_country_selection(callback_query: CallbackQuery, session: Any):
+    """
+    Обрабатывает выбор страны.
+    Формат callback data:
+      select_country|{selected_country}|{ts} [|{old_key_name} (опционально)]
+    Если передан old_key_name – значит, происходит смена локации.
+    """
+    data = callback_query.data.split("|")
+    if len(data) < 3:
+        await callback_query.message.answer("❌ Некорректные данные. Попробуйте снова.")
+        return
+
+    selected_country = data[1]
+    try:
+        ts = int(data[2])
+    except ValueError:
+        await callback_query.message.answer("❌ Некорректное время истечения. Попробуйте снова.")
+        return
+
+    expiry_time = datetime.fromtimestamp(ts, tz=moscow_tz)
+
+    old_key_name = data[3] if len(data) > 3 else None
+
+    tg_id = callback_query.from_user.id
+    logger.info(f"Пользователь {tg_id} выбрал страну: {selected_country}")
+    logger.info(f"Получено время истечения (timestamp): {ts}")
+
+    await finalize_key_creation(tg_id, expiry_time, selected_country, None, session, callback_query, old_key_name)
+
+
+async def finalize_key_creation(
+    tg_id: int,
+    expiry_time: datetime,
+    selected_country: str,
+    state: FSMContext | None,
+    session: Any,
+    callback_query: CallbackQuery,
+    old_key_name: str = None,
+):
+    """Финализирует создание ключа с выбором стран."""
+
+    if not await check_connection_exists(tg_id):
+        await add_connection(tg_id, balance=0.0, trial=0, session=session)
+        logger.info(f"[Connection] Подключение создано для пользователя {tg_id}")
+
+    expiry_time = expiry_time.astimezone(moscow_tz)
+
+    if old_key_name:
+        key_name = old_key_name
+    else:
+        while True:
+            key_name = generate_random_email()
+            existing_key = await get_key_details(key_name, session)
+            if not existing_key:
+                break
+            logger.warning(f"Key name '{key_name}' already exists for user {tg_id}. Generating a new one.")
+
+    client_id = str(uuid.uuid4())
+    email = key_name.lower()
+    expiry_timestamp = int(expiry_time.timestamp() * 1000)
+    public_link = f"{PUBLIC_LINK}{email}/{tg_id}"
+
+    try:
+        server_info = await session.fetchrow(
+            "SELECT api_url, inbound_id, server_name FROM servers WHERE server_name = $1",
+            selected_country,
+        )
+
+        if not server_info:
+            raise ValueError(f"Сервер {selected_country} не найден.")
+
+        if old_key_name:
+            old_key_details = await get_key_details(old_key_name, session)
+            old_client_id = old_key_details.get("client_id") if old_key_details else None
+            old_email = old_key_details.get("email") if old_key_details else None
+            old_server_id = old_key_details.get("server_id") if old_key_details else None
+
+            if old_client_id and old_email and old_server_id:
+                old_server_info = await session.fetchrow(
+                    "SELECT api_url, inbound_id, server_name FROM servers WHERE server_name = $1",
+                    old_server_id,
+                )
+
+                if old_server_info:
+                    xui = AsyncApi(
+                        old_server_info["api_url"],
+                        username=ADMIN_USERNAME,
+                        password=ADMIN_PASSWORD,
+                    )
+                    deletion_success = await delete_client(
+                        xui,
+                        old_server_info["inbound_id"],
+                        old_email,
+                        old_client_id,
+                    )
+                    if not deletion_success:
+                        raise ValueError(f"Не удалось удалить клиента с сервера {old_server_id}.")
+
+        semaphore = asyncio.Semaphore(2)
+        await create_client_on_server(
+            server_info=server_info,
+            tg_id=tg_id,
+            client_id=client_id,
+            email=email,
+            expiry_timestamp=expiry_timestamp,
+            semaphore=semaphore,
+        )
+
+        logger.info(f"Key created on server {selected_country} for user {tg_id}.")
+
+        if old_key_name:
+            await session.execute(
+                """
+                UPDATE keys
+                SET client_id = $1, email = $2, expiry_time = $3, key = $4, server_id = $5
+                WHERE tg_id = $6 AND email = $7
+                """,
+                client_id,
+                email,
+                expiry_timestamp,
+                public_link,
+                selected_country,
+                tg_id,
+                old_key_name,
+            )
+        else:
+            created_at = int(datetime.now(moscow_tz).timestamp() * 1000)
+            await session.execute(
+                """
+                INSERT INTO keys (tg_id, client_id, email, created_at, expiry_time, key, server_id)
+                VALUES ($1, $2, $3, $4, $5, $6, $7)
+                """,
+                tg_id,
+                client_id,
+                email,
+                created_at,
+                expiry_timestamp,
+                public_link,
+                selected_country,
+            )
+
+    except Exception as e:
+        logger.error(f"Error while creating the key for user {tg_id}: {e}")
+        await callback_query.message.answer("❌ Произошла ошибка при создании подписки. Пожалуйста, попробуйте снова.")
+        return
+
+    builder = InlineKeyboardBuilder()
+    builder.row(InlineKeyboardButton(text="💬 Поддержка", url=SUPPORT_CHAT_URL))
+    if CONNECT_PHONE_BUTTON:
+        builder.row(InlineKeyboardButton(text="📱 Подключить телефон", callback_data=f"connect_phone|{key_name}"))
+    else:
+        builder.row(
+            InlineKeyboardButton(text=DOWNLOAD_IOS_BUTTON, url=DOWNLOAD_IOS),
+            InlineKeyboardButton(text=DOWNLOAD_ANDROID_BUTTON, url=DOWNLOAD_ANDROID),
+        )
+        builder.row(
+            InlineKeyboardButton(text=IMPORT_IOS, url=f"{CONNECT_IOS}{public_link}"),
+            InlineKeyboardButton(text=IMPORT_ANDROID, url=f"{CONNECT_ANDROID}{public_link}"),
+        )
+    builder.row(
+        InlineKeyboardButton(text=PC_BUTTON, callback_data=f"connect_pc|{email}"),
+        InlineKeyboardButton(text=TV_BUTTON, callback_data=f"connect_tv|{email}"),
+    )
+    builder.row(InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile"))
+
+    remaining_time = expiry_time - datetime.now(moscow_tz)
+    days = remaining_time.days
+    key_message_text = key_message_success(public_link, f"⏳ Осталось дней: {days} 📅")
+
+    await edit_or_send_message(
+        target_message=callback_query.message, text=key_message_text, reply_markup=builder.as_markup(), media_path=None
+    )
+
+    if state:
+        await state.clear()

handlers/keys/key_utils.py

@@ -1,75 +1,126 @@
 import asyncio
+from typing import Any
 
-import asyncpg
 from py3xui import AsyncApi
 
-from client import add_client, delete_client, extend_client_key
-from config import ADMIN_PASSWORD, ADMIN_USERNAME, DATABASE_URL, LIMIT_IP, TOTAL_GB
-from database import get_servers_from_db
+from client import ClientConfig, add_client, delete_client, extend_client_key, get_client_traffic, toggle_client
+from config import ADMIN_PASSWORD, ADMIN_USERNAME, LIMIT_IP, PUBLIC_LINK, SUPERNODE, TOTAL_GB, USE_COUNTRY_SELECTION
+from database import get_servers, store_key
+from handlers.utils import get_least_loaded_cluster
 from logger import logger
 
 
-async def create_key_on_cluster(cluster_id, tg_id, client_id, email, expiry_timestamp):
+async def create_key_on_cluster(
+    cluster_id: str, tg_id: int, client_id: str, email: str, expiry_timestamp: int, plan: int = None
+):
+    """
+    Создает ключ на всех серверах указанного кластера (или на конкретном сервере, если cluster_id — это имя сервера).
+    """
     try:
-        tasks = []
-        servers = await get_servers_from_db()
+        servers = await get_servers()
         cluster = servers.get(cluster_id)
 
         if not cluster:
-            raise ValueError(f"Кластер с ID {cluster_id} не найден.")
+            found_servers = []
+            for _key, server_list in servers.items():
+                for server_info in server_list:
+                    if server_info.get("server_name", "").lower() == cluster_id.lower():
+                        found_servers.append(server_info)
+            if found_servers:
+                cluster = found_servers
+            else:
+                raise ValueError(f"Кластер или сервер с ID/именем {cluster_id} не найден.")
 
-        for server_info in cluster:
-            xui = AsyncApi(
-                server_info["api_url"],
-                username=ADMIN_USERNAME,
-                password=ADMIN_PASSWORD,
-            )
+        semaphore = asyncio.Semaphore(2)
 
-            inbound_id = server_info.get("inbound_id")
-            if not inbound_id:
-                logger.warning(
-                    f"INBOUND_ID отсутствует для сервера {server_info.get('server_name', 'unknown')}. Пропуск."
+        if SUPERNODE:
+            for server_info in cluster:
+                await create_client_on_server(
+                    server_info, tg_id, client_id, email, expiry_timestamp, semaphore, plan=plan
                 )
-                continue
-
-            conn = await asyncpg.connect(DATABASE_URL)
-            existing_key = await conn.fetchrow(
-                "SELECT 1 FROM keys WHERE email = $1", email
-            )
-
-            if existing_key:
-                raise ValueError(f"Email {email} уже существует в базе данных.")
-
-            tasks.append(
-                add_client(
-                    xui,
-                    client_id,
-                    email,
-                    tg_id,
-                    limit_ip=LIMIT_IP,
-                    total_gb=TOTAL_GB,
-                    expiry_time=expiry_timestamp,
-                    enable=True,
-                    flow="xtls-rprx-vision",
-                    inbound_id=int(inbound_id),
+        else:
+            await asyncio.gather(
+                *(
+                    create_client_on_server(server, tg_id, client_id, email, expiry_timestamp, semaphore, plan=plan)
+                    for server in cluster
                 )
             )
-            await conn.close()
-
-        await asyncio.gather(*tasks)
 
     except Exception as e:
         logger.error(f"Ошибка при создании ключа: {e}")
         raise e
 
 
+async def create_client_on_server(
+    server_info: dict,
+    tg_id: int,
+    client_id: str,
+    email: str,
+    expiry_timestamp: int,
+    semaphore: asyncio.Semaphore,
+    plan: int = None,
+):
+    """
+    Создает клиента на указанном сервере.
+    """
+    async with semaphore:
+        xui = AsyncApi(
+            server_info["api_url"],
+            username=ADMIN_USERNAME,
+            password=ADMIN_PASSWORD,
+        )
+
+        inbound_id = server_info.get("inbound_id")
+        server_name = server_info.get("server_name", "unknown")
+
+        if not inbound_id:
+            logger.warning(f"INBOUND_ID отсутствует для сервера {server_name}. Пропуск.")
+            return
+
+        if SUPERNODE:
+            unique_email = f"{email}_{server_name.lower()}"
+            sub_id = email
+        else:
+            unique_email = email
+            sub_id = unique_email
+
+        total_gb_value = int(TOTAL_GB) if plan is None else int(plan) * int(TOTAL_GB)
+
+        await add_client(
+            xui,
+            ClientConfig(
+                client_id=client_id,
+                email=unique_email,
+                tg_id=tg_id,
+                limit_ip=LIMIT_IP,
+                total_gb=total_gb_value,
+                expiry_time=expiry_timestamp,
+                enable=True,
+                flow="xtls-rprx-vision",
+                inbound_id=int(inbound_id),
+                sub_id=sub_id,
+            ),
+        )
+
+        if SUPERNODE:
+            await asyncio.sleep(0.7)
+
+
 async def renew_key_in_cluster(cluster_id, email, client_id, new_expiry_time, total_gb):
     try:
-        servers = await get_servers_from_db()
+        servers = await get_servers()
         cluster = servers.get(cluster_id)
 
         if not cluster:
-            raise ValueError(f"Кластер с ID {cluster_id} не найден.")
+            found_servers = []
+            for _key, server_list in servers.items():
+                for server_info in server_list:
+                    if server_info.get("server_name", "").lower() == cluster_id.lower():
+                        found_servers.append(server_info)
+            if found_servers:
+                cluster = found_servers
+            else:
+                raise ValueError(f"Кластер или сервер с ID/именем {cluster_id} не найден.")
 
         tasks = []
         for server_info in cluster:
@@ -80,47 +131,47 @@ async def renew_key_in_cluster(cluster_id, email, client_id, new_expiry_time, to
             )
 
             inbound_id = server_info.get("inbound_id")
+            server_name = server_info.get("server_name", "unknown")
+
             if not inbound_id:
-                logger.warning(
-                    f"INBOUND_ID отсутствует для сервера {server_info.get('server_name', 'unknown')}. Пропуск."
-                )
+                logger.warning(f"INBOUND_ID отсутствует для сервера {server_name}. Пропуск.")
                 continue
 
+            if SUPERNODE:
+                unique_email = f"{email}_{server_name.lower()}"
+                sub_id = email
+            else:
+                unique_email = email
+                sub_id = unique_email
+
             tasks.append(
-                extend_client_key(
-                    xui,
-                    int(inbound_id),
-                    email,
-                    new_expiry_time,
-                    client_id,
-                    total_gb,
-                )
+                extend_client_key(xui, int(inbound_id), unique_email, new_expiry_time, client_id, total_gb, sub_id)
             )
 
         await asyncio.gather(*tasks)
 
     except Exception as e:
-        logger.error(
-            f"Не удалось продлить ключ {client_id} в кластере {cluster_id}: {e}"
-        )
+        logger.error(f"Не удалось продлить ключ {client_id} в кластере/на сервере {cluster_id}: {e}")
         raise e
 
 
-async def delete_key_from_db(client_id, session):
-    try:
-        await session.execute("DELETE FROM keys WHERE client_id = $1", client_id)
-    except Exception as e:
-        logger.error(f"Ошибка при удалении ключа {client_id} из базы данных: {e}")
-
-
 async def delete_key_from_cluster(cluster_id, email, client_id):
-    """Удаление ключа с серверов в кластере"""
+    """Удаление ключа с серверов в кластере или с конкретного сервера"""
     try:
-        servers = await get_servers_from_db()
+        servers = await get_servers()
         cluster = servers.get(cluster_id)
 
         if not cluster:
-            raise ValueError(f"Кластер с ID {cluster_id} не найден.")
+            found_servers = []
+            for _, server_list in servers.items():
+                for server_info in server_list:
+                    if server_info.get("server_name", "").lower() == cluster_id.lower():
+                        found_servers.append(server_info)
+
+            if found_servers:
+                cluster = found_servers
+            else:
+                raise ValueError(f"Кластер или сервер с ID/именем {cluster_id} не найден.")
 
         tasks = []
         for server_info in cluster:
@@ -149,19 +200,28 @@ async def delete_key_from_cluster(cluster_id, email, client_id):
         await asyncio.gather(*tasks)
 
     except Exception as e:
-        logger.error(
-            f"Не удалось удалить ключ {client_id} в кластере {cluster_id}: {e}"
-        )
+        logger.error(f"Не удалось удалить ключ {client_id} в кластере/на сервере {cluster_id}: {e}")
         raise e
 
 
 async def update_key_on_cluster(tg_id, client_id, email, expiry_time, cluster_id):
+    """
+    Обновляет ключ на всех серверах указанного кластера (или сервера, если передано имя).
+    """
     try:
-        servers = await get_servers_from_db()
+        servers = await get_servers()
         cluster = servers.get(cluster_id)
 
         if not cluster:
-            raise ValueError(f"Кластер с ID {cluster_id} не найден.")
+            found_servers = []
+            for _key, server_list in servers.items():
+                for server_info in server_list:
+                    if server_info.get("server_name", "").lower() == cluster_id.lower():
+                        found_servers.append(server_info)
+            if found_servers:
+                cluster = found_servers
+            else:
+                raise ValueError(f"Кластер или сервер с ID/именем {cluster_id} не найден.")
 
         tasks = []
         for server_info in cluster:
@@ -181,26 +241,219 @@ async def update_key_on_cluster(tg_id, client_id, email, expiry_time, cluster_id
             tasks.append(
                 add_client(
                     xui,
-                    client_id,
-                    email,
-                    tg_id,
-                    limit_ip=LIMIT_IP,
-                    total_gb=TOTAL_GB,
-                    expiry_time=expiry_time,
-                    enable=True,
-                    flow="xtls-rprx-vision",
-                    inbound_id=int(inbound_id),
+                    ClientConfig(
+                        client_id=client_id,
+                        email=email,
+                        tg_id=tg_id,
+                        limit_ip=LIMIT_IP,
+                        total_gb=TOTAL_GB,
+                        expiry_time=expiry_time,
+                        enable=True,
+                        flow="xtls-rprx-vision",
+                        inbound_id=int(inbound_id),
+                        sub_id=email,
+                    ),
                 )
             )
 
         await asyncio.gather(*tasks)
 
-        logger.info(
-            f"Ключ успешно обновлен для {client_id} на всех серверах в кластере {cluster_id}"
-        )
+        logger.info(f"Ключ успешно обновлен для {client_id} на всех серверах в кластере {cluster_id}")
 
     except Exception as e:
-        logger.error(
-            f"Ошибка при обновлении ключа на серверах кластера {cluster_id} для {client_id}: {e}"
-        )
+        logger.error(f"Ошибка при обновлении ключа на серверах кластера {cluster_id} для {client_id}: {e}")
         raise e
+
+
+async def update_subscription(tg_id: int, email: str, session: Any) -> None:
+    record = await session.fetchrow(
+        """
+        SELECT k.key, k.expiry_time, k.email, k.server_id, k.client_id
+        FROM keys k
+        WHERE k.tg_id = $1 AND k.email = $2
+        """,
+        tg_id,
+        email,
+    )
+
+    if not record:
+        raise ValueError(f"The key {email} does not exist in database")
+
+    expiry_time = record["expiry_time"]
+    client_id = record["client_id"]
+    public_link = f"{PUBLIC_LINK}{email}/{tg_id}"
+
+    await session.execute(
+        """
+        DELETE FROM keys
+        WHERE tg_id = $1 AND email = $2
+        """,
+        tg_id,
+        email,
+    )
+
+    least_loaded_cluster_id = await get_least_loaded_cluster()
+
+    await asyncio.gather(
+        update_key_on_cluster(
+            tg_id,
+            client_id,
+            email,
+            expiry_time,
+            least_loaded_cluster_id,
+        )
+    )
+
+    await store_key(
+        tg_id,
+        client_id,
+        email,
+        expiry_time,
+        public_link,
+        server_id=least_loaded_cluster_id,
+        session=session,
+    )
+
+
+async def get_user_traffic(session: Any, tg_id: int, email: str) -> dict[str, Any]:
+    """
+    Получает трафик пользователя на всех серверах, где у него есть ключ.
+
+    Args:
+        session (Any): Сессия базы данных.
+        tg_id (int): ID пользователя Telegram.
+        email (str): Email пользователя.
+
+    Returns:
+        dict[str, Any]: Структура с данными о трафике.
+    """
+
+    query = "SELECT client_id, server_id FROM keys WHERE tg_id = $1 AND email = $2"
+    rows = await session.fetch(query, tg_id, email)
+
+    if not rows:
+        return {"status": "error", "message": "❌ У пользователя нет активных ключей."}
+
+    server_ids = {row["server_id"] for row in rows}
+
+    query_servers = """
+        SELECT server_name, api_url FROM servers 
+        WHERE server_name = ANY($1) OR cluster_name = ANY($1)
+    """
+    server_rows = await session.fetch(query_servers, list(server_ids))
+
+    if not server_rows:
+        logger.error(f"❌ Не найдено серверов для: {server_ids}")
+        return {"status": "error", "message": f"❌ Серверы не найдены: {', '.join(server_ids)}"}
+
+    servers_map = {row["server_name"]: row["api_url"] for row in server_rows}
+
+    user_traffic_data = {}
+
+    async def fetch_traffic(api_url: str, client_id: str, server: str) -> tuple[str, Any]:
+        """
+        Получает трафик с сервера для заданного client_id.
+        Возвращает кортеж: (server, used_gb) или (server, ошибка).
+        """
+        xui = AsyncApi(api_url, username=ADMIN_USERNAME, password=ADMIN_PASSWORD)
+        try:
+            traffic_info = await get_client_traffic(xui, client_id)
+            if traffic_info["status"] == "success" and traffic_info["traffic"]:
+                client_data = traffic_info["traffic"][0]
+                used_gb = (client_data.up + client_data.down) / 1073741824
+                return server, round(used_gb, 2)
+            else:
+                return server, "Ошибка получения трафика"
+        except Exception as e:
+            return server, f"Ошибка: {e}"
+
+    tasks = []
+    for row in rows:
+        client_id = row["client_id"]
+        server_id = row["server_id"]
+        if server_id in servers_map:
+            api_url = servers_map[server_id]
+            tasks.append(fetch_traffic(api_url, client_id, server_id))
+        else:
+            for server, api_url in servers_map.items():
+                tasks.append(fetch_traffic(api_url, client_id, server))
+
+    results = await asyncio.gather(*tasks)
+    for server, result in results:
+        user_traffic_data[server] = result
+
+    return {"status": "success", "traffic": user_traffic_data}
+
+
+async def toggle_client_on_cluster(cluster_id: str, email: str, client_id: str, enable: bool = True) -> dict[str, Any]:
+    """
+    Включает или отключает клиента на всех серверах указанного кластера.
+
+    Args:
+        cluster_id (str): ID кластера или имя сервера
+        email (str): Email клиента
+        client_id (str): UUID клиента
+        enable (bool): True для включения, False для отключения
+
+    Returns:
+        dict[str, Any]: Результат операции с информацией по каждому серверу
+    """
+    try:
+        servers = await get_servers()
+        cluster = servers.get(cluster_id)
+
+        if not cluster:
+            found_servers = []
+            for _, server_list in servers.items():
+                for server_info in server_list:
+                    if server_info.get("server_name", "").lower() == cluster_id.lower():
+                        found_servers.append(server_info)
+
+            if found_servers:
+                cluster = found_servers
+            else:
+                raise ValueError(f"Кластер или сервер с ID/именем {cluster_id} не найден.")
+
+        results = {}
+        tasks = []
+
+        for server_info in cluster:
+            xui = AsyncApi(
+                server_info["api_url"],
+                username=ADMIN_USERNAME,
+                password=ADMIN_PASSWORD,
+            )
+
+            inbound_id = server_info.get("inbound_id")
+            server_name = server_info.get("server_name", "unknown")
+
+            if not inbound_id:
+                logger.warning(f"INBOUND_ID отсутствует для сервера {server_name}. Пропуск.")
+                results[server_name] = False
+                continue
+
+            if SUPERNODE:
+                unique_email = f"{email}_{server_name.lower()}"
+            else:
+                unique_email = email
+
+            tasks.append(toggle_client(xui, int(inbound_id), unique_email, client_id, enable))
+
+        task_results = await asyncio.gather(*tasks, return_exceptions=True)
+
+        for server_info, result in zip(cluster, task_results, strict=False):
+            server_name = server_info.get("server_name", "unknown")
+            if isinstance(result, Exception):
+                logger.error(f"Ошибка на сервере {server_name}: {result}")
+                results[server_name] = False
+            else:
+                results[server_name] = result
+
+        status = "включен" if enable else "отключен"
+        logger.info(f"Клиент {email} {status} на серверах кластера {cluster_id}")
+
+        return {"status": "success" if any(results.values()) else "error", "results": results}
+
+    except Exception as e:
+        logger.error(f"Ошибка при изменении состояния клиента {email} в кластере {cluster_id}: {e}")
+        return {"status": "error", "error": str(e)}

handlers/keys/keys.py

@@ -4,42 +4,64 @@ import os
 from datetime import datetime, timedelta
 from typing import Any
 
+import asyncpg
+import pytz
 from aiogram import F, Router, types
-from aiogram.types import BufferedInputFile, InlineKeyboardButton
+from aiogram.types import CallbackQuery, InlineKeyboardButton, Message
 from aiogram.utils.keyboard import InlineKeyboardBuilder
 
+from bot import bot
 from config import (
     CONNECT_ANDROID,
     CONNECT_IOS,
+    CONNECT_PHONE_BUTTON,
+    DATABASE_URL,
     DOWNLOAD_ANDROID,
     DOWNLOAD_IOS,
+    ENABLE_DELETE_KEY_BUTTON,
+    ENABLE_UPDATE_SUBSCRIPTION_BUTTON,
     PUBLIC_LINK,
     RENEWAL_PLANS,
     TOTAL_GB,
+    USE_COUNTRY_SELECTION,
+    USE_NEW_PAYMENT_FLOW,
 )
 from database import (
+    check_server_name_by_cluster,
+    create_temporary_data,
     delete_key,
     get_balance,
-    get_servers_from_db,
-    store_key,
+    get_key_by_server,
+    get_key_details,
+    get_keys,
+    get_servers,
     update_balance,
     update_key_expiry,
 )
+from handlers.buttons.add_subscribe import (
+    DOWNLOAD_ANDROID_BUTTON,
+    DOWNLOAD_IOS_BUTTON,
+    IMPORT_ANDROID,
+    IMPORT_IOS,
+    PC_BUTTON,
+    TV_BUTTON,
+)
 from handlers.keys.key_utils import (
     delete_key_from_cluster,
-    delete_key_from_db,
     renew_key_in_cluster,
-    update_key_on_cluster,
+    update_subscription,
 )
+from handlers.payments.robokassa_pay import handle_custom_amount_input
+from handlers.payments.yookassa_pay import process_custom_amount_input
 from handlers.texts import (
     DISCOUNTS,
-    INSUFFICIENT_FUNDS_MSG,
     KEY_NOT_FOUND_MSG,
     PLAN_SELECTION_MSG,
+    SUBSCRIPTION_DESCRIPTION,
     SUCCESS_RENEWAL_MSG,
     key_message,
 )
-from handlers.utils import get_least_loaded_cluster, handle_error
+from handlers.utils import edit_or_send_message, handle_error
 from logger import logger
 
 locale.setlocale(locale.LC_TIME, "ru_RU.UTF-8")
@@ -49,182 +71,97 @@ router = Router()
 
 @router.callback_query(F.data == "view_keys")
 @router.message(F.text == "/subs")
-async def process_callback_or_message_view_keys(
-    callback_query_or_message: types.Message | types.CallbackQuery, session: Any
-):
-    if isinstance(callback_query_or_message, types.CallbackQuery):
-        chat_id = callback_query_or_message.message.chat.id
-        send_message = callback_query_or_message.message.answer
-        send_photo = callback_query_or_message.message.answer_photo
+async def process_callback_or_message_view_keys(callback_query_or_message: Message | CallbackQuery, session: Any):
+    if isinstance(callback_query_or_message, CallbackQuery):
+        target_message = callback_query_or_message.message
     else:
-        chat_id = callback_query_or_message.chat.id
-        send_message = callback_query_or_message.answer
-        send_photo = callback_query_or_message.answer_photo
+        target_message = callback_query_or_message
 
     try:
-        records = await session.fetch(
-            """
-            SELECT email, client_id FROM keys WHERE tg_id = $1
-            """,
-            chat_id,
-        )
-
-        if records:
-            inline_keyboard, response_message = build_keys_response(records)
-        else:
-            inline_keyboard, response_message = build_no_keys_response()
-
+        records = await get_keys(target_message.chat.id, session)
+        inline_keyboard, response_message = build_keys_response(records)
         image_path = os.path.join("img", "pic_keys.jpg")
-        await send_with_optional_image(
-            send_message, send_photo, image_path, response_message, inline_keyboard
+
+        await edit_or_send_message(
+            target_message=target_message, text=response_message, reply_markup=inline_keyboard, media_path=image_path
         )
     except Exception as e:
         error_message = f"Ошибка при получении ключей: {e}"
-        await send_message(text=error_message)
+        await target_message.answer(text=error_message)
 
 
 def build_keys_response(records):
     """
-    Формирует сообщение и клавиатуру, если у пользователя есть устройства.
+    Формирует сообщение и клавиатуру для устройств с указанием срока действия подписки.
     """
     builder = InlineKeyboardBuilder()
-    for record in records:
-        key_name = record["email"]
-        builder.row(
-            InlineKeyboardButton(
-                text=f"🔑 {key_name}", callback_data=f"view_key|{key_name}"
-            )
-        )
+    moscow_tz = pytz.timezone("Europe/Moscow")
 
-    builder.row(
-        InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile")
-    )
+    if records:
+        response_message = "<b>🔑 Список ваших подписок:</b>\n\n<blockquote>"
+        for record in records:
+            key_name = record["email"]
+            expiry_time = record.get("expiry_time")
 
-    inline_keyboard = builder.as_markup()
-    response_message = (
-        "<b>🔑 Список ваших устройств</b>\n\n"
-        "<i>👇 Выберите устройство для управления подпиской:</i>"
-    )
-    return inline_keyboard, response_message
+            if expiry_time:
+                expiry_date_full = datetime.fromtimestamp(expiry_time / 1000, tz=moscow_tz)
+                formatted_date_full = expiry_date_full.strftime("до %d.%m.%y, %H:%M")
+                formatted_date_short = expiry_date_full.strftime("до %d.%m.%y")
+            else:
+                formatted_date_full = "без срока действия"
+                formatted_date_short = "без срока действия"
 
+            button_text = f"🔑{key_name} ({formatted_date_short})"
+            builder.row(InlineKeyboardButton(text=button_text, callback_data=f"view_key|{key_name}"))
 
-def build_no_keys_response():
-    """
-    Формирует сообщение и клавиатуру, если у пользователя нет устройств.
-    """
-    builder = InlineKeyboardBuilder()
-    builder.row(
-        InlineKeyboardButton(
-            text="➕ Создать подписку", callback_data="create_key"
-        )
-    )
-    builder.row(
-        InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile")
-    )
+            response_message += f"• <b>{key_name}</b> ({formatted_date_full})\n"
 
-    inline_keyboard = builder.as_markup()
-    response_message = (
-        "<b>❌ У вас пока нет активных устройств</b>\n\n"
-        "<i>Нажмите кнопку ниже, чтобы создать устройство:</i>"
-    )
-    return inline_keyboard, response_message
+        response_message += "</blockquote>\n"
 
-
-async def send_with_optional_image(send_message, send_photo, image_path, text, keyboard):
-    """
-    Отправляет сообщение с изображением, если файл существует. В противном случае отправляет только текст.
-    """
-    if os.path.isfile(image_path):
-        with open(image_path, "rb") as image_file:
-            await send_photo(
-                photo=BufferedInputFile(image_file.read(), filename=os.path.basename(image_path)),
-                caption=text,
-                reply_markup=keyboard,
-            )
     else:
-        await send_message(
-            text=text,
-            reply_markup=keyboard,
+        response_message = (
+            "<b>🔑 У вас пока нет подписок.</b>\n\nВы можете создать новую подписку для подключения устройств."
         )
 
+    builder.row(InlineKeyboardButton(text="➕ Добавить подписку", callback_data="create_key"))
+    builder.row(InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile"))
 
+    inline_keyboard = builder.as_markup()
+    return inline_keyboard, response_message
 
 
 @router.callback_query(F.data.startswith("view_key|"))
-async def process_callback_view_key(callback_query: types.CallbackQuery, session: Any):
+async def process_callback_view_key(callback_query: CallbackQuery, session: Any):
     tg_id = callback_query.message.chat.id
     key_name = callback_query.data.split("|")[1]
     try:
-        record = await session.fetchrow(
-            """
-            SELECT k.expiry_time, k.server_id, k.key
-            FROM keys k
-            WHERE k.tg_id = $1 AND k.email = $2
-            """,
-            tg_id,
-            key_name,
-        )
-
+        record = await get_key_details(key_name, session)
         if record:
             key = record["key"]
             expiry_time = record["expiry_time"]
             server_name = record["server_id"]
+            country = server_name
             expiry_date = datetime.utcfromtimestamp(expiry_time / 1000)
             current_date = datetime.utcnow()
             time_left = expiry_date - current_date
 
             if time_left.total_seconds() <= 0:
-                days_left_message = (
-                    "<b>🕒 Статус подписки:</b>\n🔴 Истекла\nОсталось часов: 0"
-                )
-            elif time_left.days > 0:
-                days_left_message = f"Осталось дней: <b>{time_left.days}</b>"
+                days_left_message = "<b>🕒 Статус подписки:</b>\n🔴 Истекла\nОсталось часов: 0\nОсталось минут: 0"
             else:
-                hours_left = time_left.seconds // 3600
-                days_left_message = f"Осталось часов: <b>{hours_left}</b>"
+                total_seconds = int(time_left.total_seconds())
+                days = total_seconds // 86400
+                hours = (total_seconds % 86400) // 3600
+                minutes = (total_seconds % 3600) // 60
+                days_left_message = f"Осталось: <b>{days}</b> дней, <b>{hours}</b> часов, <b>{minutes}</b> минут"
 
             formatted_expiry_date = expiry_date.strftime("%d %B %Y года")
             response_message = key_message(
-                key, formatted_expiry_date, days_left_message, server_name
+                key, formatted_expiry_date, days_left_message, server_name, country if USE_COUNTRY_SELECTION else None
             )
 
             builder = InlineKeyboardBuilder()
 
-            builder.row(
-                InlineKeyboardButton(text="🍏 Скачать для iOS", url=DOWNLOAD_IOS),
-                InlineKeyboardButton(
-                    text="🤖 Скачать для Android", url=DOWNLOAD_ANDROID
-                ),
-            )
-
-            builder.row(
-                InlineKeyboardButton(
-                    text="🍏 Подключить на iOS", url=f"{CONNECT_IOS}{key}"
-                ),
-                InlineKeyboardButton(
-                    text="🤖 Подключить на Android", url=f"{CONNECT_ANDROID}{key}"
-                ),
-            )
-
-            builder.row(
-                InlineKeyboardButton(
-                    text="💻 Компьютеры", callback_data=f"connect_pc|{key_name}"
-                ),
-                InlineKeyboardButton(
-                    text="📺 Андроид TV", callback_data=f"connect_tv|{key_name}"
-                )
-            )
-
-            builder.row(
-                InlineKeyboardButton(
-                    text="⏳ Продлить", callback_data=f"renew_key|{key_name}"
-                ),
-                InlineKeyboardButton(
-                    text="❌ Удалить", callback_data=f"delete_key|{key_name}"
-                ),
-            )
-
-            if not key.startswith(PUBLIC_LINK):
+            if not key.startswith(PUBLIC_LINK) or ENABLE_UPDATE_SUBSCRIPTION_BUTTON:
                 builder.row(
                     InlineKeyboardButton(
                         text="🔄 Обновить подписку",
@@ -232,28 +169,56 @@ async def process_callback_view_key(callback_query: types.CallbackQuery, session
                     )
                 )
 
+            if CONNECT_PHONE_BUTTON:
+                builder.row(
+                    InlineKeyboardButton(text="📱 Подключить телефон", callback_data=f"connect_phone|{key_name}")
+                )
+            else:
+                builder.row(
+                    InlineKeyboardButton(text=DOWNLOAD_IOS_BUTTON, url=DOWNLOAD_IOS),
+                    InlineKeyboardButton(text=DOWNLOAD_ANDROID_BUTTON, url=DOWNLOAD_ANDROID),
+                )
+                builder.row(
+                    InlineKeyboardButton(text=IMPORT_IOS, url=f"{CONNECT_IOS}{key}"),
+                    InlineKeyboardButton(text=IMPORT_ANDROID, url=f"{CONNECT_ANDROID}{key}"),
+                )
+
             builder.row(
-                InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile")
+                InlineKeyboardButton(text=PC_BUTTON, callback_data=f"connect_pc|{key_name}"),
+                InlineKeyboardButton(text=TV_BUTTON, callback_data=f"connect_tv|{key_name}"),
             )
 
-            keyboard = builder.as_markup()
+            if ENABLE_DELETE_KEY_BUTTON:
+                builder.row(
+                    InlineKeyboardButton(text="⏳ Продлить", callback_data=f"renew_key|{key_name}"),
+                    InlineKeyboardButton(text="❌ Удалить", callback_data=f"delete_key|{key_name}"),
+                )
+            else:
+                builder.row(InlineKeyboardButton(text="⏳ Продлить подписку", callback_data=f"renew_key|{key_name}"))
 
+            if USE_COUNTRY_SELECTION:
+                builder.row(
+                    InlineKeyboardButton(text="🌍 Сменить локацию", callback_data=f"change_location|{key_name}")
+                )
+
+            builder.row(InlineKeyboardButton(text="⬅️ Назад", callback_data="view_keys"))
+            builder.row(InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile"))
+
+            keyboard = builder.as_markup()
             image_path = os.path.join("img", "pic_view.jpg")
 
             if not os.path.isfile(image_path):
                 await callback_query.message.answer("Файл изображения не найден.")
                 return
 
-            with open(image_path, "rb") as image_file:
-                await callback_query.message.answer_photo(
-                    photo=BufferedInputFile(image_file.read(), filename="pic_view.jpg"),
-                    caption=response_message,
-                    reply_markup=keyboard,
-                )
-        else:
-            await callback_query.message.answer(
-                text="<b>Информация о подписке не найдена.</b>",
+            await edit_or_send_message(
+                target_message=callback_query.message,
+                text=response_message,
+                reply_markup=keyboard,
+                media_path=image_path,
             )
+        else:
+            await callback_query.message.answer(text="<b>Информация о подписке не найдена.</b>")
     except Exception as e:
         await handle_error(
             tg_id,
@@ -262,76 +227,67 @@ async def process_callback_view_key(callback_query: types.CallbackQuery, session
         )
 
 
-@router.callback_query(F.data.startswith("update_subscription|"))
-async def process_callback_update_subscription(
-    callback_query: types.CallbackQuery, session: Any
-):
-    tg_id = callback_query.message.chat.id
+@router.callback_query(F.data.startswith("connect_phone|"))
+async def process_callback_connect_phone(callback_query: CallbackQuery):
     email = callback_query.data.split("|")[1]
+
+    conn = None
     try:
-        record = await session.fetchrow(
+        conn = await asyncpg.connect(DATABASE_URL)
+        key_data = await conn.fetchrow(
             """
-            SELECT k.key, k.expiry_time, k.email, k.server_id, k.client_id
-            FROM keys k
-            WHERE k.tg_id = $1 AND k.email = $2
+            SELECT key FROM keys WHERE email = $1
             """,
-            tg_id,
             email,
         )
+        if not key_data:
+            await callback_query.message.answer("❌ Ошибка: ключ не найден.")
+            return
 
-        if record:
-            expiry_time = record["expiry_time"]
-            client_id = record["client_id"]
-            public_link = f"{PUBLIC_LINK}{email}/{tg_id}"
+        key_link = key_data["key"]
 
-            try:
-                await session.execute(
-                    """
-                    DELETE FROM keys
-                    WHERE tg_id = $1 AND email = $2
-                    """,
-                    tg_id,
-                    email,
-                )
-            except Exception as delete_error:
-                await callback_query.message.answer(
-                    f"Ошибка при удалении старой подписки: {delete_error}",
-                )
-                return
-
-            least_loaded_cluster_id = await get_least_loaded_cluster()
-
-            await asyncio.gather(
-                update_key_on_cluster(
-                    tg_id,
-                    client_id,
-                    email,
-                    expiry_time,
-                    least_loaded_cluster_id,
-                )
-            )
-
-            await store_key(
-                tg_id,
-                client_id,
-                email,
-                expiry_time,
-                public_link,
-                server_id=least_loaded_cluster_id,
-                session=session,
-            )
-
-            await process_callback_view_key(callback_query, session)
-        else:
-            await callback_query.message.answer("<b>Ключ не найден в базе данных.</b>")
     except Exception as e:
-        await handle_error(
-            tg_id, callback_query, f"Ошибка при обновлении подписки: {e}"
-        )
+        logger.error(f"Ошибка при получении ключа для {email}: {e}")
+        await callback_query.message.answer("❌ Произошла ошибка. Попробуйте позже.")
+        return
+    finally:
+        if conn:
+            await conn.close()
+
+    description = SUBSCRIPTION_DESCRIPTION.format(key_link=key_link)
+
+    builder = InlineKeyboardBuilder()
+    builder.row(
+        InlineKeyboardButton(text=DOWNLOAD_IOS_BUTTON, url=DOWNLOAD_IOS),
+        InlineKeyboardButton(text=DOWNLOAD_ANDROID_BUTTON, url=DOWNLOAD_ANDROID),
+    )
+    builder.row(
+        InlineKeyboardButton(text=IMPORT_IOS, url=f"{CONNECT_IOS}{key_link}"),
+        InlineKeyboardButton(text=IMPORT_ANDROID, url=f"{CONNECT_ANDROID}{key_link}"),
+    )
+    builder.row(InlineKeyboardButton(text="📖 Ручная установка", callback_data="instructions"))
+    builder.row(InlineKeyboardButton(text="⬅️ Назад", callback_data=f"view_key|{email}"))
+
+    await edit_or_send_message(
+        target_message=callback_query.message, text=description, reply_markup=builder.as_markup(), media_path=None
+    )
+
+
+@router.callback_query(F.data.startswith("update_subscription|"))
+async def process_callback_update_subscription(callback_query: CallbackQuery, session: Any):
+    tg_id = callback_query.message.chat.id
+    email = callback_query.data.split("|")[1]
+
+    try:
+        await update_subscription(tg_id, email, session)
+        await process_callback_view_key(callback_query, session)
+    except Exception as e:
+        logger.error(f"Ошибка при обновлении ключа {email} пользователем: {e}")
+        await handle_error(tg_id, callback_query, f"Ошибка при обновлении подписки: {e}")
 
 
 @router.callback_query(F.data.startswith("delete_key|"))
-async def process_callback_delete_key(callback_query: types.CallbackQuery):
+async def process_callback_delete_key(callback_query: CallbackQuery):
     client_id = callback_query.data.split("|")[1]
     try:
         confirmation_keyboard = types.InlineKeyboardMarkup(
@@ -342,87 +298,63 @@ async def process_callback_delete_key(callback_query: types.CallbackQuery):
                         callback_data=f"confirm_delete|{client_id}",
                     )
                 ],
-                [
-                    types.InlineKeyboardButton(
-                        text="❌ Нет, отменить", callback_data="view_keys"
-                    )
-                ],
+                [types.InlineKeyboardButton(text="❌ Нет, отменить", callback_data="view_keys")],
             ]
         )
 
-        await callback_query.message.answer(
-            text="<b>Вы уверены, что хотите удалить ключ?</b>",
-            reply_markup=confirmation_keyboard,
-        )
+        if callback_query.message.caption:
+            await callback_query.message.edit_caption(
+                caption="<b>Вы уверены, что хотите удалить ключ?</b>", reply_markup=confirmation_keyboard
+            )
+        else:
+            await callback_query.message.edit_text(
+                text="<b>Вы уверены, что хотите удалить ключ?</b>", reply_markup=confirmation_keyboard
+            )
 
     except Exception as e:
-        logger.error(e)
+        logger.error(f"Ошибка при обработке запроса на удаление ключа {client_id}: {e}")
 
 
 @router.callback_query(F.data.startswith("renew_key|"))
-async def process_callback_renew_key(callback_query: types.CallbackQuery, session: Any):
+async def process_callback_renew_key(callback_query: CallbackQuery, session: Any):
     tg_id = callback_query.message.chat.id
     key_name = callback_query.data.split("|")[1]
     try:
-        record = await session.fetchrow(
-            """
-            SELECT client_id, expiry_time 
-            FROM keys 
-            WHERE email = $1
-            """,
-            key_name,
-        )
-
+        record = await get_key_details(key_name, session)
         if record:
             client_id = record["client_id"]
             expiry_time = record["expiry_time"]
 
             builder = InlineKeyboardBuilder()
 
-            builder.row(
-                InlineKeyboardButton(
-                    text=f'📅 1 месяц ({RENEWAL_PLANS["1"]["price"]} руб.)',
-                    callback_data=f"renew_plan|1|{client_id}",
+            for plan_id, plan_details in RENEWAL_PLANS.items():
+                months = plan_details["months"]
+                price = plan_details["price"]
+                discount = DISCOUNTS.get(plan_id, 0)
+                button_text = f"📅 {months} месяц{'а' if months > 1 else ''} ({price} руб.)" + (
+                    f" {discount}% скидка" if discount > 0 else ""
+                )
+                builder.row(
+                    InlineKeyboardButton(
+                        text=button_text,
+                        callback_data=f"renew_plan|{months}|{client_id}",
+                    )
                 )
-            )
 
-            builder.row(
-                InlineKeyboardButton(
-                    text=f'📅 3 месяца ({RENEWAL_PLANS["3"]["price"]} руб.) {DISCOUNTS["3"]}% скидка',
-                    callback_data=f"renew_plan|3|{client_id}",
-                )
-            )
-
-            builder.row(
-                InlineKeyboardButton(
-                    text=f'📅 6 месяцев ({RENEWAL_PLANS["6"]["price"]} руб.) {DISCOUNTS["6"]}% скидка',
-                    callback_data=f"renew_plan|6|{client_id}",
-                )
-            )
-
-            builder.row(
-                InlineKeyboardButton(
-                    text=f'📅 12 месяцев ({RENEWAL_PLANS["12"]["price"]} руб.) ({DISCOUNTS["12"]}% 🔥)',
-                    callback_data=f"renew_plan|12|{client_id}",
-                )
-            )
-            back_button = InlineKeyboardButton(
-                text="🔙 Назад", callback_data="view_keys"
-            )
-            builder.row(back_button)
+            builder.row(InlineKeyboardButton(text="⬅️ Назад", callback_data="view_keys"))
 
             balance = await get_balance(tg_id)
 
             response_message = PLAN_SELECTION_MSG.format(
                 balance=balance,
-                expiry_date=datetime.utcfromtimestamp(expiry_time / 1000).strftime(
-                    "%Y-%m-%d %H:%M:%S"
-                ),
+                expiry_date=datetime.utcfromtimestamp(expiry_time / 1000).strftime("%Y-%m-%d %H:%M:%S"),
             )
 
-            await callback_query.message.answer(
+            await edit_or_send_message(
+                target_message=callback_query.message,
                 text=response_message,
                 reply_markup=builder.as_markup(),
+                media_path=None,
             )
         else:
             await callback_query.message.answer("<b>Ключ не найден.</b>")
@@ -431,82 +363,58 @@ async def process_callback_renew_key(callback_query: types.CallbackQuery, sessio
 
 
 @router.callback_query(F.data.startswith("confirm_delete|"))
-async def process_callback_confirm_delete(
-    callback_query: types.CallbackQuery, session: Any
-):
+async def process_callback_confirm_delete(callback_query: CallbackQuery, session: Any):
     email = callback_query.data.split("|")[1]
     try:
-        record = await session.fetchrow(
-            "SELECT client_id FROM keys WHERE email = $1", email
-        )
-
+        record = await get_key_details(email, session)
         if record:
             client_id = record["client_id"]
             response_message = "Ключ успешно удален."
-            back_button = types.InlineKeyboardButton(
-                text="Назад", callback_data="view_keys"
-            )
+            back_button = types.InlineKeyboardButton(text="Назад", callback_data="view_keys")
             keyboard = types.InlineKeyboardMarkup(inline_keyboard=[[back_button]])
 
-            await delete_key(client_id)
-            await callback_query.message.answer(
-                response_message,
-                reply_markup=keyboard,
+            await delete_key(client_id, session)
+
+            await edit_or_send_message(
+                target_message=callback_query.message, text=response_message, reply_markup=keyboard, media_path=None
             )
 
-            servers = await get_servers_from_db()
+            servers = await get_servers(session)
 
             async def delete_key_from_servers():
                 try:
                     tasks = []
-                    for cluster_id, cluster in servers.items():
-                        tasks.append(
-                            delete_key_from_cluster(cluster_id, email, client_id)
-                        )
-
+                    for cluster_id, _cluster in servers.items():
+                        tasks.append(delete_key_from_cluster(cluster_id, email, client_id))
                     await asyncio.gather(*tasks)
-
                 except Exception as e:
                     logger.error(f"Ошибка при удалении ключа {client_id}: {e}")
 
             asyncio.create_task(delete_key_from_servers())
 
-            await delete_key_from_db(client_id, session)
-
+            await delete_key(client_id, session)
         else:
             response_message = "Ключ не найден или уже удален."
-            back_button = types.InlineKeyboardButton(
-                text="Назад", callback_data="view_keys"
-            )
+            back_button = types.InlineKeyboardButton(text="Назад", callback_data="view_keys")
             keyboard = types.InlineKeyboardMarkup(inline_keyboard=[[back_button]])
-
-            await callback_query.message.answer(
-                response_message,
-                reply_markup=keyboard,
+            await edit_or_send_message(
+                target_message=callback_query.message, text=response_message, reply_markup=keyboard, media_path=None
             )
     except Exception as e:
         logger.error(e)
 
 
 @router.callback_query(F.data.startswith("renew_plan|"))
-async def process_callback_renew_plan(
-    callback_query: types.CallbackQuery, session: Any
-):
+async def process_callback_renew_plan(callback_query: CallbackQuery, session: Any):
     tg_id = callback_query.message.chat.id
-    plan, client_id = (
-        callback_query.data.split("|")[1],
-        callback_query.data.split("|")[2],
-    )
+    plan, client_id = callback_query.data.split("|")[1], callback_query.data.split("|")[2]
     days_to_extend = 30 * int(plan)
 
     gb_multiplier = {"1": 1, "3": 3, "6": 6, "12": 12}
     total_gb = TOTAL_GB * gb_multiplier.get(plan, 1) if TOTAL_GB > 0 else 0
 
     try:
-        record = await session.fetchrow(
-            "SELECT email, expiry_time FROM keys WHERE client_id = $1",
-            client_id,
-        )
+        record = await get_key_by_server(tg_id, client_id, session)
 
         if record:
             email = record["email"]
@@ -514,70 +422,133 @@ async def process_callback_renew_plan(
             current_time = datetime.utcnow().timestamp() * 1000
 
             if expiry_time <= current_time:
-                new_expiry_time = int(
-                    current_time + timedelta(days=days_to_extend).total_seconds() * 1000
-                )
+                new_expiry_time = int(current_time + timedelta(days=days_to_extend).total_seconds() * 1000)
             else:
-                new_expiry_time = int(
-                    expiry_time + timedelta(days=days_to_extend).total_seconds() * 1000
-                )
+                new_expiry_time = int(expiry_time + timedelta(days=days_to_extend).total_seconds() * 1000)
 
             cost = RENEWAL_PLANS[plan]["price"]
-
             balance = await get_balance(tg_id)
+
             if balance < cost:
-                builder = InlineKeyboardBuilder()
-                builder.row(
-                    InlineKeyboardButton(text="Пополнить баланс", callback_data="pay")
-                )
-                builder.row(
-                    InlineKeyboardButton(
-                        text="👤 Личный кабинет", callback_data="profile"
-                    )
+                required_amount = cost - balance
+
+                logger.info(
+                    f"[RENEW] Пользователю {tg_id} не хватает {required_amount}₽. Запуск доплаты через {USE_NEW_PAYMENT_FLOW}"
                 )
 
-                await callback_query.message.answer(
-                    INSUFFICIENT_FUNDS_MSG,
-                    reply_markup=builder.as_markup(),
+                await create_temporary_data(
+                    session,
+                    tg_id,
+                    "waiting_for_renewal_payment",
+                    {
+                        "plan": plan,
+                        "client_id": client_id,
+                        "cost": cost,
+                        "required_amount": required_amount,
+                        "new_expiry_time": new_expiry_time,
+                        "total_gb": total_gb,
+                        "email": email,
+                    },
                 )
+
+                if USE_NEW_PAYMENT_FLOW == "YOOKASSA":
+                    logger.info(f"[RENEW] Запуск оплаты через Юкассу для пользователя {tg_id}")
+                    await process_custom_amount_input(callback_query, session)
+                elif USE_NEW_PAYMENT_FLOW == "ROBOKASSA":
+                    logger.info(f"[RENEW] Запуск оплаты через Робокассу для пользователя {tg_id}")
+                    await handle_custom_amount_input(callback_query, session)
+                else:
+                    logger.info(f"[RENEW] Отправка сообщения о доплате пользователю {tg_id}")
+                    builder = InlineKeyboardBuilder()
+                    builder.row(InlineKeyboardButton(text="💳 Пополнить баланс", callback_data="pay"))
+                    builder.row(InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile"))
+
+                    await edit_or_send_message(
+                        target_message=callback_query.message,
+                        text=f"💳 Недостаточно средств. Пополните баланс на {required_amount}₽.",
+                        reply_markup=builder.as_markup(),
+                        media_path=None,
+                    )
                 return
 
-            response_message = SUCCESS_RENEWAL_MSG.format(
-                months=RENEWAL_PLANS[plan]["months"]
-            )
-            builder = InlineKeyboardBuilder()
-            builder.row(
-                InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile")
-            )
-
-            await callback_query.message.answer(
-                response_message, reply_markup=builder.as_markup()
-            )
-
-            servers = await get_servers_from_db()
-
-            async def renew_key_on_servers():
-                tasks = []
-                for cluster_id in servers:
-                    task = asyncio.create_task(
-                        renew_key_in_cluster(
-                            cluster_id,
-                            email,
-                            client_id,
-                            new_expiry_time,
-                            total_gb,
-                        )
-                    )
-                    tasks.append(task)
-
-                await asyncio.gather(*tasks)
-
-                await update_balance(tg_id, -cost)
-                await update_key_expiry(client_id, new_expiry_time)
-
-            await renew_key_on_servers()
+            logger.info(f"[RENEW] Средств достаточно. Продление ключа для пользователя {tg_id}")
+            await complete_key_renewal(tg_id, client_id, email, new_expiry_time, total_gb, cost, callback_query, plan)
 
         else:
             await callback_query.message.answer(KEY_NOT_FOUND_MSG)
+            logger.error(f"[RENEW] Ключ с client_id={client_id} не найден.")
     except Exception as e:
-        logger.error(e)
+        logger.error(f"[RENEW] Ошибка при продлении ключа для пользователя {tg_id}: {e}")
+
+
+async def complete_key_renewal(tg_id, client_id, email, new_expiry_time, total_gb, cost, callback_query, plan):
+    logger.info(
+        f"[RENEW] Начинаю процесс продления ключа с параметрами: "
+        f"tg_id={tg_id}, client_id={client_id}, email={email}, "
+        f"new_expiry_time={new_expiry_time}, total_gb={total_gb}, cost={cost}, "
+        f"callback_query={'есть' if callback_query else 'отсутствует'}, plan={plan}"
+    )
+
+    response_message = SUCCESS_RENEWAL_MSG.format(months=plan)
+
+    builder = InlineKeyboardBuilder()
+    builder.row(InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile"))
+
+    if callback_query:
+        try:
+            await edit_or_send_message(
+                target_message=callback_query.message,
+                text=response_message,
+                reply_markup=builder.as_markup(),
+                media_path=None,
+            )
+        except Exception as e:
+            logger.error(f"Ошибка редактирования сообщения в complete_key_renewal: {e}")
+            await callback_query.message.answer(response_message, reply_markup=builder.as_markup())
+    else:
+        await bot.send_message(tg_id, response_message, reply_markup=builder.as_markup())
+
+    conn = await asyncpg.connect(DATABASE_URL)
+
+    logger.info(f"[RENEW] Получение данных о ключе для email: {email}")
+    key_info = await get_key_details(email, conn)
+    if not key_info:
+        logger.error(f"[RENEW] Ключ с client_id {client_id} для пользователя {tg_id} не найден.")
+        await conn.close()
+        return
+
+    server_id = key_info["server_id"]
+
+    if USE_COUNTRY_SELECTION:
+        logger.info(f"[RENEW] USE_COUNTRY_SELECTION включён. Проверяю информацию о сервере {server_id}")
+        cluster_info = await check_server_name_by_cluster(server_id, conn)
+        if not cluster_info:
+            logger.error(f"[RENEW] Сервер {server_id} не найден в таблице servers.")
+            await conn.close()
+            return
+        cluster_id = cluster_info["cluster_name"]
+        logger.info(f"[RENEW] Информация о сервере получена: {cluster_info}. Использую cluster_id: {cluster_id}")
+    else:
+        cluster_id = server_id
+        logger.info(f"[RENEW] USE_COUNTRY_SELECTION выключен. Использую server_id в качестве cluster_id: {cluster_id}")
+
+    logger.info(f"[RENEW] Запуск продления ключа для пользователя {tg_id} на {plan} мес. в кластере {cluster_id}.")
+
+    async def renew_key_on_cluster():
+        logger.info(
+            f"[RENEW] Запуск renew_key_on_cluster с параметрами: "
+            f"cluster_id={cluster_id}, email={email}, client_id={client_id}, "
+            f"new_expiry_time={new_expiry_time}, total_gb={total_gb}"
+        )
+        await renew_key_in_cluster(cluster_id, email, client_id, new_expiry_time, total_gb)
+        logger.info("[RENEW] Продление ключа на сервере завершено. Обновляю срок действия в базе данных.")
+        await update_key_expiry(client_id, new_expiry_time, conn)
+        logger.info("[RENEW] Срок действия ключа обновлён. Обновляю баланс пользователя.")
+        await update_balance(tg_id, -cost, conn)
+        logger.info(f"[RENEW] Ключ {client_id} успешно продлён на {plan} мес. для пользователя {tg_id}.")
+
+    logger.info("[RENEW] Инициализация процесса продления ключа в кластере.")
+    await renew_key_on_cluster()
+
+    logger.info("[RENEW] Процесс продления ключа завершён. Закрываю соединение с базой данных.")
+    await conn.close()

handlers/keys/subscriptions.py

@@ -1,214 +1,378 @@
+import asyncio
 import base64
+import random
+import re
+import time
+import urllib.parse
 from datetime import datetime
 
 import aiohttp
 import asyncpg
+import pytz
 from aiohttp import web
 
-from config import DATABASE_URL, PROJECT_NAME, SUB_MESSAGE, TRANSITION_DATE_STR
-from database import get_servers_from_db
+from config import (
+    DATABASE_URL,
+    PROJECT_NAME,
+    SUB_MESSAGE,
+    SUPERNODE,
+    SUPPORT_CHAT_URL,
+    TOTAL_GB,
+    TRANSITION_DATE_STR,
+    USE_COUNTRY_SELECTION,
+    USERNAME_BOT,
+)
+from database import get_key_details, get_servers
+from handlers.utils import convert_to_bytes
 from logger import logger
 
 
-async def fetch_url_content(url, tg_id):
+async def fetch_url_content(url: str, identifier: str) -> list[str]:
+    """
+    Получает содержимое подписки по URL и декодирует его.
+
+    Args:
+        url: URL для получения содержимого
+        identifier: Идентификатор пользователя (tg_id или email)
+
+    Returns:
+        Список строк из подписки
+    """
     try:
-        logger.info(f"Получение URL: {url} для tg_id: {tg_id}")
-        async with aiohttp.ClientSession() as session:
+        logger.info(f"Получение URL: {url} для идентификатора: {identifier}")
+        timeout = aiohttp.ClientTimeout(total=5)
+        async with aiohttp.ClientSession(timeout=timeout) as session:
             async with session.get(url, ssl=False) as response:
                 if response.status == 200:
                     content = await response.text()
-                    logger.info(f"Успешно получен контент с {url} для tg_id: {tg_id}")
+                    logger.info(f"Успешно получен контент с {url} для идентификатора: {identifier}")
                     return base64.b64decode(content).decode("utf-8").split("\n")
                 else:
                     logger.error(
-                        f"Не удалось получить {url} для tg_id: {tg_id}, статус: {response.status}"
+                        f"Не удалось получить {url} для идентификатора: {identifier}, статус: {response.status}"
                     )
                     return []
+    except TimeoutError:
+        logger.error(f"Таймаут при получении {url} для идентификатора: {identifier}")
+        return []
     except Exception as e:
-        logger.error(f"Ошибка при получении {url} для tg_id: {tg_id}: {e}")
+        logger.error(f"Ошибка при получении {url} для идентификатора: {identifier}: {e}")
         return []
 
 
-async def combine_unique_lines(urls, tg_id, query_string):
-    all_lines = []
-    logger.info(
-        f"Начинаем объединение подписок для tg_id: {tg_id}, запрос: {query_string}"
-    )
+async def combine_unique_lines(urls: list[str], identifier: str, query_string: str) -> list[str]:
+    """
+    Объединяет строки подписки из нескольких URL, удаляя дубликаты.
 
-    urls_with_query = [f"{url}?{query_string}" for url in urls]
+    Args:
+        urls: Список URL для получения подписок
+        identifier: Идентификатор пользователя (tg_id или email)
+        query_string: Строка запроса для добавления к URL
+
+    Returns:
+        Список уникальных строк из всех подписок
+    """
+    if SUPERNODE:
+        logger.info(f"Режим SUPERNODE активен. Возвращаем первую ссылку для идентификатора: {identifier}")
+        if not urls:
+            return []
+        url_with_query = f"{urls[0]}?{query_string}" if query_string else urls[0]
+        return await fetch_url_content(url_with_query, identifier)
+
+    logger.info(f"Начинаем объединение подписок для идентификатора: {identifier}, запрос: {query_string}")
+    urls_with_query = [f"{url}?{query_string}" if query_string else url for url in urls]
     logger.info(f"Составлены URL-адреса: {urls_with_query}")
 
-    for url in urls_with_query:
-        lines = await fetch_url_content(url, tg_id)
-        all_lines.extend(lines)
-
-    all_lines = list(set(filter(None, all_lines)))
+    tasks = [fetch_url_content(url, identifier) for url in urls_with_query]
+    results = await asyncio.gather(*tasks)
+    all_lines = set()
+    for lines in results:
+        all_lines.update(filter(None, lines))
     logger.info(
-        f"Объединено {len(all_lines)} строк после фильтрации и удаления дубликатов для tg_id: {tg_id}"
+        f"Объединено {len(all_lines)} строк после фильтрации и удаления дубликатов для идентификатора: {identifier}"
     )
-
-    return all_lines
+    return list(all_lines)
 
 
-transition_date = datetime.strptime(TRANSITION_DATE_STR, "%Y-%m-%d %H:%M:%S")
+async def get_subscription_urls(server_id: str, email: str, conn) -> list[str]:
+    """
+    Получает список URL-адресов для подписки в зависимости от режима выбора страны.
 
-transition_timestamp_ms = int(transition_date.timestamp() * 1000)
+    Args:
+        server_id: Идентификатор сервера или кластера
+        email: Email пользователя
+        conn: Соединение с базой данных
 
-transition_timestamp_ms_adjusted = transition_timestamp_ms - (3 * 60 * 60 * 1000)
+    Returns:
+        Список URL-адресов для подписки
+    """
+    if USE_COUNTRY_SELECTION:
+        logger.info(f"Режим выбора страны активен. Ищем сервер {server_id} в БД.")
+        server_data = await conn.fetchrow("SELECT subscription_url FROM servers WHERE server_name = $1", server_id)
+        if not server_data:
+            logger.warning(f"Не найден сервер {server_id} в БД!")
+            return []
+        subscription_url = server_data["subscription_url"]
+        urls = [f"{subscription_url}/{email}"]
+        logger.info(f"Используем подписку {urls[0]}")
+        return urls
 
-logger.info(
-    f"Время перехода (с поправкой на часовой пояс): {transition_timestamp_ms_adjusted}"
-)
+    servers = await get_servers(conn)
+    logger.info(f"Режим выбора страны отключен. Используем кластер {server_id}.")
+    cluster_servers = servers.get(server_id, [])
+    if not cluster_servers:
+        logger.warning(f"Не найдены сервера для {server_id}")
+        return []
+    urls = [f"{server['subscription_url']}/{email}" for server in cluster_servers]
+    logger.info(f"Найдено {len(urls)} URL-адресов в кластере {server_id}")
+    return urls
 
 
-async def handle_old_subscription(request):
+def get_transition_timestamp() -> int:
+    """
+    Получает временную метку перехода с учетом часового пояса Москвы.
+
+    Returns:
+        Временная метка перехода в миллисекундах
+    """
+    moscow_tz = pytz.timezone("Europe/Moscow")
+    transition_date_naive = datetime.strptime(TRANSITION_DATE_STR, "%Y-%m-%d %H:%M:%S")
+    transition_date = moscow_tz.localize(transition_date_naive)
+    transition_timestamp_ms = int(transition_date.timestamp() * 1000)
+    return transition_timestamp_ms
+
+
+def calculate_traffic(cleaned_subscriptions: list[str], expiry_time_ms: int | None) -> str:
+    """
+    Рассчитывает информацию о трафике на основе подписок.
+
+    Args:
+        cleaned_subscriptions: Список строк подписки
+        expiry_time_ms: Время истечения подписки в миллисекундах
+
+    Returns:
+        Строка с информацией о трафике
+    """
+    expire_timestamp = int(expiry_time_ms / 1000) if expiry_time_ms else 0
+
+    if TOTAL_GB != 0:
+        country_remaining = {}
+        for line in cleaned_subscriptions:
+            if "#" not in line:
+                continue
+
+            try:
+                _, meta = line.split("#", 1)
+            except ValueError:
+                continue
+
+            parts = meta.split("-")
+            country = parts[0].strip()
+            remaining_str = parts[1].strip() if len(parts) == 2 else ""
+
+            if remaining_str:
+                remaining_str = remaining_str.replace(",", ".")
+                m_total = re.search(r"([\d\.]+)\s*([GMKTB]B)", remaining_str, re.IGNORECASE)
+                if m_total:
+                    value = float(m_total.group(1))
+                    unit = m_total.group(2).upper()
+                    remaining_bytes = convert_to_bytes(value, unit)
+                    country_remaining[country] = remaining_bytes
+
+        num_countries = len(country_remaining)
+        issued_per_country = TOTAL_GB
+        total_traffic_bytes = issued_per_country * num_countries
+        consumed_traffic_bytes = total_traffic_bytes - sum(country_remaining.values())
+
+        if consumed_traffic_bytes < 0:
+            consumed_traffic_bytes = 0
+    else:
+        consumed_traffic_bytes = 1
+        total_traffic_bytes = 0
+
+    return f"upload=0; download={consumed_traffic_bytes}; total={total_traffic_bytes}; expire={expire_timestamp}"
+
+
+def clean_subscription_line(line: str) -> str:
+    """
+    Очищает строку подписки, оставляя только нужную информацию.
+
+    Args:
+        line: Исходная строка подписки
+
+    Returns:
+        Очищенная строка подписки
+    """
+    if "#" not in line:
+        return line
+
+    try:
+        base, meta = line.split("#", 1)
+    except ValueError:
+        return line
+
+    parts = meta.split("-")
+    country = parts[0].strip() if parts else ""
+    traffic = ""
+
+    for part in parts[1:]:
+        part_decoded = urllib.parse.unquote(part).strip()
+        if re.search(r"\d+(?:[.,]\d+)?\s*(?:GB|MB|KB|TB)", part_decoded, re.IGNORECASE):
+            traffic = part_decoded
+            break
+
+    meta_clean = f"{country} - {traffic}" if traffic else country
+    return base + "#" + meta_clean
+
+
+def format_time_left(expiry_time_ms: int | None) -> str:
+    """
+    Форматирует оставшееся время подписки.
+
+    Args:
+        expiry_time_ms: Время истечения подписки в миллисекундах
+
+    Returns:
+        Отформатированная строка с оставшимся временем
+    """
+    if not expiry_time_ms:
+        return "N/A"
+
+    now_ms = int(time.time() * 1000)
+    remaining_sec = max((expiry_time_ms - now_ms) / 1000, 0)
+    days = int(remaining_sec // 86400)
+    hours = int((remaining_sec % 86400) // 3600)
+
+    return f"{days}D,{hours}H ⏳" if days else f"{hours}H ⏳"
+
+
+def prepare_headers(
+    user_agent: str, project_name: str, subscription_info: str, subscription_userinfo: str
+) -> dict[str, str]:
+    """
+    Подготавливает заголовки ответа в зависимости от User-Agent клиента.
+
+    Args:
+        user_agent: User-Agent клиента
+        project_name: Название проекта
+        subscription_info: Информация о подписке
+        subscription_userinfo: Информация о трафике
+
+    Returns:
+        Словарь с заголовками ответа
+    """
+    if "Happ" in user_agent:
+        encoded_project_name = f"{project_name}"
+        announce_str = f"↖️Бот | {subscription_info} | Поддержка↗️"
+        return {
+            "Content-Type": "text/plain; charset=utf-8",
+            "Content-Disposition": "inline",
+            "profile-update-interval": "3",
+            "profile-title": "base64:" + base64.b64encode(encoded_project_name.encode("utf-8")).decode("utf-8"),
+            "support-url": SUPPORT_CHAT_URL,
+            "announce": "base64:" + base64.b64encode(announce_str.encode("utf-8")).decode("utf-8"),
+            "profile-web-page-url": f"https://t.me/{USERNAME_BOT}",
+            "subscription-userinfo": subscription_userinfo,
+        }
+    elif "Hiddify" in user_agent:
+        parts = subscription_info.split(' - ')[0].split(': ')
+        key_info = parts[1] if len(parts) > 1 else parts[0]
+
+        encoded_project_name = f"{project_name}\n📄 Подписка: {key_info}"
+        return {
+            "profile-update-interval": "3",
+            "profile-title": "base64:" + base64.b64encode(encoded_project_name.encode("utf-8")).decode("utf-8"),
+            "subscription-userinfo": subscription_userinfo,
+        }
+    else:
+        encoded_project_name = f"{project_name}\n{subscription_info}"
+        return {
+            "Content-Type": "text/plain; charset=utf-8",
+            "Content-Disposition": "inline",
+            "profile-update-interval": "3",
+            "profile-title": "base64:" + base64.b64encode(encoded_project_name.encode("utf-8")).decode("utf-8"),
+        }
+
+
+async def handle_subscription(request: web.Request, old_subscription: bool = False) -> web.Response:
+    """
+    Обрабатывает запрос на подписку (старую или новую).
+
+    Args:
+        request: Объект запроса
+        old_subscription: Флаг, указывающий на тип подписки (старая или новая)
+
+    Returns:
+        Ответ с подпиской или сообщением об ошибке
+    """
     email = request.match_info.get("email")
+    tg_id = request.match_info.get("tg_id") if not old_subscription else None
 
-    if not email:
-        logger.warning("Получен запрос без email")
-        return web.Response(
-            text="❌ Неверные параметры запроса. Требуется email.",
-            status=400,
-        )
+    if not email or (not old_subscription and not tg_id):
+        logger.warning("Получен запрос с отсутствующими параметрами")
+        return web.Response(text="❌ Неверные параметры запроса.", status=400)
 
-    logger.info(f"Обработка запроса для старого клиента с email: {email}")
+    logger.info(
+        f"Обработка запроса для {'старого' if old_subscription else 'нового'} клиента: email={email}, tg_id={tg_id}"
+    )
 
     conn = await asyncpg.connect(DATABASE_URL)
     try:
-        key_info = await conn.fetchrow(
-            "SELECT created_at, server_id FROM keys WHERE email = $1", email
-        )
-
-        if not key_info:
+        client_data = await get_key_details(email, conn)
+        if not client_data:
             logger.warning(f"Клиент с email {email} не найден в базе.")
-            return web.Response(
-                text="❌ Клиент с таким email не найден.",
-                status=404,
-            )
+            return web.Response(text="❌ Клиент с таким email не найден.", status=404)
 
-        created_at_ms = key_info["created_at"]
-        cluster_name = key_info.get("server_id")
-        if not cluster_name:
-            logger.warning(f"У клиента с email {email} отсутствует cluster_name.")
-            return web.Response(
-                text="❌ Устаревшие данные. Обратитесь в поддержку.",
-                status=400,
-            )
+        stored_tg_id = client_data.get("tg_id")
+        server_id = client_data["server_id"]
 
-        logger.info(f"Значение created_at для клиента с email {email}: {created_at_ms}, кластер: {cluster_name}")
+        if not old_subscription and str(tg_id) != str(stored_tg_id):
+            logger.warning(f"Неверный tg_id для клиента с email {email}.")
+            return web.Response(text="❌ Неверные данные. Получите свой ключ в боте.", status=403)
 
-        created_at_datetime = datetime.utcfromtimestamp(created_at_ms / 1000)
-        logger.info(
-            f"Время создания клиента в формате datetime (UTC): {created_at_datetime}"
-        )
+        if old_subscription:
+            created_at_ms = client_data["created_at"]
+            created_at_datetime = datetime.utcfromtimestamp(created_at_ms / 1000)
+            logger.info(f"created_at для {email}: {created_at_datetime}, server_id: {server_id}")
 
-        if created_at_ms >= transition_timestamp_ms_adjusted:
-            logger.info(f"Клиент с email {email} является новым.")
-            return web.Response(
-                text="❌ Эта ссылка устарела. Пожалуйста, обновите ссылку.",
-                status=400,
-            )
+            transition_timestamp_ms = get_transition_timestamp()
+            logger.info(f"Время перехода (с учетом часового пояса Москвы): {transition_timestamp_ms}")
 
-        servers = await get_servers_from_db()
-        cluster_servers = servers.get(cluster_name, [])
-        logger.info(f"Сервера в кластере: {cluster_servers}")
+            if created_at_ms >= transition_timestamp_ms:
+                logger.info(f"Клиент с email {email} является новым.")
+                return web.Response(text="❌ Эта ссылка устарела. Пожалуйста, обновите ссылку.", status=400)
 
-        urls = []
-        for server in cluster_servers:
-            server_subscription_url = f"{server['subscription_url']}/{email}"
-            urls.append(server_subscription_url)
+        expiry_time_ms = client_data.get("expiry_time")
+        time_left = format_time_left(expiry_time_ms)
 
-        combined_subscriptions = await combine_unique_lines(urls, email, "")
+        urls = await get_subscription_urls(server_id, email, conn)
+        if not urls:
+            return web.Response(text="❌ Сервер не найден.", status=404)
 
-        base64_encoded = base64.b64encode(
-            "\n".join(combined_subscriptions).encode("utf-8")
-        ).decode("utf-8")
+        query_string = request.query_string if not old_subscription else ""
+        combined_subscriptions = await combine_unique_lines(urls, tg_id or email, query_string)
+        random.shuffle(combined_subscriptions)
 
-        encoded_project_name = f"{PROJECT_NAME} - {SUB_MESSAGE}"
-        headers = {
-            "Content-Type": "text/plain; charset=utf-8",
-            "Content-Disposition": "inline",
-            "profile-update-interval": "7",
-            "profile-title": "base64:" + base64.b64encode(
-                encoded_project_name.encode("utf-8")
-            ).decode("utf-8"),
-        }
+        cleaned_subscriptions = [clean_subscription_line(line) for line in combined_subscriptions]
+
+        base64_encoded = base64.b64encode("\n".join(cleaned_subscriptions).encode("utf-8")).decode("utf-8")
+        subscription_info = f"📄 Подписка: {email} - {time_left}"
+
+        user_agent = request.headers.get("User-Agent", "")
+        subscription_userinfo = calculate_traffic(cleaned_subscriptions, expiry_time_ms)
+        headers = prepare_headers(user_agent, PROJECT_NAME, subscription_info, subscription_userinfo)
 
         logger.info(f"Возвращаем объединенные подписки для email: {email}")
         return web.Response(text=base64_encoded, headers=headers)
-
     finally:
         await conn.close()
 
 
+async def handle_old_subscription(request: web.Request) -> web.Response:
+    """Обработка запроса для старых клиентов."""
+    return await handle_subscription(request, old_subscription=True)
 
-async def handle_new_subscription(request):
-    email = request.match_info.get("email")
-    tg_id = request.match_info.get("tg_id")
 
-    if not email or not tg_id:
-        logger.warning("Получен запрос с отсутствующими параметрами email или tg_id")
-        return web.Response(
-            text="❌ Неверные параметры запроса. Требуются email и tg_id.",
-            status=400,
-        )
-
-    logger.info(f"Обработка запроса для нового клиента: email={email}, tg_id={tg_id}")
-
-    conn = await asyncpg.connect(DATABASE_URL)
-    try:
-
-        client_data = await conn.fetchrow(
-            "SELECT tg_id, server_id FROM keys WHERE email = $1", email
-        )
-
-        if not client_data:
-            logger.warning(f"Клиент с email {email} не найден в базе.")
-            return web.Response(
-                text="❌ Клиент с таким email не найден.",
-                status=404,
-            )
-
-        stored_tg_id = client_data["tg_id"]
-        cluster_name = client_data["server_id"]
-
-        if str(tg_id) != str(stored_tg_id):
-            logger.warning(f"Неверный tg_id для клиента с email {email}.")
-            return web.Response(
-                text="❌ Неверные данные. Получите свой ключ в боте.",
-                status=403,
-            )
-
-    finally:
-        await conn.close()
-
-    servers = await get_servers_from_db()
-    cluster_servers = servers.get(cluster_name, [])
-
-    urls = []
-    for server in cluster_servers:
-        server_subscription_url = f"{server['subscription_url']}/{email}"
-        urls.append(server_subscription_url)
-
-    query_string = request.query_string
-    logger.info(f"Извлечен query string: {query_string}")
-
-    combined_subscriptions = await combine_unique_lines(urls, tg_id, query_string)
-
-    base64_encoded = base64.b64encode(
-        "\n".join(combined_subscriptions).encode("utf-8")
-    ).decode("utf-8")
-
-    encoded_project_name = f"{PROJECT_NAME} - {SUB_MESSAGE}"
-
-    headers = {
-        "Content-Type": "text/plain; charset=utf-8",
-        "Content-Disposition": "inline",
-        "profile-update-interval": "7",
-        "profile-title": "base64:" + base64.b64encode(
-            encoded_project_name.encode("utf-8")
-        ).decode("utf-8"),
-    }
-
-    logger.info(f"Возвращаем объединенные подписки для email: {email}")
-    return web.Response(text=base64_encoded, headers=headers)
+async def handle_new_subscription(request: web.Request) -> web.Response:
+    """Обработка запроса для новых клиентов."""
+    return await handle_subscription(request, old_subscription=False)

handlers/keys/trial_key.py

@@ -1,68 +0,0 @@
-import asyncio
-import uuid
-from datetime import datetime, timedelta
-from typing import Any
-
-from py3xui import AsyncApi
-
-from client import add_client
-from config import ADMIN_PASSWORD, ADMIN_USERNAME, PUBLIC_LINK, TOTAL_GB, TRIAL_TIME
-from database import get_servers_from_db, store_key, use_trial
-from handlers.texts import INSTRUCTIONS
-from handlers.utils import generate_random_email, get_least_loaded_cluster
-
-
-async def create_trial_key(tg_id: int, session: Any):
-    client_id = str(uuid.uuid4())
-    email = generate_random_email()
-    public_link = f"{PUBLIC_LINK}{email}/{tg_id}"
-    instructions = INSTRUCTIONS
-    result = {"key": public_link, "instructions": instructions, "email": email}
-    current_time = datetime.utcnow()
-    expiry_time = current_time + timedelta(days=TRIAL_TIME)
-    expiry_timestamp = int(expiry_time.timestamp() * 1000)
-
-    clusters = await get_servers_from_db()
-
-    least_loaded_cluster = await get_least_loaded_cluster()
-
-    if least_loaded_cluster not in clusters:
-        raise ValueError(f"Кластер {least_loaded_cluster} не найден в базе данных.")
-
-    servers_in_cluster = clusters[least_loaded_cluster]
-
-    tasks = []
-
-    for server_info in servers_in_cluster:
-        tasks.append(
-            add_client(
-                AsyncApi(
-                    server_info["api_url"],
-                    username=ADMIN_USERNAME,
-                    password=ADMIN_PASSWORD,
-                ),
-                client_id,
-                email,
-                tg_id,
-                limit_ip=1,
-                total_gb=TOTAL_GB,
-                expiry_time=expiry_timestamp,
-                enable=True,
-                flow="xtls-rprx-vision",
-                inbound_id=int(server_info["inbound_id"]),
-            )
-        )
-
-    await asyncio.gather(*tasks)
-
-    await store_key(
-        tg_id,
-        client_id,
-        email,
-        expiry_timestamp,
-        public_link,
-        server_id=least_loaded_cluster,
-        session=session,
-    )
-    await use_trial(tg_id, session)
-    return result

handlers/notifications.py

@@ -1,415 +0,0 @@
-import asyncio
-from datetime import datetime, timedelta
-
-import asyncpg
-from aiogram import Bot, Router, types
-from aiogram.utils.keyboard import InlineKeyboardBuilder
-from py3xui import AsyncApi
-
-from config import (
-    ADMIN_PASSWORD,
-    ADMIN_USERNAME,
-    DATABASE_URL,
-    DEV_MODE,
-    RENEWAL_PLANS,
-    TOTAL_GB,
-    TRIAL_TIME,
-)
-from database import (
-    add_notification,
-    check_notification_time,
-    delete_key,
-    get_balance,
-    get_servers_from_db,
-    update_balance,
-    update_key_expiry,
-)
-from handlers.keys.key_utils import delete_key_from_cluster, renew_key_in_cluster
-from handlers.texts import KEY_EXPIRY_10H, KEY_EXPIRY_24H, KEY_RENEWED
-from logger import logger
-
-router = Router()
-
-
-async def notify_expiring_keys(bot: Bot):
-    conn = None
-    try:
-        conn = await asyncpg.connect(DATABASE_URL)
-        logger.info("Подключение к базе данных успешно.")
-
-        current_time = int(datetime.utcnow().timestamp() * 1000)
-        threshold_time_10h = int(
-            (datetime.utcnow() + timedelta(hours=10)).timestamp() * 1000
-        )
-        threshold_time_24h = int(
-            (datetime.utcnow() + timedelta(days=1)).timestamp() * 1000
-        )
-
-        logger.info("Начало обработки уведомлений.")
-
-        await notify_inactive_trial_users(bot, conn)
-        await asyncio.sleep(1)
-        await check_online_users()
-        await asyncio.sleep(1)
-        await notify_10h_keys(bot, conn, current_time, threshold_time_10h)
-        await asyncio.sleep(1)
-        await notify_24h_keys(bot, conn, current_time, threshold_time_24h)
-        await asyncio.sleep(1)
-        await handle_expired_keys(bot, conn, current_time)
-        await asyncio.sleep(1)
-
-    except Exception as e:
-        logger.error(f"Ошибка при отправке уведомлений: {e}")
-    finally:
-        if conn:
-            await conn.close()
-            logger.info("Соединение с базой данных закрыто.")
-
-
-async def is_bot_blocked(bot: Bot, chat_id: int) -> bool:
-    if DEV_MODE:
-        return False
-    try:
-        member = await bot.get_chat_member(chat_id, bot.id)
-        blocked = member.status == "left"
-        logger.info(
-            f"Статус бота для пользователя {chat_id}: {'заблокирован' if blocked else 'активен'}"
-        )
-        return blocked
-    except Exception as e:
-        logger.warning(
-            f"Не удалось проверить статус бота для пользователя {chat_id}: {e}"
-        )
-        return False
-
-
-async def notify_10h_keys(
-    bot: Bot,
-    conn: asyncpg.Connection,
-    current_time: float,
-    threshold_time_10h: float,
-):
-    records = await conn.fetch(
-        """
-        SELECT tg_id, email, expiry_time, client_id, server_id FROM keys 
-        WHERE expiry_time <= $1 AND expiry_time > $2 AND notified = FALSE
-    """,
-        threshold_time_10h,
-        current_time,
-    )
-
-    logger.info(f"Найдено {len(records)} ключей для уведомления за 10 часов.")
-    for record in records:
-        tg_id = record["tg_id"]
-        email = record["email"]
-        expiry_time = record["expiry_time"]
-
-        expiry_date = datetime.utcfromtimestamp(expiry_time / 1000)
-        current_date = datetime.utcnow()
-        time_left = expiry_date - current_date
-
-        if time_left.total_seconds() <= 0:
-            days_left_message = "Ключ истек"
-        elif time_left.days > 0:
-            days_left_message = f"{time_left.days}"
-        else:
-            hours_left = time_left.seconds // 3600
-            days_left_message = f"{hours_left}"
-
-        message = KEY_EXPIRY_10H.format(
-            email=email,
-            expiry_date=expiry_date.strftime("%Y-%m-%d %H:%M:%S"),
-            days_left_message=days_left_message,
-            price=RENEWAL_PLANS["1"]["price"],
-        )
-
-        if not await is_bot_blocked(bot, tg_id) and not DEV_MODE:
-            try:
-                keyboard = InlineKeyboardBuilder()
-                keyboard.button(
-                    text="🔄 Продлить VPN", callback_data=f"renew_key|{email}"
-                )
-                keyboard.button(text="💳 Пополнить баланс", callback_data="pay")
-                keyboard.button(text="👤 Личный кабинет", callback_data="profile")
-                keyboard.adjust(1)
-                keyboard = keyboard.as_markup()
-                await bot.send_message(tg_id, message, reply_markup=keyboard)
-                logger.info(f"Уведомление отправлено пользователю {tg_id}.")
-            except Exception as e:
-                logger.error(
-                    f"Ошибка при отправке уведомления пользователю {tg_id}: {e}"
-                )
-                continue
-
-            await conn.execute(
-                "UPDATE keys SET notified = TRUE WHERE client_id = $1",
-                record["client_id"],
-            )
-            logger.info(f"Обновлено поле notified для клиента {record['client_id']}.")
-
-        await asyncio.sleep(1)
-
-
-async def notify_24h_keys(
-    bot: Bot,
-    conn: asyncpg.Connection,
-    current_time: float,
-    threshold_time_24h: float,
-):
-    logger.info("Проверка истекших ключей...")
-
-    records_24h = await conn.fetch(
-        """
-        SELECT tg_id, email, expiry_time, client_id, server_id FROM keys 
-        WHERE expiry_time <= $1 AND expiry_time > $2 AND notified_24h = FALSE
-    """,
-        threshold_time_24h,
-        current_time,
-    )
-
-    logger.info(f"Найдено {len(records_24h)} ключей для уведомления за 24 часа.")
-    for record in records_24h:
-        tg_id = record["tg_id"]
-        email = record["email"]
-        expiry_time = record["expiry_time"]
-
-        expiry_date = datetime.utcfromtimestamp(expiry_time / 1000)
-        current_date = datetime.utcnow()
-        time_left = expiry_date - current_date
-
-        if time_left.total_seconds() <= 0:
-            days_left_message = "Ключ истек"
-        elif time_left.days > 0:
-            days_left_message = f"{time_left.days}"
-        else:
-            hours_left = time_left.seconds // 3600
-            days_left_message = f"{hours_left}"
-
-        message_24h = KEY_EXPIRY_24H.format(
-            email=email,
-            days_left_message=days_left_message,
-            expiry_date=expiry_date.strftime("%Y-%m-%d %H:%M:%S"),
-        )
-
-        if not await is_bot_blocked(bot, tg_id) and not DEV_MODE:
-            try:
-                builder = InlineKeyboardBuilder()
-                builder.row(
-                    types.InlineKeyboardButton(
-                        text="🔄 Продлить VPN",
-                        callback_data=f"renew_key|{email}",
-                    )
-                )
-                builder.row(
-                    types.InlineKeyboardButton(
-                        text="💳 Пополнить баланс",
-                        callback_data="pay",
-                    )
-                )
-                builder.row(
-                    types.InlineKeyboardButton(
-                        text="👤 Личный кабинет",
-                        callback_data="profile",
-                    )
-                )
-                keyboard = builder.as_markup()
-                await bot.send_message(tg_id, message_24h, reply_markup=keyboard)
-                logger.info(f"Уведомление за 24 часа отправлено пользователю {tg_id}.")
-            except Exception as e:
-                logger.error(
-                    f"Ошибка при отправке уведомления за 24 часа пользователю {tg_id}: {e}"
-                )
-                continue
-
-            await conn.execute(
-                "UPDATE keys SET notified_24h = TRUE WHERE client_id = $1",
-                record["client_id"],
-            )
-            logger.info(
-                f"Обновлено поле notified_24h для клиента {record['client_id']}."
-            )
-
-        await asyncio.sleep(1)
-
-
-async def notify_inactive_trial_users(bot: Bot, conn: asyncpg.Connection):
-    logger.info("Проверка пользователей, не активировавших пробный период...")
-
-    inactive_trial_users = await conn.fetch(
-        """
-        SELECT tg_id, username FROM users 
-        WHERE tg_id IN (
-            SELECT tg_id FROM connections 
-            WHERE trial = 0
-        ) AND tg_id NOT IN (
-            SELECT DISTINCT tg_id FROM keys
-        )
-        """
-    )
-    logger.info(f"Найдено {len(inactive_trial_users)} неактивных пользователей.")
-
-    for user in inactive_trial_users:
-        tg_id = user["tg_id"]
-        username = user.get("username", "Пользователь")
-
-        try:
-            can_notify = await check_notification_time(
-                tg_id, "inactive_trial", hours=24, session=conn
-            )
-
-            if can_notify and not await is_bot_blocked(bot, tg_id):
-                builder = InlineKeyboardBuilder()
-                builder.row(
-                    types.InlineKeyboardButton(
-                        text="🚀 Активировать пробный период",
-                        callback_data="create_key",
-                    )
-                )
-                builder.row(
-                    types.InlineKeyboardButton(
-                        text="👤 Личный кабинет", callback_data="profile"
-                    )
-                )
-                keyboard = builder.as_markup()
-
-                message = (
-                    f"👋 Привет, {username}!\n\n"
-                    f"🎉 У тебя есть бесплатный пробный период на {TRIAL_TIME} дней!\n"
-                    "🕒 Не упусти возможность попробовать наш VPN прямо сейчас.\n\n"
-                    "💡 Нажми на кнопку ниже, чтобы активировать пробный доступ."
-                )
-
-                await bot.send_message(tg_id, message, reply_markup=keyboard)
-                logger.info(f"Отправлено уведомление неактивному пользователю {tg_id}.")
-
-                await add_notification(tg_id, "inactive_trial", session=conn)
-
-        except Exception as e:
-            logger.error(
-                f"Ошибка при отправке уведомления неактивному пользователю {tg_id}: {e}"
-            )
-
-        await asyncio.sleep(1)
-
-
-async def handle_expired_keys(bot: Bot, conn: asyncpg.Connection, current_time: float):
-    logger.info("Проверка истекших ключей...")
-    expiring_keys = await conn.fetch(
-        """
-        SELECT tg_id, client_id, expiry_time, email FROM keys 
-        WHERE expiry_time <= $1
-        """,
-        current_time,
-    )
-    logger.info(f"current_time {current_time}")
-    logger.info(f"Найдено {len(expiring_keys)} истекающих ключей.")
-
-    await asyncio.gather(*[process_key(record, bot, conn) for record in expiring_keys])
-
-
-async def process_key(record, bot, conn):
-    tg_id = record["tg_id"]
-    client_id = record["client_id"]
-    email = record["email"]
-    balance = await get_balance(tg_id)
-    expiry_time = record["expiry_time"]
-    expiry_date = datetime.utcfromtimestamp(expiry_time / 1000)
-    current_date = datetime.utcnow()
-    time_left = expiry_date - current_date
-
-    logger.info(
-        f"Время истечения ключа: {expiry_time} (дата: {expiry_date}), Текущее время: {current_date}, Оставшееся время: {time_left}"
-    )
-    keyboard = types.InlineKeyboardMarkup(
-        inline_keyboard=[
-            [
-                types.InlineKeyboardButton(
-                    text="👤 Личный кабинет", callback_data="profile"
-                )
-            ]
-        ]
-    )
-
-    try:
-        if balance >= RENEWAL_PLANS["1"]["price"]:
-            await update_balance(tg_id, -RENEWAL_PLANS["1"]["price"])
-            new_expiry_time = int(
-                (datetime.utcnow() + timedelta(days=30)).timestamp() * 1000
-            )
-            await update_key_expiry(client_id, new_expiry_time)
-
-            servers = await get_servers_from_db()
-
-            for cluster_id in servers:
-                await renew_key_in_cluster(
-                    cluster_id, email, client_id, new_expiry_time, TOTAL_GB
-                )
-                logger.info(
-                    f"Ключ для пользователя {tg_id} успешно продлен в кластере {cluster_id}."
-                )
-
-            await conn.execute(
-                """
-                UPDATE keys
-                SET notified = FALSE, notified_24h = FALSE
-                WHERE client_id = $1
-                """,
-                client_id,
-            )
-            logger.info(
-                f"Флаги notified и notified_24 сброшены для клиента с ID {client_id}."
-            )
-            try:
-                await bot.send_message(tg_id, text=KEY_RENEWED, reply_markup=keyboard)
-                logger.info(
-                    f"Уведомление об успешном продлении отправлено клиенту {tg_id}."
-                )
-            except Exception as e:
-                logger.error(f"Ошибка при отправке уведомления клиенту {tg_id}: {e}")
-
-        else:
-            message_expired = "Ваша подписка истекла и была удалена. Получите новую через личный кабинет"
-
-            try:
-                await bot.send_message(
-                    tg_id, text=message_expired, reply_markup=keyboard
-                )
-                logger.info(
-                    f"Уведомление об истечении подписки и удалении ключа отправлено пользователю {tg_id}."
-                )
-            except Exception as e:
-                logger.error(
-                    f"Ошибка при отправке уведомления об истечении подписки пользователю {tg_id}: {e}"
-                )
-
-            servers = await get_servers_from_db()
-
-            for cluster_id in servers:
-                await delete_key_from_cluster(cluster_id, email, client_id)
-                logger.info(f"Клиент {client_id} удален из кластера {cluster_id}.")
-
-            await delete_key(client_id)
-            logger.info(f"Ключ для клиента с ID {client_id} удален из базы данных.")
-
-    except Exception as e:
-        logger.error(f"Ошибка при обработке ключа для клиента {tg_id}: {e}")
-
-
-async def check_online_users():
-    servers = await get_servers_from_db()
-
-    for cluster_id, cluster in servers.items():
-        for server_id, server in enumerate(cluster):
-            xui = AsyncApi(
-                server["api_url"], username=ADMIN_USERNAME, password=ADMIN_PASSWORD
-            )
-            await xui.login()
-            try:
-                online_users = len(await xui.client.online())
-                logger.info(
-                    f"Сервер '{server['server_name']}' доступен, текущее количество активных пользователей: {online_users}."
-                )
-            except Exception as e:
-                logger.error(
-                    f"Не удалось проверить пользователей на сервере {server_id}: {e}"
-                )

handlers/notifications/__init__.py

@@ -0,0 +1,10 @@
+__all__ = ("router",)
+
+from aiogram import Router
+
+from .general_notifications import router as general_notifications_router
+from .special_notifications import router as special_notifications_router
+
+router = Router(name="notifications_main_router")
+
+router.include_routers(general_notifications_router, special_notifications_router)

handlers/notifications/general_notifications.py

@@ -0,0 +1,391 @@
+import asyncio
+from datetime import datetime, timedelta
+
+import asyncpg
+import pytz
+from aiogram import Bot, Router
+
+from config import (
+    DATABASE_URL,
+    NOTIFICATION_TIME,
+    NOTIFY_DELETE_DELAY,
+    NOTIFY_DELETE_KEY,
+    NOTIFY_MAXPRICE,
+    NOTIFY_RENEW,
+    NOTIFY_RENEW_EXPIRED,
+    RENEWAL_PRICES,
+    TOTAL_GB,
+    TRIAL_TIME_DISABLE,
+)
+from database import (
+    add_notification,
+    check_notification_time,
+    delete_key,
+    get_all_keys,
+    get_balance,
+    get_last_notification_time,
+    update_balance,
+    update_key_expiry,
+)
+from handlers.keys.key_utils import delete_key_from_cluster, renew_key_in_cluster
+from handlers.texts import KEY_EXPIRY_10H, KEY_EXPIRY_24H, KEY_RENEWED
+from keyboards.notifications.notify_kb import build_notification_expired_kb, build_notification_kb
+from logger import logger
+
+from .notify_utils import send_notification
+from .special_notifications import notify_inactive_trial_users, notify_users_no_traffic
+
+router = Router()
+
+moscow_tz = pytz.timezone("Europe/Moscow")
+
+
+async def periodic_notifications(bot: Bot):
+    """
+    Обработчик, который:
+    1. Получает список всех ключей.
+    2. Отправляет уведомления пользователям о неактивном пробном периоде (если триал включен).
+    3. Отправляет уведомления об истекающих ключах (10h и 24h).
+    4. Проверяет истекшие ключи.
+    5. Проверяет пользователей с нулевым трафиком.
+    """
+    while True:
+        conn = None
+        try:
+            conn = await asyncpg.connect(DATABASE_URL)
+            current_time = int(datetime.now(moscow_tz).timestamp() * 1000)
+
+            threshold_time_10h = int((datetime.now(moscow_tz) + timedelta(hours=10)).timestamp() * 1000)
+            threshold_time_24h = int((datetime.now(moscow_tz) + timedelta(days=1)).timestamp() * 1000)
+
+            logger.info("Начало обработки уведомлений.")
+
+            try:
+                keys = await get_all_keys(session=conn)
+            except Exception as e:
+                logger.error(f"Ошибка при получении ключей: {e}")
+                keys = []
+
+            if not TRIAL_TIME_DISABLE:
+                await notify_inactive_trial_users(bot, conn)
+                await asyncio.sleep(0.5)
+
+            await notify_24h_keys(bot, conn, current_time, threshold_time_24h, keys)
+            await asyncio.sleep(1)
+            await notify_10h_keys(bot, conn, current_time, threshold_time_10h, keys)
+            await asyncio.sleep(1)
+            await handle_expired_keys(bot, conn, current_time, keys)
+            await asyncio.sleep(0.5)
+            await notify_users_no_traffic(bot, conn, current_time, keys)
+            await asyncio.sleep(0.5)
+
+        except Exception as e:
+            logger.error(f"❌ Ошибка в periodic_notifications: {e}")
+        finally:
+            if conn:
+                await conn.close()
+                logger.info("Соединение с базой данных закрыто.")
+
+        await asyncio.sleep(NOTIFICATION_TIME)
+
+
+async def notify_24h_keys(bot: Bot, conn: asyncpg.Connection, current_time: int, threshold_time_24h: int, keys: list):
+    logger.info("Начало проверки подписок, истекающих через 24 часа.")
+
+    expiring_keys = [
+        key for key in keys if key.get("expiry_time") and current_time < key.get("expiry_time") <= threshold_time_24h
+    ]
+    logger.info(f"Найдено {len(expiring_keys)} подписок, истекающих через 24 часа.")
+
+    for key in expiring_keys:
+        tg_id = key["tg_id"]
+        email = key.get("email", "")
+        expiry_timestamp = key.get("expiry_time")
+        notification_id = f"{email}_key_24h"
+
+        try:
+            can_notify = await check_notification_time(tg_id, notification_id, hours=24, session=conn)
+        except Exception as e:
+            logger.error(f"Ошибка проверки уведомления для пользователя {tg_id}: {e}")
+            continue
+
+        if not can_notify:
+            continue
+
+        hours_left = int((expiry_timestamp - current_time) / (1000 * 3600))
+        days_left_message = (
+            f"⏳ Осталось времени: {hours_left} часов" if hours_left > 0 else "⏳ Последний день подписки!"
+        )
+
+        expiry_datetime = datetime.fromtimestamp(expiry_timestamp / 1000, tz=moscow_tz)
+        formatted_expiry_date = expiry_datetime.strftime("%d %B %Y, %H:%M (МСК)")
+
+        notification_text = KEY_EXPIRY_24H.format(
+            email=email,
+            days_left_message=days_left_message,
+            formatted_expiry_date=formatted_expiry_date,
+        )
+
+        if NOTIFY_RENEW:
+            await process_auto_renew_or_notify(bot, conn, key, notification_id, 1, "notify_24h.jpg", notification_text)
+        else:
+            keyboard = build_notification_kb(email)
+            try:
+                await send_notification(bot, tg_id, "notify_24h.jpg", notification_text, keyboard)
+                logger.info(f"Отправлено уведомление об истечении подписки через 24 часа для пользователя {tg_id}.")
+                await add_notification(tg_id, notification_id, session=conn)
+            except Exception as e:
+                logger.error(f"Не удалось отправить уведомление пользователю {tg_id}: {e}")
+
+    logger.info("✅ Обработка всех уведомлений за 24 часа завершена.")
+    await asyncio.sleep(1)
+
+
+async def notify_10h_keys(bot: Bot, conn: asyncpg.Connection, current_time: int, threshold_time_10h: int, keys: list):
+    """
+    Отправляет уведомления пользователям о том, что их подписка истекает через 10 часов.
+    """
+    logger.info("Начало проверки подписок, истекающих через 10 часов.")
+
+    expiring_keys = [
+        key for key in keys if key.get("expiry_time") and current_time < key.get("expiry_time") <= threshold_time_10h
+    ]
+    logger.info(f"Найдено {len(expiring_keys)} подписок, истекающих через 10 часов.")
+
+    for key in expiring_keys:
+        tg_id = key["tg_id"]
+        email = key.get("email", "")
+        expiry_timestamp = key.get("expiry_time")
+        notification_id = f"{email}_key_10h"
+
+        try:
+            can_notify = await check_notification_time(tg_id, notification_id, hours=10, session=conn)
+        except Exception as e:
+            logger.error(f"Ошибка проверки уведомления для пользователя {tg_id}: {e}")
+            continue
+
+        if not can_notify:
+            continue
+
+        hours_left = int((expiry_timestamp - current_time) / (1000 * 3600))
+        hours_left_message = (
+            f"⏳ Осталось времени: {hours_left} часов" if hours_left > 0 else "⏳ Последний день подписки!"
+        )
+
+        expiry_datetime = datetime.fromtimestamp(expiry_timestamp / 1000, tz=moscow_tz)
+        formatted_expiry_date = expiry_datetime.strftime("%d %B %Y, %H:%M (МСК)")
+
+        notification_text = KEY_EXPIRY_10H.format(
+            email=email,
+            hours_left_message=hours_left_message,
+            formatted_expiry_date=formatted_expiry_date,
+        )
+
+        if NOTIFY_RENEW:
+            try:
+                await process_auto_renew_or_notify(
+                    bot, conn, key, notification_id, 1, "notify_10h.jpg", notification_text
+                )
+            except Exception as e:
+                logger.error(f"Ошибка авто-продления/уведомления для пользователя {tg_id}: {e}")
+        else:
+            keyboard = build_notification_kb(email)
+            try:
+                await send_notification(bot, tg_id, "notify_10h.jpg", notification_text, keyboard)
+                logger.info(f"Отправлено уведомление об истечении подписки через 10 часов для пользователя {tg_id}.")
+                await add_notification(tg_id, notification_id, session=conn)
+            except Exception as e:
+                logger.error(f"Не удалось отправить уведомление пользователю {tg_id}: {e}")
+
+    logger.info("✅ Обработка всех уведомлений за 10 часов завершена.")
+    await asyncio.sleep(1)
+
+
+async def handle_expired_keys(bot: Bot, conn: asyncpg.Connection, current_time: int, keys: list):
+    """
+    Обрабатывает истекшие ключи, проверяя продление или удаление.
+    """
+    logger.info("Начало обработки истекших ключей.")
+
+    expired_keys = [key for key in keys if key.get("expiry_time") and key.get("expiry_time") < current_time]
+    logger.info(f"Найдено {len(expired_keys)} истекших ключей.")
+
+    for key in expired_keys:
+        tg_id = key["tg_id"]
+        email = key.get("email", "")
+        client_id = key.get("client_id")
+        server_id = key.get("server_id")
+        notification_id = f"{email}_key_expired"
+
+        try:
+            last_notification_time = await get_last_notification_time(tg_id, notification_id, session=conn)
+        except Exception as e:
+            logger.error(f"Ошибка получения времени последнего уведомления для пользователя {tg_id}: {e}")
+            continue
+
+        if NOTIFY_RENEW_EXPIRED:
+            try:
+                balance = await get_balance(tg_id)
+            except Exception as e:
+                logger.error(f"Ошибка получения баланса для пользователя {tg_id}: {e}")
+                continue
+
+            renewal_period_months = 1
+            renewal_cost = RENEWAL_PRICES[str(renewal_period_months)]
+
+            if balance >= renewal_cost:
+                try:
+                    await process_auto_renew_or_notify(
+                        bot, conn, key, notification_id, 1, "notify_expired.jpg", "Ваш ключ продлён!"
+                    )
+                except Exception as e:
+                    logger.error(f"Ошибка авто-продления для пользователя {tg_id}: {e}")
+                continue
+
+        if NOTIFY_DELETE_KEY:
+            delete_immediately = NOTIFY_DELETE_DELAY == 0
+            delete_after_delay = False
+
+            if last_notification_time is not None:
+                delete_after_delay = (current_time - last_notification_time) / (1000 * 60) >= NOTIFY_DELETE_DELAY
+                logger.info(
+                    f"Прошло минут={(current_time - last_notification_time) / (1000 * 60):.2f} "
+                    f"NOTIFY_DELETE_DELAY={NOTIFY_DELETE_DELAY}"
+                )
+
+            if delete_immediately or delete_after_delay:
+                try:
+                    await delete_key_from_cluster(server_id, email, client_id)
+                    await delete_key(client_id, conn)
+                    logger.info(f"🗑 Ключ {client_id} для пользователя {tg_id} успешно удалён.")
+
+                    keyboard = build_notification_expired_kb()
+                    try:
+                        await send_notification(
+                            bot,
+                            tg_id,
+                            "notify_expired.jpg",
+                            (
+                                f"Ваша подписка {email} была удалена, так как вы не продлили её действие.\n\n"
+                                "Перейдите в личный кабинет и получите новую!"
+                            ),
+                            keyboard,
+                        )
+                        logger.info(f"📢 Отправлено уведомление об удалении подписки {email} пользователю {tg_id}.")
+                    except Exception as e:
+                        logger.error(f"Не удалось отправить уведомление об удалении пользователю {tg_id}: {e}")
+                except Exception as e:
+                    logger.error(f"❌ Ошибка удаления ключа {client_id} для пользователя {tg_id}: {e}")
+                continue
+
+        if last_notification_time is None:
+            keyboard = build_notification_kb(email)
+
+            if NOTIFY_DELETE_DELAY > 0:
+                hours = NOTIFY_DELETE_DELAY // 60
+                minutes = NOTIFY_DELETE_DELAY % 60
+
+                if hours > 0:
+                    if minutes > 0:
+                        delay_message = f"⚠️ Ваша подписка {email} истекла.\n\nЕсли вы не продлите её, она будет удалена через {hours} час{'а' if hours == 1 else 'ов'} и {minutes} минут."
+                    else:
+                        delay_message = f"⚠️ Ваша подписка {email} истекла.\n\nЕсли вы не продлите её, она будет удалена через {hours} час{'а' if hours == 1 else 'ов'}."
+                else:
+                    delay_message = f"⚠️ Ваша подписка {email} истекла.\n\nЕсли вы не продлите её, она будет удалена через {NOTIFY_DELETE_DELAY} минут."
+
+            else:
+                delay_message = f"⚠ Ваша подписка {email} истекла!\n\nПродлите доступ, чтобы возобновить услуги."
+
+            try:
+                await send_notification(
+                    bot,
+                    tg_id,
+                    "notify_expired.jpg",
+                    delay_message,
+                    keyboard,
+                )
+                await add_notification(tg_id, notification_id, session=conn)
+                logger.info(
+                    f"📢 Отправлено уведомление о необходимости продления подписки {email} пользователю {tg_id}."
+                )
+            except Exception as e:
+                logger.error(f"Не удалось отправить уведомление о продлении подписки пользователю {tg_id}: {e}")
+
+    logger.info("✅ Обработка истекших ключей завершена.")
+    await asyncio.sleep(1)
+
+
+async def process_auto_renew_or_notify(
+    bot, conn, key: dict, notification_id: str, renewal_period_months: int, standard_photo: str, standard_caption: str
+):
+    """
+    Если баланс пользователя позволяет, продлевает ключ на максимальный возможный срок и списывает средства;
+    иначе отправляет стандартное уведомление.
+    """
+    tg_id = key.get("tg_id")
+    email = key.get("email", "")
+    renew_notification_id = f"{email}_renew"
+
+    try:
+        can_renew = await check_notification_time(tg_id, renew_notification_id, hours=24, session=conn)
+        if not can_renew:
+            logger.info(
+                f"⏳ Подписка {email} уже продлевалась в течение последних 24 часов, повторное продление отменено."
+            )
+            return
+
+        balance = await get_balance(tg_id)
+
+    except Exception as e:
+        logger.error(f"Ошибка получения данных для пользователя {tg_id}: {e}")
+        return
+
+    if NOTIFY_MAXPRICE:
+        renewal_period_months = max(
+            (int(months) for months, price in RENEWAL_PRICES.items() if balance >= price), default=None
+        )
+    else:
+        renewal_period_months = 1 if balance >= RENEWAL_PRICES["1"] else None
+
+    if renewal_period_months:
+        renewal_period_months = int(renewal_period_months)
+        renewal_cost = RENEWAL_PRICES[str(renewal_period_months)]
+        client_id = key.get("client_id")
+        server_id = key.get("server_id")
+        current_expiry = key.get("expiry_time")
+        new_expiry_time = current_expiry + renewal_period_months * 30 * 24 * 3600 * 1000
+
+        formatted_expiry_date = datetime.fromtimestamp(new_expiry_time / 1000, moscow_tz).strftime("%d %B %Y, %H:%M")
+
+        logger.info(
+            f"[Автопродление] Продление подписки {email} на {renewal_period_months} мес. для пользователя {tg_id}. Баланс: {balance}, списываем: {renewal_cost}"
+        )
+
+        try:
+            await renew_key_in_cluster(server_id, email, client_id, new_expiry_time, TOTAL_GB)
+            await update_balance(tg_id, -renewal_cost, session=conn)
+            await update_key_expiry(client_id, new_expiry_time, conn)
+
+            await add_notification(tg_id, renew_notification_id, session=conn)
+
+            logger.info(
+                f"✅ Ключ {client_id} продлён на {renewal_period_months} мес. для пользователя {tg_id}. Списано {renewal_cost}."
+            )
+
+            renewed_message = KEY_RENEWED.format(
+                email=email, months=renewal_period_months, expiry_date=formatted_expiry_date
+            )
+
+            keyboard = build_notification_expired_kb()
+            await send_notification(bot, tg_id, "notify_expired.jpg", renewed_message, keyboard)
+
+        except KeyError as e:
+            logger.error(f"❌ Ошибка форматирования сообщения KEY_RENEWED: отсутствует ключ {e}")
+        except Exception as e:
+            logger.error(f"❌ Ошибка при продлении ключа {client_id} для пользователя {tg_id}: {e}")
+
+    else:
+        keyboard = build_notification_kb(email)
+        await send_notification(bot, tg_id, standard_photo, standard_caption, keyboard)
+        logger.info(f"📢 Отправлено уведомление об истекающей подписке {email} пользователю {tg_id}.")
+        await add_notification(tg_id, notification_id, session=conn)

handlers/notifications/notify_utils.py

@@ -0,0 +1,52 @@
+import os
+
+import aiofiles
+from aiogram import Bot, types
+from aiogram.exceptions import TelegramForbiddenError
+from aiogram.types import BufferedInputFile, InlineKeyboardMarkup
+
+from logger import logger
+
+
+async def send_notification(
+    bot: Bot,
+    tg_id: int,
+    image_filename: str,
+    caption: str,
+    keyboard: InlineKeyboardMarkup,
+):
+    """
+    Отправляет уведомление с изображением, если файл существует, иначе отправляет текстовое сообщение.
+    Если возникает TelegramForbiddenError (например, бот заблокирован пользователем),
+    функция логирует ошибку и прекращает попытки отправки уведомления.
+    """
+    photo_path = os.path.join("img", image_filename)
+    if os.path.isfile(photo_path):
+        try:
+            async with aiofiles.open(photo_path, "rb") as image_file:
+                image_data = await image_file.read()
+            buffered_photo = BufferedInputFile(image_data, filename=image_filename)
+            await bot.send_photo(tg_id, buffered_photo, caption=caption, reply_markup=keyboard)
+        except TelegramForbiddenError as e:
+            logger.error(f"Ошибка отправки фото для пользователя {tg_id}: {e}")
+            return
+        except Exception as e:
+            logger.error(f"Ошибка отправки фото для пользователя {tg_id}: {e}")
+            try:
+                await bot.send_message(tg_id, caption, reply_markup=keyboard)
+            except TelegramForbiddenError as e:
+                logger.error(f"Ошибка отправки fallback-сообщения для пользователя {tg_id}: {e}")
+                return
+            except Exception as e:
+                logger.error(f"Неизвестная ошибка при отправке fallback-сообщения для пользователя {tg_id}: {e}")
+                return
+    else:
+        logger.error(f"Файл с изображением не найден: {photo_path}")
+        try:
+            await bot.send_message(tg_id, caption, reply_markup=keyboard)
+        except TelegramForbiddenError as e:
+            logger.error(f"Ошибка отправки сообщения для пользователя {tg_id}: {e}")
+            return
+        except Exception as e:
+            logger.error(f"Неизвестная ошибка при отправке сообщения для пользователя {tg_id}: {e}")
+            return

handlers/notifications/special_notifications.py

@@ -0,0 +1,209 @@
+import asyncio
+from datetime import datetime, timedelta
+
+import asyncpg
+import pytz
+from aiogram import Bot, Router, types
+from aiogram.exceptions import TelegramForbiddenError
+from aiogram.utils.keyboard import InlineKeyboardBuilder
+
+from config import NOTIFY_EXTRA_DAYS, NOTIFY_INACTIVE, NOTIFY_INACTIVE_TRAFFIC, SUPPORT_CHAT_URL, TRIAL_TIME
+from database import (
+    add_notification,
+    check_notification_time,
+    create_blocked_user,
+)
+from handlers.keys.key_utils import get_user_traffic
+from logger import logger
+
+router = Router()
+
+moscow_tz = pytz.timezone("Europe/Moscow")
+
+
+async def notify_inactive_trial_users(bot: Bot, conn: asyncpg.Connection):
+    """
+    Проверяет пользователей, не активировавших пробный период, и отправляет им напоминания.
+    Первое уведомление — стандартное.
+    Если прошло 24 часа и триал не активирован, отправляется уведомление с бонусом +2 дня.
+    """
+    logger.info("Проверка пользователей, не активировавших пробный период...")
+
+    inactive_trial_users = await conn.fetch(
+        """
+        SELECT tg_id, username, first_name, last_name FROM users 
+        WHERE tg_id IN (
+            SELECT tg_id FROM connections 
+            WHERE trial IN (0, -1)
+        )
+        AND tg_id NOT IN (
+            SELECT tg_id FROM blocked_users
+        )
+        AND tg_id NOT IN (
+            SELECT DISTINCT tg_id FROM keys
+        )
+        """
+    )
+    logger.info(f"👥 Найдено {len(inactive_trial_users)} неактивных пользователей.")
+
+    for user in inactive_trial_users:
+        tg_id = user["tg_id"]
+        username = user["username"]
+        first_name = user["first_name"]
+        last_name = user["last_name"]
+        display_name = username or first_name or last_name or "Пользователь"
+
+        try:
+            can_notify = await check_notification_time(tg_id, "inactive_trial", hours=NOTIFY_INACTIVE, session=conn)
+
+            if can_notify:
+                builder = InlineKeyboardBuilder()
+                builder.row(
+                    types.InlineKeyboardButton(
+                        text="🚀 Активировать пробный период",
+                        callback_data="create_key",
+                    )
+                )
+                builder.row(types.InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile"))
+                keyboard = builder.as_markup()
+
+                trial_extended = await conn.fetchval(
+                    """
+                    SELECT EXISTS (
+                        SELECT 1 FROM notifications 
+                        WHERE tg_id = $1 AND notification_type = 'inactive_trial'
+                    )
+                    """,
+                    tg_id,
+                )
+
+                if trial_extended:
+                    message = (
+                        f"<b>{display_name}</b>, у нас для тебя подарок! 🎁\n\n"
+                        "<blockquote>"
+                        f"Мы добавили тебе +{NOTIFY_EXTRA_DAYS} дополнительных дня к пробному периоду!\n"
+                        f"Теперь у тебя есть еще шанс протестировать наш VPN целых {NOTIFY_EXTRA_DAYS + TRIAL_TIME} дня!\n"
+                        "</blockquote>"
+                        "Нажми на кнопку ниже, чтобы активировать доступ с бонусом +2 дня! 👇"
+                    )
+
+                    await conn.execute("UPDATE connections SET trial = -1 WHERE tg_id = $1", tg_id)
+                else:
+                    message = (
+                        f"👋 <b>Привет, {display_name}!</b>\n\n"
+                        "<blockquote>"
+                        f"🎉 У тебя есть бесплатный пробный период на {TRIAL_TIME} дней!\n"
+                        "Не упусти возможность попробовать наш VPN прямо сейчас.\n"
+                        "</blockquote>"
+                        "Нажми на кнопку ниже, чтобы активировать пробный доступ! 👇"
+                    )
+
+                try:
+                    await bot.send_message(tg_id, message, reply_markup=keyboard)
+                    logger.info(f"📩 Отправлено уведомление неактивному пользователю {tg_id}.")
+                    await add_notification(tg_id, "inactive_trial", session=conn)
+
+                except TelegramForbiddenError:
+                    logger.warning(f"🚫 Бот заблокирован пользователем {tg_id}. Добавляем в blocked_users.")
+                    await create_blocked_user(tg_id, conn)
+                except Exception as e:
+                    logger.error(f"⚠ Ошибка при отправке уведомления пользователю {tg_id}: {e}")
+
+        except Exception as e:
+            logger.error(f"⚠ Ошибка при обработке пользователя {tg_id}: {e}")
+
+        await asyncio.sleep(1)
+
+    logger.info("✅ Проверка пользователей с неактивным пробным периодом завершена.")
+
+
+async def notify_users_no_traffic(bot: Bot, conn: asyncpg.Connection, current_time: int, keys: list):
+    """
+    Проверяет трафик пользователей, у которых ещё не отправлялось уведомление о нулевом трафике.
+    Если трафик 0 ГБ и прошло более 2 часов с момента создания ключа, отправляет уведомление,
+    но исключает пользователей, у которых подписка недавно продлилась.
+    """
+    logger.info("Проверка пользователей с нулевым трафиком...")
+
+    current_dt = datetime.fromtimestamp(current_time / 1000, tz=moscow_tz)
+
+    for key in keys:
+        tg_id = key.get("tg_id")
+        email = key.get("email")
+        created_at = key.get("created_at")
+        client_id = key.get("client_id")
+        expiry_time = key.get("expiry_time")
+        notified = key.get("notified")
+
+        if created_at is None:
+            logger.warning(f"Для {email} нет значения created_at. Пропускаем.")
+            continue
+
+        if notified is True:
+            continue
+
+        created_at_dt = pytz.utc.localize(datetime.fromtimestamp(created_at / 1000)).astimezone(moscow_tz)
+        created_at_plus_2 = created_at_dt + timedelta(hours=NOTIFY_INACTIVE_TRAFFIC)
+
+        if expiry_time:
+            expiry_dt = pytz.utc.localize(datetime.fromtimestamp(expiry_time / 1000)).astimezone(moscow_tz)
+            renewal_threshold = expiry_dt - timedelta(days=30)
+            renewal_recent = current_dt - renewal_threshold < timedelta(hours=NOTIFY_INACTIVE_TRAFFIC)
+
+            if renewal_recent:
+                continue
+
+        if current_dt < created_at_plus_2:
+            continue
+
+        try:
+            traffic_data = await get_user_traffic(conn, tg_id, email)
+        except Exception as e:
+            logger.error(f"Ошибка получения трафика для {email}: {e}")
+            continue
+
+        if traffic_data.get("status") != "success":
+            logger.warning(f"⚠ Ошибка при получении трафика для {email}: {traffic_data.get('message')}")
+            continue
+
+        total_traffic = sum(
+            value if isinstance(value, (int, float)) else 0 for value in traffic_data.get("traffic", {}).values()
+        )
+        logger.info(f"Ключ для {email}: общий трафик: {total_traffic} ГБ")
+
+        if total_traffic == 0:
+            logger.info(f"⚠ У пользователя {tg_id} ({email}) 0 ГБ трафика. Отправляем уведомление.")
+
+            builder = InlineKeyboardBuilder()
+            builder.row(types.InlineKeyboardButton(text="🔧 Написать в поддержку", url=SUPPORT_CHAT_URL))
+            builder.row(types.InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile"))
+            keyboard = builder.as_markup()
+
+            message = (
+                f"⚠ <b>Ваша VPN-подписка {email} активна, но трафик не используется.</b>\n\n"
+                "<blockquote>Если у вас возникли сложности с подключением, "
+                "нажмите кнопку ниже, чтобы связаться с поддержкой.</blockquote>\n\n"
+                "🛠 Мы поможем вам разобраться! 💡"
+            )
+
+            try:
+                await bot.send_message(tg_id, message, reply_markup=keyboard)
+                logger.info(f"📩 Отправлено уведомление пользователю {tg_id} о нулевом трафике.")
+                await conn.execute(
+                    "UPDATE keys SET notified = TRUE WHERE tg_id = $1 AND client_id = $2", tg_id, client_id
+                )
+            except TelegramForbiddenError:
+                logger.warning(f"🚫 Бот заблокирован пользователем {tg_id}.")
+                await create_blocked_user(tg_id, conn)
+            except Exception as e:
+                logger.error(f"⚠ Ошибка при отправке уведомления пользователю {tg_id}: {e}")
+        else:
+            try:
+                await conn.execute(
+                    "UPDATE keys SET notified = TRUE WHERE tg_id = $1 AND client_id = $2", tg_id, client_id
+                )
+                logger.info(f"Ключ для {email} имеет трафик. Обновлено notified = TRUE.")
+            except Exception as e:
+                logger.error(f"Ошибка обновления notified для пользователя {tg_id}: {e}")
+
+    logger.info("✅ Обработка пользователей с нулевым трафиком завершена.")

handlers/pay.py

@@ -5,13 +5,14 @@ from aiogram.utils.keyboard import InlineKeyboardBuilder
 from config import (
     CRYPTO_BOT_ENABLE,
     DONATIONS_ENABLE,
-    FREEKASSA_ENABLE,
     ROBOKASSA_ENABLE,
     STARS_ENABLE,
     YOOKASSA_ENABLE,
     YOOMONEY_ENABLE,
 )
 
+from .utils import edit_or_send_message
+
 router = Router()
 
 
@@ -33,13 +34,6 @@ async def handle_pay(callback_query: CallbackQuery):
                 callback_data="pay_yoomoney",
             )
         )
-    if FREEKASSA_ENABLE:
-        builder.row(
-            InlineKeyboardButton(
-                text="🌐 FreeKassa: множество способов",
-                callback_data="pay_freekassa",
-            )
-        )
     if CRYPTO_BOT_ENABLE:
         builder.row(
             InlineKeyboardButton(
@@ -65,13 +59,21 @@ async def handle_pay(callback_query: CallbackQuery):
     builder.row(InlineKeyboardButton(text="🎟️ Активировать купон", callback_data="activate_coupon"))
     if DONATIONS_ENABLE:
         builder.row(InlineKeyboardButton(text="💰 Поддержать проект", callback_data="donate"))
-
     builder.row(InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile"))
 
-    await callback_query.message.answer(
-        "💸 <b>Выберите удобный способ пополнения баланса:</b>\n\n"
+    payment_text = (
+        "💸 <b>Выберите удобный способ пополнения баланса:</b>\n"
+        "<blockquote>"
         "• Быстро и безопасно\n"
         "• Поддержка разных платежных систем\n"
-        "• Моментальное зачисление средств 🚀",
-        reply_markup=builder.as_markup(),
+        "• Моментальное зачисление средств 🚀\n"
+        "</blockquote>"
+    )
+
+    await edit_or_send_message(
+        target_message=callback_query.message,
+        text=payment_text,
+        reply_markup=builder.as_markup(),
+        media_path=None,
+        disable_web_page_preview=False,
     )

handlers/payments/__init__.py

@@ -1,10 +1,8 @@
 __all__ = ("router",)
 
 from aiogram import Router
-
 from config import (
     CRYPTO_BOT_ENABLE,
-    FREEKASSA_ENABLE,
     ROBOKASSA_ENABLE,
     STARS_ENABLE,
     YOOKASSA_ENABLE,

handlers/payments/robokassa_pay.py

@@ -1,30 +1,34 @@
 import hashlib
 from typing import Any
 
+import asyncpg
 from aiogram import F, Router, types
 from aiogram.fsm.context import FSMContext
 from aiogram.fsm.state import State, StatesGroup
 from aiogram.types import InlineKeyboardButton, InlineKeyboardMarkup
 from aiogram.utils.keyboard import InlineKeyboardBuilder
 from aiohttp import web
-from robokassa import HashAlgorithm, Robokassa
-
 from config import (
+    DATABASE_URL,
     ROBOKASSA_ENABLE,
     ROBOKASSA_LOGIN,
     ROBOKASSA_PASSWORD1,
     ROBOKASSA_PASSWORD2,
     ROBOKASSA_TEST_MODE,
 )
+from robokassa import HashAlgorithm, Robokassa
+
 from database import (
     add_connection,
     add_payment,
     check_connection_exists,
     get_key_count,
+    get_temporary_data,
     update_balance,
 )
 from handlers.payments.utils import send_payment_success_notification
 from handlers.texts import PAYMENT_OPTIONS
+from handlers.utils import edit_or_send_message
 from logger import logger
 
 router = Router()
@@ -49,9 +53,7 @@ if ROBOKASSA_ENABLE:
 
 def generate_payment_link(amount, inv_id, description, tg_id):
     """Генерация ссылки на оплату."""
-    logger.debug(
-        f"Generating payment link for amount: {amount}, inv_id: {inv_id}, description: {description}"
-    )
+    logger.debug(f"Generating payment link for amount: {amount}, inv_id: {inv_id}, description: {description}")
     payment_link = robokassa._payment.link.generate_by_script(
         out_sum=amount,
         inv_id=inv_id,
@@ -63,9 +65,7 @@ def generate_payment_link(amount, inv_id, description, tg_id):
 
 
 @router.callback_query(F.data == "pay_robokassa")
-async def process_callback_pay_robokassa(
-    callback_query: types.CallbackQuery, state: FSMContext, session: Any
-):
+async def process_callback_pay_robokassa(callback_query: types.CallbackQuery, state: FSMContext, session: Any):
     tg_id = callback_query.message.chat.id
     logger.info(f"User {tg_id} initiated Robokassa payment.")
 
@@ -89,12 +89,6 @@ async def process_callback_pay_robokassa(
                     callback_data=f'robokassa_amount|{PAYMENT_OPTIONS[i]["callback_data"]}',
                 )
             )
-    builder.row(
-        InlineKeyboardButton(
-            text="💰 Ввести свою сумму",
-            callback_data="enter_custom_amount_robokassa",
-        )
-    )
     builder.row(InlineKeyboardButton(text="⬅️ Назад", callback_data="pay"))
 
     key_count = await get_key_count(tg_id)
@@ -105,24 +99,30 @@ async def process_callback_pay_robokassa(
             await add_connection(tg_id, balance=0.0, trial=0, session=session)
             logger.info(f"Created new connection for user {tg_id} with balance 0.0.")
 
-    await callback_query.message.answer(
+    await callback_query.message.delete()
+    
+    new_message = await callback_query.message.answer(
         text="Выберите сумму пополнения:",
         reply_markup=builder.as_markup(),
     )
+    await state.update_data(message_id=new_message.message_id, chat_id=new_message.chat.id) 
     await state.set_state(ReplenishBalanceState.choosing_amount_robokassa)
     logger.info(f"Displayed amount selection for user {tg_id}.")
 
 
 @router.callback_query(F.data.startswith("robokassa_amount|"))
-async def process_amount_selection(
-    callback_query: types.CallbackQuery, state: FSMContext
-):
+async def process_amount_selection(callback_query: types.CallbackQuery, state: FSMContext):
     logger.info(f"Получены данные callback_data: {callback_query.data}")
 
     data = callback_query.data.split("|")
     if len(data) != 3 or data[1] != "amount":
         logger.error("Ошибка: callback_data не соответствует формату.")
-        await callback_query.message.answer("Ошибка: данные повреждены.")
+        await edit_or_send_message(
+            target_message=callback_query.message,
+            text="Ошибка: данные повреждены.",
+            reply_markup=types.InlineKeyboardMarkup(),
+            force_text=True,
+        )
         return
 
     amount_str = data[2]
@@ -132,7 +132,12 @@ async def process_amount_selection(
             raise ValueError("Сумма должна быть положительным числом.")
     except ValueError as e:
         logger.error(f"Некорректное значение суммы: {amount_str}. Ошибка: {e}")
-        await callback_query.message.answer("Некорректная сумма.")
+        await edit_or_send_message(
+            target_message=callback_query.message,
+            text="Некорректная сумма.",
+            reply_markup=types.InlineKeyboardMarkup(),
+            force_text=True,
+        )
         return
 
     await state.update_data(amount=amount)
@@ -151,9 +156,11 @@ async def process_amount_selection(
         ]
     )
 
-    await callback_query.message.answer(
+    await edit_or_send_message(
+        target_message=callback_query.message,
         text=f"Вы выбрали пополнение на {amount} рублей. Для оплаты перейдите по ссылке ниже:",
         reply_markup=confirm_keyboard,
+        force_text=True,
     )
     logger.info(f"Payment link sent to user {callback_query.message.chat.id}.")
 
@@ -170,9 +177,7 @@ async def robokassa_webhook(request):
         shp_id = params.get("shp_id")
         signature_value = params.get("SignatureValue")
 
-        logger.info(
-            f"OutSum: {amount}, InvId: {inv_id}, shp_id: {shp_id}, SignatureValue: {signature_value}"
-        )
+        logger.info(f"OutSum: {amount}, InvId: {inv_id}, shp_id: {shp_id}, SignatureValue: {signature_value}")
 
         if not check_payment_signature(params):
             logger.error("Неверная подпись или данные запроса.")
@@ -211,9 +216,7 @@ def check_payment_signature(params):
 
     logger.info(f"Signature string before hashing: {signature_string}")
 
-    expected_signature = (
-        hashlib.md5(signature_string.encode("utf-8")).hexdigest().upper()
-    )
+    expected_signature = hashlib.md5(signature_string.encode("utf-8")).hexdigest().upper()
 
     logger.info(f"Expected signature: {expected_signature}")
     logger.info(f"Received signature: {signature_value}")
@@ -222,56 +225,93 @@ def check_payment_signature(params):
 
 
 @router.callback_query(F.data == "enter_custom_amount_robokassa")
-async def process_custom_amount_selection(
-    callback_query: types.CallbackQuery, state: FSMContext
-):
+async def process_custom_amount_selection(callback_query: types.CallbackQuery, state: FSMContext):
     tg_id = callback_query.message.chat.id
     logger.info(f"User {tg_id} chose to enter a custom amount.")
 
     builder = InlineKeyboardBuilder()
     builder.row(InlineKeyboardButton(text="🔙 Назад", callback_data="pay_robokassa"))
 
-    await callback_query.message.answer(
-        "Пожалуйста, введите сумму пополнения.",
+    await edit_or_send_message(
+        target_message=callback_query.message,
+        text="Пожалуйста, введите сумму пополнения.",
         reply_markup=builder.as_markup(),
+        force_text=True,
     )
 
-    await state.set_state(
-        ReplenishBalanceState.waiting_for_payment_confirmation_robokassa
-    )
+    await state.set_state(ReplenishBalanceState.waiting_for_payment_confirmation_robokassa)
 
 
 @router.message(ReplenishBalanceState.waiting_for_payment_confirmation_robokassa)
-async def handle_custom_amount_input(message: types.Message, state: FSMContext):
-    tg_id = message.chat.id
-    logger.info(f"User {tg_id} entered custom amount: {message.text}")
+async def handle_custom_amount_input(
+    message: types.Message | types.CallbackQuery, state: FSMContext = None, session: Any = None
+):
+    if isinstance(message, types.CallbackQuery):
+        tg_id = message.message.chat.id
+        target_message = message.message
+    else:
+        tg_id = message.chat.id
+        target_message = message
+
+    logger.info(f"User {tg_id} initiated payment through ROBOKASSA")
     inv_id = 0
 
     try:
-        amount = int(message.text)
-        if amount <= 0:
-            raise ValueError("Сумма должна быть положительным числом.")
+        conn = await asyncpg.connect(DATABASE_URL)
+        user_data = await get_temporary_data(conn, tg_id)
+        await conn.close()
 
-        await state.update_data(amount=amount)
+        if not user_data:
+            await edit_or_send_message(
+                target_message=target_message,
+                text="Данные для оплаты не найдены. Попробуйте снова.",
+                reply_markup=types.InlineKeyboardMarkup(),
+            )
+            return
+
+        state_type = user_data["state"]
+        amount = user_data["data"].get("required_amount", 0)
+
+        if amount <= 0:
+            await edit_or_send_message(
+                target_message=target_message,
+                text="Недостаточная сумма для пополнения.",
+                reply_markup=types.InlineKeyboardMarkup(),
+            )
+            return
 
         payment_url = generate_payment_link(amount, inv_id, "Пополнение баланса", tg_id)
-
         logger.info(f"Generated payment link for user {tg_id}: {payment_url}")
 
-        confirm_keyboard = InlineKeyboardMarkup(
-            inline_keyboard=[
-                [InlineKeyboardButton(text="Оплатить", url=payment_url)],
-                [InlineKeyboardButton(text="⬅️ Назад", callback_data="pay_robokassa")],
-            ]
-        )
+        builder = InlineKeyboardBuilder()
+        builder.row(InlineKeyboardButton(text="💳 Оплатить", url=payment_url))
+        builder.row(InlineKeyboardButton(text="⬅️ Назад", callback_data="pay_robokassa"))
 
-        await message.answer(
-            text=f"Вы выбрали пополнение на {amount} рублей. Для оплаты перейдите по ссылке ниже:",
-            reply_markup=confirm_keyboard,
-        )
-        await state.clear()
-    except ValueError as e:
-        logger.error(f"Некорректная сумма от пользователя {tg_id}: {e}")
-        await message.answer(
-            text="Введите корректную сумму в рублях (целое положительное число)."
+        if state_type == "waiting_for_payment":
+            message_text = (
+                f"Вы выбрали пополнение на {amount} рублей для создания нового ключа. Перейдите по ссылке для оплаты:"
+            )
+        elif state_type == "waiting_for_renewal_payment":
+            message_text = (
+                f"Вы выбрали пополнение на {amount} рублей для продления ключа. Перейдите по ссылке для оплаты:"
+            )
+        else:
+            await edit_or_send_message(
+                target_message=target_message,
+                text="Некорректное состояние данных. Попробуйте снова.",
+                reply_markup=types.InlineKeyboardMarkup(),
+            )
+            return
+
+        await edit_or_send_message(target_message=target_message, text=message_text, reply_markup=builder.as_markup())
+
+        if isinstance(state, FSMContext):
+            await state.clear()
+
+    except Exception as e:
+        logger.error(f"Ошибка при создании платежа для пользователя {tg_id}: {e}")
+        await edit_or_send_message(
+            target_message=target_message,
+            text="Произошла ошибка при создании платежа. Попробуйте позже.",
+            reply_markup=types.InlineKeyboardMarkup(),
         )

handlers/profile.py

@@ -1,14 +1,48 @@
 import os
+from typing import Any
 
-from aiogram import F, Router, types
+import asyncpg
+from aiogram import F, Router
+from aiogram.enums import ParseMode
 from aiogram.fsm.context import FSMContext
-from aiogram.types import BufferedInputFile, InlineKeyboardButton
+from aiogram.types import (
+    CallbackQuery,
+    InlineKeyboardButton,
+    InlineQuery,
+    InlineQueryResultArticle,
+    InputTextMessageContent,
+    Message,
+)
 from aiogram.utils.keyboard import InlineKeyboardBuilder
 
-from config import NEWS_MESSAGE, RENEWAL_PLANS
-from database import get_balance, get_key_count, get_referral_stats
-from handlers.buttons.profile import ADD_SUB, GIFTS, INSTRUCTIONS, INVITE, MAIN_MENU, MY_SUBS, PAYMENT, TARRIFS
+from config import (
+    DATABASE_URL,
+    INLINE_MODE,
+    INSTRUCTIONS_BUTTON,
+    NEWS_MESSAGE,
+    REFERRAL_OFFERS,
+    RENEWAL_PLANS,
+    TRIAL_TIME,
+    USERNAME_BOT,
+)
+from database import get_balance, get_key_count, get_last_payments, get_referral_stats, get_trial
+from handlers.buttons.profile import (
+    ADD_SUB,
+    BALANCE,
+    BALANCE_HISTORY,
+    GIFTS,
+    INSTRUCTIONS,
+    INVITE,
+    MAIN_MENU,
+    MY_SUBS,
+    PAYMENT,
+)
 from handlers.texts import get_referral_link, invite_message_send, profile_message_send
+from keyboards.admin.panel_kb import AdminPanelCallback
+from logger import logger
+import html
+
+from .utils import edit_or_send_message
 
 router = Router()
 
@@ -16,91 +50,132 @@ router = Router()
 @router.callback_query(F.data == "profile")
 @router.message(F.text == "/profile")
 async def process_callback_view_profile(
-    callback_query_or_message: types.Message | types.CallbackQuery, state: FSMContext, admin: bool
+    callback_query_or_message: Message | CallbackQuery,
+    state: FSMContext,
+    admin: bool,
 ):
-    if isinstance(callback_query_or_message, types.CallbackQuery):
+    if isinstance(callback_query_or_message, CallbackQuery):
         chat_id = callback_query_or_message.message.chat.id
-        username = callback_query_or_message.from_user.full_name
-        is_callback = True
-    elif isinstance(callback_query_or_message, types.Message):
+        username = html.escape(callback_query_or_message.from_user.full_name)  
+        target_message = callback_query_or_message.message
+    else:
         chat_id = callback_query_or_message.chat.id
-        username = callback_query_or_message.from_user.full_name
-        is_callback = False
+        username = html.escape(callback_query_or_message.from_user.full_name)
+        target_message = callback_query_or_message
+
+    image_path = os.path.join("img", "profile.jpg")
+    logger.info(f"Переход в профиль. Используется изображение: {image_path}")
 
-    image_path = os.path.join("img", "pic.jpg")
     key_count = await get_key_count(chat_id)
-    balance = await get_balance(chat_id)
-    if balance is None:
-        balance = 0
+    balance = await get_balance(chat_id) or 0
 
-    profile_message = profile_message_send(username, chat_id, int(balance), key_count)
+    conn = await asyncpg.connect(DATABASE_URL)
+    try:
+        trial_status = await get_trial(chat_id, conn)
 
-    if key_count == 0:
-        profile_message += "\n<pre>🔧 <i>Нажмите кнопку ➕ Устройство, чтобы настроить VPN-подключение</i></pre>"
-    else:
-        profile_message += f"\n<pre> <i>{NEWS_MESSAGE}</i></pre>"
-
-    builder = InlineKeyboardBuilder()
-    builder.row(
-        InlineKeyboardButton(text=ADD_SUB, callback_data="create_key"),
-        InlineKeyboardButton(text=MY_SUBS, callback_data="view_keys"),
-    )
-    builder.row(
-        InlineKeyboardButton(
-            text=PAYMENT,
-            callback_data="pay",
-        )
-    )
-    builder.row()
-    builder.row(
-        InlineKeyboardButton(text=INVITE, callback_data="invite"),
-        InlineKeyboardButton(text=GIFTS, callback_data="gifts"),
-    )
-    builder.row(
-        InlineKeyboardButton(text=TARRIFS, callback_data="view_tariffs"),
-        InlineKeyboardButton(text=INSTRUCTIONS, callback_data="instructions"),
-    )
-    if admin:
-        builder.row(
-            InlineKeyboardButton(text="🔧 Администратор", callback_data="admin")
-        )
-    builder.row(InlineKeyboardButton(text=MAIN_MENU, callback_data="start"))
-
-    if os.path.isfile(image_path):
-        with open(image_path, "rb") as image_file:
-            if is_callback:
-                await callback_query_or_message.message.answer_photo(
-                    photo=BufferedInputFile(image_file.read(), filename="pic.jpg"),
-                    caption=profile_message,
-                    reply_markup=builder.as_markup(),
-                )
-            else:
-                await callback_query_or_message.answer_photo(
-                    photo=BufferedInputFile(image_file.read(), filename="pic.jpg"),
-                    caption=profile_message,
-                    reply_markup=builder.as_markup(),
-                )
-    else:
-        if is_callback:
-            await callback_query_or_message.message.answer(
-                text=profile_message,
-                reply_markup=builder.as_markup(),
+        profile_message = profile_message_send(username, chat_id, int(balance), key_count)
+        if key_count == 0:
+            profile_message += (
+                "\n<blockquote>🔧 <i>Нажмите кнопку ➕ Подписка, чтобы настроить VPN-подключение</i></blockquote>"
             )
         else:
-            await callback_query_or_message.answer(
-                text=profile_message,
-                reply_markup=builder.as_markup(),
+            profile_message += f"\n<blockquote> <i>{NEWS_MESSAGE}</i></blockquote>"
+
+        builder = InlineKeyboardBuilder()
+        if trial_status == 0 or key_count == 0:
+            builder.row(InlineKeyboardButton(text=ADD_SUB, callback_data="create_key"))
+        else:
+            builder.row(InlineKeyboardButton(text=MY_SUBS, callback_data="view_keys"))
+        builder.row(InlineKeyboardButton(text=BALANCE, callback_data="balance"))
+        builder.row(
+            InlineKeyboardButton(text=INVITE, callback_data="invite"),
+            InlineKeyboardButton(text=GIFTS, callback_data="gifts"),
+        )
+        if INSTRUCTIONS_BUTTON:
+            builder.row(InlineKeyboardButton(text=INSTRUCTIONS, callback_data="instructions"))
+        if admin:
+            builder.row(
+                InlineKeyboardButton(text="🔧 Администратор", callback_data=AdminPanelCallback(action="admin").pack())
             )
 
+        builder.row(InlineKeyboardButton(text=MAIN_MENU, callback_data="start"))
+
+        await edit_or_send_message(
+            target_message=target_message,
+            text=profile_message,
+            reply_markup=builder.as_markup(),
+            media_path=image_path,
+            disable_web_page_preview=False,
+            force_text=True,
+        )
+    finally:
+        await conn.close()
 
 
+@router.callback_query(F.data == "balance")
+async def balance_handler(callback_query: CallbackQuery, session: Any):
+    result = await session.fetchrow(
+        "SELECT balance FROM connections WHERE tg_id = $1",
+        callback_query.from_user.id,
+    )
+    balance = result["balance"] if result else 0.0
+    balance = int(balance)
+
+    builder = InlineKeyboardBuilder()
+    builder.row(InlineKeyboardButton(text=PAYMENT, callback_data="pay"))
+    builder.row(InlineKeyboardButton(text=BALANCE_HISTORY, callback_data="balance_history"))
+    builder.row(InlineKeyboardButton(text=MAIN_MENU, callback_data="profile"))
+
+    text = f"<b>Управление вашим балансом 💰</b>\n\nВаш баланс: {balance}"
+    await edit_or_send_message(
+        target_message=callback_query.message,
+        text=text,
+        reply_markup=builder.as_markup(),
+        media_path=None,
+        disable_web_page_preview=False,
+    )
+
+
+@router.callback_query(F.data == "balance_history")
+async def balance_history_handler(callback_query: CallbackQuery, session: Any):
+    builder = InlineKeyboardBuilder()
+    builder.row(InlineKeyboardButton(text=PAYMENT, callback_data="pay"))
+    builder.row(InlineKeyboardButton(text=MAIN_MENU, callback_data="profile"))
+
+    records = await get_last_payments(callback_query.from_user.id, session)
+
+    if records:
+        history_text = "📊 <b>Последние 3 операции с балансом:</b>\n\n"
+        for record in records:
+            amount = record["amount"]
+            payment_system = record["payment_system"]
+            status = record["status"]
+            date = record["created_at"].strftime("%Y-%m-%d %H:%M:%S")
+            history_text += (
+                f"<b>Сумма:</b> {amount}₽\n"
+                f"<b>Способ оплаты:</b> {payment_system}\n"
+                f"<b>Статус:</b> {status}\n"
+                f"<b>Дата:</b> {date}\n\n"
+            )
+    else:
+        history_text = "❌ У вас пока нет операций с балансом."
+
+    await edit_or_send_message(
+        target_message=callback_query.message,
+        text=history_text,
+        reply_markup=builder.as_markup(),
+        media_path=None,
+        disable_web_page_preview=False,
+    )
+
+
+@router.message(F.text == "/tariffs")
 @router.callback_query(F.data == "view_tariffs")
-async def view_tariffs_handler(callback_query: types.CallbackQuery):
+async def view_tariffs_handler(callback_query: CallbackQuery):
     builder = InlineKeyboardBuilder()
     builder.row(InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile"))
 
     image_path = os.path.join("img", "tariffs.jpg")
-
     tariffs_message = "<b>🚀 Доступные тарифы VPN:</b>\n\n" + "\n".join(
         [
             f"{months} {'месяц' if months == '1' else 'месяца' if int(months) in [2, 3, 4] else 'месяцев'}: "
@@ -110,42 +185,70 @@ async def view_tariffs_handler(callback_query: types.CallbackQuery):
         ]
     )
 
-    if os.path.isfile(image_path):
-        with open(image_path, "rb") as image_file:
-            await callback_query.message.answer_photo(
-                photo=BufferedInputFile(image_file.read(), filename="tariffs.jpg"),
-                caption=tariffs_message,
-                reply_markup=builder.as_markup(),
-            )
-    else:
-        await callback_query.message.answer(
-            text=tariffs_message,
-            reply_markup=builder.as_markup(),
-        )
+    await edit_or_send_message(
+        target_message=callback_query.message,
+        text=tariffs_message,
+        reply_markup=builder.as_markup(),
+        media_path=image_path,
+        disable_web_page_preview=False,
+    )
 
 
 @router.callback_query(F.data == "invite")
-async def invite_handler(callback_query: types.CallbackQuery):
-    chat_id = callback_query.message.chat.id
+@router.message(F.text == "/invite")
+async def invite_handler(callback_query_or_message: Message | CallbackQuery):
+    chat_id = None
+    if isinstance(callback_query_or_message, CallbackQuery):
+        chat_id = callback_query_or_message.message.chat.id
+        target_message = callback_query_or_message.message
+    else:
+        chat_id = callback_query_or_message.chat.id
+        target_message = callback_query_or_message
+
     referral_link = get_referral_link(chat_id)
-
     referral_stats = await get_referral_stats(chat_id)
-
     invite_message = invite_message_send(referral_link, referral_stats)
-
     image_path = os.path.join("img", "pic_invite.jpg")
 
     builder = InlineKeyboardBuilder()
-    builder.row(InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile"))
-    if os.path.isfile(image_path):
-        with open(image_path, "rb") as image_file:
-            await callback_query.message.answer_photo(
-                photo=BufferedInputFile(image_file.read(), filename="pic_invite.jpg"),
-                caption=invite_message,
+    if INLINE_MODE:
+        builder.button(text="👥 Пригласить друга", switch_inline_query="invite")
+    else:
+        invite_text = f"\nПриглашаю тебя пользоваться действительно быстрым VPN вместе:\n\n{referral_link}"
+        builder.button(text="👥 Пригласить друга", switch_inline_query=invite_text)
+    builder.button(text="👤 Личный кабинет", callback_data="profile")
+    builder.adjust(1)
+
+    await edit_or_send_message(
+        target_message=target_message,
+        text=invite_message,
+        reply_markup=builder.as_markup(),
+        media_path=image_path,
+        disable_web_page_preview=False,
+    )
+
+
+@router.inline_query(F.query.in_(["referral", "ref", "invite"]))
+async def inline_referral_handler(inline_query: InlineQuery):
+    referral_link = f"https://t.me/{USERNAME_BOT}?start=referral_{inline_query.from_user.id}"
+
+    results: list[InlineQueryResultArticle] = []
+
+    for index, offer in enumerate(REFERRAL_OFFERS):
+        description = offer["description"][:64]
+        message_text = offer["message"].format(trial_time=TRIAL_TIME)[:4096]
+
+        builder = InlineKeyboardBuilder()
+        builder.row(InlineKeyboardButton(text=offer["title"], url=referral_link))
+
+        results.append(
+            InlineQueryResultArticle(
+                id=str(index),
+                title=offer["title"],
+                description=description,
+                input_message_content=InputTextMessageContent(message_text=message_text, parse_mode=ParseMode.HTML),
                 reply_markup=builder.as_markup(),
             )
-    else:
-        await callback_query.message.answer(
-            text=invite_message,
-            reply_markup=builder.as_markup(),
         )
+
+    await inline_query.answer(results=results, cache_time=86400, is_personal=True)

handlers/start.py

@@ -5,65 +5,177 @@ from aiogram import F, Router
 from aiogram.filters import Command
 from aiogram.fsm.context import FSMContext
 from aiogram.types import (
-    BufferedInputFile,
     CallbackQuery,
     InlineKeyboardButton,
     Message,
 )
 from aiogram.utils.keyboard import InlineKeyboardBuilder
 
+from bot import bot
 from config import (
+    CAPTCHA_ENABLE,
     CHANNEL_EXISTS,
+    CHANNEL_ID,
+    CHANNEL_REQUIRED,
     CHANNEL_URL,
-    CONNECT_ANDROID,
-    CONNECT_IOS,
     DONATIONS_ENABLE,
-    DOWNLOAD_ANDROID,
-    DOWNLOAD_IOS,
     SUPPORT_CHAT_URL,
 )
-from database import add_connection, add_referral, check_connection_exists, get_trial, use_trial
+from database import (
+    add_connection,
+    add_referral,
+    check_connection_exists,
+    get_referral_by_referred_id,
+    get_trial,
+    update_balance,
+)
+from handlers.captcha import generate_captcha
 from handlers.keys.key_management import create_key
-from handlers.keys.trial_key import create_trial_key
-from handlers.texts import INSTRUCTIONS_TRIAL, WELCOME_TEXT, get_about_vpn
+from handlers.texts import WELCOME_TEXT, get_about_vpn
+from keyboards.admin.panel_kb import AdminPanelCallback
 from logger import logger
 
+from .utils import edit_or_send_message
+
 router = Router()
 
 
 @router.callback_query(F.data == "start")
 async def handle_start_callback_query(
-    callback_query: CallbackQuery, state: FSMContext, session: Any, admin: bool
+    callback_query: CallbackQuery, state: FSMContext, session: Any, admin: bool, captcha: bool = False
 ):
-    await start_command(callback_query.message, state, session, admin)
+    await start_command(callback_query.message, state, session, admin, captcha)
 
 
 @router.message(Command("start"))
-async def start_command(message: Message, state: FSMContext, session: Any, admin: bool):
-    """Обрабатывает команду /start, включает логику рефералов и подарков."""
+async def start_command(message: Message, state: FSMContext, session: Any, admin: bool, captcha: bool = True):
+    """Обрабатывает команду /start, включая логику проверки подписки, рефералов и подарков."""
     logger.info(f"Вызвана функция start_command для пользователя {message.chat.id}")
 
-    await state.clear()
+    if CAPTCHA_ENABLE and captcha:
+        captcha_data = await generate_captcha(message, state)
+        await edit_or_send_message(
+            target_message=message,
+            text=captcha_data["text"],
+            reply_markup=captcha_data["markup"],
+        )
+        return
 
-    if message.text:
+    state_data = await state.get_data()
+    text_to_process = state_data.get("original_text", message.text)
+
+    if CHANNEL_EXISTS and CHANNEL_REQUIRED:
+        try:
+            member = await bot.get_chat_member(CHANNEL_ID, message.chat.id)
+            if member.status not in ["member", "administrator", "creator"]:
+                await state.update_data(original_text=text_to_process)
+                builder = InlineKeyboardBuilder()
+                builder.row(InlineKeyboardButton(text="✅ Я подписался", callback_data="check_subscription"))
+                await edit_or_send_message(
+                    target_message=message,
+                    text=f"Для использования бота, пожалуйста, подпишитесь на наш канал: {CHANNEL_URL}",
+                    reply_markup=builder.as_markup(),
+                )
+                return
+            else:
+                logger.info(f"Пользователь {message.chat.id} подписан на канал (статус: {member.status}). Продолжаем работу.")
+        except Exception as e:
+            logger.error(f"Ошибка проверки подписки пользователя {message.chat.id}: {e}")
+            await state.update_data(start_text=text_to_process)
+            builder = InlineKeyboardBuilder()
+            builder.row(InlineKeyboardButton(text="✅ Я подписался", callback_data="check_subscription"))
+            await edit_or_send_message(
+                target_message=message,
+                text=f"Пожалуйста, подпишитесь на наш канал: {CHANNEL_URL}",
+                reply_markup=builder.as_markup(),
+            )
+            return
+    await process_start_logic(message, state, session, admin, text_to_process)
+
+
+async def process_start_logic(
+    message: Message, state: FSMContext, session: Any, admin: bool, text_to_process: str = None
+):
+    text = text_to_process if text_to_process is not None else message.text
+    if text:
         try:
             connection_exists = await check_connection_exists(message.chat.id)
             logger.info(f"Проверка существования подключения: {connection_exists}")
 
-
             if not connection_exists:
                 await add_connection(tg_id=message.chat.id, session=session)
                 logger.info(f"Пользователь {message.chat.id} успешно добавлен в базу данных.")
 
-            if "gift_" in message.text:
-                logger.info(f"Обнаружена ссылка на подарок: {message.text}")
-                parts = message.text.split("gift_")[1].split("_")
-                gift_id = parts[0]
+            if "coupons_" in text:
+                logger.info(f"Обнаружена ссылка на купон: {text}")
+                coupon_code = text.split("coupons_")[1].strip()
+                logger.info(f"Пользователь {message.chat.id} ввёл купон: {coupon_code}")
 
+                coupon = await session.fetchrow(
+                    "SELECT id, code, amount, usage_limit, usage_count, is_used FROM coupons WHERE code = $1",
+                    coupon_code,
+                )
+                if coupon is None:
+                    logger.warning(f"Купон {coupon_code} не найден.")
+                    await message.answer("❌ Купон не найден!")
+                    return await show_start_menu(message, admin, session)
+
+                usage_exists = await session.fetchval(
+                    "SELECT 1 FROM coupon_usages WHERE coupon_id = $1 AND user_id = $2",
+                    coupon["id"],
+                    message.chat.id,
+                )
+                if usage_exists:
+                    logger.info(f"Пользователь {message.chat.id} уже активировал купон {coupon_code}.")
+                    await message.answer("❌ Вы уже использовали этот купон!")
+                    return await show_start_menu(message, admin, session)
+
+                if coupon["is_used"] or coupon["usage_count"] >= coupon["usage_limit"]:
+                    logger.info(f"Купон {coupon_code} уже использован или исчерпан.")
+                    await message.answer("❌ Этот купон уже использован!")
+                    return await show_start_menu(message, admin, session)
+
+                await update_balance(message.chat.id, coupon["amount"])
+                logger.info(f"Начислено {coupon['amount']} единиц для пользователя {message.chat.id}")
+
+                new_usage_count = coupon["usage_count"] + 1
+                is_used = new_usage_count >= coupon["usage_limit"]
+
+                await session.execute(
+                    "UPDATE coupons SET usage_count = $1, is_used = $2 WHERE code = $3",
+                    new_usage_count,
+                    is_used,
+                    coupon_code,
+                )
+
+                await session.execute(
+                    "INSERT INTO coupon_usages (coupon_id, user_id, used_at) VALUES ($1, $2, NOW())",
+                    coupon["id"],
+                    message.chat.id,
+                )
+
+                logger.info(
+                    f"Купон {coupon_code} успешно использован пользователем {message.chat.id}, начислено {coupon['amount']} RUB."
+                )
+                await message.answer(f"🎉 Ваш баланс пополнен на {coupon['amount']} RUB по купону!")
+                return await show_start_menu(message, admin, session)
+
+            if "gift_" in text:
+                logger.info(f"Обнаружена ссылка на подарок: {text}")
+                parts = text.split("gift_")[1].split("_")
+                if len(parts) < 2:
+                    logger.error("Неверный формат ссылки на подарок: недостаточно частей после 'gift_'")
+                    await message.answer("❌ Неверный формат ссылки на подарок.")
+                    return await show_start_menu(message, admin, session)
+                gift_id = parts[0]
                 recipient_tg_id = message.chat.id
 
                 gift_info = await session.fetchrow(
-                    "SELECT * FROM gifts WHERE gift_id = $1 AND is_used = FALSE", gift_id
+                    """
+                    SELECT sender_tg_id, selected_months, expiry_time, is_used, recipient_tg_id 
+                    FROM gifts WHERE gift_id = $1
+                    """,
+                    gift_id,
                 )
 
                 if gift_info is None:
@@ -71,41 +183,65 @@ async def start_command(message: Message, state: FSMContext, session: Any, admin
                     await message.answer("Этот подарок уже был использован или не существует.")
                     return await show_start_menu(message, admin, session)
 
-                if gift_info['sender_tg_id'] == recipient_tg_id:
-                    logger.warning(
-                        f"Пользователь {recipient_tg_id} попытался активировать подарок, который был отправлен им самим."
-                    )
+                if gift_info["is_used"]:
+                    logger.warning(f"Подарок с ID {gift_id} уже был активирован ранее.")
+                    await message.answer("Этот подарок уже был использован.")
+                    return await show_start_menu(message, admin, session)
+
+                if gift_info["sender_tg_id"] == recipient_tg_id:
+                    logger.warning(f"Пользователь {recipient_tg_id} попытался активировать свой же подарок.")
                     await message.answer("❌ Вы не можете получить подарок от самого себя.")
                     return await show_start_menu(message, admin, session)
 
-                selected_months = gift_info['selected_months']
-                expiry_time = gift_info['expiry_time']
-                expiry_time_naive = expiry_time.replace(tzinfo=None)
+                if gift_info["recipient_tg_id"] is not None:
+                    logger.warning(
+                        f"Подарок {gift_id} уже привязан к другому пользователю ({gift_info['recipient_tg_id']})."
+                    )
+                    await message.answer("❌ Этот подарок уже был активирован другим пользователем.")
+                    return await show_start_menu(message, admin, session)
+
+                if not connection_exists:
+                    await add_referral(recipient_tg_id, gift_info["sender_tg_id"], session)
+                    logger.info(
+                        f"Пользователь {recipient_tg_id} теперь является рефералом отправителя {gift_info['sender_tg_id']}."
+                    )
+
+                await session.execute(
+                    """
+                    UPDATE connections SET trial = 1 WHERE tg_id = $1
+                    """,
+                    recipient_tg_id,
+                )
+
+                selected_months = gift_info["selected_months"]
+                expiry_time = gift_info["expiry_time"].replace(tzinfo=None)
+
                 logger.info(f"Подарок с ID {gift_id} успешно найден для пользователя {recipient_tg_id}.")
 
-                await create_key(recipient_tg_id, expiry_time_naive, state, session, message)
+                await create_key(recipient_tg_id, expiry_time, state, session, message)
                 logger.info(f"Ключ создан для пользователя {recipient_tg_id} на срок {selected_months} месяцев.")
 
                 await session.execute(
-                    "UPDATE gifts SET is_used = TRUE, recipient_tg_id = $1 WHERE gift_id = $2",
+                    """
+                    UPDATE gifts SET is_used = TRUE, recipient_tg_id = $1 
+                    WHERE gift_id = $2
+                    """,
                     recipient_tg_id,
                     gift_id,
                 )
 
                 await message.answer(
-                    f"🎉 Ваш подарок на {selected_months} {'месяц' if selected_months == 1 else 'месяца' if selected_months in [2, 3, 4] else 'месяцев'} активирован!"
+                    f"🎉 Ваш подарок на {selected_months} "
+                    f"{'месяц' if selected_months == 1 else 'месяца' if selected_months in [2, 3, 4] else 'месяцев'} активирован!"
                 )
                 logger.info(f"Подарок на {selected_months} месяцев активирован для пользователя {recipient_tg_id}.")
                 return
 
-            elif "referral_" in message.text:
+            elif "referral_" in text:
                 try:
-                    referrer_tg_id = int(message.text.split("referral_")[1])
-
+                    referrer_tg_id = int(text.split("referral_")[1])
                     if connection_exists:
-                        logger.info(
-                            f"Пользователь {message.chat.id} уже зарегистрирован и не может стать рефералом."
-                        )
+                        logger.info(f"Пользователь {message.chat.id} уже зарегистрирован и не может стать рефералом.")
                         await message.answer("❌ Вы уже зарегистрированы и не можете использовать реферальную ссылку.")
                         return await show_start_menu(message, admin, session)
 
@@ -114,16 +250,20 @@ async def start_command(message: Message, state: FSMContext, session: Any, admin
                         await message.answer("❌ Вы не можете быть рефералом самого себя.")
                         return await show_start_menu(message, admin, session)
 
-                    existing_referral = await session.fetchrow(
-                        "SELECT * FROM referrals WHERE referred_tg_id = $1", message.chat.id
-                    )
-
+                    existing_referral = await get_referral_by_referred_id(message.chat.id, session)
                     if existing_referral:
                         logger.info(f"Реферал с ID {message.chat.id} уже существует.")
                         return await show_start_menu(message, admin, session)
 
                     await add_referral(message.chat.id, referrer_tg_id, session)
                     logger.info(f"Реферал {message.chat.id} использовал ссылку от пользователя {referrer_tg_id}")
+                    await message.answer(f"Вы стали рефералом пользователя с ID {referrer_tg_id}")
+                    try:
+                        await bot.send_message(referrer_tg_id, f"🎉 Ваш реферал {message.chat.id} успешно зарегистрировался!")
+                        logger.info(f"Уведомление отправлено пользователю {referrer_tg_id} о новом реферале {message.chat.id}")
+                    except Exception as e:
+                        logger.error(f"Не удалось отправить уведомление пригласившему ({referrer_tg_id}): {e}")
+
                     return await show_start_menu(message, admin, session)
 
                 except (ValueError, IndexError) as e:
@@ -131,7 +271,7 @@ async def start_command(message: Message, state: FSMContext, session: Any, admin
                 return
 
             else:
-                logger.info(f"Пользователь {message.chat.id} зашел без реферальной ссылки или подарка.")
+                logger.info(f"Пользователь {message.chat.id} зашел без реферальной ссылки, подарка или купона.")
 
             await show_start_menu(message, admin, session)
 
@@ -142,111 +282,91 @@ async def start_command(message: Message, state: FSMContext, session: Any, admin
         await show_start_menu(message, admin, session)
 
 
-async def show_start_menu(message: Message, admin: bool, session: Any):
-    """Функция для отображения стандартного меню"""
-    logger.info(f"Показываю главное меню для пользователя {message.chat.id}")
-    trial_status = await get_trial(message.chat.id, session)
-    image_path = os.path.join("img", "pic.jpg")
+@router.callback_query(F.data == "check_subscription")
+async def check_subscription_callback(callback_query: CallbackQuery, state: FSMContext, session: Any, admin: bool):
+    user_id = callback_query.from_user.id
+    logger.info(f"[CALLBACK] Получен callback 'check_subscription' от пользователя {user_id}")
+    try:
+        member = await bot.get_chat_member(CHANNEL_ID, user_id)
+        logger.info(f"[CALLBACK] Статус подписки пользователя {user_id}: {member.status}")
 
+        if member.status not in ["member", "administrator", "creator"]:
+            await callback_query.answer("Вы еще не подписаны на канал!", show_alert=True)
+            builder = InlineKeyboardBuilder()
+            builder.row(InlineKeyboardButton(text="✅ Я подписался", callback_data="check_subscription"))
+            await callback_query.message.edit_text(
+                f"Для использования бота, пожалуйста, подпишитесь на наш канал: {CHANNEL_URL}",
+                reply_markup=builder.as_markup(),
+            )
+        else:
+            await callback_query.answer("Подписка подтверждена!")
+            data = await state.get_data()
+            original_text = data.get("original_text")
+            if not original_text:
+                original_text = callback_query.message.text
+            await process_start_logic(callback_query.message, state, session, admin, text_to_process=original_text)
+            logger.info(f"[CALLBACK] Завершен вызов process_start_logic для пользователя {user_id}")
+    except Exception as e:
+        logger.error(f"[CALLBACK] Ошибка проверки подписки для пользователя {user_id}: {e}", exc_info=True)
+        await callback_query.answer("Ошибка проверки подписки, повторите попытку", show_alert=True)
+
+
+async def show_start_menu(message: Message, admin: bool, session: Any):
+    """Функция для отображения стандартного меню через редактирование сообщения.
+    Если редактирование не удалось, отправляем новое сообщение."""
+    logger.info(f"Показываю главное меню для пользователя {message.chat.id}")
+
+    image_path = os.path.join("img", "pic.jpg")
     builder = InlineKeyboardBuilder()
 
-    if trial_status == 0:
-        builder.row(InlineKeyboardButton(text="🔗 Подключить VPN", callback_data="connect_vpn"))
+    if session is not None:
+        trial_status = await get_trial(message.chat.id, session)
+        logger.info(f"Trial status для {message.chat.id}: {trial_status}")
+        if trial_status == 0:
+            builder.row(InlineKeyboardButton(text="🔗 Подключить VPN", callback_data="create_key"))
+    else:
+        logger.warning(f"Сессия базы данных отсутствует, пропускаем проверку триала для {message.chat.id}")
 
     builder.row(InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile"))
 
-    builder.row(
-        InlineKeyboardButton(text="📞 Поддержка", url=SUPPORT_CHAT_URL),
-        InlineKeyboardButton(text="📢 Канал", url=CHANNEL_URL),
-    )
+    if CHANNEL_EXISTS:
+        builder.row(
+            InlineKeyboardButton(text="📞 Поддержка", url=SUPPORT_CHAT_URL),
+            InlineKeyboardButton(text="📢 Канал", url=CHANNEL_URL),
+        )
+    else:
+        builder.row(InlineKeyboardButton(text="📞 Поддержка", url=SUPPORT_CHAT_URL))
 
     if admin:
-        builder.row(InlineKeyboardButton(text="🔧 Администратор", callback_data="admin"))
-
-    builder.row(InlineKeyboardButton(text="🌐 О нашем VPN", callback_data="about_vpn"))
-
-    if os.path.isfile(image_path):
-        with open(image_path, "rb") as image_from_buffer:
-            await message.answer_photo(
-                photo=BufferedInputFile(image_from_buffer.read(), filename="pic.jpg"),
-                caption=WELCOME_TEXT,
-                reply_markup=builder.as_markup(),
-            )
-    else:
-        await message.answer(
-            text=WELCOME_TEXT,
-            reply_markup=builder.as_markup(),
-        )
-
-
-@router.callback_query(F.data == "connect_vpn")
-async def handle_connect_vpn(callback_query: CallbackQuery, session: Any):
-    user_id = callback_query.message.chat.id
-
-    trial_key_info = await create_trial_key(user_id, session)
-
-    if "error" in trial_key_info:
-        await callback_query.message.answer(trial_key_info["error"])
-    else:
-        await use_trial(user_id, session)
-
-        key_message = (
-            f"🔑 <b>Ваш персональный ключ доступа:</b>\n"
-            f"<code>{trial_key_info['key']}</code>\n\n"
-            f"📋 <b>Быстрая инструкция по подключению:</b>\n{INSTRUCTIONS_TRIAL}"
-        )
-
-        email = trial_key_info["email"]
-
-        builder = InlineKeyboardBuilder()
-        builder.row(InlineKeyboardButton(text="💬 Поддержка", url=SUPPORT_CHAT_URL))
         builder.row(
-            InlineKeyboardButton(text="🍏 Скачать для iOS", url=DOWNLOAD_IOS),
-            InlineKeyboardButton(text="🤖 Скачать для Android", url=DOWNLOAD_ANDROID),
-        )
-        builder.row(
-            InlineKeyboardButton(
-                text="🍏 Подключить на iOS",
-                url=f'{CONNECT_IOS}{trial_key_info["key"]}',
-            ),
-            InlineKeyboardButton(
-                text="🤖 Подключить на Android",
-                url=f'{CONNECT_ANDROID}{trial_key_info["key"]}',
-            ),
-        )
-        builder.row(
-            InlineKeyboardButton(
-                text="💻 Компьютеры", callback_data=f"connect_pc|{email}"
-            ),
-            InlineKeyboardButton(
-                text="📺 Андроид TV", callback_data=f"connect_tv|{email}"
-            )
-        )
-        builder.row(
-            InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile")
+            InlineKeyboardButton(text="🔧 Администратор", callback_data=AdminPanelCallback(action="admin").pack())
         )
 
-        await callback_query.message.answer(
-            key_message, reply_markup=builder.as_markup()
-        )
+    builder.row(InlineKeyboardButton(text="🌐 О VPN", callback_data="about_vpn"))
+
+    await edit_or_send_message(
+        target_message=message,
+        text=WELCOME_TEXT,
+        reply_markup=builder.as_markup(),
+        media_path=image_path,
+    )
 
 
 @router.callback_query(F.data == "about_vpn")
 async def handle_about_vpn(callback_query: CallbackQuery):
     builder = InlineKeyboardBuilder()
-
     if DONATIONS_ENABLE:
         builder.row(InlineKeyboardButton(text="💰 Поддержать проект", callback_data="donate"))
-
-    builder.row(
-        InlineKeyboardButton(text="📞 Техническая поддержка", url=SUPPORT_CHAT_URL),
-    )
+    builder.row(InlineKeyboardButton(text="📞 Техническая поддержка", url=SUPPORT_CHAT_URL))
     if CHANNEL_EXISTS:
-        builder.row(
-            InlineKeyboardButton(text="📢 Официальный канал", url=CHANNEL_URL),
-        )
+        builder.row(InlineKeyboardButton(text="📢 Канал", url=CHANNEL_URL))
     builder.row(InlineKeyboardButton(text="⬅️ Назад", callback_data="start"))
+    text = get_about_vpn("3.2.3-minor")
 
-    await callback_query.message.answer(
-        get_about_vpn("3.2.3-minor"), reply_markup=builder.as_markup()
+    await edit_or_send_message(
+        target_message=callback_query.message,
+        text=text,
+        reply_markup=builder.as_markup(),
+        media_path=None,
+        force_text=False,
     )

handlers/utils.py

@@ -1,14 +1,35 @@
-import random
+import json
+import os
 import re
+import secrets
+import string
 
+import aiofiles
+import aiohttp
 import asyncpg
+from aiogram.types import BufferedInputFile, InlineKeyboardMarkup, InputMediaPhoto, Message
 
 from bot import bot
 from config import DATABASE_URL
-from database import get_servers_from_db
+from database import get_all_keys, get_servers
 from logger import logger
 
 
+async def get_usd_rate():
+    try:
+        async with aiohttp.ClientSession() as session:
+            async with session.get("https://www.cbr-xml-daily.ru/daily_json.js") as response:
+                if response.status == 200:
+                    data = await response.text()
+                    usd = float(json.loads(data)["Valute"]["USD"]["Value"])
+                else:
+                    usd = float(100)
+    except Exception as e:
+        logger.exception(f"Error fetching USD rate: {e}")
+        usd = float(100)
+    return usd
+
+
 def sanitize_key_name(key_name: str) -> str:
     """
     Очищает название ключа, оставляя только допустимые символы.
@@ -32,7 +53,7 @@ def generate_random_email(length: int = 6) -> str:
     Returns:
         str: Сгенерированная случайная строка.
     """
-    return "".join(random.choices("abcdefghijklmnopqrstuvwxyz0123456789", k=length))
+    return "".join(secrets.choice(string.ascii_lowercase + string.digits) for _ in range(length)) if length > 0 else ""
 
 
 async def get_least_loaded_cluster() -> str:
@@ -42,13 +63,13 @@ async def get_least_loaded_cluster() -> str:
     Returns:
         str: Идентификатор наименее загруженного кластера.
     """
-    servers = await get_servers_from_db()
+    servers = await get_servers()
 
     cluster_loads: dict[str, int] = {cluster_id: 0 for cluster_id in servers.keys()}
 
     async with asyncpg.create_pool(DATABASE_URL) as pool:
         async with pool.acquire() as conn:
-            keys = await conn.fetch("SELECT server_id FROM keys")
+            keys = await get_all_keys(conn)
             for key in keys:
                 cluster_id = key["server_id"]
                 if cluster_id in cluster_loads:
@@ -67,9 +88,7 @@ async def get_least_loaded_cluster() -> str:
     return least_loaded_cluster
 
 
-async def handle_error(
-    tg_id: int, callback_query: object | None = None, message: str = ""
-) -> None:
+async def handle_error(tg_id: int, callback_query: object | None = None, message: str = "") -> None:
     """
     Обрабатывает ошибку, отправляя сообщение пользователю.
 
@@ -81,13 +100,125 @@ async def handle_error(
     try:
         if callback_query and hasattr(callback_query, "message"):
             try:
-                await bot.delete_message(
-                    chat_id=tg_id, message_id=callback_query.message.message_id
-                )
+                await bot.delete_message(chat_id=tg_id, message_id=callback_query.message.message_id)
             except Exception as delete_error:
                 logger.warning(f"Не удалось удалить сообщение: {delete_error}")
 
-        await bot.send_message(tg_id, message, parse_mode="HTML")
+        await bot.send_message(tg_id, message)
 
     except Exception as e:
         logger.error(f"Ошибка при обработке ошибки: {e}")
+
+
+def format_time_until_deletion(seconds: int) -> str:
+    if seconds <= 0:
+        return "0 минут"
+
+    days = seconds // (3600 * 24)
+    hours = (seconds % (3600 * 24)) // 3600
+    minutes = (seconds % 3600 + 59) // 60
+
+    parts = []
+
+    if days > 0:
+        if days == 1:
+            parts.append(f"{days} день")
+        elif 2 <= days <= 4:
+            parts.append(f"{days} дня")
+        else:
+            parts.append(f"{days} дней")
+
+    if hours > 0:
+        if hours == 1:
+            parts.append(f"{hours} час")
+        elif 2 <= hours <= 4:
+            parts.append(f"{hours} часа")
+        else:
+            parts.append(f"{hours} часов")
+
+    if minutes > 0 and days == 0:
+        if minutes == 1:
+            parts.append("1 минута")
+        elif 2 <= minutes <= 4:
+            parts.append(f"{minutes} минуты")
+        else:
+            parts.append(f"{minutes} минут")
+
+    return " и ".join(parts) if parts else "менее минуты"
+
+
+async def edit_or_send_message(
+    target_message: Message,
+    text: str,
+    reply_markup: InlineKeyboardMarkup,
+    media_path: str = None,
+    disable_web_page_preview: bool = False,
+    force_text: bool = False,
+):
+    """
+    Универсальная функция для редактирования исходного сообщения target_message.
+
+    - Если media_path указан и существует, считается, что сообщение содержит фото, и используется редактирование медиа
+      (замена фото и подписи) через edit_media. Если редактирование не удаётся, отправляется новое сообщение с фото.
+
+    - Если media_path не указан:
+        - Если force_text=False и target_message уже имеет caption, пытаемся отредактировать подпись (edit_caption).
+        - Иначе (или если редактирование caption не удалось) — редактируем текст (edit_text).
+
+    В случае неудачи fallback – отправка нового сообщения.
+    """
+    if media_path and os.path.isfile(media_path):
+        async with aiofiles.open(media_path, "rb") as f:
+            image_data = await f.read()
+        media = InputMediaPhoto(
+            media=BufferedInputFile(image_data, filename=os.path.basename(media_path)),
+            caption=text,
+        )
+        try:
+            await target_message.edit_media(media=media, reply_markup=reply_markup)
+            return
+        except Exception:
+            await target_message.answer_photo(
+                photo=BufferedInputFile(image_data, filename=os.path.basename(media_path)),
+                caption=text,
+                reply_markup=reply_markup,
+                disable_web_page_preview=disable_web_page_preview,
+            )
+            return
+    else:
+        if not force_text and target_message.caption is not None:
+            try:
+                await target_message.edit_caption(caption=text, reply_markup=reply_markup)
+                return
+            except Exception as e:
+                logger.error(f"Ошибка редактирования подписи: {e}")
+        try:
+            await target_message.edit_text(
+                text=text,
+                reply_markup=reply_markup,
+                disable_web_page_preview=disable_web_page_preview,
+            )
+            return
+        except Exception as e:
+            await target_message.answer(
+                text=text,
+                reply_markup=reply_markup,
+                disable_web_page_preview=disable_web_page_preview,
+            )
+
+
+def convert_to_bytes(value: float, unit: str) -> int:
+    """
+    Конвертирует значение с указанной единицей измерения в байты.
+    Args:
+        value (float): Числовое значение.
+        unit (str): Единица измерения ('KB', 'MB', 'GB', 'TB').
+    Returns:
+        int: Количество байт.
+    """
+    KB = 1024
+    MB = KB * 1024
+    GB = MB * 1024
+    TB = GB * 1024
+    units = {"KB": KB, "MB": MB, "GB": GB, "TB": TB}
+    return int(value * units.get(unit.upper(), 1))

keyboards/admin/bans_kb.py

@@ -0,0 +1,13 @@
+from aiogram.types import InlineKeyboardMarkup
+from aiogram.utils.keyboard import InlineKeyboardBuilder
+
+from keyboards.admin.panel_kb import AdminPanelCallback, build_admin_back_btn
+
+
+def build_bans_kb() -> InlineKeyboardMarkup:
+    builder = InlineKeyboardBuilder()
+    builder.button(text="📄 Выгрузить в CSV", callback_data=AdminPanelCallback(action="bans_export").pack())
+    builder.button(text="🗑️ Удалить из БД", callback_data=AdminPanelCallback(action="bans_delete_banned").pack())
+    builder.row(build_admin_back_btn("management"))
+    builder.adjust(1)
+    return builder.as_markup()

keyboards/admin/coupons_kb.py

@@ -0,0 +1,50 @@
+from aiogram.filters.callback_data import CallbackData
+from aiogram.types import InlineKeyboardButton, InlineKeyboardMarkup
+from aiogram.utils.keyboard import InlineKeyboardBuilder
+
+from keyboards.admin.panel_kb import AdminPanelCallback, build_admin_back_btn
+
+
+class AdminCouponDeleteCallback(CallbackData, prefix="admin_coupon_delete"):
+    coupon_code: str
+
+
+def build_coupons_kb() -> InlineKeyboardMarkup:
+    builder = InlineKeyboardBuilder()
+    builder.button(text="➕ Создать купон", callback_data=AdminPanelCallback(action="coupons_create").pack())
+    builder.button(text="Купоны", callback_data=AdminPanelCallback(action="coupons_list").pack())
+    builder.row(build_admin_back_btn())
+    return builder.as_markup()
+
+
+def build_coupons_list_kb(coupons: list, current_page: int, total_pages: int) -> InlineKeyboardMarkup:
+    builder = InlineKeyboardBuilder()
+
+    for coupon in coupons:
+        coupon_code = coupon["code"]
+        builder.button(
+            text=f"❌{coupon_code}",
+            callback_data=AdminCouponDeleteCallback(coupon_code=coupon_code).pack(),
+        )
+
+    pagination_buttons = []
+    if current_page > 1:
+        pagination_buttons.append(
+            InlineKeyboardButton(
+                text="⬅️ Назад",
+                callback_data=AdminPanelCallback(action="coupons_list", page=current_page - 1).pack(),
+            )
+        )
+    if current_page < total_pages:
+        pagination_buttons.append(
+            InlineKeyboardButton(
+                text="Вперед ➡️",
+                callback_data=AdminPanelCallback(action="coupons_list", page=current_page + 1).pack(),
+            )
+        )
+    if pagination_buttons:
+        builder.row(*pagination_buttons)
+
+    builder.row(build_admin_back_btn("coupons"))
+    builder.adjust(2)
+    return builder.as_markup()

keyboards/admin/panel_kb.py

@@ -0,0 +1,68 @@
+from aiogram.filters.callback_data import CallbackData
+from aiogram.types import InlineKeyboardButton, InlineKeyboardMarkup
+from aiogram.utils.keyboard import InlineKeyboardBuilder
+
+
+class AdminPanelCallback(CallbackData, prefix="admin_panel"):
+    action: str
+    page: int
+
+    def __init__(self, *args, **kwargs):
+        if "page" not in kwargs or kwargs["page"] is None:
+            kwargs["page"] = 1
+        super().__init__(*args, **kwargs)
+
+
+def build_panel_kb() -> InlineKeyboardMarkup:
+    builder = InlineKeyboardBuilder()
+    builder.button(text="👤 Поиск пользователя", callback_data=AdminPanelCallback(action="search_user").pack())
+    builder.button(text="🔑 Поиск по названию ключа", callback_data=AdminPanelCallback(action="search_key").pack())
+    builder.row(
+        InlineKeyboardButton(text="🖥️ Серверы", callback_data=AdminPanelCallback(action="servers").pack()),
+        InlineKeyboardButton(text="🎟️ Купоны", callback_data=AdminPanelCallback(action="coupons").pack()),
+    )
+    builder.button(text="📢 Рассылка", callback_data=AdminPanelCallback(action="sender").pack())
+    builder.row(
+        InlineKeyboardButton(text="📊 Статистика", callback_data=AdminPanelCallback(action="stats").pack()),
+        InlineKeyboardButton(text="🤖 Управление", callback_data=AdminPanelCallback(action="management").pack()),
+    )
+    builder.button(text="Личный кабинет", callback_data="profile")
+    builder.adjust(1, 1, 2, 1, 2, 1)
+    return builder.as_markup()
+
+
+def build_management_kb() -> InlineKeyboardMarkup:
+    builder = InlineKeyboardBuilder()
+    builder.button(text="💾 Создать резервную копию", callback_data=AdminPanelCallback(action="backups").pack())
+    builder.button(text="🚫 Заблокировавшие бота", callback_data=AdminPanelCallback(action="bans").pack())
+    builder.button(text="🔄 Перезагрузить бота", callback_data=AdminPanelCallback(action="restart").pack())
+    builder.button(text="🌐 Сменить домен", callback_data=AdminPanelCallback(action="change_domain").pack())
+    builder.row(build_admin_back_btn())
+    builder.adjust(1)
+    return builder.as_markup()
+
+
+def build_restart_kb() -> InlineKeyboardMarkup:
+    builder = InlineKeyboardBuilder()
+    builder.button(text="✅ Да, перезагрузить", callback_data=AdminPanelCallback(action="restart_confirm").pack())
+    builder.row(build_admin_back_btn())
+    builder.adjust(1)
+    return builder.as_markup()
+
+
+def build_admin_back_kb(action: str = "admin") -> InlineKeyboardMarkup:
+    return build_admin_singleton_kb("🔙 Назад", action)
+
+
+def build_admin_singleton_kb(text: str, action: str) -> InlineKeyboardMarkup:
+    builder = InlineKeyboardBuilder()
+    builder.row(build_admin_btn(text, action))
+    return builder.as_markup()
+
+
+def build_admin_back_btn(action: str = "admin") -> InlineKeyboardButton:
+    return build_admin_btn("🔙 Назад", action)
+
+
+def build_admin_btn(text: str, action: str) -> InlineKeyboardButton:
+    return InlineKeyboardButton(text=text, callback_data=AdminPanelCallback(action=action).pack())

keyboards/admin/sender_kb.py

@@ -0,0 +1,32 @@
+from aiogram.filters.callback_data import CallbackData
+from aiogram.types import InlineKeyboardMarkup
+from aiogram.utils.keyboard import InlineKeyboardBuilder
+
+from keyboards.admin.panel_kb import build_admin_back_btn
+
+
+class AdminSenderCallback(CallbackData, prefix="admin_sender"):
+    type: str
+    data: str | None = None
+
+
+def build_sender_kb() -> InlineKeyboardMarkup:
+    builder = InlineKeyboardBuilder()
+    builder.button(text="👥 Все пользователи", callback_data=AdminSenderCallback(type="all").pack())
+    builder.button(text="✅ Пользователи с подпиской", callback_data=AdminSenderCallback(type="subscribed").pack())
+    builder.button(text="❌ Пользователи без подписки", callback_data=AdminSenderCallback(type="unsubscribed").pack())
+    builder.button(text="📢 Пользователи кластера", callback_data=AdminSenderCallback(type="cluster-select").pack())
+    builder.row(build_admin_back_btn())
+    builder.adjust(1)
+    return builder.as_markup()
+
+
+def build_clusters_kb(clusters: list) -> InlineKeyboardMarkup:
+    builder = InlineKeyboardBuilder()
+    for cluster in clusters:
+        name = cluster["cluster_name"]
+        builder.button(text=f"🌐 {name}", callback_data=AdminSenderCallback(type="cluster", data=name).pack())
+
+    builder.row(build_admin_back_btn())
+    builder.adjust(1)
+    return builder.as_markup()

keyboards/admin/servers_kb.py

@@ -0,0 +1,81 @@
+from aiogram.filters.callback_data import CallbackData
+from aiogram.types import InlineKeyboardButton, InlineKeyboardMarkup
+from aiogram.utils.keyboard import InlineKeyboardBuilder
+
+from keyboards.admin.panel_kb import AdminPanelCallback, build_admin_back_btn
+
+
+class AdminServerEditorCallback(CallbackData, prefix="admin_servers"):
+    action: str
+    data: str
+
+
+def build_clusters_editor_kb(servers: dict) -> InlineKeyboardMarkup:
+    builder = InlineKeyboardBuilder()
+
+    for cluster_name in servers:
+        builder.button(
+            text=f"⚙️ {cluster_name}",
+            callback_data=AdminServerEditorCallback(action="clusters_manage", data=cluster_name).pack(),
+        )
+
+    builder.button(text="➕ Добавить кластер", callback_data=AdminPanelCallback(action="clusters_add").pack())
+    builder.row(build_admin_back_btn())
+    builder.adjust(1)
+    return builder.as_markup()
+
+
+def build_manage_cluster_kb(cluster_servers, cluster_name) -> InlineKeyboardMarkup:
+    builder = InlineKeyboardBuilder()
+
+    for server in cluster_servers:
+        builder.button(
+            text=f"🌍 {server['server_name']}",
+            callback_data=AdminServerEditorCallback(action="servers_manage", data=server["server_name"]).pack(),
+        )
+
+    builder.button(
+        text="➕ Добавить сервер",
+        callback_data=AdminServerEditorCallback(action="servers_add", data=cluster_name).pack(),
+    )
+    builder.row(
+        InlineKeyboardButton(
+            text="🌐 Доступность",
+            callback_data=AdminServerEditorCallback(action="servers_availability", data=cluster_name).pack(),
+        ),
+        InlineKeyboardButton(
+            text="🔄 Синхронизация",
+            callback_data=AdminServerEditorCallback(action="clusters_sync", data=cluster_name).pack(),
+        ),
+    )
+    builder.button(
+        text="💾 Создать бэкап кластера",
+        callback_data=AdminServerEditorCallback(action="clusters_backup", data=cluster_name).pack(),
+    )
+    builder.row(build_admin_back_btn("servers"))
+    builder.adjust(1, 1, 1, 1, 1, 2, 1)
+    return builder.as_markup()
+
+
+def build_manage_server_kb(server_name: str, cluster_name: str) -> InlineKeyboardMarkup:
+    builder = InlineKeyboardBuilder()
+    builder.button(
+        text="🗑️ Удалить", callback_data=AdminServerEditorCallback(action="servers_delete", data=server_name).pack()
+    )
+    builder.button(
+        text="🔙 Назад", callback_data=AdminServerEditorCallback(action="clusters_manage", data=cluster_name).pack()
+    )
+    builder.adjust(1)
+    return builder.as_markup()
+
+
+def build_delete_server_kb(server_name: str) -> InlineKeyboardMarkup:
+    builder = InlineKeyboardBuilder()
+    builder.button(
+        text="✅ Да", callback_data=AdminServerEditorCallback(action="servers_delete_confirm", data=server_name).pack()
+    )
+    builder.button(
+        text="🔙 Назад", callback_data=AdminServerEditorCallback(action="servers_manage", data=server_name).pack()
+    )
+    builder.adjust(1)
+    return builder.as_markup()

keyboards/admin/stats_kb.py

@@ -0,0 +1,19 @@
+from aiogram.types import InlineKeyboardMarkup
+from aiogram.utils.keyboard import InlineKeyboardBuilder
+
+from keyboards.admin.panel_kb import AdminPanelCallback, build_admin_back_btn
+
+
+def build_stats_kb() -> InlineKeyboardMarkup:
+    builder = InlineKeyboardBuilder()
+    builder.button(text="🔄 Обновить", callback_data=AdminPanelCallback(action="stats").pack())
+    builder.button(
+        text="📥 Выгрузить пользователей в CSV",
+        callback_data=AdminPanelCallback(action="stats_export_users_csv").pack(),
+    )
+    builder.button(
+        text="📥 Выгрузить оплаты в CSV", callback_data=AdminPanelCallback(action="stats_export_payments_csv").pack()
+    )
+    builder.row(build_admin_back_btn())
+    builder.adjust(1)
+    return builder.as_markup()

keyboards/admin/users_kb.py

@@ -0,0 +1,208 @@
+from datetime import datetime, timezone
+
+from aiogram.filters.callback_data import CallbackData
+from aiogram.types import InlineKeyboardButton, InlineKeyboardMarkup
+from aiogram.utils.keyboard import InlineKeyboardBuilder
+
+from config import RENEWAL_PRICES
+from keyboards.admin.panel_kb import build_admin_back_btn
+
+
+class AdminUserEditorCallback(CallbackData, prefix="admin_users"):
+    action: str
+    tg_id: int
+    data: str | int | None = None
+    edit: bool = False
+
+
+class AdminUserKeyEditorCallback(CallbackData, prefix="admin_users_key"):
+    action: str
+    tg_id: int
+    data: str
+    month: int | None = None
+    edit: bool = False
+
+
+def build_user_edit_kb(tg_id: int, key_records: list) -> InlineKeyboardMarkup:
+    builder = InlineKeyboardBuilder()
+    current_time = datetime.now(tz=timezone.utc)
+
+    for record in key_records:
+        email = record["email"]
+        expiry = datetime.fromtimestamp(record["expiry_time"] / 1000, tz=timezone.utc)
+        days = (expiry - current_time).days
+        builder.button(
+            text=f"🔑 {email} ({'<1' if days < 1 else days} дн.)",
+            callback_data=AdminUserEditorCallback(action="users_key_edit", tg_id=tg_id, data=str(email)).pack(),
+        )
+
+    builder.button(
+        text="✉️ Сообщение", callback_data=AdminUserEditorCallback(action="users_send_message", tg_id=tg_id).pack()
+    )
+    builder.button(
+        text="💸 Изменить баланс",
+        callback_data=AdminUserEditorCallback(action="users_balance_edit", tg_id=tg_id).pack(),
+    )
+    builder.button(
+        text="♻️ Восстановить триал",
+        callback_data=AdminUserEditorCallback(action="users_trial_restore", tg_id=tg_id).pack(),
+    )
+    builder.button(
+        text="❌ Удалить клиента", callback_data=AdminUserEditorCallback(action="users_delete_user", tg_id=tg_id).pack()
+    )
+    builder.row(build_editor_btn("🔄 Обновить данные", tg_id, edit=True))
+    builder.row(build_admin_back_btn())
+    builder.adjust(1)
+    return builder.as_markup()
+
+
+def build_users_balance_change_kb(tg_id: int) -> InlineKeyboardMarkup:
+    builder = InlineKeyboardBuilder()
+    builder.button(
+        text="🔙 Назад",  # todo: fix magic text was set
+        callback_data=AdminUserEditorCallback(action="users_balance_edit", tg_id=tg_id).pack(),
+    )
+    return builder.as_markup()
+
+
+def build_users_balance_kb(tg_id: int) -> InlineKeyboardMarkup:
+    builder = InlineKeyboardBuilder()
+    for month, amount in RENEWAL_PRICES.items():
+        builder.button(
+            text=f"+ {amount}Р ({month} мес.)",
+            callback_data=AdminUserEditorCallback(action="users_balance_add", tg_id=tg_id, data=amount).pack(),
+        )
+        builder.button(
+            text=f"- {amount}Р ({month} мес.)",
+            callback_data=AdminUserEditorCallback(action="users_balance_add", tg_id=tg_id, data=-amount).pack(),
+        )
+    builder.button(
+        text="💵 Добавить", callback_data=AdminUserEditorCallback(action="users_balance_add", tg_id=tg_id).pack()
+    )
+    builder.button(
+        text="💵 Вычесть", callback_data=AdminUserEditorCallback(action="users_balance_take", tg_id=tg_id).pack()
+    )
+    builder.button(
+        text="💵 Установить баланс",
+        callback_data=AdminUserEditorCallback(action="users_balance_set", tg_id=tg_id).pack(),
+    )
+    builder.row(build_editor_back_btn(tg_id, True))
+    builder.adjust(2, 2, 2, 2, 2, 1)
+    return builder.as_markup()
+
+
+def build_users_key_show_kb(tg_id: int, email: str) -> InlineKeyboardMarkup:
+    builder = InlineKeyboardBuilder()
+    builder.button(
+        text="🔙 Назад",  # todo: fix magic text was set
+        callback_data=AdminUserEditorCallback(action="users_key_edit", tg_id=tg_id, data=email, edit=True).pack(),
+    )
+    return builder.as_markup()
+
+
+def build_users_key_expiry_kb(tg_id: int, email: str) -> InlineKeyboardMarkup:
+    builder = InlineKeyboardBuilder()
+    for month in RENEWAL_PRICES.keys():
+        month = int(month)
+        builder.button(
+            text=f"+ {month} мес.",
+            callback_data=AdminUserKeyEditorCallback(action="add", tg_id=tg_id, data=email, month=month).pack(),
+        )
+        builder.button(
+            text=f"- {month} мес.",
+            callback_data=AdminUserKeyEditorCallback(action="add", tg_id=tg_id, data=email, month=-month).pack(),
+        )
+    builder.button(
+        text="⏳ Добавить дни", callback_data=AdminUserKeyEditorCallback(action="add", tg_id=tg_id, data=email).pack()
+    )
+    builder.button(
+        text="⏳ Вычесть дни", callback_data=AdminUserKeyEditorCallback(action="take", tg_id=tg_id, data=email).pack()
+    )
+    builder.button(
+        text="⏳ Установить дату истечения",
+        callback_data=AdminUserKeyEditorCallback(action="set", tg_id=tg_id, data=email).pack(),
+    )
+    builder.button(
+        text="🔙 Назад",  # todo: fix magic text was set
+        callback_data=AdminUserEditorCallback(action="users_key_edit", tg_id=tg_id, data=email).pack(),
+    )
+    builder.adjust(2, 2, 2, 2, 2, 1)
+    return builder.as_markup()
+
+
+def build_user_delete_kb(tg_id: int):
+    builder = InlineKeyboardBuilder()
+    builder.button(
+        text="❌ Да, удалить!",
+        callback_data=AdminUserEditorCallback(action="users_delete_user_confirm", tg_id=tg_id).pack(),
+    )
+    builder.row(build_editor_back_btn(tg_id, True))
+    builder.adjust(1)
+    return builder.as_markup()
+
+
+def build_user_key_kb(tg_id: int, email: str) -> InlineKeyboardMarkup:
+    builder = InlineKeyboardBuilder()
+    builder.button(
+        text="🔙 Назад", callback_data=AdminUserEditorCallback(action="users_key_edit", tg_id=tg_id, data=email).pack()
+    )
+    builder.adjust(1)
+    return builder.as_markup()
+
+
+def build_key_edit_kb(key_details: dict, email: str) -> InlineKeyboardMarkup:
+    builder = InlineKeyboardBuilder()
+    builder.button(
+        text="⏳ Время истечения",
+        callback_data=AdminUserEditorCallback(
+            action="users_expiry_edit", data=email, tg_id=key_details["tg_id"]
+        ).pack(),
+    )
+    builder.button(
+        text="🔄 Перевыпустить",
+        callback_data=AdminUserEditorCallback(action="users_update_key", data=email, tg_id=key_details["tg_id"]).pack(),
+    )
+    builder.button(
+        text="❌ Удалить",
+        callback_data=AdminUserEditorCallback(action="users_delete_key", data=email, tg_id=key_details["tg_id"]).pack(),
+    )
+    builder.button(
+        text="📊 Трафик",
+        callback_data=AdminUserEditorCallback(action="users_traffic", data=email, tg_id=key_details["tg_id"]).pack(),
+    )
+    builder.row(build_editor_back_btn(key_details["tg_id"], True))
+    builder.adjust(1)
+    return builder.as_markup()
+
+
+def build_key_delete_kb(tg_id: int, email: str) -> InlineKeyboardMarkup:
+    builder = InlineKeyboardBuilder()
+    builder.row(
+        InlineKeyboardButton(
+            text="✅ Да, удалить",
+            callback_data=AdminUserEditorCallback(action="users_delete_key_confirm", data=email, tg_id=tg_id).pack(),
+        )
+    )
+    builder.row(build_editor_back_btn(tg_id))
+    builder.adjust(1)
+    return builder.as_markup()
+
+
+def build_editor_kb(tg_id: int, edit: bool = False) -> InlineKeyboardMarkup:
+    return build_editor_singleton_kb("🔙 Назад", tg_id, edit)
+
+
+def build_editor_singleton_kb(text: str, tg_id: int, edit: bool = False) -> InlineKeyboardMarkup:
+    builder = InlineKeyboardBuilder()
+    builder.row(build_editor_btn(text, tg_id, edit))
+    return builder.as_markup()
+
+
+def build_editor_back_btn(tg_id: int, edit: bool = False) -> InlineKeyboardButton:
+    return build_editor_btn("🔙 Назад", tg_id, edit)
+
+
+def build_editor_btn(text: str, tg_id: int, edit: bool = False) -> InlineKeyboardButton:
+    return InlineKeyboardButton(
+        text=text, callback_data=AdminUserEditorCallback(action="users_editor", tg_id=tg_id, edit=edit).pack()
+    )

keyboards/notifications/notify_kb.py

@@ -0,0 +1,27 @@
+from aiogram.types import InlineKeyboardMarkup
+
+
+def build_notification_kb(email: str) -> InlineKeyboardMarkup:
+    """
+    Формирует inline-клавиатуру для уведомлений.
+    Кнопки: "🔄 Продлить VPN" (callback_data содержит email) и "👤 Личный кабинет".
+    """
+    from aiogram.utils.keyboard import InlineKeyboardBuilder
+
+    builder = InlineKeyboardBuilder()
+    builder.button(text="🔄 Продлить VPN", callback_data=f"renew_key|{email}")
+    builder.button(text="👤 Личный кабинет", callback_data="profile")
+    builder.adjust(1)
+    return builder.as_markup()
+
+
+def build_notification_expired_kb() -> InlineKeyboardMarkup:
+    """
+    Формирует inline-клавиатуру для уведомлений после удаления или продления.
+    Кнопка: "👤 Личный кабинет"
+    """
+    from aiogram.utils.keyboard import InlineKeyboardBuilder
+
+    builder = InlineKeyboardBuilder()
+    builder.button(text="👤 Личный кабинет", callback_data="profile")
+    return builder.as_markup()

middlewares/__init__.py

@@ -0,0 +1,58 @@
+from collections.abc import Iterable
+from typing import Any, Optional, Type, Union
+
+from aiogram import Dispatcher
+from aiogram.dispatcher.middlewares.base import BaseMiddleware
+
+from .admin import AdminMiddleware
+from .loggings import LoggingMiddleware
+from .session import SessionMiddleware
+from .throttling import ThrottlingMiddleware
+from .user import UserMiddleware
+
+
+def register_middleware(
+    dispatcher: Dispatcher,
+    middlewares: Iterable[BaseMiddleware | type[BaseMiddleware]] | None = None,
+    exclude: Iterable[str] | None = None,
+) -> None:
+    """Регистрирует middleware в диспетчере.
+
+    Args:
+        dispatcher: Экземпляр диспетчера Aiogram
+        middlewares: Опциональный список middleware для регистрации.
+                    Если не указан, регистрируются все стандартные middleware.
+        exclude: Опциональный список имен middleware, которые нужно исключить из регистрации.
+                Применяется только если middlewares не указан.
+    """
+    # Если middleware не указаны, используем стандартный набор
+    if middlewares is None:
+        # Словарь всех доступных middleware
+        available_middlewares = {
+            "admin": AdminMiddleware(),
+            "session": SessionMiddleware(),
+            "logging": LoggingMiddleware(),
+            "throttling": ThrottlingMiddleware(),
+            "user": UserMiddleware(),
+        }
+
+        # Фильтруем middleware по списку исключений
+        exclude_set = set(exclude or [])
+        middlewares = [middleware for name, middleware in available_middlewares.items() if name not in exclude_set]
+
+    # Регистрируем middleware для всех типов обработчиков
+    handlers = [
+        dispatcher.message,
+        dispatcher.callback_query,
+        dispatcher.inline_query,
+        # Можно добавить другие типы обработчиков при необходимости
+    ]
+
+    # Регистрируем каждый middleware для каждого типа обработчика
+    for middleware in middlewares:
+        # Если передан класс, а не экземпляр, создаем экземпляр
+        if isinstance(middleware, type):
+            middleware = middleware()
+
+        for handler in handlers:
+            handler.outer_middleware(middleware)

middlewares/admin.py

@@ -1,27 +1,58 @@
 from collections.abc import Awaitable, Callable
-from typing import Any
+from typing import Any, Dict, Set, cast
 
 from aiogram import BaseMiddleware
-from aiogram.types import TelegramObject
+from aiogram.types import CallbackQuery, Message, TelegramObject
 
 from config import ADMIN_ID
 
 
 class AdminMiddleware(BaseMiddleware):
+    """Middleware для проверки прав администратора.
+
+    Добавляет в data['admin'] = True/False в зависимости от того,
+    является ли пользователь администратором.
+    """
+
+    # Кэш ID администраторов для быстрого доступа
+    _admin_ids: set[int] = set(ADMIN_ID) if isinstance(ADMIN_ID, (list, tuple)) else {ADMIN_ID}
+
     async def __call__(
         self,
         handler: Callable[[TelegramObject, dict[str, Any]], Awaitable[Any]],
         event: TelegramObject,
         data: dict[str, Any],
     ) -> Any:
+        """Обрабатывает событие и добавляет флаг администратора в data.
+
+        Args:
+            handler: Обработчик события
+            event: Событие Telegram
+            data: Словарь с данными события
+
+        Returns:
+            Результат выполнения обработчика
+        """
         data["admin"] = self._check_admin_access(event)
         return await handler(event, data)
 
     def _check_admin_access(self, event: TelegramObject) -> bool:
+        """Проверяет, имеет ли пользователь права администратора.
+
+        Args:
+            event: Событие Telegram
+
+        Returns:
+            True, если пользователь администратор, иначе False
+        """
         try:
-            admin_ids: int | list[int] = ADMIN_ID
-            if isinstance(admin_ids, list):
-                return event.from_user.id in admin_ids
-            return event.from_user.id == admin_ids
+            if isinstance(event, Message):
+                return event.from_user and event.from_user.id in self._admin_ids
+            elif isinstance(event, CallbackQuery):
+                return event.from_user and event.from_user.id in self._admin_ids
+
+            # Для других типов событий пытаемся получить from_user
+            user_id = getattr(getattr(event, "from_user", None), "id", None)
+            return user_id in self._admin_ids if user_id else False
         except Exception:
             return False

middlewares/database.py

@@ -1,23 +0,0 @@
-from collections.abc import Awaitable, Callable
-from typing import Any
-
-import asyncpg
-from aiogram import BaseMiddleware
-from aiogram.types import TelegramObject
-
-from config import DATABASE_URL
-
-
-class DatabaseMiddleware(BaseMiddleware):
-    async def __call__(
-        self,
-        handler: Callable[[TelegramObject, dict[str, Any]], Awaitable[Any]],
-        event: TelegramObject,
-        data: dict[str, Any],
-    ) -> Any:
-        conn = await asyncpg.connect(DATABASE_URL)
-        try:
-            data["session"] = conn
-            return await handler(event, data)
-        finally:
-            await conn.close()

middlewares/delete.py

@@ -1,28 +0,0 @@
-from collections.abc import Awaitable, Callable
-from typing import Any
-
-from aiogram import BaseMiddleware
-from aiogram.types import CallbackQuery, Message, TelegramObject
-
-
-class DeleteMessageMiddleware(BaseMiddleware):
-    async def __call__(
-        self,
-        handler: Callable[[TelegramObject, dict[str, Any]], Awaitable[Any]],
-        event: TelegramObject,
-        data: dict[str, Any],
-    ) -> Any:
-        if isinstance(event, (Message, CallbackQuery)):
-            if isinstance(event, Message):
-                if not event.text or not event.text.startswith("/start"):
-                    try:
-                        await event.bot.delete_message(
-                            event.chat.id, event.message_id - 1
-                        )
-                    except Exception:
-                        pass
-                    await event.delete()
-            elif isinstance(event, CallbackQuery):
-                await event.answer()
-                await event.message.delete()
-        return await handler(event, data)

middlewares/logging.py

@@ -1,43 +0,0 @@
-from collections.abc import Awaitable, Callable
-from typing import Any
-
-from aiogram import BaseMiddleware
-from aiogram.types import CallbackQuery, Message, TelegramObject
-
-from logger import logger
-
-
-class LoggingMiddleware(BaseMiddleware):
-    async def __call__(
-        self,
-        handler: Callable[[TelegramObject, dict[str, Any]], Awaitable[Any]],
-        event: TelegramObject,
-        data: dict[str, Any],
-    ) -> Any:
-        user_info = self._extract_user_info(event)
-
-        logger.info(
-            f"Активность пользователя - "
-            f"ID пользователя: {user_info['user_id']}, "
-            f"Имя пользователя: {user_info['username']}, "
-            f"Действие: {user_info['action']}"
-        )
-        return await handler(event, data)
-
-    def _extract_user_info(self, event: TelegramObject) -> dict[str, str | None]:
-        user_id = None
-        username = None
-        action = None
-
-        if isinstance(event, Message):
-            user = event.from_user
-            user_id = user.id
-            username = user.username
-            action = f"Сообщение: {event.text}"
-        elif isinstance(event, CallbackQuery):
-            user = event.from_user
-            user_id = user.id
-            username = user.username
-            action = f"Обратный вызов: {event.data}"
-
-        return {"user_id": user_id, "username": username, "action": action}

middlewares/loggings.py

@@ -0,0 +1,61 @@
+from collections.abc import Awaitable, Callable
+from typing import Any, Dict, Optional, TypedDict, Union
+
+from aiogram import BaseMiddleware
+from aiogram.types import CallbackQuery, InlineQuery, Message, TelegramObject, User
+
+from logger import logger
+
+
+class UserInfo(TypedDict):
+    user_id: int | None
+    username: str | None
+    action: str | None
+
+
+class LoggingMiddleware(BaseMiddleware):
+    """Middleware для логирования действий пользователя."""
+
+    async def __call__(
+        self,
+        handler: Callable[[TelegramObject, dict[str, Any]], Awaitable[Any]],
+        event: TelegramObject,
+        data: dict[str, Any],
+    ) -> Any:
+        user_info = self._extract_user_info(event)
+
+        if user_info["user_id"]:
+            logger.info(
+                f"Активность пользователя - "
+                f"ID пользователя: {user_info['user_id']}, "
+                f"Имя пользователя: {user_info['username'] or 'Не указано'}, "
+                f"Действие: {user_info['action'] or 'Неизвестно'}"
+            )
+
+        return await handler(event, data)
+
+    def _extract_user_info(self, event: TelegramObject) -> UserInfo:
+        """Извлекает информацию о пользователе из различных типов событий.
+
+        Args:
+            event: Событие Telegram
+
+        Returns:
+            Словарь с информацией о пользователе
+        """
+        result: UserInfo = {"user_id": None, "username": None, "action": None}
+
+        # Обработка общих атрибутов для разных типов событий
+        if hasattr(event, "from_user") and isinstance(event.from_user, User):
+            result["user_id"] = event.from_user.id
+            result["username"] = event.from_user.username
+
+            # Определение типа действия в зависимости от типа события
+            if isinstance(event, Message):
+                result["action"] = f"Сообщение: {event.text}"
+            elif isinstance(event, CallbackQuery):
+                result["action"] = f"Обратный вызов: {event.data}"
+            elif isinstance(event, InlineQuery):
+                result["action"] = f"Inline запрос: {event.query}"
+
+        return result

middlewares/session.py

@@ -0,0 +1,34 @@
+from collections.abc import Awaitable, Callable
+from typing import Any, Optional
+
+import asyncpg
+from aiogram import BaseMiddleware
+from aiogram.types import TelegramObject
+
+from config import DATABASE_URL
+
+
+class SessionMiddleware(BaseMiddleware):
+    pool: asyncpg.Pool | None = None
+
+    async def __call__(
+        self,
+        handler: Callable[[TelegramObject, dict[str, Any]], Awaitable[Any]],
+        event: TelegramObject,
+        data: dict[str, Any],
+    ) -> Any:
+        # Создаем пул соединений при первом вызове
+        if self.pool is None:
+            self.pool = await asyncpg.create_pool(DATABASE_URL, min_size=5, max_size=20)
+
+        # Получаем соединение из пула
+        async with self.pool.acquire() as conn:
+            data["session"] = conn
+            return await handler(event, data)
+
+    @classmethod
+    async def close(cls) -> None:
+        """Закрыть пул соединений при завершении работы приложения."""
+        if cls.pool is not None:
+            await cls.pool.close()
+            cls.pool = None

middlewares/throttling.py

@@ -0,0 +1,109 @@
+from collections.abc import Awaitable, Callable, MutableMapping
+from typing import Any, Dict, Optional, Union
+
+from aiogram import BaseMiddleware
+from aiogram.dispatcher.flags import get_flag
+from aiogram.types import TelegramObject, Update, User
+from cachetools import TTLCache
+
+from logger import logger
+
+
+class ThrottlingMiddleware(BaseMiddleware):
+    """
+    Middleware для ограничения частоты запросов от пользователей.
+    Позволяет настраивать разные временные интервалы для разных типов запросов.
+    """
+
+    def __init__(
+        self,
+        *,
+        default_key: str | None = "default",
+        default_ttl: float = 0.5,
+        cache_size: int = 10_000,
+        **ttl_map: float,
+    ) -> None:
+        """
+        Инициализация middleware для ограничения частоты запросов.
+
+        Args:
+            default_key: Ключ по умолчанию для ограничения
+            default_ttl: Время ограничения по умолчанию в секундах
+            cache_size: Максимальный размер кэша для каждого ключа
+            **ttl_map: Словарь с ключами и временем ограничения
+        """
+        # Добавляем ключ по умолчанию в карту TTL, если он указан
+        if default_key:
+            ttl_map[default_key] = default_ttl
+
+        self.default_key = default_key
+        self.caches: dict[str, MutableMapping[int, None]] = {}
+        self.cache_size = cache_size
+
+        # Инициализация кэшей для каждого ключа
+        for name, ttl in ttl_map.items():
+            self.caches[name] = TTLCache(maxsize=self.cache_size, ttl=ttl)
+
+        logger.debug(f"ThrottlingMiddleware initialized with {len(self.caches)} throttling keys")
+
+    def _should_skip_throttling(self, event: Update) -> bool:
+        """
+        Проверяет, нужно ли пропустить ограничение для данного события.
+
+        Args:
+            event: Событие Telegram
+
+        Returns:
+            True, если ограничение следует пропустить
+        """
+        # Пропускаем предварительные запросы на оплату
+        if event.pre_checkout_query:
+            return True
+
+        # Пропускаем уведомления об успешной оплате
+        if event.message and event.message.successful_payment:
+            return True
+
+        return False
+
+    async def __call__(
+        self,
+        handler: Callable[[TelegramObject, dict[str, Any]], Awaitable[Any]],
+        event: TelegramObject,
+        data: dict[str, Any],
+    ) -> Any:
+        # Проверяем, что событие является экземпляром Update
+        if not isinstance(event, Update):
+            logger.debug(f"Skipping throttling for non-Update event: {type(event).__name__}")
+            return await handler(event, data)
+
+        # Проверяем, нужно ли пропустить ограничение
+        if self._should_skip_throttling(event):
+            logger.debug("Skipping throttling for special event type")
+            return await handler(event, data)
+
+        # Получаем пользователя из данных события
+        user: User | None = data.get("event_from_user")
+
+        if user is None:
+            logger.debug("No user found in event data, proceeding without throttle")
+            return await handler(event, data)
+
+        # Получаем ключ ограничения из флагов или используем ключ по умолчанию
+        key = get_flag(data, "throttling_key", default=self.default_key)
+
+        if not key:
+            logger.debug(f"No throttling key provided for user {user.id}, proceeding without throttle")
+            return await handler(event, data)
+
+        # Проверяем, находится ли пользователь в кэше (т.е. ограничен)
+        if user.id in self.caches[key]:
+            logger.warning(f"User {user.id} is throttled with key: {key}")
+            return None
+
+        # Добавляем пользователя в кэш
+        self.caches[key][user.id] = None
+        logger.debug(f"User {user.id} allowed to proceed with key: {key}")
+
+        # Продолжаем обработку события
+        return await handler(event, data)

middlewares/user.py

@@ -5,25 +5,60 @@ from aiogram import BaseMiddleware
 from aiogram.types import TelegramObject, User
 
 from database import upsert_user
+from logger import logger
 
 
 class UserMiddleware(BaseMiddleware):
+    """
+    Middleware для обработки информации о пользователе.
+    Сохраняет или обновляет данные пользователя в базе данных.
+    """
+
     async def __call__(
         self,
         handler: Callable[[TelegramObject, dict[str, Any]], Awaitable[Any]],
         event: TelegramObject,
         data: dict[str, Any],
     ) -> Any:
-        if user := data.get("event_from_user"):
-            await self._process_user(user)
+        try:
+            # Получаем пользователя из данных события
+            if user := data.get("event_from_user"):
+                # Получаем сессию из контекста, если она есть
+                session = data.get("session")
+                # Обрабатываем пользователя и получаем его данные из БД
+                db_user = await self._process_user(user, session)
+                # Добавляем данные пользователя из БД в контекст
+                if db_user:
+                    data["user"] = db_user
+        except Exception as e:
+            # Логируем ошибку, но не прерываем обработку события
+            logger.error(f"Ошибка при обработке пользователя: {e}")
+
+        # Продолжаем обработку события в любом случае
         return await handler(event, data)
 
-    async def _process_user(self, user: User) -> None:
-        await upsert_user(
+    async def _process_user(self, user: User, session: Any = None) -> dict:
+        """
+        Обрабатывает информацию о пользователе и сохраняет её в базу данных.
+
+        Args:
+            user (User): Объект пользователя Telegram
+            session (Any, optional): Сессия базы данных, если доступна
+
+        Returns:
+            dict: Словарь с информацией о пользователе из базы данных
+        """
+        logger.debug(f"Обработка пользователя: {user.id}")
+        # Получаем данные пользователя из БД после вставки/обновления
+        user_data = await upsert_user(
             tg_id=user.id,
             username=user.username,
             first_name=user.first_name,
             last_name=user.last_name,
             language_code=user.language_code,
             is_bot=user.is_bot,
+            session=session,  # Передаем сессию, если она есть
         )
+
+        logger.debug(f"Получены данные пользователя из БД: {user.id}")
+        return user_data

pyproject.toml

@@ -1,17 +1,75 @@
+[project]
+name = "Solo_bot"
+version = "0.0.1"
+dependencies = [
+    "aiofiles==24.1.0",
+    "aiogram==3.13.1",
+    "aiohappyeyeballs==2.4.3",
+    "aiohttp==3.10.10",
+    "aiosignal==1.3.1",
+    "annotated-types==0.7.0",
+    "async-timeout==4.0.3",
+    "asyncpg==0.30.0",
+    "attrs==24.2.0",
+    "certifi",
+    "charset-normalizer==3.4.0",
+    "deprecated==1.2.14",
+    "distro==1.9.0",
+    "frozenlist==1.4.1",
+    "idna==3.10",
+    "magic-filter==1.0.12",
+    "multidict==6.1.0",
+    "netaddr==1.3.0",
+    "propcache==0.2.0",
+    "pydantic",
+    "pydantic-core",
+    "requests==2.32.3",
+    "typing-extensions==4.12.2",
+    "urllib3==2.2.3",
+    "wrapt==1.16.0",
+    "yarl==1.15.5",
+    "yookassa==3.3.0",
+    "loguru",
+    "aiocryptopay",
+    "py3xui",
+    "sqlalchemy",
+    "robokassa",
+    "ping3",
+    "ruff",
+    "pytz",
+    "cachetools",
+    "babel",
+]
+
 [tool.ruff]
 line-length = 120
-target-version = "py310"
+target-version = "py312"
+
+[tool.uv]
+package = false
 
 [tool.ruff.lint]
 select = ["E", "F", "W", "I", "N", "UP", "ANN", "ASYNC", "S", "BLE", "FBT", "B", "A", "C4", "DTZ", "T10", "ISC", "ICN", "G", "PIE"]
-ignore = ["ANN101", "ANN102", "S101",'ANN201','ANN001','BLE001']
+ignore = ["ANN101", "ANN102", "S101",'ANN201','ANN001','BLE001','W291','ANN401','DTZ003','DTZ005','F401','FBT002','FBT001','FBT003','A005','E501','UP017','DTZ004','W293','ANN202','DTZ007']
+exclude = [
+    ".git", 
+    "venv",
+    "main.py",
+    "handlers/payments",
+]
 
 [tool.ruff.format]
-quote-style = "single"
+quote-style = "double"
 indent-style = "space"
 
 [tool.darker]
 src = ["."]
 revision = "HEAD"
 diff = false
-check = false 
+check = false 
+exclude = [
+    ".git", 
+    "venv",
+    "main.py",
+    "handlers/payments",
+]

requirements.txt

@@ -1,34 +1,44 @@
+aiocryptopay==0.4.7
 aiofiles==24.1.0
 aiogram==3.13.1
 aiohappyeyeballs==2.4.3
 aiohttp==3.10.10
 aiosignal==1.3.1
 annotated-types==0.7.0
+anyio==4.8.0
 async-timeout==4.0.3
 asyncpg==0.30.0
 attrs==24.2.0
-certifi
+babel==2.17.0
+cachetools==5.5.1
+certifi==2023.11.17
 charset-normalizer==3.4.0
-Deprecated==1.2.14
+deprecated==1.2.14
 distro==1.9.0
 frozenlist==1.4.1
+greenlet==3.1.1
+h11==0.14.0
+httpcore==1.0.7
+httpx==0.27.2
 idna==3.10
+loguru==0.7.3
 magic-filter==1.0.12
 multidict==6.1.0
 netaddr==1.3.0
+ping3==4.0.8
 propcache==0.2.0
-pydantic
-pydantic_core
+py3xui==0.3.4
+pydantic==2.9.2
+pydantic-core==2.23.4
+pytz==2025.1
 requests==2.32.3
-typing_extensions==4.12.2
+robokassa==0.3.2
+ruff==0.9.5
+sniffio==1.3.1
+sqlalchemy==2.0.38
+strenum==0.4.15
+typing-extensions==4.12.2
 urllib3==2.2.3
 wrapt==1.16.0
 yarl==1.15.5
 yookassa==3.3.0
-loguru
-aiocryptopay
-py3xui
-sqlalchemy
-robokassa
-ping3
-ruff

servers.py

@@ -2,199 +2,118 @@ import asyncio
 import re
 from datetime import datetime, timedelta
 
-import asyncpg
 from aiogram.types import InlineKeyboardButton
 from aiogram.utils.keyboard import InlineKeyboardBuilder
 from ping3 import ping
 
 from bot import bot
-from config import ADMIN_ID, DATABASE_URL
-from database import get_servers_from_db
+from config import ADMIN_ID, PING_TIME
+from database import get_servers
+from keyboards.admin.servers_kb import AdminServerEditorCallback
 from logger import logger
 
-try:
-    from config import CLUSTERS
-except ImportError:
-    CLUSTERS = None
-    logger.warning(
-        "Переменная CLUSTERS не найдена в конфигурации. Добавьте сервера через админ-панель!"
-    )
-
-
-async def sync_servers_with_db():
-    """
-    Синхронизирует сервера из конфигурации CLUSTERS с базой данных.
-    Если CLUSTERS не найден, синхронизация не будет выполнена.
-    """
-    if CLUSTERS is None:
-        logger.info(
-            "Конфигурация CLUSTERS не найдена. Синхронизация не будет выполнена."
-        )
-        return
-
-    try:
-        conn = await asyncpg.connect(DATABASE_URL)
-        logger.info("Подключение к базе данных для синхронизации серверов успешно.")
-
-        for cluster_name, servers in CLUSTERS.items():
-            for server_key, server_info in servers.items():
-                exists = await conn.fetchval(
-                    """
-                    SELECT 1 FROM servers
-                    WHERE cluster_name = $1 AND server_name = $2
-                    """,
-                    cluster_name,
-                    server_info["name"],
-                )
-
-                if not exists:
-                    await conn.execute(
-                        """
-                        INSERT INTO servers (cluster_name, server_name, api_url, subscription_url, inbound_id)
-                        VALUES ($1, $2, $3, $4, $5)
-                        """,
-                        cluster_name,
-                        server_info["name"],
-                        server_info["API_URL"],
-                        server_info["SUBSCRIPTION"],
-                        server_info["INBOUND_ID"],
-                    )
-                    logger.info(
-                        f"Сервер {server_info['name']} из кластера {cluster_name} добавлен в базу данных."
-                    )
-                else:
-                    logger.info(
-                        f"Сервер {server_info['name']} из кластера {cluster_name} уже существует."
-                    )
-
-    except Exception as e:
-        logger.error(f"Ошибка при синхронизации серверов: {e}")
-    finally:
-        if "conn" in locals():
-            await conn.close()
-
-
 last_ping_times = {}
 last_notification_times = {}
+PING_SEMAPHORE = asyncio.Semaphore(3)
 
 
 async def ping_server(server_ip: str) -> bool:
-    """
-    Функция пинга сервера.
-    Возвращает True, если сервер доступен, иначе False.
-    """
+    """Пингует сервер через ICMP или TCP 443, если ICMP недоступен или возникает ошибка."""
+    async with PING_SEMAPHORE:
+        try:
+            response = ping(server_ip, timeout=3)
+            if response is not None and response is not False:
+                return True
+            return await check_tcp_connection(server_ip, 443)
+        except Exception:
+            return await check_tcp_connection(server_ip, 443)
+
+
+async def check_tcp_connection(host: str, port: int) -> bool:
+    """Проверяет доступность сервера через TCP (порт 443)."""
     try:
-        logger.debug(f"Пингуем сервер {server_ip}...")
-        response = ping(server_ip, timeout=3)
-        if response is False:
-            logger.warning(f"Сервер {server_ip} не отвечает.")
-            return False
+        reader, writer = await asyncio.open_connection(host, port)
+        writer.close()
+        await writer.wait_closed()
         return True
-    except Exception as e:
-        logger.error(f"Ошибка при пинге сервера {server_ip}: {e}")
+    except Exception:
         return False
 
 
 async def notify_admin(server_name: str):
-    """
-    Отправляет уведомление всем администраторам о недоступности сервера.
-    Уведомления отправляются не чаще чем раз в 3 минуты.
-    """
-    try:
-        current_time = datetime.now()
-        last_notification_time = last_notification_times.get(server_name)
+    """Отправляет уведомление администраторам о недоступности сервера (не чаще чем раз в 3 минуты)."""
+    current_time = datetime.now()
+    last_notification_time = last_notification_times.get(server_name)
 
-        if last_notification_time and current_time - last_notification_time < timedelta(
-            minutes=3
-        ):
-            logger.info(
-                f"Не отправляем уведомление для сервера {server_name}, так как прошло менее 3 минут."
-            )
-            return
+    if last_notification_time and current_time - last_notification_time < timedelta(minutes=3):
+        return
 
-        logger.info(
-            f"Отправка уведомлений администратору о недоступности сервера {server_name}..."
+    builder = InlineKeyboardBuilder()
+    builder.row(
+        InlineKeyboardButton(
+            text="Управление сервером",
+            callback_data=AdminServerEditorCallback(action="servers_manage", data=server_name).pack(),
+        )
+    )
+
+    for admin_id in ADMIN_ID:
+        await bot.send_message(
+            admin_id,
+            (
+                f"❌ <b>Сервер '{server_name}'</b> не отвечает более {PING_TIME * 3} секунд.\n\n"
+                "Проверьте соединение к серверу или удалите его из списка, чтобы не выдавать подписки на неработающий сервер."
+            ),
+            reply_markup=builder.as_markup(),
         )
 
-        builder = InlineKeyboardBuilder()
-        builder.row(
-            InlineKeyboardButton(
-                text="Управление сервером", callback_data=f"manage_server|{server_name}"
-            )
-        )
-
-        for admin_id in ADMIN_ID:
-            await bot.send_message(
-                admin_id,
-                (
-                    f"❌ <b>Сервер '{server_name}'</b> не отвечает более 3 минут.\n\n"
-                    "Проверьте соединение к серверу, подключение к панели или удалите его из таблицы серверов в боте, "
-                    "чтобы не выдать подписку к неработающему серверу."
-                ),
-                parse_mode="HTML",
-                reply_markup=builder.as_markup(),
-            )
-            logger.info(
-                f"Уведомление отправлено администратору с ID {admin_id} о сервере {server_name}."
-            )
-
-        last_notification_times[server_name] = current_time
-    except Exception as e:
-        logger.error(f"Ошибка при отправке уведомления администраторам: {e}")
+    last_notification_times[server_name] = current_time
 
 
 async def check_servers():
     """
-    Периодическая проверка серверов с учетом извлечения хоста из `api_url`.
+    Периодическая проверка серверов.
+    Использует `asyncio.gather()` для ускорения.
     """
     while True:
-        servers = await get_servers_from_db()
+        servers = await get_servers()
         current_time = datetime.now()
 
-        logger.info(f"Начинаю проверку серверов: {current_time}")
+        tasks = []
+        server_info_list = []
 
-        for cluster_name, cluster_servers in servers.items():
-            logger.debug(f"Проверка кластеров: {cluster_name}")
+        for _, cluster_servers in servers.items():
             for server in cluster_servers:
                 original_api_url = server["api_url"]
                 server_name = server["server_name"]
-
                 server_host = extract_host(original_api_url)
-                logger.debug(
-                    f"Проверка доступности сервера '{server_name}' с хостом {server_host}"
-                )
 
-                is_online = await ping_server(server_host)
+                server_info_list.append((server_name, server_host))
+                tasks.append(ping_server(server_host))
 
-                if is_online:
+        results = await asyncio.gather(*tasks)
+
+        offline_servers = []
+
+        for (server_name, _), is_online in zip(server_info_list, results, strict=False):
+            if is_online:
+                last_ping_times[server_name] = current_time
+            else:
+                last_ping_time = last_ping_times.get(server_name)
+                if last_ping_time and current_time - last_ping_time > timedelta(seconds=PING_TIME * 3):
+                    offline_servers.append(server_name)
+                    await notify_admin(server_name)
+                elif not last_ping_time:
                     last_ping_times[server_name] = current_time
-                else:
-                    last_ping_time = last_ping_times.get(server_name)
-                    if last_ping_time and current_time - last_ping_time > timedelta(
-                        minutes=3
-                    ):
-                        logger.warning(
-                            f"Сервер {server_name} не отвечает более 3 минут. Отправляю уведомление."
-                        )
-                        await notify_admin(server_name)
-                    elif not last_ping_time:
-                        last_ping_times[server_name] = current_time
-                        logger.info(
-                            f"Сервер {server_name} не отвечал ранее, но теперь зарегистрирован."
-                        )
 
-        logger.info("Завершена проверка всех серверов.")
-        await asyncio.sleep(30)
+        online_servers = [name for name, _ in server_info_list if name not in offline_servers]
+        logger.info(f"Проверка серверов завершена. Доступно: {len(online_servers)}, Недоступно: {len(offline_servers)}")
+        if offline_servers:
+            logger.warning(f"🚨 Не отвечает {len(offline_servers)} серверов: {', '.join(offline_servers)}")
+
+        await asyncio.sleep(PING_TIME)
 
 
 def extract_host(api_url: str) -> str:
-    """
-    Извлекает только хост из `api_url` (без путей, портов и параметров).
-    """
+    """Извлекает хост из `api_url`."""
     match = re.match(r"(https?://)?([^:/]+)", api_url)
-    if match:
-        host = match.group(2)
-        logger.debug(f"Извлечён хост: {host} из URL: {api_url}")
-        return host
-    logger.error(f"Не удалось извлечь хост из URL: {api_url}")
-    return api_url
+    return match.group(2) if match else api_url

utils/csv_export.py

@@ -0,0 +1,97 @@
+from io import StringIO
+from typing import Any
+
+from aiogram.types import BufferedInputFile
+
+
+async def export_users_csv(session: Any) -> BufferedInputFile:
+    """
+    Экспорт пользователей в CSV с сортировкой от самого старого к новому.
+    """
+    query = """
+        SELECT 
+            u.tg_id, 
+            u.username, 
+            u.first_name, 
+            u.last_name, 
+            u.language_code, 
+            u.is_bot, 
+            c.balance, 
+            c.trial,
+            u.created_at  -- Добавляем дату регистрации
+        FROM users u
+        LEFT JOIN connections c ON u.tg_id = c.tg_id
+        ORDER BY u.created_at ASC  -- Сортировка от старых к новым
+    """
+
+    users = await session.fetch(query)
+
+    buffer = StringIO()
+    buffer.write("tg_id,username,first_name,last_name,language_code,is_bot,balance,trial,created_at\n")
+
+    for user in users:
+        buffer.write(
+            f"{user['tg_id']},{user['username']},{user['first_name']},{user['last_name']},"
+            f"{user['language_code']},{user['is_bot']},{user['balance']},{user['trial']},"
+            f"{user['created_at']}\n"
+        )
+
+    buffer.seek(0)
+
+    return BufferedInputFile(file=buffer.getvalue().encode("utf-8-sig"), filename="users_export.csv")
+
+
+async def export_payments_csv(session: Any) -> BufferedInputFile:
+    """
+    Экспорт платежей в CSV с сортировкой от самого старого к новому.
+    """
+    query = """
+        SELECT 
+            u.tg_id, 
+            u.username, 
+            u.first_name, 
+            u.last_name, 
+            p.amount, 
+            p.payment_system,
+            p.status,
+            p.created_at 
+        FROM users u
+        JOIN payments p ON u.tg_id = p.tg_id
+        ORDER BY p.created_at ASC  -- Сортировка по дате от старых к новым
+    """
+    payments = await session.fetch(query)
+    return _export_payments_csv(payments, "payments_export.csv")
+
+
+async def export_user_payments_csv(tg_id: int, session: Any) -> BufferedInputFile:
+    query = """
+            SELECT 
+                u.tg_id, 
+                u.username, 
+                u.first_name, 
+                u.last_name, 
+                p.amount, 
+                p.payment_system,
+                p.status,
+                p.created_at 
+            FROM users u 
+            JOIN payments p ON u.tg_id = p.tg_id
+            WHERE u.tg_id = $1
+        """
+    payments = await session.fetch(query, tg_id)
+    return _export_payments_csv(payments, f"payments_export_{tg_id}.csv")
+
+
+def _export_payments_csv(payments: list, filename: str) -> BufferedInputFile:
+    buffer = StringIO()
+    buffer.write("tg_id,username,first_name,last_name,amount,payment_system,status,created_at\n")
+
+    for payment in payments:
+        buffer.write(
+            f"{payment['tg_id']},{payment['username']},{payment['first_name']},{payment['last_name']},"
+            f"{payment['amount']},{payment['payment_system']},{payment['status']},{payment['created_at']}\n"
+        )
+
+    buffer.seek(0)
+
+    return BufferedInputFile(file=buffer.getvalue().encode("utf-8-sig"), filename=filename)

uv.lock

@@ -0,0 +1,860 @@
+version = 1
+requires-python = ">=3.12"
+resolution-markers = [
+    "python_full_version >= '3.13'",
+    "python_full_version < '3.13'",
+]
+
+[[package]]
+name = "aiocryptopay"
+version = "0.4.7"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "aiohttp" },
+    { name = "certifi" },
+    { name = "pydantic" },
+    { name = "strenum" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/6e/e6/0bfcd032c853e3e44965c475b17d3a9f2f82e8a8df9daed071e9e6c4e167/aiocryptopay-0.4.7.tar.gz", hash = "sha256:f6bbb8433a2783bfa120ce4ec95af46f64a6491abc354efc10f31f2d1b90ccd1", size = 10830 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/fd/d5/edd9565bb46e4945ad089678119bd4905c5f8fead26466625cdef4a6fc7f/aiocryptopay-0.4.7-py3-none-any.whl", hash = "sha256:1b53eee4baa0cb34b87a6cfd35b5ee26352babc6964eec3c701b925a733f19bc", size = 14391 },
+]
+
+[[package]]
+name = "aiofiles"
+version = "24.1.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/0b/03/a88171e277e8caa88a4c77808c20ebb04ba74cc4681bf1e9416c862de237/aiofiles-24.1.0.tar.gz", hash = "sha256:22a075c9e5a3810f0c2e48f3008c94d68c65d763b9b03857924c99e57355166c", size = 30247 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/a5/45/30bb92d442636f570cb5651bc661f52b610e2eec3f891a5dc3a4c3667db0/aiofiles-24.1.0-py3-none-any.whl", hash = "sha256:b4ec55f4195e3eb5d7abd1bf7e061763e864dd4954231fb8539a0ef8bb8260e5", size = 15896 },
+]
+
+[[package]]
+name = "aiogram"
+version = "3.13.1"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "aiofiles" },
+    { name = "aiohttp" },
+    { name = "certifi" },
+    { name = "magic-filter" },
+    { name = "pydantic" },
+    { name = "typing-extensions" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/ea/34/192e1166d9dbb5c53a4654a0dbf69a3c6e91d0f9e0d77adbb0544ff23dda/aiogram-3.13.1.tar.gz", hash = "sha256:2674640ae74501ae30e68a5354e03f12e10db3adbcbd475bb56904536288c9c9", size = 1347281 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/c3/3b/2c2ca8f56226079ec134db7130b1c60b398671b76d55edab0fc2bb47f173/aiogram-3.13.1-py3-none-any.whl", hash = "sha256:148cbba15c2b6e0bc482aff6ae86848ed43e023b7102336bad17698242693000", size = 588744 },
+]
+
+[[package]]
+name = "aiohappyeyeballs"
+version = "2.4.3"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/bc/69/2f6d5a019bd02e920a3417689a89887b39ad1e350b562f9955693d900c40/aiohappyeyeballs-2.4.3.tar.gz", hash = "sha256:75cf88a15106a5002a8eb1dab212525c00d1f4c0fa96e551c9fbe6f09a621586", size = 21809 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/f7/d8/120cd0fe3e8530df0539e71ba9683eade12cae103dd7543e50d15f737917/aiohappyeyeballs-2.4.3-py3-none-any.whl", hash = "sha256:8a7a83727b2756f394ab2895ea0765a0a8c475e3c71e98d43d76f22b4b435572", size = 14742 },
+]
+
+[[package]]
+name = "aiohttp"
+version = "3.10.10"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "aiohappyeyeballs" },
+    { name = "aiosignal" },
+    { name = "attrs" },
+    { name = "frozenlist" },
+    { name = "multidict" },
+    { name = "yarl" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/17/7e/16e57e6cf20eb62481a2f9ce8674328407187950ccc602ad07c685279141/aiohttp-3.10.10.tar.gz", hash = "sha256:0631dd7c9f0822cc61c88586ca76d5b5ada26538097d0f1df510b082bad3411a", size = 7542993 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/ae/99/4c5aefe5ad06a1baf206aed6598c7cdcbc7c044c46801cd0d1ecb758cae3/aiohttp-3.10.10-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:9294bbb581f92770e6ed5c19559e1e99255e4ca604a22c5c6397b2f9dd3ee42c", size = 583536 },
+    { url = "https://files.pythonhosted.org/packages/a9/36/8b3bc49b49cb6d2da40ee61ff15dbcc44fd345a3e6ab5bb20844df929821/aiohttp-3.10.10-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:a8fa23fe62c436ccf23ff930149c047f060c7126eae3ccea005f0483f27b2e28", size = 395693 },
+    { url = "https://files.pythonhosted.org/packages/e1/77/0aa8660dcf11fa65d61712dbb458c4989de220a844bd69778dff25f2d50b/aiohttp-3.10.10-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:5c6a5b8c7926ba5d8545c7dd22961a107526562da31a7a32fa2456baf040939f", size = 390898 },
+    { url = "https://files.pythonhosted.org/packages/38/d2/b833d95deb48c75db85bf6646de0a697e7fb5d87bd27cbade4f9746b48b1/aiohttp-3.10.10-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:007ec22fbc573e5eb2fb7dec4198ef8f6bf2fe4ce20020798b2eb5d0abda6138", size = 1312060 },
+    { url = "https://files.pythonhosted.org/packages/aa/5f/29fd5113165a0893de8efedf9b4737e0ba92dfcd791415a528f947d10299/aiohttp-3.10.10-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:9627cc1a10c8c409b5822a92d57a77f383b554463d1884008e051c32ab1b3742", size = 1350553 },
+    { url = "https://files.pythonhosted.org/packages/ad/cc/f835f74b7d344428469200105236d44606cfa448be1e7c95ca52880d9bac/aiohttp-3.10.10-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:50edbcad60d8f0e3eccc68da67f37268b5144ecc34d59f27a02f9611c1d4eec7", size = 1392646 },
+    { url = "https://files.pythonhosted.org/packages/bf/fe/1332409d845ca601893bbf2d76935e0b93d41686e5f333841c7d7a4a770d/aiohttp-3.10.10-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a45d85cf20b5e0d0aa5a8dca27cce8eddef3292bc29d72dcad1641f4ed50aa16", size = 1306310 },
+    { url = "https://files.pythonhosted.org/packages/e4/a1/25a7633a5a513278a9892e333501e2e69c83e50be4b57a62285fb7a008c3/aiohttp-3.10.10-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0b00807e2605f16e1e198f33a53ce3c4523114059b0c09c337209ae55e3823a8", size = 1260255 },
+    { url = "https://files.pythonhosted.org/packages/f2/39/30eafe89e0e2a06c25e4762844c8214c0c0cd0fd9ffc3471694a7986f421/aiohttp-3.10.10-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:f2d4324a98062be0525d16f768a03e0bbb3b9fe301ceee99611dc9a7953124e6", size = 1271141 },
+    { url = "https://files.pythonhosted.org/packages/5b/fc/33125df728b48391ef1fcb512dfb02072158cc10d041414fb79803463020/aiohttp-3.10.10-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:438cd072f75bb6612f2aca29f8bd7cdf6e35e8f160bc312e49fbecab77c99e3a", size = 1280244 },
+    { url = "https://files.pythonhosted.org/packages/3b/61/e42bf2c2934b5caa4e2ec0b5e5fd86989adb022b5ee60c2572a9d77cf6fe/aiohttp-3.10.10-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:baa42524a82f75303f714108fea528ccacf0386af429b69fff141ffef1c534f9", size = 1316805 },
+    { url = "https://files.pythonhosted.org/packages/18/32/f52a5e2ae9ad3bba10e026a63a7a23abfa37c7d97aeeb9004eaa98df3ce3/aiohttp-3.10.10-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:a7d8d14fe962153fc681f6366bdec33d4356f98a3e3567782aac1b6e0e40109a", size = 1343930 },
+    { url = "https://files.pythonhosted.org/packages/05/be/6a403b464dcab3631fe8e27b0f1d906d9e45c5e92aca97ee007e5a895560/aiohttp-3.10.10-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:c1277cd707c465cd09572a774559a3cc7c7a28802eb3a2a9472588f062097205", size = 1306186 },
+    { url = "https://files.pythonhosted.org/packages/8e/fd/bb50fe781068a736a02bf5c7ad5f3ab53e39f1d1e63110da6d30f7605edc/aiohttp-3.10.10-cp312-cp312-win32.whl", hash = "sha256:59bb3c54aa420521dc4ce3cc2c3fe2ad82adf7b09403fa1f48ae45c0cbde6628", size = 359289 },
+    { url = "https://files.pythonhosted.org/packages/70/9e/5add7e240f77ef67c275c82cc1d08afbca57b77593118c1f6e920ae8ad3f/aiohttp-3.10.10-cp312-cp312-win_amd64.whl", hash = "sha256:0e1b370d8007c4ae31ee6db7f9a2fe801a42b146cec80a86766e7ad5c4a259cf", size = 379313 },
+    { url = "https://files.pythonhosted.org/packages/b1/eb/618b1b76c7fe8082a71c9d62e3fe84c5b9af6703078caa9ec57850a12080/aiohttp-3.10.10-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:ad7593bb24b2ab09e65e8a1d385606f0f47c65b5a2ae6c551db67d6653e78c28", size = 576114 },
+    { url = "https://files.pythonhosted.org/packages/aa/37/3126995d7869f8b30d05381b81a2d4fb4ec6ad313db788e009bc6d39c211/aiohttp-3.10.10-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:1eb89d3d29adaf533588f209768a9c02e44e4baf832b08118749c5fad191781d", size = 391901 },
+    { url = "https://files.pythonhosted.org/packages/3e/f2/8fdfc845be1f811c31ceb797968523813f8e1263ee3e9120d61253f6848f/aiohttp-3.10.10-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:3fe407bf93533a6fa82dece0e74dbcaaf5d684e5a51862887f9eaebe6372cd79", size = 387418 },
+    { url = "https://files.pythonhosted.org/packages/60/d5/33d2061d36bf07e80286e04b7e0a4de37ce04b5ebfed72dba67659a05250/aiohttp-3.10.10-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:50aed5155f819873d23520919e16703fc8925e509abbb1a1491b0087d1cd969e", size = 1287073 },
+    { url = "https://files.pythonhosted.org/packages/00/52/affb55be16a4747740bd630b4c002dac6c5eac42f9bb64202fc3cf3f1930/aiohttp-3.10.10-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4f05e9727ce409358baa615dbeb9b969db94324a79b5a5cea45d39bdb01d82e6", size = 1323612 },
+    { url = "https://files.pythonhosted.org/packages/94/f2/cddb69b975387daa2182a8442566971d6410b8a0179bb4540d81c97b1611/aiohttp-3.10.10-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:3dffb610a30d643983aeb185ce134f97f290f8935f0abccdd32c77bed9388b42", size = 1368406 },
+    { url = "https://files.pythonhosted.org/packages/c1/e4/afba7327da4d932da8c6e29aecaf855f9d52dace53ac15bfc8030a246f1b/aiohttp-3.10.10-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:aa6658732517ddabe22c9036479eabce6036655ba87a0224c612e1ae6af2087e", size = 1282761 },
+    { url = "https://files.pythonhosted.org/packages/9f/6b/364856faa0c9031ea76e24ef0f7fef79cddd9fa8e7dba9a1771c6acc56b5/aiohttp-3.10.10-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:741a46d58677d8c733175d7e5aa618d277cd9d880301a380fd296975a9cdd7bc", size = 1236518 },
+    { url = "https://files.pythonhosted.org/packages/46/af/c382846f8356fe64a7b5908bb9b477457aa23b71be7ed551013b7b7d4d87/aiohttp-3.10.10-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:e00e3505cd80440f6c98c6d69269dcc2a119f86ad0a9fd70bccc59504bebd68a", size = 1250344 },
+    { url = "https://files.pythonhosted.org/packages/87/53/294f87fc086fd0772d0ab82497beb9df67f0f27a8b3dd5742a2656db2bc6/aiohttp-3.10.10-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:ffe595f10566f8276b76dc3a11ae4bb7eba1aac8ddd75811736a15b0d5311414", size = 1248956 },
+    { url = "https://files.pythonhosted.org/packages/86/30/7d746717fe11bdfefb88bb6c09c5fc985d85c4632da8bb6018e273899254/aiohttp-3.10.10-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:bdfcf6443637c148c4e1a20c48c566aa694fa5e288d34b20fcdc58507882fed3", size = 1293379 },
+    { url = "https://files.pythonhosted.org/packages/48/b9/45d670a834458db67a24258e9139ba61fa3bd7d69b98ecf3650c22806f8f/aiohttp-3.10.10-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:d183cf9c797a5291e8301790ed6d053480ed94070637bfaad914dd38b0981f67", size = 1320108 },
+    { url = "https://files.pythonhosted.org/packages/72/8c/804bb2e837a175635d2000a0659eafc15b2e9d92d3d81c8f69e141ecd0b0/aiohttp-3.10.10-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:77abf6665ae54000b98b3c742bc6ea1d1fb31c394bcabf8b5d2c1ac3ebfe7f3b", size = 1281546 },
+    { url = "https://files.pythonhosted.org/packages/89/c0/862e6a9de3d6eeb126cd9d9ea388243b70df9b871ce1a42b193b7a4a77fc/aiohttp-3.10.10-cp313-cp313-win32.whl", hash = "sha256:4470c73c12cd9109db8277287d11f9dd98f77fc54155fc71a7738a83ffcc8ea8", size = 357516 },
+    { url = "https://files.pythonhosted.org/packages/ae/63/3e1aee3e554263f3f1011cca50d78a4894ae16ce99bf78101ac3a2f0ef74/aiohttp-3.10.10-cp313-cp313-win_amd64.whl", hash = "sha256:486f7aabfa292719a2753c016cc3a8f8172965cabb3ea2e7f7436c7f5a22a151", size = 376785 },
+]
+
+[[package]]
+name = "aiosignal"
+version = "1.3.1"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "frozenlist" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/ae/67/0952ed97a9793b4958e5736f6d2b346b414a2cd63e82d05940032f45b32f/aiosignal-1.3.1.tar.gz", hash = "sha256:54cd96e15e1649b75d6c87526a6ff0b6c1b0dd3459f43d9ca11d48c339b68cfc", size = 19422 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/76/ac/a7305707cb852b7e16ff80eaf5692309bde30e2b1100a1fcacdc8f731d97/aiosignal-1.3.1-py3-none-any.whl", hash = "sha256:f8376fb07dd1e86a584e4fcdec80b36b7f81aac666ebc724e2c090300dd83b17", size = 7617 },
+]
+
+[[package]]
+name = "annotated-types"
+version = "0.7.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/ee/67/531ea369ba64dcff5ec9c3402f9f51bf748cec26dde048a2f973a4eea7f5/annotated_types-0.7.0.tar.gz", hash = "sha256:aff07c09a53a08bc8cfccb9c85b05f1aa9a2a6f23728d790723543408344ce89", size = 16081 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/78/b6/6307fbef88d9b5ee7421e68d78a9f162e0da4900bc5f5793f6d3d0e34fb8/annotated_types-0.7.0-py3-none-any.whl", hash = "sha256:1f02e8b43a8fbbc3f3e0d4f0f4bfc8131bcb4eebe8849b8e5c773f3a1c582a53", size = 13643 },
+]
+
+[[package]]
+name = "anyio"
+version = "4.8.0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "idna" },
+    { name = "sniffio" },
+    { name = "typing-extensions", marker = "python_full_version < '3.13'" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/a3/73/199a98fc2dae33535d6b8e8e6ec01f8c1d76c9adb096c6b7d64823038cde/anyio-4.8.0.tar.gz", hash = "sha256:1d9fe889df5212298c0c0723fa20479d1b94883a2df44bd3897aa91083316f7a", size = 181126 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/46/eb/e7f063ad1fec6b3178a3cd82d1a3c4de82cccf283fc42746168188e1cdd5/anyio-4.8.0-py3-none-any.whl", hash = "sha256:b5011f270ab5eb0abf13385f851315585cc37ef330dd88e27ec3d34d651fd47a", size = 96041 },
+]
+
+[[package]]
+name = "async-timeout"
+version = "4.0.3"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/87/d6/21b30a550dafea84b1b8eee21b5e23fa16d010ae006011221f33dcd8d7f8/async-timeout-4.0.3.tar.gz", hash = "sha256:4640d96be84d82d02ed59ea2b7105a0f7b33abe8703703cd0ab0bf87c427522f", size = 8345 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/a7/fa/e01228c2938de91d47b307831c62ab9e4001e747789d0b05baf779a6488c/async_timeout-4.0.3-py3-none-any.whl", hash = "sha256:7405140ff1230c310e51dc27b3145b9092d659ce68ff733fb0cefe3ee42be028", size = 5721 },
+]
+
+[[package]]
+name = "asyncpg"
+version = "0.30.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/2f/4c/7c991e080e106d854809030d8584e15b2e996e26f16aee6d757e387bc17d/asyncpg-0.30.0.tar.gz", hash = "sha256:c551e9928ab6707602f44811817f82ba3c446e018bfe1d3abecc8ba5f3eac851", size = 957746 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/4b/64/9d3e887bb7b01535fdbc45fbd5f0a8447539833b97ee69ecdbb7a79d0cb4/asyncpg-0.30.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:c902a60b52e506d38d7e80e0dd5399f657220f24635fee368117b8b5fce1142e", size = 673162 },
+    { url = "https://files.pythonhosted.org/packages/6e/eb/8b236663f06984f212a087b3e849731f917ab80f84450e943900e8ca4052/asyncpg-0.30.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:aca1548e43bbb9f0f627a04666fedaca23db0a31a84136ad1f868cb15deb6e3a", size = 637025 },
+    { url = "https://files.pythonhosted.org/packages/cc/57/2dc240bb263d58786cfaa60920779af6e8d32da63ab9ffc09f8312bd7a14/asyncpg-0.30.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6c2a2ef565400234a633da0eafdce27e843836256d40705d83ab7ec42074efb3", size = 3496243 },
+    { url = "https://files.pythonhosted.org/packages/f4/40/0ae9d061d278b10713ea9021ef6b703ec44698fe32178715a501ac696c6b/asyncpg-0.30.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1292b84ee06ac8a2ad8e51c7475aa309245874b61333d97411aab835c4a2f737", size = 3575059 },
+    { url = "https://files.pythonhosted.org/packages/c3/75/d6b895a35a2c6506952247640178e5f768eeb28b2e20299b6a6f1d743ba0/asyncpg-0.30.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:0f5712350388d0cd0615caec629ad53c81e506b1abaaf8d14c93f54b35e3595a", size = 3473596 },
+    { url = "https://files.pythonhosted.org/packages/c8/e7/3693392d3e168ab0aebb2d361431375bd22ffc7b4a586a0fc060d519fae7/asyncpg-0.30.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:db9891e2d76e6f425746c5d2da01921e9a16b5a71a1c905b13f30e12a257c4af", size = 3641632 },
+    { url = "https://files.pythonhosted.org/packages/32/ea/15670cea95745bba3f0352341db55f506a820b21c619ee66b7d12ea7867d/asyncpg-0.30.0-cp312-cp312-win32.whl", hash = "sha256:68d71a1be3d83d0570049cd1654a9bdfe506e794ecc98ad0873304a9f35e411e", size = 560186 },
+    { url = "https://files.pythonhosted.org/packages/7e/6b/fe1fad5cee79ca5f5c27aed7bd95baee529c1bf8a387435c8ba4fe53d5c1/asyncpg-0.30.0-cp312-cp312-win_amd64.whl", hash = "sha256:9a0292c6af5c500523949155ec17b7fe01a00ace33b68a476d6b5059f9630305", size = 621064 },
+    { url = "https://files.pythonhosted.org/packages/3a/22/e20602e1218dc07692acf70d5b902be820168d6282e69ef0d3cb920dc36f/asyncpg-0.30.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:05b185ebb8083c8568ea8a40e896d5f7af4b8554b64d7719c0eaa1eb5a5c3a70", size = 670373 },
+    { url = "https://files.pythonhosted.org/packages/3d/b3/0cf269a9d647852a95c06eb00b815d0b95a4eb4b55aa2d6ba680971733b9/asyncpg-0.30.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:c47806b1a8cbb0a0db896f4cd34d89942effe353a5035c62734ab13b9f938da3", size = 634745 },
+    { url = "https://files.pythonhosted.org/packages/8e/6d/a4f31bf358ce8491d2a31bfe0d7bcf25269e80481e49de4d8616c4295a34/asyncpg-0.30.0-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9b6fde867a74e8c76c71e2f64f80c64c0f3163e687f1763cfaf21633ec24ec33", size = 3512103 },
+    { url = "https://files.pythonhosted.org/packages/96/19/139227a6e67f407b9c386cb594d9628c6c78c9024f26df87c912fabd4368/asyncpg-0.30.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:46973045b567972128a27d40001124fbc821c87a6cade040cfcd4fa8a30bcdc4", size = 3592471 },
+    { url = "https://files.pythonhosted.org/packages/67/e4/ab3ca38f628f53f0fd28d3ff20edff1c975dd1cb22482e0061916b4b9a74/asyncpg-0.30.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:9110df111cabc2ed81aad2f35394a00cadf4f2e0635603db6ebbd0fc896f46a4", size = 3496253 },
+    { url = "https://files.pythonhosted.org/packages/ef/5f/0bf65511d4eeac3a1f41c54034a492515a707c6edbc642174ae79034d3ba/asyncpg-0.30.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:04ff0785ae7eed6cc138e73fc67b8e51d54ee7a3ce9b63666ce55a0bf095f7ba", size = 3662720 },
+    { url = "https://files.pythonhosted.org/packages/e7/31/1513d5a6412b98052c3ed9158d783b1e09d0910f51fbe0e05f56cc370bc4/asyncpg-0.30.0-cp313-cp313-win32.whl", hash = "sha256:ae374585f51c2b444510cdf3595b97ece4f233fde739aa14b50e0d64e8a7a590", size = 560404 },
+    { url = "https://files.pythonhosted.org/packages/c8/a4/cec76b3389c4c5ff66301cd100fe88c318563ec8a520e0b2e792b5b84972/asyncpg-0.30.0-cp313-cp313-win_amd64.whl", hash = "sha256:f59b430b8e27557c3fb9869222559f7417ced18688375825f8f12302c34e915e", size = 621623 },
+]
+
+[[package]]
+name = "attrs"
+version = "24.2.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/fc/0f/aafca9af9315aee06a89ffde799a10a582fe8de76c563ee80bbcdc08b3fb/attrs-24.2.0.tar.gz", hash = "sha256:5cfb1b9148b5b086569baec03f20d7b6bf3bcacc9a42bebf87ffaaca362f6346", size = 792678 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/6a/21/5b6702a7f963e95456c0de2d495f67bf5fd62840ac655dc451586d23d39a/attrs-24.2.0-py3-none-any.whl", hash = "sha256:81921eb96de3191c8258c199618104dd27ac608d9366f5e35d011eae1867ede2", size = 63001 },
+]
+
+[[package]]
+name = "babel"
+version = "2.17.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/7d/6b/d52e42361e1aa00709585ecc30b3f9684b3ab62530771402248b1b1d6240/babel-2.17.0.tar.gz", hash = "sha256:0c54cffb19f690cdcc52a3b50bcbf71e07a808d1c80d549f2459b9d2cf0afb9d", size = 9951852 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/b7/b8/3fe70c75fe32afc4bb507f75563d39bc5642255d1d94f1f23604725780bf/babel-2.17.0-py3-none-any.whl", hash = "sha256:4d0b53093fdfb4b21c92b5213dba5a1b23885afa8383709427046b21c366e5f2", size = 10182537 },
+]
+
+[[package]]
+name = "cachetools"
+version = "5.5.1"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/d9/74/57df1ab0ce6bc5f6fa868e08de20df8ac58f9c44330c7671ad922d2bbeae/cachetools-5.5.1.tar.gz", hash = "sha256:70f238fbba50383ef62e55c6aff6d9673175fe59f7c6782c7a0b9e38f4a9df95", size = 28044 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/ec/4e/de4ff18bcf55857ba18d3a4bd48c8a9fde6bb0980c9d20b263f05387fd88/cachetools-5.5.1-py3-none-any.whl", hash = "sha256:b76651fdc3b24ead3c648bbdeeb940c1b04d365b38b4af66788f9ec4a81d42bb", size = 9530 },
+]
+
+[[package]]
+name = "certifi"
+version = "2023.11.17"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/d4/91/c89518dd4fe1f3a4e3f6ab7ff23cb00ef2e8c9adf99dacc618ad5e068e28/certifi-2023.11.17.tar.gz", hash = "sha256:9b469f3a900bf28dc19b8cfbf8019bf47f7fdd1a65a1d4ffb98fc14166beb4d1", size = 163637 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/64/62/428ef076be88fa93716b576e4a01f919d25968913e817077a386fcbe4f42/certifi-2023.11.17-py3-none-any.whl", hash = "sha256:e036ab49d5b79556f99cfc2d9320b34cfbe5be05c5871b51de9329f0603b0474", size = 162530 },
+]
+
+[[package]]
+name = "charset-normalizer"
+version = "3.4.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/f2/4f/e1808dc01273379acc506d18f1504eb2d299bd4131743b9fc54d7be4df1e/charset_normalizer-3.4.0.tar.gz", hash = "sha256:223217c3d4f82c3ac5e29032b3f1c2eb0fb591b72161f86d93f5719079dae93e", size = 106620 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/d3/0b/4b7a70987abf9b8196845806198975b6aab4ce016632f817ad758a5aa056/charset_normalizer-3.4.0-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:0713f3adb9d03d49d365b70b84775d0a0d18e4ab08d12bc46baa6132ba78aaf6", size = 194445 },
+    { url = "https://files.pythonhosted.org/packages/50/89/354cc56cf4dd2449715bc9a0f54f3aef3dc700d2d62d1fa5bbea53b13426/charset_normalizer-3.4.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:de7376c29d95d6719048c194a9cf1a1b0393fbe8488a22008610b0361d834ecf", size = 125275 },
+    { url = "https://files.pythonhosted.org/packages/fa/44/b730e2a2580110ced837ac083d8ad222343c96bb6b66e9e4e706e4d0b6df/charset_normalizer-3.4.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:4a51b48f42d9358460b78725283f04bddaf44a9358197b889657deba38f329db", size = 119020 },
+    { url = "https://files.pythonhosted.org/packages/9d/e4/9263b8240ed9472a2ae7ddc3e516e71ef46617fe40eaa51221ccd4ad9a27/charset_normalizer-3.4.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b295729485b06c1a0683af02a9e42d2caa9db04a373dc38a6a58cdd1e8abddf1", size = 139128 },
+    { url = "https://files.pythonhosted.org/packages/6b/e3/9f73e779315a54334240353eaea75854a9a690f3f580e4bd85d977cb2204/charset_normalizer-3.4.0-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ee803480535c44e7f5ad00788526da7d85525cfefaf8acf8ab9a310000be4b03", size = 149277 },
+    { url = "https://files.pythonhosted.org/packages/1a/cf/f1f50c2f295312edb8a548d3fa56a5c923b146cd3f24114d5adb7e7be558/charset_normalizer-3.4.0-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:3d59d125ffbd6d552765510e3f31ed75ebac2c7470c7274195b9161a32350284", size = 142174 },
+    { url = "https://files.pythonhosted.org/packages/16/92/92a76dc2ff3a12e69ba94e7e05168d37d0345fa08c87e1fe24d0c2a42223/charset_normalizer-3.4.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8cda06946eac330cbe6598f77bb54e690b4ca93f593dee1568ad22b04f347c15", size = 143838 },
+    { url = "https://files.pythonhosted.org/packages/a4/01/2117ff2b1dfc61695daf2babe4a874bca328489afa85952440b59819e9d7/charset_normalizer-3.4.0-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:07afec21bbbbf8a5cc3651aa96b980afe2526e7f048fdfb7f1014d84acc8b6d8", size = 146149 },
+    { url = "https://files.pythonhosted.org/packages/f6/9b/93a332b8d25b347f6839ca0a61b7f0287b0930216994e8bf67a75d050255/charset_normalizer-3.4.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:6b40e8d38afe634559e398cc32b1472f376a4099c75fe6299ae607e404c033b2", size = 140043 },
+    { url = "https://files.pythonhosted.org/packages/ab/f6/7ac4a01adcdecbc7a7587767c776d53d369b8b971382b91211489535acf0/charset_normalizer-3.4.0-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:b8dcd239c743aa2f9c22ce674a145e0a25cb1566c495928440a181ca1ccf6719", size = 148229 },
+    { url = "https://files.pythonhosted.org/packages/9d/be/5708ad18161dee7dc6a0f7e6cf3a88ea6279c3e8484844c0590e50e803ef/charset_normalizer-3.4.0-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:84450ba661fb96e9fd67629b93d2941c871ca86fc38d835d19d4225ff946a631", size = 151556 },
+    { url = "https://files.pythonhosted.org/packages/5a/bb/3d8bc22bacb9eb89785e83e6723f9888265f3a0de3b9ce724d66bd49884e/charset_normalizer-3.4.0-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:44aeb140295a2f0659e113b31cfe92c9061622cadbc9e2a2f7b8ef6b1e29ef4b", size = 149772 },
+    { url = "https://files.pythonhosted.org/packages/f7/fa/d3fc622de05a86f30beea5fc4e9ac46aead4731e73fd9055496732bcc0a4/charset_normalizer-3.4.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:1db4e7fefefd0f548d73e2e2e041f9df5c59e178b4c72fbac4cc6f535cfb1565", size = 144800 },
+    { url = "https://files.pythonhosted.org/packages/9a/65/bdb9bc496d7d190d725e96816e20e2ae3a6fa42a5cac99c3c3d6ff884118/charset_normalizer-3.4.0-cp312-cp312-win32.whl", hash = "sha256:5726cf76c982532c1863fb64d8c6dd0e4c90b6ece9feb06c9f202417a31f7dd7", size = 94836 },
+    { url = "https://files.pythonhosted.org/packages/3e/67/7b72b69d25b89c0b3cea583ee372c43aa24df15f0e0f8d3982c57804984b/charset_normalizer-3.4.0-cp312-cp312-win_amd64.whl", hash = "sha256:b197e7094f232959f8f20541ead1d9862ac5ebea1d58e9849c1bf979255dfac9", size = 102187 },
+    { url = "https://files.pythonhosted.org/packages/f3/89/68a4c86f1a0002810a27f12e9a7b22feb198c59b2f05231349fbce5c06f4/charset_normalizer-3.4.0-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:dd4eda173a9fcccb5f2e2bd2a9f423d180194b1bf17cf59e3269899235b2a114", size = 194617 },
+    { url = "https://files.pythonhosted.org/packages/4f/cd/8947fe425e2ab0aa57aceb7807af13a0e4162cd21eee42ef5b053447edf5/charset_normalizer-3.4.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:e9e3c4c9e1ed40ea53acf11e2a386383c3304212c965773704e4603d589343ed", size = 125310 },
+    { url = "https://files.pythonhosted.org/packages/5b/f0/b5263e8668a4ee9becc2b451ed909e9c27058337fda5b8c49588183c267a/charset_normalizer-3.4.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:92a7e36b000bf022ef3dbb9c46bfe2d52c047d5e3f3343f43204263c5addc250", size = 119126 },
+    { url = "https://files.pythonhosted.org/packages/ff/6e/e445afe4f7fda27a533f3234b627b3e515a1b9429bc981c9a5e2aa5d97b6/charset_normalizer-3.4.0-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:54b6a92d009cbe2fb11054ba694bc9e284dad30a26757b1e372a1fdddaf21920", size = 139342 },
+    { url = "https://files.pythonhosted.org/packages/a1/b2/4af9993b532d93270538ad4926c8e37dc29f2111c36f9c629840c57cd9b3/charset_normalizer-3.4.0-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1ffd9493de4c922f2a38c2bf62b831dcec90ac673ed1ca182fe11b4d8e9f2a64", size = 149383 },
+    { url = "https://files.pythonhosted.org/packages/fb/6f/4e78c3b97686b871db9be6f31d64e9264e889f8c9d7ab33c771f847f79b7/charset_normalizer-3.4.0-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:35c404d74c2926d0287fbd63ed5d27eb911eb9e4a3bb2c6d294f3cfd4a9e0c23", size = 142214 },
+    { url = "https://files.pythonhosted.org/packages/2b/c9/1c8fe3ce05d30c87eff498592c89015b19fade13df42850aafae09e94f35/charset_normalizer-3.4.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4796efc4faf6b53a18e3d46343535caed491776a22af773f366534056c4e1fbc", size = 144104 },
+    { url = "https://files.pythonhosted.org/packages/ee/68/efad5dcb306bf37db7db338338e7bb8ebd8cf38ee5bbd5ceaaaa46f257e6/charset_normalizer-3.4.0-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e7fdd52961feb4c96507aa649550ec2a0d527c086d284749b2f582f2d40a2e0d", size = 146255 },
+    { url = "https://files.pythonhosted.org/packages/0c/75/1ed813c3ffd200b1f3e71121c95da3f79e6d2a96120163443b3ad1057505/charset_normalizer-3.4.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:92db3c28b5b2a273346bebb24857fda45601aef6ae1c011c0a997106581e8a88", size = 140251 },
+    { url = "https://files.pythonhosted.org/packages/7d/0d/6f32255c1979653b448d3c709583557a4d24ff97ac4f3a5be156b2e6a210/charset_normalizer-3.4.0-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:ab973df98fc99ab39080bfb0eb3a925181454d7c3ac8a1e695fddfae696d9e90", size = 148474 },
+    { url = "https://files.pythonhosted.org/packages/ac/a0/c1b5298de4670d997101fef95b97ac440e8c8d8b4efa5a4d1ef44af82f0d/charset_normalizer-3.4.0-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:4b67fdab07fdd3c10bb21edab3cbfe8cf5696f453afce75d815d9d7223fbe88b", size = 151849 },
+    { url = "https://files.pythonhosted.org/packages/04/4f/b3961ba0c664989ba63e30595a3ed0875d6790ff26671e2aae2fdc28a399/charset_normalizer-3.4.0-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:aa41e526a5d4a9dfcfbab0716c7e8a1b215abd3f3df5a45cf18a12721d31cb5d", size = 149781 },
+    { url = "https://files.pythonhosted.org/packages/d8/90/6af4cd042066a4adad58ae25648a12c09c879efa4849c705719ba1b23d8c/charset_normalizer-3.4.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:ffc519621dce0c767e96b9c53f09c5d215578e10b02c285809f76509a3931482", size = 144970 },
+    { url = "https://files.pythonhosted.org/packages/cc/67/e5e7e0cbfefc4ca79025238b43cdf8a2037854195b37d6417f3d0895c4c2/charset_normalizer-3.4.0-cp313-cp313-win32.whl", hash = "sha256:f19c1585933c82098c2a520f8ec1227f20e339e33aca8fa6f956f6691b784e67", size = 94973 },
+    { url = "https://files.pythonhosted.org/packages/65/97/fc9bbc54ee13d33dc54a7fcf17b26368b18505500fc01e228c27b5222d80/charset_normalizer-3.4.0-cp313-cp313-win_amd64.whl", hash = "sha256:707b82d19e65c9bd28b81dde95249b07bf9f5b90ebe1ef17d9b57473f8a64b7b", size = 102308 },
+    { url = "https://files.pythonhosted.org/packages/bf/9b/08c0432272d77b04803958a4598a51e2a4b51c06640af8b8f0f908c18bf2/charset_normalizer-3.4.0-py3-none-any.whl", hash = "sha256:fe9f97feb71aa9896b81973a7bbada8c49501dc73e58a10fcef6663af95e5079", size = 49446 },
+]
+
+[[package]]
+name = "colorama"
+version = "0.4.6"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/d8/53/6f443c9a4a8358a93a6792e2acffb9d9d5cb0a5cfd8802644b7b1c9a02e4/colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44", size = 27697 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/d1/d6/3965ed04c63042e047cb6a3e6ed1a63a35087b6a609aa3a15ed8ac56c221/colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6", size = 25335 },
+]
+
+[[package]]
+name = "deprecated"
+version = "1.2.14"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "wrapt" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/92/14/1e41f504a246fc224d2ac264c227975427a85caf37c3979979edb9b1b232/Deprecated-1.2.14.tar.gz", hash = "sha256:e5323eb936458dccc2582dc6f9c322c852a775a27065ff2b0c4970b9d53d01b3", size = 2974416 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/20/8d/778b7d51b981a96554f29136cd59ca7880bf58094338085bcf2a979a0e6a/Deprecated-1.2.14-py2.py3-none-any.whl", hash = "sha256:6fac8b097794a90302bdbb17b9b815e732d3c4720583ff1b198499d78470466c", size = 9561 },
+]
+
+[[package]]
+name = "distro"
+version = "1.9.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/fc/f8/98eea607f65de6527f8a2e8885fc8015d3e6f5775df186e443e0964a11c3/distro-1.9.0.tar.gz", hash = "sha256:2fa77c6fd8940f116ee1d6b94a2f90b13b5ea8d019b98bc8bafdcabcdd9bdbed", size = 60722 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/12/b3/231ffd4ab1fc9d679809f356cebee130ac7daa00d6d6f3206dd4fd137e9e/distro-1.9.0-py3-none-any.whl", hash = "sha256:7bffd925d65168f85027d8da9af6bddab658135b840670a223589bc0c8ef02b2", size = 20277 },
+]
+
+[[package]]
+name = "frozenlist"
+version = "1.4.1"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/cf/3d/2102257e7acad73efc4a0c306ad3953f68c504c16982bbdfee3ad75d8085/frozenlist-1.4.1.tar.gz", hash = "sha256:c037a86e8513059a2613aaba4d817bb90b9d9b6b69aace3ce9c877e8c8ed402b", size = 37820 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/b4/db/4cf37556a735bcdb2582f2c3fa286aefde2322f92d3141e087b8aeb27177/frozenlist-1.4.1-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:1979bc0aeb89b33b588c51c54ab0161791149f2461ea7c7c946d95d5f93b56ae", size = 93937 },
+    { url = "https://files.pythonhosted.org/packages/46/03/69eb64642ca8c05f30aa5931d6c55e50b43d0cd13256fdd01510a1f85221/frozenlist-1.4.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:cc7b01b3754ea68a62bd77ce6020afaffb44a590c2289089289363472d13aedb", size = 53656 },
+    { url = "https://files.pythonhosted.org/packages/3f/ab/c543c13824a615955f57e082c8a5ee122d2d5368e80084f2834e6f4feced/frozenlist-1.4.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:c9c92be9fd329ac801cc420e08452b70e7aeab94ea4233a4804f0915c14eba9b", size = 51868 },
+    { url = "https://files.pythonhosted.org/packages/a9/b8/438cfd92be2a124da8259b13409224d9b19ef8f5a5b2507174fc7e7ea18f/frozenlist-1.4.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5c3894db91f5a489fc8fa6a9991820f368f0b3cbdb9cd8849547ccfab3392d86", size = 280652 },
+    { url = "https://files.pythonhosted.org/packages/54/72/716a955521b97a25d48315c6c3653f981041ce7a17ff79f701298195bca3/frozenlist-1.4.1-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ba60bb19387e13597fb059f32cd4d59445d7b18b69a745b8f8e5db0346f33480", size = 286739 },
+    { url = "https://files.pythonhosted.org/packages/65/d8/934c08103637567084568e4d5b4219c1016c60b4d29353b1a5b3587827d6/frozenlist-1.4.1-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8aefbba5f69d42246543407ed2461db31006b0f76c4e32dfd6f42215a2c41d09", size = 289447 },
+    { url = "https://files.pythonhosted.org/packages/70/bb/d3b98d83ec6ef88f9bd63d77104a305d68a146fd63a683569ea44c3085f6/frozenlist-1.4.1-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:780d3a35680ced9ce682fbcf4cb9c2bad3136eeff760ab33707b71db84664e3a", size = 265466 },
+    { url = "https://files.pythonhosted.org/packages/0b/f2/b8158a0f06faefec33f4dff6345a575c18095a44e52d4f10c678c137d0e0/frozenlist-1.4.1-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9acbb16f06fe7f52f441bb6f413ebae6c37baa6ef9edd49cdd567216da8600cd", size = 281530 },
+    { url = "https://files.pythonhosted.org/packages/ea/a2/20882c251e61be653764038ece62029bfb34bd5b842724fff32a5b7a2894/frozenlist-1.4.1-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:23b701e65c7b36e4bf15546a89279bd4d8675faabc287d06bbcfac7d3c33e1e6", size = 281295 },
+    { url = "https://files.pythonhosted.org/packages/4c/f9/8894c05dc927af2a09663bdf31914d4fb5501653f240a5bbaf1e88cab1d3/frozenlist-1.4.1-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:3e0153a805a98f5ada7e09826255ba99fb4f7524bb81bf6b47fb702666484ae1", size = 268054 },
+    { url = "https://files.pythonhosted.org/packages/37/ff/a613e58452b60166507d731812f3be253eb1229808e59980f0405d1eafbf/frozenlist-1.4.1-cp312-cp312-musllinux_1_1_ppc64le.whl", hash = "sha256:dd9b1baec094d91bf36ec729445f7769d0d0cf6b64d04d86e45baf89e2b9059b", size = 286904 },
+    { url = "https://files.pythonhosted.org/packages/cc/6e/0091d785187f4c2020d5245796d04213f2261ad097e0c1cf35c44317d517/frozenlist-1.4.1-cp312-cp312-musllinux_1_1_s390x.whl", hash = "sha256:1a4471094e146b6790f61b98616ab8e44f72661879cc63fa1049d13ef711e71e", size = 290754 },
+    { url = "https://files.pythonhosted.org/packages/a5/c2/e42ad54bae8bcffee22d1e12a8ee6c7717f7d5b5019261a8c861854f4776/frozenlist-1.4.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:5667ed53d68d91920defdf4035d1cdaa3c3121dc0b113255124bcfada1cfa1b8", size = 282602 },
+    { url = "https://files.pythonhosted.org/packages/b6/61/56bad8cb94f0357c4bc134acc30822e90e203b5cb8ff82179947de90c17f/frozenlist-1.4.1-cp312-cp312-win32.whl", hash = "sha256:beee944ae828747fd7cb216a70f120767fc9f4f00bacae8543c14a6831673f89", size = 44063 },
+    { url = "https://files.pythonhosted.org/packages/3e/dc/96647994a013bc72f3d453abab18340b7f5e222b7b7291e3697ca1fcfbd5/frozenlist-1.4.1-cp312-cp312-win_amd64.whl", hash = "sha256:64536573d0a2cb6e625cf309984e2d873979709f2cf22839bf2d61790b448ad5", size = 50452 },
+    { url = "https://files.pythonhosted.org/packages/83/10/466fe96dae1bff622021ee687f68e5524d6392b0a2f80d05001cd3a451ba/frozenlist-1.4.1-py3-none-any.whl", hash = "sha256:04ced3e6a46b4cfffe20f9ae482818e34eba9b5fb0ce4056e4cc9b6e212d09b7", size = 11552 },
+]
+
+[[package]]
+name = "greenlet"
+version = "3.1.1"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/2f/ff/df5fede753cc10f6a5be0931204ea30c35fa2f2ea7a35b25bdaf4fe40e46/greenlet-3.1.1.tar.gz", hash = "sha256:4ce3ac6cdb6adf7946475d7ef31777c26d94bccc377e070a7986bd2d5c515467", size = 186022 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/7d/ec/bad1ac26764d26aa1353216fcbfa4670050f66d445448aafa227f8b16e80/greenlet-3.1.1-cp312-cp312-macosx_11_0_universal2.whl", hash = "sha256:4afe7ea89de619adc868e087b4d2359282058479d7cfb94970adf4b55284574d", size = 274260 },
+    { url = "https://files.pythonhosted.org/packages/66/d4/c8c04958870f482459ab5956c2942c4ec35cac7fe245527f1039837c17a9/greenlet-3.1.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f406b22b7c9a9b4f8aa9d2ab13d6ae0ac3e85c9a809bd590ad53fed2bf70dc79", size = 649064 },
+    { url = "https://files.pythonhosted.org/packages/51/41/467b12a8c7c1303d20abcca145db2be4e6cd50a951fa30af48b6ec607581/greenlet-3.1.1-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c3a701fe5a9695b238503ce5bbe8218e03c3bcccf7e204e455e7462d770268aa", size = 663420 },
+    { url = "https://files.pythonhosted.org/packages/27/8f/2a93cd9b1e7107d5c7b3b7816eeadcac2ebcaf6d6513df9abaf0334777f6/greenlet-3.1.1-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2846930c65b47d70b9d178e89c7e1a69c95c1f68ea5aa0a58646b7a96df12441", size = 658035 },
+    { url = "https://files.pythonhosted.org/packages/57/5c/7c6f50cb12be092e1dccb2599be5a942c3416dbcfb76efcf54b3f8be4d8d/greenlet-3.1.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:99cfaa2110534e2cf3ba31a7abcac9d328d1d9f1b95beede58294a60348fba36", size = 660105 },
+    { url = "https://files.pythonhosted.org/packages/f1/66/033e58a50fd9ec9df00a8671c74f1f3a320564c6415a4ed82a1c651654ba/greenlet-3.1.1-cp312-cp312-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:1443279c19fca463fc33e65ef2a935a5b09bb90f978beab37729e1c3c6c25fe9", size = 613077 },
+    { url = "https://files.pythonhosted.org/packages/19/c5/36384a06f748044d06bdd8776e231fadf92fc896bd12cb1c9f5a1bda9578/greenlet-3.1.1-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:b7cede291382a78f7bb5f04a529cb18e068dd29e0fb27376074b6d0317bf4dd0", size = 1135975 },
+    { url = "https://files.pythonhosted.org/packages/38/f9/c0a0eb61bdf808d23266ecf1d63309f0e1471f284300ce6dac0ae1231881/greenlet-3.1.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:23f20bb60ae298d7d8656c6ec6db134bca379ecefadb0b19ce6f19d1f232a942", size = 1163955 },
+    { url = "https://files.pythonhosted.org/packages/43/21/a5d9df1d21514883333fc86584c07c2b49ba7c602e670b174bd73cfc9c7f/greenlet-3.1.1-cp312-cp312-win_amd64.whl", hash = "sha256:7124e16b4c55d417577c2077be379514321916d5790fa287c9ed6f23bd2ffd01", size = 299655 },
+    { url = "https://files.pythonhosted.org/packages/f3/57/0db4940cd7bb461365ca8d6fd53e68254c9dbbcc2b452e69d0d41f10a85e/greenlet-3.1.1-cp313-cp313-macosx_11_0_universal2.whl", hash = "sha256:05175c27cb459dcfc05d026c4232f9de8913ed006d42713cb8a5137bd49375f1", size = 272990 },
+    { url = "https://files.pythonhosted.org/packages/1c/ec/423d113c9f74e5e402e175b157203e9102feeb7088cee844d735b28ef963/greenlet-3.1.1-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:935e943ec47c4afab8965954bf49bfa639c05d4ccf9ef6e924188f762145c0ff", size = 649175 },
+    { url = "https://files.pythonhosted.org/packages/a9/46/ddbd2db9ff209186b7b7c621d1432e2f21714adc988703dbdd0e65155c77/greenlet-3.1.1-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:667a9706c970cb552ede35aee17339a18e8f2a87a51fba2ed39ceeeb1004798a", size = 663425 },
+    { url = "https://files.pythonhosted.org/packages/bc/f9/9c82d6b2b04aa37e38e74f0c429aece5eeb02bab6e3b98e7db89b23d94c6/greenlet-3.1.1-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b8a678974d1f3aa55f6cc34dc480169d58f2e6d8958895d68845fa4ab566509e", size = 657736 },
+    { url = "https://files.pythonhosted.org/packages/d9/42/b87bc2a81e3a62c3de2b0d550bf91a86939442b7ff85abb94eec3fc0e6aa/greenlet-3.1.1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:efc0f674aa41b92da8c49e0346318c6075d734994c3c4e4430b1c3f853e498e4", size = 660347 },
+    { url = "https://files.pythonhosted.org/packages/37/fa/71599c3fd06336cdc3eac52e6871cfebab4d9d70674a9a9e7a482c318e99/greenlet-3.1.1-cp313-cp313-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:0153404a4bb921f0ff1abeb5ce8a5131da56b953eda6e14b88dc6bbc04d2049e", size = 615583 },
+    { url = "https://files.pythonhosted.org/packages/4e/96/e9ef85de031703ee7a4483489b40cf307f93c1824a02e903106f2ea315fe/greenlet-3.1.1-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:275f72decf9932639c1c6dd1013a1bc266438eb32710016a1c742df5da6e60a1", size = 1133039 },
+    { url = "https://files.pythonhosted.org/packages/87/76/b2b6362accd69f2d1889db61a18c94bc743e961e3cab344c2effaa4b4a25/greenlet-3.1.1-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:c4aab7f6381f38a4b42f269057aee279ab0fc7bf2e929e3d4abfae97b682a12c", size = 1160716 },
+    { url = "https://files.pythonhosted.org/packages/1f/1b/54336d876186920e185066d8c3024ad55f21d7cc3683c856127ddb7b13ce/greenlet-3.1.1-cp313-cp313-win_amd64.whl", hash = "sha256:b42703b1cf69f2aa1df7d1030b9d77d3e584a70755674d60e710f0af570f3761", size = 299490 },
+    { url = "https://files.pythonhosted.org/packages/5f/17/bea55bf36990e1638a2af5ba10c1640273ef20f627962cf97107f1e5d637/greenlet-3.1.1-cp313-cp313t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f1695e76146579f8c06c1509c7ce4dfe0706f49c6831a817ac04eebb2fd02011", size = 643731 },
+    { url = "https://files.pythonhosted.org/packages/78/d2/aa3d2157f9ab742a08e0fd8f77d4699f37c22adfbfeb0c610a186b5f75e0/greenlet-3.1.1-cp313-cp313t-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7876452af029456b3f3549b696bb36a06db7c90747740c5302f74a9e9fa14b13", size = 649304 },
+    { url = "https://files.pythonhosted.org/packages/f1/8e/d0aeffe69e53ccff5a28fa86f07ad1d2d2d6537a9506229431a2a02e2f15/greenlet-3.1.1-cp313-cp313t-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:4ead44c85f8ab905852d3de8d86f6f8baf77109f9da589cb4fa142bd3b57b475", size = 646537 },
+    { url = "https://files.pythonhosted.org/packages/05/79/e15408220bbb989469c8871062c97c6c9136770657ba779711b90870d867/greenlet-3.1.1-cp313-cp313t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8320f64b777d00dd7ccdade271eaf0cad6636343293a25074cc5566160e4de7b", size = 642506 },
+    { url = "https://files.pythonhosted.org/packages/18/87/470e01a940307796f1d25f8167b551a968540fbe0551c0ebb853cb527dd6/greenlet-3.1.1-cp313-cp313t-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:6510bf84a6b643dabba74d3049ead221257603a253d0a9873f55f6a59a65f822", size = 602753 },
+    { url = "https://files.pythonhosted.org/packages/e2/72/576815ba674eddc3c25028238f74d7b8068902b3968cbe456771b166455e/greenlet-3.1.1-cp313-cp313t-musllinux_1_1_aarch64.whl", hash = "sha256:04b013dc07c96f83134b1e99888e7a79979f1a247e2a9f59697fa14b5862ed01", size = 1122731 },
+    { url = "https://files.pythonhosted.org/packages/ac/38/08cc303ddddc4b3d7c628c3039a61a3aae36c241ed01393d00c2fd663473/greenlet-3.1.1-cp313-cp313t-musllinux_1_1_x86_64.whl", hash = "sha256:411f015496fec93c1c8cd4e5238da364e1da7a124bcb293f085bf2860c32c6f6", size = 1142112 },
+]
+
+[[package]]
+name = "h11"
+version = "0.14.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/f5/38/3af3d3633a34a3316095b39c8e8fb4853a28a536e55d347bd8d8e9a14b03/h11-0.14.0.tar.gz", hash = "sha256:8f19fbbe99e72420ff35c00b27a34cb9937e902a8b810e2c88300c6f0a3b699d", size = 100418 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/95/04/ff642e65ad6b90db43e668d70ffb6736436c7ce41fcc549f4e9472234127/h11-0.14.0-py3-none-any.whl", hash = "sha256:e3fe4ac4b851c468cc8363d500db52c2ead036020723024a109d37346efaa761", size = 58259 },
+]
+
+[[package]]
+name = "httpcore"
+version = "1.0.7"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "certifi" },
+    { name = "h11" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/6a/41/d7d0a89eb493922c37d343b607bc1b5da7f5be7e383740b4753ad8943e90/httpcore-1.0.7.tar.gz", hash = "sha256:8551cb62a169ec7162ac7be8d4817d561f60e08eaa485234898414bb5a8a0b4c", size = 85196 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/87/f5/72347bc88306acb359581ac4d52f23c0ef445b57157adedb9aee0cd689d2/httpcore-1.0.7-py3-none-any.whl", hash = "sha256:a3fff8f43dc260d5bd363d9f9cf1830fa3a458b332856f34282de498ed420edd", size = 78551 },
+]
+
+[[package]]
+name = "httpx"
+version = "0.27.2"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "anyio" },
+    { name = "certifi" },
+    { name = "httpcore" },
+    { name = "idna" },
+    { name = "sniffio" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/78/82/08f8c936781f67d9e6b9eeb8a0c8b4e406136ea4c3d1f89a5db71d42e0e6/httpx-0.27.2.tar.gz", hash = "sha256:f7c2be1d2f3c3c3160d441802406b206c2b76f5947b11115e6df10c6c65e66c2", size = 144189 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/56/95/9377bcb415797e44274b51d46e3249eba641711cf3348050f76ee7b15ffc/httpx-0.27.2-py3-none-any.whl", hash = "sha256:7bb2708e112d8fdd7829cd4243970f0c223274051cb35ee80c03301ee29a3df0", size = 76395 },
+]
+
+[[package]]
+name = "idna"
+version = "3.10"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/f1/70/7703c29685631f5a7590aa73f1f1d3fa9a380e654b86af429e0934a32f7d/idna-3.10.tar.gz", hash = "sha256:12f65c9b470abda6dc35cf8e63cc574b1c52b11df2c86030af0ac09b01b13ea9", size = 190490 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/76/c6/c88e154df9c4e1a2a66ccf0005a88dfb2650c1dffb6f5ce603dfbd452ce3/idna-3.10-py3-none-any.whl", hash = "sha256:946d195a0d259cbba61165e88e65941f16e9b36ea6ddb97f00452bae8b1287d3", size = 70442 },
+]
+
+[[package]]
+name = "loguru"
+version = "0.7.3"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "colorama", marker = "sys_platform == 'win32'" },
+    { name = "win32-setctime", marker = "sys_platform == 'win32'" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/3a/05/a1dae3dffd1116099471c643b8924f5aa6524411dc6c63fdae648c4f1aca/loguru-0.7.3.tar.gz", hash = "sha256:19480589e77d47b8d85b2c827ad95d49bf31b0dcde16593892eb51dd18706eb6", size = 63559 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/0c/29/0348de65b8cc732daa3e33e67806420b2ae89bdce2b04af740289c5c6c8c/loguru-0.7.3-py3-none-any.whl", hash = "sha256:31a33c10c8e1e10422bfd431aeb5d351c7cf7fa671e3c4df004162264b28220c", size = 61595 },
+]
+
+[[package]]
+name = "magic-filter"
+version = "1.0.12"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/e6/08/da7c2cc7398cc0376e8da599d6330a437c01d3eace2f2365f300e0f3f758/magic_filter-1.0.12.tar.gz", hash = "sha256:4751d0b579a5045d1dc250625c4c508c18c3def5ea6afaf3957cb4530d03f7f9", size = 11071 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/cc/75/f620449f0056eff0ec7c1b1e088f71068eb4e47a46eb54f6c065c6ad7675/magic_filter-1.0.12-py3-none-any.whl", hash = "sha256:e5929e544f310c2b1f154318db8c5cdf544dd658efa998172acd2e4ba0f6c6a6", size = 11335 },
+]
+
+[[package]]
+name = "multidict"
+version = "6.1.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/d6/be/504b89a5e9ca731cd47487e91c469064f8ae5af93b7259758dcfc2b9c848/multidict-6.1.0.tar.gz", hash = "sha256:22ae2ebf9b0c69d206c003e2f6a914ea33f0a932d4aa16f236afc049d9958f4a", size = 64002 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/fd/16/92057c74ba3b96d5e211b553895cd6dc7cc4d1e43d9ab8fafc727681ef71/multidict-6.1.0-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:b04772ed465fa3cc947db808fa306d79b43e896beb677a56fb2347ca1a49c1fa", size = 48713 },
+    { url = "https://files.pythonhosted.org/packages/94/3d/37d1b8893ae79716179540b89fc6a0ee56b4a65fcc0d63535c6f5d96f217/multidict-6.1.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:6180c0ae073bddeb5a97a38c03f30c233e0a4d39cd86166251617d1bbd0af436", size = 29516 },
+    { url = "https://files.pythonhosted.org/packages/a2/12/adb6b3200c363062f805275b4c1e656be2b3681aada66c80129932ff0bae/multidict-6.1.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:071120490b47aa997cca00666923a83f02c7fbb44f71cf7f136df753f7fa8761", size = 29557 },
+    { url = "https://files.pythonhosted.org/packages/47/e9/604bb05e6e5bce1e6a5cf80a474e0f072e80d8ac105f1b994a53e0b28c42/multidict-6.1.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:50b3a2710631848991d0bf7de077502e8994c804bb805aeb2925a981de58ec2e", size = 130170 },
+    { url = "https://files.pythonhosted.org/packages/7e/13/9efa50801785eccbf7086b3c83b71a4fb501a4d43549c2f2f80b8787d69f/multidict-6.1.0-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b58c621844d55e71c1b7f7c498ce5aa6985d743a1a59034c57a905b3f153c1ef", size = 134836 },
+    { url = "https://files.pythonhosted.org/packages/bf/0f/93808b765192780d117814a6dfcc2e75de6dcc610009ad408b8814dca3ba/multidict-6.1.0-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:55b6d90641869892caa9ca42ff913f7ff1c5ece06474fbd32fb2cf6834726c95", size = 133475 },
+    { url = "https://files.pythonhosted.org/packages/d3/c8/529101d7176fe7dfe1d99604e48d69c5dfdcadb4f06561f465c8ef12b4df/multidict-6.1.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4b820514bfc0b98a30e3d85462084779900347e4d49267f747ff54060cc33925", size = 131049 },
+    { url = "https://files.pythonhosted.org/packages/ca/0c/fc85b439014d5a58063e19c3a158a889deec399d47b5269a0f3b6a2e28bc/multidict-6.1.0-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:10a9b09aba0c5b48c53761b7c720aaaf7cf236d5fe394cd399c7ba662d5f9966", size = 120370 },
+    { url = "https://files.pythonhosted.org/packages/db/46/d4416eb20176492d2258fbd47b4abe729ff3b6e9c829ea4236f93c865089/multidict-6.1.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:1e16bf3e5fc9f44632affb159d30a437bfe286ce9e02754759be5536b169b305", size = 125178 },
+    { url = "https://files.pythonhosted.org/packages/5b/46/73697ad7ec521df7de5531a32780bbfd908ded0643cbe457f981a701457c/multidict-6.1.0-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:76f364861c3bfc98cbbcbd402d83454ed9e01a5224bb3a28bf70002a230f73e2", size = 119567 },
+    { url = "https://files.pythonhosted.org/packages/cd/ed/51f060e2cb0e7635329fa6ff930aa5cffa17f4c7f5c6c3ddc3500708e2f2/multidict-6.1.0-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:820c661588bd01a0aa62a1283f20d2be4281b086f80dad9e955e690c75fb54a2", size = 129822 },
+    { url = "https://files.pythonhosted.org/packages/df/9e/ee7d1954b1331da3eddea0c4e08d9142da5f14b1321c7301f5014f49d492/multidict-6.1.0-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:0e5f362e895bc5b9e67fe6e4ded2492d8124bdf817827f33c5b46c2fe3ffaca6", size = 128656 },
+    { url = "https://files.pythonhosted.org/packages/77/00/8538f11e3356b5d95fa4b024aa566cde7a38aa7a5f08f4912b32a037c5dc/multidict-6.1.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:3ec660d19bbc671e3a6443325f07263be452c453ac9e512f5eb935e7d4ac28b3", size = 125360 },
+    { url = "https://files.pythonhosted.org/packages/be/05/5d334c1f2462d43fec2363cd00b1c44c93a78c3925d952e9a71caf662e96/multidict-6.1.0-cp312-cp312-win32.whl", hash = "sha256:58130ecf8f7b8112cdb841486404f1282b9c86ccb30d3519faf301b2e5659133", size = 26382 },
+    { url = "https://files.pythonhosted.org/packages/a3/bf/f332a13486b1ed0496d624bcc7e8357bb8053823e8cd4b9a18edc1d97e73/multidict-6.1.0-cp312-cp312-win_amd64.whl", hash = "sha256:188215fc0aafb8e03341995e7c4797860181562380f81ed0a87ff455b70bf1f1", size = 28529 },
+    { url = "https://files.pythonhosted.org/packages/22/67/1c7c0f39fe069aa4e5d794f323be24bf4d33d62d2a348acdb7991f8f30db/multidict-6.1.0-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:d569388c381b24671589335a3be6e1d45546c2988c2ebe30fdcada8457a31008", size = 48771 },
+    { url = "https://files.pythonhosted.org/packages/3c/25/c186ee7b212bdf0df2519eacfb1981a017bda34392c67542c274651daf23/multidict-6.1.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:052e10d2d37810b99cc170b785945421141bf7bb7d2f8799d431e7db229c385f", size = 29533 },
+    { url = "https://files.pythonhosted.org/packages/67/5e/04575fd837e0958e324ca035b339cea174554f6f641d3fb2b4f2e7ff44a2/multidict-6.1.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:f90c822a402cb865e396a504f9fc8173ef34212a342d92e362ca498cad308e28", size = 29595 },
+    { url = "https://files.pythonhosted.org/packages/d3/b2/e56388f86663810c07cfe4a3c3d87227f3811eeb2d08450b9e5d19d78876/multidict-6.1.0-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b225d95519a5bf73860323e633a664b0d85ad3d5bede6d30d95b35d4dfe8805b", size = 130094 },
+    { url = "https://files.pythonhosted.org/packages/6c/ee/30ae9b4186a644d284543d55d491fbd4239b015d36b23fea43b4c94f7052/multidict-6.1.0-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:23bfd518810af7de1116313ebd9092cb9aa629beb12f6ed631ad53356ed6b86c", size = 134876 },
+    { url = "https://files.pythonhosted.org/packages/84/c7/70461c13ba8ce3c779503c70ec9d0345ae84de04521c1f45a04d5f48943d/multidict-6.1.0-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5c09fcfdccdd0b57867577b719c69e347a436b86cd83747f179dbf0cc0d4c1f3", size = 133500 },
+    { url = "https://files.pythonhosted.org/packages/4a/9f/002af221253f10f99959561123fae676148dd730e2daa2cd053846a58507/multidict-6.1.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bf6bea52ec97e95560af5ae576bdac3aa3aae0b6758c6efa115236d9e07dae44", size = 131099 },
+    { url = "https://files.pythonhosted.org/packages/82/42/d1c7a7301d52af79d88548a97e297f9d99c961ad76bbe6f67442bb77f097/multidict-6.1.0-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:57feec87371dbb3520da6192213c7d6fc892d5589a93db548331954de8248fd2", size = 120403 },
+    { url = "https://files.pythonhosted.org/packages/68/f3/471985c2c7ac707547553e8f37cff5158030d36bdec4414cb825fbaa5327/multidict-6.1.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:0c3f390dc53279cbc8ba976e5f8035eab997829066756d811616b652b00a23a3", size = 125348 },
+    { url = "https://files.pythonhosted.org/packages/67/2c/e6df05c77e0e433c214ec1d21ddd203d9a4770a1f2866a8ca40a545869a0/multidict-6.1.0-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:59bfeae4b25ec05b34f1956eaa1cb38032282cd4dfabc5056d0a1ec4d696d3aa", size = 119673 },
+    { url = "https://files.pythonhosted.org/packages/c5/cd/bc8608fff06239c9fb333f9db7743a1b2eafe98c2666c9a196e867a3a0a4/multidict-6.1.0-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:b2f59caeaf7632cc633b5cf6fc449372b83bbdf0da4ae04d5be36118e46cc0aa", size = 129927 },
+    { url = "https://files.pythonhosted.org/packages/44/8e/281b69b7bc84fc963a44dc6e0bbcc7150e517b91df368a27834299a526ac/multidict-6.1.0-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:37bb93b2178e02b7b618893990941900fd25b6b9ac0fa49931a40aecdf083fe4", size = 128711 },
+    { url = "https://files.pythonhosted.org/packages/12/a4/63e7cd38ed29dd9f1881d5119f272c898ca92536cdb53ffe0843197f6c85/multidict-6.1.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:4e9f48f58c2c523d5a06faea47866cd35b32655c46b443f163d08c6d0ddb17d6", size = 125519 },
+    { url = "https://files.pythonhosted.org/packages/38/e0/4f5855037a72cd8a7a2f60a3952d9aa45feedb37ae7831642102604e8a37/multidict-6.1.0-cp313-cp313-win32.whl", hash = "sha256:3a37ffb35399029b45c6cc33640a92bef403c9fd388acce75cdc88f58bd19a81", size = 26426 },
+    { url = "https://files.pythonhosted.org/packages/7e/a5/17ee3a4db1e310b7405f5d25834460073a8ccd86198ce044dfaf69eac073/multidict-6.1.0-cp313-cp313-win_amd64.whl", hash = "sha256:e9aa71e15d9d9beaad2c6b9319edcdc0a49a43ef5c0a4c8265ca9ee7d6c67774", size = 28531 },
+    { url = "https://files.pythonhosted.org/packages/99/b7/b9e70fde2c0f0c9af4cc5277782a89b66d35948ea3369ec9f598358c3ac5/multidict-6.1.0-py3-none-any.whl", hash = "sha256:48e171e52d1c4d33888e529b999e5900356b9ae588c2f09a52dcefb158b27506", size = 10051 },
+]
+
+[[package]]
+name = "netaddr"
+version = "1.3.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/54/90/188b2a69654f27b221fba92fda7217778208532c962509e959a9cee5229d/netaddr-1.3.0.tar.gz", hash = "sha256:5c3c3d9895b551b763779ba7db7a03487dc1f8e3b385af819af341ae9ef6e48a", size = 2260504 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/12/cc/f4fe2c7ce68b92cbf5b2d379ca366e1edae38cccaad00f69f529b460c3ef/netaddr-1.3.0-py3-none-any.whl", hash = "sha256:c2c6a8ebe5554ce33b7d5b3a306b71bbb373e000bbbf2350dd5213cc56e3dbbe", size = 2262023 },
+]
+
+[[package]]
+name = "ping3"
+version = "4.0.8"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/20/75/31ad8e1e466caeed891c39275be21d585b1490af1f4e5d747d4e45b54e9d/ping3-4.0.8.tar.gz", hash = "sha256:9ab460eb57f006b71f977a693d157215aabd6bbcbc6cd6428b6951eaae0c2875", size = 17826 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/e6/f4/4070daca3da5bbc3ef5e622d68f979e034e5bf678416817918e51a1b2907/ping3-4.0.8-py3-none-any.whl", hash = "sha256:b5c294851968b4229e9af69d252778241cb84221594b436a8677419c31925594", size = 14007 },
+]
+
+[[package]]
+name = "propcache"
+version = "0.2.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/a9/4d/5e5a60b78dbc1d464f8a7bbaeb30957257afdc8512cbb9dfd5659304f5cd/propcache-0.2.0.tar.gz", hash = "sha256:df81779732feb9d01e5d513fad0122efb3d53bbc75f61b2a4f29a020bc985e70", size = 40951 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/7c/46/a41ca1097769fc548fc9216ec4c1471b772cc39720eb47ed7e38ef0006a9/propcache-0.2.0-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:2ee7606193fb267be4b2e3b32714f2d58cad27217638db98a60f9efb5efeccc2", size = 80800 },
+    { url = "https://files.pythonhosted.org/packages/75/4f/93df46aab9cc473498ff56be39b5f6ee1e33529223d7a4d8c0a6101a9ba2/propcache-0.2.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:91ee8fc02ca52e24bcb77b234f22afc03288e1dafbb1f88fe24db308910c4ac7", size = 46443 },
+    { url = "https://files.pythonhosted.org/packages/0b/17/308acc6aee65d0f9a8375e36c4807ac6605d1f38074b1581bd4042b9fb37/propcache-0.2.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:2e900bad2a8456d00a113cad8c13343f3b1f327534e3589acc2219729237a2e8", size = 45676 },
+    { url = "https://files.pythonhosted.org/packages/65/44/626599d2854d6c1d4530b9a05e7ff2ee22b790358334b475ed7c89f7d625/propcache-0.2.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f52a68c21363c45297aca15561812d542f8fc683c85201df0bebe209e349f793", size = 246191 },
+    { url = "https://files.pythonhosted.org/packages/f2/df/5d996d7cb18df076debae7d76ac3da085c0575a9f2be6b1f707fe227b54c/propcache-0.2.0-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1e41d67757ff4fbc8ef2af99b338bfb955010444b92929e9e55a6d4dcc3c4f09", size = 251791 },
+    { url = "https://files.pythonhosted.org/packages/2e/6d/9f91e5dde8b1f662f6dd4dff36098ed22a1ef4e08e1316f05f4758f1576c/propcache-0.2.0-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a64e32f8bd94c105cc27f42d3b658902b5bcc947ece3c8fe7bc1b05982f60e89", size = 253434 },
+    { url = "https://files.pythonhosted.org/packages/3c/e9/1b54b7e26f50b3e0497cd13d3483d781d284452c2c50dd2a615a92a087a3/propcache-0.2.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:55346705687dbd7ef0d77883ab4f6fabc48232f587925bdaf95219bae072491e", size = 248150 },
+    { url = "https://files.pythonhosted.org/packages/a7/ef/a35bf191c8038fe3ce9a414b907371c81d102384eda5dbafe6f4dce0cf9b/propcache-0.2.0-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:00181262b17e517df2cd85656fcd6b4e70946fe62cd625b9d74ac9977b64d8d9", size = 233568 },
+    { url = "https://files.pythonhosted.org/packages/97/d9/d00bb9277a9165a5e6d60f2142cd1a38a750045c9c12e47ae087f686d781/propcache-0.2.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:6994984550eaf25dd7fc7bd1b700ff45c894149341725bb4edc67f0ffa94efa4", size = 229874 },
+    { url = "https://files.pythonhosted.org/packages/8e/78/c123cf22469bdc4b18efb78893e69c70a8b16de88e6160b69ca6bdd88b5d/propcache-0.2.0-cp312-cp312-musllinux_1_2_armv7l.whl", hash = "sha256:56295eb1e5f3aecd516d91b00cfd8bf3a13991de5a479df9e27dd569ea23959c", size = 225857 },
+    { url = "https://files.pythonhosted.org/packages/31/1b/fd6b2f1f36d028820d35475be78859d8c89c8f091ad30e377ac49fd66359/propcache-0.2.0-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:439e76255daa0f8151d3cb325f6dd4a3e93043e6403e6491813bcaaaa8733887", size = 227604 },
+    { url = "https://files.pythonhosted.org/packages/99/36/b07be976edf77a07233ba712e53262937625af02154353171716894a86a6/propcache-0.2.0-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:f6475a1b2ecb310c98c28d271a30df74f9dd436ee46d09236a6b750a7599ce57", size = 238430 },
+    { url = "https://files.pythonhosted.org/packages/0d/64/5822f496c9010e3966e934a011ac08cac8734561842bc7c1f65586e0683c/propcache-0.2.0-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:3444cdba6628accf384e349014084b1cacd866fbb88433cd9d279d90a54e0b23", size = 244814 },
+    { url = "https://files.pythonhosted.org/packages/fd/bd/8657918a35d50b18a9e4d78a5df7b6c82a637a311ab20851eef4326305c1/propcache-0.2.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:4a9d9b4d0a9b38d1c391bb4ad24aa65f306c6f01b512e10a8a34a2dc5675d348", size = 235922 },
+    { url = "https://files.pythonhosted.org/packages/a8/6f/ec0095e1647b4727db945213a9f395b1103c442ef65e54c62e92a72a3f75/propcache-0.2.0-cp312-cp312-win32.whl", hash = "sha256:69d3a98eebae99a420d4b28756c8ce6ea5a29291baf2dc9ff9414b42676f61d5", size = 40177 },
+    { url = "https://files.pythonhosted.org/packages/20/a2/bd0896fdc4f4c1db46d9bc361c8c79a9bf08ccc08ba054a98e38e7ba1557/propcache-0.2.0-cp312-cp312-win_amd64.whl", hash = "sha256:ad9c9b99b05f163109466638bd30ada1722abb01bbb85c739c50b6dc11f92dc3", size = 44446 },
+    { url = "https://files.pythonhosted.org/packages/a8/a7/5f37b69197d4f558bfef5b4bceaff7c43cc9b51adf5bd75e9081d7ea80e4/propcache-0.2.0-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:ecddc221a077a8132cf7c747d5352a15ed763b674c0448d811f408bf803d9ad7", size = 78120 },
+    { url = "https://files.pythonhosted.org/packages/c8/cd/48ab2b30a6b353ecb95a244915f85756d74f815862eb2ecc7a518d565b48/propcache-0.2.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:0e53cb83fdd61cbd67202735e6a6687a7b491c8742dfc39c9e01e80354956763", size = 45127 },
+    { url = "https://files.pythonhosted.org/packages/a5/ba/0a1ef94a3412aab057bd996ed5f0ac7458be5bf469e85c70fa9ceb43290b/propcache-0.2.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:92fe151145a990c22cbccf9ae15cae8ae9eddabfc949a219c9f667877e40853d", size = 44419 },
+    { url = "https://files.pythonhosted.org/packages/b4/6c/ca70bee4f22fa99eacd04f4d2f1699be9d13538ccf22b3169a61c60a27fa/propcache-0.2.0-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d6a21ef516d36909931a2967621eecb256018aeb11fc48656e3257e73e2e247a", size = 229611 },
+    { url = "https://files.pythonhosted.org/packages/19/70/47b872a263e8511ca33718d96a10c17d3c853aefadeb86dc26e8421184b9/propcache-0.2.0-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3f88a4095e913f98988f5b338c1d4d5d07dbb0b6bad19892fd447484e483ba6b", size = 234005 },
+    { url = "https://files.pythonhosted.org/packages/4f/be/3b0ab8c84a22e4a3224719099c1229ddfdd8a6a1558cf75cb55ee1e35c25/propcache-0.2.0-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5a5b3bb545ead161be780ee85a2b54fdf7092815995661947812dde94a40f6fb", size = 237270 },
+    { url = "https://files.pythonhosted.org/packages/04/d8/f071bb000d4b8f851d312c3c75701e586b3f643fe14a2e3409b1b9ab3936/propcache-0.2.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:67aeb72e0f482709991aa91345a831d0b707d16b0257e8ef88a2ad246a7280bf", size = 231877 },
+    { url = "https://files.pythonhosted.org/packages/93/e7/57a035a1359e542bbb0a7df95aad6b9871ebee6dce2840cb157a415bd1f3/propcache-0.2.0-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3c997f8c44ec9b9b0bcbf2d422cc00a1d9b9c681f56efa6ca149a941e5560da2", size = 217848 },
+    { url = "https://files.pythonhosted.org/packages/f0/93/d1dea40f112ec183398fb6c42fde340edd7bab202411c4aa1a8289f461b6/propcache-0.2.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:2a66df3d4992bc1d725b9aa803e8c5a66c010c65c741ad901e260ece77f58d2f", size = 216987 },
+    { url = "https://files.pythonhosted.org/packages/62/4c/877340871251145d3522c2b5d25c16a1690ad655fbab7bb9ece6b117e39f/propcache-0.2.0-cp313-cp313-musllinux_1_2_armv7l.whl", hash = "sha256:3ebbcf2a07621f29638799828b8d8668c421bfb94c6cb04269130d8de4fb7136", size = 212451 },
+    { url = "https://files.pythonhosted.org/packages/7c/bb/a91b72efeeb42906ef58ccf0cdb87947b54d7475fee3c93425d732f16a61/propcache-0.2.0-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:1235c01ddaa80da8235741e80815ce381c5267f96cc49b1477fdcf8c047ef325", size = 212879 },
+    { url = "https://files.pythonhosted.org/packages/9b/7f/ee7fea8faac57b3ec5d91ff47470c6c5d40d7f15d0b1fccac806348fa59e/propcache-0.2.0-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:3947483a381259c06921612550867b37d22e1df6d6d7e8361264b6d037595f44", size = 222288 },
+    { url = "https://files.pythonhosted.org/packages/ff/d7/acd67901c43d2e6b20a7a973d9d5fd543c6e277af29b1eb0e1f7bd7ca7d2/propcache-0.2.0-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:d5bed7f9805cc29c780f3aee05de3262ee7ce1f47083cfe9f77471e9d6777e83", size = 228257 },
+    { url = "https://files.pythonhosted.org/packages/8d/6f/6272ecc7a8daad1d0754cfc6c8846076a8cb13f810005c79b15ce0ef0cf2/propcache-0.2.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:e4a91d44379f45f5e540971d41e4626dacd7f01004826a18cb048e7da7e96544", size = 221075 },
+    { url = "https://files.pythonhosted.org/packages/7c/bd/c7a6a719a6b3dd8b3aeadb3675b5783983529e4a3185946aa444d3e078f6/propcache-0.2.0-cp313-cp313-win32.whl", hash = "sha256:f902804113e032e2cdf8c71015651c97af6418363bea8d78dc0911d56c335032", size = 39654 },
+    { url = "https://files.pythonhosted.org/packages/88/e7/0eef39eff84fa3e001b44de0bd41c7c0e3432e7648ffd3d64955910f002d/propcache-0.2.0-cp313-cp313-win_amd64.whl", hash = "sha256:8f188cfcc64fb1266f4684206c9de0e80f54622c3f22a910cbd200478aeae61e", size = 43705 },
+    { url = "https://files.pythonhosted.org/packages/3d/b6/e6d98278f2d49b22b4d033c9f792eda783b9ab2094b041f013fc69bcde87/propcache-0.2.0-py3-none-any.whl", hash = "sha256:2ccc28197af5313706511fab3a8b66dcd6da067a1331372c82ea1cb74285e036", size = 11603 },
+]
+
+[[package]]
+name = "py3xui"
+version = "0.3.4"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "httpx" },
+    { name = "pydantic" },
+    { name = "requests" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/0e/d5/341423a74580ea9e0fab69a3fdec439ba03325f2d74f54e817701e5f5cad/py3xui-0.3.4.tar.gz", hash = "sha256:fa44f1549699b1ea3066f3ea2d40319678ba1f6b93201ab0b31f2a52c866facf", size = 30702 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/59/44/434046870557f68ee24414cb180c80c1e636740605aa5ccd409cfe106218/py3xui-0.3.4-py3-none-any.whl", hash = "sha256:1d30f64c2e81256315b6848ab3dacd07be37b01ec422460c920b7317ad0d6c76", size = 38125 },
+]
+
+[[package]]
+name = "pydantic"
+version = "2.9.2"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "annotated-types" },
+    { name = "pydantic-core" },
+    { name = "typing-extensions" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/a9/b7/d9e3f12af310e1120c21603644a1cd86f59060e040ec5c3a80b8f05fae30/pydantic-2.9.2.tar.gz", hash = "sha256:d155cef71265d1e9807ed1c32b4c8deec042a44a50a4188b25ac67ecd81a9c0f", size = 769917 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/df/e4/ba44652d562cbf0bf320e0f3810206149c8a4e99cdbf66da82e97ab53a15/pydantic-2.9.2-py3-none-any.whl", hash = "sha256:f048cec7b26778210e28a0459867920654d48e5e62db0958433636cde4254f12", size = 434928 },
+]
+
+[[package]]
+name = "pydantic-core"
+version = "2.23.4"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "typing-extensions" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/e2/aa/6b6a9b9f8537b872f552ddd46dd3da230367754b6f707b8e1e963f515ea3/pydantic_core-2.23.4.tar.gz", hash = "sha256:2584f7cf844ac4d970fba483a717dbe10c1c1c96a969bf65d61ffe94df1b2863", size = 402156 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/74/7b/8e315f80666194b354966ec84b7d567da77ad927ed6323db4006cf915f3f/pydantic_core-2.23.4-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:f3e0da4ebaef65158d4dfd7d3678aad692f7666877df0002b8a522cdf088f231", size = 1856459 },
+    { url = "https://files.pythonhosted.org/packages/14/de/866bdce10ed808323d437612aca1ec9971b981e1c52e5e42ad9b8e17a6f6/pydantic_core-2.23.4-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:f69a8e0b033b747bb3e36a44e7732f0c99f7edd5cea723d45bc0d6e95377ffee", size = 1770007 },
+    { url = "https://files.pythonhosted.org/packages/dc/69/8edd5c3cd48bb833a3f7ef9b81d7666ccddd3c9a635225214e044b6e8281/pydantic_core-2.23.4-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:723314c1d51722ab28bfcd5240d858512ffd3116449c557a1336cbe3919beb87", size = 1790245 },
+    { url = "https://files.pythonhosted.org/packages/80/33/9c24334e3af796ce80d2274940aae38dd4e5676298b4398eff103a79e02d/pydantic_core-2.23.4-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:bb2802e667b7051a1bebbfe93684841cc9351004e2badbd6411bf357ab8d5ac8", size = 1801260 },
+    { url = "https://files.pythonhosted.org/packages/a5/6f/e9567fd90104b79b101ca9d120219644d3314962caa7948dd8b965e9f83e/pydantic_core-2.23.4-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d18ca8148bebe1b0a382a27a8ee60350091a6ddaf475fa05ef50dc35b5df6327", size = 1996872 },
+    { url = "https://files.pythonhosted.org/packages/2d/ad/b5f0fe9e6cfee915dd144edbd10b6e9c9c9c9d7a56b69256d124b8ac682e/pydantic_core-2.23.4-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:33e3d65a85a2a4a0dc3b092b938a4062b1a05f3a9abde65ea93b233bca0e03f2", size = 2661617 },
+    { url = "https://files.pythonhosted.org/packages/06/c8/7d4b708f8d05a5cbfda3243aad468052c6e99de7d0937c9146c24d9f12e9/pydantic_core-2.23.4-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:128585782e5bfa515c590ccee4b727fb76925dd04a98864182b22e89a4e6ed36", size = 2071831 },
+    { url = "https://files.pythonhosted.org/packages/89/4d/3079d00c47f22c9a9a8220db088b309ad6e600a73d7a69473e3a8e5e3ea3/pydantic_core-2.23.4-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:68665f4c17edcceecc112dfed5dbe6f92261fb9d6054b47d01bf6371a6196126", size = 1917453 },
+    { url = "https://files.pythonhosted.org/packages/e9/88/9df5b7ce880a4703fcc2d76c8c2d8eb9f861f79d0c56f4b8f5f2607ccec8/pydantic_core-2.23.4-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:20152074317d9bed6b7a95ade3b7d6054845d70584216160860425f4fbd5ee9e", size = 1968793 },
+    { url = "https://files.pythonhosted.org/packages/e3/b9/41f7efe80f6ce2ed3ee3c2dcfe10ab7adc1172f778cc9659509a79518c43/pydantic_core-2.23.4-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:9261d3ce84fa1d38ed649c3638feefeae23d32ba9182963e465d58d62203bd24", size = 2116872 },
+    { url = "https://files.pythonhosted.org/packages/63/08/b59b7a92e03dd25554b0436554bf23e7c29abae7cce4b1c459cd92746811/pydantic_core-2.23.4-cp312-none-win32.whl", hash = "sha256:4ba762ed58e8d68657fc1281e9bb72e1c3e79cc5d464be146e260c541ec12d84", size = 1738535 },
+    { url = "https://files.pythonhosted.org/packages/88/8d/479293e4d39ab409747926eec4329de5b7129beaedc3786eca070605d07f/pydantic_core-2.23.4-cp312-none-win_amd64.whl", hash = "sha256:97df63000f4fea395b2824da80e169731088656d1818a11b95f3b173747b6cd9", size = 1917992 },
+    { url = "https://files.pythonhosted.org/packages/ad/ef/16ee2df472bf0e419b6bc68c05bf0145c49247a1095e85cee1463c6a44a1/pydantic_core-2.23.4-cp313-cp313-macosx_10_12_x86_64.whl", hash = "sha256:7530e201d10d7d14abce4fb54cfe5b94a0aefc87da539d0346a484ead376c3cc", size = 1856143 },
+    { url = "https://files.pythonhosted.org/packages/da/fa/bc3dbb83605669a34a93308e297ab22be82dfb9dcf88c6cf4b4f264e0a42/pydantic_core-2.23.4-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:df933278128ea1cd77772673c73954e53a1c95a4fdf41eef97c2b779271bd0bd", size = 1770063 },
+    { url = "https://files.pythonhosted.org/packages/4e/48/e813f3bbd257a712303ebdf55c8dc46f9589ec74b384c9f652597df3288d/pydantic_core-2.23.4-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0cb3da3fd1b6a5d0279a01877713dbda118a2a4fc6f0d821a57da2e464793f05", size = 1790013 },
+    { url = "https://files.pythonhosted.org/packages/b4/e0/56eda3a37929a1d297fcab1966db8c339023bcca0b64c5a84896db3fcc5c/pydantic_core-2.23.4-cp313-cp313-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:42c6dcb030aefb668a2b7009c85b27f90e51e6a3b4d5c9bc4c57631292015b0d", size = 1801077 },
+    { url = "https://files.pythonhosted.org/packages/04/be/5e49376769bfbf82486da6c5c1683b891809365c20d7c7e52792ce4c71f3/pydantic_core-2.23.4-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:696dd8d674d6ce621ab9d45b205df149399e4bb9aa34102c970b721554828510", size = 1996782 },
+    { url = "https://files.pythonhosted.org/packages/bc/24/e3ee6c04f1d58cc15f37bcc62f32c7478ff55142b7b3e6d42ea374ea427c/pydantic_core-2.23.4-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2971bb5ffe72cc0f555c13e19b23c85b654dd2a8f7ab493c262071377bfce9f6", size = 2661375 },
+    { url = "https://files.pythonhosted.org/packages/c1/f8/11a9006de4e89d016b8de74ebb1db727dc100608bb1e6bbe9d56a3cbbcce/pydantic_core-2.23.4-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8394d940e5d400d04cad4f75c0598665cbb81aecefaca82ca85bd28264af7f9b", size = 2071635 },
+    { url = "https://files.pythonhosted.org/packages/7c/45/bdce5779b59f468bdf262a5bc9eecbae87f271c51aef628d8c073b4b4b4c/pydantic_core-2.23.4-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:0dff76e0602ca7d4cdaacc1ac4c005e0ce0dcfe095d5b5259163a80d3a10d327", size = 1916994 },
+    { url = "https://files.pythonhosted.org/packages/d8/fa/c648308fe711ee1f88192cad6026ab4f925396d1293e8356de7e55be89b5/pydantic_core-2.23.4-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:7d32706badfe136888bdea71c0def994644e09fff0bfe47441deaed8e96fdbc6", size = 1968877 },
+    { url = "https://files.pythonhosted.org/packages/16/16/b805c74b35607d24d37103007f899abc4880923b04929547ae68d478b7f4/pydantic_core-2.23.4-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:ed541d70698978a20eb63d8c5d72f2cc6d7079d9d90f6b50bad07826f1320f5f", size = 2116814 },
+    { url = "https://files.pythonhosted.org/packages/d1/58/5305e723d9fcdf1c5a655e6a4cc2a07128bf644ff4b1d98daf7a9dbf57da/pydantic_core-2.23.4-cp313-none-win32.whl", hash = "sha256:3d5639516376dce1940ea36edf408c554475369f5da2abd45d44621cb616f769", size = 1738360 },
+    { url = "https://files.pythonhosted.org/packages/a5/ae/e14b0ff8b3f48e02394d8acd911376b7b66e164535687ef7dc24ea03072f/pydantic_core-2.23.4-cp313-none-win_amd64.whl", hash = "sha256:5a1504ad17ba4210df3a045132a7baeeba5a200e930f57512ee02909fc5c4cb5", size = 1919411 },
+]
+
+[[package]]
+name = "pytz"
+version = "2025.1"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/5f/57/df1c9157c8d5a05117e455d66fd7cf6dbc46974f832b1058ed4856785d8a/pytz-2025.1.tar.gz", hash = "sha256:c2db42be2a2518b28e65f9207c4d05e6ff547d1efa4086469ef855e4ab70178e", size = 319617 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/eb/38/ac33370d784287baa1c3d538978b5e2ea064d4c1b93ffbd12826c190dd10/pytz-2025.1-py2.py3-none-any.whl", hash = "sha256:89dd22dca55b46eac6eda23b2d72721bf1bdfef212645d81513ef5d03038de57", size = 507930 },
+]
+
+[[package]]
+name = "requests"
+version = "2.32.3"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "certifi" },
+    { name = "charset-normalizer" },
+    { name = "idna" },
+    { name = "urllib3" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/63/70/2bf7780ad2d390a8d301ad0b550f1581eadbd9a20f896afe06353c2a2913/requests-2.32.3.tar.gz", hash = "sha256:55365417734eb18255590a9ff9eb97e9e1da868d4ccd6402399eaf68af20a760", size = 131218 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/f9/9b/335f9764261e915ed497fcdeb11df5dfd6f7bf257d4a6a2a686d80da4d54/requests-2.32.3-py3-none-any.whl", hash = "sha256:70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6", size = 64928 },
+]
+
+[[package]]
+name = "robokassa"
+version = "0.3.2"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "httpx" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/c7/ce/1c9fe483c2907217242576571aa4383a139c60545992bc483e99556b8cae/robokassa-0.3.2.tar.gz", hash = "sha256:0a4fa6eeb1f959fa6743a2a3638381feaf1c137f06c6aaeb91faf3b24cfe892b", size = 8992 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/e1/c4/3caeae80cd8b5dac9aea5ce9767499fad9327e9d14f2d6ea00f92f89348f/robokassa-0.3.2-py3-none-any.whl", hash = "sha256:1080502795b12b1173deab8cf5bd377ae584dc8864755c30136b68d3ab0cec4e", size = 15477 },
+]
+
+[[package]]
+name = "ruff"
+version = "0.9.5"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/02/74/6c359f6b9ed85b88df6ef31febce18faeb852f6c9855651dfb1184a46845/ruff-0.9.5.tar.gz", hash = "sha256:11aecd7a633932875ab3cb05a484c99970b9d52606ce9ea912b690b02653d56c", size = 3634177 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/17/4b/82b7c9ac874e72b82b19fd7eab57d122e2df44d2478d90825854f9232d02/ruff-0.9.5-py3-none-linux_armv6l.whl", hash = "sha256:d466d2abc05f39018d53f681fa1c0ffe9570e6d73cde1b65d23bb557c846f442", size = 11681264 },
+    { url = "https://files.pythonhosted.org/packages/27/5c/f5ae0a9564e04108c132e1139d60491c0abc621397fe79a50b3dc0bd704b/ruff-0.9.5-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:38840dbcef63948657fa7605ca363194d2fe8c26ce8f9ae12eee7f098c85ac8a", size = 11657554 },
+    { url = "https://files.pythonhosted.org/packages/2a/83/c6926fa3ccb97cdb3c438bb56a490b395770c750bf59f9bc1fe57ae88264/ruff-0.9.5-py3-none-macosx_11_0_arm64.whl", hash = "sha256:d56ba06da53536b575fbd2b56517f6f95774ff7be0f62c80b9e67430391eeb36", size = 11088959 },
+    { url = "https://files.pythonhosted.org/packages/af/a7/42d1832b752fe969ffdbfcb1b4cb477cb271bed5835110fb0a16ef31ab81/ruff-0.9.5-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4f7cb2a01da08244c50b20ccfaeb5972e4228c3c3a1989d3ece2bc4b1f996001", size = 11902041 },
+    { url = "https://files.pythonhosted.org/packages/53/cf/1fffa09fb518d646f560ccfba59f91b23c731e461d6a4dedd21a393a1ff1/ruff-0.9.5-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:96d5c76358419bc63a671caac70c18732d4fd0341646ecd01641ddda5c39ca0b", size = 11421069 },
+    { url = "https://files.pythonhosted.org/packages/09/27/bb8f1b7304e2a9431f631ae7eadc35550fe0cf620a2a6a0fc4aa3d736f94/ruff-0.9.5-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:deb8304636ed394211f3a6d46c0e7d9535b016f53adaa8340139859b2359a070", size = 12625095 },
+    { url = "https://files.pythonhosted.org/packages/d7/ce/ab00bc9d3df35a5f1b64f5117458160a009f93ae5caf65894ebb63a1842d/ruff-0.9.5-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:df455000bf59e62b3e8c7ba5ed88a4a2bc64896f900f311dc23ff2dc38156440", size = 13257797 },
+    { url = "https://files.pythonhosted.org/packages/88/81/c639a082ae6d8392bc52256058ec60f493c6a4d06d5505bccface3767e61/ruff-0.9.5-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:de92170dfa50c32a2b8206a647949590e752aca8100a0f6b8cefa02ae29dce80", size = 12763793 },
+    { url = "https://files.pythonhosted.org/packages/b3/d0/0a3d8f56d1e49af466dc770eeec5c125977ba9479af92e484b5b0251ce9c/ruff-0.9.5-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:3d28532d73b1f3f627ba88e1456f50748b37f3a345d2be76e4c653bec6c3e393", size = 14386234 },
+    { url = "https://files.pythonhosted.org/packages/04/70/e59c192a3ad476355e7f45fb3a87326f5219cc7c472e6b040c6c6595c8f0/ruff-0.9.5-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2c746d7d1df64f31d90503ece5cc34d7007c06751a7a3bbeee10e5f2463d52d2", size = 12437505 },
+    { url = "https://files.pythonhosted.org/packages/55/4e/3abba60a259d79c391713e7a6ccabf7e2c96e5e0a19100bc4204f1a43a51/ruff-0.9.5-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:11417521d6f2d121fda376f0d2169fb529976c544d653d1d6044f4c5562516ee", size = 11884799 },
+    { url = "https://files.pythonhosted.org/packages/a3/db/b0183a01a9f25b4efcae919c18fb41d32f985676c917008620ad692b9d5f/ruff-0.9.5-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:5b9d71c3879eb32de700f2f6fac3d46566f644a91d3130119a6378f9312a38e1", size = 11527411 },
+    { url = "https://files.pythonhosted.org/packages/0a/e4/3ebfcebca3dff1559a74c6becff76e0b64689cea02b7aab15b8b32ea245d/ruff-0.9.5-py3-none-musllinux_1_2_i686.whl", hash = "sha256:2e36c61145e70febcb78483903c43444c6b9d40f6d2f800b5552fec6e4a7bb9a", size = 12078868 },
+    { url = "https://files.pythonhosted.org/packages/ec/b2/5ab808833e06c0a1b0d046a51c06ec5687b73c78b116e8d77687dc0cd515/ruff-0.9.5-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:2f71d09aeba026c922aa7aa19a08d7bd27c867aedb2f74285a2639644c1c12f5", size = 12524374 },
+    { url = "https://files.pythonhosted.org/packages/e0/51/1432afcc3b7aa6586c480142caae5323d59750925c3559688f2a9867343f/ruff-0.9.5-py3-none-win32.whl", hash = "sha256:134f958d52aa6fdec3b294b8ebe2320a950d10c041473c4316d2e7d7c2544723", size = 9853682 },
+    { url = "https://files.pythonhosted.org/packages/b7/ad/c7a900591bd152bb47fc4882a27654ea55c7973e6d5d6396298ad3fd6638/ruff-0.9.5-py3-none-win_amd64.whl", hash = "sha256:78cc6067f6d80b6745b67498fb84e87d32c6fc34992b52bffefbdae3442967d6", size = 10865744 },
+    { url = "https://files.pythonhosted.org/packages/75/d9/fde7610abd53c0c76b6af72fc679cb377b27c617ba704e25da834e0a0608/ruff-0.9.5-py3-none-win_arm64.whl", hash = "sha256:18a29f1a005bddb229e580795627d297dfa99f16b30c7039e73278cf6b5f9fa9", size = 10064595 },
+]
+
+[[package]]
+name = "sniffio"
+version = "1.3.1"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/a2/87/a6771e1546d97e7e041b6ae58d80074f81b7d5121207425c964ddf5cfdbd/sniffio-1.3.1.tar.gz", hash = "sha256:f4324edc670a0f49750a81b895f35c3adb843cca46f0530f79fc1babb23789dc", size = 20372 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/e9/44/75a9c9421471a6c4805dbf2356f7c181a29c1879239abab1ea2cc8f38b40/sniffio-1.3.1-py3-none-any.whl", hash = "sha256:2f6da418d1f1e0fddd844478f41680e794e6051915791a034ff65e5f100525a2", size = 10235 },
+]
+
+[[package]]
+name = "solo-bot"
+version = "0.0.1"
+source = { virtual = "." }
+dependencies = [
+    { name = "aiocryptopay" },
+    { name = "aiofiles" },
+    { name = "aiogram" },
+    { name = "aiohappyeyeballs" },
+    { name = "aiohttp" },
+    { name = "aiosignal" },
+    { name = "annotated-types" },
+    { name = "async-timeout" },
+    { name = "asyncpg" },
+    { name = "attrs" },
+    { name = "babel" },
+    { name = "cachetools" },
+    { name = "certifi" },
+    { name = "charset-normalizer" },
+    { name = "deprecated" },
+    { name = "distro" },
+    { name = "frozenlist" },
+    { name = "idna" },
+    { name = "loguru" },
+    { name = "magic-filter" },
+    { name = "multidict" },
+    { name = "netaddr" },
+    { name = "ping3" },
+    { name = "propcache" },
+    { name = "py3xui" },
+    { name = "pydantic" },
+    { name = "pydantic-core" },
+    { name = "pytz" },
+    { name = "requests" },
+    { name = "robokassa" },
+    { name = "ruff" },
+    { name = "sqlalchemy" },
+    { name = "typing-extensions" },
+    { name = "urllib3" },
+    { name = "wrapt" },
+    { name = "yarl" },
+    { name = "yookassa" },
+]
+
+[package.metadata]
+requires-dist = [
+    { name = "aiocryptopay" },
+    { name = "aiofiles", specifier = "==24.1.0" },
+    { name = "aiogram", specifier = "==3.13.1" },
+    { name = "aiohappyeyeballs", specifier = "==2.4.3" },
+    { name = "aiohttp", specifier = "==3.10.10" },
+    { name = "aiosignal", specifier = "==1.3.1" },
+    { name = "annotated-types", specifier = "==0.7.0" },
+    { name = "async-timeout", specifier = "==4.0.3" },
+    { name = "asyncpg", specifier = "==0.30.0" },
+    { name = "attrs", specifier = "==24.2.0" },
+    { name = "babel" },
+    { name = "cachetools" },
+    { name = "certifi" },
+    { name = "charset-normalizer", specifier = "==3.4.0" },
+    { name = "deprecated", specifier = "==1.2.14" },
+    { name = "distro", specifier = "==1.9.0" },
+    { name = "frozenlist", specifier = "==1.4.1" },
+    { name = "idna", specifier = "==3.10" },
+    { name = "loguru" },
+    { name = "magic-filter", specifier = "==1.0.12" },
+    { name = "multidict", specifier = "==6.1.0" },
+    { name = "netaddr", specifier = "==1.3.0" },
+    { name = "ping3" },
+    { name = "propcache", specifier = "==0.2.0" },
+    { name = "py3xui" },
+    { name = "pydantic" },
+    { name = "pydantic-core" },
+    { name = "pytz" },
+    { name = "requests", specifier = "==2.32.3" },
+    { name = "robokassa" },
+    { name = "ruff" },
+    { name = "sqlalchemy" },
+    { name = "typing-extensions", specifier = "==4.12.2" },
+    { name = "urllib3", specifier = "==2.2.3" },
+    { name = "wrapt", specifier = "==1.16.0" },
+    { name = "yarl", specifier = "==1.15.5" },
+    { name = "yookassa", specifier = "==3.3.0" },
+]
+
+[[package]]
+name = "sqlalchemy"
+version = "2.0.38"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "greenlet", marker = "(python_full_version < '3.14' and platform_machine == 'AMD64') or (python_full_version < '3.14' and platform_machine == 'WIN32') or (python_full_version < '3.14' and platform_machine == 'aarch64') or (python_full_version < '3.14' and platform_machine == 'amd64') or (python_full_version < '3.14' and platform_machine == 'ppc64le') or (python_full_version < '3.14' and platform_machine == 'win32') or (python_full_version < '3.14' and platform_machine == 'x86_64')" },
+    { name = "typing-extensions" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/e4/08/9a90962ea72acd532bda71249a626344d855c4032603924b1b547694b837/sqlalchemy-2.0.38.tar.gz", hash = "sha256:e5a4d82bdb4bf1ac1285a68eab02d253ab73355d9f0fe725a97e1e0fa689decb", size = 9634782 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/5a/f8/6d0424af1442c989b655a7b5f608bc2ae5e4f94cdf6df9f6054f629dc587/SQLAlchemy-2.0.38-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:12d5b06a1f3aeccf295a5843c86835033797fea292c60e72b07bcb5d820e6dd3", size = 2104927 },
+    { url = "https://files.pythonhosted.org/packages/25/80/fc06e65fca0a19533e2bfab633a5633ed8b6ee0b9c8d580acf84609ce4da/SQLAlchemy-2.0.38-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:e036549ad14f2b414c725349cce0772ea34a7ab008e9cd67f9084e4f371d1f32", size = 2095317 },
+    { url = "https://files.pythonhosted.org/packages/98/2d/5d66605f76b8e344813237dc160a01f03b987201e974b46056a7fb94a874/SQLAlchemy-2.0.38-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ee3bee874cb1fadee2ff2b79fc9fc808aa638670f28b2145074538d4a6a5028e", size = 3244735 },
+    { url = "https://files.pythonhosted.org/packages/73/8d/b0539e8dce90861efc38fea3eefb15a5d0cfeacf818614762e77a9f192f9/SQLAlchemy-2.0.38-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e185ea07a99ce8b8edfc788c586c538c4b1351007e614ceb708fd01b095ef33e", size = 3255581 },
+    { url = "https://files.pythonhosted.org/packages/ac/a5/94e1e44bf5bdffd1782807fcc072542b110b950f0be53f49e68b5f5eca1b/SQLAlchemy-2.0.38-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:b79ee64d01d05a5476d5cceb3c27b5535e6bb84ee0f872ba60d9a8cd4d0e6579", size = 3190877 },
+    { url = "https://files.pythonhosted.org/packages/91/13/f08b09996dce945aec029c64f61c13b4788541ac588d9288e31e0d3d8850/SQLAlchemy-2.0.38-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:afd776cf1ebfc7f9aa42a09cf19feadb40a26366802d86c1fba080d8e5e74bdd", size = 3217485 },
+    { url = "https://files.pythonhosted.org/packages/13/8f/8cfe2ba5ba6d8090f4de0e658330c53be6b7bf430a8df1b141c2b180dcdf/SQLAlchemy-2.0.38-cp312-cp312-win32.whl", hash = "sha256:a5645cd45f56895cfe3ca3459aed9ff2d3f9aaa29ff7edf557fa7a23515a3725", size = 2075254 },
+    { url = "https://files.pythonhosted.org/packages/c2/5c/e3c77fae41862be1da966ca98eec7fbc07cdd0b00f8b3e1ef2a13eaa6cca/SQLAlchemy-2.0.38-cp312-cp312-win_amd64.whl", hash = "sha256:1052723e6cd95312f6a6eff9a279fd41bbae67633415373fdac3c430eca3425d", size = 2100865 },
+    { url = "https://files.pythonhosted.org/packages/21/77/caa875a1f5a8a8980b564cc0e6fee1bc992d62d29101252561d0a5e9719c/SQLAlchemy-2.0.38-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:ecef029b69843b82048c5b347d8e6049356aa24ed644006c9a9d7098c3bd3bfd", size = 2100201 },
+    { url = "https://files.pythonhosted.org/packages/f4/ec/94bb036ec78bf9a20f8010c807105da9152dd84f72e8c51681ad2f30b3fd/SQLAlchemy-2.0.38-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:9c8bcad7fc12f0cc5896d8e10fdf703c45bd487294a986903fe032c72201596b", size = 2090678 },
+    { url = "https://files.pythonhosted.org/packages/7b/61/63ff1893f146e34d3934c0860209fdd3925c25ee064330e6c2152bacc335/SQLAlchemy-2.0.38-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2a0ef3f98175d77180ffdc623d38e9f1736e8d86b6ba70bff182a7e68bed7727", size = 3177107 },
+    { url = "https://files.pythonhosted.org/packages/a9/4f/b933bea41a602b5f274065cc824fae25780ed38664d735575192490a021b/SQLAlchemy-2.0.38-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8b0ac78898c50e2574e9f938d2e5caa8fe187d7a5b69b65faa1ea4648925b096", size = 3190435 },
+    { url = "https://files.pythonhosted.org/packages/f5/23/9e654b4059e385988de08c5d3b38a369ea042f4c4d7c8902376fd737096a/SQLAlchemy-2.0.38-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:9eb4fa13c8c7a2404b6a8e3772c17a55b1ba18bc711e25e4d6c0c9f5f541b02a", size = 3123648 },
+    { url = "https://files.pythonhosted.org/packages/83/59/94c6d804e76ebc6412a08d2b086a8cb3e5a056cd61508e18ddaf3ec70100/SQLAlchemy-2.0.38-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:5dba1cdb8f319084f5b00d41207b2079822aa8d6a4667c0f369fce85e34b0c86", size = 3151789 },
+    { url = "https://files.pythonhosted.org/packages/b2/27/17f143013aabbe1256dce19061eafdce0b0142465ce32168cdb9a18c04b1/SQLAlchemy-2.0.38-cp313-cp313-win32.whl", hash = "sha256:eae27ad7580529a427cfdd52c87abb2dfb15ce2b7a3e0fc29fbb63e2ed6f8120", size = 2073023 },
+    { url = "https://files.pythonhosted.org/packages/e2/3e/259404b03c3ed2e7eee4c179e001a07d9b61070334be91124cf4ad32eec7/SQLAlchemy-2.0.38-cp313-cp313-win_amd64.whl", hash = "sha256:b335a7c958bc945e10c522c069cd6e5804f4ff20f9a744dd38e748eb602cbbda", size = 2096908 },
+    { url = "https://files.pythonhosted.org/packages/aa/e4/592120713a314621c692211eba034d09becaf6bc8848fabc1dc2a54d8c16/SQLAlchemy-2.0.38-py3-none-any.whl", hash = "sha256:63178c675d4c80def39f1febd625a6333f44c0ba269edd8a468b156394b27753", size = 1896347 },
+]
+
+[[package]]
+name = "strenum"
+version = "0.4.15"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/85/ad/430fb60d90e1d112a62ff57bdd1f286ec73a2a0331272febfddd21f330e1/StrEnum-0.4.15.tar.gz", hash = "sha256:878fb5ab705442070e4dd1929bb5e2249511c0bcf2b0eeacf3bcd80875c82eff", size = 23384 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/81/69/297302c5f5f59c862faa31e6cb9a4cd74721cd1e052b38e464c5b402df8b/StrEnum-0.4.15-py3-none-any.whl", hash = "sha256:a30cda4af7cc6b5bf52c8055bc4bf4b2b6b14a93b574626da33df53cf7740659", size = 8851 },
+]
+
+[[package]]
+name = "typing-extensions"
+version = "4.12.2"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/df/db/f35a00659bc03fec321ba8bce9420de607a1d37f8342eee1863174c69557/typing_extensions-4.12.2.tar.gz", hash = "sha256:1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8", size = 85321 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/26/9f/ad63fc0248c5379346306f8668cda6e2e2e9c95e01216d2b8ffd9ff037d0/typing_extensions-4.12.2-py3-none-any.whl", hash = "sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d", size = 37438 },
+]
+
+[[package]]
+name = "urllib3"
+version = "2.2.3"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/ed/63/22ba4ebfe7430b76388e7cd448d5478814d3032121827c12a2cc287e2260/urllib3-2.2.3.tar.gz", hash = "sha256:e7d814a81dad81e6caf2ec9fdedb284ecc9c73076b62654547cc64ccdcae26e9", size = 300677 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/ce/d9/5f4c13cecde62396b0d3fe530a50ccea91e7dfc1ccf0e09c228841bb5ba8/urllib3-2.2.3-py3-none-any.whl", hash = "sha256:ca899ca043dcb1bafa3e262d73aa25c465bfb49e0bd9dd5d59f1d0acba2f8fac", size = 126338 },
+]
+
+[[package]]
+name = "win32-setctime"
+version = "1.2.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/b3/8f/705086c9d734d3b663af0e9bb3d4de6578d08f46b1b101c2442fd9aecaa2/win32_setctime-1.2.0.tar.gz", hash = "sha256:ae1fdf948f5640aae05c511ade119313fb6a30d7eabe25fef9764dca5873c4c0", size = 4867 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/e1/07/c6fe3ad3e685340704d314d765b7912993bcb8dc198f0e7a89382d37974b/win32_setctime-1.2.0-py3-none-any.whl", hash = "sha256:95d644c4e708aba81dc3704a116d8cbc974d70b3bdb8be1d150e36be6e9d1390", size = 4083 },
+]
+
+[[package]]
+name = "wrapt"
+version = "1.16.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/95/4c/063a912e20bcef7124e0df97282a8af3ff3e4b603ce84c481d6d7346be0a/wrapt-1.16.0.tar.gz", hash = "sha256:5f370f952971e7d17c7d1ead40e49f32345a7f7a5373571ef44d800d06b1899d", size = 53972 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/92/17/224132494c1e23521868cdd57cd1e903f3b6a7ba6996b7b8f077ff8ac7fe/wrapt-1.16.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:5eb404d89131ec9b4f748fa5cfb5346802e5ee8836f57d516576e61f304f3b7b", size = 37614 },
+    { url = "https://files.pythonhosted.org/packages/6a/d7/cfcd73e8f4858079ac59d9db1ec5a1349bc486ae8e9ba55698cc1f4a1dff/wrapt-1.16.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:9090c9e676d5236a6948330e83cb89969f433b1943a558968f659ead07cb3b36", size = 38316 },
+    { url = "https://files.pythonhosted.org/packages/7e/79/5ff0a5c54bda5aec75b36453d06be4f83d5cd4932cc84b7cb2b52cee23e2/wrapt-1.16.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:94265b00870aa407bd0cbcfd536f17ecde43b94fb8d228560a1e9d3041462d73", size = 86322 },
+    { url = "https://files.pythonhosted.org/packages/c4/81/e799bf5d419f422d8712108837c1d9bf6ebe3cb2a81ad94413449543a923/wrapt-1.16.0-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f2058f813d4f2b5e3a9eb2eb3faf8f1d99b81c3e51aeda4b168406443e8ba809", size = 79055 },
+    { url = "https://files.pythonhosted.org/packages/62/62/30ca2405de6a20448ee557ab2cd61ab9c5900be7cbd18a2639db595f0b98/wrapt-1.16.0-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:98b5e1f498a8ca1858a1cdbffb023bfd954da4e3fa2c0cb5853d40014557248b", size = 87291 },
+    { url = "https://files.pythonhosted.org/packages/49/4e/5d2f6d7b57fc9956bf06e944eb00463551f7d52fc73ca35cfc4c2cdb7aed/wrapt-1.16.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:14d7dc606219cdd7405133c713f2c218d4252f2a469003f8c46bb92d5d095d81", size = 90374 },
+    { url = "https://files.pythonhosted.org/packages/a6/9b/c2c21b44ff5b9bf14a83252a8b973fb84923764ff63db3e6dfc3895cf2e0/wrapt-1.16.0-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:49aac49dc4782cb04f58986e81ea0b4768e4ff197b57324dcbd7699c5dfb40b9", size = 83896 },
+    { url = "https://files.pythonhosted.org/packages/14/26/93a9fa02c6f257df54d7570dfe8011995138118d11939a4ecd82cb849613/wrapt-1.16.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:418abb18146475c310d7a6dc71143d6f7adec5b004ac9ce08dc7a34e2babdc5c", size = 91738 },
+    { url = "https://files.pythonhosted.org/packages/a2/5b/4660897233eb2c8c4de3dc7cefed114c61bacb3c28327e64150dc44ee2f6/wrapt-1.16.0-cp312-cp312-win32.whl", hash = "sha256:685f568fa5e627e93f3b52fda002c7ed2fa1800b50ce51f6ed1d572d8ab3e7fc", size = 35568 },
+    { url = "https://files.pythonhosted.org/packages/5c/cc/8297f9658506b224aa4bd71906447dea6bb0ba629861a758c28f67428b91/wrapt-1.16.0-cp312-cp312-win_amd64.whl", hash = "sha256:dcdba5c86e368442528f7060039eda390cc4091bfd1dca41e8046af7c910dda8", size = 37653 },
+    { url = "https://files.pythonhosted.org/packages/ff/21/abdedb4cdf6ff41ebf01a74087740a709e2edb146490e4d9beea054b0b7a/wrapt-1.16.0-py3-none-any.whl", hash = "sha256:6906c4100a8fcbf2fa735f6059214bb13b97f75b1a61777fcf6432121ef12ef1", size = 23362 },
+]
+
+[[package]]
+name = "yarl"
+version = "1.15.5"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "idna" },
+    { name = "multidict" },
+    { name = "propcache" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/3e/83/529d9cb66a6b3ba120c4a52bec8299f495f9446b749cb1110c89ffb46704/yarl-1.15.5.tar.gz", hash = "sha256:8249147ee81c1cf4d1dc6f26ba28a1b9d92751529f83c308ad02164bb93abd0d", size = 172410 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/1f/42/24e7a628366eba6dd953bbe6f2badb2096c1246d1836cf0df8236914e6c7/yarl-1.15.5-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:d3309ee667f2d9c7ac9ecf44620d6b274bfdd8065b8c5019ff6795dd887b8fed", size = 137713 },
+    { url = "https://files.pythonhosted.org/packages/9c/92/92a160e99e9318e878f83dd142325ab68294514cdae9b44211ca0967e07d/yarl-1.15.5-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:96ce879799fee124d241ea3b84448378f638e290c49493d00b706f3fd57ec22b", size = 90000 },
+    { url = "https://files.pythonhosted.org/packages/e4/02/545486efaeb93e62df561348a7ef5c5dfbff8ad6e17e601b2306ff939d34/yarl-1.15.5-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:c884dfa56b050f718ea3cbbfd972e29a6f07f63a7449b10d9a20d64f7eec92e2", size = 87929 },
+    { url = "https://files.pythonhosted.org/packages/ba/9e/b7072da94820f6b1d5ecbe5f6208d68121cd6abd9b5a78629fe2d85b65b8/yarl-1.15.5-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0327081978fe186c3390dd4f73f95f825d0bb9c74967e22c2a1a87735974d8f5", size = 327334 },
+    { url = "https://files.pythonhosted.org/packages/e8/2b/8d8776de7624cb45f5713285c0c38f2d8761371cc979e6f5220ab9b035f3/yarl-1.15.5-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:524b3bb7dff320e305bc979c65eddc0342548c56ea9241502f907853fe53c408", size = 337141 },
+    { url = "https://files.pythonhosted.org/packages/0b/25/5aed0c7e09fc34ec7c54a4a7b7bd56db479f3f45396d277fbd2700f836e7/yarl-1.15.5-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:fd56de8b645421ff09c993fdb0ee9c5a3b50d290a8f55793b500d99b34d0c1ce", size = 336749 },
+    { url = "https://files.pythonhosted.org/packages/7a/c8/774b09fc1a432369bfe85061b9e635703f312f26a6da64263f55ba4657a0/yarl-1.15.5-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c166ad987265bb343be58cdf4fbc4478cc1d81f2246d2be9a15f94393b269faa", size = 332540 },
+    { url = "https://files.pythonhosted.org/packages/d0/f0/d0fd3428faa47dd66be38a38ab96446817e659e1c892959382dad06f3edc/yarl-1.15.5-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d56980374a10c74255fcea6ebcfb0aeca7166d212ee9fd7e823ddef35fb62ad0", size = 320887 },
+    { url = "https://files.pythonhosted.org/packages/24/44/1cc40a59af483fa556a579e250188c421a1b9758eb733c8d4d5755707fee/yarl-1.15.5-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:cbf36099a9b407e1456dbf55844743a98603fcba32d2a46fb3a698d926facf1b", size = 338720 },
+    { url = "https://files.pythonhosted.org/packages/62/6d/1ac1bfae2e1b4f0456abfa4ce11c7b99e677f0b9b725f099f9249bd49957/yarl-1.15.5-cp312-cp312-musllinux_1_2_armv7l.whl", hash = "sha256:d7fa4b033e2f267e37aabcc36949fa89f9f1716a723395912147f9cf3fb437c7", size = 337322 },
+    { url = "https://files.pythonhosted.org/packages/54/20/d1db5b27ca782d13d4cde4bba1aff284bbaeec1f61fa236f4d480f282891/yarl-1.15.5-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:bb129f77ddaea2d8e6e00417b8d907448de3407af4eddacca0a515574ad71493", size = 340805 },
+    { url = "https://files.pythonhosted.org/packages/51/5b/cf94a7c4c153b92084e67f85fc17696ceea00850a78c62b6d46649f805e6/yarl-1.15.5-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:68e837b3edfcd037f9706157e7cb8efda832de6248c7d9e893e2638356dfae5d", size = 351607 },
+    { url = "https://files.pythonhosted.org/packages/f6/be/ab2bfe984c5c7a9fb6134cf5f7f994f4e2da14f4615c4abeae517fa4861d/yarl-1.15.5-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:5b8af4165e097ff84d9bbb97bb4f4d7f71b9c1c9565a2d0e27d93e5f92dae220", size = 358007 },
+    { url = "https://files.pythonhosted.org/packages/c2/03/c9f0168f8fe02db46df7fd0756c3b1af78d2f20bf6f072844f85b3cfb8c7/yarl-1.15.5-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:70d074d5a96e0954fe6db81ff356f4361397da1cda3f7c127fc0902f671a087e", size = 352227 },
+    { url = "https://files.pythonhosted.org/packages/1a/0f/6cd2d1067b6581e457fe72932da04c5f132b4493aa3671ade3168185c58a/yarl-1.15.5-cp312-cp312-win32.whl", hash = "sha256:362da97ad4360e4ef1dd24ccdd3bceb18332da7f40026a42f49b7edd686e31c3", size = 79161 },
+    { url = "https://files.pythonhosted.org/packages/a4/37/c1640b0b1bd3c926d5f87df38b6c605bd3338ce5c0b5550bae318add9b5a/yarl-1.15.5-cp312-cp312-win_amd64.whl", hash = "sha256:9aa054d97033beac9cb9b19b7c0b8784b85b12cd17879087ca6bffba57884e02", size = 85477 },
+    { url = "https://files.pythonhosted.org/packages/7c/c5/403ec3569db8a826561bb6190e18fedb27c51493b364d059f96a80d61e96/yarl-1.15.5-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:5fadcf532fd9f6cbad71485ef8c2462dd9a91d3efc72ca01eb0970792c92552a", size = 135849 },
+    { url = "https://files.pythonhosted.org/packages/04/38/3110906d7474c7f16e40c137e03938aa8bfa01fa9ab6cd8a378c09a10e8a/yarl-1.15.5-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:8b7dd6983c81523f9de0ae6334c3b7a3cb33283936e0525f80c4f713f54a9bb6", size = 89245 },
+    { url = "https://files.pythonhosted.org/packages/b1/6f/e0f6e70072bef3f642168db8364745b1ce327bd63314b1cf9cce71442c8b/yarl-1.15.5-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:fcfd663dc88465ebe41c7c938bdc91c4b01cda96a0d64bf38fd66c1877323771", size = 87056 },
+    { url = "https://files.pythonhosted.org/packages/ee/59/f314c479cf9be8411133dcacc69f16e97eebe499cf741ff2dc9bc0d5d07b/yarl-1.15.5-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cd529e637cd23204bd82072f6637cff7af2516ad2c132e8f3342cbc84871f7d1", size = 328951 },
+    { url = "https://files.pythonhosted.org/packages/62/76/40c6e2c63135a367d4661e9c0b17c3c7e91e2ce56557ba0e88406a264ee3/yarl-1.15.5-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3b30f13fac56598474071a4f1ecd66c78fdaf2f8619042d7ca135f72dbb348cf", size = 339545 },
+    { url = "https://files.pythonhosted.org/packages/ec/c2/b2635fde3c285f7ea3bb6af9f55d2615d2d6385aede5913e608a605208d9/yarl-1.15.5-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:44088ec0be82fba118ed29b6b429f80bf295297727adae4c257ac297e01e8bcd", size = 341097 },
+    { url = "https://files.pythonhosted.org/packages/94/2b/bd69ad1943bc3fc6bdf87ee37ca533b0c920d8fdcf61fa7a00fbce210e89/yarl-1.15.5-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:607683991bab8607e5158cd290dd8fdaa613442aeab802fe1c237d3a3eee7358", size = 334615 },
+    { url = "https://files.pythonhosted.org/packages/12/ff/2b32e90b9ddf5ccc9226a9d5fd14e45894e1dccb5f39d6531663f17db822/yarl-1.15.5-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:da48cdff56b01ea4282a6d04b83b07a2088351a4a3ff7aacc1e7e9b6b04b90b9", size = 322593 },
+    { url = "https://files.pythonhosted.org/packages/75/c4/b2d514b448ce61a6d202a1547daf82c2f76755ee2e33f1cecf4f580b65ba/yarl-1.15.5-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:9162ea117ce8bad8ebc95b7376b4135988acd888d2cf4702f8281e3c11f8b81f", size = 341703 },
+    { url = "https://files.pythonhosted.org/packages/5a/bb/854c2ed4c6038b9ee18abb590f6fe5c06f4181ad76d9e4f09261dde341e3/yarl-1.15.5-cp313-cp313-musllinux_1_2_armv7l.whl", hash = "sha256:e8aa19c39cb20bfb16f0266df175a6004943122cf20707fbf0cacc21f6468a25", size = 336212 },
+    { url = "https://files.pythonhosted.org/packages/0c/f1/0c2197536c6d50f31f3861b2524324268a87c4fbc4aee7127b01b3db2eb4/yarl-1.15.5-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:5d6be369488d503c8edc14e2f63d71ab2a607041ad216a8ad444fa18e8dea792", size = 341181 },
+    { url = "https://files.pythonhosted.org/packages/29/5c/5a57a754820428055ca150b9967327ab5f77cacf7f3d4ae65b45bacc00f3/yarl-1.15.5-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:6e2c674cfe4c03ad7a4d536b1f808221f0d11a360486b4b032d2557c0bd633ad", size = 350081 },
+    { url = "https://files.pythonhosted.org/packages/d8/46/8cccf74985b3a91c4843c3fbe9aa1def99fd81d794315c81c5935b11dd73/yarl-1.15.5-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:041bafaa82b77fd4ec2826d42a55461ec86d999adf7ed9644eef7e8a9febb366", size = 356390 },
+    { url = "https://files.pythonhosted.org/packages/d2/b7/84fc62490f289a1275ecb1ce726368c520b391d5896439efeaa750260d5f/yarl-1.15.5-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:2eeb9ba53c055740cd282ae9d34eb7970d65e73a46f15adec4b0c1b0f2e55cc2", size = 355326 },
+    { url = "https://files.pythonhosted.org/packages/ba/36/c89affe17426af3c0261de69cb9094ab652a5fa02d32014c1761ddf58ec5/yarl-1.15.5-cp313-cp313-win32.whl", hash = "sha256:73143dd279e641543da52c55652ad7b4c7c5f79e797f124f58f04cc060f14271", size = 304789 },
+    { url = "https://files.pythonhosted.org/packages/ef/8d/81b1a88b10e18ad5409bdd3aa2dde46e85da7e315e772218a0f76cff6f65/yarl-1.15.5-cp313-cp313-win_amd64.whl", hash = "sha256:94ab1185900f43760d5487c8e49f5f1a66f864e36092f282f1813597479b9dfa", size = 310525 },
+    { url = "https://files.pythonhosted.org/packages/97/1a/0ee9e6ccb77d223b84cdf18b6a24cac9b72e96d3255b95f6a627a75a6dd9/yarl-1.15.5-py3-none-any.whl", hash = "sha256:625f31d6650829fba4030b4e7bdb2d69e41510dddfa29a1da27076c199521757", size = 40228 },
+]
+
+[[package]]
+name = "yookassa"
+version = "3.3.0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "deprecated" },
+    { name = "distro" },
+    { name = "netaddr" },
+    { name = "requests" },
+    { name = "urllib3" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/28/99/288061ff92713ed8dda5fdddd204edb8dfaf78d246d078d86b5ae019f38c/yookassa-3.3.0.tar.gz", hash = "sha256:2075b52404c78636882d5d68eff58545b0cbe17a3c484c068c33970b9eb8d5e8", size = 97658 }