From 8fe7d23c1712160663b44300ca0a0daf01c871e0 Mon Sep 17 00:00:00 2001
From: Robert Nagy <ronagy@icloud.com>
Date: Wed, 6 Jan 2021 21:35:01 +0100
Subject: [PATCH] stream: add readableDidRead

Adds readableDidRead to streams and applies usage to http, http2 and quic.

PR-URL: https://github.com/nodejs/node/pull/36820
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
---
 lib/_http_incoming.js                         |  1 +
 lib/_http_server.js                           |  2 +-
 lib/internal/streams/readable.js              | 14 +++++++++++
 test/parallel/test-stream-readable-didRead.js | 24 +++++++++++++++++++
 4 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 test/parallel/test-stream-readable-didRead.js

diff --git a/lib/_http_incoming.js b/lib/_http_incoming.js
index e0f1354e6c969c..071721cefd23b7 100644
--- a/lib/_http_incoming.js
+++ b/lib/_http_incoming.js
@@ -87,6 +87,7 @@ function IncomingMessage(socket) {
   this.statusMessage = null;
   this.client = socket;
 
+  // TODO: Deprecate and remove.
   this._consuming = false;
   // Flag for when we decide that this message cannot possibly be
   // read by the user, so there's no point continuing to handle it.
diff --git a/lib/_http_server.js b/lib/_http_server.js
index 11119169d56f2c..02a9ecb6e69efd 100644
--- a/lib/_http_server.js
+++ b/lib/_http_server.js
@@ -804,7 +804,7 @@ function resOnFinish(req, res, socket, state, server) {
   // If the user never called req.read(), and didn't pipe() or
   // .resume() or .on('data'), then we call req._dump() so that the
   // bytes will be pulled off the wire.
-  if (!req._consuming && !req._readableState.resumeScheduled)
+  if (!req.readableDidRead)
     req._dump();
 
   // Make sure the requestTimeout is cleared before finishing.
diff --git a/lib/internal/streams/readable.js b/lib/internal/streams/readable.js
index d2d4f19ed3fa5c..60affd77511fa8 100644
--- a/lib/internal/streams/readable.js
+++ b/lib/internal/streams/readable.js
@@ -167,6 +167,8 @@ function ReadableState(options, stream, isDuplex) {
   // If true, a maybeReadMore has been scheduled.
   this.readingMore = false;
 
+  this.didRead = false;
+
   this.decoder = null;
   this.encoding = null;
   if (options && options.encoding) {
@@ -522,6 +524,8 @@ Readable.prototype.read = function(n) {
   if (ret !== null)
     this.emit('data', ret);
 
+  state.didRead = true;
+
   return ret;
 };
 
@@ -825,7 +829,9 @@ function pipeOnDrain(src, dest) {
 
     if ((!state.awaitDrainWriters || state.awaitDrainWriters.size === 0) &&
       EE.listenerCount(src, 'data')) {
+      // TODO(ronag): Call resume() instead?
       state.flowing = true;
+      state.didRead = true;
       flow(src);
     }
   };
@@ -973,6 +979,7 @@ Readable.prototype.resume = function() {
 function resume(stream, state) {
   if (!state.resumeScheduled) {
     state.resumeScheduled = true;
+    state.didRead = true;
     process.nextTick(resume_, stream, state);
   }
 }
@@ -1183,6 +1190,13 @@ ObjectDefineProperties(Readable.prototype, {
     }
   },
 
+  readableDidRead: {
+    enumerable: false,
+    get: function() {
+      return this._readableState.didRead;
+    }
+  },
+
   readableHighWaterMark: {
     enumerable: false,
     get: function() {
diff --git a/test/parallel/test-stream-readable-didRead.js b/test/parallel/test-stream-readable-didRead.js
new file mode 100644
index 00000000000000..18e2da97e88e94
--- /dev/null
+++ b/test/parallel/test-stream-readable-didRead.js
@@ -0,0 +1,24 @@
+'use strict';
+require('../common');
+const assert = require('assert');
+const Readable = require('stream').Readable;
+
+{
+  const readable = new Readable({
+    read: () => {}
+  });
+
+  assert.strictEqual(readable.readableDidRead, false);
+  readable.read();
+  assert.strictEqual(readable.readableDidRead, true);
+}
+
+{
+  const readable = new Readable({
+    read: () => {}
+  });
+
+  assert.strictEqual(readable.readableDidRead, false);
+  readable.resume();
+  assert.strictEqual(readable.readableDidRead, true);
+}