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
+92 -2
View File
@@ -32,6 +32,7 @@ class AutoReloginTests(unittest.TestCase):
idle = fixtures.ServiceTests.idle
job = fixtures.ServiceTests.job
login = fixtures.ServiceTests.login
enable = fixtures.ServiceTests.enable
def connected(self, *, remember=True, server=2, account=None):
self.manager.login_factory = AutoLogin
@@ -79,6 +80,8 @@ class AutoReloginTests(unittest.TestCase):
def test_first_expiry_deadline_survives_idle_refresh_and_duplicate_ticks(self):
identifier, worker = self.connected()
self.enable(identifier)
selected = deepcopy(worker.config)
identity = worker.active_identity
self.disconnect(identifier, worker)
status = self.auto_status(identifier)
@@ -92,13 +95,17 @@ class AutoReloginTests(unittest.TestCase):
self.assertEqual(self.auto_status(identifier)["next_attempt_at"], status["next_attempt_at"])
self.assertEqual(len(AutoLogin.calls), before)
self.now += 1
self.tick(identifier, worker)
result = self.tick(identifier, worker)["result"]
self.assertEqual(len(AutoLogin.calls), before + 1)
self.assertEqual(worker.active_identity, identity)
self.assertEqual(worker.engine.client.session.server_id, 2)
self.assertEqual(worker.engine.client.session.role_id, 102)
self.assertTrue(self.manager.status(identifier)["connected"])
self.assertFalse(self.manager.status(identifier)["running"])
self.assertTrue(self.manager.status(identifier)["running"])
self.assertTrue(worker.engine.auto)
self.assertTrue(result["running"])
self.assertIn("已勾选", result["message"])
self.assertEqual(worker.config, selected)
self.assertTrue(worker.schedule.monitoring)
self.assertIsNone(self.auto_status(identifier)["next_attempt_at"])
for _ in range(3):
@@ -201,6 +208,8 @@ class AutoReloginTests(unittest.TestCase):
with patch.object(AutoLogin, "authenticate", wrong):
self.tick(identifier, worker)
self.assertFalse(self.manager.status(identifier)["connected"])
self.assertFalse(worker.running)
self.assertFalse(worker.engine.auto)
self.assertFalse(any(url.endswith("userServerService/enterGame")
for _, url, _ in fixtures.FakeClient.calls[before:]))
self.assertEqual(self.auto_status(identifier)["state"], "failed")
@@ -239,6 +248,8 @@ class AutoReloginTests(unittest.TestCase):
def test_portable_import_preserves_local_login_preference(self):
identifier, worker = self.connected()
self.enable(identifier)
self.job(identifier, self.manager.submit(identifier, "start"))
portable = export_config(default_config(), worker.engine.snapshot)
self.job(identifier, self.manager.submit(identifier, "import_config", {"config": portable}))
self.assertEqual(self.manager.get_config(identifier)["config"]["auto_relogin"],
@@ -246,6 +257,85 @@ 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)
def test_restart_opt_in_activates_after_thirty_minutes_and_supersedes_old_stop(self):
identifier, worker = self.connected()
self.enable(identifier)
self.configure(identifier, delay=30)
self.manager.submit(identifier, "stop")
selected = deepcopy(worker.config)
self.manager.close()
before = len(AutoLogin.calls), len(fixtures.FakeClient.calls)
self.manager = WebManager(self.root, start_scheduler=False, login_factory=AutoLogin)
self.addCleanup(self.manager.close)
self.idle(identifier)
worker = self.manager._worker(identifier)
self.assertFalse(worker.running)
self.assertFalse(worker.engine.auto)
self.assertIsNone(worker.engine.client)
self.assertEqual((len(AutoLogin.calls), len(fixtures.FakeClient.calls)), before)
origin = worker.schedule.disconnected_at
worker.schedule.clock = lambda: self.now
self.now = origin + 1799
self.tick(identifier, worker)
self.assertFalse(worker.running)
self.assertEqual(len(AutoLogin.calls), before[0])
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.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"):
with self.subTest(operation=operation):
identifier, worker = self.connected()
self.enable(identifier)
self.disconnect(identifier, worker)
original_client = worker.engine.client
identity = worker.active_identity
entered, release = threading.Event(), threading.Event()
self.addCleanup(release.set)
original = worker.securestore.set_active
def held(active):
if active == identity and not release.is_set():
entered.set()
if not release.wait(5):
raise AssertionError("Relogin activation gate not released")
return original(active)
self.now += 60
before = self.manager.logs(identifier)["next"]
with patch.object(worker.securestore, "set_active", side_effect=held):
candidate = worker.enqueue("__tick")
self.assertTrue(entered.wait(2))
if operation in {"stop", "logout", "forget_login"}:
followup = self.manager.submit(identifier, operation)
else:
config = self.manager.get_config(identifier)["config"]
if operation == "policy":
config["daily_policy"]["enabled"] = False
else:
config["auto_relogin"].update(enabled=operation != "disable", delay_minutes=2)
followup = self.manager.set_config(identifier, config)["job"]
self.assertFalse(worker.running)
release.set()
self.job(identifier, candidate, status="cancelled")
self.job(identifier, followup)
self.assertFalse(worker.running)
self.assertFalse(worker.engine.auto)
if operation in {"logout", "forget_login"}:
self.assertIsNone(worker.engine.client)
else:
self.assertIs(worker.engine.client, original_client)
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):
identifier, worker = self.connected()