WindyMadman/mirror-leech-telegram-bot
1
0
Fork 0
mirror of https://github.com/anasty17/mirror-leech-telegram-bot.git synced 2025-01-09 04:47:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use one session for all jdownloader requests

Browse Source
This commit is contained in:
anasty17 2024-05-29 02:12:35 +03:00
parent db8b0fca0f
commit b32d7e54db
5 changed files with 96 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bot/__init__.py
View File

@ -251,7 +251,7 @@ USENET_SERVERS = environ.get("USENET_SERVERS", "")
try:
if len(USENET_SERVERS) == 0:
USENET_SERVERS = []
elif not eval(USENET_SERVERS)[0]["host"]:
elif (us := eval(USENET_SERVERS)) and not us[0].get("host"):
USENET_SERVERS = []
else:
USENET_SERVERS = eval(USENET_SERVERS)

2
bot/helper/listeners/qbit_listener.py
View File

@ -99,6 +99,8 @@ async def _onDownloadComplete(tor):
if removed:
await _remove_torrent(task.client, ext_hash, tag)
return
else:
await sync_to_async(task.client.auth_log_out)
async with qb_listener_lock:
if tag in QbTorrents:
QbTorrents[tag]["seeding"] = True

2
bot/modules/bot_settings.py
View File

@ -1011,7 +1011,7 @@ async def load_config():
try:
if len(USENET_SERVERS) == 0:
USENET_SERVERS = []
elif not eval(USENET_SERVERS)[0]["host"]:
elif (us := eval(USENET_SERVERS)) and not us[0].get("host"):
USENET_SERVERS = []
else:
USENET_SERVERS = eval(USENET_SERVERS)

155
myjd/myjdapi.py
View File

