dp-cli 0.5.0__tar.gz → 0.6.2__tar.gz

{dp_cli-0.5.0 → dp_cli-0.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dp-cli
-Version: 0.5.0
+Version: 0.6.2
 Summary: A powerful CLI for DrissionPage — browser automation, structured data extraction, network listening and more.
 License: BSD-3-Clause
 Project-URL: Homepage, https://github.com/mofanx/dp-cli
@@ -18,6 +18,11 @@ Requires-Dist: click>=8.0
 Requires-Dist: aiohttp>=3.9
 Requires-Dist: websockets>=12
 Requires-Dist: requests>=2.28
+Provides-Extra: test
+Requires-Dist: pytest>=7.4.0; extra == "test"
+Requires-Dist: pytest-cov>=4.1.0; extra == "test"
+Requires-Dist: pytest-timeout>=2.1.0; extra == "test"
+Requires-Dist: pytest-mock>=3.11.0; extra == "test"
 
 # dp-cli
 
@@ -26,7 +31,7 @@ A powerful CLI for [DrissionPage](https://github.com/g1879/DrissionPage) — bro
 ## Features
 
 - **Anti-detection by default** — not based on webdriver, `navigator.webdriver` is `false`
-- **Reuse your own browser** — `--auto-connect` (Chrome 144+, no CLI flag needed) or `--port`
+- **Reuse your own browser** — `--auto-connect` (Chrome/Edge 144+, no CLI flag needed) or `--port`
 - **Hybrid snapshot** — a11y tree + Vimium-style clickable detection, catches icon-only buttons
   and custom menu items the a11y tree misses; every element gets an `[N]` ref with
   confidence markers (`⚡` medium, `?` low)
@@ -64,25 +69,26 @@ dp open https://example.com --port 9222
 dp snapshot
 ```
 
-## Connect to a Normally-Launched Chrome (Chrome 144+)
+## Connect to a Normally-Launched Chrome/Edge (Chrome/Edge 144+)
 
-No `--remote-debugging-port` required. Chrome 144+ exposes opt-in remote debugging
-via `chrome://inspect`:
+No `--remote-debugging-port` required. Chrome/Edge 144+ exposes opt-in remote debugging
+via `chrome://inspect` (Chrome) or `edge://inspect/#devices` (Edge):
 
-1. Open your Chrome as usual (no special flags)
-2. Visit `chrome://inspect/#remote-debugging`
+1. Open your Chrome or Edge as usual (no special flags)
+2. Visit `chrome://inspect/#remote-debugging` (Chrome) or `edge://inspect/#devices` (Edge)
 3. Check **"Allow remote debugging for this browser instance"**
 4. Run `dp open --auto-connect`
 
 ```bash
-dp open --auto-connect                              # stable channel, default profile
-dp open --auto-connect --channel beta               # pick a different channel
+dp open --auto-connect                              # auto channel: sniffs Chrome stable → Edge stable
+dp open --auto-connect --channel edge              # force Edge stable
+dp open --auto-connect --channel beta               # Chrome beta
 dp open --auto-connect --probe-dir ~/my-profile     # custom user-data-dir
 ```
 
 ### How it works
 
-Chrome 144+ in this mode exposes **only** a browser-level WebSocket and omits the HTTP
+Chrome/Edge 144+ in this mode exposes **only** a browser-level WebSocket and omits the HTTP
 REST API (`/json`, `/json/version`, ...) that DrissionPage / puppeteer / Playwright
 depend on. `dp-cli` transparently handles this:
 
@@ -95,14 +101,14 @@ depend on. `dp-cli` transparently handles this:
 4. Points DrissionPage at the bridge. Subsequent `dp` commands reuse the same bridge.
 
 The bridge subprocess and its port are tracked in the session file; `dp close` stops
-the bridge automatically and never quits your Chrome (it's your browser, not dp's).
+the bridge automatically and never quits your browser (it's your browser, not dp's).
 
 ### Caveats
 
-- Chrome always shows an **"Allow remote debugging"** dialog per new WebSocket client.
+- Chrome/Edge always shows an **"Allow remote debugging"** dialog per new WebSocket client.
   Since bridge maintains one WebSocket and dp commands share it, you confirm at most
   once per `dp open --auto-connect`.
-- Works with whatever profile Chrome is actually using — same cookies, logins, history.
+- Works with whatever profile Chrome/Edge is actually using — same cookies, logins, history.
 - Classic `--remote-debugging-port=9222` mode still works unchanged via `dp open --port 9222`.
 
 ## Hybrid Snapshot (a11y + Vimium-style)
@@ -132,9 +138,12 @@ Every element gets an `[N]` ref usable in any command: `dp click "ref:5"`.
 
 ```bash
 dp snapshot                     # a11y + clickable (default); high + medium markers
-dp snapshot --viewport-only     # clickable probe limited to viewport (faster)
-dp snapshot --include-low       # also surface `?` low-confidence heuristics
-dp snapshot --no-clickables     # a11y tree only (legacy behavior)
+dp snapshot -i                  # interactive mode: only interactive elements
+dp snapshot -s ".main"          # limit to specific area
+dp snapshot -p "data-test"      # custom locator priority
+dp scan --viewport              # only elements currently in viewport
+dp scan --confidence all        # include low-confidence heuristics
+dp scan --confidence high       # only the sure-thing clickables
 ```
 
 ### `dp scan` — fast clickable-only listing
@@ -238,7 +247,7 @@ GPU or Xvfb environment.
 
 ```bash
 # 1. Discover CSS class names via noise-filtered content tree
-dp snapshot --mode content --max-text 40
+dp snapshot -i -s ".main"
 
 # 2. Verify field selectors
 dp query "css:.item-title" --fields "text,loc"
@@ -249,7 +258,7 @@ dp extract "css:.item-card" \
     "price":"css:.item-price",
     "tags":{"selector":"css:.tag","multi":true},
     "url":{"selector":"css:a","attr":"href"}}' \
-  --limit 100 --output csv --filename result.csv
+  --limit 100 -o csv -f result.csv
 ```
 
 ## Project Structure

{dp_cli-0.5.0 → dp_cli-0.6.2}/README.md

@@ -5,7 +5,7 @@ A powerful CLI for [DrissionPage](https://github.com/g1879/DrissionPage) — bro
 ## Features
 
 - **Anti-detection by default** — not based on webdriver, `navigator.webdriver` is `false`
-- **Reuse your own browser** — `--auto-connect` (Chrome 144+, no CLI flag needed) or `--port`
+- **Reuse your own browser** — `--auto-connect` (Chrome/Edge 144+, no CLI flag needed) or `--port`
 - **Hybrid snapshot** — a11y tree + Vimium-style clickable detection, catches icon-only buttons
   and custom menu items the a11y tree misses; every element gets an `[N]` ref with
   confidence markers (`⚡` medium, `?` low)
@@ -43,25 +43,26 @@ dp open https://example.com --port 9222
 dp snapshot
 ```
 
-## Connect to a Normally-Launched Chrome (Chrome 144+)
+## Connect to a Normally-Launched Chrome/Edge (Chrome/Edge 144+)
 
-No `--remote-debugging-port` required. Chrome 144+ exposes opt-in remote debugging
-via `chrome://inspect`:
+No `--remote-debugging-port` required. Chrome/Edge 144+ exposes opt-in remote debugging
+via `chrome://inspect` (Chrome) or `edge://inspect/#devices` (Edge):
 
-1. Open your Chrome as usual (no special flags)
-2. Visit `chrome://inspect/#remote-debugging`
+1. Open your Chrome or Edge as usual (no special flags)
+2. Visit `chrome://inspect/#remote-debugging` (Chrome) or `edge://inspect/#devices` (Edge)
 3. Check **"Allow remote debugging for this browser instance"**
 4. Run `dp open --auto-connect`
 
 ```bash
-dp open --auto-connect                              # stable channel, default profile
-dp open --auto-connect --channel beta               # pick a different channel
+dp open --auto-connect                              # auto channel: sniffs Chrome stable → Edge stable
+dp open --auto-connect --channel edge              # force Edge stable
+dp open --auto-connect --channel beta               # Chrome beta
 dp open --auto-connect --probe-dir ~/my-profile     # custom user-data-dir
 ```
 
 ### How it works
 
-Chrome 144+ in this mode exposes **only** a browser-level WebSocket and omits the HTTP
+Chrome/Edge 144+ in this mode exposes **only** a browser-level WebSocket and omits the HTTP
 REST API (`/json`, `/json/version`, ...) that DrissionPage / puppeteer / Playwright
 depend on. `dp-cli` transparently handles this:
 
@@ -74,14 +75,14 @@ depend on. `dp-cli` transparently handles this:
 4. Points DrissionPage at the bridge. Subsequent `dp` commands reuse the same bridge.
 
 The bridge subprocess and its port are tracked in the session file; `dp close` stops
-the bridge automatically and never quits your Chrome (it's your browser, not dp's).
+the bridge automatically and never quits your browser (it's your browser, not dp's).
 
 ### Caveats
 
-- Chrome always shows an **"Allow remote debugging"** dialog per new WebSocket client.
+- Chrome/Edge always shows an **"Allow remote debugging"** dialog per new WebSocket client.
   Since bridge maintains one WebSocket and dp commands share it, you confirm at most
   once per `dp open --auto-connect`.
-- Works with whatever profile Chrome is actually using — same cookies, logins, history.
+- Works with whatever profile Chrome/Edge is actually using — same cookies, logins, history.
 - Classic `--remote-debugging-port=9222` mode still works unchanged via `dp open --port 9222`.
 
 ## Hybrid Snapshot (a11y + Vimium-style)
@@ -111,9 +112,12 @@ Every element gets an `[N]` ref usable in any command: `dp click "ref:5"`.
 
 ```bash
 dp snapshot                     # a11y + clickable (default); high + medium markers
-dp snapshot --viewport-only     # clickable probe limited to viewport (faster)
-dp snapshot --include-low       # also surface `?` low-confidence heuristics
-dp snapshot --no-clickables     # a11y tree only (legacy behavior)
+dp snapshot -i                  # interactive mode: only interactive elements
+dp snapshot -s ".main"          # limit to specific area
+dp snapshot -p "data-test"      # custom locator priority
+dp scan --viewport              # only elements currently in viewport
+dp scan --confidence all        # include low-confidence heuristics
+dp scan --confidence high       # only the sure-thing clickables
 ```
 
 ### `dp scan` — fast clickable-only listing
@@ -217,7 +221,7 @@ GPU or Xvfb environment.
 
 ```bash
 # 1. Discover CSS class names via noise-filtered content tree
-dp snapshot --mode content --max-text 40
+dp snapshot -i -s ".main"
 
 # 2. Verify field selectors
 dp query "css:.item-title" --fields "text,loc"
@@ -228,7 +232,7 @@ dp extract "css:.item-card" \
     "price":"css:.item-price",
     "tags":{"selector":"css:.tag","multi":true},
     "url":{"selector":"css:a","attr":"href"}}' \
-  --limit 100 --output csv --filename result.csv
+  --limit 100 -o csv -f result.csv
 ```
 
 ## Project Structure

{dp_cli-0.5.0 → dp_cli-0.6.2}/dp_cli/bridge.py

@@ -464,11 +464,29 @@ async def main_async(user_data_dir: Path, host: str, port: int) -> None:
     # 等待终止信号
     stop_evt = asyncio.Event()
     loop = asyncio.get_running_loop()
-    for sig in (signal.SIGINT, signal.SIGTERM):
-        try:
-            loop.add_signal_handler(sig, stop_evt.set)
-        except NotImplementedError:
-            pass
+
+    if sys.platform == 'win32':
+        # Windows ProactorEventLoop 不支持 add_signal_handler。
+        # 改用 signal.signal 拦截 SIGINT / SIGBREAK（来自 CTRL_BREAK_EVENT）。
+        # signal handler 跑在主线程的信号上下文中，必须用 call_soon_threadsafe
+        # 通知 event loop。
+        def _win_signal_handler(signum, frame):
+            loop.call_soon_threadsafe(stop_evt.set)
+
+        for sig_name in ('SIGINT', 'SIGBREAK', 'SIGTERM'):
+            sig = getattr(signal, sig_name, None)
+            if sig is None:
+                continue
+            try:
+                signal.signal(sig, _win_signal_handler)
+            except (ValueError, OSError):
+                pass
+    else:
+        for sig in (signal.SIGINT, signal.SIGTERM):
+            try:
+                loop.add_signal_handler(sig, stop_evt.set)
+            except NotImplementedError:
+                pass
     try:
         await stop_evt.wait()
     finally:

{dp_cli-0.5.0 → dp_cli-0.6.2}/dp_cli/bridge_manager.py

@@ -8,8 +8,10 @@ chrome://inspect 桥接进程生命周期管理
 - start_bridge(user_data_dir): spawn `python -m dp_cli.bridge` 子进程，
   等待其向 stdout 打印 "BRIDGE_READY host=... port=..." 标记后返回 (pid, port)。
 
-- stop_bridge(pid): 向子进程发 SIGTERM；如 2 秒未退出再 SIGKILL。
-- is_bridge_alive(pid): OS 级存在性检查。
+- stop_bridge(pid): 向子进程发终止信号；如 2 秒未退出再强杀。
+  POSIX: SIGTERM → SIGKILL（针对整个进程组）。
+  Windows: CTRL_BREAK_EVENT → taskkill /F /T。
+- is_bridge_alive(pid): OS 级存在性检查（Windows 走 OpenProcess）。
 """
 
 from __future__ import annotations
@@ -22,6 +24,59 @@ import sys
 import time
 from pathlib import Path
 
+IS_WINDOWS = sys.platform == 'win32'
+
+
+def _detach_spawn_kwargs() -> dict:
+    """让 bridge 子进程脱离父进程的信号/控制台分组。
+
+    POSIX: ``start_new_session=True`` → setsid，使 bridge 自成进程组，
+    父进程 Ctrl-C 不会传递过来。
+    Windows: ``CREATE_NEW_PROCESS_GROUP`` 让我们后续可以发 CTRL_BREAK_EVENT；
+    ``CREATE_NO_WINDOW`` 避免在 GUI/服务环境弹出黑色控制台窗口。
+    """
+    if IS_WINDOWS:
+        CREATE_NEW_PROCESS_GROUP = 0x00000200
+        CREATE_NO_WINDOW = 0x08000000
+        return {'creationflags': CREATE_NEW_PROCESS_GROUP | CREATE_NO_WINDOW}
+    return {'start_new_session': True}
+
+
+def _win_pid_alive(pid: int) -> bool:
+    """Windows: 用 OpenProcess + GetExitCodeProcess 判断进程是否存活。"""
+    import ctypes
+    from ctypes import wintypes
+
+    PROCESS_QUERY_LIMITED_INFORMATION = 0x1000
+    STILL_ACTIVE = 259
+    kernel32 = ctypes.windll.kernel32
+    kernel32.OpenProcess.restype = wintypes.HANDLE
+    kernel32.OpenProcess.argtypes = [wintypes.DWORD, wintypes.BOOL, wintypes.DWORD]
+    h = kernel32.OpenProcess(PROCESS_QUERY_LIMITED_INFORMATION, False, pid)
+    if not h:
+        return False
+    try:
+        code = wintypes.DWORD()
+        if not kernel32.GetExitCodeProcess(h, ctypes.byref(code)):
+            return False
+        return code.value == STILL_ACTIVE
+    finally:
+        kernel32.CloseHandle(h)
+
+
+def _win_terminate(pid: int) -> None:
+    """Windows: taskkill /F /T 强杀进程及其子进程树。"""
+    try:
+        subprocess.run(
+            ['taskkill', '/F', '/T', '/PID', str(pid)],
+            stdout=subprocess.DEVNULL,
+            stderr=subprocess.DEVNULL,
+            check=False,
+            timeout=5,
+        )
+    except Exception:
+        pass
+
 
 _READY_RE = re.compile(r'^BRIDGE_READY host=(?P<host>\S+) port=(?P<port>\d+)\s*$')
 
@@ -82,21 +137,23 @@ def start_bridge(user_data_dir: str | os.PathLike,
         '--listen', str(listen_port),
         '-v',
     ]
-    # start_new_session 让 bridge 成为独立进程组，防止父进程 SIGINT 误杀
+    # 让 bridge 成为独立进程组，防止父进程 SIGINT/Ctrl-C 误杀。
+    # POSIX 走 start_new_session；Windows 走 CREATE_NEW_PROCESS_GROUP。
     proc = subprocess.Popen(
         cmd,
         stdout=subprocess.PIPE,
         stderr=subprocess.PIPE,
         text=True,
-        start_new_session=True,
         bufsize=1,  # 行缓冲
+        **_detach_spawn_kwargs(),
     )
 
     # 立即提示用户：bridge 正在连接；若 Chrome 弹出授权框请点击。
     # 写 stderr 避免污染 stdout 的 JSON 输出。
-    print('[dp] 正在启动 bridge 并连接 Chrome…', file=sys.stderr, flush=True)
-    print('[dp] 💡 若 Chrome 弹出 "Allow remote debugging" 对话框，'
-          '请切到 Chrome 窗口点击 "Allow"（后续命令会自动复用连接）',
+    print('[dp] 正在启动 bridge 并连接浏览器（Chrome/Edge）…',
+          file=sys.stderr, flush=True)
+    print('[dp] 💡 若浏览器弹出 "Allow remote debugging" 对话框，'
+          '请切到浏览器窗口点击 "Allow"（后续命令会自动复用连接）',
           file=sys.stderr, flush=True)
 
     # 异步读 stderr，方便 timeout 时回显给用户
@@ -143,7 +200,7 @@ def start_bridge(user_data_dir: str | os.PathLike,
             proc.terminate()
             raise RuntimeError(
                 f'bridge 启动超时 ({ready_timeout}s)。\n'
-                f'若是首次连接：请把 Chrome 窗口切到前台，点击弹出的'
+                f'若是首次连接：请把浏览器窗口（Chrome/Edge）切到前台，点击弹出的'
                 f' "Allow remote debugging for this browser instance" 对话框。\n'
                 f'当前 bridge stderr:\n{_collect_stderr()}'
             )
@@ -172,6 +229,8 @@ def start_bridge(user_data_dir: str | os.PathLike,
 def is_bridge_alive(pid: int) -> bool:
     if pid <= 0:
         return False
+    if IS_WINDOWS:
+        return _win_pid_alive(pid)
     try:
         os.kill(pid, 0)
         return True
@@ -184,18 +243,37 @@ def is_bridge_alive(pid: int) -> bool:
 
 
 def stop_bridge(pid: int, timeout: float = 2.0) -> bool:
-    """停止 bridge 子进程。返回是否成功终止。"""
+    """停止 bridge 子进程。返回是否成功终止。
+
+    POSIX: SIGTERM 整个进程组 → 等待 → SIGKILL。
+    Windows: CTRL_BREAK_EVENT（依赖 spawn 时的 CREATE_NEW_PROCESS_GROUP）
+             → 等待 → taskkill /F /T 终止进程树。
+    """
     if not is_bridge_alive(pid):
         return True
-    # 先 SIGTERM 整个进程组（start_new_session 让 bridge 自成组）
-    try:
-        os.killpg(pid, signal.SIGTERM)
-    except (ProcessLookupError, PermissionError):
+
+    if IS_WINDOWS:
+        # 1) 优雅: 给整个进程组发 CTRL_BREAK_EVENT
         try:
-            os.kill(pid, signal.SIGTERM)
+            os.kill(pid, signal.CTRL_BREAK_EVENT)
         except Exception:
             pass
-    except Exception:
+
+        deadline = time.monotonic() + timeout
+        while time.monotonic() < deadline:
+            if not is_bridge_alive(pid):
+                return True
+            time.sleep(0.05)
+
+        # 2) 强杀: taskkill /F /T 终止进程树
+        _win_terminate(pid)
+        time.sleep(0.1)
+        return not is_bridge_alive(pid)
+
+    # POSIX: 先 SIGTERM 整个进程组（start_new_session 让 bridge 自成组）
+    try:
+        os.killpg(pid, signal.SIGTERM)
+    except (ProcessLookupError, PermissionError, OSError):
         try:
             os.kill(pid, signal.SIGTERM)
         except Exception:

{dp_cli-0.5.0 → dp_cli-0.6.2}/dp_cli/commands/_utils.py

@@ -21,7 +21,7 @@ def normalize_url(url: str) -> str:
 
 
 def session_option(f):
-    return click.option('-s', '--session', default='default',
+    return click.option('-S', '--session', default='default',
                         help='会话名称，默认 default', show_default=True)(f)
 
 

{dp_cli-0.5.0 → dp_cli-0.6.2}/dp_cli/commands/browser.py

@@ -7,7 +7,8 @@ import click
 from dp_cli.session import (get_browser, close_browser, list_sessions,
                             delete_session, load_session, save_session,
                             discover_port_from_profile,
-                            default_user_data_dir_for_channel)
+                            default_user_data_dir_for_channel,
+                            sniff_auto_user_data_dir)
 from dp_cli.output import ok, error, format_page_info
 from dp_cli.commands._utils import session_option, _get_page, normalize_url
 from dp_cli.stealth import apply_stealth, PRESETS, DEFAULT_UA
@@ -24,11 +25,14 @@ def register(cli):
     @click.option('--proxy', default=None, help='代理服务器，如 http://127.0.0.1:7890')
     @click.option('--port', type=int, default=None, help='连接指定端口的已有浏览器实例')
     @click.option('--auto-connect', '-a', is_flag=True,
-                  help='从用户常规启动的 Chrome 读取 DevToolsActivePort 自动发现端口'
-                       '（需 Chrome 144+，用户在 chrome://inspect/#remote-debugging 启用）')
-    @click.option('--channel', type=click.Choice(['stable', 'beta', 'dev', 'canary', 'chromium']),
-                  default='stable', show_default=True,
-                  help='配合 --auto-connect 使用，定位默认 user-data-dir')
+                  help='从用户常规启动的 Chrome/Edge 读取 DevToolsActivePort 自动发现端口'
+                       '（需 Chrome/Edge 144+，用户在 chrome://inspect/#remote-debugging 或 '
+                       'edge://inspect/#devices 启用）')
+    @click.option('--channel',
+                  type=click.Choice(['auto', 'stable', 'beta', 'dev', 'canary', 'chromium', 'edge']),
+                  default='auto', show_default=True,
+                  help='配合 --auto-connect 使用，定位默认 user-data-dir；'
+                       'auto = 依次嗅探 chrome stable → edge stable，取首个含 DevToolsActivePort 的目录')
     @click.option('--probe-dir', 'probe_dir', default=None,
                   help='配合 --auto-connect 使用，显式指定要探测的 user-data-dir '
                        '（覆盖 --channel 的默认路径）')
@@ -46,14 +50,16 @@ def register(cli):
           dp open --port 9222
 
         \b
-        【复用用户自己的浏览器 - 方式 B：--auto-connect（Chrome 144+ 推荐）】
-        无需特殊启动参数，正常打开 Chrome 即可：
-          1. 打开 Chrome，访问 chrome://inspect/#remote-debugging
+        【复用用户自己的浏览器 - 方式 B：--auto-connect（Chrome/Edge 144+ 推荐）】
+        无需特殊启动参数，正常打开 Chrome 或 Edge 即可：
+          1. 打开浏览器：
+             - Chrome：访问 chrome://inspect/#remote-debugging
+             - Edge:   访问 edge://inspect/#devices
           2. 勾选 "Allow remote debugging for this browser instance"
-          3. dp open --auto-connect
-        dp 会从 Chrome 的 user-data-dir 自动读取 DevToolsActivePort 拿到端口。
-        指定非 stable 渠道：dp open --auto-connect --channel beta
-        指定自定义 profile：dp open --auto-connect --probe-dir ~/my-chrome-profile
+          3. dp open --auto-connect            # 默认 auto：先嗅探 Chrome，再 Edge
+             dp open --auto-connect --channel edge   # 强制使用 Edge stable
+             dp open --auto-connect --channel beta   # 使用 Chrome beta
+             dp open --auto-connect --probe-dir ~/my-profile   # 自定义 profile
 
         \b
         【dp 自动管理浏览器】
@@ -83,6 +89,20 @@ def register(cli):
                 return
             if probe_dir:
                 dir_to_probe = Path(probe_dir).expanduser()
+            elif channel == 'auto':
+                # 自动嗅探：chrome stable → edge stable，取首个含 DevToolsActivePort 的目录
+                hit, diag = sniff_auto_user_data_dir()
+                if hit is None:
+                    detail = '\n'.join(f'  - {ch:7s} {p}  [{reason}]'
+                                       for ch, p, reason in diag)
+                    error('自动嗅探未找到含 DevToolsActivePort 的 user-data-dir。\n'
+                          '请先在 Chrome (chrome://inspect/#remote-debugging) 或 '
+                          'Edge (edge://inspect/#devices) 启用远程调试，\n'
+                          '或用 --channel/--probe-dir 显式指定。\n'
+                          f'嗅探记录：\n{detail}',
+                          code='PROFILE_NOT_FOUND')
+                    return
+                dir_to_probe = hit
             else:
                 dir_to_probe = default_user_data_dir_for_channel(channel)
                 if not dir_to_probe:

{dp_cli-0.5.0 → dp_cli-0.6.2}/dp_cli/commands/keyboard.py

@@ -9,6 +9,20 @@ from dp_cli.commands._utils import (
     session_option, _get_page, resolve_locator, wait_network_idle,
 )
 
+# ponytail: 提取重复的 findScrollable JS 函数
+_FIND_SCROLLABLE_JS = """
+function findScrollable(el) {
+  while (el && el !== document.body && el !== document.documentElement) {
+    const st = getComputedStyle(el);
+    const canY = /(auto|scroll|overlay)/.test(st.overflowY) && el.scrollHeight > el.clientHeight + 1;
+    const canX = /(auto|scroll|overlay)/.test(st.overflowX) && el.scrollWidth > el.clientWidth + 1;
+    if (canY || canX) return el;
+    el = el.parentElement;
+  }
+  return document.scrollingElement || document.documentElement;
+}
+"""
+
 
 def register(cli):
 
@@ -142,32 +156,22 @@ def register(cli):
 
             if mouse_x is not None and mouse_y is not None:
                 result = page.run_js(
-                    """
-                    function findScrollable(el) {
-                      while (el && el !== document.body && el !== document.documentElement) {
-                        const st = getComputedStyle(el);
-                        const canY = /(auto|scroll|overlay)/.test(st.overflowY) && el.scrollHeight > el.clientHeight + 1;
-                        const canX = /(auto|scroll|overlay)/.test(st.overflowX) && el.scrollWidth > el.clientWidth + 1;
-                        if (canY || canX) return el;
-                        el = el.parentElement;
-                      }
-                      return document.scrollingElement || document.documentElement;
-                    }
+                    f"""{_FIND_SCROLLABLE_JS}
                     const start = document.elementFromPoint(arguments[2], arguments[3]);
                     const target = findScrollable(start);
-                    const before = {scrollTop: target.scrollTop, scrollLeft: target.scrollLeft};
-                    if (arguments[4]) {
+                    const before = {{scrollTop: target.scrollTop, scrollLeft: target.scrollLeft}};
+                    if (arguments[4]) {{
                       target.scrollTop = 0;
-                    } else if (arguments[5]) {
+                    }} else if (arguments[5]) {{
                       target.scrollTop = target.scrollHeight;
-                    } else {
+                    }} else {{
                       target.scrollTop += arguments[1];
                       target.scrollLeft += arguments[0];
-                    }
-                    target.dispatchEvent(new Event('scroll', {bubbles: true}));
-                    return {
+                    }}
+                    target.dispatchEvent(new Event('scroll', {{bubbles: true}}));
+                    return {{
                       before,
-                      after: {scrollTop: target.scrollTop, scrollLeft: target.scrollLeft},
+                      after: {{scrollTop: target.scrollTop, scrollLeft: target.scrollLeft}},
                       scrollHeight: target.scrollHeight,
                       clientHeight: target.clientHeight,
                       scrollWidth: target.scrollWidth,
@@ -176,8 +180,8 @@ def register(cli):
                       id: target.id || '',
                       className: target.className || '',
                       mode: 'mouse'
-                    };
-                    """,
+                    }};
+                    }}""",
                     x, y, mouse_x, mouse_y, top, bottom,
                 )
                 ok({'x': x, 'y': y, 'mouse': {'x': mouse_x, 'y': mouse_y},
@@ -292,19 +296,9 @@ def register(cli):
                     return int(target.run_js('return this.scrollHeight'))
                 if use_mouse_container:
                     return int(page.run_js(
-                        """
-                        function findScrollable(el) {
-                          while (el && el !== document.body && el !== document.documentElement) {
-                            const st = getComputedStyle(el);
-                            const canY = /(auto|scroll|overlay)/.test(st.overflowY) && el.scrollHeight > el.clientHeight + 1;
-                            if (canY) return el;
-                            el = el.parentElement;
-                          }
-                          return document.scrollingElement || document.documentElement;
-                        }
+                        f"""{_FIND_SCROLLABLE_JS}
                         const target = findScrollable(document.elementFromPoint(arguments[0], arguments[1]));
-                        return target.scrollHeight;
-                        """,
+                        return target.scrollHeight;""",
                         mouse_x, mouse_y,
                     ))
                 return int(page.run_js('return document.documentElement.scrollHeight'))
@@ -329,22 +323,13 @@ def register(cli):
                     )
                 elif use_mouse_container:
                     position = page.run_js(
-                        """
-                        function findScrollable(el) {
-                          while (el && el !== document.body && el !== document.documentElement) {
-                            const st = getComputedStyle(el);
-                            const canY = /(auto|scroll|overlay)/.test(st.overflowY) && el.scrollHeight > el.clientHeight + 1;
-                            if (canY) return el;
-                            el = el.parentElement;
-                          }
-                          return document.scrollingElement || document.documentElement;
-                        }
+                        f"""{_FIND_SCROLLABLE_JS}
                         const target = findScrollable(document.elementFromPoint(arguments[0], arguments[1]));
                         const before = target.scrollTop;
                         const delta = arguments[2] > 0 ? arguments[2] : Math.max(300, Math.floor(target.clientHeight * arguments[3]));
                         target.scrollTop += delta;
-                        target.dispatchEvent(new Event('scroll', {bubbles: true}));
-                        return {
+                        target.dispatchEvent(new Event('scroll', {{bubbles: true}}));
+                        return {{
                           before,
                           after: target.scrollTop,
                           delta,
@@ -354,8 +339,7 @@ def register(cli):
                           id: target.id || '',
                           className: target.className || '',
                           mode: 'mouse'
-                        };
-                        """,
+                        }};""",
                         mouse_x, mouse_y, step, 3 if fast else 0.9,
                     )
                 else: