[fix] Handle close frame which spans multiple packets (#1494)

websockets · Jan 23, 2019 · 3df4809 · 3df4809
1 parent c61218f
commit 3df4809
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/lib/receiver.js b/lib/receiver.js
@@ -62,7 +62,7 @@ class Receiver extends stream.Writable {
    * @param {Function} cb Callback
    */
   _write(chunk, encoding, cb) {
-    if (this._opcode === 0x08) return cb();
+    if (this._opcode === 0x08 && this._state == GET_INFO) return cb();
 
     this._bufferedBytes += chunk.length;
     this._buffers.push(chunk);
@@ -454,6 +454,7 @@ class Receiver extends stream.Writable {
         this.end();
       }
 
+      this._state = GET_INFO;
       return;
     }
 

diff --git a/test/receiver.test.js b/test/receiver.test.js
@@ -34,6 +34,19 @@ describe('Receiver', function() {
     receiver.write(Buffer.from('8800', 'hex'));
   });
 
+  it('parses a close message spanning multiple writes', function(done) {
+    const receiver = new Receiver();
+
+    receiver.on('conclude', (code, data) => {
+      assert.strictEqual(code, 1000);
+      assert.strictEqual(data, 'DONE');
+      done();
+    });
+
+    receiver.write(Buffer.from('8806', 'hex'));
+    receiver.write(Buffer.from('03e8444F4E45', 'hex'));
+  });
+
   it('parses a masked text message', function(done) {
     const receiver = new Receiver();