try to adapt the main script to scf one #33

scf.py

@@ -6,65 +6,76 @@ import sentry_sdk
 import random
 import time
 import yaml
+import logging
 
-
-config_datas = """
-# 使用前请阅读文档：https://bili33.top/posts/MHYY-AutoCheckin-Manual-Gen2/
-# 有问题请前往Github开启issue：https://github.com/GamerNoTitle/MHYY/issues
-
-######## 以下为账号配置项，可以多账号，详情请参考文档 ########
-accounts:
-  # 第一个账号
-  - token: 
-    # 关于type：如果你在安卓版的云·原神里面抓的话type应该是2
-    # 如果你是网页版抓的，那type应该是16
-    # 此处仅供参考，具体以你抓的为准 
-    type: 
-    # sysver：如果你是安卓版抓的，这个应该会显示你的安卓版本（鸿蒙不清楚，手上没设备）
-    # 如果你是网页版抓的，这个应该是你的系统版本（注：Windows 10和Windows 11都是写的Windows 10）
-    sysver: 
-    # deviceid：手机抓的会有这个，抓到什么填什么
-    # 如果是网页版抓的，那也是抓到什么填什么
-    deviceid: 
-    # devicename: 手机抓的话就是手机的入网型号，如红米K40为M2012K11AC，红米K50为22021211RC
-    # 如果是网页版抓的，填Unknown
-    devicename: 
-    # devicemodel: 手机抓的填抓出来的手机型号，大概为手机厂商+上面的deviceid，如红米K40为Xiaomi M2012K11AC
-    # 如果是网页版抓的，填Unknown
-    devicemodel: 
-    # appid: 国服手机抓的固定填1953439974，网页版抓的留空；国际服手机抓的填600493
-    appid: 
-    # region(可选): 账号所处的地区，国服填cn，国际服填os，不填或非法值按国服处理
-    region: cn
-"""
-
+# 配置 Sentry
 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,
 )
 
+# 配置日志级别
+loglevel_env = os.environ.get("MHYY_LOGLEVEL", "INFO").upper()
+loglevel = getattr(logging, loglevel_env, logging.INFO)
+
+# 配置日志
+logging.basicConfig(
+    level=loglevel,
+    format="%(asctime)s [%(levelname)s]: %(message)s",
+    datefmt="%Y-%m-%d %H:%M:%S",
+)
+
+logger = logging.getLogger()
+
+# 配置数据写入脚本
+config_datas = """
+accounts:
+  - token: your_token_here
+    type: 2
+    sysver: your_sysver
+    deviceid: your_deviceid
+    devicename: your_devicename
+    devicemodel: your_devicemodel
+    appid: 1953439974
+    region: cn
+"""
+
 class RunError(Exception):
     pass
 
-
 def handler(*args):
-    # Options
+    """
+    云函数入口函数。
+    """
+    # 读取配置
+    conf_data = yaml.load(config_datas, Loader=yaml.FullLoader)
+    if not conf_data or "accounts" not in conf_data:
+        logger.error("请正确配置账户信息后再运行本脚本！")
+        return {"statusCode": 1, "message": "配置错误，请检查账户信息。"}
+
+    conf = conf_data["accounts"]
+    if not conf:
+        logger.error("账户配置为空！")
+        return {"statusCode": 1, "message": "账户配置为空，请添加账户信息。"}
+
+    logger.info(f"检测到 {len(conf)} 个账号，正在进行任务……")
+
+    # 获取 SCT 通知配置
     sct_status = os.environ.get("sct")  # https://sct.ftqq.com/
     sct_key = os.environ.get("sct_key")
-    sct_url = f"https://sctapi.ftqq.com/{sct_key}.send?title=MHYY-AutoCheckin 自动推送"
+    sct_url = f"https://sctapi.ftqq.com/{sct_key}.send?title=MHYY-AutoCheckin 自动推送" if sct_key else None
 
     sct_msg = ""
 
-    conf = yaml.load(config_datas, Loader=yaml.FullLoader)
-    print(conf)
-    if not conf:
-        print("请正确配置环境变量或者config.yml后再运行本脚本！")
-        os._exit(0)
-    print(f"检测到 {len(conf)} 个账号，正在进行任务……")
+    try:
+        # 随机等待时间以避免被封禁
+        debug_mode = os.environ.get("MHYY_DEBUG", "False").upper() == "TRUE"
+        if not debug_mode:
+            wait_time = random.randint(10, 60)
+            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",
@@ -72,154 +83,190 @@ def handler(*args):
                 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["accounts"]:
-        # 各种API的URL
-        NotificationURL = "https://api-cloudgame.mihoyo.com/hk4e_cg_cn/gamer/api/listNotifications?status=NotificationStatusUnread&type=NotificationTypePopup&is_sort=true"
-        WalletURL = "https://api-cloudgame.mihoyo.com/hk4e_cg_cn/wallet/wallet/get"
-        AnnouncementURL = (
-            "https://api-cloudgame.mihoyo.com/hk4e_cg_cn/gamer/api/getAnnouncementInfo"
-        )
+        # 遍历每个账户进行任务
+        for idx, config in enumerate(conf, start=1):
+            if not config:
+                raise RunError("账户配置为空，请添加账户信息。")
 
