Add error handling to getProperties

Updates: #804
Related: #688

api/js_handle.go

@@ -11,7 +11,7 @@ type JSHandle interface {
 	Dispose()
 	Evaluate(pageFunc goja.Value, args ...goja.Value) any
 	EvaluateHandle(pageFunc goja.Value, args ...goja.Value) (JSHandle, error)
-	GetProperties() map[string]JSHandle
+	GetProperties() (map[string]JSHandle, error)
 	GetProperty(propertyName string) JSHandle
 	JSONValue() goja.Value
 	ObjectID() cdpruntime.RemoteObjectID

browser/mapping.go

@@ -171,12 +171,17 @@ func mapJSHandle(vu moduleVU, jsh api.JSHandle) mapping {
 			}
 			return mapJSHandle(vu, h), nil
 		},
-		"getProperties": func() *goja.Object {
+		"getProperties": func() (mapping, error) {
+			props, err := jsh.GetProperties()
+			if err != nil {
+				return nil, err //nolint:wrapcheck
+			}
+
 			dst := make(map[string]any)
-			for k, v := range jsh.GetProperties() {
+			for k, v := range props {
 				dst[k] = mapJSHandle(vu, v)
 			}
-			return rt.ToValue(dst).ToObject(rt)
+			return dst, nil
 		},
 		"getProperty": func(propertyName string) *goja.Object {
 			var (

common/element_handle.go

@@ -1094,10 +1094,14 @@ func (h *ElementHandle) queryAll(selector string, eval evalFunc) ([]api.ElementH
 		return nil, fmt.Errorf("getting element handle for selector %q: %w", selector, ErrJSHandleInvalid)
 	}
 	defer handles.Dispose()
-	var (
-		props = handles.GetProperties()
-		els   = make([]api.ElementHandle, 0, len(props))
-	)
+
+	props, err := handles.GetProperties()
+	if err != nil {
+		// GetProperties has a rich error already, so we don't need to wrap it.
+		return nil, err //nolint:wrapcheck
+	}
+
+	els := make([]api.ElementHandle, 0, len(props))
 	for _, prop := range props {
 		if el := prop.AsElement(); el != nil {
 			els = append(els, el)

common/element_handle_test.go

@@ -84,11 +84,11 @@ func TestQueryAll(t *testing.T) {
 				handles := &jsHandleStub{
 					asElementFn: nilHandle,
 				}
-				handles.getPropertiesFn = func() map[string]api.JSHandle {
+				handles.getPropertiesFn = func() (map[string]api.JSHandle, error) {
 					return map[string]api.JSHandle{
 						"1": handles,
 						"2": handles,
-					}
+					}, nil
 				}
 
 				return handles
@@ -105,13 +105,25 @@ func TestQueryAll(t *testing.T) {
 					"3": &jsHandleStub{asElementFn: nilHandle},
 				}
 				return &jsHandleStub{
-					getPropertiesFn: func() map[string]api.JSHandle {
-						return childHandles
+					getPropertiesFn: func() (map[string]api.JSHandle, error) {
+						return childHandles, nil
 					},
 				}
 			},
 			wantHandles: 2,
 		},
+		"returns_err": {
+			selector: "*",
+			returnHandle: func() any {
+				return &jsHandleStub{
+					getPropertiesFn: func() (map[string]api.JSHandle, error) {
+						return nil, errors.New("any error")
+					},
+				}
+			},
+			wantHandles: 0,
+			wantErr:     true,
+		},
 	} {
 		name, tt := name, tt
 
@@ -172,7 +184,7 @@ type jsHandleStub struct {
 	disposeCalls int
 
 	asElementFn     func() api.ElementHandle
-	getPropertiesFn func() map[string]api.JSHandle
+	getPropertiesFn func() (map[string]api.JSHandle, error)
 }
 
 func (s *jsHandleStub) AsElement() api.ElementHandle {
@@ -186,9 +198,9 @@ func (s *jsHandleStub) Dispose() {
 	s.disposeCalls++
 }
 
-func (s *jsHandleStub) GetProperties() map[string]api.JSHandle {
+func (s *jsHandleStub) GetProperties() (map[string]api.JSHandle, error) {
 	if s.getPropertiesFn == nil {
-		return nil
+		return nil, nil //nolint:nilnil
 	}
 	return s.getPropertiesFn()
 }

common/js_handle.go

@@ -108,18 +108,18 @@ func (h *BaseJSHandle) EvaluateHandle(pageFunc goja.Value, args ...goja.Value) (
 }
 
 // GetProperties retreives the JS handle's properties.
-func (h *BaseJSHandle) GetProperties() map[string]api.JSHandle {
+func (h *BaseJSHandle) GetProperties() (map[string]api.JSHandle, error) {
 	handles, err := h.getProperties()
 	if err != nil {
-		k6ext.Panic(h.ctx, "getProperties: %w", err)
+		return nil, err
 	}
 
 	jsHandles := make(map[string]api.JSHandle, len(handles))
 	for k, v := range handles {
 		jsHandles[k] = v
 	}
 
-	return jsHandles
+	return jsHandles, nil
 }
 
 // getProperties is like GetProperties, but does not panic.

tests/js_handle_get_properties_test.go

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