Refactor JSONValue to use parseConsoleRemoteObject

common/frame.go

@@ -1455,7 +1455,11 @@ func (f *Frame) selectOption(selector string, values goja.Value, opts *FrameSele
 	}
 	vals := make([]string, 0, len(optHandles))
 	for _, oh := range optHandles {
-		vals = append(vals, oh.JSONValue())
+		val, err := oh.JSONValue()
+		if err != nil {
+			return nil, fmt.Errorf("reading value: %w", err)
+		}
+		vals = append(vals, val)
 		if err := oh.dispose(); err != nil {
 			return nil, fmt.Errorf("optionHandle.dispose: %w", err)
 		}

common/frame_session.go

@@ -642,6 +642,8 @@ func (fs *FrameSession) onConsoleAPICalled(event *cdpruntime.EventConsoleAPICall
 	case "error":
 		l.Error()
 	default:
+		// this is where debug & other console.* apis will default to (such as
+		// console.table).
 		l.Debug()
 	}
 }

common/js_handle.go

@@ -2,7 +2,6 @@ package common
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 
 	"github.com/grafana/xk6-browser/k6ext"
@@ -25,7 +24,7 @@ type JSHandleAPI interface {
 	EvaluateHandle(pageFunc string, args ...any) (JSHandleAPI, error)
 	GetProperties() (map[string]JSHandleAPI, error)
 	GetProperty(propertyName string) JSHandleAPI
-	JSONValue() string
+	JSONValue() (string, error)
 	ObjectID() cdpruntime.RemoteObjectID
 }
 
@@ -163,38 +162,25 @@ func (h *BaseJSHandle) GetProperty(_ string) JSHandleAPI {
 }
 
 // JSONValue returns a JSON version of this JS handle.
-func (h *BaseJSHandle) JSONValue() string { // TODO: return error
-	convertToString := func(ro *cdpruntime.RemoteObject) string {
-		res, err := valueFromRemoteObject(h.ctx, ro)
-		if err != nil {
-			k6ext.Panic(h.ctx, "extracting value from remote object: %w", err)
-		}
-		switch v := res.(type) {
-		case string:
-			return v
-		default:
-			buf, err := json.Marshal(v)
-			if err != nil {
-				k6ext.Panic(h.ctx, "marshaling value: %w", err)
-			}
-			return string(buf)
-		}
-	}
+func (h *BaseJSHandle) JSONValue() (string, error) {
 	remoteObject := h.remoteObject
 	if remoteObject.ObjectID != "" {
-		var result *runtime.RemoteObject
 		var err error
 		action := runtime.CallFunctionOn("function() { return this; }").
 			WithReturnByValue(true).
 			WithAwaitPromise(true).
 			WithObjectID(h.remoteObject.ObjectID)
-		if result, _, err = action.Do(cdp.WithExecutor(h.ctx, h.session)); err != nil {
-			k6ext.Panic(h.ctx, "getting properties for JS handle: %w", err)
+		if remoteObject, _, err = action.Do(cdp.WithExecutor(h.ctx, h.session)); err != nil {
+			return "", fmt.Errorf("retrieving json value: %w", err)
 		}
-		remoteObject = result
 	}
 
-	return convertToString(remoteObject)
+	res, err := parseConsoleRemoteObject(h.logger, remoteObject)
+	if err != nil {
+		return "", fmt.Errorf("extracting json value (remote object id: %v): %w", remoteObject.ObjectID, err)
+	}
+
+	return res, nil
 }
 
 // ObjectID returns the remote object ID.

tests/js_handle_get_properties_test.go

@@ -28,6 +28,7 @@ func TestJSHandleGetProperties(t *testing.T) {
 	props, err := handle.GetProperties()
 	require.NoError(t, err, "expected no error when getting properties")
 
-	value := props["prop1"].JSONValue()
+	value, err := props["prop1"].JSONValue()
+	assert.NoError(t, err, "expected no error when getting JSONValue")
 	assert.Equal(t, value, "one", `expected property value of "one", got %q`, value)
 }

tests/page_test.go

@@ -852,7 +852,9 @@ func TestPageOn(t *testing.T) {
 				t.Helper()
 				assert.Equal(t, "log", cm.Type)
 				assert.Equal(t, "this is a log message", cm.Text)
-				assert.Equal(t, "this is a log message", cm.Args[0].JSONValue())
+				val, err := cm.Args[0].JSONValue()
+				assert.NoError(t, err)
+				assert.Equal(t, "this is a log message", val)
 				assert.True(t, cm.Page.URL() == blankPage, "url is not %s", blankPage)
 			},
 		},
@@ -863,7 +865,9 @@ func TestPageOn(t *testing.T) {
 				t.Helper()
 				assert.Equal(t, "debug", cm.Type)
 				assert.Equal(t, "this is a debug message", cm.Text)
-				assert.Equal(t, "this is a debug message", cm.Args[0].JSONValue())
+				val, err := cm.Args[0].JSONValue()
+				assert.NoError(t, err)
+				assert.Equal(t, "this is a debug message", val)
 				assert.True(t, cm.Page.URL() == blankPage, "url is not %s", blankPage)
 			},
 		},
