[fix] Take into account the data that is being compressed

Improve `websocket.bufferedAmount` accuracy by taking into account the number of bytes of a message while it is being compressed.
websockets · Jun 24, 2020 · e1349c0 · e1349c0
1 parent 0954abc
commit e1349c0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/lib/sender.js b/lib/sender.js
@@ -318,6 +318,7 @@ class Sender {
 
     const perMessageDeflate = this._extensions[PerMessageDeflate.extensionName];
 
+    this._bufferedBytes += data.length;
     this._deflating = true;
     perMessageDeflate.compress(data, options.fin, (_, buf) => {
       if (this._socket.destroyed) {
@@ -336,6 +337,7 @@ class Sender {
         return;
       }
 
+      this._bufferedBytes -= data.length;
       this._deflating = false;
       options.readOnly = false;
       this.sendFrame(Sender.frame(buf, options), cb);

diff --git a/test/websocket.test.js b/test/websocket.test.js
@@ -185,13 +185,16 @@ describe('WebSocket', () => {
 
             ws.on('open', () => {
               ws.send('foo');
+
+              assert.strictEqual(ws.bufferedAmount, 3);
+
               ws.send('bar', (err) => {
                 assert.ifError(err);
                 assert.strictEqual(ws.bufferedAmount, 0);
                 wss.close(done);
               });
 
-              assert.strictEqual(ws.bufferedAmount, 3);
+              assert.strictEqual(ws.bufferedAmount, 6);
             });
           }
         );