Skip to content
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

Jump to bottom

revert: "websocket: pre-calculated length" #3290

Merged
merged 2 commits into from
May 21, 2024
Merged

revert: "websocket: pre-calculated length" #3290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a1805af
revert: "websocket: pre-calculated length"
KhafraDev May 21, 2024
93c653e
rerun autobahn
KhafraDev May 21, 2024
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
11 changes: 3 additions & 8 deletions lib/web/websocket/receiver.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ const {
failWebsocketConnection,
websocketMessageReceived,
utf8Decode,
bufferConcat,
isControlFrame,
isTextBinaryFrame,
isContinuationFrame
Expand All @@ -34,7 +33,6 @@ class ByteParser extends Writable {

#info = {}
#fragments = []
#fragmentsBytes = 0

/** @type {Map<string, PerMessageDeflate>} */
#extensions
Expand Down Expand Up @@ -210,17 +208,15 @@ class ByteParser extends Writable {
} else {
if (!this.#info.compressed) {
this.#fragments.push(body)
this.#fragmentsBytes += body.length

// If the frame is not fragmented, a message has been received.
// If the frame is fragmented, it will terminate with a fin bit set
// and an opcode of 0 (continuation), therefore we handle that when
// parsing continuation frames, not here.
if (!this.#info.fragmented && this.#info.fin) {
const fullMessage = bufferConcat(this.#fragments, this.#fragmentsBytes)
const fullMessage = Buffer.concat(this.#fragments)
websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage)
this.#fragments.length = 0
this.#fragmentsBytes = 0
}

this.#state = parserStates.INFO
Expand All @@ -240,13 +236,12 @@ class ByteParser extends Writable {
return
}

websocketMessageReceived(this.ws, this.#info.binaryType, bufferConcat(this.#fragments, this.#fragmentsBytes))
websocketMessageReceived(this.ws, this.#info.binaryType, Buffer.concat(this.#fragments))

this.#loop = true
this.#state = parserStates.INFO
this.run(callback)
this.#fragments.length = 0
this.#fragmentsBytes = 0
this.run(callback)
})

this.#loop = false
Expand Down
24 changes: 0 additions & 24 deletions lib/web/websocket/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,29 +294,6 @@ const utf8Decode = hasIntl
throw new TypeError('Invalid utf-8 received.')
}

function bufferConcat (buffers, length) {
if (buffers.length === 0 || length === 0) {
return Buffer.allocUnsafe(0)
}
let offset = 0
if (length === undefined) {
length = 0
for (let i = 0; i < buffers.length; ++i) {
length += buffers[i].length
}
}
const output = Buffer.allocUnsafe(length)
for (let i = 0; i < buffers.length; ++i) {
const buffer = buffers[i]
output.set(buffer, offset)
offset += buffer.length
}
if (offset < length) {
output.fill(0, offset, length)
}
return output
}

module.exports = {
isConnecting,
isEstablished,
Expand All @@ -328,7 +305,6 @@ module.exports = {
failWebsocketConnection,
websocketMessageReceived,
utf8Decode,
bufferConcat,
isControlFrame,
isContinuationFrame,
isTextBinaryFrame,
Expand Down
Loading