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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dp-cli
-Version: 0.4.0
+Version: 0.6.0
 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
@@ -26,7 +26,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 +64,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 +96,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)

{dp_cli-0.4.0 → dp_cli-0.6.0}/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)

{dp_cli-0.4.0 → dp_cli-0.6.0}/dp_cli/bridge_manager.py

@@ -94,9 +94,10 @@ def start_bridge(user_data_dir: str | os.PathLike,
 
     # 立即提示用户：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 +144,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()}'
             )

{dp_cli-0.4.0 → dp_cli-0.6.0}/dp_cli/commands/__init__.py

@@ -1,10 +1,10 @@
 # -*- coding:utf-8 -*-
 from dp_cli.commands import (
     browser, snapshot_cmd, element, keyboard,
-    page, tab, storage, network, misc,
+    page, tab, storage, network, record, misc,
 )
 
-_MODULES = [browser, snapshot_cmd, element, keyboard, page, tab, storage, network, misc]
+_MODULES = [browser, snapshot_cmd, element, keyboard, page, tab, storage, network, record, misc]
 
 
 def register_all(cli):

{dp_cli-0.4.0 → dp_cli-0.6.0}/dp_cli/commands/_utils.py

@@ -25,11 +25,12 @@ def session_option(f):
                         help='会话名称，默认 default', show_default=True)(f)
 
 
-def _get_page(session: str, raw: bool = False):
+def _get_page(session: str, raw: bool = False, inject_recording: bool = True):
     """获取页面对象，失败则 error 退出。
 
     :param raw: True 时始终返回 ChromiumPage（用于浏览器级操作如标签页管理）。
-                False 时返回绑定的标签页 ChromiumTab（如有），否则返回 ChromiumPage。
+                False 时返回绑定的标签页 ChromiumTab（如有），否则返回当前激活标签页。
+    :param inject_recording: session 录制中时是否自动注入录制器。
     """
     try:
         page = get_browser(session)
@@ -53,7 +54,10 @@ def _get_page(session: str, raw: bool = False):
                 save_session(session, sess)
                 target = page
         else:
-            target = page
+            try:
+                target = page.latest_tab or page
+            except Exception:
+                target = page
 
     # 自动重新应用 stealth：CDP init_js 绑定到 CDP session，每个 dp 命令是独立
     # Python 进程/独立 session，必须重新注册才能让下一次 navigation 生效。
@@ -71,6 +75,13 @@ def _get_page(session: str, raw: bool = False):
         except Exception:
             pass  # 不能让 stealth 失败阻塞常规命令
 
+    if inject_recording and sess.get('recording'):
+        try:
+            from dp_cli.recorder import inject_recorder
+            inject_recorder(target)
+        except Exception:
+            pass
+
     return target
 
 

{dp_cli-0.4.0 → dp_cli-0.6.0}/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
@@ -23,12 +24,15 @@ def register(cli):
     @click.option('--profile', 'user_data_dir', default=None, help='用户数据目录')
     @click.option('--proxy', default=None, help='代理服务器，如 http://127.0.0.1:7890')
     @click.option('--port', type=int, default=None, help='连接指定端口的已有浏览器实例')
-    @click.option('--auto-connect', 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')
+    @click.option('--auto-connect', '-a', is_flag=True,
+                  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: