This commit is contained in:
baiqwerdvd 2024-12-09 13:52:25 +08:00
parent 89bd33fe63
commit 446dd3cef7
No known key found for this signature in database
GPG Key ID: 7717E46E1797411A

View File

@ -24,7 +24,12 @@ from .api import ARK_PLAYER_INFO, ARK_REFRESH_TOKEN, ARK_SKD_SIGN, ARK_WEB_USER
proxy_url = core_plugins_config.get_config("proxy").data
ssl_verify = core_plugins_config.get_config("MhySSLVerify").data
dId = get_d_id()
# dId = get_d_id()
# async def get_header():
# header = deepcopy(_HEADER)
# header["dId"] = await get_d_id()
# return header
_HEADER: Dict[str, str] = {
"User-Agent": "Skland/1.5.1 (com.hypergryph.skland; build:100501001; Android 33; ) Okhttp/4.11.0",
@ -35,7 +40,7 @@ _HEADER: Dict[str, str] = {
"Content-Type": "application/json",
"manufacturer": "Xiaomi",
"os": "33",
"dId": dId, # "de9759a5afaa634f",
# "dId": dId, # "de9759a5afaa634f",
}
@ -124,6 +129,7 @@ class BaseArkApi:
# return -61
headers = deepcopy(_HEADER)
headers["cred"] = cred
headers["dId"] = await get_d_id()
header = get_sign_header(token, ARK_PLAYER_INFO, "get", None, headers)
raw_data = await self.ark_request(
url=ARK_PLAYER_INFO,
@ -159,6 +165,7 @@ class BaseArkApi:
# return -61
headers = deepcopy(_HEADER)
headers["cred"] = cred
headers["dId"] = await get_d_id()
data = {"uid": uid, "gameId": 1}
# header = get_sign_header(token, ARK_SKD_SIGN, "post", data, headers)
async with ClientSession(
@ -194,6 +201,7 @@ class BaseArkApi:
return -60
headers = deepcopy(_HEADER)
headers["cred"] = cred
headers["dId"] = await get_d_id()
header = get_sign_header(token, ARK_SKD_SIGN, "get", None, headers)
raw_data = await self.ark_request(
url=ARK_SKD_SIGN,
@ -254,6 +262,7 @@ class BaseArkApi:
header = deepcopy(_HEADER)
header["cred"] = cred
header["sign_enable"] = "false"
header["dId"] = await get_d_id()
raw_data = await self.ark_request(url=ARK_REFRESH_TOKEN, header=header)
if isinstance(raw_data, int) or not raw_data:
raise TokenRefreshFailed
@ -291,6 +300,7 @@ class BaseArkApi:
await self.refresh_token(header["cred"])
headers = deepcopy(header)
headers["cred"] = header["cred"]
headers["dId"] = await get_d_id()
headers = get_sign_header(headers["cred"], url, method, data, headers)
raw_data = await self._ark_request(
url=url,