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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dp-cli
-Version: 0.3.2
+Version: 0.5.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
@@ -31,7 +31,8 @@ A powerful CLI for [DrissionPage](https://github.com/g1879/DrissionPage) — bro
   and custom menu items the a11y tree misses; every element gets an `[N]` ref with
   confidence markers (`⚡` medium, `?` low)
 - **`dp scan`** — fast Vimium-style listing of interactive elements (viewport-only mode available)
-- **Powerful locator syntax** — descriptive strings stable across navigation
+- **Powerful locator syntax** — descriptive strings stable across navigation, plus
+  Playwright-style `pw:role=button[name="Submit"] >> nth=2` chains
 - **Structured data extraction** — `extract` + `query` + `snapshot` for scraping list pages
 - **Network listening** — capture XHR/Fetch requests and response bodies
 - **Stealth patches** — `dp stealth` bypasses common automation detections
@@ -150,6 +151,53 @@ dp scan --confidence high       # only the sure-thing clickables
 Both `snapshot` and `scan` share the same `[N]` ref numbering per session, so
 `dp click "ref:N"` works regardless of which one produced the snapshot.
 
+## Playwright-style locators (`pw:` prefix)
+
+Need semantic, role-based targeting on a fresh page (no snapshot required)?
+Use the `pw:` prefix. Syntax mirrors Playwright, and chains with `>>`:
+
+```bash
+# By ARIA role (with accessible name — exact / substring / regex)
+dp click 'pw:role=button[name="Submit"]'
+dp click 'pw:role=button[name=/^Sign/i]'
+dp click 'pw:role=link[name=More]'         # substring
+
+# By visible text (exact / substring / regex)
+dp click 'pw:text="Login"'                 # exact
+dp click 'pw:text=Login'                   # substring (case-insensitive)
+dp click 'pw:text=/^log/i'                 # regex
+
+# By form affordances
+dp fill  'pw:placeholder=Search…' "chatgpt"
+dp fill  'pw:label="Email"' "a@b.com"
+dp click 'pw:alt="Logo"'
+dp click 'pw:title="Close"'
+dp click 'pw:testid=submit-btn'            # data-testid / data-test-id / data-test
+
+# Chain with >> (each step narrows the scope)
+dp click 'pw:css=.sidebar >> role=listitem[name="Chat"] >> nth=2'
+dp click 'pw:css=li >> has-text="Python"'
+dp click 'pw:role=list >> nth=-1'          # negative index = from end
+
+# Raw css/xpath chunks mix freely
+dp click 'pw:xpath=//nav >> role=link[name=Docs]'
+```
+
+**Matchers**: `role` / `text` / `label` / `placeholder` / `alt` / `title` /
+`testid` / `css` / `xpath` / `nth` / `has-text` / `visible`
+
+**Value forms**: `bare` = substring, `"quoted"` = exact, `/pattern/flags` = regex
+
+**Visibility**: `role` / `text` / `has-text` automatically skip elements hidden
+via `display:none`, `visibility:hidden`, `hidden` attribute, or
+`aria-hidden="true"` (matches Playwright semantics).
+
+**Shadow DOM**: open shadow roots are traversed automatically.
+
+Under the hood the matcher chain is evaluated in-page as JS, the target element
+is tagged with a one-shot `data-dp-ref` attribute, and DrissionPage resolves it
+by that attribute — bypassing stale classes / CSS Modules / dynamic XPath.
+
 ## Anti-Detection (stealth)
 
 Bypass `navigator.webdriver`, `HeadlessChrome` UA, empty `plugins`, SwiftShader WebGL,

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

@@ -10,7 +10,8 @@ A powerful CLI for [DrissionPage](https://github.com/g1879/DrissionPage) — bro
   and custom menu items the a11y tree misses; every element gets an `[N]` ref with
   confidence markers (`⚡` medium, `?` low)
 - **`dp scan`** — fast Vimium-style listing of interactive elements (viewport-only mode available)
-- **Powerful locator syntax** — descriptive strings stable across navigation
+- **Powerful locator syntax** — descriptive strings stable across navigation, plus
+  Playwright-style `pw:role=button[name="Submit"] >> nth=2` chains
 - **Structured data extraction** — `extract` + `query` + `snapshot` for scraping list pages
 - **Network listening** — capture XHR/Fetch requests and response bodies
 - **Stealth patches** — `dp stealth` bypasses common automation detections
@@ -129,6 +130,53 @@ dp scan --confidence high       # only the sure-thing clickables
 Both `snapshot` and `scan` share the same `[N]` ref numbering per session, so
 `dp click "ref:N"` works regardless of which one produced the snapshot.
 
+## Playwright-style locators (`pw:` prefix)
+
+Need semantic, role-based targeting on a fresh page (no snapshot required)?
+Use the `pw:` prefix. Syntax mirrors Playwright, and chains with `>>`:
+
+```bash
+# By ARIA role (with accessible name — exact / substring / regex)
+dp click 'pw:role=button[name="Submit"]'
+dp click 'pw:role=button[name=/^Sign/i]'
+dp click 'pw:role=link[name=More]'         # substring
+
+# By visible text (exact / substring / regex)
+dp click 'pw:text="Login"'                 # exact
+dp click 'pw:text=Login'                   # substring (case-insensitive)
+dp click 'pw:text=/^log/i'                 # regex
+
+# By form affordances
+dp fill  'pw:placeholder=Search…' "chatgpt"
+dp fill  'pw:label="Email"' "a@b.com"
+dp click 'pw:alt="Logo"'
+dp click 'pw:title="Close"'
+dp click 'pw:testid=submit-btn'            # data-testid / data-test-id / data-test
+
+# Chain with >> (each step narrows the scope)
+dp click 'pw:css=.sidebar >> role=listitem[name="Chat"] >> nth=2'
+dp click 'pw:css=li >> has-text="Python"'
+dp click 'pw:role=list >> nth=-1'          # negative index = from end
+
+# Raw css/xpath chunks mix freely
+dp click 'pw:xpath=//nav >> role=link[name=Docs]'
+```
+
+**Matchers**: `role` / `text` / `label` / `placeholder` / `alt` / `title` /
+`testid` / `css` / `xpath` / `nth` / `has-text` / `visible`
+
+**Value forms**: `bare` = substring, `"quoted"` = exact, `/pattern/flags` = regex
+
+**Visibility**: `role` / `text` / `has-text` automatically skip elements hidden
+via `display:none`, `visibility:hidden`, `hidden` attribute, or
+`aria-hidden="true"` (matches Playwright semantics).
+
+**Shadow DOM**: open shadow roots are traversed automatically.
+
+Under the hood the matcher chain is evaluated in-page as JS, the target element
+is tagged with a one-shot `data-dp-ref` attribute, and DrissionPage resolves it
+by that attribute — bypassing stale classes / CSS Modules / dynamic XPath.
+
 ## Anti-Detection (stealth)
 
 Bypass `navigator.webdriver`, `HeadlessChrome` UA, empty `plugins`, SwiftShader WebGL,

{dp_cli-0.3.2 → dp_cli-0.5.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.3.2 → dp_cli-0.5.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,11 +75,18 @@ 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
 
 
 _KNOWN_PREFIX = re.compile(
-    r'^(css[:=]|xpath[:=]|text[:=^$]|tag[:=^$]|@@?[\w]|ref:)', re.IGNORECASE)
+    r'^(css[:=]|xpath[:=]|text[:=^$]|tag[:=^$]|@@?[\w]|ref:|pw:)', re.IGNORECASE)
 _CSS_ID_CLASS = re.compile(r'^[#.][\w-]')           # #id  .class
 _CSS_TAG_SEL = re.compile(r'^[\w-]+[.#\[][\w-]')   # div.class  a[href]  h1#title
 _CSS_COMBINATOR = re.compile(r'[\[>+~]|::|:(?:nth|first|last|not|has)')  # [attr] > + ~ ::pseudo :nth-child
@@ -145,17 +156,58 @@ def _mark_element_by_backend_id(page, backend_node_id: int) -> str:
     return marker
 
 
-def resolve_locator(locator: str, session: str = 'default', page=None) -> str:
-    """解析定位器：ref:N 展开 + 智能前缀补全。
+def _resolve_pw(expr: str, session: str, page) -> str:
+    """解析 pw: 表达式 → 在页面上打标 → 返回 @data-dp-ref=<marker>。
+
+    失败（语法错 / 未匹配 / 浏览器不可用）会调用 error 并退出。
+    """
+    from dp_cli.locators import parse_pw, build_pw_js, PwParseError
+    try:
+        matchers = parse_pw(expr)
+    except PwParseError as e:
+        error(f'pw 定位器语法错误: {e}', code='PW_SYNTAX')
+        raise SystemExit(1)
 
-    如果 locator 以 'ref:' 开头，从 session 的 refs 映射中查找。
-      - 有 backendNodeId 时：通过 CDP 现场打临时属性，返回 @data-dp-ref=<marker>
-        （最鲁棒，绕开 CSS Modules / 动态 class / xpath 变化）
-      - 无 backendNodeId 或打标失败时：回落到保存的 locator 字符串
-      - 再失败，用 name 作 text 定位器
+    if page is None:
+        try:
+            page = _get_page(session)
+        except SystemExit:
+            raise
+        except Exception as e:
+            error('无法连接浏览器会话', code='SESSION_NOT_FOUND', detail=str(e))
+            raise SystemExit(1)
+
+    js = build_pw_js(matchers)
+    try:
+        marker = page.run_js(js)
+    except Exception as e:
+        error(f'pw 定位器求值失败', code='PW_EVAL_FAILED', detail=str(e))
+        raise SystemExit(1)
+
+    if not marker:
+        error(f'pw 定位器未匹配到元素: pw:{expr}', code='PW_NOT_FOUND')
+        raise SystemExit(1)
+
+    return f'@data-dp-ref={marker}'
+
+
+def resolve_locator(locator: str, session: str = 'default', page=None) -> str:
+    """解析定位器：ref:N 展开 + pw: 表达式求值 + 智能前缀补全。
+
+    - pw:<expr>：Playwright 风格（role/text/label/placeholder/alt/title/
+      testid/css/xpath/nth/has-text/visible），支持 >> 链式。通过 JS 求值
+      + 打标，返回 @data-dp-ref=<marker>。
+    - ref:N：从 session 的 refs 映射中查找。
+        · 有 backendNodeId 时：通过 CDP 现场打临时属性，返回 @data-dp-ref=
+          （最鲁棒，绕开 CSS Modules / 动态 class / xpath 变化）
+        · 无 backendNodeId 或打标失败时：回落到保存的 locator 字符串
+        · 再失败，用 name 作 text 定位器
+    - 其它：智能补全 css:/xpath: 前缀。
 
     :param page: 可选，传入避免内部再调用 _get_page；为 None 时按需懒加载。
     """
+    if locator.startswith('pw:'):
+        return _resolve_pw(locator[3:], session, page)
     if not locator.startswith('ref:'):
         return normalize_locator(locator)
 

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

@@ -23,7 +23,7 @@ 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,
+    @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']),