fix: preserve background connection state and durable disconnect logs

This commit is contained in:
AttilaNet
2026-11-11 11:05:49 +08:00
parent e26d37e9c5
commit 654567caa3
14 changed files with 1622 additions and 48 deletions
+18 -6
View File
@@ -38,7 +38,17 @@ def decode(raw, key):
class ApiError(RuntimeError):
pass
def __init__(self, message, *, code=None):
super().__init__(message)
self.code = code
class SessionExpiredError(ApiError):
"""The game explicitly rejected its saved session (resCode 408)."""
class TemporaryApiError(ApiError):
"""Transport/server failure with an unknown outcome; never replay writes."""
def server_id(server):
@@ -177,20 +187,22 @@ class Client:
headers=dict(result.headers), elapsed_ms=round((time.monotonic() - started) * 1000),
body_preview=result.content[:4000].decode("utf-8", errors="replace"), bytes_received=len(result.content), decoded=False)
if result.status_code != 200:
raise ApiError(f"HTTP {result.status_code},响应无法解码,请查看调试窗口")
error_type = TemporaryApiError if result.status_code in (408, 429) or result.status_code >= 500 else ApiError
raise error_type(f"HTTP {result.status_code},响应无法解码,请查看调试窗口")
raise
if self.trace:
self.trace.emit("response", operation, request_id=identifier, url=url, http_status=result.status_code,
headers=dict(result.headers), elapsed_ms=round((time.monotonic() - started) * 1000), body=response, decoded=True)
if result.status_code != 200:
raise ApiError(f"HTTP {result.status_code},请求已停止")
error_type = TemporaryApiError if result.status_code in (408, 429) or result.status_code >= 500 else ApiError
raise error_type(f"HTTP {result.status_code},请求已停止")
if not isinstance(response, dict):
raise ApiError("游戏接口响应不是 JSON 对象,请查看调试窗口")
code = response.get("resCode")
if code not in (0, "0"):
if str(code) == "408":
raise ApiError("会话已失效,请重新登录或导入有效会话")
raise ApiError(f"游戏接口返回 {code},已停止本轮操作")
raise SessionExpiredError("会话已失效,请手动恢复会话或重新登录", code=408)
raise ApiError(f"游戏接口返回 {code},已停止本轮操作", code=code)
except ApiError as error:
if self.trace:
self.trace.emit("error", operation, request_id=identifier, url=url, message=str(error))
@@ -198,7 +210,7 @@ class Client:
except requests.RequestException as error:
if self.trace:
self.trace.emit("error", operation, request_id=identifier, url=url, exception_type=type(error).__name__, message=str(error))
raise ApiError("网络请求未确认完成;已停止执行,请刷新状态后再启动") from error
raise TemporaryApiError("网络请求未确认完成;已停止执行,请刷新状态后再启动") from error
except (ValueError, TypeError) as error:
if self.trace:
self.trace.emit("error", operation, request_id=identifier, url=url, exception_type=type(error).__name__, message=str(error))
+1 -1
View File
@@ -990,8 +990,8 @@ class Engine:
def keep_alive(self):
if self.demo:
return "离线演示无需心跳"
self.last_heartbeat = time.monotonic()
self.client.call("heartBeatService/keepAlive")
self.last_heartbeat = time.monotonic()
return "会话心跳已更新"
@single_flight