@@ -874,7 +878,9 @@ func TestPageOn(t *testing.T) {
 				t.Helper()
 				assert.Equal(t, "info", cm.Type)
 				assert.Equal(t, "this is an info message", cm.Text)
-				assert.Equal(t, "this is an info message", cm.Args[0].JSONValue())
+				val, err := cm.Args[0].JSONValue()
+				assert.NoError(t, err)
+				assert.Equal(t, "this is an info message", val)
 				assert.True(t, cm.Page.URL() == blankPage, "url is not %s", blankPage)
 			},
 		},
@@ -885,7 +891,9 @@ func TestPageOn(t *testing.T) {
 				t.Helper()
 				assert.Equal(t, "error", cm.Type)
 				assert.Equal(t, "this is an error message", cm.Text)
-				assert.Equal(t, "this is an error message", cm.Args[0].JSONValue())
+				val, err := cm.Args[0].JSONValue()
+				assert.NoError(t, err)
+				assert.Equal(t, "this is an error message", val)
 				assert.True(t, cm.Page.URL() == blankPage, "url is not %s", blankPage)
 			},
 		},
@@ -896,7 +904,9 @@ func TestPageOn(t *testing.T) {
 				t.Helper()
 				assert.Equal(t, "warning", cm.Type)
 				assert.Equal(t, "this is a warning message", cm.Text)
-				assert.Equal(t, "this is a warning message", cm.Args[0].JSONValue())
+				val, err := cm.Args[0].JSONValue()
+				assert.NoError(t, err)
+				assert.Equal(t, "this is a warning message", val)
 				assert.True(t, cm.Page.URL() == blankPage, "url is not %s", blankPage)
 			},
 		},
@@ -927,7 +937,9 @@ func TestPageOn(t *testing.T) {
 				t.Helper()
 				assert.Equal(t, "table", cm.Type)
 				assert.Equal(t, "Array(2)", cm.Text)
-				assert.Equal(t, `[["Grafana","k6"],["Grafana","Mimir"]]`, cm.Args[0].JSONValue())
+				val, err := cm.Args[0].JSONValue()
+				assert.NoError(t, err)
+				assert.Equal(t, `[["Grafana","k6"],["Grafana","Mimir"]]`, val)
 				assert.True(t, cm.Page.URL() == blankPage, "url is not %s", blankPage)
 			},
 		},
@@ -938,7 +950,9 @@ func TestPageOn(t *testing.T) {
 				t.Helper()
 				assert.Equal(t, "trace", cm.Type)
 				assert.Equal(t, "trace example", cm.Text)
-				assert.Equal(t, "trace example", cm.Args[0].JSONValue())
+				val, err := cm.Args[0].JSONValue()
+				assert.NoError(t, err)
+				assert.Equal(t, "trace example", val)
 				assert.True(t, cm.Page.URL() == blankPage, "url is not %s", blankPage)
 			},
 		},