fixup

nodejs · May 13, 2024 · 3823134 · 3823134
1 parent 7b8a7d0
commit 3823134
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/lib/web/websocket/receiver.js b/lib/web/websocket/receiver.js
@@ -12,7 +12,6 @@ const {
   websocketMessageReceived,
   utf8Decode,
   isControlFrame,
-  isContinuationFrame,
   isTextBinaryFrame
 } = require('./util')
 const { WebsocketFrameSend } = require('./frame')
@@ -104,7 +103,7 @@ class ByteParser extends Writable {
 
         // If we are already parsing a text/binary frame and do not receive either
         // a continuation frame or close frame, fail the connection.
-        if (isTextBinaryFrame(opcode) && this.#info.opcode !== undefined) {
+        if (isTextBinaryFrame(opcode) && this.#fragments.length > 0) {
           failWebsocketConnection(this.ws, 'Expected continuation frame')
           return
         }
@@ -131,7 +130,11 @@ class ByteParser extends Writable {
           this.#state = parserStates.PAYLOADLENGTH_64
         }
 
-        if (!isContinuationFrame(opcode)) this.#info.opcode = opcode
+        if (isTextBinaryFrame(opcode)) {
+          this.#info.binaryType = opcode
+        }
+
+        this.#info.opcode = opcode
         this.#info.masked = masked
         this.#info.fin = fin
         this.#info.fragmented = fragmented
@@ -185,8 +188,7 @@ class ByteParser extends Writable {
           // parsing continuation frames, not here.
           if (!this.#info.fragmented && this.#info.fin) {
             const fullMessage = Buffer.concat(this.#fragments)
-            websocketMessageReceived(this.ws, this.#info.opcode, fullMessage)
-            this.#info = {}
+            websocketMessageReceived(this.ws, this.#info.binaryType, fullMessage)
             this.#fragments.length = 0
           }
         }
@@ -293,6 +295,7 @@ class ByteParser extends Writable {
         const { code, reason } = this.#info.closeInfo
 
         closeWebSocketConnection(this.ws, code, reason, reason.length)
+        failWebsocketConnection(this.ws, reason)
         return false
       }