Revert "feat(douyin): 添加短信验证码弹窗处理并移除多余浏览器参数"

This reverts commit 77b372a56e.

uploader/douyin_uploader/main.py

@@ -10,7 +10,7 @@ from patchright.async_api import Page
 from patchright.async_api import Playwright
 from patchright.async_api import async_playwright
 
-from conf import BASE_DIR, DEBUG_MODE, LOCAL_CHROME_HEADLESS, LOCAL_CHROME_PATH
+from conf import DEBUG_MODE, LOCAL_CHROME_HEADLESS, LOCAL_CHROME_PATH
 from uploader.base_video import BaseVideoUploader
 from utils.base_social_media import set_init_script
 from utils.login_qrcode import build_login_qrcode_path
@@ -53,7 +53,7 @@ async def cookie_auth(account_file):
     # 即便有头，页面慢/瞬时跳转仍会让 wait_for_url(精确URL,5s) 误判→重试3次+宽松判定(URL含 content/upload 且无登录文案)。
     # 允许 linux server 用户通过 env var 强制无头: DOUYIN_COOKIE_AUTH_HEADLESS=true
     use_headless = os.environ.get("DOUYIN_COOKIE_AUTH_HEADLESS", "").lower() in ("1", "true", "yes")
-    launch_kwargs = {"headless": use_headless, "args": ["--no-sandbox", "--disable-blink-features=AutomationControlled"]}
+    launch_kwargs = {"headless": use_headless, "channel": "chrome", "args": ["--no-sandbox", "--disable-blink-features=AutomationControlled"]}
     for _attempt in range(3):
         async with async_playwright() as playwright:
             browser = await playwright.chromium.launch(**launch_kwargs)
@@ -172,8 +172,6 @@ async def _is_douyin_login_completed(page: Page) -> bool:
 
 async def _wait_for_douyin_login(page: Page, account_file: str, qrcode_info: dict, qrcode_callback=None, poll_interval: int = 3, max_checks: int = 100) -> dict:
     qrcode_path = Path(qrcode_info["image_path"]) if qrcode_info.get("image_path") else None
-    original_url = page.url
-    saw_2fa = False
     for _ in range(max_checks):
         if await _is_douyin_login_completed(page):
             douyin_logger.info(_msg("🥳", f"扫码成功，已经跳转到登录后页面: {page.url}"))
@@ -577,7 +575,7 @@ class DouYinVideo(DouYinBaseUploader):
         douyin_logger.info(_msg("🏃", "小人正在设置视频封面"))
         # 先清掉 shepherd 新手引导浮层，否则它会拦截“选择封面”点击导致弹窗打不开
         await page.evaluate(
-            "() => { document.querySelectorAll('.shepherd-element, .shepherd-modal-overlay-container, [class*=\"mention-wrapper\"]').forEach(e => e.remove()); }"
+            "() => document.querySelectorAll('.shepherd-element,.shepherd-modal-overlay-container').forEach(e=>e.remove())"
         )
         await page.get_by_text("选择封面", exact=True).first.click(force=True)
         cover_locator_str = 'div.dy-creator-content-modal'
@@ -700,49 +698,6 @@ class DouYinVideo(DouYinBaseUploader):
                 await page.evaluate(
                     "() => { document.querySelectorAll('.shepherd-element, .shepherd-modal-overlay-container, [class*=\"mention-wrapper\"]').forEach(e => e.remove()); }"
                 )
-                # 检测并处理短信验证码弹窗
-                sms_input = page.locator('input[placeholder*="验证码"], input[type="tel"], input[placeholder*="短信"], input[placeholder*="手机号"]').first
-                if await sms_input.count() and await sms_input.is_visible():
-                    douyin_logger.warning(_msg("📱", "检测到短信验证码弹窗"))
-                    # 点击「获取验证码」按钮（仅首次）
-                    get_code_btn = page.get_by_text("获取验证码").first
-                    if await get_code_btn.count() and await get_code_btn.is_visible():
-                        await get_code_btn.click()
-                        douyin_logger.info(_msg("📤", "已点击「获取验证码」，请查看手机短信"))
-                    # 等待验证码文件
-                    code_file = os.path.join(BASE_DIR, "verify_code.txt")
-                    if os.path.exists(code_file):
-                        code = open(code_file).read().strip()
-                        if code:
-                            douyin_logger.info(_msg("✍️", f"从文件读取到验证码: {code}"))
-                            await sms_input.click()
-                            await sms_input.fill(code)
-                            douyin_logger.info(_msg("✅", "验证码已填入输入框"))
-                            await page.wait_for_timeout(500)
-                            # 点击「验证」按钮（div 类型按钮，用 force=True + JS 兜底）
-                            verify_btn = page.locator('div.uc-ui-verify_sms-verify_button:has-text("验证")').first
-                            if await verify_btn.count() and await verify_btn.is_visible():
-                                try:
-                                    await verify_btn.click(force=True)
-                                    douyin_logger.success(_msg("✅", "已点击「验证」按钮 (force)"))
-                                except Exception:
-                                    await page.eval_on_selector('div.uc-ui-verify_sms-verify_button', 'el => el.click()')
-                                    douyin_logger.success(_msg("✅", "已点击「验证」按钮 (JS)"))
-                            else:
-                                # 兜底：按文本找
-                                verify_by_text = page.get_by_text("验证", exact=True).first
-                                if await verify_by_text.count():
-                                    await verify_by_text.click(force=True)
-                                    douyin_logger.success(_msg("✅", "已点击「验证」按钮 (text)"))
-                                else:
-                                    douyin_logger.warning(_msg("⚠️", "未找到验证按钮，尝试按Enter"))
-                                    await page.keyboard.press("Enter")
-                            os.remove(code_file)
-                            douyin_logger.info(_msg("🧹", "验证码文件已清理"))
-                            await page.wait_for_timeout(3000)
-                            douyin_logger.info(_msg("🔄", "验证码处理完成，继续发布流程"))
-                    else:
-                        douyin_logger.warning(_msg("⏳", "等待你发送验证码到微信..."))
                 publish_button = page.get_by_role("button", name="发布", exact=True)
                 if await publish_button.count():
                     await publish_button.click(force=True)