@ -5,8 +5,10 @@ from hashlib import sha256
from hmac import new
from json import dumps, loads, JSONDecodeError
from httpx import AsyncClient, RequestError
from httpx import AsyncHTTPTransport
from time import time
from urllib.parse import quote
from functools import wraps
from .exception import (
MYJDApiException,
@ -811,12 +813,21 @@ class Jddevice:
return f"/t_{self.myjd.get_session_token()}_{self.device_id}"
class clientSession(AsyncClient):
@wraps(AsyncClient.request)
async def request(self, method: str, url: str, **kwargs):
kwargs.setdefault("timeout", 1.5)
kwargs.setdefault("follow_redirects", True)
return await super().request(method, url, **kwargs)
class Myjdapi:
def __init__(self):
self.__request_id = int(time() * 1000)
self.__api_url = "https://api.jdownloader.org"
self.__app_key = "http://git.io/vmcsk"
self.__app_key = "mltb"
self.__api_version = 1
self.__devices = None
self.__login_secret = None
@ -826,6 +837,19 @@ class Myjdapi:
self.__server_encryption_token = None
self.__device_encryption_token = None
self.__connected = False
self._http_session = None
def _session(self):
if self._http_session is not None:
return self._http_session
transport = AsyncHTTPTransport(retries=10, verify=False)
self._http_session = clientSession(transport=transport)
self._http_session.verify = False
return self._http_session
def get_session_token(self):
return self.__session_token
@ -971,6 +995,9 @@ class Myjdapi:
"/my/disconnect", "GET", [("sessiontoken", self.__session_token)]
)
self.__clean_resources()
if self._http_session is not None:
self._http_session = None
await self._http_session.aclose()
return response
def __clean_resources(self):
@ -1041,77 +1068,75 @@ class Myjdapi:
action=True
This would make a request to "https://api.jdownloader.org"
"""
session = self._session()
if not api:
api = self.__api_url
data = None
if not self.is_connected() and path != "/my/connect":
raise (MYJDConnectionException("No connection established\n"))
async with AsyncClient(verify=False) as client:
if http_method == "GET":
query = [f"{path}?"]
if params is not None:
for param in params:
if param[0] != "encryptedLoginSecret":
query += [f"{param[0]}={quote(param[1])}"]
else:
query += [f"&{param[0]}={param[1]}"]
query += [f"rid={str(self.__request_id)}"]
if self.__server_encryption_token is None:
query += [
"signature="
+ str(
self.__signature_create(
self.__login_secret, query[0] + "&".join(query[1:])
)
if http_method == "GET":
query = [f"{path}?"]
if params is not None:
for param in params:
if param[0] != "encryptedLoginSecret":
query += [f"{param[0]}={quote(param[1])}"]
else:
query += [f"&{param[0]}={param[1]}"]
query += [f"rid={str(self.__request_id)}"]
if self.__server_encryption_token is None:
query += [
"signature="
+ str(
self.__signature_create(
self.__login_secret, query[0] + "&".join(query[1:])
)
]
else:
query += [
"signature="
+ str(
self.__signature_create(
self.__server_encryption_token,
query[0] + "&".join(query[1:]),
)
)
]
query = query[0] + "&".join(query[1:])
res = await client.get(api + query, timeout=2)
encrypted_response = res.text
else:
params_request = []
if params is not None:
for param in params:
if isinstance(param, (str, list)):
params_request += [param]
elif isinstance(param, (dict, bool)):
params_request += [dumps(param)]
else:
params_request += [str(param)]
params_request = {
"apiVer": self.__api_version,
"url": path,
"params": params_request,
"rid": self.__request_id,
}
data = dumps(params_request)
# Removing quotes around null elements.
data = data.replace('"null"', "null")
data = data.replace("'null'", "null")
encrypted_data = self.__encrypt(self.__device_encryption_token, data)
request_url = api + action + path if action is not None else api + path
try:
res = await client.post(
request_url,
headers={
"Content-Type": "application/aesjson-jd; charset=utf-8"
},
content=encrypted_data,
timeout=2,
)
encrypted_response = res.text
except RequestError:
return None
]
else:
query += [
"signature="
+ str(
self.__signature_create(
self.__server_encryption_token,
query[0] + "&".join(query[1:]),
)
)
]
query = query[0] + "&".join(query[1:])
res = await session.request(http_method, api + query)
encrypted_response = res.text
else:
params_request = []
if params is not None:
for param in params:
if isinstance(param, (str, list)):
params_request += [param]
elif isinstance(param, (dict, bool)):
params_request += [dumps(param)]
else:
params_request += [str(param)]
params_request = {
"apiVer": self.__api_version,
"url": path,
"params": params_request,
"rid": self.__request_id,
}
data = dumps(params_request)
# Removing quotes around null elements.
data = data.replace('"null"', "null")
data = data.replace("'null'", "null")
encrypted_data = self.__encrypt(self.__device_encryption_token, data)
request_url = api + action + path if action is not None else api + path
try:
res = await session.request(
http_method,
request_url,
headers={"Content-Type": "application/aesjson-jd; charset=utf-8"},
content=encrypted_data,
)
encrypted_response = res.text
except RequestError:
return None
if res.status_code != 200:
try:
error_msg = loads(encrypted_response)

8
sabnzbdapi/requests.py
View File

@ -1,4 +1,4 @@
from httpx import AsyncClient, Response, DecodingError
from httpx import AsyncClient, DecodingError
from httpx import AsyncHTTPTransport
from urllib3 import disable_warnings
from urllib3.exceptions import InsecureRequestWarning
@ -10,13 +10,9 @@ from .exception import APIConnectionError
class sabnzbdSession(AsyncClient):
@wraps(AsyncClient.request)
async def request(self, method: str, url: str, **kwargs) -> Response:
async def request(self, method: str, url: str, **kwargs):
kwargs.setdefault("timeout", 15.1)
kwargs.setdefault("follow_redirects", True)
data = kwargs.get("data") or {}
is_data = any(x is not None for x in data.values())
if method.lower() == "post" and not is_data:
kwargs.setdefault("headers", {}).update({"Content-Length": "0"})
return await super().request(method, url, **kwargs)