WEB-APP/ Optimization/ Build fix/ Hotkey edit mode/ Log rotation/ Form a11y/ E2E non-blocking
This commit is contained in:
@@ -0,0 +1,300 @@
|
||||
import asyncio
|
||||
import base64
|
||||
import random
|
||||
import re
|
||||
import time
|
||||
import urllib.parse
|
||||
|
||||
import aiohttp
|
||||
|
||||
from aiohttp import web
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
|
||||
from config import (
|
||||
PROJECT_NAME,
|
||||
RANDOM_SUBSCRIPTIONS,
|
||||
SUPERNODE,
|
||||
SUPPORT_CHAT_URL,
|
||||
USERNAME_BOT,
|
||||
USE_COUNTRY_SELECTION,
|
||||
)
|
||||
from core.bootstrap import MODES_CONFIG
|
||||
from core.cache_config import (
|
||||
SUBSCRIPTION_HANDLER_CONCURRENCY,
|
||||
SUBSCRIPTION_RESPONSE_CACHE_TTL_SEC,
|
||||
)
|
||||
from core.redis_cache import cache_get, cache_key, cache_set
|
||||
from database import get_key_details, get_servers
|
||||
from database.servers import get_enabled_server_subscription_url
|
||||
from handlers.texts import HAPP_ANNOUNCE, HIDDIFY_PROFILE_TITLE, SUBSCRIPTION_INFO_TEXT, V2RAYTUN_ANNOUNCE
|
||||
from handlers.utils import convert_to_bytes
|
||||
from logger import logger
|
||||
|
||||
_subscription_semaphore = asyncio.Semaphore(SUBSCRIPTION_HANDLER_CONCURRENCY)
|
||||
|
||||
|
||||
async def fetch_url_content(url: str, identifier: str) -> tuple[list[str], dict[str, str]]:
|
||||
try:
|
||||
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()
|
||||
lines = base64.b64decode(content).decode("utf-8").split("\n")
|
||||
headers = {k.lower(): v for k, v in response.headers.items()}
|
||||
logger.debug(f"Fetched {url}: {len(lines)} lines, headers: {headers}")
|
||||
return lines, headers
|
||||
return [], {}
|
||||
except Exception as e:
|
||||
logger.debug(f"Error fetching URL {url}: {e}")
|
||||
return [], {}
|
||||
|
||||
|
||||
async def combine_unique_lines(
|
||||
urls: list[str], identifier: str, query_string: str
|
||||
) -> tuple[list[str], list[dict[str, str]]]:
|
||||
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]
|
||||
lines, headers = await fetch_url_content(url_with_query, identifier)
|
||||
return lines, [headers]
|
||||
|
||||
urls_with_query = [f"{url}?{query_string}" if query_string else url for url in urls]
|
||||
tasks = [fetch_url_content(url, identifier) for url in urls_with_query]
|
||||
results = await asyncio.gather(*tasks, return_exceptions=True)
|
||||
all_lines = []
|
||||
all_headers = []
|
||||
for result in results:
|
||||
if isinstance(result, tuple):
|
||||
lines, headers = result
|
||||
for line in filter(None, lines):
|
||||
if line not in all_lines:
|
||||
all_lines.append(line)
|
||||
all_headers.append(headers)
|
||||
return all_lines, all_headers
|
||||
|
||||
|
||||
async def get_subscription_urls(
|
||||
server_id: str, email: str, session: AsyncSession, include_remnawave_key: str = None
|
||||
) -> list[str]:
|
||||
urls = []
|
||||
use_country_selection = bool(MODES_CONFIG.get("COUNTRY_SELECTION_ENABLED", USE_COUNTRY_SELECTION))
|
||||
|
||||
if use_country_selection:
|
||||
server_data = await get_enabled_server_subscription_url(session, server_id)
|
||||
if server_data:
|
||||
urls.append(f"{server_data}/{email}")
|
||||
else:
|
||||
servers = await get_servers(session)
|
||||
cluster_servers = servers.get(server_id, [])
|
||||
for server in cluster_servers:
|
||||
if url := server.get("subscription_url"):
|
||||
urls.append(f"{url}/{email}")
|
||||
|
||||
if include_remnawave_key:
|
||||
urls.append(include_remnawave_key)
|
||||
|
||||
if RANDOM_SUBSCRIPTIONS:
|
||||
random.shuffle(urls)
|
||||
|
||||
return urls
|
||||
|
||||
|
||||
def calculate_traffic(
|
||||
cleaned_subscriptions: list[str],
|
||||
expiry_time_ms: int | None,
|
||||
headers_list: list[dict[str, str]],
|
||||
) -> str:
|
||||
logger.debug(f"Calculating traffic with subscriptions: {cleaned_subscriptions}, headers: {headers_list}")
|
||||
expire_timestamp = int(expiry_time_ms / 1000) if expiry_time_ms else 0
|
||||
|
||||
upload = 0
|
||||
download = 0
|
||||
total = 0
|
||||
for headers in headers_list:
|
||||
userinfo = headers.get("subscription-userinfo", "")
|
||||
if userinfo:
|
||||
parts = userinfo.split(";")
|
||||
for part in parts:
|
||||
part = part.strip()
|
||||
if part.startswith("upload="):
|
||||
upload += int(part.split("=")[1])
|
||||
elif part.startswith("download="):
|
||||
download += int(part.split("=")[1])
|
||||
elif part.startswith("total="):
|
||||
total += int(part.split("=")[1])
|
||||
logger.debug(f"Processed Subscription-Userinfo: {userinfo}")
|
||||
|
||||
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
|
||||
logger.debug(f"Found traffic: {value}{unit} for {country}")
|
||||
|
||||
consumed_traffic_bytes = total - sum(country_remaining.values()) if country_remaining else download
|
||||
if consumed_traffic_bytes < 0:
|
||||
consumed_traffic_bytes = 0
|
||||
download = max(download, consumed_traffic_bytes)
|
||||
|
||||
if download == 0 and total == 0 and not country_remaining:
|
||||
download = 1
|
||||
|
||||
result = f"upload={upload}; download={download}; total={total}; expire={expire_timestamp}"
|
||||
logger.debug(f"Calculated subscription-userinfo: {result}")
|
||||
return result
|
||||
|
||||
|
||||
def clean_subscription_line(line: str) -> str:
|
||||
if "#" not in line:
|
||||
return line
|
||||
try:
|
||||
base, meta = line.split("#", 1)
|
||||
meta = urllib.parse.unquote(meta).strip()
|
||||
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:
|
||||
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]:
|
||||
if "Happ" in user_agent:
|
||||
encoded_project_name = f"{project_name}"
|
||||
announce_str = HAPP_ANNOUNCE.format(subscription_info=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 = HIDDIFY_PROFILE_TITLE.format(project_name=project_name, key_info=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,
|
||||
}
|
||||
elif "v2raytun" in user_agent:
|
||||
encoded_project_name = f"{project_name}\n{subscription_info}"
|
||||
announce_str = V2RAYTUN_ANNOUNCE
|
||||
return {
|
||||
"Content-Type": "text/plain; charset=utf-8",
|
||||
"Content-Disposition": "inline",
|
||||
"update-always": "true",
|
||||
"announce": "base64:" + base64.b64encode(announce_str.encode("utf-8")).decode("utf-8"),
|
||||
"announce-url": f"{SUPPORT_CHAT_URL}",
|
||||
"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) -> web.Response:
|
||||
email = request.match_info.get("email")
|
||||
tg_id = request.match_info.get("tg_id")
|
||||
|
||||
if not email or not tg_id:
|
||||
return web.Response(text="❌ Неверные параметры запроса.", status=400)
|
||||
|
||||
cache_key_sub = cache_key("sub_response", email, tg_id)
|
||||
cached = await cache_get(cache_key_sub)
|
||||
if isinstance(cached, dict) and "b" in cached and "h" in cached:
|
||||
return web.Response(text=cached["b"], headers=cached["h"])
|
||||
|
||||
sessionmaker = request.app["sessionmaker"]
|
||||
|
||||
async with _subscription_semaphore:
|
||||
async with sessionmaker() as session:
|
||||
try:
|
||||
key = await get_key_details(session, email)
|
||||
if not key:
|
||||
return web.Response(text="❌ Клиент с таким email не найден.", status=404)
|
||||
|
||||
if int(tg_id) != int(key["tg_id"]):
|
||||
return web.Response(text="❌ Неверные данные. Получите свой ключ в боте.", status=403)
|
||||
|
||||
expiry_time_ms = key["expiry_time"]
|
||||
server_id = key["server_id"]
|
||||
remnawave_link = key["remnawave_link"]
|
||||
|
||||
time_left = format_time_left(expiry_time_ms)
|
||||
|
||||
urls = await get_subscription_urls(server_id, email, session, include_remnawave_key=remnawave_link)
|
||||
if not urls:
|
||||
return web.Response(text="❌ Сервер не найден.", status=404)
|
||||
|
||||
query_string = request.query_string
|
||||
combined_subscriptions, headers_list = await combine_unique_lines(urls, tg_id or email, query_string)
|
||||
|
||||
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 = SUBSCRIPTION_INFO_TEXT.format(email=email, time_left=time_left)
|
||||
|
||||
user_agent = request.headers.get("User-Agent", "")
|
||||
subscription_userinfo = calculate_traffic(cleaned_subscriptions, expiry_time_ms, headers_list)
|
||||
headers = prepare_headers(user_agent, PROJECT_NAME, subscription_info, subscription_userinfo)
|
||||
|
||||
await cache_set(
|
||||
cache_key_sub,
|
||||
{"b": base64_encoded, "h": dict(headers)},
|
||||
SUBSCRIPTION_RESPONSE_CACHE_TTL_SEC,
|
||||
)
|
||||
return web.Response(text=base64_encoded, headers=headers)
|
||||
|
||||
except Exception as e:
|
||||
await session.rollback()
|
||||
logger.error(f"Ошибка в handle_subscription: {e}", exc_info=True)
|
||||
return web.Response(text=f"❌ Ошибка сервера: {e}", status=500)
|
||||
Reference in New Issue
Block a user