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
+83 -17
View File
@@ -9,6 +9,7 @@ from unittest.mock import patch
import requests
from ranch_assistant.api import ApiError, SessionExpiredError
from ranch_assistant.model import Action
from ranch_web.policies import default_config, export_config, validate_config
from ranch_web.service import WebManager
from ranch_web.tests import test_service as fixtures
@@ -102,7 +103,7 @@ class AutoReloginTests(unittest.TestCase):
self.assertEqual(worker.engine.client.session.role_id, 102)
self.assertTrue(self.manager.status(identifier)["connected"])
self.assertTrue(self.manager.status(identifier)["running"])
self.assertTrue(worker.engine.auto)
self.assertFalse(worker.engine.auto, "Authentication must not run selected writes inline")
self.assertTrue(result["running"])
self.assertIn("已勾选", result["message"])
self.assertEqual(worker.config, selected)
@@ -128,10 +129,39 @@ class AutoReloginTests(unittest.TestCase):
def test_recovery_clears_outage_and_next_outage_gets_fresh_delay(self):
identifier, worker = self.connected()
self.enable(identifier)
self.disconnect(identifier, worker, timeout=True)
before = len(fixtures.FakeClient.calls)
self.now += 5
self.tick(identifier, worker)
self.assertEqual(self.auto_status(identifier)["state"], "idle")
self.assertTrue(worker.running, "A confirmed read lost the user's execution request")
self.assertFalse(worker.engine.auto, "A retry must not authorize writes in its own job")
self.assertEqual([url.rsplit("/", 2)[-2:] for _, url, _ in fixtures.FakeClient.calls[before:]],
[["masterService", "masterQueryDetail"]])
monster = next(iter(worker.engine.snapshot.monsters))
action = Action("lock", "Synthetic selected action", "monsterService/monsterLock",
{"monsterId": monster, "lock": True})
writes = []
original = worker.engine.client.http.post
def transport(url, *args, **kwargs):
if url.endswith(action.path):
job = worker._execution
writes.append((job.operation, job.consuming, job.generation == worker._generation))
return original(url, *args, **kwargs)
with patch.object(worker.engine, "plans", return_value=[action]), \
patch.object(worker.engine.client.http, "post", side_effect=transport):
# This invokes the real Engine.poll/read_snapshot path. The
# snapshot callback must not enable the selected write inline.
self.job(identifier, self.manager.submit(identifier, "refresh"))
self.assertEqual(writes, [])
self.assertFalse(worker.engine.auto)
worker.engine.last_heartbeat = self.now
worker.schedule.next_poll = 0
self.tick(identifier, worker)
self.assertEqual(writes, [("__tick", True, True)])
self.now += 100
self.disconnect(identifier, worker)
before = len(AutoLogin.calls)
@@ -142,9 +172,9 @@ class AutoReloginTests(unittest.TestCase):
self.tick(identifier, worker)
self.assertEqual(len(AutoLogin.calls), before + 1)
def test_enabling_and_changing_delay_reuses_known_outage(self):
def test_changing_delay_reuses_known_outage(self):
identifier, worker = self.connected()
self.configure(identifier, enabled=False, delay=5)
self.configure(identifier, delay=5)
self.disconnect(identifier, worker)
self.now += 70
self.configure(identifier, delay=2)
@@ -242,9 +272,14 @@ class AutoReloginTests(unittest.TestCase):
self.login(identifier, server=2)
self.assertNotEqual(self.manager.get_config(identifier)["config"]["policy"]["keep_money"], 4321)
self.assertEqual(self.manager.get_config(identifier)["config"]["auto_relogin"]["delay_minutes"], 7)
worker = self.manager._worker(identifier)
identity = worker.active_identity
self.job(identifier, self.manager.submit(identifier, "logout"))
self.assertTrue(self.manager.get_config(identifier)["config"]["auto_relogin"]["enabled"])
self.assertEqual(self.auto_status(identifier)["state"], "suspended")
self.assertEqual(worker.active_identity, identity)
self.assertEqual(worker.securestore.active(), identity)
self.assertTrue(worker.securestore.load_credentials()[0])
self.assertEqual(self.auto_status(identifier)["state"], "waiting")
def test_portable_import_preserves_local_login_preference(self):
identifier, worker = self.connected()
@@ -257,10 +292,14 @@ class AutoReloginTests(unittest.TestCase):
public = json.dumps(self.manager.get_config(identifier)) + json.dumps(export_config(worker.config))
self.assertNotIn("synthetic-password", public)
self.assertNotIn("synthetic-center-token", public)
self.assertFalse(worker.running)
self.assertFalse(worker.engine.auto)
worker.engine.last_heartbeat = self.now
worker.schedule.next_poll = 0
self.tick(identifier, worker)
self.assertTrue(worker.running)
self.assertTrue(worker.engine.auto)
self.assertFalse(self.manager.status(identifier)["manual_stop"])
def test_restart_opt_in_activates_after_thirty_minutes_and_supersedes_old_stop(self):
def test_restart_reconnects_after_thirty_minutes_and_preserves_explicit_stop(self):
identifier, worker = self.connected()
self.enable(identifier)
self.configure(identifier, delay=30)
@@ -285,14 +324,16 @@ class AutoReloginTests(unittest.TestCase):
self.now = origin + 1800
result = self.tick(identifier, worker)["result"]
self.assertTrue(result["connected"])
self.assertTrue(result["running"])
self.assertTrue(worker.running)
self.assertTrue(worker.engine.auto)
self.assertFalse(result["running"])
self.assertFalse(worker.running)
self.assertFalse(worker.engine.auto)
self.assertFalse(self.manager.status(identifier)["strategy_requested"])
self.assertTrue(self.manager.status(identifier)["manual_stop"])
self.assertEqual(worker.config, selected)
self.assertEqual(len(AutoLogin.calls), before[0] + 1)
def test_final_activation_revocation_never_starts_relogin_candidate(self):
for operation in ("stop", "logout", "forget_login", "policy", "disable", "delay"):
for operation in ("stop", "logout", "forget_login", "policy", "delay"):
with self.subTest(operation=operation):
identifier, worker = self.connected()
self.enable(identifier)
@@ -337,7 +378,7 @@ class AutoReloginTests(unittest.TestCase):
self.assertFalse(any("已自动开启" in row["message"]
for row in self.manager.logs(identifier, after=before)["entries"]))
def test_restart_opt_in_waits_and_logout_disarms_restart(self):
def test_restart_waits_and_logout_retains_keep_login_across_restart(self):
identifier, worker = self.connected()
self.manager.close()
before = len(AutoLogin.calls)
@@ -361,13 +402,15 @@ class AutoReloginTests(unittest.TestCase):
self.addCleanup(self.manager.close)
self.idle(identifier)
worker = self.manager._worker(identifier)
self.now += 99999
self.now = worker.schedule.disconnected_at + 60
worker.schedule.clock = lambda: self.now
self.tick(identifier, worker)
self.assertEqual(len(AutoLogin.calls), before)
self.assertEqual(len(AutoLogin.calls), before + 1)
self.assertTrue(self.manager.status(identifier)["connected"])
self.assertTrue(worker.running)
def test_logout_forget_and_delay_change_revoke_inflight_auth_immediately(self):
for operation in ("logout", "forget_login", "disable", "delay"):
for operation in ("logout", "forget_login", "delay"):
with self.subTest(operation=operation):
identifier, worker = self.connected()
self.disconnect(identifier, worker)
@@ -388,7 +431,6 @@ class AutoReloginTests(unittest.TestCase):
self.assertTrue(entered.wait(2))
if operation in {"logout", "forget_login"}:
next_job = self.manager.submit(identifier, operation)
self.assertEqual(self.auto_status(identifier)["state"], "suspended")
else:
config = self.manager.get_config(identifier)["config"]
config["auto_relogin"].update(enabled=operation != "disable", delay_minutes=2)
@@ -398,11 +440,22 @@ class AutoReloginTests(unittest.TestCase):
self.job(identifier, next_job)
self.assertEqual(len(AutoLogin.calls), before)
self.assertFalse(self.manager.status(identifier)["connected"])
if operation == "logout":
# Revoking an in-flight SDK call retains its completion
# backoff as well as keep-login authorization.
self.assertEqual(self.auto_status(identifier)["state"], "failed")
self.assertIsNotNone(self.auto_status(identifier)["next_attempt_at"])
self.assertTrue(worker.securestore.load_credentials()[0])
elif operation == "forget_login":
self.assertFalse(worker.securestore.load_credentials()[0])
self.assertIsNone(worker.active_identity)
def test_account_isolation(self):
first, first_worker = self.connected(account="owner-one")
second, second_worker = self.connected(account="owner-two")
self.configure(second, enabled=False)
self.enable(first)
self.enable(second)
self.configure(second, delay=2)
self.disconnect(first, first_worker)
self.disconnect(second, second_worker)
self.now += 60
@@ -412,6 +465,19 @@ class AutoReloginTests(unittest.TestCase):
self.assertEqual(AutoLogin.calls[before:], [("owner-one", "synthetic-password")])
self.assertTrue(self.manager.status(first)["connected"])
self.assertFalse(self.manager.status(second)["connected"])
self.manager.submit(first, "stop")
self.disconnect(first, first_worker)
self.now += 60
self.tick(first, first_worker)
self.tick(second, second_worker)
self.assertTrue(self.manager.status(first)["connected"])
self.assertFalse(first_worker.running)
self.assertTrue(self.manager.status(first)["manual_stop"])
self.assertTrue(self.manager.status(second)["connected"])
self.assertTrue(second_worker.running)
self.assertFalse(self.manager.status(second)["manual_stop"])
self.assertEqual(AutoLogin.calls[before + 1:],
[("owner-one", "synthetic-password"), ("owner-two", "synthetic-password")])
def test_stop_policy_and_delay_cancellation_back_off_even_after_transport_error(self):
for operation in ("stop", "policy", "delay"):