-        if config == "":
-            # Verify config
-            raise RunError(
-                f"请在Settings->Secrets->Actions页面中新建名为config的变量，并将你的配置填入后再运行！"
-            )
-        else:
-            token = config["token"]
-            client_type = config["type"]
-            sysver = config["sysver"]
-            deviceid = config["deviceid"]
-            devicename = config["devicename"]
-            devicemodel = config["devicemodel"]
-            appid = config["appid"]
+            # 提取账户配置
+            token = config.get("token")
+            client_type = config.get("type")
+            sysver = config.get("sysver")
+            deviceid = config.get("deviceid")
+            devicename = config.get("devicename")
+            devicemodel = config.get("devicemodel")
+            appid = config.get("appid")
+            region = config.get("region", "cn")
+
+            if not all([token, client_type, sysver, deviceid, devicename, devicemodel, appid]):
+                logger.error(f"第 {idx} 个账户配置不完整，请检查配置。")
+                sct_msg += f"第 {idx} 个账户配置不完整，请检查配置。\n"
+                continue
+
+            # 构建请求头
             headers = {
                 "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",
                 "Accept-Encoding": "gzip",
                 "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.0.0 Safari/537.36 Edg/121.0.0.0",
             }
-        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"
-            headers["x-rpc-cg_game_id"] = "9000254"
-            headers["x-rpc-app_id"] = "600493"
-            headers["User-Agent"] = "okhttp/4.10.0"
-            headers["Host"] = "sg-cg-api.hoyoverse.com"
-            # 国际服URL
+                headers.update({
+                    "x-rpc-channel": "mihoyo",
+                    "x-rpc-cg_game_biz": "hk4e_global",
+                    "x-rpc-op_biz": "clgm_global",
+                    "x-rpc-cg_game_id": "9000254",
+                    "x-rpc-app_id": "600493",
+                    "User-Agent": "okhttp/4.10.0",
+                    "Host": "sg-cg-api.hoyoverse.com",
+                })
                 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"
-            )
+                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"
+            else:
+                NotificationURL = "https://api-cloudgame.mihoyo.com/hk4e_cg_cn/gamer/api/listNotifications?status=NotificationStatusUnread&type=NotificationTypePopup&is_sort=true"
+                WalletURL = "https://api-cloudgame.mihoyo.com/hk4e_cg_cn/wallet/wallet/get"
+                AnnouncementURL = "https://api-cloudgame.mihoyo.com/hk4e_cg_cn/gamer/api/getAnnouncementInfo"
 
-        print(
-            f"正在进行第 {conf['accounts'].index(config) +1 } 个账号，服务器为{'CN' if region != 'os' else 'GLOBAL'}……"
-        )
+            logger.info(f"正在进行第 {idx} 个账号，服务器为{'GLOBAL' if region == 'os' else 'CN'}……")
 
