Add executionWorld type

Author: inancgumus

common/execution_context.go

@@ -38,9 +38,11 @@ const evaluationScriptURL = "__xk6_browser_evaluation_script__"
 
 var sourceURLRegex = regexp.MustCompile(`^(?s)[\040\t]*//[@#] sourceURL=\s*(\S*?)\s*$`)
 
+type executionWorld string
+
 const (
-	mainWorld    = "main"
-	utilityWorld = "utility"
+	mainWorld    executionWorld = "main"
+	utilityWorld executionWorld = "utility"
 )
 
 type evaluateOptions struct {

common/frame.go

@@ -337,7 +337,7 @@ func (f *Frame) document() (*ElementHandle, error) {
 	return f.documentHandle, err
 }
 
-func (f *Frame) hasContext(world string) bool {
+func (f *Frame) hasContext(world executionWorld) bool {
 	f.executionContextMu.RLock()
 	defer f.executionContextMu.RUnlock()
 
@@ -443,7 +443,7 @@ func (f *Frame) requestByID(reqID network.RequestID) *Request {
 	return frameSession.networkManager.requestFromID(reqID)
 }
 
-func (f *Frame) setContext(world string, execCtx frameExecutionContext) {
+func (f *Frame) setContext(world executionWorld, execCtx frameExecutionContext) {
 	f.executionContextMu.Lock()
 	defer f.executionContextMu.Unlock()
 
@@ -472,7 +472,7 @@ func (f *Frame) setID(id cdp.FrameID) {
 	f.id = id
 }
 
-func (f *Frame) waitForExecutionContext(world string) {
+func (f *Frame) waitForExecutionContext(world executionWorld) {
 	f.log.Debugf("Frame:waitForExecutionContext", "fid:%s furl:%q world:%s",
 		f.ID(), f.URL(), world)
 
@@ -490,7 +490,7 @@ func (f *Frame) waitForExecutionContext(world string) {
 	}
 }
 
-func (f *Frame) waitForFunction(apiCtx context.Context, world string, predicateFn goja.Value, polling PollingType, interval int64, timeout time.Duration, args ...goja.Value) (interface{}, error) {
+func (f *Frame) waitForFunction(apiCtx context.Context, world executionWorld, predicateFn goja.Value, polling PollingType, interval int64, timeout time.Duration, args ...goja.Value) (interface{}, error) {
 	f.log.Debugf(
 		"Frame:waitForFunction",
 		"fid:%s furl:%q world:%s pt:%s timeout:%s",
@@ -1434,15 +1434,15 @@ func (f *Frame) WaitForTimeout(timeout int64) {
 	}
 }
 
-func (f *Frame) adoptBackendNodeID(world string, id cdp.BackendNodeID) (*ElementHandle, error) {
+func (f *Frame) adoptBackendNodeID(world executionWorld, id cdp.BackendNodeID) (*ElementHandle, error) {
 	f.executionContextMu.RLock()
 	defer f.executionContextMu.RUnlock()
 
 	ec := f.getExecCtx(world)
 	return ec.adoptBackendNodeID(id)
 }
 
-func (f *Frame) evaluate(world string, apiCtx context.Context, opts evaluateOptions, pageFunc goja.Value, args ...goja.Value) (res interface{}, err error) {
+func (f *Frame) evaluate(world executionWorld, apiCtx context.Context, opts evaluateOptions, pageFunc goja.Value, args ...goja.Value) (res interface{}, err error) {
 	f.executionContextMu.RLock()
 	defer f.executionContextMu.RUnlock()
 
@@ -1452,7 +1452,7 @@ func (f *Frame) evaluate(world string, apiCtx context.Context, opts evaluateOpti
 
 // getExecCtx returns an execution context using a given world name.
 // Unsafe to use concurrently.
-func (f *Frame) getExecCtx(world string) frameExecutionContext {
+func (f *Frame) getExecCtx(world executionWorld) frameExecutionContext {
 	ec := f.mainExecutionContext
 	if world == utilityWorld {
 		ec = f.utilityExecutionContext

common/frame_session.go

@@ -549,7 +549,7 @@ func (fs *FrameSession) onExecutionContextCreated(event *runtime.EventExecutionC
 	if err := json.Unmarshal(auxData, &i); err != nil {
 		k6Throw(fs.ctx, "unable to unmarshal JSON: %w", err)
 	}
-	var world string = ""
+	var world executionWorld
 	frame := fs.manager.getFrameByID(i.FrameID)
 	if frame != nil {
 		if i.IsDefault {