Skip to content
This repository was archived by the owner on Jan 30, 2025. It is now read-only.

Commit 0da77ab

Browse files
committed
Fix the timeout conversion so it's consistent
The timeout is assumed to be in milliseconds when the user sets it using the provided APIs on browserContext and page. The issue is that internally it's assumed to be seconds. This commit fixes that for the default navigation so it's always assumed to be milliseconds.
1 parent d72aa0f commit 0da77ab

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

common/barrier.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ func (b *Barrier) AddFrameNavigation(frame *Frame) {
3232
atomic.AddInt64(&b.count, 1)
3333
select {
3434
case <-frame.ctx.Done():
35-
case <-time.After(time.Duration(frame.manager.timeoutSettings.navigationTimeout()) * time.Second):
35+
case <-time.After(time.Duration(frame.manager.timeoutSettings.navigationTimeout()) * time.Millisecond):
3636
b.errCh <- ErrTimedOut
3737
case <-ch:
3838
b.ch <- true

common/frame.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -883,7 +883,7 @@ func (f *Frame) Goto(url string, opts goja.Value) (api.Response, error) {
883883
defaultReferer = netMgr.extraHTTPHeaders["referer"]
884884
parsedOpts = NewFrameGotoOptions(
885885
defaultReferer,
886-
time.Duration(f.manager.timeoutSettings.navigationTimeout())*time.Second,
886+
time.Duration(f.manager.timeoutSettings.navigationTimeout())*time.Millisecond,
887887
)
888888
)
889889
if err := parsedOpts.Parse(f.ctx, opts); err != nil {

common/timeout.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func (t *TimeoutSettings) navigationTimeout() int64 {
3535
if t.parent != nil {
3636
return t.parent.navigationTimeout()
3737
}
38-
return int64(DefaultTimeout.Seconds())
38+
return int64(DefaultTimeout.Milliseconds())
3939
}
4040

4141
func (t *TimeoutSettings) timeout() int64 {

common/timeout_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ func testTimeoutSettingsNavigationTimeout(t *testing.T) {
8080
ts := NewTimeoutSettings(nil)
8181

8282
// Assert default timeout value is used
83-
assert.Equal(t, int64(DefaultTimeout.Seconds()), ts.navigationTimeout())
83+
assert.Equal(t, int64(DefaultTimeout.Milliseconds()), ts.navigationTimeout())
8484

8585
// Assert custom default timeout is used
8686
ts.setDefaultNavigationTimeout(100)
@@ -94,7 +94,7 @@ func testTimeoutSettingsNavigationTimeoutWithParent(t *testing.T) {
9494
tsWithParent := NewTimeoutSettings(ts)
9595

9696
// Assert default timeout value is used
97-
assert.Equal(t, int64(DefaultTimeout.Seconds()), tsWithParent.navigationTimeout())
97+
assert.Equal(t, int64(DefaultTimeout.Milliseconds()), tsWithParent.navigationTimeout())
9898

9999
// Assert custom default timeout from parent is used
100100
ts.setDefaultNavigationTimeout(1000)

0 commit comments

Comments
 (0)