Merge pull request #33 from Vladless/youkassa

aiohttp, уведомления, правки

README.md

@@ -86,6 +86,3 @@ python main.py
 
 Попробуйте SoloBot прямо сейчас в Telegram [по этой ссылке](https://t.me/SoloNetVPN_bot).
 
-
-
-

auth.py

@@ -1,36 +1,39 @@
 import json
-
+import aiohttp
-import requests
 
 from config import SERVERS
 
 session = None
 
-def login_with_credentials(server_id: str, username: str, password: str):
+async def login_with_credentials(server_id: str, username: str, password: str):
     global session
-    session = requests.Session()
+    session = aiohttp.ClientSession()
     api_url = SERVERS[server_id]['API_URL']
     auth_url = f"{api_url}/login/"
+    
     data = {
         "username": username,
         "password": password
     }
-    response = requests.post(auth_url, json=data)
-    if response.status_code == 200:
-        session.cookies.update(response.cookies)
-        return session
-    else:
-        raise Exception(f"Ошибка авторизации: {response.status_code}, {response.text}")
     
-def get_clients(session, server_id):
+    async with session.post(auth_url, json=data) as response:
+        if response.status == 200:
+            session.cookie_jar.update_cookies(response.cookies)
+            return session
+        else:
+            raise Exception(f"Ошибка авторизации: {response.status}, {await response.text()}")
+
+
+async def get_clients(session, server_id):
     api_url = SERVERS[server_id]['API_URL']
-    response = session.get(f'{api_url}/panel/api/inbounds/list/')
+    async with session.get(f'{api_url}/panel/api/inbounds/list/') as response:
-    if response.status_code == 200:
+        if response.status == 200:
-        return response.json()
+            return await response.json()
-    else:
+        else:
-        raise Exception(f"Ошибка при получении клиентов: {response.status_code}, {response.text}")
+            raise Exception(f"Ошибка при получении клиентов: {response.status}, {await response.text()}")
 
-def link(session, server_id: str, client_id: str, email: str):
+
+async def link(session, server_id: str, client_id: str, email: str):
     """
     Получение ссылки для подключения по ID клиента.
     :param server_id: str - идентификатор сервера
@@ -38,7 +41,7 @@ def link(session, server_id: str, client_id: str, email: str):
     :param email: str - электронная почта клиента
     :return: str - ссылка для подключения
     """
-    response = get_clients(session, server_id)
+    response = await get_clients(session, server_id) 
     
     if 'obj' not in response or len(response['obj']) == 0:
         raise Exception("Не удалось получить данные клиентов.")
@@ -51,5 +54,8 @@ def link(session, server_id: str, client_id: str, email: str):
     reality = stream_settings.get('security', 'reality')
     flow = stream_settings.get('flow', 'xtls-rprx-vision')
     
-    val = f"vless://{client_id}@{SERVERS[server_id]['DOMEN']}?type={tcp}&security={reality}&pbk={SERVERS[server_id]['PBK']}&fp=chrome&sni={SERVERS[server_id]['SNI']}&sid={SERVERS[server_id]['SID']}=%2F&flow={flow}#{SERVERS[server_id]['PREFIX']}-{email}"
+    val = (
+        f"vless://{client_id}@{SERVERS[server_id]['DOMEN']}?type={tcp}&security={reality}&pbk={SERVERS[server_id]['PBK']}"
+        f"&fp=chrome&sni={SERVERS[server_id]['SNI']}&sid={SERVERS[server_id]['SID']}=%2F&flow={flow}#{SERVERS[server_id]['PREFIX']}-{email}"
+    )
     return val

client.py

@@ -1,9 +1,10 @@
 import json
+import aiohttp
 
 from config import SERVERS 
 
 
-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):
+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'
     
@@ -33,95 +34,102 @@ def add_client(session, server_id: str, client_id: str, email: str, tg_id: str,
         'Content-Type': 'application/json',
     }
 
-    response = session.post(url, json=data, headers=headers)
+    async with session.post(url, json=data, headers=headers) as response:
+        print(f"Запрос на добавление клиента: {data}")
+        print(f"Статус ответа: {response.status}")
+        response_text = await response.text()
+        print(f"Ответ от сервера: {response_text}")
 
