Fix race when getting body - fixes #4596

grafana · Mar 6, 2025 · ff5aa4c · ff5aa4c
1 parent dafd7f8
commit ff5aa4c
Showing 1 changed file with 16 additions and 5 deletions.
diff --git a/internal/js/modules/k6/browser/browser/response_mapping.go b/internal/js/modules/k6/browser/browser/response_mapping.go
@@ -12,6 +12,8 @@ func mapResponseEvent(vu moduleVU, event common.PageOnEvent) mapping {
 }
 
 // mapResponse to the JS module.
+//
+//nolint:funlen
 func mapResponse(vu moduleVU, r *common.Response) mapping {
 	if r == nil {
 		return nil
@@ -23,14 +25,23 @@ func mapResponse(vu moduleVU, r *common.Response) mapping {
 			})
 		},
 		"body": func() *sobek.Promise {
-			return k6ext.Promise(vu.Context(), func() (any, error) {
+			rt := vu.Runtime()
+			promise, res, rej := rt.NewPromise()
+			callback := vu.RegisterCallback()
+			go func() {
 				body, err := r.Body()
 				if err != nil {
-					return nil, err //nolint: wrapcheck
+					callback(func() error {
+						return rej(err)
+					})
+					return
 				}
-				buf := vu.Runtime().NewArrayBuffer(body)
-				return &buf, nil
-			})
+				callback(func() error {
+					buf := vu.Runtime().NewArrayBuffer(body)
+					return res(&buf)
+				})
+			}()
+			return promise
 		},
 		"frame": func() mapping {
 			return mapFrame(vu, r.Frame())