houseassassin/Solo_bot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Show all inbound nodes with country flags in Remnawave

Browse Source
This commit is contained in:
Capybara-z
2025-07-12 02:24:29 +03:00
parent f08d53362b
commit 7caee34147
2 changed files with 111 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
handlers/admin/clusters/clusters_handler.py
+48 -18
View File
@@ -29,6 +29,7 @@ from handlers.keys.key_utils import (
)
from logger import logger
from panels.remnawave import RemnawaveAPI
from panels.remnawave_time import get_all_nodes_with_online
from ..panel.keyboard import AdminPanelCallback, build_admin_back_kb
from .keyboard import (
@@ -391,33 +392,62 @@ async def handle_cluster_availability(
result_text += f"🌍 <b>{prefix} {server_name}</b> - {online_inbound_users} онлайн\n"
elif panel_type == "remnawave":
remna = RemnawaveAPI(server["api_url"])
if not await remna.login(REMNAWAVE_LOGIN, REMNAWAVE_PASSWORD):
raise Exception("Не удалось авторизоваться")
# remna = RemnawaveAPI(server["api_url"])
# if not await remna.login(REMNAWAVE_LOGIN, REMNAWAVE_PASSWORD):
# raise Exception("Не удалось авторизоваться")
server_inbound_id = server.get("inbound_id")
if not server_inbound_id:
raise Exception("Не указан inbound_id сервера")
all_nodes = await remna.get_all_nodes()
if not all_nodes:
raise Exception("Не удалось получить список нод")
# all_nodes = await remna.get_all_nodes()
# if not all_nodes:
# raise Exception("Не удалось получить список нод")
matching_node = None
for node in all_nodes:
excluded_inbounds = node.get("excludedInbounds", [])
if server_inbound_id not in excluded_inbounds:
matching_node = node
break
# matching_node = None
# for node in all_nodes:
# excluded_inbounds = node.get("excludedInbounds", [])
# if server_inbound_id not in excluded_inbounds:
# matching_node = node
# break
if not matching_node:
raise Exception("Нода, обслуживающая этот inbound_id, не найдена")
# if not matching_node:
# raise Exception("Нода, обслуживающая этот inbound_id, не найдена")
online_remna_users = matching_node.get("usersOnline", 0)
total_online_users += online_remna_users
result_text += (
f"🌍 <b>{prefix} {server_name}</b> - {online_remna_users} онлайн\n"
# online_remna_users = matching_node.get("usersOnline", 0)
# total_online_users += online_remna_users
# result_text += (
# f"🌍 <b>{prefix} {server_name}</b> - {online_remna_users} онлайн\n"
# )
nodes_data = await get_all_nodes_with_online(
server["api_url"], REMNAWAVE_LOGIN, REMNAWAVE_PASSWORD, server_inbound_id
)
if nodes_data.get("error"):
raise Exception(nodes_data["error"])
online_remna_users = nodes_data["total_online"]
total_online_users += online_remna_users
nodes_info = nodes_data["nodes"]
if len(nodes_info) > 1:
result_text += f"🌍 <b>{prefix} {server_name}</b> - {online_remna_users} онлайн\n"
for node_info in nodes_info:
country_code = node_info.get('country_code', 'Unknown')
node_name = node_info.get('name', 'Unknown')
online_users = node_info.get('online_users', 0)
if country_code != 'Unknown' and len(country_code) == 2:
flag = ''.join(chr(ord(c) + 127397) for c in country_code.upper())
else:
flag = country_code
result_text += f" ↳ {flag} ({node_name}): {online_users} онлайн\n"
else:
result_text += (
f"🌍 <b>{prefix} {server_name}</b> - {online_remna_users} онлайн\n"
)
except Exception as e:
error_text = str(e) or "Сервер недоступен"