-    print(f"Запрос на добавление клиента: {data}")
+        if response.status == 200:
-    print(f"Статус ответа: {response.status_code}")
+            print(f"Клиент добавлен: email={email}")
-    print(f"Ответ от сервера: {response.text}")
+            return await response.json()
-
-    if response.status_code == 200:
-        print(f"Клиент добавлен: email={email}")
-        return response.json()
-    else:
-        print(f"Ошибка при добавлении клиента: {response.status_code}, {response.text}")
-
-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']
-    response = session.get(f"{api_url}/panel/api/inbounds/getClientTraffics/{email}")
-    print(f"GET {response.url} Status: {response.status_code}")
-    print(f"GET Response: {response.text}")
-    
-    if response.status_code != 200:
-        print(f"Ошибка при получении данных клиента: {response.status_code} - {response.text}")
-        return False
-    
-    client_data = response.json().get("obj", {})
-    print(client_data)
-
-    if not client_data:
-        print("Не удалось получить данные клиента.")
-        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": 429496729600000,
-                    "expiryTime": updated_expiry_time,
-                    "enable": True,
-                    "tgId": tg_id,
-                    "subId": "",
-                    "flow": "xtls-rprx-vision"
-                }
-            ]
-        })
-    }
-    
-    headers = {
-        'Content-Type': 'application/json',
-        'Accept': 'application/json'
-    }
-    
-    try:
-        response = session.post(f"{api_url}/panel/api/inbounds/updateClient/{client_id}", json=payload, headers=headers)
-        print(f"POST {response.url} Status: {response.status_code}")
-        print(f"POST Request Data: {json.dumps(payload, indent=2)}")
-        print(f"POST Response: {response.text}")
-        
-        if response.status_code == 200:
-            return True
         else:
-            print(f"Ошибка при продлении ключа: {response.status_code} - {response.text}")
+            print(f"Ошибка при добавлении клиента: {response.status}, {response_text}")
-            return False
+            return None
-    except Exception as e:
-        print(f"Ошибка запроса: {e}")
-        return False
 
-def delete_client(session, server_id: str, client_id: str) -> bool:
+
+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}")
+        response_text = await response.text()
+        print(f"GET Response: {response_text}")
+        
+        if response.status != 200:
+            print(f"Ошибка при получении данных клиента: {response.status} - {response_text}")
+            return False
+        
+        client_data = (await response.json()).get("obj", {})
+        print(client_data)
+
+        if not client_data:
+            print("Не удалось получить данные клиента.")
+            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": 429496729600000,
+                        "expiryTime": updated_expiry_time,
+                        "enable": True,
+                        "tgId": tg_id,
+                        "subId": "",
+                        "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
+
+
+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'
     }
+
     try:
-        response = session.post(url, headers=headers)
+        async with session.post(url, headers=headers) as response:
-        if response.status_code == 200:
+            if response.status == 200:
-            return True
+                return True
-        else:
+            else:
-            print(f"Ошибка при удалении клиента: {response.status_code} - {response.text}")
+                print(f"Ошибка при удалении клиента: {response.status} - {await response.text()}")
-            return False
+                return False
     except Exception as e:
         print(f"Ошибка запроса: {e}")
         return False

handlers/key_management.py

@@ -126,25 +126,16 @@ async def cancel_create_key(callback_query: CallbackQuery, state: FSMContext):
 async def handle_text(message: Message, state: FSMContext):
     current_state = await state.get_state()
 
+    # Обработка команд
     if message.text in ["/start", "/menu"]:
         await start_command(message)
         return
 
     if message.text == "Мой профиль":
-        callback_query = types.CallbackQuery(
+        await process_callback_view_profile(message)
-            id="1",
-            from_user=message.from_user,
-            chat_instance='',
-            data='view_profile',
-            message=message
-        )
-        await process_callback_view_profile(callback_query, state)
-        return
-    
-    if message.text in ["/send_to_all"]:
-        await send_message_to_all_clients(message)
         return
 
+    # Проверка текущего состояния
     if current_state == Form.waiting_for_key_name.state:
         await handle_key_name_input(message, state)
 
@@ -163,7 +154,7 @@ async def handle_key_name_input(message: Message, state: FSMContext):
     creating_new_key = data.get('creating_new_key', False)
     server_id = data.get('selected_server_id')
 
-    session = login_with_credentials(server_id, ADMIN_USERNAME, ADMIN_PASSWORD)
+    session = await login_with_credentials(server_id, ADMIN_USERNAME, ADMIN_PASSWORD)
     client_id = str(uuid.uuid4())
     email = key_name.lower()
     current_time = datetime.utcnow()
@@ -194,7 +185,7 @@ async def handle_key_name_input(message: Message, state: FSMContext):
     expiry_timestamp = int(expiry_time.timestamp() * 1000)
 
     try:
-        response = add_client(session, server_id, client_id, email, tg_id, limit_ip=1, total_gb=0, expiry_time=expiry_timestamp, enable=True, flow="xtls-rprx-vision")
+        response = await add_client(session, server_id, client_id, email, tg_id, limit_ip=1, total_gb=0, expiry_time=expiry_timestamp, enable=True, flow="xtls-rprx-vision")
         
         if not response.get("success", True):
             error_msg = response.get("msg", "Неизвестная ошибка.")
@@ -205,7 +196,7 @@ async def handle_key_name_input(message: Message, state: FSMContext):
             else:
                 raise Exception(error_msg)
 
-        connection_link = link(session, server_id, client_id, email)
+        connection_link = await link(session, server_id, client_id, email)
 
         conn = await asyncpg.connect(DATABASE_URL)
         try:

handlers/keys.py

@@ -179,8 +179,8 @@ async def process_callback_confirm_delete(callback_query: types.CallbackQuery):
             if record:
                 email = record['email']
                 server_id = record['server_id']
-                session = login_with_credentials(server_id, ADMIN_USERNAME, ADMIN_PASSWORD)
+                session = await login_with_credentials(server_id, ADMIN_USERNAME, ADMIN_PASSWORD)
-                success = delete_client(session, server_id, client_id)
+                success = await delete_client(session, server_id, client_id)
 
                 if success:
                     await conn.execute('DELETE FROM keys WHERE client_id = $1', client_id)
@@ -244,8 +244,8 @@ async def process_callback_renew_plan(callback_query: types.CallbackQuery):
                     await bot.edit_message_text("Недостаточно средств для продления ключа.", chat_id=tg_id, message_id=callback_query.message.message_id, reply_markup=keyboard)
                     return
 
-                session = login_with_credentials(server_id, ADMIN_USERNAME, ADMIN_PASSWORD)
+                session = await login_with_credentials(server_id, ADMIN_USERNAME, ADMIN_PASSWORD)
-                success = extend_client_key(session, server_id, tg_id, client_id, email, new_expiry_time)
+                success = await extend_client_key(session, server_id, tg_id, client_id, email, new_expiry_time)
 
                 if success:
                     await update_balance(tg_id, -cost)
@@ -305,34 +305,45 @@ async def process_callback_select_server(callback_query: types.CallbackQuery):
                 email = record['email']
                 expiry_time = record['expiry_time']
                 current_server_id = record['server_id']
-                session = login_with_credentials(server_id, ADMIN_USERNAME, ADMIN_PASSWORD)
+
+                # Авторизация на новом сервере
+                session_new = await login_with_credentials(server_id, ADMIN_USERNAME, ADMIN_PASSWORD)
                 new_expiry_time = int(datetime.utcnow().timestamp() * 1000) + (expiry_time - datetime.utcnow().timestamp() * 1000)
 
-                new_client_data = add_client(session, server_id, client_id, email, tg_id, limit_ip=1, total_gb=0, expiry_time=new_expiry_time, enable=True, flow="xtls-rprx-vision")
+                # Добавляем клиента на новый сервер
+                new_client_data = await add_client(session_new, server_id, client_id, email, tg_id, limit_ip=1, total_gb=0, expiry_time=new_expiry_time, enable=True, flow="xtls-rprx-vision")
 
                 if new_client_data:
-                    new_key = link(session, server_id, client_id, email)
+                    # Генерация нового ключа
+                    new_key = await link(session_new, server_id, client_id, email)
 
+                    # Обновляем запись в БД
                     await conn.execute('UPDATE keys SET server_id = $1, key = $2 WHERE client_id = $3',
                                        server_id, new_key, client_id)
 
