Сделаны подписки и переделаны роуты
This commit is contained in:
Disledg
@@ -1,5 +1,6 @@
|
||||
import aiohttp
|
||||
import uuid
|
||||
import json
|
||||
import base64
|
||||
import ssl
|
||||
|
||||
@@ -9,79 +10,51 @@ def generate_uuid():
|
||||
|
||||
class PanelInteraction:
|
||||
def __init__(self, base_url, login_data, logger, certificate=None, is_encoded=True):
|
||||
"""
|
||||
Initialize the PanelInteraction class.
|
||||
|
||||
:param base_url: Base URL for the panel.
|
||||
:param login_data: Login data (username/password or token).
|
||||
:param logger: Logger for debugging.
|
||||
:param certificate: Certificate content (Base64-encoded or raw string).
|
||||
:param is_encoded: Indicates whether the certificate is Base64-encoded.
|
||||
"""
|
||||
self.base_url = base_url
|
||||
self.login_data = login_data
|
||||
self.logger = logger
|
||||
self.cert_content = self._decode_certificate(certificate, is_encoded)
|
||||
self.session_id = None # Session ID will be initialized lazily
|
||||
self.ssl_context = self._create_ssl_context(certificate, is_encoded)
|
||||
self.session_id = None
|
||||
self.headers = None
|
||||
|
||||
def _decode_certificate(self, certificate, is_encoded):
|
||||
"""
|
||||
Decode the provided certificate content.
|
||||
|
||||
:param certificate: Certificate content (Base64-encoded or raw string).
|
||||
:param is_encoded: Indicates whether the certificate is Base64-encoded.
|
||||
:return: Decoded certificate content as bytes.
|
||||
"""
|
||||
|
||||
def _create_ssl_context(self, certificate, is_encoded):
|
||||
if not certificate:
|
||||
self.logger.error("No certificate provided.")
|
||||
raise ValueError("Certificate is required.")
|
||||
try:
|
||||
# Создаем SSLContext
|
||||
ssl_context = ssl.create_default_context()
|
||||
|
||||
# Декодируем, если нужно
|
||||
if is_encoded:
|
||||
certificate = base64.b64decode(certificate).decode()
|
||||
|
||||
# Загружаем сертификат в SSLContext
|
||||
ssl_context.load_verify_locations(cadata=certificate)
|
||||
return ssl_context
|
||||
|
||||
except Exception as e:
|
||||
self.logger.error(f"Error while decoding certificate: {e}")
|
||||
raise ValueError("Invalid certificate format or content.") from e
|
||||
|
||||
self.logger.error(f"Error creating SSL context: {e}")
|
||||
raise ValueError("Invalid certificate format.") from e
|
||||
|
||||
async def _ensure_logged_in(self):
|
||||
"""
|
||||
Ensure the session ID is available for authenticated requests.
|
||||
"""
|
||||
if not self.session_id:
|
||||
self.session_id = await self.login()
|
||||
if self.session_id:
|
||||
self.headers = {
|
||||
'Accept': 'application/json',
|
||||
'Cookie': f'3x-ui={self.session_id}',
|
||||
'Content-Type': 'application/json'
|
||||
}
|
||||
else:
|
||||
raise ValueError("Unable to log in and retrieve session ID.")
|
||||
try:
|
||||
self.session_id = await self.login()
|
||||
if self.session_id:
|
||||
self.headers = {
|
||||
'Accept': 'application/json',
|
||||
'Cookie': f'3x-ui={self.session_id}',
|
||||
'Content-Type': 'application/json'
|
||||
}
|
||||
else:
|
||||
self.logger.error("Login failed: Unable to retrieve session ID.")
|
||||
raise ValueError("Login failed: No session ID.")
|
||||
except Exception as e:
|
||||
self.logger.exception("Unexpected error during login.")
|
||||
raise
|
||||
|
||||
async def login(self):
|
||||
"""
|
||||
Perform login to the panel.
|
||||
|
||||
:return: Session ID or None.
|
||||
"""
|
||||
login_url = f"{self.base_url}/login"
|
||||
self.logger.info(f"Attempting to login at: {login_url}")
|
||||
|
||||
async with aiohttp.ClientSession() as session:
|
||||
try:
|
||||
async with session.post(
|
||||
login_url, data=self.login_data, ssl=self.cert_content, timeout=10
|
||||
login_url, data=self.login_data, ssl=self.ssl_context, timeout=10
|
||||
) as response:
|
||||
if response.status == 200:
|
||||
session_id = response.cookies.get("3x-ui")
|
||||
@@ -89,13 +62,12 @@ class PanelInteraction:
|
||||
return session_id.value
|
||||
else:
|
||||
self.logger.error("Login failed: No session ID received.")
|
||||
return None
|
||||
else:
|
||||
self.logger.error(f"Login failed: {response.status}")
|
||||
return None
|
||||
error_details = await response.text()
|
||||
self.logger.error(f"Login failed with status {response.status}: {error_details}")
|
||||
except aiohttp.ClientError as e:
|
||||
self.logger.error(f"Login request failed: {e}")
|
||||
return None
|
||||
self.logger.exception(f"Login request failed: {e}")
|
||||
raise
|
||||
|
||||
async def get_inbound_info(self, inbound_id):
|
||||
"""
|
||||
@@ -109,7 +81,7 @@ class PanelInteraction:
|
||||
async with aiohttp.ClientSession() as session:
|
||||
try:
|
||||
async with session.get(
|
||||
url, headers=self.headers, ssl=self.cert_content, timeout=10
|
||||
url, headers=self.headers, ssl=self.ssl_context, timeout=10
|
||||
) as response:
|
||||
if response.status == 200:
|
||||
return await response.json()
|
||||
@@ -132,7 +104,7 @@ class PanelInteraction:
|
||||
async with aiohttp.ClientSession() as session:
|
||||
try:
|
||||
async with session.get(
|
||||
url, headers=self.headers, ssl=self.cert_content, timeout=10
|
||||
url, headers=self.headers, ssl=self.ssl_context, timeout=10
|
||||
) as response:
|
||||
if response.status == 200:
|
||||
return await response.json()
|
||||
@@ -176,7 +148,7 @@ class PanelInteraction:
|
||||
async with aiohttp.ClientSession() as session:
|
||||
try:
|
||||
async with session.post(
|
||||
url, headers=self.headers, json=update_data, ssl=self.cert_content
|
||||
url, headers=self.headers, json=update_data, ssl=self.ssl_context
|
||||
) as response:
|
||||
if response.status == 200:
|
||||
self.logger.info("Client expiry updated successfully.")
|
||||
@@ -197,36 +169,39 @@ class PanelInteraction:
|
||||
await self._ensure_logged_in()
|
||||
url = f"{self.base_url}/panel/api/inbounds/addClient"
|
||||
client_info = {
|
||||
"clients": [
|
||||
{
|
||||
"id": generate_uuid(),
|
||||
"alterId": 0,
|
||||
"email": email,
|
||||
"limitIp": 2,
|
||||
"totalGB": 0,
|
||||
"flow": "xtls-rprx-vision",
|
||||
"expiryTime": expiry_date,
|
||||
"enable": True,
|
||||
"tgId": "",
|
||||
"subId": ""
|
||||
}
|
||||
]
|
||||
"id": generate_uuid(),
|
||||
"flow": "xtls-rprx-vision",
|
||||
"email": email,
|
||||
"limitIp": 2,
|
||||
"totalGB": 0,
|
||||
"expiryTime": expiry_date,
|
||||
"enable": True,
|
||||
"tgId": "",
|
||||
"subId": "",
|
||||
"reset": 0
|
||||
}
|
||||
settings = json.dumps({"clients": [client_info]}) # Преобразуем объект в JSON-строку
|
||||
|
||||
payload = {
|
||||
"id": inbound_id,
|
||||
"settings": client_info
|
||||
"id": int(inbound_id), # Преобразуем inbound_id в число
|
||||
"settings": settings # Передаем settings как JSON-строку
|
||||
}
|
||||
|
||||
async with aiohttp.ClientSession() as session:
|
||||
try:
|
||||
async with session.post(
|
||||
url, headers=self.headers, json=payload, ssl=self.cert_content
|
||||
url, headers=self.headers, json=payload, ssl=self.ssl_context
|
||||
) as response:
|
||||
if response.status == 200:
|
||||
return await response.status
|
||||
response_json = await response.json()
|
||||
if response.status == 200 and response_json.get('success'):
|
||||
self.logger.info(f"Клиент успешно добавлен: {response_json}")
|
||||
return "OK"
|
||||
else:
|
||||
self.logger.error(f"Failed to add client: {response.status}")
|
||||
error_msg = response_json.get('msg', 'Причина не указана')
|
||||
self.logger.error(f"Не удалось добавить клиента: {error_msg}")
|
||||
return None
|
||||
except aiohttp.ClientError as e:
|
||||
self.logger.error(f"Add client request failed: {e}")
|
||||
return None
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user