1. 修复快手默认有头模式
This commit is contained in:
+5
-1
@@ -50,7 +50,6 @@ sau douyin upload-note --account creator --images videos/1.png videos/2.png --no
|
||||
|
||||
```bash
|
||||
sau kuaishou login --account creator
|
||||
sau kuaishou login --account creator --headed
|
||||
sau kuaishou check --account creator
|
||||
sau kuaishou upload-video --account creator --file videos/demo.mp4 --title "示例标题" --tags 运动,训练
|
||||
sau kuaishou upload-note --account creator --images videos/1.png videos/2.png videos/3.png --note "图文示例" --tags 图文,测试
|
||||
@@ -90,6 +89,11 @@ CLI 将 `debug` 和 `headless` 拆成了两个独立维度:
|
||||
|
||||
如果都不传,CLI 当前默认按 `headless=True` 运行。
|
||||
|
||||
补充:
|
||||
|
||||
- 抖音和快手的 CLI 默认都是无头模式
|
||||
- 如果用户明确要求可见浏览器窗口,或确实需要人工看页面,再显式传 `--headed`
|
||||
|
||||
## 视频上传参数
|
||||
|
||||
```bash
|
||||
|
||||
+1
-1
@@ -102,7 +102,7 @@ sau douyin upload-video --account creator --file videos/demo.mp4 --title "示例
|
||||
### 8. 快手主线示例
|
||||
|
||||
```bash
|
||||
sau kuaishou login --account creator --headed
|
||||
sau kuaishou login --account creator
|
||||
sau kuaishou check --account creator
|
||||
sau kuaishou upload-video --account creator --file videos/demo.mp4 --title "示例标题"
|
||||
sau kuaishou upload-note --account creator --images videos/1.png videos/2.png videos/3.png --note "图文示例"
|
||||
|
||||
+6
-6
@@ -125,9 +125,9 @@ async def check_douyin_account(account_name: str) -> bool:
|
||||
return await douyin_cookie_auth(str(account_file))
|
||||
|
||||
|
||||
async def login_kuaishou_account(account_name: str, headless: bool = True) -> bool:
|
||||
async def login_kuaishou_account(account_name: str, headless: bool = True) -> dict:
|
||||
account_file = resolve_account_file("kuaishou", account_name)
|
||||
return await ks_setup(str(account_file), handle=True, headless=headless)
|
||||
return await ks_setup(str(account_file), handle=True, return_detail=True, headless=headless)
|
||||
|
||||
|
||||
async def check_kuaishou_account(account_name: str) -> bool:
|
||||
@@ -370,10 +370,10 @@ async def dispatch(args: argparse.Namespace) -> int:
|
||||
|
||||
if args.platform == "kuaishou":
|
||||
if args.action == "login":
|
||||
success = await login_kuaishou_account(args.account, headless=args.headless)
|
||||
if not success:
|
||||
raise RuntimeError("Kuaishou login flow failed")
|
||||
print(f"Kuaishou login flow completed: {resolve_account_file('kuaishou', args.account)}")
|
||||
result = await login_kuaishou_account(args.account, headless=args.headless)
|
||||
if not result["success"]:
|
||||
raise RuntimeError(result["message"])
|
||||
print(f"Kuaishou login flow completed: {result['account_file']}")
|
||||
return 0
|
||||
|
||||
if args.action == "check":
|
||||
|
||||
@@ -63,5 +63,6 @@ uv run sau kuaishou --help
|
||||
|
||||
- 使用 `--headless` 表示无头模式
|
||||
- 使用 `--headed` 表示有头模式
|
||||
- 快手登录如果遇到二维码展示问题,优先切到 `--headed`
|
||||
- 快手 CLI 默认按无头模式运行
|
||||
- 如果用户明确要求可见浏览器窗口,或二维码展示确实有问题,再切到 `--headed`
|
||||
- 如果登录过程中已经生成了本地二维码图片,agent 应优先直接把图片展示/发送给用户扫码,不要只告诉用户图片路径
|
||||
|
||||
@@ -41,7 +41,8 @@ sau kuaishou login --account <account>
|
||||
|
||||
如果用户反馈二维码在终端里不好扫:
|
||||
|
||||
- 优先让用户切到 `--headed`
|
||||
- 先优先使用 CLI / uploader 生成的本地二维码图片
|
||||
- 只有用户明确需要可见浏览器窗口,或图片方案仍然不方便时,再切到 `--headed`
|
||||
- 如果 CLI / uploader 已经生成临时二维码图片,agent 不要只回图片路径
|
||||
- agent 应优先直接把本地二维码图片展示/发送给用户扫码
|
||||
- 图片路径只作为补充信息
|
||||
|
||||
@@ -13,7 +13,7 @@ def main() -> None:
|
||||
account = "creator"
|
||||
|
||||
commands = [
|
||||
["sau", "kuaishou", "login", "--account", account, "--headed"],
|
||||
["sau", "kuaishou", "login", "--account", account],
|
||||
["sau", "kuaishou", "check", "--account", account],
|
||||
[
|
||||
"sau",
|
||||
|
||||
@@ -5,7 +5,7 @@ $video = "videos/demo.mp4"
|
||||
$thumbnail = "videos/demo.png"
|
||||
$noteImages = @("videos/1.png", "videos/2.png", "videos/3.png")
|
||||
|
||||
sau kuaishou login --account $account --headed
|
||||
sau kuaishou login --account $account
|
||||
sau kuaishou check --account $account
|
||||
|
||||
sau kuaishou upload-video `
|
||||
|
||||
@@ -6,7 +6,7 @@ account="creator"
|
||||
video="videos/demo.mp4"
|
||||
thumbnail="videos/demo.png"
|
||||
|
||||
sau kuaishou login --account "$account" --headed
|
||||
sau kuaishou login --account "$account"
|
||||
sau kuaishou check --account "$account"
|
||||
|
||||
sau kuaishou upload-video \
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
from __future__ import annotations
|
||||
|
||||
import asyncio
|
||||
import inspect
|
||||
import os
|
||||
from datetime import datetime
|
||||
from pathlib import Path
|
||||
@@ -35,6 +36,33 @@ def _msg(emoji: str, text: str) -> str:
|
||||
return f"{emoji} {text}"
|
||||
|
||||
|
||||
async def _emit_qrcode_callback(qrcode_callback, payload: dict):
|
||||
if not qrcode_callback:
|
||||
return
|
||||
|
||||
callback_result = qrcode_callback(payload)
|
||||
if inspect.isawaitable(callback_result):
|
||||
await callback_result
|
||||
|
||||
|
||||
def _build_login_result(
|
||||
success: bool,
|
||||
status: str,
|
||||
message: str,
|
||||
account_file: str,
|
||||
qrcode: dict | None = None,
|
||||
current_url: str = "",
|
||||
) -> dict:
|
||||
return {
|
||||
"success": success,
|
||||
"status": status,
|
||||
"message": message,
|
||||
"account_file": str(account_file),
|
||||
"qrcode": qrcode,
|
||||
"current_url": current_url,
|
||||
}
|
||||
|
||||
|
||||
async def _is_ks_cookie_invalid(page: Page, timeout: int = 5000) -> bool:
|
||||
try:
|
||||
await page.wait_for_selector(KUAISHOU_COOKIE_INVALID_SELECTOR, timeout=timeout)
|
||||
@@ -69,7 +97,7 @@ async def _extract_ks_qrcode_src(page: Page) -> str:
|
||||
return qrcode_src
|
||||
|
||||
|
||||
async def _save_ks_qrcode(page: Page, account_file: str, previous_qrcode_path: Path | None = None) -> dict:
|
||||
async def _save_ks_qrcode(page: Page, account_file: str, previous_qrcode_path: Path | None = None, qrcode_callback=None) -> dict:
|
||||
qrcode_src = await _extract_ks_qrcode_src(page)
|
||||
qrcode_path = save_data_url_image(qrcode_src, build_login_qrcode_path(account_file, suffix="ks_login_qrcode"))
|
||||
|
||||
@@ -84,10 +112,12 @@ async def _save_ks_qrcode(page: Page, account_file: str, previous_qrcode_path: P
|
||||
else:
|
||||
kuaishou_logger.warning(_msg("😵", f"终端没法完整显示二维码,请打开 {qrcode_path} 扫码"))
|
||||
|
||||
return {
|
||||
qrcode_info = {
|
||||
"image_path": str(qrcode_path),
|
||||
"image_data_url": qrcode_src,
|
||||
}
|
||||
await _emit_qrcode_callback(qrcode_callback, qrcode_info)
|
||||
return qrcode_info
|
||||
|
||||
|
||||
async def _is_ks_qrcode_expired(page: Page) -> bool:
|
||||
@@ -134,21 +164,29 @@ async def cookie_auth(account_file):
|
||||
await browser.close()
|
||||
|
||||
|
||||
async def ks_setup(account_file, handle=False, headless: bool = LOCAL_CHROME_HEADLESS):
|
||||
async def ks_setup(account_file, handle=False, return_detail=False, qrcode_callback=None, headless: bool = LOCAL_CHROME_HEADLESS):
|
||||
account_file = get_absolute_path(account_file, "ks_uploader")
|
||||
if not os.path.exists(account_file) or not await cookie_auth(account_file):
|
||||
if not handle:
|
||||
return False
|
||||
result = _build_login_result(False, "cookie_invalid", "cookie文件不存在或已失效", account_file)
|
||||
return result if return_detail else False
|
||||
kuaishou_logger.info(_msg("🥹", "cookie 失效了,准备重新登录快手创作者平台"))
|
||||
return await get_ks_cookie(account_file, headless=headless)
|
||||
result = await get_ks_cookie(account_file, qrcode_callback=qrcode_callback, headless=headless)
|
||||
return result if return_detail else result["success"]
|
||||
|
||||
return True
|
||||
result = _build_login_result(True, "cookie_valid", "cookie有效", account_file)
|
||||
return result if return_detail else True
|
||||
|
||||
|
||||
async def get_ks_cookie(account_file, headless: bool = LOCAL_CHROME_HEADLESS, poll_interval: int = 3, max_checks: int = 100):
|
||||
async def get_ks_cookie(
|
||||
account_file,
|
||||
qrcode_callback=None,
|
||||
headless: bool = LOCAL_CHROME_HEADLESS,
|
||||
poll_interval: int = 3,
|
||||
max_checks: int = 100,
|
||||
):
|
||||
if headless:
|
||||
kuaishou_logger.warning(_msg("😵", "快手登录暂未接入抖音那套二维码透传,先切到有头模式方便你扫码"))
|
||||
headless = False
|
||||
kuaishou_logger.info(_msg("🖼️", "快手登录将以无头模式运行,小人会输出终端二维码并保存本地二维码图片"))
|
||||
|
||||
async with async_playwright() as playwright:
|
||||
if LOCAL_CHROME_PATH:
|
||||
@@ -158,13 +196,14 @@ async def get_ks_cookie(account_file, headless: bool = LOCAL_CHROME_HEADLESS, po
|
||||
context = await browser.new_context()
|
||||
context = await set_init_script(context)
|
||||
qrcode_path = None
|
||||
login_success = False
|
||||
qrcode_info = None
|
||||
result = _build_login_result(False, "failed", "快手登录失败", account_file)
|
||||
try:
|
||||
page = await context.new_page()
|
||||
await page.goto(KUAISHOU_LOGIN_URL)
|
||||
kuaishou_logger.info(_msg("🧍", "请在浏览器里扫码登录快手,小人正在耐心等待"))
|
||||
|
||||
qrcode_info = await _save_ks_qrcode(page, account_file)
|
||||
qrcode_info = await _save_ks_qrcode(page, account_file, qrcode_callback=qrcode_callback)
|
||||
qrcode_path = Path(qrcode_info["image_path"])
|
||||
|
||||
for _ in range(max_checks):
|
||||
@@ -172,10 +211,18 @@ async def get_ks_cookie(account_file, headless: bool = LOCAL_CHROME_HEADLESS, po
|
||||
await context.storage_state(path=account_file)
|
||||
if await cookie_auth(account_file):
|
||||
kuaishou_logger.success(_msg("🥳", "快手扫码登录成功,小人开心收工"))
|
||||
login_success = True
|
||||
result = _build_login_result(True, "success", "快手扫码登录成功", account_file, qrcode_info, page.url)
|
||||
else:
|
||||
kuaishou_logger.error(_msg("😢", "快手扫码完成了,但 cookie 校验失败"))
|
||||
return login_success
|
||||
result = _build_login_result(
|
||||
False,
|
||||
"cookie_invalid",
|
||||
"快手扫码流程结束,但 cookie 校验失败",
|
||||
account_file,
|
||||
qrcode_info,
|
||||
page.url,
|
||||
)
|
||||
return result
|
||||
|
||||
if qrcode_info and await _is_ks_qrcode_expired(page):
|
||||
kuaishou_logger.warning(_msg("😵", "二维码失效了,小人马上去刷新"))
|
||||
@@ -183,20 +230,35 @@ async def get_ks_cookie(account_file, headless: bool = LOCAL_CHROME_HEADLESS, po
|
||||
if await refresh_button.count():
|
||||
await refresh_button.click()
|
||||
await asyncio.sleep(1)
|
||||
qrcode_info = await _save_ks_qrcode(page, account_file, qrcode_path)
|
||||
qrcode_info = await _save_ks_qrcode(
|
||||
page,
|
||||
account_file,
|
||||
qrcode_path,
|
||||
qrcode_callback=qrcode_callback,
|
||||
)
|
||||
qrcode_path = Path(qrcode_info["image_path"])
|
||||
|
||||
await asyncio.sleep(poll_interval)
|
||||
|
||||
result = _build_login_result(
|
||||
False,
|
||||
"timeout",
|
||||
"等待快手扫码登录超时",
|
||||
account_file,
|
||||
qrcode_info,
|
||||
page.url,
|
||||
)
|
||||
except Exception as exc:
|
||||
kuaishou_logger.error(_msg("😢", f"登录失败: {exc}"))
|
||||
result = _build_login_result(False, "failed", str(exc), account_file, current_url=page.url if "page" in locals() else "")
|
||||
finally:
|
||||
if remove_qrcode_file(qrcode_path):
|
||||
kuaishou_logger.info(_msg("🧹", f"临时二维码文件已清理: {qrcode_path}"))
|
||||
if not result["success"]:
|
||||
kuaishou_logger.error(_msg("😢", f"登录失败: {result['message']}"))
|
||||
await context.close()
|
||||
await browser.close()
|
||||
|
||||
kuaishou_logger.error(_msg("😢", "等待快手扫码登录超时"))
|
||||
return False
|
||||
return result
|
||||
|
||||
|
||||
class KSBaseUploader(BaseVideoUploader):
|
||||
|
||||
Reference in New Issue
Block a user