stream: finished waits for 'close' on OutgoingMessage

ronag · danielleadams · commit abae61e2307b · 2021-01-12T07:11:44.000-05:00
Don't invoke finished callback until OutgoingMessagehas emitted 'close'. PR-URL: #36648 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
diff --git a/lib/internal/streams/end-of-stream.js b/lib/internal/streams/end-of-stream.js
@@ -13,6 +13,16 @@ function isRequest(stream) {
   return stream.setHeader && typeof stream.abort === 'function';
 }
 
+function isServerResponse(stream) {
+  return (
+    typeof stream._sent100 === 'boolean' &&
+    typeof stream._removedConnection === 'boolean' &&
+    typeof stream._removedContLen === 'boolean' &&
+    typeof stream._removedTE === 'boolean' &&
+    typeof stream._closed === 'boolean'
+  );
+}
+
 function isReadable(stream) {
   return typeof stream.readable === 'boolean' ||
     typeof stream.readableEnded === 'boolean' ||
@@ -72,7 +82,7 @@ function eos(stream, options, callback) {
   // TODO (ronag): Improve soft detection to include core modules and
   // common ecosystem modules that do properly emit 'close' but fail
   // this generic check.
-  let willEmitClose = (
+  let willEmitClose = isServerResponse(stream) || (
     state &&
     state.autoDestroy &&
     state.emitClose &&
diff --git a/test/parallel/test-http-outgoing-finished.js b/test/parallel/test-http-outgoing-finished.js
@@ -0,0 +1,32 @@
+'use strict';
+const common = require('../common');
+const { finished } = require('stream');
+
+const http = require('http');
+const assert = require('assert');
+
+const server = http.createServer(function(req, res) {
+  let closed = false;
+  res
+    .on('close', common.mustCall(() => {
+      closed = true;
+      finished(res, common.mustCall(() => {
+        server.close();
+      }));
+    }))
+    .end();
+  finished(res, common.mustCall(() => {
+    assert.strictEqual(closed, true);
+  }));
+
+}).listen(0, function() {
+  http
+    .request({
+      port: this.address().port,
+      method: 'GET'
+    })
+    .on('response', function(res) {
+      res.resume();
+    })
+    .end();
+});
