release: prepare Web 2.0.1 automatic strategies and private updates

This commit is contained in:
AttilaNet
2026-11-11 12:52:08 +08:00
parent 5b1ef25048
commit 533280e007
30 changed files with 1177 additions and 107 deletions
@@ -14,7 +14,7 @@ from unittest.mock import patch
from urllib.parse import urlsplit
from ranch_assistant.model import Catalog
from ranch_web.policies import default_config
from ranch_web.policies import default_config, export_config
from ranch_web.views import build_view, schema
from . import test_workbench_browser as fixtures
@@ -68,6 +68,7 @@ class AutoReloginBrowserTests(unittest.TestCase):
fixtures.WorkbenchBrowserTests.setUp(self)
self.context.set_default_timeout(5000)
self.external_requests, self.unexpected_actions, self.writes, self.actions = [], [], [], []
self.action_handlers = {}
self.view_calls = 0
self.configs, self.summaries, self.login_data = {}, {}, {}
engine = SimpleNamespace(catalog=Catalog(), snapshot=None, demo=False)
@@ -112,6 +113,10 @@ class AutoReloginBrowserTests(unittest.TestCase):
if path.startswith(prefix + "/actions/"):
operation = path.rsplit("/", 1)[-1]
self.actions.append((identifier, operation, request.post_data_json))
handler = self.action_handlers.get((identifier, operation))
if handler:
self.fulfill(route, handler(request.post_data_json))
return
if operation != "logout":
self.unexpected_actions.append(operation)
route.abort()
@@ -132,7 +137,7 @@ class AutoReloginBrowserTests(unittest.TestCase):
def tearDown(self):
try:
self.assertEqual(self.external_requests, [])
self.assertEqual(self.unexpected_actions, [], "UI must never initiate game login or start strategies")
self.assertEqual(self.unexpected_actions, [], "UI must only submit explicitly requested fixture actions")
self.assertEqual(self.errors, [])
finally:
fixtures.WorkbenchBrowserTests.tearDown(self)
@@ -155,6 +160,11 @@ class AutoReloginBrowserTests(unittest.TestCase):
self.page.wait_for_function("() => document.querySelector('#save-status').textContent === '策略已自动保存'")
self.assertEqual(self.configs[identifier]["auto_relogin"], {"enabled": enabled, "delay_minutes": minutes})
def complete_login(self, operation, *, running=True):
self.summaries[self.first].update(connected=True, connection_state="online",
connection_message="游戏连接正常", error="", running=running)
return {"id": "mock-" + operation, "operation": operation, "status": "succeeded", "result": {}}
def test_defaults_visible_explanations_and_existing_layout(self):
self.open()
panel = self.go("login")
@@ -164,7 +174,7 @@ class AutoReloginBrowserTests(unittest.TestCase):
expect(delay).to_have_value("30")
for attribute, value in (("min", "1"), ("max", "10080"), ("step", "1")):
expect(delay).to_have_attribute(attribute, value)
for text in ("服务端", "记住账号和密码", "原区服", "角色", "恢复监控", "策略保持停止", "关闭页面", "服务重启"):
for text in ("服务端", "记住账号和密码", "原区服", "角色", "恢复监控", "自动执行已勾选功能", "顶部“停止”", "关闭页面", "服务重启"):
expect(panel).to_contain_text(text)
self.assertTrue(enabled.evaluate("node => Boolean(node.closest('.policy-form'))"))
self.assertTrue(enabled.evaluate("node => Boolean(node.compareDocumentPosition(document.querySelector('.login-layout')) & Node.DOCUMENT_POSITION_FOLLOWING)"))
@@ -176,6 +186,131 @@ class AutoReloginBrowserTests(unittest.TestCase):
self.assertEqual(self.writes, [])
self.assertEqual(self.actions, [])
def test_server_candidates_wait_for_role_then_run_only_selected_features_and_allow_stop(self):
self.configs[self.first]["daily_policy"].update(enabled=True, selected=["gift"])
original = copy.deepcopy(self.configs[self.first])
candidates = {"servers": [{"id": 7, "name": "离线测试区", "role_name": "离线角色"}]}
def login(payload):
self.login_data[self.first].update(candidates)
return {"id": "mock-login", "operation": "login", "status": "succeeded", "result": candidates}
def stop(payload):
self.summaries[self.first]["running"] = False
return {"id": "mock-stop", "operation": "stop", "status": "succeeded", "result": {"message": "策略已停止"}}
self.action_handlers.update({(self.first, "login"): login,
(self.first, "enter_server"): lambda payload: self.complete_login("enter_server"),
(self.first, "stop"): stop})
self.open()
panel = self.go("login")
panel.get_by_label("游戏账号", exact=True).fill("offline-role-test")
panel.get_by_label("游戏密码", exact=True).fill("synthetic-password")
panel.get_by_role("button", name="账号密码登录 / 获取区服", exact=True).click()
expect(panel.get_by_label("区服 / 角色", exact=True)).to_contain_text("离线测试区")
expect(self.page.locator("#connection")).to_have_text("游戏离线")
toggle = self.page.locator("#strategy-toggle")
expect(toggle).to_have_text("开启")
expect(toggle).to_be_disabled()
expect(self.page.locator("#notice")).to_be_hidden()
self.assertFalse(self.summaries[self.first]["running"])
panel.get_by_role("button", name="进入选中区服", exact=True).click()
expect(toggle).to_have_text("停止")
expect(toggle).to_have_attribute("aria-pressed", "true")
expect(self.page.locator("#notice")).to_contain_text("已自动开启策略")
expect(self.page.locator("#status-text")).to_contain_text("已配置且已勾选的功能")
expect(self.page.locator("#data-summary")).to_contain_text("顶部“停止”")
expect(self.page.locator("#page-tabs [role=tab]")).to_have_count(15)
self.assertEqual(self.configs[self.first], original, "Logging in must preserve every feature selection")
toggle.click()
expect(toggle).to_have_text("开启")
expect(self.page.locator("#data-summary")).to_contain_text("策略已停止")
self.assertEqual([operation for _, operation, _ in self.actions], ["login", "enter_server", "stop"])
self.assertEqual(self.actions[1][2], {"server_id": "7"})
self.assertEqual(self.configs[self.first], original)
self.assertEqual(self.writes, [])
def test_import_stays_stopped_and_next_restored_session_runs_imported_selection(self):
imported = copy.deepcopy(default_config())
imported["daily_policy"].update(enabled=True, selected=["gift"])
portable = export_config(imported)
imports = []
self.login_data[self.first]["saved_sessions"] = [{"id": "offline-session", "label": "离线区服 / 原角色"}]
self.action_handlers[(self.first, "restore_session")] = lambda payload: self.complete_login("restore_session")
def import_config(route):
imports.append(route.request.post_data_json)
self.configs[self.first] = copy.deepcopy(imported)
self.summaries[self.first]["running"] = False
self.summaries[self.first]["revision"] += 1
self.fulfill(route, {"id": "mock-import", "operation": "import_config", "status": "succeeded", "result": {}})
self.page.route(f"**/api/accounts/{self.first}/config/import", import_config)
self.open()
panel = self.go("login")
self.page.locator('.menu > summary').nth(2).click()
with self.page.expect_file_chooser() as chooser:
self.page.locator('[data-command="import-config"]').click()
chooser.value.set_files({"name": "offline-policy.json", "mimeType": "application/json",
"buffer": json.dumps(portable).encode("utf-8")})
expect(self.page.locator("#dialog-content")).to_contain_text("下次成功登录会自动执行已勾选功能")
self.page.locator("#dialog-confirm").click()
expect(self.page.locator("#notice")).to_contain_text("策略已导入,执行已停止")
expect(self.page.locator("#strategy-toggle")).to_be_disabled()
self.assertEqual(imports, [portable])
self.assertEqual(self.actions, [])
panel.get_by_role("button", name="恢复选中会话(无需重新输密码)", exact=True).click()
expect(self.page.locator("#strategy-toggle")).to_have_text("停止")
expect(self.page.locator("#notice")).to_contain_text("已自动开启策略")
self.assertEqual(self.actions, [(self.first, "restore_session", {"session_id": "offline-session"})])
self.assertEqual(self.configs[self.first], imported, "Restoring must preserve imported selections")
self.assertEqual(self.writes, [])
def test_failed_candidates_and_disconnected_success_jobs_never_report_login_success(self):
self.login_data[self.first].update(servers=[{"id": 7, "name": "候选区服"}],
saved_sessions=[{"id": "offline-session", "label": "候选角色"}])
for operation, label in (("enter_server", "进入选中区服"), ("restore_session", "恢复选中会话(无需重新输密码)")):
for job_status in ("failed", "succeeded"):
with self.subTest(operation=operation, job_status=job_status):
self.action_handlers[(self.first, operation)] = lambda payload, op=operation, status=job_status: {
"id": "mock-candidate", "operation": op, "status": status,
"error": "候选角色验证失败", "result": {"message": "候选声称登录成功"}}
self.open()
panel = self.go("login")
self.page.evaluate("""() => {
window.loginFeedback = [];
new MutationObserver(() => {
for (const id of ['status-text', 'notice']) {
const node = document.getElementById(id);
if (node && !node.hidden) window.loginFeedback.push(node.textContent);
}
}).observe(document.body, {subtree:true, childList:true, characterData:true,
attributes:true, attributeFilter:['hidden']});
}""")
panel.get_by_role("button", name=label, exact=True).click()
expect(self.page.locator("#notice.error")).to_be_visible()
expect(self.page.locator("#notice")).to_contain_text("候选角色验证失败" if job_status == "failed" else "尚未连接游戏")
expect(self.page.locator("#connection")).to_have_text("游戏离线")
expect(self.page.locator("#strategy-toggle")).to_be_disabled()
feedback = "\n".join(self.page.evaluate("window.loginFeedback"))
for false_success in ("已完成", "已读取角色", "已自动开启策略", "候选声称登录成功"):
self.assertNotIn(false_success, feedback)
self.assertNotIn("start", [operation for _, operation, _ in self.actions])
self.assertEqual(self.writes, [])
def test_stop_after_restore_is_shown_from_confirmed_server_status(self):
self.login_data[self.first]["saved_sessions"] = [{"id": "offline-session", "label": "离线角色"}]
self.action_handlers[(self.first, "restore_session")] = lambda payload: self.complete_login("restore_session", running=False)
self.open()
panel = self.go("login")
panel.get_by_role("button", name="恢复选中会话(无需重新输密码)", exact=True).click()
expect(self.page.locator("#connection")).to_have_text("已登录")
expect(self.page.locator("#notice")).to_contain_text("策略已停止")
expect(self.page.locator("#notice")).not_to_contain_text("已自动开启")
expect(self.page.locator("#data-summary")).to_contain_text("策略已停止")
expect(self.page.locator("#strategy-toggle")).to_have_text("开启")
self.assertEqual(self.actions, [(self.first, "restore_session", {"session_id": "offline-session"})])
def test_native_autosave_range_validation_refresh_and_focus(self):
self.open()
panel = self.go("login")
@@ -286,10 +421,14 @@ class AutoReloginBrowserTests(unittest.TestCase):
self.set_status(self.first, "failed", reason)
expect(status).to_contain_text(reason)
expect(status.locator("img")).to_have_count(0)
self.set_status(self.first, "monitoring", "重登成功,已恢复监控,策略保持停止")
self.summaries[self.first].update(connected=True, connection_state="online", connection_message="游戏连接正常", running=False)
expect(status).to_contain_text("已恢复监控,策略保持停止")
expect(self.page.locator("#strategy-toggle")).to_have_text("开启")
expect(self.page.locator("#strategy-toggle")).to_be_disabled()
original = copy.deepcopy(self.configs[self.first])
self.set_status(self.first, "monitoring", "重登成功,已恢复监控并自动执行已勾选功能,可在顶部停止")
self.summaries[self.first].update(connected=True, connection_state="online", connection_message="游戏连接正常", running=True)
expect(status).to_contain_text("已恢复监控并自动执行已勾选功能")
expect(self.page.locator("#strategy-toggle")).to_have_text("停止")
expect(self.page.locator("#data-summary")).to_contain_text("正在自动执行已配置且已勾选的功能")
self.assertEqual(self.configs[self.first], original)
self.assertEqual(self.actions, [])
def test_restart_wait_persists_across_reload_and_closing_page_has_no_actions(self):
@@ -297,12 +436,15 @@ class AutoReloginBrowserTests(unittest.TestCase):
self.open()
panel = self.go("login")
expect(panel.locator("[data-auto-relogin-status]")).to_contain_text("服务重启")
expect(self.page.locator("#strategy-toggle")).to_be_disabled()
before = len(self.writes)
self.page.reload(wait_until="networkidle")
panel = self.go("login")
expect(self.controls(panel)[0]).to_be_checked()
expect(self.controls(panel)[1]).to_have_value("30")
expect(panel.locator("[data-auto-relogin-countdown]")).to_contain_text("秒后自动重新登录")
expect(self.page.locator("#strategy-toggle")).to_have_text("开启")
expect(self.page.locator("#strategy-toggle")).to_be_disabled()
self.page.goto("about:blank")
self.page.close()
self.assertEqual(len(self.writes), before)