-        wallet = httpx.get(WalletURL, headers=headers, timeout=60, verify=False)
-        print(wallet.text)
-        if json.loads(wallet.text) == {
+            try:
+                # 获取钱包信息
+                wallet_response = httpx.get(WalletURL, headers=headers, timeout=60, verify=False)
+                wallet_data = wallet_response.json()
+                logger.debug(wallet_data)
+
+                if wallet_data == {
                     "data": None,
                     "message": "登录已失效，请重新登录",
                     "retcode": -100,
                 }:
-            print(f"当前登录已过期，请重新登陆！返回为：{wallet.text}")
-            sct_msg += f"当前登录已过期，请重新登陆！返回为：{wallet.text}"
+                    logger.error(f"账号 {idx} 登录已过期，请重新登陆！返回为：{wallet_response.text}")
+                    sct_msg += f"账号 {idx} 登录已过期，请重新登陆！返回为：{wallet_response.text}\n"
+                    continue
                 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']} 枚"
+                    free_time = wallet_data['data']['free_time']['free_time']
+                    play_card_status = wallet_data['data']['play_card']['short_msg']
+                    coin_num = wallet_data['data']['coin']['coin_num']
+                    logger.info(
+                        f"账号 {idx}: 你当前拥有免费时长 {free_time} 分钟，畅玩卡状态为 {play_card_status}，拥有原点 {coin_num} 点（{int(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']} 枚"
-            announcement = httpx.get(
-                AnnouncementURL, headers=headers, timeout=60, verify=False
+                    sct_msg += (
+                        f"账号 {idx}: 你当前拥有免费时长 {free_time} 分钟，"
+                        f"畅玩卡状态为 {play_card_status}，拥有原点 {coin_num} 点（{int(coin_num)/10}分钟）\n"
                     )
-            print(f'获取到公告列表：{json.loads(announcement.text)["data"]}')
-            res = httpx.get(NotificationURL, headers=headers, timeout=60, verify=False)
-            success, Signed = False, False
+
+                # 获取公告信息
+                announcement_response = httpx.get(AnnouncementURL, headers=headers, timeout=60, verify=False)
+                announcement_data = announcement_response.json()
+                logger.debug(f'获取到公告列表：{announcement_data["data"]}')
+
+                # 获取签到通知
+                notification_response = httpx.get(NotificationURL, headers=headers, timeout=60, verify=False)
+                notification_data = notification_response.json()
+                logger.debug(notification_data)
+
+                # 解析签到状态
+                success, Signed, Over = False, False, False
                 try:
-                if list(json.loads(res.text)["data"]["list"]) == []:
+                    notifications = notification_data["data"]["list"]
+                    if not notifications:
                         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,
-                }:
+                    else:
+                        last_msg = json.loads(notifications[-1]["msg"])
+                        if last_msg.get("msg") == "每日登录奖励":
                             success = True
                             Signed = False
                             Over = False
-                elif (
-                    json.loads(json.loads(res.text)["data"]["list"][0]["msg"])[
-                        "over_num"
-                    ]
-                    > 0
-                ):
+                        elif last_msg.get("over_num", 0) > 0:
                             success = True
                             Signed = False
                             Over = True
                         else:
                             success = False
-            except IndexError:
+                except (IndexError, json.JSONDecodeError, KeyError) as e:
+                    logger.warning(f"解析签到状态时出错: {e}")
                     success = False
+
                 if success:
                     if Signed:
-                    print(f"获取签到情况成功！今天是否已经签到过了呢？")
-                    sct_msg += f"获取签到情况成功！今天是否已经签到过了呢？"
-                    print(f"完整返回体为：{res.text}")
+                        logger.info(f"账号 {idx}: 获取签到情况成功！今天是否已经签到过了呢？")
+                        sct_msg += f"账号 {idx}: 获取签到情况成功！今天是否已经签到过了呢？\n"
+                        logger.debug(f"完整返回体为：{notification_response.text}")
                     elif not Signed and Over:
-                    print(
-                        f'获取签到情况成功！当前免费时长已经达到上限！签到情况为{json.loads(res.text)["data"]["list"][0]["msg"]}'
+                        last_msg = json.loads(notifications[-1]["msg"])
+                        logger.info(
+                            f"账号 {idx}: 获取签到情况成功！当前免费时长已经达到上限！签到情况为{last_msg}"
+                        )
+                        sct_msg += (
+                            f"账号 {idx}: 获取签到情况成功！当前免费时长已经达到上限！签到情况为{last_msg}\n"
                         )
-                    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}")
+                        logger.info(f"账号 {idx}: 已经签到过了！")
+                        sct_msg += f"账号 {idx}: 已经签到过了！\n"
                 else:
-                raise RunError(
-                    f"签到失败！请带着本次运行的所有log内容到 https://github.com/GamerNoTitle/MHYY/issues 发起issue解决（或者自行解决）。签到出错，返回信息如下：{res.text}"
-                )
-        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推送完成！")
+                    logger.info(f"账号 {idx}: 当前没有签到！请稍后再试！")
+                    sct_msg += f"账号 {idx}: 当前没有签到！请稍后再试！\n"
+
+                # 发送 SCT 通知
+                if sct_url:
+                    try:
+                        sct_response = httpx.get(sct_url, params={"desp": sct_msg}, timeout=30)
+                        if sct_response.status_code == 200:
+                            logger.info("SCT 推送完成！")
                         else:
-                print("sct无法推送")
-                print(res.text)
+                            logger.warning(f"SCT 无法推送，状态码：{sct_response.status_code}, 响应：{sct_response.text}")
+                    except Exception as e:
+                        logger.error(f"SCT 推送时出错：{e}")
+
+            except Exception as e:
+                logger.error(f"账号 {idx} 执行过程中出错：{str(e)}")
+                sct_msg += f"账号 {idx} 执行过程中出错：{str(e)}\n"
+                if sct_url:
+                    try:
+                        httpx.get(sct_url, params={"desp": sct_msg}, timeout=30)
+                    except Exception as notify_error:
+                        logger.error(f"SCT 推送时出错：{notify_error}")
+                continue
+
+        logger.info("所有任务已经执行完毕！")
+        return {"statusCode": 0, "message": "所有任务已经执行完毕！", "details": sct_msg}
+
+    except RunError as re:
+        logger.error(f"运行错误：{str(re)}")
+        if sct_url:
+            try:
+                httpx.get(sct_url, params={"desp": f"运行错误：{str(re)}"}, timeout=30)
+            except Exception as notify_error:
+                logger.error(f"SCT 推送时出错：{notify_error}")
+        return {"statusCode": 1, "message": f"运行错误：{str(re)}"}
+
+    except Exception as e:
+        logger.error(f"未知错误：{str(e)}")
+        if sct_url:
+            try:
+                httpx.get(sct_url, params={"desp": f"未知错误：{str(e)}"}, timeout=30)
+            except Exception as notify_error:
+                logger.error(f"SCT 推送时出错：{notify_error}")
+        return {"statusCode": 1, "message": f"未知错误：{str(e)}"}