[fix] Use socket._writableState.length instead of socket.bufferSize

Refs: nodejs/node#34088
websockets · Jun 29, 2020 · a162942 · a162942
1 parent 41b0f9b
commit a162942
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/lib/websocket.js b/lib/websocket.js
@@ -116,10 +116,7 @@ class WebSocket extends EventEmitter {
   get bufferedAmount() {
     if (!this._socket) return this._bufferedAmount;
 
-    //
-    // `socket.bufferSize` is `undefined` if the socket is closed.
-    //
-    return (this._socket.bufferSize || 0) + this._sender._bufferedBytes;
+    return this._socket._writableState.length + this._sender._bufferedBytes;
   }
 
   /**

diff --git a/test/websocket.test.js b/test/websocket.test.js
@@ -208,12 +208,15 @@ describe('WebSocket', () => {
         wss.on('connection', (ws) => {
           const data = Buffer.alloc(1024, 61);
 
-          while (ws._socket.bufferSize === 0) {
+          while (ws.bufferedAmount === 0) {
             ws.send(data);
           }
 
-          assert.ok(ws._socket.bufferSize > 0);
-          assert.strictEqual(ws.bufferedAmount, ws._socket.bufferSize);
+          assert.ok(ws.bufferedAmount > 0);
+          assert.strictEqual(
+            ws.bufferedAmount,
+            ws._socket._writableState.length
+          );
 
           ws.on('close', () => wss.close(done));
           ws.close();