diff --git a/src/js/node/http.ts b/src/js/node/http.ts index 3b6f688ad2..f4d8596741 100644 --- a/src/js/node/http.ts +++ b/src/js/node/http.ts @@ -1747,7 +1747,7 @@ const OutgoingMessagePrototype = { clearTimeout(this[timeoutTimerSymbol]); if (callback) { - this.on('timeout', callback); + this.on("timeout", callback); } if (msecs === 0) { @@ -1762,7 +1762,7 @@ const OutgoingMessagePrototype = { // Node.js compatibility: also delegate to socket if available if (!this[fakeSocketSymbol]) { - this.once('socket', function socketSetTimeoutOnConnect(socket) { + this.once("socket", function socketSetTimeoutOnConnect(socket) { socket.setTimeout(msecs); }); } else { @@ -1786,7 +1786,7 @@ const OutgoingMessagePrototype = { const prev = this[fakeSocketSymbol]; this[fakeSocketSymbol] = value; if (!prev && value) { - this.emit('socket', value); + this.emit("socket", value); } }, @@ -2048,6 +2048,12 @@ const ServerResponsePrototype = { } } + // Update bytesWritten on the socket to ensure res.connection.bytesWritten works + if (chunk && this.socket) { + const byteLength = chunk instanceof Buffer ? chunk.length : Buffer.byteLength(chunk, encoding || "utf8"); + this.socket.bytesWritten += byteLength; + } + if (handle) { const headerState = this[headerStateSymbol]; callWriteHeadIfObservable(this, headerState); @@ -2152,6 +2158,12 @@ const ServerResponsePrototype = { result = handle.write(chunk, encoding); } + // Update bytesWritten on the socket to ensure res.connection.bytesWritten works + if (chunk && this.socket) { + const byteLength = chunk instanceof Buffer ? chunk.length : Buffer.byteLength(chunk, encoding || "utf8"); + this.socket.bytesWritten += byteLength; + } + if (result < 0) { if (callback) { // The write was buffered due to backpressure. @@ -2241,6 +2253,13 @@ const ServerResponsePrototype = { } else { handle.write(data, encoding, callback); } + + // Update bytesWritten on the socket to ensure res.connection.bytesWritten works + if (data && this.socket) { + const dataByteLength = + byteLength || (data instanceof Buffer ? data.length : Buffer.byteLength(data, encoding || "utf8")); + this.socket.bytesWritten += dataByteLength; + } }, writeHead(statusCode, statusMessage, headers) { diff --git a/test/js/node/test/parallel/test-http-byteswritten.js b/test/js/node/test/parallel/test-http-byteswritten.js new file mode 100644 index 0000000000..c93fa3aaf2 --- /dev/null +++ b/test/js/node/test/parallel/test-http-byteswritten.js @@ -0,0 +1,55 @@ +// Copyright Joyent, Inc. and other Node contributors. +// +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to permit +// persons to whom the Software is furnished to do so, subject to the +// following conditions: +// +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN +// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +// USE OR OTHER DEALINGS IN THE SOFTWARE. + +'use strict'; +const common = require('../common'); +const assert = require('assert'); +const http = require('http'); + +const body = 'hello world\n'; + +const httpServer = http.createServer(common.mustCall(function(req, res) { + httpServer.close(); + + res.on('finish', common.mustCall(function() { + assert.strictEqual(typeof req.connection.bytesWritten, 'number'); + assert(req.connection.bytesWritten > 0); + })); + res.writeHead(200, { 'Content-Type': 'text/plain' }); + + // Write 1.5mb to cause some requests to buffer + // Also, mix up the encodings a bit. + const chunk = '7'.repeat(1024); + const bchunk = Buffer.from(chunk); + for (let i = 0; i < 1024; i++) { + res.write(chunk); + res.write(bchunk); + res.write(chunk, 'hex'); + } + // Get .bytesWritten while buffer is not empty + assert(res.connection.bytesWritten > 0); + + res.end(body); +})); + +httpServer.listen(0, function() { + http.get({ port: this.address().port }); +}); \ No newline at end of file