fix: adapt websocket frame-limit handling for v6 parser

Signed-off-by: Matteo Collina <hello@matteocollina.com>

Author: mcollina

lib/web/websocket/receiver.js

@@ -18,7 +18,6 @@ const {
 const { WebsocketFrameSend } = require('./frame')
 const { closeWebSocketConnection } = require('./connection')
 const { PerMessageDeflate } = require('./permessage-deflate')
-const { MessageSizeExceededError } = require('../../core/errors')
 
 // This code was influenced by ws released under the MIT license.
 // Copyright (c) 2011 Einar Otto Stangvik <einaros@gmail.com>
@@ -232,9 +231,7 @@ class ByteParser extends Writable {
           } else {
             this.#extensions.get('permessage-deflate').decompress(body, this.#info.fin, (error, data) => {
               if (error) {
-                // Use 1009 (Message Too Big) for decompression size limit errors
-                const code = error instanceof MessageSizeExceededError ? 1009 : 1007
-                closeWebSocketConnection(this.ws, code, error.message, error.message.length)
+                failWebsocketConnection(this.ws, error.message)
                 return
               }
 

test/websocket/receiver-unit.js

@@ -2,37 +2,39 @@
 
 const { test } = require('node:test')
 const { ByteParser } = require('../../lib/web/websocket/receiver')
-const { states } = require('../../lib/web/websocket/constants')
+const { kController, kResponse } = require('../../lib/web/websocket/symbols')
 
 const invalidFrame = Buffer.from([0x82, 0x7F, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01])
 
 test('ByteParser rejects 64-bit payload lengths with a non-zero upper word', (t) => {
   const calls = {
     abort: 0,
-    close: 0
+    destroy: 0
   }
 
-  const handler = {
-    readyState: states.CONNECTING,
-    controller: {
-      abort: () => {
-        calls.abort += 1
+  const ws = new EventTarget()
+  ws[kController] = {
+    abort: () => {
+      calls.abort += 1
+    }
+  }
+  ws[kResponse] = {
+    socket: {
+      destroyed: false,
+      destroy: () => {
+        calls.destroy += 1
       }
-    },
-    onSocketClose: () => {
-      calls.close += 1
-    },
-    closeState: new Set()
+    }
   }
 
-  const parser = new ByteParser(handler)
+  const parser = new ByteParser(ws)
 
   parser.write(invalidFrame)
 
   return new Promise((resolve) => {
     setImmediate(() => {
       t.assert.strictEqual(calls.abort, 1)
-      t.assert.strictEqual(calls.close, 1)
+      t.assert.strictEqual(calls.destroy, 1)
       parser.destroy()
       resolve()
     })