High-performance browser automation bridge and multi-instance orchestrator with advanced stealth injection and real-time dashboard.
fix upload selectors in shadow roots
马千里ae4a172caceb
diff --git a/internal/bridge/action_resolve.go b/internal/bridge/action_resolve.goindex 9bdc0dd4..93ed754f 100644--- a/internal/bridge/action_resolve.go+++ b/internal/bridge/action_resolve.go@@ -403,8 +403,19 @@ const resolveSelectorAtFn = `function(kind, value, index, fromEnd) {if (idx < 0 || idx >= items.length) return null;return items[idx];};+ const deepQueryAll = (selector) => {+ const out = [];+ const visit = (scope) => {+ if (!scope || !scope.querySelectorAll) return;+ const elements = Array.from(scope.querySelectorAll("*"));+ out.push(...Array.from(scope.querySelectorAll(selector)));+ for (const el of elements) if (el.shadowRoot) visit(el.shadowRoot);+ };+ visit(root);+ return out;+ };const textCandidates = (query) => {- const elements = Array.from((root.body || root.documentElement || root).querySelectorAll("*"));+ const elements = deepQueryAll("*");const exact = [];for (const el of elements) {const text = normalize(el.textContent || "");@@ -435,7 +446,7 @@ const resolveSelectorAtFn = `function(kind, value, index, fromEnd) {try {switch (kind) {case "css":- return pick(Array.from(root.querySelectorAll(value)));+ return pick(deepQueryAll(value));case "xpath": {const result = root.evaluate(value, root, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);const items = [];diff --git a/internal/bridge/action_resolve_test.go b/internal/bridge/action_resolve_test.goindex 9dc57676..1fe8b7c5 100644--- a/internal/bridge/action_resolve_test.go+++ b/internal/bridge/action_resolve_test.go@@ -3,6 +3,7 @@ package bridgeimport ("context""errors"+ "strings""testing""github.com/pinchtab/pinchtab/internal/selector"@@ -24,6 +25,18 @@ func TestResolveUnifiedSelector_ErrorClassification(t *testing.T) {}}+func TestResolveSelectorAtFnSearchesOpenShadowRoots(t *testing.T) {+ if !strings.Contains(resolveSelectorAtFn, "shadowRoot") {+ t.Fatal("selector resolver should walk open shadow roots")+ }+ if !strings.Contains(resolveSelectorAtFn, "return pick(deepQueryAll(value))") {+ t.Fatal("css selectors should use deepQueryAll")+ }+ if strings.Contains(resolveSelectorAtFn, "return pick(Array.from(root.querySelectorAll(value)))") {+ t.Fatal("css selectors should not use document-only querySelectorAll")+ }+}+func TestParseNthSelectorValue(t *testing.T) {index, raw, err := parseNthSelectorValue("2:role:button Save")if err != nil {diff --git a/internal/bridge/upload.go b/internal/bridge/upload.goindex 0d911d3a..ed85ffcc 100644--- a/internal/bridge/upload.go+++ b/internal/bridge/upload.go@@ -2,57 +2,21 @@ package bridgeimport ("context"- "fmt"- "strings""github.com/chromedp/cdproto/cdp""github.com/chromedp/cdproto/dom"- "github.com/chromedp/cdproto/runtime""github.com/chromedp/chromedp"+ "github.com/pinchtab/pinchtab/internal/selector")-func (b *Bridge) SetFileInputFiles(ctx context.Context, nodeID int64, paths []string) error {+func (b *Bridge) SetFileInputFiles(ctx context.Context, backendNodeID int64, paths []string) error {return chromedp.Run(ctx, chromedp.ActionFunc(func(ctx context.Context) error {- return dom.SetFileInputFiles(paths).WithNodeID(cdp.NodeID(nodeID)).Do(ctx)+ return dom.SetFileInputFiles(paths).WithBackendNodeID(cdp.BackendNodeID(backendNodeID)).Do(ctx)}))}// ResolveSelectorToNodeID finds a DOM node by a unified selector string and returns its NodeID.// Supports CSS (default), XPath (xpath: prefix or // auto-detect), and text (text: prefix).-func (b *Bridge) ResolveSelectorToNodeID(ctx context.Context, selector string) (int64, error) {- var nodeID int64- err := chromedp.Run(ctx, chromedp.ActionFunc(func(ctx context.Context) error {- var expr string- switch {- case strings.HasPrefix(selector, "xpath:"):- xpath := selector[len("xpath:"):]- expr = fmt.Sprintf(`(function(){var r=document.evaluate(%q,document,null,XPathResult.FIRST_ORDERED_NODE_TYPE,null);return r.singleNodeValue})()`, xpath)- case strings.HasPrefix(selector, "//") || strings.HasPrefix(selector, "(//"):- expr = fmt.Sprintf(`(function(){var r=document.evaluate(%q,document,null,XPathResult.FIRST_ORDERED_NODE_TYPE,null);return r.singleNodeValue})()`, selector)- case strings.HasPrefix(selector, "text:"):- text := selector[len("text:"):]- expr = fmt.Sprintf(`(function(){var w=document.createTreeWalker(document.body,NodeFilter.SHOW_TEXT);while(w.nextNode()){if(w.currentNode.textContent.includes(%q))return w.currentNode.parentElement}return null})()`, text)- case strings.HasPrefix(selector, "css:"):- css := selector[len("css:"):]- expr = fmt.Sprintf(`document.querySelector(%q)`, css)- default:- // Bare selector — treat as CSS (backward compatible)- expr = fmt.Sprintf(`document.querySelector(%q)`, selector)- }-- val, _, err := runtime.Evaluate(expr).Do(ctx)- if err != nil {- return fmt.Errorf("evaluate: %w", err)- }- if val.ObjectID == "" {- return fmt.Errorf("no element matches selector")- }- node, err := dom.RequestNode(val.ObjectID).Do(ctx)- if err != nil {- return fmt.Errorf("request node: %w", err)- }- nodeID = int64(node)- return nil- }))- return nodeID, err+func (b *Bridge) ResolveSelectorToNodeID(ctx context.Context, raw string) (int64, error) {+ return ResolveUnifiedSelectorInFrame(ctx, selector.Parse(raw), nil, "")}