High-performance browser automation bridge and multi-instance orchestrator with advanced stealth injection and real-time dashboard.
feat: add ad blocking for cleaner snapshots
Marioce547039b6c7
diff --git a/cmd/pinchtab/cmd_cli.go b/cmd/pinchtab/cmd_cli.goindex b51a1c91..866585da 100644--- a/cmd/pinchtab/cmd_cli.go+++ b/cmd/pinchtab/cmd_cli.go@@ -128,7 +128,7 @@ func cliHelp() {Usage: pinchtab <command> [args] [flags]Commands:- nav, navigate <url> Navigate to URL (--new-tab, --block-images)+ nav, navigate <url> Navigate to URL (--new-tab, --block-images, --block-ads)snap, snapshot Accessibility tree snapshot (-i, -c, -d, --max-tokens N)click <ref> Click element by reftype <ref> <text> Type text into element@@ -162,7 +162,7 @@ Pipe with jq:func cliNavigate(client *http.Client, base, token string, args []string) {if len(args) < 1 {- fatal("Usage: pinchtab nav <url> [--new-tab] [--block-images]")+ fatal("Usage: pinchtab nav <url> [--new-tab] [--block-images] [--block-ads]")}body := map[string]any{"url": args[0]}for _, a := range args[1:] {@@ -171,6 +171,8 @@ func cliNavigate(client *http.Client, base, token string, args []string) {body["newTab"] = truecase "--block-images":body["blockImages"] = true+ case "--block-ads":+ body["blockAds"] = true}}doPost(client, base, token, "/navigate", body)diff --git a/cmd/pinchtab/cmd_cli_test.go b/cmd/pinchtab/cmd_cli_test.goindex 516aef4e..7f1efa20 100644--- a/cmd/pinchtab/cmd_cli_test.go+++ b/cmd/pinchtab/cmd_cli_test.go@@ -103,6 +103,19 @@ func TestCLINavigateWithFlags(t *testing.T) {}}+func TestCLINavigateWithBlockAds(t *testing.T) {+ m := newMockServer()+ defer m.close()+ client := m.server.Client()++ cliNavigate(client, m.base(), "", []string{"https://example.com", "--block-ads"})+ var body map[string]any+ _ = json.Unmarshal([]byte(m.lastBody), &body)+ if body["blockAds"] != true {+ t.Error("expected blockAds=true")+ }+}+// --- snapshot tests ---func TestCLISnapshot(t *testing.T) {diff --git a/internal/bridge/adblock.go b/internal/bridge/adblock.gonew file mode 100644index 00000000..42af46f3--- /dev/null+++ b/internal/bridge/adblock.go@@ -0,0 +1,131 @@+package bridge++// AdBlockPatterns contains patterns for common ad, tracking, and analytics domains+// to provide cleaner snapshots for AI agents+var AdBlockPatterns = []string{+ // Google Analytics & Tag Manager+ "*google-analytics.com/*",+ "*googletagmanager.com/*",+ "*googletagservices.com/*",+ "*googlesyndication.com/*",+ "*googleadservices.com/*",+ "*doubleclick.net/*",++ // Facebook/Meta tracking+ "*facebook.com/tr/*",+ "*facebook.com/plugins/*",+ "*connect.facebook.net/*",+ "*fbcdn.net/*/fbevents.js",++ // Twitter/X tracking+ "*twitter.com/i/adsct",+ "*analytics.twitter.com/*",+ "*static.ads-twitter.com/*",++ // Amazon tracking+ "*amazon-adsystem.com/*",+ "*amazontrust.com/*",+ "*adsafeprotected.com/*",++ // Common analytics services+ "*segment.io/*",+ "*segment.com/*",+ "*mixpanel.com/*",+ "*amplitude.com/*",+ "*mxpnl.com/*",+ "*kissmetrics.com/*",+ "*hotjar.com/*",+ "*fullstory.com/*",+ "*heapanalytics.com/*",+ "*mouseflow.com/*",+ "*luckyorange.com/*",+ "*crazyegg.com/*",+ "*pingdom.net/*",+ "*newrelic.com/*",+ "*nr-data.net/*",++ // Ad networks+ "*doubleclick.net/*",+ "*googleadservices.com/*",+ "*googlesyndication.com/*",+ "*adnxs.com/*",+ "*adsymptotic.com/*",+ "*openx.net/*",+ "*pubmatic.com/*",+ "*rubiconproject.com/*",+ "*adsrvr.org/*",+ "*amazon-adsystem.com/*",+ "*media.net/*",+ "*adtech.de/*",+ "*adzerk.net/*",+ "*criteo.com/*",+ "*criteo.net/*",+ "*casalemedia.com/*",+ "*33across.com/*",+ "*taboola.com/*",+ "*outbrain.com/*",+ "*revcontent.com/*",+ "*zemanta.com/*",+ "*disqus.com/ads/*",++ // Marketing automation+ "*marketo.com/*",+ "*marketo.net/*",+ "*hubspot.com/analytics/*",+ "*pardot.com/*",+ "*leadfeeder.com/*",+ "*clickcease.com/*",+ "*leadforensics.com/*",++ // Social media widgets (often slow/tracking)+ "*platform.twitter.com/widgets/*",+ "*platform.instagram.com/widgets/*",+ "*platform.linkedin.com/widgets/*",+ "*pinterest.com/js/pinit.js",++ // Common trackers+ "*scorecardresearch.com/*",+ "*quantserve.com/*",+ "*quantcount.com/*",+ "*parsely.com/*",+ "*chartbeat.com/*",+ "*omtrdc.net/*",+ "*optimizely.com/*",+ "*visualwebsiteoptimizer.com/*",+ "*demdex.net/*",+ "*bluekai.com/*",+ "*addthis.com/*",+ "*sharethis.com/*",++ // Cookie consent (often blocks content)+ "*cookielaw.org/*",+ "*cookiebot.com/*",+ "*onetrust.com/*",+ "*trustarc.com/*",+ "*usercentrics.com/*",++ // Misc tracking pixels+ "*pixel.gif*",+ "*tracking.gif*",+ "*analytics.gif*",+ "*/tr?*",+ "*/pixel?*",+ "*/collect?*",+}++// CombineBlockPatterns merges multiple pattern lists+func CombineBlockPatterns(patterns ...[]string) []string {+ var result []string+ seen := make(map[string]bool)++ for _, list := range patterns {+ for _, pattern := range list {+ if !seen[pattern] {+ seen[pattern] = true+ result = append(result, pattern)+ }+ }+ }++ return result+}diff --git a/internal/bridge/adblock_test.go b/internal/bridge/adblock_test.gonew file mode 100644index 00000000..e914464b--- /dev/null+++ b/internal/bridge/adblock_test.go@@ -0,0 +1,81 @@+package bridge++import (+ "testing"+)++func TestAdBlockPatterns(t *testing.T) {+ // Verify we have a good number of patterns+ if len(AdBlockPatterns) < 50 {+ t.Errorf("expected at least 50 ad block patterns, got %d", len(AdBlockPatterns))+ }++ // Check for some essential patterns+ essentialPatterns := []string{+ "*google-analytics.com/*",+ "*doubleclick.net/*",+ "*facebook.com/tr/*",+ "*segment.io/*",+ }++ patternMap := make(map[string]bool)+ for _, p := range AdBlockPatterns {+ patternMap[p] = true+ }++ for _, essential := range essentialPatterns {+ if !patternMap[essential] {+ t.Errorf("missing essential pattern: %s", essential)+ }+ }+}++func TestCombineBlockPatterns(t *testing.T) {+ list1 := []string{"*.jpg", "*.png", "*.gif"}+ list2 := []string{"*.mp4", "*.png", "*.webm"} // .png is duplicate+ list3 := []string{"*.pdf", "*.doc"}++ combined := CombineBlockPatterns(list1, list2, list3)++ // Should have 7 unique patterns+ if len(combined) != 7 {+ t.Errorf("expected 7 unique patterns, got %d", len(combined))+ }++ // Verify all patterns are present+ expected := map[string]bool{+ "*.jpg": true,+ "*.png": true,+ "*.gif": true,+ "*.mp4": true,+ "*.webm": true,+ "*.pdf": true,+ "*.doc": true,+ }++ for _, pattern := range combined {+ if !expected[pattern] {+ t.Errorf("unexpected pattern: %s", pattern)+ }+ delete(expected, pattern)+ }++ if len(expected) > 0 {+ t.Errorf("missing patterns: %v", expected)+ }+}++func TestCombineBlockPatterns_Empty(t *testing.T) {+ // Test with empty lists+ combined := CombineBlockPatterns([]string{}, []string{})+ if len(combined) != 0 {+ t.Errorf("expected empty result for empty inputs, got %d patterns", len(combined))+ }++ // Test with one empty list+ list := []string{"*.jpg", "*.png"}+ combined = CombineBlockPatterns(list, []string{})+ if len(combined) != 2 {+ t.Errorf("expected 2 patterns, got %d", len(combined))+ }+}diff --git a/internal/bridge/tab_manager.go b/internal/bridge/tab_manager.goindex edf2bbba..73172137 100644--- a/internal/bridge/tab_manager.go+++ b/internal/bridge/tab_manager.go@@ -146,10 +146,21 @@ func (tm *TabManager) CreateTab(url string) (string, context.Context, context.Catm.onTabSetup(ctx)}+ // Configure resource blocking based on settings+ var blockPatterns []string++ if tm.config.BlockAds {+ blockPatterns = CombineBlockPatterns(blockPatterns, AdBlockPatterns)+ }+if tm.config.BlockMedia {- _ = SetResourceBlocking(ctx, MediaBlockPatterns)+ blockPatterns = CombineBlockPatterns(blockPatterns, MediaBlockPatterns)} else if tm.config.BlockImages {- _ = SetResourceBlocking(ctx, ImageBlockPatterns)+ blockPatterns = CombineBlockPatterns(blockPatterns, ImageBlockPatterns)+ }++ if len(blockPatterns) > 0 {+ _ = SetResourceBlocking(ctx, blockPatterns)}newTargetID := string(targetID)diff --git a/internal/config/config.go b/internal/config/config.goindex d2629a1d..8c133749 100644--- a/internal/config/config.go+++ b/internal/config/config.go@@ -23,6 +23,7 @@ type RuntimeConfig struct {Timezone stringBlockImages boolBlockMedia bool+ BlockAds boolMaxTabs intChromeBinary stringChromeExtraFlags string@@ -105,6 +106,7 @@ func Load() *RuntimeConfig {Timezone: os.Getenv("BRIDGE_TIMEZONE"),BlockImages: os.Getenv("BRIDGE_BLOCK_IMAGES") == "true",BlockMedia: os.Getenv("BRIDGE_BLOCK_MEDIA") == "true",+ BlockAds: envBoolOr("BRIDGE_BLOCK_ADS", false),MaxTabs: envIntOr("BRIDGE_MAX_TABS", 20),ChromeBinary: os.Getenv("CHROME_BINARY"),ChromeExtraFlags: os.Getenv("CHROME_FLAGS"),diff --git a/internal/handlers/navigation.go b/internal/handlers/navigation.goindex 34d71061..17e6cbd7 100644--- a/internal/handlers/navigation.go+++ b/internal/handlers/navigation.go@@ -24,6 +24,7 @@ func (h *Handlers) HandleNavigate(w http.ResponseWriter, r *http.Request) {Timeout float64 `json:"timeout"`BlockImages *bool `json:"blockImages"`BlockMedia *bool `json:"blockMedia"`+ BlockAds *bool `json:"blockAds"`}if err := json.NewDecoder(http.MaxBytesReader(w, r.Body, maxBodySize)).Decode(&req); err != nil {web.Error(w, 400, fmt.Errorf("decode: %w", err))@@ -50,17 +51,35 @@ func (h *Handlers) HandleNavigate(w http.ResponseWriter, r *http.Request) {navTimeout = time.Duration(req.Timeout * float64(time.Second))}+ // Build block patterns based on request and configvar blockPatterns []string- if req.BlockMedia != nil && *req.BlockMedia {- blockPatterns = bridge.MediaBlockPatterns- } else if req.BlockImages != nil && *req.BlockImages {- blockPatterns = bridge.ImageBlockPatterns- } else if req.BlockImages != nil && !*req.BlockImages {- blockPatterns = nil- } else if h.Config.BlockMedia {- blockPatterns = bridge.MediaBlockPatterns- } else if h.Config.BlockImages {- blockPatterns = bridge.ImageBlockPatterns++ // Handle explicit request overrides first+ blockAds := h.Config.BlockAds+ if req.BlockAds != nil {+ blockAds = *req.BlockAds+ }++ blockMedia := h.Config.BlockMedia+ if req.BlockMedia != nil {+ blockMedia = *req.BlockMedia+ }++ blockImages := h.Config.BlockImages+ if req.BlockImages != nil {+ blockImages = *req.BlockImages+ }++ // Combine patterns based on flags+ if blockAds {+ blockPatterns = bridge.CombineBlockPatterns(blockPatterns, bridge.AdBlockPatterns)+ }++ if blockMedia {+ blockPatterns = bridge.CombineBlockPatterns(blockPatterns, bridge.MediaBlockPatterns)+ } else if blockImages {+ // Only block images if not already blocking all media+ blockPatterns = bridge.CombineBlockPatterns(blockPatterns, bridge.ImageBlockPatterns)}if req.NewTab {@@ -74,7 +93,7 @@ func (h *Handlers) HandleNavigate(w http.ResponseWriter, r *http.Request) {defer tCancel()go web.CancelOnClientDone(r.Context(), tCancel)- if blockPatterns != nil {+ if len(blockPatterns) > 0 {_ = bridge.SetResourceBlocking(tCtx, blockPatterns)}@@ -103,9 +122,10 @@ func (h *Handlers) HandleNavigate(w http.ResponseWriter, r *http.Request) {defer tCancel()go web.CancelOnClientDone(r.Context(), tCancel)- if blockPatterns != nil {+ if len(blockPatterns) > 0 {_ = bridge.SetResourceBlocking(tCtx, blockPatterns)- } else if h.Config.BlockImages {+ } else {+ // Clear any existing blocking patterns_ = bridge.SetResourceBlocking(tCtx, nil)}