High-performance browser automation bridge and multi-instance orchestrator with advanced stealth injection and real-time dashboard.
refactor: delete the unreachable RuntimeInstance shadow implementation
Luigi Agostib4535abe1eb1
diff --git a/internal/bridge/api.go b/internal/bridge/api.goindex c08d5f8c..d29267d7 100644--- a/internal/bridge/api.go+++ b/internal/bridge/api.go@@ -157,8 +157,6 @@ type BridgeAPI interface {AddScriptToEvaluateOnNewDocument(ctx context.Context, source string) (string, error)}-// Browser-runtime DTOs are defined once in internal/runtimetypes and aliased-// here so bridge and the browsers RuntimeInstance speak one set of structs.// Construct ScreencastStream via runtimetypes.NewScreencastStreamWithDone (the// bridge screencast loop owns and closes the done channel itself).type (diff --git a/internal/bridge/bridge.go b/internal/bridge/bridge.goindex 5b5bb855..68202b61 100644--- a/internal/bridge/bridge.go+++ b/internal/bridge/bridge.go@@ -9,7 +9,6 @@ import ("github.com/chromedp/chromedp"bridgeruntime "github.com/pinchtab/pinchtab/internal/bridge/runtime"- "github.com/pinchtab/pinchtab/internal/browsers""github.com/pinchtab/pinchtab/internal/config""github.com/pinchtab/pinchtab/internal/ids""github.com/pinchtab/pinchtab/internal/stealth"@@ -59,9 +58,6 @@ type Bridge struct {pointerMu sync.RWMutexpointerByTab map[string]pointerState- // Initialized during EnsureBrowser. Nil before launch.- Runtime browsers.RuntimeInstance-initMu sync.Mutexinitialized booldraining booldiff --git a/internal/bridge/bridge_lifecycle.go b/internal/bridge/bridge_lifecycle.goindex 2b5b0823..983d87a7 100644--- a/internal/bridge/bridge_lifecycle.go+++ b/internal/bridge/bridge_lifecycle.go@@ -18,8 +18,6 @@ import (cdpruntime "github.com/chromedp/cdproto/runtime""github.com/chromedp/chromedp"bridgeruntime "github.com/pinchtab/pinchtab/internal/bridge/runtime"- "github.com/pinchtab/pinchtab/internal/browsers"- "github.com/pinchtab/pinchtab/internal/browsers/chrome""github.com/pinchtab/pinchtab/internal/config""github.com/pinchtab/pinchtab/internal/stealth")@@ -232,7 +230,6 @@ func (b *Bridge) EnsureBrowser(cfg *config.RuntimeConfig) error {b.AllocCtx = nilb.AllocCancel = nilb.TabManager = nil- b.Runtime = nilcfg.DisableInProcessGPU = true}@@ -242,7 +239,6 @@ func (b *Bridge) EnsureBrowser(cfg *config.RuntimeConfig) error {}b.BrowserCtx = nilb.BrowserCancel = nil- b.Runtime = nil}// Remote-CDP: no profile lock, no launched process.@@ -285,13 +281,6 @@ func (b *Bridge) EnsureBrowser(cfg *config.RuntimeConfig) error {b.initialized = trueb.stealthLaunchMode = launchMode- browserID := config.NormalizeBrowser(cfg.DefaultBrowser)- if browser, ok := browsers.Get(browserID); ok {- b.Runtime = browser.NewRuntimeInstance(browserCtx, cfg.Headless)- } else {- b.Runtime = chrome.NewInstance(browserCtx, cfg.Headless)- }-if b.Config != nil && b.TabManager == nil {b.reinitWiring(browserCtx, reinitWiringOpts{startBrowserGuards: true})}@@ -394,7 +383,6 @@ func (b *Bridge) RestartBrowser(cfg *config.RuntimeConfig) error {b.AllocCtx = nilb.AllocCancel = nilb.TabManager = nil- b.Runtime = nilb.stealthLaunchMode = stealth.LaunchModeUninitializedb.LogStore = NewConsoleLogStore(1000)diff --git a/internal/bridge/runtime/init_test.go b/internal/bridge/runtime/init_test.goindex 64f845f1..afbf7de8 100644--- a/internal/bridge/runtime/init_test.go+++ b/internal/bridge/runtime/init_test.go@@ -274,9 +274,6 @@ func (noCDPBrowser) ClassifyLaunchError(_ browsers.LaunchFailure) browsers.Launcfunc (noCDPBrowser) CanHandle(_ browsers.RequestIntent) browsers.HandleDecision {return browsers.HandleDecision{Decision: browsers.DecisionHandle}}-func (noCDPBrowser) NewRuntimeInstance(_ context.Context, _ bool) browsers.RuntimeInstance {- return nil-}var registerNoCDPOnce sync.Oncediff --git a/internal/browsers/all/browser_handle_test.go b/internal/browsers/all/browser_handle_test.goindex fd3749d5..92fd3520 100644--- a/internal/browsers/all/browser_handle_test.go+++ b/internal/browsers/all/browser_handle_test.go@@ -1,7 +1,6 @@package all_testimport (- "context""sync""testing"@@ -30,7 +29,6 @@ func (handleStub) ClassifyLaunchError(_ browsers.LaunchFailure) browsers.LaunchEfunc (handleStub) CanHandle(_ browsers.RequestIntent) browsers.HandleDecision {return browsers.HandleDecision{Decision: browsers.DecisionHandle}}-func (handleStub) NewRuntimeInstance(_ context.Context, _ bool) browsers.RuntimeInstance { return nil }type skipStub struct{}@@ -53,7 +51,6 @@ func (skipStub) ClassifyLaunchError(_ browsers.LaunchFailure) browsers.LaunchErrfunc (skipStub) CanHandle(_ browsers.RequestIntent) browsers.HandleDecision {return browsers.HandleDecision{Decision: browsers.DecisionSkip, Reason: "not supported"}}-func (skipStub) NewRuntimeInstance(_ context.Context, _ bool) browsers.RuntimeInstance { return nil }type failStub struct{}@@ -76,7 +73,6 @@ func (failStub) ClassifyLaunchError(_ browsers.LaunchFailure) browsers.LaunchErrfunc (failStub) CanHandle(_ browsers.RequestIntent) browsers.HandleDecision {return browsers.HandleDecision{Decision: browsers.DecisionFail, Reason: "fatal: missing dependency"}}-func (failStub) NewRuntimeInstance(_ context.Context, _ bool) browsers.RuntimeInstance { return nil }var (registerHandleOnce sync.Oncediff --git a/internal/browsers/browser.go b/internal/browsers/browser.goindex 93eef626..a2de254b 100644--- a/internal/browsers/browser.go+++ b/internal/browsers/browser.go@@ -4,7 +4,6 @@package browsersimport (- "context""fmt""sort""strings"@@ -92,11 +91,6 @@ type Browser interface {// intent. Providers return DecisionHandle, DecisionSkip, or// DecisionFail with an optional reason.CanHandle(intent RequestIntent) HandleDecision-- // NewRuntimeInstance creates a post-launch RuntimeInstance from an- // already-initialized browser context. Each provider returns its own- // Instance type (chrome, cloak, ghost-chrome).- NewRuntimeInstance(browserCtx context.Context, headless bool) RuntimeInstance}var (diff --git a/internal/browsers/browser_test.go b/internal/browsers/browser_test.goindex 7d9041e2..5cbed90f 100644--- a/internal/browsers/browser_test.go+++ b/internal/browsers/browser_test.go@@ -1,7 +1,6 @@package browsersimport (- "context""encoding/json""strings""sync"@@ -28,7 +27,6 @@ func (s *stubBrowser) ClassifyLaunchError(_ LaunchFailure) LaunchErrorKind { retfunc (s *stubBrowser) CanHandle(_ RequestIntent) HandleDecision {return HandleDecision{Decision: DecisionHandle}}-func (s *stubBrowser) NewRuntimeInstance(_ context.Context, _ bool) RuntimeInstance { return nil }func stub(id string) Browser {return &stubBrowser{id: id, displayName: id}diff --git a/internal/browsers/chrome/chrome.go b/internal/browsers/chrome/chrome.goindex 2a48c97c..40883f00 100644--- a/internal/browsers/chrome/chrome.go+++ b/internal/browsers/chrome/chrome.go@@ -2,7 +2,6 @@package chromeimport (- "context""crypto/rand""fmt""math/big"@@ -228,8 +227,4 @@ func (Browser) CanHandle(_ browsers.RequestIntent) browsers.HandleDecision {return browsers.HandleDecision{Decision: browsers.DecisionHandle}}-func (Browser) NewRuntimeInstance(browserCtx context.Context, headless bool) browsers.RuntimeInstance {- return NewInstance(browserCtx, headless)-}-func init() { browsers.Register(&Browser{}) }diff --git a/internal/browsers/chrome/instance.go b/internal/browsers/chrome/instance.godeleted file mode 100644index 5e7c4a0e..00000000--- a/internal/browsers/chrome/instance.go+++ /dev/null@@ -1,344 +0,0 @@-package chrome--import (- "context"- "encoding/json"- "fmt"- "strings"- "time"-- "github.com/chromedp/cdproto/cdp"- "github.com/chromedp/cdproto/dom"- "github.com/chromedp/cdproto/emulation"- "github.com/chromedp/cdproto/network"- "github.com/chromedp/cdproto/page"- "github.com/chromedp/cdproto/runtime"- "github.com/chromedp/chromedp"- "github.com/pinchtab/pinchtab/internal/bridge/cdpops"- "github.com/pinchtab/pinchtab/internal/browsers"- "github.com/pinchtab/pinchtab/internal/cdptk"-)--type Instance struct {- browserCtx context.Context- headless bool-}--// NewInstance creates a Chrome RuntimeInstance backed by the given browser-// context. headless controls the screencast strategy (polling vs event-driven).-func NewInstance(browserCtx context.Context, headless bool) *Instance {- return &Instance{browserCtx: browserCtx, headless: headless}-}--var _ browsers.RuntimeInstance = (*Instance)(nil)--func (i *Instance) CaptureScreenshot(ctx context.Context, format string, quality int, clip *cdptk.ScreenshotClip) ([]byte, error) {- const beyondViewport = false- vp := cdptk.ClipViewport(clip)-- buf, err := cdptk.CaptureWithSurfaceFallback(cdptk.CaptureFromSurface(beyondViewport, vp), func(fromSurface bool) ([]byte, error) {- var buf []byte- err := chromedp.Run(ctx, chromedp.ActionFunc(func(c context.Context) error {- // Wake the target's renderer before capturing. Background / non-- // foreground tabs throttle their compositor and stop painting, so- // captureScreenshot blocks until the action deadline (~30s). A- // best-effort BringToFront resumes painting for the target we are- // about to capture; the error is ignored so providers whose CDP proxy- // does not implement it still capture normally.- _ = page.BringToFront().Do(c)-- var cdpFormat page.CaptureScreenshotFormat- switch format {- case "png":- cdpFormat = page.CaptureScreenshotFormatPng- default:- cdpFormat = page.CaptureScreenshotFormatJpeg- }-- shot := page.CaptureScreenshot().WithFormat(cdpFormat).WithFromSurface(fromSurface)- if vp != nil {- shot = shot.WithClip(vp)- }- if cdpFormat == page.CaptureScreenshotFormatJpeg && quality > 0 {- shot = shot.WithQuality(int64(quality))- }- var err error- buf, err = shot.Do(c)- return err- }))- return buf, err- })- if err != nil {- return nil, fmt.Errorf("screenshot: %w", err)- }- return buf, nil-}--func (i *Instance) Evaluate(ctx context.Context, expression string, result any, opts browsers.EvalOpts) error {- var chromedpOpts []chromedp.EvaluateOption- if opts.AwaitPromise {- chromedpOpts = append(chromedpOpts, func(p *runtime.EvaluateParams) *runtime.EvaluateParams {- return p.WithAwaitPromise(true)- })- }- return chromedp.Run(ctx, chromedp.Evaluate(expression, result, chromedpOpts...))-}--// EvaluateInFrame evaluates a JavaScript expression in the given frame's-// execution context. If frameID is empty, behaves like Evaluate.-func (i *Instance) EvaluateInFrame(ctx context.Context, frameID string, expression string, result any, opts browsers.EvalOpts) error {- if frameID == "" {- return i.Evaluate(ctx, expression, result, opts)- }-- execID, err := frameExecutionContextID(ctx, frameID)- if err != nil {- return fmt.Errorf("resolve frame context: %w", err)- }- if execID == 0 {- return i.Evaluate(ctx, expression, result, opts)- }-- var raw json.RawMessage- err = chromedp.Run(ctx, chromedp.ActionFunc(func(ctx context.Context) error {- return chromedp.FromContext(ctx).Target.Execute(ctx, "Runtime.evaluate", map[string]any{- "expression": expression,- "returnByValue": true,- "contextId": execID,- }, &raw)- }))- if err != nil {- return err- }-- var parsed struct {- Result struct {- Value json.RawMessage `json:"value"`- } `json:"result"`- ExceptionDetails *struct {- Text string `json:"text"`- } `json:"exceptionDetails,omitempty"`- }- if err := json.Unmarshal(raw, &parsed); err != nil {- return fmt.Errorf("evaluate in frame parse: %w", err)- }- if parsed.ExceptionDetails != nil && parsed.ExceptionDetails.Text != "" {- return fmt.Errorf("%s", parsed.ExceptionDetails.Text)- }- if result == nil || len(parsed.Result.Value) == 0 {- return nil- }- return json.Unmarshal(parsed.Result.Value, result)-}--// CallFunctionOnNode resolves a backend node ID to a Runtime object, then-// calls the given JavaScript function on it.-func (i *Instance) CallFunctionOnNode(ctx context.Context, backendNodeID int64, functionDecl string, args []map[string]any, result any) error {- return cdpops.CallFunctionOnNode(ctx, backendNodeID, functionDecl, args, result)-}--func (i *Instance) DescribeNode(ctx context.Context, backendNodeID int64) (*browsers.NodeInfo, error) {- return cdpops.DescribeNode(ctx, backendNodeID)-}--// ResolveSelectorToNodeID finds a DOM node by a unified selector string and-// returns its NodeID.-func (i *Instance) 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:- 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 (i *Instance) SetFileInputFiles(ctx context.Context, nodeID 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)- }))-}--func (i *Instance) GetCookies(ctx context.Context, urls []string) ([]browsers.CookieData, error) {- var cookies []*network.Cookie- err := chromedp.Run(ctx, chromedp.ActionFunc(func(ctx context.Context) error {- var err error- cookies, err = network.GetCookies().WithURLs(urls).Do(ctx)- return err- }))- if err != nil {- return nil, err- }-- result := make([]browsers.CookieData, len(cookies))- for idx, c := range cookies {- result[idx] = browsers.CookieData{- Name: c.Name,- Value: c.Value,- Domain: c.Domain,- Path: c.Path,- Expires: float64(c.Expires),- HTTPOnly: c.HTTPOnly,- Secure: c.Secure,- SameSite: c.SameSite.String(),- }- }- return result, nil-}--func (i *Instance) SetCookie(ctx context.Context, params browsers.SetCookieParams) error {- return chromedp.Run(ctx, chromedp.ActionFunc(func(ctx context.Context) error {- p := network.SetCookie(params.Name, params.Value).- WithURL(params.URL).- WithHTTPOnly(params.HTTPOnly).- WithSecure(params.Secure)-- if params.Domain != "" {- p = p.WithDomain(params.Domain)- }- if params.Path != "" {- p = p.WithPath(params.Path)- }- if params.Expires > 0 {- expires := cdp.TimeSinceEpoch(time.Unix(int64(params.Expires), 0))- p = p.WithExpires(&expires)- }- if params.SameSite != "" {- var sameSite network.CookieSameSite- switch strings.ToLower(params.SameSite) {- case "strict":- sameSite = network.CookieSameSiteStrict- case "lax":- sameSite = network.CookieSameSiteLax- case "none":- sameSite = network.CookieSameSiteNone- }- if sameSite != "" {- p = p.WithSameSite(sameSite)- }- }-- return p.Do(ctx)- }))-}--func (i *Instance) SetViewport(ctx context.Context, params browsers.ViewportParams) error {- return chromedp.Run(ctx, chromedp.ActionFunc(func(ctx context.Context) error {- return emulation.SetDeviceMetricsOverride(params.Width, params.Height, params.DeviceScaleFactor, params.Mobile).- WithScreenWidth(params.Width).WithScreenHeight(params.Height).Do(ctx)- }))-}--func (i *Instance) SetGeolocation(ctx context.Context, lat, lng, accuracy float64) error {- return chromedp.Run(ctx, chromedp.ActionFunc(func(ctx context.Context) error {- return emulation.SetGeolocationOverride().WithLatitude(lat).WithLongitude(lng).WithAccuracy(accuracy).Do(ctx)- }))-}--func (i *Instance) SetEmulatedMedia(ctx context.Context, feature, value string) error {- return chromedp.Run(ctx, chromedp.ActionFunc(func(ctx context.Context) error {- return emulation.SetEmulatedMedia().WithFeatures([]*emulation.MediaFeature{{Name: feature, Value: value}}).Do(ctx)- }))-}--func (i *Instance) SetNetworkConditions(ctx context.Context, params browsers.NetworkConditions) error {- return chromedp.Run(ctx, chromedp.ActionFunc(func(ctx context.Context) error {- return network.OverrideNetworkState(params.Offline, params.Latency, params.DownloadThroughput, params.UploadThroughput).- Do(ctx)- }))-}--func (i *Instance) SetExtraHTTPHeaders(ctx context.Context, headers map[string]string) error {- hdrs := make(network.Headers, len(headers))- for k, v := range headers {- hdrs[k] = v- }- return chromedp.Run(ctx, chromedp.ActionFunc(func(ctx context.Context) error {- return network.SetExtraHTTPHeaders(hdrs).Do(ctx)- }))-}--func (i *Instance) CurrentURL(ctx context.Context) (string, error) {- var url string- err := chromedp.Run(ctx, chromedp.Location(&url))- return url, err-}--func (i *Instance) CurrentTitle(ctx context.Context) (string, error) {- var title string- err := chromedp.Run(ctx, chromedp.Title(&title))- return title, err-}--func (i *Instance) PrintToPDF(ctx context.Context, params browsers.PDFParams) ([]byte, error) {- var buf []byte- err := chromedp.Run(ctx, chromedp.ActionFunc(func(ctx context.Context) error {- p := page.PrintToPDF().- WithPrintBackground(params.PrintBackground).- WithScale(params.Scale).- WithLandscape(params.Landscape).- WithPaperWidth(params.PaperWidth).- WithPaperHeight(params.PaperHeight).- WithMarginTop(params.MarginTop).- WithMarginBottom(params.MarginBottom).- WithMarginLeft(params.MarginLeft).- WithMarginRight(params.MarginRight).- WithPreferCSSPageSize(params.PreferCSSPageSize).- WithDisplayHeaderFooter(params.DisplayHeaderFooter).- WithGenerateTaggedPDF(params.GenerateTaggedPDF).- WithGenerateDocumentOutline(params.GenerateDocumentOutline)-- if params.PageRanges != "" {- p = p.WithPageRanges(params.PageRanges)- }- if params.HeaderTemplate != "" {- p = p.WithHeaderTemplate(params.HeaderTemplate)- }- if params.FooterTemplate != "" {- p = p.WithFooterTemplate(params.FooterTemplate)- }-- var err error- buf, _, err = p.Do(ctx)- return err- }))- return buf, err-}--// frameExecutionContextID returns a Runtime.executionContextId that evaluates-// in the given frame's document. Returns (0, nil) when frameID is empty so-// callers can fall back to the default top-level context without branching.-func frameExecutionContextID(ctx context.Context, frameID string) (int64, error) {- return cdpops.FrameExecutionContextID(ctx, frameID)-}--func isContextCanceled(err error) bool {- return err != nil && (strings.Contains(err.Error(), "context canceled") || strings.Contains(err.Error(), context.Canceled.Error()))-}diff --git a/internal/browsers/chrome/instance_clip_test.go b/internal/browsers/chrome/instance_clip_test.godeleted file mode 100644index 33aa1cbf..00000000--- a/internal/browsers/chrome/instance_clip_test.go+++ /dev/null@@ -1,110 +0,0 @@-package chrome_test--import (- "bytes"- "context"- "encoding/base64"- "image"- _ "image/png"- "testing"- "time"-- "github.com/chromedp/chromedp"- "github.com/pinchtab/pinchtab/internal/browsers/chrome"- "github.com/pinchtab/pinchtab/internal/cdptk"- "github.com/pinchtab/pinchtab/internal/testbrowser"-)--// A single black box at a known offset, materially smaller than any viewport,-// so the expected clipped dimensions are exact rather than a ratio.-const clipFixtureHTML = `<body style="margin:0;background:#fff">-<div id="box" style="position:absolute;left:40px;top:60px;width:120px;height:60px;background:#000"></div>-</body>`--func newClipFixture(t *testing.T) (*chrome.Instance, context.Context) {- t.Helper()- chromePath := testbrowser.Path(t)-- alloc, cancelAlloc := chromedp.NewExecAllocator(context.Background(), append(- chromedp.DefaultExecAllocatorOptions[:],- chromedp.ExecPath(chromePath),- chromedp.UserDataDir(testbrowser.ProfileDir(t)),- chromedp.Flag("headless", true),- chromedp.Flag("no-sandbox", true),- )...)- ctx, cancelBrowser := chromedp.NewContext(alloc)- ctx, cancelTimeout := context.WithTimeout(ctx, 30*time.Second)- t.Cleanup(func() {- cancelTimeout()- cancelBrowser()- cancelAlloc()- })-- dataURL := "data:text/html;base64," + base64.StdEncoding.EncodeToString([]byte(clipFixtureHTML))- if err := chromedp.Run(ctx,- chromedp.Navigate(dataURL),- chromedp.WaitVisible("#box", chromedp.ByID),- ); err != nil {- t.Fatal(err)- }- return chrome.NewInstance(ctx, true), ctx-}--func captureSize(t *testing.T, i *chrome.Instance, ctx context.Context, clip *cdptk.ScreenshotClip) (int, int) {- t.Helper()- buf, err := i.CaptureScreenshot(ctx, "png", 0, clip)- if err != nil {- t.Fatalf("CaptureScreenshot: %v", err)- }- cfg, _, err := image.DecodeConfig(bytes.NewReader(buf))- if err != nil {- t.Fatalf("decode png: %v", err)- }- return cfg.Width, cfg.Height-}--// Page.captureScreenshot with fromSurface=false ignores the clip entirely and-// returns the whole viewport. This path hardcoded fromSurface=false for the-// idle-surface stall on headed providers, so every clip it was handed —-// selector-scoped and beyond-viewport annotated captures both — came back as a-// full-viewport image the caller then treated as the clipped region.-func TestInstanceCaptureScreenshotHonoursClip(t *testing.T) {- i, ctx := newClipFixture(t)-- clip := &cdptk.ScreenshotClip{X: 40, Y: 60, Width: 120, Height: 60, Scale: 1}- gotW, gotH := captureSize(t, i, ctx, clip)-- if gotW != 120 || gotH != 60 {- t.Errorf("clipped capture is %dx%d, want 120x60 — the clip was discarded", gotW, gotH)- }-}--// Scale is the one field whose zero value silently reinstates the defect above:-// bridge.ScreenshotOpts documents 0 as native and normalises it, CDP instead-// discards a scale-0 clip and returns the whole viewport. A caller that builds a-// clip without naming a scale gets the full-viewport image back with no error,-// which is why the normalisation is asserted rather than left to the callers who-// happen to set Scale today.-func TestInstanceCaptureScreenshotHonoursClipWithNativeScale(t *testing.T) {- i, ctx := newClipFixture(t)-- gotW, gotH := captureSize(t, i, ctx, &cdptk.ScreenshotClip{X: 40, Y: 60, Width: 120, Height: 60})-- if gotW != 120 || gotH != 60 {- t.Errorf("clip with Scale unset captured %dx%d, want 120x60 — scale 0 must mean native, not a discarded clip", gotW, gotH)- }-}--// The unclipped path keeps reading the view directly, which is why the flag was-// hardcoded: screencast polls this method with a nil clip and must not wait on a-// compositor frame that an idle headed page never swaps.-func TestInstanceCaptureScreenshotWithoutClipCoversViewport(t *testing.T) {- i, ctx := newClipFixture(t)-- clipped, _ := captureSize(t, i, ctx, &cdptk.ScreenshotClip{X: 40, Y: 60, Width: 120, Height: 60, Scale: 1})- fullW, fullH := captureSize(t, i, ctx, nil)-- if fullW <= clipped || fullH <= 60 {- t.Errorf("unclipped capture is %dx%d, want the whole viewport (clipped width was %d)", fullW, fullH, clipped)- }-}diff --git a/internal/browsers/chrome/instance_download.go b/internal/browsers/chrome/instance_download.godeleted file mode 100644index 3f7fc84d..00000000--- a/internal/browsers/chrome/instance_download.go+++ /dev/null@@ -1,202 +0,0 @@-package chrome--import (- "context"- "fmt"- "sync"- "sync/atomic"-- "github.com/chromedp/cdproto/cdp"- "github.com/chromedp/cdproto/fetch"- "github.com/chromedp/cdproto/network"- "github.com/chromedp/chromedp"- "github.com/pinchtab/pinchtab/internal/browsers"-)--// DownloadURL downloads a URL using the browser's session (cookies, stealth).-// It creates a temporary tab, enables fetch interception to validate requests,-// navigates to the URL, and returns the response body.-func (i *Instance) DownloadURL(ctx context.Context, dlURL string, opts browsers.DownloadOpts) (*browsers.DownloadResult, error) {- tabCtx, tabCancel := chromedp.NewContext(i.browserCtx)- defer tabCancel()-- tCtx, tCancel := context.WithCancel(ctx)- defer tCancel()-- var requestID network.RequestID- var responseMIME string- var responseStatus int- var mainFrameID cdp.FrameID- done := make(chan struct{}, 1)- var receivedBytes atomic.Int64-- var mu sync.Mutex- var blockedErr error-- noteBlocked := func(err error) {- mu.Lock()- if blockedErr == nil {- blockedErr = err- }- mu.Unlock()- }-- getBlockedErr := func() error {- mu.Lock()- defer mu.Unlock()- return blockedErr- }-- if err := chromedp.Run(tabCtx, chromedp.ActionFunc(func(ctx context.Context) error {- return fetch.Enable().Do(ctx)- })); err != nil {- return nil, fmt.Errorf("fetch enable: %w", err)- }- defer func() {- _ = chromedp.Run(tabCtx, chromedp.ActionFunc(func(ctx context.Context) error {- return fetch.Disable().Do(ctx)- }))- }()-- chromedp.ListenTarget(tabCtx, func(ev interface{}) {- switch e := ev.(type) {- case *fetch.EventRequestPaused:- go func() {- reqID := e.RequestID- isRedirect := e.RedirectedRequestID != ""- if opts.ValidateURL != nil {- if err := opts.ValidateURL(e.Request.URL, isRedirect); err != nil {- noteBlocked(err)- select {- case done <- struct{}{}:- default:- }- _ = fetch.FailRequest(reqID, network.ErrorReasonBlockedByClient).Do(cdp.WithExecutor(tabCtx, chromedp.FromContext(tabCtx).Target))- return- }- }- _ = fetch.ContinueRequest(reqID).Do(cdp.WithExecutor(tabCtx, chromedp.FromContext(tabCtx).Target))- }()- case *network.EventRequestWillBeSent:- if e.Type != network.ResourceTypeDocument {- return- }- if mainFrameID == "" {- mainFrameID = e.FrameID- }- if e.FrameID == mainFrameID {- requestID = e.RequestID- }- case *network.EventResponseReceived:- if e.RequestID == requestID && requestID != "" {- requestID = e.RequestID- responseMIME = e.Response.MimeType- responseStatus = int(e.Response.Status)- if opts.IsDomainAllowed != nil && !opts.IsDomainAllowed(e.Response.URL) {- if opts.ValidateRemoteIP != nil {- if err := opts.ValidateRemoteIP(e.Response.RemoteIPAddress); err != nil {- noteBlocked(err)- select {- case done <- struct{}{}:- default:- }- tCancel()- return- }- }- }- if opts.MaxBytes > 0 && opts.ParseContentLength != nil {- if contentLength, ok := opts.ParseContentLength(e.Response.Headers); ok && contentLength > int64(opts.MaxBytes) {- noteBlocked(fmt.Errorf("download response too large: received %d bytes, max %d", contentLength, opts.MaxBytes))- select {- case done <- struct{}{}:- default:- }- tCancel()- return- }- }- }- case *network.EventDataReceived:- if e.RequestID == requestID && requestID != "" {- chunk := e.EncodedDataLength- if chunk <= 0 {- chunk = e.DataLength- }- if opts.MaxBytes > 0 && chunk > 0 && receivedBytes.Add(chunk) > int64(opts.MaxBytes) {- noteBlocked(fmt.Errorf("download response too large: received %d bytes, max %d", receivedBytes.Load(), opts.MaxBytes))- select {- case done <- struct{}{}:- default:- }- tCancel()- return- }- }- case *network.EventLoadingFinished:- if e.RequestID == requestID && requestID != "" {- select {- case done <- struct{}{}:- default:- }- }- case *network.EventLoadingFailed:- if e.RequestID == requestID && requestID != "" {- select {- case done <- struct{}{}:- default:- }- }- }- })-- if err := chromedp.Run(tabCtx, network.Enable()); err != nil {- return nil, fmt.Errorf("network enable: %w", err)- }-- navErr := chromedp.Run(tabCtx, chromedp.Navigate(dlURL))- if navErr != nil {- if bErr := getBlockedErr(); bErr != nil {- return nil, bErr- }- return nil, navErr- }-- select {- case <-done:- case <-tCtx.Done():- if bErr := getBlockedErr(); bErr != nil {- return nil, bErr- }- return nil, fmt.Errorf("download timed out")- }-- if bErr := getBlockedErr(); bErr != nil {- return nil, bErr- }-- if responseStatus >= 400 {- return &browsers.DownloadResult{StatusCode: responseStatus, MIMEType: responseMIME}, fmt.Errorf("remote server returned HTTP %d", responseStatus)- }- if requestID == "" {- return nil, fmt.Errorf("download response was not captured")- }-- var body []byte- if err := chromedp.Run(tabCtx, chromedp.ActionFunc(func(ctx context.Context) error {- b, err := network.GetResponseBody(requestID).Do(ctx)- if err != nil {- return err- }- body = b- return nil- })); err != nil {- return nil, fmt.Errorf("get response body: %w", err)- }-- return &browsers.DownloadResult{- Body: body,- MIMEType: responseMIME,- StatusCode: responseStatus,- }, nil-}diff --git a/internal/browsers/chrome/instance_screencast.go b/internal/browsers/chrome/instance_screencast.godeleted file mode 100644index e2fca0a7..00000000--- a/internal/browsers/chrome/instance_screencast.go+++ /dev/null@@ -1,197 +0,0 @@-package chrome--import (- "context"- "encoding/base64"- "fmt"- "log/slog"- "sync/atomic"- "time"-- "github.com/chromedp/cdproto/page"- "github.com/chromedp/chromedp"- "github.com/pinchtab/pinchtab/internal/browsers"- "github.com/pinchtab/pinchtab/internal/cdptk"-)--// StartScreencast begins streaming screencast frames. The caller must call-// Close on the returned ScreencastStream when done. The instance picks-// event-driven (Page.startScreencast) or polling (CaptureScreenshot on a-// ticker) based on the headless flag.-func (i *Instance) StartScreencast(ctx context.Context, opts browsers.ScreencastOpts) (*browsers.ScreencastStream, error) {- if i.headless {- return i.startScreencastPolling(ctx, opts)- }- return i.startScreencastEventDriven(ctx, opts)-}--// startScreencastEventDriven uses CDP Page.startScreencast for headed browsers.-func (i *Instance) startScreencastEventDriven(ctx context.Context, opts browsers.ScreencastOpts) (*browsers.ScreencastStream, error) {- fps := opts.FPS- if fps <= 0 {- fps = 1- }- minFrameInterval := time.Second / time.Duration(fps)-- frameCh := make(chan []byte, 3)- ackCh := make(chan int64, 128)-- // stream is captured by the ack goroutine and the ListenTarget callback- // below; it must never be reassigned (an unsynchronized write racing- // their reads). The repaint-loop stop only exists after StartScreencast- // succeeds, so the closer late-binds it through an atomic instead.- var stopRepaint atomic.Value // holds func()- stream := browsers.NewScreencastStream(frameCh, func() {- if f, ok := stopRepaint.Load().(func()); ok {- f()- }- _ = chromedp.Run(ctx,- chromedp.ActionFunc(func(c context.Context) error {- return page.StopScreencast().Do(c)- }),- )- })-- go func() {- for {- select {- case sessionID := <-ackCh:- if err := chromedp.Run(ctx,- chromedp.ActionFunc(func(c context.Context) error {- return page.ScreencastFrameAck(sessionID).Do(c)- }),- ); err != nil && !isContextCanceled(err) {- slog.Debug("screencast ack failed", "err", err)- }- case <-stream.Done():- return- }- }- }()-- var lastFrame time.Time- chromedp.ListenTarget(ctx, func(ev interface{}) {- switch e := ev.(type) {- case *page.EventScreencastFrame:- select {- case ackCh <- e.SessionID:- case <-stream.Done():- return- default:- go func(sessionID int64) {- if err := chromedp.Run(ctx,- chromedp.ActionFunc(func(c context.Context) error {- return page.ScreencastFrameAck(sessionID).Do(c)- }),- ); err != nil && !isContextCanceled(err) {- slog.Debug("screencast ack fallback failed", "err", err)- }- }(e.SessionID)- }-- now := time.Now()- if now.Sub(lastFrame) < minFrameInterval {- return- }- lastFrame = now-- data, err := base64.StdEncoding.DecodeString(e.Data)- if err != nil {- slog.Warn("screencast frame base64 decode failed", "error", err)- return- }-- select {- case frameCh <- data:- default:- }- }- })-- err := chromedp.Run(ctx,- chromedp.ActionFunc(func(c context.Context) error {- return page.StartScreencast().- WithFormat(page.ScreencastFormatJpeg).- WithQuality(int64(opts.Quality)).- WithMaxWidth(int64(opts.MaxWidth)).- WithMaxHeight(int64(opts.MaxHeight)).- WithEveryNthFrame(int64(opts.EveryNthFrame)).- Do(c)- }),- )- if err != nil {- stream.Close()- return nil, fmt.Errorf("start screencast: %w", err)- }-- stopRepaint.Store(cdptk.StartRepaintLoop(ctx))-- return stream, nil-}--// startScreencastPolling uses CaptureScreenshot on a ticker for headless browsers.-func (i *Instance) startScreencastPolling(ctx context.Context, opts browsers.ScreencastOpts) (*browsers.ScreencastStream, error) {- fps := opts.FPS- if fps <= 0 {- fps = 1- }- frameInterval := time.Second / time.Duration(fps)- if frameInterval <= 0 {- frameInterval = time.Second- }-- frameCh := make(chan []byte, 2)-- stream := browsers.NewScreencastStream(frameCh, nil)-- go func() {- defer close(frameCh)-- t0 := time.Now()- frame, err := i.CaptureScreenshot(ctx, "jpeg", opts.Quality, nil)- if err != nil {- slog.Warn("screencast polling: initial CaptureScreenshot failed",- "err", err, "elapsed", time.Since(t0))- return- }- slog.Debug("screencast polling: initial frame captured",- "bytes", len(frame), "elapsed", time.Since(t0))-- select {- case frameCh <- frame:- case <-stream.Done():- return- }-- ticker := time.NewTicker(frameInterval)- defer ticker.Stop()-- var frames int- for {- select {- case <-ticker.C:- t1 := time.Now()- frame, err := i.CaptureScreenshot(ctx, "jpeg", opts.Quality, nil)- if err != nil {- slog.Warn("screencast polling: CaptureScreenshot failed",- "err", err, "frame", frames, "elapsed", time.Since(t1))- return- }- frames++- if frames <= 3 || frames%30 == 0 {- slog.Debug("screencast polling: frame captured",- "frame", frames, "bytes", len(frame), "elapsed", time.Since(t1))- }- select {- case frameCh <- frame:- case <-stream.Done():- return- }- case <-stream.Done():- return- }- }- }()-- return stream, nil-}diff --git a/internal/browsers/cloak/cloak.go b/internal/browsers/cloak/cloak.goindex 40d9c740..57b2dc15 100644--- a/internal/browsers/cloak/cloak.go+++ b/internal/browsers/cloak/cloak.go@@ -149,8 +149,4 @@ func (Browser) GeoAlignment(geo browsers.GeoConfig) browsers.GeoStrategy {}}-func (Browser) NewRuntimeInstance(browserCtx context.Context, _ bool) browsers.RuntimeInstance {- return NewInstance(browserCtx)-}-func init() { browsers.Register(&Browser{}) }diff --git a/internal/browsers/cloak/instance.go b/internal/browsers/cloak/instance.godeleted file mode 100644index 32aa3bc0..00000000--- a/internal/browsers/cloak/instance.go+++ /dev/null@@ -1,27 +0,0 @@-package cloak--import (- "context"-- "github.com/pinchtab/pinchtab/internal/browsers"- "github.com/pinchtab/pinchtab/internal/browsers/chrome"-)--// Instance implements browsers.RuntimeInstance for CloakBrowser by-// embedding a Chrome Instance. Screencast always uses polling because-// Cloak's CDP proxy does not support Page.startScreencast.-type Instance struct {- *chrome.Instance-}--// NewInstance creates a Cloak RuntimeInstance. The embedded Chrome-// Instance is always constructed with headless=true to force-// polling-based screencast (the only screencast strategy that works-// through Cloak's CDP proxy).-func NewInstance(browserCtx context.Context) *Instance {- return &Instance{- Instance: chrome.NewInstance(browserCtx, true),- }-}--var _ browsers.RuntimeInstance = (*Instance)(nil)diff --git a/internal/browsers/ghostchrome/ghostchrome.go b/internal/browsers/ghostchrome/ghostchrome.goindex 1b02fcfb..30bec1c7 100644--- a/internal/browsers/ghostchrome/ghostchrome.go+++ b/internal/browsers/ghostchrome/ghostchrome.go@@ -127,10 +127,6 @@ func (b Browser) CanHandle(intent browsers.RequestIntent) browsers.HandleDecisioreturn ghostCanHandle(intent)}-func (Browser) NewRuntimeInstance(browserCtx context.Context, headless bool) browsers.RuntimeInstance {- return NewInstance(browserCtx, headless)-}-// All methods use value receivers (consistent with chrome/cloak), so the value// type satisfies the interface; the pointer registered below does too.var _ browsers.Browser = Browser{}diff --git a/internal/browsers/ghostchrome/instance.go b/internal/browsers/ghostchrome/instance.godeleted file mode 100644index 778334a7..00000000--- a/internal/browsers/ghostchrome/instance.go+++ /dev/null@@ -1,24 +0,0 @@-package ghostchrome--import (- "context"-- "github.com/pinchtab/pinchtab/internal/browsers"- "github.com/pinchtab/pinchtab/internal/browsers/chrome"-)--// Instance implements browsers.RuntimeInstance for Ghost-chrome by-// embedding a Chrome Instance. All RuntimeInstance methods delegate to-// Chrome — Ghost-chrome's staticfetch optimization operates at the-// Bridge/BridgeAdapter layer, not here.-type Instance struct {- *chrome.Instance-}--func NewInstance(browserCtx context.Context, headless bool) *Instance {- return &Instance{- Instance: chrome.NewInstance(browserCtx, headless),- }-}--var _ browsers.RuntimeInstance = (*Instance)(nil)diff --git a/internal/browsers/runtime.go b/internal/browsers/runtime.godeleted file mode 100644index 51ede67d..00000000--- a/internal/browsers/runtime.go+++ /dev/null@@ -1,68 +0,0 @@-package browsers--import (- "context"-- "github.com/pinchtab/pinchtab/internal/cdptk"- "github.com/pinchtab/pinchtab/internal/runtimetypes"-)--// The runtime DTOs are defined once in internal/runtimetypes and aliased here so-// the RuntimeInstance interface and internal/bridge share one set of structs-// without an import cycle (config → browsers → bridge → config).--type (- EvalOpts = runtimetypes.EvalOpts- NodeInfo = runtimetypes.NodeInfo- ScreencastOpts = runtimetypes.ScreencastOpts- ScreencastStream = runtimetypes.ScreencastStream- CookieData = runtimetypes.CookieData- SetCookieParams = runtimetypes.SetCookieParams- ViewportParams = runtimetypes.ViewportParams- NetworkConditions = runtimetypes.NetworkConditions- DownloadOpts = runtimetypes.DownloadOpts- DownloadResult = runtimetypes.DownloadResult- PDFParams = runtimetypes.PDFParams-)--// NewScreencastStream wraps runtimetypes.NewScreencastStream so provider runtimes-// keep constructing streams through the browsers package.-func NewScreencastStream(frames <-chan []byte, closer func()) *ScreencastStream {- return runtimetypes.NewScreencastStream(frames, closer)-}--// RuntimeInstance defines post-launch browser operations. Each browser-// provider (chrome, cloak, ghost-chrome) implements this interface to-// own its runtime behavior. The Bridge delegates operations to the-// active RuntimeInstance. Implementations live in the provider-// sub-packages (chrome.Instance, cloak.Instance, ghostchrome.Instance);-// compile-time assertions can't live here without inverting the imports.-type RuntimeInstance interface {- CaptureScreenshot(ctx context.Context, format string, quality int, clip *cdptk.ScreenshotClip) ([]byte, error)- StartScreencast(ctx context.Context, opts ScreencastOpts) (*ScreencastStream, error)-- Evaluate(ctx context.Context, expression string, result any, opts EvalOpts) error- EvaluateInFrame(ctx context.Context, frameID string, expression string, result any, opts EvalOpts) error- CallFunctionOnNode(ctx context.Context, backendNodeID int64, functionDecl string, args []map[string]any, result any) error-- DescribeNode(ctx context.Context, backendNodeID int64) (*NodeInfo, error)- ResolveSelectorToNodeID(ctx context.Context, selector string) (int64, error)- SetFileInputFiles(ctx context.Context, nodeID int64, paths []string) error-- GetCookies(ctx context.Context, urls []string) ([]CookieData, error)- SetCookie(ctx context.Context, params SetCookieParams) error-- SetViewport(ctx context.Context, params ViewportParams) error- SetGeolocation(ctx context.Context, lat, lng, accuracy float64) error- SetEmulatedMedia(ctx context.Context, feature, value string) error-- SetNetworkConditions(ctx context.Context, params NetworkConditions) error- SetExtraHTTPHeaders(ctx context.Context, headers map[string]string) error-- CurrentURL(ctx context.Context) (string, error)- CurrentTitle(ctx context.Context) (string, error)-- DownloadURL(ctx context.Context, dlURL string, opts DownloadOpts) (*DownloadResult, error)-- PrintToPDF(ctx context.Context, params PDFParams) ([]byte, error)-}diff --git a/internal/cdptk/screenshot.go b/internal/cdptk/screenshot.goindex 1ff9d0db..0f52f0ff 100644--- a/internal/cdptk/screenshot.go+++ b/internal/cdptk/screenshot.go@@ -114,11 +114,10 @@ func ClipForNode(ctx context.Context, nodeID int64, css1x bool) (*ScreenshotClip}// CaptureFromSurface decides the Page.captureScreenshot fromSurface flag. It is the one-// owner of that rule: it had two implementations that could not import each other, and-// they had already drifted once — the bridge path was fixed while the RuntimeInstance-// path kept fromSurface=false and went on applying a clip CDP discarded, so scoped and-// beyond-viewport captures returned the full viewport with their annotation boxes mapped-// into the clip's coordinate space.+// owner of that rule: it once had two implementations that could not import each other,+// and they drifted — one path was fixed while the other kept fromSurface=false and went+// on applying a clip CDP discarded, so scoped and beyond-viewport captures returned the+// full viewport with their annotation boxes mapped into the clip's coordinate space.//// fromSurface=false reads the renderer's current view directly instead of waiting for a// fresh compositor surface frame. On idle pages in headed browsers (e.g. Cloak) thediff --git a/internal/config/validate_test.go b/internal/config/validate_test.goindex 8ef974f2..0706992a 100644--- a/internal/config/validate_test.go+++ b/internal/config/validate_test.go@@ -1,7 +1,6 @@package configimport (- "context""log/slog""path/filepath""strings"@@ -1065,9 +1064,6 @@ func (testStubBrowser) ClassifyLaunchError(_ browsers.LaunchFailure) browsers.Lafunc (testStubBrowser) CanHandle(_ browsers.RequestIntent) browsers.HandleDecision {return browsers.HandleDecision{Decision: browsers.DecisionHandle}}-func (testStubBrowser) NewRuntimeInstance(_ context.Context, _ bool) browsers.RuntimeInstance {- return nil-}var registerStubOnce sync.Oncediff --git a/internal/runtimetypes/runtimetypes.go b/internal/runtimetypes/runtimetypes.goindex bff768eb..ab0a89fc 100644--- a/internal/runtimetypes/runtimetypes.go+++ b/internal/runtimetypes/runtimetypes.go@@ -33,16 +33,6 @@ type ScreencastStream struct {closer func()}-// NewScreencastStream creates a stream that owns its done channel; Close is the-// only closer of done.-func NewScreencastStream(frames <-chan []byte, closer func()) *ScreencastStream {- return &ScreencastStream{- Frames: frames,- done: make(chan struct{}),- closer: closer,- }-}-// NewScreencastStreamWithDone creates a stream over a caller-supplied done// channel, for producers that close done themselves when the source ends (e.g.// the bridge screencast loop). Close still guards against a double close.