PaiGramTeam/PaiGram
3
0
Fork 0
mirror of https://github.com/PaiGramTeam/PaiGram.git synced 2024-11-22 07:07:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

🎨 Improve Cookies Status Update Handler

Browse Source
This commit is contained in:
洛水居室 2023-09-10 02:08:11 +08:00
parent 8b4274482c
commit c6799187dd
No known key found for this signature in database
GPG Key ID: C9DE87DA724B88FC
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
plugins/tools/genshin.py
View File

@ -11,6 +11,7 @@ from simnet.errors import BadRequest as SimnetBadRequest, InvalidCookies, Networ
from simnet.models.genshin.calculator import CalculatorCharacterDetails from simnet.models.genshin.calculator import CalculatorCharacterDetails
from simnet.models.genshin.chronicle.characters import Character from simnet.models.genshin.chronicle.characters import Character
from sqlalchemy.exc import SQLAlchemyError from sqlalchemy.exc import SQLAlchemyError
from sqlalchemy.orm.exc import StaleDataError
from sqlmodel import BigInteger, Column, DateTime, Field, Index, Integer, SQLModel, String, delete, func, select from sqlmodel import BigInteger, Column, DateTime, Field, Index, Integer, SQLModel, String, delete, func, select
from telegram.ext import ContextTypes from telegram.ext import ContextTypes
@ -252,6 +253,8 @@ class GenshinHelper(Plugin):
try: try:
yield client yield client
except InvalidCookies as exc: except InvalidCookies as exc:
refresh = False
cookie_model.status = CookiesStatusEnum.INVALID_COOKIES
stoken = client.cookies.get("stoken") stoken = client.cookies.get("stoken")
if stoken is not None: if stoken is not None:
try: try:
@ -262,17 +265,31 @@ class GenshinHelper(Plugin):
logger.success("用户 %s 刷新 ltoken 成功", user_id) logger.success("用户 %s 刷新 ltoken 成功", user_id)
cookie_model.data = new_cookies cookie_model.data = new_cookies
cookie_model.status = CookiesStatusEnum.STATUS_SUCCESS cookie_model.status = CookiesStatusEnum.STATUS_SUCCESS
await self.cookies_service.update(cookie_model) except InvalidCookies:
logger.info("用户 user_id[%s] Cookies 已经过期", cookie_model.user_id)
except SimnetBadRequest as _exc: except SimnetBadRequest as _exc:
logger.warning( logger.warning(
"用户 %s 刷新 token 失败 [%s]%s", user_id, _exc.ret_code, _exc.original or _exc.message "用户 %s 刷新 token 失败 [%s]%s", user_id, _exc.ret_code, _exc.original or _exc.message
) )
cookie_model.status = CookiesStatusEnum.STATUS_SUCCESS
except NetworkError: except NetworkError:
logger.warning("用户 %s 刷新 Cookies 失败 网络错误", user_id) logger.warning("用户 %s 刷新 Cookies 失败 网络错误", user_id)
cookie_model.status = CookiesStatusEnum.STATUS_SUCCESS
except Exception as _exc: except Exception as _exc:
logger.error("用户 %s 刷新 Cookies 失败", user_id, exc_info=_exc) logger.error("用户 %s 刷新 Cookies 失败", user_id, exc_info=_exc)
else: else:
raise CookieException(message="The cookie has been refreshed.") from exc refresh = True
try:
await self.cookies_service.update(cookie_model)
except StaleDataError as _exc:
if "UPDATE" in str(_exc):
logger.warning("用户 user_id[%s] 刷新 Cookies 失败，数据不存在", cookie_model.user_id)
else:
logger.error("用户 user_id[%s] 更新 Cookies 时出现错误", cookie_model.user_id, exc_info=_exc)
except Exception as _exc:
logger.error("用户 user_id[%s] 更新 Cookies 失败", cookie_model.user_id, exc_info=_exc)
if refresh:
raise CookieException(message="The cookie has been refreshed.") from exc
raise exc raise exc
async def get_genshin_client(self, user_id: int, region: Optional[RegionEnum] = None) -> GenshinClient: async def get_genshin_client(self, user_id: int, region: Optional[RegionEnum] = None) -> GenshinClient: