dp-cli 0.6.0__tar.gz → 0.6.3__tar.gz

{dp_cli-0.6.0 → dp_cli-0.6.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dp-cli
-Version: 0.6.0
+Version: 0.6.3
 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
 
@@ -133,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
@@ -239,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"
@@ -250,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.6.0 → dp_cli-0.6.3}/README.md

@@ -112,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
@@ -218,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"
@@ -229,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.6.0 → dp_cli-0.6.3}/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.6.0 → dp_cli-0.6.3}/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,14 +137,15 @@ 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 弹出授权框请点击。
@@ -173,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
@@ -185,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.6.0 → dp_cli-0.6.3}/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.6.0 → dp_cli-0.6.3}/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):
 
@@ -20,13 +34,17 @@ def register(cli):
 
         \b
         支持的按键: Enter, Tab, Escape, Space, Backspace,
-                   ArrowUp/Down/Left/Right, F1-F12,
-                   Control+A, Shift+Enter, Alt+F4 等组合键。
+                   ArrowUp/Down/Left/Right, F1-F12, Home, End,
+                   PageUp/PageDown, Insert, Delete 等。
+        组合键: Control+A, Shift+Enter, Alt+F4,
+               支持多修饰键如 Control+Shift+Delete。
 
         \b
         示例:
           dp press Enter
           dp press "Control+A"
+          dp press "Control+Shift+Delete"
+          dp press F5
           dp press Escape
         """
         page = _get_page(session)
@@ -38,20 +56,46 @@ def register(cli):
                 'arrowup': '\ue013', 'arrowdown': '\ue015',
                 'arrowleft': '\ue012', 'arrowright': '\ue014',
             }
-            k = key.lower()
+            mod_map = {'control': Keys.CTRL, 'ctrl': Keys.CTRL,
+                       'shift': Keys.SHIFT, 'alt': Keys.ALT,
+                       'meta': Keys.META, 'cmd': Keys.COMMAND,
+                       'command': Keys.COMMAND}
+            # 常见键名别名 → Keys 枚举名（枚举用下划线风格，如 PAGE_UP；
+            # 映射失败会回退为字面输入，带修饰键时会误触浏览器快捷键，
+            # 所以别名必须覆盖常用名）
+            key_alias = {
+                'pageup': 'PAGE_UP', 'pgup': 'PAGE_UP',
+                'pagedown': 'PAGE_DOWN', 'pgdn': 'PAGE_DOWN',
+                'del': 'DEL', 'esc': 'ESCAPE', 'win': 'META',
+            }
+
+            def _key_token(name):
+                """键名 → Keys 枚举/特殊键码；未知键按字面输入。"""
+                low = name.strip().lower()
+                if low in key_map:
+                    return key_map[low]
+                attr = key_alias.get(
+                    low, low.upper().replace('-', '_').replace(' ', '_'))
+                k = getattr(Keys, attr, None)
+                return k if k is not None else name.strip()
+
             if '+' in key:
-                parts = key.split('+')
-                modifier = parts[0].lower()
-                main_key = parts[1]
-                mod_map = {'control': Keys.CTRL, 'ctrl': Keys.CTRL,
-                           'shift': Keys.SHIFT, 'alt': Keys.ALT}
-                if modifier in mod_map:
-                    page.actions.key_down(mod_map[modifier]).type(main_key).key_up(mod_map[modifier])
+                # 前缀修饰键逐个出栈，支持 Control+Shift+Delete 多修饰组合
+                parts = [p for p in key.split('+') if p.strip()]
+                mods = []
+                while len(parts) > 1 and parts[0].strip().lower() in mod_map:
+                    mods.append(mod_map[parts.pop(0).strip().lower()])
+                if mods and parts:
+                    act = page.actions
+                    for m in mods:
+                        act = act.key_down(m)
+                    act = act.type(_key_token('+'.join(parts)))
+                    for m in reversed(mods):
+                        act = act.key_up(m)
                 else:
                     page.actions.type(key)
             else:
-                actual_key = key_map.get(k, key)
-                page.actions.type(actual_key)
+                page.actions.type(_key_token(key))
             ok({'key': key}, msg='按键成功')
         except Exception as e:
             error(f'按键失败: {key}', code='KEY_FAILED', detail=str(e))
@@ -142,32 +186,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 +210,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 +326,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 +353,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 +369,7 @@ def register(cli):
                           id: target.id || '',
                           className: target.className || '',
                           mode: 'mouse'
-                        };
-                        """,
+                        }};""",
                         mouse_x, mouse_y, step, 3 if fast else 0.9,
                     )
                 else:

{dp_cli-0.6.0 → dp_cli-0.6.3}/dp_cli/commands/misc.py

@@ -134,3 +134,5 @@ def register(cli):
                 co.set_user_data_path(user_path)
             co.save()
             ok(msg='配置已保存')
+        elif not copy_config:
+            click.echo('请至少指定一个选项。使用 --help 查看可用参数。')

{dp_cli-0.6.0 → dp_cli-0.6.3}/dp_cli/commands/network.py

@@ -9,13 +9,46 @@ from dp_cli.output import ok, error
 from dp_cli.commands._utils import session_option, _get_page
 
 
+def _emit_response(page, output):
+    """构造 http-get/http-post 的输出。
+
+    --output 指定时把原始响应字节写入文件（兼容二进制），
+    否则把 body 内联到结果（JSON 优先，文本截断 3000 字）。
+    """
+    resp = page.response
+    result = {
+        'url': page.url,
+        'status_code': resp.status_code if resp is not None else None,
+    }
+    if output:
+        # response 为 None（请求失败未拿到响应）时写空文件，避免 AttributeError
+        Path(output).write_bytes(resp.content if resp is not None else b'')
+        result['saved_to'] = output
+        if resp is None:
+            result['warning'] = '无响应内容（response is None），已写入空文件'
+        return result
+    if resp is None:
+        result['body'] = None
+        return result
+    try:
+        result['body'] = resp.json()
+    except Exception:
+        try:
+            result['body'] = resp.text[:3000]
+        except Exception:
+            result['body'] = '<binary>'
+    return result
+
+
 def register(cli):
 
     @cli.command('listen')
     @session_option
     @click.option('--filter', 'url_filter', default=None, help='URL 过滤关键字，如 "api/user"')
-    @click.option('--count', default=10, help='最多捕获请求数', show_default=True)
-    @click.option('--timeout', default=30, help='监听超时秒数', show_default=True)
+    # --count/--timeout 对 listen.start 无意义（作用于 listen-stop 的 wait），
+    # 保留参数兼容性但从 help 隐藏，避免误导
+    @click.option('--count', default=10, hidden=True)
+    @click.option('--timeout', default=30, hidden=True)
     @click.option('--method', default=None, help='过滤请求方法，如 POST')
     def listen(session, url_filter, count, timeout, method):
         """监听网络请求（抓包）。先 listen，再执行触发操作，最后 listen-stop 读取结果。
@@ -26,7 +59,7 @@ def register(cli):
         \b
         示例:
           dp listen --filter "api/login"
-          dp listen --count 5 --timeout 10
+          dp listen --method POST
         """
         page = _get_page(session)
         try:
@@ -44,7 +77,11 @@ def register(cli):
         """停止监听并获取捕获的网络请求数据。"""
         page = _get_page(session)
         try:
-            packets = page.listen.wait(count=count, timeout=timeout, fit_count=False)
+            # finally 中 stop：wait 超时/出错也必须停止监听，否则监听器残留
+            try:
+                packets = page.listen.wait(count=count, timeout=timeout, fit_count=False)
+            finally:
+                page.listen.stop()
             results = []
             if packets:
                 pkts = packets if isinstance(packets, list) else [packets]
@@ -63,7 +100,6 @@ def register(cli):
                         results.append(item)
                     except Exception:
                         continue
-            page.listen.stop()
             ok({'packets': results, 'count': len(results)})
         except Exception as e:
             error(f'获取监听数据失败', code='LISTEN_FAILED', detail=str(e))
@@ -95,25 +131,7 @@ def register(cli):
 
             page = SessionPage(session_or_options=so)
             page.get(url, timeout=timeout)
-
-            result = {
-                'url': page.url,
-                'status_code': page.response.status_code if page.response else None,
-            }
-            try:
-                result['body'] = page.response.json()
-            except Exception:
-                try:
-                    body_text = page.response.text[:3000]
-                except Exception:
-                    body_text = '<binary>'
-                if output:
-                    Path(output).write_text(page.response.text, encoding='utf-8')
-                    result['saved_to'] = output
-                else:
-                    result['body'] = body_text
-
-            ok(result)
+            ok(_emit_response(page, output))
         except Exception as e:
             error(f'HTTP GET 失败', code='HTTP_FAILED', detail=str(e))
 
@@ -124,7 +142,8 @@ def register(cli):
     @click.option('--headers', default=None, help='JSON 格式的 Headers')
     @click.option('--proxy', default=None, help='代理地址')
     @click.option('--timeout', default=30, help='超时秒数', show_default=True)
-    def http_post(url, data, form, headers, proxy, timeout):
+    @click.option('--output', default=None, help='响应体保存路径')
+    def http_post(url, data, form, headers, proxy, timeout, output):
         """发送 HTTP POST 请求（不启动浏览器）。
 
         \b
@@ -151,19 +170,6 @@ def register(cli):
                 kwargs['data'] = json.loads(form)
 
             page.post(url, **kwargs)
-
-            result = {
-                'url': page.url,
-                'status_code': page.response.status_code if page.response else None,
-            }
-            try:
-                result['body'] = page.response.json()
-            except Exception:
-                try:
-                    result['body'] = page.response.text[:3000]
-                except Exception:
-                    result['body'] = '<binary>'
-
-            ok(result)
+            ok(_emit_response(page, output))
         except Exception as e:
             error(f'HTTP POST 失败', code='HTTP_FAILED', detail=str(e))