From a6d2203e78761b6f5b9bd3e71a3c4ea5bc0ef19b Mon Sep 17 00:00:00 2001 From: Vlad Date: Thu, 19 Sep 2024 03:41:44 +0300 Subject: [PATCH] =?UTF-8?q?=D0=B0=D0=BF=D0=B4=D0=B5=D0=B9=D1=82=20=D1=8E?= =?UTF-8?q?=D0=B7=D0=B5=D1=80=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- auth.py | 2 + client.py | 67 +++++++++++++++++++++- handlers/__pycache__/keys.cpython-310.pyc | Bin 1921 -> 4032 bytes handlers/keys.py | 63 ++++++++++++++++++-- key_management.py | 42 +++++++++++++- path_to_your_database | 0 6 files changed, 164 insertions(+), 10 deletions(-) create mode 100644 path_to_your_database diff --git a/auth.py b/auth.py index c1d0880e..2c0f1443 100644 --- a/auth.py +++ b/auth.py @@ -1,6 +1,7 @@ import requests from config import ADMIN_USERNAME, ADMIN_PASSWORD, GET_INBOUNDS_URL import json +import httpx session = None @@ -19,6 +20,7 @@ def login_with_credentials(username, password): else: raise Exception(f"Ошибка авторизации: {response.status_code}, {response.text}") + def get_clients(session): response = session.get(GET_INBOUNDS_URL) if response.status_code == 200: diff --git a/client.py b/client.py index 308ad879..c490b222 100644 --- a/client.py +++ b/client.py @@ -1,7 +1,10 @@ import requests import json -from config import ADMIN_USERNAME, ADMIN_PASSWORD, GET_INBOUNDS_URL +from config import ADMIN_USERNAME, ADMIN_PASSWORD, GET_INBOUNDS_URL, DATABASE_PATH import uuid +from auth import login_with_credentials +from datetime import datetime, timedelta +import aiosqlite def add_client(session, client_id: str, email: str, tg_id: str, limit_ip: int, total_gb: int, expiry_time: int, enable: bool, flow: str): url = 'https://solonet.pocomacho.ru:62553/solonet/panel/api/inbounds/addClient' @@ -48,7 +51,65 @@ def add_client(session, client_id: str, email: str, tg_id: str, limit_ip: int, t else: print(f"Ошибка при добавлении клиента: {response.status_code}, {response.text}") +import json +def extend_client_key(session, tg_id, client_id, email: str, new_expiry_time: int) -> bool: + # Получаем текущие данные клиента + response = session.get(f"https://solonet.pocomacho.ru:62553/solonet/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) -def generate_client_id(): - return str(uuid.uuid4()) + if not client_data: + print("Не удалось получить данные клиента.") + return False + + # Обновляем данные клиента + client_data['expiryTime'] = new_expiry_time + + # Формируем данные для обновления + payload = { + "id": 1, # Если id динамически изменяется, замените это значение + "settings": json.dumps({ + "clients": [ + { + "id": client_id, + "alterId": 0, + "email": client_data['email'], + "limitIp": 1, + # "totalGB": 2, + "expiryTime": new_expiry_time, + "enable": client_data['enable'], + "tgId": tg_id, + "subId": '', + "flow": 'xtls-rprx-vision' + } + ] + }) + } + + headers = { + 'Content-Type': 'application/json', + 'Accept': 'application/json' + } + + try: + response = session.post(f"https://solonet.pocomacho.ru:62553/solonet/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}") + return False + except Exception as e: + print(f"Ошибка запроса: {e}") + return False \ No newline at end of file diff --git a/handlers/__pycache__/keys.cpython-310.pyc b/handlers/__pycache__/keys.cpython-310.pyc index 5d50a89d45f9ac129745940175bb3839b92a0512..a374ce33836ba21656884d68b5f6769e4f231385 100644 GIT binary patch literal 4032 zcmbW4U2Ggz6@cf?&g{Jn zdFZV6-2XG@o_p{4?%4T!Mu6u^>(jXx%7XAWEc8AS6uu9C=Z_$CK_`Y_k}5I9sz|Ub z8i{HG(u5(IQdQ!0k|CRNRW_5=BrnTG%2cX~nXabIOf_R>t65&3G;(IXn&^1Y0@x_Qm2Ni zjYwg6p1L)y;WjVQ+9F-9QB!LgVHRuanxR<@=%AYoVI$CeYqbFS*pxYYn4G zEf-ach%5`XgoB1X-?VB=P4_~r!Qh3K+tdsP-l0?j$zzkVmD-ufvnLw_CmBDO7vX;#{{O}W_k{&m%SH5tI31=hHt7g35?btC5`t4wjcWb_t4k{+oWR`4NV_AK`)NY+J;>NM~z+3EZv~Y8N;EYt>sXe zFf_BSYe#eVB79>;U{66378;si)V0Q9?KO|GeAD&ch=Loyg}M2J?YEu3VO;{MNcP zR`%<${m#`TLInJshyN3M{&IIu>p4kq`%1|a@2-;dK&b`2d1g3FM;}QY0vm`Co3}*=;6-Sc;AyYrSB+zsw^-s!wKo|$Md zdel1zO%r37%>+M#9#?|fYVZJhJqYf1-VAOB_k%l~>*MM~{pgA`F;+k7y@<+w0j-xi zS30Ymwcu{&jo?mjM-4s>9;nd!GG^c{ZwJ4J^n+N(J7KPAIWF@eA3!*gTnHRtzI%l5 zgnD?ag5PvjVdRIwJj(wIYQ zrmfR3$7st~u9+HJ^jhAtsQtGp8r8Y1!rV4HSGwAR&EOBCpm!h|;@UNnI*v9^!Ry{P zapbQ%Z^2C82k(HBJ_aMBNyA*%z*n2-E3ArLjQYmak%2Hh$859aIh2KBQxDTx({^4n znl24f@vdM+P#>n~CE9?P9V&CwZCtP|%4DoBdTs+%;LdYg&1{7VIC2h)45Lw4KE*xp zBf88Tam;gF+j_Kiio1Xz`of%p0Xv>vnA*-{b|xIAE0-Fyh5I#3YL>G^*+`x}je}*r z4?|I}hslP=9GitnMjJM)KmtxcnC&?z-2yTrEHdh}-~hndM4k-?diO-F9vKd6hN~Qx z6wn#1FQGhgM`8#~InZKu160+zo2VP}F;+XrK!~e~D2ip0B$Ax_pC}iIBq~H9Wl|!A z1ePQs5#_T3vLqfL;_BhQAKH>u3(sW8SBbJJepZqgs@WCWd&$H4p%r+;z5*#5K(P-6 zLT1NQ&I>#`>;Q;e$_h|{^x~kX!-DRB;s#j}_n_j_&q2kXAA^d&JcKMS=Z1)|vT&I{VzB+rK6Pu1bCua3%XmKfNZmbAFEf$sO?FGPNddTgwp( zp!4N9aih1kyaR;Tp8SqI)<9fW=&4J`b$vT^d*|H)zJKn<*&amZwh?)QIO6WU)|UZ& z`)-isg8)CcSgw@fcNhIUBCyv24!r#9c@8{CW8md?=Es58KfO|k`PSvm5tZNkAn5@e z=UOkjA{cd1#OcGn1l#u^h9dS1<}l1cAcZ^Evg1ub;Su<#K#ku8n;aHEoXy}aWO+DN zgO4EcLmS5B_d7p{!as)EhzAg3M<42-F;aUA#(o$)KooIyJ%BKLA1DMBtJuUFK2Q-Q zo$FD^?&?9V?ZoQaqs?D!ZEdZLzj_8PoIu+iT+dd{?()e?>dR`(} zvpy6U9{J}4!ypOBu}!n-GK{4o1x_UPE$s4b6zBo=T@YcqyRSo;?`!rwtj+AhJznDe;;2?8;6COV^eD2^K?oKFh2+2$L$OSX LIdDnt;2`-w)IHr# delta 800 zcmZuvO=wd=5Z>9h?d+?<0zP6y?EHkq^yYtQP&AuJp$fN_$vyqhI z*!S|DxsyH)bZ7kJnqJTWQAA1IXcz?}+3R()VHQk43~!=>#jIY68r0lEyFe`lHM@*y zirQOb6ABK+b13J0Q_wja>tW|UYsJRxU^!%bCI_)Mm7mXF&Cgw1yp^AymI198gwk2m z4_SD#+F&J6$p@nLSn8zImTEXcHAG=aRlzfH>OqyY7nfM4B_W7}@TG^+OT=w4iZ6O8 zm8SA-#9hJg$T>GTAoO0{JeKeqpdf3|g_WHU_q34g!Uc3gk}!>)u8L3Au_J}97HK_W z_aNFO5#e{mXMFv#8>K2x0qSl;*ABf}I)cceUS!ksHrdAj)XdOK*E+nF)iSj#&2DQV zuusFPc&_Evp0ojwT6d%_pynxp!oJQMKwSsW$^h+)oM-3-{vXO=l?9ng<@-lYQ{VS( zXiK_!{fB+4VM^NiXI5U@Bman)BCnt-ev)_Mi~eztNN!@2J!B<0wb&}NuyikIGH!?u z#w_UKggK$P+!FWk~j7)h8XzlwY6;7$7V tdeJW}%`P+ENf7^P#~xQ%j(TWaY6Nt-&aSAh)yhhfMHaZpGO&w}!XK$UwlM$z diff --git a/handlers/keys.py b/handlers/keys.py index b545e2aa..2df51c0e 100644 --- a/handlers/keys.py +++ b/handlers/keys.py @@ -1,8 +1,11 @@ from aiogram import types, Router import aiosqlite -from config import DATABASE_PATH from bot import bot -from datetime import datetime +from datetime import datetime, timedelta +from database import get_active_key_email, get_balance, store_key, update_balance +from client import extend_client_key +from client import extend_client_key, login_with_credentials +from config import ADMIN_ID, ADMIN_PASSWORD, ADMIN_USERNAME, DATABASE_PATH router = Router() @@ -26,9 +29,14 @@ async def process_callback_view_keys(callback_query: types.CallbackQuery): expiry_date = datetime.utcfromtimestamp(expiry_time / 1000).strftime("%Y-%m-%d %H:%M:%S") response_message = f"Ваш ключ:\n
{key}
\nДата окончания: {expiry_date}" - # Добавляем кнопку с инструкциями + # Кнопки для инструкций и продления instructions_button = types.InlineKeyboardButton(text='Инструкции по использованию', callback_data='instructions') - keyboard = types.InlineKeyboardMarkup(inline_keyboard=[[instructions_button]]) + renew_button = types.InlineKeyboardButton(text='Продлить ключ', callback_data='renew_key') + + keyboard = types.InlineKeyboardMarkup(inline_keyboard=[ + [instructions_button], + [renew_button] + ]) await bot.send_message(tg_id, response_message, parse_mode="HTML", reply_markup=keyboard) else: @@ -40,3 +48,50 @@ async def process_callback_view_keys(callback_query: types.CallbackQuery): await bot.send_message(tg_id, response_message, reply_to_message_id=callback_query.message.message_id) await callback_query.answer() + +@router.callback_query(lambda c: c.data == 'renew_key') +async def process_callback_renew_key(callback_query: types.CallbackQuery): + tg_id = callback_query.from_user.id + + try: + async with aiosqlite.connect(DATABASE_PATH) as db: + async with db.execute('SELECT client_id, email, expiry_time FROM connections WHERE tg_id = ?', (tg_id,)) as cursor: + record = await cursor.fetchone() + + if record: + client_id = record[0] + email = record[1] # Получаем email + expiry_time = record[2] + current_time = datetime.utcnow().timestamp() * 1000 + new_expiry_time = int((datetime.utcnow() + timedelta(days=30)).timestamp() * 1000) + + if expiry_time <= current_time: + await callback_query.message.answer("Ваш ключ уже истек и не может быть продлен.") + return + + # Проверка баланса + balance = await get_balance(tg_id) + if balance < 100: + await callback_query.message.answer("Недостаточно средств для продления ключа.") + return + + # Создаем сессию для API-запросов + session = login_with_credentials(ADMIN_USERNAME, ADMIN_PASSWORD) + + # Обновляем ключ через API + success = extend_client_key(session, tg_id, client_id, email, new_expiry_time) + + if success: + await update_balance(tg_id, -100) # Списание 100 рублей с баланса + await db.execute('UPDATE connections SET expiry_time = ? WHERE client_id = ?', (new_expiry_time, client_id)) + await db.commit() + await callback_query.message.answer("Ваш ключ был успешно продлен на месяц.") + else: + await callback_query.message.answer("Ошибка при продлении ключа.") + else: + await callback_query.message.answer("У вас нет ключей для продления.") + + except Exception as e: + await callback_query.message.answer(f"Ошибка при продлении ключа: {e}") + + await callback_query.answer() \ No newline at end of file diff --git a/key_management.py b/key_management.py index 98ca6ba7..5efb7877 100644 --- a/key_management.py +++ b/key_management.py @@ -8,7 +8,8 @@ from auth import login_with_credentials, link from client import add_client from datetime import datetime, timedelta from config import API_TOKEN, ADMIN_PASSWORD, ADMIN_USERNAME, ADMIN_CHAT_ID, DATABASE_PATH -from database import add_connection, has_active_key, get_active_key_email, get_balance, store_key +from database import add_connection, has_active_key, get_active_key_email, get_balance, store_key, update_balance +from client import extend_client_key import uuid import aiosqlite import re @@ -16,6 +17,8 @@ from bot import dp from handlers.start import start_command from bot import bot from handlers.profile import process_callback_view_profile +import asyncio + router = Router() @@ -49,6 +52,7 @@ async def process_callback_create_key(callback_query: types.CallbackQuery, state @dp.message() async def handle_text(message: types.Message, state: FSMContext): current_state = await state.get_state() + print(f"Received message: {message.text}, Current state: {current_state}") if message.text == "Мой профиль": # Создайте фейковый объект CallbackQuery для вызова функции @@ -121,7 +125,15 @@ async def handle_admin_confirmation(callback_query: CallbackQuery, state: FSMCon limit_ip = 1 total_gb = 0 current_time = datetime.utcnow() - expiry_time = int((current_time + timedelta(days=30)).timestamp() * 1000) + + # Определяем время истечения ключа + if await has_active_key(tg_id): + # Если есть активный ключ, устанавливаем срок действия на 30 дней + expiry_time = int((current_time + timedelta(days=30)).timestamp() * 1000) + else: + # Первый ключ устанавливаем на 1 день + expiry_time = int((current_time + timedelta(days=1)).timestamp() * 1000) + enable = True flow = "xtls-rprx-vision" balance = 0 @@ -151,7 +163,6 @@ async def handle_admin_confirmation(callback_query: CallbackQuery, state: FSMCon await callback_query.answer() - @dp.callback_query(F.data == 'instructions') async def handle_instructions(callback_query: CallbackQuery): instructions_message = ( @@ -169,3 +180,28 @@ async def handle_instructions(callback_query: CallbackQuery): parse_mode='Markdown' ) await callback_query.answer() + +async def renew_expired_keys(): + while True: + current_time = datetime.utcnow() + async with aiosqlite.connect(DATABASE_PATH) as db: + async with db.execute('SELECT tg_id, client_id FROM connections WHERE expiry_time <= ?', (int(current_time.timestamp() * 1000),)) as cursor: + expired_keys = await cursor.fetchall() + + for tg_id, client_id in expired_keys: + balance = await get_balance(tg_id) + if balance >= 100: + new_expiry_time = int((current_time + timedelta(days=30)).timestamp() * 1000) + + async with aiosqlite.connect(DATABASE_PATH) as db: + await db.execute('UPDATE connections SET expiry_time = ? WHERE tg_id = ? AND client_id = ?', (new_expiry_time, tg_id, client_id)) + await db.commit() + + await update_balance(tg_id, -100) + await extend_client_key(client_id) + + print(f"Ключ для клиента {client_id} продлен на месяц и списано 100 рублей.") + else: + print(f"Недостаточно средств на балансе для клиента {client_id}.") + + await asyncio.sleep(3600) \ No newline at end of file diff --git a/path_to_your_database b/path_to_your_database new file mode 100644 index 00000000..e69de29b