Update to Goja fork called Sobek

More info in: - grafana/k6#3772 - grafana/k6#3773
grafana · Jun 7, 2024 · 06643f3 · 06643f3
1 parent 021fdd4
commit 06643f3
Show file tree

Hide file tree

Showing 68 changed files with 878 additions and 901 deletions.
diff --git a/browser/browser_context_mapping.go b/browser/browser_context_mapping.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/dop251/goja"
+	"github.com/grafana/sobek"
 
 	"github.com/grafana/xk6-browser/common"
 	"github.com/grafana/xk6-browser/k6error"
@@ -15,30 +15,30 @@ import (
 func mapBrowserContext(vu moduleVU, bc *common.BrowserContext) mapping { //nolint:funlen,gocognit,cyclop
 	rt := vu.Runtime()
 	return mapping{
-		"addCookies": func(cookies []*common.Cookie) *goja.Promise {
+		"addCookies": func(cookies []*common.Cookie) *sobek.Promise {
 			return k6ext.Promise(vu.Context(), func() (any, error) {
 				return nil, bc.AddCookies(cookies) //nolint:wrapcheck
 			})
 		},
-		"addInitScript": func(script goja.Value) *goja.Promise {
+		"addInitScript": func(script sobek.Value) *sobek.Promise {
 			return k6ext.Promise(vu.Context(), func() (any, error) {
-				if !gojaValueExists(script) {
+				if !sobekValueExists(script) {
 					return nil, nil
 				}
 
 				source := ""
 				switch script.ExportType() {
 				case reflect.TypeOf(string("")):
 					source = script.String()
-				case reflect.TypeOf(goja.Object{}):
+				case reflect.TypeOf(sobek.Object{}):
 					opts := script.ToObject(rt)
 					for _, k := range opts.Keys() {
 						if k == "content" {
 							source = opts.Get(k).String()
 						}
 					}
 				default:
-					_, isCallable := goja.AssertFunction(script)
+					_, isCallable := sobek.AssertFunction(script)
 					if !isCallable {
 						source = fmt.Sprintf("(%s);", script.ToString().String())
 					} else {
@@ -53,27 +53,27 @@ func mapBrowserContext(vu moduleVU, bc *common.BrowserContext) mapping { //nolin
 			// the browser is grabbed from VU.
 			return mapBrowser(vu)
 		},
-		"clearCookies": func() *goja.Promise {
+		"clearCookies": func() *sobek.Promise {
 			return k6ext.Promise(vu.Context(), func() (any, error) {
 				return nil, bc.ClearCookies() //nolint:wrapcheck
 			})
 		},
-		"clearPermissions": func() *goja.Promise {
+		"clearPermissions": func() *sobek.Promise {
 			return k6ext.Promise(vu.Context(), func() (any, error) {
 				return nil, bc.ClearPermissions() //nolint:wrapcheck
 			})
 		},
-		"close": func() *goja.Promise {
+		"close": func() *sobek.Promise {
 			return k6ext.Promise(vu.Context(), func() (any, error) {
 				return nil, bc.Close() //nolint:wrapcheck
 			})
 		},
-		"cookies": func(urls ...string) *goja.Promise {
+		"cookies": func(urls ...string) *sobek.Promise {
 			return k6ext.Promise(vu.Context(), func() (any, error) {
 				return bc.Cookies(urls...) //nolint:wrapcheck
 			})
 		},
-		"grantPermissions": func(permissions []string, opts goja.Value) *goja.Promise {
+		"grantPermissions": func(permissions []string, opts sobek.Value) *sobek.Promise {
 			return k6ext.Promise(vu.Context(), func() (any, error) {
 				popts := common.NewGrantPermissionsOptions()
 				popts.Parse(vu.Context(), opts)
@@ -83,22 +83,22 @@ func mapBrowserContext(vu moduleVU, bc *common.BrowserContext) mapping { //nolin
 		},
 		"setDefaultNavigationTimeout": bc.SetDefaultNavigationTimeout,
 		"setDefaultTimeout":           bc.SetDefaultTimeout,
-		"setGeolocation": func(geolocation goja.Value) *goja.Promise {
+		"setGeolocation": func(geolocation sobek.Value) *sobek.Promise {
 			return k6ext.Promise(vu.Context(), func() (any, error) {
 				return nil, bc.SetGeolocation(geolocation) //nolint:wrapcheck
 			})
 		},
-		"setHTTPCredentials": func(httpCredentials goja.Value) *goja.Promise {
+		"setHTTPCredentials": func(httpCredentials sobek.Value) *sobek.Promise {
 			return k6ext.Promise(vu.Context(), func() (any, error) {
 				return nil, bc.SetHTTPCredentials(httpCredentials) //nolint:staticcheck,wrapcheck
 			})
 		},
-		"setOffline": func(offline bool) *goja.Promise {
+		"setOffline": func(offline bool) *sobek.Promise {
 			return k6ext.Promise(vu.Context(), func() (any, error) {
 				return nil, bc.SetOffline(offline) //nolint:wrapcheck
 			})
 		},
-		"waitForEvent": func(event string, optsOrPredicate goja.Value) (*goja.Promise, error) {
+		"waitForEvent": func(event string, optsOrPredicate sobek.Value) (*sobek.Promise, error) {
 			ctx := vu.Context()
 			popts := common.NewWaitForEventOptions(
 				bc.Timeout(),
@@ -120,7 +120,7 @@ func mapBrowserContext(vu moduleVU, bc *common.BrowserContext) mapping { //nolin
 						// before returning the result to the caller.
 						c := make(chan bool)
 						tq.Queue(func() error {
-							var resp goja.Value
+							var resp sobek.Value
 							resp, err = popts.PredicateFn(vu.Runtime().ToValue(p))
 							rtn = resp.ToBoolean()
 							close(c)
@@ -145,7 +145,7 @@ func mapBrowserContext(vu moduleVU, bc *common.BrowserContext) mapping { //nolin
 				return mapPage(vu, p), nil
 			}), nil
 		},
-		"pages": func() *goja.Object {
+		"pages": func() *sobek.Object {
 			var (
 				mpages []mapping
 				pages  = bc.Pages()
@@ -160,7 +160,7 @@ func mapBrowserContext(vu moduleVU, bc *common.BrowserContext) mapping { //nolin
 
 			return rt.ToValue(mpages).ToObject(rt)
 		},
-		"newPage": func() *goja.Promise {
+		"newPage": func() *sobek.Promise {
 			return k6ext.Promise(vu.Context(), func() (any, error) {
 				page, err := bc.NewPage()
 				if err != nil {

diff --git a/browser/browser_mapping.go b/browser/browser_mapping.go
@@ -3,7 +3,7 @@ package browser
 import (
 	"fmt"
 
-	"github.com/dop251/goja"
+	"github.com/grafana/sobek"
 
 	"github.com/grafana/xk6-browser/common"
 	"github.com/grafana/xk6-browser/k6ext"
@@ -19,7 +19,7 @@ func mapBrowser(vu moduleVU) mapping { //nolint:funlen,cyclop
 			}
 			return mapBrowserContext(vu, b.Context()), nil
 		},
-		"closeContext": func() *goja.Promise {
+		"closeContext": func() *sobek.Promise {
 			return k6ext.Promise(vu.Context(), func() (any, error) {
 				b, err := vu.browser()
 				if err != nil {
@@ -35,7 +35,7 @@ func mapBrowser(vu moduleVU) mapping { //nolint:funlen,cyclop
 			}
 			return b.IsConnected(), nil
 		},
-		"newContext": func(opts goja.Value) (*goja.Promise, error) {
+		"newContext": func(opts sobek.Value) (*sobek.Promise, error) {
 			return k6ext.Promise(vu.Context(), func() (any, error) {
 				b, err := vu.browser()
 				if err != nil {
@@ -69,7 +69,7 @@ func mapBrowser(vu moduleVU) mapping { //nolint:funlen,cyclop
 			}
 			return b.Version(), nil
 		},
-		"newPage": func(opts goja.Value) *goja.Promise {
+		"newPage": func(opts sobek.Value) *sobek.Promise {
 			return k6ext.Promise(vu.Context(), func() (any, error) {
 				b, err := vu.browser()
 				if err != nil {

diff --git a/browser/console_message_mapping.go b/browser/console_message_mapping.go
@@ -1,7 +1,7 @@
 package browser
 
 import (
-	"github.com/dop251/goja"
+	"github.com/grafana/sobek"
 
 	"github.com/grafana/xk6-browser/common"
 )
@@ -10,7 +10,7 @@ import (
 func mapConsoleMessage(vu moduleVU, cm *common.ConsoleMessage) mapping {
 	rt := vu.Runtime()
 	return mapping{
-		"args": func() *goja.Object {
+		"args": func() *sobek.Object {
 			var (
 				margs []mapping
 				args  = cm.Args
@@ -24,14 +24,14 @@ func mapConsoleMessage(vu moduleVU, cm *common.ConsoleMessage) mapping {
 		},
 		// page(), text() and type() are defined as
 		// functions in order to match Playwright's API
-		"page": func() *goja.Object {
+		"page": func() *sobek.Object {
 			mp := mapPage(vu, cm.Page)
 			return rt.ToValue(mp).ToObject(rt)
 		},
-		"text": func() *goja.Object {
+		"text": func() *sobek.Object {
 			return rt.ToValue(cm.Text).ToObject(rt)
 		},
-		"type": func() *goja.Object {
+		"type": func() *sobek.Object {
 			return rt.ToValue(cm.Type).ToObject(rt)
 		},
 	}