diff --git a/scripts/convert_modules.py b/scripts/convert_modules.py index 697a332..68c3314 100644 --- a/scripts/convert_modules.py +++ b/scripts/convert_modules.py @@ -125,6 +125,69 @@ def render_ok(): return bool(r) +def parse_session_table(text): + """解析 `query session` 的输出。 + + 实测格式(注意: 成功时返回码也是 1, 不能拿返回码判断成败): + SESSIONNAME USERNAME ID STATE TYPE DEVICE + services 0 Disc + >console YWS-HHH 1 Active + 31c5ce94259d4... 65536 Listen + rdp-tcp 65537 Listen + + 行首的 '>' 标出**当前**会话。用户从 RDP 连进来时会变成: + >rdp-tcp#70 YWS-HHH 1 Active + console 3 Conn + 这时物理 console 的画面是空的, BitBlt 采集不到东西。 + """ + current = rdp_active = console = None + for line in text.splitlines(): + raw = line.rstrip() + stripped = raw.strip() + if not stripped or stripped.lower().startswith('sessionname'): + continue + is_current = raw.lstrip().startswith('>') + parts = stripped.lstrip('>').split() + if len(parts) < 3: + continue + name = parts[0] + # ID 列: 从后往前找第一个纯数字, 比按固定列切更耐得住用户名带空格 + sid = None + for tok in parts[1:]: + if tok.isdigit(): + sid = tok + break + state = 'Active' if 'active' in stripped.lower() else ( + 'Disc' if 'disc' in stripped.lower() else '') + if is_current: + current = name + if name.startswith('rdp-tcp#') and state == 'Active': + rdp_active = name + if name == 'console': + console = sid + return {'current': current, 'rdp_active': rdp_active, 'console': console} + + +def session_state(): + """查当前会话归属, 用于把"截不到图"的原因说清楚。 + + 实测两种都会让 BitBlt 失败, 但性质完全不同: + * 会话掉到 Disc -> 看门狗能把它挂回 console, 自愈 + * RDP 会话 Active 占着显示 -> console 画面是空的, 看门狗**不会动**(它只看 Disc) + 不区分的话日志里只会留一句"会话被断开", 排查时会被带偏。 + """ + try: + out = subprocess.run(['query', 'session'], capture_output=True, text=True, + errors='ignore', timeout=20).stdout + except (OSError, subprocess.SubprocessError): + return None + if not isinstance(out, str): + # 拿到的不是文本就别硬解析 —— 这只是诊断信息, 不值得为它炸掉整轮 + return None + st = parse_session_table(out) + return st if any(st.values()) else None + + def ensure_display(timeout_s=90): """确认桌面在出图, 不在就先跑看门狗把它挂回来。 @@ -135,7 +198,15 @@ def ensure_display(timeout_s=90): """ if render_ok(): return True - log('桌面未在出图(BitBlt 失败), 跑看门狗把显示挂回 console') + st = session_state() + if st and st.get('rdp_active'): + # RDP 会话 Active 时 console 画面是空的, 看门狗按设计不会动它(它只处理 Disc)。 + # 硬把它踢到 console 会把正在用的人踢下线, 所以这里只报告, 不擅自动手。 + log('桌面未在出图, 而 RDP 会话 %s 处于 Active(占着显示) —— ' + '看门狗只处理 Disc, 这种情况要人工把 RDP 断开; 本轮跳过' % st['rdp_active']) + return False + log('桌面未在出图(BitBlt 失败), 跑看门狗把显示挂回 console' + + ('(会话状态: %s)' % st if st else '')) watchdog = os.path.join(HERE, 'keep_display.ps1') try: subprocess.run(['powershell.exe', '-NoProfile', '-ExecutionPolicy', 'Bypass', diff --git a/tests/test_convert_modules.py b/tests/test_convert_modules.py index dce7f58..fe72f78 100644 --- a/tests/test_convert_modules.py +++ b/tests/test_convert_modules.py @@ -480,7 +480,10 @@ class DisplayRecoveryTest(QuietLogMixin, unittest.TestCase): calls.append(cmd) return mock.Mock(returncode=0) + # session_state 固定成 None: 否则诊断用的 `query session` 也走 subprocess, + # 会混进 calls 里把"看门狗跑了几次"数错 with mock.patch.object(cm, 'render_ok', lambda: seq.pop(0)), \ + mock.patch.object(cm, 'session_state', lambda: None), \ mock.patch.object(cm.subprocess, 'run', fake_run), \ mock.patch.object(cm.time, 'sleep', lambda s: None): self.assertTrue(cm.ensure_display(timeout_s=10)) @@ -489,6 +492,7 @@ class DisplayRecoveryTest(QuietLogMixin, unittest.TestCase): def test_reports_failure_when_never_recovers(self): with mock.patch.object(cm, 'render_ok', lambda: False), \ + mock.patch.object(cm, 'session_state', lambda: None), \ mock.patch.object(cm.subprocess, 'run', lambda *a, **k: mock.Mock()), \ mock.patch.object(cm.time, 'sleep', lambda s: None): self.assertFalse(cm.ensure_display(timeout_s=0)) @@ -499,6 +503,7 @@ class DisplayRecoveryTest(QuietLogMixin, unittest.TestCase): raise OSError('powershell not found') with mock.patch.object(cm, 'render_ok', lambda: False), \ + mock.patch.object(cm, 'session_state', lambda: None), \ mock.patch.object(cm.subprocess, 'run', boom), \ mock.patch.object(cm.time, 'sleep', lambda s: None): self.assertFalse(cm.ensure_display(timeout_s=0)) @@ -630,6 +635,69 @@ class CliRoutingTest(QuietLogMixin, unittest.TestCase): self.assertEqual(code, 0) +class SessionTableTest(QuietLogMixin, unittest.TestCase): + """解析 `query session` —— 用来区分"截不到图"到底是哪种情况。 + + 两段输入都是**实测原样**(2026-10-17)。注意成功时返回码也是 1, 所以只能看输出。 + + ⛔ 必须继承 QuietLogMixin: 这里会调 ensure_display(), 它一 log 就写进真实的 + convert.log —— 又一次让值守日志里出现"看着像真出事"的行(这是第三次了)。 + """ + + # 用户从 RDP 连进来: console 画面是空的 -> BitBlt 失败, 看门狗按设计不会动 + RDP_IN = ( + ' SESSIONNAME USERNAME ID STATE TYPE DEVICE \n' + ' services 0 Disc \n' + '>rdp-tcp#70 YWS-HHH 1 Active \n' + ' console 3 Conn \n' + ' 31c5ce94259d4... 65536 Listen \n' + ' rdp-tcp 65537 Listen \n') + + # 已挂回 console: 显示正常 + CONSOLE = ( + ' SESSIONNAME USERNAME ID STATE TYPE DEVICE \n' + ' services 0 Disc \n' + '>console YWS-HHH 1 Active \n' + ' 31c5ce94259d4... 65536 Listen \n' + ' rdp-tcp 65537 Listen \n') + + def test_detects_active_rdp(self): + st = cm.parse_session_table(self.RDP_IN) + self.assertEqual(st['rdp_active'], 'rdp-tcp#70') + self.assertEqual(st['console'], '3') + self.assertEqual(st['current'], 'rdp-tcp#70') + + def test_console_only_has_no_active_rdp(self): + st = cm.parse_session_table(self.CONSOLE) + self.assertIsNone(st['rdp_active'], '没有 RDP 会话时不该报有') + self.assertEqual(st['console'], '1') + self.assertEqual(st['current'], 'console') + + def test_empty_or_garbage_is_safe(self): + for text in ('', 'garbage\n', 'only one\n'): + st = cm.parse_session_table(text) + self.assertIsNone(st['rdp_active']) + + def test_non_text_output_is_tolerated(self): + """query session 万一没给出文本, 也不能把整轮炸掉 —— 那只是诊断信息。""" + with mock.patch.object(cm.subprocess, 'run', + lambda *a, **k: mock.Mock(stdout=object())): + self.assertIsNone(cm.session_state()) + + def test_display_refuses_to_fight_an_active_rdp(self): + """RDP Active 时不能去跑看门狗(它不会动), 也不能硬踢人家下线。""" + ran = [] + with mock.patch.object(cm, 'render_ok', lambda: False), \ + mock.patch.object(cm, 'session_state', + lambda: {'current': 'rdp-tcp#70', + 'rdp_active': 'rdp-tcp#70', + 'console': '3'}), \ + mock.patch.object(cm.subprocess, 'run', + lambda *a, **k: ran.append(a)): + self.assertFalse(cm.ensure_display(timeout_s=1)) + self.assertEqual(ran, [], '不该去跑看门狗, 更不该踢人下线') + + class LaunchGameRetryTest(QuietLogMixin, unittest.TestCase): """⛔ 2026-10-17 02:03 实测: exe 起来就退了。