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

Update FlareRequest

Browse Source
This commit is contained in:
Michel Roux 2022-12-24 14:23:54 +00:00
parent 933b016917
commit 561a0754d8
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pynyaata/session.py
View File

@ -9,9 +9,9 @@ CLOUDPROXY_ENDPOINT = getenv("CLOUDPROXY_ENDPOINT")
class FlareRequests(Session): class FlareRequests(Session):
def request(self, method, url, params=None, **kwargs): def request(self, method, url, params=None, data=None, **kwargs):
if not CLOUDPROXY_ENDPOINT: if not CLOUDPROXY_ENDPOINT:
return super().request(method, url, params, **kwargs) return super().request(method, url, params, data, **kwargs)
sessions = post(CLOUDPROXY_ENDPOINT, json={"cmd": "sessions.list"}).json() sessions = post(CLOUDPROXY_ENDPOINT, json={"cmd": "sessions.list"}).json()
@ -26,14 +26,18 @@ class FlareRequests(Session):
else: else:
raise RequestException(response) raise RequestException(response)
if params:
url += "&" if len(url.split("?")) > 1 else "?"
url = f"{url}{parse.urlencode(params)}"
post_data = { post_data = {
"cmd": f"request.{method}", "cmd": f"request.{method.lower()}",
"session": FLARESESSION, "session": FLARESESSION,
"url": url, "url": url,
} }
if params: if data:
post_data["postData"] = parse.urlencode(params) post_data["postData"] = parse.urlencode(data)
try: try:
response = post( response = post(
@ -44,12 +48,22 @@ class FlareRequests(Session):
solution = response.json() solution = response.json()
if "solution" in solution: if "solution" in solution:
if "content-type" in solution["solution"]["headers"]:
content_type = solution["solution"]["headers"][
"content-type"
].split(";")
if len(content_type) > 1:
charset = content_type[1].split("=")
if len(charset) > 1:
encoding = charset[1]
resolved = Response() resolved = Response()
resolved.raw = BytesIO(solution["solution"]["response"].encode())
resolved.status_code = solution["solution"]["status"] resolved.status_code = solution["solution"]["status"]
resolved.headers = solution["solution"]["headers"] resolved.headers = solution["solution"]["headers"]
resolved.raw = BytesIO(solution["solution"]["response"].encode())
resolved.url = url resolved.url = url
resolved.encoding = encoding or None
resolved.reason = solution["status"] resolved.reason = solution["status"]
resolved.cookies = solution["solution"]["cookies"] resolved.cookies = solution["solution"]["cookies"]