Merge branch 'master' into fix/ws-support-code-reason

Author: etodanik

internal/js/modules/k6/experimental/websockets/websockets.go

@@ -642,13 +642,17 @@ func (w *webSocket) send(msg sobek.Value) {
 			common.Throw(rt, fmt.Errorf("unsupported send type %T", o))
 		}
 
-		buffer := msg.ToObject(rt).Get("buffer")
-		ab, ok := buffer.Export().(sobek.ArrayBuffer)
-		if !ok {
+		var b []byte
+		err = rt.ExportTo(msg, &b)
+		if err != nil {
 			common.Throw(rt,
-				fmt.Errorf("buffer of an ArrayBufferView was not an ArrayBuffer but %T", buffer.Export()))
+				fmt.Errorf("got error while trying to export ArrayBufferView to bytes: %w", err))
+		}
+		w.writeQueueCh <- message{
+			mtype: websocket.BinaryMessage,
+			data:  b,
+			t:     time.Now(),
 		}
-		w.sendArrayBuffer(ab)
 	}
 }
 

internal/js/modules/k6/experimental/websockets/websockets_test.go

@@ -427,6 +427,35 @@ func TestBinaryType_ArrayBuffer(t *testing.T) {
 	require.Len(t, logs, 0)
 }
 
+func TestBinaryType_ArrayBuffer_issue_5226(t *testing.T) {
+	t.Parallel()
+	ts := newTestState(t)
+	logger, hook := testutils.NewLoggerWithHook(t, logrus.WarnLevel)
+	ts.runtime.VU.StateField.Logger = logger
+	_, err := ts.runtime.RunOnEventLoop(ts.tb.Replacer.Replace(`
+		var ws = new WebSocket("WSBIN_URL/ws-echo")
+		ws.binaryType = "arraybuffer"
+		ws.addEventListener("open", () => {
+			const sent = new Uint8Array(1024)
+			ws.send(sent.subarray(0, 1))
+			ws.onmessage = (e) => {
+				if (!(e.data instanceof ArrayBuffer)) {
+					throw new Error("Wrong event.data type; expected: ArrayBuffer, got: "+ typeof e.data);
+				}
+
+				if (e.data.byteLength != 1) {
+					throw new Error("The data received isn't equal to the data sent "  + e.data.byteLength);
+				}
+
+				ws.close();
+			}
+		})
+	`))
+	require.NoError(t, err)
+	logs := hook.Drain()
+	require.Len(t, logs, 0)
+}
+
 func TestExceptionDontPanic(t *testing.T) {
 	t.Parallel()
 	cases := map[string]struct {