diff --git a/main.py b/main.py index 676336d..7a20e34 100644 --- a/main.py +++ b/main.py @@ -6,6 +6,17 @@ import sentry_sdk import random import time import yaml +import logging + + +# 设置日志配置 +logging.basicConfig( + level=logging.INFO, # 日志级别设置为INFO，记录INFO级别以上的日志 + format="%(asctime)s [%(levelname)s]: %(message)s", # 设置日志的输出格式 + datefmt="%Y-%m-%d %H:%M:%S", # 设置时间格式 +) + +logger = logging.getLogger() # 获取日志记录器 def ReadConf(variable_name, default_value=None): @@ -27,18 +38,15 @@ def ReadConf(variable_name, default_value=None): sentry_sdk.init( "https://425d7b4536f94c9fa540fe34dd6609a2@o361988.ingest.sentry.io/6352584", - # Set traces_sample_rate to 1.0 to capture 100% - # of transactions for performance monitoring. - # We recommend adjusting this value in production. traces_sample_rate=1.0, ) conf = ReadConf("MHYY_CONFIG")["accounts"] if not conf: - print("请正确配置环境变量或者config.yml后再运行本脚本！") + logger.error("请正确配置环境变量或者config.yml后再运行本脚本！") os._exit(0) -print(f"检测到 {len(conf)} 个账号，正在进行任务……") +logger.info(f"检测到 {len(conf)} 个账号，正在进行任务……") # Options @@ -56,9 +64,8 @@ class RunError(Exception): if __name__ == "__main__": # if not os.environ.get("MHYY_DEBUG", False): # wait_time = random.randint(1, 3600) # Random Sleep to Avoid Ban - # print(f"为了避免同一时间签到人数太多导致被官方怀疑，开始休眠 {wait_time} 秒") + # logger.info(f"为了避免同一时间签到人数太多导致被官方怀疑，开始休眠 {wait_time} 秒") # time.sleep(wait_time) - try: ver_info = httpx.get( "https://hyp-api.mihoyo.com/hyp/hyp-connect/api/getGameBranches?game_ids[]=1Z8W5NHUQb&launcher_id=jGHBHlcOq1", @@ -66,9 +73,10 @@ if __name__ == "__main__": verify=False, ).text version = json.loads(ver_info)["data"]["game_branches"][0]["main"]["tag"] - print(f"从官方API获取到云·原神最新版本号：{version}") + logger.info(f"从官方API获取到云·原神最新版本号：{version}") except Exception as e: version = "5.0.0" + logger.warning(f"获取版本号失败，使用默认版本：{version}") for config in conf: # 各种API的URL @@ -95,16 +103,14 @@ if __name__ == "__main__": "x-rpc-combo_token": token, "x-rpc-client_type": str(client_type), "x-rpc-app_version": str(version), - "x-rpc-sys_version": str( - sysver - ), # Previous version need to convert the type of this var + "x-rpc-sys_version": str(sysver), "x-rpc-channel": "cyydmihoyo", "x-rpc-device_id": deviceid, "x-rpc-device_name": devicename, "x-rpc-device_model": devicemodel, - "x-rpc-vendor_id": "1", # 2023/8/31更新，不知道作用 - "x-rpc-cg_game_biz": "hk4e_cn", # 游戏频道，国服就是这个 - "x-rpc-op_biz": "clgm_cn", # 2023/8/31更新，不知道作用 + "x-rpc-vendor_id": "1", + "x-rpc-cg_game_biz": "hk4e_cn", + "x-rpc-op_biz": "clgm_cn", "x-rpc-language": "zh-cn", "Host": "api-cloudgame.mihoyo.com", "Connection": "Keep-Alive", @@ -114,7 +120,6 @@ if __name__ == "__main__": bbsid = re.findall(r"oi=[0-9]+", token)[0].replace("oi=", "") region = config.get("region", "cn") if region == "os": - # 国际服处理 headers["x-rpc-channel"] = "mihoyo" headers["x-rpc-cg_game_biz"] = "hk4e_global" headers["x-rpc-op_biz"] = "clgm_global" @@ -122,99 +127,88 @@ if __name__ == "__main__": headers["x-rpc-app_id"] = "600493" headers["User-Agent"] = "okhttp/4.10.0" headers["Host"] = "sg-cg-api.hoyoverse.com" - # 国际服URL NotificationURL = "https://sg-cg-api.hoyoverse.com/hk4e_global/cg/gamer/api/listNotifications?status=NotificationStatusUnread&type=NotificationTypePopup&is_sort=true" WalletURL = ( "https://sg-cg-api.hoyoverse.com/hk4e_global/cg/wallet/wallet/get" ) AnnouncementURL = "https://sg-cg-api.hoyoverse.com/hk4e_global/cg/gamer/api/getAnnouncementInfo" - print( - f"正在进行第 {conf.index(config) +1 } 个账号，服务器为{'CN' if region != 'os' else 'GLOBAL'}……" + logger.info( + f"正在进行第 {conf.index(config) + 1} 个账号，服务器为{'CN' if region != 'os' else 'GLOBAL'}……" ) - - wallet = httpx.get(WalletURL, headers=headers, timeout=60, verify=False) - print(wallet.text) - if json.loads(wallet.text) == { - "data": None, - "message": "登录已失效，请重新登录", - "retcode": -100, - }: - print(f"当前登录已过期，请重新登陆！返回为：{wallet.text}") - sct_msg += f"当前登录已过期，请重新登陆！返回为：{wallet.text}" - else: - print( - f"你当前拥有免费时长 {json.loads(wallet.text)['data']['free_time']['free_time']} 分钟，畅玩卡状态为 {json.loads(wallet.text)['data']['play_card']['short_msg']}，拥有原点 {json.loads(wallet.text)['data']['coin']['coin_num']} 点（{int(json.loads(wallet.text)['data']['coin']['coin_num'])/10}分钟）" - ) - sct_msg += f"你当前拥有免费时长 {json.loads(wallet.text)['data']['free_time']['free_time']} 分钟，畅玩卡状态为 {json.loads(wallet.text)['data']['play_card']['short_msg']}，拥有原点 {json.loads(wallet.text)['data']['coin']['coin_num']} 点（{int(json.loads(wallet.text)['data']['coin']['coin_num'])/10}分钟）" - announcement = httpx.get( - AnnouncementURL, headers=headers, timeout=60, verify=False - ) - print(f'获取到公告列表：{json.loads(announcement.text)["data"]}') - res = httpx.get(NotificationURL, headers=headers, timeout=60, verify=False) - success, Signed = False, False - print(res.text) - try: - if list(json.loads(res.text)["data"]["list"]) == []: - success = True - Signed = True - Over = False - elif json.loads(json.loads(res.text)["data"]["list"][0]["msg"]) == { - "num": 15, - "over_num": 0, - "type": 2, - "msg": "每日登录奖励", - "func_type": 1, - }: - success = True - Signed = False - Over = False - elif ( - json.loads(json.loads(res.text)["data"]["list"][0]["msg"])[ - "over_num" - ] - > 0 - ): - success = True - Signed = False - Over = True - else: - success = False - except IndexError: - success = False - if success: - if Signed: - print(f"获取签到情况成功！今天是否已经签到过了呢？") - sct_msg += f"获取签到情况成功！今天是否已经签到过了呢？" - print(f"完整返回体为：{res.text}") - elif not Signed and Over: - print( - f'获取签到情况成功！当前免费时长已经达到上限！签到情况为{json.loads(res.text)["data"]["list"][0]["msg"]}' - ) - sct_msg += f'获取签到情况成功！当前免费时长已经达到上限！签到情况为{json.loads(res.text)["data"]["list"][0]["msg"]}' - print(f"完整返回体为：{res.text}") - else: - print( - f'获取签到情况成功！当前签到情况为{json.loads(res.text)["data"]["list"][0]["msg"]}' - ) - sct_msg += f'获取签到情况成功！当前签到情况为{json.loads(res.text)["data"]["list"][0]["msg"]}' - print(f"完整返回体为：{res.text}") + try: + wallet = httpx.get(WalletURL, headers=headers, timeout=60, verify=False) + logger.debug(wallet.text) + if json.loads(wallet.text) == { + "data": None, + "message": "登录已失效，请重新登录", + "retcode": -100, + }: + logger.error(f"当前登录已过期，请重新登陆！返回为：{wallet.text}") + sct_msg += f"当前登录已过期，请重新登陆！返回为：{wallet.text}" else: - raise RunError( - f"签到失败！请带着本次运行的所有log内容到 https://github.com/GamerNoTitle/MHYY/issues 发起issue解决（或者自行解决）。签到出错，返回信息如下：{res.text}" + logger.info( + f"你当前拥有免费时长 {json.loads(wallet.text)['data']['free_time']['free_time']} 分钟，畅玩卡状态为 {json.loads(wallet.text)['data']['play_card']['short_msg']}，拥有原点 {json.loads(wallet.text)['data']['coin']['coin_num']} 点（{int(json.loads(wallet.text)['data']['coin']['coin_num'])/10}分钟）" ) - if sct_status: - res = httpx.post( - sct_url, - json={ - "title": "", - "short": "MHYY-AutoCheckin 签到情况报告", - "desp": sct_msg, - }, - timeout=30, - ) - if res.status_code == 200: - print("sct推送完成！") - else: - print("sct无法推送") - print(res.text) + sct_msg += f"你当前拥有免费时长 {json.loads(wallet.text)['data']['free_time']['free_time']} 分钟，畅玩卡状态为 {json.loads(wallet.text)['data']['play_card']['short_msg']}，拥有原点 {json.loads(wallet.text)['data']['coin']['coin_num']} 点（{int(json.loads(wallet.text)['data']['coin']['coin_num'])/10}分钟）" + announcement = httpx.get( + AnnouncementURL, headers=headers, timeout=60, verify=False + ) + logger.debug(f'获取到公告列表：{json.loads(announcement.text)["data"]}') + res = httpx.get( + NotificationURL, headers=headers, timeout=60, verify=False + ) + success, Signed = False, False + logger.debug(res.text) + try: + if list(json.loads(res.text)["data"]["list"]) == []: + success = True + Signed = True + Over = False + elif ( + json.loads( + json.loads(res.text)["data"]["list"][-1]["msg"]["msg"] + ) + == "每日登录奖励" + ): + success = True + Signed = False + Over = False + elif ( + json.loads(json.loads(res.text)["data"]["list"][-1]["msg"])[ + "over_num" + ] + > 0 + ): + success = True + Signed = False + Over = True + else: + success = False + except IndexError: + success = False + if success: + if Signed: + logger.info(f"获取签到情况成功！今天是否已经签到过了呢？") + sct_msg += f"获取签到情况成功！今天是否已经签到过了呢？" + logger.debug(f"完整返回体为：{res.text}") + elif not Signed and Over: + logger.info( + f'获取签到情况成功！当前免费时长已经达到上限！签到情况为{json.loads(res.text)["data"]["list"][0]["msg"]}' + ) + sct_msg += f"获取签到情况成功！当前免费时长已经达到上限！签到情况为{json.loads(res.text)['data']['list'][0]['msg']}" + else: + logger.info(f"已经签到过了！") + sct_msg += f"已经签到过了！" + else: + logger.info(f"当前没有签到！请稍后再试！") + sct_msg += f"当前没有签到！请稍后再试！" + if sct_key: + httpx.get(sct_url, params={"desp": sct_msg}) + time.sleep(random.randint(10, 20)) + except Exception as e: + logger.error(f"执行过程中出错：{str(e)}") + sct_msg += f"执行过程中出错：{str(e)}" + if sct_key: + httpx.get(sct_url, params={"desp": sct_msg}) + logger.info("所有任务已经执行完毕！")