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

* revert: "websocket: pre-calculated length" This reverts 13523fd which broke permessage-deflate support. See #3289 for why the tests did not catch this. * rerun autobahn
nodejs · May 21, 2024 · fcfa4db · fcfa4db
1 parent 0564b46
commit fcfa4db
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 32 deletions.
diff --git a/lib/web/websocket/receiver.js b/lib/web/websocket/receiver.js
@@ -11,7 +11,6 @@ const {
   failWebsocketConnection,
   websocketMessageReceived,
   utf8Decode,
-  bufferConcat,
   isControlFrame,
   isTextBinaryFrame,
   isContinuationFrame
@@ -34,7 +33,6 @@ class ByteParser extends Writable {
 
   #info = {}
   #fragments = []
-  #fragmentsBytes = 0
 
   /** @type {Map<string, PerMessageDeflate>} */
   #extensions
@@ -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
@@ -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

diff --git a/lib/web/websocket/util.js b/lib/web/websocket/util.js
@@ -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,
@@ -328,7 +305,6 @@ module.exports = {
   failWebsocketConnection,
   websocketMessageReceived,
   utf8Decode,
-  bufferConcat,
   isControlFrame,
   isContinuationFrame,
   isTextBinaryFrame,