Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

browser: Mark a bunch of places where races happen #4521

Merged
merged 1 commit into from
Feb 10, 2025
Merged

browser: Mark a bunch of places where races happen #4521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions internal/js/modules/k6/browser/browser/keyboard_mapping.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ func mapKeyboard(vu moduleVU, kb *common.Keyboard) mapping {
},
"press": func(key string, opts sobek.Value) *sobek.Promise {
return k6ext.Promise(vu.Context(), func() (any, error) {
// TODO(@mstoykov): don't use sobek Values in a separate goroutine
kbopts, err := exportTo[common.KeyboardOptions](vu.Runtime(), opts)
if err != nil {
return nil, fmt.Errorf("parsing keyboard options: %w", err)
Expand All @@ -32,6 +33,7 @@ func mapKeyboard(vu moduleVU, kb *common.Keyboard) mapping {
},
"type": func(text string, opts sobek.Value) *sobek.Promise {
return k6ext.Promise(vu.Context(), func() (any, error) {
// TODO(@mstoykov): don't use sobek Values in a separate goroutine
kbopts, err := exportTo[common.KeyboardOptions](vu.Runtime(), opts)
if err != nil {
return nil, fmt.Errorf("parsing keyboard options: %w", err)
Expand Down
5 changes: 5 additions & 0 deletions internal/js/modules/k6/browser/browser/mouse_mapping.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,26 +11,31 @@ func mapMouse(vu moduleVU, m *common.Mouse) mapping {
return mapping{
"click": func(x float64, y float64, opts sobek.Value) *sobek.Promise {
return k6ext.Promise(vu.Context(), func() (any, error) {
// TODO(@mstoykov): don't use sobek Values in a separate goroutine
return nil, m.Click(x, y, opts) //nolint:wrapcheck
})
},
"dblClick": func(x float64, y float64, opts sobek.Value) *sobek.Promise {
return k6ext.Promise(vu.Context(), func() (any, error) {
// TODO(@mstoykov): don't use sobek Values in a separate goroutine
return nil, m.DblClick(x, y, opts) //nolint:wrapcheck
})
},
"down": func(opts sobek.Value) *sobek.Promise {
return k6ext.Promise(vu.Context(), func() (any, error) {
// TODO(@mstoykov): don't use sobek Values in a separate goroutine
return nil, m.Down(opts) //nolint:wrapcheck
})
},
"up": func(opts sobek.Value) *sobek.Promise {
return k6ext.Promise(vu.Context(), func() (any, error) {
// TODO(@mstoykov): don't use sobek Values in a separate goroutine
return nil, m.Up(opts) //nolint:wrapcheck
})
},
"move": func(x float64, y float64, opts sobek.Value) *sobek.Promise {
return k6ext.Promise(vu.Context(), func() (any, error) {
// TODO(@mstoykov): don't use sobek Values in a separate goroutine
return nil, m.Move(x, y, opts) //nolint:wrapcheck
})
},
Expand Down
34 changes: 34 additions & 0 deletions internal/js/modules/k6/browser/browser/page_mapping.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ func mapPage(vu moduleVU, p *common.Page) mapping { //nolint:gocognit,cyclop
// exists).
vu.taskQueueRegistry.close(p.TargetID())

// TODO(@mstoykov): don't use sobek Values in a separate goroutine
return nil, p.Close(opts) //nolint:wrapcheck
})
},
Expand All @@ -58,6 +59,7 @@ func mapPage(vu moduleVU, p *common.Page) mapping { //nolint:gocognit,cyclop
},
"dblclick": func(selector string, opts sobek.Value) *sobek.Promise {
return k6ext.Promise(vu.Context(), func() (any, error) {
// TODO(@mstoykov): don't use sobek Values in a separate goroutine
return nil, p.Dblclick(selector, opts) //nolint:wrapcheck
})
},
Expand All @@ -72,6 +74,7 @@ func mapPage(vu moduleVU, p *common.Page) mapping { //nolint:gocognit,cyclop
},
"emulateMedia": func(opts sobek.Value) *sobek.Promise {
return k6ext.Promise(vu.Context(), func() (any, error) {
// TODO(@mstoykov): don't use sobek Values in a separate goroutine
return nil, p.EmulateMedia(opts) //nolint:wrapcheck
})
},
Expand All @@ -85,6 +88,7 @@ func mapPage(vu moduleVU, p *common.Page) mapping { //nolint:gocognit,cyclop
return nil, fmt.Errorf("evaluate requires a page function")
}
return k6ext.Promise(vu.Context(), func() (any, error) {
// TODO(@mstoykov): don't use sobek Values in a separate goroutine
return p.Evaluate(pageFunc.String(), exportArgs(gargs)...)
}), nil
},
Expand All @@ -93,6 +97,7 @@ func mapPage(vu moduleVU, p *common.Page) mapping { //nolint:gocognit,cyclop
return nil, fmt.Errorf("evaluateHandle requires a page function")
}
return k6ext.Promise(vu.Context(), func() (any, error) {
// TODO(@mstoykov): don't use sobek Values in a separate goroutine
jsh, err := p.EvaluateHandle(pageFunc.String(), exportArgs(gargs)...)
if err != nil {
return nil, err //nolint:wrapcheck
Expand All @@ -102,11 +107,13 @@ func mapPage(vu moduleVU, p *common.Page) mapping { //nolint:gocognit,cyclop
},
"fill": func(selector string, value string, opts sobek.Value) *sobek.Promise {
return k6ext.Promise(vu.Context(), func() (any, error) {
// TODO(@mstoykov): don't use sobek Values in a separate goroutine
return nil, p.Fill(selector, value, opts) //nolint:wrapcheck
})
},
"focus": func(selector string, opts sobek.Value) *sobek.Promise {
return k6ext.Promise(vu.Context(), func() (any, error) {
// TODO(@mstoykov): don't use sobek Values in a separate goroutine
return nil, p.Focus(selector, opts) //nolint:wrapcheck
})
},
Expand All @@ -122,6 +129,7 @@ func mapPage(vu moduleVU, p *common.Page) mapping { //nolint:gocognit,cyclop
},
"getAttribute": func(selector string, name string, opts sobek.Value) *sobek.Promise {
return k6ext.Promise(vu.Context(), func() (any, error) {
// TODO(@mstoykov): don't use sobek Values in a separate goroutine
s, ok, err := p.GetAttribute(selector, name, opts)
if err != nil {
return nil, err //nolint:wrapcheck
Expand Down Expand Up @@ -151,57 +159,68 @@ func mapPage(vu moduleVU, p *common.Page) mapping { //nolint:gocognit,cyclop
},
"hover": func(selector string, opts sobek.Value) *sobek.Promise {
return k6ext.Promise(vu.Context(), func() (any, error) {
// TODO(@mstoykov): don't use sobek Values in a separate goroutine
return nil, p.Hover(selector, opts) //nolint:wrapcheck
})
},
"innerHTML": func(selector string, opts sobek.Value) *sobek.Promise {
return k6ext.Promise(vu.Context(), func() (any, error) {
// TODO(@mstoykov): don't use sobek Values in a separate goroutine
return p.InnerHTML(selector, opts) //nolint:wrapcheck
})
},
"innerText": func(selector string, opts sobek.Value) *sobek.Promise {
return k6ext.Promise(vu.Context(), func() (any, error) {
// TODO(@mstoykov): don't use sobek Values in a separate goroutine
return p.InnerText(selector, opts) //nolint:wrapcheck
})
},
"inputValue": func(selector string, opts sobek.Value) *sobek.Promise {
return k6ext.Promise(vu.Context(), func() (any, error) {
// TODO(@mstoykov): don't use sobek Values in a separate goroutine
return p.InputValue(selector, opts) //nolint:wrapcheck
})
},
"isChecked": func(selector string, opts sobek.Value) *sobek.Promise {
return k6ext.Promise(vu.Context(), func() (any, error) {
// TODO(@mstoykov): don't use sobek Values in a separate goroutine
return p.IsChecked(selector, opts) //nolint:wrapcheck
})
},
"isClosed": p.IsClosed,
"isDisabled": func(selector string, opts sobek.Value) *sobek.Promise {
return k6ext.Promise(vu.Context(), func() (any, error) {
// TODO(@mstoykov): don't use sobek Values in a separate goroutine
return p.IsDisabled(selector, opts) //nolint:wrapcheck
})
},
"isEditable": func(selector string, opts sobek.Value) *sobek.Promise {
return k6ext.Promise(vu.Context(), func() (any, error) {
// TODO(@mstoykov): don't use sobek Values in a separate goroutine
return p.IsEditable(selector, opts) //nolint:wrapcheck
})
},
"isEnabled": func(selector string, opts sobek.Value) *sobek.Promise {
return k6ext.Promise(vu.Context(), func() (any, error) {
// TODO(@mstoykov): don't use sobek Values in a separate goroutine
return p.IsEnabled(selector, opts) //nolint:wrapcheck
})
},
"isHidden": func(selector string, opts sobek.Value) *sobek.Promise {
return k6ext.Promise(vu.Context(), func() (any, error) {
// TODO(@mstoykov): don't use sobek Values in a separate goroutine
return p.IsHidden(selector, opts) //nolint:wrapcheck
})
},
"isVisible": func(selector string, opts sobek.Value) *sobek.Promise {
return k6ext.Promise(vu.Context(), func() (any, error) {
// TODO(@mstoykov): don't use sobek Values in a separate goroutine
return p.IsVisible(selector, opts) //nolint:wrapcheck
})
},
"keyboard": mapKeyboard(vu, p.GetKeyboard()),
"locator": func(selector string, opts sobek.Value) *sobek.Object {
// TODO(@mstoykov): don't use sobek Values in a separate goroutine
ml := mapLocator(vu, p.Locator(selector, opts))
return rt.ToValue(ml).ToObject(rt)
},
Expand All @@ -218,11 +237,13 @@ func mapPage(vu moduleVU, p *common.Page) mapping { //nolint:gocognit,cyclop
},
"press": func(selector string, key string, opts sobek.Value) *sobek.Promise {
return k6ext.Promise(vu.Context(), func() (any, error) {
// TODO(@mstoykov): don't use sobek Values in a separate goroutine
return nil, p.Press(selector, key, opts) //nolint:wrapcheck
})
},
"reload": func(opts sobek.Value) *sobek.Promise {
return k6ext.Promise(vu.Context(), func() (any, error) {
// TODO(@mstoykov): don't use sobek Values in a separate goroutine
resp, err := p.Reload(opts)
if err != nil {
return nil, err //nolint:wrapcheck
Expand All @@ -249,23 +270,27 @@ func mapPage(vu moduleVU, p *common.Page) mapping { //nolint:gocognit,cyclop
return nil, err //nolint:wrapcheck
}

// TODO(@mstoykov): don't use sobek Values in a separate goroutine
ab := rt.NewArrayBuffer(bb)

return &ab, nil
}), nil
},
"selectOption": func(selector string, values sobek.Value, opts sobek.Value) *sobek.Promise {
return k6ext.Promise(vu.Context(), func() (any, error) {
// TODO(@mstoykov): don't use sobek Values in a separate goroutine
return p.SelectOption(selector, values, opts) //nolint:wrapcheck
})
},
"setChecked": func(selector string, checked bool, opts sobek.Value) *sobek.Promise {
return k6ext.Promise(vu.Context(), func() (any, error) {
// TODO(@mstoykov): don't use sobek Values in a separate goroutine
return nil, p.SetChecked(selector, checked, opts) //nolint:wrapcheck
})
},
"setContent": func(html string, opts sobek.Value) *sobek.Promise {
return k6ext.Promise(vu.Context(), func() (any, error) {
// TODO(@mstoykov): don't use sobek Values in a separate goroutine
return nil, p.SetContent(html, opts) //nolint:wrapcheck
})
},
Expand All @@ -278,6 +303,7 @@ func mapPage(vu moduleVU, p *common.Page) mapping { //nolint:gocognit,cyclop
},
"setInputFiles": func(selector string, files sobek.Value, opts sobek.Value) *sobek.Promise {
return k6ext.Promise(vu.Context(), func() (any, error) {
// TODO(@mstoykov): don't use sobek Values in a separate goroutine
return nil, p.SetInputFiles(selector, files, opts) //nolint:wrapcheck
})
},
Expand All @@ -297,6 +323,7 @@ func mapPage(vu moduleVU, p *common.Page) mapping { //nolint:gocognit,cyclop
},
"textContent": func(selector string, opts sobek.Value) *sobek.Promise {
return k6ext.Promise(vu.Context(), func() (any, error) {
// TODO(@mstoykov): don't use sobek Values in a separate goroutine
s, ok, err := p.TextContent(selector, opts)
if err != nil {
return nil, err //nolint:wrapcheck
Expand Down Expand Up @@ -324,11 +351,13 @@ func mapPage(vu moduleVU, p *common.Page) mapping { //nolint:gocognit,cyclop
},
"touchscreen": mapTouchscreen(vu, p.GetTouchscreen()),
"type": func(selector string, text string, opts sobek.Value) *sobek.Promise {
// TODO(@mstoykov): don't use sobek Values in a separate goroutine
return k6ext.Promise(vu.Context(), func() (any, error) {
return nil, p.Type(selector, text, opts) //nolint:wrapcheck
})
},
"uncheck": func(selector string, opts sobek.Value) *sobek.Promise {
// TODO(@mstoykov): don't use sobek Values in a separate goroutine
return k6ext.Promise(vu.Context(), func() (any, error) {
return nil, p.Uncheck(selector, opts) //nolint:wrapcheck
})
Expand All @@ -349,6 +378,7 @@ func mapPage(vu moduleVU, p *common.Page) mapping { //nolint:gocognit,cyclop
},
"waitForLoadState": func(state string, opts sobek.Value) *sobek.Promise {
return k6ext.Promise(vu.Context(), func() (any, error) {
// TODO(@mstoykov): don't use sobek Values in a separate goroutine
return nil, p.WaitForLoadState(state, opts) //nolint:wrapcheck
})
},
Expand All @@ -363,11 +393,13 @@ func mapPage(vu moduleVU, p *common.Page) mapping { //nolint:gocognit,cyclop
if err != nil {
return nil, err //nolint:wrapcheck
}
// TODO(@mstoykov): don't use sobek Values in a separate goroutine
return mapResponse(vu, resp), nil
}), nil
},
"waitForSelector": func(selector string, opts sobek.Value) *sobek.Promise {
return k6ext.Promise(vu.Context(), func() (any, error) {
// TODO(@mstoykov): don't use sobek Values in a separate goroutine
eh, err := p.WaitForSelector(selector, opts)
if err != nil {
return nil, err //nolint:wrapcheck
Expand Down Expand Up @@ -402,6 +434,7 @@ func mapPage(vu moduleVU, p *common.Page) mapping { //nolint:gocognit,cyclop
if eh == nil {
return nil, nil
}
// TODO(@mstoykov): don't use sobek Values in a separate goroutine
ehm := mapElementHandle(vu, eh)

return ehm, nil
Expand All @@ -415,6 +448,7 @@ func mapPage(vu moduleVU, p *common.Page) mapping { //nolint:gocognit,cyclop
}
var mehs []mapping
for _, eh := range ehs {
// TODO(@mstoykov): don't use sobek Values in a separate goroutine
ehm := mapElementHandle(vu, eh)
mehs = append(mehs, ehm)
}
Expand Down
Loading