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

Remove FlareSolverr session management
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Michel Roux 2022-12-21 17:12:18 +00:00
parent 068aebdaaf
commit 8dc0b49e18
1 changed files with 20 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
pynyaata/flarerequests.py
View File

@ -8,49 +8,27 @@ class FlareRequests(Session):
if not CLOUDPROXY_ENDPOINT:
return super().request(method, url, params, timeout=timeout, **kwargs)
sessions = post(CLOUDPROXY_ENDPOINT, json={"cmd": "sessions.list"}).json()
response = post(
CLOUDPROXY_ENDPOINT,
json={
"cmd": f"request.{method.lower()}",
"url": url,
"postData": parse.urlencode(params) if params else "",
"maxTimeout": timeout * 1000,
},
)
solution = response.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 "solution" in solution:
resolved = Response()
if "session" in session:
FLARESESSION = session["session"]
else:
raise RequestException(response)
resolved.raw = solution["solution"]["response"]
resolved.status_code = solution["solution"]["status"]
resolved.headers = solution["solution"]["headers"]
resolved.url = url
resolved.reason = solution["status"]
resolved.cookies = solution["solution"]["cookies"]
try:
response = post(
CLOUDPROXY_ENDPOINT,
json={
"cmd": f"request.{method.lower()}",
"session": FLARESESSION,
"url": url,
"postData": parse.urlencode(params) if params else "",
"maxTimeout": timeout * 1000,
},
)
solution = response.json()
return resolved
if "solution" in solution:
resolved = Response()
resolved.raw = solution["solution"]["response"]
resolved.status_code = solution["solution"]["status"]
resolved.headers = solution["solution"]["headers"]
resolved.url = url
resolved.reason = solution["status"]
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)
raise RequestException(response)