Refactor navigation timeout to time duration

We should try to work with time duration across most of the codebase.
The only place where it could be an int64 is when the module receives
a millisecond value in int64.

Author: ankur22

common/barrier.go

@@ -32,7 +32,7 @@ func (b *Barrier) AddFrameNavigation(frame *Frame) {
 		atomic.AddInt64(&b.count, 1)
 		select {
 		case <-frame.ctx.Done():
-		case <-time.After(time.Duration(frame.manager.timeoutSettings.navigationTimeout()) * time.Millisecond):
+		case <-time.After(frame.manager.timeoutSettings.navigationTimeout()):
 			b.errCh <- ErrTimedOut
 		case <-ch:
 			b.ch <- true

common/frame.go

@@ -883,7 +883,7 @@ func (f *Frame) Goto(url string, opts goja.Value) (api.Response, error) {
 		defaultReferer = netMgr.extraHTTPHeaders["referer"]
 		parsedOpts     = NewFrameGotoOptions(
 			defaultReferer,
-			time.Duration(f.manager.timeoutSettings.navigationTimeout())*time.Millisecond,
+			f.manager.timeoutSettings.navigationTimeout(),
 		)
 	)
 	if err := parsedOpts.Parse(f.ctx, opts); err != nil {

common/timeout.go

@@ -1,10 +1,12 @@
 package common
 
+import "time"
+
 // TimeoutSettings holds information on timeout settings.
 type TimeoutSettings struct {
 	parent                   *TimeoutSettings
 	defaultTimeout           *int64
-	defaultNavigationTimeout *int64
+	defaultNavigationTimeout *time.Duration
 }
 
 // NewTimeoutSettings creates a new timeout settings object.
@@ -22,20 +24,21 @@ func (t *TimeoutSettings) setDefaultTimeout(timeout int64) {
 }
 
 func (t *TimeoutSettings) setDefaultNavigationTimeout(timeout int64) {
-	t.defaultNavigationTimeout = &timeout
+	d := time.Duration(timeout) * time.Millisecond
+	t.defaultNavigationTimeout = &d
 }
 
-func (t *TimeoutSettings) navigationTimeout() int64 {
+func (t *TimeoutSettings) navigationTimeout() time.Duration {
 	if t.defaultNavigationTimeout != nil {
 		return *t.defaultNavigationTimeout
 	}
 	if t.defaultTimeout != nil {
-		return *t.defaultTimeout
+		return time.Duration(*t.defaultTimeout * time.Hour.Milliseconds())
 	}
 	if t.parent != nil {
 		return t.parent.navigationTimeout()
 	}
-	return int64(DefaultTimeout.Milliseconds())
+	return DefaultTimeout
 }
 
 func (t *TimeoutSettings) timeout() int64 {

common/timeout_test.go

@@ -71,7 +71,7 @@ func testTimeoutSettingsSetDefaultNavigationTimeout(t *testing.T) {
 
 	ts := NewTimeoutSettings(nil)
 	ts.setDefaultNavigationTimeout(100)
-	assert.Equal(t, int64(100), *ts.defaultNavigationTimeout)
+	assert.Equal(t, int64(100), ts.defaultNavigationTimeout.Milliseconds())
 }
 
 func testTimeoutSettingsNavigationTimeout(t *testing.T) {
@@ -80,11 +80,11 @@ func testTimeoutSettingsNavigationTimeout(t *testing.T) {
 	ts := NewTimeoutSettings(nil)
 
 	// Assert default timeout value is used
-	assert.Equal(t, int64(DefaultTimeout.Milliseconds()), ts.navigationTimeout())
+	assert.Equal(t, DefaultTimeout, ts.navigationTimeout())
 
 	// Assert custom default timeout is used
 	ts.setDefaultNavigationTimeout(100)
-	assert.Equal(t, int64(100), ts.navigationTimeout())
+	assert.Equal(t, int64(100), ts.navigationTimeout().Milliseconds())
 }
 
 func testTimeoutSettingsNavigationTimeoutWithParent(t *testing.T) {
@@ -94,15 +94,15 @@ func testTimeoutSettingsNavigationTimeoutWithParent(t *testing.T) {
 	tsWithParent := NewTimeoutSettings(ts)
 
 	// Assert default timeout value is used
-	assert.Equal(t, int64(DefaultTimeout.Milliseconds()), tsWithParent.navigationTimeout())
+	assert.Equal(t, DefaultTimeout, tsWithParent.navigationTimeout())
 
 	// Assert custom default timeout from parent is used
 	ts.setDefaultNavigationTimeout(1000)
-	assert.Equal(t, int64(1000), tsWithParent.navigationTimeout())
+	assert.Equal(t, int64(1000), tsWithParent.navigationTimeout().Milliseconds())
 
 	// Assert custom default timeout is used (over parent)
 	tsWithParent.setDefaultNavigationTimeout(100)
-	assert.Equal(t, int64(100), tsWithParent.navigationTimeout())
+	assert.Equal(t, int64(100), tsWithParent.navigationTimeout().Milliseconds())
 }
 
 func testTimeoutSettingsTimeout(t *testing.T) {