High-performance browser automation bridge and multi-instance orchestrator with advanced stealth injection and real-time dashboard.
improve resource blocking: broader patterns, blockMedia option, fix Fetch hang
L5484716e4dab
diff --git a/cdp.go b/cdp.goindex 49a4c222..c93c012c 100644--- a/cdp.go+++ b/cdp.go@@ -168,23 +168,38 @@ func scrollByNodeID(ctx context.Context, backendNodeID int64) error {return withElement(ctx, backendNodeID, "function() { this.scrollIntoViewIfNeeded(); }")}-// setImageBlocking uses Network.setBlockedURLs to block common image URLs.-// Pass true to block, false to clear the blocklist.-func setImageBlocking(ctx context.Context, block bool) error {+// URL patterns for blocking resources via Network.setBlockedURLs.+var imageBlockPatterns = []string{+ // Common image extensions+ "*.png", "*.jpg", "*.jpeg", "*.gif", "*.webp", "*.svg", "*.ico",+ "*.bmp", "*.tiff", "*.avif", "*.jfif",+ // Common CDN image paths+ "*/images/*", "*/img/*", "*/photos/*", "*/thumbnails/*",+ "*imagedelivery.net*", "*images.unsplash.com*", "*pbs.twimg.com*",+}++var mediaBlockPatterns = append(imageBlockPatterns,+ // Fonts+ "*.woff", "*.woff2", "*.ttf", "*.otf", "*.eot",+ // Video/Audio+ "*.mp4", "*.webm", "*.ogg", "*.mp3", "*.wav", "*.m3u8",+ // CSS (aggressive)+ "*.css",+)++// setResourceBlocking uses Network.setBlockedURLs to block resources by URL pattern.+// Pass nil to clear the blocklist.+func setResourceBlocking(ctx context.Context, patterns []string) error {return chromedp.Run(ctx, chromedp.ActionFunc(func(ctx context.Context) error {- // Enable Network domain first (idempotent).+ // Enable Network domain (idempotent).if err := chromedp.FromContext(ctx).Target.Execute(ctx, "Network.enable", nil, nil); err != nil {return fmt.Errorf("Network.enable: %w", err)}- var urls []string- if block {- urls = []string{- "*.png", "*.jpg", "*.jpeg", "*.gif", "*.webp", "*.svg", "*.ico",- "*.bmp", "*.tiff", "*.avif",- }+ if patterns == nil {+ patterns = []string{}}- p := map[string]any{"urls": urls}+ p := map[string]any{"urls": patterns}if err := chromedp.FromContext(ctx).Target.Execute(ctx, "Network.setBlockedURLs", p, nil); err != nil {return fmt.Errorf("Network.setBlockedURLs: %w", err)}diff --git a/config.go b/config.goindex 93f9801b..84019543 100644--- a/config.go+++ b/config.go@@ -56,6 +56,7 @@ var (chromeVersion = envOr("BRIDGE_CHROME_VERSION", "133.0.6943.98")timezone = os.Getenv("BRIDGE_TIMEZONE") // e.g. "America/New_York"blockImages = os.Getenv("BRIDGE_BLOCK_IMAGES") == "true"+ blockMedia = os.Getenv("BRIDGE_BLOCK_MEDIA") == "true" // superset: images + fonts + CSS + videoactionTimeout = 15 * time.SecondnavigateTimeout = 30 * time.SecondshutdownTimeout = 10 * time.Seconddiff --git a/handlers.go b/handlers.goindex ba0e2aa7..b2aee3a6 100644--- a/handlers.go+++ b/handlers.go@@ -182,6 +182,7 @@ func (b *Bridge) handleNavigate(w http.ResponseWriter, r *http.Request) {WaitTitle float64 `json:"waitTitle"` // seconds to wait for title (default 2, max 30)Timeout float64 `json:"timeout"` // per-request navigate timeout in seconds (default: BRIDGE_NAV_TIMEOUT)BlockImages *bool `json:"blockImages"` // per-request override; nil = use global BRIDGE_BLOCK_IMAGES+ BlockMedia *bool `json:"blockMedia"` // block images + fonts + CSS + video/audio}if err := json.NewDecoder(http.MaxBytesReader(w, r.Body, maxBodySize)).Decode(&req); err != nil {jsonErr(w, 400, fmt.Errorf("decode: %w", err))@@ -210,10 +211,18 @@ func (b *Bridge) handleNavigate(w http.ResponseWriter, r *http.Request) {navTimeout = time.Duration(req.Timeout * float64(time.Second))}- // Resolve image blocking: per-request overrides global.- shouldBlockImages := blockImages- if req.BlockImages != nil {- shouldBlockImages = *req.BlockImages+ // Resolve resource blocking: per-request overrides global.+ var blockPatterns []string+ if req.BlockMedia != nil && *req.BlockMedia {+ blockPatterns = mediaBlockPatterns+ } else if req.BlockImages != nil && *req.BlockImages {+ blockPatterns = imageBlockPatterns+ } else if req.BlockImages != nil && !*req.BlockImages {+ blockPatterns = nil // explicitly disabled+ } else if blockMedia {+ blockPatterns = mediaBlockPatterns // global BRIDGE_BLOCK_MEDIA+ } else if blockImages {+ blockPatterns = imageBlockPatterns // global BRIDGE_BLOCK_IMAGES}if req.NewTab {@@ -227,8 +236,8 @@ func (b *Bridge) handleNavigate(w http.ResponseWriter, r *http.Request) {defer tCancel()go cancelOnClientDone(r.Context(), tCancel)- if shouldBlockImages {- _ = setImageBlocking(tCtx, true)+ if blockPatterns != nil {+ _ = setResourceBlocking(tCtx, blockPatterns)}var url, title string@@ -249,8 +258,13 @@ func (b *Bridge) handleNavigate(w http.ResponseWriter, r *http.Request) {defer tCancel()go cancelOnClientDone(r.Context(), tCancel)- // Apply image blocking before navigation.- _ = setImageBlocking(tCtx, shouldBlockImages)+ // Apply resource blocking before navigation.+ if blockPatterns != nil {+ _ = setResourceBlocking(tCtx, blockPatterns)+ } else if blockImages {+ // Clear any previous blocking if per-request disabled it.+ _ = setResourceBlocking(tCtx, nil)+ }if err := navigatePage(tCtx, req.URL); err != nil {jsonErr(w, 500, fmt.Errorf("navigate: %w", err))