Refactoring and fix

2024-11-09 10:36:16 +03:00
parent a0d3eb3a52
commit f44c6cb2e3
24 changed files with 2340 additions and 1190 deletions
@@ -1,14 +1,28 @@
 import json
+import logging

 from config import SERVERS

+logging.basicConfig(level=logging.DEBUG)
+
+
+async def add_client(
+    session,
+    server_id: str,
+    client_id: str,
+    email: str,
+    tg_id: str,
+    limit_ip: int,
+    total_gb: int,
+    expiry_time: int,
+    enable: bool,
+    flow: str,
+):
+    api_url = SERVERS[server_id]["API_URL"]
+    url = f"{api_url}/panel/api/inbounds/addClient"

-async def add_client(session, server_id: str, client_id: str, email: str, tg_id: str, limit_ip: int, total_gb: int, expiry_time: int, 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,
@@ -21,53 +35,58 @@ async def add_client(session, server_id: str, client_id: str, email: str, tg_id:
        "subId": email,
        "flow": flow,
    }
-    
+
    settings = json.dumps({"clients": [client_data]})

-    data = {
-        "id": 1,
-        "settings": settings
-    }
+    data = {"id": 1, "settings": settings}

    headers = {
-        'Content-Type': 'application/json',
+        "Content-Type": "application/json",
    }

    async with session.post(url, json=data, headers=headers) as response:
-        print(f"Запрос на добавление клиента: {data}")
-        print(f"Статус ответа: {response.status}")
+        logging.info(f"Запрос на добавление клиента: {data}")
+        logging.info(f"Статус ответа: {response.status}")
        response_text = await response.text()
-        print(f"Ответ от сервера: {response_text}")
+        logging.info(f"Ответ от сервера: {response_text}")

        if response.status == 200:
-            print(f"Клиент добавлен: email={email}")
+            logging.info(f"Клиент добавлен: email={email}")
            return await response.json()
        else:
-            print(f"Ошибка при добавлении клиента: {response.status}, {response_text}")
+            logging.error(
+                f"Ошибка при добавлении клиента: {response.status}, {response_text}"
+            )
            return None


-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']
-    
-    async with session.get(f"{api_url}/panel/api/inbounds/getClientTraffics/{email}") as response:
-        print(f"GET {response.url} Status: {response.status}")
+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"]
+
+    async with session.get(
+        f"{api_url}/panel/api/inbounds/getClientTraffics/{email}"
+    ) as response:
+        logging.info(f"GET {response.url} Status: {response.status}")
        response_text = await response.text()
-        print(f"GET Response: {response_text}")
-        
+        logging.info(f"GET Response: {response_text}")
+
        if response.status != 200:
-            print(f"Ошибка при получении данных клиента: {response.status} - {response_text}")
+            logging.error(
+                f"Ошибка при получении данных клиента: {response.status} - {response_text}"
+            )
            return False
-        
+
        client_data = (await response.json()).get("obj", {})
-        print(client_data)
+        logging.info(client_data)

        if not client_data:
-            print("Не удалось получить данные клиента.")
+            logging.error("Не удалось получить данные клиента.")
            return False

-        current_expiry_time = client_data.get('expiryTime', 0)
-        
+        current_expiry_time = client_data.get("expiryTime", 0)
+
        if current_expiry_time == 0:
            current_expiry_time = new_expiry_time

@@ -75,7 +94,60 @@ async def extend_client_key(session, server_id: str, tg_id, client_id, email: st

        payload = {
            "id": 1,
-            "settings": json.dumps({
+            "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:
+                logging.info(f"POST {response.url} Status: {response.status}")
+                logging.info(f"POST Request Data: {json.dumps(payload, indent=2)}")
+                response_text = await response.text()
+                logging.info(f"POST Response: {response_text}")
+
+                if response.status == 200:
+                    return True
+                else:
+                    logging.error(
+                        f"Ошибка при продлении ключа: {response.status} - {response_text}"
+                    )
+                    return False
+        except Exception as e:
+            logging.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,
@@ -83,95 +155,56 @@ async def extend_client_key(session, server_id: str, tg_id, client_id, email: st
                        "email": email.lower(),
                        "limitIp": 2,
                        "totalGB": 0,
-                        "expiryTime": updated_expiry_time,
+                        "expiryTime": new_expiry_time,
                        "enable": True,
                        "tgId": tg_id,
                        "subId": email,
-                        "flow": "xtls-rprx-vision"
+                        "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:
-                print(f"POST {response.url} Status: {response.status}")
-                print(f"POST Request Data: {json.dumps(payload, indent=2)}")
-                response_text = await response.text()
-                print(f"POST Response: {response_text}")
-                
-                if response.status == 200:
-                    return True
-                else:
-                    print(f"Ошибка при продлении ключа: {response.status} - {response_text}")
-                    return False
-        except Exception as e:
-            print(f"Ошибка запроса: {e}")
-            return False
+            }
+        ),
+    }
+
+    headers = {"Content-Type": "application/json", "Accept": "application/json"}

-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:
-            print(f"POST {response.url} Status: {response.status}")
-            print(f"POST Request Data: {json.dumps(payload, indent=2)}")
+        async with session.post(
+            f"{api_url}/panel/api/inbounds/updateClient/{client_id}",
+            json=payload,
+            headers=headers,
+        ) as response:
+            logging.info(f"POST {response.url} Status: {response.status}")
+            logging.info(f"POST Request Data: {json.dumps(payload, indent=2)}")
            response_text = await response.text()
-            print(f"POST Response: {response_text}")
-            
+            logging.info(f"POST Response: {response_text}")
+
            if response.status == 200:
                return True
            else:
-                print(f"Ошибка при продлении ключа: {response.status} - {response_text}")
+                logging.error(
+                    f"Ошибка при продлении ключа: {response.status} - {response_text}"
+                )
                return False
    except Exception as e:
-        print(f"Ошибка запроса: {e}")
+        logging.error(f"Ошибка запроса: {e}")
        return False

+
 async def delete_client(session, server_id: str, client_id: str) -> bool:
-    api_url = SERVERS[server_id]['API_URL']
+    api_url = SERVERS[server_id]["API_URL"]
    url = f"{api_url}/panel/api/inbounds/1/delClient/{client_id}"
-    headers = {
-        'Accept': 'application/json'
-    }
+    headers = {"Accept": "application/json"}

    try:
        async with session.post(url, headers=headers) as response:
            if response.status == 200:
                return True
            else:
-                print(f"Ошибка при удалении клиента: {response.status} - {await response.text()}")
+                logging.error(
+                    f"Ошибка при удалении клиента: {response.status} - {await response.text()}"
+                )
                return False
    except Exception as e:
-        print(f"Ошибка запроса: {e}")
+        logging.error(f"Ошибка запроса: {e}")
        return False