diff --git a/assets/schema.sql b/assets/schema.sql
index 9db6f6ae..0f84a171 100644
--- a/assets/schema.sql
+++ b/assets/schema.sql
@@ -44,6 +44,21 @@ CREATE TABLE IF NOT EXISTS keys
DO $$
BEGIN
+ IF EXISTS (
+ SELECT 1
+ FROM information_schema.columns
+ WHERE table_name = 'keys' AND column_name = 'key' AND is_nullable = 'NO'
+ ) THEN
+ ALTER TABLE keys ALTER COLUMN key DROP NOT NULL;
+ END IF;
+
+ IF NOT EXISTS (
+ SELECT 1 FROM information_schema.columns
+ WHERE table_name = 'keys' AND column_name = 'remnawave_link'
+ ) THEN
+ ALTER TABLE keys ADD COLUMN remnawave_link TEXT;
+ END IF;
+
IF NOT EXISTS (
SELECT 1 FROM information_schema.columns
WHERE table_name = 'keys' AND column_name = 'is_frozen'
@@ -115,6 +130,10 @@ CREATE TABLE IF NOT EXISTS servers
UNIQUE (cluster_name, server_name)
);
+ALTER TABLE servers ADD COLUMN IF NOT EXISTS panel_type TEXT NOT NULL DEFAULT '3x-ui';
+ALTER TABLE servers
+ ALTER COLUMN subscription_url DROP NOT NULL;
+
CREATE TABLE IF NOT EXISTS gifts
(
diff --git a/bot.py b/bot.py
index 5fc35812..76a75826 100644
--- a/bot.py
+++ b/bot.py
@@ -19,7 +19,7 @@ bot = Bot(token=API_TOKEN, default=DefaultBotProperties(parse_mode=ParseMode.HTM
storage = MemoryStorage()
dp = Dispatcher(bot=bot, storage=storage)
-version = "4.2-beta"
+version = "4.2-alpha(10.04)"
register_middleware(dp)
diff --git a/database.py b/database.py
index ab89a022..33c39580 100644
--- a/database.py
+++ b/database.py
@@ -382,6 +382,7 @@ async def store_key(
key: str,
server_id: str,
session: Any,
+ remnawave_link: str = None,
):
"""
Сохраняет информацию о ключе в базу данных.
@@ -391,8 +392,9 @@ async def store_key(
client_id (str): Уникальный идентификатор клиента
email (str): Электронная почта или имя устройства
expiry_time (int): Время истечения ключа в миллисекундах
- key (str): Ключ доступа
- server_id (str): Идентификатор сервера
+ key (str): Ключ доступа (публичная ссылка)
+ server_id (str): Идентификатор сервера или кластера
+ remnawave_link (str, optional): Подписка Remnawave (если есть)
Raises:
Exception: Если возникает ошибка при сохранении ключа в базу данных
@@ -400,8 +402,8 @@ async def store_key(
try:
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)
+ INSERT INTO keys (tg_id, client_id, email, created_at, expiry_time, key, server_id, remnawave_link)
+ VALUES ($1, $2, $3, $4, $5, $6, $7, $8)
""",
tg_id,
client_id,
@@ -410,6 +412,7 @@ async def store_key(
expiry_time,
key,
server_id,
+ remnawave_link,
)
logger.info(f"Ключ успешно сохранен для пользователя {tg_id} на сервере {server_id}")
except Exception as e:
@@ -1346,7 +1349,7 @@ async def get_servers(session: Any = None):
result = await conn.fetch(
"""
- SELECT cluster_name, server_name, api_url, subscription_url, inbound_id
+ SELECT cluster_name, server_name, api_url, subscription_url, inbound_id, panel_type
FROM servers
"""
)
@@ -1361,6 +1364,7 @@ async def get_servers(session: Any = None):
"api_url": row["api_url"],
"subscription_url": row["subscription_url"],
"inbound_id": row["inbound_id"],
+ "panel_type": row["panel_type"],
})
return servers
@@ -1442,7 +1446,7 @@ async def store_gift_link(
async def get_key_details(email, session):
record = await session.fetchrow(
"""
- SELECT k.server_id, k.key, k.email, k.is_frozen, k.expiry_time, k.client_id, k.created_at, c.tg_id, c.balance
+ SELECT k.server_id, k.key, k.remnawave_link, k.email, k.is_frozen, k.expiry_time, k.client_id, k.created_at, c.tg_id, c.balance
FROM keys k
JOIN connections c ON k.tg_id = c.tg_id
WHERE k.email = $1
@@ -1470,6 +1474,7 @@ async def get_key_details(email, session):
return {
"key": record["key"],
+ "remnawave_link": record["remnawave_link"],
"server_id": record["server_id"],
"created_at": record["created_at"],
"expiry_time": record["expiry_time"],
diff --git a/handlers/admin/clusters/clusters_handler.py b/handlers/admin/clusters/clusters_handler.py
index 504ce1ec..5d3277be 100644
--- a/handlers/admin/clusters/clusters_handler.py
+++ b/handlers/admin/clusters/clusters_handler.py
@@ -10,9 +10,10 @@ from aiogram.fsm.context import FSMContext
from aiogram.fsm.state import State, StatesGroup
from aiogram.types import CallbackQuery, Message
from py3xui import AsyncApi
+from datetime import datetime, timedelta
from backup import create_backup_and_send_to_admins
-from config import ADMIN_PASSWORD, ADMIN_USERNAME, DATABASE_URL, TOTAL_GB, USE_COUNTRY_SELECTION
+from config import ADMIN_PASSWORD, ADMIN_USERNAME, DATABASE_URL, TOTAL_GB, USE_COUNTRY_SELECTION, REMNAWAVE_PASSWORD, REMNAWAVE_LOGIN
from database import check_unique_server_name, get_servers, update_key_expiry
from filters.admin import IsAdminFilter
from handlers.keys.key_utils import create_client_on_server, create_key_on_cluster, renew_key_in_cluster
@@ -26,7 +27,9 @@ from .keyboard import (
build_clusters_editor_kb,
build_manage_cluster_kb,
build_sync_cluster_kb,
+ build_panel_type_kb
)
+from panels.remnawave import RemnawaveAPI
router = Router()
@@ -143,9 +146,11 @@ async def handle_server_name_input(message: Message, state: FSMContext, session:
text = (
f"Введите API URL для сервера {server_name} в кластере {cluster_name}:\n\n"
- "Ссылку можно найти в поисковой строке браузера, при входе в 3X-UI.\n\n"
- "ℹ️ Формат API URL:\n"
- "https://your_domain:port/panel_path/"
+ "🔍 Ссылку можно найти в адресной строке браузера при входе в панель управления сервером.\n\n"
+ "ℹ️ Формат для 3X-UI:\n"
+ "https://your-domain.com:port/panel_path/\n\n"
+ "ℹ️ Формат для Remnawave:\n"
+ "https://your-domain.com/api"
)
await message.answer(
@@ -158,58 +163,38 @@ async def handle_server_name_input(message: Message, state: FSMContext, session:
@router.message(AdminClusterStates.waiting_for_api_url, IsAdminFilter())
async def handle_api_url_input(message: Message, state: FSMContext):
- if not message.text or not message.text.strip().startswith("https://"):
- await message.answer(
- text="❌ API URL должен начинаться с https://. Попробуйте снова.",
- reply_markup=build_admin_back_kb("clusters"),
- )
- return
-
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)
text = (
f"Введите subscription_url для сервера {server_name} в кластере {cluster_name}:\n\n"
- "Ссылку можно найти в панели 3X-UI, в информации о клиенте.\n\n"
- "ℹ️ Формат Subscription URL:\n"
- "https://your_domain:port_sub/sub_path/"
- )
-
- await message.answer(
- text=text,
- reply_markup=build_admin_back_kb("clusters"),
+ "Если вы используете Remnawave — введите 0\n\n"
+ "Формат: https://your_domain:port/sub_path"
)
+ await message.answer(text=text, reply_markup=build_admin_back_kb("clusters"))
await state.set_state(AdminClusterStates.waiting_for_subscription_url)
@router.message(AdminClusterStates.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(
- text="❌ subscription_url должен начинаться с https://. Попробуйте снова.",
- reply_markup=build_admin_back_kb("clusters"),
- )
- return
-
- subscription_url = message.text.strip().rstrip("/")
+ raw = message.text.strip()
+ subscription_url = None if raw == "0" else raw.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)
- text = (
- f"Введите inbound_id для сервера {server_name} в кластере {cluster_name}:\n\n"
- "Это номер подключения vless в вашей панели 3x-ui. Обычно это 1 при чистой настройке по гайду.\n\n"
- )
-
await message.answer(
- text=text,
+ text=f"Введите inbound_id для сервера {server_name} в кластере {cluster_name}:\n\n"
+ f"Для Remnawave это UUID Инбаунда, для 3x-ui — просто ID (например, 1).",
reply_markup=build_admin_back_kb("clusters"),
)
await state.set_state(AdminClusterStates.waiting_for_inbound_id)
@@ -218,39 +203,48 @@ async def handle_subscription_url_input(message: Message, state: FSMContext):
@router.message(AdminClusterStates.waiting_for_inbound_id, IsAdminFilter())
async def handle_inbound_id_input(message: Message, state: FSMContext):
inbound_id = message.text.strip()
+ await state.update_data(inbound_id=inbound_id)
- if not inbound_id.isdigit():
- await message.answer(
- text="❌ inbound_id должен быть числовым значением. Попробуйте снова.",
- reply_markup=build_admin_back_kb("clusters"),
- )
- return
+ await message.answer(
+ text=(
+ "🧩 Выберите тип панели для этого сервера:\n\n"
+ "⚠️ Внимание: Некоторые функции Remnawave находятся в разработке.\n"
+ "Поддержка режима выбора стран — ограничена."
+ ),
+ reply_markup=build_panel_type_kb(),
+ )
+
+
+@router.callback_query(AdminClusterCallback.filter(F.action.in_(["panel_3xui", "panel_remnawave"])), IsAdminFilter())
+async def handle_panel_type_selection(callback_query: CallbackQuery, callback_data: AdminClusterCallback, state: FSMContext):
+ panel_type = "3x-ui" if callback_data.action == "panel_3xui" else "remnawave"
user_data = await state.get_data()
cluster_name = user_data.get("cluster_name")
server_name = user_data.get("server_name")
api_url = user_data.get("api_url")
subscription_url = user_data.get("subscription_url")
+ inbound_id = user_data.get("inbound_id")
conn = await asyncpg.connect(DATABASE_URL)
await conn.execute(
"""
- INSERT INTO servers (cluster_name, server_name, api_url, subscription_url, inbound_id)
- VALUES ($1, $2, $3, $4, $5)
+ INSERT INTO servers (cluster_name, server_name, api_url, subscription_url, inbound_id, panel_type)
+ VALUES ($1, $2, $3, $4, $5, $6)
""",
cluster_name,
server_name,
api_url,
subscription_url,
inbound_id,
+ panel_type,
)
await conn.close()
- await message.answer(
- text=f"✅ Кластер {cluster_name} и сервер {server_name} успешно добавлены!",
+ await callback_query.message.edit_text(
+ text=f"✅ Сервер {server_name} с панелью {panel_type} успешно добавлен в кластер {cluster_name}!",
reply_markup=build_admin_back_kb("clusters"),
)
-
await state.clear()
@@ -281,30 +275,59 @@ async def handle_cluster_availability(
await callback_query.message.edit_text(text=f"Кластер '{cluster_name}' не содержит серверов.")
return
- text = (
- f"🖥️ Проверка доступности серверов для кластера {cluster_name}.\n\n"
- "Это может занять до 1 минуты, пожалуйста, подождите..."
+ await callback_query.message.edit_text(
+ text=(
+ f"🖥️ Проверка доступности серверов для кластера {cluster_name}.\n\n"
+ "Это может занять до 1 минуты, пожалуйста, подождите..."
+ )
)
- await callback_query.message.edit_text(text=text)
total_online_users = 0
result_text = f"🖥️ Проверка доступности серверов\n\n⚙️ Кластер: {cluster_name}\n\n"
+ now = datetime.utcnow()
+ start_time = now - timedelta(minutes=5)
+ start_iso = start_time.strftime("%Y-%m-%dT%H:%M:%SZ")
+ end_iso = now.strftime("%Y-%m-%dT%H:%M:%SZ")
+
for server in cluster_servers:
- xui = AsyncApi(server["api_url"], username=ADMIN_USERNAME, password=ADMIN_PASSWORD, logger=None)
+ server_name = server["server_name"]
+ panel_type = server.get("panel_type", "3x-ui").lower()
+ prefix = "[3x]" if panel_type == "3x-ui" else "[Re]"
+
try:
- await xui.login()
- online_clients = await xui.client.online()
- inbound_id = int(server["inbound_id"])
- online_inbound_users = 0
- for client_email in online_clients:
- client = await xui.client.get_by_email(client_email)
- if client and client.inbound_id == inbound_id:
- online_inbound_users += 1
- total_online_users += online_inbound_users
- result_text += f"🌍 {server['server_name']} - {online_inbound_users} онлайн\n"
+ if panel_type == "3x-ui":
+ xui = AsyncApi(server["api_url"], username=ADMIN_USERNAME, password=ADMIN_PASSWORD, logger=None)
+ await xui.login()
+ inbound_id = int(server["inbound_id"])
+ online_clients = await xui.client.online()
+ online_inbound_users = 0
+
+ for client_email in online_clients:
+ client = await xui.client.get_by_email(client_email)
+ if client and client.inbound_id == inbound_id:
+ online_inbound_users += 1
+
+ total_online_users += online_inbound_users
+ result_text += f"🌍 {prefix} {server_name} - {online_inbound_users} онлайн\n"
+
+ elif panel_type == "remnawave":
+ remna = RemnawaveAPI(server["api_url"])
+ if not await remna.login(REMNAWAVE_LOGIN, REMNAWAVE_PASSWORD):
+ raise Exception("Не удалось авторизоваться")
+
+ node_uuid = server.get("inbound_id")
+ if not node_uuid:
+ raise Exception("Не указан UUID ноды (inbound_id)")
+
+ data = await remna.get_node_users_usage(node_uuid, start=start_iso, end=end_iso)
+ online_remna_users = len(data) if data else 0
+ total_online_users += online_remna_users
+ result_text += f"🌍 {prefix} {server_name} - {online_remna_users} онлайн\n"
+
except Exception as e:
- result_text += f"❌ {server['server_name']} - ошибка: {str(e) if str(e).strip() else 'Сервер недоступен'}\n"
+ error_text = str(e) or "Сервер недоступен"
+ result_text += f"❌ {prefix} {server_name} - ошибка: {error_text}\n"
result_text += f"\n👥 Всего пользователей онлайн: {total_online_users}"
await callback_query.message.edit_text(text=result_text, reply_markup=build_admin_back_kb("clusters"))
diff --git a/handlers/admin/clusters/keyboard.py b/handlers/admin/clusters/keyboard.py
index e267fa8b..b9042d5f 100644
--- a/handlers/admin/clusters/keyboard.py
+++ b/handlers/admin/clusters/keyboard.py
@@ -130,3 +130,17 @@ def build_sync_cluster_kb(cluster_servers: list, cluster_name: str) -> InlineKey
builder.row(build_admin_back_btn("clusters"))
return builder.as_markup()
+
+
+def build_panel_type_kb() -> InlineKeyboardMarkup:
+ builder = InlineKeyboardBuilder()
+ builder.button(
+ text="🌐 3X-UI",
+ callback_data=AdminClusterCallback(action="panel_3xui").pack()
+ )
+ builder.button(
+ text="🌀 Remnawave",
+ callback_data=AdminClusterCallback(action="panel_remnawave").pack()
+ )
+ builder.row(build_admin_back_btn("clusters"))
+ return builder.as_markup()
diff --git a/handlers/admin/users/users_handler.py b/handlers/admin/users/users_handler.py
index 7b20cc9c..1068327c 100644
--- a/handlers/admin/users/users_handler.py
+++ b/handlers/admin/users/users_handler.py
@@ -13,14 +13,13 @@ from aiogram.fsm.state import State, StatesGroup
from aiogram.types import CallbackQuery, Message
from aiogram.utils.keyboard import InlineKeyboardBuilder
-from config import PUBLIC_LINK, RENEWAL_PRICES, TOTAL_GB
+from config import RENEWAL_PRICES, TOTAL_GB
from database import (
delete_key,
delete_user_data,
get_balance,
get_client_id_by_email,
get_servers,
- store_key,
update_balance,
update_key_expiry,
update_trial,
@@ -48,7 +47,6 @@ from .keyboard import (
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,
@@ -875,19 +873,7 @@ async def handle_create_key_duration(callback_query: CallbackQuery, state: FSMCo
expiry = datetime.now(tz=timezone.utc) + timedelta(days=30 * months)
expiry_ms = int(expiry.timestamp() * 1000)
- await create_key_on_cluster(cluster_name, tg_id, client_id, email, expiry_ms)
-
- public_link = f"{PUBLIC_LINK}{email}/{tg_id}"
-
- await store_key(
- tg_id=tg_id,
- client_id=client_id,
- email=email,
- expiry_time=expiry_ms,
- key=public_link,
- server_id=cluster_name,
- session=session,
- )
+ await create_key_on_cluster(cluster_name, tg_id, client_id, email, expiry_ms, plan=months, session=session)
await state.clear()
diff --git a/handlers/buttons.py b/handlers/buttons.py
index a4c68c85..de0ab4ab 100644
--- a/handlers/buttons.py
+++ b/handlers/buttons.py
@@ -15,7 +15,6 @@ MY_SUBS = "📱 Мои подписки"
BALANCE = "💰 Баланс"
INVITE = "👥 Пригласить"
GIFTS = "🎁 Подарить"
-TARIFFS = "💡 Тарифы"
INSTRUCTIONS = "📘 Инструкции"
TOP_FIVE = "🏆 Топ-5"
TRIAL_SUB = "🎁 Пробная подписка"
diff --git a/handlers/keys/__init__.py b/handlers/keys/__init__.py
index 831e0979..fc75a083 100644
--- a/handlers/keys/__init__.py
+++ b/handlers/keys/__init__.py
@@ -2,21 +2,20 @@ __all__ = ("router",)
from aiogram import Router
-from .key_management import router as management_router
from .keys import router as keys_router
from .key_view import router as view_router
from .key_renew import router as renew_router
from .key_freeze import router as freeze_router
from .key_connect import router as connect_router
-
+from .key_mode import router as key_mode_router
router = Router(name="keys_main_router")
router.include_routers(
keys_router,
- management_router,
view_router,
renew_router,
freeze_router,
- connect_router
+ connect_router,
+ key_mode_router
)
diff --git a/handlers/keys/key_management.py b/handlers/keys/key_management.py
deleted file mode 100644
index ebf9ecdc..00000000
--- a/handlers/keys/key_management.py
+++ /dev/null
@@ -1,669 +0,0 @@
-import asyncio
-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.types import CallbackQuery, InlineKeyboardButton, Message, FSInputFile
-from aiogram.utils.keyboard import InlineKeyboardBuilder
-from py3xui import AsyncApi
-
-from bot import bot
-from config import (
- ADMIN_PASSWORD,
- ADMIN_USERNAME,
- CONNECT_PHONE_BUTTON,
- 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 (
- add_connection,
- check_connection_exists,
- create_temporary_data,
- get_balance,
- get_key_details,
- get_trial,
- store_key,
- update_balance,
- update_trial,
- check_server_name_by_cluster,
-)
-from handlers.buttons import (
- BACK,
- CONNECT_DEVICE,
- CONNECT_PHONE,
- MAIN_MENU,
- PAYMENT,
- PC_BUTTON,
- SUPPORT,
- 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 (
- CREATING_CONNECTION_MSG,
- DISCOUNTS,
- INSUFFICIENT_FUNDS_MSG,
- SELECT_COUNTRY_MSG,
- SELECT_TARIFF_PLAN_MSG,
- key_message_success,
-)
-from handlers.utils import edit_or_send_message, generate_random_email, get_least_loaded_cluster
-from logger import logger
-from panels.three_xui import delete_client
-
-
-router = Router()
-
-moscow_tz = pytz.timezone("Europe/Moscow")
-
-
-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
- 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,
-):
- """Создание ключа с учётом выбора тарифного плана."""
- current_time = datetime.now(moscow_tz)
-
- 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}.")
- await edit_or_send_message(
- target_message=message_or_query if isinstance(message_or_query, Message) else message_or_query.message,
- text=CREATING_CONNECTION_MSG,
- reply_markup=None,
- )
- await state.update_data(is_trial=True)
- await create_key(tg_id, expiry_time, state, session, message_or_query)
- return
-
- builder = InlineKeyboardBuilder()
- for index, (plan_id, price) in enumerate(RENEWAL_PRICES.items()):
- discount_text = ""
- if DISCOUNTS and 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=MAIN_MENU, 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=SELECT_TARIFF_PLAN_MSG,
- 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, session: Any, state: FSMContext):
- 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:
- 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,
- },
- )
- 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=PAYMENT, callback_data="pay"))
- builder.row(InlineKeyboardButton(text=MAIN_MENU, callback_data="profile"))
- await edit_or_send_message(
- target_message=callback_query.message,
- text=INSUFFICIENT_FUNDS_MSG.format(required_amount=required_amount),
- reply_markup=builder.as_markup(),
- media_path=None,
- )
- return
- builder = InlineKeyboardBuilder()
- builder.row(InlineKeyboardButton(text="⏳ Подождите...", callback_data="creating_key"))
-
- await edit_or_send_message(
- target_message=callback_query.message,
- text=CREATING_CONNECTION_MSG,
- reply_markup=builder.as_markup(),
- )
-
- expiry_time = datetime.now(moscow_tz) + timedelta(days=duration_days)
- await state.update_data(plan_id=plan_id)
- await create_key(tg_id, expiry_time, state, session, callback_query, plan=int(plan_id))
-
-async def create_key(
- 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, api_url FROM servers WHERE cluster_name = $1",
- least_loaded_cluster,
- )
- if not servers:
- logger.error(f"Нет серверов в кластере {least_loaded_cluster}")
- 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
-
- available_servers = []
- tasks = []
- for server in servers:
- server_info = {
- "server_name": server["server_name"],
- "api_url": server["api_url"],
- }
- task = asyncio.create_task(check_server_availability(server_info))
- tasks.append(task)
-
- results = await asyncio.gather(*tasks, return_exceptions=True)
-
- for server, result in zip(servers, results):
- if result is True:
- available_servers.append(server["server_name"])
-
- if not available_servers:
- logger.error(f"Нет доступных серверов в кластере {least_loaded_cluster}")
- 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
-
- logger.info(f"[Country Selection] Список доступных серверов: {available_servers}")
-
- builder = InlineKeyboardBuilder()
- ts = int(expiry_time.timestamp())
- for country in available_servers:
- 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=MAIN_MENU, callback_data="profile"))
-
- if target_message:
- await edit_or_send_message(
- target_message=target_message,
- text=SELECT_COUNTRY_MSG,
- reply_markup=builder.as_markup(),
- media_path=None,
- )
- else:
- await bot.send_message(
- chat_id=tg_id,
- text=SELECT_COUNTRY_MSG,
- reply_markup=builder.as_markup(),
- )
- return
-
- while True:
- key_name = generate_random_email()
- 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 Generation] Имя ключа {key_name} уже существует. Генерация нового.")
-
- 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:
- 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, plan)
- )
- ]
- await asyncio.gather(*tasks, return_exceptions=True)
- 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,
- )
-
- data = {}
- if state:
- data = await state.get_data()
-
- if data.get("is_trial"):
- trial_status = await get_trial(tg_id, session)
- if trial_status in [0, -1]:
- await update_trial(tg_id, 1, session)
- if data.get("plan_id"):
- plan_price = RENEWAL_PRICES.get(data["plan_id"])
- await update_balance(tg_id, -plan_price, session)
- logger.info(f"[Database] Ключ сохранён в базе данных для пользователя {tg_id}")
- except Exception as e:
- 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()
- if CONNECT_PHONE_BUTTON:
- builder.row(InlineKeyboardButton(text=CONNECT_PHONE, callback_data=f"connect_phone|{key_name}"))
- builder.row(
- InlineKeyboardButton(text=PC_BUTTON, callback_data=f"connect_pc|{email}"),
- InlineKeyboardButton(text=TV_BUTTON, callback_data=f"connect_tv|{email}"),
- )
- else:
- builder.row(
- InlineKeyboardButton(
- text=CONNECT_DEVICE,
- callback_data=f"connect_device|{key_name}",
- )
- )
- builder.row(InlineKeyboardButton(text=SUPPORT, url=SUPPORT_CHAT_URL))
- builder.row(InlineKeyboardButton(text=MAIN_MENU, callback_data="profile"))
-
- 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_text = key_message_success(public_link, f"⏳ Осталось дней: {days} 📅")
-
- default_media_path = "img/pic.jpg"
-
- if target_message:
- await edit_or_send_message(
- target_message=target_message,
- text=key_message_text,
- reply_markup=builder.as_markup(),
- media_path=default_media_path,
- )
-
- else:
- photo = FSInputFile(default_media_path)
- await bot.send_photo(
- chat_id=tg_id,
- photo=photo,
- caption=key_message_text,
- reply_markup=builder.as_markup(),
- )
- 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)
-
- current_server = record["server_id"]
-
- cluster_info = await check_server_name_by_cluster(current_server, session)
- if not cluster_info:
- await callback_query.answer("❌ Кластер для текущего сервера не найден", show_alert=True)
- return
-
- cluster_name = cluster_info["cluster_name"]
-
- servers = await session.fetch(
- "SELECT server_name, api_url FROM servers WHERE cluster_name = $1 AND server_name != $2",
- cluster_name,
- current_server,
- )
- if not servers:
- await callback_query.answer("❌ Доступных серверов в кластере не найдено", show_alert=True)
- return
-
- available_servers = []
- tasks = []
- for server in servers:
- server_info = {
- "server_name": server["server_name"],
- "api_url": server["api_url"],
- }
- task = asyncio.create_task(check_server_availability(server_info))
- tasks.append(task)
-
- results = await asyncio.gather(*tasks, return_exceptions=True)
-
- for server, result in zip(servers, results):
- if result is True:
- available_servers.append(server["server_name"])
-
- if not available_servers:
- await callback_query.answer("❌ Нет доступных серверов для смены локации", show_alert=True)
- return
-
- logger.info(f"Доступные страны для смены локации: {available_servers}")
-
- builder = InlineKeyboardBuilder()
- for country in available_servers:
- callback_data = f"select_country|{country}|{ts}|{old_key_name}"
- builder.row(InlineKeyboardButton(text=country, callback_data=callback_data))
- builder.row(InlineKeyboardButton(text=BACK, 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, state: FSMContext):
- """
- Обрабатывает выбор страны.
- Формат 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, state, 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:
- old_key_details = await get_key_details(old_key_name, session)
- if not old_key_details:
- await callback_query.message.answer("❌ Ключ не найден. Попробуйте снова.")
- return
-
- key_name = old_key_name
- client_id = old_key_details["client_id"]
- email = old_key_details["email"]
- expiry_timestamp = old_key_details["expiry_time"]
- public_link = old_key_details["key"]
- 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_server_id = old_key_details.get("server_id")
- if 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,
- logger=logger,
- )
- deletion_success = await delete_client(
- xui,
- old_server_info["inbound_id"],
- email,
- client_id,
- )
- if not deletion_success:
- logger.warning(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 server_id = $1
- WHERE tg_id = $2 AND email = $3
- """,
- 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,
- )
- data = await state.get_data()
- if data.get("is_trial"):
- trial_status = await get_trial(tg_id, session)
- if trial_status in [0, -1]:
- await update_trial(tg_id, 1, session)
- if data.get("plan_id"):
- plan_price = RENEWAL_PRICES.get(data["plan_id"])
- await update_balance(tg_id, -plan_price, session)
-
- 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=SUPPORT, url=SUPPORT_CHAT_URL))
- if CONNECT_PHONE_BUTTON:
- builder.row(InlineKeyboardButton(text=CONNECT_PHONE, callback_data=f"connect_phone|{key_name}"))
- builder.row(
- InlineKeyboardButton(text=PC_BUTTON, callback_data=f"connect_pc|{email}"),
- InlineKeyboardButton(text=TV_BUTTON, callback_data=f"connect_tv|{email}"),
- )
- else:
- builder.row(
- InlineKeyboardButton(
- text=CONNECT_DEVICE,
- callback_data=f"connect_device|{key_name}",
- )
- )
- builder.row(InlineKeyboardButton(text=MAIN_MENU, 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} 📅")
-
- default_media_path = "img/pic.jpg"
-
- await edit_or_send_message(
- target_message=callback_query.message,
- text=key_message_text,
- reply_markup=builder.as_markup(),
- media_path=default_media_path,
- )
-
- if state:
- await state.clear()
-
-async def check_server_availability(server_info: dict) -> bool:
- """
- Проверяет доступность сервера через API.
-
- Args:
- server_info (dict): Информация о сервере (api_url, username, password).
-
- Returns:
- bool: True, если сервер доступен, False в противном случае.
- """
- try:
- xui = AsyncApi(
- server_info["api_url"],
- username=ADMIN_USERNAME,
- password=ADMIN_PASSWORD,
- logger=logger,
- )
- await asyncio.wait_for(xui.login(), timeout=5.0)
- logger.info(f"Сервер {server_info.get('server_name', 'unknown')} доступен.")
- return True
- except asyncio.TimeoutError:
- logger.warning(f"Сервер {server_info.get('server_name', 'unknown')} не ответил вовремя.")
- return False
- except Exception as e:
- logger.warning(f"Сервер {server_info.get('server_name', 'unknown')} недоступен: {e}")
- return False
diff --git a/handlers/keys/key_mode/__init__.py b/handlers/keys/key_mode/__init__.py
new file mode 100644
index 00000000..bcdd15ae
--- /dev/null
+++ b/handlers/keys/key_mode/__init__.py
@@ -0,0 +1,15 @@
+__all__ = ("router",)
+
+from aiogram import Router
+
+from .key_create import router as create_router
+from .key_cluster_mode import router as cluster_router
+from .key_country_mode import router as country_router
+
+router = Router(name="key_mode_router")
+
+router.include_routers(
+ create_router,
+ cluster_router,
+ country_router,
+)
diff --git a/handlers/keys/key_mode/key_cluster_mode.py b/handlers/keys/key_mode/key_cluster_mode.py
new file mode 100644
index 00000000..67575a52
--- /dev/null
+++ b/handlers/keys/key_mode/key_cluster_mode.py
@@ -0,0 +1,153 @@
+import uuid
+
+from datetime import datetime
+
+import pytz
+
+from aiogram import Router
+from aiogram.types import CallbackQuery, InlineKeyboardButton, Message, FSInputFile, WebAppInfo
+from aiogram.utils.keyboard import InlineKeyboardBuilder
+
+from bot import bot
+from config import (
+ CONNECT_PHONE_BUTTON,
+ RENEWAL_PRICES,
+ SUPPORT_CHAT_URL,
+)
+from database import (
+ get_key_details,
+ get_trial,
+ update_balance,
+ update_trial,
+)
+from handlers.buttons import (
+ CONNECT_DEVICE,
+ CONNECT_PHONE,
+ MAIN_MENU,
+ PC_BUTTON,
+ TV_BUTTON,
+ SUPPORT
+)
+from handlers.keys.key_utils import create_key_on_cluster
+from handlers.texts import (
+ key_message_success,
+)
+from handlers.utils import edit_or_send_message, generate_random_email, get_least_loaded_cluster, is_full_remnawave_cluster
+from logger import logger
+
+
+router = Router()
+
+moscow_tz = pytz.timezone("Europe/Moscow")
+
+
+async def key_cluster_mode(
+ tg_id: int,
+ expiry_time: datetime,
+ state,
+ session,
+ message_or_query: Message | CallbackQuery | None = None,
+ plan: int = None,
+):
+ target_message = message_or_query.message if isinstance(message_or_query, CallbackQuery) else message_or_query
+
+ while True:
+ key_name = generate_random_email()
+ existing_key = await get_key_details(key_name, session)
+ if not existing_key:
+ break
+
+ client_id = str(uuid.uuid4())
+ email = key_name.lower()
+ expiry_timestamp = int(expiry_time.timestamp() * 1000)
+
+ try:
+ least_loaded_cluster = await get_least_loaded_cluster()
+ await create_key_on_cluster(
+ least_loaded_cluster, tg_id, client_id, email, expiry_timestamp, plan, session
+ )
+ logger.info(f"[Key Creation] Ключ создан на кластере {least_loaded_cluster} для пользователя {tg_id}")
+
+ key_record = await get_key_details(email, session)
+ if not key_record:
+ raise ValueError(f"Ключ не найден после создания: {email}")
+
+ public_link = key_record.get("key")
+ remnawave_link = key_record.get("remnawave_link")
+ final_link = public_link or remnawave_link or ""
+
+ data = await state.get_data() if state else {}
+
+ if data.get("is_trial"):
+ trial_status = await get_trial(tg_id, session)
+ if trial_status in [0, -1]:
+ await update_trial(tg_id, 1, session)
+
+ if data.get("plan_id"):
+ plan_price = RENEWAL_PRICES.get(data["plan_id"])
+ await update_balance(tg_id, -plan_price, session)
+
+ logger.info(f"[Database] Баланс обновлён для пользователя {tg_id}")
+
+ except Exception as e:
+ 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()
+
+ if await is_full_remnawave_cluster(least_loaded_cluster, session):
+ builder.row(
+ InlineKeyboardButton(
+ text=CONNECT_DEVICE,
+ web_app=WebAppInfo(url=final_link),
+ )
+ )
+ elif CONNECT_PHONE_BUTTON:
+ builder.row(InlineKeyboardButton(text=CONNECT_PHONE, callback_data=f"connect_phone|{key_name}"))
+ builder.row(
+ InlineKeyboardButton(text=PC_BUTTON, callback_data=f"connect_pc|{email}"),
+ InlineKeyboardButton(text=TV_BUTTON, callback_data=f"connect_tv|{email}"),
+ )
+ else:
+ builder.row(
+ InlineKeyboardButton(
+ text=CONNECT_DEVICE,
+ callback_data=f"connect_device|{key_name}",
+ )
+ )
+
+ builder.row(InlineKeyboardButton(text=SUPPORT, url=SUPPORT_CHAT_URL))
+ builder.row(InlineKeyboardButton(text=MAIN_MENU, callback_data="profile"))
+
+ expiry_time_local = expiry_time.astimezone(moscow_tz)
+ remaining_time = expiry_time_local - datetime.now(moscow_tz)
+ days = remaining_time.days
+ key_message_text = key_message_success(final_link, f"⏳ Осталось дней: {days} 📅")
+
+ default_media_path = "img/pic.jpg"
+
+ if target_message:
+ await edit_or_send_message(
+ target_message=target_message,
+ text=key_message_text,
+ reply_markup=builder.as_markup(),
+ media_path=default_media_path,
+ )
+ else:
+ photo = FSInputFile(default_media_path)
+ await bot.send_photo(
+ chat_id=tg_id,
+ photo=photo,
+ caption=key_message_text,
+ reply_markup=builder.as_markup(),
+ )
+
+ if state:
+ await state.clear()
\ No newline at end of file
diff --git a/handlers/keys/key_mode/key_country_mode.py b/handlers/keys/key_mode/key_country_mode.py
new file mode 100644
index 00000000..e019d070
--- /dev/null
+++ b/handlers/keys/key_mode/key_country_mode.py
@@ -0,0 +1,437 @@
+import asyncio
+import uuid
+
+from datetime import datetime
+from typing import Any
+
+import pytz
+
+from aiogram import F, Router
+from aiogram.fsm.context import FSMContext
+from aiogram.types import CallbackQuery, InlineKeyboardButton, Message
+from aiogram.utils.keyboard import InlineKeyboardBuilder
+from py3xui import AsyncApi
+
+from config import (
+ ADMIN_PASSWORD,
+ ADMIN_USERNAME,
+ CONNECT_PHONE_BUTTON,
+ PUBLIC_LINK,
+ RENEWAL_PRICES,
+ SUPPORT_CHAT_URL,
+ REMNAWAVE_LOGIN,
+ REMNAWAVE_PASSWORD
+)
+from database import (
+ add_connection,
+ check_connection_exists,
+ get_key_details,
+ get_trial,
+ update_balance,
+ update_trial,
+ check_server_name_by_cluster,
+)
+from handlers.buttons import (
+ BACK,
+ CONNECT_DEVICE,
+ CONNECT_PHONE,
+ MAIN_MENU,
+ PC_BUTTON,
+ SUPPORT,
+ TV_BUTTON,
+ SUPPORT
+)
+from handlers.keys.key_utils import create_client_on_server
+from handlers.texts import (
+ SELECT_COUNTRY_MSG,
+ key_message_success,
+)
+from handlers.utils import edit_or_send_message, generate_random_email, get_least_loaded_cluster
+from logger import logger
+from panels.three_xui import delete_client
+from panels.remnawave import RemnawaveAPI
+
+
+router = Router()
+
+moscow_tz = pytz.timezone("Europe/Moscow")
+
+
+async def key_country_mode(
+ tg_id: int,
+ expiry_time: datetime,
+ state: FSMContext,
+ session: Any,
+ message_or_query: Message | CallbackQuery | None = None,
+ old_key_name: str = None,
+):
+ target_message = message_or_query.message if isinstance(message_or_query, CallbackQuery) else message_or_query
+
+ least_loaded_cluster = await get_least_loaded_cluster()
+ servers = await session.fetch(
+ "SELECT server_name, api_url, panel_type FROM servers WHERE cluster_name = $1",
+ least_loaded_cluster,
+ )
+
+
+ if not servers:
+ logger.error(f"Нет серверов в кластере {least_loaded_cluster}")
+ error_message = "❌ Нет доступных серверов для создания ключа."
+ await edit_or_send_message(
+ target_message=target_message,
+ text=error_message,
+ reply_markup=None,
+ )
+ return
+
+ available_servers = []
+ tasks = [asyncio.create_task(check_server_availability(server)) for server in servers]
+ results = await asyncio.gather(*tasks, return_exceptions=True)
+
+ for server, result in zip(servers, results):
+ if result is True:
+ available_servers.append(server["server_name"])
+
+ if not available_servers:
+ logger.error(f"Нет доступных серверов в кластере {least_loaded_cluster}")
+ error_message = "❌ Нет доступных серверов для создания ключа."
+ await edit_or_send_message(
+ target_message=target_message,
+ text=error_message,
+ reply_markup=None,
+ )
+ return
+
+ logger.info(f"[Country Selection] Доступные серверы для выбора: {available_servers}")
+
+ builder = InlineKeyboardBuilder()
+ ts = int(expiry_time.timestamp())
+
+ for country in available_servers:
+ 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=MAIN_MENU, callback_data="profile"))
+
+ await edit_or_send_message(
+ target_message=target_message,
+ text=SELECT_COUNTRY_MSG,
+ reply_markup=builder.as_markup(),
+ media_path=None,
+ )
+
+
+@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)
+
+ current_server = record["server_id"]
+
+ cluster_info = await check_server_name_by_cluster(current_server, session)
+ if not cluster_info:
+ await callback_query.answer("❌ Кластер для текущего сервера не найден", show_alert=True)
+ return
+
+ cluster_name = cluster_info["cluster_name"]
+
+ servers = await session.fetch(
+ "SELECT server_name, api_url, panel_type FROM servers WHERE cluster_name = $1 AND server_name != $2",
+ cluster_name,
+ current_server,
+ )
+ if not servers:
+ await callback_query.answer("❌ Доступных серверов в кластере не найдено", show_alert=True)
+ return
+
+ available_servers = []
+ tasks = []
+
+ for server in servers:
+ server_info = {
+ "server_name": server["server_name"],
+ "api_url": server["api_url"],
+ "panel_type": server["panel_type"],
+ }
+ task = asyncio.create_task(check_server_availability(server_info))
+ tasks.append(task)
+
+ results = await asyncio.gather(*tasks, return_exceptions=True)
+
+ for server, result in zip(servers, results):
+ if result is True:
+ available_servers.append(server["server_name"])
+
+ if not available_servers:
+ await callback_query.answer("❌ Нет доступных серверов для смены локации", show_alert=True)
+ return
+
+ logger.info(f"Доступные страны для смены локации: {available_servers}")
+
+ builder = InlineKeyboardBuilder()
+ for country in available_servers:
+ callback_data = f"select_country|{country}|{ts}|{old_key_name}"
+ builder.row(InlineKeyboardButton(text=country, callback_data=callback_data))
+ builder.row(InlineKeyboardButton(text=BACK, 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, state: FSMContext):
+ """
+ Обрабатывает выбор страны.
+ Формат 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, state, 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:
+ old_key_details = await get_key_details(old_key_name, session)
+ if not old_key_details:
+ await callback_query.message.answer("❌ Ключ не найден. Попробуйте снова.")
+ return
+
+ key_name = old_key_name
+ client_id = old_key_details["client_id"]
+ email = old_key_details["email"]
+ expiry_timestamp = old_key_details["expiry_time"]
+ else:
+ while True:
+ key_name = generate_random_email()
+ existing_key = await get_key_details(key_name, session)
+ if not existing_key:
+ break
+ client_id = str(uuid.uuid4())
+ email = key_name.lower()
+ expiry_timestamp = int(expiry_time.timestamp() * 1000)
+
+ try:
+ server_info = await session.fetchrow(
+ "SELECT api_url, inbound_id, server_name, panel_type FROM servers WHERE server_name = $1",
+ selected_country,
+ )
+ if not server_info:
+ raise ValueError(f"Сервер {selected_country} не найден.")
+
+ panel_type = server_info["panel_type"].lower()
+
+ public_link = None
+ remnawave_link = None
+ created_at = int(datetime.now(moscow_tz).timestamp() * 1000)
+
+ if old_key_name and panel_type == "3x-ui":
+ old_server_id = old_key_details.get("server_id")
+ if 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,
+ logger=logger,
+ )
+ await delete_client(
+ xui,
+ old_server_info["inbound_id"],
+ email,
+ client_id,
+ )
+
+ if panel_type == "remnawave":
+ remna = RemnawaveAPI(server_info["api_url"])
+ logged_in = await remna.login(REMNAWAVE_LOGIN, REMNAWAVE_PASSWORD)
+ if not logged_in:
+ raise ValueError(f"❌ Не удалось авторизоваться в Remnawave ({selected_country})")
+
+ expire_at = datetime.utcfromtimestamp(expiry_timestamp / 1000).isoformat() + "Z"
+ user_data = {
+ "username": email,
+ "trafficLimitStrategy": "NO_RESET",
+ "expireAt": expire_at,
+ "telegramId": tg_id,
+ "activeUserInbounds": [server_info["inbound_id"]],
+ }
+ result = await remna.create_user(user_data)
+ if not result:
+ raise ValueError("❌ Ошибка при создании пользователя в Remnawave")
+
+ client_id = result.get("uuid")
+ remnawave_link = result.get("subscriptionUrl")
+ logger.info(f"[Key Creation] Remnawave пользователь создан: {result}")
+
+ if panel_type == "3x-ui":
+ 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,
+ )
+ public_link = f"{PUBLIC_LINK}{email}/{tg_id}"
+
+ logger.info(f"[Key Creation] Подписка создана для пользователя {tg_id} на сервере {selected_country}")
+
+ if old_key_name:
+ await session.execute(
+ "UPDATE keys SET server_id = $1 WHERE tg_id = $2 AND email = $3",
+ selected_country,
+ tg_id,
+ old_key_name,
+ )
+ else:
+ await session.execute(
+ """
+ INSERT INTO keys (tg_id, client_id, email, created_at, expiry_time, key, remnawave_link, server_id)
+ VALUES ($1, $2, $3, $4, $5, $6, $7, $8)
+ """,
+ tg_id,
+ client_id,
+ email,
+ created_at,
+ expiry_timestamp,
+ public_link,
+ remnawave_link,
+ selected_country,
+ )
+ data = await state.get_data()
+ if data.get("is_trial"):
+ trial_status = await get_trial(tg_id, session)
+ if trial_status in [0, -1]:
+ await update_trial(tg_id, 1, session)
+ if data.get("plan_id"):
+ plan_price = RENEWAL_PRICES.get(data["plan_id"])
+ await update_balance(tg_id, -plan_price, session)
+
+ except Exception as e:
+ logger.error(f"[Key Finalize] Ошибка при создании ключа для пользователя {tg_id}: {e}")
+ await callback_query.message.answer("❌ Произошла ошибка при создании подписки. Попробуйте снова.")
+ return
+
+ builder = InlineKeyboardBuilder()
+ builder.row(InlineKeyboardButton(text=SUPPORT, url=SUPPORT_CHAT_URL))
+ if CONNECT_PHONE_BUTTON:
+ builder.row(InlineKeyboardButton(text=CONNECT_PHONE, callback_data=f"connect_phone|{key_name}"))
+ builder.row(
+ InlineKeyboardButton(text=PC_BUTTON, callback_data=f"connect_pc|{email}"),
+ InlineKeyboardButton(text=TV_BUTTON, callback_data=f"connect_tv|{email}"),
+ )
+ else:
+ builder.row(InlineKeyboardButton(text=CONNECT_DEVICE, callback_data=f"connect_device|{key_name}"))
+
+ builder.row(InlineKeyboardButton(text=MAIN_MENU, callback_data="profile"))
+
+ remaining_time = expiry_time - datetime.now(moscow_tz)
+ days = remaining_time.days
+
+ link_to_show = public_link or remnawave_link or "Ссылка не найдена"
+ key_message_text = key_message_success(link_to_show, f"⏳ Осталось дней: {days} 📅")
+
+ await edit_or_send_message(
+ target_message=callback_query.message,
+ text=key_message_text,
+ reply_markup=builder.as_markup(),
+ media_path="img/pic.jpg",
+ )
+
+ if state:
+ await state.clear()
+
+
+async def check_server_availability(server_info: dict) -> bool:
+ """
+ Проверяет доступность сервера (3x-ui или Remnawave).
+ """
+ panel_type = server_info.get("panel_type", "3x-ui").lower()
+ server_name = server_info.get("server_name", "unknown")
+
+ try:
+ if panel_type == "remnawave":
+ remna = RemnawaveAPI(server_info["api_url"])
+ await asyncio.wait_for(remna.login(REMNAWAVE_LOGIN, REMNAWAVE_PASSWORD), timeout=5.0)
+ logger.info(f"[Ping] Remnawave сервер {server_name} доступен.")
+ return True
+
+ else:
+ xui = AsyncApi(
+ server_info["api_url"],
+ username=ADMIN_USERNAME,
+ password=ADMIN_PASSWORD,
+ logger=logger,
+ )
+ await asyncio.wait_for(xui.login(), timeout=5.0)
+ logger.info(f"[Ping] 3x-ui сервер {server_name} доступен.")
+ return True
+
+ except asyncio.TimeoutError:
+ logger.warning(f"[Ping] Сервер {server_name} не ответил вовремя.")
+ return False
+ except Exception as e:
+ logger.warning(f"[Ping] Ошибка при проверке сервера {server_name}: {e}")
+ return False
+
diff --git a/handlers/keys/key_mode/key_create.py b/handlers/keys/key_mode/key_create.py
new file mode 100644
index 00000000..6a9ef0eb
--- /dev/null
+++ b/handlers/keys/key_mode/key_create.py
@@ -0,0 +1,202 @@
+from datetime import datetime, timedelta
+from typing import Any
+
+import pytz
+
+from aiogram import F, Router
+from aiogram.fsm.context import FSMContext
+from aiogram.types import CallbackQuery, InlineKeyboardButton, Message
+from aiogram.utils.keyboard import InlineKeyboardBuilder
+from .key_cluster_mode import key_cluster_mode
+from .key_country_mode import key_country_mode
+
+from config import (
+ NOTIFY_EXTRA_DAYS,
+ RENEWAL_PRICES,
+ TRIAL_TIME,
+ TRIAL_TIME_DISABLE,
+ USE_COUNTRY_SELECTION,
+ USE_NEW_PAYMENT_FLOW,
+)
+from database import (
+ add_connection,
+ check_connection_exists,
+ create_temporary_data,
+ get_balance,
+ get_trial,
+)
+from handlers.buttons import (
+ MAIN_MENU,
+ PAYMENT,
+)
+from handlers.payments.robokassa_pay import handle_custom_amount_input
+from handlers.payments.yookassa_pay import process_custom_amount_input
+from handlers.texts import (
+ CREATING_CONNECTION_MSG,
+ DISCOUNTS,
+ INSUFFICIENT_FUNDS_MSG,
+ SELECT_TARIFF_PLAN_MSG,
+)
+from handlers.utils import edit_or_send_message
+from logger import logger
+
+
+router = Router()
+
+moscow_tz = pytz.timezone("Europe/Moscow")
+
+
+class Form(FSMContext):
+ waiting_for_server_selection = "waiting_for_server_selection"
+
+
+@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
+ 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,
+):
+ """Создание ключа с учётом выбора тарифного плана."""
+ current_time = datetime.now(moscow_tz)
+
+ 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}.")
+ await edit_or_send_message(
+ target_message=message_or_query if isinstance(message_or_query, Message) else message_or_query.message,
+ text=CREATING_CONNECTION_MSG,
+ reply_markup=None,
+ )
+ await state.update_data(is_trial=True)
+ await create_key(tg_id, expiry_time, state, session, message_or_query)
+ return
+
+ builder = InlineKeyboardBuilder()
+ for index, (plan_id, price) in enumerate(RENEWAL_PRICES.items()):
+ discount_text = ""
+ if DISCOUNTS and 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=MAIN_MENU, 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=SELECT_TARIFF_PLAN_MSG,
+ 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, session: Any, state: FSMContext):
+ 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:
+ 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,
+ },
+ )
+ 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=PAYMENT, callback_data="pay"))
+ builder.row(InlineKeyboardButton(text=MAIN_MENU, callback_data="profile"))
+ await edit_or_send_message(
+ target_message=callback_query.message,
+ text=INSUFFICIENT_FUNDS_MSG.format(required_amount=required_amount),
+ reply_markup=builder.as_markup(),
+ media_path=None,
+ )
+ return
+ builder = InlineKeyboardBuilder()
+ builder.row(InlineKeyboardButton(text="⏳ Подождите...", callback_data="creating_key"))
+
+ await edit_or_send_message(
+ target_message=callback_query.message,
+ text=CREATING_CONNECTION_MSG,
+ reply_markup=builder.as_markup(),
+ )
+
+ expiry_time = datetime.now(moscow_tz) + timedelta(days=duration_days)
+ await state.update_data(plan_id=plan_id)
+ await create_key(tg_id, expiry_time, state, session, callback_query, plan=int(plan_id))
+
+
+async def create_key(
+ tg_id: int,
+ expiry_time,
+ state,
+ session,
+ message_or_query=None,
+ old_key_name: str = None,
+ plan: int = 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}")
+
+ if USE_COUNTRY_SELECTION:
+ await key_country_mode(
+ tg_id=tg_id,
+ expiry_time=expiry_time,
+ state=state,
+ session=session,
+ message_or_query=message_or_query,
+ old_key_name=old_key_name,
+ )
+ else:
+ await key_cluster_mode(
+ tg_id=tg_id,
+ expiry_time=expiry_time,
+ state=state,
+ session=session,
+ message_or_query=message_or_query,
+ plan=plan,
+ )
\ No newline at end of file
diff --git a/handlers/keys/key_utils.py b/handlers/keys/key_utils.py
index 887331b4..52fa774a 100644
--- a/handlers/keys/key_utils.py
+++ b/handlers/keys/key_utils.py
@@ -6,10 +6,11 @@ import asyncpg
from py3xui import AsyncApi
-from config import ADMIN_PASSWORD, ADMIN_USERNAME, DATABASE_URL, LIMIT_IP, PUBLIC_LINK, SUPERNODE, TOTAL_GB
+from config import ADMIN_PASSWORD, ADMIN_USERNAME, DATABASE_URL, LIMIT_IP, PUBLIC_LINK, SUPERNODE, TOTAL_GB, REMNAWAVE_LOGIN, REMNAWAVE_PASSWORD
from database import get_servers, store_key, delete_notification
from handlers.utils import get_least_loaded_cluster
from logger import logger
+from panels.remnawave import RemnawaveAPI
from panels.three_xui import (
ClientConfig,
add_client,
@@ -19,16 +20,22 @@ from panels.three_xui import (
toggle_client,
)
+from datetime import datetime, timezone
+
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: str,
+ tg_id: int,
+ client_id: str,
+ email: str,
+ expiry_timestamp: int,
+ plan: int = None,
+ session=None,
):
- """
- Создает ключ на всех серверах указанного кластера (или на конкретном сервере, если cluster_id — это имя сервера).
- """
try:
servers = await get_servers()
cluster = servers.get(cluster_id)
+ server_id_to_store = cluster_id
if not cluster:
found_servers = []
@@ -38,23 +45,93 @@ async def create_key_on_cluster(
found_servers.append(server_info)
if found_servers:
cluster = found_servers
+ server_id_to_store = found_servers[0].get("server_name")
else:
raise ValueError(f"Кластер или сервер с ID/именем {cluster_id} не найден.")
semaphore = asyncio.Semaphore(2)
- if SUPERNODE:
- for server_info in cluster:
- await create_client_on_server(
- server_info, tg_id, client_id, email, expiry_timestamp, semaphore, plan=plan
+ remnawave_servers = [s for s in cluster if s.get("panel_type", "3x-ui").lower() == "remnawave"]
+ xui_servers = [s for s in cluster if s.get("panel_type", "3x-ui").lower() == "3x-ui"]
+
+ remnawave_created = False
+ remnawave_key = None
+ remnawave_client_id = None
+
+ if remnawave_servers:
+ remna = RemnawaveAPI(remnawave_servers[0]["api_url"])
+ logged_in = await remna.login(REMNAWAVE_LOGIN, REMNAWAVE_PASSWORD)
+ if not logged_in:
+ logger.error("Не удалось войти в Remnawave API")
+ else:
+ expire_at = datetime.utcfromtimestamp(expiry_timestamp / 1000).isoformat() + "Z"
+ inbound_ids = [s.get("inbound_id") for s in remnawave_servers if s.get("inbound_id")]
+
+ if not inbound_ids:
+ logger.warning("Нет inbound_id у серверов Remnawave")
+ else:
+ traffic_limit_bytes = int((plan or 1) * TOTAL_GB * 1024**3)
+
+ user_data = {
+ "username": email,
+ "trafficLimitStrategy": "NO_RESET",
+ "trafficLimitBytes": traffic_limit_bytes,
+ "expireAt": expire_at,
+ "telegramId": tg_id,
+ "activeUserInbounds": inbound_ids,
+ }
+
+ result = await remna.create_user(user_data)
+ if not result:
+ logger.error("Ошибка при создании пользователя в Remnawave")
+ else:
+ remnawave_created = True
+ remnawave_key = result.get("subscriptionUrl")
+ remnawave_client_id = result.get("uuid")
+ logger.info(f"[Key Creation] Пользователь создан в Remnawave: {result}")
+
+ public_link = f"{PUBLIC_LINK}{email}/{tg_id}" if xui_servers else None
+ final_client_id = remnawave_client_id or client_id
+
+ if xui_servers:
+ if SUPERNODE:
+ for server_info in xui_servers:
+ await create_client_on_server(
+ server_info,
+ tg_id,
+ final_client_id,
+ email,
+ expiry_timestamp,
+ semaphore,
+ plan=plan,
+ )
+ else:
+ await asyncio.gather(
+ *(
+ create_client_on_server(
+ server,
+ tg_id,
+ final_client_id,
+ email,
+ expiry_timestamp,
+ semaphore,
+ plan=plan,
+ )
+ for server in xui_servers
+ ),
+ return_exceptions=True,
)
- else:
- await asyncio.gather(
- *(
- create_client_on_server(server, tg_id, client_id, email, expiry_timestamp, semaphore, plan=plan)
- for server in cluster
- ),
- return_exceptions=True,
+
+ if (remnawave_created and remnawave_client_id) or xui_servers:
+ await store_key(
+ tg_id,
+ final_client_id,
+ email,
+ expiry_timestamp,
+ key=public_link,
+ server_id=server_id_to_store,
+ session=session,
+ remnawave_link=remnawave_key,
)
except Exception as e:
@@ -96,7 +173,7 @@ async def create_client_on_server(
unique_email = email
sub_id = unique_email
- total_gb_value = int(TOTAL_GB) if plan is None else int(plan) * int(TOTAL_GB)
+ total_gb_value = int((plan or 1) * TOTAL_GB * 1024**3)
await add_client(
xui,
@@ -150,34 +227,70 @@ async def renew_key_in_cluster(cluster_id, email, client_id, new_expiry_time, to
notification_id = f"{email}_{notif}"
await delete_notification(tg_id, notification_id, session=conn)
logger.info(f"🧹 Уведомления для ключа {email} очищены при продлении.")
+
+ remnawave_inbound_ids = []
tasks = []
for server_info in cluster:
- xui = AsyncApi(
- server_info["api_url"],
- username=ADMIN_USERNAME,
- password=ADMIN_PASSWORD,
- logger=logger,
- )
-
- inbound_id = server_info.get("inbound_id")
+ panel_type = server_info.get("panel_type", "3x-ui").lower()
server_name = server_info.get("server_name", "unknown")
- if not inbound_id:
- logger.warning(f"INBOUND_ID отсутствует для сервера {server_name}. Пропуск.")
- continue
+ if panel_type == "remnawave":
+ inbound_uuid = server_info.get("inbound_id")
+ if inbound_uuid:
+ remnawave_inbound_ids.append(inbound_uuid)
+ else:
+ logger.warning(f"Не указан inbound_id для продления Remnawave на сервере {server_name}")
- 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), unique_email, new_expiry_time, client_id, total_gb, sub_id, tg_id
+ if remnawave_inbound_ids:
+ remna = RemnawaveAPI(cluster[0]["api_url"])
+ logged_in = await remna.login(REMNAWAVE_LOGIN, REMNAWAVE_PASSWORD)
+ if logged_in:
+ expire_iso = datetime.utcfromtimestamp(new_expiry_time // 1000).isoformat() + "Z"
+ updated = await remna.update_user(
+ uuid=client_id,
+ expire_at=expire_iso,
+ active_user_inbounds=remnawave_inbound_ids,
)
- )
+ if updated:
+ logger.info(f"Подписка Remnawave {client_id} успешно продлена")
+ else:
+ logger.warning(f"Не удалось продлить подписку Remnawave {client_id}")
+ else:
+ logger.error("Не удалось войти в Remnawave API")
+
+ for server_info in cluster:
+ panel_type = server_info.get("panel_type", "3x-ui").lower()
+ server_name = server_info.get("server_name", "unknown")
+
+ if panel_type == "3x-ui":
+ xui = AsyncApi(
+ server_info["api_url"],
+ username=ADMIN_USERNAME,
+ password=ADMIN_PASSWORD,
+ logger=logger,
+ )
+
+ inbound_id = server_info.get("inbound_id")
+
+ if not inbound_id:
+ 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), unique_email, new_expiry_time, client_id, total_gb, sub_id, tg_id
+ )
+ )
+
+ elif panel_type != "remnawave":
+ logger.warning(f"Неизвестный тип панели '{panel_type}' для сервера {server_name}")
await asyncio.gather(*tasks, return_exceptions=True)
@@ -204,32 +317,47 @@ async def delete_key_from_cluster(cluster_id, email, client_id):
else:
raise ValueError(f"Кластер или сервер с ID/именем {cluster_id} не найден.")
- tasks = []
for server_info in cluster:
- xui = AsyncApi(
- server_info["api_url"],
- username=ADMIN_USERNAME,
- password=ADMIN_PASSWORD,
- logger=logger,
- )
+ panel_type = server_info.get("panel_type", "3x-ui").lower()
- inbound_id = server_info.get("inbound_id")
- if not inbound_id:
- logger.warning(
- f"INBOUND_ID отсутствует для сервера {server_info.get('server_name', 'unknown')}. Пропуск."
- )
+ if panel_type == "remnawave":
+ remna = RemnawaveAPI(server_info["api_url"])
+ logged_in = await remna.login(REMNAWAVE_LOGIN, REMNAWAVE_PASSWORD)
+ if not logged_in:
+ logger.error("Не удалось войти в Remnawave API")
+ continue
+
+ success = await remna.delete_user(client_id)
+ if success:
+ logger.info(f"Клиент Remnawave {client_id} успешно удалён")
+ else:
+ logger.warning(f"Не удалось удалить клиента Remnawave {client_id}")
continue
- tasks.append(
- delete_client(
+ elif panel_type == "3x-ui":
+ xui = AsyncApi(
+ server_info["api_url"],
+ username=ADMIN_USERNAME,
+ password=ADMIN_PASSWORD,
+ logger=logger,
+ )
+
+ inbound_id = server_info.get("inbound_id")
+ if not inbound_id:
+ logger.warning(
+ f"INBOUND_ID отсутствует для сервера {server_info.get('server_name', 'unknown')}. Пропуск."
+ )
+ continue
+
+ await delete_client(
xui,
int(inbound_id),
email,
client_id,
)
- )
- await asyncio.gather(*tasks, return_exceptions=True)
+ else:
+ logger.warning(f"Неизвестный тип панели '{panel_type}' для сервера {server_info.get('server_name')}")
except Exception as e:
logger.error(f"Не удалось удалить ключ {client_id} в кластере/на сервере {cluster_id}: {e}")
@@ -238,7 +366,10 @@ async def delete_key_from_cluster(cluster_id, email, client_id):
async def update_key_on_cluster(tg_id, client_id, email, expiry_time, cluster_id):
"""
- Обновляет ключ на всех серверах указанного кластера (или сервера, если передано имя).
+ Пересоздаёт ключ на всех серверах указанного кластера (или сервера, если передано имя).
+ Работает с панелями 3x-ui и Remnawave. Использует новый client_id от Remnawave для всех серверов (если пересоздан).
+ Если SUPERNODE активен — email делается уникальным на каждый сервер.
+ Возвращает кортеж: (новый client_id, remnawave ссылка или None).
"""
try:
servers = await get_servers()
@@ -255,8 +386,52 @@ async def update_key_on_cluster(tg_id, client_id, email, expiry_time, cluster_id
else:
raise ValueError(f"Кластер или сервер с ID/именем {cluster_id} не найден.")
+ expire_iso = datetime.utcfromtimestamp(expiry_time / 1000).replace(tzinfo=timezone.utc).isoformat()
tasks = []
- for server_info in cluster:
+
+ remnawave_servers = [s for s in cluster if s.get("panel_type", "3x-ui").lower() == "remnawave"]
+ xui_servers = [s for s in cluster if s.get("panel_type", "3x-ui").lower() == "3x-ui"]
+
+ remnawave_client_id = None
+ remnawave_key = None
+
+ if remnawave_servers:
+ inbound_ids = [s["inbound_id"] for s in remnawave_servers if s.get("inbound_id")]
+
+ remna = RemnawaveAPI(remnawave_servers[0]["api_url"])
+ logged_in = await remna.login(REMNAWAVE_LOGIN, REMNAWAVE_PASSWORD)
+ if logged_in:
+ await remna.delete_user(client_id)
+
+ user_data = {
+ "username": email,
+ "trafficLimitStrategy": "NO_RESET",
+ "expireAt": expire_iso,
+ "telegramId": tg_id,
+ "activeUserInbounds": inbound_ids,
+ }
+
+ result = await remna.create_user(user_data)
+ if result:
+ remnawave_client_id = result.get("uuid")
+ remnawave_key = result.get("subscriptionUrl")
+ logger.info(f"[Update] Remnawave: клиент заново создан, новый UUID: {remnawave_client_id}")
+ else:
+ logger.error(f"[Update] Ошибка создания Remnawave клиента")
+ else:
+ logger.error(f"[Update] Не удалось авторизоваться в Remnawave")
+
+ if not remnawave_client_id:
+ logger.warning(f"[Update] Remnawave client_id не получен. Используется исходный: {client_id}")
+ remnawave_client_id = client_id
+
+ for server_info in xui_servers:
+ server_name = server_info.get("server_name", "unknown")
+ inbound_id = server_info.get("inbound_id")
+ if not inbound_id:
+ logger.warning(f"[Update] INBOUND_ID отсутствует для сервера {server_name}. Пропуск.")
+ continue
+
xui = AsyncApi(
server_info["api_url"],
username=ADMIN_USERNAME,
@@ -264,37 +439,36 @@ async def update_key_on_cluster(tg_id, client_id, email, expiry_time, cluster_id
logger=logger,
)
- inbound_id = server_info.get("inbound_id")
- if not inbound_id:
- logger.warning(
- f"INBOUND_ID отсутствует для сервера {server_info.get('server_name', 'unknown')}. Пропуск."
- )
- continue
+ if SUPERNODE:
+ sub_id = email
+ unique_email = f"{email}_{server_name.lower()}"
+ else:
+ sub_id = email
+ unique_email = email
- tasks.append(
- add_client(
- xui,
- 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,
- ),
- )
+ config = ClientConfig(
+ client_id=remnawave_client_id,
+ email=unique_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=sub_id,
)
- await asyncio.gather(*tasks, return_exceptions=True)
+ tasks.append(add_client(xui, config))
- logger.info(f"Ключ успешно обновлен для {client_id} на всех серверах в кластере {cluster_id}")
+ if tasks:
+ await asyncio.gather(*tasks, return_exceptions=True)
+
+ logger.info(f"[Update] Ключ {remnawave_client_id} обновлён на всех серверах кластера {cluster_id}")
+ return remnawave_client_id, remnawave_key
except Exception as e:
- logger.error(f"Ошибка при обновлении ключа на серверах кластера {cluster_id} для {client_id}: {e}")
+ logger.error(f"[Update Error] Ошибка при обновлении ключа {client_id} на {cluster_id}: {e}")
raise e
@@ -327,17 +501,17 @@ async def update_subscription(tg_id: int, email: str, session: Any, cluster_over
new_cluster_id = cluster_override or await get_least_loaded_cluster()
- await asyncio.gather(
- update_key_on_cluster(tg_id, client_id, email, expiry_time, new_cluster_id),
- return_exceptions=True,
+ new_client_id, remnawave_key = await update_key_on_cluster(
+ tg_id, client_id, email, expiry_time, new_cluster_id
)
await store_key(
tg_id,
- client_id,
+ new_client_id,
email,
expiry_time,
- public_link,
+ key=public_link,
+ remnawave_link=remnawave_key,
server_id=new_cluster_id,
session=session,
)
@@ -360,7 +534,7 @@ async def get_user_traffic(session: Any, tg_id: int, email: str) -> dict[str, An
rows = await session.fetch(query, tg_id, email)
if not rows:
- return {"status": "error", "message": "❌ У пользователя нет активных ключей."}
+ return {"status": "error", "message": "У пользователя нет активных ключей."}
server_ids = {row["server_id"] for row in rows}
@@ -371,8 +545,8 @@ async def get_user_traffic(session: Any, tg_id: int, email: str) -> dict[str, An
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)}"}
+ 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}
@@ -529,8 +703,8 @@ async def reset_traffic_in_cluster(cluster_id: str, email: str) -> None:
tasks.append(xui.client.reset_stats(int(inbound_id), unique_email))
await asyncio.gather(*tasks, return_exceptions=True)
- logger.info(f"✅ Трафик клиента {email} успешно сброшен на всех серверах кластера {cluster_id}")
+ logger.info(f"Трафик клиента {email} успешно сброшен на всех серверах кластера {cluster_id}")
except Exception as e:
- logger.error(f"❌ Ошибка при сбросе трафика клиента {email} в кластере {cluster_id}: {e}")
- raise
+ logger.error(f"Ошибка при сбросе трафика клиента {email} в кластере {cluster_id}: {e}")
+ raise
\ No newline at end of file
diff --git a/handlers/keys/key_view.py b/handlers/keys/key_view.py
index 18e4accd..4794698c 100644
--- a/handlers/keys/key_view.py
+++ b/handlers/keys/key_view.py
@@ -1,5 +1,5 @@
from aiogram import F, Router
-from aiogram.types import CallbackQuery, Message, InlineKeyboardButton
+from aiogram.types import CallbackQuery, Message, InlineKeyboardButton, WebAppInfo
from aiogram.utils.keyboard import InlineKeyboardBuilder
import pytz
import html
@@ -46,7 +46,7 @@ from handlers.texts import (
NO_SUBSCRIPTIONS_MSG,
key_message,
)
-from handlers.utils import edit_or_send_message, handle_error
+from handlers.utils import edit_or_send_message, handle_error, is_full_remnawave_cluster
from logger import logger
@@ -170,135 +170,134 @@ async def process_callback_view_key(callback_query: CallbackQuery, session: Any)
key_name = callback_query.data.split("|")[1]
try:
record = await get_key_details(key_name, session)
- if record:
- is_frozen = record["is_frozen"]
+ if not record:
+ await callback_query.message.answer(text="Информация о подписке не найдена.")
+ return
- if is_frozen:
- response_message = FROZEN_SUBSCRIPTION_MSG
+ is_frozen = record["is_frozen"]
- builder = InlineKeyboardBuilder()
+ builder = InlineKeyboardBuilder()
+ image_path = os.path.join("img", "pic_view.jpg")
+ if not os.path.isfile(image_path):
+ await callback_query.message.answer("Файл изображения не найден.")
+ return
+
+ if is_frozen:
+ builder.row(
+ InlineKeyboardButton(
+ text=UNFREEZE,
+ callback_data=f"unfreeze_subscription|{key_name}",
+ )
+ )
+ builder.row(InlineKeyboardButton(text=BACK, callback_data="view_keys"))
+ builder.row(InlineKeyboardButton(text=MAIN_MENU, callback_data="profile"))
+
+ await edit_or_send_message(
+ target_message=callback_query.message,
+ text=FROZEN_SUBSCRIPTION_MSG,
+ reply_markup=builder.as_markup(),
+ media_path=image_path,
+ )
+ return
+
+ key = record.get("key")
+ remnawave_link = record.get("remnawave_link")
+ final_link = key or remnawave_link
+
+ expiry_time = record["expiry_time"]
+ server_name = record["server_id"]
+ expiry_date = datetime.utcfromtimestamp(expiry_time / 1000)
+ time_left = expiry_date - datetime.utcnow()
+
+ if time_left.total_seconds() <= 0:
+ days_left_message = "🕒 Статус подписки:\n🔴 Истекла\nОсталось часов: 0\nОсталось минут: 0"
+ else:
+ 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"Осталось: {days} дней, {hours} часов, {minutes} минут"
+
+ formatted_expiry_date = expiry_date.strftime("%d %B %Y года")
+ response_message = key_message(
+ final_link,
+ formatted_expiry_date,
+ days_left_message,
+ server_name,
+ server_name if USE_COUNTRY_SELECTION else None,
+ )
+
+ if (not key or not key.startswith(PUBLIC_LINK)) or ENABLE_UPDATE_SUBSCRIPTION_BUTTON:
+ builder.row(
+ InlineKeyboardButton(
+ text="🔄 Обновить подписку",
+ callback_data=f"update_subscription|{key_name}",
+ )
+ )
+
+ is_full_remnawave = await is_full_remnawave_cluster(server_name, session)
+ if is_full_remnawave and final_link:
+ builder.row(
+ InlineKeyboardButton(
+ text=CONNECT_DEVICE,
+ web_app=WebAppInfo(url=final_link),
+ )
+ )
+ else:
+ if CONNECT_PHONE_BUTTON:
builder.row(
InlineKeyboardButton(
- text=UNFREEZE,
- callback_data=f"unfreeze_subscription|{key_name}",
+ text=CONNECT_PHONE,
+ callback_data=f"connect_phone|{key_name}",
)
)
- builder.row(InlineKeyboardButton(text=BACK, callback_data="view_keys"))
- builder.row(InlineKeyboardButton(text=MAIN_MENU, 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
-
- await edit_or_send_message(
- target_message=callback_query.message,
- text=response_message,
- reply_markup=keyboard,
- media_path=image_path,
+ builder.row(
+ InlineKeyboardButton(text=PC_BUTTON, callback_data=f"connect_pc|{key_name}"),
+ InlineKeyboardButton(text=TV_BUTTON, callback_data=f"connect_tv|{key_name}"),
)
-
else:
- 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 = "🕒 Статус подписки:\n🔴 Истекла\nОсталось часов: 0\nОсталось минут: 0"
- else:
- 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"Осталось: {days} дней, {hours} часов, {minutes} минут"
-
- formatted_expiry_date = expiry_date.strftime("%d %B %Y года")
- response_message = key_message(
- key,
- formatted_expiry_date,
- days_left_message,
- server_name,
- country if USE_COUNTRY_SELECTION else None,
+ builder.row(
+ InlineKeyboardButton(
+ text=CONNECT_DEVICE,
+ callback_data=f"connect_device|{key_name}",
+ )
)
- builder = InlineKeyboardBuilder()
-
- if not key.startswith(PUBLIC_LINK) or ENABLE_UPDATE_SUBSCRIPTION_BUTTON:
- builder.row(
- InlineKeyboardButton(
- text="🔄 Обновить подписку",
- callback_data=f"update_subscription|{key_name}",
- )
- )
-
- if CONNECT_PHONE_BUTTON:
- builder.row(
- InlineKeyboardButton(
- text=CONNECT_PHONE,
- callback_data=f"connect_phone|{key_name}",
- )
- )
- builder.row(
- InlineKeyboardButton(text=PC_BUTTON, callback_data=f"connect_pc|{key_name}"),
- InlineKeyboardButton(text=TV_BUTTON, callback_data=f"connect_tv|{key_name}"),
- )
- else:
- builder.row(
- InlineKeyboardButton(
- text=CONNECT_DEVICE,
- callback_data=f"connect_device|{key_name}",
- )
- )
- if QRCODE:
- builder.row(
- InlineKeyboardButton(
- text=QR,
- callback_data=f"show_qr|{key_name}",
- )
- )
- if ENABLE_DELETE_KEY_BUTTON:
- builder.row(
- InlineKeyboardButton(text=RENEW, callback_data=f"renew_key|{key_name}"),
- InlineKeyboardButton(text=DELETE, callback_data=f"delete_key|{key_name}"),
- )
- else:
- builder.row(InlineKeyboardButton(text=RENEW_FULL, callback_data=f"renew_key|{key_name}"))
-
- if USE_COUNTRY_SELECTION:
- builder.row(InlineKeyboardButton(text=CHANGE_LOCATION, callback_data=f"change_location|{key_name}"))
-
- if TOGGLE_CLIENT:
- builder.row(
- InlineKeyboardButton(
- text=FREEZE,
- callback_data=f"freeze_subscription|{key_name}",
- )
- )
-
- builder.row(InlineKeyboardButton(text=BACK, callback_data="view_keys"))
- builder.row(InlineKeyboardButton(text=MAIN_MENU, 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
-
- await edit_or_send_message(
- target_message=callback_query.message,
- text=response_message,
- reply_markup=keyboard,
- media_path=image_path,
+ if QRCODE:
+ builder.row(
+ InlineKeyboardButton(
+ text=QR,
+ callback_data=f"show_qr|{key_name}",
)
+ )
+ if ENABLE_DELETE_KEY_BUTTON:
+ builder.row(
+ InlineKeyboardButton(text=RENEW, callback_data=f"renew_key|{key_name}"),
+ InlineKeyboardButton(text=DELETE, callback_data=f"delete_key|{key_name}"),
+ )
else:
- await callback_query.message.answer(text="Информация о подписке не найдена.