add default type exclude for Page.WaitRequestIdle

go-rod · Jul 12, 2023 · add0409 · add0409
1 parent ba218fa
commit add0409
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/must.go b/must.go
@@ -416,7 +416,13 @@ func (p *Page) MustWaitNavigation() func() {
 
 // MustWaitRequestIdle is similar to Page.WaitRequestIdle
 func (p *Page) MustWaitRequestIdle(excludes ...string) (wait func()) {
- return p.WaitRequestIdle(300*time.Millisecond, nil, excludes)
+ return p.WaitRequestIdle(300*time.Millisecond, nil, excludes, []proto.NetworkResourceType{
+ proto.NetworkResourceTypeWebSocket,
+ proto.NetworkResourceTypeEventSource,
+ proto.NetworkResourceTypeMedia,
+ proto.NetworkResourceTypeImage,
+ proto.NetworkResourceTypeFont,
+ })
 }
 
 // MustWaitIdle is similar to Page.WaitIdle

diff --git a/page.go b/page.go
@@ -584,7 +584,9 @@ func (p *Page) WaitNavigation(name proto.PageLifecycleEventName) func() {
 // Be careful, d is not the max wait timeout, it's the least idle time.
 // If you want to set a timeout you can use the "Page.Timeout" function.
 // Use the includes and excludes regexp list to filter the requests by their url.
-func (p *Page) WaitRequestIdle(d time.Duration, includes, excludes []string) func() {
+func (p *Page) WaitRequestIdle(d time.Duration, includes, excludes []string, excludeTypes []proto.NetworkResourceType) func() {
+ defer p.tryTrace(TraceTypeWait, "request-idle")()
+
  if len(includes) == 0 {
  includes = []string{""}
  }
@@ -605,6 +607,12 @@ func (p *Page) WaitRequestIdle(d time.Duration, includes, excludes []string) fun
  }
 
  wait := p.EachEvent(func(sent *proto.NetworkRequestWillBeSent) {
+ for _, t := range excludeTypes {
+ if sent.Type == t {
+ return
+ }
+ }
+
  if match(sent.Request.URL) {
  // Redirect will send multiple NetworkRequestWillBeSent events with the same RequestID,
  // we should filter them out.

diff --git a/page_test.go b/page_test.go
@@ -465,14 +465,16 @@ func TestPageWaitRequestIdle(t *testing.T) {
  rw.WriteHeader(http.StatusFound)
  })
  s.Route("/r4", "")
- s.Route("/", ".html", `<html></html>`)
+ s.Route("/img.jpg", ".jpg", "img")
+ s.Route("/", ".html", `<html><body></body></html>`)
 
  page := g.newPage(s.URL()).MustWaitLoad()
 
  code := ` () => {
  fetch('/r2').then(r => r.text())
  fetch('/r1')
  fetch('/r3')
+ document.body.innerHTML = '<img src="/img.jpg" />'
  }`
 
  waitReq := ""