partially done, blocked on stream

Author: Sarat Addepalli

lib/net.js

@@ -41,7 +41,7 @@ const {
   UV_EOF
 } = internalBinding('uv');
 
-const { Buffer } = require('buffer');
+const { byteLength } = require('buffer').Buffer;
 const TTYWrap = process.binding('tty_wrap');
 const { ShutdownWrap } = internalBinding('stream_wrap');
 const {
@@ -78,6 +78,7 @@ const {
 } = errors.codes;
 const { validateInt32, validateString } = require('internal/validators');
 const kLastWriteQueueSize = Symbol('lastWriteQueueSize');
+const { isArrayBufferView } = require('internal/util/types');
 
 // Lazy loaded to improve startup performance.
 let cluster;
@@ -791,28 +792,28 @@ protoGetter('bytesWritten', function bytesWritten() {
     return undefined;
 
   this.writableBuffer.forEach(function(el) {
-    if (el.chunk instanceof Buffer)
-      bytes += el.chunk.length;
+    if (isArrayBufferView(el.chunk))
+      bytes += el.chunk.byteLength;
     else
-      bytes += Buffer.byteLength(el.chunk, el.encoding);
+      bytes += byteLength(el.chunk, el.encoding);
   });
 
   if (Array.isArray(data)) {
     // was a writev, iterate over chunks to get total length
     for (var i = 0; i < data.length; i++) {
       const chunk = data[i];
 
-      if (data.allBuffers || chunk instanceof Buffer)
-        bytes += chunk.length;
+      if (data.allBuffers || isArrayBufferView(chunk))
+        bytes += chunk.byteLength;
       else
-        bytes += Buffer.byteLength(chunk.chunk, chunk.encoding);
+        bytes += byteLength(chunk.chunk, chunk.encoding);
     }
   } else if (data) {
     // Writes are either a string or a Buffer.
     if (typeof data !== 'string')
-      bytes += data.length;
+      bytes += data.byteLength;
     else
-      bytes += Buffer.byteLength(data, encoding);
+      bytes += byteLength(data, encoding);
   }
 
   return bytes;

test/parallel/test-net-bytes-stats.js

@@ -20,14 +20,20 @@
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 'use strict';
-require('../common');
+const common = require('../common');
 const assert = require('assert');
 const net = require('net');
 
 let bytesRead = 0;
 let bytesWritten = 0;
 let count = 0;
 
+const writeFoo = ['foo'];
+writeFoo.push(...common.getArrayBufferViews(Buffer.from(writeFoo[0])));
+const writeBar = ['bar'];
+writeBar.push(...common.getArrayBufferViews(Buffer.from(writeBar[0])));
+const maxReconnects = writeFoo.length - 1;
+
 const tcp = net.Server(function(s) {
   console.log('tcp server connection');
 
@@ -48,9 +54,9 @@ tcp.listen(0, function doTest() {
     count++;
     console.error('CLIENT connect #%d', count);
 
-    socket.write('foo', function() {
+    socket.write(writeFoo[count - 1], function() {
       console.error('CLIENT: write cb');
-      socket.end('bar');
+      socket.end(writeBar[count - 1]);
     });
   });
 
@@ -63,7 +69,7 @@ tcp.listen(0, function doTest() {
     console.error('CLIENT close event #%d', count);
     console.log(`Bytes read: ${bytesRead}`);
     console.log(`Bytes written: ${bytesWritten}`);
-    if (count < 2) {
+    if (count < maxReconnects) {
       console.error('RECONNECTING');
       socket.connect(tcp.address().port);
     } else {
@@ -73,6 +79,6 @@ tcp.listen(0, function doTest() {
 });
 
 process.on('exit', function() {
-  assert.strictEqual(bytesRead, 12);
-  assert.strictEqual(bytesWritten, 12);
+  assert.strictEqual(bytesRead, 24);
+  assert.strictEqual(bytesWritten, 24);
 });