fix retry of nil context

czqn8 · Feb 19, 2020 · 77f29c0 · 77f29c0
1 parent ff24514
commit 77f29c0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/page.go b/page.go
@@ -343,6 +343,9 @@ func (p *Page) EvalE(byValue bool, thisID, js string, jsArgs []interface{}) (res
 			if p.windowObjectID == "" {
 				err := p.initJS()
 				if err != nil {
+					if isNilContextErr(err) {
+						return false, nil
+					}
 					return true, err
 				}
 			}
@@ -365,8 +368,7 @@ func (p *Page) EvalE(byValue bool, thisID, js string, jsArgs []interface{}) (res
 		res, err = p.CallE("Runtime.callFunctionOn", params)
 
 		if thisID == "" {
-			cdpErr, ok := err.(*cdp.Error)
-			if ok && cdpErr.Code == -32000 {
+			if isNilContextErr(err) {
 				_ = p.initJS()
 				return false, nil
 			}

diff --git a/utils.go b/utils.go
@@ -34,3 +34,11 @@ func Method(name string) EventFilter {
 		return name == e.Method
 	}
 }
+
+func isNilContextErr(err error) bool {
+	if err == nil {
+		return false
+	}
+	cdpErr, ok := err.(*cdp.Error)
+	return ok && cdpErr.Code == -32000
+}