Async response text

grafana · May 31, 2024 · a95f88a · a95f88a
1 parent 9ff103d
commit a95f88a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/browser/mapping_test.go b/browser/mapping_test.go
@@ -494,6 +494,7 @@ type responseAPI interface {
 	Status() int64
 	StatusText() string
 	URL() string
+	Text() (string, error)
 }
 
 // locatorAPI represents a way to find element(s) on a page at any moment.

diff --git a/browser/response_mapping.go b/browser/response_mapping.go
@@ -8,7 +8,7 @@ import (
 )
 
 // mapResponse to the JS module.
-func mapResponse(vu moduleVU, r *common.Response) mapping {
+func mapResponse(vu moduleVU, r *common.Response) mapping { //nolint:funlen
 	if r == nil {
 		return nil
 	}
@@ -81,6 +81,11 @@ func mapResponse(vu moduleVU, r *common.Response) mapping {
 		"status":     r.Status,
 		"statusText": r.StatusText,
 		"url":        r.URL,
+		"text": func() *goja.Promise {
+			return k6ext.Promise(vu.Context(), func() (any, error) {
+				return r.Text() //nolint:wrapcheck
+			})
+		},
 	}
 
 	return maps

diff --git a/common/http.go b/common/http.go
@@ -568,13 +568,15 @@ func (r *Response) StatusText() string {
 }
 
 // Text returns the response body as a string.
-func (r *Response) Text() string {
+func (r *Response) Text() (string, error) {
 	if err := r.fetchBody(); err != nil {
-		k6ext.Panic(r.ctx, "getting response body as text: %w", err)
+		return "", fmt.Errorf("getting response body as text: %w", err)
 	}
+
 	r.bodyMu.RLock()
 	defer r.bodyMu.RUnlock()
-	return string(r.body)
+
+	return string(r.body), nil
 }
 
 // URL returns the request URL.