High-performance browser automation bridge and multi-instance orchestrator with advanced stealth injection and real-time dashboard.
fix(upload): resolve the upload selector with the tab's RefCache and frame scope so a snapshot ref and an in-frame input resolve like every other element verb (PIN-421)
Luigi Agosti57c83507b6f0
diff --git a/internal/bridge/api.go b/internal/bridge/api.goindex 3647501d..62c0c6e8 100644--- a/internal/bridge/api.go+++ b/internal/bridge/api.go@@ -122,7 +122,7 @@ type BridgeAPI interface {PrintToPDF(ctx context.Context, params PDFParams) ([]byte, error)SetFileInputFiles(ctx context.Context, nodeID int64, paths []string) error- ResolveSelectorToNodeID(ctx context.Context, selector string) (int64, error)+ ResolveSelectorToNodeID(ctx context.Context, selector string, refCache *RefCache, frameID string) (int64, error)DownloadURL(ctx context.Context, dlURL string, opts DownloadOpts) (*DownloadResult, error)diff --git a/internal/bridge/upload.go b/internal/bridge/upload.goindex ed85ffcc..9557bc59 100644--- a/internal/bridge/upload.go+++ b/internal/bridge/upload.go@@ -15,8 +15,6 @@ func (b *Bridge) SetFileInputFiles(ctx context.Context, backendNodeID int64, pat}))}-// 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, raw string) (int64, error) {- return ResolveUnifiedSelectorInFrame(ctx, selector.Parse(raw), nil, "")+func (b *Bridge) ResolveSelectorToNodeID(ctx context.Context, raw string, refCache *RefCache, frameID string) (int64, error) {+ return ResolveUnifiedSelectorInFrame(ctx, selector.Parse(raw), refCache, frameID)}diff --git a/internal/bridge/upload_filename_test.go b/internal/bridge/upload_filename_test.goindex 4281edc7..5b1ab15f 100644--- a/internal/bridge/upload_filename_test.go+++ b/internal/bridge/upload_filename_test.go@@ -124,7 +124,7 @@ func uploadTargetNodeID(t *testing.T, ctx context.Context) int64 {t.Helper()b := &Bridge{}- nodeID, err := b.ResolveSelectorToNodeID(ctx, "#target")+ nodeID, err := b.ResolveSelectorToNodeID(ctx, "#target", nil, "")if err != nil {t.Fatal(err)}diff --git a/internal/handlers/handlers_test.go b/internal/handlers/handlers_test.goindex 54561005..9bcd8b79 100644--- a/internal/handlers/handlers_test.go+++ b/internal/handlers/handlers_test.go@@ -309,7 +309,7 @@ func (m *mockBridge) SetFileInputFiles(ctx context.Context, nodeID int64, pathsreturn nil}-func (m *mockBridge) ResolveSelectorToNodeID(ctx context.Context, selector string) (int64, error) {+func (m *mockBridge) ResolveSelectorToNodeID(ctx context.Context, selector string, refCache *bridge.RefCache, frameID string) (int64, error) {return 0, nil}diff --git a/internal/handlers/health_tabs_test.go b/internal/handlers/health_tabs_test.goindex dd50b391..f682901b 100644--- a/internal/handlers/health_tabs_test.go+++ b/internal/handlers/health_tabs_test.go@@ -563,7 +563,7 @@ func (m *MockBridge) SetFileInputFiles(ctx context.Context, nodeID int64, pathsreturn nil}-func (m *MockBridge) ResolveSelectorToNodeID(ctx context.Context, selector string) (int64, error) {+func (m *MockBridge) ResolveSelectorToNodeID(ctx context.Context, selector string, refCache *bridge.RefCache, frameID string) (int64, error) {return 0, nil}diff --git a/internal/handlers/upload.go b/internal/handlers/upload.goindex 20823b26..d11b1a4f 100644--- a/internal/handlers/upload.go+++ b/internal/handlers/upload.go@@ -202,7 +202,7 @@ func (h *Handlers) HandleUpload(w http.ResponseWriter, r *http.Request) {defer tCancel()go httpx.CancelOnClientDone(r.Context(), tCancel)- nodeID, err := h.Bridge.ResolveSelectorToNodeID(tCtx, req.Selector)+ nodeID, err := h.Bridge.ResolveSelectorToNodeID(tCtx, req.Selector, h.Bridge.GetRefCache(resolvedTabID), h.selectorFrameID(resolvedTabID))if err != nil {respondSelectorFailure(w, fmt.Errorf("%w: upload selector %q: %v", ErrElementNotFound, req.Selector, err))returndiff --git a/internal/handlers/upload_test.go b/internal/handlers/upload_test.goindex c9e52984..fda0e060 100644--- a/internal/handlers/upload_test.go+++ b/internal/handlers/upload_test.go@@ -15,6 +15,7 @@ import ("github.com/pinchtab/pinchtab/internal/bridge""github.com/pinchtab/pinchtab/internal/config"+ "github.com/pinchtab/pinchtab/internal/selector")type uploadLockBridge struct {@@ -31,10 +32,25 @@ type recordingUploadBridge struct {selector stringnodeID int64attachedPaths []string+ refCache *bridge.RefCache+ gotRefCache *bridge.RefCache+ gotFrameID string}-func (m *recordingUploadBridge) ResolveSelectorToNodeID(_ context.Context, selector string) (int64, error) {- m.selector = selector+func (m *recordingUploadBridge) GetRefCache(string) *bridge.RefCache { return m.refCache }++func (m *recordingUploadBridge) ResolveSelectorToNodeID(_ context.Context, sel string, refCache *bridge.RefCache, frameID string) (int64, error) {+ m.selector = sel+ m.gotRefCache = refCache+ m.gotFrameID = frameID+ if parsed := selector.Parse(sel); parsed.Kind == selector.KindRef {+ if refCache != nil {+ if target, ok := refCache.Lookup(parsed.Value); ok {+ return target.BackendNodeID, nil+ }+ }+ return 0, fmt.Errorf("ref %s not in snapshot cache", parsed.Value)+ }return 42, nil}@@ -53,7 +69,7 @@ type failingSelectorUploadBridge struct {mockBridge}-func (failingSelectorUploadBridge) ResolveSelectorToNodeID(context.Context, string) (int64, error) {+func (failingSelectorUploadBridge) ResolveSelectorToNodeID(context.Context, string, *bridge.RefCache, string) (int64, error) {return 0, fmt.Errorf("no element matches selector")}@@ -71,6 +87,42 @@ func TestHandleUpload_SelectorNotFoundIs404(t *testing.T) {}}+func TestHandleUpload_ResolvesRefSelector(t *testing.T) {+ rec := &recordingUploadBridge{refCache: &bridge.RefCache{Refs: map[string]int64{"e0": 4242}}}+ h := New(rec, &config.RuntimeConfig{AllowUpload: true, StateDir: t.TempDir(), ActionTimeout: time.Second}, nil, nil, nil)+ req := httptest.NewRequest("POST", "/upload?tabId=t1", bytes.NewReader([]byte(`{"selector":"e0","files":["aGVsbG8="]}`)))+ req.Header.Set("Content-Type", "application/json")+ w := httptest.NewRecorder()+ h.HandleUpload(w, req)++ if w.Code != http.StatusOK {+ t.Fatalf("ref selector e0 did not upload: %d %s", w.Code, w.Body.String())+ }+ if rec.gotRefCache != rec.refCache {+ t.Fatalf("handler did not forward the tab's RefCache (got %v), so a ref cannot resolve", rec.gotRefCache)+ }+ if rec.nodeID != 4242 {+ t.Fatalf("ref e0 resolved to node %d, want 4242 from the cache", rec.nodeID)+ }+}++func TestHandleUpload_ResolvesFrameScopedSelector(t *testing.T) {+ rec := &recordingUploadBridge{}+ rec.SetFrameScope("tab1", bridge.FrameScope{FrameID: "FRAME-7"})+ h := New(rec, &config.RuntimeConfig{AllowUpload: true, StateDir: t.TempDir(), ActionTimeout: time.Second}, nil, nil, nil)+ req := httptest.NewRequest("POST", "/upload?tabId=t1", bytes.NewReader([]byte(`{"selector":"#f","files":["aGVsbG8="]}`)))+ req.Header.Set("Content-Type", "application/json")+ w := httptest.NewRecorder()+ h.HandleUpload(w, req)++ if w.Code != http.StatusOK {+ t.Fatalf("frame-scoped selector did not upload: %d %s", w.Code, w.Body.String())+ }+ if rec.gotFrameID != "FRAME-7" {+ t.Fatalf("handler resolved the selector in frame %q, want FRAME-7 — an in-frame input is unreachable otherwise", rec.gotFrameID)+ }+}+func TestHandleUpload_BadJSON(t *testing.T) {h := New(&mockBridge{}, &config.RuntimeConfig{AllowUpload: true}, nil, nil, nil)req := httptest.NewRequest("POST", "/upload", bytes.NewReader([]byte("not json")))