-                    session = login_with_credentials(current_server_id, ADMIN_USERNAME, ADMIN_PASSWORD)
+                    # Логируем удаление клиента со старого сервера
-                    success_delete = delete_client(session, current_server_id, client_id)
+                    try:
-                    if success_delete:
+                        session_old = await login_with_credentials(current_server_id, ADMIN_USERNAME, ADMIN_PASSWORD)
-                        response_message = ("Ключ успешно перемещен на новый сервер.\n\n"
+                        success_delete = await delete_client(session_old, current_server_id, client_id)
-                                            "<b>Не забудьте удалить старый ключ из вашего приложения и установить новый.</b>")
+
-                    else:
+                        if success_delete:
-                        response_message = "Ошибка при удалении ключа с текущего сервера."
+                            response_message = (f"Ключ успешно перемещен на новый сервер.\n\n"
+                                                f"<b>Удалите старый ключ и используйте новый для подключения к новому серверу:</b>\n"
+                                                f"<pre>{new_key}</pre>")
+                        else:
+                            response_message = "Ошибка при удалении ключа с текущего сервера. Клиент не удален."
+                            print(f"Не удалось удалить клиента {client_id} с сервера {current_server_id}. Ответ API: {success_delete}")
+                    except Exception as e:
+                        response_message = f"Ошибка при удалении клиента с текущего сервера: {e}"
+                        print(f"Ошибка при авторизации на старом сервере {current_server_id}: {e}")
                 else:
                     response_message = "Ошибка при создании клиента на новом сервере."
-
             else:
                 response_message = "Ключ не найден или уже удален."
 
             back_button = types.InlineKeyboardButton(text='Назад', callback_data='view_keys')
             keyboard = types.InlineKeyboardMarkup(inline_keyboard=[[back_button]])
 
-            # Указываем parse_mode='HTML' для форматирования
             await bot.edit_message_text(response_message, chat_id=tg_id, message_id=callback_query.message.message_id, reply_markup=keyboard, parse_mode='HTML')
 
         finally:

handlers/notifications.py

@@ -78,14 +78,14 @@ async def notify_expiring_keys(bot: Bot):
 
                 await conn.execute('DELETE FROM keys WHERE client_id = $1', client_id)
 
-                session = login_with_credentials(server_id, ADMIN_USERNAME, ADMIN_PASSWORD)
+                session = await login_with_credentials(server_id, ADMIN_USERNAME, ADMIN_PASSWORD)
-                delete_client(session, server_id, client_id)
+                await delete_client(session, server_id, client_id)
 
                 keyboard = InlineKeyboardMarkup(inline_keyboard=[
                     [InlineKeyboardButton(text='В профиль', callback_data='view_profile')]
                 ])
 
-                message = f"Ваш ключ <b>{email}</b> истек и был удален автоматически."
+                message = f"Ваш ключ <b>{email}</b> истек , через 3 часа будет удалён."
 
                 try:
                     await bot.send_message(chat_id=tg_id, text=message, parse_mode='HTML', reply_markup=keyboard)
@@ -104,13 +104,12 @@ async def send_message_to_all_clients(message: types.Message):
         await message.answer("У вас нет прав для выполнения этой команды.")
         return
 
-    # Получаем текст сообщения после команды
+    text = message.text.split(maxsplit=1)
-    text = message.text.split(maxsplit=1)  # Разделяем текст сообщения на части
+    if len(text) < 2:
-    if len(text) < 2:  # Если нет текста после команды
         await message.answer("Пожалуйста, введите текст сообщения после команды.")
         return
 
-    text_message = text[1]  # Получаем текст сообщения
+    text_message = text[1]
 
     try:
         conn = await asyncpg.connect(DATABASE_URL)

handlers/start.py

@@ -18,7 +18,7 @@ async def send_welcome_message(chat_id: int):
     welcome_text = (
         "*SoloNet — ваш доступ в свободный интернет! 🌐✨*\n\n"
         "Используйте надежный и быстрый VPN, который гарантирует вашу безопасность даже в самых строгих условиях. 🔒🚀\n\n"
-        "*ver. 1.0*"
+        "*ver. 1.1*"
     )
 
     image_path = os.path.join(os.path.dirname(__file__), 'pic.jpg')
@@ -45,11 +45,10 @@ async def send_welcome_message(chat_id: int):
 
 @router.message(Command('start'))
 async def start_command(message: Message):
-    print(f"Received start command with text: {message.text}")  # Отладочный лог
+    print(f"Received start command with text: {message.text}") 
     if 'referral_' in message.text:
         referrer_tg_id = int(message.text.split('referral_')[1])
-        print(f"Referral ID: {referrer_tg_id}")  # Отладочный лог
+        print(f"Referral ID: {referrer_tg_id}")
-        # Остальная часть кода...
         if not await check_connection_exists(message.from_user.id):
             await add_connection(message.from_user.id)