值守补强: 合成脚本自己确认/拉起 MCP 服务
计划任务 LcMCPServer 配了 RestartCount=3 / PT1M, 但那只在进程"崩溃"时生效。 服务压根没起来(或重启后还没登录)时, convert_modules 会因为连不上 8765 而失败 —— 而值守场景没人手动救它。 新增 server_listening() / ensure_server(): 先探端口, 不通就用 pythonw 拉起 lc_mcp.server 并等它就绪(最多 90 秒)。已监听时 0.03 秒直接返回, 不引入额外延迟。 同时把 REPO / PYW / SERVER_PORT 提成模块常量, 不再散落魔法值。 新增 4 个用例(端口探测返回 bool、已监听时短路、不通时尝试拉起一次、端口号与项目一致)。 全套 250/250 通过。
This commit is contained in:
@@ -32,6 +32,9 @@ from lc_ui import HERE, click, items, keypress, probe, screen_text
|
|||||||
|
|
||||||
GAME_EXE = r'D:\SteamLibrary\steamapps\common\Limbus Company\LimbusCompany.exe'
|
GAME_EXE = r'D:\SteamLibrary\steamapps\common\Limbus Company\LimbusCompany.exe'
|
||||||
GAME_PROC = 'LimbusCompany'
|
GAME_PROC = 'LimbusCompany'
|
||||||
|
REPO = os.path.dirname(HERE) if os.path.basename(HERE) == 'scripts' else HERE
|
||||||
|
PYW = os.path.join(REPO, 'vendor', 'aalc', '.venv', 'Scripts', 'pythonw.exe')
|
||||||
|
SERVER_PORT = 8765
|
||||||
|
|
||||||
# --- 坐标(1600x900 基准; lc_ui 会换算到真实客户区) ---
|
# --- 坐标(1600x900 基准; lc_ui 会换算到真实客户区) ---
|
||||||
MODULE_ICON = (390, 805) # 主界面底栏, 绿胶囊图标(点开合成面板)
|
MODULE_ICON = (390, 805) # 主界面底栏, 绿胶囊图标(点开合成面板)
|
||||||
@@ -61,6 +64,46 @@ def log(msg):
|
|||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------- MCP 服务
|
||||||
|
|
||||||
|
def server_listening(host='127.0.0.1', port=SERVER_PORT, timeout=1.0):
|
||||||
|
import socket
|
||||||
|
s = socket.socket()
|
||||||
|
s.settimeout(timeout)
|
||||||
|
try:
|
||||||
|
s.connect((host, port))
|
||||||
|
return True
|
||||||
|
except OSError:
|
||||||
|
return False
|
||||||
|
finally:
|
||||||
|
s.close()
|
||||||
|
|
||||||
|
|
||||||
|
def ensure_server(timeout_s=90):
|
||||||
|
"""确保 lc-mcp 的 TCP 服务在监听, 不在就拉起来。
|
||||||
|
|
||||||
|
值守场景下没人手动救它。虽然计划任务 LcMCPServer 配了 RestartCount=3,
|
||||||
|
但那只在进程"崩溃"时生效; 服务没起来(或重启后没登录)时, 这边的合成会
|
||||||
|
直接因为连不上而失败。自己拉一把最省事。
|
||||||
|
"""
|
||||||
|
if server_listening():
|
||||||
|
return True
|
||||||
|
log('MCP 服务(%d)未监听, 尝试拉起' % SERVER_PORT)
|
||||||
|
try:
|
||||||
|
subprocess.Popen([PYW, '-m', 'lc_mcp.server'], cwd=REPO, close_fds=True)
|
||||||
|
except OSError as e:
|
||||||
|
log('拉起服务失败: %s' % e)
|
||||||
|
return False
|
||||||
|
t0 = time.time()
|
||||||
|
while time.time() - t0 < timeout_s:
|
||||||
|
time.sleep(2)
|
||||||
|
if server_listening():
|
||||||
|
log('服务已就绪 (%.0fs)' % (time.time() - t0))
|
||||||
|
return True
|
||||||
|
log('等服务就绪超时(%ds)' % timeout_s)
|
||||||
|
return False
|
||||||
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------- 屏幕判定
|
# ---------------------------------------------------------------- 屏幕判定
|
||||||
|
|
||||||
def screen():
|
def screen():
|
||||||
@@ -346,6 +389,8 @@ def main(argv=None):
|
|||||||
|
|
||||||
log('=== 开始: 体力换模块 ===')
|
log('=== 开始: 体力换模块 ===')
|
||||||
|
|
||||||
|
if not ensure_server():
|
||||||
|
return done(1, 'MCP 服务连不上, 也没能拉起来')
|
||||||
if not launch_game():
|
if not launch_game():
|
||||||
return done(1, '游戏启动失败')
|
return done(1, '游戏启动失败')
|
||||||
if not wait_main_menu(args.start_timeout):
|
if not wait_main_menu(args.start_timeout):
|
||||||
|
|||||||
@@ -98,6 +98,34 @@ class LunacyReadTest(unittest.TestCase):
|
|||||||
self.assertIsNone(cm.read_lunacy())
|
self.assertIsNone(cm.read_lunacy())
|
||||||
|
|
||||||
|
|
||||||
|
class ServerBootstrapTest(unittest.TestCase):
|
||||||
|
"""值守时没人手动救服务, 所以脚本要能自己确认/拉起 lc-mcp 的 TCP 服务。
|
||||||
|
|
||||||
|
计划任务 LcMCPServer 配了 RestartCount=3, 但那只在进程"崩溃"时生效;
|
||||||
|
服务压根没起来(或重启后还没登录)时, 合成会因为连不上而失败。
|
||||||
|
"""
|
||||||
|
|
||||||
|
def test_listening_returns_bool(self):
|
||||||
|
self.assertIsInstance(cm.server_listening(timeout=0.5), bool)
|
||||||
|
|
||||||
|
def test_ensure_server_short_circuits_when_listening(self):
|
||||||
|
with mock.patch.object(cm, 'server_listening', lambda **kw: True):
|
||||||
|
self.assertTrue(cm.ensure_server(timeout_s=1))
|
||||||
|
|
||||||
|
def test_ensure_server_gives_up_when_never_listening(self):
|
||||||
|
calls = []
|
||||||
|
with mock.patch.object(cm, 'server_listening', lambda **kw: False), \
|
||||||
|
mock.patch.object(cm.subprocess, 'Popen',
|
||||||
|
lambda *a, **k: calls.append(a)), \
|
||||||
|
mock.patch.object(cm.time, 'sleep', lambda s: None):
|
||||||
|
self.assertFalse(cm.ensure_server(timeout_s=0))
|
||||||
|
self.assertEqual(len(calls), 1, '应该尝试拉起服务一次')
|
||||||
|
|
||||||
|
def test_server_port_matches_the_project_default(self):
|
||||||
|
# 服务端 lc_mcp/server.py 用的就是 8765, 改这里要同步改
|
||||||
|
self.assertEqual(cm.SERVER_PORT, 8765)
|
||||||
|
|
||||||
|
|
||||||
class ForbiddenCoordinateTest(unittest.TestCase):
|
class ForbiddenCoordinateTest(unittest.TestCase):
|
||||||
"""Use Lunacy 页签的坐标只能用于"确认没点到它", 不能出现在任何点击路径上。
|
"""Use Lunacy 页签的坐标只能用于"确认没点到它", 不能出现在任何点击路径上。
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user