Speed up equity/position display after CTP reconnect and auto-refresh stale sessions before market open.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
dekun
2026-07-03 21:17:15 +08:00
parent 61481d5749
commit d6776d2b8e
4 changed files with 110 additions and 21 deletions
+46 -12
View File
@@ -173,7 +173,7 @@ def _fire_position_refresh_callback_debounced(*, min_interval: float = 0.35) ->
def _fire_position_refresh_burst() -> None:
"""连接后持仓回报可能分批到达,分多次触发快照刷新。"""
_fire_position_refresh_callback()
for delay in (0.4, 0.9, 1.5, 3.0, 6.0, 12.0, 20.0):
for delay in (0.3, 0.7, 1.2, 2.5, 5.0, 10.0):
threading.Timer(delay, _fire_position_refresh_callback).start()
@@ -228,7 +228,7 @@ _bridge: Optional["CtpBridge"] = None
_bridge_lock = threading.Lock()
_ctp_td_lock = threading.RLock()
POSITION_QUERY_MIN_INTERVAL_SEC = 5.0
POSITION_QUERY_RETRY_DELAYS_SEC = (1.5, 4.0, 9.0, 18.0, 35.0)
POSITION_QUERY_RETRY_DELAYS_SEC = (0.8, 2.0, 4.0, 8.0, 15.0)
TRADE_QUERY_MIN_INTERVAL_SEC = 10.0
@@ -783,6 +783,7 @@ class CtpBridge:
"connected": self._connected_mode == mode,
"connecting": connecting,
"connected_mode": self._connected_mode,
"td_logged_in": self._td_logged_in() if self._connected_mode == mode else False,
"mode_label": _mode_label(mode),
"missing_config": missing,
"last_error": last_error,
@@ -1375,11 +1376,13 @@ class CtpBridge:
return False
if self._td_logged_in():
return True
try:
if self._engine.get_all_accounts():
return True
except Exception as exc:
logger.debug("CTP ping failed: %s", exc)
age = time.time() - float(getattr(self, "_last_connect_ok_ts", 0) or 0)
if age < 90:
try:
if self._engine.get_all_accounts():
return True
except Exception as exc:
logger.debug("CTP ping failed: %s", exc)
self._connected_mode = None
return False
@@ -2900,10 +2903,39 @@ def ctp_start_connect(mode: str, *, force: bool = False, scheduled: bool = False
return {**info, "status": st}
def ctp_session_needs_reconnect(mode: str) -> bool:
"""连接看似在线但不可交易、无资金回报或会话过旧时需强制重连。"""
if _use_ctp_worker_client():
st = ctp_ipc_client.status(mode)
if not st.get("connected"):
return True
if not st.get("td_logged_in"):
return True
return False
b = get_bridge()
if b.connected_mode != mode:
return True
if not b._td_logged_in():
return True
age = time.time() - float(getattr(b, "_last_connect_ok_ts", 0) or 0)
if age > 3 * 3600:
return True
try:
acc = b.get_account()
if float(acc.get("balance") or 0) <= 0:
return True
except Exception:
return True
return False
def ctp_try_auto_reconnect(mode: str) -> bool:
"""断线时静默异步重连;已连接且交易通道正常则不再重复 connect。"""
if _use_ctp_worker_client():
info = ctp_ipc_client.start_connect(mode, force=False, scheduled=True)
if ctp_session_needs_reconnect(mode):
info = ctp_ipc_client.start_connect(mode, force=True, scheduled=True)
else:
info = ctp_ipc_client.start_connect(mode, force=False, scheduled=True)
return bool(
info.get("connected")
or info.get("connecting")
@@ -2921,13 +2953,15 @@ def ctp_try_auto_reconnect(mode: str) -> bool:
st = _setting_for_mode(mode)
if not st.get("用户名") or not st.get("密码") or not st.get("交易服务器"):
return False
force = False
if b.connected_mode == mode:
if b._td_logged_in() or b.ping():
if not ctp_session_needs_reconnect(mode):
return True
recent = time.time() - float(getattr(b, "_last_connect_ok_ts", 0) or 0)
if recent < 120:
logger.debug("CTP 跳过自动重连:刚连接 %.0fs", recent)
if recent < 45 and b._td_logged_in():
return True
force = True
logger.info("CTP 会话失效或过旧,强制重连 [%s]", mode)
td = st.get("交易服务器", "")
ok, err = probe_tcp_address(td, timeout=4.0)
if not ok:
@@ -2936,7 +2970,7 @@ def ctp_try_auto_reconnect(mode: str) -> bool:
"请更新 SIMNOW_TD_ADDRESS 并确认服务器出网。"
)
return False
info = b.start_connect_async(mode, force=False, scheduled=True)
info = b.start_connect_async(mode, force=force, scheduled=True)
return bool(
info.get("connected")
or info.get("connecting")