feat(huya): 多选登录改单线程队列并拆分路由与工作台

默认同时只登一个号,失败两次跳下一个,号间留间隔,结束后可一键重试失败账号。
顺带拆分虎牙路由与斗鱼工作台页面,并补齐 raw_cookie 重建入口。

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
yml2213
2026-09-10 11:31:50 +08:00
co-authored by Cursor
parent 8dea9e3244
commit e81119117f
27 changed files with 6405 additions and 5409 deletions
+116
View File
@@ -0,0 +1,116 @@
"""斗鱼写路径契约:锁单/支付编排走 mock 客户端,不打真实兑换。"""
from unittest.mock import Mock
from sqlalchemy import create_engine, event
from sqlalchemy.orm import sessionmaker
from web.backend.database import Base
from web.backend.models import Account, DouyuGoodsSnapshot, DouyuTask, User
from web.backend.services.douyu_runner import DouyuBatchRunner
class TestDouyuWritePathContracts:
def setup_method(self):
self.engine = create_engine("sqlite://")
@event.listens_for(self.engine, "connect")
def enable_foreign_keys(connection, _):
connection.execute("PRAGMA foreign_keys=ON")
Base.metadata.create_all(self.engine)
self.session = sessionmaker(bind=self.engine)()
self.user = User(username="operator", password_hash="hash", role="super_admin")
self.account = Account(
username="dyuser",
password="pw",
email="a@example.com",
email_password="em",
)
self.session.add_all([self.user, self.account])
self.session.commit()
self.session.add(
DouyuGoodsSnapshot(
commodity_id="bag10",
name="套装-兔兔白日梦",
raw={"name": "套装-兔兔白日梦"},
)
)
self.session.commit()
def teardown_method(self):
self.session.close()
Base.metadata.drop_all(self.engine)
self.engine.dispose()
def _runner(self, task_type: str) -> DouyuBatchRunner:
return DouyuBatchRunner(db=self.session, batch_id="batch1", task_type=task_type)
def _task(self, task_type: str, payload: dict) -> DouyuTask:
task = DouyuTask(
batch_id="batch1",
account_id=self.account.id,
task_type=task_type,
handbook_scope="elite",
status="running",
result={"payload": payload},
created_by=self.user.id,
)
self.session.add(task)
self.session.commit()
return task
def test_lock_goods_records_order_without_paying(self):
task = self._task("lock_goods", {"commodity_id": "bag10", "num": 1})
runner = self._runner("lock_goods")
client = Mock()
client.create_exchange_order.return_value = {
"order_id": "5874",
"expire_seconds": "300",
}
runner._client = Mock(return_value=client)
runner._execute_lock_goods(
self.session,
task,
self.account,
"acf_uid=100",
{"manual_id": "G4KA4Qnz4LDp7", "rid": "9263298"},
)
self.session.refresh(task)
self.session.refresh(self.account)
assert task.status == "success"
assert task.result["order_id"] == "5874"
assert self.account.bind_status == "goods_locked"
client.create_exchange_order.assert_called_once()
client.pay_exchange_order.assert_not_called()
def test_pay_locked_order_uses_existing_order_id(self):
task = self._task(
"pay_locked_order",
{"order_id": "5874", "commodity_id": "bag10"},
)
runner = self._runner("pay_locked_order")
client = Mock()
client.pay_exchange_order.return_value = {
"exchange_id": "11098933",
"commodity_image": "https://example.test/item.png",
"exchange_num": 1,
}
runner._client = Mock(return_value=client)
runner._refresh_account_points = Mock(return_value={"points": 1280})
runner._execute_pay_locked_order(
self.session,
task,
self.account,
"acf_uid=100",
{"manual_id": "G4KA4Qnz4LDp7", "rid": "9263298"},
)
self.session.refresh(task)
assert task.status == "success"
assert task.result["exchange_id"] == "11098933"
client.pay_exchange_order.assert_called_once()
client.create_exchange_order.assert_not_called()
+2 -1
View File
@@ -508,7 +508,8 @@ class TestHuyaAppLogin:
)
with patch(
"web.backend.routers.huya.login_huya_app_password", return_value=mock_res
"web.backend.routers.huya.login.login_huya_app_password",
return_value=mock_res,
):
req = HuyaAppPasswordLoginRequest(
username="mock_test_huya_user",
+84
View File
@@ -0,0 +1,84 @@
"""虎牙网页 Cookie 回写与 raw_cookie 重建(不发起登录或支付)。"""
import pytest
from sqlalchemy import create_engine, event
from sqlalchemy.orm import sessionmaker
from core.huya.web_cookie_fields import cookie_fields, missing_web_cookie_fields
from web.backend.database import Base
from web.backend.models import HuyaAccount, User
from web.backend.routers.huya.cookies import rebuild_web_cookie
from web.backend.services.huya_service import (
persist_huya_session_cookie,
rebuild_web_cookie_from_raw,
)
RAW_COOKIE = (
"udb_cred=cred; udb_uid=100; yyuid=100; udb_biztoken=biz; udb_appid=5008; sdid=sdid"
)
class TestHuyaCookieRebuild:
def setup_method(self):
self.engine = create_engine("sqlite://")
@event.listens_for(self.engine, "connect")
def enable_foreign_keys(connection, _):
connection.execute("PRAGMA foreign_keys=ON")
Base.metadata.create_all(self.engine)
self.session = sessionmaker(bind=self.engine)()
self.user = User(username="operator", password_hash="hash", role="super_admin")
self.account = HuyaAccount(
uid="100",
yyuid="100",
username="",
cookie=RAW_COOKIE,
raw_cookie=RAW_COOKIE,
)
self.session.add_all([self.user, self.account])
self.session.commit()
def teardown_method(self):
self.session.close()
Base.metadata.drop_all(self.engine)
self.engine.dispose()
def test_persist_writes_filled_session_cookie(self):
filled = RAW_COOKIE + "; guid=0123456789abcdef0123456789abcdef"
assert persist_huya_session_cookie(
self.session, self.account.id, RAW_COOKIE, filled
)
self.session.refresh(self.account)
assert "guid=" in self.account.cookie
assert (
persist_huya_session_cookie(self.session, self.account.id, filled, filled)
is False
)
def test_rebuild_from_raw_keeps_app_creds_and_fills_web_fields(self):
rebuilt = rebuild_web_cookie_from_raw(self.session, self.account)
fields = cookie_fields(rebuilt)
assert fields["udb_cred"] == "cred"
assert fields["udb_appid"] == "5002"
assert not missing_web_cookie_fields(rebuilt)
self.session.refresh(self.account)
assert self.account.cookie == rebuilt
assert self.account.raw_cookie == RAW_COOKIE
def test_rebuild_without_raw_cookie_raises(self):
self.account.raw_cookie = ""
self.session.commit()
with pytest.raises(ValueError, match="原始凭据"):
rebuild_web_cookie_from_raw(self.session, self.account)
def test_rebuild_route_returns_cookie_without_login(self):
payload = rebuild_web_cookie(
account_id=self.account.id,
db=self.session,
current=self.user,
)
assert payload["id"] == self.account.id
assert payload["has_raw_cookie"] is True
assert payload["cookie"]
assert "udb_cred=cred" in payload["cookie"]
+154
View File
@@ -0,0 +1,154 @@
"""虎牙多选登录:单线程、失败重试、号间间隔。"""
from unittest.mock import patch
from sqlalchemy import create_engine
from sqlalchemy.orm import sessionmaker
from core.huya.app_login import HuyaAppQrAuthRequiredError
from core.huya.login import HuyaCredentialError, HuyaLoginResult
from web.backend.database import Base
from web.backend.models import HuyaAccount, User
from web.backend.routers.huya.login import app_password_login_selected_accounts
from web.backend.schemas import HuyaPasswordLoginSelectedRequest
SUCCESS_COOKIE = (
"udb_cred=mock_cred_123; yyuid=1199666914671; "
"udb_uid=1199666914671; username=mock_test_huya_user"
)
def _ok_result() -> HuyaLoginResult:
return HuyaLoginResult(
success=True,
cookie=SUCCESS_COOKIE,
message="App协议登录成功",
sdid="mock_sdid_123",
)
def _fail_result(message: str = "网络超时", code: str = "LOGIN_FAILED") -> HuyaLoginResult:
return HuyaLoginResult(success=False, message=message, code=code)
class TestSelectedAppLoginQueue:
def setup_method(self):
self.engine = create_engine("sqlite://")
Base.metadata.create_all(self.engine)
self.session = sessionmaker(bind=self.engine)()
self.admin = User(username="admin", password_hash="hash", role="super_admin")
self.session.add(self.admin)
self.session.commit()
def teardown_method(self):
self.session.close()
Base.metadata.drop_all(self.engine)
self.engine.dispose()
def _add_account(self, username: str, password: str = "pw") -> HuyaAccount:
account = HuyaAccount(
username=username,
account_password=password,
cookie="",
status="password_imported",
)
self.session.add(account)
self.session.commit()
return account
def _run(self, ids: list[int], **kwargs):
req = HuyaPasswordLoginSelectedRequest(
account_ids=ids,
max_attempts=kwargs.get("max_attempts", 2),
interval_seconds=kwargs.get("interval_seconds", 8),
retry_delay_seconds=kwargs.get("retry_delay_seconds", 3),
)
return app_password_login_selected_accounts(
req=req, db=self.session, current=self.admin
)
def test_retries_then_succeeds(self):
account = self._add_account("hy_retry_ok")
with (
patch("web.backend.routers.huya.login.time.sleep") as m_sleep,
patch(
"web.backend.routers.huya.login.login_huya_app_password",
side_effect=[_fail_result(), _ok_result()],
) as m_login,
):
resp = self._run([account.id])
assert resp["count"] == 1
assert resp["failed"] == 0
assert resp["results"][0]["success"]
assert resp["results"][0]["attempts"] == 2
assert m_login.call_count == 2
m_sleep.assert_called_once_with(3)
def test_fails_twice_then_moves_on(self):
first = self._add_account("hy_fail_twice")
second = self._add_account("hy_next_ok")
with (
patch("web.backend.routers.huya.login.time.sleep") as m_sleep,
patch(
"web.backend.routers.huya.login.login_huya_app_password",
side_effect=[_fail_result(), _fail_result(), _ok_result()],
) as m_login,
):
resp = self._run(
[first.id, second.id],
interval_seconds=8,
retry_delay_seconds=3,
)
assert resp["count"] == 1
assert resp["failed"] == 1
assert resp["results"][0]["success"] is False
assert resp["results"][0]["attempts"] == 2
assert "已尝试 2 次" in resp["results"][0]["message"]
assert resp["results"][1]["success"]
assert m_login.call_count == 3
assert m_sleep.call_args_list == [((3,),), ((8,),)]
def test_qr_auth_is_not_retried(self):
account = self._add_account("hy_need_qr")
with (
patch("web.backend.routers.huya.login.time.sleep") as m_sleep,
patch(
"web.backend.routers.huya.login.login_huya_app_password",
side_effect=HuyaAppQrAuthRequiredError("要求扫码验证"),
) as m_login,
):
resp = self._run([account.id])
assert resp["failed"] == 1
assert resp["results"][0]["attempts"] == 1
assert m_login.call_count == 1
m_sleep.assert_not_called()
def test_wrong_password_is_not_retried(self):
account = self._add_account("hy_bad_pw")
with (
patch("web.backend.routers.huya.login.time.sleep") as m_sleep,
patch(
"web.backend.routers.huya.login.login_huya_app_password",
side_effect=HuyaCredentialError("账号或密码错误"),
) as m_login,
):
resp = self._run([account.id])
assert resp["failed"] == 1
assert resp["results"][0]["attempts"] == 1
assert m_login.call_count == 1
m_sleep.assert_not_called()
def test_sms_auth_result_is_not_retried(self):
account = self._add_account("hy_sms")
with (
patch("web.backend.routers.huya.login.time.sleep") as m_sleep,
patch(
"web.backend.routers.huya.login.login_huya_app_password",
return_value=_fail_result("需要短信验证", "SMS_AUTH_REQUIRED"),
) as m_login,
):
resp = self._run([account.id])
assert resp["failed"] == 1
assert resp["results"][0]["attempts"] == 1
assert m_login.call_count == 1
m_sleep.assert_not_called()