Add retry count for max waitFor call stack

grafana · Oct 10, 2024 · f51abb3 · f51abb3
1 parent fa6d966
commit f51abb3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/common/frame.go b/common/frame.go
@@ -564,27 +564,32 @@ func (f *Frame) waitForSelector(selector string, opts *FrameWaitForSelectorOptio
 	return handle, nil
 }
 
-func (f *Frame) waitFor(selector string, opts *FrameWaitForSelectorOptions) error {
+func (f *Frame) waitFor(selector string, opts *FrameWaitForSelectorOptions, retryCount int) error {
 	f.log.Debugf("Frame:waitFor", "fid:%s furl:%q sel:%q", f.ID(), f.URL(), selector)
 
+	retryCount--
+	if retryCount < 0 {
+		return errors.New("waitFor retry threshold reached")
+	}
+
 	document, err := f.document()
 	if err != nil {
 		if strings.Contains(err.Error(), "Cannot find context with specified id") {
-			return f.waitFor(selector, opts)
+			return f.waitFor(selector, opts, retryCount)
 		}
 		return err
 	}
 
 	_, err = document.waitForSelector(f.ctx, selector, opts)
 	if err != nil {
 		if strings.Contains(err.Error(), "Inspected target navigated or closed") {
-			return f.waitFor(selector, opts)
+			return f.waitFor(selector, opts, retryCount)
 		}
 		if strings.Contains(err.Error(), "Cannot find context with specified id") {
-			return f.waitFor(selector, opts)
+			return f.waitFor(selector, opts, retryCount)
 		}
 		if strings.Contains(err.Error(), "Execution context was destroyed") {
-			return f.waitFor(selector, opts)
+			return f.waitFor(selector, opts, retryCount)
 		}
 	}
 

diff --git a/common/locator.go b/common/locator.go
@@ -621,7 +621,7 @@ func (l *Locator) WaitFor(opts sobek.Value) error {
 
 func (l *Locator) waitFor(opts *FrameWaitForSelectorOptions) error {
 	opts.Strict = true
-	return l.frame.waitFor(l.selector, opts)
+	return l.frame.waitFor(l.selector, opts, 20)
 }
 
 // DefaultTimeout returns the default timeout for the locator.