minPython 3.10/py3xui/subs/rm_artefacts

client.py

@@ -1,13 +1,9 @@
-import json
-
+import py3xui
 from loguru import logger
 
-from config import SERVERS
-
 
 async def add_client(
-    session,
-    server_id: str,
+    xui,
     client_id: str,
     email: str,
     tg_id: str,
@@ -17,218 +13,90 @@ async def add_client(
     enable: bool,
     flow: str,
 ):
-    api_url = SERVERS[server_id]["API_URL"]
-    url = f"{api_url}/panel/api/inbounds/addClient"
-
-    email = email.lower()
-
-    client_data = {
-        "id": client_id,
-        "alterId": 0,
-        "email": email,
-        "limitIp": limit_ip,
-        "totalGB": total_gb,
-        "expiryTime": expiry_time,
-        "enable": enable,
-        "tgId": tg_id,
-        "subId": email,
-        "flow": flow,
-    }
-
-    settings = json.dumps({"clients": [client_data]})
-
-    data = {"id": 1, "settings": settings}
-
-    headers = {
-        "Content-Type": "application/json",
-    }
-
-    async with session.post(url, json=data, headers=headers) as response:
-        logger.info(f"Запрос на добавление клиента: {data}")
-        logger.info(f"Статус ответа: {response.status}")
-        response_text = await response.text()
-        logger.info(f"Ответ от сервера: {response_text}")
-
-        if response.status == 200:
-            logger.info(f"Клиент добавлен: email={email}")
-            return await response.json()
-        else:
-            logger.error(
-                f"Ошибка при добавлении клиента: {response.status}, {response_text}"
-            )
-            return None
-
-
-async def reset_client_traffic(session, server_id: str, email: str) -> bool:
-    """Сбрасывает трафик клиента на сервере"""
-    api_url = SERVERS[server_id]["API_URL"]
-    url = f"{api_url}/panel/api/inbounds/1/resetClientTraffic/{email}"
-    headers = {"Accept": "application/json"}
-
+    """
+    Adds a client to the server via 3x-ui.
+    """
     try:
-        async with session.post(url, headers=headers) as response:
-            if response.status == 200:
-                logger.info(
-                    f"Трафик клиента {email} успешно сброшен на сервере {server_id}"
-                )
-                return True
-            else:
-                logger.error(
-                    f"Ошибка при сбросе трафика клиента {email} на сервере {server_id}: {response.status} - {await response.text()}"
-                )
-                return False
-    except Exception as e:
-        logger.error(
-            f"Ошибка при попытке сброса трафика клиента {email} на сервере {server_id}: {e}"
+        await xui.login()
+
+        client = py3xui.Client(
+            id=client_id,
+            email=email.lower(),
+            limit_ip=limit_ip,
+            total_gb=total_gb,
+            expiry_time=expiry_time,
+            enable=enable,
+            tg_id=tg_id,
+            sub_id=email,
+            flow=flow,
         )
-        return False
 
+        response = await xui.client.add(1, [client])
 
-async def extend_client_key(
-    session, server_id: str, tg_id, client_id, email: str, new_expiry_time: int
-) -> bool:
-    api_url = SERVERS[server_id]["API_URL"]
+        if response:
+            logger.info(f"Клиент {email} успешно добавлен с ID {client_id}.")
+        else:
+            logger.error(f"Не удалось добавить клиента {email} с ID {client_id}.")
 
-    async with session.get(
-        f"{api_url}/panel/api/inbounds/getClientTraffics/{email}"
-    ) as response:
-        logger.info(f"GET {response.url} Status: {response.status}")
-        response_text = await response.text()
-        logger.info(f"GET Response: {response_text}")
+        return response if response else {"status": "failed"}
 
-        if response.status != 200:
-            logger.error(
-                f"Ошибка при получении данных клиента: {response.status} - {response_text}"
-            )
-            return False
-
-        client_data = (await response.json()).get("obj", {})
-        logger.info(client_data)
-
-        if not client_data:
-            logger.error("Не удалось получить данные клиента.")
-            return False
-
-        current_expiry_time = client_data.get("expiryTime", 0)
-
-        if current_expiry_time == 0:
-            current_expiry_time = new_expiry_time
-
-        updated_expiry_time = max(current_expiry_time, new_expiry_time)
-
-        payload = {
-            "id": 1,
-            "settings": json.dumps(
-                {
-                    "clients": [
-                        {
-                            "id": client_id,
-                            "alterId": 0,
-                            "email": email.lower(),
-                            "limitIp": 2,
-                            "totalGB": 0,
-                            "expiryTime": updated_expiry_time,
-                            "enable": True,
-                            "tgId": tg_id,
-                            "subId": email,
-                            "flow": "xtls-rprx-vision",
-                        }
-                    ]
-                }
-            ),
-        }
-
-        headers = {"Content-Type": "application/json", "Accept": "application/json"}
-
-        try:
-            async with session.post(
-                f"{api_url}/panel/api/inbounds/updateClient/{client_id}",
-                json=payload,
-                headers=headers,
-            ) as response:
-                logger.info(f"POST {response.url} Status: {response.status}")
-                logger.info(f"POST Request Data: {json.dumps(payload, indent=2)}")
-                response_text = await response.text()
-                logger.info(f"POST Response: {response_text}")
-
-                if response.status == 200:
-                    return True
-                else:
-                    logger.error(
-                        f"Ошибка при продлении ключа: {response.status} - {response_text}"
-                    )
-                    return False
-        except Exception as e:
-            logger.error(f"Ошибка запроса: {e}")
-            return False
-
-
-async def extend_client_key_admin(
-    session, server_id: str, tg_id, client_id: str, email: str, new_expiry_time: int
-) -> bool:
-    api_url = SERVERS[server_id]["API_URL"]
-
-    payload = {
-        "id": 1,
-        "settings": json.dumps(
-            {
-                "clients": [
-                    {
-                        "id": client_id,
-                        "alterId": 0,
-                        "email": email.lower(),
-                        "limitIp": 2,
-                        "totalGB": 0,
-                        "expiryTime": new_expiry_time,
-                        "enable": True,
-                        "tgId": tg_id,
-                        "subId": email,
-                        "flow": "xtls-rprx-vision",
-                    }
-                ]
-            }
-        ),
-    }
-
-    headers = {"Content-Type": "application/json", "Accept": "application/json"}
-
-    try:
-        async with session.post(
-            f"{api_url}/panel/api/inbounds/updateClient/{client_id}",
-            json=payload,
-            headers=headers,
-        ) as response:
-            logger.info(f"POST {response.url} Status: {response.status}")
-            logger.info(f"POST Request Data: {json.dumps(payload, indent=2)}")
-            response_text = await response.text()
-            logger.info(f"POST Response: {response_text}")
-
-            if response.status == 200:
-                return True
-            else:
-                logger.error(
-                    f"Ошибка при продлении ключа: {response.status} - {response_text}"
-                )
-                return False
     except Exception as e:
-        logger.error(f"Ошибка запроса: {e}")
-        return False
+        logger.error(f"Ошибка при добавлении клиента {email}: {e}")
+        return {"status": "failed", "error": str(e)}
 
 
-async def delete_client(session, server_id: str, client_id: str) -> bool:
-    api_url = SERVERS[server_id]["API_URL"]
-    url = f"{api_url}/panel/api/inbounds/1/delClient/{client_id}"
-    headers = {"Accept": "application/json"}
-
+async def extend_client_key(xui, email: str, new_expiry_time: int, client_id: str):
+    """
+    Функция для обновления срока действия ключа клиента по email.
+    """
+    await xui.login()
     try:
-        async with session.post(url, headers=headers) as response:
-            if response.status == 200:
-                return True
-            else:
-                logger.error(
-                    f"Ошибка при удалении клиента: {response.status} - {await response.text()}"
-                )
-                return False
+        client = await xui.client.get_by_email(email)
+
+        if not client:
+            logger.warning(f"Клиент с email {email} не найден.")
+            return
+
+        if not client.id:
+            logger.warning(f"Ошибка: клиент {email} не имеет действительного ID.")
+            return
+
+        logger.info(
+            f"Обновление ключа клиента {client.email} с ID {client.id} до нового времени: {new_expiry_time}"
+        )
+        client.id = client_id
+        client.expiry_time = new_expiry_time
+
+        await xui.client.update(client.id, client)
+        logger.info(
+            f"Ключ клиента {client.email} успешно продлён до {new_expiry_time}."
+        )
+
     except Exception as e:
-        logger.error(f"Ошибка запроса: {e}")
-        return False
+        logger.error(f"Ошибка при обновлении клиента с email {email}: {e}")
+
+
+async def delete_client(
+    xui,
+    email: str,
+    client_id: str,
+):
+    """
+    Функция для удаления клиента с сервера 3x-ui
+    """
+    await xui.login()
+    try:
+        client = await xui.client.get_by_email(email)
+        client.id = client_id
+
+        if not client:
+            logger.warning(f"Клиент с email {client_id} не найден.")
+            return
+
+        inbound_id = 1
+        await xui.client.delete(inbound_id, client.id)
+
+        logger.info(f"Клиент с ID {client_id} был удален успешно.")
+
+    except Exception as e:
+        logger.error(f"Ошибка при удалении клиента с ID {client_id}: {e}")