Xefir/PyNyaaTa
Archived
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Use flaresolverr v3
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Michel Roux 2023-01-05 15:19:04 +01:00
parent da4aaff8d4
commit 125d0bde2d
1 changed files with 23 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
pynyaata/flarerequests.py
View File

@ -1,6 +1,6 @@
from io import BytesIO
from urllib import parse
from requests import RequestException, Response, Session, post
from requests import Response, Session, post
from .config import CLOUDPROXY_ENDPOINT
@ -9,33 +9,18 @@ class FlareRequests(Session):
if not CLOUDPROXY_ENDPOINT:
return super().request(method, url, params, data, **kwargs)
sessions = post(CLOUDPROXY_ENDPOINT, json={"cmd": "sessions.list"}).json()
if "sessions" in sessions and len(sessions["sessions"]) > 0:
FLARESESSION = sessions["sessions"][0]
else:
response = post(CLOUDPROXY_ENDPOINT, json={"cmd": "sessions.create"})
session = response.json()
if "session" in session:
FLARESESSION = session["session"]
else:
raise RequestException(response)
if params:
url += "&" if len(url.split("?")) > 1 else "?"
url = f"{url}{parse.urlencode(params)}"
post_data = {
"cmd": f"request.{method.lower()}",
"session": FLARESESSION,
"url": url,
}
if data:
post_data["postData"] = parse.urlencode(data)
try:
response = post(
CLOUDPROXY_ENDPOINT,
json=post_data,
@ -44,10 +29,9 @@ class FlareRequests(Session):
solution = response.json()
if "solution" in solution:
if "content-type" in solution["solution"]["headers"]:
content_type = solution["solution"]["headers"][
"content-type"
].split(";")
headers = solution["solution"]["headers"]
if "content-type" in headers:
content_type = headers["content-type"].split(";")
if len(content_type) > 1:
charset = content_type[1].split("=")
if len(charset) > 1:
@ -56,7 +40,7 @@ class FlareRequests(Session):
resolved = Response()
resolved.status_code = solution["solution"]["status"]
resolved.headers = solution["solution"]["headers"]
resolved.headers = headers
resolved.raw = BytesIO(solution["solution"]["response"].encode())
resolved.url = url
resolved.encoding = encoding or None
@ -64,12 +48,3 @@ class FlareRequests(Session):
resolved.cookies = solution["solution"]["cookies"]
return resolved
raise RequestException(response)
except RequestException:
session = post(
CLOUDPROXY_ENDPOINT,
json={"cmd": "sessions.destroy", "session": FLARESESSION},
)
raise RequestException(solution)