fix: preserve strategy intent and recover accounts automatically

This commit is contained in:
AttilaNet
2026-11-11 19:37:15 +08:00
parent ccb945631d
commit 5c253d5cf9
26 changed files with 1628 additions and 236 deletions
+66 -17
View File
@@ -12,6 +12,7 @@ from ranch_web.activity import ActivityLogError
from ranch_web.service import WebManager
from ranch_web.scheduler import Scheduler
from ranch_web.tests import test_service as fixtures
from ranch_web.tests.test_auto_relogin import AutoLogin
class ConnectionStateTests(unittest.TestCase):
@@ -73,9 +74,9 @@ class ConnectionStateTests(unittest.TestCase):
self.job(identifier, self.manager.submit(identifier, "restore_session", {"session_id": worker.active_identity}))
self.assertEqual(self.manager.status(identifier)["connection_state"], "online")
self.assertTrue(self.manager.status(identifier)["running"])
self.assertTrue(worker.engine.auto)
self.assertFalse(worker.engine.auto, "Session verification must not authorize selected writes inline")
def test_explicit_stop_survives_heartbeat_local_refresh_and_monitor_until_login(self):
def test_explicit_stop_survives_heartbeat_refresh_monitor_and_relogin(self):
identifier, worker = self.connected(running=True)
self.manager.submit(identifier, "stop")
worker.engine.last_heartbeat = 0
@@ -90,8 +91,16 @@ class ConnectionStateTests(unittest.TestCase):
self.assertTrue(self.manager.status(identifier)["connected"])
result = self.job(identifier, self.manager.submit(identifier, "restore_session", {
"session_id": worker.active_identity}))["result"]
self.assertTrue(result["running"])
self.assertTrue(worker.engine.auto)
self.assertFalse(result["running"])
self.assertFalse(worker.engine.auto)
self.assertTrue(self.manager.status(identifier)["manual_stop"])
self.assertFalse(self.manager.status(identifier)["strategy_requested"])
self.login(identifier)
self.assertFalse(worker.running, "Password login erased the same role's explicit Stop")
self.assertFalse(worker.engine.auto)
self.job(identifier, self.manager.submit(identifier, "start"))
self.assertTrue(worker.running)
self.assertFalse(self.manager.status(identifier)["manual_stop"])
def test_timeout_retries_only_snapshot_and_keeps_uncertain_write_evidence(self):
identifier, worker = self.connected(running=True)
@@ -127,6 +136,10 @@ class ConnectionStateTests(unittest.TestCase):
self.assertIsNone(self.manager.status(identifier)["next_retry_at"])
self.assertIsNotNone(self.manager.status(identifier)["last_game_success_at"])
self.assertFalse(worker.running)
self.assertFalse(worker.engine.auto)
self.assertTrue(self.manager.status(identifier)["strategy_requested"])
self.assertEqual(self.manager.status(identifier)["strategy_state"], "blocked")
self.assertFalse(self.manager.status(identifier)["manual_stop"])
self.assertEqual(journal.pending(worker.engine.snapshot)["attempt_id"], pending["attempt_id"])
self.assertEqual(evidence.read_bytes(), before)
# Continue through the ordinary monitor/reconcile path after recovery.
@@ -140,6 +153,9 @@ class ConnectionStateTests(unittest.TestCase):
self.assertEqual(journal.pending(worker.engine.snapshot)["attempt_id"], pending["attempt_id"])
self.assertEqual(journal.pending(worker.engine.snapshot)["phase"], "unknown")
self.assertFalse(worker.running)
self.assertFalse(worker.engine.auto)
self.assertTrue(self.manager.status(identifier)["strategy_requested"])
self.assertEqual(evidence.read_bytes(), before)
def test_business_rejection_keeps_connection_and_idle_does_not_clear_error(self):
identifier, worker = self.connected(running=True)
@@ -236,8 +252,8 @@ class ConnectionStateTests(unittest.TestCase):
self.assertEqual(self.manager.status(identifier)["error"], reason)
self.assertFalse(self.manager.status(identifier)["connected"])
def test_failed_restore_candidate_does_not_poison_online_client(self):
identifier, worker = self.connected()
def test_failed_restore_and_login_candidates_preserve_online_client_and_monitor(self):
identifier, worker = self.connected(running=True)
client = worker.engine.client
original = deepcopy(self.manager.status(identifier))
response = self.expiry(worker)
@@ -250,6 +266,30 @@ class ConnectionStateTests(unittest.TestCase):
self.assertEqual(state["last_game_success_at"], original["last_game_success_at"])
self.assertEqual(state["connection_message"], original["connection_message"])
self.assertTrue(state["connected"])
for fail in (True, False):
with self.subTest(login_failure=fail):
before = len(fixtures.FakeClient.calls)
if fail:
with patch.object(fixtures.FakeLogin, "authenticate", side_effect=ApiError("Candidate login failed")):
self.job(identifier, self.manager.submit(identifier, "login", {
"account": "synthetic-owner", "password": "synthetic-password"}), status="failed")
else:
self.job(identifier, self.manager.submit(identifier, "login", {
"account": "synthetic-owner", "password": "synthetic-password"}))
self.assertIs(worker.engine.client, client)
self.assertFalse(client.closed)
self.assertTrue(self.manager.status(identifier)["connected"])
self.assertTrue(self.manager.status(identifier)["strategy_requested"])
self.assertEqual(len(fixtures.FakeClient.calls), before,
"Server discovery issued old-role strategy writes inline")
self.now += 61
worker.engine.last_heartbeat = self.now
worker.schedule.next_poll = 0
with patch.object(worker.engine, "poll", wraps=worker.engine.poll) as poll:
self.tick(identifier, worker)
self.assertEqual(poll.call_count, 1, "An online role lost automatic polling after candidate login")
self.assertTrue(worker.schedule.monitoring)
self.assertTrue(worker.running)
def test_failed_same_protocol_restore_preserves_counter_high_water_before_wire_and_finally(self):
identifier, worker = self.connected()
@@ -321,7 +361,7 @@ class ConnectionStateTests(unittest.TestCase):
self.idle(identifier)
logs = self.manager.logs(identifier, after=old_cursor)
self.assertGreater(logs["next"], old_cursor)
self.assertTrue(any("重启" in row["message"] and "恢复" in row["message"] for row in logs["entries"]))
self.assertTrue(any("重启" in row["message"] and "重新登录" in row["message"] for row in logs["entries"]))
all_logs = self.manager.logs(identifier, debug=True)["entries"]
self.assertTrue(any("可持久保存的运行事件" == row["message"] for row in all_logs))
self.assertFalse(any("不持久保存的调试内容" == row["message"] for row in all_logs))
@@ -408,32 +448,41 @@ class ConnectionStateTests(unittest.TestCase):
self.assertEqual(messages[2], "账号工作区已载入")
self.assertFalse(any("无法持久保存" in message for message in messages[1:]))
def test_restart_and_explicit_logout_require_manual_restore(self):
def test_restart_and_logout_retain_explicit_stop_and_saved_login(self):
identifier, worker = self.connected()
self.manager.close()
calls = len(fixtures.FakeClient.calls)
self.manager = WebManager(self.root, start_scheduler=False, login_factory=fixtures.FakeLogin)
self.manager = WebManager(self.root, start_scheduler=False, login_factory=AutoLogin)
self.addCleanup(self.manager.close)
self.idle(identifier)
worker = self.manager._worker(identifier)
state = self.manager.status(identifier)
self.assertEqual(state.get("connection_state"), "offline")
self.assertIn("重启", state["connection_message"])
self.assertIn("恢复", state["connection_message"])
self.assertIn("重新登录", state["connection_message"])
self.assertFalse(state["running"])
self.assertEqual(len(fixtures.FakeClient.calls), calls)
self.tick(identifier, worker)
self.assertEqual(len(fixtures.FakeClient.calls), calls)
self.assertTrue(state["manual_stop"])
self.assertFalse(state["strategy_requested"])
self.job(identifier, self.manager.submit(identifier, "restore_session", {"session_id": worker.active_identity}))
self.assertFalse(worker.running)
identity = worker.active_identity
self.job(identifier, self.manager.submit(identifier, "logout"))
calls = len(fixtures.FakeClient.calls)
self.now += 10000
self.assertEqual(worker.active_identity, identity)
self.assertEqual(worker.securestore.active(), identity)
self.assertTrue(worker.securestore.load_credentials()[0])
self.assertEqual(self.manager.status(identifier)["auto_relogin_status"]["state"], "waiting")
# The delay is anchored in the restarted scheduler's own clock.
self.now = worker.schedule.disconnected_at + worker.config["auto_relogin"]["delay_minutes"] * 60
worker.schedule.clock = lambda: self.now
attempts = len(AutoLogin.calls)
self.tick(identifier, worker)
state = self.manager.status(identifier)
self.assertEqual(state["connection_state"], "offline")
self.assertIn("退出", state["connection_message"])
self.assertEqual(len(AutoLogin.calls), attempts + 1)
self.assertTrue(state["connected"])
self.assertEqual(state["auto_relogin_status"]["state"], "idle")
self.assertTrue(state["manual_stop"])
self.assertFalse(state["running"])
self.assertEqual(len(fixtures.FakeClient.calls), calls)
class ErrorClassificationTests(unittest.TestCase):