PaiGramTeam/PamGram
3
0
Fork 0
mirror of https://github.com/PaiGramTeam/PamGram.git synced 2024-11-16 12:02:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

🎨 Update hex_digest for requests

Browse Source
This commit is contained in:
洛水居室 2022-11-14 15:35:09 +08:00
parent e96da60d0c
commit cbf23737cd
No known key found for this signature in database
GPG Key ID: C9DE87DA724B88FC
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/apihelper/helpers.py
View File

@ -18,11 +18,11 @@ RECOGNIZE_SERVER = {
} }
def get_device_id(name: str = None): def get_device_id(name: str = ""):
return str(uuid.uuid3(uuid.NAMESPACE_URL, name)) return str(uuid.uuid3(uuid.NAMESPACE_URL, name))
def _hexdigest(text): def hex_digest(text):
_md5 = hashlib.md5() # nosec B303 _md5 = hashlib.md5() # nosec B303
_md5.update(text.encode()) _md5.update(text.encode())
return _md5.hexdigest() return _md5.hexdigest()
@ -43,13 +43,13 @@ def get_ds(ds_type: str = None, new_ds: bool = False, data: Mapping[str, str] =
r = str(random.randint(100001, 200000)) # nosec r = str(random.randint(100001, 200000)) # nosec
b = json.dumps(data) if data else '' b = json.dumps(data) if data else ''
q = urlencode(params) if params else '' q = urlencode(params) if params else ''
c = _hexdigest(f'salt={salt}&t={t}&r={r}&b={b}&q={q}') c = hex_digest(f'salt={salt}&t={t}&r={r}&b={b}&q={q}')
return f'{t},{r},{c}' return f'{t},{r},{c}'
def old(): def old():
t = str(int(time.time())) t = str(int(time.time()))
r = ''.join(random.sample(string.ascii_lowercase + string.digits, 6)) r = ''.join(random.sample(string.ascii_lowercase + string.digits, 6))
c = _hexdigest(f'salt={salt}&t={t}&r={r}') c = hex_digest(f'salt={salt}&t={t}&r={r}')
return f'{t},{r},{c}' return f'{t},{r},{c}'
app_version = '2.36.1' app_version = '2.36.1'

10
utils/patch/genshin.py
View File

@ -7,9 +7,10 @@ from genshin import constants, types
from genshin.client import routes from genshin.client import routes
from genshin.utility import ds from genshin.utility import ds
from modules.apihelper.helpers import get_ds, get_ua, get_device_id from modules.apihelper.helpers import get_ds, get_ua, get_device_id, hex_digest
from utils.patch.methods import patch, patchable from utils.patch.methods import patch, patchable
DEVICE_ID = get_device_id()
@patch(genshin.client.components.calculator.CalculatorClient) # noqa @patch(genshin.client.components.calculator.CalculatorClient) # noqa
class CalculatorClient: class CalculatorClient:
@ -79,8 +80,13 @@ class BaseClient:
"ds": ds.generate_dynamic_secret(), "ds": ds.generate_dynamic_secret(),
} }
elif region == types.Region.CHINESE: elif region == types.Region.CHINESE:
uid = self.cookie_manager.get_user_id()
if uid:
device_id = hex_digest(str(uid))
else:
device_id = DEVICE_ID
_app_version, _client_type, _ds = get_ds(new_ds=True, data=data, params=params) _app_version, _client_type, _ds = get_ds(new_ds=True, data=data, params=params)
ua = get_ua(version=_app_version) ua = get_ua(device="Paimon Build " + device_id[0:5], version=_app_version)
headers = { headers = {
"User-Agent": ua, "User-Agent": ua,
"X_Requested_With": "com.mihoyo.hoyolab", "X_Requested_With": "com.mihoyo.hoyolab",