Skip to content

websockets: track bufferedAmount for typed arrays in ArrayBuffer (v1.8.0 backport of #5716) #5990

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
inancgumus merged 1 commit into from
May 15, 2026
Merged

websockets: track bufferedAmount for typed arrays in ArrayBuffer (v1.8.0 backport of #5716) #5990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions internal/js/modules/k6/websockets/websockets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,6 +665,7 @@ func (w *webSocket) send(msg sobek.Value) {
common.Throw(rt,
fmt.Errorf("got error while trying to export ArrayBufferView to bytes: %w", err))
}
w.bufferedAmount += len(b)
w.writeQueueCh <- message{
mtype: websocket.BinaryMessage,
data: b,
Expand Down
27 changes: 27 additions & 0 deletions internal/js/modules/k6/websockets/websockets_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1524,6 +1524,7 @@ func TestArrayBufferViewSupport(t *testing.T) {
t.Parallel()

testArrayBufferViewSupport(t, name)
testArrayBufferViewBufferedAmount(t, name)
})
}
}
Expand Down Expand Up @@ -1554,6 +1555,32 @@ func testArrayBufferViewSupport(t *testing.T, viewName string) {
require.Len(t, logs, 0)
}

func testArrayBufferViewBufferedAmount(t *testing.T, viewName string) {
t.Helper()
ts := newTestState(t)
logger, hook := testutils.NewLoggerWithHook(t, logrus.WarnLevel)
ts.runtime.VU.StateField.Logger = logger
_, err := ts.runtime.RunOnEventLoop(ts.tb.Replacer.Replace(fmt.Sprintf(`
var ws = new WebSocket("WSBIN_URL/ws-echo")
ws.addEventListener("open", () => {
const sent = new %[1]s([164, 41])
ws.send(sent)
if (ws.bufferedAmount != sent.byteLength) {
throw new Error("Expected " + sent.byteLength + " bufferedAmount got " + ws.bufferedAmount);
}
ws.onmessage = async (e) => {
if (ws.bufferedAmount != 0) {
throw new Error("Expected 0 bufferedAmount got " + ws.bufferedAmount);
}
ws.close()
}
})
`, viewName)))
require.NoError(t, err)
logs := hook.Drain()
require.Len(t, logs, 0)
}

func TestReadyStateSwitch(t *testing.T) {
t.Parallel()
ts := newTestState(t)
Expand Down
Loading